* i386/386bsd.h, i386/beos-pe.h, i386/bsd386.h, i386/crtdll.h,

	i386/cygwin.h, i386/dgux.h, i386/djgpp-rtems.h, i386/djgpp.h,
	i386/freebsd.h, i386/gnu.h, i386/i386-aout.h, i386/i386-coff.h,
	i386/i386-interix.h, i386/i386elf.h, i386/linux.h, i386/lynx-ng.h,
	i386/lynx.h, i386/mach.h, i386/mingw32.h, i386/moss.h,
	i386/netbsd.h, i386/next.h, i386/openbsd.h, i386/osf1elf.h,
	i386/ptx4-i.h, i386/rtems.h, i386/rtemself.h, i386/sco.h,
	i386/sequent.h, i386/sun.h, i386/sysv4.h, i386/uwin.h, i386/vsta.h,
	i386/vxi386.h, i386/win-nt.h, i386/win32.h:
	Remove -Di386 -Acpu(i386) -Amachine(i386) from CPP_PREDEFINES.

	* i386/osf1elf.h, i386/scodbx.h, i386/seq-sysv3.h, i386/sysv5.h:
	Add %(cpp_cpu) to CPP_SPEC.

	* i386/osf1elf.h, i386/osfelf.h, i386/osfrose.h:
	Add %(cc1_cpu) to CC1_SPEC.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31710 138bc75d-0d04-0410-961f-82ee72b054a4

42 files changed, 65 insertions, 68 deletions

diff --git a/gcc/config/i386/386bsd.h b/gcc/config/i386/386bsd.h
index c4e350da37a..111a89230f7 100644
--- a/gcc/config/i386/386bsd.h
+++ b/gcc/config/i386/386bsd.h
@@ -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}"
diff --git a/gcc/config/i386/beos-pe.h b/gcc/config/i386/beos-pe.h
index 52af628eb81..7184b91918a 100644
--- a/gcc/config/i386/beos-pe.h
+++ b/gcc/config/i386/beos-pe.h
@@ -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}"
diff --git a/gcc/config/i386/bsd386.h b/gcc/config/i386/bsd386.h
index c0dcf87cbdd..0cae90e68c7 100644
--- a/gcc/config/i386/bsd386.h
+++ b/gcc/config/i386/bsd386.h
@@ -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"
diff --git a/gcc/config/i386/crtdll.h b/gcc/config/i386/crtdll.h
index ae353c30599..db479fad4dd 100644
--- a/gcc/config/i386/crtdll.h
+++ b/gcc/config/i386/crtdll.h
@@ -23,13 +23,13 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 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 \
diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index 225c8d11ef6..5152fc2d2e8 100644
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -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
diff --git a/gcc/config/i386/dgux.h b/gcc/config/i386/dgux.h
index 54b29af947b..780777c4c48 100644
--- a/gcc/config/i386/dgux.h
+++ b/gcc/config/i386/dgux.h
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
 #include "i386/sysv4.h"
 
 #ifndef VERSION_INFO2
-#define VERSION_INFO2   "$Revision: 1.7 $"
+#define VERSION_INFO2   "$Revision: 1.8 $"
 #endif
 
 #ifndef VERSION_STRING
@@ -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
diff --git a/gcc/config/i386/djgpp-rtems.h b/gcc/config/i386/djgpp-rtems.h
index b355cc5796a..a4bd03d9f66 100644
--- a/gcc/config/i386/djgpp-rtems.h
+++ b/gcc/config/i386/djgpp-rtems.h
@@ -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
diff --git a/gcc/config/i386/djgpp.h b/gcc/config/i386/djgpp.h
index 38d8e22d5bf..4801c5d8819 100644
--- a/gcc/config/i386/djgpp.h
+++ b/gcc/config/i386/djgpp.h
@@ -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
diff --git a/gcc/config/i386/freebsd-elf.h b/gcc/config/i386/freebsd-elf.h
index 360f844d0e0..b728ae2ae97 100644
--- a/gcc/config/i386/freebsd-elf.h
+++ b/gcc/config/i386/freebsd-elf.h
@@ -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 
diff --git a/gcc/config/i386/freebsd.h b/gcc/config/i386/freebsd.h
index 5492fd18678..a03b43ea093 100644
--- a/gcc/config/i386/freebsd.h
+++ b/gcc/config/i386/freebsd.h
@@ -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}}"
diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
index cd32b928f66..11bca8c385f 100644
--- a/gcc/config/i386/gnu.h
+++ b/gcc/config/i386/gnu.h
@@ -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
diff --git a/gcc/config/i386/i386-aout.h b/gcc/config/i386/i386-aout.h
index e4be8d5dd15..7385bec6d7c 100644
--- a/gcc/config/i386/i386-aout.h
+++ b/gcc/config/i386/i386-aout.h
@@ -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 */
diff --git a/gcc/config/i386/i386-coff.h b/gcc/config/i386/i386-coff.h
index 2e00b7a8907..2fddc3a0788 100644
--- a/gcc/config/i386/i386-coff.h
+++ b/gcc/config/i386/i386-coff.h
@@ -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.  */
 
diff --git a/gcc/config/i386/i386-interix.h b/gcc/config/i386/i386-interix.h
index 70b8bc4bd70..9804ea3bd62 100644
--- a/gcc/config/i386/i386-interix.h
+++ b/gcc/config/i386/i386-interix.h
@@ -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.  
diff --git a/gcc/config/i386/i386elf.h b/gcc/config/i386/i386elf.h
index 2e75310c0c4..40ea9db63b8 100644
--- a/gcc/config/i386/i386elf.h
+++ b/gcc/config/i386/i386elf.h
@@ -34,18 +34,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #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)"
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
index 9ba64c67ee7..c661e37b119 100644
--- a/gcc/config/i386/linux.h
+++ b/gcc/config/i386/linux.h
@@ -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
diff --git a/gcc/config/i386/lynx-ng.h b/gcc/config/i386/lynx-ng.h
index ec4e2961692..3736ea5299e 100644
--- a/gcc/config/i386/lynx-ng.h
+++ b/gcc/config/i386/lynx-ng.h
@@ -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.  */
 
diff --git a/gcc/config/i386/lynx.h b/gcc/config/i386/lynx.h
index 73111f916a5..ca6f044d0ce 100644
--- a/gcc/config/i386/lynx.h
+++ b/gcc/config/i386/lynx.h
@@ -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. */
 
diff --git a/gcc/config/i386/mach.h b/gcc/config/i386/mach.h
index 4b7cf37e54d..f0ede49c2ab 100644
--- a/gcc/config/i386/mach.h
+++ b/gcc/config/i386/mach.h
@@ -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"
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index 9516065dc19..4d445ea6146 100644
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -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
diff --git a/gcc/config/i386/moss.h b/gcc/config/i386/moss.h
index d2548e3a5b9..215172d5b7a 100644
--- a/gcc/config/i386/moss.h
+++ b/gcc/config/i386/moss.h
@@ -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"
diff --git a/gcc/config/i386/netbsd.h b/gcc/config/i386/netbsd.h
index d9f06469e62..ce135ae342b 100644
--- a/gcc/config/i386/netbsd.h
+++ b/gcc/config/i386/netbsd.h
@@ -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"
diff --git a/gcc/config/i386/next.h b/gcc/config/i386/next.h
index bbc0e6b3061..566cba69fbc 100644
--- a/gcc/config/i386/next.h
+++ b/gcc/config/i386/next.h
@@ -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. */
 
diff --git a/gcc/config/i386/openbsd.h b/gcc/config/i386/openbsd.h
index dc84f892c16..1356484e678 100644
--- a/gcc/config/i386/openbsd.h
+++ b/gcc/config/i386/openbsd.h
@@ -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.  */
 
diff --git a/gcc/config/i386/osf1elf.h b/gcc/config/i386/osf1elf.h
index 4ea2d77c76f..f10f83b7437 100644
--- a/gcc/config/i386/osf1elf.h
+++ b/gcc/config/i386/osf1elf.h
@@ -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.  */
diff --git a/gcc/config/i386/osfelf.h b/gcc/config/i386/osfelf.h
index 381ffc26313..cd7f7f96dc2 100644
--- a/gcc/config/i386/osfelf.h
+++ b/gcc/config/i386/osfelf.h
@@ -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 }} \
diff --git a/gcc/config/i386/osfrose.h b/gcc/config/i386/osfrose.h
index 1a2eee53dfd..e9b4d6ff13c 100644
--- a/gcc/config/i386/osfrose.h
+++ b/gcc/config/i386/osfrose.h
@@ -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 }} \
diff --git a/gcc/config/i386/ptx4-i.h b/gcc/config/i386/ptx4-i.h
index 0303014efab..6b0a49ba616 100644
--- a/gcc/config/i386/ptx4-i.h
+++ b/gcc/config/i386/ptx4-i.h
@@ -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
diff --git a/gcc/config/i386/rtems.h b/gcc/config/i386/rtems.h
index 07eaa71b88d..7ed279d963a 100644
--- a/gcc/config/i386/rtems.h
+++ b/gcc/config/i386/rtems.h
@@ -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
diff --git a/gcc/config/i386/rtemself.h b/gcc/config/i386/rtemself.h
index c1c125f7b7f..586fb78e80c 100644
--- a/gcc/config/i386/rtemself.h
+++ b/gcc/config/i386/rtemself.h
@@ -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"
diff --git a/gcc/config/i386/sco.h b/gcc/config/i386/sco.h
index dae2de36544..c085480b700 100644
--- a/gcc/config/i386/sco.h
+++ b/gcc/config/i386/sco.h
@@ -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}"
diff --git a/gcc/config/i386/scodbx.h b/gcc/config/i386/scodbx.h
index e8fed08f303..bcbb48aed5e 100644
--- a/gcc/config/i386/scodbx.h
+++ b/gcc/config/i386/scodbx.h
@@ -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.  */
 
diff --git a/gcc/config/i386/seq-sysv3.h b/gcc/config/i386/seq-sysv3.h
index 4b07db029e7..a1fab334738 100644
--- a/gcc/config/i386/seq-sysv3.h
+++ b/gcc/config/i386/seq-sysv3.h
@@ -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
diff --git a/gcc/config/i386/sequent.h b/gcc/config/i386/sequent.h
index daf62c4a374..8e8fa3d46ef 100644
--- a/gcc/config/i386/sequent.h
+++ b/gcc/config/i386/sequent.h
@@ -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.  */
 
diff --git a/gcc/config/i386/sun.h b/gcc/config/i386/sun.h
index ecc0e8294d2..0cc2ae165ce 100644
--- a/gcc/config/i386/sun.h
+++ b/gcc/config/i386/sun.h
@@ -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.  */
 
diff --git a/gcc/config/i386/sysv4.h b/gcc/config/i386/sysv4.h
index 0c16d2e205a..1bc6f048ffc 100644
--- a/gcc/config/i386/sysv4.h
+++ b/gcc/config/i386/sysv4.h
@@ -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
diff --git a/gcc/config/i386/sysv5.h b/gcc/config/i386/sysv5.h
index 8c4ac625948..e7e283e6bfd 100644
--- a/gcc/config/i386/sysv5.h
+++ b/gcc/config/i386/sysv5.h
@@ -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}"
diff --git a/gcc/config/i386/uwin.h b/gcc/config/i386/uwin.h
index 0588bc0d772..efa4bb8867b 100644
--- a/gcc/config/i386/uwin.h
+++ b/gcc/config/i386/uwin.h
@@ -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} \
diff --git a/gcc/config/i386/vsta.h b/gcc/config/i386/vsta.h
index ee7fab9173f..401c262a793 100644
--- a/gcc/config/i386/vsta.h
+++ b/gcc/config/i386/vsta.h
@@ -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
diff --git a/gcc/config/i386/vxi386.h b/gcc/config/i386/vxi386.h
index 0bd27b4a189..2df3b7fdb68 100644
--- a/gcc/config/i386/vxi386.h
+++ b/gcc/config/i386/vxi386.h
@@ -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.  */
 
diff --git a/gcc/config/i386/win-nt.h b/gcc/config/i386/win-nt.h
index a2d2359464b..56eaeb6a2fc 100644
--- a/gcc/config/i386/win-nt.h
+++ b/gcc/config/i386/win-nt.h
@@ -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"
diff --git a/gcc/config/i386/win32.h b/gcc/config/i386/win32.h
index 68ad31fee72..d31a18e63d5 100644
--- a/gcc/config/i386/win32.h
+++ b/gcc/config/i386/win32.h
@@ -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)"