Index: ELF/OutputSections.h
===================================================================
--- ELF/OutputSections.h
+++ ELF/OutputSections.h
@@ -481,11 +481,10 @@
   std::vector<FdeData> FdeList;
 };
 
-// All output sections that are hadnled by the linker specially are
+// All output sections that are handled by the linker specially are
 // globally accessible. Writer initializes them, so don't use them
 // until Writer is initialized.
 template <class ELFT> struct Out {
-  typedef typename llvm::object::ELFFile<ELFT>::uintX_t uintX_t;
   typedef typename llvm::object::ELFFile<ELFT>::Elf_Phdr Elf_Phdr;
   static DynamicSection<ELFT> *Dynamic;
   static EhFrameHeader<ELFT> *EhFrameHdr;
Index: ELF/Writer.cpp
===================================================================
--- ELF/Writer.cpp
+++ ELF/Writer.cpp
@@ -105,59 +105,60 @@
 template <class ELFT> static bool shouldUseRela() { return ELFT::Is64Bits; }
 
 template <class ELFT> void elf2::writeResult(SymbolTable<ELFT> *Symtab) {
-  // Initialize output sections that are handled by Writer specially.
-  // Don't reorder because the order of initialization matters.
+  // Create singleton output sections. Do not reorder because the order
+  // of initialization matters.
+  std::unique_ptr<StringTableSection<ELFT>> StrTab;
+  std::unique_ptr<GotPltSection<ELFT>> GotPlt;
+  std::unique_ptr<SymbolTableSection<ELFT>> SymTabSec;
+  std::unique_ptr<SymbolTableSection<ELFT>> DynSymTab;
+  std::unique_ptr<HashTableSection<ELFT>> HashTab;
+  std::unique_ptr<GnuHashTableSection<ELFT>> GnuHashTab;
+  std::unique_ptr<RelocationSection<ELFT>> RelaPlt;
+
   InterpSection<ELFT> Interp;
-  Out<ELFT>::Interp = &Interp;
   StringTableSection<ELFT> ShStrTab(".shstrtab", false);
-  Out<ELFT>::ShStrTab = &ShStrTab;
-  StringTableSection<ELFT> StrTab(".strtab", false);
   if (!Config->StripAll)
-    Out<ELFT>::StrTab = &StrTab;
-  else
-    Out<ELFT>::StrTab = nullptr;
+    StrTab.reset(new StringTableSection<ELFT>(".strtab", false));
   StringTableSection<ELFT> DynStrTab(".dynstr", true);
-  Out<ELFT>::DynStrTab = &DynStrTab;
   GotSection<ELFT> Got;
-  Out<ELFT>::Got = &Got;
-  GotPltSection<ELFT> GotPlt;
   if (Target->UseLazyBinding)
-    Out<ELFT>::GotPlt = &GotPlt;
-  else
-    Out<ELFT>::GotPlt = nullptr;
+    GotPlt.reset(new GotPltSection<ELFT>);
   PltSection<ELFT> Plt;
-  Out<ELFT>::Plt = &Plt;
-  std::unique_ptr<SymbolTableSection<ELFT>> SymTab;
-  if (!Config->StripAll) {
-    SymTab.reset(new SymbolTableSection<ELFT>(*Symtab, *Out<ELFT>::StrTab));
-    Out<ELFT>::SymTab = SymTab.get();
-  } else {
-    Out<ELFT>::SymTab = nullptr;
-  }
-  SymbolTableSection<ELFT> DynSymTab(*Symtab, *Out<ELFT>::DynStrTab);
-  Out<ELFT>::DynSymTab = &DynSymTab;
-  HashTableSection<ELFT> HashTab;
+  if (!Config->StripAll)
+    SymTabSec.reset(new SymbolTableSection<ELFT>(*Symtab, *StrTab));
+  DynSymTab.reset(new SymbolTableSection<ELFT>(*Symtab, DynStrTab));
   if (Config->SysvHash)
-    Out<ELFT>::HashTab = &HashTab;
-  else
-    Out<ELFT>::HashTab = nullptr;
-  GnuHashTableSection<ELFT> GnuHashTab;
+    HashTab.reset(new HashTableSection<ELFT>);
   if (Config->GnuHash)
-    Out<ELFT>::GnuHashTab = &GnuHashTab;
-  else
-    Out<ELFT>::GnuHashTab = nullptr;
+    GnuHashTab.reset(new GnuHashTableSection<ELFT>);
   bool IsRela = shouldUseRela<ELFT>();
   RelocationSection<ELFT> RelaDyn(IsRela ? ".rela.dyn" : ".rel.dyn", IsRela);
-  Out<ELFT>::RelaDyn = &RelaDyn;
-  RelocationSection<ELFT> RelaPlt(IsRela ? ".rela.plt" : ".rel.plt", IsRela);
   if (Target->UseLazyBinding)
-    Out<ELFT>::RelaPlt = &RelaPlt;
-  else
-    Out<ELFT>::RelaPlt = nullptr;
+    RelaPlt.reset(
+        new RelocationSection<ELFT>(IsRela ? ".rela.plt" : ".rel.plt", IsRela));
   DynamicSection<ELFT> Dynamic(*Symtab);
-  Out<ELFT>::Dynamic = &Dynamic;
   EhFrameHeader<ELFT> EhFrameHdr;
+
+  Out<ELFT>::Dynamic = &Dynamic;
   Out<ELFT>::EhFrameHdr = &EhFrameHdr;
+  Out<ELFT>::GnuHashTab = GnuHashTab.get();
+  Out<ELFT>::GotPlt = GotPlt.get();
+  Out<ELFT>::Got = &Got;
+  Out<ELFT>::HashTab = HashTab.get();
+  Out<ELFT>::Interp = &Interp;
+  Out<ELFT>::Plt = &Plt;
+  Out<ELFT>::RelaDyn = &RelaDyn;
+  Out<ELFT>::RelaPlt = RelaPlt.get();
+  Out<ELFT>::DynStrTab = &DynStrTab;
+  Out<ELFT>::ShStrTab = &ShStrTab;
+  Out<ELFT>::StrTab = StrTab.get();
+  Out<ELFT>::DynSymTab = DynSymTab.get();
+  Out<ELFT>::SymTab = SymTabSec.get();
+  Out<ELFT>::MipsRldMap = nullptr;
+  Out<ELFT>::Bss = nullptr;
+  Out<ELFT>::Opd = nullptr;
+  Out<ELFT>::OpdBuf = nullptr;
+  Out<ELFT>::TlsPhdr = nullptr;
 
   Writer<ELFT>(*Symtab).run();
 }