diff options
Diffstat (limited to 'gcc/fixinc/fixincl.x')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 241 |
1 files changed, 217 insertions, 24 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index b1a426d468e..bbc664b4ee8 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Tuesday July 8, 2003 at 01:41:54 PM PDT + * It has been AutoGen-ed Friday August 29, 2003 at 01:36:38 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Jul 8 13:41:54 PDT 2003 +/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Aug 29 13:36:38 EDT 2003 * * You must regenerate it. Use the ./genfixes script. * @@ -15,7 +15,7 @@ * certain ANSI-incompatible system header files which are fixed to work * correctly with ANSI C and placed in a directory that GNU C will search. * - * This file contains 154 fixup descriptions. + * This file contains 158 fixup descriptions. * * See README for more information. * @@ -286,8 +286,9 @@ fix = {\n\ };\n\ #endif\n\n\n\ /*\n\ - * Completely replace <sys/byteorder.h>; with a file that implements gcc's\n\ - * optimized byteswapping.\n\ + * Completely replace <sys/byteorder.h> with a file that implements gcc's\n\ + * optimized byteswapping. (The original probably implemented some\n\ + * incompatible optimized byteswapping.)\n\ */\n\ fix = {\n\ hackname = AAB_svr4_replace_byteorder;\n\ @@ -298,6 +299,7 @@ fix = {\n\ mach = \"i[34567]86-*-solaris2.[0-4]\";\n\ mach = \"powerpcle-*-solaris2.[0-4]\";\n\ mach = \"sparc-*-solaris2.[0-4]\";\n\ + mach = \"i[34567]86-sequent-ptx*\";\n\ files = sys/byteorder.h;\n\ replace = <<- _EndOfHeader_\n\ #ifndef _SYS_BYTEORDER_H\n\ @@ -859,6 +861,45 @@ static const char* apzAlpha_ParensPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Alpha_Pthread fix + */ +tSCC zAlpha_PthreadName[] = + "alpha_pthread"; + +/* + * File name selection pattern + */ +tSCC zAlpha_PthreadList[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAlpha_PthreadMachs[] = { + "alpha*-dec-osf*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAlpha_PthreadSelect0[] = + "(#[ \t]*if defined \\(_PTHREAD_ENV_DECC\\) || defined \\(_PTHREAD_ENV_EPCC\\))\n\ +(#[ \t]*define _PTHREAD_USE_PTDNAM_)"; + +#define ALPHA_PTHREAD_TEST_CT 1 +static tTestDesc aAlpha_PthreadTests[] = { + { TT_EGREP, zAlpha_PthreadSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Alpha_Pthread + */ +static const char* apzAlpha_PthreadPatch[] = { + "format", + "%1 || defined (__PRAGMA_EXTERN_PREFIX)\n\ +%2", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Alpha_Sbrk fix */ tSCC zAlpha_SbrkName[] = @@ -919,7 +960,7 @@ tSCC zAvoid_Bool_DefineSelect0[] = * content bypass pattern - skip fix if pattern found */ tSCC zAvoid_Bool_DefineBypass0[] = - "we must use the C\\+\\+ compiler's type"; + "__cplusplus"; #define AVOID_BOOL_DEFINE_TEST_CT 2 static tTestDesc aAvoid_Bool_DefineTests[] = { @@ -964,7 +1005,7 @@ tSCC zAvoid_Bool_TypeSelect0[] = * content bypass pattern - skip fix if pattern found */ tSCC zAvoid_Bool_TypeBypass0[] = - "we must use the C\\+\\+ compiler's type"; + "__cplusplus"; #define AVOID_BOOL_TYPE_TEST_CT 2 static tTestDesc aAvoid_Bool_TypeTests[] = { @@ -1007,7 +1048,7 @@ tSCC zAvoid_Wchar_T_TypeSelect0[] = * content bypass pattern - skip fix if pattern found */ tSCC zAvoid_Wchar_T_TypeBypass0[] = - "we must use the C\\+\\+ compiler's type"; + "__cplusplus"; tSCC zAvoid_Wchar_T_TypeBypass1[] = "_LINUX_NLS_H"; tSCC zAvoid_Wchar_T_TypeBypass2[] = @@ -1231,7 +1272,7 @@ tSCC zBroken_CabsName[] = * File name selection pattern */ tSCC zBroken_CabsList[] = - "|math.h|"; + "|math.h|architecture/ppc/math.h|architecture/i386/math.h|"; /* * Machine/OS name selection pattern */ @@ -1253,7 +1294,7 @@ static tTestDesc aBroken_CabsTests[] = { static const char* apzBroken_CabsPatch[] = { "format", "", - "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);", + "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -2830,14 +2871,21 @@ tSCC zLimits_IfndefsList[] = #define apzLimits_IfndefsMachs (const char**)NULL /* + * content selection pattern - do fix if pattern found + */ +tSCC zLimits_IfndefsSelect0[] = + "^[ \t]*#[ \t]*define[ \t]+((FLT|DBL)_(MIN|MAX|DIG))[ \t].*"; + +/* * content bypass pattern - skip fix if pattern found */ tSCC zLimits_IfndefsBypass0[] = "ifndef[ \t]+FLT_(MIN|MAX)"; -#define LIMITS_IFNDEFS_TEST_CT 1 +#define LIMITS_IFNDEFS_TEST_CT 2 static tTestDesc aLimits_IfndefsTests[] = { - { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL }, }; + { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL }, + { TT_EGREP, zLimits_IfndefsSelect0, (regex_t*)NULL }, }; /* * Fix Command Arguments for Limits_Ifndefs @@ -2847,7 +2895,6 @@ static const char* apzLimits_IfndefsPatch[] = { "#ifndef %1\n\ %0\n\ #endif", - "^[ \t]*#[ \t]*define[ \t]+((FLT|DBL)_(MIN|MAX|DIG))[ \t].*", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -3022,7 +3069,7 @@ tSCC zMath_ExceptionSelect0[] = * content bypass pattern - skip fix if pattern found */ tSCC zMath_ExceptionBypass0[] = - "We have a problem when using C\\+\\+"; + "__cplusplus"; #define MATH_EXCEPTION_TEST_CT 2 static tTestDesc aMath_ExceptionTests[] = { @@ -3962,7 +4009,7 @@ static const char* apzSolaris_Mutex_Init_2Patch[] = { #else\n\ %1, {0}}%3\n\ #endif", - "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*),[ \t]*0}(|[ \t].*)$", + "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+\\{.*),[ \t]*0\\}(|[ \t].*)$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -4238,6 +4285,7 @@ s@ __va_list)@ __gnuc_va_list)@\n\ s@typedef[ \t]\\(.*\\)[ \t]va_list[ \t]*;@typedef \\1 __not_va_list__;@\n\ s@typedef[ \t]*__va_list__@typedef __gnuc_va_list@\n\ s@GNUC_VA_LIST@GNUC_Va_LIST@\n\ +s@_VA_LIST_DEFINED@_Va_LIST_DEFINED@\n\ s@_NEED___VA_LIST@_NEED___Va_LIST@\n\ s@VA_LIST@DUMMY_VA_LIST@\n\ s@_Va_LIST@_VA_LIST@", @@ -4431,17 +4479,20 @@ tSCC zStruct_SockaddrList[] = * content selection pattern - do fix if pattern found */ tSCC zStruct_SockaddrSelect0[] = - "^.*authdes_create.*struct sockaddr"; + "^.*authdes_create.*struct sockaddr[^_]"; /* * content bypass pattern - skip fix if pattern found */ tSCC zStruct_SockaddrBypass0[] = "<sys/socket.h>"; +tSCC zStruct_SockaddrBypass1[] = + "struct sockaddr;\n"; -#define STRUCT_SOCKADDR_TEST_CT 2 +#define STRUCT_SOCKADDR_TEST_CT 3 static tTestDesc aStruct_SockaddrTests[] = { { TT_NEGREP, zStruct_SockaddrBypass0, (regex_t*)NULL }, + { TT_NEGREP, zStruct_SockaddrBypass1, (regex_t*)NULL }, { TT_EGREP, zStruct_SockaddrSelect0, (regex_t*)NULL }, }; /* @@ -4855,6 +4906,45 @@ static const char* apzSvr4_GetcwdPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Svr4_Krnl fix + */ +tSCC zSvr4_KrnlName[] = + "svr4_krnl"; + +/* + * File name selection pattern + */ +tSCC zSvr4_KrnlList[] = + "|fs/rfs/rf_cache.h|sys/erec.h|sys/err.h|sys/char.h|sys/getpages.h|sys/map.h|sys/cmn_err.h|sys/kdebugger.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSvr4_KrnlMachs[] = { + "*-*-sysv4*", + "i?86-sequent-ptx*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSvr4_KrnlBypass0[] = + "_KERNEL"; + +#define SVR4_KRNL_TEST_CT 1 +static tTestDesc aSvr4_KrnlTests[] = { + { TT_NEGREP, zSvr4_KrnlBypass0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Svr4_Krnl + */ +static const char* apzSvr4_KrnlPatch[] = { + "wrap", + "#ifdef _KERNEL\n", + "#endif /* _KERNEL */\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Svr4_Profil fix */ tSCC zSvr4_ProfilName[] = @@ -4890,6 +4980,85 @@ static const char* apzSvr4_ProfilPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Svr4_Sighandler_Type fix + */ +tSCC zSvr4_Sighandler_TypeName[] = + "svr4_sighandler_type"; + +/* + * File name selection pattern + */ +tSCC zSvr4_Sighandler_TypeList[] = + "|sys/signal.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSvr4_Sighandler_TypeMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSvr4_Sighandler_TypeSelect0[] = + "void *\\(\\*\\)\\(\\)"; + +#define SVR4_SIGHANDLER_TYPE_TEST_CT 1 +static tTestDesc aSvr4_Sighandler_TypeTests[] = { + { TT_EGREP, zSvr4_Sighandler_TypeSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Svr4_Sighandler_Type + */ +static const char* apzSvr4_Sighandler_TypePatch[] = { + "format", + "void (*)(int)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Svr4_Undeclared_Getrnge fix + */ +tSCC zSvr4_Undeclared_GetrngeName[] = + "svr4_undeclared_getrnge"; + +/* + * File name selection pattern + */ +tSCC zSvr4_Undeclared_GetrngeList[] = + "|regexp.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSvr4_Undeclared_GetrngeMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSvr4_Undeclared_GetrngeSelect0[] = + "getrnge"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSvr4_Undeclared_GetrngeBypass0[] = + "static void getrnge"; + +#define SVR4_UNDECLARED_GETRNGE_TEST_CT 2 +static tTestDesc aSvr4_Undeclared_GetrngeTests[] = { + { TT_NEGREP, zSvr4_Undeclared_GetrngeBypass0, (regex_t*)NULL }, + { TT_EGREP, zSvr4_Undeclared_GetrngeSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Svr4_Undeclared_Getrnge + */ +static const char* apzSvr4_Undeclared_GetrngePatch[] = { + "format", + "%0\n\ +static int getrnge ();", + "^static int[ \t]+size;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Sysv68_String fix */ tSCC zSysv68_StringName[] = @@ -5493,11 +5662,11 @@ static tTestDesc aUndefine_NullTests[] = { */ static const char* apzUndefine_NullPatch[] = { "format", - "#ifndef NULL%2\n\ -#define NULL%1%2\n\ -#endif%2\n", - "^#[ \t]*define[ \t]*[ \t]NULL([^\r\n\ -]+)([\r]*)\n", + "#ifndef NULL\n\ +#define NULL%1\n\ +#endif\n", + "^#[ \t]*define[ \t]+NULL([^\r\n\ +]+)[\r]*\n", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -6100,9 +6269,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 171 +#define REGEX_COUNT 178 #define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 154 +#define FIX_COUNT 158 /* * Enumerate the fixes @@ -6126,6 +6295,7 @@ typedef enum { ALPHA_ASSERT_FIXIDX, ALPHA_GETOPT_FIXIDX, ALPHA_PARENS_FIXIDX, + ALPHA_PTHREAD_FIXIDX, ALPHA_SBRK_FIXIDX, AVOID_BOOL_DEFINE_FIXIDX, AVOID_BOOL_TYPE_FIXIDX, @@ -6229,7 +6399,10 @@ typedef enum { SVR4__P_FIXIDX, SVR4_DISABLE_OPT_FIXIDX, SVR4_GETCWD_FIXIDX, + SVR4_KRNL_FIXIDX, SVR4_PROFIL_FIXIDX, + SVR4_SIGHANDLER_TYPE_FIXIDX, + SVR4_UNDECLARED_GETRNGE_FIXIDX, SYSV68_STRING_FIXIDX, SYSZ_STDLIB_FOR_SUN_FIXIDX, THREAD_KEYWORD_FIXIDX, @@ -6355,6 +6528,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_ParensTests, apzAlpha_ParensPatch, 0 }, + { zAlpha_PthreadName, zAlpha_PthreadList, + apzAlpha_PthreadMachs, + ALPHA_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAlpha_PthreadTests, apzAlpha_PthreadPatch, 0 }, + { zAlpha_SbrkName, zAlpha_SbrkList, apzAlpha_SbrkMachs, ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -6870,11 +7048,26 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SVR4_GETCWD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSvr4_GetcwdTests, apzSvr4_GetcwdPatch, 0 }, + { zSvr4_KrnlName, zSvr4_KrnlList, + apzSvr4_KrnlMachs, + SVR4_KRNL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSvr4_KrnlTests, apzSvr4_KrnlPatch, 0 }, + { zSvr4_ProfilName, zSvr4_ProfilList, apzSvr4_ProfilMachs, SVR4_PROFIL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSvr4_ProfilTests, apzSvr4_ProfilPatch, 0 }, + { zSvr4_Sighandler_TypeName, zSvr4_Sighandler_TypeList, + apzSvr4_Sighandler_TypeMachs, + SVR4_SIGHANDLER_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSvr4_Sighandler_TypeTests, apzSvr4_Sighandler_TypePatch, 0 }, + + { zSvr4_Undeclared_GetrngeName, zSvr4_Undeclared_GetrngeList, + apzSvr4_Undeclared_GetrngeMachs, + SVR4_UNDECLARED_GETRNGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSvr4_Undeclared_GetrngeTests, apzSvr4_Undeclared_GetrngePatch, 0 }, + { zSysv68_StringName, zSysv68_StringList, apzSysv68_StringMachs, SYSV68_STRING_TEST_CT, FD_MACH_ONLY, |