NPTL: Fix generic pthread_sigmask.

This commit is contained in:
Roland McGrath 2015-01-08 14:26:51 -08:00
parent cc40d25e50
commit 7b052e33dd
2 changed files with 8 additions and 1 deletions

View File

@ -1,5 +1,8 @@
2015-01-08 Roland McGrath <roland@hack.frob.com> 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 * nptl/nptl-init.c (pthread_functions): Conditionalize
.ptr__nptl_setxid initialization on [SIGSETXID]. .ptr__nptl_setxid initialization on [SIGSETXID].

View File

@ -18,14 +18,18 @@
#include <errno.h> #include <errno.h>
#include <signal.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 int
pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask) pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask)
{ {
/* Here we assume that sigprocmask actually does everything right. /* Here we assume that sigprocmask actually does everything right.
The only difference is the return value protocol. */ The only difference is the return value protocol. */
int result = __sigprocmask (how, newmask, oldmask); int result = sigprocmask (how, newmask, oldmask);
if (result < 0) if (result < 0)
result = errno; result = errno;
return result; return result;