diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2016-06-04 23:04:39 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2016-06-04 23:04:39 +0000 |
| commit | 6996ef8072649209332418a4e5bc1e97f80ecbd4 (patch) | |
| tree | 337ecb972a702aaa394330ab71179fa4f9ebb4fc | |
| parent | 869ed6990db9f42c79706f4f09fb0df685f1a3f1 (diff) | |
Rename TlsGdToLeSkip.
It will also be used for GT_TO_IE relaxations.
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@271813 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | ELF/Relocations.cpp | 2 | ||||
| -rw-r--r-- | ELF/Target.cpp | 4 | ||||
| -rw-r--r-- | ELF/Target.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ELF/Relocations.cpp b/ELF/Relocations.cpp index 193fa051e..5a13ef016 100644 --- a/ELF/Relocations.cpp +++ b/ELF/Relocations.cpp @@ -159,7 +159,7 @@ static unsigned handleTlsRelocation(uint32_t Type, SymbolBody &Body, } 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 diff --git a/ELF/Target.cpp b/ELF/Target.cpp index dc63dae0d..2d871ceef 100644 --- a/ELF/Target.cpp +++ b/ELF/Target.cpp @@ -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 { diff --git a/ELF/Target.h b/ELF/Target.h index 65f25755d..25ac2f2b3 100644 --- a/ELF/Target.h +++ b/ELF/Target.h @@ -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. |