* config/mn10300/linux.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,

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

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cbdd594..b673b0e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-13  Joseph Myers  <joseph@codesourcery.com>
 
+       * config/mn10300/linux.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
+       WCHAR_TYPE_SIZE): Undefine.
+       * config/mn10300/mn10300.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
+       WCHAR_TYPE_SIZE): Define.
+       * config.gcc (mn10300-*-*): Don't use svr4.h.
+
+2010-12-13  Joseph Myers  <joseph@codesourcery.com>
+
        * config/m68k/linux.h (DBX_REGISTER_NUMBER): Undefine and
        redefine.
        (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE, WCHAR_TYPE_SIZE): Define.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 4c1c4bd..491a5aa 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1974,7 +1974,7 @@ mmix-knuth-mmixware)
        use_gcc_stdint=wrap
        ;;
 mn10300-*-*)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"

diff --git a/gcc/config/mn10300/linux.h b/gcc/config/mn10300/linux.h
index bed6ece..cfaa0a8 100644 (file)
--- a/gcc/config/mn10300/linux.h
+++ b/gcc/config/mn10300/linux.h
@@ -84,3 +84,7 @@ extern int mn10300_protect_label;
     }                                          \
   while (0)           
 
+#undef SIZE_TYPE
+#undef PTRDIFF_TYPE
+#undef WCHAR_TYPE
+#undef WCHAR_TYPE_SIZE

diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h
index 6db0ed0..67516b6 100644 (file)
--- a/gcc/config/mn10300/mn10300.h
+++ b/gcc/config/mn10300/mn10300.h
@@ -121,6 +121,18 @@ extern enum processor_type mn10300_tune_cpu;
 
 /* Define this as 1 if `char' should by default be signed; else as 0.  */
 #define DEFAULT_SIGNED_CHAR 0
+
+#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
 \f
 /* Standard register usage.  */