3 files changed, 6 insertions, 6 deletions

diff --git a/src/regress/lib/libc/ieeefp/except/Makefile b/src/regress/lib/libc/ieeefp/except/Makefile
index cf73841c4e..0a16eb762e 100644
--- a/src/regress/lib/libc/ieeefp/except/Makefile
+++ b/src/regress/lib/libc/ieeefp/except/Makefile
@@ -1,10 +1,10 @@
-#       $OpenBSD: Makefile,v 1.6 2020/10/18 17:40:06 kettenis Exp $
+#       $OpenBSD: Makefile,v 1.7 2021/06/17 12:55:38 kettenis Exp $
 
 PROG=except
 
 REGRESS_TARGETS+= fltdiv fltinv fltovf fltund
 
-.if ${MACHINE} == arm64 || ${MACHINE} == armv7
+.if ${MACHINE} == arm64 || ${MACHINE} == armv7 || ${MACHINE} == riscv64
 # Floating-point exceptions are optional and absent on most hardware
 REGRESS_EXPECTED_FAILURES+= fltdiv fltinv fltovf fltund
 .endif
diff --git a/src/regress/lib/libc/setjmp-fpu/fpu.c b/src/regress/lib/libc/setjmp-fpu/fpu.c
index 8637854177..e585702887 100644
--- a/src/regress/lib/libc/setjmp-fpu/fpu.c
+++ b/src/regress/lib/libc/setjmp-fpu/fpu.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: fpu.c,v 1.2 2020/10/19 08:50:35 kettenis Exp $        */
+/*      $OpenBSD: fpu.c,v 1.3 2021/06/17 12:55:38 kettenis Exp $        */
 
 #include <err.h>
 #include <fenv.h>
@@ -34,7 +34,7 @@ main(int argc, char *argv[])
         rv = fegetround();
         if (rv != FE_UPWARD)
                 errx(1, "fegetround returned %d, not FE_UPWARD", rv);
-#if !defined(__arm__) && !defined(__aarch64__)
+#if !defined(__arm__) && !defined(__aarch64__) && !defined(__riscv)
         rv = fegetexcept();
         if (rv != FE_DIVBYZERO)
                 errx(1, "fegetexcept returned %d, not FE_DIVBYZERO",
diff --git a/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c b/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
index b74460e5ee..b5ffd8948e 100644
--- a/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
+++ b/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: setjmp-fpu.c,v 1.6 2020/10/19 08:50:35 kettenis Exp $ */
+/*      $OpenBSD: setjmp-fpu.c,v 1.7 2021/06/17 12:55:38 kettenis Exp $ */
 
 #include <err.h>
 #include <fenv.h>
@@ -42,7 +42,7 @@ TEST_SETJMP(void)
                 rv = fegetround();
                 if (rv != FE_UPWARD)
                         errx(1, "fegetround returned %d, not FE_UPWARD", rv);
-#if !defined(__arm__) && !defined(__aarch64__)
+#if !defined(__arm__) && !defined(__aarch64__) && !defined(__riscv)
                 rv = fegetexcept();
                 if (rv != FE_DIVBYZERO)
                         errx(1, "fegetexcept returned %d, not FE_DIVBYZERO",