From: Rui Ueyama <ruiu@google.com>
Date: Tue, 1 Nov 2016 23:17:45 +0000 (+0000)
Subject: Split writeResult. NFC.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f83aca42e6bf4aff0af10a5f8d0844896928c32a;p=platform%2Fupstream%2Fllvm.git

Split writeResult. NFC.

This is now doable because this code doesn't have to be in the
dynamic scope of Writer::run().

llvm-svn: 285766
---

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 186bb34..5a74403 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -49,6 +49,7 @@ public:
 private:
   typedef PhdrEntry<ELFT> Phdr;
 
+  void createSyntheticSections();
   void copyLocalSymbols();
   void addReservedSymbols();
   void addInputSec(InputSectionBase<ELFT> *S);
@@ -126,83 +127,6 @@ template <class ELFT> static bool needsInterpSection() {
 }
 
 template <class ELFT> void elf::writeResult() {
-  typedef typename ELFT::uint uintX_t;
-  typedef typename ELFT::Ehdr Elf_Ehdr;
-
-  // Initialize all pointers with NULL.
-  memset(&Out<ELFT>::First, 0, sizeof(Out<ELFT>));
-
-  // Create singleton output sections.
-  Out<ELFT>::Bss =
-      make<OutputSection<ELFT>>(".bss", SHT_NOBITS, SHF_ALLOC | SHF_WRITE);
-  Out<ELFT>::Dynamic = make<DynamicSection<ELFT>>();
-  Out<ELFT>::EhFrame = make<EhOutputSection<ELFT>>();
-  Out<ELFT>::Got = make<GotSection<ELFT>>();
-  Out<ELFT>::Plt = make<PltSection<ELFT>>();
-  Out<ELFT>::RelaDyn = make<RelocationSection<ELFT>>(
-      Config->Rela ? ".rela.dyn" : ".rel.dyn", Config->ZCombreloc);
-  Out<ELFT>::ShStrTab = make<StringTableSection<ELFT>>(".shstrtab", false);
-  Out<ELFT>::VerSym = make<VersionTableSection<ELFT>>();
-  Out<ELFT>::VerNeed = make<VersionNeedSection<ELFT>>();
-
-  Out<ELFT>::ElfHeader = make<OutputSectionBase<ELFT>>("", 0, SHF_ALLOC);
-  Out<ELFT>::ElfHeader->setSize(sizeof(Elf_Ehdr));
-  Out<ELFT>::ProgramHeaders = make<OutputSectionBase<ELFT>>("", 0, SHF_ALLOC);
-  Out<ELFT>::ProgramHeaders->updateAlignment(sizeof(uintX_t));
-
-  if (needsInterpSection<ELFT>())
-    Out<ELFT>::Interp = make<InterpSection<ELFT>>();
-
-  if (!Symtab<ELFT>::X->getSharedFiles().empty() || Config->Pic) {
-    Out<ELFT>::DynStrTab = make<StringTableSection<ELFT>>(".dynstr", true);
-    Out<ELFT>::DynSymTab =
-        make<SymbolTableSection<ELFT>>(*Out<ELFT>::DynStrTab);
-  }
-
-  if (Config->EhFrameHdr)
-    Out<ELFT>::EhFrameHdr = make<EhFrameHeader<ELFT>>();
-
-  if (Config->GnuHash)
-    Out<ELFT>::GnuHashTab = make<GnuHashTableSection<ELFT>>();
-  if (Config->SysvHash)
-    Out<ELFT>::HashTab = make<HashTableSection<ELFT>>();
-  if (Config->GdbIndex)
-    Out<ELFT>::GdbIndex = make<GdbIndexSection<ELFT>>();
-
-  StringRef S = Config->Rela ? ".rela.plt" : ".rel.plt";
-  Out<ELFT>::GotPlt = make<GotPltSection<ELFT>>();
-  Out<ELFT>::RelaPlt = make<RelocationSection<ELFT>>(S, false /*Sort*/);
-  if (Config->Strip != StripPolicy::All) {
-    Out<ELFT>::StrTab = make<StringTableSection<ELFT>>(".strtab", false);
-    Out<ELFT>::SymTab = make<SymbolTableSection<ELFT>>(*Out<ELFT>::StrTab);
-  }
-
-  if (Config->EMachine == EM_MIPS && !Config->Shared) {
-    // This is a MIPS specific section to hold a space within the data segment
-    // of executable file which is pointed to by the DT_MIPS_RLD_MAP entry.
-    // See "Dynamic section" in Chapter 5 in the following document:
-    // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
-    Out<ELFT>::MipsRldMap = make<OutputSection<ELFT>>(".rld_map", SHT_PROGBITS,
-                                                      SHF_ALLOC | SHF_WRITE);
-    Out<ELFT>::MipsRldMap->setSize(sizeof(uintX_t));
-    Out<ELFT>::MipsRldMap->updateAlignment(sizeof(uintX_t));
-  }
-  if (!Config->VersionDefinitions.empty())
-    Out<ELFT>::VerDef = make<VersionDefinitionSection<ELFT>>();
-
-  // Initialize linker generated sections
-  if (Config->BuildId == BuildIdKind::Fast)
-    In<ELFT>::BuildId = make<BuildIdFastHash<ELFT>>();
-  else if (Config->BuildId == BuildIdKind::Md5)
-    In<ELFT>::BuildId = make<BuildIdMd5<ELFT>>();
-  else if (Config->BuildId == BuildIdKind::Sha1)
-    In<ELFT>::BuildId = make<BuildIdSha1<ELFT>>();
-  else if (Config->BuildId == BuildIdKind::Uuid)
-    In<ELFT>::BuildId = make<BuildIdUuid<ELFT>>();
-  else if (Config->BuildId == BuildIdKind::Hexstring)
-    In<ELFT>::BuildId = make<BuildIdHexstring<ELFT>>();
-  In<ELFT>::Sections = {In<ELFT>::BuildId};
-
   Writer<ELFT>().run();
 }
 
@@ -216,6 +140,7 @@ template <class ELFT> static std::vector<DefinedCommon *> getCommonSymbols() {
 
 // The main function of the writer.
 template <class ELFT> void Writer<ELFT>::run() {
+  createSyntheticSections();
   addReservedSymbols();
 
   if (Target->NeedsThunks)
@@ -284,6 +209,84 @@ template <class ELFT> void Writer<ELFT>::run() {
   }
 }
 
+// Initialize Out<ELFT> members.
+template <class ELFT> void Writer<ELFT>::createSyntheticSections() {
+  // Initialize all pointers with NULL. This is needed because
+  // you can call lld::elf::main more than once as a library.
+  memset(&Out<ELFT>::First, 0, sizeof(Out<ELFT>));
+
+  // Create singleton output sections.
+  Out<ELFT>::Bss =
+      make<OutputSection<ELFT>>(".bss", SHT_NOBITS, SHF_ALLOC | SHF_WRITE);
+  Out<ELFT>::Dynamic = make<DynamicSection<ELFT>>();
+  Out<ELFT>::EhFrame = make<EhOutputSection<ELFT>>();
+  Out<ELFT>::Got = make<GotSection<ELFT>>();
+  Out<ELFT>::Plt = make<PltSection<ELFT>>();
+  Out<ELFT>::RelaDyn = make<RelocationSection<ELFT>>(
+      Config->Rela ? ".rela.dyn" : ".rel.dyn", Config->ZCombreloc);
+  Out<ELFT>::ShStrTab = make<StringTableSection<ELFT>>(".shstrtab", false);
+  Out<ELFT>::VerSym = make<VersionTableSection<ELFT>>();
+  Out<ELFT>::VerNeed = make<VersionNeedSection<ELFT>>();
+
+  Out<ELFT>::ElfHeader = make<OutputSectionBase<ELFT>>("", 0, SHF_ALLOC);
+  Out<ELFT>::ElfHeader->setSize(sizeof(Elf_Ehdr));
+  Out<ELFT>::ProgramHeaders = make<OutputSectionBase<ELFT>>("", 0, SHF_ALLOC);
+  Out<ELFT>::ProgramHeaders->updateAlignment(sizeof(uintX_t));
+
+  if (needsInterpSection<ELFT>())
+    Out<ELFT>::Interp = make<InterpSection<ELFT>>();
+
+  if (!Symtab<ELFT>::X->getSharedFiles().empty() || Config->Pic) {
+    Out<ELFT>::DynStrTab = make<StringTableSection<ELFT>>(".dynstr", true);
+    Out<ELFT>::DynSymTab =
+        make<SymbolTableSection<ELFT>>(*Out<ELFT>::DynStrTab);
+  }
+
+  if (Config->EhFrameHdr)
+    Out<ELFT>::EhFrameHdr = make<EhFrameHeader<ELFT>>();
+
+  if (Config->GnuHash)
+    Out<ELFT>::GnuHashTab = make<GnuHashTableSection<ELFT>>();
+  if (Config->SysvHash)
+    Out<ELFT>::HashTab = make<HashTableSection<ELFT>>();
+  if (Config->GdbIndex)
+    Out<ELFT>::GdbIndex = make<GdbIndexSection<ELFT>>();
+
+  StringRef S = Config->Rela ? ".rela.plt" : ".rel.plt";
+  Out<ELFT>::GotPlt = make<GotPltSection<ELFT>>();
+  Out<ELFT>::RelaPlt = make<RelocationSection<ELFT>>(S, false /*Sort*/);
+  if (Config->Strip != StripPolicy::All) {
+    Out<ELFT>::StrTab = make<StringTableSection<ELFT>>(".strtab", false);
+    Out<ELFT>::SymTab = make<SymbolTableSection<ELFT>>(*Out<ELFT>::StrTab);
+  }
+
+  if (Config->EMachine == EM_MIPS && !Config->Shared) {
+    // This is a MIPS specific section to hold a space within the data segment
+    // of executable file which is pointed to by the DT_MIPS_RLD_MAP entry.
+    // See "Dynamic section" in Chapter 5 in the following document:
+    // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
+    Out<ELFT>::MipsRldMap = make<OutputSection<ELFT>>(".rld_map", SHT_PROGBITS,
+                                                      SHF_ALLOC | SHF_WRITE);
+    Out<ELFT>::MipsRldMap->setSize(sizeof(uintX_t));
+    Out<ELFT>::MipsRldMap->updateAlignment(sizeof(uintX_t));
+  }
+  if (!Config->VersionDefinitions.empty())
+    Out<ELFT>::VerDef = make<VersionDefinitionSection<ELFT>>();
+
+  // Initialize linker generated sections
+  if (Config->BuildId == BuildIdKind::Fast)
+    In<ELFT>::BuildId = make<BuildIdFastHash<ELFT>>();
+  else if (Config->BuildId == BuildIdKind::Md5)
+    In<ELFT>::BuildId = make<BuildIdMd5<ELFT>>();
+  else if (Config->BuildId == BuildIdKind::Sha1)
+    In<ELFT>::BuildId = make<BuildIdSha1<ELFT>>();
+  else if (Config->BuildId == BuildIdKind::Uuid)
+    In<ELFT>::BuildId = make<BuildIdUuid<ELFT>>();
+  else if (Config->BuildId == BuildIdKind::Hexstring)
+    In<ELFT>::BuildId = make<BuildIdHexstring<ELFT>>();
+  In<ELFT>::Sections = {In<ELFT>::BuildId};
+}
+
 template <class ELFT>
 static bool shouldKeepInSymtab(InputSectionBase<ELFT> *Sec, StringRef SymName,
                                const SymbolBody &B) {