summaryrefslogtreecommitdiff
path: root/gcc/config
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/config')
-rw-r--r--gcc/config/a29k/a29k.h2
-rw-r--r--gcc/config/a29k/unix.h2
-rw-r--r--gcc/config/alpha/alpha.h2
-rw-r--r--gcc/config/arm/arm.h4
-rw-r--r--gcc/config/clipper/clix.h2
-rw-r--r--gcc/config/convex/convex.h2
-rw-r--r--gcc/config/elxsi/elxsi.h2
-rw-r--r--gcc/config/fx80/fx80.h2
-rw-r--r--gcc/config/gmicro/gmicro.h4
-rw-r--r--gcc/config/h8300/h8300.h2
-rw-r--r--gcc/config/i386/386bsd.h2
-rw-r--r--gcc/config/i386/aix386ng.h2
-rw-r--r--gcc/config/i386/gas.h2
-rw-r--r--gcc/config/i386/go32.h3
-rw-r--r--gcc/config/i386/linux.h2
-rw-r--r--gcc/config/i386/lynx.h2
-rw-r--r--gcc/config/i386/mach.h2
-rw-r--r--gcc/config/i386/next.h2
-rw-r--r--gcc/config/i386/osfelf.h2
-rw-r--r--gcc/config/i386/osfrose.h2
-rw-r--r--gcc/config/i386/sco.h2
-rw-r--r--gcc/config/i386/sco4.h2
-rw-r--r--gcc/config/i386/sco4dbx.h2
-rw-r--r--gcc/config/i386/scodbx.h2
-rw-r--r--gcc/config/i386/sequent.h2
-rw-r--r--gcc/config/i386/sun.h2
-rw-r--r--gcc/config/i386/sysv3.h2
-rw-r--r--gcc/config/i386/sysv4.h2
-rw-r--r--gcc/config/i860/fx2800.h2
-rw-r--r--gcc/config/i860/i860.h2
-rw-r--r--gcc/config/i860/mach.h2
-rw-r--r--gcc/config/i860/sysv3.h2
-rw-r--r--gcc/config/i860/sysv4.h2
-rw-r--r--gcc/config/i960/i960.h2
-rw-r--r--gcc/config/m68k/3b1.h2
-rw-r--r--gcc/config/m68k/3b1g.h2
-rw-r--r--gcc/config/m68k/altos3068.h2
-rw-r--r--gcc/config/m68k/apollo68.h2
-rw-r--r--gcc/config/m68k/crds.h4
-rw-r--r--gcc/config/m68k/ctix.h2
-rw-r--r--gcc/config/m68k/dpx2.h6
-rw-r--r--gcc/config/m68k/hp2bsd.h2
-rw-r--r--gcc/config/m68k/hp320.h2
-rw-r--r--gcc/config/m68k/hp3bsd.h2
-rw-r--r--gcc/config/m68k/hp3bsd44.h2
-rw-r--r--gcc/config/m68k/isi.h2
-rw-r--r--gcc/config/m68k/lynx.h2
-rw-r--r--gcc/config/m68k/m68kv4.h2
-rw-r--r--gcc/config/m68k/mot3300.h2
-rw-r--r--gcc/config/m68k/news.h16
-rw-r--r--gcc/config/m68k/next.h2
-rw-r--r--gcc/config/m68k/pbb.h2
-rw-r--r--gcc/config/m68k/plexus.h2
-rw-r--r--gcc/config/m68k/sun2.h2
-rw-r--r--gcc/config/m68k/sun3.h2
-rw-r--r--gcc/config/m68k/sun3mach.h2
-rw-r--r--gcc/config/m68k/tower-as.h2
-rw-r--r--gcc/config/m68k/tower.h10
-rw-r--r--gcc/config/m88k/dgux.h2
-rw-r--r--gcc/config/m88k/luna.h2
-rw-r--r--gcc/config/m88k/m88k.h2
-rw-r--r--gcc/config/m88k/sysv3.h2
-rw-r--r--gcc/config/m88k/sysv4.h2
-rw-r--r--gcc/config/mips/bsd-4.h6
-rw-r--r--gcc/config/mips/bsd-5.h6
-rw-r--r--gcc/config/mips/dec-osf1.h6
-rw-r--r--gcc/config/mips/iris3.h4
-rw-r--r--gcc/config/mips/mips.h3
-rw-r--r--gcc/config/mips/news4.h6
-rw-r--r--gcc/config/mips/news5.h4
-rw-r--r--gcc/config/mips/osfrose.h4
-rw-r--r--gcc/config/mips/svr3-4.h6
-rw-r--r--gcc/config/mips/svr3-5.h6
-rw-r--r--gcc/config/mips/svr4-4.h6
-rw-r--r--gcc/config/mips/svr4-5.h3
-rw-r--r--gcc/config/mips/ultrix.h6
-rw-r--r--gcc/config/ns32k/encore.h2
-rw-r--r--gcc/config/ns32k/merlin.h3
-rw-r--r--gcc/config/ns32k/pc532-mach.h2
-rw-r--r--gcc/config/ns32k/pc532.h2
-rw-r--r--gcc/config/ns32k/sequent.h2
-rw-r--r--gcc/config/ns32k/tek6000.h5
-rw-r--r--gcc/config/ns32k/tek6100.h3
-rw-r--r--gcc/config/ns32k/tek6200.h3
-rw-r--r--gcc/config/pa/pa-hpux.h2
-rw-r--r--gcc/config/pa/pa-hpux7.h2
-rw-r--r--gcc/config/pa/pa-osf.h2
-rw-r--r--gcc/config/pa/pa.h2
-rw-r--r--gcc/config/pyr/pyr.h2
-rw-r--r--gcc/config/romp/romp.h2
-rw-r--r--gcc/config/rs6000/aix31.h2
-rw-r--r--gcc/config/rs6000/mach.h2
-rw-r--r--gcc/config/rs6000/rs6000.h2
-rw-r--r--gcc/config/sh/sh.h2
-rw-r--r--gcc/config/sparc/lite.h2
-rw-r--r--gcc/config/sparc/lynx.h2
-rw-r--r--gcc/config/sparc/pbd.h2
-rw-r--r--gcc/config/sparc/sol2.h3
-rw-r--r--gcc/config/sparc/sparc.h4
-rw-r--r--gcc/config/sparc/sysv4.h3
-rw-r--r--gcc/config/spur/spur.h2
-rw-r--r--gcc/config/tahoe/harris.h2
-rw-r--r--gcc/config/tahoe/tahoe.h2
-rw-r--r--gcc/config/vax/ultrix.h2
-rw-r--r--gcc/config/vax/vax.h2
-rw-r--r--gcc/config/vax/vaxv.h3
-rw-r--r--gcc/config/vax/vms.h2
-rw-r--r--gcc/config/we32k/we32k.h2
108 files changed, 168 insertions, 132 deletions
diff --git a/gcc/config/a29k/a29k.h b/gcc/config/a29k/a29k.h
index 3a2d58e1d33..d7b600054c3 100644
--- a/gcc/config/a29k/a29k.h
+++ b/gcc/config/a29k/a29k.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-D_AM29K -D_AM29000 -D_EPI"
+#define CPP_PREDEFINES "-D_AM29K -D_AM29000 -D_EPI -Acpu(a29k) -Amachine(a29k)"
/* Print subsidiary information on the compiler version in use. */
#define TARGET_VERSION
diff --git a/gcc/config/a29k/unix.h b/gcc/config/a29k/unix.h
index ca77015437f..d5562b0d12f 100644
--- a/gcc/config/a29k/unix.h
+++ b/gcc/config/a29k/unix.h
@@ -31,7 +31,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define TARGET_DEFAULT (1+2+8+64)
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dam29k -Da29k -Dam29000"
+#define CPP_PREDEFINES "-Dam29k -Da29k -Dam29000 -Asystem(unix) -Acpu(a29k) -Amachine(a29k)"
#undef CPP_SPEC
#define CPP_SPEC "%{!m29000:-Dam29050 -D__am29050__}"
diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index 4e63134f950..1bf61e383bf 100644
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define CPP_PREDEFINES "\
-Dunix -D__osf__ -D__alpha -D__alpha__ -D_LONGLONG -DSYSTYPE_BSD \
--D_SYSTYPE_BSD"
+-D_SYSTYPE_BSD -Asystem(unix) -Asystem(xpg4) -Acpu(alpha) -Amachine(alpha)"
/* Write out the correct language type definition for the header files. */
#define CPP_SPEC "\
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index e2e06918524..3cb6a5286f3 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -43,9 +43,9 @@ extern char *output_arithmetic_with_immediate_multiply ();
"%{pg:/usr/lib/gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}"
#ifdef riscos
-#define CPP_PREDEFINES "-Darm -Driscos"
+#define CPP_PREDEFINES "-Darm -Driscos -Acpu(arm) -Amachine(arm)"
#else
-#define CPP_PREDEFINES "-Darm -Driscix -Dunix"
+#define CPP_PREDEFINES "-Darm -Driscix -Dunix -Asystem(unix) -Acpu(arm) -Amachine(arm)"
#endif
/* Run-time Target Specification. */
diff --git a/gcc/config/clipper/clix.h b/gcc/config/clipper/clix.h
index 0f045de488d..a60f94dd2cc 100644
--- a/gcc/config/clipper/clix.h
+++ b/gcc/config/clipper/clix.h
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dclipper -Dunix"
+#define CPP_PREDEFINES "-Dclipper -Dunix -Asystem(unix) -Asystem(svr3) -Acpu(clipper) -Amachine(clipper)"
#undef STARTFILE_SPEC
#define STARTFILE_SPEC \
diff --git a/gcc/config/convex/convex.h b/gcc/config/convex/convex.h
index 579b9c6eb13..4c3749e9110 100644
--- a/gcc/config/convex/convex.h
+++ b/gcc/config/convex/convex.h
@@ -94,7 +94,7 @@ extern int target_flags;
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dconvex -Dunix"
+#define CPP_PREDEFINES "-Dconvex -Dunix -Asystem(unix) -Acpu(convex) -Amachine(convex)"
/* Print subsidiary information on the compiler version in use. */
diff --git a/gcc/config/elxsi/elxsi.h b/gcc/config/elxsi/elxsi.h
index c09e2c059ef..7589c461906 100644
--- a/gcc/config/elxsi/elxsi.h
+++ b/gcc/config/elxsi/elxsi.h
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Delxsi -Dunix"
+#define CPP_PREDEFINES "-Delxsi -Dunix -Asystem(unix) -Acpu(elxsi) -Amachine(elxsi)"
/* Print subsidiary information on the compiler version in use. */
diff --git a/gcc/config/fx80/fx80.h b/gcc/config/fx80/fx80.h
index 06acdfd0106..68033985d0c 100644
--- a/gcc/config/fx80/fx80.h
+++ b/gcc/config/fx80/fx80.h
@@ -26,7 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -Dalliant -Dunix"
+#define CPP_PREDEFINES "-Dmc68000 -Dalliant -Dunix -Asystem(unix) -Acpu(m68k) -Amachine(m68k)"
/* Print subsidiary information on the compiler version in use. */
diff --git a/gcc/config/gmicro/gmicro.h b/gcc/config/gmicro/gmicro.h
index 683550a55bf..834c57711dd 100644
--- a/gcc/config/gmicro/gmicro.h
+++ b/gcc/config/gmicro/gmicro.h
@@ -31,7 +31,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dgmicro"
+#define CPP_PREDEFINES "-Dgmicro -Acpu(tron) -Amachine(tron)"
/* #define CPP_SPEC ** currently not defined **/
@@ -168,7 +168,7 @@ extern int target_flags;
#define BIGGEST_ALIGNMENT 32
/* Set this non-zero if move instructions will actually fail to work
- when given unaligned data. */
+ when given unaligned data.
Unaligned data is allowed on Gmicro, though the access is slow. */
#define STRICT_ALIGNMENT 1
diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h
index f0a2fbf946d..0c1c87e0e42 100644
--- a/gcc/config/h8300/h8300.h
+++ b/gcc/config/h8300/h8300.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-D__H8300__ -D_DOUBLE_IS_32BITS"
+#define CPP_PREDEFINES "-D__H8300__ -D_DOUBLE_IS_32BITS -Acpu(h8300) -Amachine(h8300)"
#define LIB_SPEC "%{mrelax:-relax} %{g:-lg} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p} "
diff --git a/gcc/config/i386/386bsd.h b/gcc/config/i386/386bsd.h
index f7fbac12425..cdab5f57c88 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"
+#define CPP_PREDEFINES "-Dunix -Di386 -D____386BSD____ -D__386BSD__ -DBSD_NET2 -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
/* Like the default, except no -lg. */
#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
diff --git a/gcc/config/i386/aix386ng.h b/gcc/config/i386/aix386ng.h
index 16d687540e3..c817cecce8f 100644
--- a/gcc/config/i386/aix386ng.h
+++ b/gcc/config/i386/aix386ng.h
@@ -43,7 +43,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Specify predefined symbols in preprocessor. */
-#define CPP_PREDEFINES "-Dps2 -Dunix -Di386"
+#define CPP_PREDEFINES "-Dps2 -Dunix -Di386 -Asystem(unix) -Asystem(aix) -Acpu(i386) -Amachine(i386)"
#define CPP_SPEC \
"%{posix:-D_POSIX_SOURCE}%{!posix:-DAIX} -D_I386 -D_AIX -D_MBCS"
diff --git a/gcc/config/i386/gas.h b/gcc/config/i386/gas.h
index 7dc3da061af..b1cd4faf370 100644
--- a/gcc/config/i386/gas.h
+++ b/gcc/config/i386/gas.h
@@ -55,7 +55,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Specify predefined symbols in preprocessor. */
-#define CPP_PREDEFINES "-Dunix -Di386"
+#define CPP_PREDEFINES "-Dunix -Di386 -Asystem(unix) -Acpu(i386) -Amachine(i386)"
#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
/* Allow #sccs in preprocessor. */
diff --git a/gcc/config/i386/go32.h b/gcc/config/i386/go32.h
index 6e8aa915662..a7c903998f0 100644
--- a/gcc/config/i386/go32.h
+++ b/gcc/config/i386/go32.h
@@ -7,4 +7,5 @@
#ifdef CPP_PREDEFINES
#undef CPP_PREDEFINES
#endif
-#define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DMSDOS"
+#define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DMSDOS \
+ -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386)"
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
index 19580673eaa..18513a6c347 100644
--- a/gcc/config/i386/linux.h
+++ b/gcc/config/i386/linux.h
@@ -25,7 +25,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -Dlinux"
+#define CPP_PREDEFINES "-Dunix -Di386 -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(i386) -Amachine(i386)"
#undef CPP_SPEC
#if TARGET_CPU_DEFAULT == 2
diff --git a/gcc/config/i386/lynx.h b/gcc/config/i386/lynx.h
index f5fab719b61..f837f68ebf8 100644
--- a/gcc/config/i386/lynx.h
+++ b/gcc/config/i386/lynx.h
@@ -21,4 +21,4 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "lynx.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -DI386 -DLynx -DIBITS32"
+#define CPP_PREDEFINES "-Dunix -Di386 -DI386 -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx) -Acpu(i386) -Amachine(i386)"
diff --git a/gcc/config/i386/mach.h b/gcc/config/i386/mach.h
index 61a698836bc..4b7cf37e54d 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"
+#define CPP_PREDEFINES "-Dunix -Di386 -DMACH -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386)"
/* Specify extra dir to search for include files. */
#define SYSTEM_INCLUDE_DIR "/usr/mach/include"
diff --git a/gcc/config/i386/next.h b/gcc/config/i386/next.h
index a0c30160fa8..c59838fac47 100644
--- a/gcc/config/i386/next.h
+++ b/gcc/config/i386/next.h
@@ -110,7 +110,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, 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\""
+#define CPP_PREDEFINES "-Di386 -DNeXT -Dunix -D__MACH__ -D__LITTLE_ENDIAN__ -D__ARCHITECTURE__=\"i386\" -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386)"
/* This accounts for the return pc and saved fp on the i386. */
diff --git a/gcc/config/i386/osfelf.h b/gcc/config/i386/osfelf.h
index d7c6c8700ab..79fac938814 100644
--- a/gcc/config/i386/osfelf.h
+++ b/gcc/config/i386/osfelf.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "config/i386/osfrose.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Di386 -Asystem(unix) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Di386 -Asystem(unix) -Asystem(xpg4) -Acpu(i386) -Amachine(i386)"
#undef CPP_SPEC
#define CPP_SPEC "\
diff --git a/gcc/config/i386/osfrose.h b/gcc/config/i386/osfrose.h
index 5d773afc2eb..92ff47ebac7 100644
--- a/gcc/config/i386/osfrose.h
+++ b/gcc/config/i386/osfrose.h
@@ -74,7 +74,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Change default predefines. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Di386 -Asystem(unix) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Di386 -Asystem(unix) -Asystem(xpg4) -Acpu(i386) -Amachine(i386)"
#undef CPP_SPEC
#define CPP_SPEC "\
diff --git a/gcc/config/i386/sco.h b/gcc/config/i386/sco.h
index 6751af3d6e2..ef2bac6e999 100644
--- a/gcc/config/i386/sco.h
+++ b/gcc/config/i386/sco.h
@@ -33,7 +33,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP"
+#define CPP_PREDEFINES "-Dunix -Di386 -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)"
#undef CPP_SPEC
#define CPP_SPEC "%{scointl:-DM_INTERNAT}"
diff --git a/gcc/config/i386/sco4.h b/gcc/config/i386/sco4.h
index 8d343d0a72c..b5cdef0edc3 100644
--- a/gcc/config/i386/sco4.h
+++ b/gcc/config/i386/sco4.h
@@ -61,7 +61,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -Dunix"
+#define CPP_PREDEFINES "-Di386 -Dunix -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)"
#undef CPP_SPEC
#define CPP_SPEC \
diff --git a/gcc/config/i386/sco4dbx.h b/gcc/config/i386/sco4dbx.h
index e0454e41ec6..3633547397b 100644
--- a/gcc/config/i386/sco4dbx.h
+++ b/gcc/config/i386/sco4dbx.h
@@ -60,7 +60,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di386 -Dunix"
+#define CPP_PREDEFINES "-Di386 -Dunix -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)"
#undef CPP_SPEC
#define CPP_SPEC \
diff --git a/gcc/config/i386/scodbx.h b/gcc/config/i386/scodbx.h
index c54565fdaed..d16476af8d5 100644
--- a/gcc/config/i386/scodbx.h
+++ b/gcc/config/i386/scodbx.h
@@ -49,7 +49,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP"
+#define CPP_PREDEFINES "-Dunix -Di386 -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)"
#undef CPP_SPEC
#define CPP_SPEC "%{scointl:-DM_INTERNAT}"
diff --git a/gcc/config/i386/sequent.h b/gcc/config/i386/sequent.h
index 5604347e80f..c7d487c9b9d 100644
--- a/gcc/config/i386/sequent.h
+++ b/gcc/config/i386/sequent.h
@@ -33,7 +33,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Specify predefined symbols in preprocessor. */
-#define CPP_PREDEFINES "-Dunix -Di386 -Dsequent"
+#define CPP_PREDEFINES "-Dunix -Di386 -Dsequent -Asystem(unix) -Acpu(i386) -Amachine(i386)"
/* Pass -Z and -ZO options to the linker. */
diff --git a/gcc/config/i386/sun.h b/gcc/config/i386/sun.h
index c8e927fb355..5b39359163b 100644
--- a/gcc/config/i386/sun.h
+++ b/gcc/config/i386/sun.h
@@ -43,7 +43,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Specify predefined symbols in preprocessor. */
-#define CPP_PREDEFINES "-Dunix -Di386 -Dsun386 -Dsun"
+#define CPP_PREDEFINES "-Dunix -Di386 -Dsun386 -Dsun -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
/* Allow #sccs in preprocessor. */
diff --git a/gcc/config/i386/sysv3.h b/gcc/config/i386/sysv3.h
index f5070662505..f198561714b 100644
--- a/gcc/config/i386/sysv3.h
+++ b/gcc/config/i386/sysv3.h
@@ -41,7 +41,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Specify predefined symbols in preprocessor. */
-#define CPP_PREDEFINES "-Dunix -Di386"
+#define CPP_PREDEFINES "-Dunix -Di386 -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)"
#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
diff --git a/gcc/config/i386/sysv4.h b/gcc/config/i386/sysv4.h
index a4d5292e9b8..678209f22a3 100644
--- a/gcc/config/i386/sysv4.h
+++ b/gcc/config/i386/sysv4.h
@@ -37,7 +37,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, 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) -Acpu(i386) -Amachine(i386)"
+ "-Di386 -Dunix -D__svr4__ -Asystem(unix) -Asystem(svr4) -Acpu(i386) -Amachine(i386)"
/* If the host and target formats match, output the floats as hex. */
#if HOST_FLOAT_FORMAT == TARGET_FLOAT_FORMAT
diff --git a/gcc/config/i860/fx2800.h b/gcc/config/i860/fx2800.h
index 942dc3d59d3..2921d2f42b5 100644
--- a/gcc/config/i860/fx2800.h
+++ b/gcc/config/i860/fx2800.h
@@ -269,7 +269,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
the i860 running Concentrix 2.x. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di860 -Dunix -DBSD4_3 -Dalliant -Asystem(unix) -Acpu(i860) -Amachine(i860)"
+#define CPP_PREDEFINES "-Di860 -Dunix -DBSD4_3 -Dalliant -Asystem(unix) -Asystem(bsd) -Acpu(i860) -Amachine(i860)"
#undef I860_REG_PREFIX
#undef ASM_COMMENT_START
diff --git a/gcc/config/i860/i860.h b/gcc/config/i860/i860.h
index f0fa2a314d3..628066e93b9 100644
--- a/gcc/config/i860/i860.h
+++ b/gcc/config/i860/i860.h
@@ -29,7 +29,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Di860 -Dunix"
+#define CPP_PREDEFINES "-Di860 -Dunix -Asystem(unix) -Asystem(svr4) -Acpu(i860) -Amachine(i860)"
/* Print subsidiary information on the compiler version in use. */
#define TARGET_VERSION fprintf (stderr, " (i860)");
diff --git a/gcc/config/i860/mach.h b/gcc/config/i860/mach.h
index b81cb6f9908..7a4f5230974 100644
--- a/gcc/config/i860/mach.h
+++ b/gcc/config/i860/mach.h
@@ -6,7 +6,7 @@
#define TARGET_VERSION fprintf (stderr, " (i860 Mach3.x)");
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di860 -DMACH"
+#define CPP_PREDEFINES "-Dunix -Di860 -DMACH -Asystem(unix) -Asystem(mach) -Acpu(i860) -Amachine(i860)"
/* Specify extra dir to search for include files. */
#define SYSTEM_INCLUDE_DIR "/usr/mach/include"
diff --git a/gcc/config/i860/sysv3.h b/gcc/config/i860/sysv3.h
index 3d7dc033363..6fdd50bd847 100644
--- a/gcc/config/i860/sysv3.h
+++ b/gcc/config/i860/sysv3.h
@@ -27,7 +27,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Provide a set of pre-definitions and pre-assertions appropriate for
the i860 running svr3. */
-#define CPP_PREDEFINES "-Di860 -Dunix -D__svr3__"
+#define CPP_PREDEFINES "-Di860 -Dunix -D__svr3__ -Asystem(unix) -Asystem(svr3) -Acpu(i860) -Amachine(i860)"
/* Use crt1.o as a startup file and crtn.o as a closing file. */
diff --git a/gcc/config/i860/sysv4.h b/gcc/config/i860/sysv4.h
index abf904c5aa3..48c62baed30 100644
--- a/gcc/config/i860/sysv4.h
+++ b/gcc/config/i860/sysv4.h
@@ -35,7 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
__svr4__ is our extension. */
#define CPP_PREDEFINES \
- "-Di860 -Dunix -DSVR4 -D__svr4__ -Asystem(unix) -Acpu(i860) -Amachine(i860)"
+ "-Di860 -Dunix -DSVR4 -D__svr4__ -Asystem(unix) -Asystem(svr4) -Acpu(i860) -Amachine(i860)"
/* The prefix to be used in assembler output for all names of registers.
This string gets prepended to all i860 register names (svr4 only). */
diff --git a/gcc/config/i960/i960.h b/gcc/config/i960/i960.h
index d76a19f7fe7..f1e5d76b97a 100644
--- a/gcc/config/i960/i960.h
+++ b/gcc/config/i960/i960.h
@@ -24,7 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
many of the definitions that relate to assembler syntax. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Di960 -Di80960 -DI960 -DI80960"
+#define CPP_PREDEFINES "-Di960 -Di80960 -DI960 -DI80960 -Acpu(i960) -Amachine(i960)"
/* Name to predefine in the preprocessor for processor variations. */
#define CPP_SPEC "%{mic*:-D__i960\
diff --git a/gcc/config/m68k/3b1.h b/gcc/config/m68k/3b1.h
index e5b9dc032c7..4497fa11290 100644
--- a/gcc/config/m68k/3b1.h
+++ b/gcc/config/m68k/3b1.h
@@ -80,7 +80,7 @@ output_file_directive ((FILE), main_input_filename)
/* ihnp4!lmayk!lgm@eddie.mit.edu says mc68000 and m68k should not be here. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dmc68k -Dunix -Dunixpc -D__motorola__"
+#define CPP_PREDEFINES "-Dmc68k -Dunix -Dunixpc -D__motorola__ -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
#undef REGISTER_NAMES
#define REGISTER_NAMES \
diff --git a/gcc/config/m68k/3b1g.h b/gcc/config/m68k/3b1g.h
index d8c7471c9f1..c80f05eac34 100644
--- a/gcc/config/m68k/3b1g.h
+++ b/gcc/config/m68k/3b1g.h
@@ -37,7 +37,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
"%{m68020:-mc68020}%{mc68020:-mc68020}%{!mc68020:%{!m68020:-mc68010}}"
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -Dmc68k -Dunix -Dunixpc"
+#define CPP_PREDEFINES "-Dmc68000 -Dmc68k -Dunix -Dunixpc -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
/* This is (not really) BSD, so (but) it wants DBX format. */
#define DBX_DEBUGGING_INFO
diff --git a/gcc/config/m68k/altos3068.h b/gcc/config/m68k/altos3068.h
index bbf1c8d6a8a..e4391567232 100644
--- a/gcc/config/m68k/altos3068.h
+++ b/gcc/config/m68k/altos3068.h
@@ -62,7 +62,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -DPORTAR -Dmc68k32 -Uvax -Dm68k -Dunix"
+#define CPP_PREDEFINES "-Dmc68000 -DPORTAR -Dmc68k32 -Uvax -Dm68k -Dunix -Asystem(unix) -Acpu(m68k) -Amachine(m68k)"
/* Every structure or union's size must be a multiple of 2 bytes. */
diff --git a/gcc/config/m68k/apollo68.h b/gcc/config/m68k/apollo68.h
index a7989b0a872..80752b08cfb 100644
--- a/gcc/config/m68k/apollo68.h
+++ b/gcc/config/m68k/apollo68.h
@@ -75,7 +75,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* These are the ones defined by Apollo, plus mc68000 for uniformity with
GCC on other 68000 systems. */
-#define CPP_PREDEFINES "-Dapollo -Daegis -Dunix"
+#define CPP_PREDEFINES "-Dapollo -Daegis -Dunix -Asystem(unix) -Acpu(m68k) -Amachine(m68k)"
/* cpp has to support a #sccs directive for the /usr/include files */
diff --git a/gcc/config/m68k/crds.h b/gcc/config/m68k/crds.h
index 3d7cfaaf04a..ee2ed962496 100644
--- a/gcc/config/m68k/crds.h
+++ b/gcc/config/m68k/crds.h
@@ -33,7 +33,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
aligned such that we can correctly extract bitfields from them.
Someone should check whether the usual compiler on the crds machine
provides the equivalent behavior of STRUCTURE_SIZE_BOUNDARY. */
-#error This doesn't define STRUCTURE_SIZE_BOUNDARY
+#error This does not define STRUCTURE_SIZE_BOUNDARY
/* See m68k.h. 0 means 680[01]0 with no 68881. */
@@ -101,7 +101,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dmc68k -DM68000 -Dmc68000 -Dunos -Dunix -D__motorola__"
+#define CPP_PREDEFINES "-Dmc68k -DM68000 -Dmc68000 -Dunos -Dunix -D__motorola__ -Asystem(unix) -Acpu(m68k) -Amachine(m68k)"
/* Register in which address to store a structure value
is passed to a function. */
diff --git a/gcc/config/m68k/ctix.h b/gcc/config/m68k/ctix.h
index f9886ff8c1c..23acccbd87d 100644
--- a/gcc/config/m68k/ctix.h
+++ b/gcc/config/m68k/ctix.h
@@ -32,7 +32,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dmc68000 -Dmc68k -Dunix -Dctix"
+#define CPP_PREDEFINES "-Dmc68000 -Dmc68k -Dunix -Dctix -Asystem(unix) -Acpu(m68k) -Amachine(m68k)"
/* Where to look for robotussinized startfiles. */
#undef STANDARD_STARTFILE_PREFIX
diff --git a/gcc/config/m68k/dpx2.h b/gcc/config/m68k/dpx2.h
index 77902cb64ea..094e21da1c9 100644
--- a/gcc/config/m68k/dpx2.h
+++ b/gcc/config/m68k/dpx2.h
@@ -34,12 +34,12 @@
* define all the things the compiler should
*/
#ifdef ncl_mr
-# define CPP_PREDEFINES "-Dunix -Dbull -DDPX2 -DSVR3 -Dmc68000 -Dmc68020 -Dncl_mr=1 -D_BULL_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE"
+# define CPP_PREDEFINES "-Dunix -Dbull -DDPX2 -DSVR3 -Dmc68000 -Dmc68020 -Dncl_mr=1 -D_BULL_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
#else
# ifdef ncl_el
-# define CPP_PREDEFINES "-Dunix -Dbull -DDPX2 -DSVR3 -Dmc68000 -Dmc68020 -Dncl_el-D_BULL_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE "
+# define CPP_PREDEFINES "-Dunix -Dbull -DDPX2 -DSVR3 -Dmc68000 -Dmc68020 -Dncl_el-D_BULL_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
# else
-# define CPP_PREDEFINES "-Dunix -Dbull -DDPX2 -DSVR3 -Dmc68000 -Dmc68020 -D_BULL_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE"
+# define CPP_PREDEFINES "-Dunix -Dbull -DDPX2 -DSVR3 -Dmc68000 -Dmc68020 -D_BULL_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
# endif
#endif
diff --git a/gcc/config/m68k/hp2bsd.h b/gcc/config/m68k/hp2bsd.h
index f27ecb3b718..11f6dca4c41 100644
--- a/gcc/config/m68k/hp2bsd.h
+++ b/gcc/config/m68k/hp2bsd.h
@@ -41,7 +41,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -Dmc68010 -Dhp200 -Dunix"
+#define CPP_PREDEFINES "-Dmc68000 -Dmc68010 -Dhp200 -Dunix -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
/* Link with libg.a when debugging, for dbx's sake. */
diff --git a/gcc/config/m68k/hp320.h b/gcc/config/m68k/hp320.h
index 65e5169f149..d2ddec21c76 100644
--- a/gcc/config/m68k/hp320.h
+++ b/gcc/config/m68k/hp320.h
@@ -124,7 +124,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* These are the ones defined by HPUX cc, plus mc68000 for uniformity with
GCC on other 68000 systems. */
-#define CPP_PREDEFINES "-Dhp9000s200 -Dhp9000s300 -DPWB -Dhpux -Dunix -D__hp9000s300 -D__hp9000s200 -D__PWB -D__hpux -D__unix -D__motorola__"
+#define CPP_PREDEFINES "-Dhp9000s200 -Dhp9000s300 -DPWB -Dhpux -Dunix -D__hp9000s300 -D__hp9000s200 -D__PWB -D__hpux -D__unix -D__motorola__ -Asystem(unix) -Asystem(hpux) -Acpu(m68k) -Amachine(m68k)"
/* Every structure or union's size must be a multiple of 2 bytes. */
diff --git a/gcc/config/m68k/hp3bsd.h b/gcc/config/m68k/hp3bsd.h
index 8d76c6365c8..d800f7a137b 100644
--- a/gcc/config/m68k/hp3bsd.h
+++ b/gcc/config/m68k/hp3bsd.h
@@ -11,7 +11,7 @@
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -Dmc68020 -Dhp300 -Dhp9000 -Dunix"
+#define CPP_PREDEFINES "-Dmc68000 -Dmc68020 -Dhp300 -Dhp9000 -Dunix -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
/* Link with libg.a when debugging, for dbx's sake. */
diff --git a/gcc/config/m68k/hp3bsd44.h b/gcc/config/m68k/hp3bsd44.h
index bdb627d7cfd..3d70c81a0a0 100644
--- a/gcc/config/m68k/hp3bsd44.h
+++ b/gcc/config/m68k/hp3bsd44.h
@@ -12,7 +12,7 @@
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -Dmc68020 -Dhp300 -Dhp9000 -Dunix -D__BSD_4_4__"
+#define CPP_PREDEFINES "-Dmc68000 -Dmc68020 -Dhp300 -Dhp9000 -Dunix -D__BSD_4_4__ -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
/* No more libg.a */
diff --git a/gcc/config/m68k/isi.h b/gcc/config/m68k/isi.h
index 38d3755b6a1..f5053530f5e 100644
--- a/gcc/config/m68k/isi.h
+++ b/gcc/config/m68k/isi.h
@@ -52,7 +52,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dunix -Dmc68000 -Dis68k"
+#define CPP_PREDEFINES "-Dunix -Dmc68000 -Dis68k -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
/* This is BSD, so it wants DBX format. */
diff --git a/gcc/config/m68k/lynx.h b/gcc/config/m68k/lynx.h
index feeb95cf297..e05e657f05b 100644
--- a/gcc/config/m68k/lynx.h
+++ b/gcc/config/m68k/lynx.h
@@ -28,7 +28,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Dmc68000 -DM68K -DLynx -DIBITS32"
+#define CPP_PREDEFINES "-Dunix -Dmc68000 -DM68K -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx) -Acpu(m68k) -Amachine(m68k)"
/* Every structure or union's size must be a multiple of 2 bytes. */
diff --git a/gcc/config/m68k/m68kv4.h b/gcc/config/m68k/m68kv4.h
index c4c1ebb1e82..bd33a18494a 100644
--- a/gcc/config/m68k/m68kv4.h
+++ b/gcc/config/m68k/m68kv4.h
@@ -55,7 +55,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define CPP_PREDEFINES \
"-Dm68k -Dunix -D__svr4__ -D__motorola__ \
- -Asystem(unix) -Acpu(m68k) -Amachine(m68k)"
+ -Asystem(unix) -Asystem(svr4) -Acpu(m68k) -Amachine(m68k)"
/* Test to see if the target includes a 68881 by default, and use CPP_SPEC
to control whether or not __HAVE_68881__ is defined by default or not.
diff --git a/gcc/config/m68k/mot3300.h b/gcc/config/m68k/mot3300.h
index b949dc0caea..56406ec9ee6 100644
--- a/gcc/config/m68k/mot3300.h
+++ b/gcc/config/m68k/mot3300.h
@@ -218,7 +218,7 @@ output_file_directive ((FILE), main_input_filename)
on the other hand I don't care what he says. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dm68k -Dunix -DsysV68 -D__motorola__"
+#define CPP_PREDEFINES "-Dm68k -Dunix -DsysV68 -D__motorola__ -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
/* Specify how to pad function arguments.
Value should be `upward', `downward' or `none'.
diff --git a/gcc/config/m68k/news.h b/gcc/config/m68k/news.h
index 60737109bc0..84b32278b30 100644
--- a/gcc/config/m68k/news.h
+++ b/gcc/config/m68k/news.h
@@ -39,9 +39,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
GCC on other 68000 systems. */
#ifdef MOTOROLA
-#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dnews700 -D__motorola__"
+#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dnews700 -D__motorola__ -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
#else
-#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dnews700"
+#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dnews700 -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
#endif
/* These conditionals tested for different submodels,
@@ -50,22 +50,22 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#if 0
#ifdef news800
-#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dnews800"
+#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dnews800 -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
#endif
#ifdef news900
-#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dnews900"
+#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dnews900 -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
#endif
#ifdef news1500
-#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dmc68030 -Dnews1500"
+#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dmc68030 -Dnews1500 -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
#endif
#ifdef news1700
-#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dmc68030 -Dnews1700"
+#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dmc68030 -Dnews1700 -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
#endif
#ifdef news1800
-#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dmc68030 -Dnews1800"
+#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dmc68030 -Dnews1800 -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
#endif
#ifdef news1900
-#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dmc68030 -Dnews1900"
+#define CPP_PREDEFINES "-Dunix -Dbsd43 -Dsony -Dsony_news -Dmc68000 -Dmc68020 -Dmc68030 -Dnews1900 -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
#endif
#endif
diff --git a/gcc/config/m68k/next.h b/gcc/config/m68k/next.h
index 55891b403a9..119db1770f6 100644
--- a/gcc/config/m68k/next.h
+++ b/gcc/config/m68k/next.h
@@ -33,7 +33,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -Dm68k -DNeXT -Dunix -D__MACH__ -D__BIG_ENDIAN__ -D__ARCHITECTURE__=\"m68k\""
+#define CPP_PREDEFINES "-Dmc68000 -Dm68k -DNeXT -Dunix -D__MACH__ -D__BIG_ENDIAN__ -D__ARCHITECTURE__=\"m68k\" -Asystem(unix) -Asystem(mach) -Acpu(m68k) -Amachine(m68k)"
/* Every structure or union's size must be a multiple of 2 bytes.
(Why isn't this in m68k.h?) */
diff --git a/gcc/config/m68k/pbb.h b/gcc/config/m68k/pbb.h
index 7f36e00edd5..3a351d63bb0 100644
--- a/gcc/config/m68k/pbb.h
+++ b/gcc/config/m68k/pbb.h
@@ -44,7 +44,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dm68k -Dunix -DUnicomPBB -Dmc68k -Dmc68020 -Dmc68k32"
+#define CPP_PREDEFINES "-Dm68k -Dunix -DUnicomPBB -Dmc68k -Dmc68020 -Dmc68k32 -Asystem(unix) -Acpu(m68k) -Amachine(m68k)"
/* We want DBX format for use with gdb under COFF. */
diff --git a/gcc/config/m68k/plexus.h b/gcc/config/m68k/plexus.h
index 1bea8096ba6..2dd6da3b717 100644
--- a/gcc/config/m68k/plexus.h
+++ b/gcc/config/m68k/plexus.h
@@ -48,7 +48,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define LONG_DOUBLE_TYPE_SIZE 64
#define CPP_SPEC "%{m68881:-D__HAVE_68881__}"
-#define CPP_PREDEFINES "-Dm68 -Dunix -Dplexus"
+#define CPP_PREDEFINES "-Dm68 -Dunix -Dplexus -Asystem(unix) -Acpu(m68k) -Amachine(m68k)"
#if TARGET_DEFAULT & 01
#define ASM_SPEC\
diff --git a/gcc/config/m68k/sun2.h b/gcc/config/m68k/sun2.h
index db94cf12cd9..a5cba1aaeb7 100644
--- a/gcc/config/m68k/sun2.h
+++ b/gcc/config/m68k/sun2.h
@@ -43,7 +43,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -Dsun -Dunix"
+#define CPP_PREDEFINES "-Dmc68000 -Dsun -Dunix -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
/* Prevent error on `-sun2' and `-target sun2' options. */
diff --git a/gcc/config/m68k/sun3.h b/gcc/config/m68k/sun3.h
index 86b3414c16b..43a5391416e 100644
--- a/gcc/config/m68k/sun3.h
+++ b/gcc/config/m68k/sun3.h
@@ -82,7 +82,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dmc68000 -Dsun -Dunix -D_CROSS_TARGET_ARCH=SUN3"
+#define CPP_PREDEFINES "-Dmc68000 -Dsun -Dunix -D_CROSS_TARGET_ARCH=SUN3 -Asystem(unix) -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
/* STARTFILE_SPEC to include sun floating point initialization
This is necessary (tr: Sun does it) for both the m68881 and the fpa
diff --git a/gcc/config/m68k/sun3mach.h b/gcc/config/m68k/sun3mach.h
index 3d954e54565..86c48d0f7c3 100644
--- a/gcc/config/m68k/sun3mach.h
+++ b/gcc/config/m68k/sun3mach.h
@@ -1,7 +1,7 @@
#include "m68k/sun3.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dmc68000 -Dsun -Dsun3 -Dunix -DMACH -DCMU -DMTXINU -DBIT_MSF -DBYTE_MSF"
+#define CPP_PREDEFINES "-Dmc68000 -Dsun -Dsun3 -Dunix -DMACH -DCMU -DMTXINU -DBIT_MSF -DBYTE_MSF -Asystem(unix) -Asystem(mach) -Acpu(m68k) -Amachine(m68k)"
/* Specify extra dir to search for include files. */
#define SYSTEM_INCLUDE_DIR "/usr/mach/include"
diff --git a/gcc/config/m68k/tower-as.h b/gcc/config/m68k/tower-as.h
index caa4c2a4365..699660bcd41 100644
--- a/gcc/config/m68k/tower-as.h
+++ b/gcc/config/m68k/tower-as.h
@@ -38,7 +38,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_600 -D__motorola__"
+#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_600 -D__motorola__ -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
/* Define __HAVE_68881 in preprocessor only if -m68881 is specified.
This will control the use of inline 68881 insns in certain macros.
diff --git a/gcc/config/m68k/tower.h b/gcc/config/m68k/tower.h
index c3de28d1a44..943594eab72 100644
--- a/gcc/config/m68k/tower.h
+++ b/gcc/config/m68k/tower.h
@@ -47,22 +47,22 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_200"
+#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_200 -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
#if 0 /* It is incorrect to test these symbols.
They describe the host, not the target.
It should not matter which model is specified. */
#ifdef tower32_600
-#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_600"
+#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_600 -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
#endif
#ifdef tower32_700
-#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_700"
+#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_700 -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
#endif
#ifdef tower32_800
-#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_800"
+#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_800 -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
#endif
#ifdef tower32_850
-#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_850"
+#define CPP_PREDEFINES "-Dunix -Dtower32 -Dtower32_850 -Asystem(unix) -Asystem(svr3) -Acpu(m68k) -Amachine(m68k)"
#endif
#endif
diff --git a/gcc/config/m88k/dgux.h b/gcc/config/m88k/dgux.h
index 10f4021f6a7..6936e5bb86b 100644
--- a/gcc/config/m88k/dgux.h
+++ b/gcc/config/m88k/dgux.h
@@ -70,7 +70,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dm88000 -Dm88k -Dunix -DDGUX -D__CLASSIFY_TYPE__=2\
- -D__svr4__ -Asystem(unix) -Acpu(m88k) -Amachine(m88k)"
+ -D__svr4__ -Asystem(unix) -Asystem(svr4) -Acpu(m88k) -Amachine(m88k)"
/* If -m88100 is in effect, add -Dm88100; similarly for -m88110.
Here, the CPU_DEFAULT is assumed to be -m88000. If not -ansi,
diff --git a/gcc/config/m88k/luna.h b/gcc/config/m88k/luna.h
index 9f900704845..e2e47501b21 100644
--- a/gcc/config/m88k/luna.h
+++ b/gcc/config/m88k/luna.h
@@ -36,7 +36,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Macros to be automatically defined. */
#undef CPP_PREDEFINES
#define CPP_PREDEFINES \
- "-DMACH -Dm88k -Dunix -Dluna -Dluna88k -D__CLASSIFY_TYPE__=2"
+ "-DMACH -Dm88k -Dunix -Dluna -Dluna88k -D__CLASSIFY_TYPE__=2 -Asystem(unix) -Asystem(mach) -Acpu(m88k) -Amachine(m88k)"
/* If -m88000 is in effect, add -Dmc88000; similarly for -m88100 and -m88110.
However, reproduce the effect of -Dmc88100 previously in CPP_PREDEFINES.
diff --git a/gcc/config/m88k/m88k.h b/gcc/config/m88k/m88k.h
index 30ca9a77489..c5e7505dcaa 100644
--- a/gcc/config/m88k/m88k.h
+++ b/gcc/config/m88k/m88k.h
@@ -207,7 +207,7 @@ extern char * reg_names[];
/* Names to predefine in the preprocessor for this target machine.
Redefined in m88kv3.h, m88kv4.h, m88kdgux.h, and m88kluna.h. */
-#define CPP_PREDEFINES "-Dm88000 -Dm88k -Dunix -D__CLASSIFY_TYPE__=2"
+#define CPP_PREDEFINES "-Dm88000 -Dm88k -Dunix -D__CLASSIFY_TYPE__=2 -Asystem(unix) -Acpu(m88k) -Amachine(m88k)"
#define TARGET_VERSION fprintf (stderr, " (%s%s)", \
VERSION_INFO1, VERSION_INFO2)
diff --git a/gcc/config/m88k/sysv3.h b/gcc/config/m88k/sysv3.h
index 30f8942380c..8b3bf872137 100644
--- a/gcc/config/m88k/sysv3.h
+++ b/gcc/config/m88k/sysv3.h
@@ -30,7 +30,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Macros to be automatically defined. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dm88000 -Dm88k -Dunix -DsysV88 -D__CLASSIFY_TYPE__=2"
+#define CPP_PREDEFINES "-Dm88000 -Dm88k -Dunix -DsysV88 -D__CLASSIFY_TYPE__=2 -Asystem(unix) -Asystem(svr3) -Acpu(m88k) -Amachine(m88k)"
/* Override svr3.h to link with ?crt0.o instead of ?crt1.o and ?crtn.o.
From arul@sdsu.edu. */
diff --git a/gcc/config/m88k/sysv4.h b/gcc/config/m88k/sysv4.h
index a32ba712d2c..d91086b16d3 100644
--- a/gcc/config/m88k/sysv4.h
+++ b/gcc/config/m88k/sysv4.h
@@ -48,7 +48,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#undef CPP_PREDEFINES
#define CPP_PREDEFINES \
- "-Dm88000 -Dm88k -Dunix -D__svr4__ -Amachine(m88k) -Acpu(m88k) -Asystem(unix)"
+ "-Dm88000 -Dm88k -Dunix -D__svr4__ -Amachine(m88k) -Acpu(m88k) -Asystem(unix) -Asystem(svr4)"
/* For the AT&T SVR4 port, the function is _mcount. */
#undef FUNCTION_PROFILER
diff --git a/gcc/config/mips/bsd-4.h b/gcc/config/mips/bsd-4.h
index 8f28ec27050..45ac4c2dba6 100644
--- a/gcc/config/mips/bsd-4.h
+++ b/gcc/config/mips/bsd-4.h
@@ -19,8 +19,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define MIPS_BSD43
-#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_BSD43 \
--D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_BSD43"
+#define CPP_PREDEFINES "\
+-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_BSD43 \
+-D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_BSD43 \
+-Asystem(unix) -Asystem(bsd) -Acpu(mips) -Amachine(mips)"
#define STANDARD_INCLUDE_DIR "/bsd43/usr/include"
diff --git a/gcc/config/mips/bsd-5.h b/gcc/config/mips/bsd-5.h
index 4c5c523debb..a757ebdad50 100644
--- a/gcc/config/mips/bsd-5.h
+++ b/gcc/config/mips/bsd-5.h
@@ -19,8 +19,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define MIPS_BSD43
-#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_BSD43 \
--D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_BSD43"
+#define CPP_PREDEFINES "\
+-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_BSD43 \
+-D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_BSD43 \
+-Asystem(unix) -Asystem(bsd) -Acpu(mips) -Amachine(mips)"
#define STANDARD_INCLUDE_DIR "/bsd43/usr/include"
diff --git a/gcc/config/mips/dec-osf1.h b/gcc/config/mips/dec-osf1.h
index 6ba860b15dd..3f00e6237a3 100644
--- a/gcc/config/mips/dec-osf1.h
+++ b/gcc/config/mips/dec-osf1.h
@@ -19,8 +19,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define DEC_OSF1
-#define CPP_PREDEFINES "-D__ANSI_COMPAT \
--DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD -Dbsd4_2 -Dhost_mips -Dmips -Dosf -Dunix"
+#define CPP_PREDEFINES "\
+-D__ANSI_COMPAT -DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD \
+-Dbsd4_2 -Dhost_mips -Dmips -Dosf -Dunix \
+-Asystem(unix) -Asystem(xpg4) -Acpu(mips) -Amachine(mips)"
#define LINK_SPEC "\
%{G*} \
diff --git a/gcc/config/mips/iris3.h b/gcc/config/mips/iris3.h
index 6ddb8f10c5a..8af0cf1a53b 100644
--- a/gcc/config/mips/iris3.h
+++ b/gcc/config/mips/iris3.h
@@ -21,7 +21,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dunix -Dmips -Dsgi -DSVR3 -Dhost_mips -DMIPSEB -DSYSTYPE_SYSV"
+#define CPP_PREDEFINES "\
+-Dunix -Dmips -Dsgi -DSVR3 -Dhost_mips -DMIPSEB -DSYSTYPE_SYSV \
+-Asystem(unix) -Asystem(svr3) -Acpu(mips) -Amachine(mips)"
#define STARTFILE_SPEC "%{pg:gcrt1.o%s}%{!pg:%{p:mcrt1.o%s}%{!p:crt1.o%s}}"
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 11c47bee3a0..c717ad6c638 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -535,7 +535,8 @@ while (0)
#ifndef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_BSD43 \
--D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_BSD43"
+-D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_BSD43 \
+-Asystem(unix) -Asystem(bsd) -Acpu(mips) -Amachine(mips)"
#endif
/* Extra switches sometimes passed to the assembler. */
diff --git a/gcc/config/mips/news4.h b/gcc/config/mips/news4.h
index fa29a8037ab..007618b4a51 100644
--- a/gcc/config/mips/news4.h
+++ b/gcc/config/mips/news4.h
@@ -19,8 +19,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define MIPS_NEWS
-#define CPP_PREDEFINES "-Dr3000 -Dnews3700 -DLANGUAGE_C -DMIPSEB -DSYSTYPE_BSD \
--Dsony_news -Dsony -Dunix -Dmips -Dhost_mips"
+#define CPP_PREDEFINES "\
+-Dr3000 -Dnews3700 -DLANGUAGE_C -DMIPSEB -DSYSTYPE_BSD \
+-Dsony_news -Dsony -Dunix -Dmips -Dhost_mips \
+-Asystem(unix) -Asystem(bsd) -Acpu(mips) -Amachine(mips)"
#define ASM_SPEC "\
%{!mgas: \
diff --git a/gcc/config/mips/news5.h b/gcc/config/mips/news5.h
index 289f00f7874..0952049c794 100644
--- a/gcc/config/mips/news5.h
+++ b/gcc/config/mips/news5.h
@@ -19,7 +19,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define MIPS_SYSV
-#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -Dsony -Dsonyrisc -DMIPSEB -DSYSTYPE_SYSV"
+#define CPP_PREDEFINES "\
+-Dmips -Dunix -Dhost_mips -Dsony -Dsonyrisc -DMIPSEB -DSYSTYPE_SYSV \
+-Asystem(unix) -Asystem(svr3) -Acpu(mips) -Amachine(mips)"
#define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
diff --git a/gcc/config/mips/osfrose.h b/gcc/config/mips/osfrose.h
index 3e9bb756e25..372c39730ad 100644
--- a/gcc/config/mips/osfrose.h
+++ b/gcc/config/mips/osfrose.h
@@ -29,7 +29,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define WORD_SWITCH_TAKES_ARG(STR) \
(DEFAULT_WORD_SWITCH_TAKES_ARG (STR) || !strcmp (STR, "pic-names"))
-#define CPP_PREDEFINES "-DOSF -DOSF1 -Dbsd4_2 -DMIPSEL -Dhost_mips -Dmips -Dunix -DR3000 -DSYSTYPE_BSD"
+#define CPP_PREDEFINES "\
+-DOSF -DOSF1 -Dbsd4_2 -DMIPSEL -Dhost_mips -Dmips -Dunix -DR3000 -DSYSTYPE_BSD \
+-Asystem(unix) -Asystem(xpg4) -Acpu(mips) -Amachine(mips)"
#define ASM_SPEC "\
%{mmips-as: \
diff --git a/gcc/config/mips/svr3-4.h b/gcc/config/mips/svr3-4.h
index e4d3ec205c5..ac88ef65d50 100644
--- a/gcc/config/mips/svr3-4.h
+++ b/gcc/config/mips/svr3-4.h
@@ -19,8 +19,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define MIPS_SYSV
-#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_SYSV \
--D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_SYSV"
+#define CPP_PREDEFINES "\
+-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_SYSV \
+-D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_SYSV \
+-Asystem(unix) -Asystem(svr3) -Acpu(mips) -Amachine(mips)"
#define STANDARD_INCLUDE_DIR "/sysv/usr/include"
diff --git a/gcc/config/mips/svr3-5.h b/gcc/config/mips/svr3-5.h
index 1764237ad94..40189965e7c 100644
--- a/gcc/config/mips/svr3-5.h
+++ b/gcc/config/mips/svr3-5.h
@@ -19,8 +19,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define MIPS_SYSV
-#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_SYSV \
--D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_SYSV"
+#define CPP_PREDEFINES "\
+-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_SYSV \
+-D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_SYSV \
+-Asystem(unix) -Asystem(svr3) -Acpu(mips) -Amachine(mips)"
#define STANDARD_INCLUDE_DIR "/sysv/usr/include"
diff --git a/gcc/config/mips/svr4-4.h b/gcc/config/mips/svr4-4.h
index 6dd45a391ab..2d7d540e00d 100644
--- a/gcc/config/mips/svr4-4.h
+++ b/gcc/config/mips/svr4-4.h
@@ -19,8 +19,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define MIPS_SVR4
-#define CPP_PREDEFINES "-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_SVR4 \
--D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_SVR4"
+#define CPP_PREDEFINES "\
+-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_SVR4 \
+-D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_SVR4 \
+-Asystem(unix) -Asystem(svr4) -Acpu(mips) -Amachine(mips)"
#define STANDARD_INCLUDE_DIR "/svr4/usr/include"
diff --git a/gcc/config/mips/svr4-5.h b/gcc/config/mips/svr4-5.h
index 94a97e5727b..0fa1d825612 100644
--- a/gcc/config/mips/svr4-5.h
+++ b/gcc/config/mips/svr4-5.h
@@ -22,7 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define CPP_PREDEFINES \
"-Dmips -Dunix -Dhost_mips -DMIPSEB -DR3000 -DSYSTYPE_SVR4 \
-D_mips -D_unix -D_host_mips -D_MIPSEB -D_R3000 -D_SYSTYPE_SVR4 \
--D_MIPS_SZINT=32 -D_MIPS_SZLONG=32 -D_MIPS_SZPTR=32"
+-D_MIPS_SZINT=32 -D_MIPS_SZLONG=32 -D_MIPS_SZPTR=32 \
+-Asystem(unix) -Asystem(svr4) -Acpu(mips) -Amachine(mips)"
#define STANDARD_INCLUDE_DIR "/svr4/usr/include"
diff --git a/gcc/config/mips/ultrix.h b/gcc/config/mips/ultrix.h
index 694be60c9ac..1a1bb8ba173 100644
--- a/gcc/config/mips/ultrix.h
+++ b/gcc/config/mips/ultrix.h
@@ -20,8 +20,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define DECSTATION
#ifndef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ANSI_COMPAT \
--DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD -Dbsd4_2 -Dhost_mips -Dmips -Dultrix -Dunix"
+#define CPP_PREDEFINES "\
+-D__ANSI_COMPAT -DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD \
+-Dbsd4_2 -Dhost_mips -Dmips -Dultrix -Dunix \
+-Asystem(unix) -Asystem(bsd) -Acpu(mips) -Amachine(mips)"
#endif
#ifndef ASM_SPEC
diff --git a/gcc/config/ns32k/encore.h b/gcc/config/ns32k/encore.h
index 35dd0daae41..8a6bdb32309 100644
--- a/gcc/config/ns32k/encore.h
+++ b/gcc/config/ns32k/encore.h
@@ -54,7 +54,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define TARGET_VERSION fprintf (stderr, " (32000, Encore syntax)");
/* Note Encore does not standardly do -Dencore. */
/* budd: should have a -ns32332 (or -apc) switch! but no harm for now */
-#define CPP_PREDEFINES "-Dns32000 -Dn16 -Dns16000 -Dns32332 -Dunix"
+#define CPP_PREDEFINES "-Dns32000 -Dn16 -Dns16000 -Dns32332 -Dunix -Asystem(unix) -Acpu(ns32k) -Amachine(ns32k)"
/* Ignore certain cpp directives used in header files on sysV. */
#define SCCS_DIRECTIVE
diff --git a/gcc/config/ns32k/merlin.h b/gcc/config/ns32k/merlin.h
index 250495d8af4..a2fabd0348e 100644
--- a/gcc/config/ns32k/merlin.h
+++ b/gcc/config/ns32k/merlin.h
@@ -46,7 +46,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#undef CPP_PREDEFINES
#define CPP_PREDEFINES \
- "-Dns32000 -Dns32k -Dns16000 -Dmerlin -Dunix -DUtek -Dbsd"
+ "-Dns32000 -Dns32k -Dns16000 -Dmerlin -Dunix -DUtek -Dbsd \
+ -Asystem(unix) -Asystem(bsd) -Acpu(ns32k) -Amachine(ns32k)"
/* This is how to align the code that follows an unconditional branch.
Don't define it, since it confuses the assembler (we hear). */
diff --git a/gcc/config/ns32k/pc532-mach.h b/gcc/config/ns32k/pc532-mach.h
index e59f131378e..7e4b2c401b9 100644
--- a/gcc/config/ns32k/pc532-mach.h
+++ b/gcc/config/ns32k/pc532-mach.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "ns32k/pc532.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dns32532 -DPC532 -DMACH=1"
+#define CPP_PREDEFINES "-Dns32532 -DPC532 -DMACH=1 -Asystem(unix) -Asystem(mach) -Acpu(ns32k) -Amachine(ns32k)"
/* Don't default to pcc-struct-return, because gcc is the only compiler, and
we want to retain compatibility with older gcc versions. */
diff --git a/gcc/config/ns32k/pc532.h b/gcc/config/ns32k/pc532.h
index d03db710ee4..b6cc01ab1c8 100644
--- a/gcc/config/ns32k/pc532.h
+++ b/gcc/config/ns32k/pc532.h
@@ -54,7 +54,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Maybe someone needs to know which processor we're running on */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dns32000 -Dns32532 -Dpc532 -Dunix"
+#define CPP_PREDEFINES "-Dns32000 -Dns32532 -Dpc532 -Dunix -Asystem(unix) -Acpu(ns32k) -Amachine(ns32k)"
/* Use pc relative addressing whenever possible,
it's more efficient than absolute (ns32k.c)
diff --git a/gcc/config/ns32k/sequent.h b/gcc/config/ns32k/sequent.h
index c007e2bdab8..7972ee3aad8 100644
--- a/gcc/config/ns32k/sequent.h
+++ b/gcc/config/ns32k/sequent.h
@@ -36,7 +36,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define TARGET_VERSION fprintf (stderr, " (32000, Sequent syntax)");
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dns32000 -Dsequent -Dunix"
+#define CPP_PREDEFINES "-Dns32000 -Dsequent -Dunix -Asystem(unix) -Asystem(bsd) -Acpu(ns32k) -Amachine(ns32k)"
/* Link with libg.a when debugging, for dbx's sake. */
diff --git a/gcc/config/ns32k/tek6000.h b/gcc/config/ns32k/tek6000.h
index 12173bec011..d231b17312d 100644
--- a/gcc/config/ns32k/tek6000.h
+++ b/gcc/config/ns32k/tek6000.h
@@ -95,9 +95,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* The tek6100.h and tek6200.h files add stratos or merlin respectively. */
#define CPP_PREDEFINES_Tek6000 \
- "-Dns16000 -Dns32000 -Dns32k -Dns32016 -DUTek -DUTEK -Dbsd -DBSD"
+ "-Dns16000 -Dns32000 -Dns32k -Dns32016 -DUTek -DUTEK -Dbsd -DBSD \
+ -Asystem(unix) -Asystem(bsd) -Acpu(ns32k) -Amachine(ns32k)"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "CPP_PREDEFINES_Tek6000"
+#define CPP_PREDEFINES CPP_PREDEFINES_Tek6000
/* This is how to align the code that follows an unconditional branch.
Don't define it, since it confuses the assembler (we hear). */
diff --git a/gcc/config/ns32k/tek6100.h b/gcc/config/ns32k/tek6100.h
index fbaf0196baf..e5b385f1272 100644
--- a/gcc/config/ns32k/tek6100.h
+++ b/gcc/config/ns32k/tek6100.h
@@ -2,5 +2,6 @@
#undef CPP_PREDEFINES
#define CPP_PREDEFINES \
- "-Dns32000 -Dns32k -Dns16000 -Dns32016 -DUTek -DUTEK -Dbsd -DBSD -Dstratos"
+ "-Dns32000 -Dns32k -Dns16000 -Dns32016 -DUTek -DUTEK -Dbsd -DBSD -Dstratos \
+ -Asystem(unix) -Asystem(bsd) -Acpu(ns32k) -Amachine(ns32k)"
diff --git a/gcc/config/ns32k/tek6200.h b/gcc/config/ns32k/tek6200.h
index 7dac295298f..c03f25534e7 100644
--- a/gcc/config/ns32k/tek6200.h
+++ b/gcc/config/ns32k/tek6200.h
@@ -2,5 +2,6 @@
#undef CPP_PREDEFINES
#define CPP_PREDEFINES \
- "-Dns32000 -Dns32k -Dns16000 -Dns32016 -DUTek -DUTEK -Dbsd -DBSD -Dmerlin"
+ "-Dns32000 -Dns32k -Dns16000 -Dns32016 -DUTek -DUTEK -Dbsd -DBSD -Dmerlin \
+ -Asystem(unix) -Asystem(bsd) -Acpu(ns32k) -Amachine(ns32k)"
diff --git a/gcc/config/pa/pa-hpux.h b/gcc/config/pa/pa-hpux.h
index 12c69dbc26c..b98b0cc2729 100644
--- a/gcc/config/pa/pa-hpux.h
+++ b/gcc/config/pa/pa-hpux.h
@@ -43,7 +43,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p: -L/lib/libp/ -lc}%{pg: -L/lib/libp/ -lc}"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -DPWB -Dhpux -Dunix -D_HPUX_SOURCE"
+#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -DPWB -Dhpux -Dunix -D_HPUX_SOURCE -Asystem(unix) -Asystem(hpux) -Acpu(hppa) -Amachine(hppa)"
#undef LINK_SPEC
#define LINK_SPEC "-u main %{static: -a archive}%{g: -a archive}"
diff --git a/gcc/config/pa/pa-hpux7.h b/gcc/config/pa/pa-hpux7.h
index 44201f0e7d8..ebfbf22490c 100644
--- a/gcc/config/pa/pa-hpux7.h
+++ b/gcc/config/pa/pa-hpux7.h
@@ -46,4 +46,4 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p: -L/lib/libp/ -lc}%{pg: -L/lib/libp/ -lc}"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -DPWB -Dhpux -Dunix -D_HPUX_SOURCE"
+#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -DPWB -Dhpux -Dunix -D_HPUX_SOURCE -Asystem(unix) -Asystem(hpux) -Acpu(hppa) -Amachine(hppa)"
diff --git a/gcc/config/pa/pa-osf.h b/gcc/config/pa/pa-osf.h
index 1c2cac27bb3..a0a70922b52 100644
--- a/gcc/config/pa/pa-osf.h
+++ b/gcc/config/pa/pa-osf.h
@@ -22,7 +22,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "pa/pa.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -Dunix -Dhp9000 -Dhp800 -Dspectrum -DREVARGV -Dparisc -D__pa_risc -DPARISC -DBYTE_MSF -DBIT_MSF"
+#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -Dunix -Dhp9000 -Dhp800 -Dspectrum -DREVARGV -Dparisc -D__pa_risc -DPARISC -DBYTE_MSF -DBIT_MSF -Asystem(unix) -Asystem(mach) -Acpu(hppa) -Amachine(hppa)"
/* Don't default to pcc-struct-return, because gcc is the only compiler, and
we want to retain compatibility with older gcc versions. */
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index cf620aa1c88..7d5f4d4b89b 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -149,7 +149,7 @@ extern int target_flags;
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -Dunix -D_HPUX_SOURCE -Dhp9000 -Dhp800 -Dspectrum -DREVARGV"
+#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -Dunix -D_HPUX_SOURCE -Dhp9000 -Dhp800 -Dspectrum -DREVARGV -Asystem(unix) -Asystem(bsd) -Acpu(hppa) -Amachine(hppa)"
/* target machine storage layout */
diff --git a/gcc/config/pyr/pyr.h b/gcc/config/pyr/pyr.h
index cce7d65d1b4..78f0705907b 100644
--- a/gcc/config/pyr/pyr.h
+++ b/gcc/config/pyr/pyr.h
@@ -41,7 +41,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dpyr -Dunix"
+#define CPP_PREDEFINES "-Dpyr -Dunix -Asystem(unix) -Acpu(pyr) -Amachine(pyr)"
/* Print subsidiary information on the compiler version in use. */
diff --git a/gcc/config/romp/romp.h b/gcc/config/romp/romp.h
index c454b5e4a30..504efa404aa 100644
--- a/gcc/config/romp/romp.h
+++ b/gcc/config/romp/romp.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dibm032 -Dunix"
+#define CPP_PREDEFINES "-Dibm032 -Dunix -Asystem(unix) -Asystem(bsd) -Acpu(ibm032) -Amachine(ibm032)"
/* Print subsidiary information on the compiler version in use. */
#define TARGET_VERSION ;
diff --git a/gcc/config/rs6000/aix31.h b/gcc/config/rs6000/aix31.h
index 19cd1588703..f2e8fa1275c 100644
--- a/gcc/config/rs6000/aix31.h
+++ b/gcc/config/rs6000/aix31.h
@@ -24,7 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* AIX 3.2 defined _AIX32, but older versions do not. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D_IBMR2 -D_AIX"
+#define CPP_PREDEFINES "-D_IBMR2 -D_AIX -Asystem(unix) -Asystem(aix) -Acpu(rs6000) -Amachine(rs6000)"
/* AIX 3.1 uses bit 15 in CROR as the magic nop. */
#undef RS6000_CROR_BIT_NUMBER
diff --git a/gcc/config/rs6000/mach.h b/gcc/config/rs6000/mach.h
index a2d942f6e46..81a2efc5c53 100644
--- a/gcc/config/rs6000/mach.h
+++ b/gcc/config/rs6000/mach.h
@@ -24,7 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* We don't define AIX under MACH; instead we define `unix'. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Drios -D_IBMR2 -Dunix"
+#define CPP_PREDEFINES "-Drios -D_IBMR2 -Dunix -Asystem(unix) -Asystem(mach) -Acpu(rs6000) -Amachine(rs6000)"
/* Define different binder options for MACH. */
#undef LINK_SPEC
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 5949ff64204..7e5a9742c07 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -25,7 +25,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-D_IBMR2 -D_AIX -D_AIX32"
+#define CPP_PREDEFINES "-D_IBMR2 -D_AIX -D_AIX32 -Asystem(unix) -Asystem(aix) -Acpu(rs6000) -Amachine(rs6000)"
/* Print subsidiary information on the compiler version in use. */
#define TARGET_VERSION ;
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index c1fdda99044..e22a775f93e 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -32,7 +32,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define SDB_DELIM ";"
-#define CPP_PREDEFINES "-D__sh__"
+#define CPP_PREDEFINES "-D__sh__ -Acpu(sh) -Amachine(sh)"
/* Omitting the frame pointer is a very good idea on the SH */
diff --git a/gcc/config/sparc/lite.h b/gcc/config/sparc/lite.h
index 15c6dd5cb13..da7671e8d6b 100644
--- a/gcc/config/sparc/lite.h
+++ b/gcc/config/sparc/lite.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "sparc/sparc.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dsparc -Dsparclite"
+#define CPP_PREDEFINES "-Dsparc -Dsparclite -Acpu(sparc) -Amachine(sparc)"
#undef TARGET_VERSION
#define TARGET_VERSION fprintf (stderr, " (sparclite)");
diff --git a/gcc/config/sparc/lynx.h b/gcc/config/sparc/lynx.h
index e9020a030ed..d8c60565dc8 100644
--- a/gcc/config/sparc/lynx.h
+++ b/gcc/config/sparc/lynx.h
@@ -27,4 +27,4 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Dsparc -DLynx -DIBITS32"
+#define CPP_PREDEFINES "-Dunix -Dsparc -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx) -Acpu(sparc) -Amachine(sparc)"
diff --git a/gcc/config/sparc/pbd.h b/gcc/config/sparc/pbd.h
index 73c56dba335..ea14a23ddb1 100644
--- a/gcc/config/sparc/pbd.h
+++ b/gcc/config/sparc/pbd.h
@@ -26,7 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dsparc -DUnicomPBD -Dunix -D__GCC_NEW_VARARGS__"
+#define CPP_PREDEFINES "-Dsparc -DUnicomPBD -Dunix -D__GCC_NEW_VARARGS__ -Asystem(unix) -Acpu(sparc) -Amachine(sparc)"
/* We want DBX format for use with gdb under COFF. */
diff --git a/gcc/config/sparc/sol2.h b/gcc/config/sparc/sol2.h
index 6954f94a0b3..dee4f88f80e 100644
--- a/gcc/config/sparc/sol2.h
+++ b/gcc/config/sparc/sol2.h
@@ -24,7 +24,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#undef CPP_PREDEFINES
#define CPP_PREDEFINES \
- "-Dsun -Dsparc -Dunix -D__svr4__ -Asystem(unix) -Acpu(sparc) -Amachine(sparc)\
+ "-Dsun -Dsparc -Dunix -D__svr4__ \
+ -Asystem(unix) -Asystem(svr4) -Acpu(sparc) -Amachine(sparc)\
-D__GCC_NEW_VARARGS__"
#undef CPP_SPEC
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index c841eff33f8..4686ae22100 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -86,7 +86,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
because gcc does "gvarargs.h" instead of <varargs.h>, and thus gets the
wrong varargs file when it is compiled with a different version of gcc. */
-#define CPP_PREDEFINES "-Dsparc -Dsun -Dunix -D__GCC_NEW_VARARGS__"
+#define CPP_PREDEFINES \
+ "-Dsparc -Dsun -Dunix -D__GCC_NEW_VARARGS__ \
+ -Asystem(unix) -Asystem(bsd) -Acpu(sparc) -Amachine(sparc)"
/* Print subsidiary information on the compiler version in use. */
diff --git a/gcc/config/sparc/sysv4.h b/gcc/config/sparc/sysv4.h
index f36fd356772..9e165134e30 100644
--- a/gcc/config/sparc/sysv4.h
+++ b/gcc/config/sparc/sysv4.h
@@ -52,7 +52,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
the Sparc running svr4. __svr4__ is our extension. */
#define CPP_PREDEFINES \
- "-Dsparc -Dunix -D__svr4__ -Asystem(unix) -Acpu(sparc) -Amachine(sparc) \
+ "-Dsparc -Dunix -D__svr4__ \
+ -Asystem(unix) -Asystem(svr4) -Acpu(sparc) -Amachine(sparc) \
-D__GCC_NEW_VARARGS__"
/* The specialized code which needs to appear in the .init section prior
diff --git a/gcc/config/spur/spur.h b/gcc/config/spur/spur.h
index fedfba23c6f..4daaf36798c 100644
--- a/gcc/config/spur/spur.h
+++ b/gcc/config/spur/spur.h
@@ -24,7 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dspur"
+#define CPP_PREDEFINES "-Dspur -Acpu(spur) -Amachine(spur)"
/* Link with libg.a when debugging, for dbx's sake. */
diff --git a/gcc/config/tahoe/harris.h b/gcc/config/tahoe/harris.h
index a26b4b97a52..2c6476dac99 100644
--- a/gcc/config/tahoe/harris.h
+++ b/gcc/config/tahoe/harris.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "tahoe/tahoe.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dtahoe -Dunix -Dhcx"
+#define CPP_PREDEFINES "-Dtahoe -Dunix -Dhcx -Asystem(unix) -Acpu(tahoe) -Amachine(tahoe)"
#undef DBX_DEBUGGING_INFO
#define SDB_DEBUGGING_INFO
diff --git a/gcc/config/tahoe/tahoe.h b/gcc/config/tahoe/tahoe.h
index 0982b7d070d..2f32ddeb1f4 100644
--- a/gcc/config/tahoe/tahoe.h
+++ b/gcc/config/tahoe/tahoe.h
@@ -44,7 +44,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define TARGET_VERSION printf (" (hcx)");
#else
/* we want "tahoe" and "unix" defined for all future compilations */
-#define CPP_PREDEFINES "-Dtahoe -Dunix"
+#define CPP_PREDEFINES "-Dtahoe -Dunix -Asystem(unix) -Acpu(tahoe) -Amachine(tahoe)"
/* have cc1 print that this is the tahoe version */
#define TARGET_VERSION printf (" (tahoe)");
#endif
diff --git a/gcc/config/vax/ultrix.h b/gcc/config/vax/ultrix.h
index 8516170d19e..e2891cee281 100644
--- a/gcc/config/vax/ultrix.h
+++ b/gcc/config/vax/ultrix.h
@@ -1,7 +1,7 @@
#include "vax/vax.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES " -Dvax -Dunix -Dultrix -Dbsd4_2 -D__vax -D__unix -D__ultrix -D__bsd4_2"
+#define CPP_PREDEFINES " -Dvax -Dunix -Dultrix -Dbsd4_2 -D__vax -D__unix -D__ultrix -D__bsd4_2 -Asystem(unix) -Asystem(bsd) -Acpu(vax) -Amachine(vax)"
/* By default, allow $ to be part of an identifier. */
#define DOLLARS_IN_IDENTIFIERS 1
diff --git a/gcc/config/vax/vax.h b/gcc/config/vax/vax.h
index a2460b222f7..d675460be24 100644
--- a/gcc/config/vax/vax.h
+++ b/gcc/config/vax/vax.h
@@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dvax -Dunix"
+#define CPP_PREDEFINES "-Dvax -Dunix -Asystem(unix) -Asystem(bsd) -Acpu(vax) -Amachine(vax)"
/* If using g-format floating point, alter math.h. */
diff --git a/gcc/config/vax/vaxv.h b/gcc/config/vax/vaxv.h
index 7d7ca458a69..60c09019a83 100644
--- a/gcc/config/vax/vaxv.h
+++ b/gcc/config/vax/vaxv.h
@@ -23,6 +23,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define SCCS_DIRECTIVE
+#undef CPP_PREDEFINES
+#define CPP_PREDEFINES "-Dvax -Dunix -Asystem(unix) -Asystem(svr3) -Acpu(vax) -Amachine(vax)"
+
/* Output #ident as a .ident. */
#define ASM_OUTPUT_IDENT(FILE, NAME) fprintf (FILE, "\t.ident \"%s\"\n", NAME);
diff --git a/gcc/config/vax/vms.h b/gcc/config/vax/vms.h
index a023f1bc31b..9ae1df12a75 100644
--- a/gcc/config/vax/vms.h
+++ b/gcc/config/vax/vms.h
@@ -37,7 +37,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Predefine this in CPP because VMS limits the size of command options
and GNU CPP is not used on VMS except with GNU C. */
-#define CPP_PREDEFINES "-Dvax -Dvms -DVMS -D__GNUC__=2"
+#define CPP_PREDEFINES "-Dvax -Dvms -DVMS -D__GNUC__=2 -Asystem(vms) -Acpu(vax) -Amachine(vax)"
/* These match the definitions used in VAXCRTL, the VMS C run-time library */
diff --git a/gcc/config/we32k/we32k.h b/gcc/config/we32k/we32k.h
index d133e485755..42457fd3e73 100644
--- a/gcc/config/we32k/we32k.h
+++ b/gcc/config/we32k/we32k.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Names to predefine in the preprocessor for this target machine. */
-#define CPP_PREDEFINES "-Dwe32000 -Du3b -Dunix"
+#define CPP_PREDEFINES "-Dwe32000 -Du3b -Dunix -Asystem(unix) -Acpu(we32000) -Amachine(we32000)"
/* Print subsidiary information on the compiler version in use. */