[lld] 1ca00ec - [NFC][lld] Inclusive language: change master file to merged file

[Quinn Pham via llvm-commits]

Author: Quinn Pham
Date: 2021-11-15T14:32:09-06:00
New Revision: 1ca00ecfb8f65cabef49bc823892c3e0aebcae97

URL: https://github.com/llvm/llvm-project/commit/1ca00ecfb8f65cabef49bc823892c3e0aebcae97
DIFF: https://github.com/llvm/llvm-project/commit/1ca00ecfb8f65cabef49bc823892c3e0aebcae97.diff

LOG: [NFC][lld] Inclusive language: change master file to merged file

[NFC] As part of using inclusive language within the llvm project, this patch
replaces master with merged in these comments.

Reviewed By: #lld-macho, thakis

Differential Revision: https://reviews.llvm.org/D113903

Added: 
    

Modified: 
    lld/lib/ReaderWriter/MachO/GOTPass.cpp
    lld/lib/ReaderWriter/MachO/ShimPass.cpp

Removed: 
    


################################################################################
diff  --git a/lld/lib/ReaderWriter/MachO/GOTPass.cpp b/lld/lib/ReaderWriter/MachO/GOTPass.cpp
index 10e611c1bd2b4..9cb5ab5eab120 100644
--- a/lld/lib/ReaderWriter/MachO/GOTPass.cpp
+++ b/lld/lib/ReaderWriter/MachO/GOTPass.cpp
@@ -121,7 +121,7 @@ class GOTPass : public Pass {
       }
     }
 
-    // Sort and add all created GOT Atoms to master file
+    // Sort and add all created GOT Atoms to merged file
     std::vector<const GOTEntryAtom *> entries;
     entries.reserve(_targetToGOT.size());
     for (auto &it : _targetToGOT)

diff  --git a/lld/lib/ReaderWriter/MachO/ShimPass.cpp b/lld/lib/ReaderWriter/MachO/ShimPass.cpp
index a5b34cfe8de61..4c62ef9d330f2 100644
--- a/lld/lib/ReaderWriter/MachO/ShimPass.cpp
+++ b/lld/lib/ReaderWriter/MachO/ShimPass.cpp
@@ -78,7 +78,7 @@ class ShimPass : public Pass {
                 return (l->name() < r->name());
               });
 
-    // Add all shims to master file.
+    // Add all shims to merged file.
     for (const DefinedAtom *shim : shims)
       mergedFile.addAtom(*shim);