commit 5784e96f5c464dc483ca179fda6ae4406c4cfd78
author Eugene Leviant <eleviant@accesssoftek.com> Tue Mar 14 08:57:09 2017 +0000
committer Eugene Leviant <eleviant@accesssoftek.com> Tue Mar 14 08:57:09 2017 +0000
tree 27bbe6ce718d034ec83925b13316e7eb25bcd3df
parent 30c1b436add85460c33b52565691adaa71a22236

[ELF] Fix LMA offset calculation

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

llvm-svn: 297713

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index fb309ce..7f68b5b 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -547,10 +547,6 @@
 // for a single sections command (e.g. ".text { *(.text); }").
 template <class ELFT>
 void LinkerScript<ELFT>::assignOffsets(OutputSectionCommand *Cmd) {
-  if (Cmd->LMAExpr) {
-    uintX_t D = Dot;
-    LMAOffset = [=] { return Cmd->LMAExpr() - D; };
-  }
   OutputSection *Sec = findSection<ELFT>(Cmd->Name, *OutputSections);
   if (!Sec)
     return;
@@ -558,6 +554,11 @@
   if (Cmd->AddrExpr && Sec->Flags & SHF_ALLOC)
     setDot(Cmd->AddrExpr, Cmd->Location);
 
+  if (Cmd->LMAExpr) {
+    uintX_t D = Dot;
+    LMAOffset = [=] { return Cmd->LMAExpr() - D; };
+  }
+
   // Handle align (e.g. ".foo : ALIGN(16) { ... }").
   if (Cmd->AlignExpr)
     Sec->updateAlignment(Cmd->AlignExpr());