[lld] r266330 - Remove the only case where we would relocate a R_386_TLS_TPOFF.

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Thu Apr 14 09:05:42 PDT 2016


Author: rafael
Date: Thu Apr 14 11:05:42 2016
New Revision: 266330

URL: http://llvm.org/viewvc/llvm-project?rev=266330&view=rev
Log:
Remove the only case where we would relocate a R_386_TLS_TPOFF.

Modified:
    lld/trunk/ELF/Target.cpp

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=266330&r1=266329&r2=266330&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Thu Apr 14 11:05:42 2016
@@ -422,7 +422,7 @@ uint32_t X86TargetInfo::getDynRel(uint32
 uint32_t X86TargetInfo::getTlsGotRel(uint32_t Type) const {
   if (Type == R_386_TLS_IE)
     return Type;
-  return TlsGotRel;
+  return R_386_GOT32;
 }
 
 bool X86TargetInfo::isTlsGlobalDynamicRel(uint32_t Type) const {
@@ -544,8 +544,7 @@ void X86TargetInfo::relocateOne(uint8_t
     break;
   case R_386_GOT32:
   case R_386_TLS_GD:
-  case R_386_TLS_LDM:
-  case R_386_TLS_TPOFF: {
+  case R_386_TLS_LDM: {
     uint64_t V = Val - Out<ELF32LE>::Got->getVA() -
                  Out<ELF32LE>::Got->getNumEntries() * 4;
     checkInt<32>(V, Type);




More information about the llvm-commits mailing list