about summary refs log tree commit diff
path: root/ports
diff options
context:
space:
mode:
Diffstat (limited to 'ports')
-rw-r--r--ports/ChangeLog.aarch647
-rw-r--r--ports/sysdeps/aarch64/setjmp.S10
2 files changed, 15 insertions, 2 deletions
diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64
index e12c4472b5..2e2dc2f3fd 100644
--- a/ports/ChangeLog.aarch64
+++ b/ports/ChangeLog.aarch64
@@ -1,3 +1,10 @@
+2013-05-21  Andreas Schwab  <schwab@suse.de>
+
+	[BZ #15493]
+	* sysdeps/aarch64/setjmp.S (__sigsetjmp): Don't clobber register
+	x1.
+	[NOT_IN_libc && IS_IN_rtld]: Don't call __sigjmp_save.
+
 2013-05-21  Marcus Shawcroft  <marcus.shawcroft@linaro.org>
 
 	* sysdeps/aarch64/libm-test-ulps: Regenerate.
diff --git a/ports/sysdeps/aarch64/setjmp.S b/ports/sysdeps/aarch64/setjmp.S
index cff81c7e4d..10e070999c 100644
--- a/ports/sysdeps/aarch64/setjmp.S
+++ b/ports/sysdeps/aarch64/setjmp.S
@@ -44,8 +44,14 @@ ENTRY (__sigsetjmp)
 	stp	d10, d11, [x0, #JB_D10<<3]
 	stp	d12, d13, [x0, #JB_D12<<3]
 	stp	d14, d15, [x0, #JB_D14<<3]
-	mov	x1,  sp
-	str	x1,  [x0, #JB_SP<<3]
+	mov	x2,  sp
+	str	x2,  [x0, #JB_SP<<3]
+#if defined NOT_IN_libc && defined IS_IN_rtld
+	/* In ld.so we never save the signal mask */
+	mov	w0, #0
+	RET
+#else
 	b	C_SYMBOL_NAME(__sigjmp_save)
+#endif
 END (__sigsetjmp)
 hidden_def (__sigsetjmp)