diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-10-18 14:29:04 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-10-18 14:29:04 +0200 |
| commit | e4b3707cea0eae2cf46a82534dd9279541e7415a (patch) | |
| tree | c2246b8c9cf4f12e0de4e3cd050f15a751402fb3 /sysdeps/nptl | |
| parent | 5e20aae5ee087f394f276bd556c5c1df52d76ff9 (diff) | |
| download | glibc-e4b3707cea0eae2cf46a82534dd9279541e7415a.tar.gz glibc-e4b3707cea0eae2cf46a82534dd9279541e7415a.tar.xz glibc-e4b3707cea0eae2cf46a82534dd9279541e7415a.zip | |
nptl: SIGCANCEL, SIGTIMER, SIGSETXID are always defined
All nptl targets have these signal definitions nowadays. This changes also replaces the nptl-generic version of pthread_sigmask with the Linux version. Tested on x86_64-linux-gnu and i686-linux-gnu. Built with build-many-glibcs.py. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/nptl')
| -rw-r--r-- | sysdeps/nptl/allocrtsig.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/sysdeps/nptl/allocrtsig.c b/sysdeps/nptl/allocrtsig.c index e9ea038655..3f62bf40e7 100644 --- a/sysdeps/nptl/allocrtsig.c +++ b/sysdeps/nptl/allocrtsig.c @@ -19,32 +19,13 @@ #include <signal.h> #include <nptl/pthreadP.h> -/* Up to three special signals might be used privately by libpthread. - Figure out how many unique ones are actually used. */ - -#ifdef SIGCANCEL -# define SIGCANCEL_CONSUMES 1 -#else -# define SIGCANCEL_CONSUMES 0 -#endif - -#if defined SIGTIMER && (!defined SIGCANCEL || SIGTIMER != SIGCANCEL) -# define SIGTIMER_CONSUMES 1 -#else -# define SIGTIMER_CONSUMES 0 -#endif - -#if (defined SIGSETXID \ - && (!defined SIGCANCEL || SIGSETXID != SIGCANCEL) \ - && (!defined SIGTIMER || SIGSETXID != SIGTIMER)) -# define SIGSETXID_CONSUMES 1 -#else -# define SIGSETXID_CONSUMES 0 +#if SIGTIMER != SIGCANCEL +# error "SIGTIMER and SIGCANCEL must be the same" #endif /* This tells the generic code (included below) how many signal - numbers need to be reserved for libpthread's private uses. */ -#define RESERVED_SIGRT \ - (SIGCANCEL_CONSUMES + SIGTIMER_CONSUMES + SIGSETXID_CONSUMES) + numbers need to be reserved for libpthread's private uses + (SIGCANCEL and SIGSETXID). */ +#define RESERVED_SIGRT 2 #include <signal/allocrtsig.c> |