| From 2538ffd3e39a6987cd9d796f49c3d83f752e30b7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 19 Nov 2019 16:39:42 +0100 |
| Subject: ARM: 8939/1: kbuild: use correct nm executable |
| |
| From: Dmitry Golovin <dima@golovin.in> |
| |
| [ Upstream commit 29c623d64f0dcd6aa10e0eabd16233e77114090b ] |
| |
| Since $(NM) variable can be easily overridden for the whole build, it's |
| better to use it instead of $(CROSS_COMPILE)nm. The use of $(CROSS_COMPILE) |
| prefixed variables where their calculated equivalents can be used is |
| incorrect. This fixes issues with builds where $(NM) is set to llvm-nm. |
| |
| Link: https://github.com/ClangBuiltLinux/linux/issues/766 |
| |
| Signed-off-by: Dmitry Golovin <dima@golovin.in> |
| Suggested-by: Nick Desaulniers <ndesaulniers@google.com> |
| Cc: Matthias Maennich <maennich@google.com> |
| Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> |
| Tested-by: Nathan Chancellor <natechancellor@gmail.com> |
| Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/compressed/Makefile | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile |
| index 1f5a5ffe7fcf8..c762004572eff 100644 |
| --- a/arch/arm/boot/compressed/Makefile |
| +++ b/arch/arm/boot/compressed/Makefile |
| @@ -120,7 +120,7 @@ ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin -I$(obj) |
| asflags-y := -DZIMAGE |
| |
| # Supply kernel BSS size to the decompressor via a linker symbol. |
| -KBSS_SZ = $(shell echo $$(($$($(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \ |
| +KBSS_SZ = $(shell echo $$(($$($(NM) $(obj)/../../../../vmlinux | \ |
| sed -n -e 's/^\([^ ]*\) [AB] __bss_start$$/-0x\1/p' \ |
| -e 's/^\([^ ]*\) [AB] __bss_stop$$/+0x\1/p') )) ) |
| LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ) |
| @@ -166,7 +166,7 @@ $(obj)/bswapsdi2.S: $(srctree)/arch/$(SRCARCH)/lib/bswapsdi2.S |
| # The .data section is already discarded by the linker script so no need |
| # to bother about it here. |
| check_for_bad_syms = \ |
| -bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \ |
| +bad_syms=$$($(NM) $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \ |
| [ -z "$$bad_syms" ] || \ |
| ( echo "following symbols must have non local/private scope:" >&2; \ |
| echo "$$bad_syms" >&2; rm -f $@; false ) |
| -- |
| 2.25.1 |
| |
