fix previous commit that broke sigreturn. looks like the asm is needed.

diff --git a/src/signal/i386/restore.s b/src/signal/i386/restore.s
new file mode 100644 (file)
index 0000000..e0c4ab6
--- /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 (file)
index 0000000..e69de29

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 9a36226..b1603b9 100644 (file)
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -4,10 +4,7 @@
 #include "syscall.h"
 #include "pthread_impl.h"
 
 #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)
 {
 
 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;
        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;
        }
                ksa.mask = sa->sa_mask;
                pksa = (long)&ksa;
        }