From e4256f5759a19a2933ed9944e1d4d41ee26a76f5 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 27 Oct 2015 18:18:46 +0000 Subject: [PATCH] Revert "Enable gold linker for aarch64." Causes build failures on Darwin. prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 5 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols. prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 8 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols. prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 11 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols. prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: error: treating warnings as errors This reverts commit 127d110172818c7dce14fefcc72b07a18686ee9c. Change-Id: I1d3de90f5ae777b66a8f94fbcc9ccde8a9e3001c --- core/combo/TARGET_linux-arm64.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index ce7f62e351..b213ea735d 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -110,8 +110,6 @@ TARGET_GLOBAL_LDFLAGS += \ -Wl,-maarch64linux \ -Wl,--hash-style=gnu \ -Wl,--fix-cortex-a53-843419 \ - -fuse-ld=gold \ - -Wl,--icf=safe \ $(arch_variant_ldflags) # Disable transitive dependency library symbol resolving.