1 files changed, 9 insertions, 2 deletions

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index e01af2b1a469..bc8f4773d4d8 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -16,6 +16,8 @@
 #include "annotate.h"
 #include <pthread.h>
 
+const char      *disassembler_style;
+
 int symbol__annotate_init(struct map *map __used, struct symbol *sym)
 {
         struct annotation *notes = symbol__annotation(sym);
@@ -323,10 +325,15 @@ fallback:
                  dso, dso->long_name, sym, sym->name);
 
         snprintf(command, sizeof(command),
-                 "objdump --start-address=0x%016" PRIx64
-                 " --stop-address=0x%016" PRIx64 " -dS -C %s|grep -v %s|expand",
+                 "objdump %s%s --start-address=0x%016" PRIx64
+                 " --stop-address=0x%016" PRIx64
+                 " -d %s %s -C %s|grep -v %s|expand",
+                 disassembler_style ? "-M " : "",
+                 disassembler_style ? disassembler_style : "",
                  map__rip_2objdump(map, sym->start),
                  map__rip_2objdump(map, sym->end),
+                 symbol_conf.annotate_asm_raw ? "" : "--no-show-raw",
+                 symbol_conf.annotate_src ? "-S" : "",
                  symfs_filename, filename);
 
         pr_debug("Executing: %s\n", command);