From c6869789666becf60317ba746e06dcdff7699867 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 17 Feb 2011 13:57:21 +0000 Subject: [PATCH] linux64.h (OPTION_DEFAULT_SPECS): Match -mfpu and -mno-fpu, not -fpu and -no-fpu. * config/sparc/linux64.h (OPTION_DEFAULT_SPECS): Match -mfpu and -mno-fpu, not -fpu and -no-fpu. * config/sparc/sol2-bi.h (OPTION_DEFAULT_SPECS): Likewise. * config/sparc/sparc.h (OPTION_DEFAULT_SPECS): Likewise. From-SVN: r170246 --- gcc/ChangeLog | 7 +++++++ gcc/config/sparc/linux64.h | 4 ++-- gcc/config/sparc/sol2-bi.h | 4 ++-- gcc/config/sparc/sparc.h | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cdcfb72ae80..5098e77da72 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-02-17 Joseph Myers + + * config/sparc/linux64.h (OPTION_DEFAULT_SPECS): Match -mfpu and + -mno-fpu, not -fpu and -no-fpu. + * config/sparc/sol2-bi.h (OPTION_DEFAULT_SPECS): Likewise. + * config/sparc/sparc.h (OPTION_DEFAULT_SPECS): Likewise. + 2011-02-17 Uros Bizjak PR target/43653 diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h index cd7c390e6ff..a4c67dce312 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -176,12 +176,12 @@ along with GCC; see the file COPYING3. If not see #define OPTION_DEFAULT_SPECS \ {"cpu", "%{!m64:%{!mcpu=*:-mcpu=%(VALUE)}}" }, \ {"tune", "%{!mtune=*:-mtune=%(VALUE)}" }, \ - {"float", "%{!msoft-float:%{!mhard-float:%{!fpu:%{!no-fpu:-m%(VALUE)-float}}}}" } + {"float", "%{!msoft-float:%{!mhard-float:%{!mfpu:%{!mno-fpu:-m%(VALUE)-float}}}}" } #else #define OPTION_DEFAULT_SPECS \ {"cpu", "%{!m32:%{!mcpu=*:-mcpu=%(VALUE)}}" }, \ {"tune", "%{!mtune=*:-mtune=%(VALUE)}" }, \ - {"float", "%{!msoft-float:%{!mhard-float:%{!fpu:%{!no-fpu:-m%(VALUE)-float}}}}" } + {"float", "%{!msoft-float:%{!mhard-float:%{!mfpu:%{!mno-fpu:-m%(VALUE)-float}}}}" } #endif #if DEFAULT_ARCH32_P diff --git a/gcc/config/sparc/sol2-bi.h b/gcc/config/sparc/sol2-bi.h index bd9cd70487c..d1d62ebbea7 100644 --- a/gcc/config/sparc/sol2-bi.h +++ b/gcc/config/sparc/sol2-bi.h @@ -256,12 +256,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define OPTION_DEFAULT_SPECS \ {"cpu", "%{!m64:%{!mcpu=*:-mcpu=%(VALUE)}}" }, \ {"tune", "%{!mtune=*:-mtune=%(VALUE)}" }, \ - {"float", "%{!msoft-float:%{!mhard-float:%{!fpu:%{!no-fpu:-m%(VALUE)-float}}}}" } + {"float", "%{!msoft-float:%{!mhard-float:%{!mfpu:%{!mno-fpu:-m%(VALUE)-float}}}}" } #else #define OPTION_DEFAULT_SPECS \ {"cpu", "%{!m32:%{!mcpu=*:-mcpu=%(VALUE)}}" }, \ {"tune", "%{!mtune=*:-mtune=%(VALUE)}" }, \ - {"float", "%{!msoft-float:%{!mhard-float:%{!fpu:%{!no-fpu:-m%(VALUE)-float}}}}" } + {"float", "%{!msoft-float:%{!mhard-float:%{!mfpu:%{!mno-fpu:-m%(VALUE)-float}}}}" } #endif #if DEFAULT_ARCH32_P diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h index 5137b5c1903..41c54c8f36c 100644 --- a/gcc/config/sparc/sparc.h +++ b/gcc/config/sparc/sparc.h @@ -551,7 +551,7 @@ extern enum processor_type sparc_cpu; #define OPTION_DEFAULT_SPECS \ {"cpu", "%{!mcpu=*:-mcpu=%(VALUE)}" }, \ {"tune", "%{!mtune=*:-mtune=%(VALUE)}" }, \ - {"float", "%{!msoft-float:%{!mhard-float:%{!fpu:%{!no-fpu:-m%(VALUE)-float}}}}" } + {"float", "%{!msoft-float:%{!mhard-float:%{!mfpu:%{!mno-fpu:-m%(VALUE)-float}}}}" } /* sparc_select[0] is reserved for the default cpu. */ struct sparc_cpu_select -- 2.30.2