From 72bd6912ea38224481f8bd0ed13b751e0fda4683 Mon Sep 17 00:00:00 2001 From: Kito Cheng Date: Mon, 6 Jul 2020 19:30:36 -0700 Subject: RISC-V: Improve the error message for the mis-matched ISA versions. Consider the updated attr-merge-arch-failed-01.d testcase. Extension A's version are mis-matched between attr-merge-arch-failed-01a.s and attr-merge-arch-failed-01b.s. But the old binutils reports that the mis-matched extension is M rather than A. This commit is used to fix the wrong mis-matched error message. Besides, when parsing the arch string in the riscv_parse_subset, it shouldn't be NULL or empty. However, it might be empty when we failed to merge the arch string in the riscv_merge_attributes. Since we should already issue the correct error message in another side, and the message - ISA string must begin with rv32 or rv64 - is meaninglesss when the arch string is empty, so do not issue it. bfd/ * elfnn-riscv.c (riscv_merge_std_ext): Fix to report the correct error message when the versions of extension are mis-matched. * elfxx-riscv.c (riscv_parse_subset): Don't issue the error when the string is empty. ld/ * testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d: Updated. * testsuite/ld-riscv-elf/attr-merge-arch-failed-01a.s: Likewise. * testsuite/ld-riscv-elf/attr-merge-arch-failed-01b.s: Likewise. --- bfd/elfnn-riscv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bfd/elfnn-riscv.c') diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 8a3338c..f8de719 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -2724,7 +2724,7 @@ riscv_merge_std_ext (bfd *ibfd, && ((find_in->major_version != find_out->major_version) || (find_in->minor_version != find_out->minor_version))) { - riscv_version_mismatch (ibfd, in, out); + riscv_version_mismatch (ibfd, find_in, find_out); return FALSE; } -- cgit v1.1