diff options
author | Joseph Myers <joseph@codesourcery.com> | 2014-03-07 23:57:56 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2014-03-07 23:57:56 +0000 |
commit | 5c7808498e9e1fd3df43aa2bd84fd47dc8e6ab7c (patch) | |
tree | 159596dda8bf51b42d0acb603cb4df27206d076a /conform | |
parent | bc61d27c616f517521826581f0401f5b81772a65 (diff) | |
download | glibc-5c7808498e9e1fd3df43aa2bd84fd47dc8e6ab7c.tar.gz |
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.
Diffstat (limited to 'conform')
-rw-r--r-- | conform/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/conform/Makefile b/conform/Makefile index e8c9a9acca..e1df914904 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -188,8 +188,6 @@ test-xfail-XPG4/termios.h/conform = yes test-xfail-XPG4/ucontext.h/conform = yes test-xfail-XPG4/unistd.h/conform = yes test-xfail-XPG4/utmpx.h/conform = yes -test-xfail-POSIX/signal.h/conform = yes -test-xfail-POSIX/sys/wait.h/conform = yes test-xfail-POSIX/tar.h/conform = yes test-xfail-UNIX98/arpa/inet.h/conform = yes test-xfail-UNIX98/fcntl.h/conform = yes |