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

Rearrange code for the sake of readability. NFC. 

llvm-svn: 303961
This commit is contained in:
Rui Ueyama 2017-05-26 02:27:19 +00:00
parent c93c063993
commit e962e37792
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lld/ELF/Writer.cpp
View File

@ -1622,18 +1622,6 @@ static uint16_t getELFType() {
// to each section. This function fixes some predefined
// symbol values that depend on section address and size.
template <class ELFT> void Writer<ELFT>::fixPredefinedSymbols() {
auto Set = [](DefinedRegular *S1, DefinedRegular *S2, OutputSection *Sec,
uint64_t Value) {
if (S1) {
S1->Section = Sec;
S1->Value = Value;
}
if (S2) {
S2->Section = Sec;
S2->Value = Value;
}
};
// _etext is the first location after the last read-only loadable segment.
// _edata is the first location after the last read-write loadable segment.
// _end is the first location after the uninitialized data region.
@ -1649,12 +1637,26 @@ template <class ELFT> void Writer<ELFT>::fixPredefinedSymbols() {
else
LastRO = &P;
}
if (Last)
Set(ElfSym::End1, ElfSym::End2, Last->First, Last->p_memsz);
if (LastRO)
Set(ElfSym::Etext1, ElfSym::Etext2, LastRO->First, LastRO->p_filesz);
if (LastRW)
Set(ElfSym::Edata1, ElfSym::Edata2, LastRW->First, LastRW->p_filesz);
auto Set = [](DefinedRegular *S, OutputSection *Sec, uint64_t Value) {
if (S) {
S->Section = Sec;
S->Value = Value;
}
};
if (Last) {
Set(ElfSym::End1, Last->First, Last->p_memsz);
Set(ElfSym::End2, Last->First, Last->p_memsz);
}
if (LastRO) {
Set(ElfSym::Etext1, LastRO->First, LastRO->p_filesz);
Set(ElfSym::Etext2, LastRO->First, LastRO->p_filesz);
}
if (LastRW) {
Set(ElfSym::Edata1, LastRW->First, LastRW->p_filesz);
Set(ElfSym::Edata2, LastRW->First, LastRW->p_filesz);
}
if (ElfSym::Bss)
ElfSym::Bss->Section = findSection(".bss");