Преглед изворни кода

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

Rich Felker пре 14 година
родитељ
комит
dc3776d445
3 измењених фајлова са 17 додато и 5 уклоњено
  1. 15 0
      src/signal/i386/restore.s
  2. 0 0
      src/signal/restore.c
  3. 2 5
      src/signal/sigaction.c

+ 15 - 0
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
+

+ 0 - 0
src/signal/restore.c


+ 2 - 5
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;
 	}