summaryrefslogtreecommitdiffstats
path: root/lld/ELF/LinkerScript.cpp
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2017-03-16 21:50:30 +0000
committerRui Ueyama <ruiu@google.com>2017-03-16 21:50:30 +0000
commit98e55de6990cae05c864c17c3ce6015a0c63b563 (patch)
tree1ad516f6fd923b73fbe396e615c7fa0c5ec77a9a /lld/ELF/LinkerScript.cpp
parentd609d6ebf045b98b810190f874f29b2b4c5b5185 (diff)
downloadbcm5719-llvm-98e55de6990cae05c864c17c3ce6015a0c63b563.tar.gz
bcm5719-llvm-98e55de6990cae05c864c17c3ce6015a0c63b563.zip
Revert r297850: [ELF] - Linkerscript: make Dot public and remove getDot(). NFC.
This reverts commit r297850 because this change was made based on a miscommunication. llvm-svn: 298001
Diffstat (limited to 'lld/ELF/LinkerScript.cpp')
-rw-r--r--lld/ELF/LinkerScript.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 4519a2b892b..99a041988d6 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -1424,7 +1424,7 @@ Expr ScriptParser::readAssert() {
return [=] {
if (!E())
error(Msg);
- return ScriptBase->Dot;
+ return ScriptBase->getDot();
};
}
@@ -1754,7 +1754,7 @@ Expr ScriptParser::readPrimary() {
return [=] { return alignTo(E(), E2()); };
}
expect(")");
- return [=] { return alignTo(ScriptBase->Dot, E()); };
+ return [=] { return alignTo(ScriptBase->getDot(), E()); };
}
if (Tok == "CONSTANT") {
StringRef Name = readParenLiteral();
@@ -1778,13 +1778,13 @@ Expr ScriptParser::readPrimary() {
expect(",");
readExpr();
expect(")");
- return [=] { return alignTo(ScriptBase->Dot, E()); };
+ return [=] { return alignTo(ScriptBase->getDot(), E()); };
}
if (Tok == "DATA_SEGMENT_END") {
expect("(");
expect(".");
expect(")");
- return []() { return ScriptBase->Dot; };
+ return []() { return ScriptBase->getDot(); };
}
// GNU linkers implements more complicated logic to handle
// DATA_SEGMENT_RELRO_END. We instead ignore the arguments and just align to
@@ -1795,7 +1795,7 @@ Expr ScriptParser::readPrimary() {
expect(",");
readExpr();
expect(")");
- return []() { return alignTo(ScriptBase->Dot, Target->PageSize); };
+ return []() { return alignTo(ScriptBase->getDot(), Target->PageSize); };
}
if (Tok == "SIZEOF") {
StringRef Name = readParenLiteral();
OpenPOWER on IntegriCloud