summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-07-25 14:25:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-25 14:25:30 -0700
commitc759e468995417a0c8c0ca7ca38e4c937a176ab8 (patch)
tree2eff521874cf7c939585b1f7949f59c9b396ab38 /core
parentf0daadf6988c823355e9b59996e3dc798b7b7619 (diff)
parentb7391efbf03d47876fd0747a5cf2199f6b4a503a (diff)
downloadbuild-c759e468995417a0c8c0ca7ca38e4c937a176ab8.zip
build-c759e468995417a0c8c0ca7ca38e4c937a176ab8.tar.gz
build-c759e468995417a0c8c0ca7ca38e4c937a176ab8.tar.bz2
am b7391efb: Merge "Add -fuse-ld=bfd to x86 target"
* commit 'b7391efbf03d47876fd0747a5cf2199f6b4a503a': Add -fuse-ld=bfd to x86 target
Diffstat (limited to 'core')
-rw-r--r--core/combo/TARGET_linux-x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 28c031d..9c0f7b9 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -186,12 +186,14 @@ $(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 $@ \