[ARM] Implement R_ARM_TLS_IE32 for dynamic executable

llvm-svn: 235182

3 files changed, 30 insertions, 1 deletions

diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h b/lld/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h
index a354c2fc415..883180798c3 100644
--- a/lld/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h
@@ -33,6 +33,18 @@ public:
     return _baseAddress;
   }
 
+  bool isDynamicRelocation(const Reference &r) const override {
+    if (r.kindNamespace() != Reference::KindNamespace::ELF)
+      return false;
+    assert(r.kindArch() == Reference::KindArch::ARM);
+    switch (r.kindValue()) {
+    case llvm::ELF::R_ARM_TLS_TPOFF32:
+      return true;
+    default:
+      return false;
+    }
+  }
+
   bool isPLTRelocation(const Reference &r) const override {
     if (r.kindNamespace() != Reference::KindNamespace::ELF)
       return false;
diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
index ce5f14c95a3..b0dfac20776 100644
--- a/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
+++ b/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
@@ -89,6 +89,7 @@ static Reference::Addend readAddend(const uint8_t *location,
   case R_ARM_BASE_PREL:
   case R_ARM_TLS_IE32:
   case R_ARM_TLS_LE32:
+  case R_ARM_TLS_TPOFF32:
     return (int32_t)read32le(location);
   case R_ARM_PREL31:
     return (int32_t)(read32le(location) & 0x7FFFFFFF);
@@ -427,6 +428,19 @@ static void relocR_ARM_TLS_LE32(uint8_t *location, uint64_t P, uint64_t S,
   applyArmReloc(location, result);
 }
 
+/// \brief R_ARM_TLS_TPOFF32 - S + A - tp => S + A (offset within TLS block)
+static void relocR_ARM_TLS_TPOFF32(uint8_t *location, uint64_t P, uint64_t S,
+                                   int64_t A) {
+  uint32_t result = (uint32_t)(S + A);
+
+  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+        llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+        llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+        llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+        llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result);
+}
+
 template <uint32_t lshift>
 static void relocR_ARM_ALU_PC_GN_NC(uint8_t *location, uint32_t result) {
   static_assert(lshift < 32 && lshift % 2 == 0,
@@ -571,6 +585,9 @@ std::error_code ARMTargetRelocationHandler::applyRelocation(
   case R_ARM_TLS_LE32:
     relocR_ARM_TLS_LE32(loc, reloc, target, addend, _armLayout.getTPOffset());
     break;
+  case R_ARM_TLS_TPOFF32:
+    relocR_ARM_TLS_TPOFF32(loc, reloc, target, addend);
+    break;
   case R_ARM_GOT_BREL:
     relocR_ARM_GOT_BREL(loc, reloc, target, addend, _armLayout.getGOTSymAddr());
     break;
diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp b/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp
index bc3456defca..1114ba3eb91 100644
--- a/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp
+++ b/lld/lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp
@@ -870,7 +870,7 @@ public:
 
   /// \brief Create a GOT entry for R_ARM_TLS_TPOFF32 reloc.
   const GOTAtom *getTLSTPOFF32(const DefinedAtom *da) {
-    llvm_unreachable("Handle TLS TPOFF32");
+    return getGOTTLSEntry<R_ARM_TLS_TPOFF32>(da);
   }
 
   const PLT0Atom *getPLT0() {