diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 54 |
1 files changed, 49 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 88ad8434020..f1552cc1741 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 Friday May 7, 2010 at 02:41:29 PM MEST + * It has been AutoGen-ed Sunday June 27, 2010 at 12:52:26 PM MEST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Fri May 7 14:41:29 MEST 2010 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun 27 12:52:26 MEST 2010 * * 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 208 fixup descriptions. * * See README for more information. * @@ -6229,6 +6229,44 @@ extern \"C\" {\\\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Cond_Init fix + */ +tSCC zSolaris_Cond_InitName[] = + "solaris_cond_init"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Cond_InitList[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Cond_InitMachs[] = { + "*-*-solaris2.8", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Cond_InitSelect0[] = + "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + +#define SOLARIS_COND_INIT_TEST_CT 1 +static tTestDesc aSolaris_Cond_InitTests[] = { + { TT_EGREP, zSolaris_Cond_InitSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Cond_Init + */ +static const char* apzSolaris_Cond_InitPatch[] = { + "format", + "%1, 0x4356%2", + "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Solaris_Math_1 fix */ tSCC zSolaris_Math_1Name[] = @@ -8432,9 +8470,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 246 +#define REGEX_COUNT 247 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 207 +#define FIX_COUNT 208 /* * Enumerate the fixes @@ -8593,6 +8631,7 @@ typedef enum { SOLARIS___RESTRICT_FIXIDX, SOLARIS_COMPLEX_FIXIDX, SOLARIS_COMPLEX_CXX_FIXIDX, + SOLARIS_COND_INIT_FIXIDX, SOLARIS_MATH_1_FIXIDX, SOLARIS_MATH_2_FIXIDX, SOLARIS_MATH_3_FIXIDX, @@ -9415,6 +9454,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY, aSolaris_Complex_CxxTests, apzSolaris_Complex_CxxPatch, 0 }, + { zSolaris_Cond_InitName, zSolaris_Cond_InitList, + apzSolaris_Cond_InitMachs, + SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Cond_InitTests, apzSolaris_Cond_InitPatch, 0 }, + { zSolaris_Math_1Name, zSolaris_Math_1List, apzSolaris_Math_1Machs, SOLARIS_MATH_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |