Merge from trunk.

9 files changed, 19 insertions, 8 deletions

diff --git a/libc/signal/sigblock.c b/libc/signal/sigblock.c
index 70af609aa..d3568b9f5 100644
--- a/libc/signal/sigblock.c
+++ b/libc/signal/sigblock.c
@@ -22,7 +22,7 @@
 #include "sigset-cvt-mask.h"
 
 /* Block signals in MASK, returning the old mask.  */
-int __sigblock (int mask)
+int attribute_hidden __sigblock (int mask)
 {
   sigset_t set, oset;
 
diff --git a/libc/signal/siggetmask.c b/libc/signal/siggetmask.c
index f139d3861..18e3d367d 100644
--- a/libc/signal/siggetmask.c
+++ b/libc/signal/siggetmask.c
@@ -19,7 +19,7 @@
 
 #include <signal.h>
 
-extern int __sigblock (int __mask);
+extern int __sigblock (int __mask) __THROW /*__attribute_deprecated__*/ attribute_hidden;
 int
 siggetmask (void)
 {
diff --git a/libc/signal/sigignore.c b/libc/signal/sigignore.c
index 407b52e2a..3f8b8985f 100644
--- a/libc/signal/sigignore.c
+++ b/libc/signal/sigignore.c
@@ -18,6 +18,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define sigaction __sigaction
+
 #define _GNU_SOURCE
 #include <errno.h>
 #define __need_NULL
diff --git a/libc/signal/sigintr.c b/libc/signal/sigintr.c
index 8315c3a6b..797c52843 100644
--- a/libc/signal/sigintr.c
+++ b/libc/signal/sigintr.c
@@ -16,6 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define sigaction __sigaction
+
 #include <stddef.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/libc/signal/signal.c b/libc/signal/signal.c
index 7df88eff0..bcc31c0bc 100644
--- a/libc/signal/signal.c
+++ b/libc/signal/signal.c
@@ -18,6 +18,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define sigaction __sigaction
+
 #include <errno.h>
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */
@@ -50,4 +52,5 @@ __bsd_signal (int sig, __sighandler_t handler)
   return oact.sa_handler;
 }
 weak_alias (__bsd_signal, bsd_signal)
+hidden_weak_alias (__bsd_signal, __signal)
 weak_alias (__bsd_signal, signal)
diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c
index fc77c958d..7e0852dbc 100644
--- a/libc/signal/sigpause.c
+++ b/libc/signal/sigpause.c
@@ -18,6 +18,7 @@
    02111-1307 USA.  */
 
 #define sigdelset __sigdelset_internal
+#define sigsuspend __sigsuspend
 
 #include <errno.h>
 #include <signal.h>
@@ -27,7 +28,7 @@
 
 /* Set the mask of blocked signals to MASK,
    wait for a signal to arrive, and then restore the mask.  */
-int __sigpause (int sig_or_mask, int is_sig)
+int attribute_hidden __sigpause_internal (int sig_or_mask, int is_sig)
 {
   sigset_t set;
 
@@ -44,7 +45,7 @@ int __sigpause (int sig_or_mask, int is_sig)
 
   return sigsuspend (&set);
 }
-
+strong_alias(__sigpause_internal,__sigpause)
 
 #undef sigpause
 
@@ -53,5 +54,5 @@ int __sigpause (int sig_or_mask, int is_sig)
    the BSD version.  So make this the default.  */
 int sigpause (int mask)
 {
-  return __sigpause (mask, 0);
+  return __sigpause_internal (mask, 0);
 }
diff --git a/libc/signal/sigset.c b/libc/signal/sigset.c
index 350e3cb2d..305cd96fb 100644
--- a/libc/signal/sigset.c
+++ b/libc/signal/sigset.c
@@ -16,6 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define sigaction __sigaction
+
 #include <errno.h>
 #define __need_NULL
 #include <stddef.h>
diff --git a/libc/signal/sigsetmask.c b/libc/signal/sigsetmask.c
index 1c16d6411..56d7eccfa 100644
--- a/libc/signal/sigsetmask.c
+++ b/libc/signal/sigsetmask.c
@@ -22,7 +22,7 @@
 #include "sigset-cvt-mask.h"
 
 /* Set the mask of blocked signals to MASK, returning the old mask.  */
-int
+int attribute_hidden
 __sigsetmask (int mask)
 {
   sigset_t set, oset;
@@ -36,5 +36,4 @@ __sigsetmask (int mask)
 
   return sigset_get_old_mask (&oset);
 }
-
-weak_alias (__sigsetmask, sigsetmask)
+weak_alias(__sigsetmask,sigsetmask)
diff --git a/libc/signal/sysv_signal.c b/libc/signal/sysv_signal.c
index 576fc0b8d..608aef235 100644
--- a/libc/signal/sysv_signal.c
+++ b/libc/signal/sysv_signal.c
@@ -16,6 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define sigaction __sigaction
+
 #include <errno.h>
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */