aboutsummaryrefslogtreecommitdiffstats
path: root/ELF/LinkerScript.cpp
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-06-03 15:21:18 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-06-03 15:21:18 +0000
commitb9a1baec33e911ca24f51abf882d454e62047ea6 (patch)
treed426cb84117bdb3ec63a7bef741444456d30e414 /ELF/LinkerScript.cpp
parent80350c116f86dbb87e055a630b1b2be0c66b244b (diff)
downloadsrc-b9a1baec33e911ca24f51abf882d454e62047ea6.tar.gz
src-b9a1baec33e911ca24f51abf882d454e62047ea6.zip
Vendor import of lld trunk r304659:vendor/lld/lld-trunk-r304659
Notes
Notes: svn path=/vendor/lld/dist/; revision=319531 svn path=/vendor/lld/lld-trunk-r304659/; revision=319532; tag=vendor/lld/lld-trunk-r304659
Diffstat (limited to 'ELF/LinkerScript.cpp')
-rw-r--r--ELF/LinkerScript.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/ELF/LinkerScript.cpp b/ELF/LinkerScript.cpp
index 75df2cd4bd5c..1ced3e8e8d71 100644
--- a/ELF/LinkerScript.cpp
+++ b/ELF/LinkerScript.cpp
@@ -463,12 +463,7 @@ void LinkerScript::fabricateDefaultCommands() {
// Prefer user supplied address over additional alignment constraint
auto I = Config->SectionStartMap.find(Sec->Name);
if (I != Config->SectionStartMap.end())
- Commands.push_back(
- make<SymbolAssignment>(".", [=] { return I->second; }, ""));
- else if (Sec->PageAlign)
- OSCmd->AddrExpr = [=] {
- return alignTo(Script->getDot(), Config->MaxPageSize);
- };
+ OSCmd->AddrExpr = [=] { return I->second; };
Commands.push_back(OSCmd);
if (Sec->Sections.size()) {