Index: test/Object/multiple-sections.yaml =================================================================== --- test/Object/multiple-sections.yaml +++ test/Object/multiple-sections.yaml @@ -4,8 +4,8 @@ # Test that multiple sections with the same type does not trigger an error. # CHECK: ElfHeader { -# CHECK: SHT_GNU_verdef { -# CHECK: SHT_GNU_verneed { +# CHECK: VersionDefinitions [ +# CHECK: VersionRequirements [ # CHECK: CGProfile [ # CHECK: Addrsig [ Index: test/tools/llvm-objcopy/ELF/binary-output-target.test =================================================================== --- test/tools/llvm-objcopy/ELF/binary-output-target.test +++ test/tools/llvm-objcopy/ELF/binary-output-target.test @@ -104,7 +104,7 @@ # 64-NEXT: SectionHeaderEntrySize: 64 # CHECK-NEXT: SectionHeaderCount: 4 # CHECK-NEXT: StringTableSectionIndex: -# CHECK-NEXT: } +# CHECK-NEXT: ] ## ELFOSABI_NONE = ELFOSABI_SYSV = 0 is the default. ## "-freebsd" suffixed target name can change the field to ELFOSABI_FREEBSD. Index: test/tools/llvm-objcopy/ELF/many-sections.test =================================================================== --- test/tools/llvm-objcopy/ELF/many-sections.test +++ test/tools/llvm-objcopy/ELF/many-sections.test @@ -33,7 +33,7 @@ EHDR-NEXT: SectionHeaderEntrySize: 64 EHDR-NEXT: SectionHeaderCount: 0 EHDR-NEXT: StringTableSectionIndex: 65535 -EHDR-NEXT: } +EHDR-NEXT: ] SECS: Index: 65285 SECS-NEXT: Name: .symtab Index: test/tools/llvm-readobj/all.test =================================================================== --- test/tools/llvm-readobj/all.test +++ test/tools/llvm-readobj/all.test @@ -10,10 +10,12 @@ # LLVM-ALL: Sections [ # LLVM-ALL: Relocations [ # LLVM-ALL: Symbols [ +# LLVM-ALL: EHFrameHeader { +# LLVM-ALL: .eh_frame section at offset 0x1128 address 0x0: # LLVM-ALL: ProgramHeaders [ -# LLVM-ALL: Version symbols { -# LLVM-ALL: SHT_GNU_verdef { -# LLVM-ALL: SHT_GNU_verneed { +# LLVM-ALL: VersionSymbols { +# LLVM-ALL: VersionDefinitions [ +# LLVM-ALL: VersionRequirements [ # LLVM-ALL: Addrsig [ # LLVM-ALL: Notes [ # LLVM-ALL: StackSizes [ @@ -25,7 +27,7 @@ # GNU-ALL: There are {{.*}} section headers, starting at offset {{.*}}: # GNU-ALL: Relocation section '.rela.data' at offset {{.*}} contains {{.*}} entries: # GNU-ALL: Symbol table '.symtab' contains {{.*}} entries: -# GNU-ALL: EH_FRAME Header [ +# GNU-ALL: EHFrameHeader { # GNU-ALL: .eh_frame section at offset {{.*}} address 0x0: # GNU-ALL: Dynamic section at offset {{.*}} contains {{.*}} entries: # GNU-ALL: Program Headers: Index: test/tools/llvm-readobj/elf-file-headers.test =================================================================== --- test/tools/llvm-readobj/elf-file-headers.test +++ test/tools/llvm-readobj/elf-file-headers.test @@ -30,7 +30,7 @@ # I386-NEXT: SectionHeaderEntrySize: 40 # I386-NEXT: SectionHeaderCount: 4 # I386-NEXT: StringTableSectionIndex: 3 -# I386-NEXT:} +# I386-NEXT:] # I386-NOT:{{.}} --- !ELF @@ -74,7 +74,7 @@ # X86-64-NEXT: SectionHeaderEntrySize: 64 # X86-64-NEXT: SectionHeaderCount: 4 # X86-64-NEXT: StringTableSectionIndex: 3 -# X86-64-NEXT:} +# X86-64-NEXT:] # X86-64-NOT:{{.}} --- !ELF @@ -125,5 +125,5 @@ # LANAI-NEXT: SectionHeaderEntrySize: 40 # LANAI-NEXT: SectionHeaderCount: 4 # LANAI-NEXT: StringTableSectionIndex: 3 -# LANAI-NEXT:} +# LANAI-NEXT:] # LANAI-NOT:{{.}} Index: test/tools/llvm-readobj/elf-versioninfo.test =================================================================== --- test/tools/llvm-readobj/elf-versioninfo.test +++ test/tools/llvm-readobj/elf-versioninfo.test @@ -77,7 +77,7 @@ Binding: STB_GLOBAL ... -# LLVM: Version symbols { +# LLVM: VersionSymbols { # LLVM-NEXT: Section Name: .gnu.version # LLVM-NEXT: Address: 0x0 # LLVM-NEXT: Offset: 0x40 @@ -108,8 +108,8 @@ # LLVM-NEXT: Name: sym5@v3 # LLVM-NEXT: } # LLVM-NEXT: ] -# LLVM-NEXT: } -# LLVM-NEXT: SHT_GNU_verdef { +# LLVM-NEXT: ] +# LLVM-NEXT: VersionDefinitions [ # LLVM-NEXT: Definition { # LLVM-NEXT: Version: 1 # LLVM-NEXT: Flags: 0x0 @@ -133,8 +133,8 @@ # LLVM-NEXT: Name: VERSION2 # LLVM-NEXT: Predecessor: VERSION1 # LLVM-NEXT: } -# LLVM-NEXT: } -# LLVM-NEXT: SHT_GNU_verneed { +# LLVM-NEXT: ] +# LLVM-NEXT: VersionRequirements [ # LLVM-NEXT: Dependency { # LLVM-NEXT: Version: 1 # LLVM-NEXT: Count: 2 @@ -167,7 +167,7 @@ # LLVM-NEXT: } # LLVM-NEXT: ] # LLVM-NEXT: } -# LLVM-NEXT: } +# LLVM-NEXT: ] # GNU: Version symbols section '.gnu.version' contains 6 entries: # GNU-NEXT: Addr: 0000000000000000 Offset: 0x000040 Link: 7 (.dynsym) Index: test/tools/llvm-readobj/file-name.test =================================================================== --- test/tools/llvm-readobj/file-name.test +++ test/tools/llvm-readobj/file-name.test @@ -30,7 +30,7 @@ # GNU: Section header string table index: # LLVM: StringTableSectionIndex: -# LLVM-NEXT: } +# LLVM-NEXT: ] # NAME2-EMPTY: # NAME2-NEXT: {{^}}File: [[FILE2]]{{$}} Index: test/tools/yaml2obj/verdef-section.yaml =================================================================== --- test/tools/yaml2obj/verdef-section.yaml +++ test/tools/yaml2obj/verdef-section.yaml @@ -3,7 +3,7 @@ # Check we are able to handle the SHT_GNU_verdef sections. -# CHECK: SHT_GNU_verdef { +# CHECK: VersionDefinitions [ # CHECK-NEXT: Definition { # CHECK-NEXT: Version: 1 # CHECK-NEXT: Flags: Base @@ -26,7 +26,7 @@ # CHECK-NEXT: Name: VERSION_2 # CHECK-NEXT: Predecessor: VERSION_3 # CHECK-NEXT: } -# CHECK-NEXT: } +# CHECK-NEXT: ] --- !ELF FileHeader: Index: test/tools/yaml2obj/verneed-section.yaml =================================================================== --- test/tools/yaml2obj/verneed-section.yaml +++ test/tools/yaml2obj/verneed-section.yaml @@ -3,7 +3,7 @@ # Check we are able to handle the SHT_GNU_verneed sections. -# CHECK: SHT_GNU_verneed { +# CHECK: VersionRequirements [ # CHECK-NEXT: Dependency { # CHECK-NEXT: Version: 1 # CHECK-NEXT: Count: 2 @@ -36,7 +36,7 @@ # CHECK-NEXT: } # CHECK-NEXT: ] # CHECK-NEXT: } -# CHECK-NEXT: } +# CHECK-NEXT: ] --- !ELF FileHeader: Index: test/tools/yaml2obj/versym-section.yaml =================================================================== --- test/tools/yaml2obj/versym-section.yaml +++ test/tools/yaml2obj/versym-section.yaml @@ -4,7 +4,7 @@ # RUN: yaml2obj --docnum=1 %s -o %t1 # RUN: llvm-readobj -V %t1 | FileCheck %s -# CHECK: Version symbols { +# CHECK: VersionSymbols { # CHECK-NEXT: Section Name: .gnu.version # CHECK-NEXT: Address: 0x200210 # CHECK-NEXT: Offset: 0x40 @@ -23,10 +23,10 @@ # CHECK-NEXT: Name: f2@v2 # CHECK-NEXT: } # CHECK-NEXT: ] -# CHECK-NEXT: } -# CHECK-NEXT: SHT_GNU_verdef { -# CHECK-NEXT: } -# CHECK-NEXT: SHT_GNU_verneed { +# CHECK-NEXT: ] +# CHECK-NEXT: VersionDefinitions [ +# CHECK-NEXT: ] +# CHECK-NEXT: VersionRequirements [ # CHECK-NEXT: Dependency { # CHECK-NEXT: Version: 1 # CHECK-NEXT: Count: 2 @@ -46,7 +46,7 @@ # CHECK-NEXT: } # CHECK-NEXT: ] # CHECK-NEXT: } -# CHECK-NEXT: } +# CHECK-NEXT: ] --- !ELF FileHeader: Index: tools/llvm-readobj/DwarfCFIEHPrinter.h =================================================================== --- tools/llvm-readobj/DwarfCFIEHPrinter.h +++ tools/llvm-readobj/DwarfCFIEHPrinter.h @@ -99,7 +99,7 @@ void PrinterContext::printEHFrameHdr(uint64_t EHFrameHdrOffset, uint64_t EHFrameHdrAddress, uint64_t EHFrameHdrSize) const { - ListScope L(W, "EH_FRAME Header"); + DictScope L(W, "EHFrameHeader"); W.startLine() << format("Address: 0x%" PRIx64 "\n", EHFrameHdrAddress); W.startLine() << format("Offset: 0x%" PRIx64 "\n", EHFrameHdrOffset); W.startLine() << format("Size: 0x%" PRIx64 "\n", EHFrameHdrSize); Index: tools/llvm-readobj/ELFDumper.cpp =================================================================== --- tools/llvm-readobj/ELFDumper.cpp +++ tools/llvm-readobj/ELFDumper.cpp @@ -5595,7 +5595,7 @@ template void LLVMStyle::printVersionSymbolSection(const ELFFile *Obj, const Elf_Shdr *Sec) { - DictScope SS(W, "Version symbols"); + DictScope SS(W, "VersionSymbols"); if (!Sec) return; @@ -5626,7 +5626,7 @@ template void LLVMStyle::printVersionDefinitionSection(const ELFFile *Obj, const Elf_Shdr *Sec) { - DictScope SD(W, "SHT_GNU_verdef"); + ListScope SD(W, "VersionDefinitions"); if (!Sec) return; @@ -5674,7 +5674,7 @@ template void LLVMStyle::printVersionDependencySection(const ELFFile *Obj, const Elf_Shdr *Sec) { - DictScope SD(W, "SHT_GNU_verneed"); + ListScope SD(W, "VersionRequirements"); if (!Sec) return;