From efc006b573cea9d01b810c18877cd9e2a6efa605 Mon Sep 17 00:00:00 2001
From: Simon Atanasyan <simon@atanasyan.com>
Date: Sun, 5 Apr 2015 09:01:53 +0000
Subject: [PATCH] [Mips] Rename MipsLinkingContext class method

getMergeReginfoMask => getMergedReginfoMask

llvm-svn: 234116
---
 lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h | 2 +-
 lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h     | 2 +-
 lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp     | 2 +-
 lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
index e671442..831d82f 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
@@ -76,7 +76,7 @@ template <class ELFT>
 void MipsDynamicLibraryWriter<ELFT>::createDefaultSections() {
   DynamicLibraryWriter<ELFT>::createDefaultSections();
   const auto &ctx = static_cast<const MipsLinkingContext &>(this->_ctx);
-  const auto &mask = ctx.getMergeReginfoMask();
+  const auto &mask = ctx.getMergedReginfoMask();
   if (!mask.hasValue())
     return;
   if (ELFT::Is64Bits)
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h
index 0f89213..8cc1285 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h
@@ -127,7 +127,7 @@ void MipsExecutableWriter<ELFT>::finalizeDefaultAtomValues() {
 template <class ELFT> void MipsExecutableWriter<ELFT>::createDefaultSections() {
   ExecutableWriter<ELFT>::createDefaultSections();
   const auto &ctx = static_cast<const MipsLinkingContext &>(this->_ctx);
-  const auto &mask = ctx.getMergeReginfoMask();
+  const auto &mask = ctx.getMergedReginfoMask();
   if (!mask.hasValue())
     return;
   if (ELFT::Is64Bits)
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
index fcbd724..4cb06ab 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
@@ -59,7 +59,7 @@ uint32_t MipsLinkingContext::getMergedELFFlags() const {
 }
 
 const llvm::Optional<MipsReginfo> &
-MipsLinkingContext::getMergeReginfoMask() const {
+MipsLinkingContext::getMergedReginfoMask() const {
   return _reginfoMask;
 }
 
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
index d77ba25..8bcade4 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
@@ -50,7 +50,7 @@ public:
   void mergeReginfoMask(const MipsReginfo &info);
 
   uint32_t getMergedELFFlags() const;
-  const llvm::Optional<MipsReginfo> &getMergeReginfoMask() const;
+  const llvm::Optional<MipsReginfo> &getMergedReginfoMask() const;
 
   void registerRelocationNames(Registry &r) override;
 
-- 
2.7.4