summaryrefslogtreecommitdiffstats
path: root/arch/arm/pbl
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-03-15 08:10:55 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-03-18 10:13:05 +0100
commitc00193a57b3c7024dd14b49f0f826bdccbe89153 (patch)
tree2061c36697cd0eef3f4a72c58b2adcc710fcd322 /arch/arm/pbl
parent4d9d350ec93999714ae45113e5b69bb4e606085c (diff)
downloadbarebox-c00193a57b3c7024dd14b49f0f826bdccbe89153.tar.gz
barebox-c00193a57b3c7024dd14b49f0f826bdccbe89153.tar.xz
Revert "fix zbarebox linking with new ld"
--no-dynamic-linker is already added just a few lines below, do not add the option twice. This option also needs to be embedded in a test if the linker supports this option which we already have in the other place adding this option. This reverts commit 25de30638a2859f9e07c61821cdc71906b7169b8.
Diffstat (limited to 'arch/arm/pbl')
-rw-r--r--arch/arm/pbl/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile
index 2c28f56034..5d7e85b373 100644
--- a/arch/arm/pbl/Makefile
+++ b/arch/arm/pbl/Makefile
@@ -31,7 +31,7 @@ $(obj)/zbarebox.S: $(obj)/zbarebox FORCE
$(call if_changed,disasm)
PBL_CPPFLAGS += -fdata-sections -ffunction-sections
-LDFLAGS_zbarebox := -Map $(obj)/zbarebox.map --gc-sections --no-dynamic-linker
+LDFLAGS_zbarebox := -Map $(obj)/zbarebox.map --gc-sections
ifdef CONFIG_PBL_RELOCATABLE
LDFLAGS_zbarebox += -pie
else