3 files changed, 13 insertions, 13 deletions

diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
index 2ea9499bdbe..034b57ca7c3 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicLibraryWriter.h
@@ -45,14 +45,14 @@ protected:
 
 private:
   MipsELFWriter<ELFT> _writeHelper;
-  MipsTargetLayout<ELFT> &_mipsTargetLayout;
+  MipsTargetLayout<ELFT> &_targetLayout;
 };
 
 template <class ELFT>
 MipsDynamicLibraryWriter<ELFT>::MipsDynamicLibraryWriter(
     MipsLinkingContext &ctx, MipsTargetLayout<ELFT> &layout)
     : DynamicLibraryWriter<ELFT>(ctx, layout), _writeHelper(ctx, layout),
-      _mipsTargetLayout(layout) {}
+      _targetLayout(layout) {}
 
 template <class ELFT>
 bool MipsDynamicLibraryWriter<ELFT>::createImplicitFiles(
@@ -81,7 +81,7 @@ template <class ELFT>
 unique_bump_ptr<DynamicTable<ELFT>>
     MipsDynamicLibraryWriter<ELFT>::createDynamicTable() {
   return unique_bump_ptr<DynamicTable<ELFT>>(
-      new (this->_alloc) MipsDynamicTable<ELFT>(this->_ctx, _mipsTargetLayout));
+      new (this->_alloc) MipsDynamicTable<ELFT>(this->_ctx, _targetLayout));
 }
 
 /// \brief create dynamic symbol table
@@ -90,7 +90,7 @@ unique_bump_ptr<DynamicSymbolTable<ELFT>>
     MipsDynamicLibraryWriter<ELFT>::createDynamicSymbolTable() {
   return unique_bump_ptr<DynamicSymbolTable<ELFT>>(
       new (this->_alloc)
-          MipsDynamicSymbolTable<ELFT>(this->_ctx, _mipsTargetLayout));
+          MipsDynamicSymbolTable<ELFT>(this->_ctx, _targetLayout));
 }
 
 } // namespace elf
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicTable.h b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicTable.h
index 2b9562f42b5..0e2bc18f579 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicTable.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsDynamicTable.h
@@ -24,7 +24,7 @@ public:
                    MipsTargetLayout<MipsELFType> &layout)
       : DynamicTable<MipsELFType>(ctx, layout, ".dynamic",
                                   DefaultLayout<MipsELFType>::ORDER_DYNAMIC),
-        _mipsTargetLayout(layout) {}
+        _targetLayout(layout) {}
 
   void createDefaultEntries() override {
     DynamicTable<MipsELFType>::createDefaultEntries();
@@ -73,19 +73,19 @@ public:
 
     // Assign the minimum segment address to the DT_MIPS_BASE_ADDRESS tag.
     auto baseAddr = std::numeric_limits<uint64_t>::max();
-    for (auto si : _mipsTargetLayout.segments())
+    for (auto si : _targetLayout.segments())
       if (si->segmentType() != llvm::ELF::PT_NULL)
         baseAddr = std::min(baseAddr, si->virtualAddr());
     this->_entries[_dt_baseaddr].d_un.d_val = baseAddr;
 
-    auto &got = _mipsTargetLayout.getGOTSection();
+    auto &got = _targetLayout.getGOTSection();
 
     this->_entries[_dt_symtabno].d_un.d_val = this->getSymbolTable()->size();
     this->_entries[_dt_gotsym].d_un.d_val =
        this-> getSymbolTable()->size() - got.getGlobalCount();
     this->_entries[_dt_localgot].d_un.d_val = got.getLocalCount();
     this->_entries[_dt_pltgot].d_un.d_ptr =
-        _mipsTargetLayout.findOutputSection(".got")->virtualAddr();
+        _targetLayout.findOutputSection(".got")->virtualAddr();
   }
 
   int64_t getGotPltTag() override { return DT_MIPS_PLTGOT; }
@@ -106,7 +106,7 @@ private:
   std::size_t _dt_gotsym;
   std::size_t _dt_pltgot;
   std::size_t _dt_baseaddr;
-  MipsTargetLayout<MipsELFType> &_mipsTargetLayout;
+  MipsTargetLayout<MipsELFType> &_targetLayout;
 };
 
 } // end namespace elf
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h b/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h
index 73e00aca76e..0b0ed6dbca9 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsExecutableWriter.h
@@ -39,14 +39,14 @@ protected:
 
 private:
   MipsELFWriter<ELFT> _writeHelper;
-  MipsTargetLayout<ELFT> &_mipsTargetLayout;
+  MipsTargetLayout<ELFT> &_targetLayout;
 };
 
 template <class ELFT>
 MipsExecutableWriter<ELFT>::MipsExecutableWriter(MipsLinkingContext &ctx,
                                                  MipsTargetLayout<ELFT> &layout)
     : ExecutableWriter<ELFT>(ctx, layout), _writeHelper(ctx, layout),
-      _mipsTargetLayout(layout) {}
+      _targetLayout(layout) {}
 
 template <class ELFT>
 std::error_code MipsExecutableWriter<ELFT>::setELFHeader() {
@@ -134,7 +134,7 @@ template <class ELFT>
 unique_bump_ptr<DynamicTable<ELFT>>
     MipsExecutableWriter<ELFT>::createDynamicTable() {
   return unique_bump_ptr<DynamicTable<ELFT>>(
-      new (this->_alloc) MipsDynamicTable<ELFT>(this->_ctx, _mipsTargetLayout));
+      new (this->_alloc) MipsDynamicTable<ELFT>(this->_ctx, _targetLayout));
 }
 
 /// \brief create dynamic symbol table
@@ -143,7 +143,7 @@ unique_bump_ptr<DynamicSymbolTable<ELFT>>
     MipsExecutableWriter<ELFT>::createDynamicSymbolTable() {
   return unique_bump_ptr<DynamicSymbolTable<ELFT>>(
       new (this->_alloc)
-          MipsDynamicSymbolTable<ELFT>(this->_ctx, _mipsTargetLayout));
+          MipsDynamicSymbolTable<ELFT>(this->_ctx, _targetLayout));
 }
 
 } // namespace elf