X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=fixincludes%2Ffixincl.x;h=271c14e29ed4b85e07dfe6816e273c9d5d8d8043;hb=0526a3ffe67ff3f491e097332f73f7b986373527;hp=86032abda2cd72b40936fe8c2de49f1649cbe7f5;hpb=634f7a13c64daa6880a2241827483e0fb28a6df3;p=pf3gnuchains%2Fgcc-fork.git diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 86032abda2c..271c14e29ed 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Saturday August 14, 2004 at 05:48:43 PM EDT + * It has been AutoGen-ed Friday June 24, 2005 at 01:40:52 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Aug 14 17:48:43 EDT 2004 +/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Jun 24 13:40:52 EDT 2005 * * 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 177 fixup descriptions. + * This file contains 190 fixup descriptions. * * See README for more information. * @@ -42,6 +42,154 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aab_Darwin7_9_Long_Double_Funcs fix + */ +tSCC zAab_Darwin7_9_Long_Double_FuncsName[] = + "AAB_darwin7_9_long_double_funcs"; + +/* + * File name selection pattern + */ +tSCC zAab_Darwin7_9_Long_Double_FuncsList[] = + "|architecture/ppc/math.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Darwin7_9_Long_Double_FuncsMachs[] = { + "*-*-darwin7.9*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zAab_Darwin7_9_Long_Double_FuncsBypass0[] = + "powl"; + +#define AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT 1 +static tTestDesc aAab_Darwin7_9_Long_Double_FuncsTests[] = { + { TT_NEGREP, zAab_Darwin7_9_Long_Double_FuncsBypass0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aab_Darwin7_9_Long_Double_Funcs + */ +static const char* apzAab_Darwin7_9_Long_Double_FuncsPatch[] = { +"/* This file prototypes the long double functions available on Mac OS\n\ + 10.3.9. */\n\ +#ifndef __MATH__\n\ +# include_next \n\ +# ifndef __LIBMLDBL_COMPAT\n\ +# ifdef __LONG_DOUBLE_128__\n\ +# define __LIBMLDBL_COMPAT(sym) __asm(\"_\" #sym \"$LDBL128\")\n\ +# else\n\ +# define __LIBMLDBL_COMPAT(sym)\n\ +# endif /* __LONG_DOUBLE_128__ */\n\ +# endif /* __LIBMLDBL_COMPAT */\n\ +# ifdef __cplusplus\n\ + extern \"C\" {\n\ +# endif\n\ + extern long double acosl( long double ) __LIBMLDBL_COMPAT(acosl);\n\ + extern long double asinl( long double ) __LIBMLDBL_COMPAT(asinl);\n\ + extern long double atanl( long double ) __LIBMLDBL_COMPAT(atanl);\n\ + extern long double atan2l( long double, long double ) __LIBMLDBL_COMPAT(atan2l);\n\ + extern long double cosl( long double ) __LIBMLDBL_COMPAT(cosl);\n\ + extern long double sinl( long double ) __LIBMLDBL_COMPAT(sinl);\n\ + extern long double tanl( long double ) __LIBMLDBL_COMPAT(tanl);\n\ + extern long double acoshl( long double ) __LIBMLDBL_COMPAT(acoshl);\n\ + extern long double asinhl( long double ) __LIBMLDBL_COMPAT(asinhl);\n\ + extern long double atanhl( long double ) __LIBMLDBL_COMPAT(atanhl);\n\ + extern long double coshl( long double ) __LIBMLDBL_COMPAT(coshl);\n\ + extern long double sinhl( long double ) __LIBMLDBL_COMPAT(sinhl);\n\ + extern long double tanhl( long double ) __LIBMLDBL_COMPAT(tanhl);\n\ + extern long double expl( long double ) __LIBMLDBL_COMPAT(expl);\n\ + extern long double exp2l( long double ) __LIBMLDBL_COMPAT(exp2l);\n\ + extern long double expm1l( long double ) __LIBMLDBL_COMPAT(expm1l);\n\ + extern long double logl( long double ) __LIBMLDBL_COMPAT(logl);\n\ + extern long double log10l( long double ) __LIBMLDBL_COMPAT(log10l);\n\ + extern long double log2l( long double ) __LIBMLDBL_COMPAT(log2l);\n\ + extern long double log1pl( long double ) __LIBMLDBL_COMPAT(log1pl);\n\ + extern long double logbl( long double ) __LIBMLDBL_COMPAT(logbl);\n\ + extern long double modfl( long double, long double * ) __LIBMLDBL_COMPAT(modfl);\n\ + extern long double ldexpl( long double, int ) __LIBMLDBL_COMPAT(ldexpl);\n\ + extern long double frexpl( long double, int * ) __LIBMLDBL_COMPAT(frexpl);\n\ + extern int ilogbl( long double ) __LIBMLDBL_COMPAT(ilogbl);\n\ + extern long double scalbnl( long double, int ) __LIBMLDBL_COMPAT(scalbnl);\n\ + extern long double scalblnl( long double, long int ) __LIBMLDBL_COMPAT(scalblnl);\n\ + extern long double fabsl( long double ) __LIBMLDBL_COMPAT(fabsl);\n\ + extern long double cbrtl( long double ) __LIBMLDBL_COMPAT(cbrtl);\n\ + extern long double hypotl( long double, long double ) __LIBMLDBL_COMPAT(hypotl);\n\ + extern long double powl( long double, long double ) __LIBMLDBL_COMPAT(powl);\n\ + extern long double sqrtl( long double ) __LIBMLDBL_COMPAT(sqrtl);\n\ + extern long double erfl( long double ) __LIBMLDBL_COMPAT(erfl);\n\ + extern long double erfcl( long double ) __LIBMLDBL_COMPAT(erfcl);\n\ + extern long double lgammal( long double ) __LIBMLDBL_COMPAT(lgammal);\n\ + extern long double tgammal( long double ) __LIBMLDBL_COMPAT(tgammal);\n\ + extern long double ceill( long double ) __LIBMLDBL_COMPAT(ceill);\n\ + extern long double floorl( long double ) __LIBMLDBL_COMPAT(floorl);\n\ + extern long double nearbyintl( long double ) __LIBMLDBL_COMPAT(nearbyintl);\n\ + extern long double rintl( long double ) __LIBMLDBL_COMPAT(rintl);\n\ + extern long int lrintl( long double ) __LIBMLDBL_COMPAT(lrintl);\n\ + extern long long int llrintl( long double ) __LIBMLDBL_COMPAT(llrintl);\n\ + extern long double roundl( long double ) __LIBMLDBL_COMPAT(roundl);\n\ + extern long int lroundl( long double ) __LIBMLDBL_COMPAT(lroundl);\n\ + extern long long int llroundl( long double ) __LIBMLDBL_COMPAT(llroundl);\n\ + extern long double truncl( long double ) __LIBMLDBL_COMPAT(truncl);\n\ + extern long double fmodl( long double, long double) __LIBMLDBL_COMPAT(fmodl);\n\ + extern long double remainderl( long double, long double ) __LIBMLDBL_COMPAT(remainderl);\n\ + extern long double remquol( long double, long double, int * ) __LIBMLDBL_COMPAT(remquol);\n\ + extern long double copysignl( long double, long double ) __LIBMLDBL_COMPAT(copysignl);\n\ + extern long double nanl( const char * ) __LIBMLDBL_COMPAT(nanl);\n\ + extern long double nextafterl( long double, long double ) __LIBMLDBL_COMPAT(nextafterl);\n\ + extern long double nexttowardl( long double, long double ) __LIBMLDBL_COMPAT(nexttowardl);\n\ + extern long double fdiml( long double, long double ) __LIBMLDBL_COMPAT(fdiml);\n\ + extern long double fmaxl( long double, long double ) __LIBMLDBL_COMPAT(fmaxl);\n\ + extern long double fminl( long double, long double ) __LIBMLDBL_COMPAT(fminl);\n\ + extern long double fmal( long double, long double, long double ) __LIBMLDBL_COMPAT(fmal);\n\ +# ifdef __cplusplus\n\ + }\n\ +# endif\n\ +#endif /* __MATH__ */", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aab_Darwin7_9_Long_Double_Funcs_2 fix + */ +tSCC zAab_Darwin7_9_Long_Double_Funcs_2Name[] = + "AAB_darwin7_9_long_double_funcs_2"; + +/* + * File name selection pattern + */ +tSCC zAab_Darwin7_9_Long_Double_Funcs_2List[] = + "|math.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAab_Darwin7_9_Long_Double_Funcs_2Machs[] = { + "*-*-darwin7.9*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAab_Darwin7_9_Long_Double_Funcs_2Select0[] = + "#include[ \\t]+\\\""; + +#define AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT 1 +static tTestDesc aAab_Darwin7_9_Long_Double_Funcs_2Tests[] = { + { TT_EGREP, zAab_Darwin7_9_Long_Double_Funcs_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aab_Darwin7_9_Long_Double_Funcs_2 + */ +static const char* apzAab_Darwin7_9_Long_Double_Funcs_2Patch[] = { + "format", + "%1<%2.h>", + "([ \\t]*#[ \\t]*include[ \\t]+)\"([a-z0-9/]+)\\.h\"", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aab_Fd_Zero_Asm_Posix_Types_H fix */ tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] = @@ -124,13 +272,13 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = { #include_next \n\n\ #if defined(__FD_ZERO) && !defined(__GLIBC__)\n\ #undef __FD_ZERO\n\ -# define __FD_ZERO(fdsetp) \\\\\n\ - do { \\\\\n\ - int __d0, __d1; \\\\\n\ -__asm__ __volatile__(\"cld ; rep ; stosl\" \\\\\n\ - \t: \"=&c\" (__d0), \"=&D\" (__d1) \\\\\n\ - \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\\\n\ - \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\\\n\ +# define __FD_ZERO(fdsetp) \\\n\ + do { \\\n\ + int __d0, __d1; \\\n\ + __asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\ + : \"=&c\" (__d0), \"=&D\" (__d1) \\\n\ + : \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\ + \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\n\ } while (0)\n\ #endif\n\n\ #define _TYPES_H_WRAPPER\n\ @@ -1085,6 +1233,47 @@ static const char* apzAlpha_Pthread_GccPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Alpha_Pthread_Init fix + */ +tSCC zAlpha_Pthread_InitName[] = + "alpha_pthread_init"; + +/* + * File name selection pattern + */ +tSCC zAlpha_Pthread_InitList[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAlpha_Pthread_InitMachs[] = { + "alpha*-dec-osf*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAlpha_Pthread_InitSelect0[] = + " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$"; + +#define ALPHA_PTHREAD_INIT_TEST_CT 1 +static tTestDesc aAlpha_Pthread_InitTests[] = { + { TT_EGREP, zAlpha_Pthread_InitSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Alpha_Pthread_Init + */ +static const char* apzAlpha_Pthread_InitPatch[] = { "sed", + "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\ +s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\ +s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\ +s@CVALID\\(.*\\)_}@CVALID\\1_, 0, 0 }@\n\ +s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n\ +s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Alpha_Sbrk fix */ tSCC zAlpha_SbrkName[] = @@ -1470,7 +1659,7 @@ tSCC zBroken_CabsList[] = * content selection pattern - do fix if pattern found */ tSCC zBroken_CabsSelect0[] = - "^extern[ \\t]+double[ \\t]+cabs"; + "^extern[ \t]+double[ \t]+cabs"; #define BROKEN_CABS_TEST_CT 1 static tTestDesc aBroken_CabsTests[] = { @@ -1642,6 +1831,43 @@ extern \"C\" {\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Gcc4_Breakage fix + */ +tSCC zDarwin_Gcc4_BreakageName[] = + "darwin_gcc4_breakage"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Gcc4_BreakageList[] = + "|AvailabilityMacros.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Gcc4_BreakageMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Gcc4_BreakageSelect0[] = + "\\(__GNUC__ >= 3\\) && \\(__GNUC_MINOR__ >= 1\\)"; + +#define DARWIN_GCC4_BREAKAGE_TEST_CT 1 +static tTestDesc aDarwin_Gcc4_BreakageTests[] = { + { TT_EGREP, zDarwin_Gcc4_BreakageSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Gcc4_Breakage + */ +static const char* apzDarwin_Gcc4_BreakagePatch[] = { + "format", + "((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Darwin_Private_Extern fix */ tSCC zDarwin_Private_ExternName[] = @@ -1873,6 +2099,43 @@ static const char* apzFreebsd_Gcc3_BreakagePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Freebsd_Gcc4_Breakage fix + */ +tSCC zFreebsd_Gcc4_BreakageName[] = + "freebsd_gcc4_breakage"; + +/* + * File name selection pattern + */ +tSCC zFreebsd_Gcc4_BreakageList[] = + "|sys/cdefs.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzFreebsd_Gcc4_BreakageMachs[] = { + "*-*-freebsd*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zFreebsd_Gcc4_BreakageSelect0[] = + "^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 \\|\\| __GNUC__ == 3$"; + +#define FREEBSD_GCC4_BREAKAGE_TEST_CT 1 +static tTestDesc aFreebsd_Gcc4_BreakageTests[] = { + { TT_EGREP, zFreebsd_Gcc4_BreakageSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Freebsd_Gcc4_Breakage + */ +static const char* apzFreebsd_Gcc4_BreakagePatch[] = { + "format", + "#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Gnu_Types fix */ tSCC zGnu_TypesName[] = @@ -1886,7 +2149,9 @@ tSCC zGnu_TypesList[] = /* * Machine/OS name selection pattern */ -#define apzGnu_TypesMachs (const char**)NULL +tSCC* apzGnu_TypesMachs[] = { + "*-*-solaris2.1[0-9]*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -2473,8 +2738,15 @@ tSCC zHpux8_Bogus_InlinesList[] = tSCC zHpux8_Bogus_InlinesSelect0[] = "inline"; -#define HPUX8_BOGUS_INLINES_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zHpux8_Bogus_InlinesBypass0[] = + "__GNUG__"; + +#define HPUX8_BOGUS_INLINES_TEST_CT 2 static tTestDesc aHpux8_Bogus_InlinesTests[] = { + { TT_NEGREP, zHpux8_Bogus_InlinesBypass0, (regex_t*)NULL }, { TT_EGREP, zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, }; /* @@ -2524,96 +2796,84 @@ static const char* apzHpux_Ctype_MacrosPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Long_Double fix + * Description of Hpux_Htonl fix */ -tSCC zHpux_Long_DoubleName[] = - "hpux_long_double"; +tSCC zHpux_HtonlName[] = + "hpux_htonl"; /* * File name selection pattern */ -tSCC zHpux_Long_DoubleList[] = - "|stdlib.h|"; +tSCC zHpux_HtonlList[] = + "|netinet/in.h|"; /* * Machine/OS name selection pattern */ -#define apzHpux_Long_DoubleMachs (const char**)NULL +#define apzHpux_HtonlMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux_Long_DoubleSelect0[] = - "extern[ \t]long_double[ \t]strtold"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zHpux_Long_DoubleBypass0[] = - "long_double_t"; +tSCC zHpux_HtonlSelect0[] = + "#ifndef _XOPEN_SOURCE_EXTENDED\n\ +(/\\*\n\ + \\* Macros for number representation conversion\\.\n\ + \\*/\n\ +#ifndef ntohl)"; -#define HPUX_LONG_DOUBLE_TEST_CT 2 -static tTestDesc aHpux_Long_DoubleTests[] = { - { TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, }; +#define HPUX_HTONL_TEST_CT 1 +static tTestDesc aHpux_HtonlTests[] = { + { TT_EGREP, zHpux_HtonlSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux_Long_Double + * Fix Command Arguments for Hpux_Htonl */ -static const char* apzHpux_Long_DoublePatch[] = { "sed", - "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D", - "-e", "s/long_double/long double/g", +static const char* apzHpux_HtonlPatch[] = { + "format", + "#if 1\n\ +%1", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux_Maxint fix + * Description of Hpux_Long_Double fix */ -tSCC zHpux_MaxintName[] = - "hpux_maxint"; +tSCC zHpux_Long_DoubleName[] = + "hpux_long_double"; /* * File name selection pattern */ -tSCC zHpux_MaxintList[] = - "|sys/param.h|values.h|"; +tSCC zHpux_Long_DoubleList[] = + "|stdlib.h|"; /* * Machine/OS name selection pattern */ -#define apzHpux_MaxintMachs (const char**)NULL +#define apzHpux_Long_DoubleMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux_MaxintSelect0[] = - "^#[ \t]*define[ \t]+MAXINT[ \t]"; +tSCC zHpux_Long_DoubleSelect0[] = + "extern[ \t]long_double[ \t]strtold"; /* * content bypass pattern - skip fix if pattern found */ -tSCC zHpux_MaxintBypass0[] = - "^#[ \t]*ifndef[ \t]+MAXINT"; - -/* - * perform the 'test' shell command - do fix on success - */ -tSCC zHpux_MaxintTest0[] = - "-n \"`egrep '#[ \t]*define[ \t]+MAXINT[ \t]' sys/param.h`\""; +tSCC zHpux_Long_DoubleBypass0[] = + "long_double_t"; -#define HPUX_MAXINT_TEST_CT 3 -static tTestDesc aHpux_MaxintTests[] = { - { TT_TEST, zHpux_MaxintTest0, 0 /* unused */ }, - { TT_NEGREP, zHpux_MaxintBypass0, (regex_t*)NULL }, - { TT_EGREP, zHpux_MaxintSelect0, (regex_t*)NULL }, }; +#define HPUX_LONG_DOUBLE_TEST_CT 2 +static tTestDesc aHpux_Long_DoubleTests[] = { + { TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL }, + { TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux_Maxint + * Fix Command Arguments for Hpux_Long_Double */ -static const char* apzHpux_MaxintPatch[] = { - "format", - "#ifndef MAXINT\n\ -%0\n\ -#endif", - "^#[ \t]*define[ \t]+MAXINT[ \t].*", +static const char* apzHpux_Long_DoublePatch[] = { "sed", + "-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D", + "-e", "s/long_double/long double/g", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -2674,8 +2934,15 @@ tSCC zInt_Abort_Free_And_ExitList[] = tSCC zInt_Abort_Free_And_ExitSelect0[] = "int[ \t]+(abort|free|exit)[ \t]*\\("; -#define INT_ABORT_FREE_AND_EXIT_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zInt_Abort_Free_And_ExitBypass0[] = + "_CLASSIC_ANSI_TYPES"; + +#define INT_ABORT_FREE_AND_EXIT_TEST_CT 2 static tTestDesc aInt_Abort_Free_And_ExitTests[] = { + { TT_NEGREP, zInt_Abort_Free_And_ExitBypass0, (regex_t*)NULL }, { TT_EGREP, zInt_Abort_Free_And_ExitSelect0, (regex_t*)NULL }, }; /* @@ -3289,117 +3556,120 @@ extern [a-z_]+ mem.*(\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Limits_Ifndefs fix + * Description of Linux_Ia64_Ucontext fix */ -tSCC zLimits_IfndefsName[] = - "limits_ifndefs"; +tSCC zLinux_Ia64_UcontextName[] = + "linux_ia64_ucontext"; /* * File name selection pattern */ -tSCC zLimits_IfndefsList[] = - "|sys/limits.h|limits.h|"; +tSCC zLinux_Ia64_UcontextList[] = + "|sys/ucontext.h|"; /* * Machine/OS name selection pattern */ -#define apzLimits_IfndefsMachs (const char**)NULL +tSCC* apzLinux_Ia64_UcontextMachs[] = { + "ia64-*-linux*", + (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)"; +tSCC zLinux_Ia64_UcontextSelect0[] = + "\\(\\(\\(char \\*\\) &\\(\\(struct sigcontext \\*\\) 0\\)->sc_gr\\[0\\]\\) - \\(char \\*\\) 0\\)"; -#define LIMITS_IFNDEFS_TEST_CT 2 -static tTestDesc aLimits_IfndefsTests[] = { - { TT_NEGREP, zLimits_IfndefsBypass0, (regex_t*)NULL }, - { TT_EGREP, zLimits_IfndefsSelect0, (regex_t*)NULL }, }; +#define LINUX_IA64_UCONTEXT_TEST_CT 1 +static tTestDesc aLinux_Ia64_UcontextTests[] = { + { TT_EGREP, zLinux_Ia64_UcontextSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Limits_Ifndefs + * Fix Command Arguments for Linux_Ia64_Ucontext */ -static const char* apzLimits_IfndefsPatch[] = { +static const char* apzLinux_Ia64_UcontextPatch[] = { "format", - "#ifndef %1\n\ -%0\n\ -#endif", + "__builtin_offsetof (struct sigcontext, sc_gr[0])", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Lynx_Void_Int fix + * Description of Lynxos_No_Warning_In_Sys_Time_H fix */ -tSCC zLynx_Void_IntName[] = - "lynx_void_int"; +tSCC zLynxos_No_Warning_In_Sys_Time_HName[] = + "lynxos_no_warning_in_sys_time_h"; /* * File name selection pattern */ -tSCC zLynx_Void_IntList[] = - "|curses.h|"; +tSCC zLynxos_No_Warning_In_Sys_Time_HList[] = + "|sys/time.h|"; /* * Machine/OS name selection pattern */ -#define apzLynx_Void_IntMachs (const char**)NULL +#define apzLynxos_No_Warning_In_Sys_Time_HMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zLynx_Void_IntSelect0[] = - "#[ \t]*define[ \t]+void[ \t]+int[ \t]*"; +tSCC zLynxos_No_Warning_In_Sys_Time_HSelect0[] = + "#warning[ \t]+Using instead of "; -#define LYNX_VOID_INT_TEST_CT 1 -static tTestDesc aLynx_Void_IntTests[] = { - { TT_EGREP, zLynx_Void_IntSelect0, (regex_t*)NULL }, }; +#define LYNXOS_NO_WARNING_IN_SYS_TIME_H_TEST_CT 1 +static tTestDesc aLynxos_No_Warning_In_Sys_Time_HTests[] = { + { TT_EGREP, zLynxos_No_Warning_In_Sys_Time_HSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Lynx_Void_Int + * Fix Command Arguments for Lynxos_No_Warning_In_Sys_Time_H */ -static const char* apzLynx_Void_IntPatch[] = { +static const char* apzLynxos_No_Warning_In_Sys_Time_HPatch[] = { "format", "", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Lynxos_Fcntl_Proto fix + * Description of Lynxos_Missing_Putenv fix */ -tSCC zLynxos_Fcntl_ProtoName[] = - "lynxos_fcntl_proto"; +tSCC zLynxos_Missing_PutenvName[] = + "lynxos_missing_putenv"; /* * File name selection pattern */ -tSCC zLynxos_Fcntl_ProtoList[] = - "|fcntl.h|"; +tSCC zLynxos_Missing_PutenvList[] = + "|stdlib.h|"; /* * Machine/OS name selection pattern */ -#define apzLynxos_Fcntl_ProtoMachs (const char**)NULL +tSCC* apzLynxos_Missing_PutenvMachs[] = { + "*-*-lynxos*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zLynxos_Fcntl_ProtoSelect0[] = - "fcntl[ \t]*\\(int, int, int\\)"; +tSCC zLynxos_Missing_PutenvSelect0[] = + "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zLynxos_Missing_PutenvBypass0[] = + "putenv[ \\t]*\\("; -#define LYNXOS_FCNTL_PROTO_TEST_CT 1 -static tTestDesc aLynxos_Fcntl_ProtoTests[] = { - { TT_EGREP, zLynxos_Fcntl_ProtoSelect0, (regex_t*)NULL }, }; +#define LYNXOS_MISSING_PUTENV_TEST_CT 2 +static tTestDesc aLynxos_Missing_PutenvTests[] = { + { TT_NEGREP, zLynxos_Missing_PutenvBypass0, (regex_t*)NULL }, + { TT_EGREP, zLynxos_Missing_PutenvSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Lynxos_Fcntl_Proto + * Fix Command Arguments for Lynxos_Missing_Putenv */ -static const char* apzLynxos_Fcntl_ProtoPatch[] = { +static const char* apzLynxos_Missing_PutenvPatch[] = { "format", - "%1...)", - "(fcntl[ \t]*\\(int, int, )int\\)", + "%0\n\ +extern int putenv\t\t\t\t_AP((char *));", + "extern char \\*getenv[ \t]*_AP\\(\\(const char \\*\\)\\);", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -3570,44 +3840,6 @@ static const char* apzMath_Huge_Val_From_Dbl_MaxPatch[] = { "sh", "-c", /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Math_Huge_Val_Ifndef fix - */ -tSCC zMath_Huge_Val_IfndefName[] = - "math_huge_val_ifndef"; - -/* - * File name selection pattern - */ -tSCC zMath_Huge_Val_IfndefList[] = - "|math.h|math/math.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzMath_Huge_Val_IfndefMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zMath_Huge_Val_IfndefSelect0[] = - "define[ \t]+HUGE_VAL"; - -#define MATH_HUGE_VAL_IFNDEF_TEST_CT 1 -static tTestDesc aMath_Huge_Val_IfndefTests[] = { - { TT_EGREP, zMath_Huge_Val_IfndefSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Math_Huge_Val_Ifndef - */ -static const char* apzMath_Huge_Val_IfndefPatch[] = { - "format", - "#ifndef HUGE_VAL\n\ -%0\n\ -#endif", - "^[ \t]*#[ \t]*define[ \t]+HUGE_VAL[ \t].*", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Nested_Auth_Des fix */ tSCC zNested_Auth_DesName[] = @@ -4099,6 +4331,42 @@ static const char* apzPthread_Page_SizePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Pthread_Incomplete_Struct_Argument fix + */ +tSCC zPthread_Incomplete_Struct_ArgumentName[] = + "pthread_incomplete_struct_argument"; + +/* + * File name selection pattern + */ +tSCC zPthread_Incomplete_Struct_ArgumentList[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzPthread_Incomplete_Struct_ArgumentMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] = + "struct __jmp_buf_tag"; + +#define PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT 1 +static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = { + { TT_EGREP, zPthread_Incomplete_Struct_ArgumentSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Pthread_Incomplete_Struct_Argument + */ +static const char* apzPthread_Incomplete_Struct_ArgumentPatch[] = { + "format", + "%1 *%2%3", + "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) (__env)\\[1\\](.*)$", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Read_Ret_Type fix */ tSCC zRead_Ret_TypeName[] = @@ -4337,8 +4605,15 @@ tSCC zSco_MathList[] = tSCC zSco_MathSelect0[] = "inline double abs"; -#define SCO_MATH_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSco_MathBypass0[] = + "__GNUG__"; + +#define SCO_MATH_TEST_CT 2 static tTestDesc aSco_MathTests[] = { + { TT_NEGREP, zSco_MathBypass0, (regex_t*)NULL }, { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, }; /* @@ -4480,63 +4755,476 @@ static const char* apzSco_UtimePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Mutex_Init_1 fix + * Description of Solaris_Math_1 fix */ -tSCC zSolaris_Mutex_Init_1Name[] = - "solaris_mutex_init_1"; +tSCC zSolaris_Math_1Name[] = + "solaris_math_1"; /* * File name selection pattern */ -tSCC zSolaris_Mutex_Init_1List[] = - "|pthread.h|"; +tSCC zSolaris_Math_1List[] = + "|iso/math_c99.h|"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Mutex_Init_1Machs (const char**)NULL +#define apzSolaris_Math_1Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Mutex_Init_1Select0[] = - "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI"; +tSCC zSolaris_Math_1Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define SOLARIS_MUTEX_INIT_1_TEST_CT 1 -static tTestDesc aSolaris_Mutex_Init_1Tests[] = { - { TT_EGREP, zSolaris_Mutex_Init_1Select0, (regex_t*)NULL }, }; +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_1Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_1_TEST_CT 2 +static tTestDesc aSolaris_Math_1Tests[] = { + { TT_NEGREP, zSolaris_Math_1Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_1Select0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Solaris_Mutex_Init_1 + * Fix Command Arguments for Solaris_Math_1 */ -static const char* apzSolaris_Mutex_Init_1Patch[] = { "sed", - "-e", "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n\ -/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/", +static const char* apzSolaris_Math_1Patch[] = { + "format", + "#define\tHUGE_VA%1\t(__builtin_huge_va%2())", + "^#define[ \t]+HUGE_VA([LF]+)[ \t]+__builtin_huge_va([lf]+)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Solaris_Mutex_Init_2 fix + * Description of Solaris_Math_2 fix */ -tSCC zSolaris_Mutex_Init_2Name[] = - "solaris_mutex_init_2"; +tSCC zSolaris_Math_2Name[] = + "solaris_math_2"; /* * File name selection pattern */ -tSCC zSolaris_Mutex_Init_2List[] = - "|pthread.h|"; +tSCC zSolaris_Math_2List[] = + "|iso/math_c99.h|"; /* * Machine/OS name selection pattern */ -#define apzSolaris_Mutex_Init_2Machs (const char**)NULL +#define apzSolaris_Math_2Machs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zSolaris_Mutex_Init_2Select0[] = - "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; +tSCC zSolaris_Math_2Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; -#define SOLARIS_MUTEX_INIT_2_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_2Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_2_TEST_CT 2 +static tTestDesc aSolaris_Math_2Tests[] = { + { TT_NEGREP, zSolaris_Math_2Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_2 + */ +static const char* apzSolaris_Math_2Patch[] = { + "format", + "#define\tINFINITY\t(__builtin_inff())", + "^#define[ \t]+INFINITY[ \t]+__builtin_infinity", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Math_3 fix + */ +tSCC zSolaris_Math_3Name[] = + "solaris_math_3"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_3List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_3Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_3Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_3Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_3_TEST_CT 2 +static tTestDesc aSolaris_Math_3Tests[] = { + { TT_NEGREP, zSolaris_Math_3Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_3Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_3 + */ +static const char* apzSolaris_Math_3Patch[] = { + "format", + "#define\tNAN\t\t(__builtin_nanf(\"\"))", + "^#define[ \t]+NAN[ \t]+__builtin_nan", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Math_4 fix + */ +tSCC zSolaris_Math_4Name[] = + "solaris_math_4"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_4List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_4Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_4Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_4Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_4_TEST_CT 2 +static tTestDesc aSolaris_Math_4Tests[] = { + { TT_NEGREP, zSolaris_Math_4Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_4Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_4 + */ +static const char* apzSolaris_Math_4Patch[] = { + "format", + "#define\tfpclassify(x) \\\n\ + __extension__ ({ __typeof(x) __x_fp = (x); \\\n\ +\t\t isnan(__x_fp) \\\n\ +\t\t ? FP_NAN \\\n\ +\t\t : isinf(__x_fp) \\\n\ +\t\t ? FP_INFINITE \\\n\ +\t\t : isnormal(__x_fp) \\\n\ +\t\t\t ? FP_NORMAL \\\n\ +\t\t\t : __x_fp == 0.0 \\\n\ +\t\t\t ? FP_ZERO \\\n\ +\t\t\t : FP_SUBNORMAL; })", + "^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Math_5 fix + */ +tSCC zSolaris_Math_5Name[] = + "solaris_math_5"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_5List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_5Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_5Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_5Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_5_TEST_CT 2 +static tTestDesc aSolaris_Math_5Tests[] = { + { TT_NEGREP, zSolaris_Math_5Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_5Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_5 + */ +static const char* apzSolaris_Math_5Patch[] = { + "format", + "#define\tisfinite(x) \\\n\ + __extension__ ({ __typeof (x) __x_f = (x); \\\n\ +\t\t __builtin_expect(!isnan(__x_f - __x_f), 1); })", + "^#define[ \t]+isfinite\\(x\\)[ \t]+__builtin_isfinite\\(x\\)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Math_6 fix + */ +tSCC zSolaris_Math_6Name[] = + "solaris_math_6"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_6List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_6Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_6Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_6Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_6_TEST_CT 2 +static tTestDesc aSolaris_Math_6Tests[] = { + { TT_NEGREP, zSolaris_Math_6Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_6Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_6 + */ +static const char* apzSolaris_Math_6Patch[] = { + "format", + "#define\tisinf(x) \\\n\ + __extension__ ({ __typeof (x) __x_i = (x); \\\n\ +\t\t __builtin_expect(!isnan(__x_i) && !isfinite(__x_i), 0); })", + "^#define[ \t]+isinf\\(x\\)[ \t]+__builtin_isinf\\(x\\)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Math_7 fix + */ +tSCC zSolaris_Math_7Name[] = + "solaris_math_7"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_7List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_7Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_7Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_7Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_7_TEST_CT 2 +static tTestDesc aSolaris_Math_7Tests[] = { + { TT_NEGREP, zSolaris_Math_7Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_7Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_7 + */ +static const char* apzSolaris_Math_7Patch[] = { + "format", + "#define\tisnormal(x) \\\n\ + __extension__ ({ __typeof(x) __x_n = (x); \\\n\ +\t\t if (__x_n < 0.0) __x_n = -__x_n; \\\n\ +\t\t __builtin_expect(isfinite(__x_n) \\\n\ +\t\t\t\t && (sizeof(__x_n) == sizeof(float) \\\n\ +\t\t\t\t\t ? __x_n >= __FLT_MIN__ \\\n\ +\t\t\t\t\t : sizeof(__x_n) == sizeof(long double) \\\n\ +\t\t\t\t\t ? __x_n >= __LDBL_MIN__ \\\n\ +\t\t\t\t\t : __x_n >= __DBL_MIN__), 1); })", + "^#define[ \t]+isnormal\\(x\\)[ \t]+__builtin_isnormal\\(x\\)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Math_8 fix + */ +tSCC zSolaris_Math_8Name[] = + "solaris_math_8"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_8List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_8Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_8Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_8Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_8_TEST_CT 2 +static tTestDesc aSolaris_Math_8Tests[] = { + { TT_NEGREP, zSolaris_Math_8Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_8Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_8 + */ +static const char* apzSolaris_Math_8Patch[] = { + "format", + "#define\tsignbit(x)\t(sizeof(x) == sizeof(float) \\\n\ +\t\t\t ? __builtin_signbitf(x) \\\n\ +\t\t\t : sizeof(x) == sizeof(long double) \\\n\ +\t\t\t ? __builtin_signbitl(x) \\\n\ +\t\t\t : __builtin_signbit(x))", + "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Math_9 fix + */ +tSCC zSolaris_Math_9Name[] = + "solaris_math_9"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_9List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_9Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_9Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Math_9Bypass0[] = + "__GNUC__"; + +#define SOLARIS_MATH_9_TEST_CT 2 +static tTestDesc aSolaris_Math_9Tests[] = { + { TT_NEGREP, zSolaris_Math_9Bypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Math_9Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_9 + */ +static const char* apzSolaris_Math_9Patch[] = { + "format", + "#define\t%1(x, y)%2__builtin_%1(x, y)", + "^#define[ \t]+([a-z]+)\\(x, y\\)([ \t]+)\\(\\(x\\) __builtin_[a-z]+\\(y\\)\\)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Mutex_Init_1 fix + */ +tSCC zSolaris_Mutex_Init_1Name[] = + "solaris_mutex_init_1"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Mutex_Init_1List[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Mutex_Init_1Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Mutex_Init_1Select0[] = + "@\\(#\\)pthread.h[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI"; + +#define SOLARIS_MUTEX_INIT_1_TEST_CT 1 +static tTestDesc aSolaris_Mutex_Init_1Tests[] = { + { TT_EGREP, zSolaris_Mutex_Init_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Mutex_Init_1 + */ +static const char* apzSolaris_Mutex_Init_1Patch[] = { "sed", + "-e", "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n\ +/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Mutex_Init_2 fix + */ +tSCC zSolaris_Mutex_Init_2Name[] = + "solaris_mutex_init_2"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Mutex_Init_2List[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Mutex_Init_2Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Mutex_Init_2Select0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +#define SOLARIS_MUTEX_INIT_2_TEST_CT 1 static tTestDesc aSolaris_Mutex_Init_2Tests[] = { { TT_EGREP, zSolaris_Mutex_Init_2Select0, (regex_t*)NULL }, }; @@ -4612,8 +5300,15 @@ tSCC zSolaris_Stdio_TagList[] = tSCC zSolaris_Stdio_TagSelect0[] = "__cplusplus < 54321L"; -#define SOLARIS_STDIO_TAG_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Stdio_TagBypass0[] = + "__GNUC__"; + +#define SOLARIS_STDIO_TAG_TEST_CT 2 static tTestDesc aSolaris_Stdio_TagTests[] = { + { TT_NEGREP, zSolaris_Stdio_TagBypass0, (regex_t*)NULL }, { TT_EGREP, zSolaris_Stdio_TagSelect0, (regex_t*)NULL }, }; /* @@ -4763,7 +5458,9 @@ tSCC zStdio_Stdarg_HList[] = /* * Machine/OS name selection pattern */ -#define apzStdio_Stdarg_HMachs (const char**)NULL +tSCC* apzStdio_Stdarg_HMachs[] = { + "*-*-solaris2.1[0-9]*", + (const char*)NULL }; /* * content bypass pattern - skip fix if pattern found @@ -4795,11 +5492,13 @@ tSCC zStdio_Va_ListName[] = * File name selection pattern */ tSCC zStdio_Va_ListList[] = - "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|com_err.h|cps.h|curses.h|krb5.h|lc_core.h|pfmt.h|wchar.h|curses_colr/curses.h|"; + "|stdio.h|internal/stdio_core.h|internal/wchar_core.h|"; /* * Machine/OS name selection pattern */ -#define apzStdio_Va_ListMachs (const char**)NULL +tSCC* apzStdio_Va_ListMachs[] = { + "*-*-solaris2.1[0-9]*", + (const char*)NULL }; /* * content bypass pattern - skip fix if pattern found @@ -4833,6 +5532,56 @@ s@_Va_LIST@_VA_LIST@", /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Stdio_Va_List_Clients fix + */ +tSCC zStdio_Va_List_ClientsName[] = + "stdio_va_list_clients"; + +/* + * File name selection pattern + */ +tSCC zStdio_Va_List_ClientsList[] = + "|com_err.h|cps.h|curses.h|krb5.h|lc_core.h|pfmt.h|wchar.h|curses_colr/curses.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzStdio_Va_List_ClientsMachs (const char**)NULL + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zStdio_Va_List_ClientsBypass0[] = + "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list"; +tSCC zStdio_Va_List_ClientsBypass1[] = + "include |#ifdef va_start"; + +#define STDIO_VA_LIST_CLIENTS_TEST_CT 2 +static tTestDesc aStdio_Va_List_ClientsTests[] = { + { TT_NEGREP, zStdio_Va_List_ClientsBypass0, (regex_t*)NULL }, + { TT_NEGREP, zStdio_Va_List_ClientsBypass1, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Stdio_Va_List_Clients + */ +static const char* apzStdio_Va_List_ClientsPatch[] = { "sed", + "-e", "s@[ \t]va_list\\([ \t)]\\)@ __gnuc_va_list\\1@\n\ +s@(va_list)&@(__gnuc_va_list)\\&@\n\ +s@ _VA_LIST_));@ __gnuc_va_list));@\n\ +s@ __VA_LIST__));@ __gnuc_va_list));@\n\ +s@ va_list@ __not_va_list__@\n\ +s@\\*va_list@*__not_va_list__@\n\ +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@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Strict_Ansi_Not fix */ tSCC zStrict_Ansi_NotName[] = @@ -5067,8 +5816,15 @@ tSCC zSun_Auth_ProtoList[] = tSCC zSun_Auth_ProtoSelect0[] = "\\(\\*[a-z][a-z_]*\\)\\(\\)"; -#define SUN_AUTH_PROTO_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSun_Auth_ProtoBypass0[] = + "__cplusplus"; + +#define SUN_AUTH_PROTO_TEST_CT 2 static tTestDesc aSun_Auth_ProtoTests[] = { + { TT_NEGREP, zSun_Auth_ProtoBypass0, (regex_t*)NULL }, { TT_EGREP, zSun_Auth_ProtoSelect0, (regex_t*)NULL }, }; /* @@ -5174,8 +5930,16 @@ tSCC zSun_MallocList[] = * Machine/OS name selection pattern */ #define apzSun_MallocMachs (const char**)NULL -#define SUN_MALLOC_TEST_CT 0 -#define aSun_MallocTests (tTestDesc*)NULL + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSun_MallocBypass0[] = + "_CLASSIC_ANSI_TYPES"; + +#define SUN_MALLOC_TEST_CT 1 +static tTestDesc aSun_MallocTests[] = { + { TT_NEGREP, zSun_MallocBypass0, (regex_t*)NULL }, }; /* * Fix Command Arguments for Sun_Malloc @@ -5298,43 +6062,6 @@ static const char* apzSunos_StrlenPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Svr4__P fix - */ -tSCC zSvr4__PName[] = - "svr4__p"; - -/* - * File name selection pattern - */ -tSCC zSvr4__PList[] = - "|math.h|floatingpoint.h|"; -/* - * Machine/OS name selection pattern - */ -#define apzSvr4__PMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSvr4__PSelect0[] = - "^#define[ \t]+__P.*"; - -#define SVR4__P_TEST_CT 1 -static tTestDesc aSvr4__PTests[] = { - { TT_EGREP, zSvr4__PSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Svr4__P - */ -static const char* apzSvr4__PPatch[] = { - "format", - "#ifndef __P\n\ -%0\n\ -#endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Svr4_Disable_Opt fix */ tSCC zSvr4_Disable_OptName[] = @@ -5578,8 +6305,16 @@ tSCC zSysv68_StringList[] = * Machine/OS name selection pattern */ #define apzSysv68_StringMachs (const char**)NULL -#define SYSV68_STRING_TEST_CT 0 -#define aSysv68_StringTests (tTestDesc*)NULL + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSysv68_StringBypass0[] = + "_CLASSIC_ANSI_TYPES"; + +#define SYSV68_STRING_TEST_CT 1 +static tTestDesc aSysv68_StringTests[] = { + { TT_NEGREP, zSysv68_StringBypass0, (regex_t*)NULL }, }; /* * Fix Command Arguments for Sysv68_String @@ -5621,8 +6356,15 @@ tSCC zSysz_Stdlib_For_SunList[] = tSCC zSysz_Stdlib_For_SunSelect0[] = "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\("; -#define SYSZ_STDLIB_FOR_SUN_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSysz_Stdlib_For_SunBypass0[] = + "_CLASSIC_ANSI_TYPES"; + +#define SYSZ_STDLIB_FOR_SUN_TEST_CT 2 static tTestDesc aSysz_Stdlib_For_SunTests[] = { + { TT_NEGREP, zSysz_Stdlib_For_SunBypass0, (regex_t*)NULL }, { TT_EGREP, zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, }; /* @@ -6375,51 +7117,6 @@ static const char* apzUltrix_UnistdPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Undefine_Null fix - */ -tSCC zUndefine_NullName[] = - "undefine_null"; - -/* - * File name selection pattern - */ -#define zUndefine_NullList (char*)NULL -/* - * Machine/OS name selection pattern - */ -#define apzUndefine_NullMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zUndefine_NullSelect0[] = - "^#[ \t]*define[ \t]+NULL[ \t]"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zUndefine_NullBypass0[] = - "#[ \t]*(ifn|un)def[ \t]+NULL($|[ \t\r])"; - -#define UNDEFINE_NULL_TEST_CT 2 -static tTestDesc aUndefine_NullTests[] = { - { TT_NEGREP, zUndefine_NullBypass0, (regex_t*)NULL }, - { TT_EGREP, zUndefine_NullSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Undefine_Null - */ -static const char* apzUndefine_NullPatch[] = { - "format", - "#ifndef NULL\n\ -#define NULL%1\n\ -#endif\n", - "^#[ \t]*define[ \t]+NULL([^\r\n\ -]+)[\r]*\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Unicosmk_Restrict fix */ tSCC zUnicosmk_RestrictName[] = @@ -6563,8 +7260,15 @@ tSCC zVoid_NullList[] = tSCC zVoid_NullSelect0[] = "^#[ \t]*define[ \t]+NULL[ \t]+\\(\\(void[ \t]*\\*\\)0\\)"; -#define VOID_NULL_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zVoid_NullBypass0[] = + "__cplusplus"; + +#define VOID_NULL_TEST_CT 2 static tTestDesc aVoid_NullTests[] = { + { TT_NEGREP, zVoid_NullBypass0, (regex_t*)NULL }, { TT_EGREP, zVoid_NullSelect0, (regex_t*)NULL }, }; /* @@ -7018,14 +7722,16 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 199 +#define REGEX_COUNT 229 #define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 177 +#define FIX_COUNT 190 /* * Enumerate the fixes */ typedef enum { + AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX, + AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX, AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX, AAB_FD_ZERO_GNU_TYPES_H_FIXIDX, AAB_FD_ZERO_SELECTBITS_H_FIXIDX, @@ -7050,6 +7756,7 @@ typedef enum { ALPHA_PARENS_FIXIDX, ALPHA_PTHREAD_FIXIDX, ALPHA_PTHREAD_GCC_FIXIDX, + ALPHA_PTHREAD_INIT_FIXIDX, ALPHA_SBRK_FIXIDX, ALPHA_WCHAR_FIXIDX, AVOID_BOOL_DEFINE_FIXIDX, @@ -7064,12 +7771,14 @@ typedef enum { CTRL_QUOTES_DEF_FIXIDX, CTRL_QUOTES_USE_FIXIDX, CXX_UNREADY_FIXIDX, + DARWIN_GCC4_BREAKAGE_FIXIDX, DARWIN_PRIVATE_EXTERN_FIXIDX, DEC_INTERN_ASM_FIXIDX, DJGPP_WCHAR_H_FIXIDX, ECD_CURSOR_FIXIDX, EXCEPTION_STRUCTURE_FIXIDX, FREEBSD_GCC3_BREAKAGE_FIXIDX, + FREEBSD_GCC4_BREAKAGE_FIXIDX, GNU_TYPES_FIXIDX, HP_INLINE_FIXIDX, HP_SYSFILE_FIXIDX, @@ -7086,8 +7795,8 @@ typedef enum { HPUX11_VSNPRINTF_FIXIDX, HPUX8_BOGUS_INLINES_FIXIDX, HPUX_CTYPE_MACROS_FIXIDX, + HPUX_HTONL_FIXIDX, HPUX_LONG_DOUBLE_FIXIDX, - HPUX_MAXINT_FIXIDX, HPUX_SYSTIME_FIXIDX, INT_ABORT_FREE_AND_EXIT_FIXIDX, IO_QUOTES_DEF_FIXIDX, @@ -7106,14 +7815,13 @@ typedef enum { KANDR_CONCAT_FIXIDX, LIBC1_G_VA_LIST_FIXIDX, LIBC1_IFDEFD_MEMX_FIXIDX, - LIMITS_IFNDEFS_FIXIDX, - LYNX_VOID_INT_FIXIDX, - LYNXOS_FCNTL_PROTO_FIXIDX, + LINUX_IA64_UCONTEXT_FIXIDX, + LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX, + LYNXOS_MISSING_PUTENV_FIXIDX, MACHINE_ANSI_H_VA_LIST_FIXIDX, MACHINE_NAME_FIXIDX, MATH_EXCEPTION_FIXIDX, MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX, - MATH_HUGE_VAL_IFNDEF_FIXIDX, NESTED_AUTH_DES_FIXIDX, NESTED_MOTOROLA_FIXIDX, NESTED_SYS_LIMITS_FIXIDX, @@ -7127,6 +7835,7 @@ typedef enum { OSF_NAMESPACE_A_FIXIDX, OSF_NAMESPACE_C_FIXIDX, PTHREAD_PAGE_SIZE_FIXIDX, + PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_FIXIDX, READ_RET_TYPE_FIXIDX, RPC_XDR_LVALUE_CAST_A_FIXIDX, RPC_XDR_LVALUE_CAST_B_FIXIDX, @@ -7137,6 +7846,15 @@ typedef enum { SCO_REGSET_FIXIDX, SCO_STATIC_FUNC_FIXIDX, SCO_UTIME_FIXIDX, + SOLARIS_MATH_1_FIXIDX, + SOLARIS_MATH_2_FIXIDX, + SOLARIS_MATH_3_FIXIDX, + SOLARIS_MATH_4_FIXIDX, + SOLARIS_MATH_5_FIXIDX, + SOLARIS_MATH_6_FIXIDX, + SOLARIS_MATH_7_FIXIDX, + SOLARIS_MATH_8_FIXIDX, + SOLARIS_MATH_9_FIXIDX, SOLARIS_MUTEX_INIT_1_FIXIDX, SOLARIS_MUTEX_INIT_2_FIXIDX, SOLARIS_SOCKET_FIXIDX, @@ -7146,6 +7864,7 @@ typedef enum { STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, STDIO_VA_LIST_FIXIDX, + STDIO_VA_LIST_CLIENTS_FIXIDX, STRICT_ANSI_NOT_FIXIDX, STRICT_ANSI_NOT_CTD_FIXIDX, STRICT_ANSI_ONLY_FIXIDX, @@ -7158,7 +7877,6 @@ typedef enum { SUN_RUSERS_SEMI_FIXIDX, SUN_SIGNAL_FIXIDX, SUNOS_STRLEN_FIXIDX, - SVR4__P_FIXIDX, SVR4_DISABLE_OPT_FIXIDX, SVR4_GETCWD_FIXIDX, SVR4_KRNL_FIXIDX, @@ -7187,7 +7905,6 @@ typedef enum { ULTRIX_STRINGS2_FIXIDX, ULTRIX_SYS_TIME_FIXIDX, ULTRIX_UNISTD_FIXIDX, - UNDEFINE_NULL_FIXIDX, UNICOSMK_RESTRICT_FIXIDX, UW7_BYTEORDER_FIX_FIXIDX, VA_I960_MACRO_FIXIDX, @@ -7206,6 +7923,16 @@ typedef enum { } t_fixinc_idx; tFixDesc fixDescList[ FIX_COUNT ] = { + { zAab_Darwin7_9_Long_Double_FuncsName, zAab_Darwin7_9_Long_Double_FuncsList, + apzAab_Darwin7_9_Long_Double_FuncsMachs, + AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, + aAab_Darwin7_9_Long_Double_FuncsTests, apzAab_Darwin7_9_Long_Double_FuncsPatch, 0 }, + + { zAab_Darwin7_9_Long_Double_Funcs_2Name, zAab_Darwin7_9_Long_Double_Funcs_2List, + apzAab_Darwin7_9_Long_Double_Funcs_2Machs, + AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAab_Darwin7_9_Long_Double_Funcs_2Tests, apzAab_Darwin7_9_Long_Double_Funcs_2Patch, 0 }, + { zAab_Fd_Zero_Asm_Posix_Types_HName, zAab_Fd_Zero_Asm_Posix_Types_HList, apzAab_Fd_Zero_Asm_Posix_Types_HMachs, AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, @@ -7326,6 +8053,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_Pthread_GccTests, apzAlpha_Pthread_GccPatch, 0 }, + { zAlpha_Pthread_InitName, zAlpha_Pthread_InitList, + apzAlpha_Pthread_InitMachs, + ALPHA_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY, + aAlpha_Pthread_InitTests, apzAlpha_Pthread_InitPatch, 0 }, + { zAlpha_SbrkName, zAlpha_SbrkList, apzAlpha_SbrkMachs, ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7396,6 +8128,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 }, + { zDarwin_Gcc4_BreakageName, zDarwin_Gcc4_BreakageList, + apzDarwin_Gcc4_BreakageMachs, + DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Gcc4_BreakageTests, apzDarwin_Gcc4_BreakagePatch, 0 }, + { zDarwin_Private_ExternName, zDarwin_Private_ExternList, apzDarwin_Private_ExternMachs, DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7426,9 +8163,14 @@ tFixDesc fixDescList[ FIX_COUNT ] = { FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aFreebsd_Gcc3_BreakageTests, apzFreebsd_Gcc3_BreakagePatch, 0 }, + { zFreebsd_Gcc4_BreakageName, zFreebsd_Gcc4_BreakageList, + apzFreebsd_Gcc4_BreakageMachs, + FREEBSD_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aFreebsd_Gcc4_BreakageTests, apzFreebsd_Gcc4_BreakagePatch, 0 }, + { zGnu_TypesName, zGnu_TypesList, apzGnu_TypesMachs, - GNU_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + GNU_TYPES_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE, aGnu_TypesTests, apzGnu_TypesPatch, 0 }, { zHp_InlineName, zHp_InlineList, @@ -7506,16 +8248,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux_Ctype_MacrosTests, apzHpux_Ctype_MacrosPatch, 0 }, + { zHpux_HtonlName, zHpux_HtonlList, + apzHpux_HtonlMachs, + HPUX_HTONL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_HtonlTests, apzHpux_HtonlPatch, 0 }, + { zHpux_Long_DoubleName, zHpux_Long_DoubleList, apzHpux_Long_DoubleMachs, HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY, aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 }, - { zHpux_MaxintName, zHpux_MaxintList, - apzHpux_MaxintMachs, - HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux_MaxintTests, apzHpux_MaxintPatch, 0 }, - { zHpux_SystimeName, zHpux_SystimeList, apzHpux_SystimeMachs, HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7606,20 +8348,20 @@ tFixDesc fixDescList[ FIX_COUNT ] = { LIBC1_IFDEFD_MEMX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aLibc1_Ifdefd_MemxTests, apzLibc1_Ifdefd_MemxPatch, 0 }, - { zLimits_IfndefsName, zLimits_IfndefsList, - apzLimits_IfndefsMachs, - LIMITS_IFNDEFS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aLimits_IfndefsTests, apzLimits_IfndefsPatch, 0 }, + { zLinux_Ia64_UcontextName, zLinux_Ia64_UcontextList, + apzLinux_Ia64_UcontextMachs, + LINUX_IA64_UCONTEXT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aLinux_Ia64_UcontextTests, apzLinux_Ia64_UcontextPatch, 0 }, - { zLynx_Void_IntName, zLynx_Void_IntList, - apzLynx_Void_IntMachs, - LYNX_VOID_INT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aLynx_Void_IntTests, apzLynx_Void_IntPatch, 0 }, + { zLynxos_No_Warning_In_Sys_Time_HName, zLynxos_No_Warning_In_Sys_Time_HList, + apzLynxos_No_Warning_In_Sys_Time_HMachs, + LYNXOS_NO_WARNING_IN_SYS_TIME_H_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aLynxos_No_Warning_In_Sys_Time_HTests, apzLynxos_No_Warning_In_Sys_Time_HPatch, 0 }, - { zLynxos_Fcntl_ProtoName, zLynxos_Fcntl_ProtoList, - apzLynxos_Fcntl_ProtoMachs, - LYNXOS_FCNTL_PROTO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aLynxos_Fcntl_ProtoTests, apzLynxos_Fcntl_ProtoPatch, 0 }, + { zLynxos_Missing_PutenvName, zLynxos_Missing_PutenvList, + apzLynxos_Missing_PutenvMachs, + LYNXOS_MISSING_PUTENV_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aLynxos_Missing_PutenvTests, apzLynxos_Missing_PutenvPatch, 0 }, { zMachine_Ansi_H_Va_ListName, zMachine_Ansi_H_Va_ListList, apzMachine_Ansi_H_Va_ListMachs, @@ -7641,11 +8383,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { MATH_HUGE_VAL_FROM_DBL_MAX_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT, aMath_Huge_Val_From_Dbl_MaxTests, apzMath_Huge_Val_From_Dbl_MaxPatch, 0 }, - { zMath_Huge_Val_IfndefName, zMath_Huge_Val_IfndefList, - apzMath_Huge_Val_IfndefMachs, - MATH_HUGE_VAL_IFNDEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aMath_Huge_Val_IfndefTests, apzMath_Huge_Val_IfndefPatch, 0 }, - { zNested_Auth_DesName, zNested_Auth_DesList, apzNested_Auth_DesMachs, NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7711,6 +8448,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aPthread_Page_SizeTests, apzPthread_Page_SizePatch, 0 }, + { zPthread_Incomplete_Struct_ArgumentName, zPthread_Incomplete_Struct_ArgumentList, + apzPthread_Incomplete_Struct_ArgumentMachs, + PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aPthread_Incomplete_Struct_ArgumentTests, apzPthread_Incomplete_Struct_ArgumentPatch, 0 }, + { zRead_Ret_TypeName, zRead_Ret_TypeList, apzRead_Ret_TypeMachs, READ_RET_TYPE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7761,6 +8503,51 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SCO_UTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSco_UtimeTests, apzSco_UtimePatch, 0 }, + { zSolaris_Math_1Name, zSolaris_Math_1List, + apzSolaris_Math_1Machs, + SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_1Tests, apzSolaris_Math_1Patch, 0 }, + + { zSolaris_Math_2Name, zSolaris_Math_2List, + apzSolaris_Math_2Machs, + SOLARIS_MATH_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_2Tests, apzSolaris_Math_2Patch, 0 }, + + { zSolaris_Math_3Name, zSolaris_Math_3List, + apzSolaris_Math_3Machs, + SOLARIS_MATH_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_3Tests, apzSolaris_Math_3Patch, 0 }, + + { zSolaris_Math_4Name, zSolaris_Math_4List, + apzSolaris_Math_4Machs, + SOLARIS_MATH_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_4Tests, apzSolaris_Math_4Patch, 0 }, + + { zSolaris_Math_5Name, zSolaris_Math_5List, + apzSolaris_Math_5Machs, + SOLARIS_MATH_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_5Tests, apzSolaris_Math_5Patch, 0 }, + + { zSolaris_Math_6Name, zSolaris_Math_6List, + apzSolaris_Math_6Machs, + SOLARIS_MATH_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_6Tests, apzSolaris_Math_6Patch, 0 }, + + { zSolaris_Math_7Name, zSolaris_Math_7List, + apzSolaris_Math_7Machs, + SOLARIS_MATH_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_7Tests, apzSolaris_Math_7Patch, 0 }, + + { zSolaris_Math_8Name, zSolaris_Math_8List, + apzSolaris_Math_8Machs, + SOLARIS_MATH_8_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_8Tests, apzSolaris_Math_8Patch, 0 }, + + { zSolaris_Math_9Name, zSolaris_Math_9List, + apzSolaris_Math_9Machs, + SOLARIS_MATH_9_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_9Tests, apzSolaris_Math_9Patch, 0 }, + { zSolaris_Mutex_Init_1Name, zSolaris_Mutex_Init_1List, apzSolaris_Mutex_Init_1Machs, SOLARIS_MUTEX_INIT_1_TEST_CT, FD_MACH_ONLY, @@ -7798,14 +8585,19 @@ tFixDesc fixDescList[ FIX_COUNT ] = { { zStdio_Stdarg_HName, zStdio_Stdarg_HList, apzStdio_Stdarg_HMachs, - STDIO_STDARG_H_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + STDIO_STDARG_H_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE, aStdio_Stdarg_HTests, apzStdio_Stdarg_HPatch, 0 }, { zStdio_Va_ListName, zStdio_Va_ListList, apzStdio_Va_ListMachs, - STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY, + STDIO_VA_LIST_TEST_CT, FD_MACH_IFNOT, aStdio_Va_ListTests, apzStdio_Va_ListPatch, 0 }, + { zStdio_Va_List_ClientsName, zStdio_Va_List_ClientsList, + apzStdio_Va_List_ClientsMachs, + STDIO_VA_LIST_CLIENTS_TEST_CT, FD_MACH_ONLY, + aStdio_Va_List_ClientsTests, apzStdio_Va_List_ClientsPatch, 0 }, + { zStrict_Ansi_NotName, zStrict_Ansi_NotList, apzStrict_Ansi_NotMachs, STRICT_ANSI_NOT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7866,11 +8658,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SUNOS_STRLEN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSunos_StrlenTests, apzSunos_StrlenPatch, 0 }, - { zSvr4__PName, zSvr4__PList, - apzSvr4__PMachs, - SVR4__P_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aSvr4__PTests, apzSvr4__PPatch, 0 }, - { zSvr4_Disable_OptName, zSvr4_Disable_OptList, apzSvr4_Disable_OptMachs, SVR4_DISABLE_OPT_TEST_CT, FD_MACH_ONLY, @@ -8011,11 +8798,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ULTRIX_UNISTD_TEST_CT, FD_MACH_ONLY, aUltrix_UnistdTests, apzUltrix_UnistdPatch, 0 }, - { zUndefine_NullName, zUndefine_NullList, - apzUndefine_NullMachs, - UNDEFINE_NULL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aUndefine_NullTests, apzUndefine_NullPatch, 0 }, - { zUnicosmk_RestrictName, zUnicosmk_RestrictList, apzUnicosmk_RestrictMachs, UNICOSMK_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,