This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.21-62-gd435569

From: jsm28 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 11 Feb 2015 23:17:57 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.21-62-gd435569
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  d435569cd626bccb9c27361202a279d0fd7fce88 (commit)
      from  ef0ffcfd13fea7544c2d83d222963b0da4963734 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d435569cd626bccb9c27361202a279d0fd7fce88

commit d435569cd626bccb9c27361202a279d0fd7fce88
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Feb 11 23:17:25 2015 +0000

    Fix sincos errno setting (bug 15467).
    
    This patch makes sincos set errno to EDOM when passed an infinity,
    similarly to sin and cos.
    
    Tested for x86_64, x86, powerpc and mips64.  I don't know if the
    architecture-specific implementations for ia64 and m68k might need
    corresponding fixes.
    
    2015-02-11  Joseph Myers  <joseph@codesourcery.com>
    
    	[BZ #15467]
    	* sysdeps/ieee754/dbl-64/s_sincos.c: Include <errno.h>.
    	(__sincos): Set errno to EDOM for infinite argument.
    	* sysdeps/ieee754/flt-32/s_sincosf.c: Include <errno.h>.
    	(SINCOSF_FUNC): Set errno to EDOM for infinite argument.
    	* sysdeps/ieee754/ldbl-128/s_sincosl.c: Include <errno.h>.
    	(__sincosl): Set errno to EDOM for infinite argument.
    	* sysdeps/ieee754/ldbl-128ibm/s_sincosl.c: Include <errno.h>.
    	(__sincosl): Set errno to EDOM for infinite argument.
    	* sysdeps/ieee754/ldbl-96/s_sincosl.c: Include <errno.h>.
    	(__sincosl): Set errno to EDOM for infinite argument.
    	* math/libm-test.inc (sincos_test_data): Test errno setting.

diff --git a/ChangeLog b/ChangeLog
index fd890c5..c61a392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2015-02-11  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #15467]
+	* sysdeps/ieee754/dbl-64/s_sincos.c: Include <errno.h>.
+	(__sincos): Set errno to EDOM for infinite argument.
+	* sysdeps/ieee754/flt-32/s_sincosf.c: Include <errno.h>.
+	(SINCOSF_FUNC): Set errno to EDOM for infinite argument.
+	* sysdeps/ieee754/ldbl-128/s_sincosl.c: Include <errno.h>.
+	(__sincosl): Set errno to EDOM for infinite argument.
+	* sysdeps/ieee754/ldbl-128ibm/s_sincosl.c: Include <errno.h>.
+	(__sincosl): Set errno to EDOM for infinite argument.
+	* sysdeps/ieee754/ldbl-96/s_sincosl.c: Include <errno.h>.
+	(__sincosl): Set errno to EDOM for infinite argument.
+	* math/libm-test.inc (sincos_test_data): Test errno setting.
+
 2015-02-11  Leonhard Holz  <leonhard.holz@web.de>
 
 	* string/strxfrm_l.c: Remove #define STRCMP.
diff --git a/NEWS b/NEWS
index d85e26f..2d4ebb9 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.22
 
 * The following bugs are resolved with this release:
 
-  4719, 17912, 17932, 17944, 17949.
+  4719, 15467, 17912, 17932, 17944, 17949.
 
 Version 2.21
 
diff --git a/math/libm-test.inc b/math/libm-test.inc
index 6d7ff12..aa7ba2b 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -9335,9 +9335,9 @@ sin_test (void)
 
 static const struct test_fFF_11_data sincos_test_data[] =
   {
-    TEST_fFF_11 (sincos, plus_infty, qnan_value, qnan_value, INVALID_EXCEPTION),
-    TEST_fFF_11 (sincos, minus_infty, qnan_value, qnan_value, INVALID_EXCEPTION),
-    TEST_fFF_11 (sincos, qnan_value, qnan_value, qnan_value, NO_INEXACT_EXCEPTION),
+    TEST_fFF_11 (sincos, plus_infty, qnan_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
+    TEST_fFF_11 (sincos, minus_infty, qnan_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
+    TEST_fFF_11 (sincos, qnan_value, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
 
     AUTO_TESTS_fFF_11 (sincos),
   };
diff --git a/sysdeps/ieee754/dbl-64/s_sincos.c b/sysdeps/ieee754/dbl-64/s_sincos.c
index 7d3b101..c8a9999 100644
--- a/sysdeps/ieee754/dbl-64/s_sincos.c
+++ b/sysdeps/ieee754/dbl-64/s_sincos.c
@@ -17,6 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <errno.h>
 #include <math.h>
 
 #include <math_private.h>
@@ -36,6 +37,8 @@ __sincos (double x, double *sinx, double *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
+      if (__isinf_ns (x))
+	__set_errno (EDOM);
     }
   else
     {
diff --git a/sysdeps/ieee754/flt-32/s_sincosf.c b/sysdeps/ieee754/flt-32/s_sincosf.c
index 5cf5db0..596e076 100644
--- a/sysdeps/ieee754/flt-32/s_sincosf.c
+++ b/sysdeps/ieee754/flt-32/s_sincosf.c
@@ -17,6 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <errno.h>
 #include <math.h>
 
 #include <math_private.h>
@@ -46,6 +47,8 @@ SINCOSF_FUNC (float x, float *sinx, float *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
+      if (ix == 0x7f800000)
+	__set_errno (EDOM);
     }
   else
     {
diff --git a/sysdeps/ieee754/ldbl-128/s_sincosl.c b/sysdeps/ieee754/ldbl-128/s_sincosl.c
index 175a617..6c4cbd7 100644
--- a/sysdeps/ieee754/ldbl-128/s_sincosl.c
+++ b/sysdeps/ieee754/ldbl-128/s_sincosl.c
@@ -18,6 +18,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <errno.h>
 #include <math.h>
 
 #include <math_private.h>
@@ -38,6 +39,8 @@ __sincosl (long double x, long double *sinx, long double *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
+      if (__isinf_nsl (x))
+	__set_errno (EDOM);
     }
   else
     {
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c b/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c
index f52e733..8a49c54 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c
@@ -18,6 +18,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <errno.h>
 #include <math.h>
 
 #include <math_private.h>
@@ -41,6 +42,8 @@ __sincosl (long double x, long double *sinx, long double *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
+      if (__isinf_nsl (x))
+	__set_errno (EDOM);
     }
   else
     {
diff --git a/sysdeps/ieee754/ldbl-96/s_sincosl.c b/sysdeps/ieee754/ldbl-96/s_sincosl.c
index c7a161a..37067bd 100644
--- a/sysdeps/ieee754/ldbl-96/s_sincosl.c
+++ b/sysdeps/ieee754/ldbl-96/s_sincosl.c
@@ -17,6 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <errno.h>
 #include <math.h>
 
 #include <math_private.h>
@@ -41,6 +42,8 @@ __sincosl (long double x, long double *sinx, long double *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
+      if (__isinf_nsl (x))
+	__set_errno (EDOM);
     }
   else
     {

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                               |   15 +++++++++++++++
 NEWS                                    |    2 +-
 math/libm-test.inc                      |    6 +++---
 sysdeps/ieee754/dbl-64/s_sincos.c       |    3 +++
 sysdeps/ieee754/flt-32/s_sincosf.c      |    3 +++
 sysdeps/ieee754/ldbl-128/s_sincosl.c    |    3 +++
 sysdeps/ieee754/ldbl-128ibm/s_sincosl.c |    3 +++
 sysdeps/ieee754/ldbl-96/s_sincosl.c     |    3 +++
 8 files changed, 34 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]