[ELF] Linkerscript: define symbols outside SECTIONS
Symbol assignments outside of SECTIONS command need to be created
even when SECTIONS command is not used.
Differential Revision: https://reviews.llvm.org/D23751
llvm-svn: 280252
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index e1a99b1..9403233 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -259,6 +259,16 @@
}
template <class ELFT>
+void LinkerScript<ELFT>::createAssignments() {
+ for (const std::unique_ptr<SymbolAssignment> &Cmd : Opt.Assignments) {
+ if (shouldDefine<ELFT>(Cmd.get()))
+ addRegular<ELFT>(Cmd.get());
+ if (Cmd->Sym)
+ cast<DefinedRegular<ELFT>>(Cmd->Sym)->Value = Cmd->Expression(0);
+ }
+}
+
+template <class ELFT>
void LinkerScript<ELFT>::createSections(OutputSectionFactory<ELFT> &Factory) {
for (const std::unique_ptr<BaseCommand> &Base1 : Opt.Commands) {
if (auto *Cmd = dyn_cast<SymbolAssignment>(Base1.get())) {
@@ -714,12 +724,16 @@
void ScriptParser::readLinkerScript() {
while (!atEOF()) {
StringRef Tok = next();
- if (Handler Fn = Cmd.lookup(Tok))
+ if (Handler Fn = Cmd.lookup(Tok)) {
(this->*Fn)();
- else if (SymbolAssignment *Cmd = readProvideOrAssignment(Tok))
- Opt.Commands.emplace_back(Cmd);
- else
+ } else if (SymbolAssignment *Cmd = readProvideOrAssignment(Tok)) {
+ if (Opt.HasContents)
+ Opt.Commands.emplace_back(Cmd);
+ else
+ Opt.Assignments.emplace_back(Cmd);
+ } else {
setError("unknown directive: " + Tok);
+ }
}
}