3 files changed, 20 insertions, 2 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsSectionChunks.h b/lld/lib/ReaderWriter/ELF/Mips/MipsSectionChunks.h
index cb5d612fed6..9d3040701f7 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsSectionChunks.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsSectionChunks.h
@@ -26,7 +26,7 @@ public:
                      const MipsReginfo &reginfo)
       : Section<ELFT>(ctx, ".reginfo", "MipsReginfo"),
         _targetLayout(targetLayout) {
-    this->setOrder(MipsTargetLayout<ELFT>::ORDER_RO_NOTE);
+    this->setOrder(MipsTargetLayout<ELFT>::ORDER_MIPS_REGINFO);
     this->_entSize = sizeof(Elf_RegInfo);
     this->_fsize = sizeof(Elf_RegInfo);
     this->_msize = sizeof(Elf_RegInfo);
@@ -42,6 +42,10 @@ public:
     _reginfo.ri_cprmask[3] = reginfo._cpRegMask[3];
   }
 
+  StringRef segmentKindToStr() const override { return "REGINFO"; }
+
+  bool hasOutputSegment() const override { return true; }
+
   void write(ELFWriter *writer, TargetLayout<ELFT> &layout,
              llvm::FileOutputBuffer &buffer) override {
     uint8_t *dest = buffer.getBufferStart() + this->fileOffset();
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsTargetLayout.h b/lld/lib/ReaderWriter/ELF/Mips/MipsTargetLayout.h
index 5d283488cc7..3fc8ba7a51d 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsTargetLayout.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsTargetLayout.h
@@ -20,6 +20,10 @@ class MipsLinkingContext;
 /// \brief TargetLayout for Mips
 template <class ELFT> class MipsTargetLayout final : public TargetLayout<ELFT> {
 public:
+  enum MipsSectionOrder {
+    ORDER_MIPS_REGINFO = TargetLayout<ELFT>::ORDER_RO_NOTE + 1
+  };
+
   MipsTargetLayout(MipsLinkingContext &ctx)
       : TargetLayout<ELFT>(ctx),
         _gotSection(new (this->_allocator) MipsGOTSection<ELFT>(ctx)),
@@ -39,6 +43,16 @@ public:
     return TargetLayout<ELFT>::createSection(name, type, permissions, order);
   }
 
+  typename TargetLayout<ELFT>::SegmentType
+  getSegmentType(Section<ELFT> *section) const override {
+    switch (section->order()) {
+    case ORDER_MIPS_REGINFO:
+      return llvm::ELF::PT_MIPS_REGINFO;
+    default:
+      return TargetLayout<ELFT>::getSegmentType(section);
+    }
+  }
+
   /// \brief GP offset relative to .got section.
   uint64_t getGPOffset() const { return 0x7FF0; }
 
diff --git a/lld/lib/ReaderWriter/ELF/SectionChunks.h b/lld/lib/ReaderWriter/ELF/SectionChunks.h
index 7b78e265cd7..2c8fe280a5e 100644
--- a/lld/lib/ReaderWriter/ELF/SectionChunks.h
+++ b/lld/lib/ReaderWriter/ELF/SectionChunks.h
@@ -73,7 +73,7 @@ public:
 
   /// \brief convert the segment type to a String for diagnostics and printing
   /// purposes
-  StringRef segmentKindToStr() const;
+  virtual StringRef segmentKindToStr() const;
 
   /// \brief Records the segmentType, that this section belongs to
   void