History

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Ingo Molnar committed 15 years ago

Commit 9fb67202 parents 8c1df40 287050d7 files · +77 −18Browse files

Showing the changes to scripts (1 of 7 files). Show all

Unified · Split

scripts/Makefile.build+9−4
@@ -214,17 +214,22 @@ ifdef BUILD_C_RECORDMCOUNT · 213 unmodified lines
214214 # The empty.o file is created in the make process in order to determine
215215 # the target endianness and word size. It is made before all other C
216216 # files, including recordmcount.
217−cmd_record_mcount = if [ $(@) != "scripts/mod/empty.o" ]; then \
218− $(objtree)/scripts/recordmcount "$(@)"; \
219− fi;
217+sub_cmd_record_mcount = \
218+ if [ $(@) != "scripts/mod/empty.o" ]; then \
219+ $(objtree)/scripts/recordmcount "$(@)"; \
220+ fi;
220221 else
221−cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
222+sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
222223 "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
223224 "$(if $(CONFIG_64BIT),64,32)" \
224225 "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \
225226 "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
226227 "$(if $(part-of-module),1,0)" "$(@)";
227228 endif
229+cmd_record_mcount = \
230+ if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then \
231+ $(sub_cmd_record_mcount) \
232+ fi;
228233 endif
229234
230235 define rule_cc_o_c