summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Panov <rockford@yandex.ru>2017-05-11 20:54:15 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2017-05-24 09:16:11 +0200
commit74d8a35d4461daa2374f420aef63748f51f1f3aa (patch)
tree672c8a75aa2b6d326c20887acf7c6a087a5b3755
parent40e38042b7fa370a8221251b8efe21e2274c10cb (diff)
downloadbarebox-74d8a35d4461daa2374f420aef63748f51f1f3aa.tar.gz
Fix linking with new ld, based on u-boot
U-boot commit info: http://git.denx.de/?p=u-boot.git;a=commit;h=e391b1e64b0bd65709a28a4764afe4f32d408243 Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--Makefile3
-rw-r--r--images/Makefile3
-rw-r--r--scripts/Kbuild.include2
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 09be653..3b8d73d 100644
--- a/Makefile
+++ b/Makefile
@@ -306,6 +306,9 @@ AFLAGS := -D__ASSEMBLY__
LDFLAGS_barebox := -Map barebox.map
+# Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
+LDFLAGS_barebox += $(call ld-option, --no-dynamic-linker)
+
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
diff --git a/images/Makefile b/images/Makefile
index adf950a..8c5dac4 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -53,6 +53,9 @@ extra-y += $(pbl-lds)
$(pbl-lds): $(obj)/../arch/$(ARCH)/lib/pbl.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)
+# Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
+LDFLAGS += $(call ld-option, --no-dynamic-linker)
+
quiet_cmd_elf__ ?= LD $@
cmd_elf__ ?= $(LD) $(LDFLAGS) --gc-sections -pie \
-e $(2) -Map $@.map $(LDFLAGS_$(@F)) -o $@ \
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c7faf67..310dcdc 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -148,7 +148,7 @@ cc-ldoption = $(call try-run,\
# ld-option
# Usage: LDFLAGS += $(call ld-option, -X)
ld-option = $(call try-run,\
- $(CC) /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))
+ $(CC) -x c /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))
# ar-option
# Usage: KBUILD_ARFLAGS := $(call ar-option,D)