From 9d3629143e0c600e35858caf0494613a39a5d63c Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 30 May 2002 20:51:03 +0000 Subject: 2002-05-30 Jeff Johnston * libc/sys/linux/Makefile.am: Add support for new files. * libc/sys/linux/Makefile.in: Regenerated. * libc/sys/linux/ids.c: Add __getuid weak alias for getuid. * libc/sys/linux/signal.c: Change to use real-time syscalls for sigsuspend, sigprocmask, and sigpending. Also remove sigaction as it is in a separate file now. * libc/sys/linux/machine/i386/Makefile.am * libc/sys/linux/machine/i386/Makefile.in * libc/sys/linux/sys/signal.h: Add include of . * libc/sys/linux/sigaction.c: New file. * libc/sys/linux/sigqueue.c: Ditto. * libc/sys/linux/sigwait.c: Ditto. * libc/sys/linux/machine/i386/sigaction.c: Ditto. * libc/sys/linux/kernel_sigaction.h: Ditto. --- newlib/libc/sys/linux/signal.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'newlib/libc/sys/linux/signal.c') diff --git a/newlib/libc/sys/linux/signal.c b/newlib/libc/sys/linux/signal.c index 0855ed9e0..1affe6f24 100644 --- a/newlib/libc/sys/linux/signal.c +++ b/newlib/libc/sys/linux/signal.c @@ -11,40 +11,39 @@ /* avoid name space pollution */ #define __NR___sgetmask __NR_sgetmask #define __NR___ssetmask __NR_ssetmask -#define __NR___sigsuspend __NR_sigsuspend #define __NR___rt_sigtimedwait __NR_rt_sigtimedwait +#define __NR___rt_sigpending __NR_rt_sigpending +#define __NR___rt_sigprocmask __NR_rt_sigprocmask +#define __NR___rt_sigsuspend __NR_rt_sigsuspend _syscall2(int,kill,pid_t,pid,int,sig) _syscall2(__sighandler_t,signal,int,signum,__sighandler_t,handler) -_syscall3(int,sigaction,int,signum,const struct sigaction *,act, - struct sigaction *,oldact) -_syscall1(int,sigpending,sigset_t *,set) _syscall0(int,pause) _syscall1(unsigned int,alarm,unsigned int,seconds) -_syscall3(int,sigprocmask,int,how,const sigset_t *,set,sigset_t *,oldset) static _syscall0(int,__sgetmask) static _syscall1(int,__ssetmask,int,newmask) -static _syscall3(int,__sigsuspend,int,arg1,int,arg2,int,mask) +static _syscall2(int,__rt_sigpending,sigset_t *,set,size_t,size) +static _syscall4(int,__rt_sigprocmask,int,how,const sigset_t *,set,sigset_t *,oldset,size_t,size) +static _syscall2(int,__rt_sigsuspend,const sigset_t *,mask,size_t,size) static _syscall4(int,__rt_sigtimedwait,const sigset_t *,set,siginfo_t *,info,struct timespec *,timeout,size_t,size) -int sigsuspend (const sigset_t *mask) +int __sigsuspend (const sigset_t *mask) { - return __sigsuspend(0,0,((__sigset_t *)mask)->__val[0]); + return __rt_sigsuspend(mask, _NSIG/8); } +weak_alias(__sigsuspend,sigsuspend) int sigsetmask(int newmask) /* BSD */ { return __ssetmask(newmask); } - int sigmask(int signum) /* BSD */ { return 1 << signum; } - int sigblock(int mask) /* BSD */ { return __ssetmask(mask | __sgetmask()); @@ -56,15 +55,27 @@ int __libc_raise(int sig) } weak_alias(__libc_raise,raise) +int __sigpending(sigset_t *set) +{ + return __rt_sigpending(set, _NSIG/8); +} +weak_alias(__sigpending,sigpending) + +int __sigprocmask (int how,const sigset_t *set,sigset_t *oldset) +{ + return __rt_sigprocmask(how, set, oldset, _NSIG/8); +} +weak_alias(__sigprocmask,sigprocmask) + int sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout) { - return __rt_sigtimedwait(set, info, timeout, sizeof(sigset_t)); + return __rt_sigtimedwait(set, info, timeout, _NSIG/8); } int sigwaitinfo(const sigset_t *set, siginfo_t *info) { - return __rt_sigtimedwait(set, info, NULL, sizeof(sigset_t)); + return __rt_sigtimedwait(set, info, NULL, _NSIG/8); } const char *const sys_siglist[] = { -- cgit v1.2.3