about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-12-07 03:25:24 +0000
committerUlrich Drepper <drepper@redhat.com>2003-12-07 03:25:24 +0000
commit64b02fd2f5fd5d2e2b7187b5e982fa6b59587500 (patch)
tree8b833557f08e0d9088bfbeb20af3389680cdc87f /sysdeps
parent57d20ee7f27850f2c14e7eeb1e64807e6431d469 (diff)
downloadglibc-64b02fd2f5fd5d2e2b7187b5e982fa6b59587500.tar.gz
glibc-64b02fd2f5fd5d2e2b7187b5e982fa6b59587500.tar.xz
glibc-64b02fd2f5fd5d2e2b7187b5e982fa6b59587500.zip
Update.
2003-12-06  Ulrich Drepper  <drepper@redhat.com>

	* math/Makefile (tests): Add bug-nextafter.
	* math/bug-nextafter.c: New file.
	* sysdeps/generic/s_nextafter.c: Construct overflow value correctly.
	* sysdeps/ieee754/flt-32/s_nextafterf.c: Likewise.
	* math/libm-test.inc (nextafter_test): Add test for overflow after
	+/-FLT_MAX etc.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/s_nextafter.c10
-rw-r--r--sysdeps/ieee754/flt-32/s_nextafterf.c10
2 files changed, 18 insertions, 2 deletions
diff --git a/sysdeps/generic/s_nextafter.c b/sysdeps/generic/s_nextafter.c
index a016ab0a4d..9290fc6568 100644
--- a/sysdeps/generic/s_nextafter.c
+++ b/sysdeps/generic/s_nextafter.c
@@ -27,6 +27,7 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp
 
 #include "math.h"
 #include "math_private.h"
+#include <float.h>
 
 #ifdef __STDC__
 	double __nextafter(double x, double y)
@@ -70,7 +71,14 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp
 	    }
 	}
 	hy = hx&0x7ff00000;
-	if(hy>=0x7ff00000) return x+x;	/* overflow  */
+	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
+	}
 	if(hy<0x00100000) {		/* underflow */
 	    y = x*x;
 	    if(y!=x) {		/* raise underflow flag */
diff --git a/sysdeps/ieee754/flt-32/s_nextafterf.c b/sysdeps/ieee754/flt-32/s_nextafterf.c
index 611742bdf4..e144e56acd 100644
--- a/sysdeps/ieee754/flt-32/s_nextafterf.c
+++ b/sysdeps/ieee754/flt-32/s_nextafterf.c
@@ -19,6 +19,7 @@ static char rcsid[] = "$NetBSD: s_nextafterf.c,v 1.4 1995/05/10 20:48:01 jtc Exp
 
 #include "math.h"
 #include "math_private.h"
+#include <float.h>
 
 #ifdef __STDC__
 	float __nextafterf(float x, float y)
@@ -57,7 +58,14 @@ static char rcsid[] = "$NetBSD: s_nextafterf.c,v 1.4 1995/05/10 20:48:01 jtc Exp
 	    }
 	}
 	hy = hx&0x7f800000;
-	if(hy>=0x7f800000) return x+x;	/* overflow  */
+	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
+	}
 	if(hy<0x00800000) {		/* underflow */
 	    y = x*x;
 	    if(y!=x) {		/* raise underflow flag */