commit c2dffe3aa025b63e14a9ecc33725d997d079d53e
author George Rimar <grimar@accesssoftek.com> Wed Sep 06 09:35:09 2017 +0000
committer George Rimar <grimar@accesssoftek.com> Wed Sep 06 09:35:09 2017 +0000
tree f6bdfcea29a10db38277aa0953c0d85a07e0ad08
parent 4f7f0da57429675210c204baf2d8a41cade61d04

[ELF] - Linkerscript: set load address correctly if MEMORY command used.

Previously LLD did not calculate LMAOffset correctly when
AT and MEMORY were used together.

Patch fixes PR34407.

Differential revision: https://reviews.llvm.org/D37469

llvm-svn: 312625

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index c9f43b8..f464483 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -616,14 +616,15 @@
   else if (Sec->AddrExpr)
     setDot(Sec->AddrExpr, Sec->Location, false);
 
+  CurAddressState->MemRegion = Sec->MemRegion;
+  if (CurAddressState->MemRegion)
+    Dot = CurAddressState->MemRegionOffset[CurAddressState->MemRegion];
+
   if (Sec->LMAExpr) {
     uint64_t D = Dot;
     CurAddressState->LMAOffset = [=] { return Sec->LMAExpr().getValue() - D; };
   }
 
-  CurAddressState->MemRegion = Sec->MemRegion;
-  if (CurAddressState->MemRegion)
-    Dot = CurAddressState->MemRegionOffset[CurAddressState->MemRegion];
   switchTo(Sec);
 
   // We do not support custom layout for compressed debug sectons.