RISC-V: improve a subset parsing diagnostic

These sets can be long, so report the specific item along with the full
argument.

Reviewed-by: Jiawei <jiawei@iscas.ac.cn>

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 030f27da5d96758698ddf96e752c4843d8de8ff3..4b3b878d6c7afeea581acafa392babee06b2ec96 100644 (file)
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -2688,8 +2688,8 @@ riscv_update_subset1 (riscv_parse_subset_t *rps,
        {
          *q = '\0';
          rps->error_handler
-           (_("%sinvalid ISA extension ends with <number>p in %s `%s'"),
-              errmsg_internal, errmsg_caller, implicit_exts);
+           (_("%sinvalid ISA extension `%s' ends with <number>p in %s `%s'"),
+              errmsg_internal, subset, errmsg_caller, implicit_exts);
          free (subset);
          return false;
        }

diff --git a/gas/testsuite/gas/riscv/option-arch-fail.l b/gas/testsuite/gas/riscv/option-arch-fail.l
index 191f088c21b8f174fc33482f1aed712c0d89460e..4aa35dba8312f6dbf58042a40ec49b877ba9cc13 100644 (file)
--- a/gas/testsuite/gas/riscv/option-arch-fail.l
+++ b/gas/testsuite/gas/riscv/option-arch-fail.l
@@ -7,5 +7,5 @@
 .*Error: unknown ISA extension `zsubset' in .option arch `\+zsubset2p0'
 .*Error: unknown ISA extension `f2p0_d' in .option arch `\+f2p0_d2p0'
 .*Error: unknown ISA extension `' in .option arch `\+'
-.*Error: invalid ISA extension ends with <number>p in .option arch `\+xvendor2p'
+.*Error: invalid ISA extension `xvendor2p' ends with <number>p in .option arch `\+xvendor2p'
 .*Error: .option pop with no .option push