Index: sys/conf/files.mips
===================================================================
--- sys/conf/files.mips
+++ sys/conf/files.mips
@@ -61,6 +61,9 @@
 libkern/memmove.c			standard
 libkern/cmpdi2.c			optional	mips | mipsel
 libkern/ucmpdi2.c			optional	mips | mipsel
+# required for gcc-4.9?
+libkern/ashldi3.c			standard
+libkern/ashrdi3.c			standard
 
 # cfe support
 dev/cfe/cfe_api.c			optional	cfe
Index: sys/conf/kern.mk
===================================================================
--- sys/conf/kern.mk
+++ sys/conf/kern.mk
@@ -151,6 +151,7 @@
 #
 .if ${MACHINE_CPUARCH} == "mips"
 CFLAGS+=	-msoft-float
+# CFLAGS+=	-Wa,-msoft-float
 INLINE_LIMIT?=	8000
 .endif
 
Index: sys/conf/kmod.mk
===================================================================
--- sys/conf/kmod.mk
+++ sys/conf/kmod.mk
@@ -130,6 +130,16 @@
 
 .if ${MACHINE_CPUARCH} == mips
 CFLAGS+=	-G0 -fno-pic -mno-abicalls -mlong-calls
+CFLAGS+=	-msoft-float
+#CFLAGS+=	-Wa,-msoft-float
+.endif
+
+.if ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == mipsel
+CFLAGS+=	-march=mips32
+.endif
+
+.if ${MACHINE_ARCH} == mips64 || ${MACHINE_ARCH} == mips64el
+CFLAGS+=	-march=mips64
 .endif
 
 .if defined(DEBUG) || defined(DEBUG_FLAGS)