mips.c (override_options): Do not override ISA when ABI specified if MIPS_CPU_STRING_DEFAULT was specified.

* config/mips/mips.c (override_options): Do not override ISA when ABI
        specified if MIPS_CPU_STRING_DEFAULT was specified.

From-SVN: r45476
This commit is contained in:
Aldy Hernandez 2001-09-07 21:29:05 +00:00 committed by Aldy Hernandez
parent 0ef02b2d31
commit 2fd7f0c1f8
2 changed files with 7 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2001-09-06 Aldy Hernandez <aldyh@redhat.com>
* config/mips/mips.c (override_options): Do not override ISA when ABI
specified if MIPS_CPU_STRING_DEFAULT was specified.
2001-09-07 Richard Henderson <rth@redhat.com>
* loop.c (record_giv): Avoid simplifying MULT to ASHIFT.

View File

@ -4804,6 +4804,7 @@ override_options ()
mips_abi = ABI_64;
}
#ifdef MIPS_CPU_STRING_DEFAULT
/* A specified ABI defaults the ISA if it was not specified. */
else if (mips_isa_string == 0 && mips_abi_string
&& mips_abi != ABI_EABI && mips_abi != ABI_O64)
@ -4815,6 +4816,7 @@ override_options ()
else
mips_isa = 4;
}
#endif
/* If both ABI and ISA were specified, check for conflicts. */
else if (mips_isa_string && mips_abi_string)