aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/readelf.c2
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/emultempl/z80elf.em2
-rw-r--r--ld/ldlang.c2
5 files changed, 14 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4953eba..72bbe59 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-22 Yuri Chornoivan <yurchor@mageia.org>
+
+ PR 25417
+ * readelf.c (get_alpha_symbol_other): Fix error message typo.
+
2020-01-20 Nick Clifton <nickc@redhat.com>
* po/pt.po: Updated Portuguese translation.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 6b5bebe..4dcac96 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 _("<unknown>");
}
}
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 369ffee..d8949bb 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-22 Yuri Chornoivan <yurchor@mageia.org>
+
+ 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 <hongjiu.lu@intel.com>
* testsuite/ld-elf/pr23900-1.d: Adjusted.
diff --git a/ld/emultempl/z80elf.em b/ld/emultempl/z80elf.em
index 7a55fff..4b03e79 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 e100c05..91c160b 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)