2 files changed, 14 insertions, 1 deletions

diff --git a/arch/x86/tools/distill.awk b/arch/x86/tools/distill.awk
index d433619bb866..c13c0ee48ab4 100644
--- a/arch/x86/tools/distill.awk
+++ b/arch/x86/tools/distill.awk
@@ -15,6 +15,11 @@ BEGIN {
         fwait_str="9b\tfwait"
 }
 
+/^ *[0-9a-f]+ <[^>]*>:/ {
+        # Symbol entry
+        printf("%s%s\n", $2, $1)
+}
+
 /^ *[0-9a-f]+:/ {
         if (split($0, field, "\t") < 3) {
                 # This is a continuation of the same insn.
diff --git a/arch/x86/tools/test_get_len.c b/arch/x86/tools/test_get_len.c
index 5743e5128d35..af75e07217ba 100644
--- a/arch/x86/tools/test_get_len.c
+++ b/arch/x86/tools/test_get_len.c
@@ -110,7 +110,7 @@ static void parse_args(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-        char line[BUFSIZE];
+        char line[BUFSIZE], sym[BUFSIZE] = "<unknown>";
         unsigned char insn_buf[16];
         struct insn insn;
         int insns = 0, c;
@@ -122,6 +122,12 @@ int main(int argc, char **argv)
                 int nb = 0;
                 unsigned int b;
 
+                if (line[0] == '<') {
+                        /* Symbol line */
+                        strcpy(sym, line);
+                        continue;
+                }
+
                 insns++;
                 memset(insn_buf, 0, 16);
                 strcpy(copy, line);
@@ -145,6 +151,8 @@ int main(int argc, char **argv)
                 insn_init(&insn, insn_buf, x86_64);
                 insn_get_length(&insn);
                 if (insn.length != nb) {
+                        fprintf(stderr, "Error: %s found a difference at %s\n",
+                                prog, sym);
                         fprintf(stderr, "Error: %s", line);
                         fprintf(stderr, "Error: objdump says %d bytes, but "
                                 "insn_get_length() says %d\n", nb,