[PATCH] ARM: add tlsldo relocation

[Kai Nacke]

Hi all,

this patch adds support for the symbol(tlsldo) relocation. This is 
required in order to solve PR18554.

Please review.

Regards,
Kai
-------------- next part --------------
diff --git a/include/llvm/MC/MCExpr.h b/include/llvm/MC/MCExpr.h
index 3052de1..f556d62 100644
--- a/include/llvm/MC/MCExpr.h
+++ b/include/llvm/MC/MCExpr.h
@@ -165,6 +165,7 @@ public:
     VK_ARM_TARGET1,
     VK_ARM_TARGET2,
     VK_ARM_PREL31,
+    VK_ARM_TLSLDO,         // symbol(tlsldo)
 
     VK_PPC_LO,             // symbol at l
     VK_PPC_HI,             // symbol at h
diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp
index 69cdfa3..2052d55 100644
--- a/lib/MC/MCExpr.cpp
+++ b/lib/MC/MCExpr.cpp
@@ -184,6 +184,7 @@ StringRef MCSymbolRefExpr::getVariantKindName(VariantKind Kind) {
   case VK_ARM_TARGET1: return "target1";
   case VK_ARM_TARGET2: return "target2";
   case VK_ARM_PREL31: return "prel31";
+  case VK_ARM_TLSLDO: return "tlsldo";
   case VK_PPC_LO: return "l";
   case VK_PPC_HI: return "h";
   case VK_PPC_HA: return "ha";
@@ -405,6 +406,8 @@ MCSymbolRefExpr::getVariantKindForName(StringRef Name) {
     .Case("target2", VK_ARM_TARGET2)
     .Case("PREL31", VK_ARM_PREL31)
     .Case("prel31", VK_ARM_PREL31)
+    .Case("TLSLDO", VK_ARM_TLSLDO)
+    .Case("tlsldo", VK_ARM_TLSLDO)
     .Default(VK_Invalid);
 }
 
diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
index 72ac6e2..6fcc021 100644
--- a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
@@ -250,6 +250,9 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target,
       case MCSymbolRefExpr::VK_ARM_PREL31:
         Type = ELF::R_ARM_PREL31;
         break;
+      case MCSymbolRefExpr::VK_ARM_TLSLDO:
+        Type = ELF::R_ARM_TLS_LDO32;
+        break;
       }
       break;
     case ARM::fixup_arm_ldst_pcrel_12:
diff --git a/test/MC/ARM/symbol-variants.s b/test/MC/ARM/symbol-variants.s
index d24d5c7..1ab504c 100644
--- a/test/MC/ARM/symbol-variants.s
+++ b/test/MC/ARM/symbol-variants.s
@@ -65,3 +65,8 @@ bl f05(plt)
 @CHECK: 72 R_ARM_PREL31 f18
 @CHECK: 76 R_ARM_PREL31 f19
 
+@ tlsldo
+.word f20(TLSLDO)
+.word f21(tlsldo)
+ at CHECK: 80 R_ARM_TLS_LDO32 f20
+ at CHECK: 84 R_ARM_TLS_LDO32 f21