commit d37bf4e99509aeb98706a1a2d273f39b92c7cfdb
author Andrew Hsieh <andrewhsieh@google.com> Tue Apr 15 23:37:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 15 23:37:09 2014 +0000
tree c476bca3244227a24298d111e356dcd015bfd99a
parent c73e461537678af2c29fcc38857e26fa57103710
parent f93c7c70247fb11dc99361c309bd6bd7b859e30e

am f93c7c70: am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux"

* commit 'f93c7c70247fb11dc99361c309bd6bd7b859e30e':
  Add -Wl,-maarch64linux

core/combo/TARGET_linux-arm64.mk

diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk
index e894f6d..6bb3754 100644
--- a/core/combo/TARGET_linux-arm64.mk
+++ b/core/combo/TARGET_linux-arm64.mk
@@ -114,6 +114,7 @@
 			-Wl,-z,noexecstack \
 			-Wl,--warn-shared-textrel \
 			-Wl,--fatal-warnings \
+			-Wl,-maarch64linux \
 			$(arch_variant_ldflags)
 
 TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden