Mercurial > hg > CbC > CbC_gcc
diff fixincludes/fixincl.x @ 67:f6334be47118
update gcc from gcc-4.6-20100522 to gcc-4.6-20110318
author | nobuyasu <dimolto@cr.ie.u-ryukyu.ac.jp> |
---|---|
date | Tue, 22 Mar 2011 17:18:12 +0900 |
parents | b7f97abdc517 |
children | 04ced10e8804 |
line wrap: on
line diff
--- a/fixincludes/fixincl.x Tue May 25 18:58:51 2010 +0900 +++ b/fixincludes/fixincl.x Tue Mar 22 17:18:12 2011 +0900 @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Wednesday April 7, 2010 at 05:11:50 PM MEST + * It has been AutoGen-ed Monday November 8, 2010 at 08:33:47 PM MET * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Apr 7 17:11:50 MEST 2010 +/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Nov 8 20:33:47 MET 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 205 fixup descriptions. + * This file contains 210 fixup descriptions. * * See README for more information. * @@ -3618,7 +3618,7 @@ * content selection pattern - do fix if pattern found */ tSCC zHpux_HtonlSelect0[] = - "#ifndef _XOPEN_SOURCE_EXTENDED\n\ + "#ifndef _XOPEN_SOURCE_EXTENDED[ \t]*\n\ (/\\*\n\ \\* Macros for number representation conversion\\.\n\ \\*/\n\ @@ -4665,6 +4665,43 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Irix_Pthread_Init fix + */ +tSCC zIrix_Pthread_InitName[] = + "irix_pthread_init"; + +/* + * File name selection pattern + */ +tSCC zIrix_Pthread_InitList[] = + "pthread.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_Pthread_InitMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix_Pthread_InitSelect0[] = + "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})"; + +#define IRIX_PTHREAD_INIT_TEST_CT 1 +static tTestDesc aIrix_Pthread_InitTests[] = { + { TT_EGREP, zIrix_Pthread_InitSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix_Pthread_Init + */ +static const char* apzIrix_Pthread_InitPatch[] = { + "format", + "%1{ %2 }", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Irix_Socklen_T fix */ tSCC zIrix_Socklen_TName[] = @@ -6116,6 +6153,47 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris___Restrict fix + */ +tSCC zSolaris___RestrictName[] = + "solaris___restrict"; + +/* + * File name selection pattern + */ +tSCC zSolaris___RestrictList[] = + "sys/feature_tests.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris___RestrictMachs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris___RestrictSelect0[] = + "#define[ \t]*_RESTRICT_KYWD[ \t]*restrict"; + +#define SOLARIS___RESTRICT_TEST_CT 1 +static tTestDesc aSolaris___RestrictTests[] = { + { TT_EGREP, zSolaris___RestrictSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris___Restrict + */ +static const char* apzSolaris___RestrictPatch[] = { + "format", + "#ifdef __cplusplus\n\ +#define\t_RESTRICT_KYWD\t__restrict\n\ +#else\n\ +%0\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Solaris_Complex fix */ tSCC zSolaris_ComplexName[] = @@ -6155,6 +6233,77 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Complex_Cxx fix + */ +tSCC zSolaris_Complex_CxxName[] = + "solaris_complex_cxx"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Complex_CxxList[] = + "complex.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Complex_CxxMachs[] = { + "*-*-solaris2.*", + (const char*)NULL }; +#define SOLARIS_COMPLEX_CXX_TEST_CT 0 +#define aSolaris_Complex_CxxTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Solaris_Complex_Cxx + */ +static const char* apzSolaris_Complex_CxxPatch[] = { sed_cmd_z, + "-e", "/#if[ \t]*!defined(__cplusplus)/c#ifdef\t__cplusplus\\\n\ +extern \"C\" {\\\n\ +#endif", + "-e", "/#endif[ \t]*\\/\\* !defined(__cplusplus) \\*\\//c#ifdef\t__cplusplus\\\n\ +}\\\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * 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[] = @@ -6861,6 +7010,51 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Sys_Va_List fix + */ +tSCC zSolaris_Sys_Va_ListName[] = + "solaris_sys_va_list"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Sys_Va_ListList[] = + "sys/va_list.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Sys_Va_ListMachs[] = { + "*-*-solaris2.[89]", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Sys_Va_ListSelect0[] = + "#if.*__STDC__.*\n\ +typedef void \\*__va_list;\n\ +#else\n\ +typedef char \\*__va_list;\n\ +#endif"; + +#define SOLARIS_SYS_VA_LIST_TEST_CT 1 +static tTestDesc aSolaris_Sys_Va_ListTests[] = { + { TT_EGREP, zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Sys_Va_List + */ +static const char* apzSolaris_Sys_Va_ListPatch[] = { + "format", + "#ifdef __GNUC__\n\ +typedef __builtin_va_list __va_list;\n\ +#else\n\ +%0\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Statsswtch fix */ tSCC zStatsswtchName[] = @@ -8358,9 +8552,9 @@ * * List of all fixes */ -#define REGEX_COUNT 245 +#define REGEX_COUNT 249 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 205 +#define FIX_COUNT 210 /* * Enumerate the fixes @@ -8479,6 +8673,7 @@ IRIX_ASM_APOSTROPHE_FIXIDX, IRIX_COMPLEX_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, + IRIX_PTHREAD_INIT_FIXIDX, IRIX_SOCKLEN_T_FIXIDX, IRIX_STDINT_C99_MODE_FIXIDX, IRIX_STDINT_C99_TYPES_FIXIDX, @@ -8516,7 +8711,10 @@ RS6000_DOUBLE_FIXIDX, RS6000_FCHMOD_FIXIDX, RS6000_PARAM_FIXIDX, + 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, @@ -8534,6 +8732,7 @@ SOLARIS_INT_LIMITS_3_FIXIDX, SOLARIS_INT_TYPES_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, + SOLARIS_SYS_VA_LIST_FIXIDX, STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, STDIO_VA_LIST_FIXIDX, @@ -9139,6 +9338,11 @@ IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Limits_ConstTests, apzIrix_Limits_ConstPatch, 0 }, + { zIrix_Pthread_InitName, zIrix_Pthread_InitList, + apzIrix_Pthread_InitMachs, + IRIX_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix_Pthread_InitTests, apzIrix_Pthread_InitPatch, 0 }, + { zIrix_Socklen_TName, zIrix_Socklen_TList, apzIrix_Socklen_TMachs, IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -9324,11 +9528,26 @@ RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aRs6000_ParamTests, apzRs6000_ParamPatch, 0 }, + { zSolaris___RestrictName, zSolaris___RestrictList, + apzSolaris___RestrictMachs, + SOLARIS___RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris___RestrictTests, apzSolaris___RestrictPatch, 0 }, + { zSolaris_ComplexName, zSolaris_ComplexList, apzSolaris_ComplexMachs, SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY, aSolaris_ComplexTests, apzSolaris_ComplexPatch, 0 }, + { zSolaris_Complex_CxxName, zSolaris_Complex_CxxList, + apzSolaris_Complex_CxxMachs, + 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, @@ -9414,6 +9633,11 @@ SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY, aSolaris_Stdio_TagTests, apzSolaris_Stdio_TagPatch, 0 }, + { zSolaris_Sys_Va_ListName, zSolaris_Sys_Va_ListList, + apzSolaris_Sys_Va_ListMachs, + SOLARIS_SYS_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Sys_Va_ListTests, apzSolaris_Sys_Va_ListPatch, 0 }, + { zStatsswtchName, zStatsswtchList, apzStatsswtchMachs, STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,