More fixes (#437)

* Merge pull request #429 from VSadov/tls1 Changes to support TLS access emitted in ILC (x64 win/linux) * Fix DWARF debug information emitted for empty enum (#433) (cherry picked from commit 167a9c5) --------- Co-authored-by: Filip Navara <filip.navara@gmail.com>
dotnet · Aug 16, 2024 · 157377b · 157377b
1 parent 511251d
commit 157377b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 2 deletions.
diff --git a/llvm/include/llvm/MC/MCObjectFileInfo.h b/llvm/include/llvm/MC/MCObjectFileInfo.h
@@ -348,7 +348,7 @@ class MCObjectFileInfo {
   }
 
   MCSection *getTLSExtraDataSection() const { return TLSExtraDataSection; }
-  const MCSection *getTLSDataSection() const { return TLSDataSection; }
+  MCSection *getTLSDataSection() const { return TLSDataSection; }
   MCSection *getTLSBSSSection() const { return TLSBSSSection; }
 
   MCSection *getStackMapSection() const { return StackMapSection; }

diff --git a/llvm/tools/objwriter/debugInfo/dwarf/dwarfAbbrev.cpp b/llvm/tools/objwriter/debugInfo/dwarf/dwarfAbbrev.cpp
@@ -59,6 +59,13 @@ void Dump(MCObjectStreamer *Streamer, uint16_t DwarfVersion, unsigned TargetPoin
         dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1,
         0, 0,
 
+    EnumerationTypeNoChildren,
+        dwarf::DW_TAG_enumeration_type, dwarf::DW_CHILDREN_no,
+        dwarf::DW_AT_name, dwarf::DW_FORM_strp,
+        dwarf::DW_AT_type, dwarf::DW_FORM_ref4,
+        dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1,
+        0, 0,
+
     Enumerator1,
         dwarf::DW_TAG_enumerator, dwarf::DW_CHILDREN_no,
         dwarf::DW_AT_name, dwarf::DW_FORM_strp,

diff --git a/llvm/tools/objwriter/debugInfo/dwarf/dwarfAbbrev.h b/llvm/tools/objwriter/debugInfo/dwarf/dwarfAbbrev.h
@@ -21,6 +21,7 @@ enum DwarfAbbrev : uint16_t
   CompileUnit = 0x1,
   BaseType,
   EnumerationType,
+  EnumerationTypeNoChildren,
   Enumerator1,
   Enumerator2,
   Enumerator4,

diff --git a/llvm/tools/objwriter/debugInfo/dwarf/dwarfTypeBuilder.cpp b/llvm/tools/objwriter/debugInfo/dwarf/dwarfTypeBuilder.cpp
@@ -284,7 +284,7 @@ void DwarfEnumTypeInfo::DumpStrings(MCObjectStreamer *Streamer) {
 
 void DwarfEnumTypeInfo::DumpTypeInfo(MCObjectStreamer *Streamer, UserDefinedDwarfTypesBuilder *TypeBuilder) {
   // Abbrev Number
-  Streamer->emitULEB128IntValue(DwarfAbbrev::EnumerationType);
+  Streamer->emitULEB128IntValue(HasChildren() ? DwarfAbbrev::EnumerationType : DwarfAbbrev::EnumerationTypeNoChildren);
 
   // DW_AT_name
   EmitSectionOffset(Streamer, StrSymbol, 4);

diff --git a/llvm/tools/objwriter/objwriter.cpp b/llvm/tools/objwriter/objwriter.cpp
@@ -223,6 +223,10 @@ MCSection *ObjectWriter::GetSection(const char *SectionName,
     Section = ObjFileInfo->getReadOnlySection();
   } else if (strcmp(SectionName, "xdata") == 0) {
     Section = ObjFileInfo->getXDataSection();
+  } else if (strcmp(SectionName, "tdata") == 0) {
+    Section = ObjFileInfo->getTLSDataSection();
+  } else if (strcmp(SectionName, "tbss") == 0) {
+    Section = ObjFileInfo->getTLSBSSSection();
   } else if (strcmp(SectionName, "bss") == 0) {
     if (OutContext->getObjectFileType() == MCContext::IsMachO) {
       Section = ObjFileInfo->getDataBSSSection();
@@ -458,6 +462,18 @@ int ObjectWriter::EmitSymbolRef(const char *SymbolName,
   case RelocType::IMAGE_REL_BASED_DIR64:
     Size = 8;
     break;
+  case RelocType::IMAGE_REL_SECREL:
+    Kind = MCSymbolRefExpr::VK_SECREL;
+    Size = 4;
+    break;
+  case RelocType::IMAGE_REL_TLSGD:
+    Kind = MCSymbolRefExpr::VK_TLSGD;
+    Size = 4;
+    break;
+  case RelocType::IMAGE_REL_TPOFF:
+    Kind = MCSymbolRefExpr::VK_TPOFF;
+    Size = 4;
+    break;
   case RelocType::IMAGE_REL_BASED_REL32:
     if (OutContext->getObjectFileType() == MCContext::IsMachO &&
         OutContext->getTargetTriple().getArch() == Triple::aarch64) {

diff --git a/llvm/tools/objwriter/objwriter.h b/llvm/tools/objwriter/objwriter.h
@@ -59,6 +59,9 @@ enum class RelocType {
   IMAGE_REL_BASED_RELPTR32 = 0x7C,
   IMAGE_REL_BASED_ARM64_PAGEBASE_REL21 = 0x81,
   IMAGE_REL_BASED_ARM64_PAGEOFFSET_12A = 0x82,
+  IMAGE_REL_SECREL = 0x104,
+  IMAGE_REL_TLSGD = 0x105,
+  IMAGE_REL_TPOFF = 0x106,
 };
 
 enum class SymbolRefFlags