commit ea590d91a0de0fec8b4a45af3e7837ecbbd51b5a
author Rafael Espindola <rafael.espindola@gmail.com> Wed Feb 08 15:19:03 2017 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Wed Feb 08 15:19:03 2017 +0000
tree 7de5879618bec65762c8d2e83d604c827e27523e
parent bb64200e166cbe8aaa80a339dba852b8275e7180

Revert "Simplify symbol computation for non alloc sections."

This reverts commit r294346. Looks like it regressed the build of
magenta.

llvm-svn: 294460

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 2fa2ff4..15acaf0 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -101,8 +101,12 @@
 
   if (auto *Body = dyn_cast<DefinedSynthetic>(Cmd->Sym)) {
     Body->Section = Cmd->Expression.Section();
-    if (Body->Section)
-      Body->Value = Cmd->Expression(Dot) - Body->Section->Addr;
+    if (Body->Section) {
+      uint64_t VA = 0;
+      if (Body->Section->Flags & SHF_ALLOC)
+        VA = Body->Section->Addr;
+      Body->Value = Cmd->Expression(Dot) - VA;
+    }
     return;
   }
 
@@ -802,9 +806,12 @@
   }
 
   uintX_t MinVA = std::numeric_limits<uintX_t>::max();
-  for (OutputSectionBase *Sec : *OutputSections)
+  for (OutputSectionBase *Sec : *OutputSections) {
     if (Sec->Flags & SHF_ALLOC)
       MinVA = std::min<uint64_t>(MinVA, Sec->Addr);
+    else
+      Sec->Addr = 0;
+  }
 
   allocateHeaders<ELFT>(Phdrs, *OutputSections, MinVA);
 }