Commit c5baf908 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Fix objdump --no-show-raw-insn flag 



Remove redirection of objdump's stderr to /dev/null to help diagnose
failures.

Fix the '--no-show-raw' flag to be '--no-show-raw-insn' which binutils
is permissive and allows, but fails with LLVM objdump.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: clang-built-linux@googlegroups.com
Link: http://lore.kernel.org/lkml/20191010183649.23768-6-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b34b45ee

tools/perf/util/annotate.c

+2 −2
Original line number Diff line number Diff line
@@ -1966,13 +1966,13 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) 
	err = asprintf(&command,

		 "%s %s%s --start-address=0x%016" PRIx64

		 " --stop-address=0x%016" PRIx64

		 " -l -d %s %s -C \"$1\" 2>/dev/null",

		 " -l -d %s %s -C \"$1\"",

		 opts->objdump_path ?: "objdump",

		 opts->disassembler_style ? "-M " : "",

		 opts->disassembler_style ?: "",

		 map__rip_2objdump(map, sym->start),

		 map__rip_2objdump(map, sym->end),

		 opts->show_asm_raw ? "" : "--no-show-raw",

		 opts->show_asm_raw ? "" : "--no-show-raw-insn",

		 opts->annotate_src ? "-S" : "");



	if (err < 0) {