From a23980bdb62645c6adbf6ba7a18a825e2c08c5d0 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 10 Dec 2010 01:03:33 +0000
Subject: [PATCH] linux.h (WCHAR_TYPE, [...]): Define.

	* config/vax/linux.h (WCHAR_TYPE, WCHAR_TYPE_SIZE): Define.
	* config.gcc (vax-*-linux*): Don't use svr4.h.

From-SVN: r167675
---
 gcc/ChangeLog          | 5 +++++
 gcc/config.gcc         | 2 +-
 gcc/config/vax/linux.h | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d9d27245e38..196fcbd9513 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/vax/linux.h (WCHAR_TYPE, WCHAR_TYPE_SIZE): Define.
+	* config.gcc (vax-*-linux*): Don't use svr4.h.
+
 2010-12-09  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* c-typeck.c (build_indirect_ref): Call invalid_indirection_error.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index a5e4829357c..dba1d96276a 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2633,7 +2633,7 @@ v850-*-*)
 	use_gcc_stdint=wrap
 	;;
 vax-*-linux*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h vax/elf.h vax/linux.h"
+	tm_file="${tm_file} dbxelf.h elfos.h linux.h vax/elf.h vax/linux.h"
 	tmake_file="${tmake_file} vax/t-linux"
 	;;
 vax-*-netbsdelf*)
diff --git a/gcc/config/vax/linux.h b/gcc/config/vax/linux.h
index 97e036b9d64..93ce7bb3a25 100644
--- a/gcc/config/vax/linux.h
+++ b/gcc/config/vax/linux.h
@@ -46,3 +46,9 @@ along with GCC; see the file COPYING3.  If not see
       %{rdynamic:-export-dynamic} \
       -dynamic-linker /lib/ld.so.1} \
     %{static:-static}}"
+
+#undef  WCHAR_TYPE
+#define WCHAR_TYPE "long int"
+
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE BITS_PER_WORD