about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-06-08 23:11:42 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-06-08 23:11:42 +0000
commit8c010e2f7135902b6dc90f0577573dacbb54cde9 (patch)
treecbd59f1350f8c5a0c0900c1fec63f849a8d66077
parent09096b36152dca599ca781b7299d0d662ca74ce7 (diff)
downloadglibc-8c010e2f7135902b6dc90f0577573dacbb54cde9.tar.gz
glibc-8c010e2f7135902b6dc90f0577573dacbb54cde9.tar.xz
glibc-8c010e2f7135902b6dc90f0577573dacbb54cde9.zip
Fix i386/x86_64 log1pl (sNaN) (bug 20229).
The i386/x86_64 versions of log1pl return sNaN for sNaN input.  This
patch fixes them to add a NaN input to itself so that qNaN is returned
in this case.

Tested for x86_64 and x86.

	[BZ #20229]
	* sysdeps/i386/fpu/s_log1pl.S (__log1pl): Add NaN input to itself.
	* sysdeps/x86_64/fpu/s_log1pl.S (__log1pl): Likewise.
	* math/libm-test.inc (log1p_test_data): Add sNaN tests.
-rw-r--r--ChangeLog5
-rw-r--r--math/libm-test.inc2
-rw-r--r--sysdeps/i386/fpu/s_log1pl.S1
-rw-r--r--sysdeps/x86_64/fpu/s_log1pl.S1
4 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 42d296c93e..12ac302df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2016-06-08  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #20229]
+	* sysdeps/i386/fpu/s_log1pl.S (__log1pl): Add NaN input to itself.
+	* sysdeps/x86_64/fpu/s_log1pl.S (__log1pl): Likewise.
+	* math/libm-test.inc (log1p_test_data): Add sNaN tests.
+
 	[BZ #20228]
 	* sysdeps/i386/fpu/e_log10l.S (__ieee754_log10l): Add NaN input to
 	itself.
diff --git a/math/libm-test.inc b/math/libm-test.inc
index e2a4ed38bc..4371c4ca7b 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -9049,6 +9049,8 @@ static const struct test_f_f_data log1p_test_data[] =
     TEST_f_f (log1p, plus_infty, plus_infty, ERRNO_UNCHANGED),
     TEST_f_f (log1p, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (log1p, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
+    TEST_f_f (log1p, snan_value, qnan_value, INVALID_EXCEPTION),
+    TEST_f_f (log1p, -snan_value, qnan_value, INVALID_EXCEPTION),
 
     AUTO_TESTS_f_f (log1p),
   };
diff --git a/sysdeps/i386/fpu/s_log1pl.S b/sysdeps/i386/fpu/s_log1pl.S
index 98965fa48c..0fd05cbdb3 100644
--- a/sysdeps/i386/fpu/s_log1pl.S
+++ b/sysdeps/i386/fpu/s_log1pl.S
@@ -70,6 +70,7 @@ ENTRY(__log1pl)
 3:	jp	4b		// in case x is ħInf
 	fstp	%st(1)
 	fstp	%st(1)
+	fadd	%st(0)
 	ret
 
 END (__log1pl)
diff --git a/sysdeps/x86_64/fpu/s_log1pl.S b/sysdeps/x86_64/fpu/s_log1pl.S
index e83f64d3c0..947e5e4552 100644
--- a/sysdeps/x86_64/fpu/s_log1pl.S
+++ b/sysdeps/x86_64/fpu/s_log1pl.S
@@ -68,6 +68,7 @@ ENTRY(__log1pl)
 	jnz	4b		// in case x is ħInf
 	fstp	%st(1)
 	fstp	%st(1)
+	fadd	%st(0)
 	ret
 
 END (__log1pl)