summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2010-08-10 19:39:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-09-02 15:26:39 +0100
commitf9810a82536e0c730c57844753e6c08cc7f77881 (patch)
tree24d52d7da9518c1b426292ff99ca567f1c6dba28 /scripts
parenta3ba87a614992500cf2c47e6f788e74a971ce91f (diff)
downloadlinux-stable-f9810a82536e0c730c57844753e6c08cc7f77881.tar.gz
linux-stable-f9810a82536e0c730c57844753e6c08cc7f77881.tar.bz2
linux-stable-f9810a82536e0c730c57844753e6c08cc7f77881.zip
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: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.build3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index a1a5cf95a68d..108eeb99351d 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -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