summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-07-25 13:40:30 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-07-25 13:40:30 -0700
commitb7391efbf03d47876fd0747a5cf2199f6b4a503a (patch)
tree037610f51333e4876e4de227474a2983227835ad /core
parent297d6c02bc1e1c63404d8d81df28f3f13046fe85 (diff)
parentbae121afcda8ffdca9cc03030f790121af251cea (diff)
downloadbuild-b7391efbf03d47876fd0747a5cf2199f6b4a503a.zip
build-b7391efbf03d47876fd0747a5cf2199f6b4a503a.tar.gz
build-b7391efbf03d47876fd0747a5cf2199f6b4a503a.tar.bz2
Merge "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 $@ \