Merge "Remove __CTOR_LIST__ from mips/mips64."
diff --git a/linker/arch/arm/begin.S b/linker/arch/arm/begin.S
index e259902..8cb599b 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 c96ede7..a6ea583 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 aff4660..7945a31 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
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index bb00648..d4b0396 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -28,8 +28,8 @@
LOCAL_MODULE_STEM_64 := $(module)64
else
ifeq ($($(module)_install_to_out_data),true)
- LOCAL_MODULE_PATH_32 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(module)
- LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)64/$(module)
+ LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/$(module)
+ LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(module)
endif
endif