From b9a1baec33e911ca24f51abf882d454e62047ea6 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 3 Jun 2017 15:21:18 +0000
Subject: Vendor import of lld trunk r304659:
 https://llvm.org/svn/llvm-project/lld/trunk@304659

---
 ELF/LinkerScript.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'ELF/LinkerScript.cpp')

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()) {
-- 
cgit v1.2.3