svn commit: trunk/uClibc/libc: inet/rpc signal stdlib sysdeps/linux/com etc...
psm at uclibc.org
psm at uclibc.org
Fri Dec 9 00:08:33 UTC 2005
Author: psm
Date: 2005-12-08 16:08:31 -0800 (Thu, 08 Dec 2005)
New Revision: 12771
Log:
internal sigpause, do we really default to BSD signals?
Modified:
trunk/uClibc/libc/inet/rpc/rcmd.c
trunk/uClibc/libc/signal/sigblock.c
trunk/uClibc/libc/signal/siggetmask.c
trunk/uClibc/libc/signal/signal.c
trunk/uClibc/libc/signal/sigpause.c
trunk/uClibc/libc/signal/sigwait.c
trunk/uClibc/libc/stdlib/system.c
trunk/uClibc/libc/sysdeps/linux/common/pause.c
Changeset:
Modified: trunk/uClibc/libc/inet/rpc/rcmd.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rcmd.c 2005-12-09 00:04:59 UTC (rev 12770)
+++ trunk/uClibc/libc/inet/rpc/rcmd.c 2005-12-09 00:08:31 UTC (rev 12771)
@@ -50,6 +50,7 @@
#define herror __herror
#define bind __bind
#define connect __connect
+#define sigblock __sigblock
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/signal/sigblock.c
===================================================================
--- trunk/uClibc/libc/signal/sigblock.c 2005-12-09 00:04:59 UTC (rev 12770)
+++ trunk/uClibc/libc/signal/sigblock.c 2005-12-09 00:08:31 UTC (rev 12771)
@@ -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: trunk/uClibc/libc/signal/siggetmask.c
===================================================================
--- trunk/uClibc/libc/signal/siggetmask.c 2005-12-09 00:04:59 UTC (rev 12770)
+++ trunk/uClibc/libc/signal/siggetmask.c 2005-12-09 00:08:31 UTC (rev 12771)
@@ -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: trunk/uClibc/libc/signal/signal.c
===================================================================
--- trunk/uClibc/libc/signal/signal.c 2005-12-09 00:04:59 UTC (rev 12770)
+++ trunk/uClibc/libc/signal/signal.c 2005-12-09 00:08:31 UTC (rev 12771)
@@ -52,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: trunk/uClibc/libc/signal/sigpause.c
===================================================================
--- trunk/uClibc/libc/signal/sigpause.c 2005-12-09 00:04:59 UTC (rev 12770)
+++ trunk/uClibc/libc/signal/sigpause.c 2005-12-09 00:08:31 UTC (rev 12771)
@@ -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: trunk/uClibc/libc/signal/sigwait.c
===================================================================
--- trunk/uClibc/libc/signal/sigwait.c 2005-12-09 00:04:59 UTC (rev 12770)
+++ trunk/uClibc/libc/signal/sigwait.c 2005-12-09 00:08:31 UTC (rev 12771)
@@ -18,6 +18,8 @@
* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA. */
+#define sigwaitinfo __sigwaitinfo
+
#include <errno.h>
#include <signal.h>
#include <string.h>
Modified: trunk/uClibc/libc/stdlib/system.c
===================================================================
--- trunk/uClibc/libc/stdlib/system.c 2005-12-09 00:04:59 UTC (rev 12770)
+++ trunk/uClibc/libc/stdlib/system.c 2005-12-09 00:08:31 UTC (rev 12771)
@@ -1,5 +1,6 @@
#define wait4 __wait4
#define execl __execl
+#define signal __signal
#include <stdio.h>
#include <stddef.h>
Modified: trunk/uClibc/libc/sysdeps/linux/common/pause.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/pause.c 2005-12-09 00:04:59 UTC (rev 12770)
+++ trunk/uClibc/libc/sysdeps/linux/common/pause.c 2005-12-09 00:08:31 UTC (rev 12771)
@@ -7,22 +7,20 @@
* GNU Library General Public License (LGPL) version 2 or later.
*/
+#define __sigpause __sigpause_internal
+#define sigblock __sigblock
+
#include "syscalls.h"
#include <unistd.h>
#ifdef __NR_pause
-
#define __NR___libc_pause __NR_pause
_syscall0(int, __libc_pause);
-weak_alias(__libc_pause, pause);
-
#else
-
#include <signal.h>
int __libc_pause(void)
{
return (__sigpause(sigblock(0), 0));
}
-weak_alias(__libc_pause, pause);
-
#endif
+weak_alias(__libc_pause, pause)
More information about the uClibc-cvs
mailing list