From dc3776d445957cd3ea4a682db518701b93d34292 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Sun, 13 Feb 2011 19:01:43 -0500
Subject: fix previous commit that broke sigreturn. looks like the asm is
 needed.

---
 src/signal/i386/restore.s | 15 +++++++++++++++
 src/signal/restore.c      |  0
 src/signal/sigaction.c    |  7 ++-----
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 src/signal/i386/restore.s
 create mode 100644 src/signal/restore.c

diff --git a/src/signal/i386/restore.s b/src/signal/i386/restore.s
new file mode 100644
index 00000000..e0c4ab66
--- /dev/null
+++ b/src/signal/i386/restore.s
@@ -0,0 +1,15 @@
+.global __restore
+.type __restore,%function
+__restore:
+	popl %eax
+	movl $119, %eax
+	int $0x80
+.size __restore,.-__restore
+
+.global __restore_rt
+.type __restore_rt,%function
+__restore_rt:
+	movl $173, %eax
+	int $0x80
+.size __restore_rt,.-__restore_rt
+
diff --git a/src/signal/restore.c b/src/signal/restore.c
new file mode 100644
index 00000000..e69de29b
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.3-70-g09d2