about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2019-09-17 23:04:05 -0700
committerRich Felker <dalias@aerifal.cx>2019-12-07 13:02:05 -0500
commitb1e2aae0aa6edd91413b288b9cc6939f2d80e302 (patch)
treed21031f911a71a4cfb7d94ab62e3b055b96b45b6 /src
parentc0b4a7b25430e4495bb213a5c3ad43e26c6bff20 (diff)
downloadmusl-b1e2aae0aa6edd91413b288b9cc6939f2d80e302.tar.gz
musl-b1e2aae0aa6edd91413b288b9cc6939f2d80e302.tar.xz
musl-b1e2aae0aa6edd91413b288b9cc6939f2d80e302.zip
arm: avoid conditional branch to PLT in sigsetjmp
The R_ARM_THM_JUMP19 relocation type generated for the original code
when targeting Thumb 2 is not supported by the gold linker.
Diffstat (limited to 'src')
-rw-r--r--src/signal/arm/sigsetjmp.s5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/signal/arm/sigsetjmp.s b/src/signal/arm/sigsetjmp.s
index 318addba..69ebbf49 100644
--- a/src/signal/arm/sigsetjmp.s
+++ b/src/signal/arm/sigsetjmp.s
@@ -6,9 +6,10 @@
 sigsetjmp:
 __sigsetjmp:
 	tst r1,r1
-	beq setjmp
+	bne 1f
+	b setjmp
 
-	str lr,[r0,#256]
+1:	str lr,[r0,#256]
 	str r4,[r0,#260+8]
 	mov r4,r0