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 | f807d47164176352b8314526884664fefa5e3b51 (patch) | |
| tree | a83d5e2f5b6f8b107589983883f9e574b77b8b6b | |
| parent | 5c66b8260eda6f7b445487b9ad46c3445cfebdd4 (diff) | |
| download | bcm5719-llvm-f807d47164176352b8314526884664fefa5e3b51.tar.gz bcm5719-llvm-f807d47164176352b8314526884664fefa5e3b51.zip | |
Rename TlsGdToLeSkip.
It will also be used for GT_TO_IE relaxations.
llvm-svn: 271813
| -rw-r--r-- | lld/ELF/Relocations.cpp | 2 | ||||
| -rw-r--r-- | lld/ELF/Target.cpp | 4 | ||||
| -rw-r--r-- | lld/ELF/Target.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp index 193fa051e9b..5a13ef0166e 100644 --- a/lld/ELF/Relocations.cpp +++ b/lld/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/lld/ELF/Target.cpp b/lld/ELF/Target.cpp index dc63dae0ddf..2d871ceef7d 100644 --- a/lld/ELF/Target.cpp +++ b/lld/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/lld/ELF/Target.h b/lld/ELF/Target.h index 65f25755d6a..25ac2f2b3e7 100644 --- a/lld/ELF/Target.h +++ b/lld/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. |

