From 2c90747af7b87f8105239f856726011a8b69452e Mon Sep 17 00:00:00 2001 From: aldyh Date: Fri, 7 Sep 2001 21:29:05 +0000 Subject: [PATCH] * config/mips/mips.c (override_options): Do not override ISA when ABI specified if MIPS_CPU_STRING_DEFAULT was specified. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45476 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/config/mips/mips.c | 2 ++ 2 files changed, 7 insertions(+) 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 + + * 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 * 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) -- 2.7.4