[lld] r234116 - [Mips] Rename MipsLinkingContext class method

[Simon Atanasyan]

Author: atanasyan
Date: Sun Apr  5 04:01:53 2015
New Revision: 234116

URL: http://llvm.org/viewvc/llvm-project?rev=234116&view=rev
Log:
[Mips] Rename MipsLinkingContext class method

getMergeReginfoMask => getMergedReginfoMask

Modified:
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h?rev=234116&r1=234115&r2=234116&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h Sun Apr  5 04:01:53 2015
@@ -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)

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h?rev=234116&r1=234115&r2=234116&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h Sun Apr  5 04:01:53 2015
@@ -127,7 +127,7 @@ void MipsExecutableWriter<ELFT>::finaliz
 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)

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp?rev=234116&r1=234115&r2=234116&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp Sun Apr  5 04:01:53 2015
@@ -59,7 +59,7 @@ uint32_t MipsLinkingContext::getMergedEL
 }
 
 const llvm::Optional<MipsReginfo> &
-MipsLinkingContext::getMergeReginfoMask() const {
+MipsLinkingContext::getMergedReginfoMask() const {
   return _reginfoMask;
 }
 

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h?rev=234116&r1=234115&r2=234116&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h Sun Apr  5 04:01:53 2015
@@ -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;