Skip to content

Commit

Permalink
[NFC][lld] Inclusive language: change master file to merged file
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
Quinn Pham authored and Quinn Pham committed Nov 15, 2021
1 parent f17404a commit 1ca00ec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lld/lib/ReaderWriter/MachO/GOTPass.cpp
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lld/lib/ReaderWriter/MachO/ShimPass.cpp
Expand Up @@ -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);

Expand Down

0 comments on commit 1ca00ec

Please sign in to comment.