Remove __need macros from signal.h

System Internals / glibc - Zack Weinberg [panix.com] - 20 May 2017 19:04 EDT

The types affected are __sig_atomic_t, sig_atomic_t, __sigset_t, sigset_t, sigval_t, sigevent_t, and siginfo_t. __sig_atomic_t is a scalar, so it's now directly available from bits/types.h. The others get bits/types/ headers.

Side effects include: There have been small changes to which non-signal headers expose which subset of the signal-related types. A couple of architectures' nested siginfo_t fields had to be renamed to prevent undesired macro expansion. Internal code that wants to manipulate signal masks must now include (which is not installed) and should be aware that __sigaddset, __sigandset, __sigdelset, __sigemptyset, and __sigorset no longer return a value (unlike the public API). Relatedly, the public signal.h no longer declares any of those functions. The obsolete sigmask() macro no longer has a system-specific definition -- in the cases where it matters, it didn't work anyway.

New Linux architectures should create bits/siginfo-arch.h and/or bits/siginfo-consts-arch.h to customize their siginfo_t, rather than duplicating everything in bits/siginfo.h (which no longer exists). Add new __SI_* macros if necessary. Ports to other operating systems are strongly encouraged to generalize this scheme further.

- bits/sigevent-consts.h
- bits/siginfo-consts.h
- bits/types/__sigset_t.h
- bits/types/sigevent_t.h
- bits/types/siginfo_t.h
- sysdeps/unix/sysv/linux/bits/sigevent-consts.h
- sysdeps/unix/sysv/linux/bits/siginfo-consts.h
- sysdeps/unix/sysv/linux/bits/types/__sigset_t.h
- sysdeps/unix/sysv/linux/bits/types/sigevent_t.h
- sysdeps/unix/sysv/linux/bits/types/siginfo_t.h: New system-dependent bits headers.

- sysdeps/unix/sysv/linux/bits/siginfo-arch.h
- sysdeps/unix/sysv/linux/bits/siginfo-consts-arch.h
- sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h
- sysdeps/unix/sysv/linux/ia64/bits/siginfo-consts-arch.h
- sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h
- sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h
- sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h
- sysdeps/unix/sysv/linux/tile/bits/siginfo-consts-arch.h
- sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h: New Linux-only system-dependent bits headers.

- signal/bits/types/sig_atomic_t.h
- signal/bits/types/sigset_t.h
- signal/bits/types/sigval_t.h: New non-system-dependent bits headers.

- sysdeps/generic/sigsetops.h
- sysdeps/unix/sysv/linux/sigsetops.h: New internal headers.

- include/bits/types/sig_atomic_t.h
- include/bits/types/sigset_t.h
- include/bits/types/sigval_t.h: New wrappers.

- signal/sigsetops.h
- bits/siginfo.h
- bits/sigset.h
- sysdeps/unix/sysv/linux/bits/siginfo.h
- sysdeps/unix/sysv/linux/bits/sigset.h
- sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
- sysdeps/unix/sysv/linux/mips/bits/siginfo.h
- sysdeps/unix/sysv/linux/s390/bits/siginfo.h
- sysdeps/unix/sysv/linux/sparc/bits/siginfo.h
- sysdeps/unix/sysv/linux/tile/bits/siginfo.h
- sysdeps/unix/sysv/linux/x86/bits/siginfo.h: Deleted.

- signal/Makefile, sysdeps/unix/sysv/linux/Makefile: Update lists of installed headers.

- posix/bits/types.h: Define __sig_atomic_t here.
- signal/signal.h: Use the new bits headers; no need to handle __need_sig_atomic_t nor __need_sigset_t. Don't use __sigmask to define sigmask.
- include/signal.h: No need to handle __need_sig_atomic_t nor __need_sigset_t. Don't define __sigemptyset.

- io/sys/poll.h, setjmp/setjmp.h
- sysdeps/arm/sys/ucontext.h, sysdeps/generic/sys/ucontext.h
- sysdeps/i386/sys/ucontext.h, sysdeps/m68k/sys/ucontext.h
- sysdeps/mach/hurd/i386/bits/sigcontext.h
- sysdeps/mips/sys/ucontext.h, sysdeps/powerpc/novmxsetjmp.h
- sysdeps/pthread/bits/sigthread.h
- sysdeps/unix/sysv/linux/hppa/sys/ucontext.h
- sysdeps/unix/sysv/linux/m68k/sys/ucontext.h
- sysdeps/unix/sysv/linux/mips/sys/ucontext.h
- sysdeps/unix/sysv/linux/nios2/sys/ucontext.h
- sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
- sysdeps/unix/sysv/linux/s390/sys/ucontext.h
- sysdeps/unix/sysv/linux/sh/sys/ucontext.h
- sysdeps/unix/sysv/linux/sparc/sys/ucontext.h
- sysdeps/unix/sysv/linux/tile/sys/ucontext.h
- sysdeps/unix/sysv/linux/x86/sys/ucontext.h: Use bits/types/__sigset_t.h.

- misc/sys/select.h, posix/spawn.h
- sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
- sysdeps/unix/sysv/linux/sys/epoll.h
- sysdeps/unix/sysv/linux/sys/signalfd.h: Use bits/types/sigset_t.h.

- resolv/netdb.h, rt/mqueue.h: Use bits/types/sigevent_t.h.
- rt/aio.h: Use bits/types/sigevent_t.h and bits/sigevent-consts.h.
- socket/sys/socket.h: Don't include bits/sigset.h.

- login/utmp_file.c, shadow/lckpwdf.c, signal/sigandset.c
- signal/sigisempty.c, stdlib/abort.c, sysdeps/posix/profil.c
- sysdeps/posix/sigignore.c, sysdeps/posix/sigintr.c
- sysdeps/posix/signal.c, sysdeps/posix/sigset.c
- sysdeps/posix/sprofil.c, sysdeps/posix/sysv_signal.c
- sysdeps/unix/sysv/linux/nptl-signals.h: Include sigsetops.h.

- signal/sigaddset.c, signal/sigandset.c, signal/sigdelset.c
- signal/sigorset.c, stdlib/abort.c, sysdeps/posix/sigignore.c
- sysdeps/posix/signal.c, sysdeps/posix/sigset.c: __sigaddset, __sigandset, __sigdelset, __sigemptyset, __sigorset now return no value.

- signal/sigaddset.c, signal/sigdelset.c, signal/sigismem.c Include , , and instead of "sigsetops.h".

- signal/sigsetops.c: Explicitly define __sigismember, __sigaddset, and __sigdelset as compatibility symbols.

- signal/Versions: Correct commentary on __sigpause, __sigaddset, __sigdelset, __sigismember.

- inet/rcmd.c: Include sigsetops.h. Convert old code using __sigblock/__sigsetmask to use __sigprocmask and friends.

a992f50 Remove __need macros from signal.h.
ChangeLog | 127 ++++++++
signal/sigsetops.h => bits/sigevent-consts.h | 31 +-
bits/{siginfo.h => siginfo-consts.h} | 74 +----
bits/sigset.h | 84 -----
bits/types/__sigset_t.h | 7 +
bits/types/sigevent_t.h | 17 +
bits/types/siginfo_t.h | 21 ++
include/bits/types/sig_atomic_t.h | 1 +
include/bits/types/sigset_t.h | 1 +
include/bits/types/sigval_t.h | 1 +
include/signal.h | 15 +-
inet/rcmd.c | 16 +-
io/sys/poll.h | 6 +-
login/utmp_file.c | 1 +
misc/sys/select.h | 9 +-
posix/bits/types.h | 4 +
posix/spawn.h | 3 +-
posix/sys/wait.h | 3 +-
resolv/netdb.h | 3 +-
rt/aio.h | 4 +-
rt/mqueue.h | 3 +-
setjmp/setjmp.h | 3 +-
shadow/lckpwdf.c | 1 +
signal/Makefile | 12 +-
signal/Versions | 8 +-
signal/bits/types/sig_atomic_t.h | 10 +
signal/bits/types/sigset_t.h | 9 +
signal/bits/types/sigval_t.h | 13 +
signal/sigaddset.c | 7 +-
signal/sigandset.c | 8 +-
signal/sigdelset.c | 7 +-
signal/sigisempty.c | 7 +-
signal/sigismem.c | 4 +-
signal/signal.h | 41 +--
signal/sigorset.c | 8 +-
signal/sigsetops.c | 58 +++-
socket/sys/socket.h | 5 -
stdlib/abort.c | 9 +-
sysdeps/arm/sys/ucontext.h | 1 +
sysdeps/generic/sigsetops.h | 77 +++++
sysdeps/generic/sys/ucontext.h | 1 +
sysdeps/i386/sys/ucontext.h | 1 +
sysdeps/m68k/sys/ucontext.h | 1 +
sysdeps/mach/hurd/i386/bits/sigcontext.h | 1 +
sysdeps/mips/sys/ucontext.h | 1 +
sysdeps/posix/profil.c | 1 +
sysdeps/posix/sigignore.c | 5 +-
sysdeps/posix/sigintr.c | 1 +
sysdeps/posix/signal.c | 7 +-
sysdeps/posix/sigset.c | 63 ++--
sysdeps/posix/sprofil.c | 1 +
sysdeps/posix/sysv_signal.c | 5 +-
sysdeps/powerpc/novmxsetjmp.h | 2 +-
sysdeps/pthread/bits/sigthread.h | 1 +
sysdeps/unix/sysv/linux/Makefile | 3 +-
sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/alpha/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/arm/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/bits/sigevent-consts.h | 41 +++
sysdeps/unix/sysv/linux/bits/siginfo-arch.h | 7 +
sysdeps/unix/sysv/linux/bits/siginfo-consts-arch.h | 7 +
sysdeps/unix/sysv/linux/bits/siginfo-consts.h | 185 +++++++++++
sysdeps/unix/sysv/linux/bits/siginfo.h | 341 -------------------
sysdeps/unix/sysv/linux/bits/sigset.h | 124 -------
sysdeps/unix/sysv/linux/bits/types/__sigset_t.h | 10 +
sysdeps/unix/sysv/linux/bits/types/sigevent_t.h | 48 +++
sysdeps/unix/sysv/linux/bits/types/siginfo_t.h | 139 ++++++++
sysdeps/unix/sysv/linux/hppa/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h | 19 ++
.../sysv/linux/ia64/bits/siginfo-consts-arch.h | 45 +++
sysdeps/unix/sysv/linux/ia64/bits/siginfo.h | 360 ---------------------
sysdeps/unix/sysv/linux/m68k/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h | 15 +
sysdeps/unix/sysv/linux/mips/bits/siginfo.h | 344 --------------------
sysdeps/unix/sysv/linux/mips/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/nios2/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/nptl-signals.h | 1 +
sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h | 3 +-
sysdeps/unix/sysv/linux/s390/bits/siginfo.h | 341 -------------------
sysdeps/unix/sysv/linux/s390/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/sh/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/sigsetops.h | 108 +++++++
sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h | 14 +
.../sysv/linux/sparc/bits/siginfo-consts-arch.h | 12 +
sysdeps/unix/sysv/linux/sparc/bits/siginfo.h | 352 --------------------
sysdeps/unix/sysv/linux/sparc/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/sys/epoll.h | 8 +-
sysdeps/unix/sysv/linux/sys/signalfd.h | 3 +-
sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h | 11 +
.../sysv/linux/tile/bits/siginfo-consts-arch.h | 14 +
sysdeps/unix/sysv/linux/tile/bits/siginfo.h | 347 --------------------
sysdeps/unix/sysv/linux/tile/sys/ucontext.h | 1 +
sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h | 19 ++
sysdeps/unix/sysv/linux/x86/bits/siginfo.h | 360 ---------------------
sysdeps/unix/sysv/linux/x86/sys/ucontext.h | 1 +
95 files changed, 1192 insertions(+), 2911 deletions(-)

Upstream: sourceware.org


  • Share