maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] - Split RelocationSection<ELFT>::writeTo function. 

Splitted writeTo to separate tls relocs handling stuff which is too long for one method now. NFC.

Differential revision: http://reviews.llvm.org/D15012

llvm-svn: 254309
This commit is contained in:
George Rimar 2015-11-30 17:49:19 +00:00
parent 9b6d4ffdf9
commit 5828c2319e
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lld/ELF/OutputSections.cpp
View File

@ -193,6 +193,31 @@ RelocationSection<ELFT>::RelocationSection(StringRef Name, bool IsRela)
this->Header.sh_addralign = ELFT::Is64Bits ? 8 : 4;
}
// Applies corresponding symbol and type for dynamic tls relocation.
// Returns true if relocation was handled.
template <class ELFT>
bool RelocationSection<ELFT>::applyTlsDynamicReloc(SymbolBody *Body,
uint32_t Type, Elf_Rel *P,
Elf_Rel *N) {
if (Target->isTlsLocalDynamicReloc(Type)) {
P->setSymbolAndType(0, Target->getTlsModuleIndexReloc(), Config->Mips64EL);
P->r_offset =
Out<ELFT>::Got->getVA() + Out<ELFT>::LocalModuleTlsIndexOffset;
return true;
}
if (Body && Target->isTlsGlobalDynamicReloc(Type)) {
P->setSymbolAndType(Body->getDynamicSymbolTableIndex(),
Target->getTlsModuleIndexReloc(), Config->Mips64EL);
P->r_offset = Out<ELFT>::Got->getEntryAddr(*Body);
N->setSymbolAndType(Body->getDynamicSymbolTableIndex(),
Target->getTlsOffsetReloc(), Config->Mips64EL);
N->r_offset = Out<ELFT>::Got->getEntryAddr(*Body) + sizeof(uintX_t);
return true;
}
return false;
}
template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
const unsigned EntrySize = IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel);
for (const DynamicReloc<ELFT> &Rel : Relocs) {
@ -213,26 +238,8 @@ template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
Body = Body->repl();
uint32_t Type = RI.getType(Config->Mips64EL);
if (Target->isTlsLocalDynamicReloc(Type)) {
P->setSymbolAndType(0, Target->getTlsModuleIndexReloc(),
Config->Mips64EL);
P->r_offset =
Out<ELFT>::Got->getVA() + Out<ELFT>::LocalModuleTlsIndexOffset;
if (applyTlsDynamicReloc(Body, Type, P, reinterpret_cast<Elf_Rel *>(Buf)))
continue;
}
if (Body && Target->isTlsGlobalDynamicReloc(Type)) {
P->setSymbolAndType(Body->getDynamicSymbolTableIndex(),
Target->getTlsModuleIndexReloc(), Config->Mips64EL);
P->r_offset = Out<ELFT>::Got->getEntryAddr(*Body);
auto *PNext = reinterpret_cast<Elf_Rel *>(Buf);
PNext->setSymbolAndType(Body->getDynamicSymbolTableIndex(),
Target->getTlsOffsetReloc(), Config->Mips64EL);
PNext->r_offset = Out<ELFT>::Got->getEntryAddr(*Body) + sizeof(uintX_t);
continue;
}
bool NeedsCopy = Body && Target->relocNeedsCopy(Type, *Body);
bool NeedsGot = Body && Target->relocNeedsGot(Type, *Body);
bool CanBePreempted = canBePreempted(Body, NeedsGot);

3
lld/ELF/OutputSections.h
View File

@ -223,6 +223,9 @@ public:
bool isRela() const { return IsRela; }
private:
bool applyTlsDynamicReloc(SymbolBody *Body, uint32_t Type, Elf_Rel *P,
Elf_Rel *N);
std::vector<DynamicReloc<ELFT>> Relocs;
const bool IsRela;
};