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

* commit 'b9d95b5d2f6eb748c0fdb83087b96bdb1cb5ef24':
  Don't zero r1 on entry to the dynamic linker.
This commit is contained in:
Elliott Hughes 2014-07-09 16:36:24 +00:00 committed by Android Git Automerger
commit dc0b68e5ee
3 changed files with 8 additions and 18 deletions

View File

@ -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)

View File

@ -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

View File

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