diff options
| author | Andrey Panov <rockford@yandex.ru> | 2017-05-11 20:54:15 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-05-17 08:18:20 +0200 |
| commit | 333ff7b1e4c444df565c3e4bbec51da27add0076 (patch) | |
| tree | 9610aa98b2fa66e56cc5eec2375fc725d84d9eab | |
| parent | 0d86982d3dbcde7ca958fffe3bc57850bc7f43d8 (diff) | |
| download | barebox-333ff7b1e4c444df565c3e4bbec51da27add0076.tar.gz barebox-333ff7b1e4c444df565c3e4bbec51da27add0076.tar.xz | |
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-- | Makefile | 3 | ||||
| -rw-r--r-- | images/Makefile | 3 | ||||
| -rw-r--r-- | scripts/Kbuild.include | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -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 adf950aa9c..8c5dac4bff 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 c7faf67a2b..310dcdc941 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) |