Index: lld/ELF/SyntheticSections.h
===================================================================
--- lld/ELF/SyntheticSections.h
+++ lld/ELF/SyntheticSections.h
@@ -707,22 +707,6 @@
   size_t ShardOffsets[NumShards];
 };
 
-// .MIPS.abiflags section.
-template <class ELFT>
-class MipsAbiFlagsSection final : public SyntheticSection {
-  typedef llvm::object::Elf_Mips_ABIFlags<ELFT> Elf_Mips_ABIFlags;
-
-public:
-  static MipsAbiFlagsSection *create();
-
-  MipsAbiFlagsSection(Elf_Mips_ABIFlags Flags);
-  size_t getSize() const override { return sizeof(Elf_Mips_ABIFlags); }
-  void writeTo(uint8_t *Buf) override;
-
-private:
-  Elf_Mips_ABIFlags Flags;
-};
-
 // .MIPS.options section.
 template <class ELFT> class MipsOptionsSection final : public SyntheticSection {
   typedef llvm::object::Elf_Mips_Options<ELFT> Elf_Mips_Options;
@@ -799,6 +783,7 @@
 template <class ELFT> void createCommonSections();
 InputSection *createInterpSection();
 template <class ELFT> MergeInputSection *createCommentSection();
+template <class ELFT> InputSection *createMipsAbiFlagsSection();
 void decompressSections();
 void mergeSections();
 
Index: lld/ELF/SyntheticSections.cpp
===================================================================
--- lld/ELF/SyntheticSections.cpp
+++ lld/ELF/SyntheticSections.cpp
@@ -112,19 +112,9 @@
 }
 
 // .MIPS.abiflags section.
-template <class ELFT>
-MipsAbiFlagsSection<ELFT>::MipsAbiFlagsSection(Elf_Mips_ABIFlags Flags)
-    : SyntheticSection(SHF_ALLOC, SHT_MIPS_ABIFLAGS, 8, ".MIPS.abiflags"),
-      Flags(Flags) {
-  this->Entsize = sizeof(Elf_Mips_ABIFlags);
-}
-
-template <class ELFT> void MipsAbiFlagsSection<ELFT>::writeTo(uint8_t *Buf) {
-  memcpy(Buf, &Flags, sizeof(Flags));
-}
+template <class ELFT> InputSection *elf::createMipsAbiFlagsSection() {
+  typedef llvm::object::Elf_Mips_ABIFlags<ELFT> Elf_Mips_ABIFlags;
 
-template <class ELFT>
-MipsAbiFlagsSection<ELFT> *MipsAbiFlagsSection<ELFT>::create() {
   Elf_Mips_ABIFlags Flags = {};
   bool Create = false;
 
@@ -165,9 +155,17 @@
     Flags.fp_abi = elf::getMipsFpAbiFlag(Flags.fp_abi, S->fp_abi, Filename);
   };
 
-  if (Create)
-    return make<MipsAbiFlagsSection<ELFT>>(Flags);
-  return nullptr;
+  if (!Create)
+    return nullptr;
+
+  auto *Buf = make<std::vector<uint8_t>>(sizeof(Flags));
+  memcpy(Buf->data(), &Flags, sizeof(Flags));
+
+  auto *Ret = make<InputSection>(SHF_ALLOC, SHT_MIPS_ABIFLAGS, 8, *Buf,
+                                 ".MIPS.abiflags");
+  Ret->Entsize = sizeof(Flags);
+  Ret->Live = true;
+  return Ret;
 }
 
 // .MIPS.options section.
@@ -2441,10 +2439,10 @@
 template MergeInputSection *elf::createCommentSection<ELF64LE>();
 template MergeInputSection *elf::createCommentSection<ELF64BE>();
 
-template class elf::MipsAbiFlagsSection<ELF32LE>;
-template class elf::MipsAbiFlagsSection<ELF32BE>;
-template class elf::MipsAbiFlagsSection<ELF64LE>;
-template class elf::MipsAbiFlagsSection<ELF64BE>;
+template InputSection *elf::createMipsAbiFlagsSection<ELF32LE>();
+template InputSection *elf::createMipsAbiFlagsSection<ELF32BE>();
+template InputSection *elf::createMipsAbiFlagsSection<ELF64LE>();
+template InputSection *elf::createMipsAbiFlagsSection<ELF64BE>();
 
 template class elf::MipsOptionsSection<ELF32LE>;
 template class elf::MipsOptionsSection<ELF32BE>;
Index: lld/ELF/Writer.cpp
===================================================================
--- lld/ELF/Writer.cpp
+++ lld/ELF/Writer.cpp
@@ -295,7 +295,7 @@
       InX::MipsRldMap = make<MipsRldMapSection>();
       Add(InX::MipsRldMap);
     }
-    if (auto *Sec = MipsAbiFlagsSection<ELFT>::create())
+    if (auto *Sec = createMipsAbiFlagsSection<ELFT>())
       Add(Sec);
     if (auto *Sec = MipsOptionsSection<ELFT>::create())
       Add(Sec);