From a3724010252cc46308cb813953c5e4c52d11fa45 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 9 Dec 2010 17:20:25 +0000
Subject: [PATCH] frv.h (SIZE_TYPE, [...]): Define.

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

From-SVN: r167652
---
 gcc/ChangeLog        |  6 ++++++
 gcc/config.gcc       |  4 ++--
 gcc/config/frv/frv.h | 12 ++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c1f2496804..108ef62cfd4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/frv/frv.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
+	WCHAR_TYPE_SIZE): Define.
+	* config.gcc (frv-*-elf, frv-*-*linux*): Don't use svr4.h.
+
 2010-12-09  Joseph Myers  <joseph@codesourcery.com>
 
 	* config/fr30/fr30.h (LIB_SPEC, LINK_SPEC, SIZE_TYPE,
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 12afb36701b..5495015d26d 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -966,12 +966,12 @@ fr30-*-elf)
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	;;
 frv-*-elf)
-	tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+	tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
 	tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
 	tmake_file=frv/t-frv
 	;;
 frv-*-*linux*)
-	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} \
+	tm_file="dbxelf.h elfos.h ${tm_file} \
 	         linux.h glibc-stdint.h frv/linux.h"
 	tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
 	tmake_file="${tmake_file} frv/t-frv frv/t-linux"
diff --git a/gcc/config/frv/frv.h b/gcc/config/frv/frv.h
index 1b97ae72477..15467f2b864 100644
--- a/gcc/config/frv/frv.h
+++ b/gcc/config/frv/frv.h
@@ -508,6 +508,18 @@
    default with the options `-fsigned-char' and `-funsigned-char'.  */
 #define DEFAULT_SIGNED_CHAR 1
 
+#undef  SIZE_TYPE
+#define SIZE_TYPE "unsigned int"
+
+#undef  PTRDIFF_TYPE
+#define PTRDIFF_TYPE "int"
+
+#undef  WCHAR_TYPE
+#define WCHAR_TYPE "long int"
+
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE BITS_PER_WORD
+
 
 /* General purpose registers.  */
 #define GPR_FIRST       0                       /* First gpr */
-- 
2.30.2