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 42d296c93e3956f17a19ceb09152bcbf3b43ee3f..12ac302df6fd14bf47e323c9c7e501328703301b 100644 (file)
--- 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 e2a4ed38bc086b5d3313b38aa317018e69dbcc42..4371c4ca7b36fbc605b4a43dc9ba7671c7dba4e5 100644 (file)
--- 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 98965fa48ce432e6faa749297b3cc916445f1a68..0fd05cbdb32cf69e5a5f35dc9abfdb9088207c23 100644 (file)
--- 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 e83f64d3c02906c2e939bc221f2493c4f036ae38..947e5e45521e507df03a6980d17d9959aa97989f 100644 (file)
--- 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)