From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Jin Yao <yao.jin@linux.intel.com>,
Song Liu <songliubraving@fb.com>,
linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com
Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com>
Subject: [PATCH 5/5] perf annotate: fix objdump --no-show-raw-insn flag
Date: Thu, 10 Oct 2019 11:36:49 -0700 [thread overview]
Message-ID: <20191010183649.23768-6-irogers@google.com> (raw)
In-Reply-To: <20191010183649.23768-1-irogers@google.com>
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 <irogers@google.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 3d5b9236576a..2a71c90a4921 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1944,13 +1944,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) {
--
2.23.0.581.g78d2f28ef7-goog
next prev parent reply other threads:[~2019-10-10 18:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 18:36 [PATCH 0/5] Improve objdump parsing, fix LLVM objdump Ian Rogers
2019-10-10 18:36 ` [PATCH 1/5] perf annotate: avoid reallocation in objdump parsing Ian Rogers
2019-10-14 14:15 ` Arnaldo Carvalho de Melo
2019-10-21 23:19 ` [tip: perf/core] perf annotate: Avoid " tip-bot2 for Ian Rogers
2019-10-10 18:36 ` [PATCH 2/5] perf annotate: use run-command.h to fork objdump Ian Rogers
2019-10-14 14:18 ` Arnaldo Carvalho de Melo
2019-10-15 0:35 ` Ian Rogers
2019-10-21 23:19 ` [tip: perf/core] perf annotate: Use libsubcmd's " tip-bot2 for Ian Rogers
2019-10-10 18:36 ` [PATCH 3/5] perf annotate: don't pipe objdump output through grep Ian Rogers
2019-10-14 14:19 ` Arnaldo Carvalho de Melo
2019-10-21 23:19 ` [tip: perf/core] perf annotate: Don't pipe objdump output through 'grep' command tip-bot2 for Ian Rogers
2019-10-10 18:36 ` [PATCH 4/5] perf annotate: don't pipe objdump output through expand Ian Rogers
2019-10-14 14:24 ` Arnaldo Carvalho de Melo
2019-10-21 23:19 ` [tip: perf/core] perf annotate: Don't pipe objdump output through 'expand' command tip-bot2 for Ian Rogers
2019-10-10 18:36 ` Ian Rogers [this message]
2019-10-14 14:24 ` [PATCH 5/5] perf annotate: fix objdump --no-show-raw-insn flag Arnaldo Carvalho de Melo
2019-10-21 23:19 ` [tip: perf/core] perf annotate: Fix " tip-bot2 for Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191010183649.23768-6-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=clang-built-linux@googlegroups.com \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.com \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).