From: Rich Felker <dalias@aerifal.cx>
Date: Fri, 8 Apr 2011 15:56:52 +0000 (-0400)
Subject: fix broken sigsetjmp on x86_64
X-Git-Tag: v0.7.8~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=60685ecad1c2398b4ab95fa7bf88c8336d914a6c;p=oweals%2Fmusl.git

fix broken sigsetjmp on x86_64
---

diff --git a/src/signal/x86_64/sigsetjmp.s b/src/signal/x86_64/sigsetjmp.s
index 0a450785..ac02adb2 100644
--- a/src/signal/x86_64/sigsetjmp.s
+++ b/src/signal/x86_64/sigsetjmp.s
@@ -1,11 +1,13 @@
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .global sigsetjmp
 sigsetjmp:
-	test %rsi,%rsi
-	jz 1f              /* if save == 0, just goto setjmp */
-	movq %rsi,64(%rdi) /* move save -> jmp_buf[8] */
-	addq $72,%rdi      /* add sizeof(jmp_buf) to rdi */
-	movl $0,%esi       /* arg2 = 0 */
-	movl $2,%edx       /* arg3 = 2 */
-	call sigprocmask   /* sigprocmask(jmp_buf, 0, 2) */
+	andl %esi,%esi
+	movq %rsi,64(%rdi)
+	jz 1f
+	pushq %rdi
+	leaq 72(%rdi),%rsi
+	xorl %edx,%edx
+	movl $2,%edi
+	call sigprocmask
+	popq %rdi
 1:	jmp setjmp