[BZ #14583]

        * sysdeps/pthread/pthread.h: Fix prototype of __sigsetjmp.

diff --git a/NEWS b/NEWS
index d27de189842ebf800b4629dde7ca1f31bde80723..c0ef036e7507d7f8ade4919ea320882573aac29c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ Version 2.17
   13542, 13717, 13696, 13939, 13966, 14042, 14090, 14166, 14150, 14151,
   14154, 14157, 14166, 14173, 14195, 14237, 14252, 14283, 14298, 14303,
   14307, 14328, 14331, 14336, 14337, 14347, 14349, 14459, 14476, 14505,
-  14510, 14516, 14518, 14519, 14532, 14538, 14544, 14545, 14576,
+  14510, 14516, 14518, 14519, 14532, 14538, 14544, 14545, 14576, 14583
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 7745b2edd21f17997b4b1b3e4e5a07d8ee3b69af..5d784a5f9cc2a17de3087b920482ce8a57a702aa 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-14  Jeff Law  <law@redhat.com>
+
+       [BZ #14583]
+       * sysdeps/pthread/pthread.h: Fix prototype of __sigsetjmp.
+
 2012-09-13  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #14576]

diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 246c1a0cd58afb45d9ac7d810351613d8fd3fb49..00cc7e8543152a69b0663b3e7dd95ca812310822 100644 (file)
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -731,7 +731,7 @@ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf)
 
 /* Function used in the macros.  */
 struct __jmp_buf_tag;
-extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROW;
+extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROWNL;
 
 
 /* Mutex handling.  */