From 1bd9166ecfdc06279a3f6d619b5072237988f753 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Tue, 23 May 1995 13:59:57 -0700 Subject: [PATCH] (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 --- gcc/config/mips/mips.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index 94a2210285f..c6c146a8525 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 -- 2.30.2