From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B05D1CA9EAF for ; Mon, 21 Oct 2019 13:39:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87553214AE for ; Mon, 21 Oct 2019 13:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571665166; bh=fhPQNxyAPce69t0uKiNdMBFsLFZkkaOLBdiygoR/2cQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0weoHoOYp/J7JyBBu9dWFaeu0stGXzfpuZFrY7lZYCXvduauD+C138n0r2Befcd6J IKN/8BKvx72bqtB3aYDIcWoq10bj4m0r/vyu/SK6kQqV6Z/B+QJL9T3QlFeLIiWLuG fDx17FkCxKeJiAjVrNHVhLkGKytRx5uV3aUyxeAc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729231AbfJUNjY (ORCPT ); Mon, 21 Oct 2019 09:39:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:40886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729204AbfJUNjV (ORCPT ); Mon, 21 Oct 2019 09:39:21 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.35.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C407120679; Mon, 21 Oct 2019 13:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571665160; bh=fhPQNxyAPce69t0uKiNdMBFsLFZkkaOLBdiygoR/2cQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PI94byNrR0Ln822WkA/vpMkRmem2FzqFJqJE9fJBCrvp0TyIjO02zlBXLBMdaU947 u/XxHZCApm1uQwEkkPmgUA9PPs3Fad+ecbHrtB3OYbCMaEvOFBWqaVyY0EiPyfPpRm Sl57FAbWBXtjoLgA7DFfFAhZlm2zg9IpxWAi8J/8= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ian Rogers , Alexander Shishkin , Jin Yao , Jiri Olsa , Mark Rutland , Peter Zijlstra , Song Liu , Stephane Eranian , clang-built-linux@googlegroups.com, Arnaldo Carvalho de Melo Subject: [PATCH 11/57] perf annotate: Fix objdump --no-show-raw-insn flag Date: Mon, 21 Oct 2019 10:37:48 -0300 Message-Id: <20191021133834.25998-12-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191021133834.25998-1-acme@kernel.org> References: <20191021133834.25998-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ian Rogers 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 Cc: Alexander Shishkin Cc: Jin Yao Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Song Liu Cc: Stephane Eranian Cc: clang-built-linux@googlegroups.com Link: http://lore.kernel.org/lkml/20191010183649.23768-6-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo --- 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 efc5bfef790a..eef8aa87db66 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) { -- 2.21.0