mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-05-02 02:56:09 +00:00
Code Issues Projects Releases Wiki Activity

Simplify. NFC.

Browse Source 
This new code should be logically equivalent to the previous code.

llvm-svn: 258792
This commit is contained in:
Rui Ueyama 2016-01-26 04:58:58 +00:00
parent dd54a3a887
commit d6cea14cbb
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lld/ELF/OutputSections.cpp
View File

@ -325,7 +325,6 @@ template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
bool LazyReloc = Body && Target->supportsLazyRelocations() &&
Target->relocNeedsPlt(Type, *Body);
unsigned Sym = CBP ? Body->DynamicSymbolTableIndex : 0;
unsigned Reloc;
if (!CBP)
Reloc = Target->getRelativeReloc();
@ -335,7 +334,8 @@ template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
Reloc = Body->isTls() ? Target->getTlsGotReloc() : Target->getGotReloc();
else
Reloc = Target->getDynReloc(Type);
P->setSymbolAndType(Sym, Reloc, Config->Mips64EL);
P->setSymbolAndType(CBP ? Body->DynamicSymbolTableIndex : 0, Reloc,
Config->Mips64EL);
if (LazyReloc)
P->r_offset = Out<ELFT>::GotPlt->getEntryAddr(*Body);
@ -344,24 +344,18 @@ template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
else
P->r_offset = C.getOffset(RI.r_offset) + C.OutSec->getVA();
uintX_t OrigAddend = 0;
if (IsRela && !NeedsGot)
OrigAddend = static_cast<const Elf_Rela &>(RI).r_addend;
if (!IsRela)
continue;
auto R = static_cast<const Elf_Rela &>(RI);
uintX_t Addend;
if (CBP)
Addend = OrigAddend;
Addend = NeedsGot ? 0 : R.r_addend;
else if (Body)
Addend = getSymVA<ELFT>(*Body) + OrigAddend;
else if (IsRela)
Addend =
getLocalRelTarget(File, static_cast<const Elf_Rela &>(RI),
getAddend<ELFT>(static_cast<const Elf_Rela &>(RI)));
Addend = getSymVA<ELFT>(*Body) + (NeedsGot ? 0 : R.r_addend);
else
Addend = getLocalRelTarget(File, RI, 0);
if (IsRela)
static_cast<Elf_Rela *>(P)->r_addend = Addend;
Addend = getLocalRelTarget(File, R, R.r_addend);
static_cast<Elf_Rela *>(P)->r_addend = Addend;
}
}