From d7398f146dad064dece704db9e13912f65da0acc Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 8 Oct 2013 10:05:05 -0700 Subject: [PATCH] Use linker64 for the 64-bit linker. Change-Id: I13fc7f93274f99e4cf99b077afdf5293e7233f39 --- linker/Android.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/linker/Android.mk b/linker/Android.mk index 2def99dad..e52ab709d 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -14,7 +14,7 @@ LOCAL_SRC_FILES:= \ linker.cpp \ linker_environ.cpp \ linker_phdr.cpp \ - rt.cpp + rt.cpp \ LOCAL_LDFLAGS := -shared -Wl,--exclude-libs,ALL @@ -22,7 +22,6 @@ LOCAL_CFLAGS += -fno-stack-protector \ -Wstrict-overflow=5 \ -fvisibility=hidden \ -Wall -Wextra -Werror \ - -g # We need to access Bionic private headers in the linker. LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/ @@ -43,7 +42,12 @@ ifeq ($(TARGET_ARCH),x86_64) LOCAL_CFLAGS += -DANDROID_X86_64_LINKER endif -LOCAL_MODULE:= linker +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86_64)) + LOCAL_MODULE := linker64 +else + LOCAL_MODULE := linker +endif + LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_STATIC_LIBRARIES := libc_nomalloc