mips: do not set isa if MIPS_CPU_STRING_DEFAULT

[Eric Christopher]

> ok to install?

si si!

-eric

> 
> -- 
> Aldy Hernandez					E-mail: aldyh@redhat.com
> Professional Gypsy
> Red Hat, Inc.
> 
> 2001-09-06  Aldy Hernandez  <aldyh@redhat.com>
> 
>         * config/mips/mips.c (override_options): Do not override ISA
> when ABI
>         specified if MIPS_CPU_STRING_DEFAULT was specified.
> 
> Index: mips.c
> ===================================================================
> RCS file: /cvs/gcc/egcs/gcc/config/mips/mips.c,v
> retrieving revision 1.147
> diff -c -r1.147 mips.c
> *** mips.c	2001/09/07 12:52:49	1.147
> --- mips.c	2001/09/07 15:28:29
> ***************
> *** 4804,4809 ****
> --- 4804,4810 ----
>   	mips_abi = ABI_64;
>       }
>   
> + #ifdef MIPS_CPU_STRING_DEFAULT
>     /* A specified ABI defaults the ISA if it was not specified.  */
>     else if (mips_isa_string == 0 && mips_abi_string
>   	   && mips_abi != ABI_EABI && mips_abi != ABI_O64)
> ***************
> *** 4815,4820 ****
> --- 4816,4822 ----
>         else
>   	mips_isa = 4;
>       }
> + #endif
>   
>     /* If both ABI and ISA were specified, check for conflicts.  */
>     else if (mips_isa_string && mips_abi_string)
-- 
Look out behind you!