diff options
author | Rui Ueyama <ruiu@google.com> | 2017-10-11 01:50:56 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2017-10-11 01:50:56 +0000 |
commit | 6b394caaf1c84ecd73469eacebba9453f9772552 (patch) | |
tree | a4d1c93315c06978f5b04cbba9d97587e2319ab6 /lld/ELF/ScriptParser.cpp | |
parent | 197f68da76b604748590485fb496fad5e007e485 (diff) | |
download | bcm5719-llvm-6b394caaf1c84ecd73469eacebba9453f9772552.tar.gz bcm5719-llvm-6b394caaf1c84ecd73469eacebba9453f9772552.zip |
Rename Commands -> SectionCommands.
"Commands" was ambiguous because in the linker script, everything is
a command. We used to handle only SECTIONS commands, and at the time,
it might make sense to call them the commands, but it is no longer
the case. We handle not only SECTIONS but also MEMORY, PHDRS, VERSION,
etc., and they are all commands.
llvm-svn: 315409
Diffstat (limited to 'lld/ELF/ScriptParser.cpp')
-rw-r--r-- | lld/ELF/ScriptParser.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp index 1c2e9d318a6..d30538e416c 100644 --- a/lld/ELF/ScriptParser.cpp +++ b/lld/ELF/ScriptParser.cpp @@ -234,7 +234,7 @@ void ScriptParser::readLinkerScript() { continue; if (Tok == "ASSERT") { - Script->Commands.push_back(readAssert()); + Script->SectionCommands.push_back(readAssert()); } else if (Tok == "ENTRY") { readEntry(); } else if (Tok == "EXTERN") { @@ -262,7 +262,7 @@ void ScriptParser::readLinkerScript() { } else if (Tok == "VERSION") { readVersion(); } else if (SymbolAssignment *Cmd = readProvideOrAssignment(Tok)) { - Script->Commands.push_back(Cmd); + Script->SectionCommands.push_back(Cmd); } else { setError("unknown directive: " + Tok); } @@ -451,7 +451,7 @@ void ScriptParser::readSections() { else Cmd = readOutputSectionDescription(Tok); } - Script->Commands.push_back(Cmd); + Script->SectionCommands.push_back(Cmd); } } @@ -669,11 +669,11 @@ OutputSection *ScriptParser::readOutputSectionDescription(StringRef OutSec) { if (Tok == ";") { // Empty commands are allowed. Do nothing here. } else if (SymbolAssignment *Assign = readProvideOrAssignment(Tok)) { - Cmd->Commands.push_back(Assign); + Cmd->SectionCommands.push_back(Assign); } else if (BytesDataCommand *Data = readBytesDataCommand(Tok)) { - Cmd->Commands.push_back(Data); + Cmd->SectionCommands.push_back(Data); } else if (Tok == "ASSERT") { - Cmd->Commands.push_back(readAssert()); + Cmd->SectionCommands.push_back(readAssert()); expect(";"); } else if (Tok == "CONSTRUCTORS") { // CONSTRUCTORS is a keyword to make the linker recognize C++ ctors/dtors @@ -684,7 +684,7 @@ OutputSection *ScriptParser::readOutputSectionDescription(StringRef OutSec) { } else if (Tok == "SORT") { readSort(); } else if (peek() == "(") { - Cmd->Commands.push_back(readInputSectionDescription(Tok)); + Cmd->SectionCommands.push_back(readInputSectionDescription(Tok)); } else { setError("unknown command " + Tok); } |