fixincl.tpl: Add 2001 to copyright.

2001-01-30  Jeffrey Oldham  <oldham@codesourcery.com>

        * fixinc/fixincl.tpl: Add 2001 to copyright.  Change name of
        README file.
        * fixinc/fixincl.x: Regenerated.
        * fixinc/inclhack.def (irix_limits_const): New definition to
        convert "const" to "__const" in limits.h.

From-SVN: r39362

gcc/fixinc/fixincl.tpl

@@ -9,9 +9,9 @@ x=fixincl.x =]
  *
  * This file contains [=_eval fix _count =] fixup descriptions.
  *
- * See README-fixinc for more information.
+ * See README for more information.
  *
- *  inclhack copyright (c) 1998, 1999, 2000
+ *  inclhack copyright (c) 1998, 1999, 2000, 2001
  *  The Free Software Foundation, Inc.
  *
 [=_eval inclhack "# *  " _gpl=]

gcc/fixinc/fixincl.x

@@ -5,11 +5,11 @@
  * files which are fixed to work correctly with ANSI C and placed in a
  * directory that GNU C will search.
  *
- * This file contains 130 fixup descriptions.
+ * This file contains 131 fixup descriptions.
  *
- * See README-fixinc for more information.
+ * See README for more information.
  *
- *  inclhack copyright (c) 1998, 1999, 2000
+ *  inclhack copyright (c) 1998, 1999, 2000, 2001
  *  The Free Software Foundation, Inc.
  *
  *  inclhack is free software.
@@ -2281,9 +2281,45 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Irix_Limits_Const fix
+ */
+#define IRIX_LIMITS_CONST_FIXIDX         54
+tSCC zIrix_Limits_ConstName[] =
+     "irix_limits_const";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zIrix_Limits_ConstList[] =
+  "|limits.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzIrix_Limits_ConstMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zIrix_Limits_ConstSelect0[] =
+       "^extern const ";
+
+#define    IRIX_LIMITS_CONST_TEST_CT  1
+static tTestDesc aIrix_Limits_ConstTests[] = {
+  { TT_EGREP,    zIrix_Limits_ConstSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Irix_Limits_Const
+ */
+static const char* apzIrix_Limits_ConstPatch[] = {
+    "format",
+    "extern __const ",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  54
+#define ISC_FMOD_FIXIDX                  55
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -2319,7 +2355,7 @@ static const char* apzIsc_FmodPatch[] = {
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              55
+#define KANDR_CONCAT_FIXIDX              56
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2355,7 +2391,7 @@ static const char* apzKandr_ConcatPatch[] = {
  *
  *  Description of Libc1_Ifdefd_Memx fix
  */
-#define LIBC1_IFDEFD_MEMX_FIXIDX         56
+#define LIBC1_IFDEFD_MEMX_FIXIDX         57
 tSCC zLibc1_Ifdefd_MemxName[] =
      "libc1_ifdefd_memx";
 
@@ -2404,7 +2440,7 @@ extern [a-z_]+ mem.*(\n\
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            57
+#define LIMITS_IFNDEFS_FIXIDX            58
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2443,7 +2479,7 @@ static const char* apzLimits_IfndefsPatch[] = {
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             58
+#define LYNX_VOID_INT_FIXIDX             59
 tSCC zLynx_Void_IntName[] =
      "lynx_void_int";
 
@@ -2479,7 +2515,7 @@ static const char* apzLynx_Void_IntPatch[] = {
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        59
+#define LYNXOS_FCNTL_PROTO_FIXIDX        60
 tSCC zLynxos_Fcntl_ProtoName[] =
      "lynxos_fcntl_proto";
 
@@ -2516,7 +2552,7 @@ static const char* apzLynxos_Fcntl_ProtoPatch[] = {
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        60
+#define M88K_BAD_HYPOT_OPT_FIXIDX        61
 tSCC zM88k_Bad_Hypot_OptName[] =
      "m88k_bad_hypot_opt";
 
@@ -2565,7 +2601,7 @@ static __inline__ double fake_hypot (x, y)\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             61
+#define M88K_BAD_S_IF_FIXIDX             62
 tSCC zM88k_Bad_S_IfName[] =
      "m88k_bad_s_if";
 
@@ -2604,7 +2640,7 @@ static const char* apzM88k_Bad_S_IfPatch[] = {
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           62
+#define M88K_MULTI_INCL_FIXIDX           63
 tSCC zM88k_Multi_InclName[] =
      "m88k_multi_incl";
 
@@ -2641,7 +2677,7 @@ static const char* apzM88k_Multi_InclPatch[] = {
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    63
+#define MACHINE_ANSI_H_VA_LIST_FIXIDX    64
 tSCC zMachine_Ansi_H_Va_ListName[] =
      "machine_ansi_h_va_list";
 
@@ -2684,7 +2720,7 @@ static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              64
+#define MACHINE_NAME_FIXIDX              65
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2717,7 +2753,7 @@ static const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            65
+#define MATH_EXCEPTION_FIXIDX            66
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2765,7 +2801,7 @@ static const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 66
+#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 67
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2812,7 +2848,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      67
+#define MATH_HUGE_VAL_IFNDEF_FIXIDX      68
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -2851,7 +2887,7 @@ static const char* apzMath_Huge_Val_IfndefPatch[] = {
  *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           68
+#define NESTED_MOTOROLA_FIXIDX           69
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -2889,7 +2925,7 @@ static const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         69
+#define NESTED_SYS_LIMITS_FIXIDX         70
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -2925,7 +2961,7 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed",
  *
  *  Description of Nested_Auth_Des fix
  */
-#define NESTED_AUTH_DES_FIXIDX           70
+#define NESTED_AUTH_DES_FIXIDX           71
 tSCC zNested_Auth_DesName[] =
      "nested_auth_des";
 
@@ -2961,7 +2997,7 @@ static const char* apzNested_Auth_DesPatch[] = {
  *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         71
+#define NEWS_OS_RECURSION_FIXIDX         72
 tSCC zNews_Os_RecursionName[] =
      "news_os_recursion";
 
@@ -2999,7 +3035,7 @@ static const char* apzNews_Os_RecursionPatch[] = {
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          72
+#define NEXT_MATH_PREFIX_FIXIDX          73
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -3036,7 +3072,7 @@ static const char* apzNext_Math_PrefixPatch[] = {
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             73
+#define NEXT_TEMPLATE_FIXIDX             74
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -3073,7 +3109,7 @@ static const char* apzNext_TemplatePatch[] = {
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             74
+#define NEXT_VOLITILE_FIXIDX             75
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -3110,7 +3146,7 @@ static const char* apzNext_VolitilePatch[] = {
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           75
+#define NEXT_WAIT_UNION_FIXIDX           76
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -3146,7 +3182,7 @@ static const char* apzNext_Wait_UnionPatch[] = {
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            76
+#define NODEENT_SYNTAX_FIXIDX            77
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -3182,7 +3218,7 @@ static const char* apzNodeent_SyntaxPatch[] = {
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           77
+#define OSF_NAMESPACE_A_FIXIDX           78
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -3228,7 +3264,7 @@ static const char* apzOsf_Namespace_APatch[] = {
  *
  *  Description of Osf_Namespace_C fix
  */
-#define OSF_NAMESPACE_C_FIXIDX           78
+#define OSF_NAMESPACE_C_FIXIDX           79
 tSCC zOsf_Namespace_CName[] =
      "osf_namespace_c";
 
@@ -3283,7 +3319,7 @@ typedef __regmatch_t\tregmatch_t;",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         79
+#define PTHREAD_PAGE_SIZE_FIXIDX         80
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -3319,7 +3355,7 @@ static const char* apzPthread_Page_SizePatch[] = {
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             80
+#define READ_RET_TYPE_FIXIDX             81
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -3357,7 +3393,7 @@ static const char* apzRead_Ret_TypePatch[] = {
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             81
+#define RS6000_DOUBLE_FIXIDX             82
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3396,7 +3432,7 @@ static const char* apzRs6000_DoublePatch[] = {
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             82
+#define RS6000_FCHMOD_FIXIDX             83
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3432,7 +3468,7 @@ static const char* apzRs6000_FchmodPatch[] = {
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              83
+#define RS6000_PARAM_FIXIDX              84
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3468,7 +3504,7 @@ static const char* apzRs6000_ParamPatch[] = {
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           84
+#define SCO_STATIC_FUNC_FIXIDX           85
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3512,7 +3548,7 @@ extern \"C\" {\\\n\
  *
  *  Description of Sco_Strict_Ansi fix
  */
-#define SCO_STRICT_ANSI_FIXIDX           85
+#define SCO_STRICT_ANSI_FIXIDX           86
 tSCC zSco_Strict_AnsiName[] =
      "sco_strict_ansi";
 
@@ -3550,7 +3586,7 @@ static const char* apzSco_Strict_AnsiPatch[] = {
  *
  *  Description of Sco_Utime fix
  */
-#define SCO_UTIME_FIXIDX                 86
+#define SCO_UTIME_FIXIDX                 87
 tSCC zSco_UtimeName[] =
      "sco_utime";
 
@@ -3588,7 +3624,7 @@ static const char* apzSco_UtimePatch[] = {
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                87
+#define STATSSWTCH_FIXIDX                88
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3624,7 +3660,7 @@ static const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            88
+#define STDIO_STDARG_H_FIXIDX            89
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3661,7 +3697,7 @@ static const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             89
+#define STDIO_VA_LIST_FIXIDX             90
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3706,7 +3742,7 @@ s@_Va_LIST@_VA_LIST@",
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               90
+#define STRUCT_FILE_FIXIDX               91
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3743,7 +3779,7 @@ static const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           91
+#define STRUCT_SOCKADDR_FIXIDX           92
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -3787,7 +3823,7 @@ static const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            92
+#define SUN_AUTH_PROTO_FIXIDX            93
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -3828,7 +3864,7 @@ static const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           93
+#define SUN_BOGUS_IFDEF_FIXIDX           94
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -3864,7 +3900,7 @@ static const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              94
+#define SUN_CATMACRO_FIXIDX              95
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -3904,7 +3940,7 @@ static const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                95
+#define SUN_MALLOC_FIXIDX                96
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -3935,7 +3971,7 @@ static const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           96
+#define SUN_RUSERS_SEMI_FIXIDX           97
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -3970,7 +4006,7 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                97
+#define SUN_SIGNAL_FIXIDX                98
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -4010,7 +4046,7 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        98
+#define SUNOS_MATHERR_DECL_FIXIDX        99
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -4053,7 +4089,7 @@ static const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              99
+#define SUNOS_STRLEN_FIXIDX              100
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -4089,7 +4125,7 @@ static const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   100
+#define SVR4__P_FIXIDX                   101
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4127,7 +4163,7 @@ static const char* apzSvr4__PPatch[] = {
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               101
+#define SVR4_GETCWD_FIXIDX               102
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4163,7 +4199,7 @@ static const char* apzSvr4_GetcwdPatch[] = {
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               102
+#define SVR4_PROFIL_FIXIDX               103
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4199,7 +4235,7 @@ static const char* apzSvr4_ProfilPatch[] = {
  *
  *  Description of Gnu_Types fix
  */
-#define GNU_TYPES_FIXIDX                 103
+#define GNU_TYPES_FIXIDX                 104
 tSCC zGnu_TypesName[] =
      "gnu_types";
 
@@ -4241,7 +4277,7 @@ static const char* apzGnu_TypesPatch[] = {
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             104
+#define SYSV68_STRING_FIXIDX             105
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4278,7 +4314,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       105
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       106
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4314,7 +4350,7 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = {
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           106
+#define TINFO_CPLUSPLUS_FIXIDX           107
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4350,7 +4386,7 @@ static const char* apzTinfo_CplusplusPatch[] = {
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         107
+#define ULTRIX_ATOF_PARAM_FIXIDX         108
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4386,7 +4422,7 @@ static const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              108
+#define ULTRIX_CONST_FIXIDX              109
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4423,7 +4459,7 @@ static const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             109
+#define ULTRIX_CONST2_FIXIDX             110
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4460,7 +4496,7 @@ static const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       110
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       111
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4498,7 +4534,7 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              111
+#define ULTRIX_IFDEF_FIXIDX              112
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4534,7 +4570,7 @@ static const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         112
+#define ULTRIX_MATH_IFDEF_FIXIDX         113
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4570,7 +4606,7 @@ static const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       113
+#define ULTRIX_NESTED_IOCTL_FIXIDX       114
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4605,7 +4641,7 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         114
+#define ULTRIX_NESTED_SVC_FIXIDX         115
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4640,7 +4676,7 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               115
+#define ULTRIX_STAT_FIXIDX               116
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4681,7 +4717,7 @@ static const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             116
+#define ULTRIX_STATIC_FIXIDX             117
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4718,7 +4754,7 @@ static const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            117
+#define ULTRIX_STRINGS_FIXIDX            118
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -4753,7 +4789,7 @@ static const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             118
+#define UNDEFINE_NULL_FIXIDX             119
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -4799,7 +4835,7 @@ static const char* apzUndefine_NullPatch[] = {
  *
  *  Description of Uw7_Byteorder_Fix fix
  */
-#define UW7_BYTEORDER_FIX_FIXIDX         119
+#define UW7_BYTEORDER_FIX_FIXIDX         120
 tSCC zUw7_Byteorder_FixName[] =
      "uw7_byteorder_fix";
 
@@ -4850,7 +4886,7 @@ static const char* apzUw7_Byteorder_FixPatch[] = {
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             120
+#define VA_I960_MACRO_FIXIDX             121
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -4886,7 +4922,7 @@ static const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 121
+#define VOID_NULL_FIXIDX                 122
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -4922,7 +4958,7 @@ static const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       122
+#define VXWORKS_GCC_PROBLEM_FIXIDX       123
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -4972,7 +5008,7 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     123
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     124
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -5008,7 +5044,7 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     124
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     125
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5057,7 +5093,7 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              125
+#define VXWORKS_TIME_FIXIDX              126
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5108,7 +5144,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 126
+#define X11_CLASS_FIXIDX                 127
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5155,7 +5191,7 @@ static const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           127
+#define X11_CLASS_USAGE_FIXIDX           128
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5198,7 +5234,7 @@ static const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   128
+#define X11_NEW_FIXIDX                   129
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5239,7 +5275,7 @@ static const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               129
+#define X11_SPRINTF_FIXIDX               130
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5278,9 +5314,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          135
+#define REGEX_COUNT          136
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            130
+#define FIX_COUNT            131
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
@@ -5553,6 +5589,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aIrix_Asm_ApostropheTests,   apzIrix_Asm_ApostrophePatch, 0 },
 
+  {  zIrix_Limits_ConstName,    zIrix_Limits_ConstList,
+     apzIrix_Limits_ConstMachs,
+     IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aIrix_Limits_ConstTests,   apzIrix_Limits_ConstPatch, 0 },
+
   {  zIsc_FmodName,    zIsc_FmodList,
      apzIsc_FmodMachs,
      ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

gcc/fixinc/inclhack.def

@@ -1284,6 +1284,18 @@ fix = {
 
 
 /*
+ *  Non-traditional "const" declaration in Irix's limits.h.
+ */
+fix = {
+    hackname	= irix_limits_const;
+    files	= limits.h;
+    select	= "^extern const ";
+    c_fix	= format;
+    c_fix_arg	= "extern __const ";
+};
+
+
+/*
  * Fixing ISC fmod declaration
  */
 fix = {