From 3c9a7b64d9defc62732ab801a8aaad1f15c642f3 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 16 Mar 1994 10:05:24 -0700 Subject: [PATCH] pa.h (WCHAR_TYPE): Use "unsigned int" by default. * pa.h (WCHAR_TYPE): Use "unsigned int" by default. (WCHAR_TYPE_SIZE): Change appropriately. * pa-ghiux.h, pa-ghpux.h, pa-gux7.h, pa-hiux.h, pa-hpux.h, pa-hpux7.h (WCHAR_TYPE): Delete definition. (WCHAR_TYPE_SIZE): Likewise. * pa-osf.h (WCHAR_TYPE): Override appropriately for OSF1. (WCHAR_TYPE_SIZE): Likewise. From-SVN: r6800 --- gcc/config/pa/pa-hiux.h | 4 ---- gcc/config/pa/pa-hpux.h | 4 ---- gcc/config/pa/pa-hpux7.h | 4 ---- gcc/config/pa/pa-osf.h | 7 +++++++ gcc/config/pa/pa.h | 4 ++-- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gcc/config/pa/pa-hiux.h b/gcc/config/pa/pa-hiux.h index fb11ccd425ee..31a5e91124ea 100644 --- a/gcc/config/pa/pa-hiux.h +++ b/gcc/config/pa/pa-hiux.h @@ -26,13 +26,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Make GCC agree with types.h. */ #undef SIZE_TYPE #undef PTRDIFF_TYPE -#undef WCHAR_TYPE -#undef WCHAR_TYPE_SIZE #define SIZE_TYPE "unsigned int" #define PTRDIFF_TYPE "int" -#define WCHAR_TYPE "unsigned int" -#define WCHAR_TYPE_SIZE 32 /* HPUX doesn't use any debugging format that GCC knows about. */ #undef DBX_DEBUGGING_INFO diff --git a/gcc/config/pa/pa-hpux.h b/gcc/config/pa/pa-hpux.h index c1208cb8e389..9ba4f3090145 100644 --- a/gcc/config/pa/pa-hpux.h +++ b/gcc/config/pa/pa-hpux.h @@ -26,13 +26,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Make GCC agree with types.h. */ #undef SIZE_TYPE #undef PTRDIFF_TYPE -#undef WCHAR_TYPE -#undef WCHAR_TYPE_SIZE #define SIZE_TYPE "unsigned int" #define PTRDIFF_TYPE "int" -#define WCHAR_TYPE "unsigned int" -#define WCHAR_TYPE_SIZE 32 /* HPUX doesn't use any debugging format that GCC knows about. */ #undef DBX_DEBUGGING_INFO diff --git a/gcc/config/pa/pa-hpux7.h b/gcc/config/pa/pa-hpux7.h index ebfbf22490ce..4af6580b3d35 100644 --- a/gcc/config/pa/pa-hpux7.h +++ b/gcc/config/pa/pa-hpux7.h @@ -29,13 +29,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Make GCC agree with types.h. */ #undef SIZE_TYPE #undef PTRDIFF_TYPE -#undef WCHAR_TYPE -#undef WCHAR_TYPE_SIZE #define SIZE_TYPE "unsigned int" #define PTRDIFF_TYPE "int" -#define WCHAR_TYPE "unsigned int" -#define WCHAR_TYPE_SIZE 32 /* HPUX doesn't use any debugging format that GCC knows about. */ #undef DBX_DEBUGGING_INFO diff --git a/gcc/config/pa/pa-osf.h b/gcc/config/pa/pa-osf.h index d5fcc1289eac..062b0f4edc31 100644 --- a/gcc/config/pa/pa-osf.h +++ b/gcc/config/pa/pa-osf.h @@ -27,3 +27,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Don't default to pcc-struct-return, because gcc is the only compiler, and we want to retain compatibility with older gcc versions. */ #define DEFAULT_PCC_STRUCT_RETURN 0 + +/* OSF1 on the PA still uses 16bit wchar_t. */ +#undef WCHAR_TYPE +#undef WCHAR_TYPE_SIZE + +#define WCHAR_TYPE "short unsigned int" +#define WCHAR_TYPE_SIZE 16 diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index 295dd668be07..dd971a3f92d8 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -151,8 +151,8 @@ extern int target_flags; #define SIZE_TYPE "unsigned int" #define PTRDIFF_TYPE "int" -#define WCHAR_TYPE "short unsigned int" -#define WCHAR_TYPE_SIZE 16 +#define WCHAR_TYPE "unsigned int" +#define WCHAR_TYPE_SIZE 32 /* Sometimes certain combinations of command options do not make sense on a particular target machine. You can define a macro -- 2.47.2