[binutils-gdb] bfd/RISC-V: correct grammar of conflict diagnostics

[Jan Beulich]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e7aff03e3d45c35a18638a27b8a4069fc0e1c4b9

commit e7aff03e3d45c35a18638a27b8a4069fc0e1c4b9
Author: Jan Beulich <jbeulich@suse.com>
Date:   Fri May 15 09:46:36 2026 +0200

    bfd/RISC-V: correct grammar of conflict diagnostics

Diff:
---
 bfd/elfxx-riscv.c                             | 6 +++---
 gas/testsuite/gas/riscv/x-thead-vector-fail.l | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 83134f81c96..341527b752f 100644
--- 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 6b4d82810e3..74ab8b13417 100644
--- 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