1 files changed, 20 insertions, 8 deletions

diff --git a/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c b/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
index bbc562d6bd..45b3c1ee0e 100644
--- a/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
+++ b/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
@@ -2,7 +2,7 @@
 #include <setjmp.h>
 
 int
-main(int argc, char *argv[])
+TEST_SETJMP(int argc, char *argv[])
 {
         jmp_buf env;
         int rv;
@@ -12,23 +12,35 @@ main(int argc, char *argv[])
         fedisableexcept(FE_ALL_EXCEPT);
         feenableexcept(FE_DIVBYZERO);
 
-        rv = setjmp(env);
+        rv = SETJMP(env, 0);
 
-        /* Mess with the FPU control word. */
         if (rv == 0) {
+                fexcept_t flag = FE_OVERFLOW;
+
+                /* Mess with the FPU control word. */
                 fesetround(FE_DOWNWARD);
                 fedisableexcept(FE_DIVBYZERO);
-                longjmp(env, 1);
-        /* Verify that the FPU control word is preserved. */
+
+                /* Set the FPU exception flags. */
+                fesetexceptflag(&flag, FE_ALL_EXCEPT);
+
+                LONGJMP(env, 1);
         } else if (rv == 1) {
+                fexcept_t flag = 0;
+
+                /* Verify that the FPU control word is preserved. */
                 if (fegetround() != FE_UPWARD
                     || fegetexcept() != FE_DIVBYZERO)
                         return (1);
+
+                /* Verify that the FPU exception flags weren't clobbered. */
+                fegetexceptflag(&flag, FE_ALL_EXCEPT);
+                if (flag != FE_OVERFLOW)
+                        return (1);
+
                 return (0);
-        /* This is not supposed to happen. */
-        } else {
-                return (1);
         }
 
+        /* This is not supposed to happen. */
         return (1);
 }