[lld] r271813 - Rename TlsGdToLeSkip.

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Sat Jun 4 16:04:40 PDT 2016


Author: rafael
Date: Sat Jun  4 18:04:39 2016
New Revision: 271813

URL: http://llvm.org/viewvc/llvm-project?rev=271813&view=rev
Log:
Rename TlsGdToLeSkip.

It will also be used for GT_TO_IE relaxations.

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

Modified: lld/trunk/ELF/Relocations.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=271813&r1=271812&r2=271813&view=diff
==============================================================================
--- lld/trunk/ELF/Relocations.cpp (original)
+++ lld/trunk/ELF/Relocations.cpp Sat Jun  4 18:04:39 2016
@@ -159,7 +159,7 @@ static unsigned handleTlsRelocation(uint
     }
     C.Relocations.push_back(
         {R_RELAX_TLS_GD_TO_LE, Type, Offset, Addend, &Body});
-    return Target->TlsGdToLeSkip;
+    return Target->TlsGdRelaxSkip;
   }
 
   // Initial-Exec relocs can be relaxed to Local-Exec if the symbol is locally

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=271813&r1=271812&r2=271813&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Sat Jun  4 18:04:39 2016
@@ -278,7 +278,7 @@ X86TargetInfo::X86TargetInfo() {
   TlsOffsetRel = R_386_TLS_DTPOFF32;
   PltEntrySize = 16;
   PltZeroSize = 16;
-  TlsGdToLeSkip = 2;
+  TlsGdRelaxSkip = 2;
 }
 
 RelExpr X86TargetInfo::getRelExpr(uint32_t Type, const SymbolBody &S) const {
@@ -507,7 +507,7 @@ X86_64TargetInfo::X86_64TargetInfo() {
   TlsOffsetRel = R_X86_64_DTPOFF64;
   PltEntrySize = 16;
   PltZeroSize = 16;
-  TlsGdToLeSkip = 2;
+  TlsGdRelaxSkip = 2;
 }
 
 RelExpr X86_64TargetInfo::getRelExpr(uint32_t Type, const SymbolBody &S) const {

Modified: lld/trunk/ELF/Target.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.h?rev=271813&r1=271812&r2=271813&view=diff
==============================================================================
--- lld/trunk/ELF/Target.h (original)
+++ lld/trunk/ELF/Target.h Sat Jun  4 18:04:39 2016
@@ -57,7 +57,7 @@ public:
   virtual void relocateOne(uint8_t *Loc, uint32_t Type, uint64_t Val) const = 0;
   virtual ~TargetInfo();
 
-  unsigned TlsGdToLeSkip = 1;
+  unsigned TlsGdRelaxSkip = 1;
   unsigned PageSize = 4096;
 
   // On freebsd x86_64 the first page cannot be mmaped.




More information about the llvm-commits mailing list