no more -D__NetBSD__

10 files changed, 11 insertions, 12 deletions

diff --git a/gnu/usr.bin/gcc/config/alpha/openbsd.h b/gnu/usr.bin/gcc/config/alpha/openbsd.h
index 942477c1ef5..a321da5cc1d 100644
--- a/gnu/usr.bin/gcc/config/alpha/openbsd.h
+++ b/gnu/usr.bin/gcc/config/alpha/openbsd.h
@@ -65,7 +65,7 @@ Boston, MA 02111-1307, USA.  */
 /* Define mips-specific OpenBSD predefines... */
 #ifndef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__ANSI_COMPAT \
--D__OpenBSD__ -D__NetBSD__ -D__alpha__ -D__alpha"
+-D__OpenBSD__ -D__alpha__ -D__alpha"
 #endif
 
 /* Always uses gas.  */
diff --git a/gnu/usr.bin/gcc/config/i386/openbsd.h b/gnu/usr.bin/gcc/config/i386/openbsd.h
index 4f01b04e094..9f1573d01ad 100644
--- a/gnu/usr.bin/gcc/config/i386/openbsd.h
+++ b/gnu/usr.bin/gcc/config/i386/openbsd.h
@@ -12,9 +12,8 @@
 /* Get generic OpenBSD definitions.  */
 #include <openbsd.h>
 
-/* Keep __NetBSD__ until we diverge sufficiently from them.  */
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -D__OpenBSD__ -D__NetBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-Dunix -Di386 -D__OpenBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(i386) -Amachine(i386)"
 
 #undef SIZE_TYPE
 #define SIZE_TYPE "unsigned int"
@@ -31,7 +30,7 @@
 #undef WCHAR_TYPE_SIZE
 #define WCHAR_TYPE_SIZE 32
 
-/*	$OpenBSD: openbsd.h,v 1.4 1996/08/25 11:50:11 deraadt Exp $	*/
+/*	$OpenBSD: openbsd.h,v 1.5 1997/03/28 20:47:21 deraadt Exp $	*/
 
 /* There are conflicting reports about whether this system uses
    a different assembler syntax.  wilson@cygnus.com says # is right.  */
diff --git a/gnu/usr.bin/gcc/config/m68k/openbsd.h b/gnu/usr.bin/gcc/config/m68k/openbsd.h
index ddcf22a6a3c..207ec321796 100644
--- a/gnu/usr.bin/gcc/config/m68k/openbsd.h
+++ b/gnu/usr.bin/gcc/config/m68k/openbsd.h
@@ -17,7 +17,7 @@
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
-#define CPP_PREDEFINES "-Dunix -Dm68k -Dmc68000 -Dmc68020 -D__OpenBSD__ -D__NetBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(m68k) -Amachine(m68k)"
+#define CPP_PREDEFINES "-Dunix -Dm68k -Dmc68000 -Dmc68020 -D__OpenBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(m68k) -Amachine(m68k)"
 
 /* Make gcc agree with <machine/ansi.h> */
 
diff --git a/gnu/usr.bin/gcc/config/mips/openbsd-be.h b/gnu/usr.bin/gcc/config/mips/openbsd-be.h
index 637529086dd..2d5d292d513 100644
--- a/gnu/usr.bin/gcc/config/mips/openbsd-be.h
+++ b/gnu/usr.bin/gcc/config/mips/openbsd-be.h
@@ -70,7 +70,7 @@ Boston, MA 02111-1307, USA.  */
 /* Define mips-specific OpenBSD predefines... */
 #ifndef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__ANSI_COMPAT \
--DMIPSEB -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__OpenBSD__ -D__NetBSD__ -Dmips \
+-DMIPSEB -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__OpenBSD__ -Dmips \
 -D__NO_LEADING_UNDERSCORES__ -D__GP_SUPPORT__ \
 -Dunix -D_R3000 \
 -Asystem(unix) -Asystem(OpenBSD) -Amachine(mips)"
diff --git a/gnu/usr.bin/gcc/config/mips/openbsd-le.h b/gnu/usr.bin/gcc/config/mips/openbsd-le.h
index d56c1e091aa..1dff8716355 100644
--- a/gnu/usr.bin/gcc/config/mips/openbsd-le.h
+++ b/gnu/usr.bin/gcc/config/mips/openbsd-le.h
@@ -70,7 +70,7 @@ Boston, MA 02111-1307, USA.  */
 /* Define mips-specific OpenBSD predefines... */
 #ifndef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__ANSI_COMPAT \
--DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__OpenBSD__ -D__NetBSD__ -Dmips \
+-DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__OpenBSD__ -Dmips \
 -D__NO_LEADING_UNDERSCORES__ -D__GP_SUPPORT__ \
 -Dunix -D_R3000 \
 -Asystem(unix) -Asystem(OpenBSD) -Amachine(mips)"
diff --git a/gnu/usr.bin/gcc/config/mips/openbsd.h b/gnu/usr.bin/gcc/config/mips/openbsd.h
index db93c872d33..67a5ae7ce70 100644
--- a/gnu/usr.bin/gcc/config/mips/openbsd.h
+++ b/gnu/usr.bin/gcc/config/mips/openbsd.h
@@ -70,7 +70,7 @@ Boston, MA 02111-1307, USA.  */
 /* Define mips-specific OpenBSD predefines... */
 #ifndef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__ANSI_COMPAT \
--DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__OpenBSD__ -D__NetBSD__ -Dmips \
+-DMIPSEL -DR3000 -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__OpenBSD__ -Dmips \
 -D__NO_LEADING_UNDERSCORES__ -D__GP_SUPPORT__ \
 -Dunix -D_R3000 \
 -Asystem(unix) -Asystem(OpenBSD) -Amachine(mips)"
diff --git a/gnu/usr.bin/gcc/config/ns32k/openbsd.h b/gnu/usr.bin/gcc/config/ns32k/openbsd.h
index ba21f05188e..4d1b25589a9 100644
--- a/gnu/usr.bin/gcc/config/ns32k/openbsd.h
+++ b/gnu/usr.bin/gcc/config/ns32k/openbsd.h
@@ -68,7 +68,7 @@ Boston, MA 02111-1307, USA.
 /* Names to predefine in the preprocessor for this target machine.  */
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Dns32k -Dns32000 -Dns32532 -D__OpenBSD__ -D__NetBSD__ -Dpc532 -D__ns32k__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(ns32k) -Amachine(ns32k)"
+#define CPP_PREDEFINES "-Dunix -Dns32k -Dns32000 -Dns32532 -D__OpenBSD__ -Dpc532 -D__ns32k__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(ns32k) -Amachine(ns32k)"
 
 /* Make gcc agree with <machine/ansi.h> */
 
diff --git a/gnu/usr.bin/gcc/config/rs6000/openbsd.h b/gnu/usr.bin/gcc/config/rs6000/openbsd.h
index 631c2de6fe3..38ea9ab4233 100644
--- a/gnu/usr.bin/gcc/config/rs6000/openbsd.h
+++ b/gnu/usr.bin/gcc/config/rs6000/openbsd.h
@@ -464,7 +464,7 @@ do {									\
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dunix -Dppc -D__ppc__ -Dpowerpc -D__powerpc__ \
-	-D__OpenBSD__ -D__NetBSD__ -Asystem(unix) -Asystem(OpenBSD) \
+	-D__OpenBSD__ -Asystem(unix) -Asystem(OpenBSD) \
 	-Acpu(powerpc) -Amachine(powerpc)"
 
 #undef CPP_SPEC
diff --git a/gnu/usr.bin/gcc/config/sparc/openbsd.h b/gnu/usr.bin/gcc/config/sparc/openbsd.h
index 7eb503e2f6e..1caac2b7679 100644
--- a/gnu/usr.bin/gcc/config/sparc/openbsd.h
+++ b/gnu/usr.bin/gcc/config/sparc/openbsd.h
@@ -7,7 +7,7 @@
 /* Names to predefine in the preprocessor for this target machine.  */
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Dsparc -D__OpenBSD__ -D__NetBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(sparc) -Amachine(sparc)"
+#define CPP_PREDEFINES "-Dunix -Dsparc -D__OpenBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(sparc) -Amachine(sparc)"
 
 /* Make gcc agree with <machine/ansi.h> */
 
diff --git a/gnu/usr.bin/gcc/config/vax/openbsd.h b/gnu/usr.bin/gcc/config/vax/openbsd.h
index 205dce616a0..b6c25b4cda2 100644
--- a/gnu/usr.bin/gcc/config/vax/openbsd.h
+++ b/gnu/usr.bin/gcc/config/vax/openbsd.h
@@ -2,7 +2,7 @@
 #include <openbsd.h>
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Dvax -D__OpenBSD__ -D__NetBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(vax) -Amachine(vax)"
+#define CPP_PREDEFINES "-Dunix -Dvax -D__OpenBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(vax) -Amachine(vax)"
 
 /* Make gcc agree with <machine/ansi.h> */