From patchwork Thu Dec  9 22:50:17 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svr4.h avoidance: v850
Date: Thu, 09 Dec 2010 12:50:17 -0000
From: "Joseph S. Myers" <joseph@codesourcery.com>
X-Patchwork-Id: 75006
Message-Id: <Pine.LNX.4.64.1012092249340.32497@digraph.polyomino.org.uk>
To: gcc-patches@gcc.gnu.org
Cc: nickc@redhat.com

This patch in the series removing svr4.h from the headers used by
particular targets in GCC stops v850*-* from using that header, adding
the macros used from it to v850.h.

Tested building cc1 and xgcc for crosses to v850e-elf and v850-elf.
(I tried v850e1-elf as well, but config.sub doesn't accept v850e1-*
targets; it appears the config.gcc stanza for v850e1-*-* is actually
dead code.)  OK to commit?

2010-12-09  Joseph Myers  <joseph@codesourcery.com>

	* config/v850/v850.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
	WCHAR_TYPE_SIZE): Define.
	* config.gcc (v850e1-*-*, v850e-*-*, v850-*-*): Don't use svr4.h.


Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc	(revision 167658)
+++ gcc/config.gcc	(working copy)
@@ -2585,7 +2585,7 @@ spu-*-elf*)
 	;;
 v850e1-*-*)
 	target_cpu_default="TARGET_CPU_v850e1"
-	tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h v850/v850.h"
+	tm_file="dbxelf.h elfos.h newlib-stdint.h v850/v850.h"
 	tm_p_file=v850/v850-protos.h
 	tmake_file=v850/t-v850e
 	md_file=v850/v850.md
@@ -2603,7 +2603,7 @@ v850e1-*-*)
 	;;
 v850e-*-*)
 	target_cpu_default="TARGET_CPU_v850e"
-	tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h v850/v850.h"
+	tm_file="dbxelf.h elfos.h newlib-stdint.h v850/v850.h"
 	tm_p_file=v850/v850-protos.h
 	tmake_file=v850/t-v850e
 	md_file=v850/v850.md
@@ -2621,7 +2621,7 @@ v850e-*-*)
 	;;
 v850-*-*)
 	target_cpu_default="TARGET_CPU_generic"
-	tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+	tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
 	tmake_file=v850/t-v850
 	if test x$stabs = xyes
 	then
Index: gcc/config/v850/v850.h
===================================================================
--- gcc/config/v850/v850.h	(revision 167658)
+++ gcc/config/v850/v850.h	(working copy)
@@ -198,6 +198,18 @@ extern struct small_memory_info small_me
 
    On the NEC V850, loads do sign extension, so make this default.  */
 #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
 
 /* Standard register usage.  */