aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Sandiford <rdsandiford@googlemail.com>2011-05-22 21:21:21 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2011-05-22 21:21:21 +0000
commit872dab53fd623b4871b0aa96c667e89690b8ed7b (patch)
treeae3826f1eeb86d115fbcef7345f4602210d1da58 /gcc
parent145f6c5b88265139d88220b741d2f74ce9cc0332 (diff)
downloadgcc-872dab53fd623b4871b0aa96c667e89690b8ed7b.zip
gcc-872dab53fd623b4871b0aa96c667e89690b8ed7b.tar.gz
gcc-872dab53fd623b4871b0aa96c667e89690b8ed7b.tar.bz2
mips.c (mips_default_arch): Honor MIPS_ISA_DEFAULT.
gcc/ * config/mips/mips.c (mips_default_arch): Honor MIPS_ISA_DEFAULT. From-SVN: r174045
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/config/mips/mips.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef29e49..53b72b2 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 f293579..2602819 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. */