xtensa message pluralization

	* config/tc-xtensa.c (finish_vinsn): Properly pluralize error message.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 80e9ea751cf3cbec8ec03a31d9e49e98810a019b..c13f9b164b85cd6d54a717d473b038520ca93157 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-08  Alan Modra  <amodra@gmail.com>
+
+       * config/tc-xtensa.c (finish_vinsn): Properly pluralize error message.
+
 2017-11-07  Jim Wilson  <jimw@sifive.com>
 
        * config/tc-riscv.c (append_insn): Call frag_wane and frag_new at

diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index a73abd08ed540b04613d2ac0871aca8500c89081..3fe85d2ec09d2e74f4f7915a2358bbcdba90e36c 100644 (file)
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -6358,10 +6358,20 @@ finish_vinsn (vliw_insn *vinsn)
   if (vinsn->num_slots
       != xtensa_format_num_slots (xtensa_default_isa, vinsn->format))
     {
-      as_bad (_("format '%s' allows %d slots, but there are %d opcodes"),
-             xtensa_format_name (xtensa_default_isa, vinsn->format),
-             xtensa_format_num_slots (xtensa_default_isa, vinsn->format),
-             vinsn->num_slots);
+      char *msg;
+      int slots = xtensa_format_num_slots (xtensa_default_isa, vinsn->format);
+
+      msg = concat (ngettext ("format '%s' allows %d slot, ",
+                             "format '%s' allows %d slots, ",
+                             slots),
+                   ngettext ("but there is %d opcode",
+                             "but there are %d opcodes",
+                             vinsn->num_slots),
+                   (const char *) 0);
+
+      as_bad (msg, xtensa_format_name (xtensa_default_isa, vinsn->format),
+             slots, vinsn->num_slots);
+      free (msg);
       xg_clear_vinsn (vinsn);
       return;
     }