This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-508-g7b052e3
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Jan 2015 22:29:14 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-508-g7b052e3
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 7b052e33dd35cbee0fcb14a1b58ac2023b40b9af (commit)
from cc40d25e50621b8762d05c0984d572c1bc7507bf (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=7b052e33dd35cbee0fcb14a1b58ac2023b40b9af
commit 7b052e33dd35cbee0fcb14a1b58ac2023b40b9af
Author: Roland McGrath <roland@hack.frob.com>
Date: Thu Jan 8 14:26:51 2015 -0800
NPTL: Fix generic pthread_sigmask.
diff --git a/ChangeLog b/ChangeLog
index 23e1b33..676e72c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2015-01-08 Roland McGrath <roland@hack.frob.com>
+ * nptl/pthread_sigmask.c [SIGCANCEL || SIGTIMER || SIGSETXID]: #error.
+ (pthread_sigmask): Call sigprocmask, not __sigprocmask.
+
* nptl/nptl-init.c (pthread_functions): Conditionalize
.ptr__nptl_setxid initialization on [SIGSETXID].
diff --git a/nptl/pthread_sigmask.c b/nptl/pthread_sigmask.c
index 999f07c..49f47b0 100644
--- a/nptl/pthread_sigmask.c
+++ b/nptl/pthread_sigmask.c
@@ -18,14 +18,18 @@
#include <errno.h>
#include <signal.h>
+#include <pthreadP.h>
+#if defined SIGCANCEL || defined SIGTIMER || defined SIGSETXID
+# error "This implementation assumes no internal-only signal numbers."
+#endif
int
pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask)
{
/* Here we assume that sigprocmask actually does everything right.
The only difference is the return value protocol. */
- int result = __sigprocmask (how, newmask, oldmask);
+ int result = sigprocmask (how, newmask, oldmask);
if (result < 0)
result = errno;
return result;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
nptl/pthread_sigmask.c | 6 +++++-
2 files changed, 8 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources