diff options
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/types/siginfo_t.h | 83 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/timer_routines.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tst-getpid1.c | 5 |
6 files changed, 55 insertions, 70 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h b/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h index 33766d1813..2d5fbdaf30 100644 --- a/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h +++ b/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h @@ -52,38 +52,33 @@ typedef struct { int _pad[__SI_PAD_SIZE]; - /* kill(). */ + /* Signals sent by kill or sigqueue. si_sigval is only valid for + sigqueue. */ struct { __pid_t si_pid; /* Sending process ID. */ __uid_t si_uid; /* Real user ID of sending process. */ - } _kill; + __sigval_t si_value; /* Signal value. */ + }; - /* POSIX.1b timers. */ + /* POSIX.1b timers. 'si_sigval' (above) is also valid. */ struct { - int si_tid; /* Timer ID. */ + int si_timerid; /* Timer ID. */ int si_overrun; /* Overrun count. */ __sigval_t si_sigval; /* Signal value. */ - } _timer; + }; - /* POSIX.1b signals. */ + /* SIGCHLD. The first two fields overlay the si_pid and si_uid + fields above. */ struct { - __pid_t si_pid; /* Sending process ID. */ - __uid_t si_uid; /* Real user ID of sending process. */ - __sigval_t si_sigval; /* Signal value. */ - } _rt; - - /* SIGCHLD. */ - struct - { - __pid_t si_pid; /* Which child. */ - __uid_t si_uid; /* Real user ID of sending process. */ + __pid_t __sigchld_si_pid; /* Which child. */ + __uid_t __sigchld_si_uid; /* Real user ID of sending process. */ int si_status; /* Exit value or signal. */ __SI_CLOCK_T si_utime; __SI_CLOCK_T si_stime; - } _sigchld; + }; /* SIGILL, SIGFPE, SIGSEGV, SIGBUS. */ struct @@ -96,56 +91,42 @@ typedef struct /* used when si_code=SEGV_BNDERR */ struct { - void *_lower; - void *_upper; - } _addr_bnd; + void *si_lower; + void *si_upper; + }; /* used when si_code=SEGV_PKUERR */ - __uint32_t _pkey; - } _bounds; - } _sigfault; + __uint32_t si_pkey; + }; + }; /* SIGPOLL. */ struct { long int si_band; /* Band event for SIGPOLL. */ int si_fd; - } _sigpoll; + }; /* SIGSYS. */ #if __SI_HAVE_SIGSYS struct { - void *_call_addr; /* Calling user insn. */ - int _syscall; /* Triggering system call number. */ - unsigned int _arch; /* AUDIT_ARCH_* of syscall. */ - } _sigsys; + void *si_call_addr; /* Calling user insn. */ + int si_syscall; /* Triggering system call number. */ + unsigned int si_arch; /* AUDIT_ARCH_* of syscall. */ + }; #endif - } _sifields; + }; } siginfo_t __SI_ALIGNMENT; -/* X/Open requires some more fields with fixed names. */ -#define si_pid _sifields._kill.si_pid -#define si_uid _sifields._kill.si_uid -#define si_timerid _sifields._timer.si_tid -#define si_overrun _sifields._timer.si_overrun -#define si_status _sifields._sigchld.si_status -#define si_utime _sifields._sigchld.si_utime -#define si_stime _sifields._sigchld.si_stime -#define si_value _sifields._rt.si_sigval -#define si_int _sifields._rt.si_sigval.sival_int -#define si_ptr _sifields._rt.si_sigval.sival_ptr -#define si_addr _sifields._sigfault.si_addr -#define si_addr_lsb _sifields._sigfault.si_addr_lsb -#define si_lower _sifields._sigfault._bounds._addr_bnd._lower -#define si_upper _sifields._sigfault._bounds._addr_bnd._upper -#define si_pkey _sifields._sigfault._bounds._pkey -#define si_band _sifields._sigpoll.si_band -#define si_fd _sifields._sigpoll.si_fd -#if __SI_HAVE_SIGSYS -# define si_call_addr _sifields._sigsys._call_addr -# define si_syscall _sifields._sigsys._syscall -# define si_arch _sifields._sigsys._arch +/* These field aliases are not in POSIX, and are preserved for + backward compatibility only. They may be removed in a future + release. */ +#ifdef __USE_MISC +#define si_int si_value.sival_int \ + __glibc_macro_warning("si_int is deprecated, use si_value.sival_int instead") +#define si_ptr si_value.sival_ptr \ + __glibc_macro_warning("si_ptr is deprecated, use si_value.sival_ptr instead") #endif #endif diff --git a/sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h index 8b5647062c..a2144c3771 100644 --- a/sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h +++ b/sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h @@ -3,15 +3,16 @@ #define __SI_HAVE_SIGSYS 0 -#define __SI_SIGFAULT_ADDL \ - int _si_imm; \ - unsigned int _si_flags; \ - unsigned long int _si_isr; - #ifdef __USE_GNU -# define si_imm _sifields._sigfault._si_imm -# define si_segvflags _sifields._sigfault._si_flags -# define si_isr _sifields._sigfault._si_isr +# define __SI_SIGFAULT_ADDL \ + int si_imm; \ + unsigned int si_segvflags; \ + unsigned long int si_isr; +#else +# define __SI_SIGFAULT_ADDL \ + int __si_imm; \ + unsigned int __si_segvflags; \ + unsigned long int __si_isr; #endif #endif diff --git a/sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h index 9f79715ebe..146fa2c00a 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h @@ -4,9 +4,10 @@ #define __SI_BAND_TYPE int -#define __SI_SIGFAULT_ADDL \ - int _si_trapno; - -#define si_trapno _sifields._sigfault._si_trapno +#ifdef __USE_GNU +# define __SI_SIGFAULT_ADDL int si_trapno; +#else +# define __SI_SIGFAULT_ADDL int __si_trapno; +#endif #endif diff --git a/sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h index 7d0c24c84b..0421fa3585 100644 --- a/sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h +++ b/sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h @@ -2,9 +2,10 @@ #ifndef _BITS_SIGINFO_ARCH_H #define _BITS_SIGINFO_ARCH_H 1 -#define __SI_SIGFAULT_ADDL \ - int _si_trapno; - -#define si_trapno _sifields._sigfault._si_trapno +#ifdef __USE_GNU +# define __SI_SIGFAULT_ADDL int si_trapno; +#else +# define __SI_SIGFAULT_ADDL int __si_trapno; +#endif #endif diff --git a/sysdeps/unix/sysv/linux/timer_routines.c b/sysdeps/unix/sysv/linux/timer_routines.c index 1d81304678..696ab450c6 100644 --- a/sysdeps/unix/sysv/linux/timer_routines.c +++ b/sysdeps/unix/sysv/linux/timer_routines.c @@ -92,7 +92,7 @@ timer_helper_thread (void *arg) { if (si.si_code == SI_TIMER) { - struct timer *tk = (struct timer *) si.si_ptr; + struct timer *tk = (struct timer *) si.si_value.sival_ptr; /* Check the timer is still used and will not go away while we are reading the values here. */ diff --git a/sysdeps/unix/sysv/linux/tst-getpid1.c b/sysdeps/unix/sysv/linux/tst-getpid1.c index 253ebf2e15..f24faf35e1 100644 --- a/sysdeps/unix/sysv/linux/tst-getpid1.c +++ b/sysdeps/unix/sysv/linux/tst-getpid1.c @@ -95,9 +95,10 @@ do_test (void) return 1; } - if (si.si_int != (int) p) + if (si.si_value.sival_int != (int) p) { - printf ("expected PID %d, got si_int %d\n", (int) p, si.si_int); + printf ("expected PID %d, got si_int %d\n", + (int) p, si.si_value.sival_int); kill (p, SIGKILL); return 1; } |