bfd/RISC-V: correct grammar of conflict diagnostics

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 83134f81c967afd7cd6c07db8f27da1bdc172e8b..341527b752f0a62b276bc4a6694e24ec07486592 100644 (file)
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -2245,14 +2245,14 @@ riscv_parse_check_conflicts (riscv_parse_subset_t *rps)
       && riscv_lookup_subset (rps->subset_list, "f", &subset))
     {
       rps->error_handler
-       (_("`zfinx' is conflict with the `f/d/q/zfh/zfhmin' extension"));
+       (_("`zfinx' conflicts with the `f/d/q/zfh/zfhmin' extension"));
       no_conflict = false;
     }
   if (riscv_lookup_subset (rps->subset_list, "xtheadvector", &subset)
       && riscv_lookup_subset (rps->subset_list, "zve32x", &subset))
     {
       rps->error_handler
-       (_("`xtheadvector' is conflict with the `v/zve32x' extension"));
+       (_("`xtheadvector' conflicts with the `v/zve32x' extension"));
       no_conflict = false;
     }
   if (riscv_lookup_subset (rps->subset_list, "zclsd", &subset)
@@ -2261,7 +2261,7 @@ riscv_parse_check_conflicts (riscv_parse_subset_t *rps)
          || riscv_lookup_subset (rps->subset_list, "zcf", &subset)))
     {
       rps->error_handler
-       (_("`zclsd' is conflict with the `c+f'/ `zcf' extension"));
+       (_("`zclsd' conflicts with the `c+f'/`zcf' extension"));
       no_conflict = false;
     }
   if (riscv_lookup_subset (rps->subset_list, "ssnpm", &subset) && xlen != 64)

diff --git a/gas/testsuite/gas/riscv/x-thead-vector-fail.l b/gas/testsuite/gas/riscv/x-thead-vector-fail.l
index 6b4d82810e3f3efc791f8f56ad9451c09a641a00..74ab8b13417a65eaa6b423c0a079063b7cb815e2 100644 (file)
--- a/gas/testsuite/gas/riscv/x-thead-vector-fail.l
+++ b/gas/testsuite/gas/riscv/x-thead-vector-fail.l
@@ -1,2 +1,2 @@
 Assembler messages:
-Error: `xtheadvector' is conflict with the `v/zve32x' extension
+Error: `xtheadvector' conflicts with the `v/zve32x' extension