2 files changed, 40 insertions, 4 deletions

diff --git a/crt/arm/crti.s b/crt/arm/crti.s
index 0dd978a8..2f658b76 100644
--- a/crt/arm/crti.s
+++ b/crt/arm/crti.s
@@ -1,9 +1,27 @@
 .section .init
 .global _init
 _init:
-	push {lr}
+	push {r0,r1,r2,r4,r5,lr}
+
+.weak __fini_array_start
+.weak __fini_array_end
 
 .section .fini
 .global _fini
 _fini:
-	push {lr}
+	push {r4,r5,r6,lr}
+	adr lr, 1f
+	ldr r4, 2f
+	ldr r5, 2f+4
+	add r4, r4, lr
+	add r5, r5, lr
+1:	adr lr, 1b
+	cmp r4, r5
+	beq 3f
+	ldmia r4!, {r3}
+	tst r3,#1
+	moveq pc,r3
+	bx r3
+2:	.word __fini_array_start-1b
+	.word __fini_array_end-1b
+3:	
diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s
index 5d5d6454..928e0686 100644
--- a/crt/arm/crtn.s
+++ b/crt/arm/crtn.s
@@ -1,11 +1,29 @@
+.weak __init_array_start
+.weak __init_array_end
+
 .section .init
-	pop {lr}
+	adr lr, 1f
+	ldr r4, 2f
+	ldr r5, 2f+4
+	add r4, r4, lr
+	add r5, r5, lr
+1:	adr lr, 1b
+	cmp r4, r5
+	beq 3f
+	ldmia r4!, {r3}
+	ldm sp, {r0,r1,r2}
+	tst r3,#1
+	moveq pc,r3
+	bx r3
+3:	pop {r0,r1,r2,r4,r5,lr}
 	tst lr,#1
 	moveq pc,lr
 	bx lr
+2:	.word __init_array_start-1b
+	.word __init_array_end-1b
 
 .section .fini
-	pop {lr}
+	pop {r4,r5,r6,lr}
 	tst lr,#1
 	moveq pc,lr
 	bx lr