[Mips] Support writing .MIPS.options section into the linked file

In case of MIPS N64 ABI linker should merge registers usage masks stored
in the input .MIPS.options sections and save result into the output
.MIPS.options section.

llvm-svn: 234115

1 files changed, 10 insertions, 7 deletions

diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
index a72a467b808..e67144275ea 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
@@ -75,14 +75,17 @@ void MipsDynamicLibraryWriter<ELFT>::finalizeDefaultAtomValues() {
 template <class ELFT>
 void MipsDynamicLibraryWriter<ELFT>::createDefaultSections() {
   DynamicLibraryWriter<ELFT>::createDefaultSections();
-  const auto &mask =
-      static_cast<const MipsLinkingContext &>(this->_ctx).getMergeReginfoMask();
-  if (!ELFT::Is64Bits && mask.hasValue()) {
+  const auto &ctx = static_cast<const MipsLinkingContext &>(this->_ctx);
+  const auto &mask = ctx.getMergeReginfoMask();
+  if (!mask.hasValue())
+    return;
+  if (ELFT::Is64Bits)
     _reginfo = unique_bump_ptr<Section<ELFT>>(
-        new (this->_alloc)
-            MipsReginfoSection<ELFT>(this->_ctx, _targetLayout, *mask));
-    this->_layout.addSection(_reginfo.get());
-  }
+        new (this->_alloc) MipsOptionsSection<ELFT>(ctx, _targetLayout, *mask));
+  else
+    _reginfo = unique_bump_ptr<Section<ELFT>>(
+        new (this->_alloc) MipsReginfoSection<ELFT>(ctx, _targetLayout, *mask));
+  this->_layout.addSection(_reginfo.get());
 }
 
 template <class ELFT>