aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2013-05-20 10:19:31 +0200
committerAndreas Schwab <schwab@suse.de>2013-05-21 10:52:46 +0200
commite39adf43c7d1979884dd304ed1250baf1f78fadc (patch)
tree7f9a7c260724e5a11d937ca0746b11862d84c443 /ports
parent6c14f68aabb72938a1a66bc51b05c83ed7edcf35 (diff)
downloadglibc-e39adf43c7d1979884dd304ed1250baf1f78fadc.zip
glibc-e39adf43c7d1979884dd304ed1250baf1f78fadc.tar.gz
glibc-e39adf43c7d1979884dd304ed1250baf1f78fadc.tar.bz2
AArch64: Don't clobber argument for tail call to __sigjmp_save in sigsetjmp
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 e12c447..2e2dc2f 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 cff81c7..10e0709 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)