From 97bc38d7a55befa5353bc04caff4329b7778bc84 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 14 Sep 2012 14:31:29 -0600 Subject: [PATCH] [BZ #14583] * sysdeps/pthread/pthread.h: Fix prototype of __sigsetjmp. --- NEWS | 2 +- nptl/ChangeLog | 5 +++++ nptl/sysdeps/pthread/pthread.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d27de189842..c0ef036e750 100644 --- 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 7745b2edd21..5d784a5f9cc 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2012-09-14 Jeff Law + + [BZ #14583] + * sysdeps/pthread/pthread.h: Fix prototype of __sigsetjmp. + 2012-09-13 H.J. Lu [BZ #14576] diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 246c1a0cd58..00cc7e85431 100644 --- 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. */ -- 2.47.2