From: Irina Tirdea <[email protected]> The default name for objdump is "objdump". For cross-compiling the name of objdump will be different (e.g. arm-eabi-objdump in Android).
Setting the default objdump name in the Makefile with PERF_OBJDUMP_PATH. Signed-off-by: Irina Tirdea <[email protected]> --- tools/perf/Makefile | 4 ++++ tools/perf/util/annotate.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 9021a1f..3d28150 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -140,6 +140,7 @@ ETC_PERFCONFIG = etc/perfconfig endif lib = lib PERF_TMP_DIR = /tmp +objdump = objdump export prefix bindir sharedir sysconfdir @@ -883,6 +884,9 @@ $(OUTPUT)util/exec_cmd.o: util/exec_cmd.c $(OUTPUT)PERF-CFLAGS '-DPREFIX="$(prefix_SQ)"' \ $< +$(OUTPUT)util/annotate.o: util/annotate.c $(OUTPUT)PERF-CFLAGS + $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DPERF_OBJDUMP_PATH='"$(objdump)"' $< + $(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index f0a9103..a45ac77 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -824,7 +824,7 @@ fallback: "%s %s%s --start-address=0x%016" PRIx64 " --stop-address=0x%016" PRIx64 " -d %s %s -C %s|grep -v %s|expand", - objdump_path ? objdump_path : "objdump", + objdump_path ? objdump_path : PERF_OBJDUMP_PATH, disassembler_style ? "-M " : "", disassembler_style ? disassembler_style : "", map__rip_2objdump(map, sym->start), -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
