fix data race in timer_create with SIGEV_THREAD notification

[musl] / src / setjmp / arm / longjmp.s

diff --git a/src/setjmp/arm/longjmp.s b/src/setjmp/arm/longjmp.s
index 82bce83..76cc292 100644 (file)
--- a/src/setjmp/arm/longjmp.s
+++ b/src/setjmp/arm/longjmp.s
@@ -1,3 +1,4 @@
+.syntax unified
 .global _longjmp
 .global longjmp
 .type _longjmp,%function
@@ -7,7 +8,9 @@ longjmp:
        mov ip,r0
        movs r0,r1
        moveq r0,#1
-       ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp,sp,lr}
+       ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp}
+       ldmia ip!, {r2,lr}
+       mov sp,r2
 
        adr r1,1f
        ldr r2,1f
@@ -33,9 +36,8 @@ longjmp:
        ldcl p1, cr13, [ip], #8
        ldcl p1, cr14, [ip], #8
        ldcl p1, cr15, [ip], #8
-3:     tst lr,#1
-       moveq pc,lr
-       bx lr
+3:     bx lr
 
 .hidden __hwcap
+.align 2
 1:     .word __hwcap-1b