kbuild: do not export LDFLAGS_vmlinux
Subsystems (2)
PATCH 1/1 kbuild: do not export LDFLAGS_vmlinux
When you clean the build tree for ARCH=arm, you may see the following error message:
$ make -j24 ARCH=arm clean CLEAN arch/arm/crypto CLEAN arch/arm/kernel CLEAN arch/arm/mach-at91 CLEAN arch/arm/mach-omap2 CLEAN arch/arm/vdso CLEAN certs CLEAN lib CLEAN usr CLEAN net/wireless CLEAN drivers/firmware/efi/libstub nm: 'arch/arm/boot/compressed/../../../../vmlinux': No such file /bin/sh: 1: arithmetic expression: expecting primary: " " CLEAN arch/arm/boot/compressed CLEAN drivers/scsi CLEAN drivers/tty/vt CLEAN arch/arm/boot CLEAN vmlinux.symvers modules.builtin modules.builtin.modinfo
Even if you run the same command again, the error message is not shown despite vmlinux is already gone.
To reproduce it, the parallel option -j is needed. Single thread cleaning always executes 'archclean', 'vmlinuxclean' in this order, so vmlinux still exists when arch/arm/boot/compressed/ is cleaned.
Looking at arch/arm/boot/compressed/Makefile does not help understand the reason of the error message. Both KBSS_SZ and LDFLAGS_vmlinux are assigned with '=' operator, hence, they are not expanded until they are used. Obviously, 'make clean' does not use them.
In fact, the root cause exists in the top Makefile:
export LDFLAGS_vmlinux
Since LDFLAGS_vmlinux is an exported variable, LDFLAGS_vmlinux in arch/arm/boot/compressed/Makefile is expanded when scripts/Makefile.clean has a command to execute. This is why the error message shows up only when there exist build artifacts in arch/arm/boot/compressed/.
Adding 'unexport LDFLAGS_vmlinux' to arch/arm/boot/compressed/Makefile will fix it as far as ARCH=arm is concerned, but I believe the proper fix is to get rid of 'export LDFLAGS_vmlinux' from the top Makefile.
LDFLAGS_vmlinux in the top Makefile contains linker flags for the top vmlinux. LDFLAGS_vmlinux in arch/arm/boot/compressed/Makefile is for arch/arm/boot/compressed/vmlinux. They just happen to have the same variable name, but are used for different purposes. Exporting the former bothers the decompressor Makefiles.
This commit passes LDFLAGS_vmlinux to scripts/link-vmlinux.sh via a command line parameter instead of via an environment variable. LD and KBUILD_LDFLAGS are exported, but I did the same for consistency. Anyway, they must be included in cmd_link-vmlinux to allow if_changed to detect the changes in LD or KBUILD_LDFLAGS.
The following Makefiles are not affected:
arch/arm/boot/compressed/Makefile
arch/h8300/boot/compressed/Makefile
arch/nios2/boot/compressed/Makefile
arch/parisc/boot/compressed/Makefile
arch/s390/boot/compressed/Makefile
arch/sh/boot/compressed/Makefile
arch/sh/boot/romimage/Makefile
arch/x86/boot/compressed/Makefile
They use ':=' or '=' to clear the LDFLAGS_vmlinux inherited from the top Makefile.
We need to take a closer look at the impact to unicore32 and xtensa.
arch/unicore32/boot/compressed/Makefile only uses '+=' operator for LDFLAGS_vmlinux. So, the decompressor previously inherited the linker flags from the top Makefile.
However, commit 70fac51feaf2 ("unicore32 additional architecture files:
boot process") was merged before commit 1f2bfbd00e46 ("kbuild: link of vmlinux moved to a script"). So, I believe this is rather a bug fix of 1f2bfbd00e46.
arch/xtensa/boot/boot-elf/Makefile is also affected, but this is a fix for the same reason. It did not inherit LDFLAGS_vmlinux when commit 4bedea945451 ("[PATCH] xtensa: Architecture support for Tensilica Xtensa Part 2") was merged. I deleted $(LDFLAGS_vmlinux), which is now empty.
---
Makefile | 3 +-- arch/xtensa/boot/boot-elf/Makefile | 2 +- scripts/link-vmlinux.sh | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-)
Makefile +1 -2
@@ -1100,7 +1100,6 @@ KBUILD_VMLINUX_OBJS += $(patsubst %/,%/built-in.a, $(drivers-y)) export KBUILD_VMLINUX_OBJS KBUILD_VMLINUX_LIBS export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds -export LDFLAGS_vmlinux # used by scripts/Makefile.package export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) LICENSES arch include scripts tools)
@@ -1132,7 +1131,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink) # Final link of vmlinux with optional arch pass after final link cmd_link-vmlinux = \ - $(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ; \ + $(CONFIG_SHELL) $< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)"; \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE
arch/xtensa/boot/boot-elf/Makefile +1 -1
@@ -25,7 +25,7 @@ $(obj)/Image.o: vmlinux.bin $(OBJS) $(OBJS) $@ $(obj)/../Image.elf: $(obj)/Image.o $(obj)/boot.lds - $(Q)$(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) \ + $(LD) $(KBUILD_LDFLAGS) \ -T $(obj)/boot.lds \ --build-id=none \ -o $@ $(obj)/Image.o
scripts/link-vmlinux.sh +4 -0
@@ -30,6 +30,10 @@ # Error out on error set -e +LD="$1" +KBUILD_LDFLAGS="$2" +LDFLAGS_vmlinux="$3" + # Nice output in kbuild format # Will be supressed by "make -s" info()
Signature · 1 line
2.25.1
Max Filippov
maintainerOn Wed, Jul 1, 2020 at 12:30 PM Masahiro Yamada <[email protected]> wrote:
[...]
arch/xtensa/boot/boot-elf/Makefile $(obj)/Image.o: vmlinux.bin $(OBJS) · line 28
Quoted 10 lines
arch/xtensa/boot/boot-elf/Makefile +1
-1@@ -25,7 +25,7 @@ $(obj)/Image.o: vmlinux.bin $(OBJS) $(OBJS) $@ $(obj)/../Image.elf: $(obj)/Image.o $(obj)/boot.lds - $(Q)$(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) \ + $(LD) $(KBUILD_LDFLAGS) \
Can that $(Q) be retained, please?
The rest LGTM.
Quoted 3 lines
arch/xtensa/boot/boot-elf/Makefile +0
-0-T $(obj)/boot.lds \ --build-id=none \ -o $@ $(obj)/Image.o
Signature · 2 lines
Thanks. -- Max
Quoted 14 lines · Masahiro Yamada
When you clean the build tree for ARCH=arm, you may see the following error message:
$ make -j24 ARCH=arm clean CLEAN arch/arm/crypto CLEAN arch/arm/kernel CLEAN arch/arm/mach-at91 CLEAN arch/arm/mach-omap2 CLEAN arch/arm/vdso CLEAN certs CLEAN lib CLEAN usr CLEAN net/wireless
Quoted 8 lines
CLEAN drivers/firmware/efi/libstub nm: 'arch/arm/boot/compressed/../../../../vmlinux': No such file /bin/sh: 1: arithmetic expression: expecting primary: " " CLEAN arch/arm/boot/compressed CLEAN drivers/scsi CLEAN drivers/tty/vt CLEAN arch/arm/boot CLEAN vmlinux.symvers modules.builtin modules.builtin.modinfo
Thanks for the patch, Masahiro. This fixes the issue I was also observing. Curious case of shadowing env vars.
Quoted 128 lines
Even if you run the same command again, the error message is not shown despite vmlinux is already gone.
To reproduce it, the parallel option -j is needed. Single thread cleaning always executes 'archclean', 'vmlinuxclean' in this order, so vmlinux still exists when
arch/arm/boot/compressed/is cleaned.Looking at
arch/arm/boot/compressed/Makefiledoes not help understand the reason of the error message. BothKBSS_SZandLDFLAGS_vmlinuxare assigned with '=' operator, hence, they are not expanded until they are used. Obviously, 'make clean' does not use them.In fact, the root cause exists in the top
Makefile:export
LDFLAGS_vmlinuxSince
LDFLAGS_vmlinuxis an exported variable,LDFLAGS_vmlinuxinarch/arm/boot/compressed/Makefileis expanded whenscripts/Makefile.cleanhas a command to execute. This is why the error message shows up only when there exist build artifacts inarch/arm/boot/compressed/.Adding 'unexport
LDFLAGS_vmlinux' toarch/arm/boot/compressed/Makefilewill fix it as far as ARCH=arm is concerned, but I believe the proper fix is to get rid of 'exportLDFLAGS_vmlinux' from the topMakefile.
LDFLAGS_vmlinuxin the topMakefilecontains linker flags for the top vmlinux.LDFLAGS_vmlinuxinarch/arm/boot/compressed/Makefileis forarch/arm/boot/compressed/vmlinux. They just happen to have the same variable name, but are used for different purposes. Exporting the former bothers the decompressor Makefiles.This commit passes
LDFLAGS_vmlinuxtoscripts/link-vmlinux.shvia a command line parameter instead of via an environment variable. LD andKBUILD_LDFLAGSare exported, but I did the same for consistency. Anyway, they must be included in cmd_link-vmlinux to allowif_changedto detect the changes in LD orKBUILD_LDFLAGS.The following Makefiles are not affected:
arch/arm/boot/compressed/Makefile
arch/h8300/boot/compressed/Makefile
arch/nios2/boot/compressed/Makefile
arch/parisc/boot/compressed/Makefile
arch/s390/boot/compressed/Makefile
arch/sh/boot/compressed/Makefile
arch/sh/boot/romimage/Makefile
arch/x86/boot/compressed/MakefileThey use ':=' or '=' to clear the
LDFLAGS_vmlinuxinherited from the topMakefile.We need to take a closer look at the impact to unicore32 and xtensa.
arch/unicore32/boot/compressed/Makefileonly uses '+=' operator forLDFLAGS_vmlinux. So, the decompressor previously inherited the linker flags from the topMakefile.However, commit
70fac51feaf2("unicore32 additional architecture files:
boot process") was merged before commit1f2bfbd00e46("kbuild: link of vmlinux moved to a script"). So, I believe this is rather a bug fix of1f2bfbd00e46.
arch/xtensa/boot/boot-elf/Makefileis also affected, but this is a fix for the same reason. It did not inheritLDFLAGS_vmlinuxwhen commit4bedea945451("[PATCH] xtensa: Architecture support for Tensilica Xtensa Part 2") was merged. I deleted $(LDFLAGS_vmlinux), which is now empty.Signed-off-by Masahiro Yamada <[email protected]>---
Makefile | 3 +-- arch/xtensa/boot/boot-elf/Makefile | 2 +- scripts/link-vmlinux.sh | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-)Makefile +1
-2@@ -1100,7 +1100,6 @@ KBUILD_VMLINUX_OBJS += $(patsubst %/,%/built-in.a, $(drivers-y)) export KBUILD_VMLINUX_OBJS KBUILD_VMLINUX_LIBS export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds -export LDFLAGS_vmlinux # used by scripts/Makefile.package export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) LICENSES arch include scripts tools)@@ -1132,7 +1131,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink) # Final link of vmlinux with optional arch pass after final link cmd_link-vmlinux = \ - $(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ; \ + $(CONFIG_SHELL) $< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)"; \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCEarch/xtensa/boot/boot-elf/Makefile +1
-1@@ -25,7 +25,7 @@ $(obj)/Image.o: vmlinux.bin $(OBJS) $(OBJS) $@ $(obj)/../Image.elf: $(obj)/Image.o $(obj)/boot.lds - $(Q)$(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) \ + $(LD) $(KBUILD_LDFLAGS) \ -T $(obj)/boot.lds \ --build-id=none \ -o $@ $(obj)/Image.oscripts/link-vmlinux.sh +4
-1@@ -30,6 +30,10 @@ # Error out on error set -e +LD="$1" +KBUILD_LDFLAGS="$2" +LDFLAGS_vmlinux="$3" + # Nice output in kbuild format # Will be supressed by "make -s" info() --2.25.1
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 12 lines · Max Filippov
On Wed, Jul 1, 2020 at 12:30 PM Masahiro Yamada <[email protected]> wrote:
[...]
Quoted 7 lines
arch/xtensa/boot/boot-elf/Makefile +0
-0@@ -25,7 +25,7 @@ $(obj)/Image.o: vmlinux.bin $(OBJS) $(OBJS) $@
Quoted 6 lines
arch/xtensa/boot/boot-elf/Makefile $(obj)/Image.o: vmlinux.bin $(OBJS) · line 28
Quoted 3 lines
arch/xtensa/boot/boot-elf/Makefile +1
-1$(obj)/../Image.elf: $(obj)/Image.o $(obj)/boot.lds - $(Q)$(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) \ + $(LD) $(KBUILD_LDFLAGS) \Can that $(Q) be retained, please?
The rest LGTM.
Oops, I temporarily deleted $(Q) for debugging,
then accidentally committed it.
I will restore $(Q) when this patch is applied.
Thanks.
Quoted 7 lines
arch/xtensa/boot/boot-elf/Makefile $(obj)/Image.o: vmlinux.bin $(OBJS) · line 31
Quoted 3 lines
arch/xtensa/boot/boot-elf/Makefile +0
-0-T $(obj)/boot.lds \ --build-id=none \ -o $@ $(obj)/Image.o--
Thanks.
-- Max
Signature · 2 lines
Best Regards Masahiro Yamada