The following commit has been merged into the perf/core branch of tip: Commit-ID: c5baf9089246c1356705c9ba36d767ee8ce43dd2 Gitweb: https://git.kernel.org/tip/c5baf9089246c1356705c9ba36d767ee8ce43dd2 Author: Ian Rogers <irog...@google.com> AuthorDate: Thu, 10 Oct 2019 11:36:49 -07:00 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitterDate: Tue, 15 Oct 2019 08:39:42 -03:00
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: Ian Rogers <irog...@google.com> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Jin Yao <yao....@linux.intel.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Mark Rutland <mark.rutl...@arm.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Song Liu <songliubrav...@fb.com> Cc: Stephane Eranian <eran...@google.com> Cc: clang-built-li...@googlegroups.com Link: http://lore.kernel.org/lkml/20191010183649.23768-6-irog...@google.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/annotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index efc5bfe..eef8aa8 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -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) {
