svn commit: branches/uClibc-nptl/libc/signal

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-12-10 10:03:53 -0800 (Sat, 10 Dec 2005)
New Revision: 12818

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/libc/signal/sigblock.c
   branches/uClibc-nptl/libc/signal/siggetmask.c
   branches/uClibc-nptl/libc/signal/sigignore.c
   branches/uClibc-nptl/libc/signal/sigintr.c
   branches/uClibc-nptl/libc/signal/signal.c
   branches/uClibc-nptl/libc/signal/sigpause.c
   branches/uClibc-nptl/libc/signal/sigset.c
   branches/uClibc-nptl/libc/signal/sigsetmask.c
   branches/uClibc-nptl/libc/signal/sysv_signal.c


Changeset:
Modified: branches/uClibc-nptl/libc/signal/sigblock.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sigblock.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/sigblock.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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;
 

Modified: branches/uClibc-nptl/libc/signal/siggetmask.c
===================================================================
--- branches/uClibc-nptl/libc/signal/siggetmask.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/siggetmask.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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)
 {

Modified: branches/uClibc-nptl/libc/signal/sigignore.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sigignore.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/sigignore.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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

Modified: branches/uClibc-nptl/libc/signal/sigintr.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sigintr.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/sigintr.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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>

Modified: branches/uClibc-nptl/libc/signal/signal.c
===================================================================
--- branches/uClibc-nptl/libc/signal/signal.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/signal.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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 @@
   return oact.sa_handler;
 }
 weak_alias (__bsd_signal, bsd_signal)
+hidden_weak_alias (__bsd_signal, __signal)
 weak_alias (__bsd_signal, signal)

Modified: branches/uClibc-nptl/libc/signal/sigpause.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sigpause.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/sigpause.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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,8 +45,8 @@
 
   return sigsuspend (&set);
 }
+strong_alias(__sigpause_internal,__sigpause)
 
-
 #undef sigpause
 
 /* We have to provide a default version of this function since the
@@ -53,5 +54,5 @@
    the BSD version.  So make this the default.  */
 int sigpause (int mask)
 {
-  return __sigpause (mask, 0);
+  return __sigpause_internal (mask, 0);
 }

Modified: branches/uClibc-nptl/libc/signal/sigset.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sigset.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/sigset.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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>

Modified: branches/uClibc-nptl/libc/signal/sigsetmask.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sigsetmask.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/sigsetmask.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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 @@
 
   return sigset_get_old_mask (&oset);
 }
-
-weak_alias (__sigsetmask, sigsetmask)
+weak_alias(__sigsetmask,sigsetmask)

Modified: branches/uClibc-nptl/libc/signal/sysv_signal.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sysv_signal.c	2005-12-10 17:59:34 UTC (rev 12817)
+++ branches/uClibc-nptl/libc/signal/sysv_signal.c	2005-12-10 18:03:53 UTC (rev 12818)
@@ -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.  */