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.

diff --git a/ChangeLog b/ChangeLog
index 6cc3067dae882140332b011276f4eaa7645a295e..ff791f711c97b7df5a76ad1237b16fee10fb36e7 100644 (file)
--- 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 2f6a124c971f41013aaae9e82cc700e2607a5d5b..cfbc7ac8bb0190ff07a814274ed225c3cda63db7 100644 (file)
--- 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 b080356c3d8a614dd66565c490861ba635740217..268c24a70223489c11be5e9fabaeee1643986135 100644 (file)
--- 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 ed9a10703ff5b1795d0ff3455ddd5ad99582b7c4..e5cc5218e35c76b25bbd35416f4bd43b5ac1b1e3 100644 (file)
--- 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 43ded3068f3f48d35de9890ab95ea50e4ced4439..e30efead0d39a778169ca8b5587929eb3089cad3 100644 (file)
--- 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 81c6d39344c1414ee347488a700e46eb86e9d3c0..20c0b60c9f79245be2706df0f72d41599942dd0d 100644 (file)
--- 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 bf8ceafd21e2f9c15ff045629e311c26e37c59fe..6c31e01cd777064b2c3c4905f58b48e2c003dc90 100644 (file)
--- 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 4de1a5b3d44c4b302b31c268da5eb528cbaac187..a0c5be5fa5df7d54711b3b14fd315ca8c39a70e8 100644 (file)
--- 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