This is an archive of the discontinued LLVM Phabricator instance.

Differential D15453

[ELF] - refactor of code in RelocationSection<ELFT>::writeTo()
ClosedPublic

Authored by grimar on Dec 11 2015, 8:14 AM.

Details

Reviewers
ruiu
• rafael
Commits
rGc7dc0be36a14: Reapply fixed r255626 that broke buildbot:
rGe3556420c1c0: [ELF] - refactor of code in RelocationSection<ELFT>::writeTo()
rLLD255631: Reapply fixed r255626 that broke buildbot:
rLLD255626: [ELF] - refactor of code in RelocationSection<ELFT>::writeTo()
rL255626: [ELF] - refactor of code in RelocationSection<ELFT>::writeTo()
Summary

Just a little reformat of conditions.

Diff Detail

Event Timeline

grimar updated this revision to Diff 42526.Dec 11 2015, 8:14 AM
grimar retitled this revision from to [ELF] - refactor of code in RelocationSection<ELFT>::writeTo().
grimar updated this object.
grimar added reviewers: ruiu, • rafael.
grimar added subscribers: llvm-commits, grimar.
ruiu edited edge metadata.Dec 11 2015, 11:23 AM
ruiu added a subscriber: ruiu.

Nice!

grimar added a comment.Dec 12 2015, 5:36 AM
In D15453#308536, @ruiu wrote:

Nice!

Ok to commit then ?

grimar added a child revision: D15494: [ELF] - implemented @indntpoff (x86) relocation and its optimization..Dec 14 2015, 7:32 AM
ruiu accepted this revision.Dec 14 2015, 9:57 AM
ruiu edited edge metadata.

LGTM

This revision is now accepted and ready to land.Dec 14 2015, 9:57 AM
Closed by commit rL255626: [ELF] - refactor of code in RelocationSection<ELFT>::writeTo() (authored by grimar). · Explain WhyDec 15 2015, 12:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
ELF/
28 lines

Diff 42526

ELF/OutputSections.cpp

Show First 20 Lines • Show All 258 Lines • ▼ Show 20 Lines for (const DynamicReloc<ELFT> &Rel : Relocs) {
if (applyTlsDynamicReloc(Body, Type, P, reinterpret_cast<Elf_Rel *>(Buf))) if (applyTlsDynamicReloc(Body, Type, P, reinterpret_cast<Elf_Rel *>(Buf)))
continue; continue;
bool NeedsCopy = Body && Target->relocNeedsCopy(Type, *Body); bool NeedsCopy = Body && Target->relocNeedsCopy(Type, *Body);
bool NeedsGot = Body && Target->relocNeedsGot(Type, *Body); bool NeedsGot = Body && Target->relocNeedsGot(Type, *Body);
bool CanBePreempted = canBePreempted(Body, NeedsGot); bool CanBePreempted = canBePreempted(Body, NeedsGot);
bool LazyReloc = Body && Target->supportsLazyRelocations() && bool LazyReloc = Body && Target->supportsLazyRelocations() &&
Target->relocNeedsPlt(Type, *Body); Target->relocNeedsPlt(Type, *Body);
if (CanBePreempted) { unsigned Sym = CanBePreempted ? Body->getDynamicSymbolTableIndex() : 0;
unsigned GotReloc = unsigned Rel;
Body->isTLS() ? Target->getTlsGotReloc() : Target->getGotReloc(); if (!CanBePreempted)
if (NeedsGot) Rel = Target->getRelativeReloc();
P->setSymbolAndType(Body->getDynamicSymbolTableIndex(), else if (LazyReloc)
LazyReloc ? Target->getPltReloc() : GotReloc, Rel = Target->getPltReloc();
Config->Mips64EL); else if (NeedsGot)
Rel = Body->isTLS() ? Target->getTlsGotReloc() : Target->getGotReloc();
else if (NeedsCopy)
Rel = Target->getCopyReloc();
else else
P->setSymbolAndType(Body->getDynamicSymbolTableIndex(), Rel = Target->getDynReloc(Type);
NeedsCopy ? Target->getCopyReloc() P->setSymbolAndType(Sym, Rel, Config->Mips64EL);
: Target->getDynReloc(Type),
Config->Mips64EL);
} else {
P->setSymbolAndType(0, Target->getRelativeReloc(), Config->Mips64EL);
}
if (NeedsGot) { if (NeedsGot) {
if (LazyReloc) if (LazyReloc)
P->r_offset = Out<ELFT>::GotPlt->getEntryAddr(*Body); P->r_offset = Out<ELFT>::GotPlt->getEntryAddr(*Body);
else else
P->r_offset = Out<ELFT>::Got->getEntryAddr(*Body); P->r_offset = Out<ELFT>::Got->getEntryAddr(*Body);
} else if (NeedsCopy) { } else if (NeedsCopy) {
P->r_offset = Out<ELFT>::Bss->getVA() + P->r_offset = Out<ELFT>::Bss->getVA() +
▲ Show 20 Lines • Show All 1,194 Lines • Show Last 20 Lines