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.

10 files changed, 152 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 1bc4afdc3e..e2d749d332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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.
+
 2003-12-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* math/Makefile (tests): Add bug-nextafter.
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;
+}
diff --git a/sysdeps/generic/s_nextafter.c b/sysdeps/generic/s_nextafter.c
index 9290fc6568..c2d799d5df 100644
--- a/sysdeps/generic/s_nextafter.c
+++ b/sysdeps/generic/s_nextafter.c
@@ -72,12 +72,10 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp
 	}
 	hy = hx&0x7ff00000;
 	if(hy>=0x7ff00000) {
-#if FLT_EVAL_METHOD == 0 || FLT_EVAL_METHOD == 1
-	  return x+x;	/* overflow  */
-#else
-	  /* Note that y is either +Inf or -Inf.  */
-	  return x+y;
-#endif
+	  x = x+x;	/* overflow  */
+	  if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
+	    asm ("" : "=m"(x) : "m"(x));
+	  return x;	/* overflow  */
 	}
 	if(hy<0x00100000) {		/* underflow */
 	    y = x*x;
diff --git a/sysdeps/i386/fpu/s_nexttoward.c b/sysdeps/i386/fpu/s_nexttoward.c
index 6b18df1532..2bd768e448 100644
--- a/sysdeps/i386/fpu/s_nexttoward.c
+++ b/sysdeps/i386/fpu/s_nexttoward.c
@@ -83,7 +83,12 @@ static char rcsid[] = "$NetBSD: $";
 	    }
 	}
 	hy = hx&0x7ff00000;
-	if(hy>=0x7ff00000) return x+x;	/* overflow  */
+	if(hy>=0x7ff00000) {
+	  x = x+x;	/* overflow  */
+	  /* Force conversion to double.  */
+	  asm ("" : "=m"(x) : "m"(x));
+	  return x;
+	}
 	if(hy<0x00100000) {		/* underflow */
 	    double x2 = x*x;
 	    if(x2!=x) {		/* raise underflow flag */
diff --git a/sysdeps/i386/fpu/s_nexttowardf.c b/sysdeps/i386/fpu/s_nexttowardf.c
index 150641f335..3fbe53c338 100644
--- a/sysdeps/i386/fpu/s_nexttowardf.c
+++ b/sysdeps/i386/fpu/s_nexttowardf.c
@@ -67,7 +67,12 @@ static char rcsid[] = "$NetBSD: $";
 	    }
 	}
 	hy = hx&0x7f800000;
-	if(hy>=0x7f800000) return x+x;	/* overflow  */
+	if(hy>=0x7f800000) {
+	  x = x+x;	/* overflow  */
+	  /* Force conversion to float.  */
+	  asm ("" : "=m"(x) : "m"(x));
+	  return x;
+	}
 	if(hy<0x00800000) {		/* underflow */
 	    float x2 = x*x;
 	    if(x2!=x) {		/* raise underflow flag */
diff --git a/sysdeps/ieee754/flt-32/s_nextafterf.c b/sysdeps/ieee754/flt-32/s_nextafterf.c
index e144e56acd..e1568e24c9 100644
--- a/sysdeps/ieee754/flt-32/s_nextafterf.c
+++ b/sysdeps/ieee754/flt-32/s_nextafterf.c
@@ -59,12 +59,10 @@ static char rcsid[] = "$NetBSD: s_nextafterf.c,v 1.4 1995/05/10 20:48:01 jtc Exp
 	}
 	hy = hx&0x7f800000;
 	if(hy>=0x7f800000) {
-#if FLT_EVAL_METHOD == 0
-	  return x+x;	/* overflow  */
-#else
-	  /* Note that y is either +Inf or -Inf.  */
-	  return x+y;
-#endif
+	  x = x+x;	/* overflow  */
+	  if (FLT_EVAL_METHOD != 0)
+	    asm ("" : "=m"(x) : "m"(x));
+	  return x;	/* overflow  */
 	}
 	if(hy<0x00800000) {		/* underflow */
 	    y = x*x;
diff --git a/sysdeps/ieee754/ldbl-128/s_nexttoward.c b/sysdeps/ieee754/ldbl-128/s_nexttoward.c
index 2c654fb973..553e401973 100644
--- a/sysdeps/ieee754/ldbl-128/s_nexttoward.c
+++ b/sysdeps/ieee754/ldbl-128/s_nexttoward.c
@@ -27,6 +27,7 @@ static char rcsid[] = "$NetBSD: $";
 
 #include "math.h"
 #include "math_private.h"
+#include <float.h>
 
 #ifdef __STDC__
 	double __nexttoward(double x, long double y)
@@ -83,7 +84,13 @@ static char rcsid[] = "$NetBSD: $";
 	    }
 	}
 	hy = hx&0x7ff00000;
-	if(hy>=0x7ff00000) return x+x;	/* overflow  */
+	if(hy>=0x7ff00000) {
+	  x = x+x;	/* overflow  */
+	  if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
+	    /* Force conversion to float.  */
+	    asm ("" : "=m"(x) : "m"(x));
+	  return x;
+	}
 	if(hy<0x00100000) {		/* underflow */
 	    double x2 = x*x;
 	    if(x2!=x) {		/* raise underflow flag */
diff --git a/sysdeps/ieee754/ldbl-96/s_nexttoward.c b/sysdeps/ieee754/ldbl-96/s_nexttoward.c
index c29bcd146d..8b273af929 100644
--- a/sysdeps/ieee754/ldbl-96/s_nexttoward.c
+++ b/sysdeps/ieee754/ldbl-96/s_nexttoward.c
@@ -27,6 +27,7 @@ static char rcsid[] = "$NetBSD: $";
 
 #include "math.h"
 #include "math_private.h"
+#include <float.h>
 
 #ifdef __STDC__
 	double __nexttoward(double x, long double y)
@@ -80,7 +81,13 @@ static char rcsid[] = "$NetBSD: $";
 	    }
 	}
 	hy = hx&0x7ff00000;
-	if(hy>=0x7ff00000) return x+x;	/* overflow  */
+	if(hy>=0x7ff00000) {
+	  x = x+x;	/* overflow  */
+	  if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
+	    /* Force conversion to float.  */
+	    asm ("" : "=m"(x) : "m"(x));
+	  return x;
+	}
 	if(hy<0x00100000) {		/* underflow */
 	    double x2 = x*x;
 	    if(x2!=x) {		/* raise underflow flag */