diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index a967f892846b..8e7aef3246de 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -327,11 +327,6 @@ CFLAGS += -mfloat-abi=softfp
 .endif
 .endif
 
-.if ${MACHINE_CPUARCH} == "riscv"
-CFLAGS += -msoft-float
-ACFLAGS += -msoft-float
-.endif
-
 # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
 
 .if !defined(NO_CPU_CFLAGS)
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
index 3c0812c5ccd7..417266c5641b 100644
--- a/sys/modules/dtrace/dtrace/Makefile
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -58,11 +58,6 @@ assym.o: assym.s
 	${AS} -meabi=5 -o assym.o assym.s
 .endif
 
-.if ${MACHINE_CPUARCH} == "riscv"
-assym.o: assym.s
-	${AS} -msoft-float -o assym.o assym.s
-.endif
-
 .include <bsd.kmod.mk>
 
 CFLAGS+=	-include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h