[yaml2obj] - Change the order of implicitly created sections.

[grimar]

Summary

.dynsym and .dynstr are allocatable and therefore normally are placed
before non-allocatable .strtab, .shstrtab, .symtab sections.
But we are placing them after currently what creates a mix of
alloc/non-alloc sections and does not look normal.

[MaskRay]

There is a typo in the title. I think you meant Change the order of implicitly created sections.

(I think default can be removed.)

[MaskRay]

llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml

58

Indent, i.e. CASE2-SAME: 1

[jhenderson]

llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml

58

I know I suggested this behaviour previously, but I realise that there is a slight flaw in it, as it will also match "Info: 1234" or "Info: 2211" for example. I think you need ^$ regex markers too.

[grimar]

• Addressed review comments.

llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml

58

I am not sure how to use {{^}} with -SAME
The following does not work (and I think it is correct that it is not):

# CASE1:      Info:
# CASE1-SAME:       {{^}}2{{$}}

I think we can use -NOT, I did it here. Looks fine?
(I've only applied this approach here as it is the only test I added in this diff, we can update other places independently).

[grimar]

Will reupload.

[grimar]

• Now with the change at the right place.

[jhenderson]

llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml

58

Looks fine to me.

I think you need a space after the ^ pattern with CHECK-SAME, though I'm not certain: CASE1-SAME: {{^}} 2{{$}}. My understanding is that the ^ character matches the start of a line, and also the end of the previous match, because of the way FileCheck's system is set up. Whitespace will be significant (but canoncalized to a single space).

[grimar]

llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml

58

{{^}} 2{{$}} works! As well as {{^}} 2{{$}} Thanks!

llvm/lib/ObjectYAML/ELFEmitter.cpp

ELFState<ELFT>::ELFState(ELFYAML::Object &D, yaml::ErrorHandler EH)
   // Insert SHT_NULL section implicitly when it is not defined in YAML.
   if (Sections.empty() || Sections.front()->Type != ELF::SHT_NULL)
     Doc.Chunks.insert(
         Doc.Chunks.begin(),
         std::make_unique<ELFYAML::Section>(
             ELFYAML::Chunk::ChunkKind::RawContent, /*IsImplicit=*/true));
 
   std::vector<StringRef> ImplicitSections;
+  if (Doc.DynamicSymbols)
+    ImplicitSections.insert(ImplicitSections.end(), {".dynsym", ".dynstr"});
   if (Doc.Symbols)
     ImplicitSections.push_back(".symtab");
   ImplicitSections.insert(ImplicitSections.end(), {".strtab", ".shstrtab"});
 
-  if (Doc.DynamicSymbols)
-    ImplicitSections.insert(ImplicitSections.end(), {".dynsym", ".dynstr"});
-
   // Insert placeholders for implicit sections that are not
   // defined explicitly in YAML.
   for (StringRef SecName : ImplicitSections) {
     if (DocSections.count(SecName))
       continue;
 
     std::unique_ptr<ELFYAML::Chunk> Sec = std::make_unique<ELFYAML::Section>(
         ELFYAML::Chunk::ChunkKind::RawContent, true /*IsImplicit*/);

llvm/test/tools/llvm-objcopy/ELF/add-symbol-no-symtab.test

 ...
 
 ## Check the created .symtab does not link to .dynstr (SHF_ALLOC).
 # RUN: yaml2obj --docnum=3 %s -o %t3
 # RUN: llvm-objcopy --remove-section=.symtab --remove-section=.strtab %t3 %t3.no
 # RUN: llvm-objcopy --add-symbol='abs1=1' %t3.no %t3.not.dynstr
 # RUN: llvm-readobj -S %t3.not.dynstr | FileCheck --check-prefix=SEC3 %s
 
-# SEC3:      Index: 1
+# SEC3:      Index: 3
 # SEC3-NEXT: Name: .shstrtab
 # SEC3-NEXT: Type: SHT_STRTAB
 # SEC3:      Name: .symtab
 # SEC3-NEXT: Type: SHT_SYMTAB
 # SEC3-NOT:  }
-# SEC3:      Link: 1
+# SEC3:      Link: 3
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 DynamicSymbols:
   - Name:    dummy
     Binding: STB_GLOBAL
 Symbols: []
 ...

llvm/test/tools/llvm-readobj/ELF/dynamic-reloc-no-section-headers.test

Entries:
       - Tag:   DT_RELAENT
         Value: 0x18
 ## Offset of .dynsym is 0x138. Offset of PT_LOAD is 0xb0.
 ## 0x138 - 0xb0 == 0x88
       - Tag:   DT_SYMTAB
         Value: 0x88
       - Tag:   DT_STRSZ
         Value: 0x5
-## Offset of .dynstr is 0x19f. Offset of PT_LOAD is 0xb0.
-## 0x19f - 0xb0 == 0xef
+## Offset of .dynstr is 0x168. Offset of PT_LOAD is 0xb0.
+## 0x168 - 0xb0 == 0xb8
       - Tag:   DT_STRTAB
-        Value: 0xef
+        Value: 0xb8
       - Tag:   DT_NULL
         Value: 0x0
   - Name:    .dynsym
     Type:    SHT_DYNSYM
 DynamicSymbols:
   - Name: foo
 ProgramHeaders:
   - Type:  PT_LOAD
     Sections:
       - Section: .rela.dyn
       - Section: .dynamic
         Section: .dynsym
         Section: .dynstr
   - Type:  PT_DYNAMIC
     Sections:
       - Section: .dynamic

llvm/test/tools/llvm-readobj/ELF/hidden-versym.test

 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readelf -V %t | FileCheck %s --check-prefix=HIDDEN
 
 # HIDDEN:      Version symbols section '.gnu.version' contains 2 entries:
-# HIDDEN-NEXT:  Addr: 0000000000200210  Offset: 0x000040  Link: 5 (.dynsym)
+# HIDDEN-NEXT:  Addr: 0000000000200210  Offset: 0x000040  Link: 3 (.dynsym)
 # HIDDEN-NEXT:   000:   0 (*local*)       3h(hiddensym)
 
 --- !ELF
 FileHeader:
   Class:             ELFCLASS64
   Data:              ELFDATA2LSB
   Type:              ET_EXEC
   Machine:           EM_X86_64

llvm/test/tools/llvm-readobj/ELF/reloc-symbol-with-versioning.test

Dependencies:
           - Name:            v1
             Hash:            1937
             Flags:           0
             Other:           4
   - Name:            .rela.plt
     Type:            SHT_RELA
     Flags:           [ SHF_ALLOC ]
     Info:            0
-    Link:            7
+    Link:            .dynsym
     AddressAlign:    0x0000000000000008
     EntSize:         0x0000000000000018
     Relocations:     
       - Offset:          0x0000000000013018
         Symbol:          f1
         Type:            R_X86_64_JUMP_SLOT
       - Offset:          0x0000000000013020
         Symbol:          f2

llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test

- Name:    .gnu.version_d
     Entries: []
 
 ## Check that we report a warning when we can't read the content of the SHT_GNU_verdef section.
 
 # RUN: yaml2obj %s --docnum=3 -o %t3
 # RUN: llvm-readobj -V %t3 2>&1 | FileCheck %s --check-prefix=INVALID-DATA -DFILE=%t3
 # RUN: llvm-readelf -V %t3 2>&1 | FileCheck %s --check-prefix=INVALID-DATA -DFILE=%t3
 
-# INVALID-DATA: warning: '[[FILE]]': cannot read content of SHT_GNU_verdef section with index 1: section [index 1] has a sh_offset (0xffffffff) + sh_size (0x0) that is greater than the file size (0x230)
+# INVALID-DATA: warning: '[[FILE]]': cannot read content of SHT_GNU_verdef section with index 1: section [index 1] has a sh_offset (0xffffffff) + sh_size (0x0) that is greater than the file size (0x228)
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 Sections:

 # INVALID-VERDEF-LLVM-NEXT:      Name:
 # INVALID-VERDEF-LLVM-NEXT:    }
 # INVALID-VERDEF-LLVM-NEXT:    Symbol {
 # INVALID-VERDEF-LLVM-NEXT:    Version: 2
 # INVALID-VERDEF-LLVM-NEXT:  warning: '[[FILE]]': invalid SHT_GNU_verdef section with index 2: version definition 1 goes past the end of the section
 # INVALID-VERDEF-LLVM-NEXT:    Name: foo@<corrupt>
 
 # INVALID-VERDEF-GNU:      Version symbols section '.gnu.version' contains 2 entries:
-# INVALID-VERDEF-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
+# INVALID-VERDEF-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 3 (.dynsym)
 # INVALID-VERDEF-GNU-NEXT: warning: '[[FILE]]': unable to get a version for entry 1 of SHT_GNU_versym section with index 1: invalid SHT_GNU_verdef section with index 2: version definition 1 goes past the end of the section
 # INVALID-VERDEF-GNU-NEXT:   000: 0 (*local*) 2 (<corrupt>)
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN

llvm/test/tools/llvm-readobj/ELF/verneed-invalid.test

 ## Test how llvm-readobj/llvm-readelf tools handle invalid SHT_GNU_verneed sections.
 
 ## In the first case we have a SHT_GNU_versym section that refers to
 ## a version listed in a SHT_GNU_verneed section. That version has an
 ## empty name, making it invalid.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-readelf -V %t1 | FileCheck %s --check-prefix=GNU-VERNEED-NAME
 # RUN: llvm-readobj -V %t1 | FileCheck %s --check-prefix=LLVM-VERNEED-NAME
 
 # GNU-VERNEED-NAME:      Version symbols section '.gnu.version' contains 2 entries:
-# GNU-VERNEED-NAME-NEXT:  Addr: 0000000000200210  Offset: 0x000040  Link: 5 (.dynsym)
+# GNU-VERNEED-NAME-NEXT:  Addr: 0000000000200210  Offset: 0x000040  Link: 3 (.dynsym)
 # GNU-VERNEED-NAME-NEXT:   000:   0 (*local*)       2 ()
 
 # GNU-VERNEED-NAME:      Version needs section '.gnu.version_r' contains 1 entries:
-# GNU-VERNEED-NAME-NEXT:  Addr: 0000000000000000  Offset: 0x000044  Link: 6 (.dynstr)
+# GNU-VERNEED-NAME-NEXT:  Addr: 0000000000000000  Offset: 0x000044  Link: 4 (.dynstr)
 # GNU-VERNEED-NAME-NEXT:   0x0000: Version: 1  File: somefile  Cnt: 1
 # GNU-VERNEED-NAME-NEXT:   0x0010:   Name:   Flags: none  Version: 2
 
 # LLVM-VERNEED-NAME:      VersionSymbols [
 # LLVM-VERNEED-NAME:        Symbol {
 # LLVM-VERNEED-NAME-NEXT:     Version: 0
 # LLVM-VERNEED-NAME-NEXT:     Name:
 # LLVM-VERNEED-NAME-NEXT:   }

 ## In this case SHT_GNU_verneed is not linked to a dynamic string table. We check we handle
 ## this situation properly.
 
 # RUN: yaml2obj --docnum=2 %s -o %t2
 # RUN: llvm-readelf -V %t2 2>&1 | FileCheck %s -DFILE=%t2 --check-prefix=GNU-NOLINK
 # RUN: llvm-readobj -V %t2 2>&1 | FileCheck %s -DFILE=%t2 --check-prefix=LLVM-NOLINK
 
 # GNU-NOLINK:      Version symbols section '.gnu.version' contains 2 entries:
-# GNU-NOLINK-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
+# GNU-NOLINK-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 3 (.dynsym)
 # GNU-NOLINK-NEXT: warning: '[[FILE]]': invalid string table linked to SHT_GNU_verneed section with index 2: invalid sh_type for string table section [index 0]: expected SHT_STRTAB, but got SHT_NULL
 # GNU-NOLINK-NEXT:   000:   0 (*local*) 2 (<corrupt>)
 # GNU-NOLINK:      Version needs section '.gnu.version_r' contains 1 entries:
 # GNU-NOLINK-NEXT:  Addr: 0000000000000000  Offset: 0x000044  Link: 0 ()
 # GNU-NOLINK-NEXT:   0x0000: Version: 1  File: <corrupt vn_file: 9>  Cnt: 1
 # GNU-NOLINK-NEXT:   0x0010:   Name: <corrupt>  Flags: none Version: 2
 
 # LLVM-NOLINK:      VersionSymbols [

 
 ## We can't parse misaligned auxiliary version records.
 
 # RUN: yaml2obj --docnum=3 %s -o %t3
 # RUN: llvm-readelf -V %t3 2>&1 | FileCheck %s -DFILE=%t3 --check-prefix=BROKEN-AUX-GNU
 # RUN: llvm-readobj -V %t3 2>&1 | FileCheck %s -DFILE=%t3 --check-prefix=BROKEN-AUX-LLVM
 
 # BROKEN-AUX-GNU:      Version symbols section '.gnu.version' contains 1 entries:
-# BROKEN-AUX-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
+# BROKEN-AUX-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 3 (.dynsym)
 # BROKEN-AUX-GNU-NEXT: warning: '[[FILE]]': unable to get a version for entry 0 of SHT_GNU_versym section with index 1: invalid SHT_GNU_verneed section with index 2: found a misaligned auxiliary entry at offset 0x11
 # BROKEN-AUX-GNU-NEXT:  000:   2 (<corrupt>)
 
 # BROKEN-AUX-LLVM:      VersionSymbols [
 # BROKEN-AUX-LLVM-NEXT:   Symbol {
 # BROKEN-AUX-LLVM-NEXT:     Version: 2
 # BROKEN-AUX-LLVM-NEXT: warning: '[[FILE]]': invalid SHT_GNU_verneed section with index 2: found a misaligned auxiliary entry at offset 0x11
 # BROKEN-AUX-LLVM-NEXT:     Name: @<corrupt>
DynamicSymbols:
   - Name: foo
 
 ## Check that we report a warning when we can't read the content of the SHT_GNU_verneed section.
 
 # RUN: yaml2obj --docnum=7 %s -o %t7
 # RUN: llvm-readobj --sections -V %t7 2>&1 | FileCheck %s -DFILE=%t7 --check-prefix=INVALID-DATA
 # RUN: llvm-readelf --sections -V %t7 2>&1 | FileCheck %s -DFILE=%t7 --check-prefix=INVALID-DATA
 
-# INVALID-DATA: warning: '[[FILE]]': cannot read content of SHT_GNU_verneed section with index 1: section [index 1] has a sh_offset (0xffffffff) + sh_size (0x0) that is greater than the file size (0x230)
+# INVALID-DATA: warning: '[[FILE]]': cannot read content of SHT_GNU_verneed section with index 1: section [index 1] has a sh_offset (0xffffffff) + sh_size (0x0) that is greater than the file size (0x228)
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:

 ## In this case SHT_GNU_verneed is linked to a custom dynamic string table, which is not
 ## called ".dynstr". Check we handle this case properly.
 
 # RUN: yaml2obj --docnum=13 %s -o %t13
 # RUN: llvm-readelf -V %t13 2>&1 | FileCheck %s -DFILE=%t13 --check-prefix=GNU-CUSTOM-DYNSTR
 # RUN: llvm-readobj -V %t13 2>&1 | FileCheck %s -DFILE=%t13 --check-prefix=LLVM-CUSTOM-DYNSTR
 
 # GNU-CUSTOM-DYNSTR:      Version symbols section '.gnu.version' contains 2 entries:
-# GNU-CUSTOM-DYNSTR-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 6 (.dynsym)
+# GNU-CUSTOM-DYNSTR-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 4 (.dynsym)
 # GNU-CUSTOM-DYNSTR-NEXT:   000:   0 (*local*)       2 (bcdefghij)
 # GNU-CUSTOM-DYNSTR:      Version needs section '.gnu.version_r' contains 1 entries:
 # GNU-CUSTOM-DYNSTR-NEXT:  Addr: 0000000000000000  Offset: 0x000044  Link: 3 (.custom.dynstr)
 # GNU-CUSTOM-DYNSTR-NEXT:   0x0000: Version: 1  File: j  Cnt: 1
 # GNU-CUSTOM-DYNSTR-NEXT:   0x0010:   Name: bcdefghij  Flags: none  Version: 2
 
 # LLVM-CUSTOM-DYNSTR:      VersionSymbols [
 # LLVM-CUSTOM-DYNSTR:      Symbol {

llvm/test/tools/llvm-readobj/ELF/versioninfo.test

 # LLVM-NEXT:         Index: 6
 # LLVM-NEXT:         Name: v3
 # LLVM-NEXT:       }
 # LLVM-NEXT:     ]
 # LLVM-NEXT:   }
 # LLVM-NEXT: ]
 
 # GNU:      Version symbols section '.gnu.version' contains 6 entries:
-# GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 6 (.dynsym)
+# GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 4 (.dynsym)
 # GNU-NEXT:   000:   0 (*local*) 2 (VERSION1) 3 (VERSION2) 4 (v1)
 # GNU-NEXT:   004:   5 (v2)      6 (v3)
 # GNU-EMPTY:
 # GNU-NEXT:  Version definition section '.gnu.version_d' contains 6 entries:
-# GNU-NEXT:   Addr: 0000000000000000  Offset: 0x00004c  Link: 7 (.dynstr)
+# GNU-NEXT:   Addr: 0000000000000000  Offset: 0x00004c  Link: 5 (.dynstr)
 # GNU-NEXT:    0x0000: Rev: 1  Flags: none  Index: 0  Cnt: 1  Name: VERSION1
 # GNU-NEXT:    0x001c: Rev: 1  Flags: BASE  Index: 0  Cnt: 1  Name: VERSION1
 # GNU-NEXT:    0x0038: Rev: 1  Flags: WEAK  Index: 0  Cnt: 1  Name: VERSION1
 # GNU-NEXT:    0x0054: Rev: 1  Flags: INFO  Index: 0  Cnt: 1  Name: VERSION1
 # GNU-NEXT:    0x0070: Rev: 1  Flags: BASE | WEAK | INFO  Index: 2  Cnt: 1  Name: VERSION1
 # GNU-NEXT:    0x008c: Rev: 1  Flags: <unknown>  Index: 3  Cnt: 3  Name: VERSION2
 # GNU-NEXT:    0x00b0: Parent 1: VERSION1
 # GNU-NEXT:    0x00b0: Parent 2: VERSION3
 # GNU-EMPTY:
 # GNU-NEXT:  Version needs section '.gnu.version_r' contains 2 entries:
-# GNU-NEXT:   Addr: 0000000000000000  Offset: 0x000104  Link: 7 (.dynstr)
+# GNU-NEXT:   Addr: 0000000000000000  Offset: 0x000104  Link: 5 (.dynstr)
 # GNU-NEXT:    0x0000: Version: 1  File: verneed1.so.0  Cnt: 5
 # GNU-NEXT:    0x0010:   Name: v1  Flags: BASE  Version: 0
 # GNU-NEXT:    0x0020:   Name: v1  Flags: WEAK  Version: 0
 # GNU-NEXT:    0x0030:   Name: v1  Flags: INFO  Version: 0
 # GNU-NEXT:    0x0040:   Name: v1  Flags: BASE | WEAK | INFO  Version: 4
 # GNU-NEXT:    0x0050:   Name: v2  Flags: <unknown>  Version: 5
 # GNU-NEXT:    0x0060: Version: 1  File: verneed2.so.0  Cnt: 1
 # GNU-NEXT:    0x0070:   Name: v3  Flags: none  Version: 6

llvm/test/tools/llvm-readobj/ELF/versym-invalid.test

 ## is linked with SHT_GNU_versym. In this case we are unable to produce LLVM style output,
 ## but GNU style is fine because it does not need that string table.
 
 # RUN: yaml2obj --docnum=3 %s -o %t3
 # RUN: llvm-readelf -V %t3 2>&1 | FileCheck -DFILE=%t3 %s --check-prefix=INVALID-STRING-TABLE-GNU
 # RUN: llvm-readobj -V %t3 2>&1 | FileCheck -DFILE=%t3 %s --check-prefix=INVALID-STRING-TABLE-LLVM
 
 # INVALID-STRING-TABLE-GNU:      Version symbols section '.gnu.version' contains 1 entries:
-# INVALID-STRING-TABLE-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 5 (.dynsym)
-# INVALID-STRING-TABLE-GNU-NEXT:  warning: '[[FILE]]': can't get a string table for the symbol table linked to SHT_GNU_versym section with index 1: invalid string table linked to SHT_DYNSYM section with index 5: invalid sh_type for string table section [index 2]: expected SHT_STRTAB, but got SHT_NULL
+# INVALID-STRING-TABLE-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 3 (.dynsym)
+# INVALID-STRING-TABLE-GNU-NEXT:  warning: '[[FILE]]': can't get a string table for the symbol table linked to SHT_GNU_versym section with index 1: invalid string table linked to SHT_DYNSYM section with index 3: invalid sh_type for string table section [index 2]: expected SHT_STRTAB, but got SHT_NULL
 # INVALID-STRING-TABLE-GNU-NEXT:  000:   0 (*local*)
 
 # INVALID-STRING-TABLE-LLVM:      VersionSymbols [
-# INVALID-STRING-TABLE-LLVM-NEXT: warning: '[[FILE]]': can't get a string table for the symbol table linked to SHT_GNU_versym section with index 1: invalid string table linked to SHT_DYNSYM section with index 5: invalid sh_type for string table section [index 2]: expected SHT_STRTAB, but got SHT_NULL
+# INVALID-STRING-TABLE-LLVM-NEXT: warning: '[[FILE]]': can't get a string table for the symbol table linked to SHT_GNU_versym section with index 1: invalid string table linked to SHT_DYNSYM section with index 3: invalid sh_type for string table section [index 2]: expected SHT_STRTAB, but got SHT_NULL
 # INVALID-STRING-TABLE-LLVM-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64

 
 ## Check we report a warning when the number of version entries does not match the number of symbols in the associated symbol table.
 
 # RUN: yaml2obj --docnum=6 %s -o %t6
 # RUN: llvm-readelf -V %t6 2>&1 | FileCheck -DFILE=%t6 %s --check-prefix=SYMBOLS-NUM-MISMATCH-GNU
 # RUN: llvm-readobj -V %t6 2>&1 | FileCheck -DFILE=%t6 %s --check-prefix=SYMBOLS-NUM-MISMATCH-LLVM
 
 # SYMBOLS-NUM-MISMATCH-GNU:      Version symbols section '.gnu.version' contains 2 entries:
-# SYMBOLS-NUM-MISMATCH-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 4 (.dynsym)
-# SYMBOLS-NUM-MISMATCH-GNU-NEXT:  warning: '[[FILE]]': SHT_GNU_versym section with index 1: the number of entries (2) does not match the number of symbols (3) in the symbol table with index 4
+# SYMBOLS-NUM-MISMATCH-GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 2 (.dynsym)
+# SYMBOLS-NUM-MISMATCH-GNU-NEXT:  warning: '[[FILE]]': SHT_GNU_versym section with index 1: the number of entries (2) does not match the number of symbols (3) in the symbol table with index 2
 # SYMBOLS-NUM-MISMATCH-GNU-NEXT:   000:   0 (*local*)       1 (*global*)
 
 # SYMBOLS-NUM-MISMATCH-LLVM:      VersionSymbols [
-# SYMBOLS-NUM-MISMATCH-LLVM-NEXT: warning: '[[FILE]]': SHT_GNU_versym section with index 1: the number of entries (2) does not match the number of symbols (3) in the symbol table with index 4
+# SYMBOLS-NUM-MISMATCH-LLVM-NEXT: warning: '[[FILE]]': SHT_GNU_versym section with index 1: the number of entries (2) does not match the number of symbols (3) in the symbol table with index 2
 # SYMBOLS-NUM-MISMATCH-LLVM-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64

llvm/test/tools/yaml2obj/ELF/dynamic-symbols.yaml

 # RUN: llvm-readobj --dyn-symbols %t2 2>&1 | FileCheck -DFILE=%t2 %s --check-prefix=NUM
 
 # NUM:      Name: foo
 # NUM:      Section:
 # NUM-SAME: .data (0x1)
 
 # NUM:      Name: bar
 # NUM:      Section:
-# NUM-SAME: .strtab (0x2)
+# NUM-SAME: .dynsym (0x2)
 
 # NUM:      Name: zed
 # NUM: warning: '[[FILE]]': invalid section index: 255
 # NUM:      Section:
 # NUM-SAME: <?> (0xFF)
 
 --- !ELF
 FileHeader:

llvm/test/tools/yaml2obj/ELF/gnu-hash-section.yaml

 ## Check how yaml2obj produces SHT_GNU_HASH sections.
 
 ## Check we can describe a SHT_GNU_HASH section using the "Content" tag.
 ## Check we set sh_link to index of the .dynsym by default.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-readobj --sections --section-data %t1 | FileCheck %s --check-prefix=CONTENT
 
 # CONTENT:      Name: .gnu.hash
 # CONTENT-NEXT: Type: SHT_GNU_HASH
 # CONTENT-NEXT: Flags [
 # CONTENT-NEXT: ]
 # CONTENT-NEXT: Address: 0x0
 # CONTENT-NEXT: Offset: 0x40
 # CONTENT-NEXT: Size: 3
-# CONTENT-NEXT: Link: 4
+# CONTENT-NEXT: Link: 2
 # CONTENT-NEXT: Info: 0
 # CONTENT-NEXT: AddressAlignment: 0
 # CONTENT-NEXT: EntrySize: 0
 # CONTENT-NEXT: SectionData (
 # CONTENT-NEXT:   0000: 001122 |
 # CONTENT-NEXT: )
+# CONTENT:      Index: 2
+# CONTENT-NEXT: Name: .dynsym (9)
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 Sections:

llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml

 ## Check the values of sh_info fields set by default for
 ## explicitly listed .dynstr, .dynsym, .strtab and .symtab
 ## sections.
 ##
 ## For symbol table sections, sh_info has a value which is
 ## one greater than the symbol table index of the last
 ## local symbol.
 ##
 ## sh_info isn't set for string table sections.
 
 # RUN: yaml2obj --docnum=1 %s -o %t
 # RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CASE1
 
-# CASE1:      Name: .symtab
-# CASE1:      Info:
-# CASE1-SAME: 2
-# CASE1:      Name: .strtab
-# CASE1:      Info:
-# CASE1-SAME: 0
-# CASE1:      Name: .dynsym
-# CASE1:      Info:
-# CASE1-SAME: 1
-# CASE1:      Name: .dynstr
-# CASE1:      Info:
-# CASE1-SAME: 0
+# CASE1:     Name: .symtab
+# CASE1-NOT: Info:
+# CASE1:     Info: 2{{$}}
+# CASE1:     Name: .strtab
+# CASE1-NOT: Info:
+# CASE1:     Info: 0{{$}}
+# CASE1:     Name: .dynsym
+# CASE1-NOT: Info:
+# CASE1:     Info: 1{{$}}
+# CASE1:     Name: .dynstr
+# CASE1-NOT: Info:
+# CASE1:     Info: 0{{$}}
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 Sections:

 DynamicSymbols:
   - Name:    global2
     Binding: STB_GLOBAL
 
 ## In the case when these sections are not defined in YAML, the
 ## behavior is the same as when we define them, but do not set the Info.
 
 # RUN: yaml2obj --docnum=2 %s -o %t
-# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CASE1
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CASE2
+
+# CASE2:      Name: .dynsym
+# CASE2:      Info:
+# CASE2-SAME: 1
+# CASE2:      Name: .dynstr
+# CASE2:      Info:
+# CASE2-SAME: 0
+# CASE2:      Name: .symtab
+# CASE2:      Info:
+# CASE2-SAME: 2
+# CASE2:      Name: .strtab
+# CASE2:      Info:
+# CASE2-SAME: 0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 Symbols:
   - Name:    local
   - Name:    global1
     Binding: STB_GLOBAL
 DynamicSymbols:
   - Name:    global2
     Binding: STB_GLOBAL
 
 ## Check we are able to set any sh_info explicitly.
 
 # RUN: yaml2obj --docnum=3 %s -o %t
-# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CASE2
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=CASE3
 
-# CASE2:      Name: .dynstr
-# CASE2:      Info:
-# CASE2-SAME: 10
-# CASE2:      Name: .dynsym
-# CASE2:      Info:
-# CASE2-SAME: 11
-# CASE2:      Name: .strtab
-# CASE2:      Info:
-# CASE2-SAME: 12
-# CASE2:      Name: .symtab
-# CASE2:      Info:
-# CASE2-SAME: 13
+# CASE3:      Name: .dynstr
+# CASE3:      Info:
+# CASE3-SAME: 10
+# CASE3:      Name: .dynsym
+# CASE3:      Info:
+# CASE3-SAME: 11
+# CASE3:      Name: .strtab
+# CASE3:      Info:
+# CASE3-SAME: 12
+# CASE3:      Name: .symtab
+# CASE3:      Info:
+# CASE3-SAME: 13
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 Sections:

llvm/test/tools/yaml2obj/ELF/implicit-sections-types.yaml

 ## Here we check the types set for implicit sections
 ## in different cases.
 
 ## Check the types set by default in case sections were implicitly
 ## added and not described in the YAML.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-readobj -S %t1 | FileCheck %s --check-prefix=CASE1
 
+# CASE1:      Name: .dynsym
+# CASE1-NEXT: Type: SHT_DYNSYM
+# CASE1:      Name: .dynstr
+# CASE1-NEXT: Type: SHT_STRTAB
 # CASE1:      Name: .symtab
 # CASE1-NEXT: Type: SHT_SYMTAB
 # CASE1:      Name: .strtab
 # CASE1-NEXT: Type: SHT_STRTAB
 # CASE1:      Name: .shstrtab
 # CASE1-NEXT: Type: SHT_STRTAB
-# CASE1:      Name: .dynsym
-# CASE1-NEXT: Type: SHT_DYNSYM
-# CASE1:      Name: .dynstr
-# CASE1-NEXT: Type: SHT_STRTAB
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_DYN
   Machine: EM_X86_64
 ## Needed to force the creation of the .symtab.