diff options
| -rw-r--r-- | llvm/test/tools/llvm-objdump/all-headers.test | 20 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 10 |
2 files changed, 25 insertions, 5 deletions
diff --git a/llvm/test/tools/llvm-objdump/all-headers.test b/llvm/test/tools/llvm-objdump/all-headers.test new file mode 100644 index 00000000000..6bb9a844f16 --- /dev/null +++ b/llvm/test/tools/llvm-objdump/all-headers.test @@ -0,0 +1,20 @@ +# RUN: yaml2obj %s > %t +# RUN: llvm-objdump --all-headers %t | FileCheck %s + +## Check we print file format, architecture and start address before +## anything else when using --all-headers. + +# CHECK: file format ELF64-x86-64 +# CHECK-EMPTY: +# CHECK-NEXT: architecture: x86_64 +# CHECK-NEXT: start address: 0x0000000000000000 +# CHECK-EMPTY: +# CHECK-NEXT: Sections: + +!ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Machine: EM_X86_64 +Sections: diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index b68714e624a..64de29c4e11 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -2301,8 +2301,7 @@ static void printFileHeaders(const ObjectFile *o) { StringRef Fmt = o->getBytesInAddress() > 4 ? "%016" PRIx64 : "%08" PRIx64; uint64_t Address = StartAddrOrErr.get(); outs() << "start address: " - << "0x" << format(Fmt.data(), Address) - << "\n"; + << "0x" << format(Fmt.data(), Address) << "\n\n"; } static void printArchiveChild(StringRef Filename, const Archive::Child &C) { @@ -2382,6 +2381,8 @@ static void DumpObject(ObjectFile *o, const Archive *a = nullptr, outs() << ":\tfile format " << o->getFileFormatName() << "\n\n"; } + if (FileHeaders) + printFileHeaders(o); if (ArchiveHeaders && !MachOOpt && c) printArchiveChild(ArchiveName, *c); if (Disassemble) @@ -2400,8 +2401,6 @@ static void DumpObject(ObjectFile *o, const Archive *a = nullptr, PrintUnwindInfo(o); if (PrivateHeaders || FirstPrivateHeader) printPrivateFileHeaders(o, FirstPrivateHeader); - if (FileHeaders) - printFileHeaders(o); if (ExportsTrie) printExportsTrie(o); if (Rebase) @@ -2510,7 +2509,8 @@ int main(int argc, char **argv) { InputFilenames.push_back("a.out"); if (AllHeaders) - PrivateHeaders = Relocations = SectionHeaders = SymbolTable = true; + FileHeaders = PrivateHeaders = Relocations = SectionHeaders = SymbolTable = + true; if (DisassembleAll || PrintSource || PrintLines) Disassemble = true; |
