diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-06 04:24:56 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-06 04:24:56 +0000 |
| commit | d23db60e59260308a17ed65907f55d631c8d03c5 (patch) | |
| tree | 7c830d0de954ca6f92e96eaf08b262fdc352f8ce /libc/sysdeps/linux | |
| parent | 821e7539de6922c96e2a4fc5baa11fdc335072c9 (diff) | |
| download | uClibc-alpine-d23db60e59260308a17ed65907f55d631c8d03c5.tar.bz2 uClibc-alpine-d23db60e59260308a17ed65907f55d631c8d03c5.tar.xz | |
Finish up merge from trunk.
Diffstat (limited to 'libc/sysdeps/linux')
| -rw-r--r-- | libc/sysdeps/linux/common/__rt_sigtimedwait.c | 8 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/__syscall_rt_sigaction.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/getpid.c | 11 |
3 files changed, 12 insertions, 9 deletions
diff --git a/libc/sysdeps/linux/common/__rt_sigtimedwait.c b/libc/sysdeps/linux/common/__rt_sigtimedwait.c index c50eadbbe..8862bc95b 100644 --- a/libc/sysdeps/linux/common/__rt_sigtimedwait.c +++ b/libc/sysdeps/linux/common/__rt_sigtimedwait.c @@ -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) { diff --git a/libc/sysdeps/linux/common/__syscall_rt_sigaction.c b/libc/sysdeps/linux/common/__syscall_rt_sigaction.c index 9d4916618..be7709040 100644 --- a/libc/sysdeps/linux/common/__syscall_rt_sigaction.c +++ b/libc/sysdeps/linux/common/__syscall_rt_sigaction.c @@ -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); diff --git a/libc/sysdeps/linux/common/getpid.c b/libc/sysdeps/linux/common/getpid.c index a4e07d97c..6a6a9e129 100644 --- a/libc/sysdeps/linux/common/getpid.c +++ b/libc/sysdeps/linux/common/getpid.c @@ -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) */ |