caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split readOutputSectionDescription.

Browse Source 
llvm-svn: 277121
This commit is contained in:
Rui Ueyama
2016-07-29 06:14:07 +00:00
parent e4f868ea16
commit f71caa2b49
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lld/ELF/LinkerScript.cpp
View File

@@ -443,6 +443,7 @@ private:
SymbolAssignment *readAssignment(StringRef Name);
void readOutputSectionDescription(StringRef OutSec);
std::vector<uint8_t> readOutputSectionFiller();
std::vector<StringRef> readOutputSectionPhdrs();
std::unique_ptr<InputSectionDescription> readInputSectionDescription();
void readInputSectionRules(InputSectionDescription *InCmd, bool Keep);
@@ -760,17 +761,20 @@ void ScriptParser::readOutputSectionDescription(StringRef OutSec) {
}
}
Cmd->Phdrs = readOutputSectionPhdrs();
Cmd->Filler = readOutputSectionFiller();
}
std::vector<uint8_t> ScriptParser::readOutputSectionFiller() {
StringRef Tok = peek();
if (Tok.startswith("=")) {
if (!Tok.startswith("=0x")) {
setError("filler should be a hexadecimal value");
return;
}
Tok = Tok.substr(3);
Cmd->Filler = parseHex(Tok);
next();
if (!Tok.startswith("="))
return {};
if (!Tok.startswith("=0x")) {
setError("filler should be a hexadecimal value");
return {};
}
Tok = Tok.substr(3);
next();
return parseHex(Tok);
}
void ScriptParser::readProvide(bool Hidden) {