diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sigprocmask.c | 9 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sigtimedwait.c | 9 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sigwait.c | 9 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sigwaitinfo.c | 9 |
5 files changed, 9 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog index 296ec24b1a..77fe57ce79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-01-31 Yury Norov <ynorov@caviumnetworks.com> + * sysdeps/unix/sysv/linux/sigprocmask.c: Remove useless #ifdefs. + * sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise. + * sysdeps/unix/sysv/linux/sigwait.c: Likewise. + * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. + * sysdeps/unix/sysv/linux/ia64/sigpending.c: Remove file. * sysdeps/unix/sysv/linux/s390/s390-64/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sigpending.c: Likewise. diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c index d0b8e049b2..e776563336 100644 --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -30,26 +30,19 @@ int __sigprocmask (int how, const sigset_t *set, sigset_t *oset) { -#ifdef SIGCANCEL sigset_t local_newmask; /* The only thing we have to make sure here is that SIGCANCEL and SIGSETXID are not blocked. */ if (set != NULL && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) -# ifdef SIGSETXID - || __builtin_expect (__sigismember (set, SIGSETXID), 0) -# endif - )) + || __builtin_expect (__sigismember (set, SIGSETXID), 0))) { local_newmask = *set; __sigdelset (&local_newmask, SIGCANCEL); -# ifdef SIGSETXID __sigdelset (&local_newmask, SIGSETXID); -# endif set = &local_newmask; } -#endif return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8); } diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c index ab1a84ef1c..42afbce22c 100644 --- a/sysdeps/unix/sysv/linux/sigtimedwait.c +++ b/sysdeps/unix/sysv/linux/sigtimedwait.c @@ -29,25 +29,18 @@ int __sigtimedwait (const sigset_t *set, siginfo_t *info, const struct timespec *timeout) { -#ifdef SIGCANCEL sigset_t tmpset; if (set != NULL && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) -# ifdef SIGSETXID - || __builtin_expect (__sigismember (set, SIGSETXID), 0) -# endif - )) + || __builtin_expect (__sigismember (set, SIGSETXID), 0))) { /* Create a temporary mask without the bit for SIGCANCEL set. */ // We are not copying more than we have to. memcpy (&tmpset, set, _NSIG / 8); __sigdelset (&tmpset, SIGCANCEL); -# ifdef SIGSETXID __sigdelset (&tmpset, SIGSETXID); -# endif set = &tmpset; } -#endif /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ diff --git a/sysdeps/unix/sysv/linux/sigwait.c b/sysdeps/unix/sysv/linux/sigwait.c index 48bcd2fda7..395bd9feb6 100644 --- a/sysdeps/unix/sysv/linux/sigwait.c +++ b/sysdeps/unix/sysv/linux/sigwait.c @@ -33,25 +33,18 @@ do_sigwait (const sigset_t *set, int *sig) { int ret; -#ifdef SIGCANCEL sigset_t tmpset; if (set != NULL && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) -# ifdef SIGSETXID - || __builtin_expect (__sigismember (set, SIGSETXID), 0) -# endif - )) + || __builtin_expect (__sigismember (set, SIGSETXID), 0))) { /* Create a temporary mask without the bit for SIGCANCEL set. */ // We are not copying more than we have to. memcpy (&tmpset, set, _NSIG / 8); __sigdelset (&tmpset, SIGCANCEL); -# ifdef SIGSETXID __sigdelset (&tmpset, SIGSETXID); -# endif set = &tmpset; } -#endif /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ diff --git a/sysdeps/unix/sysv/linux/sigwaitinfo.c b/sysdeps/unix/sysv/linux/sigwaitinfo.c index 5a044f08e3..0062d3ea86 100644 --- a/sysdeps/unix/sysv/linux/sigwaitinfo.c +++ b/sysdeps/unix/sysv/linux/sigwaitinfo.c @@ -31,25 +31,18 @@ int __sigwaitinfo (const sigset_t *set, siginfo_t *info) { -#ifdef SIGCANCEL sigset_t tmpset; if (set != NULL && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) -# ifdef SIGSETXID - || __builtin_expect (__sigismember (set, SIGSETXID), 0) -# endif - )) + || __builtin_expect (__sigismember (set, SIGSETXID), 0))) { /* Create a temporary mask without the bit for SIGCANCEL set. */ // We are not copying more than we have to. memcpy (&tmpset, set, _NSIG / 8); __sigdelset (&tmpset, SIGCANCEL); -# ifdef SIGSETXID __sigdelset (&tmpset, SIGSETXID); -# endif set = &tmpset; } -#endif /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ |