Commit cc6acc11 authored Nov 09, 2016 by Nicholas Piggin Committed by Michal Marek Nov 09, 2016

kbuild: be more careful about matching preprocessed asm ___EXPORT_SYMBOL



The CRC code for asm exports grabs the preprocessed asm, finds the
___EXPORT_SYMBOL and turns those into EXPORT_SYMBOL in a C program
that can be preprocessed and parsed to create the CRC signatures from
the type.

The existing regex matching and replacement is too strict, and doesn't
deal well with whitespace among other things. The line
" EXPORT_SYMBOL(sym)" in a .S file would not match due to initial
whitespace, for example, which resulted in x86's ___preempt_schedule
failing to get CRCs.

Reported-by: Philip Müller <philm@manjaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.com>

parent 90944e40

scripts/Makefile.build

+2 −2

Original line number	Diff line number	Diff line
		@@ -332,8 +332,8 @@ cmd_gensymtypes_S = \
		(echo "\#include <linux/kernel.h>" ; \
		echo "\#include <asm/asm-prototypes.h>" ; \
		$(CPP) $(a_flags) $< \| \
		grep ^___EXPORT_SYMBOL \| \
		sed 's/___EXPORT_SYMBOL $[a-zA-Z0-9_]$,./EXPORT_SYMBOL(\1);/' ) \| \
		grep "\<___EXPORT_SYMBOL\>" \| \
		sed 's/.___EXPORT_SYMBOL[[:space:]]$[a-zA-Z0-9_]$[[:space:]],.*/EXPORT_SYMBOL(\1);/' ) \| \
		$(CPP) -D__GENKSYMS__ $(c_flags) -xc - \| \
		$(GENKSYMS) $(if $(1), -T $(2)) \
		$(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX)) \

Admin message