This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
config/i386/*.h specs cleanup
- To: gcc-patches at gcc dot gnu dot org
- Subject: config/i386/*.h specs cleanup
- From: Zack Weinberg <zack at wolery dot cumb dot org>
- Date: Sat, 29 Jan 2000 10:19:02 -0800
This is a search-and-replace patch on config/i386/*.h which gets rid
of the obnoxious warnings for every file:
foo.c:0: `#machine(i386)' re-asserted
foo.c:0: `#cpu(i386)' re-asserted
The trouble was that CPP_PREDEFINES for many targets includes -Di386
-Amachine(i386) -Acpu(i386), but those are also being done by the
CPP_CPU_SPEC. The duplicate -D switch doesn't cause any trouble, but
the duplicate -A's do.
So, the patch takes -Di386 -Amachine(i386) -Acpu(i386) out of
everyone's CPP_PREDEFINES, and makes sure that everyone's CPP_SPEC
includes %(cpp_cpu). I also fixed the OSF CC1_SPECs to include
%(cc1_cpu) while I was at it.
Warning: completely and utterly untested. (I'm not even sure what
some of these targets are...)
zw
* 386bsd.h, beos-pe.h, bsd386.h, crtdll.h, cygwin.h, dgux.h,
djgpp-rtems.h, djgpp.h, freebsd.h, gnu.h, i386-aout.h,
i386-coff.h, i386-interix.h, i386elf.h, linux.h, lynx-ng.h,
lynx.h, mach.h, mingw32.h, moss.h, netbsd.h, next.h,
openbsd.h, osf1elf.h, ptx4-i.h, rtems.h, rtemself.h, sco.h,
sequent.h, sun.h, sysv4.h, uwin.h, vsta.h, vxi386.h, win-nt.h,
win32.h: Remove -Di386 -Acpu(i386) -Amachine(i386) from
CPP_PREDEFINES.
* osf1elf.h, scodbx.h, seq-sysv3.h, sysv5.h : Add %(cpp_cpu)
to CPP_SPEC.
* osf1elf.h, osfelf.h, osfrose.h: Add %(cc1_cpu) to CC1_SPEC.
===================================================================
Index: i386/386bsd.h
--- i386/386bsd.h 1999/09/15 21:41:14 1.5
+++ i386/386bsd.h 2000/01/29 18:05:09
@@ -9,7 +9,7 @@
#include "i386/perform.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -D____386BSD____ -D__386BSD__ -DBSD_NET2 -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -D____386BSD____ -D__386BSD__ -DBSD_NET2 -Asystem(unix) -Asystem(bsd)"
/* Like the default, except no -lg. */
#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
===================================================================
Index: i386/beos-pe.h
--- i386/beos-pe.h 2000/01/13 00:37:06 1.1
+++ i386/beos-pe.h 2000/01/29 18:05:09
@@ -39,11 +39,11 @@ Boston, MA 02111-1307, USA. */
existing args. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__BEOS__ -D__INTEL__ -Di386 -D_X86_=1 \
+#define CPP_PREDEFINES "-D__BEOS__ -D__INTEL__ -D_X86_=1 \
-D__stdcall=__attribute__((__stdcall__)) \
-D__cdecl=__attribute__((__cdecl__)) \
-D__declspec(x)=__attribute__((x)) \
--Asystem(beos) -Acpu(i386) -Amachine(i386)"
+-Asystem(beos)"
#undef CPP_SPEC
#define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
===================================================================
Index: i386/bsd386.h
--- i386/bsd386.h 1998/12/16 21:03:09 1.6
+++ i386/bsd386.h 2000/01/29 18:05:09
@@ -6,7 +6,8 @@
/* We exist mostly to add -Dbsdi and such to the predefines. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -Dbsdi -D__i386__ -D__bsdi__ -D____386BSD____ -D__386BSD__ -DBSD_NET2 -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -Dbsdi -D____386BSD____ -D__386BSD__\
+ -DBSD_NET2 -Asystem(unix) -Asystem(bsd)"
#undef WCHAR_TYPE
#define WCHAR_TYPE "int"
===================================================================
Index: i386/crtdll.h
--- i386/crtdll.h 2000/01/04 21:11:17 1.8
+++ i386/crtdll.h 2000/01/29 18:05:09
@@ -23,13 +23,13 @@ the Free Software Foundation, 59 Temple
Boston, MA 02111-1307, USA. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -D_WIN32 -DWIN32 -D__WIN32__ \
+#define CPP_PREDEFINES "-D_WIN32 -DWIN32 \
-D__MINGW32__=0.2 -DWINNT -D_X86_=1 -D__STDC__=1\
-D__stdcall=__attribute__((__stdcall__)) \
-D_stdcall=__attribute__((__stdcall__)) \
-D__cdecl=__attribute__((__cdecl__)) \
-D__declspec(x)=__attribute__((x)) \
- -Asystem(winnt) -Acpu(i386) -Amachine(i386)"
+ -Asystem(winnt)"
#undef LIBGCC_SPEC
#define LIBGCC_SPEC \
===================================================================
Index: i386/cygwin.h
--- i386/cygwin.h 2000/01/26 21:22:58 1.16
+++ i386/cygwin.h 2000/01/29 18:05:10
@@ -63,16 +63,13 @@ Boston, MA 02111-1307, USA. */
is that args are not accumulated: each new appearance would clobber any
existing args. */
-#ifdef CPP_PREDEFINES
#undef CPP_PREDEFINES
-#endif
-
-#define CPP_PREDEFINES "-Di386 -D_WIN32 \
+#define CPP_PREDEFINES "-D_WIN32 \
-DWINNT -D_X86_=1 -D__STDC__=1\
-D__stdcall=__attribute__((__stdcall__)) \
-D__cdecl=__attribute__((__cdecl__)) \
-D__declspec(x)=__attribute__((x)) \
- -Asystem(winnt) -Acpu(i386) -Amachine(i386)"
+ -Asystem(winnt)"
/* Normally, -lgcc is not needed since everything in it is in the DLL, but we
want to allow things to be added to it when installing new versions of
===================================================================
Index: i386/dgux.h
--- i386/dgux.h 1999/09/26 21:43:48 1.8
+++ i386/dgux.h 2000/01/29 18:05:10
@@ -144,15 +144,15 @@ Boston, MA 02111-1307, USA. */
operate without installing the header files. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -D__ix86 -Dunix -DDGUX -D__CLASSIFY_TYPE__=2\
- -Asystem(unix) -Asystem(svr4) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-D__ix86 -Dunix -DDGUX -D__CLASSIFY_TYPE__=2\
+ -Asystem(unix) -Asystem(svr4)"
/*
If not -ansi, -traditional, or restricting include files to one
specific source target, specify full DG/UX features.
*/
#undef CPP_SPEC
-#define CPP_SPEC "%{!ansi:%{!traditional:-D__OPEN_NAMESPACE__}}"
+#define CPP_SPEC "%(cpp_cpu) %{!ansi:%{!traditional:-D__OPEN_NAMESPACE__}}"
/* Assembler support (legends for mxdb). */
#undef ASM_SPEC
===================================================================
Index: i386/djgpp-rtems.h
--- i386/djgpp-rtems.h 1999/09/04 15:08:56 1.2
+++ i386/djgpp-rtems.h 2000/01/29 18:05:10
@@ -28,9 +28,8 @@ Boston, MA 02111-1307, USA. */
#ifdef CPP_PREDEFINES
#undef CPP_PREDEFINES
#endif
-#define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DDJGPP=2 -DMSDOS \
- -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386) \
- -Asystem(rtems)"
+#define CPP_PREDEFINES "-Dunix -DGO32 -DDJGPP=2 -DMSDOS \
+ -Asystem(unix) -Asystem(msdos) -Asystem(rtems)"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
===================================================================
Index: i386/djgpp.h
--- i386/djgpp.h 1999/10/15 06:06:56 1.9
+++ i386/djgpp.h 2000/01/29 18:05:10
@@ -56,11 +56,9 @@ Boston, MA 02111-1307, USA. */
(((NAME)[0] == '/') || ((NAME)[0] == '\\') || \
(((NAME)[0] >= 'A') && ((NAME)[0] <= 'z') && ((NAME)[1] == ':')))
-#ifdef CPP_PREDEFINES
#undef CPP_PREDEFINES
-#endif
-#define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DDJGPP=2 -DMSDOS \
- -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -DGO32 -DDJGPP=2 -DMSDOS \
+ -Asystem(unix) -Asystem(msdos)"
/* We need to override link_command_spec in gcc.c so support -Tdjgpp.djl.
This cannot be done in LINK_SPECS as that LINK_SPECS is processed
===================================================================
Index: i386/freebsd-elf.h
--- i386/freebsd-elf.h 2000/01/23 21:43:06 1.21
+++ i386/freebsd-elf.h 2000/01/29 18:05:10
@@ -75,7 +75,8 @@ Boston, MA 02111-1307, USA. */
#define WCHAR_TYPE_SIZE BITS_PER_WORD
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -D__ELF__ -D__FreeBSD__\
+ -Asystem(unix) -Asystem(bsd) -Asystem(FreeBSD)"
/* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add
the magical crtbegin.o file (see crtstuff.c) which provides part
===================================================================
Index: i386/freebsd.h
--- i386/freebsd.h 1999/11/23 06:17:32 1.17
+++ i386/freebsd.h 2000/01/29 18:05:10
@@ -35,7 +35,8 @@ Boston, MA 02111-1307, USA. */
(MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387)
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -D__FreeBSD__\
+ -Asystem(unix) -Asystem(bsd) -Asystem(FreeBSD)"
/* Like the default, except no -lg. */
#define LIB_SPEC "%{!shared:%{!pg:-lc}%{pg:-lc_p}}"
===================================================================
Index: i386/gnu.h
--- i386/gnu.h 1999/07/01 00:51:56 1.7
+++ i386/gnu.h 2000/01/29 18:05:10
@@ -10,7 +10,7 @@
#define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -D__i386__ -DMACH -Asystem(mach) \
+#define CPP_PREDEFINES "-D__ELF__ -DMACH -Asystem(mach) \
-Dunix -Asystem(unix) -Asystem(posix) -D__GNU__ -Asystem(gnu)"
#undef CPP_SPEC
===================================================================
Index: i386/i386-aout.h
--- i386/i386-aout.h 1998/12/16 21:03:25 1.2
+++ i386/i386-aout.h 2000/01/29 18:05:10
@@ -29,6 +29,6 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386"
+#define CPP_PREDEFINES ""
/* end of i386-aout.h */
===================================================================
Index: i386/i386-coff.h
--- i386/i386-coff.h 1998/12/16 21:03:26 1.4
+++ i386/i386-coff.h 2000/01/29 18:05:10
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386"
+#define CPP_PREDEFINES ""
/* We want to be able to get DBX debugging information via -gstabs. */
===================================================================
Index: i386/i386-interix.h
--- i386/i386-interix.h 1999/10/24 19:38:53 1.5
+++ i386/i386-interix.h 2000/01/29 18:05:10
@@ -65,7 +65,7 @@ Boston, MA 02111-1307, USA. */
-D_M_IX86=300 -D_X86_=1 \
-D__stdcall=__attribute__((__stdcall__)) \
-D__cdecl=__attribute__((__cdecl__)) \
- -Asystem(unix) -Asystem(interix) -Asystem(interix) -Acpu(i386) -Amachine(i386)"
+ -Asystem(unix) -Asystem(interix) -Asystem(interix)"
#undef CPP_SPEC
/* Write out the correct language type definition for the header files.
===================================================================
Index: i386/i386elf.h
--- i386/i386elf.h 2000/01/23 21:43:06 1.4
+++ i386/i386elf.h 2000/01/29 18:05:10
@@ -34,18 +34,16 @@ the Free Software Foundation, 675 Mass A
#define TARGET_DEFAULT (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS)
-/* The svr4 ABI for the i386 says that records and unions are returned
+/* The ELF ABI for the i386 says that records and unions are returned
in memory. */
#undef RETURN_IN_MEMORY
#define RETURN_IN_MEMORY(TYPE) \
(TYPE_MODE (TYPE) == BLKmode)
-/* Define which macros to predefine. __svr4__ is our extension. */
/* This used to define X86, but james@bigtex.cactus.org says that
is supposed to be defined optionally by user programs--not by default. */
-#define CPP_PREDEFINES \
- "-D__i386__ -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES ""
#undef CPP_SPEC
#define CPP_SPEC "%(cpp_cpu)"
===================================================================
Index: i386/linux.h
--- i386/linux.h 2000/01/23 21:43:06 1.17
+++ i386/linux.h 2000/01/29 18:05:10
@@ -86,7 +86,7 @@ Boston, MA 02111-1307, USA. */
#define WCHAR_TYPE_SIZE BITS_PER_WORD
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__i386__ -Dlinux -Asystem(posix)"
+#define CPP_PREDEFINES "-D__ELF__ -Dunix -Dlinux -Asystem(posix)"
#undef CPP_SPEC
#ifdef USE_GNULIBC_1
===================================================================
Index: i386/lynx-ng.h
--- i386/lynx-ng.h 1998/12/16 21:03:38 1.2
+++ i386/lynx-ng.h 2000/01/29 18:05:10
@@ -22,7 +22,8 @@ Boston, MA 02111-1307, USA. */
#include <lynx-ng.h>
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -DI386 -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -DI386 -DLynx -DIBITS32 \
+ -Asystem(unix) -Asystem(lynx)"
/* Provide required defaults for linker switches. */
===================================================================
Index: i386/lynx.h
--- i386/lynx.h 1998/12/16 21:03:39 1.2
+++ i386/lynx.h 2000/01/29 18:05:10
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */
#include <lynx.h>
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -DI386 -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-DI386 -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx)"
/* The prefix to add to user-visible assembler symbols. */
===================================================================
Index: i386/mach.h
--- i386/mach.h 1998/12/16 21:03:40 1.2
+++ i386/mach.h 2000/01/29 18:05:10
@@ -10,7 +10,7 @@
#include "i386/perform.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -DMACH -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -DMACH -Asystem(unix) -Asystem(mach)"
/* Specify extra dir to search for include files. */
#define SYSTEM_INCLUDE_DIR "/usr/mach/include"
===================================================================
Index: i386/mingw32.h
--- i386/mingw32.h 2000/01/04 21:11:17 1.13
+++ i386/mingw32.h 2000/01/29 18:05:10
@@ -30,13 +30,13 @@ Boston, MA 02111-1307, USA. */
only difference between the two should be __MSVCRT__ needed to
distinguish MSVC from CRTDLL runtime in mingw headers. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -D_WIN32 -DWIN32 -D__WIN32__ \
- -D__MINGW32__=0.2 -D__MSVCRT__ -DWINNT -D_X86_=1 -D__STDC__=1\
+#define CPP_PREDEFINES "-D_WIN32 -DWIN32 \
+ -D__MINGW32__=0.2 -D__MSVCRT__ -DWINNT -D_X86_=1 \
-D__stdcall=__attribute__((__stdcall__)) \
-D_stdcall=__attribute__((__stdcall__)) \
-D__cdecl=__attribute__((__cdecl__)) \
-D__declspec(x)=__attribute__((x)) \
- -Asystem(winnt) -Acpu(i386) -Amachine(i386)"
+ -Asystem(winnt)"
/* Specific a different directory for the standard include files. */
#undef STANDARD_INCLUDE_DIR
===================================================================
Index: i386/moss.h
--- i386/moss.h 1999/01/11 13:34:01 1.3
+++ i386/moss.h 2000/01/29 18:05:10
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA. */
#include "i386/linux.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -Di386 -Dmoss -Asystem(posix) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-D__ELF__ -Dmoss -Asystem(posix)"
#undef STARTFILE_SPEC
#define STARTFILE_SPEC "crt0.o%s"
===================================================================
Index: i386/netbsd.h
--- i386/netbsd.h 1999/03/23 21:34:49 1.10
+++ i386/netbsd.h 2000/01/29 18:05:10
@@ -15,7 +15,8 @@
(MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387)
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -D__NetBSD__ -Asystem(unix) -Asystem(NetBSD) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -D__NetBSD__ \
+ -Asystem(unix) -Asystem(bsd) -Asystem(NetBSD)"
#undef SIZE_TYPE
#define SIZE_TYPE "unsigned int"
===================================================================
Index: i386/next.h
--- i386/next.h 1999/01/19 20:33:00 1.5
+++ i386/next.h 2000/01/29 18:05:10
@@ -133,7 +133,8 @@ Boston, MA 02111-1307, USA. */
/* Names to predefine in the preprocessor for this target machine. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -DNeXT -Dunix -D__MACH__ -D__LITTLE_ENDIAN__ -D__ARCHITECTURE__=\"i386\" -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-DNeXT -Dunix -D__MACH__ -D__LITTLE_ENDIAN__ \
+ -D__ARCHITECTURE__=\"i386\" -Asystem(unix) -Asystem(mach)"
/* This accounts for the return pc and saved fp on the i386. */
===================================================================
Index: i386/openbsd.h
--- i386/openbsd.h 1999/04/08 00:32:14 1.4
+++ i386/openbsd.h 2000/01/29 18:05:10
@@ -37,7 +37,8 @@ Boston, MA 02111-1307, USA. */
(MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387)
/* Run-time target specifications */
-#define CPP_PREDEFINES "-D__unix__ -D__i386__ -D__OpenBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-D__unix__ -D__OpenBSD__ \
+ -Asystem(unix) -Asystem(bsd) -Asystem(OpenBSD)"
/* Layout of source language data types. */
===================================================================
Index: i386/osf1elf.h
--- i386/osf1elf.h 1999/12/28 16:36:09 1.4
+++ i386/osf1elf.h 2000/01/29 18:05:10
@@ -18,6 +18,7 @@
/* Note, -fpic and -fPIC are equivalent */
#undef CPP_SPEC
#define CPP_SPEC "\
+%(cpp_cpu)
%{fpic: -D__SHARED__} %{fPIC: %{!fpic: -D__SHARED__}} \
%{.S: %{!ansi:%{!traditional:%{!traditional-cpp:%{!ftraditional: -traditional}}}}} \
%{.S: -D__LANGUAGE_ASSEMBLY %{!ansi:-DLANGUAGE_ASSEMBLY}} \
@@ -29,7 +30,7 @@
/* -mmcount or -mno-mcount should be used with -pg or -p */
#undef CC1_SPEC
-#define CC1_SPEC "%{p: %{!mmcount: %{!mno-mcount: -mno-mcount }}} \
+#define CC1_SPEC "%(cc1_cpu) %{p: %{!mmcount: %{!mno-mcount: -mno-mcount }}} \
%{!p: %{pg: %{!mmcount: %{!mno-mcount: -mno-mcount }}}}"
/* Note, -D__NO_UNDERSCORES__ -D__ELF__ are provided in the older version of
@@ -37,7 +38,8 @@
*/
#undef CPP_PREDEFINES
#define CPP_PREDEFINES \
- "-D__NO_UNDERSCORES__ -D__ELF__ -DOSF -DOSF1 -Di386 -Dunix -Asystem(xpg4) -Asystem(osf1) -Acpu(i386) -Amachine(i386)"
+ "-D__NO_UNDERSCORES__ -D__ELF__ -DOSF -DOSF1 -Dunix \
+ -Asystem(unix) -Asystem(xpg4) -Asystem(osf1)"
/* current OSF/1 doesn't provide separate crti.o and gcrti.o (and also, crtn.o
and gcrtn.o) for profile. */
===================================================================
Index: i386/osfelf.h
--- i386/osfelf.h 1998/12/16 21:03:51 1.3
+++ i386/osfelf.h 2000/01/29 18:05:10
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA. */
/* Turn on -pic-extern by default for OSF/rose, -fpic for ELF. */
#undef CC1_SPEC
-#define CC1_SPEC "\
+#define CC1_SPEC "%(cc1_cpu) \
%{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
%{!melf: %{!mrose: -melf }} \
%{!mrose: %{!munderscores: %{!mno-underscores: -mno-underscores }} \
===================================================================
Index: i386/osfrose.h
--- i386/osfrose.h 2000/01/23 21:43:06 1.10
+++ i386/osfrose.h 2000/01/29 18:05:10
@@ -104,7 +104,7 @@ Boston, MA 02111-1307, USA. */
/* Turn on -pic-extern by default for OSF/rose, -fpic for ELF. */
#undef CC1_SPEC
-#define CC1_SPEC "\
+#define CC1_SPEC "%(cc1_cpu) \
%{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
%{!melf: %{!mrose: -mrose }} \
%{melf: %{!munderscores: %{!mno-underscores: -mno-underscores }} \
===================================================================
Index: i386/ptx4-i.h
--- i386/ptx4-i.h 2000/01/23 21:43:06 1.6
+++ i386/ptx4-i.h 2000/01/29 18:05:11
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA. */
/* This used to define X86, but james@bigtex.cactus.org says that
is supposed to be defined optionally by user programs--not by default. */
#define CPP_PREDEFINES \
- "-Di386 -Dunix -D_SEQUENT_ -Asystem(unix) -Asystem(ptx4) -Acpu(i386) -Amachine(i386)"
+ "-Dunix -D_SEQUENT_ -Asystem(unix) -Asystem(ptx4)"
/* This is how to output assembly code to define a `float' constant.
We always have to use a .long pseudo-op to do this because the native
===================================================================
Index: i386/rtems.h
--- i386/rtems.h 2000/01/05 07:10:34 1.9
+++ i386/rtems.h 2000/01/29 18:05:11
@@ -24,8 +24,7 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -Drtems -D__rtems__ \
- -Asystem(rtems) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Drtems -D__rtems__ -Asystem(rtems)"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
===================================================================
Index: i386/rtemself.h
--- i386/rtemself.h 2000/01/23 21:43:06 1.6
+++ i386/rtemself.h 2000/01/29 18:05:11
@@ -83,8 +83,7 @@ Boston, MA 02111-1307, USA. */
#define WCHAR_TYPE_SIZE BITS_PER_WORD
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -Drtems -D__rtems__ \
- -Asystem(rtems) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Drtems -D__rtems__ -Asystem(rtems)"
/* Get perform_* macros to build libgcc.a. */
#include "i386/perform.h"
===================================================================
Index: i386/sco.h
--- i386/sco.h 1999/09/15 21:41:14 1.6
+++ i386/sco.h 2000/01/29 18:05:11
@@ -55,7 +55,7 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(svr3)"
+#define CPP_PREDEFINES "-DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(svr3)"
#undef CPP_SPEC
#define CPP_SPEC "%(cpp_cpu) %{scointl:-DM_INTERNAT}"
===================================================================
Index: i386/scodbx.h
--- i386/scodbx.h 1999/09/15 21:41:14 1.5
+++ i386/scodbx.h 2000/01/29 18:05:11
@@ -53,7 +53,7 @@ Boston, MA 02111-1307, USA. */
#define CPP_PREDEFINES "-Dunix -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(svr3)"
#undef CPP_SPEC
-#define CPP_SPEC " -Acpu(i386) -Amachine(i386) %{scointl:-DM_INTERNAT}"
+#define CPP_SPEC "%(cpp_cpu) %{scointl:-DM_INTERNAT}"
/* This spec is used for telling cpp whether char is signed or not. */
===================================================================
Index: i386/seq-sysv3.h
--- i386/seq-sysv3.h 1999/09/15 21:41:14 1.3
+++ i386/seq-sysv3.h 2000/01/29 18:05:11
@@ -19,7 +19,7 @@
%{fshared-data:-lpps -lseq} -lc crtend.o%s"
#undef CPP_SPEC
-#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} -D_SEQUENT_=1"
+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} -D_SEQUENT_=1"
/* Although the .init section is used, it is not automatically invoked.
This because the _start() function in /lib/crt0.o never calls anything
===================================================================
Index: i386/sequent.h
--- i386/sequent.h 2000/01/23 21:43:06 1.5
+++ i386/sequent.h 2000/01/29 18:05:11
@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */
-#define CPP_PREDEFINES "-Dunix -Di386 -Dsequent -Asystem(unix) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -Dsequent -Asystem(unix)"
/* Pass -Z and -ZO options to the linker. */
===================================================================
Index: i386/sun.h
--- i386/sun.h 1998/12/16 21:04:15 1.2
+++ i386/sun.h 2000/01/29 18:05:11
@@ -44,7 +44,7 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */
-#define CPP_PREDEFINES "-Dunix -Di386 -Dsun386 -Dsun -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -Dsun386 -Dsun -Asystem(unix) -Asystem(bsd)"
/* Allow #sccs in preprocessor. */
===================================================================
Index: i386/sysv4.h
--- i386/sysv4.h 2000/01/23 21:43:06 1.7
+++ i386/sysv4.h 2000/01/29 18:05:11
@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA. */
/* This used to define X86, but james@bigtex.cactus.org says that
is supposed to be defined optionally by user programs--not by default. */
#define CPP_PREDEFINES \
- "-Di386 -Dunix -D__svr4__ -Asystem(unix) -Asystem(svr4) -Acpu(i386) -Amachine(i386)"
+ "-Dunix -D__svr4__ -Asystem(unix) -Asystem(svr4)"
/* This is how to output assembly code to define a `float' constant.
We always have to use a .long pseudo-op to do this because the native
===================================================================
Index: i386/sysv5.h
--- i386/sysv5.h 2000/01/12 16:31:32 1.3
+++ i386/sysv5.h 2000/01/29 18:05:11
@@ -33,4 +33,4 @@ Boston, MA 02111-1307, USA. */
%{!shared:%{!symbolic:-lc -lcrt}}"
#undef CPP_SPEC
-#define CPP_SPEC "%{pthread:-D_REENTRANT} %{pthreadT:-D_REENTRANT}"
+#define CPP_SPEC "%(cpp_cpu) %{pthread:-D_REENTRANT} %{pthreadT:-D_REENTRANT}"
===================================================================
Index: i386/uwin.h
--- i386/uwin.h 1999/12/14 06:57:48 1.5
+++ i386/uwin.h 2000/01/29 18:05:11
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA. */
#define MD_STARTFILE_PREFIX "/usr/gnu/lib/"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__i386__ -D_WIN32 -D__WIN32__ \
+#define CPP_PREDEFINES "-D_WIN32 -D__WIN32__ \
-D_UWIN -DWINNT -D_X86_=1 -D__STDC__=1 \
-D__UWIN__ -D__MSVCRT__ \
-D_STD_INCLUDE_DIR=mingw32 \
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA. */
_D_stdcall=__attribute__((__stdcall__)) \
-D__cdecl=__attribute__((__cdecl__)) \
-D__declspec(x)=__attribute__((x)) \
- -Asystem(winnt) -Acpu(i386) -Amachine(i386)"
+ -Asystem(winnt)"
#undef CPP_SPEC
#define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
===================================================================
Index: i386/vsta.h
--- i386/vsta.h 1998/12/16 21:04:45 1.2
+++ i386/vsta.h 2000/01/29 18:05:11
@@ -26,8 +26,7 @@ Boston, MA 02111-1307, USA. */
#ifdef CPP_PREDEFINES
#undef CPP_PREDEFINES
#endif
-#define CPP_PREDEFINES "-Dunix -Di386 -DVSTA \
- -Asystem(unix) -Asystem(vsta) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -DVSTA -Asystem(unix) -Asystem(vsta)"
#undef EXTRA_SECTIONS
#define EXTRA_SECTIONS in_ctor, in_dtor
===================================================================
Index: i386/vxi386.h
--- i386/vxi386.h 1999/04/13 21:30:32 1.3
+++ i386/vxi386.h 2000/01/29 18:05:11
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA. */
#define HANDLE_SYSV_PRAGMA
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__vxworks -D__i386__"
+#define CPP_PREDEFINES "-D__vxworks"
/* VxWorks does all the library stuff itself. */
===================================================================
Index: i386/win-nt.h
--- i386/win-nt.h 1999/09/15 21:41:14 1.5
+++ i386/win-nt.h 2000/01/29 18:05:11
@@ -27,12 +27,12 @@ Boston, MA 02111-1307, USA. */
#ifdef CPP_PREDEFINES
#undef CPP_PREDEFINES
#endif
-#define CPP_PREDEFINES "-Dunix -Di386 -DWIN32 -D_WIN32 \
+#define CPP_PREDEFINES "-Dunix -DWIN32 -D_WIN32 \
-DWINNT -D_M_IX86=300 -D_X86_=1 -D__STDC__=0 -DALMOST_STDC -D_MSC_VER=800 \
-D__stdcall=__attribute__((__stdcall__)) \
-D__cdecl=__attribute__((__cdecl__)) \
-D_cdecl=__attribute__((__cdecl__)) \
- -Asystem(unix) -Asystem(winnt) -Acpu(i386) -Amachine(i386)"
+ -Asystem(unix) -Asystem(winnt)"
#define SIZE_TYPE "unsigned int"
#define PTRDIFF_TYPE "int"
===================================================================
Index: i386/win32.h
--- i386/win32.h 1999/09/15 21:41:14 1.8
+++ i386/win32.h 2000/01/29 18:05:11
@@ -57,8 +57,7 @@ Boston, MA 02111-1307, USA. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D_WIN32 \
- -DWINNT -D_X86_=1 -D__STDC__=1\
+#define CPP_PREDEFINES "-D_WIN32 -DWINNT -D_X86_=1 \
-D__stdcall=__attribute__((__stdcall__)) \
-D__cdecl=__attribute__((__cdecl__)) \
-Asystem(winnt)"