From 3b14df1dbd07e302aa5fa5251af9fc08e6e57fac Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 1 Dec 2010 00:35:35 +0000 Subject: [PATCH] linux.h (ASM_SPEC): Pass -v as -v, not -V. * config/i386/linux.h (ASM_SPEC): Pass -v as -v, not -V. Remove all of %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*}. * config/i386/linux64.h (ASM_SPEC): Likewise. * config/i386/mingw-w64.h (ASM_SPEC): Likewise. * config/i386/sol2-10.h (ASM_SPEC) [USE_GAS]: Likewise. * config/i386/vxworks.h (ASM_SPEC): Likewise. * config/i386/x86-64.h (ASM_SPEC): Likewise. * config/i386/sol2.h (ASM_SPEC): Remove %{Wa,*:%*}. * config/i386/sol2-10.h (ASM_SPEC) [!USE_GAS]: Likewise. From-SVN: r167323 --- gcc/ChangeLog | 14 +++++++++++++- gcc/config/i386/linux.h | 3 +-- gcc/config/i386/linux64.h | 3 +-- gcc/config/i386/mingw-w64.h | 3 +-- gcc/config/i386/sol2-10.h | 5 ++--- gcc/config/i386/sol2.h | 5 +---- gcc/config/i386/vxworks.h | 2 +- gcc/config/i386/x86-64.h | 3 +-- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d169fc9dd92e..735cde3eff97 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,10 +1,22 @@ +2010-11-30 Ian Lance Taylor + + * config/i386/linux.h (ASM_SPEC): Pass -v as -v, not -V. Remove + all of %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*}. + * config/i386/linux64.h (ASM_SPEC): Likewise. + * config/i386/mingw-w64.h (ASM_SPEC): Likewise. + * config/i386/sol2-10.h (ASM_SPEC) [USE_GAS]: Likewise. + * config/i386/vxworks.h (ASM_SPEC): Likewise. + * config/i386/x86-64.h (ASM_SPEC): Likewise. + * config/i386/sol2.h (ASM_SPEC): Remove %{Wa,*:%*}. + * config/i386/sol2-10.h (ASM_SPEC) [!USE_GAS]: Likewise. + 2010-11-30 Nicola Pero * c-decl.c (finish_function): Call objc_finish_function in Objective-C. * c-typeck.c (convert_for_assignment): Do not call objc_type_quals_match(). - + 2010-11-30 Richard Guenther PR tree-optimization/46722 diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h index 7564c70b6d20..bb4a72f103be 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -104,8 +104,7 @@ along with GCC; see the file COPYING3. If not see #undef ASM_SPEC #define ASM_SPEC \ - "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} --32 \ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + "%{v} --32 %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h index 4a3e366fb4e5..118128174b32 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h @@ -71,8 +71,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #endif #undef ASM_SPEC -#define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ - %{Wa,*:%*} %{" SPEC_32 ":--32} %{" SPEC_64 ":--64} \ +#define ASM_SPEC "%{v} %{" SPEC_32 ":--32} %{" SPEC_64 ":--64} \ %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" #undef LINK_SPEC diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h index 3aafb933dd43..3b8a1b114bb2 100644 --- a/gcc/config/i386/mingw-w64.h +++ b/gcc/config/i386/mingw-w64.h @@ -36,8 +36,7 @@ along with GCC; see the file COPYING3. If not see /* Enable multilib. */ #undef ASM_SPEC -#define ASM_SPEC "%{v:-v} %{n} %{T} %{Ym,*} %{Yd,*} \ - %{Wa,*:%*} %{m32:--32} %{m64:--64}" +#define ASM_SPEC "%{v} %{m32:--32} %{m64:--64}" #undef SPEC_32 #undef SPEC_64 diff --git a/gcc/config/i386/sol2-10.h b/gcc/config/i386/sol2-10.h index bd3416c29b2c..fc4ea2ea8889 100644 --- a/gcc/config/i386/sol2-10.h +++ b/gcc/config/i386/sol2-10.h @@ -26,11 +26,10 @@ along with GCC; see the file COPYING3. If not see assembler requires -xarch=generic or -xarch=generic64 instead. */ #undef ASM_SPEC #ifdef USE_GAS -#define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} " \ - "%{Wa,*:%*} %{m32:--32} %{m64:--64} -s %(asm_cpu)" +#define ASM_SPEC "%{v} %{m32:--32} %{m64:--64} -s %(asm_cpu)" #else #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} " \ - "%{Wa,*:%*} %{m32:-xarch=generic} %{m64:-xarch=generic64} " \ + "%{m32:-xarch=generic} %{m64:-xarch=generic64} " \ "-s %(asm_cpu)" #endif diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h index b86308fe2fc8..ce469a719fe5 100644 --- a/gcc/config/i386/sol2.h +++ b/gcc/config/i386/sol2.h @@ -54,10 +54,7 @@ along with GCC; see the file COPYING3. If not see /* FIXME: Removed -K PIC from generic Solaris 2 ASM_SPEC: the native assembler gives many warnings: R_386_32 relocation is used for symbol ".text". */ #undef ASM_SPEC -#define ASM_SPEC "\ -%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Wa,*:%*} -s \ -%(asm_cpu) \ -" +#define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} -s %(asm_cpu)" #define ASM_CPU_SPEC "" diff --git a/gcc/config/i386/vxworks.h b/gcc/config/i386/vxworks.h index f7f929850162..4343695daf5c 100644 --- a/gcc/config/i386/vxworks.h +++ b/gcc/config/i386/vxworks.h @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see #define TARGET_VERSION fprintf (stderr, " (80586, VxWorks syntax)"); #undef ASM_SPEC -#define ASM_SPEC "%{v:-v} %{Qy:} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*}" +#define ASM_SPEC "%{v}" #define TARGET_OS_CPP_BUILTINS() \ do \ diff --git a/gcc/config/i386/x86-64.h b/gcc/config/i386/x86-64.h index 1b648138ca06..61512b466375 100644 --- a/gcc/config/i386/x86-64.h +++ b/gcc/config/i386/x86-64.h @@ -52,8 +52,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" #undef ASM_SPEC -#define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ - %{Wa,*:%*} %{m32:--32} %{m64:--64}" +#define ASM_SPEC "%{v} %{m32:--32} %{m64:--64}" #undef ASM_OUTPUT_ALIGNED_BSS #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \