From c48acf6f26713427fb6870a8551a89ac12838e7b Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 19 Jan 2020 16:24:06 +0200 Subject: [PATCH] PR25417, Fix minor typos PR 25417 binutils/ * readelf.c (get_alpha_symbol_other): Fix error message typo. ld/ * ldlang.c (ldlang_open_ctf): Fix error message typo. * emultempl/z80elf.em (z80_elf_after_open): Likewise. --- binutils/ChangeLog | 5 +++++ binutils/readelf.c | 2 +- ld/ChangeLog | 6 ++++++ ld/emultempl/z80elf.em | 2 +- ld/ldlang.c | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 4953ebaa602..72bbe59f230 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2020-01-22 Yuri Chornoivan + + PR 25417 + * readelf.c (get_alpha_symbol_other): Fix error message typo. + 2020-01-20 Nick Clifton * po/pt.po: Updated Portuguese translation. diff --git a/binutils/readelf.c b/binutils/readelf.c index 6b5bebe743f..4dcac968ddf 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -11189,7 +11189,7 @@ get_alpha_symbol_other (unsigned int other) case STO_ALPHA_NOPV: return "NOPV"; case STO_ALPHA_STD_GPLOAD: return "STD GPLOAD"; default: - error (_("Unrecognized alpah specific other value: %u"), other); + error (_("Unrecognized alpha specific other value: %u"), other); return _(""); } } diff --git a/ld/ChangeLog b/ld/ChangeLog index 369ffee04ad..d8949bbc387 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2020-01-22 Yuri Chornoivan + + PR 25417 + * ldlang.c (ldlang_open_ctf): Fix error message typo. + * emultempl/z80elf.em (z80_elf_after_open): Likewise. + 2020-01-21 H.J. Lu * testsuite/ld-elf/pr23900-1.d: Adjusted. diff --git a/ld/emultempl/z80elf.em b/ld/emultempl/z80elf.em index 7a55fff9218..4b03e798d1b 100644 --- a/ld/emultempl/z80elf.em +++ b/ld/emultempl/z80elf.em @@ -48,7 +48,7 @@ z80_elf_after_open (void) { if ((new_mach == EF_Z80_MACH_R800 || mach == EF_Z80_MACH_R800) || (new_mach == EF_Z80_MACH_GBZ80 || mach == EF_Z80_MACH_GBZ80)) - einfo (_("%F%P: %pB: Istruction set of object files mismatched\n"), + einfo (_("%F%P: %pB: Instruction set of object files mismatched\n"), abfd); else if (mach < new_mach) mach = new_mach; diff --git a/ld/ldlang.c b/ld/ldlang.c index e100c0533cf..91c160b5604 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -3659,7 +3659,7 @@ ldlang_open_ctf (void) if ((ctf_output = ctf_create (&err)) != NULL) return; - einfo (_("%P: warning: CTF output not created: `s'\n"), + einfo (_("%P: warning: CTF output not created: `%s'\n"), ctf_errmsg (err)); LANG_FOR_EACH_INPUT_STATEMENT (errfile) -- 2.30.2