projects / musl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0b4a7b)
arm: avoid conditional branch to PLT in sigsetjmp
authorAndre McCurdy <armccurdy@gmail.com>
Wed, 18 Sep 2019 06:04:05 +0000 (23:04 -0700)
committerRich Felker <dalias@aerifal.cx>
Sat, 7 Dec 2019 18:02:05 +0000 (13:02 -0500)
The R_ARM_THM_JUMP19 relocation type generated for the original code
when targeting Thumb 2 is not supported by the gold linker.

src/signal/arm/sigsetjmp.s patch | blob | history

diff --git a/src/signal/arm/sigsetjmp.s b/src/signal/arm/sigsetjmp.s
index 318addb..69ebbf4 100644 (file)
--- 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
 
musl