svn commit: r327620 - projects/clang600-import/contrib/llvm/tools/lld/ELF

[Dimitry Andric]

Author: dim
Date: Sat Jan  6 13:19:36 2018
New Revision: 327620
URL: https://svnweb.freebsd.org/changeset/base/327620

Log:
  Tentatively apply https://reviews.llvm.org/D41635:
  
    We normally want to ignore SHT_NOBITS sections when computing
    offsets. The sh_offset of section itself seems to be irrelevant and
  
    * If the section is in the middle of a PT_LOAD, it will make no
      difference on the computed offset of the followup section.
    * If it is in the end of a PT_LOAD, we want to avoid its alignment
      changing the offset of the followup sections.
  
    The issue is if it is at the start of the PT_LOAD. In that case we do
    have to align it so that the following sections have congruent
    address and offset module the page size. We were not handling this
    case.
  
    This should fix freebsd kernel link.
  
  In particular, this fixes ctfmerge and/or objcopy throwing "Layout
  constraint violation" errors when processing an lld-linked kernel.

Modified:
  projects/clang600-import/contrib/llvm/tools/lld/ELF/Writer.cpp

Modified: projects/clang600-import/contrib/llvm/tools/lld/ELF/Writer.cpp
==============================================================================
--- projects/clang600-import/contrib/llvm/tools/lld/ELF/Writer.cpp	Sat Jan  6 12:46:04 2018	(r327619)
+++ projects/clang600-import/contrib/llvm/tools/lld/ELF/Writer.cpp	Sat Jan  6 13:19:36 2018	(r327620)
@@ -1767,30 +1767,36 @@ template <class ELFT> void Writer<ELFT>::fixSectionAli
 // virtual address (modulo the page size) so that the loader can load
 // executables without any address adjustment.
 static uint64_t getFileAlignment(uint64_t Off, OutputSection *Cmd) {
-  // If the section is not in a PT_LOAD, we just have to align it.
-  if (!Cmd->PtLoad)
-    return alignTo(Off, Cmd->Alignment);
-
-  OutputSection *First = Cmd->PtLoad->FirstSec;
+  OutputSection *First = Cmd->PtLoad ? Cmd->PtLoad->FirstSec : nullptr;
   // The first section in a PT_LOAD has to have congruent offset and address
   // module the page size.
   if (Cmd == First)
     return alignTo(Off, std::max<uint64_t>(Cmd->Alignment, Config->MaxPageSize),
                    Cmd->Addr);
 
+  // For SHT_NOBITS we don't want the alignment of the section to impact the
+  // offset of the sections that follow. Since nothing seems to care about the
+  // sh_offset of the SHT_NOBITS section itself, just ignore it.
+  if (Cmd->Type == SHT_NOBITS)
+    return Off;
+
+  // If the section is not in a PT_LOAD, we just have to align it.
+  if (!Cmd->PtLoad)
+    return alignTo(Off, Cmd->Alignment);
+
   // If two sections share the same PT_LOAD the file offset is calculated
   // using this formula: Off2 = Off1 + (VA2 - VA1).
   return First->Offset + Cmd->Addr - First->Addr;
 }
 
 static uint64_t setOffset(OutputSection *Cmd, uint64_t Off) {
-  if (Cmd->Type == SHT_NOBITS) {
-    Cmd->Offset = Off;
-    return Off;
-  }
-
   Off = getFileAlignment(Off, Cmd);
   Cmd->Offset = Off;
+
+  // For SHT_NOBITS we should not count the size.
+  if (Cmd->Type == SHT_NOBITS)
+    return Off;
+
   return Off + Cmd->Size;
 }