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

Make getOffset a member function of DynamicReloc<ELFT>. 

Logically it belongs to DynamicReloc, and it is more readable to
be a member of the class.

llvm-svn: 261069
This commit is contained in:
Rui Ueyama 2016-02-17 06:08:42 +00:00
parent 861c731ccc
commit a2b1f45ded
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lld/ELF/OutputSections.cpp
View File

@ -225,25 +225,21 @@ void RelocationSection<ELFT>::addReloc(const DynamicReloc<ELFT> &Reloc) {
}
template <class ELFT>
static typename ELFFile<ELFT>::uintX_t
getOffset(const DynamicReloc<ELFT> &Rel) {
typedef typename ELFFile<ELFT>::uintX_t uintX_t;
SymbolBody *Sym = Rel.Sym;
switch (Rel.OKind) {
case DynamicReloc<ELFT>::Off_GTlsIndex:
typename ELFFile<ELFT>::uintX_t DynamicReloc<ELFT>::getOffset() const {
switch (OKind) {
case Off_GTlsIndex:
return Out<ELFT>::Got->getGlobalDynAddr(*Sym);
case DynamicReloc<ELFT>::Off_GTlsOffset:
case Off_GTlsOffset:
return Out<ELFT>::Got->getGlobalDynAddr(*Sym) + sizeof(uintX_t);
case DynamicReloc<ELFT>::Off_LTlsIndex:
case Off_LTlsIndex:
return Out<ELFT>::Got->getTlsIndexVA();
case DynamicReloc<ELFT>::Off_Sec:
return Rel.OffsetSec->getOffset(Rel.OffsetInSec) +
Rel.OffsetSec->OutSec->getVA();
case DynamicReloc<ELFT>::Off_Bss:
case Off_Sec:
return OffsetSec->getOffset(OffsetInSec) + OffsetSec->OutSec->getVA();
case Off_Bss:
return cast<SharedSymbol<ELFT>>(Sym)->OffsetInBss + Out<ELFT>::Bss->getVA();
case DynamicReloc<ELFT>::Off_Got:
case Off_Got:
return Sym->getGotVA<ELFT>();
case DynamicReloc<ELFT>::Off_GotPlt:
case Off_GotPlt:
return Sym->getGotPltVA<ELFT>();
}
llvm_unreachable("Invalid offset kind");
@ -265,7 +261,7 @@ template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
reinterpret_cast<Elf_Rela *>(P)->r_addend = Rel.Addend + VA;
}
P->r_offset = getOffset(Rel);
P->r_offset = Rel.getOffset();
uint32_t SymIdx = (!Rel.UseSymVA && Sym) ? Sym->DynsymIndex : 0;
P->setSymbolAndType(SymIdx, Rel.Type, Config->Mips64EL);
}

2
lld/ELF/OutputSections.h
View File

@ -212,6 +212,8 @@ template <class ELFT> struct DynamicReloc {
: Type(Type), OKind(Off_Sec), OffsetSec(OffsetSec),
OffsetInSec(OffsetInSec), TargetSec(TargetSec),
OffsetInTargetSec(OffsetInTargetSec), Addend(Addend) {}
uintX_t getOffset() const;
};
template <class ELFT>