diff options
| author | Aldy Hernandez <aldyh@redhat.com> | 2001-09-07 21:29:05 +0000 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@gcc.gnu.org> | 2001-09-07 21:29:05 +0000 |
| commit | 2fd7f0c1f8f3efcedf2a466b638a0d95a7398582 (patch) | |
| tree | 2fdd9a7e451e1a8c5f2a86cd4f1a1741c9830ce2 /gcc | |
| parent | 0ef02b2d315752feafa11e8f2dd9d1a4a78da1d7 (diff) | |
| download | gcc-2fd7f0c1f8f3efcedf2a466b638a0d95a7398582.zip gcc-2fd7f0c1f8f3efcedf2a466b638a0d95a7398582.tar.gz gcc-2fd7f0c1f8f3efcedf2a466b638a0d95a7398582.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/mips/mips.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c3e93f6..cc838bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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. diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index db32d47..d54854a 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -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) |