diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e9a1291852f..66cf673ef3c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2011-01-14 Joseph Myers + + * config/sparc/linux.h (CC1_SPEC): Don't handle old equivalents of + -mcpu options. + * config/sparc/linux64.h (CC1_SPEC): Likewise. + * config/sparc/netbsd-elf.h (CC1_SPEC32, CC1_SPEC64): Likewise. + * config/sparc/sol2-bi.h (CPP_CPU_SPEC, CC1_SPEC): Likewise. + * config/sparc/sparc.h (CPP_CPU_SPEC, CC1_SPEC, ASM_CPU_SPEC): + Likewise. + * config/sparc/t-elf (MULTILIB_MATCHES): Don't handle -mv8. + 2011-01-14 Joseph Myers * config/rs6000/vxworks.h (CC1_SPEC): Don't handle -fvec or diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h index 261a9eed0c4..756d30f17a9 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -43,9 +43,6 @@ along with GCC; see the file COPYING3. If not see #undef CC1_SPEC #define CC1_SPEC "%{profile:-p} \ %{sun4:} %{target:} \ -%{mcypress:-mcpu=cypress} \ -%{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \ -%{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \ " #undef TARGET_VERSION diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h index b254a923eba..6371b69c7a5 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -149,23 +149,17 @@ along with GCC; see the file COPYING3. If not see #if DEFAULT_ARCH32_P #define CC1_SPEC "%{profile:-p} \ %{sun4:} %{target:} \ -%{mcypress:-mcpu=cypress} \ -%{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \ -%{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \ %{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m64:-mptr64 -mstack-bias -mlong-double-128 \ - %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8:%{!msupersparc:-mcpu=ultrasparc}}}}}}} \ + %{!mcpu*:-mcpu=ultrasparc} \ %{!mno-vis:%{!mcpu=v9:-mvis}}} \ " #else #define CC1_SPEC "%{profile:-p} \ %{sun4:} %{target:} \ -%{mcypress:-mcpu=cypress} \ -%{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \ -%{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \ %{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m32:-mptr32 -mno-stack-bias %{!mlong-double-128:-mlong-double-64} \ - %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8:%{!msupersparc:-mcpu=cypress}}}}}}}} \ + %{!mcpu*:-mcpu=cypress}} \ %{!m32:%{!mcpu*:-mcpu=ultrasparc}} \ %{!mno-vis:%{!m32:%{!mcpu=v9:-mvis}}} \ " diff --git a/gcc/config/sparc/netbsd-elf.h b/gcc/config/sparc/netbsd-elf.h index e69934b30b2..b1b00ca86e7 100644 --- a/gcc/config/sparc/netbsd-elf.h +++ b/gcc/config/sparc/netbsd-elf.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GCC, for ELF on NetBSD/sparc and NetBSD/sparc64. - Copyright (C) 2002, 2003, 2004, 2005, 2007, 2010 + Copyright (C) 2002, 2003, 2004, 2005, 2007, 2010, 2011 Free Software Foundation, Inc. Contributed by Matthew Green (mrg@eterna.com.au). @@ -116,39 +116,21 @@ along with GCC; see the file COPYING3. If not see /* CC1_SPEC for NetBSD/sparc. */ #define CC1_SPEC32 \ "%{sun4:} %{target:} \ - %{mcypress:-mcpu=cypress} \ - %{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \ - %{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \ %{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m64: \ -mptr64 -mstack-bias -mno-v8plus -mlong-double-128 \ - %{!mcpu*: \ - %{!mcypress: \ - %{!msparclite: \ - %{!mf930: \ - %{!mf934: \ - %{!mv8*: \ - %{!msupersparc:-mcpu=ultrasparc}}}}}}} \ + %{!mcpu*:%{!mv8plus:-mcpu=ultrasparc}} \ %{!mno-vis:%{!mcpu=v9:-mvis}} \ %{p:-mcmodel=medlow} \ %{pg:-mcmodel=medlow}}" #define CC1_SPEC64 \ "%{sun4:} %{target:} \ - %{mcypress:-mcpu=cypress} \ - %{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \ - %{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \ %{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m32: \ -mptr32 -mno-stack-bias \ %{!mlong-double-128:-mlong-double-64} \ - %{!mcpu*: \ - %{!mcypress: \ - %{!msparclite: \ - %{!mf930: \ - %{!mf934: \ - %{!mv8*: \ - %{!msupersparc:-mcpu=cypress}}}}}}}} \ + %{!mcpu*:%{!mv8plus:-mcpu=cypress}}} \ %{!m32: \ %{p:-mcmodel=medlow} \ %{pg:-mcmodel=medlow}}" diff --git a/gcc/config/sparc/sol2-bi.h b/gcc/config/sparc/sol2-bi.h index 0286db27b01..098699a423d 100644 --- a/gcc/config/sparc/sol2-bi.h +++ b/gcc/config/sparc/sol2-bi.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GCC, for bi-arch SPARC running Solaris 2 using the system assembler and linker. - Copyright (C) 2002, 2003, 2004, 2006, 2007, 2009, 2010 + Copyright (C) 2002, 2003, 2004, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -90,16 +90,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #undef CPP_CPU_SPEC #define CPP_CPU_SPEC "\ -%{mcypress:} \ -%{msparclite|mf930|mf934:-D__sparclite__} \ -%{mv8:" DEF_ARCH32_SPEC("-D__sparcv8") "} \ -%{msupersparc:-D__supersparc__ " DEF_ARCH32_SPEC("-D__sparcv8") "} \ %{mcpu=sparclet|mcpu=tsc701:-D__sparclet__} \ %{mcpu=sparclite|mcpu-f930|mcpu=f934:-D__sparclite__} \ %{mcpu=v8:" DEF_ARCH32_SPEC("-D__sparcv8") "} \ %{mcpu=supersparc:-D__supersparc__ " DEF_ARCH32_SPEC("-D__sparcv8") "} \ %{mcpu=v9|mcpu=ultrasparc|mcpu=ultrasparc3|mcpu=niagara|mcpu=niagara2:" DEF_ARCH32_SPEC("-D__sparcv8") "} \ -%{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8:%{!msupersparc:%(cpp_cpu_default)}}}}}}} \ +%{!mcpu*:%(cpp_cpu_default)} \ " #undef ASM_CPU_SPEC @@ -234,24 +230,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #if DEFAULT_ARCH32_P #define CC1_SPEC "\ %{sun4:} %{target:} \ -%{mcypress:-mcpu=cypress} \ -%{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \ -%{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \ %{m64:%{m32:%emay not use both -m32 and -m64}} \ %{m64:-mptr64 -mstack-bias -mno-v8plus \ - %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8*:%{!msupersparc:-mcpu=v9}}}}}}}} \ + %{!mcpu*:-%{!mv8plus:mcpu=v9}}} \ " #else #define CC1_SPEC "\ %{sun4:} %{target:} \ -%{mcypress:-mcpu=cypress} \ -%{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \ -%{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \ %{m32:%{m64:%emay not use both -m32 and -m64}} \ %{m32:-mptr32 -mno-stack-bias \ - %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8*:%{!msupersparc:-mcpu=v9}}}}}}}} \ + %{!mcpu*:%{!mv8plus-mcpu=v9}}} \ %{mv8plus:-m32 -mptr32 -mno-stack-bias \ - %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8:%{!msupersparc:-mcpu=v9}}}}}}}} \ + %{!mcpu*:-mcpu=v9}} \ " #endif diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h index c41a623577b..b546d84fe6f 100644 --- a/gcc/config/sparc/sparc.h +++ b/gcc/config/sparc/sparc.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler, for Sun SPARC. Copyright (C) 1987, 1988, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999 - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com). 64-bit SPARC-V9 support by Michael Tiemann, Jim Wilson, and Doug Evans, @@ -361,11 +361,6 @@ extern enum cmodel sparc_cmodel; for handling -mcpu=xxx switches. */ #define CPP_CPU_SPEC "\ %{msoft-float:-D_SOFT_FLOAT} \ -%{mcypress:} \ -%{msparclite:-D__sparclite__} \ -%{mf930:-D__sparclite__} %{mf934:-D__sparclite__} \ -%{mv8:-D__sparc_v8__} \ -%{msupersparc:-D__supersparc__ -D__sparc_v8__} \ %{mcpu=sparclet:-D__sparclet__} %{mcpu=tsc701:-D__sparclet__} \ %{mcpu=sparclite:-D__sparclite__} \ %{mcpu=f930:-D__sparclite__} %{mcpu=f934:-D__sparclite__} \ @@ -379,7 +374,7 @@ extern enum cmodel sparc_cmodel; %{mcpu=ultrasparc3:-D__sparc_v9__} \ %{mcpu=niagara:-D__sparc_v9__} \ %{mcpu=niagara2:-D__sparc_v9__} \ -%{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8:%{!msupersparc:%(cpp_cpu_default)}}}}}}} \ +%{!mcpu*:%(cpp_cpu_default)} \ " #define CPP_ARCH32_SPEC "" #define CPP_ARCH64_SPEC "-D__arch64__" @@ -411,16 +406,11 @@ extern enum cmodel sparc_cmodel; #define CC1_SPEC "\ %{sun4:} %{target:} \ -%{mcypress:-mcpu=cypress} \ -%{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \ -%{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \ " /* Override in target specific files. */ #define ASM_CPU_SPEC "\ %{mcpu=sparclet:-Asparclet} %{mcpu=tsc701:-Asparclet} \ -%{msparclite:-Asparclite} \ -%{mf930:-Asparclite} %{mf934:-Asparclite} \ %{mcpu=sparclite:-Asparclite} \ %{mcpu=sparclite86x:-Asparclite} \ %{mcpu=f930:-Asparclite} %{mcpu=f934:-Asparclite} \ @@ -430,7 +420,7 @@ extern enum cmodel sparc_cmodel; %{mcpu=ultrasparc3:%{!mv8plus:-Av9b}} \ %{mcpu=niagara:%{!mv8plus:-Av9b}} \ %{mcpu=niagara2:%{!mv8plus:-Av9b}} \ -%{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8:%{!msupersparc:%(asm_cpu_default)}}}}}}} \ +%{!mcpu*:%(asm_cpu_default)} \ " /* Word size selection, among other things. diff --git a/gcc/config/sparc/t-elf b/gcc/config/sparc/t-elf index 18ed2de16e6..b1d18fda62e 100644 --- a/gcc/config/sparc/t-elf +++ b/gcc/config/sparc/t-elf @@ -1,4 +1,4 @@ -# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2005, 2007, 2010 +# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2005, 2007, 2010, 2011 # Free Software Foundation, Inc. # # This file is part of GCC. @@ -34,7 +34,7 @@ fp-bit.c: $(srcdir)/config/fp-bit.c MULTILIB_OPTIONS = msoft-float mcpu=v8 MULTILIB_DIRNAMES = soft v8 -MULTILIB_MATCHES = msoft-float=mno-fpu mcpu?v8=mv8 +MULTILIB_MATCHES = msoft-float=mno-fpu LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib