From 1ba7b41497efa87150d2325d74d130c4104593ea Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Tue, 4 Jun 2002 18:07:44 +0000 Subject: [PATCH] beos-elf.h, [...] (CPP_SPEC): Remove cpp_cpu. config/i386: * beos-elf.h, cygwin.h, djgpp.h, gas.h, gnu.h, i386-interix.h, i386-interix3.h, i386elf.h, linux-aout.h, linux.h, linux64.h, mingw32.h, netbsd-elf.h, netbsd.h, netbsd64.h, rtemself.h, sco5.h, sol2.h, sysv3.h, sysv4.h, sysv5.h, uwin.h, vxi386.h, win32.h (CPP_SPEC): Remove cpp_cpu. * i386.h (TARGET_CPU_CPP_BUILTINS): Use. (CPP_CPU_DEFAULT_SPEC, CPP_CPU_SPEC): Die! From-SVN: r54254 --- gcc/ChangeLog | 11 ++ gcc/config/i386/beos-elf.h | 2 +- gcc/config/i386/cygwin.h | 2 +- gcc/config/i386/djgpp.h | 2 +- gcc/config/i386/gas.h | 2 +- gcc/config/i386/gnu.h | 2 +- gcc/config/i386/i386-interix.h | 2 - gcc/config/i386/i386-interix3.h | 1 - gcc/config/i386/i386.h | 224 ++++++++++++++++---------------- gcc/config/i386/i386elf.h | 2 +- gcc/config/i386/linux-aout.h | 2 +- gcc/config/i386/linux.h | 4 +- gcc/config/i386/linux64.h | 2 +- gcc/config/i386/mingw32.h | 2 +- gcc/config/i386/netbsd-elf.h | 2 +- gcc/config/i386/netbsd.h | 2 +- gcc/config/i386/netbsd64.h | 2 +- gcc/config/i386/rtemself.h | 2 +- gcc/config/i386/sco5.h | 2 +- gcc/config/i386/sol2.h | 1 - gcc/config/i386/sysv3.h | 2 +- gcc/config/i386/sysv4.h | 2 +- gcc/config/i386/sysv5.h | 2 +- gcc/config/i386/uwin.h | 2 +- gcc/config/i386/vxi386.h | 2 +- gcc/config/i386/win32.h | 2 +- 26 files changed, 148 insertions(+), 135 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a0de8dc05e2b..637eecf4fdcf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2002-06-04 Neil Booth + +config/i386: + * beos-elf.h, cygwin.h, djgpp.h, gas.h, gnu.h, i386-interix.h, + i386-interix3.h, i386elf.h, linux-aout.h, linux.h, linux64.h, + mingw32.h, netbsd-elf.h, netbsd.h, netbsd64.h, rtemself.h, + sco5.h, sol2.h, sysv3.h, sysv4.h, sysv5.h, uwin.h, vxi386.h, + win32.h (CPP_SPEC): Remove cpp_cpu. + * i386.h (TARGET_CPU_CPP_BUILTINS): Use. + (CPP_CPU_DEFAULT_SPEC, CPP_CPU_SPEC): Die! + 2002-06-04 Janis Johnson * config/ia64/ia64.c (gen_thread_pointer): Fix variable name. diff --git a/gcc/config/i386/beos-elf.h b/gcc/config/i386/beos-elf.h index 5b1d1d3ff22b..e7613b86af15 100644 --- a/gcc/config/i386/beos-elf.h +++ b/gcc/config/i386/beos-elf.h @@ -76,7 +76,7 @@ Boston, MA 02111-1307, USA. */ -Asystem=beos" #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %{!no-fPIC:%{!no-fpic:-D__PIC__ -D__pic__}}" +#define CPP_SPEC "%{!no-fPIC:%{!no-fpic:-D__PIC__ -D__pic__}}" /* BeOS uses lots of multichars, so don't warn about them unless the user explicitly asks for the warnings with -Wmultichar. Note that diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h index 0caf3c340578..15a5cdbb925c 100644 --- a/gcc/config/i386/cygwin.h +++ b/gcc/config/i386/cygwin.h @@ -96,7 +96,7 @@ Boston, MA 02111-1307, USA. */ existing args. */ #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \ +#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} \ -D__stdcall=__attribute__((__stdcall__)) \ -D__cdecl=__attribute__((__cdecl__)) \ %{!ansi:-D_stdcall=__attribute__((__stdcall__)) \ diff --git a/gcc/config/i386/djgpp.h b/gcc/config/i386/djgpp.h index c44b55f9b70a..15c1531a9c82 100644 --- a/gcc/config/i386/djgpp.h +++ b/gcc/config/i386/djgpp.h @@ -87,7 +87,7 @@ Boston, MA 02111-1307, USA. */ /* Include so __DJGPP__ and __DJGPP_MINOR__ are defined. */ #undef CPP_SPEC -#define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} \ +#define CPP_SPEC "-remap %{posix:-D_POSIX_SOURCE} \ %{!ansi:%{!std=c*:%{!std=i*:-DMSDOS}}} %{!ansi:%{!std=c*:%{!std=i*:-DGO32}}} \ -imacros %s../include/sys/version.h" diff --git a/gcc/config/i386/gas.h b/gcc/config/i386/gas.h index 4c8402368c8a..c627775a8606 100644 --- a/gcc/config/i386/gas.h +++ b/gcc/config/i386/gas.h @@ -48,7 +48,7 @@ Boston, MA 02111-1307, USA. */ /* Specify predefined symbols in preprocessor. */ #define CPP_PREDEFINES "-Dunix" -#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}" +#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}" /* Allow #sccs in preprocessor. */ diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h index b14328f7f0e7..50e019560384 100644 --- a/gcc/config/i386/gnu.h +++ b/gcc/config/i386/gnu.h @@ -8,7 +8,7 @@ -Dunix -Asystem=unix -Asystem=posix -D__gnu_hurd__ -D__GNU__ -Asystem=gnu" #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) \ +#define CPP_SPEC "\ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ %{posix:-D_POSIX_SOURCE} %{bsd:-D_BSD_SOURCE}" diff --git a/gcc/config/i386/i386-interix.h b/gcc/config/i386/i386-interix.h index 630a7b9b7461..101f812c3621 100644 --- a/gcc/config/i386/i386-interix.h +++ b/gcc/config/i386/i386-interix.h @@ -66,7 +66,6 @@ Boston, MA 02111-1307, USA. */ #undef CPP_SPEC /* Write out the correct language type definition for the header files. Unless we have assembler language, write out the symbols for C. - cpp_cpu is an Intel specific variant. See i386.h mieee is an Alpha specific variant. Cross polination a bad idea. */ #define CPP_SPEC "\ @@ -77,7 +76,6 @@ Boston, MA 02111-1307, USA. */ %{.C: -D__LANGUAGE_C_PLUS_PLUS__ -D__LANGUAGE_C_PLUS_PLUS -D__cplusplus} \ %{.m: -D__LANGUAGE_OBJECTIVE_C__ -D__LANGUAGE_OBJECTIVE_C} \ -remap \ -%(cpp_cpu) \ %{posix:-D_POSIX_SOURCE} \ -isystem %$INTERIX_ROOT/usr/include" diff --git a/gcc/config/i386/i386-interix3.h b/gcc/config/i386/i386-interix3.h index 274972b5e4b5..38c6c55290f6 100644 --- a/gcc/config/i386/i386-interix3.h +++ b/gcc/config/i386/i386-interix3.h @@ -27,6 +27,5 @@ Boston, MA 02111-1307, USA. */ %{.cxx: -D__LANGUAGE_C_PLUS_PLUS__ -D__LANGUAGE_C_PLUS_PLUS -D__cplusplus} \ %{.C: -D__LANGUAGE_C_PLUS_PLUS__ -D__LANGUAGE_C_PLUS_PLUS -D__cplusplus} \ %{.m: -D__LANGUAGE_OBJECTIVE_C__ -D__LANGUAGE_OBJECTIVE_C} \ -%(cpp_cpu) \ %{posix:-D_POSIX_SOURCE}" diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index c7fe8d4df6f0..0064adf13c6f 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -474,23 +474,121 @@ extern int x86_prefetch_sse; #endif /* Target CPU builtins. */ -#define TARGET_CPU_CPP_BUILTINS() \ - do \ - { \ - if (TARGET_64BIT) \ - { \ - builtin_assert ("cpu=x86_64"); \ - builtin_assert ("machine=x86_64"); \ - builtin_define ("__x86_64"); \ - builtin_define ("__x86_64__"); \ - } \ - else \ - { \ - builtin_assert ("cpu=i386"); \ - builtin_assert ("machine=i386"); \ - builtin_define_std ("i386"); \ - } \ - } \ +#define TARGET_CPU_CPP_BUILTINS() \ + do \ + { \ + size_t arch_len = strlen (ix86_arch_string); \ + size_t cpu_len = strlen (ix86_cpu_string); \ + int last_arch_char = ix86_arch_string[arch_len - 1]; \ + int last_cpu_char = ix86_cpu_string[cpu_len - 1]; \ + \ + if (TARGET_64BIT) \ + { \ + builtin_assert ("cpu=x86_64"); \ + builtin_assert ("machine=x86_64"); \ + builtin_define ("__x86_64"); \ + builtin_define ("__x86_64__"); \ + } \ + else \ + { \ + builtin_assert ("cpu=i386"); \ + builtin_assert ("machine=i386"); \ + builtin_define_std ("i386"); \ + } \ + \ + /* Built-ins based on -mcpu= (or -march= if no \ + CPU given). */ \ + if (TARGET_386) \ + builtin_define ("__tune_i386__"); \ + else if (TARGET_486) \ + builtin_define ("__tune_i486__"); \ + else if (TARGET_PENTIUM) \ + { \ + builtin_define ("__tune_i586__"); \ + builtin_define ("__tune_pentium__"); \ + if (last_cpu_char == 'x') \ + builtin_define ("__tune_pentium_mmx__"); \ + } \ + else if (TARGET_PENTIUMPRO) \ + { \ + builtin_define ("__tune_i686__"); \ + builtin_define ("__tune_pentiumpro__"); \ + } \ + else if (TARGET_K6) \ + { \ + builtin_define ("__tune_k6__"); \ + if (last_cpu_char == '2') \ + builtin_define ("__tune_k6_2__"); \ + else if (last_cpu_char == '3') \ + builtin_define ("__tune_k6_3__"); \ + } \ + else if (TARGET_ATHLON) \ + { \ + builtin_define ("__tune_athlon__"); \ + /* Only plain "athlon" lacks SSE. */ \ + if (last_cpu_char != 'n') \ + builtin_define ("__tune_athlon_sse__"); \ + } \ + else if (TARGET_PENTIUM4) \ + builtin_define ("__tune_pentium4__"); \ + \ + if (TARGET_MMX) \ + builtin_define ("__MMX__"); \ + if (TARGET_3DNOW) \ + builtin_define ("__3dNOW__"); \ + if (TARGET_3DNOW_A) \ + builtin_define ("__3dNOW_A__"); \ + if (TARGET_SSE) \ + builtin_define ("__SSE__"); \ + if (TARGET_SSE2) \ + builtin_define ("__SSE2__"); \ + \ + /* Built-ins based on -march=. */ \ + if (ix86_arch == PROCESSOR_I486) \ + { \ + builtin_define ("__i486"); \ + builtin_define ("__i486__"); \ + } \ + else if (ix86_arch == PROCESSOR_PENTIUM) \ + { \ + builtin_define ("__i586"); \ + builtin_define ("__i586__"); \ + builtin_define ("__pentium"); \ + builtin_define ("__pentium__"); \ + if (last_arch_char == 'x') \ + builtin_define ("__pentium_mmx__"); \ + } \ + else if (ix86_arch == PROCESSOR_PENTIUMPRO) \ + { \ + builtin_define ("__i686"); \ + builtin_define ("__i686__"); \ + builtin_define ("__pentiumpro"); \ + builtin_define ("__pentiumpro__"); \ + } \ + else if (ix86_arch == PROCESSOR_K6) \ + { \ + \ + builtin_define ("__k6"); \ + builtin_define ("__k6__"); \ + if (last_arch_char == '2') \ + builtin_define ("__k6_2__"); \ + else if (last_arch_char == '3') \ + builtin_define ("__k6_3__"); \ + } \ + else if (ix86_arch == PROCESSOR_ATHLON) \ + { \ + builtin_define ("__athlon"); \ + builtin_define ("__athlon__"); \ + /* Only plain "athlon" lacks SSE. */ \ + if (last_arch_char != 'n') \ + builtin_define ("__athlon_sse__"); \ + } \ + else if (ix86_arch == PROCESSOR_PENTIUM4) \ + { \ + builtin_define ("__pentium4"); \ + builtin_define ("__pentium4__"); \ + } \ + } \ while (0) #define TARGET_CPU_DEFAULT_i386 0 @@ -511,96 +609,6 @@ extern int x86_prefetch_sse; "pentiumpro", "pentium2", "pentium3", \ "pentium4", "k6", "k6-2", "k6-3",\ "athlon", "athlon-4"} -#ifndef CPP_CPU_DEFAULT_SPEC -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_i486 -#define CPP_CPU_DEFAULT_SPEC "-D__tune_i486__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_pentium -#define CPP_CPU_DEFAULT_SPEC "-D__tune_i586__ -D__tune_pentium__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_pentium_mmx -#define CPP_CPU_DEFAULT_SPEC "-D__tune_i586__ -D__tune_pentium__ -D__tune_pentium_mmx__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_pentiumpro -#define CPP_CPU_DEFAULT_SPEC "-D__tune_i686__ -D__tune_pentiumpro__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_pentium2 -#define CPP_CPU_DEFAULT_SPEC "-D__tune_i686__ -D__tune_pentiumpro__\ --D__tune_pentium2__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_pentium3 -#define CPP_CPU_DEFAULT_SPEC "-D__tune_i686__ -D__tune_pentiumpro__\ --D__tune_pentium2__ -D__tune_pentium3__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_pentium4 -#define CPP_CPU_DEFAULT_SPEC "-D__tune_pentium4__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_k6 -#define CPP_CPU_DEFAULT_SPEC "-D__tune_k6__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_k6_2 -#define CPP_CPU_DEFAULT_SPEC "-D__tune_k6__ -D__tune_k6_2__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_k6_3 -#define CPP_CPU_DEFAULT_SPEC "-D__tune_k6__ -D__tune_k6_3__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_athlon -#define CPP_CPU_DEFAULT_SPEC "-D__tune_athlon__" -#endif -#if TARGET_CPU_DEFAULT == TARGET_CPU_DEFAULT_athlon_sse -#define CPP_CPU_DEFAULT_SPEC "-D__tune_athlon__ -D__tune_athlon_sse__" -#endif -#ifndef CPP_CPU_DEFAULT_SPEC -#define CPP_CPU_DEFAULT_SPEC "-D__tune_i386__" -#endif -#endif /* CPP_CPU_DEFAULT_SPEC */ - -#define CPP_CPU_SPEC "\ -%{march=i386:%{!mcpu*:-D__tune_i386__ }}\ -%{march=i486:-D__i486 -D__i486__ %{!mcpu*:-D__tune_i486__ }}\ -%{march=pentium|march=i586:-D__i586 -D__i586__ -D__pentium -D__pentium__ \ - %{!mcpu*:-D__tune_i586__ -D__tune_pentium__ }}\ -%{march=pentium-mmx:-D__i586 -D__i586__ -D__pentium -D__pentium__ \ - -D__pentium__mmx__ \ - %{!mcpu*:-D__tune_i586__ -D__tune_pentium__ -D__tune_pentium_mmx__}}\ -%{march=pentiumpro|march=i686:-D__i686 -D__i686__ \ - -D__pentiumpro -D__pentiumpro__ \ - %{!mcpu*:-D__tune_i686__ -D__tune_pentiumpro__ }}\ -%{march=k6:-D__k6 -D__k6__ %{!mcpu*:-D__tune_k6__ }}\ -%{march=k6-2:-D__k6 -D__k6__ -D__k6_2__ \ - %{!mcpu*:-D__tune_k6__ -D__tune_k6_2__ }}\ -%{march=k6-3:-D__k6 -D__k6__ -D__k6_3__ \ - %{!mcpu*:-D__tune_k6__ -D__tune_k6_3__ }}\ -%{march=athlon|march=athlon-tbird:-D__athlon -D__athlon__ \ - %{!mcpu*:-D__tune_athlon__ }}\ -%{march=athlon-4|march=athlon-xp|march=athlon-mp:-D__athlon -D__athlon__ \ - -D__athlon_sse__ \ - %{!mcpu*:-D__tune_athlon__ -D__tune_athlon_sse__ }}\ -%{march=pentium4:-D__pentium4 -D__pentium4__ %{!mcpu*:-D__tune_pentium4__ }}\ -%{m386|mcpu=i386:-D__tune_i386__ }\ -%{m486|mcpu=i486:-D__tune_i486__ }\ -%{mpentium|mcpu=pentium|mcpu=i586|mcpu=pentium-mmx:-D__tune_i586__ -D__tune_pentium__ }\ -%{mpentiumpro|mcpu=pentiumpro|mcpu=i686|cpu=pentium2|cpu=pentium3:-D__tune_i686__ \ --D__tune_pentiumpro__ }\ -%{mcpu=k6|mcpu=k6-2|mcpu=k6-3:-D__tune_k6__ }\ -%{mcpu=athlon|mcpu=athlon-tbird|mcpu=athlon-4|mcpu=athlon-xp|mcpu=athlon-mp:\ --D__tune_athlon__ }\ -%{mcpu=athlon-4|mcpu=athlon-xp|mcpu=athlon-mp:\ --D__tune_athlon_sse__ }\ -%{mcpu=pentium4:-D__tune_pentium4__ }\ -%{march=athlon-tbird|march=athlon-xp|march=athlon-mp|march=pentium3|march=pentium4:\ --D__SSE__ }\ -%{march=pentium-mmx|march=k6|march=k6-2|march=k6-3\ -|march=athlon|march=athlon-tbird|march=athlon-4|march=athlon-xp\ -|march=athlon-mp|march=pentium2|march=pentium3|march=pentium4: -D__MMX__ }\ -%{march=k6-2|march=k6-3\ -|march=athlon|march=athlon-tbird|march=athlon-4|march=athlon-xp\ -|march=athlon-mp: -D__3dNOW__ }\ -%{march=athlon|march=athlon-tbird|march=athlon-4|march=athlon-xp\ -|march=athlon-mp: -D__3dNOW_A__ }\ -%{msse2: -D__SSE2__ }\ -%{march=pentium4: -D__SSE2__ }\ -%{!march*:%{!mcpu*:%{!m386:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}}}}" #ifndef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) " @@ -621,8 +629,6 @@ extern int x86_prefetch_sse; #endif #define EXTRA_SPECS \ - { "cpp_cpu_default", CPP_CPU_DEFAULT_SPEC }, \ - { "cpp_cpu", CPP_CPU_SPEC }, \ { "cc1_cpu", CC1_CPU_SPEC }, \ SUBTARGET_EXTRA_SPECS diff --git a/gcc/config/i386/i386elf.h b/gcc/config/i386/i386elf.h index 924f8d0ce3e6..46f207850ecd 100644 --- a/gcc/config/i386/i386elf.h +++ b/gcc/config/i386/i386elf.h @@ -45,7 +45,7 @@ Boston, MA 02111-1307, USA. */ #define CPP_PREDEFINES "" #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu)" +#define CPP_SPEC "" #define ENDFILE_SPEC "crtend.o%s" diff --git a/gcc/config/i386/linux-aout.h b/gcc/config/i386/linux-aout.h index 84d4109a424d..51203cda3e5c 100644 --- a/gcc/config/i386/linux-aout.h +++ b/gcc/config/i386/linux-aout.h @@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA. */ #define CPP_PREDEFINES "-Dunix -D__gnu_linux__ -Dlinux -Asystem=posix" #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" +#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" #undef SIZE_TYPE #define SIZE_TYPE "unsigned int" diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h index db1583ff9d56..232a9eec5e4a 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -85,9 +85,9 @@ Boston, MA 02111-1307, USA. */ #undef CPP_SPEC #ifdef USE_GNULIBC_1 -#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" +#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" #else -#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" +#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" #endif #undef CC1_SPEC diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h index 5ea9520c2dcf..52730856e71e 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h @@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA. */ #define CPP_PREDEFINES "-D__ELF__ -Dunix -D__gnu_linux__ -Dlinux -Asystem(posix)" #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} %{!m32:-D__LONG_MAX__=9223372036854775807L}" +#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} %{!m32:-D__LONG_MAX__=9223372036854775807L}" /* Provide a LINK_SPEC. Here we provide support for the special GCC options -static and -shared, which allow us to link things in one diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index 10a34c490039..c5b8701f8984 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -48,7 +48,7 @@ Boston, MA 02111-1307, USA. */ #undef CPP_SPEC #define CPP_SPEC \ - "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{mthreads:-D_MT} \ + "%{posix:-D_POSIX_SOURCE} %{mthreads:-D_MT} \ -D__stdcall=__attribute__((__stdcall__)) \ -D__cdecl=__attribute__((__cdecl__)) \ %{!ansi:-D_stdcall=__attribute__((__stdcall__)) \ diff --git a/gcc/config/i386/netbsd-elf.h b/gcc/config/i386/netbsd-elf.h index b91847f7a4ad..3a2ab8bcd2d0 100644 --- a/gcc/config/i386/netbsd-elf.h +++ b/gcc/config/i386/netbsd-elf.h @@ -52,7 +52,7 @@ Boston, MA 02111-1307, USA. */ /* Provide a CPP_SPEC appropriate for NetBSD. */ #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %(netbsd_cpp_spec)" +#define CPP_SPEC "%(netbsd_cpp_spec)" /* Make gcc agree with */ diff --git a/gcc/config/i386/netbsd.h b/gcc/config/i386/netbsd.h index 89dce21a311f..332e70f1f42b 100644 --- a/gcc/config/i386/netbsd.h +++ b/gcc/config/i386/netbsd.h @@ -17,7 +17,7 @@ { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %(netbsd_cpp_spec)" +#define CPP_SPEC "%(netbsd_cpp_spec)" #undef SIZE_TYPE diff --git a/gcc/config/i386/netbsd64.h b/gcc/config/i386/netbsd64.h index 24448c985158..bd0c607f83d1 100644 --- a/gcc/config/i386/netbsd64.h +++ b/gcc/config/i386/netbsd64.h @@ -56,7 +56,7 @@ Boston, MA 02111-1307, USA. */ /* Provide a CPP_SPEC appropriate for NetBSD. */ #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %(netbsd_cpp_spec)" +#define CPP_SPEC "%(netbsd_cpp_spec)" /* Output assembler code to FILE to call the profiler. */ diff --git a/gcc/config/i386/rtemself.h b/gcc/config/i386/rtemself.h index 7e831b9f73ea..db95d36db851 100644 --- a/gcc/config/i386/rtemself.h +++ b/gcc/config/i386/rtemself.h @@ -28,4 +28,4 @@ Boston, MA 02111-1307, USA. */ -D__ELF__ -D__i386__ -D__USE_INIT_FINI__" #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %{msoft-float:-D_SOFT_FLOAT}" +#define CPP_SPEC "%{msoft-float:-D_SOFT_FLOAT}" diff --git a/gcc/config/i386/sco5.h b/gcc/config/i386/sco5.h index b520159f79ca..818cba84f93a 100644 --- a/gcc/config/i386/sco5.h +++ b/gcc/config/i386/sco5.h @@ -641,7 +641,7 @@ init_section () \ /* You are in a maze of GCC specs ... all alike */ #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) \ +#define CPP_SPEC "\ %{fpic:%{mcoff:%e-fpic is not valid with -mcoff}} \ %{fPIC:%{mcoff:%e-fPIC is not valid with -mcoff}} \ -D__i386 -D__unix -D_SCO_DS=1 -D_M_I386 -D_M_XENIX -D_M_UNIX \ diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h index fedfa55e20be..d860f11de480 100644 --- a/gcc/config/i386/sol2.h +++ b/gcc/config/i386/sol2.h @@ -85,7 +85,6 @@ Boston, MA 02111-1307, USA. */ #undef CPP_SPEC #define CPP_SPEC \ "%{.S:-P} \ - %(cpp_cpu) \ %{pthreads:-D_REENTRANT -D_PTHREADS} \ %{!pthreads:%{threads:-D_REENTRANT -D_SOLARIS_THREADS}} \ %{compat-bsd:-iwithprefixbefore ucbinclude -I/usr/ucbinclude}" diff --git a/gcc/config/i386/sysv3.h b/gcc/config/i386/sysv3.h index 09121cda18a5..07dadb818ed2 100644 --- a/gcc/config/i386/sysv3.h +++ b/gcc/config/i386/sysv3.h @@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. */ #define CPP_PREDEFINES "-Dunix -Asystem=svr3" -#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}" +#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}" /* Writing `int' for a bitfield forces int alignment for the structure. */ diff --git a/gcc/config/i386/sysv4.h b/gcc/config/i386/sysv4.h index 5b92fff4a2f0..f877877cf23a 100644 --- a/gcc/config/i386/sysv4.h +++ b/gcc/config/i386/sysv4.h @@ -142,4 +142,4 @@ Boston, MA 02111-1307, USA. */ #endif #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu)" +#define CPP_SPEC "" diff --git a/gcc/config/i386/sysv5.h b/gcc/config/i386/sysv5.h index 87d6b9c5d779..9b759f407be7 100644 --- a/gcc/config/i386/sysv5.h +++ b/gcc/config/i386/sysv5.h @@ -31,4 +31,4 @@ Boston, MA 02111-1307, USA. */ %{!shared:%{!symbolic:-lc -lcrt}}" #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %{pthread:-D_REENTRANT} %{pthreadT:-D_REENTRANT}" +#define CPP_SPEC "%{pthread:-D_REENTRANT} %{pthreadT:-D_REENTRANT}" diff --git a/gcc/config/i386/uwin.h b/gcc/config/i386/uwin.h index cc2f93b8cc69..b5865ac97871 100644 --- a/gcc/config/i386/uwin.h +++ b/gcc/config/i386/uwin.h @@ -42,7 +42,7 @@ Boston, MA 02111-1307, USA. */ -Asystem=winnt" #undef CPP_SPEC -#define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} \ +#define CPP_SPEC "-remap %{posix:-D_POSIX_SOURCE} \ -include /usr/include/astwin32.h \ -idirafter /usr/gnu/include/mingw32" diff --git a/gcc/config/i386/vxi386.h b/gcc/config/i386/vxi386.h index a4b5944e957c..dafe46a198fb 100644 --- a/gcc/config/i386/vxi386.h +++ b/gcc/config/i386/vxi386.h @@ -36,7 +36,7 @@ Boston, MA 02111-1307, USA. */ %{mcpu=pentium:-DCPU=PENTIUM -DCPU_VARIANT=PENTIUM %(cpp_586)} \ %{mpentiumpro:-DCPU=PENTIUM -DCPU_VARIANT=PENTIUMPRO %(cpp_686)} \ %{mcpu=pentiumpro:-DCPU=PENTIUM -DCPU_VARIANT=PENTIUMPRO %(cpp_686)} \ - %{!mcpu*:%{!m486:%{!mpentium*:-DCPU=I80386 %(cpp_cpu_default)}}}}" + %{!mcpu*:%{!m486:%{!mpentium*:-DCPU=I80386}}}}" #define HANDLE_SYSV_PRAGMA diff --git a/gcc/config/i386/win32.h b/gcc/config/i386/win32.h index a9a8b2db6b14..c03030b6d48f 100644 --- a/gcc/config/i386/win32.h +++ b/gcc/config/i386/win32.h @@ -74,7 +74,7 @@ Boston, MA 02111-1307, USA. */ %{mcygwin:crt0%O%s} %{pg:gcrt0%O%s}}" #undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \ +#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} \ %{!mcygwin:-iwithprefixbefore include/mingw32 -D__MINGW32__} \ %{mcygwin:-D__CYGWIN32__ -D__CYGWIN__}" -- 2.43.5