diff options
| -rw-r--r-- | gas/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/config/tc-mips.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 2ce9a43..afdcb2b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,9 @@ 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' consistently. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 7d7c88a..f616f8e 100644 --- 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); |