From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 8 Jun 2016 23:11:42 +0000 (+0000)
Subject: Fix i386/x86_64 log1pl (sNaN) (bug 20229).
X-Git-Tag: glibc-2.24~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c010e2f7135902b6dc90f0577573dacbb54cde9;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 42d296c93e3..12ac302df6f 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 e2a4ed38bc0..4371c4ca7b3 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 98965fa48ce..0fd05cbdb32 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 e83f64d3c02..947e5e45521 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)