diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-10-19 08:21:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-19 08:21:10 +0200 |
| commit | 1fa41266e9d20f6d66f9d7d067d9825e2c1002b9 (patch) | |
| tree | b3ba44e8efecece22265f9914bbe991ccbd0f9a3 | |
| parent | jump_label: Add COND_STMT(), reducer wrappery (diff) | |
| parent | ftrace: Remove recursion between recordmcount and scripts/mod/empty (diff) | |
| download | wireguard-linux-1fa41266e9d20f6d66f9d7d067d9825e2c1002b9.tar.xz wireguard-linux-1fa41266e9d20f6d66f9d7d067d9825e2c1002b9.zip | |
Merge branch 'tip/perf/recordmcount-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
| -rw-r--r-- | scripts/Makefile.build | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 4db60b2e2a76..843bd4f4ffc9 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -210,7 +210,13 @@ endif ifdef CONFIG_FTRACE_MCOUNT_RECORD ifdef BUILD_C_RECORDMCOUNT -cmd_record_mcount = $(objtree)/scripts/recordmcount "$(@)"; +# Due to recursion, we must skip empty.o. +# 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; else cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ |