aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJim Wilson <wilson@gcc.gnu.org>1995-05-23 13:59:57 -0700
committerJim Wilson <wilson@gcc.gnu.org>1995-05-23 13:59:57 -0700
commit1bd9166ecfdc06279a3f6d619b5072237988f753 (patch)
tree13ec4362166d392212c1c1e4cae936a6c3cd6a41 /gcc
parent55420ce980b3bfb3af8df55a12a0d20d2fa6354d (diff)
downloadgcc-1bd9166ecfdc06279a3f6d619b5072237988f753.zip
gcc-1bd9166ecfdc06279a3f6d619b5072237988f753.tar.gz
gcc-1bd9166ecfdc06279a3f6d619b5072237988f753.tar.bz2
(override_options): Delete #ifdef MIPS_CPU_DEFAULT code.
Add #ifdef MIPS_CPU_DEFAULT_STRING code before the first mips_cpu_string test. From-SVN: r9779
Diffstat (limited to 'gcc')
-rw-r--r--gcc/config/mips/mips.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 94a2210..c6c146a 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -3160,6 +3160,15 @@ override_options ()
mips_isa = 1;
}
+#ifdef MIPS_CPU_STRING_DEFAULT
+ /* ??? There is a minor inconsistency here. If the user specifies an ISA
+ greater than that supported by the default processor, then the user gets
+ an error. Normally, the compiler will just default to the base level cpu
+ for the indicated isa. */
+ if (mips_cpu_string == (char *)0)
+ mips_cpu_string = MIPS_CPU_STRING_DEFAULT;
+#endif
+
/* Identify the processor type */
if (mips_cpu_string == (char *)0
|| !strcmp (mips_cpu_string, "default")
@@ -3184,14 +3193,6 @@ override_options ()
mips_cpu = PROCESSOR_R8000;
break;
}
-
-#ifdef MIPS_CPU_DEFAULT
- if (mips_isa_string == (char *)0)
- {
- mips_cpu_string = MIPS_CPU_STRING_DEFAULT;
- mips_cpu = MIPS_CPU_DEFAULT;
- }
-#endif
}
else