From dc3776d445957cd3ea4a682db518701b93d34292 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 13 Feb 2011 19:01:43 -0500 Subject: fix previous commit that broke sigreturn. looks like the asm is needed. --- src/signal/sigaction.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/signal/sigaction.c') diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c index 9a362262..b1603b9f 100644 --- a/src/signal/sigaction.c +++ b/src/signal/sigaction.c @@ -4,10 +4,7 @@ #include "syscall.h" #include "pthread_impl.h" -static void restorer() -{ - syscall0(__NR_rt_sigreturn); -} +void __restore(), __restore_rt(); int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old) { @@ -21,7 +18,7 @@ int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old) if (sa) { ksa.handler = sa->sa_handler; ksa.flags = sa->sa_flags | SA_RESTORER; - ksa.restorer = restorer; + ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore; ksa.mask = sa->sa_mask; pksa = (long)&ksa; } -- cgit v1.2.1