X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fsetjmp%2Farm%2Flongjmp.s;h=aff15fbd263aba17412d4f6936899cdf45306384;hb=4a30ba5ca4072e85e42e84547572e958871952a2;hp=037cb3d380d59d3c36d6b769a7baaabebf06d096;hpb=d960d4f2cbf18ff3476c7ac03698ec253885dd8e;p=musl

diff --git a/src/setjmp/arm/longjmp.s b/src/setjmp/arm/longjmp.s
index 037cb3d3..aff15fbd 100644
--- a/src/setjmp/arm/longjmp.s
+++ b/src/setjmp/arm/longjmp.s
@@ -7,9 +7,31 @@ longjmp:
 	mov ip,r0
 	movs r0,r1
 	moveq r0,#1
-	ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp}
-	ldr sp,[ip],#4
-	ldr lr,[ip],#4
-	tst lr,#1
+	ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp,sp,lr}
+
+	adr r1,1f
+	ldr r2,1f
+	ldr r1,[r1,r2]
+
+	tst r1,#0x260
+	beq 3f
+	tst r1,#0x20
+	beq 2f
+	ldc p2, cr4, [ip], #48
+2:	tst r1,#0x40
+	beq 2f
+	ldc p11, cr8, [ip], #64
+2:	tst r1,#0x200
+	beq 3f
+	ldcl p1, cr10, [ip], #8
+	ldcl p1, cr11, [ip], #8
+	ldcl p1, cr12, [ip], #8
+	ldcl p1, cr13, [ip], #8
+	ldcl p1, cr14, [ip], #8
+	ldcl p1, cr15, [ip], #8
+3:	tst lr,#1
 	moveq pc,lr
 	bx lr
+
+.hidden __hwcap
+1:	.word __hwcap-1b