mips.c (mips_default_arch): Honor MIPS_ISA_DEFAULT.

gcc/
	* config/mips/mips.c (mips_default_arch): Honor MIPS_ISA_DEFAULT.

From-SVN: r174045

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef29e49d9674787629e22adc4686fbf857e6e60e..53b72b2ab19af4f1e0c9ee6a80da56adebec70cd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-22  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * config/mips/mips.c (mips_default_arch): Honor MIPS_ISA_DEFAULT.
+
 2011-05-22  Eric Botcazou  <ebotcazou@adacore.com>
 
        * config/sparc/sparc.c (sparc_delegitimize_address): Handle

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index f293579f5a5a9e200343301e9da7c6c5bde953f2..26028192db5af2803208954562a2854b03d77512 100644 (file)
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -15239,12 +15239,14 @@ mips_cpu_info_from_opt (int opt)
 static const struct mips_cpu_info *
 mips_default_arch (void)
 {
-#ifdef MIPS_CPU_STRING_DEFAULT
+#if defined (MIPS_CPU_STRING_DEFAULT)
   unsigned int i;
   for (i = 0; i < ARRAY_SIZE (mips_cpu_info_table); i++)
     if (strcmp (mips_cpu_info_table[i].name, MIPS_CPU_STRING_DEFAULT) == 0)
       return mips_cpu_info_table + i;
   gcc_unreachable ();
+#elif defined (MIPS_ISA_DEFAULT)
+  return mips_cpu_info_from_isa (MIPS_ISA_DEFAULT);
 #else
   /* 'from-abi' makes a good default: you get whatever the ABI
      requires.  */