about summary refs log tree commit diff
path: root/include/signal.h
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 /include/signal.h
parentcf7246ddf534d98b87910c04cbb51fe02aa6d562 (diff)
downloadglibc-a4733812085f338dfcbb3f31b48747b00eb5c46c.tar.gz
glibc-a4733812085f338dfcbb3f31b48747b00eb5c46c.tar.xz
glibc-a4733812085f338dfcbb3f31b48747b00eb5c46c.zip
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 'include/signal.h')
-rw-r--r--include/signal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/signal.h b/include/signal.h
index 16a7a4289a..f7a9de01ff 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -10,6 +10,7 @@ libc_hidden_proto (sigfillset)
 libc_hidden_proto (sigaddset)
 libc_hidden_proto (sigdelset)
 libc_hidden_proto (sigismember)
+extern int __sigpause (int sig_or_mask, int is_sig);
 libc_hidden_proto (__sigpause)
 libc_hidden_proto (raise)
 libc_hidden_proto (__libc_current_sigrtmin)
@@ -49,7 +50,6 @@ extern int __libc_sigaction (int sig, const struct sigaction *act,
 			     struct sigaction *oact);
 libc_hidden_proto (__libc_sigaction)
 
-extern int __sigpause (int sig_or_mask, int is_sig);
 extern int __default_sigpause (int mask);
 extern int __xpg_sigpause (int sig);