From 9bb2d43633fca4d2865cb51e4c01b41512ed68c9 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Tue, 11 Jul 2000 21:13:42 +0000 Subject: [PATCH] irix_multiline_cmnt is now obsolete From-SVN: r34964 --- gcc/ChangeLog | 2 + gcc/fixinc/fixincl.x | 195 ++++++++++++++++++++---------------------------- gcc/fixinc/inclhack.def | 15 ---- 3 files changed, 83 insertions(+), 129 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d357f6b..0c8f976 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -2,6 +2,8 @@ * fixinc/fixtests.c(double_slash): obsolete (else_endif_label): likewise + * fixinc/inclhack.def(irix_multiline_cmnt): obsolete + * fixinc/fixincl.x: regen 2000-07-11 Kaveh R. Ghazi diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 2c2b216..3abae02 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 131 fixup descriptions. + * This file contains 130 fixup descriptions. * * See README-fixinc for more information. * @@ -2157,37 +2157,9 @@ const char* apzIrix_Asm_ApostrophePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix_Multiline_Cmnt fix - */ -#define IRIX_MULTILINE_CMNT_FIXIDX 51 -tSCC zIrix_Multiline_CmntName[] = - "irix_multiline_cmnt"; - -/* - * File name selection pattern - */ -tSCC zIrix_Multiline_CmntList[] = - "|sys/types.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzIrix_Multiline_CmntMachs (const char**)NULL -#define IRIX_MULTILINE_CMNT_TEST_CT 0 -#define aIrix_Multiline_CmntTests (tTestDesc*)NULL - -/* - * Fix Command Arguments for Irix_Multiline_Cmnt - */ -const char* apzIrix_Multiline_CmntPatch[] = { "sed", - "-e", "s@type of the result@type of the result */@", - "-e", "s@of the sizeof@/* of the sizeof@", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Isc_Fmod fix */ -#define ISC_FMOD_FIXIDX 52 +#define ISC_FMOD_FIXIDX 51 tSCC zIsc_FmodName[] = "isc_fmod"; @@ -2223,7 +2195,7 @@ const char* apzIsc_FmodPatch[] = { * * Description of Kandr_Concat fix */ -#define KANDR_CONCAT_FIXIDX 53 +#define KANDR_CONCAT_FIXIDX 52 tSCC zKandr_ConcatName[] = "kandr_concat"; @@ -2259,7 +2231,7 @@ const char* apzKandr_ConcatPatch[] = { * * Description of Libc1_Ifdefd_Memx fix */ -#define LIBC1_IFDEFD_MEMX_FIXIDX 54 +#define LIBC1_IFDEFD_MEMX_FIXIDX 53 tSCC zLibc1_Ifdefd_MemxName[] = "libc1_ifdefd_memx"; @@ -2307,7 +2279,7 @@ extern [a-z_]+ mem)", * * Description of Limits_Ifndefs fix */ -#define LIMITS_IFNDEFS_FIXIDX 55 +#define LIMITS_IFNDEFS_FIXIDX 54 tSCC zLimits_IfndefsName[] = "limits_ifndefs"; @@ -2346,7 +2318,7 @@ const char* apzLimits_IfndefsPatch[] = { * * Description of Lynx_Void_Int fix */ -#define LYNX_VOID_INT_FIXIDX 56 +#define LYNX_VOID_INT_FIXIDX 55 tSCC zLynx_Void_IntName[] = "lynx_void_int"; @@ -2382,7 +2354,7 @@ const char* apzLynx_Void_IntPatch[] = { * * Description of Lynxos_Fcntl_Proto fix */ -#define LYNXOS_FCNTL_PROTO_FIXIDX 57 +#define LYNXOS_FCNTL_PROTO_FIXIDX 56 tSCC zLynxos_Fcntl_ProtoName[] = "lynxos_fcntl_proto"; @@ -2419,7 +2391,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { * * Description of M88k_Bad_Hypot_Opt fix */ -#define M88K_BAD_HYPOT_OPT_FIXIDX 58 +#define M88K_BAD_HYPOT_OPT_FIXIDX 57 tSCC zM88k_Bad_Hypot_OptName[] = "m88k_bad_hypot_opt"; @@ -2468,7 +2440,7 @@ static __inline__ double fake_hypot (x, y)\n\ * * Description of M88k_Bad_S_If fix */ -#define M88K_BAD_S_IF_FIXIDX 59 +#define M88K_BAD_S_IF_FIXIDX 58 tSCC zM88k_Bad_S_IfName[] = "m88k_bad_s_if"; @@ -2507,7 +2479,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { * * Description of M88k_Multi_Incl fix */ -#define M88K_MULTI_INCL_FIXIDX 60 +#define M88K_MULTI_INCL_FIXIDX 59 tSCC zM88k_Multi_InclName[] = "m88k_multi_incl"; @@ -2544,7 +2516,7 @@ const char* apzM88k_Multi_InclPatch[] = { * * Description of Machine_Ansi_H_Va_List fix */ -#define MACHINE_ANSI_H_VA_LIST_FIXIDX 61 +#define MACHINE_ANSI_H_VA_LIST_FIXIDX 60 tSCC zMachine_Ansi_H_Va_ListName[] = "machine_ansi_h_va_list"; @@ -2588,7 +2560,7 @@ const char* apzMachine_Ansi_H_Va_ListPatch[] = { * * Description of Machine_Name fix */ -#define MACHINE_NAME_FIXIDX 62 +#define MACHINE_NAME_FIXIDX 61 tSCC zMachine_NameName[] = "machine_name"; @@ -2621,7 +2593,7 @@ const char* apzMachine_NamePatch[] = { * * Description of Math_Exception fix */ -#define MATH_EXCEPTION_FIXIDX 63 +#define MATH_EXCEPTION_FIXIDX 62 tSCC zMath_ExceptionName[] = "math_exception"; @@ -2669,7 +2641,7 @@ const char* apzMath_ExceptionPatch[] = { * * Description of Math_Huge_Val_From_Dbl_Max fix */ -#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 64 +#define MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX 63 tSCC zMath_Huge_Val_From_Dbl_MaxName[] = "math_huge_val_from_dbl_max"; @@ -2716,7 +2688,7 @@ const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c", * * Description of Math_Huge_Val_Ifndef fix */ -#define MATH_HUGE_VAL_IFNDEF_FIXIDX 65 +#define MATH_HUGE_VAL_IFNDEF_FIXIDX 64 tSCC zMath_Huge_Val_IfndefName[] = "math_huge_val_ifndef"; @@ -2755,7 +2727,7 @@ const char* apzMath_Huge_Val_IfndefPatch[] = { * * Description of Nested_Motorola fix */ -#define NESTED_MOTOROLA_FIXIDX 66 +#define NESTED_MOTOROLA_FIXIDX 65 tSCC zNested_MotorolaName[] = "nested_motorola"; @@ -2785,7 +2757,7 @@ const char* apzNested_MotorolaPatch[] = { "sed", * * Description of Nested_Sys_Limits fix */ -#define NESTED_SYS_LIMITS_FIXIDX 67 +#define NESTED_SYS_LIMITS_FIXIDX 66 tSCC zNested_Sys_LimitsName[] = "nested_sys_limits"; @@ -2821,7 +2793,7 @@ const char* apzNested_Sys_LimitsPatch[] = { "sed", * * Description of Nested_Auth_Des fix */ -#define NESTED_AUTH_DES_FIXIDX 68 +#define NESTED_AUTH_DES_FIXIDX 67 tSCC zNested_Auth_DesName[] = "nested_auth_des"; @@ -2857,7 +2829,7 @@ const char* apzNested_Auth_DesPatch[] = { * * Description of News_Os_Recursion fix */ -#define NEWS_OS_RECURSION_FIXIDX 69 +#define NEWS_OS_RECURSION_FIXIDX 68 tSCC zNews_Os_RecursionName[] = "news_os_recursion"; @@ -2895,7 +2867,7 @@ const char* apzNews_Os_RecursionPatch[] = { * * Description of Next_Math_Prefix fix */ -#define NEXT_MATH_PREFIX_FIXIDX 70 +#define NEXT_MATH_PREFIX_FIXIDX 69 tSCC zNext_Math_PrefixName[] = "next_math_prefix"; @@ -2932,7 +2904,7 @@ const char* apzNext_Math_PrefixPatch[] = { * * Description of Next_Template fix */ -#define NEXT_TEMPLATE_FIXIDX 71 +#define NEXT_TEMPLATE_FIXIDX 70 tSCC zNext_TemplateName[] = "next_template"; @@ -2969,7 +2941,7 @@ const char* apzNext_TemplatePatch[] = { * * Description of Next_Volitile fix */ -#define NEXT_VOLITILE_FIXIDX 72 +#define NEXT_VOLITILE_FIXIDX 71 tSCC zNext_VolitileName[] = "next_volitile"; @@ -3006,7 +2978,7 @@ const char* apzNext_VolitilePatch[] = { * * Description of Next_Wait_Union fix */ -#define NEXT_WAIT_UNION_FIXIDX 73 +#define NEXT_WAIT_UNION_FIXIDX 72 tSCC zNext_Wait_UnionName[] = "next_wait_union"; @@ -3042,7 +3014,7 @@ const char* apzNext_Wait_UnionPatch[] = { * * Description of Nodeent_Syntax fix */ -#define NODEENT_SYNTAX_FIXIDX 74 +#define NODEENT_SYNTAX_FIXIDX 73 tSCC zNodeent_SyntaxName[] = "nodeent_syntax"; @@ -3078,7 +3050,7 @@ const char* apzNodeent_SyntaxPatch[] = { * * Description of Osf_Namespace_A fix */ -#define OSF_NAMESPACE_A_FIXIDX 75 +#define OSF_NAMESPACE_A_FIXIDX 74 tSCC zOsf_Namespace_AName[] = "osf_namespace_a"; @@ -3124,7 +3096,7 @@ const char* apzOsf_Namespace_APatch[] = { * * Description of Osf_Namespace_C fix */ -#define OSF_NAMESPACE_C_FIXIDX 76 +#define OSF_NAMESPACE_C_FIXIDX 75 tSCC zOsf_Namespace_CName[] = "osf_namespace_c"; @@ -3179,7 +3151,7 @@ typedef __regmatch_t\tregmatch_t;", * * Description of Pthread_Page_Size fix */ -#define PTHREAD_PAGE_SIZE_FIXIDX 77 +#define PTHREAD_PAGE_SIZE_FIXIDX 76 tSCC zPthread_Page_SizeName[] = "pthread_page_size"; @@ -3215,7 +3187,7 @@ const char* apzPthread_Page_SizePatch[] = { * * Description of Read_Ret_Type fix */ -#define READ_RET_TYPE_FIXIDX 78 +#define READ_RET_TYPE_FIXIDX 77 tSCC zRead_Ret_TypeName[] = "read_ret_type"; @@ -3253,7 +3225,7 @@ const char* apzRead_Ret_TypePatch[] = { * * Description of Rs6000_Double fix */ -#define RS6000_DOUBLE_FIXIDX 79 +#define RS6000_DOUBLE_FIXIDX 78 tSCC zRs6000_DoubleName[] = "rs6000_double"; @@ -3292,7 +3264,7 @@ const char* apzRs6000_DoublePatch[] = { * * Description of Rs6000_Fchmod fix */ -#define RS6000_FCHMOD_FIXIDX 80 +#define RS6000_FCHMOD_FIXIDX 79 tSCC zRs6000_FchmodName[] = "rs6000_fchmod"; @@ -3328,7 +3300,7 @@ const char* apzRs6000_FchmodPatch[] = { * * Description of Rs6000_Param fix */ -#define RS6000_PARAM_FIXIDX 81 +#define RS6000_PARAM_FIXIDX 80 tSCC zRs6000_ParamName[] = "rs6000_param"; @@ -3364,7 +3336,7 @@ const char* apzRs6000_ParamPatch[] = { * * Description of Sco_Static_Func fix */ -#define SCO_STATIC_FUNC_FIXIDX 82 +#define SCO_STATIC_FUNC_FIXIDX 81 tSCC zSco_Static_FuncName[] = "sco_static_func"; @@ -3408,7 +3380,7 @@ extern \"C\" {\\\n\ * * Description of Sco_Strict_Ansi fix */ -#define SCO_STRICT_ANSI_FIXIDX 83 +#define SCO_STRICT_ANSI_FIXIDX 82 tSCC zSco_Strict_AnsiName[] = "sco_strict_ansi"; @@ -3446,7 +3418,7 @@ const char* apzSco_Strict_AnsiPatch[] = { * * Description of Sco_Utime fix */ -#define SCO_UTIME_FIXIDX 84 +#define SCO_UTIME_FIXIDX 83 tSCC zSco_UtimeName[] = "sco_utime"; @@ -3484,7 +3456,7 @@ const char* apzSco_UtimePatch[] = { * * Description of Sony_Include fix */ -#define SONY_INCLUDE_FIXIDX 85 +#define SONY_INCLUDE_FIXIDX 84 tSCC zSony_IncludeName[] = "sony_include"; @@ -3519,7 +3491,7 @@ const char* apzSony_IncludePatch[] = { "sed", * * Description of Statsswtch fix */ -#define STATSSWTCH_FIXIDX 86 +#define STATSSWTCH_FIXIDX 85 tSCC zStatsswtchName[] = "statsswtch"; @@ -3555,7 +3527,7 @@ const char* apzStatsswtchPatch[] = { * * Description of Stdio_Stdarg_H fix */ -#define STDIO_STDARG_H_FIXIDX 87 +#define STDIO_STDARG_H_FIXIDX 86 tSCC zStdio_Stdarg_HName[] = "stdio_stdarg_h"; @@ -3592,7 +3564,7 @@ const char* apzStdio_Stdarg_HPatch[] = { * * Description of Stdio_Va_List fix */ -#define STDIO_VA_LIST_FIXIDX 88 +#define STDIO_VA_LIST_FIXIDX 87 tSCC zStdio_Va_ListName[] = "stdio_va_list"; @@ -3637,7 +3609,7 @@ s@_Va_LIST@_VA_LIST@", * * Description of Struct_File fix */ -#define STRUCT_FILE_FIXIDX 89 +#define STRUCT_FILE_FIXIDX 88 tSCC zStruct_FileName[] = "struct_file"; @@ -3674,7 +3646,7 @@ const char* apzStruct_FilePatch[] = { * * Description of Struct_Sockaddr fix */ -#define STRUCT_SOCKADDR_FIXIDX 90 +#define STRUCT_SOCKADDR_FIXIDX 89 tSCC zStruct_SockaddrName[] = "struct_sockaddr"; @@ -3718,7 +3690,7 @@ const char* apzStruct_SockaddrPatch[] = { * * Description of Sun_Auth_Proto fix */ -#define SUN_AUTH_PROTO_FIXIDX 91 +#define SUN_AUTH_PROTO_FIXIDX 90 tSCC zSun_Auth_ProtoName[] = "sun_auth_proto"; @@ -3759,7 +3731,7 @@ const char* apzSun_Auth_ProtoPatch[] = { * * Description of Sun_Bogus_Ifdef fix */ -#define SUN_BOGUS_IFDEF_FIXIDX 92 +#define SUN_BOGUS_IFDEF_FIXIDX 91 tSCC zSun_Bogus_IfdefName[] = "sun_bogus_ifdef"; @@ -3795,7 +3767,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { * * Description of Sun_Catmacro fix */ -#define SUN_CATMACRO_FIXIDX 93 +#define SUN_CATMACRO_FIXIDX 92 tSCC zSun_CatmacroName[] = "sun_catmacro"; @@ -3835,7 +3807,7 @@ const char* apzSun_CatmacroPatch[] = { * * Description of Sun_Malloc fix */ -#define SUN_MALLOC_FIXIDX 94 +#define SUN_MALLOC_FIXIDX 93 tSCC zSun_MallocName[] = "sun_malloc"; @@ -3866,7 +3838,7 @@ const char* apzSun_MallocPatch[] = { "sed", * * Description of Sun_Rusers_Semi fix */ -#define SUN_RUSERS_SEMI_FIXIDX 95 +#define SUN_RUSERS_SEMI_FIXIDX 94 tSCC zSun_Rusers_SemiName[] = "sun_rusers_semi"; @@ -3901,7 +3873,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed", * * Description of Sun_Signal fix */ -#define SUN_SIGNAL_FIXIDX 96 +#define SUN_SIGNAL_FIXIDX 95 tSCC zSun_SignalName[] = "sun_signal"; @@ -3941,7 +3913,7 @@ void\t(*signal(...))(...);\n\ * * Description of Sunos_Matherr_Decl fix */ -#define SUNOS_MATHERR_DECL_FIXIDX 97 +#define SUNOS_MATHERR_DECL_FIXIDX 96 tSCC zSunos_Matherr_DeclName[] = "sunos_matherr_decl"; @@ -3984,7 +3956,7 @@ const char* apzSunos_Matherr_DeclPatch[] = { * * Description of Sunos_Strlen fix */ -#define SUNOS_STRLEN_FIXIDX 98 +#define SUNOS_STRLEN_FIXIDX 97 tSCC zSunos_StrlenName[] = "sunos_strlen"; @@ -4020,7 +3992,7 @@ const char* apzSunos_StrlenPatch[] = { * * Description of Svr4__P fix */ -#define SVR4__P_FIXIDX 99 +#define SVR4__P_FIXIDX 98 tSCC zSvr4__PName[] = "svr4__p"; @@ -4058,7 +4030,7 @@ const char* apzSvr4__PPatch[] = { * * Description of Svr4_Getcwd fix */ -#define SVR4_GETCWD_FIXIDX 100 +#define SVR4_GETCWD_FIXIDX 99 tSCC zSvr4_GetcwdName[] = "svr4_getcwd"; @@ -4094,7 +4066,7 @@ const char* apzSvr4_GetcwdPatch[] = { * * Description of Svr4_Profil fix */ -#define SVR4_PROFIL_FIXIDX 101 +#define SVR4_PROFIL_FIXIDX 100 tSCC zSvr4_ProfilName[] = "svr4_profil"; @@ -4130,7 +4102,7 @@ const char* apzSvr4_ProfilPatch[] = { * * Description of Systypes fix */ -#define SYSTYPES_FIXIDX 102 +#define SYSTYPES_FIXIDX 101 tSCC zSystypesName[] = "systypes"; @@ -4189,7 +4161,7 @@ typedef __SIZE_TYPE__ size_t;\\\n\ * * Description of Systypes_Stdlib_Size_T fix */ -#define SYSTYPES_STDLIB_SIZE_T_FIXIDX 103 +#define SYSTYPES_STDLIB_SIZE_T_FIXIDX 102 tSCC zSystypes_Stdlib_Size_TName[] = "systypes_stdlib_size_t"; @@ -4235,7 +4207,7 @@ const char* apzSystypes_Stdlib_Size_TPatch[] = { * * Description of Sysv68_String fix */ -#define SYSV68_STRING_FIXIDX 104 +#define SYSV68_STRING_FIXIDX 103 tSCC zSysv68_StringName[] = "sysv68_string"; @@ -4272,7 +4244,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 104 tSCC zSysz_Stdlib_For_SunName[] = "sysz_stdlib_for_sun"; @@ -4308,7 +4280,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { * * Description of Sysz_Stdtypes_For_Sun fix */ -#define SYSZ_STDTYPES_FOR_SUN_FIXIDX 106 +#define SYSZ_STDTYPES_FOR_SUN_FIXIDX 105 tSCC zSysz_Stdtypes_For_SunName[] = "sysz_stdtypes_for_sun"; @@ -4349,7 +4321,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed", * * Description of Tinfo_Cplusplus fix */ -#define TINFO_CPLUSPLUS_FIXIDX 107 +#define TINFO_CPLUSPLUS_FIXIDX 106 tSCC zTinfo_CplusplusName[] = "tinfo_cplusplus"; @@ -4385,7 +4357,7 @@ const char* apzTinfo_CplusplusPatch[] = { * * Description of Ultrix_Atof_Param fix */ -#define ULTRIX_ATOF_PARAM_FIXIDX 108 +#define ULTRIX_ATOF_PARAM_FIXIDX 107 tSCC zUltrix_Atof_ParamName[] = "ultrix_atof_param"; @@ -4421,7 +4393,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { * * Description of Ultrix_Const fix */ -#define ULTRIX_CONST_FIXIDX 109 +#define ULTRIX_CONST_FIXIDX 108 tSCC zUltrix_ConstName[] = "ultrix_const"; @@ -4458,7 +4430,7 @@ const char* apzUltrix_ConstPatch[] = { * * Description of Ultrix_Const2 fix */ -#define ULTRIX_CONST2_FIXIDX 110 +#define ULTRIX_CONST2_FIXIDX 109 tSCC zUltrix_Const2Name[] = "ultrix_const2"; @@ -4495,7 +4467,7 @@ const char* apzUltrix_Const2Patch[] = { * * Description of Ultrix_Fix_Fixproto fix */ -#define ULTRIX_FIX_FIXPROTO_FIXIDX 111 +#define ULTRIX_FIX_FIXPROTO_FIXIDX 110 tSCC zUltrix_Fix_FixprotoName[] = "ultrix_fix_fixproto"; @@ -4533,7 +4505,7 @@ const char* apzUltrix_Fix_FixprotoPatch[] = { * * Description of Ultrix_Ifdef fix */ -#define ULTRIX_IFDEF_FIXIDX 112 +#define ULTRIX_IFDEF_FIXIDX 111 tSCC zUltrix_IfdefName[] = "ultrix_ifdef"; @@ -4569,7 +4541,7 @@ const char* apzUltrix_IfdefPatch[] = { * * Description of Ultrix_Math_Ifdef fix */ -#define ULTRIX_MATH_IFDEF_FIXIDX 113 +#define ULTRIX_MATH_IFDEF_FIXIDX 112 tSCC zUltrix_Math_IfdefName[] = "ultrix_math_ifdef"; @@ -4605,7 +4577,7 @@ const char* apzUltrix_Math_IfdefPatch[] = { * * Description of Ultrix_Nested_Ioctl fix */ -#define ULTRIX_NESTED_IOCTL_FIXIDX 114 +#define ULTRIX_NESTED_IOCTL_FIXIDX 113 tSCC zUltrix_Nested_IoctlName[] = "ultrix_nested_ioctl"; @@ -4640,7 +4612,7 @@ const char* apzUltrix_Nested_IoctlPatch[] = { "sed", * * Description of Ultrix_Nested_Svc fix */ -#define ULTRIX_NESTED_SVC_FIXIDX 115 +#define ULTRIX_NESTED_SVC_FIXIDX 114 tSCC zUltrix_Nested_SvcName[] = "ultrix_nested_svc"; @@ -4675,7 +4647,7 @@ const char* apzUltrix_Nested_SvcPatch[] = { "sed", * * Description of Ultrix_Stat fix */ -#define ULTRIX_STAT_FIXIDX 116 +#define ULTRIX_STAT_FIXIDX 115 tSCC zUltrix_StatName[] = "ultrix_stat"; @@ -4716,7 +4688,7 @@ const char* apzUltrix_StatPatch[] = { "sed", * * Description of Ultrix_Static fix */ -#define ULTRIX_STATIC_FIXIDX 117 +#define ULTRIX_STATIC_FIXIDX 116 tSCC zUltrix_StaticName[] = "ultrix_static"; @@ -4753,7 +4725,7 @@ const char* apzUltrix_StaticPatch[] = { "sed", * * Description of Ultrix_Strings fix */ -#define ULTRIX_STRINGS_FIXIDX 118 +#define ULTRIX_STRINGS_FIXIDX 117 tSCC zUltrix_StringsName[] = "ultrix_strings"; @@ -4788,7 +4760,7 @@ const char* apzUltrix_StringsPatch[] = { * * Description of Undefine_Null fix */ -#define UNDEFINE_NULL_FIXIDX 119 +#define UNDEFINE_NULL_FIXIDX 118 tSCC zUndefine_NullName[] = "undefine_null"; @@ -4834,7 +4806,7 @@ const char* apzUndefine_NullPatch[] = { * * Description of Unixware7_Byteorder_Fix fix */ -#define UNIXWARE7_BYTEORDER_FIX_FIXIDX 120 +#define UNIXWARE7_BYTEORDER_FIX_FIXIDX 119 tSCC zUnixware7_Byteorder_FixName[] = "unixware7_byteorder_fix"; @@ -4877,7 +4849,7 @@ const char* apzUnixware7_Byteorder_FixPatch[] = { "sed", * * Description of Va_I960_Macro fix */ -#define VA_I960_MACRO_FIXIDX 121 +#define VA_I960_MACRO_FIXIDX 120 tSCC zVa_I960_MacroName[] = "va_i960_macro"; @@ -4913,7 +4885,7 @@ const char* apzVa_I960_MacroPatch[] = { * * Description of Void_Null fix */ -#define VOID_NULL_FIXIDX 122 +#define VOID_NULL_FIXIDX 121 tSCC zVoid_NullName[] = "void_null"; @@ -4949,7 +4921,7 @@ const char* apzVoid_NullPatch[] = { * * Description of Vxworks_Gcc_Problem fix */ -#define VXWORKS_GCC_PROBLEM_FIXIDX 123 +#define VXWORKS_GCC_PROBLEM_FIXIDX 122 tSCC zVxworks_Gcc_ProblemName[] = "vxworks_gcc_problem"; @@ -4999,7 +4971,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed", * * Description of Vxworks_Needs_Vxtypes fix */ -#define VXWORKS_NEEDS_VXTYPES_FIXIDX 124 +#define VXWORKS_NEEDS_VXTYPES_FIXIDX 123 tSCC zVxworks_Needs_VxtypesName[] = "vxworks_needs_vxtypes"; @@ -5035,7 +5007,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { * * Description of Vxworks_Needs_Vxworks fix */ -#define VXWORKS_NEEDS_VXWORKS_FIXIDX 125 +#define VXWORKS_NEEDS_VXWORKS_FIXIDX 124 tSCC zVxworks_Needs_VxworksName[] = "vxworks_needs_vxworks"; @@ -5084,7 +5056,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed", * * Description of Vxworks_Time fix */ -#define VXWORKS_TIME_FIXIDX 126 +#define VXWORKS_TIME_FIXIDX 125 tSCC zVxworks_TimeName[] = "vxworks_time"; @@ -5135,7 +5107,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\n\ * * Description of X11_Class fix */ -#define X11_CLASS_FIXIDX 127 +#define X11_CLASS_FIXIDX 126 tSCC zX11_ClassName[] = "x11_class"; @@ -5182,7 +5154,7 @@ const char* apzX11_ClassPatch[] = { * * Description of X11_Class_Usage fix */ -#define X11_CLASS_USAGE_FIXIDX 128 +#define X11_CLASS_USAGE_FIXIDX 127 tSCC zX11_Class_UsageName[] = "x11_class_usage"; @@ -5225,7 +5197,7 @@ const char* apzX11_Class_UsagePatch[] = { * * Description of X11_New fix */ -#define X11_NEW_FIXIDX 129 +#define X11_NEW_FIXIDX 128 tSCC zX11_NewName[] = "x11_new"; @@ -5266,7 +5238,7 @@ const char* apzX11_NewPatch[] = { "sed", * * Description of X11_Sprintf fix */ -#define X11_SPRINTF_FIXIDX 130 +#define X11_SPRINTF_FIXIDX 129 tSCC zX11_SprintfName[] = "x11_sprintf"; @@ -5307,7 +5279,7 @@ const char* apzX11_SprintfPatch[] = { */ #define REGEX_COUNT 132 #define MACH_LIST_SIZE_LIMIT 279 -#define FIX_COUNT 131 +#define FIX_COUNT 130 tFixDesc fixDescList[ FIX_COUNT ] = { { zAaa_Ki_IfaceName, zAaa_Ki_IfaceList, @@ -5565,11 +5537,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Asm_ApostropheTests, apzIrix_Asm_ApostrophePatch }, - { zIrix_Multiline_CmntName, zIrix_Multiline_CmntList, - apzIrix_Multiline_CmntMachs, - IRIX_MULTILINE_CMNT_TEST_CT, FD_MACH_ONLY, - aIrix_Multiline_CmntTests, apzIrix_Multiline_CmntPatch }, - { zIsc_FmodName, zIsc_FmodList, apzIsc_FmodMachs, ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 53e3f88..45f0afe 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -1236,21 +1236,6 @@ fix = { /* - * Some IRIX header files contain the string "//" - */ -fix = { - hackname = irix_multiline_cmnt; - files = sys/types.h; - - sed = "s@type of the result@type of the result */@"; - sed = "s@of the sizeof@/* of the sizeof@"; - test_text = - "/* we check the type of the result\n" - "// of the sizeof something. This is a bad test :-( */"; -}; - - -/* * Fixing ISC fmod declaration */ fix = { -- 2.7.4