From 09096b36152dca599ca781b7299d0d662ca74ce7 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 8 Jun 2016 22:59:18 +0000
Subject: [PATCH] Fix i386/x86_64 log10l (sNaN) (bug 20228).

The i386/x86_64 versions of log10l 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 #20228]
	* sysdeps/i386/fpu/e_log10l.S (__ieee754_log10l): Add NaN input to
	itself.
	* sysdeps/x86_64/fpu/e_log10l.S (__ieee754_log10l): Likewise.
	* math/libm-test.inc (log10_test_data): Add sNaN tests.
---
 ChangeLog                     | 6 ++++++
 math/libm-test.inc            | 2 ++
 sysdeps/i386/fpu/e_log10l.S   | 1 +
 sysdeps/x86_64/fpu/e_log10l.S | 1 +
 4 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 82c698d918..42d296c93e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-06-08  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #20228]
+	* sysdeps/i386/fpu/e_log10l.S (__ieee754_log10l): Add NaN input to
+	itself.
+	* sysdeps/x86_64/fpu/e_log10l.S (__ieee754_log10l): Likewise.
+	* math/libm-test.inc (log10_test_data): Add sNaN tests.
+
 	[BZ #20227]
 	* sysdeps/i386/fpu/e_logl.S (__ieee754_logl): Add NaN input to
 	itself.
diff --git a/math/libm-test.inc b/math/libm-test.inc
index c16009b9ae..e2a4ed38bc 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -9026,6 +9026,8 @@ static const struct test_f_f_data log10_test_data[] =
     TEST_f_f (log10, plus_infty, plus_infty, ERRNO_UNCHANGED),
     TEST_f_f (log10, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
     TEST_f_f (log10, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
+    TEST_f_f (log10, snan_value, qnan_value, INVALID_EXCEPTION),
+    TEST_f_f (log10, -snan_value, qnan_value, INVALID_EXCEPTION),
 
     AUTO_TESTS_f_f (log10),
   };
diff --git a/sysdeps/i386/fpu/e_log10l.S b/sysdeps/i386/fpu/e_log10l.S
index 45b9c6d21d..9326b19796 100644
--- a/sysdeps/i386/fpu/e_log10l.S
+++ b/sysdeps/i386/fpu/e_log10l.S
@@ -65,6 +65,7 @@ ENTRY(__ieee754_log10l)
 3:	jp	4b		// in case x is ±Inf
 	fstp	%st(1)
 	fstp	%st(1)
+	fadd	%st(0)
 	ret
 END(__ieee754_log10l)
 strong_alias (__ieee754_log10l, __log10l_finite)
diff --git a/sysdeps/x86_64/fpu/e_log10l.S b/sysdeps/x86_64/fpu/e_log10l.S
index 8fa61644c1..e0cb88e32e 100644
--- a/sysdeps/x86_64/fpu/e_log10l.S
+++ b/sysdeps/x86_64/fpu/e_log10l.S
@@ -64,6 +64,7 @@ ENTRY(__ieee754_log10l)
 	jnz	4b		// in case x is ±Inf
 	fstp	%st(1)
 	fstp	%st(1)
+	fadd	%st(0)
 	ret
 END(__ieee754_log10l)
 
-- 
2.11.4.GIT