diff --git a/include/openlibm_fenv_riscv.h b/include/openlibm_fenv_riscv.h
index e8ce78e7..aba4715c 100644
--- a/include/openlibm_fenv_riscv.h
+++ b/include/openlibm_fenv_riscv.h
@@ -190,9 +190,11 @@ __fenv_static inline int
 feholdexcept(fenv_t *__envp)
 {
 
-	/* No exception traps. */
+	__rfs(*__envp);
 
-	return (-1);
+	feclearexcept(FE_ALL_EXCEPT);
+
+	return (0);
 }
 
 __fenv_static inline int