am c4c67893: Merge "Don\'t zero r1 on entry to the dynamic linker."

* commit 'c4c6789362b82150e3f16cd655032f7ab2a1b6d6':
  Don't zero r1 on entry to the dynamic linker.
This commit is contained in:
Elliott Hughes 2014-07-12 01:41:46 +00:00 committed by Android Git Automerger
commit 986fb56579
3 changed files with 8 additions and 18 deletions

View File

@ -26,20 +26,12 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
.text #include <private/bionic_asm.h>
.align 4
.type _start,#function
.globl _start
_start: ENTRY(_start)
mov r0, sp mov r0, sp
mov r1, #0 bl __linker_init
bl __linker_init
/* linker init returns the _entry address in the main image */ /* linker init returns the _entry address in the main image */
mov pc, r0 mov pc, r0
END(_start)
.section .ctors, "wa"
.globl __CTOR_LIST__
__CTOR_LIST__:
.long -1

View File

@ -30,8 +30,7 @@
ENTRY(_start) ENTRY(_start)
mov x0, sp mov x0, sp
mov x1, xzr bl __linker_init
bl __linker_init
/* linker init returns the _entry address in the main image */ /* linker init returns the _entry address in the main image */
br x0 br x0

View File

@ -29,7 +29,6 @@
#include <private/bionic_asm.h> #include <private/bionic_asm.h>
ENTRY(_start) ENTRY(_start)
/* Pass elfdata to __linker_init. */
mov %rsp, %rdi mov %rsp, %rdi
call __linker_init call __linker_init