Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9810a82 authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 6317/1: ftrace: pass KBUILD_CFLAGS to record_mcount.pl 



On ARM, we have two ABIs, and the ABI used is controlled via a config
option.  Object files built with one ABI can't be merged with object
files built with the other ABI.  So, record_mcount.pl needs to use the
same compiler flags as the kernel when generating the object file with
the mcount locations.  Ensure this by passing CFLAGS to the script.

Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a3ba87a6

scripts/Makefile.build

+2 −1
Original line number Diff line number Diff line
@@ -212,7 +212,8 @@ ifdef CONFIG_FTRACE_MCOUNT_RECORD 
cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \

	"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \

	"$(if $(CONFIG_64BIT),64,32)" \

	"$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \

	"$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \

	"$(LD)" "$(NM)" "$(RM)" "$(MV)" \

	"$(if $(part-of-module),1,0)" "$(@)";

endif