Move clearOutputSections earlier. NFC.

This is finally getting to the point where output sections are
constructed.

createOrphanCommands and fabricateDefaultCommands are moved out so
they can be merged with existing code in followup commits.

llvm-svn: 307107

1 files changed, 3 insertions, 6 deletions

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index f790ccfca56..bc5f7676b99 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -152,10 +152,6 @@ template <class ELFT> static void combineEhFrameSections() {
 }
 
 template <class ELFT> void Writer<ELFT>::clearOutputSections() {
-  if (Script->Opt.HasSections)
-    Script->createOrphanCommands();
-  else
-    Script->fabricateDefaultCommands();
   // Clear the OutputSections to make sure it is not used anymore. Any
   // code from this point on should be using the linker script
   // commands.
@@ -185,6 +181,7 @@ template <class ELFT> void Writer<ELFT>::run() {
     // Linker scripts may have left some input sections unassigned.
     // Assign such sections using the default rule.
     Script->addOrphanSections(Factory);
+    Script->createOrphanCommands();
   } else {
     // If linker script does not contain SECTIONS commands, create
     // output sections by default rules. We still need to give the
@@ -192,13 +189,13 @@ template <class ELFT> void Writer<ELFT>::run() {
     // non-SECTIONS commands such as ASSERT.
     createSections();
     Script->processCommands(Factory);
+    Script->fabricateDefaultCommands();
   }
+  clearOutputSections();
 
   if (Config->Discard != DiscardPolicy::All)
     copyLocalSymbols();
 
-  clearOutputSections();
-
   if (Config->CopyRelocs)
     addSectionSymbols();