diff --git a/lib/msun/riscv/Symbol.map b/lib/msun/riscv/Symbol.map
index 2bc6215688bb..c3d72443cb2c 100644
--- a/lib/msun/riscv/Symbol.map
+++ b/lib/msun/riscv/Symbol.map
@@ -1,15 +1,13 @@
-/*
- */
-FBSD_1.0 {
-};
-
 FBSD_1.3 {
 	fesetexceptflag;
 	feraiseexcept;
 	fegetenv;
 	feholdexcept;
 	feupdateenv;
-	feenableexcept;
-	fedisableexcept;
 	fegetexcept;
 };
+
+FBSD_1.8 {
+	feenableexcept;
+	fedisableexcept;
+};
diff --git a/lib/msun/riscv/fenv.h b/lib/msun/riscv/fenv.h
index 1971e976645c..36abb7b00b7d 100644
--- a/lib/msun/riscv/fenv.h
+++ b/lib/msun/riscv/fenv.h
@@ -216,14 +216,12 @@ feupdateenv(const fenv_t *__envp)
 
 #if __BSD_VISIBLE
 
-/* We currently provide no external definitions of the functions below. */
-
 #ifdef __riscv_float_abi_soft
 int feenableexcept(int __mask);
 int fedisableexcept(int __mask);
 int fegetexcept(void);
 #else
-static inline int
+__fenv_static inline int
 feenableexcept(int __mask __unused)
 {
 
@@ -232,7 +230,7 @@ feenableexcept(int __mask __unused)
 	return (0);
 }
 
-static inline int
+__fenv_static inline int
 fedisableexcept(int __mask __unused)
 {
 
@@ -241,6 +239,7 @@ fedisableexcept(int __mask __unused)
 	return (0);
 }
 
+/* We currently provide no external definition of fegetexcept(). */
 static inline int
 fegetexcept(void)
 {