Index: head/sys/conf/files.mips
===================================================================
--- head/sys/conf/files.mips
+++ head/sys/conf/files.mips
@@ -52,7 +52,7 @@
 kern/link_elf_obj.c			standard
 kern/subr_busdma_bufalloc.c		standard
 kern/subr_dummy_vdso_tc.c		standard
-kern/subr_sfbuf.c			optional	mips | mipsel | mipsn32
+kern/subr_sfbuf.c			standard
 
 # gcc/clang runtime
 libkern/ffsl.c				standard
@@ -61,8 +61,8 @@
 libkern/flsl.c				standard
 libkern/flsll.c				standard
 libkern/memmove.c			standard
-libkern/cmpdi2.c			optional	mips | mipsel
-libkern/ucmpdi2.c			optional	mips | mipsel
+libkern/cmpdi2.c			optional	mips | mipshf | mipsel | mipselhf
+libkern/ucmpdi2.c			optional	mips | mipshf | mipsel | mipselhf
 libkern/ashldi3.c			standard
 libkern/ashrdi3.c			standard
 
Index: head/sys/conf/kern.mk
===================================================================
--- head/sys/conf/kern.mk
+++ head/sys/conf/kern.mk
@@ -184,7 +184,7 @@
 .if ${MACHINE_CPUARCH} == "mips"
 CFLAGS+=	-msoft-float
 INLINE_LIMIT?=	8000
-.if ${TARGET_ARCH:Mmips*hf} != ""
+.if ${MACHINE_ARCH:Mmips*hf} != ""
 CFLAGS+= -DCPU_HAVEFPU
 .endif
 .endif
Index: head/sys/conf/kern.pre.mk
===================================================================
--- head/sys/conf/kern.pre.mk
+++ head/sys/conf/kern.pre.mk
@@ -74,7 +74,7 @@
 CFLAGS_PARAM_INLINE_UNIT_GROWTH?=100
 CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000
 .if ${MACHINE_CPUARCH} == "mips"
-CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000 -DMACHINE_ARCH='"${TARGET_ARCH}"'
+CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000 -DMACHINE_ARCH='"${MACHINE_ARCH}"'
 .endif
 CFLAGS.gcc+= -fno-common -fms-extensions -finline-limit=${INLINE_LIMIT}
 CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
Index: head/sys/conf/options.mips
===================================================================
--- head/sys/conf/options.mips
+++ head/sys/conf/options.mips
@@ -50,9 +50,13 @@
 
 # which MACHINE_ARCH architecture
 MIPS
+MIPSHF
 MIPSEL
+MIPSELHF
 MIPS64
+MIPS64HF
 MIPS64EL
+MIPS64ELHF
 MIPSN32
 
 COMPAT_FREEBSD32	opt_compat.h
Index: head/sys/mips/conf/JZ4780
===================================================================
--- head/sys/mips/conf/JZ4780
+++ head/sys/mips/conf/JZ4780
@@ -5,7 +5,7 @@
 #NO_UNIVERSE
 
 ident		JZ4780
-machine		mips mipsel
+machine		mips mipselhf
 cpu		CPU_XBURST
 cpu		CPU_MIPS4KC