ARM: add tlsldo relocation

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

Reviewed by R. Golin, A. Korobeynikov.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199644 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/MC/MCExpr.h b/include/llvm/MC/MCExpr.h
index 3052de112fac9d61667bce2b4bad1462f82682a5..f556d6237ff2561ca0e43c08049bd753873a9849 100644 (file)
--- 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@l
     VK_PPC_HI,             // symbol@h

diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp
index 69cdfa354401b7bd9b1a01426ca662011acd7c2f..2052d55dc7ebec81ea9d28415d7ba23d16509a87 100644 (file)
--- 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 72ac6e22e8dd149cc706f466563ffff17c8c6b1b..6fcc021a6c72c83b3d24940486022b8f68bb70b8 100644 (file)
--- 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 d24d5c790fbefbb990a1714c76fe43cd92321c21..1ab504cf65583e59d358ae7af9ff370e9e81b2da 100644 (file)
--- 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)
+@CHECK: 80 R_ARM_TLS_LDO32 f20
+@CHECK: 84 R_ARM_TLS_LDO32 f21