svn commit: branches/uClibc-nptl/libc: signal sysdeps/linux/common

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-12-05 20:24:56 -0800 (Mon, 05 Dec 2005)
New Revision: 12685

Log:
Finish up merge from trunk.


Modified:
   branches/uClibc-nptl/libc/signal/sigfillset.c
   branches/uClibc-nptl/libc/sysdeps/linux/common/__rt_sigtimedwait.c
   branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_rt_sigaction.c
   branches/uClibc-nptl/libc/sysdeps/linux/common/getpid.c


Changeset:
Modified: branches/uClibc-nptl/libc/signal/sigfillset.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sigfillset.c	2005-12-06 04:08:14 UTC (rev 12684)
+++ branches/uClibc-nptl/libc/signal/sigfillset.c	2005-12-06 04:24:56 UTC (rev 12685)
@@ -30,7 +30,7 @@
       return -1;
     }
 
-  __memset (set, 0xff, sizeof (sigset_t));
+  memset (set, 0xff, sizeof (sigset_t));
 
   /* If the implementation uses a cancellation signal don't set the bit.  */
 #ifdef SIGCANCEL

Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/__rt_sigtimedwait.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/__rt_sigtimedwait.c	2005-12-06 04:08:14 UTC (rev 12684)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/__rt_sigtimedwait.c	2005-12-06 04:24:56 UTC (rev 12685)
@@ -13,19 +13,21 @@
 #include <stddef.h>
 #ifdef __NR_rt_sigtimedwait
 #define __NR___rt_sigtimedwait __NR_rt_sigtimedwait
-_syscall4(int, __rt_sigtimedwait, const sigset_t *, set, siginfo_t *, info,
+static _syscall4(int, __rt_sigtimedwait, const sigset_t *, set, siginfo_t *, info,
 		  const struct timespec *, timeout, size_t, setsize);
 
-int sigwaitinfo(const sigset_t * set, siginfo_t * info)
+int attribute_hidden __sigwaitinfo(const sigset_t * set, siginfo_t * info)
 {
 	return __rt_sigtimedwait(set, info, NULL, _NSIG / 8);
 }
 
-int sigtimedwait(const sigset_t * set, siginfo_t * info,
+int attribute_hidden __sigtimedwait(const sigset_t * set, siginfo_t * info,
 				 const struct timespec *timeout)
 {
 	return __rt_sigtimedwait(set, info, timeout, _NSIG / 8);
 }
+weak_alias (__sigtimedwait, sigtimedwait)
+weak_alias (__sigwaitinfo, sigwaitinfo)
 #else
 int sigwaitinfo(const sigset_t * set, siginfo_t * info)
 {

Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_rt_sigaction.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_rt_sigaction.c	2005-12-06 04:08:14 UTC (rev 12684)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/__syscall_rt_sigaction.c	2005-12-06 04:24:56 UTC (rev 12685)
@@ -14,7 +14,7 @@
 
 #define __NR___syscall_rt_sigaction __NR_rt_sigaction
 #undef sigaction
-_syscall4(int, __syscall_rt_sigaction, int, signum,
+attribute_hidden _syscall4(int, __syscall_rt_sigaction, int, signum,
 		  const struct sigaction *, act, struct sigaction *, oldact,
 		  size_t, size);
 

Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/getpid.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/getpid.c	2005-12-06 04:08:14 UTC (rev 12684)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/getpid.c	2005-12-06 04:24:56 UTC (rev 12685)
@@ -11,9 +11,10 @@
 #include <unistd.h>
 
 #if defined (__alpha__)
-#define __NR_getpid     __NR_getxpid
+#define __NR___getpid __NR_getxpid
 #endif
-#define __NR___libc_getpid __NR_getpid
-_syscall0(pid_t, __libc_getpid);
-weak_alias(__libc_getpid, getpid);
-weak_alias(__libc_getpid, __getpid);
+#define __NR___getpid __NR_getpid
+attribute_hidden _syscall0(pid_t, __getpid);
+strong_alias(__getpid, getpid)
+/* not used in libpthread */
+/* weak_alias(__getpid, __libc_getpid) */