From 6b9b8b34d16d39162c31b056206269915dab4d6a Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 13 Dec 2010 11:26:42 +0000 Subject: [PATCH] linux.h (SIZE_TYPE, [...]): Undefine. * 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. From-SVN: r167744 --- gcc/ChangeLog | 8 ++++++++ gcc/config.gcc | 2 +- gcc/config/mn10300/linux.h | 4 ++++ gcc/config/mn10300/mn10300.h | 12 ++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cbdd5940492..b673b0ed3df 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-12-13 Joseph Myers + + * 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 * config/m68k/linux.h (DBX_REGISTER_NUMBER): Undefine and diff --git a/gcc/config.gcc b/gcc/config.gcc index 4c1c4bddf94..491a5aa4679 100644 --- 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 bed6ece5438..cfaa0a8f341 100644 --- 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 6db0ed0c701..67516b6ebe4 100644 --- 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 /* Standard register usage. */ -- 2.30.2