diff options
| -rw-r--r-- | llvm/test/tools/llvm-objdump/all-headers.test | 14 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/llvm/test/tools/llvm-objdump/all-headers.test b/llvm/test/tools/llvm-objdump/all-headers.test index 2cb239b4b30..ea45eccee35 100644 --- a/llvm/test/tools/llvm-objdump/all-headers.test +++ b/llvm/test/tools/llvm-objdump/all-headers.test @@ -9,10 +9,10 @@ # CHECK-NEXT: architecture: x86_64 # CHECK-NEXT: start address: 0x0000000000000000 # CHECK-EMPTY: -# CHECK-NEXT: Sections: -# CHECK: SYMBOL TABLE: -# CHECK: Program Header: +# CHECK-NEXT: Program Header: # CHECK: Dynamic Section: +# CHECK: Sections: +# CHECK: SYMBOL TABLE: ## Check how we dump the archives. ## Check we dump the appropriate headers for each file in the archive. @@ -26,18 +26,18 @@ # ARCHIVE: architecture: x86_64 # ARCHIVE: start address: 0x0000000000000000 # ARCHIVE: rw-r--r-- -# ARCHIVE: Sections: -# ARCHIVE: SYMBOL TABLE: # ARCHIVE: Program Header: # ARCHIVE: Dynamic Section: +# ARCHIVE: Sections: +# ARCHIVE: SYMBOL TABLE: # ARCHIVE: {{.*}}.a({{.*}}2): file format ELF64-x86-64 # ARCHIVE: architecture: x86_64 # ARCHIVE: start address: 0x0000000000000000 # ARCHIVE: rw-r--r-- -# ARCHIVE: Sections: -# ARCHIVE: SYMBOL TABLE: # ARCHIVE: Program Header: # ARCHIVE: Dynamic Section: +# ARCHIVE: Sections: +# ARCHIVE: SYMBOL TABLE: !ELF FileHeader: diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index e066365cb1b..f50d3448df3 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -2087,6 +2087,8 @@ static void dumpObject(ObjectFile *O, const Archive *A = nullptr, printRelocations(O); if (DynamicRelocations) printDynamicRelocations(O); + if (PrivateHeaders || FirstPrivateHeader) + printPrivateFileHeaders(O, FirstPrivateHeader); if (SectionHeaders) printSectionHeaders(O); if (SectionContents) @@ -2095,8 +2097,6 @@ static void dumpObject(ObjectFile *O, const Archive *A = nullptr, printSymbolTable(O, ArchiveName); if (UnwindInfo) printUnwindInfo(O); - if (PrivateHeaders || FirstPrivateHeader) - printPrivateFileHeaders(O, FirstPrivateHeader); if (ExportsTrie) printExportsTrie(O); if (Rebase) |
