Merge "Use linker64 for the 64-bit linker."

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