am 5d860d27: Merge "Use arm-linux-androideabi-{objdump,addr2line}"
* commit '5d860d278d98f3eb95814b886b146a3a878f7d62':
Use arm-linux-androideabi-{objdump,addr2line}
diff --git a/util/annotate.c b/util/annotate.c
index 787722e..bc91f5b 100644
--- a/util/annotate.c
+++ b/util/annotate.c
@@ -339,7 +339,7 @@
symfs_filename, filename);
#else
snprintf(command, sizeof(command),
- "arm-eabi-objdump --start-address=0x%016" PRIx64
+ "arm-linux-androideabi-objdump --start-address=0x%016" PRIx64
" --stop-address=0x%016" PRIx64 " -d%c -C %s|grep -v %s|expand",
map__rip_2objdump(map, sym->start),
map__rip_2objdump(map, sym->end),
@@ -437,7 +437,7 @@
continue;
offset = start + i;
- sprintf(cmd, "arm-eabi-addr2line -e %s%s %016" PRIx64, symbol_conf.symfs,
+ sprintf(cmd, "arm-linux-androideabi-addr2line -e %s%s %016" PRIx64, symbol_conf.symfs,
filename, offset);
fp = popen(cmd, "r");
if (!fp)
