Fix POSIX namespace for <bits/siginfo.h> (bug 16674).

<bits/siginfo.h> causes symbols ILL_*, FPE_*, SEGV_* BUS_*, CLD_*,
POLL_* and TRAP_* to be exposed in <signal.h> (and <sys/wait.h>), even
though those symbols are not in non-XSI POSIX before POSIX.1-2008 and
even in POSIX.1-2008 the TRAP_* symbols are XSI-only.  This patch
conditions the symbols appropriately in the various <bits/siginfo.h>
implementations (various <signal.h> and <sys/wait.h> conformtest
issues remain for standards other than POSIX (1995/6)).  Tested
x86_64.

	[BZ #16674]
	* bits/siginfo.h (ILL_ILLOPC): Condition on [__USE_XOPEN_EXTENDED
	|| __USE_XOPEN2K8].
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/siginfo.h (ILL_ILLOPC):
	Likewise.
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(BUS_MCEERR_AR): Likewise.
	(BUS_MCEERR_AO): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* sysdeps/unix/sysv/linux/bits/siginfo.h (ILL_ILLOPC): Likewise.
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(BUS_MCEERR_AR): Likewise.
	(BUS_MCEERR_AO): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (ILL_ILLOPC):
	Likewise.
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(ILL_BADIADDR): Likewise.
	(ILL_BREAK): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(FPE_DECOVF): Likewise.
	(FPE_DECDIV): Likewise.
	(FPE_DECERR): Likewise.
	(FPE_INVASC): Likewise.
	(FPE_INVDEC): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(SEGV_PSTKOVF): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(BUS_MCEERR_AR): Likewise.
	(BUS_MCEERR_AO): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(TRAP_BRANCH): Likewise.
	(TRAP_HWBKPT): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/siginfo.h (ILL_ILLOPC): Likewise.
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(BUS_MCEERR_AR): Likewise.
	(BUS_MCEERR_AO): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* sysdeps/unix/sysv/linux/s390/bits/siginfo.h (ILL_ILLOPC): Likewise.
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(BUS_MCEERR_AR): Likewise.
	(BUS_MCEERR_AO): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/siginfo.h (ILL_ILLOPC): Likewise.
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(BUS_MCEERR_AR): Likewise.
	(BUS_MCEERR_AO): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* sysdeps/unix/sysv/linux/tile/bits/siginfo.h (ILL_ILLOPC): Likewise.
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(ILL_DBLFLT): Likewise.
	(ILL_HARDWALL): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(BUS_MCEERR_AR): Likewise.
	(BUS_MCEERR_AO): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* sysdeps/unix/sysv/linux/x86/bits/siginfo.h (ILL_ILLOPC): Likewise.
	(ILL_ILLOPN): Likewise.
	(ILL_ILLADR): Likewise.
	(ILL_ILLTRP): Likewise.
	(ILL_PRVOPC): Likewise.
	(ILL_PRVREG): Likewise.
	(ILL_COPROC): Likewise.
	(ILL_BADSTK): Likewise.
	(FPE_INTDIV): Likewise.
	(FPE_INTOVF): Likewise.
	(FPE_FLTDIV): Likewise.
	(FPE_FLTOVF): Likewise.
	(FPE_FLTUND): Likewise.
	(FPE_FLTRES): Likewise.
	(FPE_FLTINV): Likewise.
	(FPE_FLTSUB): Likewise.
	(SEGV_MAPERR): Likewise.
	(SEGV_ACCERR): Likewise.
	(BUS_ADRALN): Likewise.
	(BUS_ADRERR): Likewise.
	(BUS_OBJERR): Likewise.
	(BUS_MCEERR_AR): Likewise.
	(BUS_MCEERR_AO): Likewise.
	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
	(TRAP_TRACE): Likewise.
	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
	__USE_XOPEN2K8].
	(CLD_KILLED): Likewise.
	(CLD_DUMPED): Likewise.
	(CLD_TRAPPED): Likewise.
	(CLD_STOPPED): Likewise.
	(CLD_CONTINUED): Likewise.
	(POLL_IN): Likewise.
	(POLL_OUT): Likewise.
	(POLL_MSG): Likewise.
	(POLL_ERR): Likewise.
	(POLL_PRI): Likewise.
	(POLL_HUP): Likewise.
	* conform/Makefile (test-xfail-POSIX/signal.h/conform): Remove.
	(test-xfail-POSIX/sys/wait.h/conform): Likewise.

12 files changed, 765 insertions, 354 deletions

diff --git a/ChangeLog b/ChangeLog
index c0ebdc6de9..a394558675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,364 @@
 2014-03-07  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #16674]
+	* bits/siginfo.h (ILL_ILLOPC): Condition on [__USE_XOPEN_EXTENDED
+	|| __USE_XOPEN2K8].
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/siginfo.h (ILL_ILLOPC):
+	Likewise.
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(BUS_MCEERR_AR): Likewise.
+	(BUS_MCEERR_AO): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* sysdeps/unix/sysv/linux/bits/siginfo.h (ILL_ILLOPC): Likewise.
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(BUS_MCEERR_AR): Likewise.
+	(BUS_MCEERR_AO): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (ILL_ILLOPC):
+	Likewise.
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(ILL_BADIADDR): Likewise.
+	(ILL_BREAK): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(FPE_DECOVF): Likewise.
+	(FPE_DECDIV): Likewise.
+	(FPE_DECERR): Likewise.
+	(FPE_INVASC): Likewise.
+	(FPE_INVDEC): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(SEGV_PSTKOVF): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(BUS_MCEERR_AR): Likewise.
+	(BUS_MCEERR_AO): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(TRAP_BRANCH): Likewise.
+	(TRAP_HWBKPT): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/siginfo.h (ILL_ILLOPC): Likewise.
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(BUS_MCEERR_AR): Likewise.
+	(BUS_MCEERR_AO): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/siginfo.h (ILL_ILLOPC): Likewise.
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(BUS_MCEERR_AR): Likewise.
+	(BUS_MCEERR_AO): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/siginfo.h (ILL_ILLOPC): Likewise.
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(BUS_MCEERR_AR): Likewise.
+	(BUS_MCEERR_AO): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* sysdeps/unix/sysv/linux/tile/bits/siginfo.h (ILL_ILLOPC): Likewise.
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(ILL_DBLFLT): Likewise.
+	(ILL_HARDWALL): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(BUS_MCEERR_AR): Likewise.
+	(BUS_MCEERR_AO): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/siginfo.h (ILL_ILLOPC): Likewise.
+	(ILL_ILLOPN): Likewise.
+	(ILL_ILLADR): Likewise.
+	(ILL_ILLTRP): Likewise.
+	(ILL_PRVOPC): Likewise.
+	(ILL_PRVREG): Likewise.
+	(ILL_COPROC): Likewise.
+	(ILL_BADSTK): Likewise.
+	(FPE_INTDIV): Likewise.
+	(FPE_INTOVF): Likewise.
+	(FPE_FLTDIV): Likewise.
+	(FPE_FLTOVF): Likewise.
+	(FPE_FLTUND): Likewise.
+	(FPE_FLTRES): Likewise.
+	(FPE_FLTINV): Likewise.
+	(FPE_FLTSUB): Likewise.
+	(SEGV_MAPERR): Likewise.
+	(SEGV_ACCERR): Likewise.
+	(BUS_ADRALN): Likewise.
+	(BUS_ADRERR): Likewise.
+	(BUS_OBJERR): Likewise.
+	(BUS_MCEERR_AR): Likewise.
+	(BUS_MCEERR_AO): Likewise.
+	(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+	(TRAP_TRACE): Likewise.
+	(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+	__USE_XOPEN2K8].
+	(CLD_KILLED): Likewise.
+	(CLD_DUMPED): Likewise.
+	(CLD_TRAPPED): Likewise.
+	(CLD_STOPPED): Likewise.
+	(CLD_CONTINUED): Likewise.
+	(POLL_IN): Likewise.
+	(POLL_OUT): Likewise.
+	(POLL_MSG): Likewise.
+	(POLL_ERR): Likewise.
+	(POLL_PRI): Likewise.
+	(POLL_HUP): Likewise.
+	* conform/Makefile (test-xfail-POSIX/signal.h/conform): Remove.
+	(test-xfail-POSIX/sys/wait.h/conform): Likewise.
+
 	[BZ #16670]
 	* posix/sched.h [!__USE_XOPEN2K] (__need_time_t): Don't define
 	before #include of <time.h>.
diff --git a/NEWS b/NEWS
index 2e55672931..35481c75c8 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.20
 * The following bugs are resolved with this release:
 
   15347, 15804, 15894, 16447, 16532, 16545, 16574, 16600, 16609, 16610,
-  16611, 16613, 16623, 16632, 16670.
+  16611, 16613, 16623, 16632, 16670, 16674.
 
 * The am33 port, which had not worked for several years, has been removed
   from ports.
diff --git a/bits/siginfo.h b/bits/siginfo.h
index f77d952166..db268d53b1 100644
--- a/bits/siginfo.h
+++ b/bits/siginfo.h
@@ -70,110 +70,116 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,		/* Illegal opcode.  */
-# define ILL_ILLOPC	ILL_ILLOPC
+#  define ILL_ILLOPC	ILL_ILLOPC
   ILL_ILLOPN,			/* Illegal operand.  */
-# define ILL_ILLOPN	ILL_ILLOPN
+#  define ILL_ILLOPN	ILL_ILLOPN
   ILL_ILLADR,			/* Illegal addressing mode.  */
-# define ILL_ILLADR	ILL_ILLADR
+#  define ILL_ILLADR	ILL_ILLADR
   ILL_ILLTRP,			/* Illegal trap. */
-# define ILL_ILLTRP	ILL_ILLTRP
+#  define ILL_ILLTRP	ILL_ILLTRP
   ILL_PRVOPC,			/* Privileged opcode.  */
-# define ILL_PRVOPC	ILL_PRVOPC
+#  define ILL_PRVOPC	ILL_PRVOPC
   ILL_PRVREG,			/* Privileged register.  */
-# define ILL_PRVREG	ILL_PRVREG
+#  define ILL_PRVREG	ILL_PRVREG
   ILL_COPROC,			/* Coprocessor error.  */
-# define ILL_COPROC	ILL_COPROC
+#  define ILL_COPROC	ILL_COPROC
   ILL_BADSTK			/* Internal stack error.  */
-# define ILL_BADSTK	ILL_BADSTK
+#  define ILL_BADSTK	ILL_BADSTK
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,		/* Integer divide by zero.  */
-# define FPE_INTDIV	FPE_INTDIV
+#  define FPE_INTDIV	FPE_INTDIV
   FPE_INTOVF,			/* Integer overflow.  */
-# define FPE_INTOVF	FPE_INTOVF
+#  define FPE_INTOVF	FPE_INTOVF
   FPE_FLTDIV,			/* Floating point divide by zero.  */
-# define FPE_FLTDIV	FPE_FLTDIV
+#  define FPE_FLTDIV	FPE_FLTDIV
   FPE_FLTOVF,			/* Floating point overflow.  */
-# define FPE_FLTOVF	FPE_FLTOVF
+#  define FPE_FLTOVF	FPE_FLTOVF
   FPE_FLTUND,			/* Floating point underflow.  */
-# define FPE_FLTUND	FPE_FLTUND
+#  define FPE_FLTUND	FPE_FLTUND
   FPE_FLTRES,			/* Floating point inexact result.  */
-# define FPE_FLTRES	FPE_FLTRES
+#  define FPE_FLTRES	FPE_FLTRES
   FPE_FLTINV,			/* Floating point invalid operation.  */
-# define FPE_FLTINV	FPE_FLTINV
+#  define FPE_FLTINV	FPE_FLTINV
   FPE_FLTSUB			/* Subscript out of range.  */
-# define FPE_FLTSUB	FPE_FLTSUB
+#  define FPE_FLTSUB	FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,		/* Address not mapped to object.  */
-# define SEGV_MAPERR	SEGV_MAPERR
+#  define SEGV_MAPERR	SEGV_MAPERR
   SEGV_ACCERR			/* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR	SEGV_ACCERR
+#  define SEGV_ACCERR	SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,		/* Invalid address alignment.  */
-# define BUS_ADRALN	BUS_ADRALN
+#  define BUS_ADRALN	BUS_ADRALN
   BUS_ADRERR,			/* Non-existant physical address.  */
-# define BUS_ADRERR	BUS_ADRERR
+#  define BUS_ADRERR	BUS_ADRERR
   BUS_OBJERR			/* Object specific hardware error.  */
-# define BUS_OBJERR	BUS_OBJERR
+#  define BUS_OBJERR	BUS_OBJERR
 };
+# endif