x86, build: Don't get confused by local symbols (ac008fe0) · Commits · 戴 / test

arch/x86/crypto/sha1_avx2_x86_64_asm.S introduced _end as a local symbol, which broke the build under certain circumstances. Although the wisdom of _end as a local symbol can definitely be questioned, the build should not break for that reason. Thus, filter the output of nm to only get global symbols of appropriate type. Reported-by:

Andy Lutomirski <luto@amacapital.net> Cc: Chandramouli Narayanan <mouli@linux.intel.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by:

H. Peter Anvin <hpa@linux.intel.com> Link: http://lkml.kernel.org/n/tip-uxm3j3w3odglcwhafwq5tjqu@git.kernel.org

arch/x86/boot/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE

		SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))

		sed-voffset := -e 's/^$[0-9a-fA-F]*$ . $_text\\|_end$$$/\#define VO_\2 0x\1/p'
		sed-voffset := -e 's/^$[0-9a-fA-F]*$ [ABCDGRSTVW] $_text\\|_end$$$/\#define VO_\2 0x\1/p'

		quiet_cmd_voffset = VOFFSET $@
		cmd_voffset = $(NM) $< \| sed -n $(sed-voffset) > $@
		@@ -80,7 +80,7 @@ targets += voffset.h
		$(obj)/voffset.h: vmlinux FORCE
		$(call if_changed,voffset)

		sed-zoffset := -e 's/^$[0-9a-fA-F]$ . $startup_32\\|startup_64\\|efi32_stub_entry\\|efi64_stub_entry\\|efi_pe_entry\\|input_data\\|_end\\|z_.$$$/\#define ZO_\2 0x\1/p'
		sed-zoffset := -e 's/^$[0-9a-fA-F]$ [ABCDGRSTVW] $startup_32\\|startup_64\\|efi32_stub_entry\\|efi64_stub_entry\\|efi_pe_entry\\|input_data\\|_end\\|z_.$$$/\#define ZO_\2 0x\1/p'

		quiet_cmd_zoffset = ZOFFSET $@
		cmd_zoffset = $(NM) $< \| sed -n $(sed-zoffset) > $@

Admin message