summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-28 13:16:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-28 13:16:57 -0700
commit5c90337229ee75c8e4e99f59b42585a8fa5089db (patch)
treecdbd2336d5b4f2021e609dee3755a80099c83ea1 /core
parent28f37bb992853a877980ea0d1040df2e46ee71c1 (diff)
parent9e2b4718a0e11a723904ba205a5156bae450be30 (diff)
downloadbuild-5c90337229ee75c8e4e99f59b42585a8fa5089db.zip
build-5c90337229ee75c8e4e99f59b42585a8fa5089db.tar.gz
build-5c90337229ee75c8e4e99f59b42585a8fa5089db.tar.bz2
am 9e2b4718: Merge "Use gold linker on x86"
* commit '9e2b4718a0e11a723904ba205a5156bae450be30': Use gold linker on x86
Diffstat (limited to 'core')
-rw-r--r--core/combo/TARGET_linux-x86.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 9c0f7b9..f12ad3e 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -186,14 +186,11 @@ $(hide) $(PRIVATE_CXX) \
endef
-# Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
define transform-o-to-executable-inner
$(hide) $(PRIVATE_CXX) \
$(TARGET_GLOBAL_LDFLAGS) \
-nostdlib -Bdynamic \
-Wl,-dynamic-linker,/system/bin/linker \
- -Wl,--copy-dt-needed-entries \
- -fuse-ld=bfd \
-Wl,-z,nocopyreloc \
-fPIE -pie \
-o $@ \