summaryrefslogtreecommitdiff
path: root/signal
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-11-14 18:35:42 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-11-14 18:35:42 +0000
commita4733812085f338dfcbb3f31b48747b00eb5c46c (patch)
tree74e56fd5e90953cdeb0c4441a1b8f46e1559b982 /signal
parentcf7246ddf534d98b87910c04cbb51fe02aa6d562 (diff)
downloadglibc-a4733812085f338dfcbb3f31b48747b00eb5c46c.tar.gz
Only declare __sigpause in installed signal.h when necessary.
This patch makes the installed signal.h declare __sigpause only when necessary (when a macro definition of sigpause makes use of __sigpause), rather than unconditionally. This fixes false positives in the linknamespace tests by making it visible to those tests that no use of ISO C functionality will actually bring in the definition of __sigpause and so bring in the other symbols defined in the same object. There is no bug filed in Bugzilla because this is fixing false positives rather than any user-visible bug. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by this patch). * signal/signal.h (__sigpause): Only declare if [__USE_XOPEN && !__GNUC__]. * include/signal.h (__sigpause): Move declaration above call to libc_hidden_proto. * conform/Makefile (test-xfail-ISO/signal.h/linknamespace): Remove variable. (test-xfail-ISO99/signal.h/linknamespace): Likewise. (test-xfail-ISO11/signal.h/linknamespace): Likewise.
Diffstat (limited to 'signal')
-rw-r--r--signal/signal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/signal/signal.h b/signal/signal.h
index fe9fd784dd..f1bbad04d3 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -164,12 +164,12 @@ extern void psiginfo (const siginfo_t *__pinfo, const char *__s);
This function is a cancellation point and therefore not marked with
__THROW. */
-extern int __sigpause (int __sig_or_mask, int __is_sig);
#ifdef __USE_XOPEN
# ifdef __GNUC__
extern int sigpause (int __sig) __asm__ ("__xpg_sigpause");
# else
+extern int __sigpause (int __sig_or_mask, int __is_sig);
/* Remove a signal from the signal mask and suspend the process. */
# define sigpause(sig) __sigpause ((sig), 1)
# endif