From: Andre McCurdy <armccurdy@gmail.com>
Date: Wed, 18 Sep 2019 06:04:05 +0000 (-0700)
Subject: arm: avoid conditional branch to PLT in sigsetjmp
X-Git-Tag: v1.2.0~56
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1e2aae0aa6edd91413b288b9cc6939f2d80e302;p=oweals%2Fmusl.git

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.
---

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