MIPS/GAS: Unify messages in `mips_check_options'

	gas/
	* config/tc-mips.c (mips_check_options): Unify messages.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2ce9a43819c924226f7a9cbeb7f58faee44e4a53..afdcb2b1b503ba2582c9fbd0de32bdc48787ed77 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-09  Maciej W. Rozycki  <macro@imgtec.com>
+
+       * config/tc-mips.c (mips_check_options): Unify messages.
+
 2016-04-09  Maciej W. Rozycki  <macro@imgtec.com>
 
        * config/tc-mips.c (mips_check_options): Use `opts->isa'

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 7d7c88aa02352d6f8696f3820788f1ba29904f2a..f616f8e56c8bd8120dc8edb88a4672a8b8fbea2f 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -3862,11 +3862,11 @@ mips_check_options (struct mips_set_options *opts, bfd_boolean abi_checks)
     as_bad (_("`nooddspreg` cannot be used with a 64-bit ABI"));
 
   if (opts->micromips == 1 && opts->mips16 == 1)
-    as_bad (_("`mips16' cannot be used with `micromips'"));
+    as_bad (_("`%s' cannot be used with `%s'"), "mips16", "micromips");
   else if (ISA_IS_R6 (opts->isa)
           && (opts->micromips == 1
               || opts->mips16 == 1))
-    as_fatal (_("`%s' can not be used with `%s'"),
+    as_fatal (_("`%s' cannot be used with `%s'"),
              opts->micromips ? "micromips" : "mips16",
              mips_cpu_info_from_isa (opts->isa)->name);