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

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

From-SVN: r45476

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3e93f6c9d0b05e34bdbcfa89e8c13ab1360d72c..cc838bc219df389fba405e35ec5e836d7b4a57b8 100644 (file)
--- 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 db32d4765fcb047c96a331cfbcbef21d8c05241e..d54854ad42dbe4d24c0e5677f7d2c8c6c0c10cc2 100644 (file)
--- 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)