X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=fixincludes%2Ffixincl.x;h=9da75308834ad2ded685e9e1ddd3fab057f54847;hb=a8806066dee401546db9f215665d8ddc8c63e2db;hp=f97bdb63d8577c7309fa8bc66e2a65a51e5748b3;hpb=560b9c9b0713f5e7019e2bf994be9f488b5df773;p=pf3gnuchains%2Fgcc-fork.git diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index f97bdb63d85..9da75308834 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 Sunday February 4, 2007 at 07:08:33 AM PST + * It has been AutoGen-ed Wednesday February 20, 2008 at 05:10:00 AM CET * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Feb 4 07:08:34 PST 2007 +/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Feb 20 05:10:00 CET 2008 * * 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 207 fixup descriptions. + * This file contains 212 fixup descriptions. * * See README for more information. * @@ -1880,6 +1880,51 @@ extern \"C\" {\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Externc fix + */ +tSCC zDarwin_ExterncName[] = + "darwin_externc"; + +/* + * File name selection pattern + */ +tSCC zDarwin_ExterncList[] = + "mach-o/swap.h\0mach/mach_time.h\0mach/mach_traps.h\0mach/message.h\0mach/mig.h\0mach/semaphore.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_ExterncMachs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zDarwin_ExterncBypass0[] = + "extern \"C\""; +tSCC zDarwin_ExterncBypass1[] = + "__BEGIN_DECLS"; + +#define DARWIN_EXTERNC_TEST_CT 2 +static tTestDesc aDarwin_ExterncTests[] = { + { TT_NEGREP, zDarwin_ExterncBypass0, (regex_t*)NULL }, + { TT_NEGREP, zDarwin_ExterncBypass1, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Externc + */ +static const char* apzDarwin_ExterncPatch[] = { + "wrap", + "#ifdef __cplusplus\n\ +extern \"C\" {\n\ +#endif\n", + "#ifdef __cplusplus\n\ +}\n\ +#endif\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Darwin_Gcc4_Breakage fix */ tSCC zDarwin_Gcc4_BreakageName[] = @@ -2215,7 +2260,44 @@ static tTestDesc aGlibc_C99_Inline_1Tests[] = { */ static const char* apzGlibc_C99_Inline_1Patch[] = { "format", - "%0 && __STDC_VERSION__ < 199901L", + "%0 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Glibc_C99_Inline_1a fix + */ +tSCC zGlibc_C99_Inline_1aName[] = + "glibc_c99_inline_1a"; + +/* + * File name selection pattern + */ +tSCC zGlibc_C99_Inline_1aList[] = + "features.h\0*/features.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzGlibc_C99_Inline_1aMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zGlibc_C99_Inline_1aSelect0[] = + "(\\) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__)\n\ +(#[ \t]*define[ \t]*__USE_EXTERN_INLINES[ \t]*1)"; + +#define GLIBC_C99_INLINE_1A_TEST_CT 1 +static tTestDesc aGlibc_C99_Inline_1aTests[] = { + { TT_EGREP, zGlibc_C99_Inline_1aSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Glibc_C99_Inline_1a + */ +static const char* apzGlibc_C99_Inline_1aPatch[] = { + "format", + "%1 && (defined __extern_inline || defined __GNUC_GNU_INLINE__)\n\ +%2", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -2249,15 +2331,15 @@ static tTestDesc aGlibc_C99_Inline_2Tests[] = { * Fix Command Arguments for Glibc_C99_Inline_2 */ static const char* apzGlibc_C99_Inline_2Patch[] = { "sed", - "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#if __STDC_VERSION__ < 199901L\\\n\ + "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ extern\\\n\ #endif\\\n\ __inline__ int \\1/", - "-e", "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/#if __STDC_VERSION__ < 199901L\\\n\ + "-e", "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ extern\\\n\ #endif\\\n\ __inline__ int __REDIRECT\\1 (\\2/", - "-e", "s/^extern __inline__ int/#if __STDC_VERSION__ < 199901L\\\n\ + "-e", "s/^extern __inline__ int/#ifdef __GNUC_GNU_INLINE__\\\n\ extern\\\n\ #endif\\\n\ __inline__ int/", @@ -2281,21 +2363,28 @@ tSCC zGlibc_C99_Inline_3List[] = #define apzGlibc_C99_Inline_3Machs (const char**)NULL /* + * content selection pattern - do fix if pattern found + */ +tSCC zGlibc_C99_Inline_3Select0[] = + "extern __inline"; + +/* * content bypass pattern - skip fix if pattern found */ tSCC zGlibc_C99_Inline_3Bypass0[] = - "__STDC_VERSION__"; + "__extern_inline|__GNU_STDC_INLINE__"; -#define GLIBC_C99_INLINE_3_TEST_CT 1 +#define GLIBC_C99_INLINE_3_TEST_CT 2 static tTestDesc aGlibc_C99_Inline_3Tests[] = { - { TT_NEGREP, zGlibc_C99_Inline_3Bypass0, (regex_t*)NULL }, }; + { TT_NEGREP, zGlibc_C99_Inline_3Bypass0, (regex_t*)NULL }, + { TT_EGREP, zGlibc_C99_Inline_3Select0, (regex_t*)NULL }, }; /* * Fix Command Arguments for Glibc_C99_Inline_3 */ static const char* apzGlibc_C99_Inline_3Patch[] = { "format", - "# if defined(__cplusplus) || __STDC_VERSION__ >= 19901L", + "# if defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)", "^# ifdef __cplusplus$", (char*)NULL }; @@ -2310,7 +2399,7 @@ tSCC zGlibc_C99_Inline_4Name[] = * File name selection pattern */ tSCC zGlibc_C99_Inline_4List[] = - "sys/sysmacros.h\0*/sys/sysmacros.h\0"; + "sys/sysmacros.h\0*/sys/sysmacros.h\0wchar.h\0*/wchar.h\0"; /* * Machine/OS name selection pattern */ @@ -2320,13 +2409,13 @@ tSCC zGlibc_C99_Inline_4List[] = * content selection pattern - do fix if pattern found */ tSCC zGlibc_C99_Inline_4Select0[] = - " extern "; + "(^| )extern __inline"; /* * content bypass pattern - skip fix if pattern found */ tSCC zGlibc_C99_Inline_4Bypass0[] = - "__STDC_VERSION__"; + "__extern_inline|__gnu_inline__"; #define GLIBC_C99_INLINE_4_TEST_CT 2 static tTestDesc aGlibc_C99_Inline_4Tests[] = { @@ -2338,10 +2427,7 @@ static tTestDesc aGlibc_C99_Inline_4Tests[] = { */ static const char* apzGlibc_C99_Inline_4Patch[] = { "format", - "\n\ -#if __STDC_VERSION__ < 19901L\n\ -extern\n\ -#endif\n", + "%0 __attribute__ ((__gnu_inline__))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -2579,6 +2665,50 @@ static const char* apzHpux11_Cpp_Pow_InlinePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hppa_Hpux_Fp_Macros fix + */ +tSCC zHppa_Hpux_Fp_MacrosName[] = + "hppa_hpux_fp_macros"; + +/* + * File name selection pattern + */ +tSCC zHppa_Hpux_Fp_MacrosList[] = + "math.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHppa_Hpux_Fp_MacrosMachs[] = { + "hppa*-hp-hpux11*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHppa_Hpux_Fp_MacrosSelect0[] = + "#[ \t]*define[ \t]*FP_NORMAL.*\n\ +#[ \t]*define[ \t]*FP_ZERO.*\n\ +#[ \t]*define[ \t]*FP_INFINITE.*\n\ +#[ \t]*define[ \t]*FP_SUBNORMAL.*\n\ +#[ \t]*define[ \t]*FP_NAN.*\n"; + +#define HPPA_HPUX_FP_MACROS_TEST_CT 1 +static tTestDesc aHppa_Hpux_Fp_MacrosTests[] = { + { TT_EGREP, zHppa_Hpux_Fp_MacrosSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hppa_Hpux_Fp_Macros + */ +static const char* apzHppa_Hpux_Fp_MacrosPatch[] = { + "format", + "#endif /* _INCLUDE_HPUX_SOURCE */\n\n\ +#if defined(_INCLUDE_HPUX_SOURCE) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))\n\ +%0#endif\n\n\ +#ifdef _INCLUDE_HPUX_SOURCE\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux10_Ctype_Declarations1 fix */ tSCC zHpux10_Ctype_Declarations1Name[] = @@ -3323,6 +3453,43 @@ extern \"C\" {\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux11_Pthread_Const fix + */ +tSCC zHpux11_Pthread_ConstName[] = + "hpux11_pthread_const"; + +/* + * File name selection pattern + */ +tSCC zHpux11_Pthread_ConstList[] = + "sys/pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux11_Pthread_ConstMachs[] = { + "*-hp-hpux11.[0-3]*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux11_Pthread_ConstSelect0[] = + "^#define[ \t]*__POINTER_SET[ \t]*\\(\\(void \\*\\) 1LL\\)"; + +#define HPUX11_PTHREAD_CONST_TEST_CT 1 +static tTestDesc aHpux11_Pthread_ConstTests[] = { + { TT_EGREP, zHpux11_Pthread_ConstSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux11_Pthread_Const + */ +static const char* apzHpux11_Pthread_ConstPatch[] = { + "format", + "#define __POINTER_SET\t\t((void *) 1L)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux_Pthread_Initializers fix */ tSCC zHpux_Pthread_InitializersName[] = @@ -3868,6 +4035,45 @@ typedef int socklen_t;\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Irix_Stdint_C99 fix + */ +tSCC zIrix_Stdint_C99Name[] = + "irix_stdint_c99"; + +/* + * File name selection pattern + */ +tSCC zIrix_Stdint_C99List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_Stdint_C99Machs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix_Stdint_C99Select0[] = + "(#ifndef __c99\n\ +)(#error This header file is to be used only for c99 mode compilations)"; + +#define IRIX_STDINT_C99_TEST_CT 1 +static tTestDesc aIrix_Stdint_C99Tests[] = { + { TT_EGREP, zIrix_Stdint_C99Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix_Stdint_C99 + */ +static const char* apzIrix_Stdint_C99Patch[] = { + "format", + "#if 0\n\ +%2", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Irix_Stdio_Va_List fix */ tSCC zIrix_Stdio_Va_ListName[] = @@ -4523,6 +4729,88 @@ static const char* apzNested_Sys_LimitsPatch[] = { "sed", /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Netbsd_C99_Inline_1 fix + */ +tSCC zNetbsd_C99_Inline_1Name[] = + "netbsd_c99_inline_1"; + +/* + * File name selection pattern + */ +tSCC zNetbsd_C99_Inline_1List[] = + "signal.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzNetbsd_C99_Inline_1Machs[] = { + "*-*-netbsd*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zNetbsd_C99_Inline_1Select0[] = + "extern __inline int"; + +#define NETBSD_C99_INLINE_1_TEST_CT 1 +static tTestDesc aNetbsd_C99_Inline_1Tests[] = { + { TT_EGREP, zNetbsd_C99_Inline_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Netbsd_C99_Inline_1 + */ +static const char* apzNetbsd_C99_Inline_1Patch[] = { + "format", + "extern\n\ +#ifdef __GNUC_STDC_INLINE__\n\ +__attribute__((__gnu_inline__))\n\ +#endif\n\ +__inline int", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Netbsd_C99_Inline_2 fix + */ +tSCC zNetbsd_C99_Inline_2Name[] = + "netbsd_c99_inline_2"; + +/* + * File name selection pattern + */ +tSCC zNetbsd_C99_Inline_2List[] = + "signal.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzNetbsd_C99_Inline_2Machs[] = { + "*-*-netbsd*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zNetbsd_C99_Inline_2Select0[] = + "#define _SIGINLINE extern __inline"; + +#define NETBSD_C99_INLINE_2_TEST_CT 1 +static tTestDesc aNetbsd_C99_Inline_2Tests[] = { + { TT_EGREP, zNetbsd_C99_Inline_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Netbsd_C99_Inline_2 + */ +static const char* apzNetbsd_C99_Inline_2Patch[] = { + "format", + "#ifdef __GNUC_STDC_INLINE__\n\ +#define _SIGINLINE extern __attribute__((__gnu_inline__)) __inline\n\ +#else\n\ +%0\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Netbsd_Extra_Semicolon fix */ tSCC zNetbsd_Extra_SemicolonName[] = @@ -5498,7 +5786,7 @@ static tTestDesc aSolaris_Math_4Tests[] = { static const char* apzSolaris_Math_4Patch[] = { "format", "#define\tfpclassify(x) \\\n\ - __extension__ ({ __typeof(x) __x_fp = (x); \\\n\ + __extension__ ({ const __typeof(x) __x_fp = (x); \\\n\ \t\t isnan(__x_fp) \\\n\ \t\t ? FP_NAN \\\n\ \t\t : isinf(__x_fp) \\\n\ @@ -5513,147 +5801,6 @@ static const char* apzSolaris_Math_4Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * 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\0"; -/* - * 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\0"; -/* - * 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\0"; -/* - * 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[] = @@ -5744,6 +5891,45 @@ static const char* apzSolaris_Math_9Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Math_10 fix + */ +tSCC zSolaris_Math_10Name[] = + "solaris_math_10"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Math_10List[] = + "iso/math_c99.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Math_10Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Math_10Select0[] = + "@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +#define SOLARIS_MATH_10_TEST_CT 1 +static tTestDesc aSolaris_Math_10Tests[] = { + { TT_EGREP, zSolaris_Math_10Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Math_10 + */ +static const char* apzSolaris_Math_10Patch[] = { + "format", + "#define\tisinf(x) __builtin_isinf(x)", + "^#define[ \t]+isinf\\(x\\)[ \t]+__extension__\\([ \t]*\\\\\n\ +[ \t]*\\{[ \t]*__typeof\\(x\\)[ \t]*__x_i[ \t]*=[ \t]*\\(x\\);[ \t]*\\\\\n\ +[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*INFINITY[ \t]*\\|\\|[ \t]*\\\\\n\ +[ \t]*__x_i[ \t]*==[ \t]*\\(__typeof\\(__x_i\\)\\)[ \t]*\\(-INFINITY\\);[ \t]*\\}\\)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Solaris_Mutex_Init_1 fix */ tSCC zSolaris_Mutex_Init_1Name[] = @@ -8425,9 +8611,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 251 +#define REGEX_COUNT 255 #define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 207 +#define FIX_COUNT 212 /* * Enumerate the fixes @@ -8475,6 +8661,7 @@ typedef enum { CTRL_QUOTES_DEF_FIXIDX, CTRL_QUOTES_USE_FIXIDX, CXX_UNREADY_FIXIDX, + DARWIN_EXTERNC_FIXIDX, DARWIN_GCC4_BREAKAGE_FIXIDX, DARWIN_PRIVATE_EXTERN_FIXIDX, DEC_INTERN_ASM_FIXIDX, @@ -8484,6 +8671,7 @@ typedef enum { FREEBSD_GCC3_BREAKAGE_FIXIDX, FREEBSD_GCC4_BREAKAGE_FIXIDX, GLIBC_C99_INLINE_1_FIXIDX, + GLIBC_C99_INLINE_1A_FIXIDX, GLIBC_C99_INLINE_2_FIXIDX, GLIBC_C99_INLINE_3_FIXIDX, GLIBC_C99_INLINE_4_FIXIDX, @@ -8493,6 +8681,7 @@ typedef enum { HP_SYSFILE_FIXIDX, HPUX10_CPP_POW_INLINE_FIXIDX, HPUX11_CPP_POW_INLINE_FIXIDX, + HPPA_HPUX_FP_MACROS_FIXIDX, HPUX10_CTYPE_DECLARATIONS1_FIXIDX, HPUX10_CTYPE_DECLARATIONS2_FIXIDX, HPUX10_STDIO_DECLARATIONS_FIXIDX, @@ -8511,6 +8700,7 @@ typedef enum { HPUX11_EXTERN_SENDFILE_FIXIDX, HPUX11_EXTERN_SENDPATH_FIXIDX, HPUX_EXTERN_ERRNO_FIXIDX, + HPUX11_PTHREAD_CONST_FIXIDX, HPUX_PTHREAD_INITIALIZERS_FIXIDX, HUGE_VAL_HEX_FIXIDX, HUGE_VALF_HEX_FIXIDX, @@ -8525,6 +8715,7 @@ typedef enum { IRIX_ASM_APOSTROPHE_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, IRIX_SOCKLEN_T_FIXIDX, + IRIX_STDINT_C99_FIXIDX, IRIX_STDIO_VA_LIST_FIXIDX, IRIX_WCSFTIME_FIXIDX, ISC_FMOD_FIXIDX, @@ -8542,6 +8733,8 @@ typedef enum { NESTED_AUTH_DES_FIXIDX, NESTED_MOTOROLA_FIXIDX, NESTED_SYS_LIMITS_FIXIDX, + NETBSD_C99_INLINE_1_FIXIDX, + NETBSD_C99_INLINE_2_FIXIDX, NETBSD_EXTRA_SEMICOLON_FIXIDX, NEXT_MATH_PREFIX_FIXIDX, NEXT_TEMPLATE_FIXIDX, @@ -8567,11 +8760,9 @@ typedef enum { 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_MATH_10_FIXIDX, SOLARIS_MUTEX_INIT_1_FIXIDX, SOLARIS_MUTEX_INIT_2_FIXIDX, SOLARIS_RWLOCK_INIT_1_FIXIDX, @@ -8853,6 +9044,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 }, + { zDarwin_ExterncName, zDarwin_ExterncList, + apzDarwin_ExterncMachs, + DARWIN_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_ExterncTests, apzDarwin_ExterncPatch, 0 }, + { zDarwin_Gcc4_BreakageName, zDarwin_Gcc4_BreakageList, apzDarwin_Gcc4_BreakageMachs, DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8898,6 +9094,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { GLIBC_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aGlibc_C99_Inline_1Tests, apzGlibc_C99_Inline_1Patch, 0 }, + { zGlibc_C99_Inline_1aName, zGlibc_C99_Inline_1aList, + apzGlibc_C99_Inline_1aMachs, + GLIBC_C99_INLINE_1A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_C99_Inline_1aTests, apzGlibc_C99_Inline_1aPatch, 0 }, + { zGlibc_C99_Inline_2Name, zGlibc_C99_Inline_2List, apzGlibc_C99_Inline_2Machs, GLIBC_C99_INLINE_2_TEST_CT, FD_MACH_ONLY, @@ -8943,6 +9144,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_Cpp_Pow_InlineTests, apzHpux11_Cpp_Pow_InlinePatch, 0 }, + { zHppa_Hpux_Fp_MacrosName, zHppa_Hpux_Fp_MacrosList, + apzHppa_Hpux_Fp_MacrosMachs, + HPPA_HPUX_FP_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHppa_Hpux_Fp_MacrosTests, apzHppa_Hpux_Fp_MacrosPatch, 0 }, + { zHpux10_Ctype_Declarations1Name, zHpux10_Ctype_Declarations1List, apzHpux10_Ctype_Declarations1Machs, HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9033,6 +9239,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX_EXTERN_ERRNO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux_Extern_ErrnoTests, apzHpux_Extern_ErrnoPatch, 0 }, + { zHpux11_Pthread_ConstName, zHpux11_Pthread_ConstList, + apzHpux11_Pthread_ConstMachs, + HPUX11_PTHREAD_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_Pthread_ConstTests, apzHpux11_Pthread_ConstPatch, 0 }, + { zHpux_Pthread_InitializersName, zHpux_Pthread_InitializersList, apzHpux_Pthread_InitializersMachs, HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY, @@ -9103,6 +9314,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Socklen_TTests, apzIrix_Socklen_TPatch, 0 }, + { zIrix_Stdint_C99Name, zIrix_Stdint_C99List, + apzIrix_Stdint_C99Machs, + IRIX_STDINT_C99_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix_Stdint_C99Tests, apzIrix_Stdint_C99Patch, 0 }, + { zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList, apzIrix_Stdio_Va_ListMachs, IRIX_STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9188,6 +9404,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = { NESTED_SYS_LIMITS_TEST_CT, FD_MACH_ONLY, aNested_Sys_LimitsTests, apzNested_Sys_LimitsPatch, 0 }, + { zNetbsd_C99_Inline_1Name, zNetbsd_C99_Inline_1List, + apzNetbsd_C99_Inline_1Machs, + NETBSD_C99_INLINE_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aNetbsd_C99_Inline_1Tests, apzNetbsd_C99_Inline_1Patch, 0 }, + + { zNetbsd_C99_Inline_2Name, zNetbsd_C99_Inline_2List, + apzNetbsd_C99_Inline_2Machs, + NETBSD_C99_INLINE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aNetbsd_C99_Inline_2Tests, apzNetbsd_C99_Inline_2Patch, 0 }, + { zNetbsd_Extra_SemicolonName, zNetbsd_Extra_SemicolonList, apzNetbsd_Extra_SemicolonMachs, NETBSD_EXTRA_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9313,21 +9539,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = { 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, @@ -9338,6 +9549,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_MATH_9_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Math_9Tests, apzSolaris_Math_9Patch, 0 }, + { zSolaris_Math_10Name, zSolaris_Math_10List, + apzSolaris_Math_10Machs, + SOLARIS_MATH_10_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Math_10Tests, apzSolaris_Math_10Patch, 0 }, + { zSolaris_Mutex_Init_1Name, zSolaris_Mutex_Init_1List, apzSolaris_Mutex_Init_1Machs, SOLARIS_MUTEX_INIT_1_TEST_CT, FD_MACH_ONLY,