MIPS/GAS: Use opts->isa' consistently in mips_check_options'

gas/
	* config/tc-mips.c (mips_check_options): Use `opts->isa'
	consistently.
This commit is contained in:
Maciej W. Rozycki 2016-04-09 12:55:09 +01:00
parent 417a667c4a
commit 5f4678bb69
2 changed files with 8 additions and 3 deletions

View File

@ -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

View File

@ -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'"),