diff options
| author | Eric Christopher <echristo@gmail.com> | 2017-06-15 18:46:17 -0700 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2017-06-21 16:22:37 -0700 |
| commit | 785bf16bde29835cbe22c845bb3df5d94151125e (patch) | |
| tree | 2b42818f62ddba20c9358130241556488ee34ec6 | |
| parent | af417045260d4eee267e2252ceff7b012f5157b8 (diff) | |
| download | binutils-gdb-785bf16bde29835cbe22c845bb3df5d94151125e.tar.gz | |
2017-06-21 Eric Christopher <echristo@gmail.com>
Apply from master
2017-06-15 Eric Christopher <echristo@gmail.com>
* aarch64.cc: Fix a few typos and grammar-os.
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/aarch64.cc | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index ba8223c07c1..3a2b3f3e93a 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,6 +1,13 @@ 2017-06-21 Eric Christopher <echristo@gmail.com> Apply from master + 2017-06-15 Eric Christopher <echristo@gmail.com> + + * aarch64.cc: Fix a few typos and grammar-os. + +2017-06-21 Eric Christopher <echristo@gmail.com> + + Apply from master 2017-06-07 Eric Christopher <echristo@gmail.com> * aarch64.cc (maybe_apply_stub): Add debug logging for looking diff --git a/gold/aarch64.cc b/gold/aarch64.cc index 52339bbf3fd..9d4ea5068f3 100644 --- a/gold/aarch64.cc +++ b/gold/aarch64.cc @@ -920,7 +920,7 @@ private: // Erratum stub class. An erratum stub differs from a reloc stub in that for // each erratum occurrence, we generate an erratum stub. We never share erratum -// stubs, whereas for reloc stubs, different branches insns share a single reloc +// stubs, whereas for reloc stubs, different branch insns share a single reloc // stub as long as the branch targets are the same. (More to the point, reloc // stubs can be shared because they're used to reach a specific target, whereas // erratum stubs branch back to the original control flow.) @@ -3740,7 +3740,8 @@ Target_aarch64<size, big_endian>::scan_reloc_for_stub( } else if (gsym->is_undefined()) { - // There is no need to generate a stub symbol is undefined. + // There is no need to generate a stub symbol if the original symbol + // is undefined. gold_debug(DEBUG_TARGET, "stub: not creating a stub for undefined symbol %s in file %s", gsym->name(), aarch64_relobj->name().c_str()); @@ -7702,8 +7703,8 @@ Target_aarch64<size, big_endian>::Relocate::tls_ld_to_le( { // Ideally we should give up gd_to_le relaxation and do gd access. // However the gd_to_le relaxation decision has been made early - // in the scan stage, where we did not allocate any GOT entry for - // this symbol. Therefore we have to exit and report error now. + // in the scan stage, where we did not allocate a GOT entry for + // this symbol. Therefore we have to exit and report an error now. gold_error(_("unexpected reloc insn sequence while relaxing " "tls gd to le for reloc %u."), r_type); return aarch64_reloc_funcs::STATUS_BAD_RELOC; |