Index: llvm/trunk/test/tools/llvm-objdump/X86/disassemble-code-data-mix.s =================================================================== --- llvm/trunk/test/tools/llvm-objdump/X86/disassemble-code-data-mix.s +++ llvm/trunk/test/tools/llvm-objdump/X86/disassemble-code-data-mix.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc %s -filetype=obj -triple=x86_64-pc-linux | llvm-objdump -d - | FileCheck %s +// RUN: llvm-mc %s -filetype=obj -triple=x86_64-pc-linux | llvm-objdump -d - | FileCheck --strict-whitespace --match-full-lines %s .text .globl foo .type foo, @function @@ -14,6 +14,5 @@ bar: .string "test string" -// CHECK: b: 74 65 73 74 20 73 74 72 test str -// CHECK-NEXT: 13: 69 6e 67 00 ing. - +// CHECK: b: 74 65 73 74 20 73 74 72 test str +// CHECK-NEXT: 13: 69 6e 67 00 ing. Index: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp =================================================================== --- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp +++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp @@ -996,10 +996,8 @@ int NumBytes = 0; for (; Index < End; ++Index) { - if (NumBytes == 0) { + if (NumBytes == 0) outs() << format("%8" PRIx64 ":", SectionAddr + Index); - outs() << "\t"; - } Byte = Bytes.slice(Index)[0]; outs() << format(" %02x", Byte); AsciiData[NumBytes] = isPrint(Byte) ? Byte : '.';