commit 64256b53af145a1afff6774767dcfbb0dbb891a1
author Quinn Pham <Quinn.Pham@ibm.com> Mon Nov 15 09:54:41 2021 -0600
committer Copybara-Service <copybara-worker@google.com> Mon Nov 15 12:36:08 2021 -0800
tree d36819daba6e46c606734359e7cb3f62dc9abfc1
parent 2db635096bfbf7ff80f32bf6781885142d91c585

[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

GitOrigin-RevId: 1ca00ecfb8f65cabef49bc823892c3e0aebcae97

lib/ReaderWriter/MachO/GOTPass.cpp

diff --git a/lib/ReaderWriter/MachO/GOTPass.cpp b/lib/ReaderWriter/MachO/GOTPass.cpp
index 10e611c..9cb5ab5 100644
--- a/lib/ReaderWriter/MachO/GOTPass.cpp
+++ b/lib/ReaderWriter/MachO/GOTPass.cpp
@@ -121,7 +121,7 @@
       }
     }
 
-    // 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)

lib/ReaderWriter/MachO/ShimPass.cpp

diff --git a/lib/ReaderWriter/MachO/ShimPass.cpp b/lib/ReaderWriter/MachO/ShimPass.cpp
index a5b34cf..4c62ef9 100644
--- a/lib/ReaderWriter/MachO/ShimPass.cpp
+++ b/lib/ReaderWriter/MachO/ShimPass.cpp
@@ -78,7 +78,7 @@
                 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);