diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-06-05 10:19:03 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-06-05 10:19:03 +0000 |
| commit | c4c96f92f76dbc03a04a0e5005bf0be6f8dd4138 (patch) | |
| tree | 21588dc4a81330b978dd8ed4b00e0ef978917810 | |
| parent | 7553131847151d04d58a02300673f13d73861cbb (diff) | |
| download | glibc-c4c96f92f76dbc03a04a0e5005bf0be6f8dd4138.tar.gz glibc-c4c96f92f76dbc03a04a0e5005bf0be6f8dd4138.tar.xz glibc-c4c96f92f76dbc03a04a0e5005bf0be6f8dd4138.zip | |
Define SIG_HOLD for XPG4 (bug 21538).
Various bits/signum.h headers define SIG_HOLD if __USE_UNIX98. That should be __USE_XOPEN, as this macro is in XPG4. This patch fixes the conditionals accordingly. Because of other header bugs, this does not allow any XFAILs to be removed (however, the XPG4/signal.h/conform XFAIL only depends on a few such straightforward header bugs, not on the more complicated to fix ucontext_t issues, as ucontext_t isn't included in signal.h in XPG4). Tested for x86_64. [BZ #21538] * bits/signum.h (SIG_HOLD): Define if [__USE_XOPEN], not [__USE_UNIX98]. * sysdeps/unix/bsd/bits/signum.h (SIG_HOLD): Likewise. * sysdeps/unix/sysv/linux/alpha/bits/signum.h (SIG_HOLD): Likewise. * sysdeps/unix/sysv/linux/bits/signum.h (SIG_HOLD): Likewise. * sysdeps/unix/sysv/linux/hppa/bits/signum.h (SIG_HOLD): Likewise. * sysdeps/unix/sysv/linux/mips/bits/signum.h (SIG_HOLD): Likewise. * sysdeps/unix/sysv/linux/sparc/bits/signum.h (SIG_HOLD): Likewise.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | bits/signum.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/bits/signum.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/signum.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/signum.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/bits/signum.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/signum.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/signum.h | 2 |
8 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 6cc3067dae..ff791f711c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2017-06-05 Joseph Myers <joseph@codesourcery.com> + [BZ #21538] + * bits/signum.h (SIG_HOLD): Define if [__USE_XOPEN], not + [__USE_UNIX98]. + * sysdeps/unix/bsd/bits/signum.h (SIG_HOLD): Likewise. + * sysdeps/unix/sysv/linux/alpha/bits/signum.h (SIG_HOLD): + Likewise. + * sysdeps/unix/sysv/linux/bits/signum.h (SIG_HOLD): Likewise. + * sysdeps/unix/sysv/linux/hppa/bits/signum.h (SIG_HOLD): Likewise. + * sysdeps/unix/sysv/linux/mips/bits/signum.h (SIG_HOLD): Likewise. + * sysdeps/unix/sysv/linux/sparc/bits/signum.h (SIG_HOLD): + Likewise. + [BZ #21517] * bits/types/stack_t.h (stack_t): Remove struct tag. * sysdeps/unix/sysv/linux/bits/types/stack_t.h (stack_t): diff --git a/bits/signum.h b/bits/signum.h index 2f6a124c97..cfbc7ac8bb 100644 --- a/bits/signum.h +++ b/bits/signum.h @@ -24,7 +24,7 @@ #define SIG_DFL ((__sighandler_t) 0) /* Default action. */ #define SIG_IGN ((__sighandler_t) 1) /* Ignore signal. */ -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN # define SIG_HOLD ((__sighandler_t) 2) /* Add signal to hold mask. */ #endif diff --git a/sysdeps/unix/bsd/bits/signum.h b/sysdeps/unix/bsd/bits/signum.h index b080356c3d..268c24a702 100644 --- a/sysdeps/unix/bsd/bits/signum.h +++ b/sysdeps/unix/bsd/bits/signum.h @@ -26,7 +26,7 @@ #define SIG_DFL ((__sighandler_t) 0) /* Default action. */ #define SIG_IGN ((__sighandler_t) 1) /* Ignore signal. */ -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN # define SIG_HOLD ((__sighandler_t) 2) /* Add signal to hold mask. */ #endif diff --git a/sysdeps/unix/sysv/linux/alpha/bits/signum.h b/sysdeps/unix/sysv/linux/alpha/bits/signum.h index ed9a10703f..e5cc5218e3 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/signum.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/signum.h @@ -23,7 +23,7 @@ #define SIG_DFL ((__sighandler_t) 0) /* Default action. */ #define SIG_IGN ((__sighandler_t) 1) /* Ignore signal. */ -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN # define SIG_HOLD ((__sighandler_t) 2) /* Add signal to hold mask. */ #endif diff --git a/sysdeps/unix/sysv/linux/bits/signum.h b/sysdeps/unix/sysv/linux/bits/signum.h index 43ded3068f..e30efead0d 100644 --- a/sysdeps/unix/sysv/linux/bits/signum.h +++ b/sysdeps/unix/sysv/linux/bits/signum.h @@ -23,7 +23,7 @@ #define SIG_DFL ((__sighandler_t) 0) /* Default action. */ #define SIG_IGN ((__sighandler_t) 1) /* Ignore signal. */ -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN # define SIG_HOLD ((__sighandler_t) 2) /* Add signal to hold mask. */ #endif diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signum.h b/sysdeps/unix/sysv/linux/hppa/bits/signum.h index 81c6d39344..20c0b60c9f 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/signum.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/signum.h @@ -23,7 +23,7 @@ #define SIG_DFL ((__sighandler_t) 0) /* Default action. */ #define SIG_IGN ((__sighandler_t) 1) /* Ignore signal. */ -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN # define SIG_HOLD ((__sighandler_t) 2) /* Add signal to hold mask. */ #endif diff --git a/sysdeps/unix/sysv/linux/mips/bits/signum.h b/sysdeps/unix/sysv/linux/mips/bits/signum.h index bf8ceafd21..6c31e01cd7 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/signum.h +++ b/sysdeps/unix/sysv/linux/mips/bits/signum.h @@ -23,7 +23,7 @@ #define SIG_DFL ((__sighandler_t) 0) /* Default action. */ #define SIG_IGN ((__sighandler_t) 1) /* Ignore signal. */ -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN # define SIG_HOLD ((__sighandler_t) 2) /* Add signal to hold mask. */ #endif diff --git a/sysdeps/unix/sysv/linux/sparc/bits/signum.h b/sysdeps/unix/sysv/linux/sparc/bits/signum.h index 4de1a5b3d4..a0c5be5fa5 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/signum.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/signum.h @@ -23,7 +23,7 @@ #define SIG_DFL ((__sighandler_t) 0) /* Default action. */ #define SIG_IGN ((__sighandler_t) 1) /* Ignore signal. */ -#ifdef __USE_UNIX98 +#ifdef __USE_XOPEN # define SIG_HOLD ((__sighandler_t) 2) /* Add signal to hold mask. */ #endif |