From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Sun, 22 May 2011 21:21:21 +0000 (+0000)
Subject: mips.c (mips_default_arch): Honor MIPS_ISA_DEFAULT.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=872dab53fd623b4871b0aa96c667e89690b8ed7b;p=gcc.git

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 ef29e49d967..53b72b2ab19 100644
--- 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 f293579f5a5..26028192db5 100644
--- 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.  */