Index: ELF/Target.h =================================================================== --- ELF/Target.h +++ ELF/Target.h @@ -22,11 +22,11 @@ class TargetInfo { public: uint64_t getVAStart() const; - virtual bool isTlsLocalDynamicRel(unsigned Type) const; - virtual bool isTlsGlobalDynamicRel(unsigned Type) const; - virtual unsigned getDynRel(unsigned Type) const { return Type; } - virtual bool isTlsDynRel(unsigned Type, const SymbolBody &S) const; - virtual unsigned getTlsGotRel(unsigned Type) const { return TlsGotRel; } + virtual bool isTlsLocalDynamicRel(uint32_t Type) const; + virtual bool isTlsGlobalDynamicRel(uint32_t Type) const; + virtual uint32_t getDynRel(uint32_t Type) const { return Type; } + virtual bool isTlsDynRel(uint32_t Type, const SymbolBody &S) const; + virtual uint32_t getTlsGotRel(uint32_t Type) const { return TlsGotRel; } virtual void writeGotHeader(uint8_t *Buf) const {} virtual void writeGotPltHeader(uint8_t *Buf) const {} virtual void writeGotPlt(uint8_t *Buf, uint64_t Plt) const {}; @@ -53,7 +53,7 @@ virtual bool isRelRelative(uint32_t Type) const; virtual bool isSizeRel(uint32_t Type) const; - virtual bool needsDynRelative(unsigned Type) const { return false; } + virtual bool needsDynRelative(uint32_t Type) const { return false; } virtual bool needsGot(uint32_t Type, SymbolBody &S) const; virtual bool refersToGotEntry(uint32_t Type) const; @@ -65,11 +65,12 @@ uint64_t P, uint64_t SA, uint64_t ZA = 0, uint8_t *PairedLoc = nullptr) const = 0; virtual bool isGotRelative(uint32_t Type) const; - virtual bool canRelaxTls(unsigned Type, const SymbolBody *S) const; + virtual bool canRelaxTls(uint32_t Type, const SymbolBody *S) const; template bool needsCopyRel(uint32_t Type, const SymbolBody &S) const; - virtual unsigned relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, - uint64_t P, uint64_t SA, const SymbolBody *S) const; + // This function returns how many relocations should be skipped from proccesssing. + virtual size_t relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, + uint64_t P, uint64_t SA, const SymbolBody *S) const; virtual ~TargetInfo(); unsigned PageSize = 4096; @@ -82,14 +83,14 @@ // 0x200000, but it looks like every OS uses 4k pages for executables. uint64_t VAStart = 0x10000; - unsigned CopyRel; - unsigned GotRel; - unsigned PltRel; - unsigned RelativeRel; - unsigned IRelativeRel; - unsigned TlsGotRel = 0; - unsigned TlsModuleIndexRel; - unsigned TlsOffsetRel; + uint32_t CopyRel; + uint32_t GotRel; + uint32_t PltRel; + uint32_t RelativeRel; + uint32_t IRelativeRel; + uint32_t TlsGotRel = 0; + uint32_t TlsModuleIndexRel; + uint32_t TlsOffsetRel; unsigned PltEntrySize = 8; unsigned PltZeroSize = 0; unsigned GotHeaderEntriesNum = 0; Index: ELF/Target.cpp =================================================================== --- ELF/Target.cpp +++ ELF/Target.cpp @@ -81,25 +81,25 @@ public: X86TargetInfo(); void writeGotPltHeader(uint8_t *Buf) const override; - unsigned getDynRel(unsigned Type) const override; - unsigned getTlsGotRel(unsigned Type) const override; - bool isTlsLocalDynamicRel(unsigned Type) const override; - bool isTlsGlobalDynamicRel(unsigned Type) const override; - bool isTlsDynRel(unsigned Type, const SymbolBody &S) const override; + uint32_t getDynRel(uint32_t Type) const override; + uint32_t getTlsGotRel(uint32_t Type) const override; + bool isTlsLocalDynamicRel(uint32_t Type) const override; + bool isTlsGlobalDynamicRel(uint32_t Type) const override; + bool isTlsDynRel(uint32_t Type, const SymbolBody &S) const override; void writeGotPlt(uint8_t *Buf, uint64_t Plt) const override; void writePltZero(uint8_t *Buf) const override; void writePlt(uint8_t *Buf, uint64_t GotEntryAddr, uint64_t PltEntryAddr, int32_t Index, unsigned RelOff) const override; bool needsCopyRelImpl(uint32_t Type) const override; - bool needsDynRelative(unsigned Type) const override; + bool needsDynRelative(uint32_t Type) const override; bool needsGot(uint32_t Type, SymbolBody &S) const override; bool needsPltImpl(uint32_t Type) const override; void relocateOne(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, uint64_t P, uint64_t SA, uint64_t ZA = 0, uint8_t *PairedLoc = nullptr) const override; - bool canRelaxTls(unsigned Type, const SymbolBody *S) const override; - unsigned relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, uint64_t P, - uint64_t SA, const SymbolBody *S) const override; + bool canRelaxTls(uint32_t Type, const SymbolBody *S) const override; + size_t relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, uint64_t P, + uint64_t SA, const SymbolBody *S) const override; bool isGotRelative(uint32_t Type) const override; bool refersToGotEntry(uint32_t Type) const override; @@ -117,10 +117,10 @@ class X86_64TargetInfo final : public TargetInfo { public: X86_64TargetInfo(); - unsigned getTlsGotRel(unsigned Type) const override; - bool isTlsLocalDynamicRel(unsigned Type) const override; - bool isTlsGlobalDynamicRel(unsigned Type) const override; - bool isTlsDynRel(unsigned Type, const SymbolBody &S) const override; + uint32_t getTlsGotRel(uint32_t Type) const override; + bool isTlsLocalDynamicRel(uint32_t Type) const override; + bool isTlsGlobalDynamicRel(uint32_t Type) const override; + bool isTlsDynRel(uint32_t Type, const SymbolBody &S) const override; void writeGotPltHeader(uint8_t *Buf) const override; void writeGotPlt(uint8_t *Buf, uint64_t Plt) const override; void writePltZero(uint8_t *Buf) const override; @@ -134,10 +134,10 @@ uint64_t SA, uint64_t ZA = 0, uint8_t *PairedLoc = nullptr) const override; bool isRelRelative(uint32_t Type) const override; - bool canRelaxTls(unsigned Type, const SymbolBody *S) const override; + bool canRelaxTls(uint32_t Type, const SymbolBody *S) const override; bool isSizeRel(uint32_t Type) const override; - unsigned relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, uint64_t P, - uint64_t SA, const SymbolBody *S) const override; + size_t relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, uint64_t P, + uint64_t SA, const SymbolBody *S) const override; private: void relocateTlsLdToLe(uint8_t *Loc, uint8_t *BufEnd, uint64_t P, @@ -175,14 +175,14 @@ class AArch64TargetInfo final : public TargetInfo { public: AArch64TargetInfo(); - unsigned getDynRel(unsigned Type) const override; - bool isTlsGlobalDynamicRel(unsigned Type) const override; + uint32_t getDynRel(uint32_t Type) const override; + bool isTlsGlobalDynamicRel(uint32_t Type) const override; void writeGotPlt(uint8_t *Buf, uint64_t Plt) const override; void writePltZero(uint8_t *Buf) const override; void writePlt(uint8_t *Buf, uint64_t GotEntryAddr, uint64_t PltEntryAddr, int32_t Index, unsigned RelOff) const override; - unsigned getTlsGotRel(unsigned Type) const override; - bool isTlsDynRel(unsigned Type, const SymbolBody &S) const override; + uint32_t getTlsGotRel(uint32_t Type) const override; + bool isTlsDynRel(uint32_t Type, const SymbolBody &S) const override; bool isRelRelative(uint32_t Type) const override; bool needsCopyRelImpl(uint32_t Type) const override; bool needsGot(uint32_t Type, SymbolBody &S) const override; @@ -190,14 +190,14 @@ void relocateOne(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, uint64_t P, uint64_t SA, uint64_t ZA = 0, uint8_t *PairedLoc = nullptr) const override; - unsigned relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, uint64_t P, - uint64_t SA, const SymbolBody *S) const override; - bool canRelaxTls(unsigned Type, const SymbolBody *S) const override; + size_t relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, uint64_t P, + uint64_t SA, const SymbolBody *S) const override; + bool canRelaxTls(uint32_t Type, const SymbolBody *S) const override; private: - void relocateTlsGdToLe(unsigned Type, uint8_t *Loc, uint8_t *BufEnd, + void relocateTlsGdToLe(uint32_t Type, uint8_t *Loc, uint8_t *BufEnd, uint64_t P, uint64_t SA) const; - void relocateTlsIeToLe(unsigned Type, uint8_t *Loc, uint8_t *BufEnd, + void relocateTlsIeToLe(uint32_t Type, uint8_t *Loc, uint8_t *BufEnd, uint64_t P, uint64_t SA) const; static const uint64_t TcbSize = 16; @@ -214,7 +214,7 @@ template class MipsTargetInfo final : public TargetInfo { public: MipsTargetInfo(); - unsigned getDynRel(unsigned Type) const override; + uint32_t getDynRel(uint32_t Type) const override; void writeGotPlt(uint8_t *Buf, uint64_t Plt) const override; void writePltZero(uint8_t *Buf) const override; void writePlt(uint8_t *Buf, uint64_t GotEntryAddr, uint64_t PltEntryAddr, @@ -261,7 +261,7 @@ TargetInfo::~TargetInfo() {} -bool TargetInfo::canRelaxTls(unsigned Type, const SymbolBody *S) const { +bool TargetInfo::canRelaxTls(uint32_t Type, const SymbolBody *S) const { return false; } @@ -283,7 +283,7 @@ return mayNeedCopy(S) && needsCopyRelImpl(Type); } -bool TargetInfo::isTlsDynRel(unsigned Type, const SymbolBody &S) const { +bool TargetInfo::isTlsDynRel(uint32_t Type, const SymbolBody &S) const { return false; } @@ -335,17 +335,17 @@ return Plt_No; } -bool TargetInfo::isTlsLocalDynamicRel(unsigned Type) const { +bool TargetInfo::isTlsLocalDynamicRel(uint32_t Type) const { return false; } -bool TargetInfo::isTlsGlobalDynamicRel(unsigned Type) const { +bool TargetInfo::isTlsGlobalDynamicRel(uint32_t Type) const { return false; } -unsigned TargetInfo::relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, - uint64_t P, uint64_t SA, - const SymbolBody *S) const { +size_t TargetInfo::relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, + uint64_t P, uint64_t SA, + const SymbolBody *S) const { return 0; } @@ -373,7 +373,7 @@ write32le(Buf, Plt + 6); } -unsigned X86TargetInfo::getDynRel(unsigned Type) const { +uint32_t X86TargetInfo::getDynRel(uint32_t Type) const { if (Type == R_386_TLS_LE) return R_386_TLS_TPOFF; if (Type == R_386_TLS_LE_32) @@ -381,21 +381,21 @@ return Type; } -unsigned X86TargetInfo::getTlsGotRel(unsigned Type) const { +uint32_t X86TargetInfo::getTlsGotRel(uint32_t Type) const { if (Type == R_386_TLS_IE) return Type; return TlsGotRel; } -bool X86TargetInfo::isTlsGlobalDynamicRel(unsigned Type) const { +bool X86TargetInfo::isTlsGlobalDynamicRel(uint32_t Type) const { return Type == R_386_TLS_GD; } -bool X86TargetInfo::isTlsLocalDynamicRel(unsigned Type) const { +bool X86TargetInfo::isTlsLocalDynamicRel(uint32_t Type) const { return Type == R_386_TLS_LDM; } -bool X86TargetInfo::isTlsDynRel(unsigned Type, const SymbolBody &S) const { +bool X86TargetInfo::isTlsDynRel(uint32_t Type, const SymbolBody &S) const { if (Type == R_386_TLS_LE || Type == R_386_TLS_LE_32 || Type == R_386_TLS_GOTIE) return Config->Shared; @@ -522,7 +522,7 @@ } } -bool X86TargetInfo::canRelaxTls(unsigned Type, const SymbolBody *S) const { +bool X86TargetInfo::canRelaxTls(uint32_t Type, const SymbolBody *S) const { if (Config->Shared || (S && !S->isTls())) return false; return Type == R_386_TLS_LDO_32 || Type == R_386_TLS_LDM || @@ -530,13 +530,13 @@ (Type == R_386_TLS_GOTIE && !canBePreempted(S)); } -bool X86TargetInfo::needsDynRelative(unsigned Type) const { +bool X86TargetInfo::needsDynRelative(uint32_t Type) const { return Config->Shared && Type == R_386_TLS_IE; } -unsigned X86TargetInfo::relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, - uint64_t P, uint64_t SA, - const SymbolBody *S) const { +size_t X86TargetInfo::relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, + uint64_t P, uint64_t SA, + const SymbolBody *S) const { switch (Type) { case R_386_TLS_GD: if (canBePreempted(S)) @@ -622,7 +622,7 @@ // Read "ELF Handling For Thread-Local Storage, 5.1 // IA-32 Linker Optimizations" (http://www.akkadia.org/drepper/tls.pdf) // by Ulrich Drepper for details. -void X86TargetInfo::relocateTlsIeToLe(unsigned Type, uint8_t *Loc, +void X86TargetInfo::relocateTlsIeToLe(uint32_t Type, uint8_t *Loc, uint8_t *BufEnd, uint64_t P, uint64_t SA) const { // Ulrich's document section 6.2 says that @gotntpoff can @@ -729,22 +729,22 @@ return refersToGotEntry(Type) || needsPlt(Type, S); } -unsigned X86_64TargetInfo::getTlsGotRel(unsigned Type) const { +uint32_t X86_64TargetInfo::getTlsGotRel(uint32_t Type) const { // No other types of TLS relocations requiring GOT should // reach here. assert(Type == R_X86_64_GOTTPOFF); return R_X86_64_PC32; } -bool X86_64TargetInfo::isTlsGlobalDynamicRel(unsigned Type) const { +bool X86_64TargetInfo::isTlsGlobalDynamicRel(uint32_t Type) const { return Type == R_X86_64_TLSGD; } -bool X86_64TargetInfo::isTlsLocalDynamicRel(unsigned Type) const { +bool X86_64TargetInfo::isTlsLocalDynamicRel(uint32_t Type) const { return Type == R_X86_64_TLSLD; } -bool X86_64TargetInfo::isTlsDynRel(unsigned Type, const SymbolBody &S) const { +bool X86_64TargetInfo::isTlsDynRel(uint32_t Type, const SymbolBody &S) const { return Type == R_X86_64_GOTTPOFF || Type == R_X86_64_TLSGD; } @@ -771,7 +771,7 @@ return Type == R_X86_64_SIZE32 || Type == R_X86_64_SIZE64; } -bool X86_64TargetInfo::canRelaxTls(unsigned Type, const SymbolBody *S) const { +bool X86_64TargetInfo::canRelaxTls(uint32_t Type, const SymbolBody *S) const { if (Config->Shared || (S && !S->isTls())) return false; return Type == R_X86_64_TLSGD || Type == R_X86_64_TLSLD || @@ -882,9 +882,9 @@ // relocation target, relocations immediately follow the TLS relocation (which // would be applied to rewritten instructions) may have to be skipped. // This function returns a number of relocations that need to be skipped. -unsigned X86_64TargetInfo::relaxTls(uint8_t *Loc, uint8_t *BufEnd, - uint32_t Type, uint64_t P, uint64_t SA, - const SymbolBody *S) const { +size_t X86_64TargetInfo::relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, + uint64_t P, uint64_t SA, + const SymbolBody *S) const { switch (Type) { case R_X86_64_DTPOFF32: relocateOne(Loc, BufEnd, R_X86_64_TPOFF32, P, SA); @@ -1020,7 +1020,7 @@ void PPC64TargetInfo::writePlt(uint8_t *Buf, uint64_t GotEntryAddr, uint64_t PltEntryAddr, int32_t Index, - unsigned RelOff) const { + uint32_t RelOff) const { uint64_t Off = GotEntryAddr - getPPC64TocBase(); // FIXME: What we should do, in theory, is get the offset of the function @@ -1211,14 +1211,14 @@ Type == R_AARCH64_ADD_ABS_LO12_NC || Type == R_AARCH64_CALL26; } -bool AArch64TargetInfo::isTlsGlobalDynamicRel(unsigned Type) const { +bool AArch64TargetInfo::isTlsGlobalDynamicRel(uint32_t Type) const { return Type == R_AARCH64_TLSDESC_ADR_PAGE21 || Type == R_AARCH64_TLSDESC_LD64_LO12_NC || Type == R_AARCH64_TLSDESC_ADD_LO12_NC || Type == R_AARCH64_TLSDESC_CALL; } -unsigned AArch64TargetInfo::getDynRel(unsigned Type) const { +uint32_t AArch64TargetInfo::getDynRel(uint32_t Type) const { if (Type == R_AARCH64_ABS32 || Type == R_AARCH64_ABS64) return Type; StringRef S = getELFRelocationTypeName(EM_AARCH64, Type); @@ -1273,13 +1273,13 @@ GotEntryAddr); } -unsigned AArch64TargetInfo::getTlsGotRel(unsigned Type) const { +uint32_t AArch64TargetInfo::getTlsGotRel(uint32_t Type) const { assert(Type == R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 || Type == R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC); return Type; } -bool AArch64TargetInfo::isTlsDynRel(unsigned Type, const SymbolBody &S) const { +bool AArch64TargetInfo::isTlsDynRel(uint32_t Type, const SymbolBody &S) const { return Type == R_AARCH64_TLSDESC_ADR_PAGE21 || Type == R_AARCH64_TLSDESC_LD64_LO12_NC || Type == R_AARCH64_TLSDESC_ADD_LO12_NC || @@ -1456,7 +1456,7 @@ } } -bool AArch64TargetInfo::canRelaxTls(unsigned Type, const SymbolBody *S) const { +bool AArch64TargetInfo::canRelaxTls(uint32_t Type, const SymbolBody *S) const { if (Config->Shared || (S && !S->isTls())) return false; @@ -1475,9 +1475,9 @@ return false; } -unsigned AArch64TargetInfo::relaxTls(uint8_t *Loc, uint8_t *BufEnd, - uint32_t Type, uint64_t P, uint64_t SA, - const SymbolBody *S) const { +size_t AArch64TargetInfo::relaxTls(uint8_t *Loc, uint8_t *BufEnd, uint32_t Type, + uint64_t P, uint64_t SA, + const SymbolBody *S) const { switch (Type) { case R_AARCH64_TLSDESC_ADR_PAGE21: case R_AARCH64_TLSDESC_LD64_LO12_NC: @@ -1499,7 +1499,7 @@ // Global-Dynamic relocations can be relaxed to Local-Exec if both binary is // an executable and target is final (can notbe preempted). -void AArch64TargetInfo::relocateTlsGdToLe(unsigned Type, uint8_t *Loc, +void AArch64TargetInfo::relocateTlsGdToLe(uint32_t Type, uint8_t *Loc, uint8_t *BufEnd, uint64_t P, uint64_t SA) const { // TLSDESC Global-Dynamic relocation are in the form: @@ -1540,7 +1540,7 @@ // Initial-Exec relocations can be relaxed to Local-Exec if symbol is final // (can not be preempted). -void AArch64TargetInfo::relocateTlsIeToLe(unsigned Type, uint8_t *Loc, +void AArch64TargetInfo::relocateTlsIeToLe(uint32_t Type, uint8_t *Loc, uint8_t *BufEnd, uint64_t P, uint64_t SA) const { uint64_t TPOff = llvm::alignTo(TcbSize, Out::TlsPhdr->p_align); @@ -1587,7 +1587,7 @@ } template -unsigned MipsTargetInfo::getDynRel(unsigned Type) const { +uint32_t MipsTargetInfo::getDynRel(uint32_t Type) const { if (Type == R_MIPS_32 || Type == R_MIPS_64) return R_MIPS_REL32; StringRef S = getELFRelocationTypeName(EM_MIPS, Type); Index: ELF/Writer.cpp =================================================================== --- ELF/Writer.cpp +++ ELF/Writer.cpp @@ -256,7 +256,7 @@ } template -static bool handleTlsRelocation(unsigned Type, SymbolBody *Body, +static bool handleTlsRelocation(uint32_t Type, SymbolBody *Body, InputSectionBase &C, RelT &RI) { if (Target->isTlsLocalDynamicRel(Type)) { if (Target->canRelaxTls(Type, nullptr))