netbsd.h (CPP_SPEC): Remove.

* config/netbsd.h (CPP_SPEC): Remove.
* config/i386/netbsd-elf.h (CPP_SPEC): Define.
* config/i386/netbsd.h (CPP_SPEC): Define.
* config/ns32k/netbsd.h (CPP_SPEC): Define.
* config/sparc/netbsd-elf.h (CPP_SPEC): Remove.
* config/sparc/netbsd.h (CPP_SPEC): Define.
* config/vax/netbsd.h (CPP_SPEC): Define.

From-SVN: r53314

8 files changed, 30 insertions, 11 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0b86cc..e1f507c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-09  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config/netbsd.h (CPP_SPEC): Remove.
+	* config/i386/netbsd-elf.h (CPP_SPEC): Define.
+	* config/i386/netbsd.h (CPP_SPEC): Define.
+	* config/ns32k/netbsd.h (CPP_SPEC): Define.
+	* config/sparc/netbsd-elf.h (CPP_SPEC): Remove.
+	* config/sparc/netbsd.h (CPP_SPEC): Define.
+	* config/vax/netbsd.h (CPP_SPEC): Define.
+
 2002-05-08  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* read-rtl.c: Fix formatting.
diff --git a/gcc/config/i386/netbsd-elf.h b/gcc/config/i386/netbsd-elf.h
index e6b6de4..f3992e8 100644
--- a/gcc/config/i386/netbsd-elf.h
+++ b/gcc/config/i386/netbsd-elf.h
@@ -43,6 +43,13 @@ Boston, MA 02111-1307, USA.  */
 #define CPP_PREDEFINES							\
   "-D__NetBSD__ -D__ELF__ -Asystem=unix -Asystem=NetBSD"
 
+/* Provide a CPP_SPEC appropriate for NetBSD.  Currently we just deal with
+   the GCC option `-posix'.  */
+
+#undef CPP_SPEC
+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
+
+
 /* Make gcc agree with <machine/ansi.h> */
 
 #undef SIZE_TYPE
diff --git a/gcc/config/i386/netbsd.h b/gcc/config/i386/netbsd.h
index 765e679..400cb0f 100644
--- a/gcc/config/i386/netbsd.h
+++ b/gcc/config/i386/netbsd.h
@@ -8,6 +8,10 @@
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dunix -D__NetBSD__ \
  -Asystem=unix -Asystem=bsd -Asystem=NetBSD"
+
+#undef CPP_SPEC
+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
+
 
 #undef SIZE_TYPE
 #define SIZE_TYPE "unsigned int"
diff --git a/gcc/config/netbsd.h b/gcc/config/netbsd.h
index 227942c..920c0a8 100644
--- a/gcc/config/netbsd.h
+++ b/gcc/config/netbsd.h
@@ -35,13 +35,6 @@
 #endif /* NETBSD_NATIVE */
 
 
-/* Provide a CPP_SPEC appropriate for NetBSD.  Currently we just deal with
-   the GCC option `-posix'.  */
-
-#undef CPP_SPEC
-#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
-
-
 /* Provide a LIB_SPEC appropriate for NetBSD.  Just select the appropriate
    libc, depending on whether we're doing profiling; if `-posix' is specified,
    link against the appropriate libposix first.  Don't include libc when
diff --git a/gcc/config/ns32k/netbsd.h b/gcc/config/ns32k/netbsd.h
index 4050700..a5ac5b5 100644
--- a/gcc/config/ns32k/netbsd.h
+++ b/gcc/config/ns32k/netbsd.h
@@ -73,6 +73,9 @@ Boston, MA 02111-1307, USA.
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dns32k -Dns32000 -Dns32532 -D__NetBSD__ -Dpc532 -D__ns32k__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=NetBSD -Acpu=ns32k -Amachine=ns32k"
 
+#undef CPP_SPEC
+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
+
 /* Make gcc agree with <machine/ansi.h> */
 
 #undef SIZE_TYPE
diff --git a/gcc/config/sparc/netbsd-elf.h b/gcc/config/sparc/netbsd-elf.h
index 1bf4356..43b3e50 100644
--- a/gcc/config/sparc/netbsd-elf.h
+++ b/gcc/config/sparc/netbsd-elf.h
@@ -295,10 +295,6 @@ Boston, MA 02111-1307, USA.  */
   "%{!m32:%(cpp_subtarget_spec64)}%{m32:%(cpp_subtarget_spec32)}"
 #endif
 
-/* Restore this from sparc/sparc.h, netbsd.h changes it.  */
-#undef CPP_SPEC
-#define CPP_SPEC "%(cpp_cpu) %(cpp_arch) %(cpp_endian) %(cpp_subtarget)"
-
 /* Name the port. */
 #undef TARGET_NAME
 #define TARGET_NAME     (DEFAULT_ARCH32_P ? TARGET_NAME32 : TARGET_NAME64)
diff --git a/gcc/config/sparc/netbsd.h b/gcc/config/sparc/netbsd.h
index b7b4440..13d5a63 100644
--- a/gcc/config/sparc/netbsd.h
+++ b/gcc/config/sparc/netbsd.h
@@ -3,6 +3,9 @@
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dunix -Dsparc -D__NetBSD__ -Asystem=unix -Asystem=NetBSD -Acpu=sparc -Amachine=sparc"
 
+#undef CPP_SPEC
+#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
+
 /* Make gcc agree with <machine/ansi.h> */
 
 #undef SIZE_TYPE
diff --git a/gcc/config/vax/netbsd.h b/gcc/config/vax/netbsd.h
index a75ae09..005a867 100644
--- a/gcc/config/vax/netbsd.h
+++ b/gcc/config/vax/netbsd.h
@@ -1,6 +1,9 @@
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dunix -Dvax -D__NetBSD__ -Asystem=unix -Asystem=NetBSD -Acpu=vax -Amachine=vax"
 
+#undef CPP_SPEC
+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
+
 /* Make gcc agree with <machine/ansi.h> */
 
 #undef SIZE_TYPE