[lld] r266584 - Delete the now redundant pointsToLocalDynamicGotEntry.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Sun Apr 17 20:34:20 2016
New Revision: 266584

URL: http://llvm.org/viewvc/llvm-project?rev=266584&view=rev
Log:
Delete the now redundant pointsToLocalDynamicGotEntry.

Modified:
    lld/trunk/ELF/Target.cpp
    lld/trunk/ELF/Target.h
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=266584&r1=266583&r2=266584&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Sun Apr 17 20:34:20 2016
@@ -75,7 +75,6 @@ public:
   void writeGotPltHeader(uint8_t *Buf) const override;
   uint32_t getDynRel(uint32_t Type) const override;
   uint32_t getTlsGotRel(uint32_t Type) const override;
-  bool pointsToLocalDynamicGotEntry(uint32_t Type) const override;
   bool isTlsLocalDynamicRel(uint32_t Type) const override;
   bool isTlsGlobalDynamicRel(uint32_t Type) const override;
   bool isTlsInitialExecRel(uint32_t Type) const override;
@@ -104,7 +103,6 @@ public:
   RelExpr getRelExpr(uint32_t Type, const SymbolBody &S) const override;
   uint32_t getDynRel(uint32_t Type) const override;
   uint32_t getTlsGotRel(uint32_t Type) const override;
-  bool pointsToLocalDynamicGotEntry(uint32_t Type) const override;
   bool isTlsLocalDynamicRel(uint32_t Type) const override;
   bool isTlsGlobalDynamicRel(uint32_t Type) const override;
   bool isTlsInitialExecRel(uint32_t Type) const override;
@@ -323,10 +321,6 @@ bool TargetInfo::needsThunk(uint32_t Typ
 
 bool TargetInfo::isTlsInitialExecRel(uint32_t Type) const { return false; }
 
-bool TargetInfo::pointsToLocalDynamicGotEntry(uint32_t Type) const {
-  return false;
-}
-
 bool TargetInfo::isTlsLocalDynamicRel(uint32_t Type) const { return false; }
 
 bool TargetInfo::isTlsGlobalDynamicRel(uint32_t Type) const {
@@ -430,10 +424,6 @@ bool X86TargetInfo::isTlsLocalDynamicRel
   return Type == R_386_TLS_LDO_32 || Type == R_386_TLS_LDM;
 }
 
-bool X86TargetInfo::pointsToLocalDynamicGotEntry(uint32_t Type) const {
-  return Type == R_386_TLS_LDM;
-}
-
 bool X86TargetInfo::isTlsInitialExecRel(uint32_t Type) const {
   return Type == R_386_TLS_IE || Type == R_386_TLS_GOTIE;
 }
@@ -765,10 +755,6 @@ bool X86_64TargetInfo::isTlsGlobalDynami
   return Type == R_X86_64_TLSGD;
 }
 
-bool X86_64TargetInfo::pointsToLocalDynamicGotEntry(uint32_t Type) const {
-  return Type == R_X86_64_TLSLD;
-}
-
 bool X86_64TargetInfo::isTlsLocalDynamicRel(uint32_t Type) const {
   return Type == R_X86_64_DTPOFF32 || Type == R_X86_64_DTPOFF64 ||
          Type == R_X86_64_TLSLD;

Modified: lld/trunk/ELF/Target.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.h?rev=266584&r1=266583&r2=266584&view=diff
==============================================================================
--- lld/trunk/ELF/Target.h (original)
+++ lld/trunk/ELF/Target.h Sun Apr 17 20:34:20 2016
@@ -25,7 +25,6 @@ class TargetInfo {
 public:
   uint64_t getVAStart() const;
   virtual bool isTlsInitialExecRel(uint32_t Type) const;
-  virtual bool pointsToLocalDynamicGotEntry(uint32_t Type) const;
   virtual bool isTlsLocalDynamicRel(uint32_t Type) const;
   virtual bool isTlsGlobalDynamicRel(uint32_t Type) const;
   virtual uint32_t getDynRel(uint32_t Type) const { return Type; }

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=266584&r1=266583&r2=266584&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Sun Apr 17 20:34:20 2016
@@ -283,7 +283,7 @@ static unsigned handleTlsRelocation(uint
     return 0;
 
   typedef typename ELFT::uint uintX_t;
-  if (Target->pointsToLocalDynamicGotEntry(Type)) {
+  if (Expr == R_TLSLD_PC || Expr == R_TLSLD) {
     if (Target->canRelaxTls(Type, nullptr)) {
       C.Relocations.push_back(
           {R_RELAX_TLS_LD_TO_LE, Type, Offset, Addend, &Body});