diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-28 04:55:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-28 04:55:37 +0000 |
| commit | 4b1a1d398b532378a04ae2e2d081ce6b8fca5358 (patch) | |
| tree | 39634141bb54bbb370ff2977298294da33b1da8c | |
| parent | 421a708b572656a0e9013aa5e63bfb4176bf244d (diff) | |
| parent | c9328b7e6e6f537c26fb2d5bc93433efe0f76bf6 (diff) | |
| download | mclinker-4b1a1d398b532378a04ae2e2d081ce6b8fca5358.tar.gz | |
Merge "Update language to comply with Android's inclusive language guidance" am: a4d0f51e53 am: abbecb888a am: c9328b7e6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1373943
Change-Id: I8e9155d24a9c78a50579256ba689f97f04712510
| -rw-r--r-- | include/mcld/IRBuilder.h | 3 | ||||
| -rw-r--r-- | unittests/test3.txt | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/mcld/IRBuilder.h b/include/mcld/IRBuilder.h index e613dac..9dfb269 100644 --- a/include/mcld/IRBuilder.h +++ b/include/mcld/IRBuilder.h @@ -417,8 +417,7 @@ class IRBuilder { /// /// - Unresolve /// - Forcefully override the symbol in mcld::Module. With this - /// argument, AddSymbol function turns a blind eye to symbol - /// resolution rules. + /// argument, AddSymbol function ignores symbol resolution rules. /// /// @param [in] pName The name of the symbol /// @param [in] pType The type of the symbol diff --git a/unittests/test3.txt b/unittests/test3.txt index 0b4a379..02ee3fb 100644 --- a/unittests/test3.txt +++ b/unittests/test3.txt @@ -165,7 +165,7 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex $(MAKE) distclean # Kludge for pr gdb/857. intl/Makefile.in lacks a couple # of files in the distclean rule. Zack W is planning to make - # the gcc version of intl/ the master version and then push + # the gcc version of intl/ the primary version and then push # that version to src soon. See: # http://sources.redhat.com/ml/binutils/2003-07/msg00032.html # After the src version of intl/ is upgraded, we can look at |