perf annotate: Allow objdump to be set in perfconfig

Allow the setting of the objdump command in the perfconfig. Update man
page for this new option.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andres Freund <andres@anarazel.de>
Cc: German Gomez <german.gomez@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Tom Rix <trix@redhat.com>
Cc: llvm@lists.linux.dev
Link: https://lore.kernel.org/r/20230328235543.1082207-2-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
index 39c890ead2dc0045a018268fcd5afc006e1ad5b4..697f7f924545762ef2c4b65bf2806981d813bf64 100644 (file)
--- a/tools/perf/Documentation/perf-config.txt
+++ b/tools/perf/Documentation/perf-config.txt
@@ -250,7 +250,10 @@ annotate.*::
        These are in control of addresses, jump function, source code
        in lines of assembly code from a specific program.
 
-       annotate.disassembler_style:
+       annotate.objdump::
+               objdump binary to use for disassembly and annotations.
+
+       annotate.disassembler_style::
                Use this to change the default disassembler style to some other value
                supported by binutils, such as "intel", see the '-M' option help in the
                'objdump' man page.

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 08e041a9b9cc279e6298a7e7cc219d622b78ed5d..317c987d3001d27fa20e1fe903e15b2bc25151bb 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -3211,6 +3211,12 @@ static int annotation__config(const char *var, const char *value, void *data)
                        pr_err("Not enough memory for annotate.disassembler_style\n");
                        return -1;
                }
+       } else if (!strcmp(var, "annotate.objdump")) {
+               opt->objdump_path = strdup(value);
+               if (!opt->objdump_path) {
+                       pr_err("Not enough memory for annotate.objdump\n");
+                       return -1;
+               }
        } else if (!strcmp(var, "annotate.demangle")) {
                symbol_conf.demangle = perf_config_bool("demangle", value);
        } else if (!strcmp(var, "annotate.demangle_kernel")) {