diff --git a/linker/arch/arm/begin.S b/linker/arch/arm/begin.S index e2599027a..8cb599b7c 100644 --- a/linker/arch/arm/begin.S +++ b/linker/arch/arm/begin.S @@ -26,20 +26,12 @@ * SUCH DAMAGE. */ - .text - .align 4 - .type _start,#function - .globl _start +#include <private/bionic_asm.h> -_start: - mov r0, sp - mov r1, #0 - bl __linker_init +ENTRY(_start) + mov r0, sp + bl __linker_init - /* linker init returns the _entry address in the main image */ - mov pc, r0 - - .section .ctors, "wa" - .globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 + /* linker init returns the _entry address in the main image */ + mov pc, r0 +END(_start) diff --git a/linker/arch/arm64/begin.S b/linker/arch/arm64/begin.S index c96ede787..a6ea583af 100644 --- a/linker/arch/arm64/begin.S +++ b/linker/arch/arm64/begin.S @@ -30,8 +30,7 @@ ENTRY(_start) mov x0, sp - mov x1, xzr - bl __linker_init + bl __linker_init /* linker init returns the _entry address in the main image */ br x0 diff --git a/linker/arch/x86_64/begin.S b/linker/arch/x86_64/begin.S index aff46600d..7945a3111 100644 --- a/linker/arch/x86_64/begin.S +++ b/linker/arch/x86_64/begin.S @@ -29,7 +29,6 @@ #include <private/bionic_asm.h> ENTRY(_start) - /* Pass elfdata to __linker_init. */ mov %rsp, %rdi call __linker_init