diff options
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-mips.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 109f3e8..2ce9a43 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2016-04-09 Maciej W. Rozycki <macro@imgtec.com> + + * config/tc-mips.c (mips_check_options): Use `opts->isa' + consistently. + 2016-04-08 Nick Clifton <nickc@redhat.com> PR target/19910 diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index b596b8b..7d7c88a 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -3850,7 +3850,7 @@ mips_check_options (struct mips_set_options *opts, bfd_boolean abi_checks) if (abi_checks && ABI_NEEDS_64BIT_REGS (mips_abi)) as_warn (_("`fp=32' used with a 64-bit ABI")); - if (ISA_IS_R6 (mips_opts.isa) && opts->single_float == 0) + if (ISA_IS_R6 (opts->isa) && opts->single_float == 0) as_bad (_("`fp=32' used with a MIPS R6 cpu")); break; default: @@ -3863,12 +3863,12 @@ mips_check_options (struct mips_set_options *opts, bfd_boolean abi_checks) if (opts->micromips == 1 && opts->mips16 == 1) as_bad (_("`mips16' cannot be used with `micromips'")); - else if (ISA_IS_R6 (mips_opts.isa) + else if (ISA_IS_R6 (opts->isa) && (opts->micromips == 1 || opts->mips16 == 1)) as_fatal (_("`%s' can not be used with `%s'"), opts->micromips ? "micromips" : "mips16", - mips_cpu_info_from_isa (mips_opts.isa)->name); + mips_cpu_info_from_isa (opts->isa)->name); if (ISA_IS_R6 (opts->isa) && mips_relax_branch) as_fatal (_("branch relaxation is not supported in `%s'"), |