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

Rename DoLayout -> HasContents. NFC. 

llvm-svn: 277102
This commit is contained in:
Rui Ueyama 2016-07-29 03:31:09 +00:00
parent a926b3e71b
commit 3de0a3308b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/LinkerScript.cpp
View File

@ -646,7 +646,7 @@ void ScriptParser::readSearchDir() {
}
void ScriptParser::readSections() {
Opt.DoLayout = true;
Opt.HasContents = true;
expect("{");
while (!Error && !skip("}")) {
StringRef Tok = next();

2
lld/ELF/LinkerScript.h
View File

@ -105,7 +105,7 @@ struct ScriptConfiguration {
// Used to assign sections to headers.
std::vector<PhdrsCommand> PhdrsCommands;
bool DoLayout = false;
bool HasContents = false;
llvm::BumpPtrAllocator Alloc;

11
lld/ELF/Writer.cpp
View File

@ -224,10 +224,9 @@ template <class ELFT> void Writer<ELFT>::run() {
CommonInputSection<ELFT> Common;
CommonInputSection<ELFT>::X = &Common;
OutputSections =
ScriptConfig->DoLayout
? Script<ELFT>::X->createSections(Factory)
: createSections();
OutputSections = ScriptConfig->HasContents
? Script<ELFT>::X->createSections(Factory)
: createSections();
finalizeSections();
if (HasError)
return;
@ -239,7 +238,7 @@ template <class ELFT> void Writer<ELFT>::run() {
? Script<ELFT>::X->createPhdrs(OutputSections)
: createPhdrs();
fixHeaders();
if (ScriptConfig->DoLayout) {
if (ScriptConfig->HasContents) {
Script<ELFT>::X->assignAddresses(OutputSections);
} else {
fixSectionAlignments();
@ -1027,7 +1026,7 @@ template <class ELFT> void Writer<ELFT>::fixSectionAlignments() {
// sections. These are special, we do not include them into output sections
// list, but have them to simplify the code.
template <class ELFT> void Writer<ELFT>::fixHeaders() {
uintX_t BaseVA = ScriptConfig->DoLayout ? 0 : Config->ImageBase;
uintX_t BaseVA = ScriptConfig->HasContents ? 0 : Config->ImageBase;
Out<ELFT>::ElfHeader->setVA(BaseVA);
uintX_t Off = Out<ELFT>::ElfHeader->getSize();
Out<ELFT>::ProgramHeaders->setVA(Off + BaseVA);