diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 477 |
1 files changed, 472 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 7d9e7c8..9b39019 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 May 7, 2005 at 07:01:32 PM UTC + * It has been AutoGen-ed Thursday May 19, 2005 at 08:56:10 AM CEST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Sat May 7 19:01:33 UTC 2005 +/* DO NOT CVS-MERGE THIS FILE, EITHER Thu May 19 08:56:10 CEST 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 179 fixup descriptions. + * This file contains 188 fixup descriptions. * * See README for more information. * @@ -4607,6 +4607,419 @@ static const char* apzSco_UtimePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Math_1 fix + */ +tSCC zSolaris_Math_1Name[] = + "solaris_math_1"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_1List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_1Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_1Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * 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_Math_1 + */ +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_Math_2 fix + */ +tSCC zSolaris_Math_2Name[] = + "solaris_math_2"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_2List[] = + "|iso/math_c99.h|"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_2Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_2Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +/* + * 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[] = @@ -7161,9 +7574,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 209 +#define REGEX_COUNT 227 #define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 179 +#define FIX_COUNT 188 /* * Enumerate the fixes @@ -7283,6 +7696,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, @@ -7921,6 +8343,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, |