a992f506ff
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 <sigsetops.h> (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 <errno.h>, <signal.h>, and <sigsetops.h> 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.
133 lines
5.1 KiB
C
133 lines
5.1 KiB
C
/* Copyright (C) 1991-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
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/>. */
|
|
|
|
/* Copied from setjmp/setjmp.h, powerpc/bits/setjmp.h and modified
|
|
appropriately to keep backward compatible with setjmp without
|
|
AltiVec/VMX support.
|
|
|
|
This file is not exported and the interfaces are private to libc. */
|
|
|
|
#ifndef __NOVMX_SETJMP_H
|
|
#define __NOVMX_SETJMP_H 1
|
|
|
|
#include <bits/wordsize.h>
|
|
|
|
/* The following definitions are needed by ASM implementations of the old
|
|
(novmx) __longjmp/__setjmp functions. */
|
|
|
|
# define JB_GPR1 0 /* Also known as the stack pointer */
|
|
# define JB_GPR2 1
|
|
# define JB_LR 2 /* The address we will return to */
|
|
# if __WORDSIZE == 64
|
|
# define JB_GPRS 3 /* GPRs 14 through 31 are saved, 18*2 words total. */
|
|
# define JB_CR 21 /* Condition code registers. */
|
|
# define JB_FPRS 22 /* FPRs 14 through 31 are saved, 18*2 words total. */
|
|
# define JB_SIZE (40 * 8)
|
|
# else
|
|
# define JB_GPRS 3 /* GPRs 14 through 31 are saved, 18 in total. */
|
|
# define JB_CR 21 /* Condition code registers. */
|
|
# define JB_FPRS 22 /* FPRs 14 through 31 are saved, 18*2 words total. */
|
|
# define JB_SIZE (58 * 4)
|
|
# endif
|
|
|
|
#ifndef _ASM
|
|
/* The following definitions are needed by the novmx* implementations of
|
|
setjmp/longjmp/sigsetjmp/etc that wrapper __setjmp/__longjmp. */
|
|
|
|
# if __WORDSIZE == 64
|
|
typedef long int __jmp_buf[40];
|
|
# else
|
|
typedef long int __jmp_buf[58];
|
|
# endif
|
|
|
|
# include <bits/types/__sigset_t.h>
|
|
|
|
/* Calling environment, plus possibly a saved signal mask. */
|
|
typedef struct __novmx__jmp_buf_tag
|
|
{
|
|
/* NOTE: The machine-dependent definitions of `__sigsetjmp'
|
|
assume that a `jmp_buf' begins with a `__jmp_buf' and that
|
|
`__mask_was_saved' follows it. Do not move these members
|
|
or add others before it. */
|
|
__jmp_buf __jmpbuf; /* Calling environment. */
|
|
int __mask_was_saved; /* Saved the signal mask? */
|
|
__sigset_t __saved_mask; /* Saved signal mask. */
|
|
} __novmx__jmp_buf[1];
|
|
|
|
|
|
/* Store the calling environment in ENV, also saving the signal mask.
|
|
Return 0. */
|
|
extern int __novmxsetjmp (__novmx__jmp_buf __env);
|
|
|
|
/* Store the calling environment in ENV, also saving the
|
|
signal mask if SAVEMASK is nonzero. Return 0.
|
|
This is the internal name for `sigsetjmp'. */
|
|
extern int __novmx__sigsetjmp (struct __novmx__jmp_buf_tag __env[1],
|
|
int __savemask);
|
|
|
|
/* Store the calling environment in ENV, not saving the signal mask.
|
|
Return 0. */
|
|
extern int __novmx_setjmp (struct __novmx__jmp_buf_tag __env[1]);
|
|
|
|
/* Jump to the environment saved in ENV, making the
|
|
`setjmp' call there return VAL, or 1 if VAL is 0. */
|
|
extern void __novmxlongjmp (struct __novmx__jmp_buf_tag __env[1], int __val)
|
|
__attribute__ ((__noreturn__));
|
|
|
|
/* Same. Usually `_longjmp' is used with `_setjmp', which does not save
|
|
the signal mask. But it is how ENV was saved that determines whether
|
|
`longjmp' restores the mask; `_longjmp' is just an alias. */
|
|
extern void __novmx_longjmp (struct __novmx__jmp_buf_tag __env[1], int __val)
|
|
__attribute__ ((__noreturn__));
|
|
|
|
/* Use the same type for `jmp_buf' and `sigjmp_buf'.
|
|
The `__mask_was_saved' flag determines whether
|
|
or not `longjmp' will restore the signal mask. */
|
|
typedef struct __novmx__jmp_buf_tag __novmx__sigjmp_buf[1];
|
|
|
|
/* Jump to the environment saved in ENV, making the
|
|
sigsetjmp call there return VAL, or 1 if VAL is 0.
|
|
Restore the signal mask if that sigsetjmp call saved it.
|
|
This is just an alias `longjmp'. */
|
|
extern void __novmxsiglongjmp (__novmx__sigjmp_buf __env, int __val)
|
|
__attribute__ ((__noreturn__));
|
|
|
|
/* Internal machine-dependent function to restore context sans signal mask. */
|
|
extern void __novmx__longjmp (__jmp_buf __env, int __val)
|
|
__attribute__ ((__noreturn__));
|
|
|
|
/* Internal function to possibly save the current mask of blocked signals
|
|
in ENV, and always set the flag saying whether or not it was saved.
|
|
This is used by the machine-dependent definition of `__sigsetjmp'.
|
|
Always returns zero, for convenience. */
|
|
extern int __novmx__sigjmp_save (__novmx__jmp_buf __env, int __savemask);
|
|
|
|
extern void _longjmp_unwind (__novmx__jmp_buf env, int val);
|
|
|
|
extern void __novmx__libc_siglongjmp (__novmx__sigjmp_buf env, int val)
|
|
__attribute__ ((noreturn));
|
|
|
|
extern void __novmx__libc_longjmp (__novmx__sigjmp_buf env, int val)
|
|
__attribute__ ((noreturn));
|
|
|
|
libc_hidden_proto (__novmx__libc_longjmp)
|
|
libc_hidden_proto (__novmx_setjmp)
|
|
libc_hidden_proto (__novmx__sigsetjmp)
|
|
#endif /* !_ASM */
|
|
|
|
#endif
|