[AIX][TLS] Add support for TLS variables to XCOFF object writer

[NeHuang]

Summary

This patch adds support for TLS variables to the XCOFF object writer:

• Add new TData and TBSS sections
• Add new CsectGroups for the mapping classes XCOFF::XMC_TL and XCOFF::XMC_UL
• Add XMC_UL in the enum entry of CsectStorageMapping class to print the string while reading the symbol properties for TLS variables.
• Fix the starting address of TData and TBSS sections

[DiggerLin]

llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables-data-sect-off.ll

4 ↗

(On Diff #331848)

maybe wo do not need to test file-header here , it already test in other patch

[DiggerLin]

we maybe also need to use llvm-objdump to test the data content of .tdata

llvm/lib/MC/XCOFFObjectWriter.cpp

314

should be
XCOFF::XTY_CM == MCSec->getCSectType() ?

[DiggerLin]

llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll

105

I am not sure whether we need to test all the symbols again ? ,may be we only need to test the symbosl which effect by the -data-sections=on.

[DiggerLin]

I think we also need to use llvm-objdump to test the content of .tdata ?

[DiggerLin]

and I am slightly prefer to combine the two test files into one. because the only different is data-section is on or off. we can use different --check-prefix for them

[NeHuang]

llvm/lib/MC/XCOFFObjectWriter.cpp

314

For the TLS external reference case, we are setting SMC to XCOFF::XMC_UL with the csect type of ER in the function TargetLoweringObjectFileXCOFF::getSectionForExternalReference

[DiggerLin]

llvm/lib/MC/XCOFFObjectWriter.cpp

314

the TLS external symbol not put in the .tbss .

[NeHuang]

Address review comments.

[NeHuang]

llvm/lib/MC/XCOFFObjectWriter.cpp

314

Yes, you are right. Updated.

[NeHuang]

Address review comment to

• Remove file header check in the test case
• Merge data section ON/OFF into one test case
• Fix the assert check condition
• Check for llvm-objdump outputs
• Print XMC_UL in the symbol table

[DiggerLin]

llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll

5

change --check-prefix=OBJ to --check-prefix=SECTION ?

10

ditto

12

if do not use --symbol-description , I think llvm-objdump -D for -data-sections=on / off should be same.

15

since we do not support generating 64bits object file. I do not think we need two different not --crash llv for -data-sections on and off.

518

suggest to remove the external from @tls_global_int_external_val_initialized , it is not a external variable.

519

ditto

525

change @tls_global_int_external_uninitialized to @tls_global_int_external ?

527

change @tls_global_double_external_uninitialized to @tls_global_double_external

[NeHuang]

Address review comment to

• Change prefix name from OBJ to SECTION
• Only keep one 64 bits object file check for data sections on
• clang-format

llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll

12

yes, it will be same without adding --symbol-description. As discussed offline, we will keep --symbol-description to check the storaging mapping class in the dump.

518

As discussed offline, we will keep these cases to check for tls variables with external linkage:

• zero initialized
• value initialized
• un-initialized (external reference)

[DiggerLin]

LGTM, please wait for 24 hours before commit . maybe other reviewer still have some comment.

llvm/lib/MC/XCOFFObjectWriter.cpp

316

change to " must be an uninitialized csect." ?

[NeHuang]

Update the assert message.

[hubert.reinterpretcast]

llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll

27

I don't like that the .text section here has size zero. This way, the test doesn't check that the thread-local sections are placed in a separate address space starting again at 0.

[NeHuang]

Addressed review comment to

• Define a constatnt variable in the test case to ensure .text section size not zero.
• Add a case with an alias to a thread-local variable as discussed offline.

[hubert.reinterpretcast]

llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll

38–39

This doesn't match the behaviour of the AIX assembler (and also of the XL compiler). The .tdata section starts again at address 0x0.

It seems the documentation is wrong one way or the other though. It says (regarding s_paddr):

This field should contain 0 for all sections except the .text , .data , and .bss sections.

but it is not the case that the .tbss starts again at 0x0 (it does follow .tdata).

[hubert.reinterpretcast]

llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll

253

This needs to be written based on INDX as well. The same comment applies to the other ContainingCsectSymbolIndex lines.

[NeHuang]

Thanks @hubert.reinterpretcast for the good catch! Just confirmed locally the section address and csect addresss for .tdata and .tbss do not match the results generated by AIX system assembler.
Working on computing proper physical/virtual addresses for the two new sections .tdata and .tbss. For .tbss case, I am not sure if it should follow the current documentation. I am starting the implementation following .tdata address to match the behavior of AIX assembler.

[NeHuang]

• Fix the starting address for .tdata and .tbss sections to match the behaviour of the AIX assembler.
• Update the CHECK for ContainingCsectSymbolIndex using INDX

[NeHuang]

Gentle ping.

[hubert.reinterpretcast]

LGTM; thanks!

llvm/lib/MC/XCOFFObjectWriter.cpp

class XCOFFObjectWriter : public MCObjectWriter {
   // the same section and get handled in a 'similar' way.
   CsectGroup UndefinedCsects;
   CsectGroup ProgramCodeCsects;
   CsectGroup ReadOnlyCsects;
   CsectGroup DataCsects;
   CsectGroup FuncDSCsects;
   CsectGroup TOCCsects;
   CsectGroup BSSCsects;
+  CsectGroup TDataCsects;
+  CsectGroup TBSSCsects;
 
   // The Predefined sections.
   Section Text;
   Section Data;
   Section BSS;
+  Section TData;
+  Section TBSS;
 
   // All the XCOFF sections, in the order they will appear in the section header
   // table.
-  std::array<Section *const, 3> Sections{{&Text, &Data, &BSS}};
+  std::array<Section *const, 5> Sections{{&Text, &Data, &BSS, &TData, &TBSS}};
 
   CsectGroup &getCsectGroup(const MCSectionXCOFF *MCSec);
 
   virtual void reset() override;
 
   void executePostLayoutBinding(MCAssembler &, const MCAsmLayout &) override;
 
   void recordRelocation(MCAssembler &, const MCAsmLayout &, const MCFragment *,
XCOFFObjectWriter::XCOFFObjectWriter(
     std::unique_ptr<MCXCOFFObjectTargetWriter> MOTW, raw_pwrite_stream &OS)
     : W(OS, support::big), TargetObjectWriter(std::move(MOTW)),
       Strings(StringTableBuilder::XCOFF),
       Text(".text", XCOFF::STYP_TEXT, /* IsVirtual */ false,
            CsectGroups{&ProgramCodeCsects, &ReadOnlyCsects}),
       Data(".data", XCOFF::STYP_DATA, /* IsVirtual */ false,
            CsectGroups{&DataCsects, &FuncDSCsects, &TOCCsects}),
       BSS(".bss", XCOFF::STYP_BSS, /* IsVirtual */ true,
-          CsectGroups{&BSSCsects}) {}
+          CsectGroups{&BSSCsects}),
+      TData(".tdata", XCOFF::STYP_TDATA, /* IsVirtual */ false,
+            CsectGroups{&TDataCsects}),
+      TBSS(".tbss", XCOFF::STYP_TBSS, /* IsVirtual */ true,
+           CsectGroups{&TBSSCsects}) {}
 
 void XCOFFObjectWriter::reset() {
   // Clear the mappings we created.
   SymbolIndexMap.clear();
   SectionMap.clear();
 
   UndefinedCsects.clear();
   // Reset any sections we have written to, and empty the section header table.
case XCOFF::XMC_RW:
     report_fatal_error("Unhandled mapping of read-write csect to section.");
   case XCOFF::XMC_DS:
     return FuncDSCsects;
   case XCOFF::XMC_BS:
     assert(XCOFF::XTY_CM == MCSec->getCSectType() &&
            "Mapping invalid csect. CSECT with bss storage class must be "
            "common type.");
     return BSSCsects;
+  case XCOFF::XMC_TL:
+    assert(XCOFF::XTY_SD == MCSec->getCSectType() &&
+           "Mapping invalid csect. CSECT with tdata storage class must be "
+           "an initialized csect.");
+    return TDataCsects;
+  case XCOFF::XMC_UL:
+    assert(XCOFF::XTY_CM == MCSec->getCSectType() &&
+           "Mapping invalid csect. CSECT with tbss storage class must not be "
+           "an initialized csect.");
+    return TBSSCsects;
   case XCOFF::XMC_TC0:
     assert(XCOFF::XTY_SD == MCSec->getCSectType() &&
            "Only an initialized csect can contain TOC-base.");
     assert(TOCCsects.empty() &&
            "We should have only one TOC-base, and it should be the first csect "
            "in this CsectGroup.");
     return TOCCsects;
   case XCOFF::XMC_TC:

llvm/test/CodeGen/PowerPC/aix-tls-xcoff-variables.ll

+; This file tests the codegen of tls variables in AIX XCOFF object files
+
+; RUN: llc -mtriple powerpc-ibm-aix-xcoff -filetype=obj -o %t.o < %s
+; RUN: llvm-readobj --section-headers %t.o | FileCheck --check-prefix=SECTION %s
+; RUN: llvm-readobj --syms %t.o | FileCheck --check-prefixes=SYMS,SYMS-DATASECT %s
+; RUN: llvm-objdump -D --symbol-description %t.o | FileCheck --check-prefixes=OBJDUMP,OBJDUMP-DATASECT %s
+
+; RUN: llc -mtriple powerpc-ibm-aix-xcoff -data-sections=false -filetype=obj -o %t.o < %s
+; RUN: llvm-readobj --section-headers %t.o | FileCheck --check-prefix=SECTION %s
+; RUN: llvm-readobj --syms %t.o | FileCheck --check-prefixes=SYMS,SYMS-NODATASECT %s
+; RUN: llvm-objdump -D --symbol-description %t.o | FileCheck --check-prefixes=OBJDUMP,OBJDUMP-NODATASECT %s
+
+; RUN: not --crash llc -mtriple powerpc64-ibm-aix-xcoff -filetype=obj < %s 2>&1 | FileCheck --check-prefix=XCOFF64 %s
+; XCOFF64: LLVM ERROR: 64-bit XCOFF object files are not supported yet.
+
+; SECTION:      File: {{.*}}aix-tls-xcoff-variables.ll.tmp.o
+; SECTION-NEXT: Format: aixcoff-rs6000
+; SECTION-NEXT: Arch: powerpc
+; SECTION-NEXT: AddressSize: 32bit
+; SECTION-NEXT: Sections [
+; SECTION-NEXT:   Section {
+; SECTION-NEXT:     Index: 1
+; SECTION-NEXT:     Name: .text
+; SECTION-NEXT:     PhysicalAddress: 0x0
+; SECTION-NEXT:     VirtualAddress: 0x0
+; SECTION-NEXT:     Size: 0x0
+; SECTION-NEXT:     RawDataOffset: 0x8C
+; SECTION-NEXT:     RelocationPointer: 0x0
+; SECTION-NEXT:     LineNumberPointer: 0x0
+; SECTION-NEXT:     NumberOfRelocations: 0
+; SECTION-NEXT:     NumberOfLineNumbers: 0
+; SECTION-NEXT:     Type: STYP_TEXT (0x20)
+; SECTION-NEXT:   }
+; SECTION-NEXT:   Section {
+; SECTION-NEXT:     Index: 2
+; SECTION-NEXT:     Name: .tdata
+; SECTION-NEXT:     PhysicalAddress: 0x0
+; SECTION-NEXT:     VirtualAddress: 0x0
+; SECTION-NEXT:     Size: 0x30
+; SECTION-NEXT:     RawDataOffset: 0x8C
+; SECTION-NEXT:     RelocationPointer: 0x0
+; SECTION-NEXT:     LineNumberPointer: 0x0
+; SECTION-NEXT:     NumberOfRelocations: 0
+; SECTION-NEXT:     NumberOfLineNumbers: 0
+; SECTION-NEXT:     Type: STYP_TDATA (0x400)
+; SECTION-NEXT:   }
+; SECTION-NEXT:   Section {
+; SECTION-NEXT:     Index: 3
+; SECTION-NEXT:     Name: .tbss
+; SECTION-NEXT:     PhysicalAddress: 0x30
+; SECTION-NEXT:     VirtualAddress: 0x30
+; SECTION-NEXT:     Size: 0x18
+; SECTION-NEXT:     RawDataOffset: 0x0
+; SECTION-NEXT:     RelocationPointer: 0x0
+; SECTION-NEXT:     LineNumberPointer: 0x0
+; SECTION-NEXT:     NumberOfRelocations: 0
+; SECTION-NEXT:     NumberOfLineNumbers: 0
+; SECTION-NEXT:     Type: STYP_TBSS (0x800)
+; SECTION-NEXT:   }
+; SECTION-NEXT: ]
+
+; SYMS:      File: {{.*}}aix-tls-xcoff-variables.ll.tmp.o
+; SYMS-NEXT: Format: aixcoff-rs6000
+; SYMS-NEXT: Arch: powerpc
+; SYMS-NEXT: AddressSize: 32bit
+; SYMS:      Symbols [
+; SYMS-NEXT:   Symbol {
+; SYMS-NEXT:     Index: 0
+; SYMS-NEXT:     Name: .file
+; SYMS-NEXT:     Value (SymbolTableIndex): 0x0
+; SYMS-NEXT:     Section: N_DEBUG
+; SYMS-NEXT:     Source Language ID: TB_C (0x0)
+; SYMS-NEXT:     CPU Version ID: 0x0
+; SYMS-NEXT:     StorageClass: C_FILE (0x67)
+; SYMS-NEXT:     NumberOfAuxEntries: 0
+; SYMS-NEXT:   }
+; SYMS-NEXT:   Symbol {
+; SYMS-NEXT:     Index: [[#INDX:]]
+; SYMS-NEXT:     Name: tls_global_int_external_uninitialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x0
+; SYMS-NEXT:     Section: N_UNDEF
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_EXT (0x2)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-NEXT:       Index: [[#INDX+1]]
+; SYMS-NEXT:       SectionLen: 0
+; SYMS-NEXT:       ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-NEXT:       SymbolAlignmentLog2: 0
+; SYMS-NEXT:       SymbolType: XTY_ER (0x0)
+; SYMS-NEXT:       StorageMappingClass: XMC_UL (0x15)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+; SYMS-NEXT:   Symbol {
+; SYMS-NEXT:     Index: [[#INDX+2]]
+; SYMS-NEXT:     Name: tls_global_double_external_uninitialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x0
+; SYMS-NEXT:     Section: N_UNDEF
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_EXT (0x2)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-NEXT:       Index: [[#INDX+3]]
+; SYMS-NEXT:       SectionLen: 0
+; SYMS-NEXT:       ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-NEXT:       SymbolAlignmentLog2: 0
+; SYMS-NEXT:       SymbolType: XTY_ER (0x0)
+; SYMS-NEXT:       StorageMappingClass: XMC_UL (0x15)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+
+; SYMS-NEXT:   Symbol {
+; SYMS-NEXT:     Index: [[#INDX+4]]
+; SYMS-NEXT:     Name: .text
+; SYMS-NEXT:     Value (RelocatableAddress): 0x0
+; SYMS-NEXT:     Section: .text
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_HIDEXT (0x6B)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-NEXT:       Index: [[#INDX+5]]
+; SYMS-NEXT:       SectionLen: 0
+; SYMS-NEXT:       ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-NEXT:       SymbolAlignmentLog2: 2
+; SYMS-NEXT:       SymbolType: XTY_SD (0x1)
+; SYMS-NEXT:       StorageMappingClass: XMC_PR (0x0)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS-NODATASECT:        Symbol {
+; SYMS-NODATASECT-NEXT:     Index: [[#INDX+6]]
+; SYMS-NODATASECT-NEXT:     Name: .tdata
+; SYMS-NODATASECT-NEXT:     Value (RelocatableAddress): 0x0
+; SYMS-NODATASECT-NEXT:     Section: .tdata
+; SYMS-NODATASECT-NEXT:     Type: 0x0
+; SYMS-NODATASECT-NEXT:     StorageClass: C_HIDEXT (0x6B)
+; SYMS-NODATASECT-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NODATASECT-NEXT:     CSECT Auxiliary Entry {
+; SYMS-NODATASECT-NEXT:       Index: [[#INDX+7]]
+; SYMS-NODATASECT-NEXT:       SectionLen: 48
+; SYMS-NODATASECT-NEXT:       ParameterHashIndex: 0x0
+; SYMS-NODATASECT-NEXT:       TypeChkSectNum: 0x0
+; SYMS-NODATASECT-NEXT:       SymbolAlignmentLog2: 3
+; SYMS-NODATASECT-NEXT:       SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT-NEXT:       StorageMappingClass: XMC_TL (0x14)
+; SYMS-NODATASECT-NEXT:       StabInfoIndex: 0x0
+; SYMS-NODATASECT-NEXT:       StabSectNum: 0x0
+; SYMS-NODATASECT-NEXT:     }
+; SYMS-NODATASECT-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+6]]
+; SYMS-NODATASECT: Index: [[#INDX+8]]
+; SYMS:          Name: tls_global_int_external_val_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x0
+; SYMS-NEXT:     Section: .tdata
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_EXT (0x2)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:        Index: [[#INDX+7]]
+; SYMS-DATASECT-NEXT:   SectionLen: 4
+; SYMS-NODATASECT:      Index: [[#INDX+9]]
+; SYMS-NODATASECT-NEXT: ContainingCsectSymbolIndex: 7
+; SYMS:            ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-DATASECT:        SymbolAlignmentLog2: 2
+; SYMS-DATASECT-NEXT:   SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT:      SymbolAlignmentLog2: 0
+; SYMS-NODATASECT-NEXT: SymbolType: XTY_LD (0x2)
+; SYMS:            StorageMappingClass: XMC_TL (0x14)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+8]]
+; SYMS-NODATASECT: Index: [[#INDX+10]]
+; SYMS:          Name: tls_global_int_external_zero_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x4
+; SYMS-NEXT:     Section: .tdata
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_EXT (0x2)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:        Index: [[#INDX+9]]
+; SYMS-DATASECT-NEXT:   SectionLen: 4
+; SYMS-NODATASECT:      Index: [[#INDX+11]]
+; SYMS-NODATASECT-NEXT: ContainingCsectSymbolIndex: 7
+; SYMS:            ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-DATASECT:        SymbolAlignmentLog2: 2
+; SYMS-DATASECT-NEXT:   SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT:      SymbolAlignmentLog2: 0
+; SYMS-NODATASECT-NEXT: SymbolType: XTY_LD (0x2)
+; SYMS:            StorageMappingClass: XMC_TL (0x14)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+10]]
+; SYMS-NODATASECT: Index: [[#INDX+12]]
+; SYMS:          Name: tls_global_int_local_val_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x8
+; SYMS-NEXT:     Section: .tdata
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_HIDEXT (0x6B)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:        Index: [[#INDX+11]]
+; SYMS-DATASECT-NEXT:   SectionLen: 4
+; SYMS-NODATASECT:      Index: [[#INDX+13]]
+; SYMS-NODATASECT-NEXT: ContainingCsectSymbolIndex: 7
+; SYMS:            ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-DATASECT:        SymbolAlignmentLog2: 2
+; SYMS-DATASECT-NEXT:   SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT:      SymbolAlignmentLog2: 0
+; SYMS-NODATASECT-NEXT: SymbolType: XTY_LD (0x2)
+; SYMS:            StorageMappingClass: XMC_TL (0x14)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+12]]
+; SYMS-NODATASECT: Index: [[#INDX+14]]
+; SYMS:          Name: tls_global_int_weak_zero_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0xC
+; SYMS-NEXT:     Section: .tdata
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_WEAKEXT (0x6F)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:        Index: [[#INDX+13]]
+; SYMS-DATASECT-NEXT:   SectionLen: 4
+; SYMS-NODATASECT:      Index: [[#INDX+15]]
+; SYMS-NODATASECT-NEXT: ContainingCsectSymbolIndex: 7
+; SYMS:            ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-DATASECT:        SymbolAlignmentLog2: 2
+; SYMS-DATASECT-NEXT:   SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT:      SymbolAlignmentLog2: 0
+; SYMS-NODATASECT-NEXT: SymbolType: XTY_LD (0x2)
+; SYMS:            StorageMappingClass: XMC_TL (0x14)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+14]]
+; SYMS-NODATASECT: Index: [[#INDX+16]]
+; SYMS:          Name: tls_global_int_weak_val_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x10
+; SYMS-NEXT:     Section: .tdata
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_WEAKEXT (0x6F)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:        Index: [[#INDX+15]]
+; SYMS-DATASECT-NEXT:   SectionLen: 4
+; SYMS-NODATASECT:      Index: [[#INDX+17]]
+; SYMS-NODATASECT-NEXT: ContainingCsectSymbolIndex: 7
+; SYMS:            ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-DATASECT:        SymbolAlignmentLog2: 2
+; SYMS-DATASECT-NEXT:   SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT:      SymbolAlignmentLog2: 0
+; SYMS-NODATASECT-NEXT: SymbolType: XTY_LD (0x2)
+; SYMS:            StorageMappingClass: XMC_TL (0x14)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+16]]
+; SYMS-NODATASECT: Index: [[#INDX+18]]
+; SYMS:          Name: tls_global_long_long_internal_val_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x18
+; SYMS-NEXT:     Section: .tdata
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_HIDEXT (0x6B)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:        Index: [[#INDX+17]]
+; SYMS-DATASECT-NEXT:   SectionLen: 8
+; SYMS-NODATASECT:      Index: [[#INDX+19]]
+; SYMS-NODATASECT-NEXT: ContainingCsectSymbolIndex: 7
+; SYMS:            ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-DATASECT:        SymbolAlignmentLog2: 3
+; SYMS-DATASECT-NEXT:   SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT:      SymbolAlignmentLog2: 0
+; SYMS-NODATASECT-NEXT: SymbolType: XTY_LD (0x2)
+; SYMS:            StorageMappingClass: XMC_TL (0x14)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+18]]
+; SYMS-NODATASECT: Index: [[#INDX+20]]
+; SYMS:          Name: tls_global_long_long_weak_val_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x20
+; SYMS-NEXT:     Section: .tdata
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_WEAKEXT (0x6F)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:        Index: [[#INDX+19]]
+; SYMS-DATASECT-NEXT:   SectionLen: 8
+; SYMS-NODATASECT:      Index: [[#INDX+21]]
+; SYMS-NODATASECT-NEXT: ContainingCsectSymbolIndex: 7
+; SYMS:            ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-DATASECT:        SymbolAlignmentLog2: 3
+; SYMS-DATASECT-NEXT:   SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT:      SymbolAlignmentLog2: 0
+; SYMS-NODATASECT-NEXT: SymbolType: XTY_LD (0x2)
+; SYMS:            StorageMappingClass: XMC_TL (0x14)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+20]]
+; SYMS-NODATASECT: Index: [[#INDX+22]]
+; SYMS:          Name: tls_global_long_long_weak_zero_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x28
+; SYMS-NEXT:     Section: .tdata
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_WEAKEXT (0x6F)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:        Index: [[#INDX+21]]
+; SYMS-DATASECT-NEXT:   SectionLen: 8
+; SYMS-NODATASECT:      Index: [[#INDX+23]]
+; SYMS-NODATASECT-NEXT: ContainingCsectSymbolIndex: 7
+; SYMS:            ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-DATASECT:        SymbolAlignmentLog2: 3
+; SYMS-DATASECT-NEXT:   SymbolType: XTY_SD (0x1)
+; SYMS-NODATASECT:      SymbolAlignmentLog2: 0
+; SYMS-NODATASECT-NEXT: SymbolType: XTY_LD (0x2)
+; SYMS:            StorageMappingClass: XMC_TL (0x14)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+22]]
+; SYMS-NODATASECT: Index: [[#INDX+24]]
+; SYMS:          Name: tls_global_int_local_zero_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x30
+; SYMS-NEXT:     Section: .tbss
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_HIDEXT (0x6B)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:   Index: [[#INDX+23]]
+; SYMS-NODATASECT: Index: [[#INDX+25]]
+; SYMS:            SectionLen: 4
+; SYMS-NEXT:       ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-NEXT:       SymbolAlignmentLog2: 2
+; SYMS-NEXT:       SymbolType: XTY_CM (0x3)
+; SYMS-NEXT:       StorageMappingClass: XMC_UL (0x15)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+24]]
+; SYMS-NODATASECT: Index: [[#INDX+26]]
+; SYMS:          Name: tls_global_int_common_zero_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x34
+; SYMS-NEXT:     Section: .tbss
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_EXT (0x2)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:   Index: [[#INDX+25]]
+; SYMS-NODATASECT: Index: [[#INDX+27]]
+; SYMS:            SectionLen: 4
+; SYMS-NEXT:       ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-NEXT:       SymbolAlignmentLog2: 2
+; SYMS-NEXT:       SymbolType: XTY_CM (0x3)
+; SYMS-NEXT:       StorageMappingClass: XMC_UL (0x15)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+26]]
+; SYMS-NODATASECT: Index: [[#INDX+28]]
+; SYMS:          Name: tls_global_double_common_zero_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x38
+; SYMS-NEXT:     Section: .tbss
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_EXT (0x2)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:   Index: [[#INDX+27]]
+; SYMS-NODATASECT: Index: [[#INDX+29]]
+; SYMS:            SectionLen: 8
+; SYMS-NEXT:       ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-NEXT:       SymbolAlignmentLog2: 3
+; SYMS-NEXT:       SymbolType: XTY_CM (0x3)
+; SYMS-NEXT:       StorageMappingClass: XMC_UL (0x15)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; SYMS:        Symbol {
+; SYMS-DATASECT:   Index: [[#INDX+28]]
+; SYMS-NODATASECT: Index: [[#INDX+30]]
+; SYMS:          Name: tls_global_long_long_internal_zero_initialized
+; SYMS-NEXT:     Value (RelocatableAddress): 0x40
+; SYMS-NEXT:     Section: .tbss
+; SYMS-NEXT:     Type: 0x0
+; SYMS-NEXT:     StorageClass: C_HIDEXT (0x6B)
+; SYMS-NEXT:     NumberOfAuxEntries: 1
+; SYMS-NEXT:     CSECT Auxiliary Entry {
+; SYMS-DATASECT:   Index: [[#INDX+29]]
+; SYMS-NODATASECT: Index: [[#INDX+31]]
+; SYMS:            SectionLen: 8
+; SYMS-NEXT:       ParameterHashIndex: 0x0
+; SYMS-NEXT:       TypeChkSectNum: 0x0
+; SYMS-NEXT:       SymbolAlignmentLog2: 3
+; SYMS-NEXT:       SymbolType: XTY_CM (0x3)
+; SYMS-NEXT:       StorageMappingClass: XMC_UL (0x15)
+; SYMS-NEXT:       StabInfoIndex: 0x0
+; SYMS-NEXT:       StabSectNum: 0x0
+; SYMS-NEXT:     }
+; SYMS-NEXT:   }
+
+; OBJDUMP:            Disassembly of section .tdata:
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000000 (idx: 7) tls_global_int_external_val_initialized[TL]:
+; OBJDUMP-NODATASECT: 00000000 (idx: 9) tls_global_int_external_val_initialized:
+; OBJDUMP:            0: 00 00 00 01   <unknown>
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000004 (idx: 9) tls_global_int_external_zero_initialized[TL]:
+; OBJDUMP-NODATASECT: 00000004 (idx: 11) tls_global_int_external_zero_initialized:
+; OBJDUMP:            4: 00 00 00 00   <unknown>
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000008 (idx: 11) tls_global_int_local_val_initialized[TL]:
+; OBJDUMP-NODATASECT: 00000008 (idx: 13) tls_global_int_local_val_initialized:
+; OBJDUMP:            8: 00 00 00 02   <unknown>
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   0000000c (idx: 13) tls_global_int_weak_zero_initialized[TL]:
+; OBJDUMP-NODATASECT: 0000000c (idx: 15) tls_global_int_weak_zero_initialized:
+; OBJDUMP:            c: 00 00 00 00   <unknown>
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000010 (idx: 15) tls_global_int_weak_val_initialized[TL]:
+; OBJDUMP-NODATASECT: 00000010 (idx: 17) tls_global_int_weak_val_initialized:
+; OBJDUMP:            10: 00 00 00 01   <unknown>
+; OBJDUMP-NEXT:       14: 00 00 00 00   <unknown>
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000018 (idx: 17) tls_global_long_long_internal_val_initialized[TL]:
+; OBJDUMP-NODATASECT: 00000018 (idx: 19) tls_global_long_long_internal_val_initialized:
+; OBJDUMP:            18: 00 00 00 00   <unknown>
+; OBJDUMP-NEXT:       1c: 00 00 00 01   <unknown>
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000020 (idx: 19) tls_global_long_long_weak_val_initialized[TL]:
+; OBJDUMP-NODATASECT: 00000020 (idx: 21) tls_global_long_long_weak_val_initialized:
+; OBJDUMP:            20: 00 00 00 00   <unknown>
+; OBJDUMP-NEXT:       24: 00 00 00 01   <unknown>
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000028 (idx: 21) tls_global_long_long_weak_zero_initialized[TL]:
+; OBJDUMP-NODATASECT: 00000028 (idx: 23) tls_global_long_long_weak_zero_initialized:
+; OBJDUMP:            ...
+; OBJDUMP-EMPTY:
+; OBJDUMP-NEXT:       Disassembly of section .tbss:
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000030 (idx: 23) tls_global_int_local_zero_initialized[UL]:
+; OBJDUMP-NODATASECT: 00000030 (idx: 25) tls_global_int_local_zero_initialized[UL]:
+; OBJDUMP:            ...
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000034 (idx: 25) tls_global_int_common_zero_initialized[UL]:
+; OBJDUMP-NODATASECT: 00000034 (idx: 27) tls_global_int_common_zero_initialized[UL]:
+; OBJDUMP:            ...
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000038 (idx: 27) tls_global_double_common_zero_initialized[UL]
+; OBJDUMP-NODATASECT: 00000038 (idx: 29) tls_global_double_common_zero_initialized[UL]:
+; OBJDUMP:            ...
+; OBJDUMP-EMPTY:
+; OBJDUMP-DATASECT:   00000040 (idx: 29) tls_global_long_long_internal_zero_initialized[UL]:
+; OBJDUMP-NODATASECT: 00000040 (idx: 31) tls_global_long_long_internal_zero_initialized[UL]:
+; OBJDUMP:            ...
+
+@tls_global_int_external_val_initialized = thread_local global i32 1, align 4
+@tls_global_int_external_zero_initialized = thread_local global i32 0, align 4
+@tls_global_int_local_val_initialized = internal thread_local global i32 2, align 4
+@tls_global_int_local_zero_initialized = internal thread_local global i32 0, align 4
+@tls_global_int_weak_zero_initialized = weak thread_local global i32 0, align 4
+@tls_global_int_common_zero_initialized = common thread_local global i32 0, align 4
+@tls_global_int_weak_val_initialized = weak thread_local global i32 1, align 4
+@tls_global_int_external_uninitialized = external thread_local global i32, align 4
+@tls_global_double_common_zero_initialized = common thread_local global double 0.000000e+00, align 8
+@tls_global_double_external_uninitialized = external thread_local global i64, align 8
+@tls_global_long_long_internal_val_initialized = internal thread_local global i64 1, align 8
+@tls_global_long_long_internal_zero_initialized = internal thread_local global i64 0, align 8
+@tls_global_long_long_weak_val_initialized = weak thread_local global i64 1, align 8
+@tls_global_long_long_weak_zero_initialized = weak thread_local global i64 0, align 8

llvm/tools/llvm-readobj/XCOFFDumper.cpp

void XCOFFDumper::printFileAuxEnt(const XCOFFFileAuxEnt *AuxEntPtr) {
   W.printEnum("Type", static_cast<uint8_t>(AuxEntPtr->Type),
               makeArrayRef(FileStringType));
 }
 
 static const EnumEntry<XCOFF::StorageMappingClass> CsectStorageMappingClass[] =
     {
 #define ECase(X)                                                               \
   { #X, XCOFF::X }
-        ECase(XMC_PR),   ECase(XMC_RO),     ECase(XMC_DB),
-        ECase(XMC_GL),   ECase(XMC_XO),     ECase(XMC_SV),
-        ECase(XMC_SV64), ECase(XMC_SV3264), ECase(XMC_TI),
-        ECase(XMC_TB),   ECase(XMC_RW),     ECase(XMC_TC0),
-        ECase(XMC_TC),   ECase(XMC_TD),     ECase(XMC_DS),
-        ECase(XMC_UA),   ECase(XMC_BS),     ECase(XMC_UC),
-        ECase(XMC_TL),   ECase(XMC_TE)
+        ECase(XMC_PR), ECase(XMC_RO), ECase(XMC_DB),   ECase(XMC_GL),
+        ECase(XMC_XO), ECase(XMC_SV), ECase(XMC_SV64), ECase(XMC_SV3264),
+        ECase(XMC_TI), ECase(XMC_TB), ECase(XMC_RW),   ECase(XMC_TC0),
+        ECase(XMC_TC), ECase(XMC_TD), ECase(XMC_DS),   ECase(XMC_UA),
+        ECase(XMC_BS), ECase(XMC_UC), ECase(XMC_TL),   ECase(XMC_UL),
+        ECase(XMC_TE)
 #undef ECase
 };
 
 static const EnumEntry<XCOFF::SymbolType> CsectSymbolTypeClass[] = {
 #define ECase(X)                                                               \
   { #X, XCOFF::X }
     ECase(XTY_ER), ECase(XTY_SD), ECase(XTY_LD), ECase(XTY_CM)
 #undef ECase