commit 3ac8e28c992448aa1f0aca267275caae220c729d
author Ben Cheng <bccheng@google.com> Tue Oct 08 17:44:45 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 08 17:44:45 2013 -0700
tree 84f3cfe8b27816b7741c2466c2a2cd537c4d9e65
parent 6629f71bd30e2c52ac639d0bb69aa25e0a92feb6
parent b8eaf684cb50cd73438b87fc5bfb33a08c823f72

am b8eaf684: am 0f324e3e: am a7662295: Merge "Explictily specify the dynamic linker name."

* commit 'b8eaf684cb50cd73438b87fc5bfb33a08c823f72':
  Explictily specify the dynamic linker name.

core/combo/TARGET_linux-aarch64.mk

diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk
index bb328c5..20be4c2 100644
--- a/core/combo/TARGET_linux-aarch64.mk
+++ b/core/combo/TARGET_linux-aarch64.mk
@@ -188,7 +188,7 @@
 
 define transform-o-to-executable-inner
 $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
-	-Wl,-dynamic-linker,/system/bin/linker \
+	-Wl,-dynamic-linker,/system/bin/linker64 \
 	-Wl,-z,nocopyreloc \
 	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
 	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \