summaryrefslogtreecommitdiffstats
path: root/lld/ELF/LinkerScript.cpp
diff options
context:
space:
mode:
authorGeorge Rimar <grimar@accesssoftek.com>2017-03-15 16:07:02 +0000
committerGeorge Rimar <grimar@accesssoftek.com>2017-03-15 16:07:02 +0000
commit20055d4cd2396c0bcd51063b224e12adf7a21f07 (patch)
tree3e6e4320deeca9be29b8c49828278213c765b367 /lld/ELF/LinkerScript.cpp
parentffcf0fb1ccc25f819f17742f67e798cab66cc173 (diff)
downloadbcm5719-llvm-20055d4cd2396c0bcd51063b224e12adf7a21f07.tar.gz
bcm5719-llvm-20055d4cd2396c0bcd51063b224e12adf7a21f07.zip
[ELF] - Linkerscript: make Dot public and remove getDot(). NFC.
Suggested by Rui Ueyama, also groups member variables in a single place, while I am here. llvm-svn: 297850
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 fc56c5fcb8e..69ac57c2f4f 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->getDot();
+ return ScriptBase->Dot;
};
}
@@ -1754,7 +1754,7 @@ Expr ScriptParser::readPrimary() {
return [=] { return alignTo(E(), E2()); };
}
expect(")");
- return [=] { return alignTo(ScriptBase->getDot(), E()); };
+ return [=] { return alignTo(ScriptBase->Dot, E()); };
}
if (Tok == "CONSTANT") {
StringRef Name = readParenLiteral();
@@ -1778,13 +1778,13 @@ Expr ScriptParser::readPrimary() {
expect(",");
readExpr();
expect(")");
- return [=] { return alignTo(ScriptBase->getDot(), E()); };
+ return [=] { return alignTo(ScriptBase->Dot, E()); };
}
if (Tok == "DATA_SEGMENT_END") {
expect("(");
expect(".");
expect(")");
- return []() { return ScriptBase->getDot(); };
+ return []() { return ScriptBase->Dot; };
}
// 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->getDot(), Target->PageSize); };
+ return []() { return alignTo(ScriptBase->Dot, Target->PageSize); };
}
if (Tok == "SIZEOF") {
StringRef Name = readParenLiteral();
OpenPOWER on IntegriCloud