From: Aldy Hernandez <aldyh@redhat.com>
Date: Fri, 7 Sep 2001 21:29:05 +0000 (+0000)
Subject: mips.c (override_options): Do not override ISA when ABI specified if MIPS_CPU_STRING_... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2fd7f0c1f8f3efcedf2a466b638a0d95a7398582;p=gcc.git

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3e93f6c9d0..cc838bc219d 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 db32d4765fc..d54854ad42d 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)