summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2015-03-01 14:12:37 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-03-02 07:11:15 +0100
commit5adb65518eae2ed93381f05dc83d2502d660133f (patch)
tree1396ea47514d3d3c386c84a211f01b91e1d6f33c /images
parent8f455cd24bac834de66da1715546379b30f97b0f (diff)
downloadbarebox-5adb65518eae2ed93381f05dc83d2502d660133f.tar.gz
barebox-5adb65518eae2ed93381f05dc83d2502d660133f.tar.xz
ARM: do not specify -static and -pie at the same time
PIE is a form of dynamic linking and thus inherently incompatible with -static. It worked ok as the current behavior of ld.bfd is to not respect -static if -pie has been specified. ld.gold and future versions of ld.bfd will fail to link if both of those incompatible switches are specified at the same time. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
-rw-r--r--images/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/images/Makefile b/images/Makefile
index 7c3aaf7627..f7e978cde1 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -54,7 +54,7 @@ $(pbl-lds): $(obj)/../arch/$(ARCH)/lib/pbl.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)
quiet_cmd_elf__ ?= LD $@
- cmd_elf__ ?= $(LD) $(LDFLAGS) -static --gc-sections -pie \
+ cmd_elf__ ?= $(LD) $(LDFLAGS) --gc-sections -pie \
-e $(2) -Map $@.map $(LDFLAGS_$(@F)) -o $@ \
-T $(pbl-lds) \
--start-group $(barebox-pbl-common) --end-group