diff --git a/lib/libc/riscv/gen/fabs.S b/lib/libc/riscv/gen/fabs.S
index 44249252e9c..036d50eddf9 100644
--- a/lib/libc/riscv/gen/fabs.S
+++ b/lib/libc/riscv/gen/fabs.S
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2015-2017 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2021 Alex Richardson <arichardson@FreeBSD.org>
  * All rights reserved.
  *
  * Portions of this software were developed by SRI International and the
@@ -10,6 +11,9 @@
  * Computer Laboratory as part of the CTSRD Project, with support from the
  * UK Higher Education Innovation Fund (HEIF).
  *
+ * This work was supported by Innovate UK project 105694, "Digital Security
+ * by Design (DSbD) Technology Platform Prototype".
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -35,9 +39,12 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef __riscv_float_abi_double
 ENTRY(fabs)
+#ifdef __riscv_float_abi_double
 	fabs.d	fa0, fa0
+#else
+	slli	a0, a0, 1
+	srli	a0, a0, 1
+#endif
 	ret
 END(fabs)
-#endif
diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile
index 67a38855309..902d1ca22f7 100644
--- a/lib/msun/tests/Makefile
+++ b/lib/msun/tests/Makefile
@@ -19,6 +19,10 @@ CFLAGS+=	-I${TESTSRC:H}/libc/gen
 CFLAGS+=	-D__HAVE_LONG_DOUBLE
 .endif
 
+# Avoid builtins, to force the compiler to emit calls to the libm
+# functions, and not calculate any results in advance.
+CFLAGS+=        -fno-builtin
+
 NETBSD_ATF_TESTS_C=	acos_test
 NETBSD_ATF_TESTS_C+=	asin_test
 NETBSD_ATF_TESTS_C+=	atan_test