inclhack.def (irix_stdio_va_list): New.

* fixinc/inclhack.def (irix_stdio_va_list): New.
* fixinc/fixincl.x: Rebuilt.

From-SVN: r40527

gcc/ChangeLog

+2001-03-16  Bruce Korb  <bkorb@gnu.org>, Alexandre Oliva  <aoliva@redhat.com>
+
+	* fixinc/inclhack.def (irix_stdio_va_list): New.
+	* fixinc/fixincl.x: Rebuilt.
+
 2001-03-15  Richard Henderson  <rth@redhat.com>
 
 	* dwarf2asm.c (dw2_asm_output_offset): Use ASM_OUTPUT_DWARF_OFFSET

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 136 fixup descriptions.
+ * This file contains 137 fixup descriptions.
  *
  * See README for more information.
  *
@@ -2404,9 +2404,45 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Stdio_Va_List fix
+ */
+#define IRIX_STDIO_VA_LIST_FIXIDX        57
+tSCC zIrix_Stdio_Va_ListName[] =
+     "irix_stdio_va_list";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Stdio_Va_ListList[] =
+  "|stdio.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_Stdio_Va_ListMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Stdio_Va_ListSelect0[] =
+       "(printf\\(.*), /\\* va_list \\*/ char \\*";
+
+#define    IRIX_STDIO_VA_LIST_TEST_CT  1
+static tTestDesc aIrix_Stdio_Va_ListTests[] = {
+  { TT_EGREP,    zIrix_Stdio_Va_ListSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Stdio_Va_List
+ */
+static const char* apzIrix_Stdio_Va_ListPatch[] = {
+    "format",
+    "%1, __gnuc_va_list",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Irix_Limits_Const fix
  */
-#define IRIX_LIMITS_CONST_FIXIDX         57
+#define IRIX_LIMITS_CONST_FIXIDX         58
 tSCC zIrix_Limits_ConstName[] =
      "irix_limits_const";
 
@@ -2442,7 +2478,7 @@ static const char* apzIrix_Limits_ConstPatch[] = {
  *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  58
+#define ISC_FMOD_FIXIDX                  59
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -2478,7 +2514,7 @@ static const char* apzIsc_FmodPatch[] = {
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              59
+#define KANDR_CONCAT_FIXIDX              60
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2514,7 +2550,7 @@ static const char* apzKandr_ConcatPatch[] = {
  *
  *  Description of Libc1_Ifdefd_Memx fix
  */
-#define LIBC1_IFDEFD_MEMX_FIXIDX         60
+#define LIBC1_IFDEFD_MEMX_FIXIDX         61
 tSCC zLibc1_Ifdefd_MemxName[] =
      "libc1_ifdefd_memx";
 
@@ -2563,7 +2599,7 @@ extern [a-z_]+ mem.*(\n\
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            61
+#define LIMITS_IFNDEFS_FIXIDX            62
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2602,7 +2638,7 @@ static const char* apzLimits_IfndefsPatch[] = {
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             62
+#define LYNX_VOID_INT_FIXIDX             63
 tSCC zLynx_Void_IntName[] =
      "lynx_void_int";
 
@@ -2638,7 +2674,7 @@ static const char* apzLynx_Void_IntPatch[] = {
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        63
+#define LYNXOS_FCNTL_PROTO_FIXIDX        64
 tSCC zLynxos_Fcntl_ProtoName[] =
      "lynxos_fcntl_proto";
 
@@ -2675,7 +2711,7 @@ static const char* apzLynxos_Fcntl_ProtoPatch[] = {
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        64
+#define M88K_BAD_HYPOT_OPT_FIXIDX        65
 tSCC zM88k_Bad_Hypot_OptName[] =
      "m88k_bad_hypot_opt";
 
@@ -2724,7 +2760,7 @@ static __inline__ double fake_hypot (x, y)\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             65
+#define M88K_BAD_S_IF_FIXIDX             66
 tSCC zM88k_Bad_S_IfName[] =
      "m88k_bad_s_if";
 
@@ -2763,7 +2799,7 @@ static const char* apzM88k_Bad_S_IfPatch[] = {
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           66
+#define M88K_MULTI_INCL_FIXIDX           67
 tSCC zM88k_Multi_InclName[] =
      "m88k_multi_incl";
 
@@ -2800,7 +2836,7 @@ static const char* apzM88k_Multi_InclPatch[] = {
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    67
+#define MACHINE_ANSI_H_VA_LIST_FIXIDX    68
 tSCC zMachine_Ansi_H_Va_ListName[] =
      "machine_ansi_h_va_list";
 
@@ -2843,7 +2879,7 @@ static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              68
+#define MACHINE_NAME_FIXIDX              69
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2876,7 +2912,7 @@ static const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            69
+#define MATH_EXCEPTION_FIXIDX            70
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2924,7 +2960,7 @@ static const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 70
+#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 71
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2971,7 +3007,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      71
+#define MATH_HUGE_VAL_IFNDEF_FIXIDX      72
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -3010,7 +3046,7 @@ static const char* apzMath_Huge_Val_IfndefPatch[] = {
  *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           72
+#define NESTED_MOTOROLA_FIXIDX           73
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -3048,7 +3084,7 @@ static const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         73
+#define NESTED_SYS_LIMITS_FIXIDX         74
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -3084,7 +3120,7 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed",
  *
  *  Description of Nested_Auth_Des fix
  */
-#define NESTED_AUTH_DES_FIXIDX           74
+#define NESTED_AUTH_DES_FIXIDX           75
 tSCC zNested_Auth_DesName[] =
      "nested_auth_des";
 
@@ -3120,7 +3156,7 @@ static const char* apzNested_Auth_DesPatch[] = {
  *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         75
+#define NEWS_OS_RECURSION_FIXIDX         76
 tSCC zNews_Os_RecursionName[] =
      "news_os_recursion";
 
@@ -3158,7 +3194,7 @@ static const char* apzNews_Os_RecursionPatch[] = {
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          76
+#define NEXT_MATH_PREFIX_FIXIDX          77
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -3195,7 +3231,7 @@ static const char* apzNext_Math_PrefixPatch[] = {
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             77
+#define NEXT_TEMPLATE_FIXIDX             78
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -3232,7 +3268,7 @@ static const char* apzNext_TemplatePatch[] = {
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             78
+#define NEXT_VOLITILE_FIXIDX             79
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -3269,7 +3305,7 @@ static const char* apzNext_VolitilePatch[] = {
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           79
+#define NEXT_WAIT_UNION_FIXIDX           80
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -3305,7 +3341,7 @@ static const char* apzNext_Wait_UnionPatch[] = {
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            80
+#define NODEENT_SYNTAX_FIXIDX            81
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -3341,7 +3377,7 @@ static const char* apzNodeent_SyntaxPatch[] = {
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           81
+#define OSF_NAMESPACE_A_FIXIDX           82
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -3387,7 +3423,7 @@ static const char* apzOsf_Namespace_APatch[] = {
  *
  *  Description of Osf_Namespace_C fix
  */
-#define OSF_NAMESPACE_C_FIXIDX           82
+#define OSF_NAMESPACE_C_FIXIDX           83
 tSCC zOsf_Namespace_CName[] =
      "osf_namespace_c";
 
@@ -3442,7 +3478,7 @@ typedef __regmatch_t\tregmatch_t;",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         83
+#define PTHREAD_PAGE_SIZE_FIXIDX         84
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -3478,7 +3514,7 @@ static const char* apzPthread_Page_SizePatch[] = {
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             84
+#define READ_RET_TYPE_FIXIDX             85
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -3516,7 +3552,7 @@ static const char* apzRead_Ret_TypePatch[] = {
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             85
+#define RS6000_DOUBLE_FIXIDX             86
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3555,7 +3591,7 @@ static const char* apzRs6000_DoublePatch[] = {
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             86
+#define RS6000_FCHMOD_FIXIDX             87
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3591,7 +3627,7 @@ static const char* apzRs6000_FchmodPatch[] = {
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              87
+#define RS6000_PARAM_FIXIDX              88
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3627,7 +3663,7 @@ static const char* apzRs6000_ParamPatch[] = {
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           88
+#define SCO_STATIC_FUNC_FIXIDX           89
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3671,7 +3707,7 @@ extern \"C\" {\\\n\
  *
  *  Description of Strict_Ansi_Not fix
  */
-#define STRICT_ANSI_NOT_FIXIDX           89
+#define STRICT_ANSI_NOT_FIXIDX           90
 tSCC zStrict_Ansi_NotName[] =
      "strict_ansi_not";
 
@@ -3706,7 +3742,7 @@ static const char* apzStrict_Ansi_NotPatch[] = {
  *
  *  Description of Strict_Ansi_Not_Ctd fix
  */
-#define STRICT_ANSI_NOT_CTD_FIXIDX       90
+#define STRICT_ANSI_NOT_CTD_FIXIDX       91
 tSCC zStrict_Ansi_Not_CtdName[] =
      "strict_ansi_not_ctd";
 
@@ -3742,7 +3778,7 @@ static const char* apzStrict_Ansi_Not_CtdPatch[] = {
  *
  *  Description of Strict_Ansi_Only fix
  */
-#define STRICT_ANSI_ONLY_FIXIDX          91
+#define STRICT_ANSI_ONLY_FIXIDX          92
 tSCC zStrict_Ansi_OnlyName[] =
      "strict_ansi_only";
 
@@ -3777,7 +3813,7 @@ static const char* apzStrict_Ansi_OnlyPatch[] = {
  *
  *  Description of Sco_Utime fix
  */
-#define SCO_UTIME_FIXIDX                 92
+#define SCO_UTIME_FIXIDX                 93
 tSCC zSco_UtimeName[] =
      "sco_utime";
 
@@ -3815,7 +3851,7 @@ static const char* apzSco_UtimePatch[] = {
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                93
+#define STATSSWTCH_FIXIDX                94
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3851,7 +3887,7 @@ static const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            94
+#define STDIO_STDARG_H_FIXIDX            95
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3888,7 +3924,7 @@ static const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             95
+#define STDIO_VA_LIST_FIXIDX             96
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3933,7 +3969,7 @@ s@_Va_LIST@_VA_LIST@",
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               96
+#define STRUCT_FILE_FIXIDX               97
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3970,7 +4006,7 @@ static const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           97
+#define STRUCT_SOCKADDR_FIXIDX           98
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -4014,7 +4050,7 @@ static const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            98
+#define SUN_AUTH_PROTO_FIXIDX            99
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -4055,7 +4091,7 @@ static const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           99
+#define SUN_BOGUS_IFDEF_FIXIDX           100
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -4091,7 +4127,7 @@ static const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              100
+#define SUN_CATMACRO_FIXIDX              101
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -4131,7 +4167,7 @@ static const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                101
+#define SUN_MALLOC_FIXIDX                102
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -4162,7 +4198,7 @@ static const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           102
+#define SUN_RUSERS_SEMI_FIXIDX           103
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -4197,7 +4233,7 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                103
+#define SUN_SIGNAL_FIXIDX                104
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -4237,7 +4273,7 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        104
+#define SUNOS_MATHERR_DECL_FIXIDX        105
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -4280,7 +4316,7 @@ static const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              105
+#define SUNOS_STRLEN_FIXIDX              106
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -4316,7 +4352,7 @@ static const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   106
+#define SVR4__P_FIXIDX                   107
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4354,7 +4390,7 @@ static const char* apzSvr4__PPatch[] = {
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               107
+#define SVR4_GETCWD_FIXIDX               108
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4390,7 +4426,7 @@ static const char* apzSvr4_GetcwdPatch[] = {
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               108
+#define SVR4_PROFIL_FIXIDX               109
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4426,7 +4462,7 @@ static const char* apzSvr4_ProfilPatch[] = {
  *
  *  Description of Gnu_Types fix
  */
-#define GNU_TYPES_FIXIDX                 109
+#define GNU_TYPES_FIXIDX                 110
 tSCC zGnu_TypesName[] =
      "gnu_types";
 
@@ -4468,7 +4504,7 @@ static const char* apzGnu_TypesPatch[] = {
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             110
+#define SYSV68_STRING_FIXIDX             111
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4505,7 +4541,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       111
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       112
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4541,7 +4577,7 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = {
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           112
+#define TINFO_CPLUSPLUS_FIXIDX           113
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4577,7 +4613,7 @@ static const char* apzTinfo_CplusplusPatch[] = {
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         113
+#define ULTRIX_ATOF_PARAM_FIXIDX         114
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4613,7 +4649,7 @@ static const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              114
+#define ULTRIX_CONST_FIXIDX              115
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4650,7 +4686,7 @@ static const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             115
+#define ULTRIX_CONST2_FIXIDX             116
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4687,7 +4723,7 @@ static const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       116
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       117
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4725,7 +4761,7 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              117
+#define ULTRIX_IFDEF_FIXIDX              118
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4761,7 +4797,7 @@ static const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         118
+#define ULTRIX_MATH_IFDEF_FIXIDX         119
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4797,7 +4833,7 @@ static const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       119
+#define ULTRIX_NESTED_IOCTL_FIXIDX       120
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4832,7 +4868,7 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         120
+#define ULTRIX_NESTED_SVC_FIXIDX         121
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4867,7 +4903,7 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               121
+#define ULTRIX_STAT_FIXIDX               122
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4908,7 +4944,7 @@ static const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             122
+#define ULTRIX_STATIC_FIXIDX             123
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4945,7 +4981,7 @@ static const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            123
+#define ULTRIX_STRINGS_FIXIDX            124
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -4980,7 +5016,7 @@ static const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             124
+#define UNDEFINE_NULL_FIXIDX             125
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -5026,7 +5062,7 @@ static const char* apzUndefine_NullPatch[] = {
  *
  *  Description of Uw7_Byteorder_Fix fix
  */
-#define UW7_BYTEORDER_FIX_FIXIDX         125
+#define UW7_BYTEORDER_FIX_FIXIDX         126
 tSCC zUw7_Byteorder_FixName[] =
      "uw7_byteorder_fix";
 
@@ -5077,7 +5113,7 @@ static const char* apzUw7_Byteorder_FixPatch[] = {
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             126
+#define VA_I960_MACRO_FIXIDX             127
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -5113,7 +5149,7 @@ static const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 127
+#define VOID_NULL_FIXIDX                 128
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -5149,7 +5185,7 @@ static const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       128
+#define VXWORKS_GCC_PROBLEM_FIXIDX       129
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -5199,7 +5235,7 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     129
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     130
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -5235,7 +5271,7 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     130
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     131
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5284,7 +5320,7 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              131
+#define VXWORKS_TIME_FIXIDX              132
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5335,7 +5371,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 132
+#define X11_CLASS_FIXIDX                 133
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5382,7 +5418,7 @@ static const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           133
+#define X11_CLASS_USAGE_FIXIDX           134
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5425,7 +5461,7 @@ static const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   134
+#define X11_NEW_FIXIDX                   135
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5466,7 +5502,7 @@ static const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               135
+#define X11_SPRINTF_FIXIDX               136
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5505,9 +5541,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          143
+#define REGEX_COUNT          144
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            136
+#define FIX_COUNT            137
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
@@ -5795,6 +5831,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Asm_ApostropheTests,   apzIrix_Asm_ApostrophePatch, 0 },
 
+  {  zIrix_Stdio_Va_ListName,    zIrix_Stdio_Va_ListList,
+     apzIrix_Stdio_Va_ListMachs,
+     IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_Stdio_Va_ListTests,   apzIrix_Stdio_Va_ListPatch, 0 },
+
   {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
      apzIrix_Limits_ConstMachs,
      IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

gcc/fixinc/inclhack.def

@@ -1327,6 +1327,20 @@ fix = {
 
 
 /*
+ *  IRIX 5.x's stdio.h declares some functions that take a va_list as
+ *  taking char *.  However, GCC uses void * for va_list, so 
+ *  calling vfprintf with a va_list fails in C++.  */
+fix = {
+    hackname  = irix_stdio_va_list;
+    files     = stdio.h;
+
+    select = '(printf\(.*), /\* va_list \*/ char \*';
+    c_fix  = format;
+    c_fix_arg = "%1, __gnuc_va_list";
+};
+
+
+/*
  *  Non-traditional "const" declaration in Irix's limits.h.
  */
 fix = {