Index: head/sys/conf/Makefile.riscv
===================================================================
--- head/sys/conf/Makefile.riscv
+++ head/sys/conf/Makefile.riscv
@@ -46,6 +46,8 @@
 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
 .endif
 
+CFLAGS += -DMACHINE_ARCH=\"${TARGET_ARCH}\"
+
 # hack because genassym.c includes sys/bus.h which includes these.
 genassym.o: bus_if.h device_if.h
 
Index: head/sys/riscv/include/param.h
===================================================================
--- head/sys/riscv/include/param.h
+++ head/sys/riscv/include/param.h
@@ -46,7 +46,11 @@
 #define	MACHINE		"riscv"
 #endif
 #ifndef MACHINE_ARCH
+#ifdef __riscv_float_abi_soft
+#define	MACHINE_ARCH	"riscv64sf"
+#else
 #define	MACHINE_ARCH	"riscv64"
+#endif
 #endif
 
 #ifdef SMP