X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread%2F__rsyscall.c;h=e885d9e7ac4fe0b640739bc12b384caa013dcdd7;hb=6232b96f5153d0b718054a8bc569fcd7d596bab2;hp=923db2bff5c7cb24d1b743614cff8e76c7ec5698;hpb=b2486a8922bf4977bd82c8190258e39de28c053b;p=musl

diff --git a/src/thread/__rsyscall.c b/src/thread/__rsyscall.c
index 923db2bf..e885d9e7 100644
--- a/src/thread/__rsyscall.c
+++ b/src/thread/__rsyscall.c
@@ -56,17 +56,18 @@ int __rsyscall(int nr, long a, long b, long c, long d, long e, long f)
 	while ((i=rs.blocks))
 		__wait(&rs.blocks, 0, i, 1);
 
-	sigfillset(&set);
-	__libc_sigprocmask(SIG_BLOCK, &set, &set);
+	__syscall(SYS_rt_sigprocmask, SIG_BLOCK, (uint64_t[]){-1}, &set, 8);
 
 	if (!rs.init) {
 		struct sigaction sa = {
+			.sa_flags = SA_SIGINFO | SA_RESTART,
 			.sa_sigaction = rsyscall_handler,
 			.sa_mask = set
 		};
 		sigfillset(&sa.sa_mask);
 		sa.sa_sigaction = rsyscall_handler;
 		__libc_sigaction(SIGSYSCALL, &sa, 0);
+		rs.init = 1;
 	}
 
 	rs.nr = nr;
@@ -86,7 +87,7 @@ int __rsyscall(int nr, long a, long b, long c, long d, long e, long f)
 	}
 
 	/* Handle any lingering signals with no-op */
-	__libc_sigprocmask(SIG_UNBLOCK, &set, &set);
+	__syscall(SYS_rt_sigprocmask, SIG_SETMASK, &set, &set, 8);
 
 	/* Resume other threads' signal handlers and wait for them */
 	rs.hold = 0;