Revert "[ELF] Rename MergedSection to OutputSection."

This reverts commit r222310.

Not sure which commit is the cause of the failure on the darwin bot. Will need
to revert my changes and commit one change at a time.

llvm-svn: 222330

1 files changed, 4 insertions, 3 deletions

diff --git a/lld/lib/ReaderWriter/ELF/HeaderChunks.h b/lld/lib/ReaderWriter/ELF/HeaderChunks.h
index d21aee377a9..62a4374d015 100644
--- a/lld/lib/ReaderWriter/ELF/HeaderChunks.h
+++ b/lld/lib/ReaderWriter/ELF/HeaderChunks.h
@@ -266,7 +266,7 @@ public:
 
   SectionHeader(const ELFLinkingContext &, int32_t order);
 
-  void appendSection(OutputSection<ELFT> *section);
+  void appendSection(MergedSections<ELFT> *section);
 
   void updateSection(Section<ELFT> *section);
 
@@ -317,8 +317,9 @@ SectionHeader<ELFT>::SectionHeader(const ELFLinkingContext &context,
   this->_fsize += sizeof (Elf_Shdr);
 }
 
-template <class ELFT>
-void SectionHeader<ELFT>::appendSection(OutputSection<ELFT> *section) {
+template<class ELFT>
+void
+SectionHeader<ELFT>::appendSection(MergedSections<ELFT> *section) {
   Elf_Shdr *shdr = new (_sectionAllocate.Allocate<Elf_Shdr>()) Elf_Shdr;
   shdr->sh_name   = _stringSection->addString(section->name());
   shdr->sh_type   = section->type();