8 files changed, 13 insertions, 9 deletions
diff --git a/gcc/config/ns32k/encore.h b/gcc/config/ns32k/encore.h
index 35dd0da..8a6bdb3 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 250495d..a2fabd0 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 e59f131..7e4b2c4 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 d03db71..b6cc01a 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 c007e2b..7972ee3 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 12173be..d231b17 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 fbaf019..e5b385f 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 7dac295..c03f255 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)"