about summary refs log tree commit diff
path: root/src/signal/sigaction.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-13 19:01:43 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-13 19:01:43 -0500
commitdc3776d445957cd3ea4a682db518701b93d34292 (patch)
tree3ca4f09e322d51377fa8319268bd534599002233 /src/signal/sigaction.c
parent6027201e5a7c810b3073c85f7373aae84b303ba3 (diff)
downloadmusl-dc3776d445957cd3ea4a682db518701b93d34292.tar.gz
musl-dc3776d445957cd3ea4a682db518701b93d34292.tar.xz
musl-dc3776d445957cd3ea4a682db518701b93d34292.zip
fix previous commit that broke sigreturn. looks like the asm is needed.
Diffstat (limited to 'src/signal/sigaction.c')
-rw-r--r--src/signal/sigaction.c7
1 files changed, 2 insertions, 5 deletions
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;
 	}