From 976c0fdcb55fafc55682d86441e5293d8aa5259d Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 21 Jul 2013 03:48:35 -0400 Subject: remove init/fini array asm from arm crti/crtn files this code has been replaced by portable C code that works on all archs. the old asm needs to be removed or ctors/dtors will run twice. --- crt/arm/crtn.s | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'crt/arm/crtn.s') diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s index eb0e883e..1b626c0a 100644 --- a/crt/arm/crtn.s +++ b/crt/arm/crtn.s @@ -1,31 +1,11 @@ -.weak __init_array_start -.weak __init_array_end -.hidden __init_array_start -.hidden __init_array_end - .section .init - 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} + pop {r0,lr} tst lr,#1 moveq pc,lr bx lr -2: .word __init_array_start-1b - .word __init_array_end-1b .section .fini - pop {r4,r5,r6,lr} + pop {r0,lr} tst lr,#1 moveq pc,lr bx lr -- cgit v1.2.1