From acef8081ec2ce5dc387ee55a04f75fb27ade94ec Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 21 Jan 2019 12:39:24 +0000 Subject: [PATCH] Fix spelling mistakes in BFD library. PR 24108 bfd * elf32-nds32.c (nds32_relocate_section): Add space between words in error message. * elfnn-riscv.c (riscv_version_mismatch): Fix spelling mistake in error message. (riscv_i_or_e_p): Likewise. (riscv_merge_arch_attr_info): Likewise. ld * testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d: Update expected error message. --- bfd/ChangeLog | 10 ++++++++++ bfd/elf32-nds32.c | 2 +- bfd/elfnn-riscv.c | 8 ++++---- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7f129c0bf27..0c06ee6161b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2019-01-21 Yuri Chornoivan + + PR 24108 + * elf32-nds32.c (nds32_relocate_section): Add space between words + in error message. + * elfnn-riscv.c (riscv_version_mismatch): Fix spelling mistake in + error message. + (riscv_i_or_e_p): Likewise. + (riscv_merge_arch_attr_info): Likewise. + 2019-01-19 Nick Clifton * version.m4: Reset to 2.32.51 diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c index b8a61471bd0..d9a429dcd50 100644 --- a/bfd/elf32-nds32.c +++ b/bfd/elf32-nds32.c @@ -5636,7 +5636,7 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, if (h->dynindx == -1) { _bfd_error_handler - (_("%pB: relocation %s against `%s' can not be used when" + (_("%pB: relocation %s against `%s' can not be used when " "making a shared object; recompile with -fPIC"), input_bfd, nds32_elf_howto_table[r_type].name, h->root.root.string); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 69cadaa28c1..0a0ceb79306 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -2708,7 +2708,7 @@ riscv_version_mismatch (bfd *ibfd, struct riscv_subset_t *out) { _bfd_error_handler - (_("error: %pB: Mis-matched ISA version for '%s' exetension. " + (_("error: %pB: Mis-matched ISA version for '%s' extension. " "%d.%d vs %d.%d"), ibfd, in->name, in->major_version, in->minor_version, @@ -2726,8 +2726,8 @@ riscv_i_or_e_p (bfd *ibfd, && (strcasecmp (subset->name, "i") != 0)) { _bfd_error_handler - (_("error: %pB: corrupted ISA string '%s'." - "first letter should be 'i' or 'e' but got '%s'."), + (_("error: %pB: corrupted ISA string '%s'. " + "First letter should be 'i' or 'e' but got '%s'."), ibfd, arch, subset->name); return FALSE; } @@ -2951,7 +2951,7 @@ riscv_merge_arch_attr_info (bfd *ibfd, char *in_arch, char *out_arch) if (xlen_in != ARCH_SIZE) { _bfd_error_handler - (_("error: %pB: Unspported XLEN (%u), you might" + (_("error: %pB: Unsupported XLEN (%u), you might be " "using wrong emulation."), ibfd, xlen_in); return NULL; } diff --git a/ld/ChangeLog b/ld/ChangeLog index 2b1b1e954f2..5db9f7c68e6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2019-01-21 Nick Clifton + + PR 24108 + * testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d: Update + expected error message. + 2019-01-19 Nick Clifton * configure: Regenerate. diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d b/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d index 564687d5f1b..c77f80b6bff 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d @@ -2,4 +2,4 @@ #source: attr-merge-arch-failed-01b.s #as: -march-attr #ld: -r -melf32lriscv -#error: Mis-matched ISA version for 'm' exetension. 3.0 vs 2.0 +#error: Mis-matched ISA version for 'm' extension. 3.0 vs 2.0 -- 2.30.2