From b3689904c18e763ee43692fe89b995339b68187f Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 26 Mar 2002 17:17:07 -0800 Subject: [PATCH] sparc.h (MAX_WCHAR_TYPE_SIZE): Don't define. * config/sparc/sparc.h (MAX_WCHAR_TYPE_SIZE): Don't define. * config/sparc/linux-aout.h (MAX_WCHAR_TYPE_SIZE): Don't undef. * config/sparc/linux.h, config/sparc/linux64.h: Likewise. * config/sparc/sol2.h (WCHAR_TYPE, WCHAR_TYPE_SIZE): Redefine. (WINT_TYPE_SIZE): Fix at 32. From-SVN: r51418 --- gcc/ChangeLog | 8 ++++++++ gcc/config/sparc/linux-aout.h | 2 -- gcc/config/sparc/linux.h | 2 -- gcc/config/sparc/linux64.h | 2 -- gcc/config/sparc/sol2.h | 9 ++++++++- gcc/config/sparc/sparc.h | 1 - 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 583f54a2591..7e5aefd31c8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2002-03-26 Richard Henderson + + * config/sparc/sparc.h (MAX_WCHAR_TYPE_SIZE): Don't define. + * config/sparc/linux-aout.h (MAX_WCHAR_TYPE_SIZE): Don't undef. + * config/sparc/linux.h, config/sparc/linux64.h: Likewise. + * config/sparc/sol2.h (WCHAR_TYPE, WCHAR_TYPE_SIZE): Redefine. + (WINT_TYPE_SIZE): Fix at 32. + 2002-03-26 Richard Henderson * toplev.c (rest_of_compilation): Delay emit_initial_value_sets diff --git a/gcc/config/sparc/linux-aout.h b/gcc/config/sparc/linux-aout.h index 55c833f24a8..bed72db14f6 100644 --- a/gcc/config/sparc/linux-aout.h +++ b/gcc/config/sparc/linux-aout.h @@ -59,8 +59,6 @@ Boston, MA 02111-1307, USA. */ #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE 32 -#undef MAX_WCHAR_TYPE_SIZE - #undef CPP_PREDEFINES #define CPP_PREDEFINES "-Dunix -Dsparc -Dlinux -Asystem=unix -Asystem=posix" diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h index a55d43c19a1..c07648b686f 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -99,8 +99,6 @@ Boston, MA 02111-1307, USA. */ #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE 32 -#undef MAX_WCHAR_TYPE_SIZE - #undef CPP_PREDEFINES #define CPP_PREDEFINES "-D__ELF__ -Dunix -D__sparc__ -Dlinux -Asystem=unix -Asystem=posix" diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h index 9d521bc1db4..136864f66c2 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -146,8 +146,6 @@ Boston, MA 02111-1307, USA. */ #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE 32 -#undef MAX_WCHAR_TYPE_SIZE - /* Define for support of TFmode long double. Sparc ABI says that long double is 4 words. */ #undef LONG_DOUBLE_TYPE_SIZE diff --git a/gcc/config/sparc/sol2.h b/gcc/config/sparc/sol2.h index 68efafe8ce5..2f504b34b57 100644 --- a/gcc/config/sparc/sol2.h +++ b/gcc/config/sparc/sol2.h @@ -23,13 +23,20 @@ Boston, MA 02111-1307, USA. */ /* Supposedly the same as vanilla sparc svr4, except for the stuff below: */ +/* Solaris 2 (at least as of 2.5.1) uses a 32-bit wchar_t. */ +#undef WCHAR_TYPE +#define WCHAR_TYPE "long int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE 32 + /* Solaris 2 uses a wint_t different from the default. This is required by the SCD 2.4.1, p. 6-83, Figure 6-66. */ #undef WINT_TYPE #define WINT_TYPE "long int" #undef WINT_TYPE_SIZE -#define WINT_TYPE_SIZE BITS_PER_WORD +#define WINT_TYPE_SIZE 32 #define HANDLE_PRAGMA_REDEFINE_EXTNAME 1 diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h index 89f5e07db8b..9fed03ca1ea 100644 --- a/gcc/config/sparc/sparc.h +++ b/gcc/config/sparc/sparc.h @@ -369,7 +369,6 @@ Unrecognized value in TARGET_CPU_DEFAULT. /* ??? This should be 32 bits for v9 but what can we do? */ #define WCHAR_TYPE "short unsigned int" #define WCHAR_TYPE_SIZE 16 -#define MAX_WCHAR_TYPE_SIZE 16 /* Show we can debug even without a frame pointer. */ #define CAN_DEBUG_WITHOUT_FP -- 2.30.2