diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-22 12:46:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-22 17:12:08 +0100 |
| commit | 9fb67204d7a00a6444bc121f221527034613d338 (patch) | |
| tree | 1f8e9715955a41577a2ee14be922683f93aa0e12 /scripts | |
| parent | 8c1df4002aa425973d7d25ffa56c042acd953bed (diff) | |
| parent | 287050d390264402e11bea8b811859e42e8faa29 (diff) | |
| download | linux-3.10-9fb67204d7a00a6444bc121f221527034613d338.tar.gz linux-3.10-9fb67204d7a00a6444bc121f221527034613d338.tar.bz2 linux-3.10-9fb67204d7a00a6444bc121f221527034613d338.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 5ad25e17b6c..4eb99ab3405 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -214,17 +214,22 @@ ifdef BUILD_C_RECORDMCOUNT # The empty.o file is created in the make process in order to determine # the target endianness and word size. It is made before all other C # files, including recordmcount. -cmd_record_mcount = if [ $(@) != "scripts/mod/empty.o" ]; then \ - $(objtree)/scripts/recordmcount "$(@)"; \ - fi; +sub_cmd_record_mcount = \ + if [ $(@) != "scripts/mod/empty.o" ]; then \ + $(objtree)/scripts/recordmcount "$(@)"; \ + fi; else -cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ +sub_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) $(KBUILD_CFLAGS)" \ "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ "$(if $(part-of-module),1,0)" "$(@)"; endif +cmd_record_mcount = \ + if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then \ + $(sub_cmd_record_mcount) \ + fi; endif define rule_cc_o_c |