From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 9 Dec 2010 17:26:33 +0000 (+0000)
Subject: 	* config/mcore/mcore.h (PTRDIFF_TYPE, WCHAR_TYPE,
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7916fcc32928deb6beedc6fdfb7049e23ffda715;p=thirdparty%2Fgcc.git

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


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d60e4ac1e1c4..e30b062c877d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/mcore/mcore.h (PTRDIFF_TYPE, WCHAR_TYPE,
+	WCHAR_TYPE_SIZE): Define.
+	* config/svr3.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
+	WCHAR_TYPE_SIZE): Don't define.
+	* config.gcc (mcore-*-elf): Don't use svr4.h.
+
 2010-12-09  Joseph Myers  <joseph@codesourcery.com>
 
 	* config.gcc (m32r-*-elf*, m32rle-*-elf*, m32r-*-rtems*,
diff --git a/gcc/config.gcc b/gcc/config.gcc
index ac84b12c41f5..3d09ee8283ad 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1751,7 +1751,7 @@ m68k-*-rtems*)
 	extra_parts="crtbegin.o crtend.o"
 	;;
 mcore-*-elf)
-	tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file} mcore/mcore-elf.h"
+	tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file} mcore/mcore-elf.h"
 	tmake_file=mcore/t-mcore
 	inhibit_libc=true
 	;;
diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h
index f1be99492025..3f76e18eab10 100644
--- a/gcc/config/mcore/mcore.h
+++ b/gcc/config/mcore/mcore.h
@@ -692,9 +692,18 @@ extern const enum reg_class reg_class_from_letter[];
 /* 'char' is signed by default.  */
 #define DEFAULT_SIGNED_CHAR  0
 
-/* The type of size_t unsigned int.  */
+#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
+
 /* Max number of bytes we can move from memory to memory
    in one reasonably fast instruction.  */
 #define MOVE_MAX 4
diff --git a/gcc/config/svr3.h b/gcc/config/svr3.h
index b3b64a066c90..243206245a62 100644
--- a/gcc/config/svr3.h
+++ b/gcc/config/svr3.h
@@ -1,6 +1,7 @@
 /* Operating system specific defines to be used when targeting GCC for
    generic System V Release 3 system.
-   Copyright (C) 1991, 1996, 2000, 2002, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1996, 2000, 2002, 2004, 2007, 2010
+   Free Software Foundation, Inc.
    Contributed by Ron Guilmette (rfg@monkeys.com).
 
 This file is part of GCC.
@@ -77,21 +78,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #undef DBX_DEBUGGING_INFO
 
-/* Define the actual types of some ANSI-mandated types.  These
-   definitions should work for most SVR3 systems.  */
-
-#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
-
 /* The prefix to add to user-visible assembler symbols.
 
    For System V Release 3 the convention is to prepend a leading