diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | nptl/pthreadP.h | 2 | ||||
| -rw-r--r-- | sysdeps/generic/internal-signals.h (renamed from sysdeps/nptl/nptl-signals.h) | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/internal-signals.h (renamed from sysdeps/unix/sysv/linux/nptl-signals.h) | 16 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/raise.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/spawni.c | 2 |
6 files changed, 30 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index a9a8a4f5e4..059537497c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2018-02-22 Adhemerval Zanella <adhemerval.zanella@linaro.org> + + * sysdeps/nptl/nptl-signals.h: Move to ... + * sysdeps/generic/internal-signals.h: ... here. Adjust internal + comments. + * sysdeps/unix/sysv/linux/internal-signals.h: Add include guards. + (__nptl_is_internal_signal): Rename to __is_internal_signal and remove + unnecessary check for SIGTIMER. + (__nptl_clear_internal_signals): Rename to __clear_internal_signals and + remove unnecessary removal of SIGTIMER. + * sysdeps/unix/sysv/linux/raise.c: Adjust nptl-signal.h to + include-signals.h rename. + * nptl/pthreadP.h: Likewise. + * sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Call + __is_internal_signal instead of __nptl_is_internal_signal. + 2018-02-22 Andrew Waterman <andrew@sifive.com> * sysdeps/riscv/rvd/s_fmax.c (__fmax): Handle sNaNs correctly. diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 583515ff48..075530c15c 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -32,7 +32,7 @@ #include <atomic.h> #include <kernel-features.h> #include <errno.h> -#include <nptl-signals.h> +#include <internal-signals.h> /* Atomic operations on TLS memory. */ diff --git a/sysdeps/nptl/nptl-signals.h b/sysdeps/generic/internal-signals.h index e1275c72ff..01e5b75b6b 100644 --- a/sysdeps/nptl/nptl-signals.h +++ b/sysdeps/generic/internal-signals.h @@ -1,4 +1,4 @@ -/* Special use of signals in NPTL internals. Stub version. +/* Special use of signals internally. Stub version. Copyright (C) 2014-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -15,8 +15,3 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ - -/* This file can define the macros SIGCANCEL, SIGTIMER, and SIGSETXID to - signal numbers reserved by libpthread for those internal purposes. - - Note that some code presumes SIGTIMER is the same as SIGCANCEL. */ diff --git a/sysdeps/unix/sysv/linux/nptl-signals.h b/sysdeps/unix/sysv/linux/internal-signals.h index e789198b88..e007372f21 100644 --- a/sysdeps/unix/sysv/linux/nptl-signals.h +++ b/sysdeps/unix/sysv/linux/internal-signals.h @@ -1,4 +1,4 @@ -/* Special use of signals in NPTL internals. Linux version. +/* Special use of signals internally. Linux version. Copyright (C) 2014-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,6 +16,9 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef __INTERNAL_SIGNALS_H +# define __INTERNAL_SIGNALS_H + #include <signal.h> #include <sigsetops.h> @@ -35,17 +38,16 @@ /* Return is sig is used internally. */ static inline int -__nptl_is_internal_signal (int sig) +__is_internal_signal (int sig) { - return (sig == SIGCANCEL) || (sig == SIGTIMER) || (sig == SIGSETXID); + return (sig == SIGCANCEL) || (sig == SIGSETXID); } /* Remove internal glibc signal from the mask. */ static inline void -__nptl_clear_internal_signals (sigset_t *set) +__clear_internal_signals (sigset_t *set) { __sigdelset (set, SIGCANCEL); - __sigdelset (set, SIGTIMER); __sigdelset (set, SIGSETXID); } @@ -66,7 +68,7 @@ static inline int __libc_signal_block_app (sigset_t *set) { sigset_t allset = SIGALL_SET; - __nptl_clear_internal_signals (&allset); + __clear_internal_signals (&allset); INTERNAL_SYSCALL_DECL (err); return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_BLOCK, &allset, set, _NSIG / 8); @@ -83,3 +85,5 @@ __libc_signal_restore_set (const sigset_t *set) /* Used to communicate with signal handler. */ extern struct xid_command *__xidcmd attribute_hidden; + +#endif diff --git a/sysdeps/unix/sysv/linux/raise.c b/sysdeps/unix/sysv/linux/raise.c index cb98f9069c..b05eae202f 100644 --- a/sysdeps/unix/sysv/linux/raise.c +++ b/sysdeps/unix/sysv/linux/raise.c @@ -21,7 +21,7 @@ #include <errno.h> #include <sys/types.h> #include <unistd.h> -#include <nptl-signals.h> +#include <internal-signals.h> int raise (int sig) diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index 6b699a46dd..0391b9bd5e 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -144,7 +144,7 @@ __spawni_child (void *arguments) } else if (sigismember (&hset, sig)) { - if (__nptl_is_internal_signal (sig)) + if (__is_internal_signal (sig)) sa.sa_handler = SIG_IGN; else { |