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

diff --git a/gcc/config/pa/pa-hiux.h b/gcc/config/pa/pa-hiux.h
index fb11ccd425ee5611d76d9f0d907b7cd444b09119..31a5e91124ea79316b6a2967ff48cd596ed5b0f4 100644 (file)
--- 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 c1208cb8e389e6929a67fef2656fc45e48f43204..9ba4f30901456b1f7f91ef9a71e8dadf8c7b057e 100644 (file)
--- 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 ebfbf22490ce4d47f1569f671b425b76d64f0821..4af6580b3d3566e5b76f50bda45573fed34151e9 100644 (file)
--- 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 d5fcc1289eaca0bbcdd76aed8900006422085994..062b0f4edc3177497d44548547e570ab94fd2042 100644 (file)
--- 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 295dd668be07394e164718c26e972214c667cb26..dd971a3f92d8b6cb553c47fb327b56e5e604bd76 100644 (file)
--- 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