[LLD] - Update the test cases after yaml2obj change.

https://reviews.llvm.org/D60122 (r357595) changed the
symbols description format.

This change updates the LLD tests.

llvm-svn: 357596

37 files changed, 281 insertions, 296 deletions

diff --git a/lld/test/ELF/Inputs/bad-reloc-target.test b/lld/test/ELF/Inputs/bad-reloc-target.test
index dabd005..f4cc671 100644
--- a/lld/test/ELF/Inputs/bad-reloc-target.test
+++ b/lld/test/ELF/Inputs/bad-reloc-target.test
@@ -17,5 +17,5 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
\ No newline at end of file
+  - Name:            foo
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/Inputs/shf-info-link.test b/lld/test/ELF/Inputs/shf-info-link.test
index b877969..a2cc2e8 100644
--- a/lld/test/ELF/Inputs/shf-info-link.test
+++ b/lld/test/ELF/Inputs/shf-info-link.test
@@ -17,5 +17,5 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:            foo
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/arm-thumb-undefined-weak-narrow.test b/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
index 15f428e..9f9129e 100644
--- a/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
+++ b/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
@@ -33,18 +33,16 @@ Sections:
         Type:            R_ARM_THM_JUMP11
 
 Symbols:
- Global:
-   - Type:             STT_FUNC
-     Name:             _start
-     Value:            1
-     Section:          .text
- Local:
-   - Type:             STT_NOTYPE
-     Name:             "$t"
-     Section:          .text
-     Value:            0
- Weak:
-   - Type:             STT_NOTYPE
-     Name:             undefined_weak
-     Value:            0
-
+  - Type:             STT_NOTYPE
+    Name:             "$t"
+    Section:          .text
+    Value:            0
+  - Type:             STT_FUNC
+    Name:             _start
+    Value:            1
+    Section:          .text
+    Binding:          STB_GLOBAL
+  - Type:             STT_NOTYPE
+    Name:             undefined_weak
+    Value:            0
+    Binding:          STB_WEAK
diff --git a/lld/test/ELF/arm-v4bx.test b/lld/test/ELF/arm-v4bx.test
index 9d9921d..dd9614a 100644
--- a/lld/test/ELF/arm-v4bx.test
+++ b/lld/test/ELF/arm-v4bx.test
@@ -29,11 +29,9 @@ Sections:
       - Offset:          0x0000000000000000
         Type:            R_ARM_V4BX
 Symbols:
-  Global:
-    - Name:            _start
-      Section:         .text
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-DynamicSymbols:
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/bad-reloc-target.test b/lld/test/ELF/bad-reloc-target.test
index fea8c5f..90f9349 100644
--- a/lld/test/ELF/bad-reloc-target.test
+++ b/lld/test/ELF/bad-reloc-target.test
@@ -25,5 +25,5 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
\ No newline at end of file
+  - Name:            foo
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/debug-relocation-none.test b/lld/test/ELF/debug-relocation-none.test
index d22941d..6a8cc5d 100644
--- a/lld/test/ELF/debug-relocation-none.test
+++ b/lld/test/ELF/debug-relocation-none.test
@@ -52,7 +52,8 @@ Sections:
     Content:         '0111001017000000'
 
 Symbols:
-  Global:
-    - Name:            _start
-      Section:         .text
-    - Name:            bar
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL
+  - Name:            bar
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/i386-debug-noabs.test b/lld/test/ELF/i386-debug-noabs.test
index dbc7a57..486cc8d 100644
--- a/lld/test/ELF/i386-debug-noabs.test
+++ b/lld/test/ELF/i386-debug-noabs.test
@@ -29,5 +29,5 @@ Sections:
         Symbol:          _GLOBAL_OFFSET_TABLE_
         Type:            R_386_GOTPC
 Symbols:
-  Global:
-    - Name:            _GLOBAL_OFFSET_TABLE_
+  - Name:            _GLOBAL_OFFSET_TABLE_
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/i386-pc16.test b/lld/test/ELF/i386-pc16.test
index 14f8b50..4033f2c 100644
--- a/lld/test/ELF/i386-pc16.test
+++ b/lld/test/ELF/i386-pc16.test
@@ -32,9 +32,9 @@ Sections:
         Symbol:          _start
         Type:            R_386_PC16
 Symbols:
-  Global:
-    - Name:     _start
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0x1234
-      Size:     4
+  - Name:     _start
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0x1234
+    Size:     4
+    Binding:  STB_GLOBAL
diff --git a/lld/test/ELF/icf11.test b/lld/test/ELF/icf11.test
index edda386..1aa3454 100644
--- a/lld/test/ELF/icf11.test
+++ b/lld/test/ELF/icf11.test
@@ -43,9 +43,9 @@ Sections:
         Symbol:          zed
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:     zed
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0x0
-      Size:     8
+  - Name:     zed
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0x0
+    Size:     8
+    Binding:  STB_GLOBAL
diff --git a/lld/test/ELF/invalid-relocations.test b/lld/test/ELF/invalid-relocations.test
index 7c32058..53a7981 100644
--- a/lld/test/ELF/invalid-relocations.test
+++ b/lld/test/ELF/invalid-relocations.test
@@ -17,7 +17,7 @@ Sections:
         Symbol:          lulz
         Type:            R_X86_64_PC32
 Symbols:
-  Global:
-    - Name:            lulz
+  - Name:            lulz
+    Binding:         STB_GLOBAL
 
 # CHECK: invalid relocated section index
diff --git a/lld/test/ELF/invalid-undef-section-symbol.test b/lld/test/ELF/invalid-undef-section-symbol.test
index cb89306..1d66885 100644
--- a/lld/test/ELF/invalid-undef-section-symbol.test
+++ b/lld/test/ELF/invalid-undef-section-symbol.test
@@ -22,6 +22,5 @@ Sections:
         Symbol:          .text
         Type:            R_X86_64_NONE
 Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
+  - Name:            .text
+    Type:            STT_SECTION
diff --git a/lld/test/ELF/invalid/broken-relaxation-x64.test b/lld/test/ELF/invalid/broken-relaxation-x64.test
index 10d4655..7ff9bb2 100644
--- a/lld/test/ELF/invalid/broken-relaxation-x64.test
+++ b/lld/test/ELF/invalid/broken-relaxation-x64.test
@@ -38,9 +38,10 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_GOTTPOFF
 Symbols:
-  Global:
-    - Name:     foo
-      Type:     STT_TLS
-      Section:  .text
-      Value:    0x12345
-      Size:     4
+  - Name:     foo
+    Type:     STT_TLS
+    Section:  .text
+    Value:    0x12345
+    Size:     4
+    Binding:  STB_GLOBAL
+ 
\ No newline at end of file
diff --git a/lld/test/ELF/invalid/comdat-broken.test b/lld/test/ELF/invalid/comdat-broken.test
index 9ff8eca..3bae4d5 100644
--- a/lld/test/ELF/invalid/comdat-broken.test
+++ b/lld/test/ELF/invalid/comdat-broken.test
@@ -21,5 +21,5 @@ Sections:
       - SectionOrType: 0xFF
       - SectionOrType: 3
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:              foo
+    Binding:           STB_GLOBAL
diff --git a/lld/test/ELF/invalid/common-symbol-alignment.test b/lld/test/ELF/invalid/common-symbol-alignment.test
index 1a7ebda..7b79441 100644
--- a/lld/test/ELF/invalid/common-symbol-alignment.test
+++ b/lld/test/ELF/invalid/common-symbol-alignment.test
@@ -11,10 +11,10 @@ FileHeader:
   Type:            ET_REL
   Machine:         EM_X86_64
 Symbols:
-  Global:
-    - Name:            bar
-      Type:            STT_FUNC
-      Index:           SHN_COMMON
+  - Name:            bar
+    Type:            STT_FUNC
+    Index:           SHN_COMMON
+    Binding:         STB_GLOBAL
 
 ## If an object contains a common symbol with alignment greater
 ## than UINT32_MAX, check we report it.
@@ -29,8 +29,8 @@ FileHeader:
   Type:            ET_REL
   Machine:         EM_X86_64
 Symbols:
-  Global:
-    - Name:            bar
-      Type:            STT_FUNC
-      Index:           SHN_COMMON
-      Value:           0x0000003F3F3F3F3F
+  - Name:            bar
+    Type:            STT_FUNC
+    Index:           SHN_COMMON
+    Value:           0x0000003F3F3F3F3F
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/invalid/ehframe-broken-relocation.test b/lld/test/ELF/invalid/ehframe-broken-relocation.test
index 1333a6d..810524e 100644
--- a/lld/test/ELF/invalid/ehframe-broken-relocation.test
+++ b/lld/test/ELF/invalid/ehframe-broken-relocation.test
@@ -23,9 +23,9 @@ Sections:
         Symbol:          zed
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:     zed
-      Type:     STT_FUNC
-      Section:  .eh_frame
-      Value:    0x0
-      Size:     8
+  - Name:     zed
+    Type:     STT_FUNC
+    Section:  .eh_frame
+    Value:    0x0
+    Size:     8
+    Binding:  STB_GLOBAL
diff --git a/lld/test/ELF/invalid/invalid-debug-relocations.test b/lld/test/ELF/invalid/invalid-debug-relocations.test
index 2940420..71e4135 100644
--- a/lld/test/ELF/invalid/invalid-debug-relocations.test
+++ b/lld/test/ELF/invalid/invalid-debug-relocations.test
@@ -33,8 +33,8 @@ Sections:
         Symbol:          _start
         Type:            0xFF
 Symbols:
-  Global:
-    - Name:     _start
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0x0
+  - Name:     _start
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0x0
+    Binding:  STB_GLOBAL
diff --git a/lld/test/ELF/invalid/invalid-relocation-x64.test b/lld/test/ELF/invalid/invalid-relocation-x64.test
index 3a8d610..fddc0ce 100644
--- a/lld/test/ELF/invalid/invalid-relocation-x64.test
+++ b/lld/test/ELF/invalid/invalid-relocation-x64.test
@@ -29,5 +29,5 @@ Sections:
         Symbol:          foo
         Type:            0x99
 Symbols:
-  Global:
-      - Name:            foo
+  - Name:            foo
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/invalid/reloc-section-reordered.test b/lld/test/ELF/invalid/reloc-section-reordered.test
index 3de567f..286d661 100644
--- a/lld/test/ELF/invalid/reloc-section-reordered.test
+++ b/lld/test/ELF/invalid/reloc-section-reordered.test
@@ -29,7 +29,6 @@ Sections:
     AddressAlign:    0x04
     Content:         "FFFFFFFFFFFFFFFF"
 Symbols:
-  Local:
-    - Name:    .text
-      Type:    STT_SECTION
-      Section: .text
+  - Name:    .text
+    Type:    STT_SECTION
+    Section: .text
diff --git a/lld/test/ELF/invalid/sht-group-wrong-section.test b/lld/test/ELF/invalid/sht-group-wrong-section.test
index d431dcb..dba266a1 100644
--- a/lld/test/ELF/invalid/sht-group-wrong-section.test
+++ b/lld/test/ELF/invalid/sht-group-wrong-section.test
@@ -18,5 +18,5 @@ Sections:
       - SectionOrType: GRP_COMDAT
       - SectionOrType: 12345
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:            foo
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/invalid/symtab-sh-info.s b/lld/test/ELF/invalid/symtab-sh-info.s
index dc99c71..9e694dc 100644
--- a/lld/test/ELF/invalid/symtab-sh-info.s
+++ b/lld/test/ELF/invalid/symtab-sh-info.s
@@ -16,8 +16,8 @@ Sections:
     Info:            0
     Type:            SHT_SYMTAB
 Symbols:
-  Global:
-    - Name: foo
+  - Name:          foo
+    Binding:       STB_GLOBAL
 
 ## sh_info has value 2 what says that non-local symbol `foo` is local.
 ## Check we report this case.
@@ -36,8 +36,8 @@ Sections:
     Info:            2
     Type:            SHT_SYMTAB
 Symbols:
-  Global:
-    - Name: foo
+  - Name:          foo
+    Binding:       STB_GLOBAL
 
 ## sh_info has value 0xff what is larger than number of symbols in a .symtab.
 ## Check we report this case.
@@ -55,5 +55,5 @@ Sections:
     Info:            0xff
     Type:            SHT_SYMTAB
 Symbols:
-  Global:
-    - Name: foo
+  - Name:          foo
+    Binding:       STB_GLOBAL
diff --git a/lld/test/ELF/invalid/symtab-symbols.test b/lld/test/ELF/invalid/symtab-symbols.test
index 953b2e3..5f4ae35 100644
--- a/lld/test/ELF/invalid/symtab-symbols.test
+++ b/lld/test/ELF/invalid/symtab-symbols.test
@@ -20,6 +20,5 @@ Sections:
     AddressAlign:    0x0000000000000010
     Content:         "00000000"
 Symbols:
-  Local:
-    - Type:            STT_NOTYPE
-      Section:         .symtab
+  - Type:            STT_NOTYPE
+    Section:         .symtab
diff --git a/lld/test/ELF/invalid/tls-symbol.s b/lld/test/ELF/invalid/tls-symbol.s
index d036859..3f371d4 100644
--- a/lld/test/ELF/invalid/tls-symbol.s
+++ b/lld/test/ELF/invalid/tls-symbol.s
@@ -18,7 +18,7 @@ Sections:
     Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
     Content:         ''
 Symbols:
-  Global:
-    - Name:            bar
-      Type:            STT_TLS
-      Section:         .text
+  - Name:          bar
+    Type:          STT_TLS
+    Section:       .text
+    Binding:       STB_GLOBAL
diff --git a/lld/test/ELF/invalid/undefined-local-symbol-in-dso.test b/lld/test/ELF/invalid/undefined-local-symbol-in-dso.test
index dae1954..c479d04 100644
--- a/lld/test/ELF/invalid/undefined-local-symbol-in-dso.test
+++ b/lld/test/ELF/invalid/undefined-local-symbol-in-dso.test
@@ -23,5 +23,4 @@ Sections:
     Info:          1
     Type:          SHT_SYMTAB
 DynamicSymbols:
-  Local:
-    - Name: foo
+  - Name: foo
diff --git a/lld/test/ELF/mips-jalr.test b/lld/test/ELF/mips-jalr.test
index c1b119c..2ca2c72 100644
--- a/lld/test/ELF/mips-jalr.test
+++ b/lld/test/ELF/mips-jalr.test
@@ -38,15 +38,14 @@ Sections:
         Type:    R_MIPS_JALR
 
 Symbols:
-  Local:
-    - Name:     T1
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0
-      Size:     4
-  Global:
-    - Name:     __start
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0
-      Size:     4
+  - Name:     T1
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0
+    Size:     4
+  - Name:     __start
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0
+    Size:     4
+    Binding:  STB_GLOBAL
diff --git a/lld/test/ELF/relocation-b-aarch64.test b/lld/test/ELF/relocation-b-aarch64.test
index 152cc39..ff4a82f 100644
--- a/lld/test/ELF/relocation-b-aarch64.test
+++ b/lld/test/ELF/relocation-b-aarch64.test
@@ -37,12 +37,11 @@ Sections:
         Type:            R_AARCH64_JUMP26
 
 Symbols:
- Local:
-   - Type:             STT_FUNC
-     Section:          .text
-     Name:             foo
-     Value:            0
-   - Type:             STT_FUNC
-     Section:          .text
-     Name:             bar
-     Value:            4
+  - Type:             STT_FUNC
+    Section:          .text
+    Name:             foo
+    Value:            0
+  - Type:             STT_FUNC
+    Section:          .text
+    Name:             bar
+    Value:            4
diff --git a/lld/test/ELF/relocation-group.test b/lld/test/ELF/relocation-group.test
index 0820ff8..f33697b 100644
--- a/lld/test/ELF/relocation-group.test
+++ b/lld/test/ELF/relocation-group.test
@@ -39,5 +39,5 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:    foo
+    Binding: STB_GLOBAL
diff --git a/lld/test/ELF/riscv-branch.test b/lld/test/ELF/riscv-branch.test
index 3af9364..c4eeced 100644
--- a/lld/test/ELF/riscv-branch.test
+++ b/lld/test/ELF/riscv-branch.test
@@ -93,27 +93,26 @@ Sections:
         Type:            R_RISCV_BRANCH
         Addend:          -4096
 Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_max
-      Type:            STT_SECTION
-      Section:         .reloc_max
-    - Name:            L1
-      Section:         .reloc_max
-    - Name:            .reloc_min
-      Type:            STT_SECTION
-      Section:         .reloc_min
-    - Name:            L2
-      Section:         .reloc_min
-  Global:
-    - Name:            _start
-      Section:         .text
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            .data
+    Type:            STT_SECTION
+    Section:         .data
+  - Name:            .bss
+    Type:            STT_SECTION
+    Section:         .bss
+  - Name:            .reloc_max
+    Type:            STT_SECTION
+    Section:         .reloc_max
+  - Name:            L1
+    Section:         .reloc_max
+  - Name:            .reloc_min
+    Type:            STT_SECTION
+    Section:         .reloc_min
+  - Name:            L2
+    Section:         .reloc_min
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL
 ...
diff --git a/lld/test/ELF/riscv-call.test b/lld/test/ELF/riscv-call.test
index d8077d4..da68935 100644
--- a/lld/test/ELF/riscv-call.test
+++ b/lld/test/ELF/riscv-call.test
@@ -74,22 +74,21 @@ Sections:
         Type:            R_RISCV_CALL
         Addend:          -4
 Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_neg
-      Type:            STT_SECTION
-      Section:         .reloc_neg
-    - Name:            L1
-      Section:         .reloc_neg
-  Global:
-    - Name:            _start
-      Section:         .text
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            .data
+    Type:            STT_SECTION
+    Section:         .data
+  - Name:            .bss
+    Type:            STT_SECTION
+    Section:         .bss
+  - Name:            .reloc_neg
+    Type:            STT_SECTION
+    Section:         .reloc_neg
+  - Name:            L1
+    Section:         .reloc_neg
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL
 ...
diff --git a/lld/test/ELF/riscv-hi20-lo12.test b/lld/test/ELF/riscv-hi20-lo12.test
index 8d21d33..15d1e35 100644
--- a/lld/test/ELF/riscv-hi20-lo12.test
+++ b/lld/test/ELF/riscv-hi20-lo12.test
@@ -62,25 +62,24 @@ Sections:
     AddressAlign:    0x0000000000000001
     Content:         37C5DCFE130585A9
 Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_12345678
-      Type:            STT_SECTION
-      Section:         .reloc_12345678
-    - Name:            foo
-      Value:           0x00000000FEDCBA98
-    - Name:            .reloc_fedcba98
-      Type:            STT_SECTION
-      Section:         .reloc_fedcba98
-  Global:
-    - Name:            _start
-      Section:         .reloc_12345678
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            .data
+    Type:            STT_SECTION
+    Section:         .data
+  - Name:            .bss
+    Type:            STT_SECTION
+    Section:         .bss
+  - Name:            .reloc_12345678
+    Type:            STT_SECTION
+    Section:         .reloc_12345678
+  - Name:            foo
+    Value:           0x00000000FEDCBA98
+  - Name:            .reloc_fedcba98
+    Type:            STT_SECTION
+    Section:         .reloc_fedcba98
+  - Name:            _start
+    Section:         .reloc_12345678
+    Binding:         STB_GLOBAL
 ...
diff --git a/lld/test/ELF/riscv-jal-error.test b/lld/test/ELF/riscv-jal-error.test
index 9df95c9..113efa5 100644
--- a/lld/test/ELF/riscv-jal-error.test
+++ b/lld/test/ELF/riscv-jal-error.test
@@ -66,28 +66,27 @@ Sections:
     Flags:           [ SHF_WRITE, SHF_ALLOC ]
     AddressAlign:    0x0000000000000001
 Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            L1
-      Section:         .text
-    - Name:            L2
-      Section:         .text
-      Value:           0x0000000000000004
-    - Name:            L3
-      Section:         .text
-      Value:           0x0000000000000008
-    - Name:            L4
-      Section:         .text
-      Value:           0x000000000000000C
-  Global:
-    - Name:            _start
-      Section:         .text
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            .data
+    Type:            STT_SECTION
+    Section:         .data
+  - Name:            .bss
+    Type:            STT_SECTION
+    Section:         .bss
+  - Name:            L1
+    Section:         .text
+  - Name:            L2
+    Section:         .text
+    Value:           0x0000000000000004
+  - Name:            L3
+    Section:         .text
+    Value:           0x0000000000000008
+  - Name:            L4
+    Section:         .text
+    Value:           0x000000000000000C
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL
 ...
diff --git a/lld/test/ELF/riscv-jal.test b/lld/test/ELF/riscv-jal.test
index cb40dc6..5441269 100644
--- a/lld/test/ELF/riscv-jal.test
+++ b/lld/test/ELF/riscv-jal.test
@@ -121,41 +121,40 @@ Sections:
         Type:            R_RISCV_RVC_JUMP
         Addend:          -2048
 Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_zero
-      Type:            STT_SECTION
-      Section:         .reloc_zero
-    - Name:            L1
-      Section:         .reloc_zero
-    - Name:            L2
-      Section:         .reloc_zero
-      Value:           0x0000000000000004
-    - Name:            .reloc_max
-      Type:            STT_SECTION
-      Section:         .reloc_max
-    - Name:            L3
-      Section:         .reloc_max
-    - Name:            L4
-      Section:         .reloc_max
-      Value:           0x0000000000000004
-    - Name:            .reloc_min
-      Type:            STT_SECTION
-      Section:         .reloc_min
-    - Name:            L5
-      Section:         .reloc_min
-    - Name:            L6
-      Section:         .reloc_min
-      Value:           0x0000000000000004
-  Global:
-    - Name:            _start
-      Section:         .reloc_zero
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            .data
+    Type:            STT_SECTION
+    Section:         .data
+  - Name:            .bss
+    Type:            STT_SECTION
+    Section:         .bss
+  - Name:            .reloc_zero
+    Type:            STT_SECTION
+    Section:         .reloc_zero
+  - Name:            L1
+    Section:         .reloc_zero
+  - Name:            L2
+    Section:         .reloc_zero
+    Value:           0x0000000000000004
+  - Name:            .reloc_max
+    Type:            STT_SECTION
+    Section:         .reloc_max
+  - Name:            L3
+    Section:         .reloc_max
+  - Name:            L4
+    Section:         .reloc_max
+    Value:           0x0000000000000004
+  - Name:            .reloc_min
+    Type:            STT_SECTION
+    Section:         .reloc_min
+  - Name:            L5
+    Section:         .reloc_min
+  - Name:            L6
+    Section:         .reloc_min
+    Value:           0x0000000000000004
+  - Name:            _start
+    Section:         .reloc_zero
+    Binding:         STB_GLOBAL
 ...
diff --git a/lld/test/ELF/riscv-pcrel-hilo.test b/lld/test/ELF/riscv-pcrel-hilo.test
index 9767e14..2cfb711 100644
--- a/lld/test/ELF/riscv-pcrel-hilo.test
+++ b/lld/test/ELF/riscv-pcrel-hilo.test
@@ -82,22 +82,21 @@ Sections:
         Symbol:          L1
         Type:            R_RISCV_PCREL_LO12_I
 Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_neg
-      Type:            STT_SECTION
-      Section:         .reloc_neg
-    - Name:            L1
-      Section:         .reloc_neg
-  Global:
-    - Name:            _start
-      Section:         .text
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            .data
+    Type:            STT_SECTION
+    Section:         .data
+  - Name:            .bss
+    Type:            STT_SECTION
+    Section:         .bss
+  - Name:            .reloc_neg
+    Type:            STT_SECTION
+    Section:         .reloc_neg
+  - Name:            L1
+    Section:         .reloc_neg
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL
 ...
diff --git a/lld/test/ELF/section-align-0.test b/lld/test/ELF/section-align-0.test
index 8827ecf..232d43a 100644
--- a/lld/test/ELF/section-align-0.test
+++ b/lld/test/ELF/section-align-0.test
@@ -15,6 +15,6 @@ Sections:
     AddressAlign:    0
 
 Symbols:
-  Global:
-    - Name:            _start
-      Section:         .text
+  - Name:          _start
+    Section:       .text
+    Binding:       STB_GLOBAL
diff --git a/lld/test/ELF/section-symbols.test b/lld/test/ELF/section-symbols.test
index 973b110..74ed7ab 100644
--- a/lld/test/ELF/section-symbols.test
+++ b/lld/test/ELF/section-symbols.test
@@ -24,12 +24,11 @@ Sections:
     Info:            .text
     Relocations:
 Symbols:
-  Local:
-    - Type:            STT_SECTION
-      Section:         .rela.text
-    - Type:            STT_SECTION
-      Section:         .shstrtab
-    - Type:            STT_SECTION
-      Section:         .symtab
-    - Type:            STT_SECTION
-      Section:         .strtab
+  - Type:            STT_SECTION
+    Section:         .rela.text
+  - Type:            STT_SECTION
+    Section:         .shstrtab
+  - Type:            STT_SECTION
+    Section:         .symtab
+  - Type:            STT_SECTION
+    Section:         .strtab
diff --git a/lld/test/ELF/shf-info-link.test b/lld/test/ELF/shf-info-link.test
index ea15655..497bce5 100644
--- a/lld/test/ELF/shf-info-link.test
+++ b/lld/test/ELF/shf-info-link.test
@@ -28,5 +28,5 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:           foo
+    Binding:        STB_GLOBAL
diff --git a/lld/test/ELF/sht-group-empty.test b/lld/test/ELF/sht-group-empty.test
index 46c77f3..5a7fa9b 100644
--- a/lld/test/ELF/sht-group-empty.test
+++ b/lld/test/ELF/sht-group-empty.test
@@ -49,7 +49,7 @@ Sections:
         Symbol:          bar
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
-    - Name:            bar
-
+  - Name:            foo
+    Binding:         STB_GLOBAL
+  - Name:            bar
+    Binding:         STB_GLOBAL
diff --git a/lld/test/ELF/undef-broken-debug.test b/lld/test/ELF/undef-broken-debug.test
index 3ed4c2b..444f3bf 100644
--- a/lld/test/ELF/undef-broken-debug.test
+++ b/lld/test/ELF/undef-broken-debug.test
@@ -62,14 +62,14 @@ Sections:
     Content:         '0111001017000000'
 
 Symbols:
-  Local:
-    - Name:            .debug_abbrev
-      Type:            STT_SECTION
-      Section:         .debug_abbrev
-    - Name:            .debug_line
-      Type:            STT_SECTION
-      Section:         .debug_line
-  Global:
-    - Name:            _start
-      Section:         .text
-    - Name:            bar
+  - Name:            .debug_abbrev
+    Type:            STT_SECTION
+    Section:         .debug_abbrev
+  - Name:            .debug_line
+    Type:            STT_SECTION
+    Section:         .debug_line
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL 
+  - Name:            bar
+    Binding:         STB_GLOBAL