commit 831b4bca1bf621119da7c64bb4736dd4f1b39fed
author Than McIntosh <thanm@google.com> Wed Dec 16 12:10:32 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 16 12:10:32 2015 +0000
tree 6714b3e391e0204ea5b61d042ade823d28e381fa
parent 17f2961cd657db074440f970ddf3d3a2b5a0fe28
parent 9d76c757820701587013aa295f4482c915d4b166

Merge "Re-enable gold linker for aarch64."
am: 9d76c75782

* commit '9d76c757820701587013aa295f4482c915d4b166':
  Re-enable gold linker for aarch64.

core/combo/TARGET_linux-arm64.mk

diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk
index fbf8ab0..bc89bc9 100644
--- a/core/combo/TARGET_linux-arm64.mk
+++ b/core/combo/TARGET_linux-arm64.mk
@@ -115,6 +115,8 @@
 			-Wl,-maarch64linux \
 			-Wl,--hash-style=gnu \
 			-Wl,--fix-cortex-a53-843419 \
+			-fuse-ld=gold \
+			-Wl,--icf=safe \
 			-Wl,--no-undefined-version \
 			$(arch_variant_ldflags)