inclhack.def (alpha___assert): Change char * args to const char * on Tru64 UNIX to avoid excessive warnings...

        * fixinc/inclhack.def (alpha___assert): Change char * args to
        const char * on Tru64 UNIX to avoid excessive warnings from
        assert.h.
        * fixinc/fixincl.x: Regenerate.

From-SVN: r42589

3 files changed, 181 insertions, 120 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7993610..af4070d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-25  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* fixinc/inclhack.def (alpha___assert): Change char * args to
+	const char * on Tru64 UNIX to avoid excessive warnings from
+	assert.h.
+	* fixinc/fixincl.x: Regenerate.
+
 2001-05-25  Geoff Keating  <geoffk@redhat.com>
 
 	* dbxout.c (dbxout_symbol): Invert previous patch, which was
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 1f50035..e0321de 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 138 fixup descriptions.
+ * This file contains 139 fixup descriptions.
  *
  * See README for more information.
  *
@@ -959,9 +959,45 @@ static const char* apzAix_VolatilePatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
+ *  Description of Alpha___Assert fix
+ */
+#define ALPHA___ASSERT_FIXIDX            21
+tSCC zAlpha___AssertName[] =
+     "alpha___assert";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zAlpha___AssertList[] =
+  "|assert.h|";
+/*
+ *  Machine/OS name selection pattern
+ */
+#define apzAlpha___AssertMachs (const char**)NULL
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zAlpha___AssertSelect0[] =
+       "__assert\\(char \\*, char \\*, int\\)";
+
+#define    ALPHA___ASSERT_TEST_CT  1
+static tTestDesc aAlpha___AssertTests[] = {
+  { TT_EGREP,    zAlpha___AssertSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Alpha___Assert
+ */
+static const char* apzAlpha___AssertPatch[] = {
+    "format",
+    "__assert(const char *, const char *, int)",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Alpha_Getopt fix
  */
-#define ALPHA_GETOPT_FIXIDX              21
+#define ALPHA_GETOPT_FIXIDX              22
 tSCC zAlpha_GetoptName[] =
      "alpha_getopt";
 
@@ -997,7 +1033,7 @@ static const char* apzAlpha_GetoptPatch[] = {
  *
  *  Description of Alpha_Parens fix
  */
-#define ALPHA_PARENS_FIXIDX              22
+#define ALPHA_PARENS_FIXIDX              23
 tSCC zAlpha_ParensName[] =
      "alpha_parens";
 
@@ -1033,7 +1069,7 @@ static const char* apzAlpha_ParensPatch[] = {
  *
  *  Description of Alpha_Sbrk fix
  */
-#define ALPHA_SBRK_FIXIDX                23
+#define ALPHA_SBRK_FIXIDX                24
 tSCC zAlpha_SbrkName[] =
      "alpha_sbrk";
 
@@ -1069,7 +1105,7 @@ static const char* apzAlpha_SbrkPatch[] = {
  *
  *  Description of Arm_Norcroft_Hint fix
  */
-#define ARM_NORCROFT_HINT_FIXIDX         24
+#define ARM_NORCROFT_HINT_FIXIDX         25
 tSCC zArm_Norcroft_HintName[] =
      "arm_norcroft_hint";
 
@@ -1105,7 +1141,7 @@ static const char* apzArm_Norcroft_HintPatch[] = {
  *
  *  Description of Arm_Wchar fix
  */
-#define ARM_WCHAR_FIXIDX                 25
+#define ARM_WCHAR_FIXIDX                 26
 tSCC zArm_WcharName[] =
      "arm_wchar";
 
@@ -1142,7 +1178,7 @@ static const char* apzArm_WcharPatch[] = {
  *
  *  Description of Aux_Asm fix
  */
-#define AUX_ASM_FIXIDX                   26
+#define AUX_ASM_FIXIDX                   27
 tSCC zAux_AsmName[] =
      "aux_asm";
 
@@ -1178,7 +1214,7 @@ static const char* apzAux_AsmPatch[] = {
  *
  *  Description of Avoid_Bool_Define fix
  */
-#define AVOID_BOOL_DEFINE_FIXIDX         27
+#define AVOID_BOOL_DEFINE_FIXIDX         28
 tSCC zAvoid_Bool_DefineName[] =
      "avoid_bool_define";
 
@@ -1224,7 +1260,7 @@ static const char* apzAvoid_Bool_DefinePatch[] = {
  *
  *  Description of Avoid_Bool_Type fix
  */
-#define AVOID_BOOL_TYPE_FIXIDX           28
+#define AVOID_BOOL_TYPE_FIXIDX           29
 tSCC zAvoid_Bool_TypeName[] =
      "avoid_bool_type";
 
@@ -1269,7 +1305,7 @@ static const char* apzAvoid_Bool_TypePatch[] = {
  *
  *  Description of Avoid_Wchar_T_Type fix
  */
-#define AVOID_WCHAR_T_TYPE_FIXIDX        29
+#define AVOID_WCHAR_T_TYPE_FIXIDX        30
 tSCC zAvoid_Wchar_T_TypeName[] =
      "avoid_wchar_t_type";
 
@@ -1306,7 +1342,7 @@ static const char* apzAvoid_Wchar_T_TypePatch[] = {
  *
  *  Description of Bad_Lval fix
  */
-#define BAD_LVAL_FIXIDX                  30
+#define BAD_LVAL_FIXIDX                  31
 tSCC zBad_LvalName[] =
      "bad_lval";
 
@@ -1341,7 +1377,7 @@ static const char* apzBad_LvalPatch[] = { "sed",
  *
  *  Description of Bad_Struct_Term fix
  */
-#define BAD_STRUCT_TERM_FIXIDX           31
+#define BAD_STRUCT_TERM_FIXIDX           32
 tSCC zBad_Struct_TermName[] =
      "bad_struct_term";
 
@@ -1377,7 +1413,7 @@ static const char* apzBad_Struct_TermPatch[] = {
  *
  *  Description of Badquote fix
  */
-#define BADQUOTE_FIXIDX                  32
+#define BADQUOTE_FIXIDX                  33
 tSCC zBadquoteName[] =
      "badquote";
 
@@ -1413,7 +1449,7 @@ static const char* apzBadquotePatch[] = {
  *
  *  Description of Broken_Assert_Stdio fix
  */
-#define BROKEN_ASSERT_STDIO_FIXIDX       33
+#define BROKEN_ASSERT_STDIO_FIXIDX       34
 tSCC zBroken_Assert_StdioName[] =
      "broken_assert_stdio";
 
@@ -1456,7 +1492,7 @@ static const char* apzBroken_Assert_StdioPatch[] = {
  *
  *  Description of Broken_Assert_Stdlib fix
  */
-#define BROKEN_ASSERT_STDLIB_FIXIDX      34
+#define BROKEN_ASSERT_STDLIB_FIXIDX      35
 tSCC zBroken_Assert_StdlibName[] =
      "broken_assert_stdlib";
 
@@ -1501,7 +1537,7 @@ static const char* apzBroken_Assert_StdlibPatch[] = {
  *
  *  Description of Broken_Cabs fix
  */
-#define BROKEN_CABS_FIXIDX               35
+#define BROKEN_CABS_FIXIDX               36
 tSCC zBroken_CabsName[] =
      "broken_cabs";
 
@@ -1538,7 +1574,7 @@ static const char* apzBroken_CabsPatch[] = {
  *
  *  Description of Ctrl_Quotes_Def fix
  */
-#define CTRL_QUOTES_DEF_FIXIDX           36
+#define CTRL_QUOTES_DEF_FIXIDX           37
 tSCC zCtrl_Quotes_DefName[] =
      "ctrl_quotes_def";
 
@@ -1573,7 +1609,7 @@ static const char* apzCtrl_Quotes_DefPatch[] = {
  *
  *  Description of Ctrl_Quotes_Use fix
  */
-#define CTRL_QUOTES_USE_FIXIDX           37
+#define CTRL_QUOTES_USE_FIXIDX           38
 tSCC zCtrl_Quotes_UseName[] =
      "ctrl_quotes_use";
 
@@ -1608,7 +1644,7 @@ static const char* apzCtrl_Quotes_UsePatch[] = {
  *
  *  Description of Cxx_Unready fix
  */
-#define CXX_UNREADY_FIXIDX               38
+#define CXX_UNREADY_FIXIDX               39
 tSCC zCxx_UnreadyName[] =
      "cxx_unready";
 
@@ -1656,7 +1692,7 @@ extern \"C\" {\n\
  *
  *  Description of Dec_Intern_Asm fix
  */
-#define DEC_INTERN_ASM_FIXIDX            39
+#define DEC_INTERN_ASM_FIXIDX            40
 tSCC zDec_Intern_AsmName[] =
      "dec_intern_asm";
 
@@ -1686,7 +1722,7 @@ static const char* apzDec_Intern_AsmPatch[] = { "sed",
  *
  *  Description of Djgpp_Wchar_H fix
  */
-#define DJGPP_WCHAR_H_FIXIDX             40
+#define DJGPP_WCHAR_H_FIXIDX             41
 tSCC zDjgpp_Wchar_HName[] =
      "djgpp_wchar_h";
 
@@ -1730,7 +1766,7 @@ static const char* apzDjgpp_Wchar_HPatch[] = {
  *
  *  Description of Ecd_Cursor fix
  */
-#define ECD_CURSOR_FIXIDX                41
+#define ECD_CURSOR_FIXIDX                42
 tSCC zEcd_CursorName[] =
      "ecd_cursor";
 
@@ -1766,7 +1802,7 @@ static const char* apzEcd_CursorPatch[] = {
  *
  *  Description of Fix_Header_Breakage fix
  */
-#define FIX_HEADER_BREAKAGE_FIXIDX       42
+#define FIX_HEADER_BREAKAGE_FIXIDX       43
 tSCC zFix_Header_BreakageName[] =
      "fix_header_breakage";
 
@@ -1804,7 +1840,7 @@ static const char* apzFix_Header_BreakagePatch[] = {
  *
  *  Description of Freebsd_Gcc3_Breakage fix
  */
-#define FREEBSD_GCC3_BREAKAGE_FIXIDX     43
+#define FREEBSD_GCC3_BREAKAGE_FIXIDX     44
 tSCC zFreebsd_Gcc3_BreakageName[] =
      "freebsd_gcc3_breakage";
 
@@ -1849,7 +1885,7 @@ static const char* apzFreebsd_Gcc3_BreakagePatch[] = {
  *
  *  Description of Hp_Inline fix
  */
-#define HP_INLINE_FIXIDX                 44
+#define HP_INLINE_FIXIDX                 45
 tSCC zHp_InlineName[] =
      "hp_inline";
 
@@ -1886,7 +1922,7 @@ static const char* apzHp_InlinePatch[] = {
  *
  *  Description of Hp_Sysfile fix
  */
-#define HP_SYSFILE_FIXIDX                45
+#define HP_SYSFILE_FIXIDX                46
 tSCC zHp_SysfileName[] =
      "hp_sysfile";
 
@@ -1923,7 +1959,7 @@ static const char* apzHp_SysfilePatch[] = {
  *
  *  Description of Hpux11_Fabsf fix
  */
-#define HPUX11_FABSF_FIXIDX              46
+#define HPUX11_FABSF_FIXIDX              47
 tSCC zHpux11_FabsfName[] =
      "hpux11_fabsf";
 
@@ -1968,7 +2004,7 @@ static const char* apzHpux11_FabsfPatch[] = {
  *
  *  Description of Hpux11_Uint32_C fix
  */
-#define HPUX11_UINT32_C_FIXIDX           47
+#define HPUX11_UINT32_C_FIXIDX           48
 tSCC zHpux11_Uint32_CName[] =
      "hpux11_uint32_c";
 
@@ -2004,7 +2040,7 @@ static const char* apzHpux11_Uint32_CPatch[] = {
  *
  *  Description of Hpux8_Bogus_Inlines fix
  */
-#define HPUX8_BOGUS_INLINES_FIXIDX       48
+#define HPUX8_BOGUS_INLINES_FIXIDX       49
 tSCC zHpux8_Bogus_InlinesName[] =
      "hpux8_bogus_inlines";
 
@@ -2042,7 +2078,7 @@ static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
  *
  *  Description of Int_Abort_Free_And_Exit fix
  */
-#define INT_ABORT_FREE_AND_EXIT_FIXIDX   49
+#define INT_ABORT_FREE_AND_EXIT_FIXIDX   50
 tSCC zInt_Abort_Free_And_ExitName[] =
      "int_abort_free_and_exit";
 
@@ -2078,7 +2114,7 @@ static const char* apzInt_Abort_Free_And_ExitPatch[] = {
  *
  *  Description of Isc_Omits_With_Stdc fix
  */
-#define ISC_OMITS_WITH_STDC_FIXIDX       50
+#define ISC_OMITS_WITH_STDC_FIXIDX       51
 tSCC zIsc_Omits_With_StdcName[] =
      "isc_omits_with_stdc";
 
@@ -2114,7 +2150,7 @@ static const char* apzIsc_Omits_With_StdcPatch[] = {
  *
  *  Description of Io_Quotes_Def fix
  */
-#define IO_QUOTES_DEF_FIXIDX             51
+#define IO_QUOTES_DEF_FIXIDX             52
 tSCC zIo_Quotes_DefName[] =
      "io_quotes_def";
 
@@ -2149,7 +2185,7 @@ static const char* apzIo_Quotes_DefPatch[] = {
  *
  *  Description of Io_Quotes_Use fix
  */
-#define IO_QUOTES_USE_FIXIDX             52
+#define IO_QUOTES_USE_FIXIDX             53
 tSCC zIo_Quotes_UseName[] =
      "io_quotes_use";
 
@@ -2184,7 +2220,7 @@ static const char* apzIo_Quotes_UsePatch[] = {
  *
  *  Description of Hpux_Maxint fix
  */
-#define HPUX_MAXINT_FIXIDX               53
+#define HPUX_MAXINT_FIXIDX               54
 tSCC zHpux_MaxintName[] =
      "hpux_maxint";
 
@@ -2237,7 +2273,7 @@ static const char* apzHpux_MaxintPatch[] = {
  *
  *  Description of Hpux_Systime fix
  */
-#define HPUX_SYSTIME_FIXIDX              54
+#define HPUX_SYSTIME_FIXIDX              55
 tSCC zHpux_SystimeName[] =
      "hpux_systime";
 
@@ -2273,7 +2309,7 @@ static const char* apzHpux_SystimePatch[] = {
  *
  *  Description of Ip_Missing_Semi fix
  */
-#define IP_MISSING_SEMI_FIXIDX           55
+#define IP_MISSING_SEMI_FIXIDX           56
 tSCC zIp_Missing_SemiName[] =
      "ip_missing_semi";
 
@@ -2308,7 +2344,7 @@ static const char* apzIp_Missing_SemiPatch[] = { "sed",
  *
  *  Description of Irix_Asm_Apostrophe fix
  */
-#define IRIX_ASM_APOSTROPHE_FIXIDX       56
+#define IRIX_ASM_APOSTROPHE_FIXIDX       57
 tSCC zIrix_Asm_ApostropheName[] =
      "irix_asm_apostrophe";
 
@@ -2345,7 +2381,7 @@ static const char* apzIrix_Asm_ApostrophePatch[] = {
  *
  *  Description of Irix_Stdio_Va_List fix
  */
-#define IRIX_STDIO_VA_LIST_FIXIDX        57
+#define IRIX_STDIO_VA_LIST_FIXIDX        58
 tSCC zIrix_Stdio_Va_ListName[] =
      "irix_stdio_va_list";
 
@@ -2381,7 +2417,7 @@ static const char* apzIrix_Stdio_Va_ListPatch[] = {
  *
  *  Description of Irix_Limits_Const fix
  */
-#define IRIX_LIMITS_CONST_FIXIDX         58
+#define IRIX_LIMITS_CONST_FIXIDX         59
 tSCC zIrix_Limits_ConstName[] =
      "irix_limits_const";
 
@@ -2417,7 +2453,7 @@ static const char* apzIrix_Limits_ConstPatch[] = {
  *
  *  Description of Isc_Fmod fix
  */
-#define ISC_FMOD_FIXIDX                  59
+#define ISC_FMOD_FIXIDX                  60
 tSCC zIsc_FmodName[] =
      "isc_fmod";
 
@@ -2453,7 +2489,7 @@ static const char* apzIsc_FmodPatch[] = {
  *
  *  Description of Kandr_Concat fix
  */
-#define KANDR_CONCAT_FIXIDX              60
+#define KANDR_CONCAT_FIXIDX              61
 tSCC zKandr_ConcatName[] =
      "kandr_concat";
 
@@ -2489,7 +2525,7 @@ static const char* apzKandr_ConcatPatch[] = {
  *
  *  Description of Libc1_Ifdefd_Memx fix
  */
-#define LIBC1_IFDEFD_MEMX_FIXIDX         61
+#define LIBC1_IFDEFD_MEMX_FIXIDX         62
 tSCC zLibc1_Ifdefd_MemxName[] =
      "libc1_ifdefd_memx";
 
@@ -2538,7 +2574,7 @@ extern [a-z_]+ mem.*(\n\
  *
  *  Description of Limits_Ifndefs fix
  */
-#define LIMITS_IFNDEFS_FIXIDX            62
+#define LIMITS_IFNDEFS_FIXIDX            63
 tSCC zLimits_IfndefsName[] =
      "limits_ifndefs";
 
@@ -2577,7 +2613,7 @@ static const char* apzLimits_IfndefsPatch[] = {
  *
  *  Description of Lynx_Void_Int fix
  */
-#define LYNX_VOID_INT_FIXIDX             63
+#define LYNX_VOID_INT_FIXIDX             64
 tSCC zLynx_Void_IntName[] =
      "lynx_void_int";
 
@@ -2613,7 +2649,7 @@ static const char* apzLynx_Void_IntPatch[] = {
  *
  *  Description of Lynxos_Fcntl_Proto fix
  */
-#define LYNXOS_FCNTL_PROTO_FIXIDX        64
+#define LYNXOS_FCNTL_PROTO_FIXIDX        65
 tSCC zLynxos_Fcntl_ProtoName[] =
      "lynxos_fcntl_proto";
 
@@ -2650,7 +2686,7 @@ static const char* apzLynxos_Fcntl_ProtoPatch[] = {
  *
  *  Description of M88k_Bad_Hypot_Opt fix
  */
-#define M88K_BAD_HYPOT_OPT_FIXIDX        65
+#define M88K_BAD_HYPOT_OPT_FIXIDX        66
 tSCC zM88k_Bad_Hypot_OptName[] =
      "m88k_bad_hypot_opt";
 
@@ -2699,7 +2735,7 @@ static __inline__ double fake_hypot (x, y)\n\
  *
  *  Description of M88k_Bad_S_If fix
  */
-#define M88K_BAD_S_IF_FIXIDX             66
+#define M88K_BAD_S_IF_FIXIDX             67
 tSCC zM88k_Bad_S_IfName[] =
      "m88k_bad_s_if";
 
@@ -2738,7 +2774,7 @@ static const char* apzM88k_Bad_S_IfPatch[] = {
  *
  *  Description of M88k_Multi_Incl fix
  */
-#define M88K_MULTI_INCL_FIXIDX           67
+#define M88K_MULTI_INCL_FIXIDX           68
 tSCC zM88k_Multi_InclName[] =
      "m88k_multi_incl";
 
@@ -2775,7 +2811,7 @@ static const char* apzM88k_Multi_InclPatch[] = {
  *
  *  Description of Machine_Ansi_H_Va_List fix
  */
-#define MACHINE_ANSI_H_VA_LIST_FIXIDX    68
+#define MACHINE_ANSI_H_VA_LIST_FIXIDX    69
 tSCC zMachine_Ansi_H_Va_ListName[] =
      "machine_ansi_h_va_list";
 
@@ -2818,7 +2854,7 @@ static const char* apzMachine_Ansi_H_Va_ListPatch[] = {
  *
  *  Description of Machine_Name fix
  */
-#define MACHINE_NAME_FIXIDX              69
+#define MACHINE_NAME_FIXIDX              70
 tSCC zMachine_NameName[] =
      "machine_name";
 
@@ -2851,7 +2887,7 @@ static const char* apzMachine_NamePatch[] = {
  *
  *  Description of Math_Exception fix
  */
-#define MATH_EXCEPTION_FIXIDX            70
+#define MATH_EXCEPTION_FIXIDX            71
 tSCC zMath_ExceptionName[] =
      "math_exception";
 
@@ -2899,7 +2935,7 @@ static const char* apzMath_ExceptionPatch[] = {
  *
  *  Description of Math_Huge_Val_From_Dbl_Max fix
  */
-#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 71
+#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 72
 tSCC zMath_Huge_Val_From_Dbl_MaxName[] =
      "math_huge_val_from_dbl_max";
 
@@ -2945,7 +2981,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      72
+#define MATH_HUGE_VAL_IFNDEF_FIXIDX      73
 tSCC zMath_Huge_Val_IfndefName[] =
      "math_huge_val_ifndef";
 
@@ -2984,7 +3020,7 @@ static const char* apzMath_Huge_Val_IfndefPatch[] = {
  *
  *  Description of Nested_Motorola fix
  */
-#define NESTED_MOTOROLA_FIXIDX           73
+#define NESTED_MOTOROLA_FIXIDX           74
 tSCC zNested_MotorolaName[] =
      "nested_motorola";
 
@@ -3022,7 +3058,7 @@ static const char* apzNested_MotorolaPatch[] = { "sed",
  *
  *  Description of Nested_Sys_Limits fix
  */
-#define NESTED_SYS_LIMITS_FIXIDX         74
+#define NESTED_SYS_LIMITS_FIXIDX         75
 tSCC zNested_Sys_LimitsName[] =
      "nested_sys_limits";
 
@@ -3058,7 +3094,7 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed",
  *
  *  Description of Nested_Auth_Des fix
  */
-#define NESTED_AUTH_DES_FIXIDX           75
+#define NESTED_AUTH_DES_FIXIDX           76
 tSCC zNested_Auth_DesName[] =
      "nested_auth_des";
 
@@ -3094,7 +3130,7 @@ static const char* apzNested_Auth_DesPatch[] = {
  *
  *  Description of News_Os_Recursion fix
  */
-#define NEWS_OS_RECURSION_FIXIDX         76
+#define NEWS_OS_RECURSION_FIXIDX         77
 tSCC zNews_Os_RecursionName[] =
      "news_os_recursion";
 
@@ -3132,7 +3168,7 @@ static const char* apzNews_Os_RecursionPatch[] = {
  *
  *  Description of Next_Math_Prefix fix
  */
-#define NEXT_MATH_PREFIX_FIXIDX          77
+#define NEXT_MATH_PREFIX_FIXIDX          78
 tSCC zNext_Math_PrefixName[] =
      "next_math_prefix";
 
@@ -3169,7 +3205,7 @@ static const char* apzNext_Math_PrefixPatch[] = {
  *
  *  Description of Next_Template fix
  */
-#define NEXT_TEMPLATE_FIXIDX             78
+#define NEXT_TEMPLATE_FIXIDX             79
 tSCC zNext_TemplateName[] =
      "next_template";
 
@@ -3206,7 +3242,7 @@ static const char* apzNext_TemplatePatch[] = {
  *
  *  Description of Next_Volitile fix
  */
-#define NEXT_VOLITILE_FIXIDX             79
+#define NEXT_VOLITILE_FIXIDX             80
 tSCC zNext_VolitileName[] =
      "next_volitile";
 
@@ -3243,7 +3279,7 @@ static const char* apzNext_VolitilePatch[] = {
  *
  *  Description of Next_Wait_Union fix
  */
-#define NEXT_WAIT_UNION_FIXIDX           80
+#define NEXT_WAIT_UNION_FIXIDX           81
 tSCC zNext_Wait_UnionName[] =
      "next_wait_union";
 
@@ -3279,7 +3315,7 @@ static const char* apzNext_Wait_UnionPatch[] = {
  *
  *  Description of Nodeent_Syntax fix
  */
-#define NODEENT_SYNTAX_FIXIDX            81
+#define NODEENT_SYNTAX_FIXIDX            82
 tSCC zNodeent_SyntaxName[] =
      "nodeent_syntax";
 
@@ -3315,7 +3351,7 @@ static const char* apzNodeent_SyntaxPatch[] = {
  *
  *  Description of Osf_Namespace_A fix
  */
-#define OSF_NAMESPACE_A_FIXIDX           82
+#define OSF_NAMESPACE_A_FIXIDX           83
 tSCC zOsf_Namespace_AName[] =
      "osf_namespace_a";
 
@@ -3361,7 +3397,7 @@ static const char* apzOsf_Namespace_APatch[] = {
  *
  *  Description of Osf_Namespace_C fix
  */
-#define OSF_NAMESPACE_C_FIXIDX           83
+#define OSF_NAMESPACE_C_FIXIDX           84
 tSCC zOsf_Namespace_CName[] =
      "osf_namespace_c";
 
@@ -3416,7 +3452,7 @@ typedef __regmatch_t\tregmatch_t;",
  *
  *  Description of Pthread_Page_Size fix
  */
-#define PTHREAD_PAGE_SIZE_FIXIDX         84
+#define PTHREAD_PAGE_SIZE_FIXIDX         85
 tSCC zPthread_Page_SizeName[] =
      "pthread_page_size";
 
@@ -3452,7 +3488,7 @@ static const char* apzPthread_Page_SizePatch[] = {
  *
  *  Description of Read_Ret_Type fix
  */
-#define READ_RET_TYPE_FIXIDX             85
+#define READ_RET_TYPE_FIXIDX             86
 tSCC zRead_Ret_TypeName[] =
      "read_ret_type";
 
@@ -3490,7 +3526,7 @@ static const char* apzRead_Ret_TypePatch[] = {
  *
  *  Description of Rs6000_Double fix
  */
-#define RS6000_DOUBLE_FIXIDX             86
+#define RS6000_DOUBLE_FIXIDX             87
 tSCC zRs6000_DoubleName[] =
      "rs6000_double";
 
@@ -3529,7 +3565,7 @@ static const char* apzRs6000_DoublePatch[] = {
  *
  *  Description of Rs6000_Fchmod fix
  */
-#define RS6000_FCHMOD_FIXIDX             87
+#define RS6000_FCHMOD_FIXIDX             88
 tSCC zRs6000_FchmodName[] =
      "rs6000_fchmod";
 
@@ -3565,7 +3601,7 @@ static const char* apzRs6000_FchmodPatch[] = {
  *
  *  Description of Rs6000_Param fix
  */
-#define RS6000_PARAM_FIXIDX              88
+#define RS6000_PARAM_FIXIDX              89
 tSCC zRs6000_ParamName[] =
      "rs6000_param";
 
@@ -3601,7 +3637,7 @@ static const char* apzRs6000_ParamPatch[] = {
  *
  *  Description of Sco_Static_Func fix
  */
-#define SCO_STATIC_FUNC_FIXIDX           89
+#define SCO_STATIC_FUNC_FIXIDX           90
 tSCC zSco_Static_FuncName[] =
      "sco_static_func";
 
@@ -3645,7 +3681,7 @@ extern \"C\" {\\\n\
  *
  *  Description of Strict_Ansi_Not fix
  */
-#define STRICT_ANSI_NOT_FIXIDX           90
+#define STRICT_ANSI_NOT_FIXIDX           91
 tSCC zStrict_Ansi_NotName[] =
      "strict_ansi_not";
 
@@ -3680,7 +3716,7 @@ static const char* apzStrict_Ansi_NotPatch[] = {
  *
  *  Description of Strict_Ansi_Not_Ctd fix
  */
-#define STRICT_ANSI_NOT_CTD_FIXIDX       91
+#define STRICT_ANSI_NOT_CTD_FIXIDX       92
 tSCC zStrict_Ansi_Not_CtdName[] =
      "strict_ansi_not_ctd";
 
@@ -3716,7 +3752,7 @@ static const char* apzStrict_Ansi_Not_CtdPatch[] = {
  *
  *  Description of Strict_Ansi_Only fix
  */
-#define STRICT_ANSI_ONLY_FIXIDX          92
+#define STRICT_ANSI_ONLY_FIXIDX          93
 tSCC zStrict_Ansi_OnlyName[] =
      "strict_ansi_only";
 
@@ -3751,7 +3787,7 @@ static const char* apzStrict_Ansi_OnlyPatch[] = {
  *
  *  Description of Sco_Utime fix
  */
-#define SCO_UTIME_FIXIDX                 93
+#define SCO_UTIME_FIXIDX                 94
 tSCC zSco_UtimeName[] =
      "sco_utime";
 
@@ -3789,7 +3825,7 @@ static const char* apzSco_UtimePatch[] = {
  *
  *  Description of Solaris27_Mutex_Init fix
  */
-#define SOLARIS27_MUTEX_INIT_FIXIDX      94
+#define SOLARIS27_MUTEX_INIT_FIXIDX      95
 tSCC zSolaris27_Mutex_InitName[] =
      "solaris27_mutex_init";
 
@@ -3826,7 +3862,7 @@ static const char* apzSolaris27_Mutex_InitPatch[] = {
  *
  *  Description of Statsswtch fix
  */
-#define STATSSWTCH_FIXIDX                95
+#define STATSSWTCH_FIXIDX                96
 tSCC zStatsswtchName[] =
      "statsswtch";
 
@@ -3862,7 +3898,7 @@ static const char* apzStatsswtchPatch[] = {
  *
  *  Description of Stdio_Stdarg_H fix
  */
-#define STDIO_STDARG_H_FIXIDX            96
+#define STDIO_STDARG_H_FIXIDX            97
 tSCC zStdio_Stdarg_HName[] =
      "stdio_stdarg_h";
 
@@ -3899,7 +3935,7 @@ static const char* apzStdio_Stdarg_HPatch[] = {
  *
  *  Description of Stdio_Va_List fix
  */
-#define STDIO_VA_LIST_FIXIDX             97
+#define STDIO_VA_LIST_FIXIDX             98
 tSCC zStdio_Va_ListName[] =
      "stdio_va_list";
 
@@ -3944,7 +3980,7 @@ s@_Va_LIST@_VA_LIST@",
  *
  *  Description of Struct_File fix
  */
-#define STRUCT_FILE_FIXIDX               98
+#define STRUCT_FILE_FIXIDX               99
 tSCC zStruct_FileName[] =
      "struct_file";
 
@@ -3981,7 +4017,7 @@ static const char* apzStruct_FilePatch[] = {
  *
  *  Description of Struct_Sockaddr fix
  */
-#define STRUCT_SOCKADDR_FIXIDX           99
+#define STRUCT_SOCKADDR_FIXIDX           100
 tSCC zStruct_SockaddrName[] =
      "struct_sockaddr";
 
@@ -4025,7 +4061,7 @@ static const char* apzStruct_SockaddrPatch[] = {
  *
  *  Description of Sun_Auth_Proto fix
  */
-#define SUN_AUTH_PROTO_FIXIDX            100
+#define SUN_AUTH_PROTO_FIXIDX            101
 tSCC zSun_Auth_ProtoName[] =
      "sun_auth_proto";
 
@@ -4066,7 +4102,7 @@ static const char* apzSun_Auth_ProtoPatch[] = {
  *
  *  Description of Sun_Bogus_Ifdef fix
  */
-#define SUN_BOGUS_IFDEF_FIXIDX           101
+#define SUN_BOGUS_IFDEF_FIXIDX           102
 tSCC zSun_Bogus_IfdefName[] =
      "sun_bogus_ifdef";
 
@@ -4102,7 +4138,7 @@ static const char* apzSun_Bogus_IfdefPatch[] = {
  *
  *  Description of Sun_Catmacro fix
  */
-#define SUN_CATMACRO_FIXIDX              102
+#define SUN_CATMACRO_FIXIDX              103
 tSCC zSun_CatmacroName[] =
      "sun_catmacro";
 
@@ -4142,7 +4178,7 @@ static const char* apzSun_CatmacroPatch[] = {
  *
  *  Description of Sun_Malloc fix
  */
-#define SUN_MALLOC_FIXIDX                103
+#define SUN_MALLOC_FIXIDX                104
 tSCC zSun_MallocName[] =
      "sun_malloc";
 
@@ -4173,7 +4209,7 @@ static const char* apzSun_MallocPatch[] = { "sed",
  *
  *  Description of Sun_Rusers_Semi fix
  */
-#define SUN_RUSERS_SEMI_FIXIDX           104
+#define SUN_RUSERS_SEMI_FIXIDX           105
 tSCC zSun_Rusers_SemiName[] =
      "sun_rusers_semi";
 
@@ -4208,7 +4244,7 @@ static const char* apzSun_Rusers_SemiPatch[] = { "sed",
  *
  *  Description of Sun_Signal fix
  */
-#define SUN_SIGNAL_FIXIDX                105
+#define SUN_SIGNAL_FIXIDX                106
 tSCC zSun_SignalName[] =
      "sun_signal";
 
@@ -4248,7 +4284,7 @@ void\t(*signal(...))(...);\n\
  *
  *  Description of Sunos_Matherr_Decl fix
  */
-#define SUNOS_MATHERR_DECL_FIXIDX        106
+#define SUNOS_MATHERR_DECL_FIXIDX        107
 tSCC zSunos_Matherr_DeclName[] =
      "sunos_matherr_decl";
 
@@ -4291,7 +4327,7 @@ static const char* apzSunos_Matherr_DeclPatch[] = {
  *
  *  Description of Sunos_Strlen fix
  */
-#define SUNOS_STRLEN_FIXIDX              107
+#define SUNOS_STRLEN_FIXIDX              108
 tSCC zSunos_StrlenName[] =
      "sunos_strlen";
 
@@ -4327,7 +4363,7 @@ static const char* apzSunos_StrlenPatch[] = {
  *
  *  Description of Svr4__P fix
  */
-#define SVR4__P_FIXIDX                   108
+#define SVR4__P_FIXIDX                   109
 tSCC zSvr4__PName[] =
      "svr4__p";
 
@@ -4365,7 +4401,7 @@ static const char* apzSvr4__PPatch[] = {
  *
  *  Description of Svr4_Getcwd fix
  */
-#define SVR4_GETCWD_FIXIDX               109
+#define SVR4_GETCWD_FIXIDX               110
 tSCC zSvr4_GetcwdName[] =
      "svr4_getcwd";
 
@@ -4401,7 +4437,7 @@ static const char* apzSvr4_GetcwdPatch[] = {
  *
  *  Description of Svr4_Profil fix
  */
-#define SVR4_PROFIL_FIXIDX               110
+#define SVR4_PROFIL_FIXIDX               111
 tSCC zSvr4_ProfilName[] =
      "svr4_profil";
 
@@ -4437,7 +4473,7 @@ static const char* apzSvr4_ProfilPatch[] = {
  *
  *  Description of Gnu_Types fix
  */
-#define GNU_TYPES_FIXIDX                 111
+#define GNU_TYPES_FIXIDX                 112
 tSCC zGnu_TypesName[] =
      "gnu_types";
 
@@ -4479,7 +4515,7 @@ static const char* apzGnu_TypesPatch[] = {
  *
  *  Description of Sysv68_String fix
  */
-#define SYSV68_STRING_FIXIDX             112
+#define SYSV68_STRING_FIXIDX             113
 tSCC zSysv68_StringName[] =
      "sysv68_string";
 
@@ -4516,7 +4552,7 @@ extern unsigned int\\\n\
  *
  *  Description of Sysz_Stdlib_For_Sun fix
  */
-#define SYSZ_STDLIB_FOR_SUN_FIXIDX       113
+#define SYSZ_STDLIB_FOR_SUN_FIXIDX       114
 tSCC zSysz_Stdlib_For_SunName[] =
      "sysz_stdlib_for_sun";
 
@@ -4552,7 +4588,7 @@ static const char* apzSysz_Stdlib_For_SunPatch[] = {
  *
  *  Description of Tinfo_Cplusplus fix
  */
-#define TINFO_CPLUSPLUS_FIXIDX           114
+#define TINFO_CPLUSPLUS_FIXIDX           115
 tSCC zTinfo_CplusplusName[] =
      "tinfo_cplusplus";
 
@@ -4588,7 +4624,7 @@ static const char* apzTinfo_CplusplusPatch[] = {
  *
  *  Description of Ultrix_Atof_Param fix
  */
-#define ULTRIX_ATOF_PARAM_FIXIDX         115
+#define ULTRIX_ATOF_PARAM_FIXIDX         116
 tSCC zUltrix_Atof_ParamName[] =
      "ultrix_atof_param";
 
@@ -4624,7 +4660,7 @@ static const char* apzUltrix_Atof_ParamPatch[] = {
  *
  *  Description of Ultrix_Const fix
  */
-#define ULTRIX_CONST_FIXIDX              116
+#define ULTRIX_CONST_FIXIDX              117
 tSCC zUltrix_ConstName[] =
      "ultrix_const";
 
@@ -4661,7 +4697,7 @@ static const char* apzUltrix_ConstPatch[] = {
  *
  *  Description of Ultrix_Const2 fix
  */
-#define ULTRIX_CONST2_FIXIDX             117
+#define ULTRIX_CONST2_FIXIDX             118
 tSCC zUltrix_Const2Name[] =
      "ultrix_const2";
 
@@ -4698,7 +4734,7 @@ static const char* apzUltrix_Const2Patch[] = {
  *
  *  Description of Ultrix_Fix_Fixproto fix
  */
-#define ULTRIX_FIX_FIXPROTO_FIXIDX       118
+#define ULTRIX_FIX_FIXPROTO_FIXIDX       119
 tSCC zUltrix_Fix_FixprotoName[] =
      "ultrix_fix_fixproto";
 
@@ -4736,7 +4772,7 @@ static const char* apzUltrix_Fix_FixprotoPatch[] = {
  *
  *  Description of Ultrix_Ifdef fix
  */
-#define ULTRIX_IFDEF_FIXIDX              119
+#define ULTRIX_IFDEF_FIXIDX              120
 tSCC zUltrix_IfdefName[] =
      "ultrix_ifdef";
 
@@ -4772,7 +4808,7 @@ static const char* apzUltrix_IfdefPatch[] = {
  *
  *  Description of Ultrix_Math_Ifdef fix
  */
-#define ULTRIX_MATH_IFDEF_FIXIDX         120
+#define ULTRIX_MATH_IFDEF_FIXIDX         121
 tSCC zUltrix_Math_IfdefName[] =
      "ultrix_math_ifdef";
 
@@ -4808,7 +4844,7 @@ static const char* apzUltrix_Math_IfdefPatch[] = {
  *
  *  Description of Ultrix_Nested_Ioctl fix
  */
-#define ULTRIX_NESTED_IOCTL_FIXIDX       121
+#define ULTRIX_NESTED_IOCTL_FIXIDX       122
 tSCC zUltrix_Nested_IoctlName[] =
      "ultrix_nested_ioctl";
 
@@ -4843,7 +4879,7 @@ static const char* apzUltrix_Nested_IoctlPatch[] = { "sed",
  *
  *  Description of Ultrix_Nested_Svc fix
  */
-#define ULTRIX_NESTED_SVC_FIXIDX         122
+#define ULTRIX_NESTED_SVC_FIXIDX         123
 tSCC zUltrix_Nested_SvcName[] =
      "ultrix_nested_svc";
 
@@ -4878,7 +4914,7 @@ static const char* apzUltrix_Nested_SvcPatch[] = { "sed",
  *
  *  Description of Ultrix_Stat fix
  */
-#define ULTRIX_STAT_FIXIDX               123
+#define ULTRIX_STAT_FIXIDX               124
 tSCC zUltrix_StatName[] =
      "ultrix_stat";
 
@@ -4918,7 +4954,7 @@ static const char* apzUltrix_StatPatch[] = { "sed",
  *
  *  Description of Ultrix_Static fix
  */
-#define ULTRIX_STATIC_FIXIDX             124
+#define ULTRIX_STATIC_FIXIDX             125
 tSCC zUltrix_StaticName[] =
      "ultrix_static";
 
@@ -4955,7 +4991,7 @@ static const char* apzUltrix_StaticPatch[] = { "sed",
  *
  *  Description of Ultrix_Strings fix
  */
-#define ULTRIX_STRINGS_FIXIDX            125
+#define ULTRIX_STRINGS_FIXIDX            126
 tSCC zUltrix_StringsName[] =
      "ultrix_strings";
 
@@ -4990,7 +5026,7 @@ static const char* apzUltrix_StringsPatch[] = {
  *
  *  Description of Undefine_Null fix
  */
-#define UNDEFINE_NULL_FIXIDX             126
+#define UNDEFINE_NULL_FIXIDX             127
 tSCC zUndefine_NullName[] =
      "undefine_null";
 
@@ -5036,7 +5072,7 @@ static const char* apzUndefine_NullPatch[] = {
  *
  *  Description of Uw7_Byteorder_Fix fix
  */
-#define UW7_BYTEORDER_FIX_FIXIDX         127
+#define UW7_BYTEORDER_FIX_FIXIDX         128
 tSCC zUw7_Byteorder_FixName[] =
      "uw7_byteorder_fix";
 
@@ -5087,7 +5123,7 @@ static const char* apzUw7_Byteorder_FixPatch[] = {
  *
  *  Description of Va_I960_Macro fix
  */
-#define VA_I960_MACRO_FIXIDX             128
+#define VA_I960_MACRO_FIXIDX             129
 tSCC zVa_I960_MacroName[] =
      "va_i960_macro";
 
@@ -5123,7 +5159,7 @@ static const char* apzVa_I960_MacroPatch[] = {
  *
  *  Description of Void_Null fix
  */
-#define VOID_NULL_FIXIDX                 129
+#define VOID_NULL_FIXIDX                 130
 tSCC zVoid_NullName[] =
      "void_null";
 
@@ -5159,7 +5195,7 @@ static const char* apzVoid_NullPatch[] = {
  *
  *  Description of Vxworks_Gcc_Problem fix
  */
-#define VXWORKS_GCC_PROBLEM_FIXIDX       130
+#define VXWORKS_GCC_PROBLEM_FIXIDX       131
 tSCC zVxworks_Gcc_ProblemName[] =
      "vxworks_gcc_problem";
 
@@ -5209,7 +5245,7 @@ static const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
  *
  *  Description of Vxworks_Needs_Vxtypes fix
  */
-#define VXWORKS_NEEDS_VXTYPES_FIXIDX     131
+#define VXWORKS_NEEDS_VXTYPES_FIXIDX     132
 tSCC zVxworks_Needs_VxtypesName[] =
      "vxworks_needs_vxtypes";
 
@@ -5245,7 +5281,7 @@ static const char* apzVxworks_Needs_VxtypesPatch[] = {
  *
  *  Description of Vxworks_Needs_Vxworks fix
  */
-#define VXWORKS_NEEDS_VXWORKS_FIXIDX     132
+#define VXWORKS_NEEDS_VXWORKS_FIXIDX     133
 tSCC zVxworks_Needs_VxworksName[] =
      "vxworks_needs_vxworks";
 
@@ -5294,7 +5330,7 @@ static const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
  *
  *  Description of Vxworks_Time fix
  */
-#define VXWORKS_TIME_FIXIDX              133
+#define VXWORKS_TIME_FIXIDX              134
 tSCC zVxworks_TimeName[] =
      "vxworks_time";
 
@@ -5345,7 +5381,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\
  *
  *  Description of X11_Class fix
  */
-#define X11_CLASS_FIXIDX                 134
+#define X11_CLASS_FIXIDX                 135
 tSCC zX11_ClassName[] =
      "x11_class";
 
@@ -5392,7 +5428,7 @@ static const char* apzX11_ClassPatch[] = {
  *
  *  Description of X11_Class_Usage fix
  */
-#define X11_CLASS_USAGE_FIXIDX           135
+#define X11_CLASS_USAGE_FIXIDX           136
 tSCC zX11_Class_UsageName[] =
      "x11_class_usage";
 
@@ -5435,7 +5471,7 @@ static const char* apzX11_Class_UsagePatch[] = {
  *
  *  Description of X11_New fix
  */
-#define X11_NEW_FIXIDX                   136
+#define X11_NEW_FIXIDX                   137
 tSCC zX11_NewName[] =
      "x11_new";
 
@@ -5476,7 +5512,7 @@ static const char* apzX11_NewPatch[] = { "sed",
  *
  *  Description of X11_Sprintf fix
  */
-#define X11_SPRINTF_FIXIDX               137
+#define X11_SPRINTF_FIXIDX               138
 tSCC zX11_SprintfName[] =
      "x11_sprintf";
 
@@ -5515,9 +5551,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          145
+#define REGEX_COUNT          146
 #define MACH_LIST_SIZE_LIMIT 279
-#define FIX_COUNT            138
+#define FIX_COUNT            139
 
 tFixDesc fixDescList[ FIX_COUNT ] = {
   {  zAaa_Ki_IfaceName,    zAaa_Ki_IfaceList,
@@ -5625,6 +5661,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      AIX_VOLATILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAix_VolatileTests,   apzAix_VolatilePatch, 0 },
 
+  {  zAlpha___AssertName,    zAlpha___AssertList,
+     apzAlpha___AssertMachs,
+     ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aAlpha___AssertTests,   apzAlpha___AssertPatch, 0 },
+
   {  zAlpha_GetoptName,    zAlpha_GetoptList,
      apzAlpha_GetoptMachs,
      ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 01ecb12..07d586c 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -651,6 +651,19 @@ fix = {
 
 
 /*
+ *  Fix __assert declaration in assert.h on Alpha OSF/1.
+ */
+fix = {
+    hackname  = alpha___assert;
+    files     = "assert.h";
+    select    = '__assert\(char \*, char \*, int\)';
+    c_fix     = format;
+    c_fix_arg = "__assert(const char *, const char *, int)";
+    test_text = 'extern void __assert(char *, char *, int);';
+};
+
+
+/*
  *  Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX.
  */
 fix = {