* config/netbsd.h (WCHAR_TYPE): Define.

(WCHAR_TYPE_SIZE): Ditto.
(WINT_TYPE): Ditto.
* config/alpha/netbsd.h (WCHAR_TYPE): Remove.
(WCHAR_UNSIGNED): Ditto.
(WCHAR_TYPE_SIZE): Ditto.
(WINT_TYPE): Ditto.
* config/arm/netbsd.h: Likewise.
* config/i386/netbsd-elf.h: Likewise.
* config/i386/netbsd.h: Likewise.
* config/m68k/netbsd-elf.h: Likewise.
* config/m68k/netbsd.h: Likewise.
* config/ns32k/netbsd.h: Likewise.
* config/sparc/netbsd.h: Likewise.
* config/vax/netbsd.: Likewise.


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

11 files changed, 31 insertions, 89 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 458fccd1fac..d2c26057f02 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,21 @@
+2002-02-05  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config/netbsd.h (WCHAR_TYPE): Define.
+	(WCHAR_TYPE_SIZE): Ditto.
+	(WINT_TYPE): Ditto.
+	* config/alpha/netbsd.h (WCHAR_TYPE): Remove.
+	(WCHAR_UNSIGNED): Ditto.
+	(WCHAR_TYPE_SIZE): Ditto.
+	(WINT_TYPE): Ditto.
+	* config/arm/netbsd.h: Likewise.
+	* config/i386/netbsd-elf.h: Likewise.
+	* config/i386/netbsd.h: Likewise.
+	* config/m68k/netbsd-elf.h: Likewise.
+	* config/m68k/netbsd.h: Likewise.
+	* config/ns32k/netbsd.h: Likewise.
+	* config/sparc/netbsd.h: Likewise.
+	* config/vax/netbsd.: Likewise.
+
 2002-02-05  Alexandre Oliva  <aoliva@redhat.com>
 
 	* target.h (struct gcc_target): Added ms_bitfield_layout_p.
diff --git a/gcc/config/alpha/netbsd.h b/gcc/config/alpha/netbsd.h
index 7eacce23f8c..e5551da2288 100644
--- a/gcc/config/alpha/netbsd.h
+++ b/gcc/config/alpha/netbsd.h
@@ -79,19 +79,5 @@ Boston, MA 02111-1307, USA.  */
    %{!shared:crtend%O%s} %{shared:crtendS%O%s}"
 
 
-/* Make gcc agree with <machine/ansi.h> */
-
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
-#undef WINT_TYPE
-#define WINT_TYPE "int"
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (NetBSD/alpha ELF)");
diff --git a/gcc/config/arm/netbsd.h b/gcc/config/arm/netbsd.h
index d1bc0093904..2be49d8f071 100644
--- a/gcc/config/arm/netbsd.h
+++ b/gcc/config/arm/netbsd.h
@@ -77,15 +77,6 @@ Boston, MA 02111-1307, USA.  */
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
 
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
 #define HANDLE_SYSV_PRAGMA
 
 /* We don't have any limit on the length as out debugger is GDB.  */
diff --git a/gcc/config/i386/netbsd-elf.h b/gcc/config/i386/netbsd-elf.h
index 7ff3c21fdea..30267dfa0c3 100644
--- a/gcc/config/i386/netbsd-elf.h
+++ b/gcc/config/i386/netbsd-elf.h
@@ -51,18 +51,6 @@ Boston, MA 02111-1307, USA.  */
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
 
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
-#undef WINT_TYPE
-#define WINT_TYPE "int"
-
 #undef ASM_APP_ON
 #define ASM_APP_ON "#APP\n"
 
diff --git a/gcc/config/i386/netbsd.h b/gcc/config/i386/netbsd.h
index 659a4f0fd3f..1d95de2f6c3 100644
--- a/gcc/config/i386/netbsd.h
+++ b/gcc/config/i386/netbsd.h
@@ -22,15 +22,6 @@
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
 
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
 #undef ASM_APP_ON
 #define ASM_APP_ON "#APP\n"
 
diff --git a/gcc/config/m68k/netbsd-elf.h b/gcc/config/m68k/netbsd-elf.h
index eb155d30d4a..97c1b961852 100644
--- a/gcc/config/m68k/netbsd-elf.h
+++ b/gcc/config/m68k/netbsd-elf.h
@@ -149,15 +149,6 @@ while (0)
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
 
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
 
 /* XXX
    Here is a bunch of stuff lifted from m68kelf.h.  We don't use that
diff --git a/gcc/config/m68k/netbsd.h b/gcc/config/m68k/netbsd.h
index 07dd4e8cc34..5dd0895df6a 100644
--- a/gcc/config/m68k/netbsd.h
+++ b/gcc/config/m68k/netbsd.h
@@ -28,15 +28,6 @@
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
 
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
 /* Every structure or union's size must be a multiple of 2 bytes.  */
 
 #define STRUCTURE_SIZE_BOUNDARY 16
diff --git a/gcc/config/netbsd.h b/gcc/config/netbsd.h
index fba341bc0cb..227942cd490 100644
--- a/gcc/config/netbsd.h
+++ b/gcc/config/netbsd.h
@@ -109,3 +109,16 @@
 /* Handle #pragma weak and #pragma pack.  */
 
 #define HANDLE_SYSV_PRAGMA
+
+
+/* Define some types that are the same on all NetBSD platforms,
+   making them agree with <machine/ansi.h>.  */
+
+#undef WCHAR_TYPE
+#define WCHAR_TYPE "int"
+
+#undef WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
+#undef WINT_TYPE
+#define WINT_TYPE "int"
diff --git a/gcc/config/ns32k/netbsd.h b/gcc/config/ns32k/netbsd.h
index 12ffdf77de5..4050700dd58 100644
--- a/gcc/config/ns32k/netbsd.h
+++ b/gcc/config/ns32k/netbsd.h
@@ -81,15 +81,6 @@ Boston, MA 02111-1307, USA.
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
 
-#undef WCHAR_TYPE
-#define WCHAR_TYPE	"int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED	0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE	32
-
 /* This is BSD, so it wants DBX format.  */
 
 #define DBX_DEBUGGING_INFO
diff --git a/gcc/config/sparc/netbsd.h b/gcc/config/sparc/netbsd.h
index 4be5b6b8e34..b7b44409a55 100644
--- a/gcc/config/sparc/netbsd.h
+++ b/gcc/config/sparc/netbsd.h
@@ -11,15 +11,6 @@
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
 
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
 /* This is BSD, so it wants DBX format.  */
 
 #define DBX_DEBUGGING_INFO
diff --git a/gcc/config/vax/netbsd.h b/gcc/config/vax/netbsd.h
index a2f8532e3c0..a75ae09787a 100644
--- a/gcc/config/vax/netbsd.h
+++ b/gcc/config/vax/netbsd.h
@@ -9,15 +9,6 @@
 #undef PTRDIFF_TYPE
 #define PTRDIFF_TYPE "int"
 
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
 /* Until they use ELF or something that handles dwarf2 unwinds
    and initialization stuff better.  */
 #undef DWARF2_UNWIND_INFO