Update.

2003-12-07  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/i386/fpu/s_nexttowardf.c: Construct overflow value correctly.
	* sysdeps/i386/fpu/s_nexttoward.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_nexttoward.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_nexttoward.c: Likewise.
	* math/Makefile (tests): Add bug-nexttoward.
	* math/bug-nexttowward.c: New file.

	* sysdeps/generic/s_nextafter.c: Make sure overflow exception is set.
	* sysdeps/ieee754/flt-32/s_nextafterf.c: Likewise.
	* math/bug-nextafter.c (main): Add tests for overflow and negative
	values.

3 files changed, 102 insertions, 2 deletions

diff --git a/math/Makefile b/math/Makefile
index b8624053a8..c78a2a6d15 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -88,7 +88,7 @@ distribute += $(filter-out $(generated),$(long-m-yes:=.c) $(long-c-yes:=.c))
 # Rules for the test suite.
 tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
 	test-misc test-fpucw tst-definitions test-tgmath test-tgmath-ret \
-	bug-nextafter
+	bug-nextafter bug-nexttoward
 # We do the `long double' tests only if this data type is available and
 # distinct from `double'.
 test-longdouble-yes = test-ldouble test-ildoubl
diff --git a/math/bug-nextafter.c b/math/bug-nextafter.c
index 8aa849df19..015c32dd93 100644
--- a/math/bug-nextafter.c
+++ b/math/bug-nextafter.c
@@ -1,3 +1,4 @@
+#include <fenv.h>
 #include <math.h>
 #include <float.h>
 #include <stdlib.h>
@@ -10,19 +11,53 @@ main (void)
 
   float i = INFINITY;
   float m = FLT_MAX;
+  feclearexcept (FE_ALL_EXCEPT);
   if (nextafterf (m, i) != i)
     {
-      puts ("nextafterf failed");
+      puts ("nextafterf+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) != 0)
+    {
+      puts ("nextafterf+ did not overflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafterf (-m, -i) != -i)
+    {
+      puts ("nextafterf- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) != 0)
+    {
+      puts ("nextafterf- did not overflow");
       ++result;
     }
 
   double di = INFINITY;
   double dm = DBL_MAX;
+  feclearexcept (FE_ALL_EXCEPT);
   if (nextafter (dm, di) != di)
     {
+      puts ("nextafter+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) != 0)
+    {
+      puts ("nextafter+ did not overflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafter (-dm, -di) != -di)
+    {
       puts ("nextafter failed");
       ++result;
     }
+  if (fetestexcept (FE_OVERFLOW) != 0)
+    {
+      puts ("nextafter- did not overflow");
+      ++result;
+    }
 
   return result;
 }
diff --git a/math/bug-nexttoward.c b/math/bug-nexttoward.c
new file mode 100644
index 0000000000..e306a129c2
--- /dev/null
+++ b/math/bug-nexttoward.c
@@ -0,0 +1,65 @@
+#include <fenv.h>
+#include <math.h>
+#include <float.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+int
+main (void)
+{
+  int result = 0;
+
+  long double tl = (long double) FLT_MAX + 0x1.0p128L;
+  float fi = INFINITY;
+  float m = FLT_MAX;
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttowardf (m, tl) != fi)
+    {
+      puts ("nexttowardf+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) == 0)
+    {
+      puts ("nexttowardf+ did not overflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttowardf (-m, -tl) != -fi)
+    {
+      puts ("nexttowardf- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) == 0)
+    {
+      puts ("nexttowardf- did not overflow");
+      ++result;
+    }
+
+  tl = (long double) DBL_MAX + 1.0e305L;
+  double di = INFINITY;
+  double dm = DBL_MAX;
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttoward (dm, tl) != di)
+    {
+      puts ("nexttoward+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) == 0)
+    {
+      puts ("nexttoward+ did not overflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttoward (-dm, -tl) != -di)
+    {
+      puts ("nexttoward- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) == 0)
+    {
+      puts ("nexttoward- did not overflow");
+      ++result;
+    }
+
+  return result;
+}