* fixinc/inclhack.def (avoid_wchar_t_type): New fix.

	* fininc/fixincl.x: Regenerated.


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

3 files changed, 168 insertions, 104 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4f76575686a..5c34f1ae977 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-11  Mark Mitchell  <mark@codesourcery.com>
+
+	* fixinc/inclhack.def (avoid_wchar_t_type): New fix.
+	* fininc/fixincl.x: Regenerated.
+
 2000-11-11  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* invoke.texi: Correct spelling of -foptimize-register-move.
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 0bfc7d3967e..524489b4de5 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -5,7 +5,7 @@
  * files which are fixed to work correctly with ANSI C and placed in a
  * directory that GNU C will search.
  *
- * This file contains 129 fixup descriptions.
+ * This file contains 130 fixup descriptions.
  *
  * See README-fixinc for more information.
  *
@@ -1295,9 +1295,47 @@ static const char* apzAvoid_Bool_TypePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Avoid_Wchar_T_Type fix
+ */
+#define AVOID_WCHAR_T_TYPE_FIXIDX        28
+tSCC zAvoid_Wchar_T_TypeName[] =
+     "avoid_wchar_t_type";
+
+/*
+ *  File name selection pattern
+ */
+#define zAvoid_Wchar_T_TypeList (char*)NULL
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAvoid_Wchar_T_TypeMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAvoid_Wchar_T_TypeSelect0[] =
+       "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
+
+#define    AVOID_WCHAR_T_TYPE_TEST_CT  1
+static tTestDesc aAvoid_Wchar_T_TypeTests[] = {
+  { TT_EGREP,    zAvoid_Wchar_T_TypeSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Avoid_Wchar_T_Type
+ */
+static const char* apzAvoid_Wchar_T_TypePatch[] = {
+    "format",
+    "#ifndef __cplusplus\n\
+%0\n\
+#endif",
+    "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;.*",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Bad_Lval fix
  */
-#define BAD_LVAL_FIXIDX                  28
+#define BAD_LVAL_FIXIDX                  29
 tSCC zBad_LvalName[] =
      "bad_lval";
 
@@ -1332,7 +1370,7 @@ static const char* apzBad_LvalPatch[] = { "sed",
  *
  *  Description of Bad_Struct_Term fix
  */
-#define BAD_STRUCT_TERM_FIXIDX           29
+#define BAD_STRUCT_TERM_FIXIDX           30
 tSCC zBad_Struct_TermName[] =
      "bad_struct_term";
 
@@ -1368,7 +1406,7 @@ static const char* apzBad_Struct_TermPatch[] = {
  *
  *  Description of Badquote fix
  */
-#define BADQUOTE_FIXIDX                  30
+#define BADQUOTE_FIXIDX                  31
 tSCC zBadquoteName[] =
      "badquote";
 
@@ -1404,7 +1442,7 @@ static const char* apzBadquotePatch[] = {
  *
  *  Description of Broken_Assert_Stdio fix
  */
-#define BROKEN_ASSERT_STDIO_FIXIDX       31
+#define BROKEN_ASSERT_STDIO_FIXIDX       32
 tSCC zBroken_Assert_StdioName[] =
      "broken_assert_stdio";
 
@@ -1447,7 +1485,7 @@ static const char* apzBroken_Assert_StdioPatch[] = {
  *
  *  Description of Broken_Assert_Stdlib fix
  */
-#define BROKEN_ASSERT_STDLIB_FIXIDX      32
+#define BROKEN_ASSERT_STDLIB_FIXIDX      33
 tSCC zBroken_Assert_StdlibName[] =
      "broken_assert_stdlib";
 
@@ -1492,7 +1530,7 @@ static const char* apzBroken_Assert_StdlibPatch[] = {
  *
  *  Description of Broken_Cabs fix
  */
-#define BROKEN_CABS_FIXIDX               33
+#define BROKEN_CABS_FIXIDX               34
 tSCC zBroken_CabsName[] =
      "broken_cabs";
 
@@ -1529,7 +1567,7 @@ static const char* apzBroken_CabsPatch[] = {
  *
  *  Description of Ctrl_Quotes_Def fix
  */
-#define CTRL_QUOTES_DEF_FIXIDX           34
+#define CTRL_QUOTES_DEF_FIXIDX           35
 tSCC zCtrl_Quotes_DefName[] =
      "ctrl_quotes_def";
 
@@ -1564,7 +1602,7 @@ static const char* apzCtrl_Quotes_DefPatch[] = {
  *
  *  Description of Ctrl_Quotes_Use fix
  */
-#define CTRL_QUOTES_USE_FIXIDX           35
+#define CTRL_QUOTES_USE_FIXIDX           36
 tSCC zCtrl_Quotes_UseName[] =
      "ctrl_quotes_use";
 
@@ -1599,7 +1637,7 @@ static const char* apzCtrl_Quotes_UsePatch[] = {
  *
  *  Description of Cxx_Unready fix
  */
-#define CXX_UNREADY_FIXIDX               36
+#define CXX_UNREADY_FIXIDX               37
 tSCC zCxx_UnreadyName[] =
      "cxx_unready";
 
@@ -1647,7 +1685,7 @@ extern \"C\" {\n\
  *
  *  Description of Dec_Intern_Asm fix
  */
-#define DEC_INTERN_ASM_FIXIDX            37
+#define DEC_INTERN_ASM_FIXIDX            38
 tSCC zDec_Intern_AsmName[] =
      "dec_intern_asm";
 
@@ -1677,7 +1715,7 @@ static const char* apzDec_Intern_AsmPatch[] = { "sed",
  *
  *  Description of Ecd_Cursor fix
  */
-#define ECD_CURSOR_FIXIDX                38
+#define ECD_CURSOR_FIXIDX                39
 tSCC zEcd_CursorName[] =
      "ecd_cursor";
 
@@ -1713,7 +1751,7 @@ static const char* apzEcd_CursorPatch[] = {
  *
  *  Description of Fix_Header_Breakage fix
  */
-#define FIX_HEADER_BREAKAGE_FIXIDX       39
+#define FIX_HEADER_BREAKAGE_FIXIDX       40
 tSCC zFix_Header_BreakageName[] =
      "fix_header_breakage";
 
@@ -1751,7 +1789,7 @@ static const char* apzFix_Header_BreakagePatch[] = {
  *
  *  Description of Hp_Inline fix
  */
-#define HP_INLINE_FIXIDX                 40
+#define HP_INLINE_FIXIDX                 41
 tSCC zHp_InlineName[] =
      "hp_inline";
 
@@ -1788,7 +1826,7 @@ static const char* apzHp_InlinePatch[] = {
  *
  *  Description of Hp_Sysfile fix
  */
-#define HP_SYSFILE_FIXIDX                41
+#define HP_SYSFILE_FIXIDX                42
 tSCC zHp_SysfileName[] =
      "hp_sysfile";
 
@@ -1825,7 +1863,7 @@ static const char* apzHp_SysfilePatch[] = {
  *
  *  Description of Hpux11_Fabsf fix
  */
-#define HPUX11_FABSF_FIXIDX              42
+#define HPUX11_FABSF_FIXIDX              43
 tSCC zHpux11_FabsfName[] =
      "hpux11_fabsf";
 
@@ -1870,7 +1908,7 @@ static const char* apzHpux11_FabsfPatch[] = {
  *
  *  Description of Hpux11_Uint32_C fix
  */
-#define HPUX11_UINT32_C_FIXIDX           43
+#define HPUX11_UINT32_C_FIXIDX           44
 tSCC zHpux11_Uint32_CName[] =
      "hpux11_uint32_c";
 
@@ -1906,7 +1944,7 @@ static const char* apzHpux11_Uint32_CPatch[] = {
  *
  *  Description of Hpux8_Bogus_Inlines fix
  */
-#define HPUX8_BOGUS_INLINES_FIXIDX       44
+#define HPUX8_BOGUS_INLINES_FIXIDX       45
 tSCC zHpux8_Bogus_InlinesName[] =
      "hpux8_bogus_inlines";
 
@@ -1944,7 +1982,7 @@ static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
  *
  *  Description of Int_Abort_Free_And_Exit fix
  */
-#define INT_ABORT_FREE_AND_EXIT_FIXIDX   45
+#define INT_ABORT_FREE_AND_EXIT_FIXIDX   46
 tSCC zInt_Abort_Free_And_ExitName[] =
      "int_abort_free_and_exit";
 
@@ -1980,7 +2018,7 @@ static const char* apzInt_Abort_Free_And_ExitPatch[] = {
  *
  *  Description of Isc_Omits_With_Stdc fix
  */
-#define ISC_OMITS_WITH_STDC_FIXIDX       46
+#define ISC_OMITS_WITH_STDC_FIXIDX       47
 tSCC zIsc_Omits_With_StdcName[] =
      "isc_omits_with_stdc";
 
@@ -2016,7 +2054,7 @@ static const char* apzIsc_Omits_With_StdcPatch[] = {
  *
  *  Description of Io_Quotes_Def fix
  */
-#define IO_QUOTES_DEF_FIXIDX             47
+#define IO_QUOTES_DEF_FIXIDX             48
 tSCC zIo_Quotes_DefName[] =
      "io_quotes_def";
 
@@ -2051,7 +2089,7 @@ static const char* apzIo_Quotes_DefPatch[] = {
  *
  *  Description of Io_Quotes_Use fix
  */
-#define IO_QUOTES_USE_FIXIDX             48
+#define IO_QUOTES_USE_FIXIDX             49
 tSCC zIo_Quotes_UseName[] =
      "io_quotes_use";
 
@@ -2086,7 +2124,7 @@ static const char* apzIo_Quotes_UsePatch[] = {
  *
  *  Description of Hpux_Maxint fix
  */
-#define HPUX_MAXINT_FIXIDX               49
+#define HPUX_MAXINT_FIXIDX               50
 tSCC zHpux_MaxintName[] =
      "hpux_maxint";
 
@@ -2125,7 +2163,7 @@ static const char* apzHpux_MaxintPatch[] = {
  *
  *  Description of Hpux_Systime fix
  */
-#define HPUX_SYSTIME_FIXIDX              50
+#define HPUX_SYSTIME_FIXIDX              51
 tSCC zHpux_SystimeName[] =
      "hpux_systime";
 
@@ -2161,7 +2199,7 @@ static const char* apzHpux_SystimePatch[] = {
  *
  *  Description of Ip_Missing_Semi fix
  */
-#define IP_MISSING_SEMI_FIXIDX           51
+#define IP_MISSING_SEMI_FIXIDX           52
 tSCC zIp_Missing_SemiName[] =
      "ip_missing_semi";
 
@@ -2196,7 +2234,7 @@ static const char* apzIp_Missing_SemiPatch[] = { "sed",
  *
  *  Description of Irix_Asm_Apostrophe fix
  */
-#define IRIX_ASM_APOSTROPHE_FIXIDX       52
+#define IRIX_ASM_APOSTROPHE_FIXIDX       53
 tSCC zIrix_Asm_ApostropheName[] =
      "irix_asm_apostrophe";
 
@@ -2233,7 +2271,7 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
  *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  53
+#define ISC_FMOD_FIXIDX                  54
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -2269,7 +2307,7 @@ static const char* apzIsc_FmodPatch[] = {
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              54
+#define KANDR_CONCAT_FIXIDX              55
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2305,7 +2343,7 @@ static const char* apzKandr_ConcatPatch[] = {
  *
  *  Description of Libc1_Ifdefd_Memx fix
  */
-#define LIBC1_IFDEFD_MEMX_FIXIDX         55
+#define LIBC1_IFDEFD_MEMX_FIXIDX         56
 tSCC zLibc1_Ifdefd_MemxName[] =
      "libc1_ifdefd_memx";
 
@@ -2354,7 +2392,7 @@ extern [a-z_]+ mem.*(\n\
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            56
+#define LIMITS_IFNDEFS_FIXIDX            57
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2393,7 +2431,7 @@ static const char* apzLimits_IfndefsPatch[] = {
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             57
+#define LYNX_VOID_INT_FIXIDX             58
 tSCC zLynx_Void_IntName[] =
      "lynx_void_int";
 
@@ -2429,7 +2467,7 @@ static const char* apzLynx_Void_IntPatch[] = {
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        58
+#define LYNXOS_FCNTL_PROTO_FIXIDX        59
 tSCC zLynxos_Fcntl_ProtoName[] =
      "lynxos_fcntl_proto";
 
@@ -2466,7 +2504,7 @@ static const char* apzLynxos_Fcntl_ProtoPatch[] = {
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        59
+#define M88K_BAD_HYPOT_OPT_FIXIDX        60
 tSCC zM88k_Bad_Hypot_OptName[] =
      "m88k_bad_hypot_opt";
 
@@ -2515,7 +2553,7 @@ static __inline__ double fake_hypot (x, y)\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             60
+#define M88K_BAD_S_IF_FIXIDX             61
 tSCC zM88k_Bad_S_IfName[] =
      "m88k_bad_s_if";
 
@@ -2554,7 +2592,7 @@ static const char* apzM88k_Bad_S_IfPatch[] = {
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           61
+#define M88K_MULTI_INCL_FIXIDX           62
 tSCC zM88k_Multi_InclName[] =
      "m88k_multi_incl";
 
@@ -2591,7 +2629,7 @@ static const char* apzM88k_Multi_InclPatch[] = {
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    62
+#define MACHINE_ANSI_H_VA_LIST_FIXIDX    63
 tSCC zMachine_Ansi_H_Va_ListName[] =
      "machine_ansi_h_va_list";
 
@@ -2635,7 +2673,7 @@ static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              63
+#define MACHINE_NAME_FIXIDX              64
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2668,7 +2706,7 @@ static const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            64
+#define MATH_EXCEPTION_FIXIDX            65
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2716,7 +2754,7 @@ static const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 65
+#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 66
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2763,7 +2801,7 @@ static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c",
  *
  *  Description of Math_Huge_Val_Ifndef fix
  */
-#define MATH_HUGE_VAL_IFNDEF_FIXIDX      66
+#define MATH_HUGE_VAL_IFNDEF_FIXIDX      67
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -2802,7 +2840,7 @@ static const char* apzMath_Huge_Val_IfndefPatch[] = {
  *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           67
+#define NESTED_MOTOROLA_FIXIDX           68
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -2840,7 +2878,7 @@ static const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         68
+#define NESTED_SYS_LIMITS_FIXIDX         69
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -2876,7 +2914,7 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed",
  *
  *  Description of Nested_Auth_Des fix
  */
-#define NESTED_AUTH_DES_FIXIDX           69
+#define NESTED_AUTH_DES_FIXIDX           70
 tSCC zNested_Auth_DesName[] =
      "nested_auth_des";
 
@@ -2912,7 +2950,7 @@ static const char* apzNested_Auth_DesPatch[] = {
  *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         70
+#define NEWS_OS_RECURSION_FIXIDX         71
 tSCC zNews_Os_RecursionName[] =
      "news_os_recursion";
 
@@ -2950,7 +2988,7 @@ static const char* apzNews_Os_RecursionPatch[] = {
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          71
+#define NEXT_MATH_PREFIX_FIXIDX          72
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -2987,7 +3025,7 @@ static const char* apzNext_Math_PrefixPatch[] = {
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             72
+#define NEXT_TEMPLATE_FIXIDX             73
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -3024,7 +3062,7 @@ static const char* apzNext_TemplatePatch[] = {
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             73
+#define NEXT_VOLITILE_FIXIDX             74
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -3061,7 +3099,7 @@ static const char* apzNext_VolitilePatch[] = {
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           74
+#define NEXT_WAIT_UNION_FIXIDX           75
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -3097,7 +3135,7 @@ static const char* apzNext_Wait_UnionPatch[] = {
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            75
+#define NODEENT_SYNTAX_FIXIDX            76
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -3133,7 +3171,7 @@ static const char* apzNodeent_SyntaxPatch[] = {
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           76
+#define OSF_NAMESPACE_A_FIXIDX           77
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -3179,7 +3217,7 @@ static const char* apzOsf_Namespace_APatch[] = {
  *
  *  Description of Osf_Namespace_C fix
  */
-#define OSF_NAMESPACE_C_FIXIDX           77
+#define OSF_NAMESPACE_C_FIXIDX           78
 tSCC zOsf_Namespace_CName[] =
      "osf_namespace_c";
 
@@ -3234,7 +3272,7 @@ typedef __regmatch_t\tregmatch_t;",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         78
+#define PTHREAD_PAGE_SIZE_FIXIDX         79
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -3270,7 +3308,7 @@ static const char* apzPthread_Page_SizePatch[] = {
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             79
+#define READ_RET_TYPE_FIXIDX             80
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -3308,7 +3346,7 @@ static const char* apzRead_Ret_TypePatch[] = {
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             80
+#define RS6000_DOUBLE_FIXIDX             81
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3347,7 +3385,7 @@ static const char* apzRs6000_DoublePatch[] = {
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             81
+#define RS6000_FCHMOD_FIXIDX             82
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3383,7 +3421,7 @@ static const char* apzRs6000_FchmodPatch[] = {
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              82
+#define RS6000_PARAM_FIXIDX              83
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3419,7 +3457,7 @@ static const char* apzRs6000_ParamPatch[] = {
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           83
+#define SCO_STATIC_FUNC_FIXIDX           84
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3463,7 +3501,7 @@ extern \"C\" {\\\n\
  *
  *  Description of Sco_Strict_Ansi fix
  */
-#define SCO_STRICT_ANSI_FIXIDX           84
+#define SCO_STRICT_ANSI_FIXIDX           85
 tSCC zSco_Strict_AnsiName[] =
      "sco_strict_ansi";
 
@@ -3501,7 +3539,7 @@ static const char* apzSco_Strict_AnsiPatch[] = {
  *
  *  Description of Sco_Utime fix
  */
-#define SCO_UTIME_FIXIDX                 85
+#define SCO_UTIME_FIXIDX                 86
 tSCC zSco_UtimeName[] =
      "sco_utime";
 
@@ -3539,7 +3577,7 @@ static const char* apzSco_UtimePatch[] = {
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                86
+#define STATSSWTCH_FIXIDX                87
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3575,7 +3613,7 @@ static const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            87
+#define STDIO_STDARG_H_FIXIDX            88
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3612,7 +3650,7 @@ static const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             88
+#define STDIO_VA_LIST_FIXIDX             89
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3657,7 +3695,7 @@ s@_Va_LIST@_VA_LIST@",
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               89
+#define STRUCT_FILE_FIXIDX               90
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3694,7 +3732,7 @@ static const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           90
+#define STRUCT_SOCKADDR_FIXIDX           91
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -3738,7 +3776,7 @@ static const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            91
+#define SUN_AUTH_PROTO_FIXIDX            92
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -3779,7 +3817,7 @@ static const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           92
+#define SUN_BOGUS_IFDEF_FIXIDX           93
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -3815,7 +3853,7 @@ static const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              93
+#define SUN_CATMACRO_FIXIDX              94
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -3855,7 +3893,7 @@ static const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                94
+#define SUN_MALLOC_FIXIDX                95
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -3886,7 +3924,7 @@ static const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           95
+#define SUN_RUSERS_SEMI_FIXIDX           96
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -3921,7 +3959,7 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                96
+#define SUN_SIGNAL_FIXIDX                97
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -3961,7 +3999,7 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        97
+#define SUNOS_MATHERR_DECL_FIXIDX        98
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -4004,7 +4042,7 @@ static const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              98
+#define SUNOS_STRLEN_FIXIDX              99
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -4040,7 +4078,7 @@ static const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   99
+#define SVR4__P_FIXIDX                   100
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4078,7 +4116,7 @@ static const char* apzSvr4__PPatch[] = {
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               100
+#define SVR4_GETCWD_FIXIDX               101
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4114,7 +4152,7 @@ static const char* apzSvr4_GetcwdPatch[] = {
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               101
+#define SVR4_PROFIL_FIXIDX               102
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4150,7 +4188,7 @@ static const char* apzSvr4_ProfilPatch[] = {
  *
  *  Description of Gnu_Types fix
  */
-#define GNU_TYPES_FIXIDX                 102
+#define GNU_TYPES_FIXIDX                 103
 tSCC zGnu_TypesName[] =
      "gnu_types";
 
@@ -4192,7 +4230,7 @@ static const char* apzGnu_TypesPatch[] = {
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             103
+#define SYSV68_STRING_FIXIDX             104
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4229,7 +4267,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       104
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       105
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4265,7 +4303,7 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = {
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           105
+#define TINFO_CPLUSPLUS_FIXIDX           106
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4301,7 +4339,7 @@ static const char* apzTinfo_CplusplusPatch[] = {
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         106
+#define ULTRIX_ATOF_PARAM_FIXIDX         107
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4337,7 +4375,7 @@ static const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              107
+#define ULTRIX_CONST_FIXIDX              108
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4374,7 +4412,7 @@ static const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             108
+#define ULTRIX_CONST2_FIXIDX             109
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4411,7 +4449,7 @@ static const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       109
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       110
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4449,7 +4487,7 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              110
+#define ULTRIX_IFDEF_FIXIDX              111
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4485,7 +4523,7 @@ static const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         111
+#define ULTRIX_MATH_IFDEF_FIXIDX         112
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4521,7 +4559,7 @@ static const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       112
+#define ULTRIX_NESTED_IOCTL_FIXIDX       113
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4556,7 +4594,7 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         113
+#define ULTRIX_NESTED_SVC_FIXIDX         114
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4591,7 +4629,7 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               114
+#define ULTRIX_STAT_FIXIDX               115
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4632,7 +4670,7 @@ static const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             115
+#define ULTRIX_STATIC_FIXIDX             116
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4669,7 +4707,7 @@ static const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            116
+#define ULTRIX_STRINGS_FIXIDX            117
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -4704,7 +4742,7 @@ static const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             117
+#define UNDEFINE_NULL_FIXIDX             118
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -4750,7 +4788,7 @@ static const char* apzUndefine_NullPatch[] = {
  *
  *  Description of Uw7_Byteorder_Fix fix
  */
-#define UW7_BYTEORDER_FIX_FIXIDX         118
+#define UW7_BYTEORDER_FIX_FIXIDX         119
 tSCC zUw7_Byteorder_FixName[] =
      "uw7_byteorder_fix";
 
@@ -4801,7 +4839,7 @@ static const char* apzUw7_Byteorder_FixPatch[] = {
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             119
+#define VA_I960_MACRO_FIXIDX             120
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -4837,7 +4875,7 @@ static const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 120
+#define VOID_NULL_FIXIDX                 121
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -4873,7 +4911,7 @@ static const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       121
+#define VXWORKS_GCC_PROBLEM_FIXIDX       122
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -4923,7 +4961,7 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     122
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     123
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -4959,7 +4997,7 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     123
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     124
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5008,7 +5046,7 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              124
+#define VXWORKS_TIME_FIXIDX              125
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5059,7 +5097,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 125
+#define X11_CLASS_FIXIDX                 126
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5106,7 +5144,7 @@ static const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           126
+#define X11_CLASS_USAGE_FIXIDX           127
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5149,7 +5187,7 @@ static const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   127
+#define X11_NEW_FIXIDX                   128
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5190,7 +5228,7 @@ static const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               128
+#define X11_SPRINTF_FIXIDX               129
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5229,9 +5267,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          133
+#define REGEX_COUNT          134
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            129
+#define FIX_COUNT            130
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
@@ -5374,6 +5412,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AVOID_BOOL_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAvoid_Bool_TypeTests,   apzAvoid_Bool_TypePatch },
 
+  {  zAvoid_Wchar_T_TypeName,    zAvoid_Wchar_T_TypeList,
+     apzAvoid_Wchar_T_TypeMachs,
+     AVOID_WCHAR_T_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAvoid_Wchar_T_TypeTests,   apzAvoid_Wchar_T_TypePatch },
+
   {  zBad_LvalName,    zBad_LvalList,
      apzBad_LvalMachs,
      BAD_LVAL_TEST_CT, FD_MACH_ONLY,
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 5688c6e8a6d..1eb953b3a56 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -769,6 +769,22 @@ fix = {
     test_text = "typedef unsigned int\tbool \t; /* bool type */";
 };
 
+/*
+ *  For C++, avoid any typedef definition of wchar_t,
+ *  and use the built in type instead.
+ */
+
+fix = {
+    hackname = avoid_wchar_t_type;
+
+    select    = "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;";
+
+    c_fix     = format;
+    c_fix_arg = "#ifndef __cplusplus\n%0\n#endif";
+    c_fix_arg = "^[ \t]*typedef[ \t].*[ \t]wchar_t[ \t]*;.*";
+
+    test_text = "typedef unsigned short\twchar_t \t; /* wchar_t type */";
+};
 
 /*
  *  Fix #defines under Alpha OSF/1: