X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=fixincludes%2Ffixincl.x;h=fa05d88eedf66f7438987302cdabacc805623d26;hb=f14a60df5ab1580f6d111936218f2865673b1e5e;hp=b9b9b040f4d5c5389bec502ee8176116776d5646;hpb=30a8006af0df5e08a07f64218b9b6e0381cab743;p=pf3gnuchains%2Fgcc-fork.git diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index b9b9b040f4d..fa05d88eedf 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 Tuesday September 15, 2009 at 06:55:13 AM CEST + * It has been AutoGen-ed Friday January 29, 2010 at 04:49:43 PM MET * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Di 15. Sep 06:55:13 CEST 2009 +/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jan 29 16:49:43 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 202 fixup descriptions. + * This file contains 205 fixup descriptions. * * See README for more information. * @@ -568,7 +568,7 @@ tSCC zAix_Stdint_1Name[] = * File name selection pattern */ tSCC zAix_Stdint_1List[] = - "stdint.h\0"; + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -607,7 +607,7 @@ tSCC zAix_Stdint_2Name[] = * File name selection pattern */ tSCC zAix_Stdint_2List[] = - "stdint.h\0"; + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -656,7 +656,7 @@ tSCC zAix_Stdint_3Name[] = * File name selection pattern */ tSCC zAix_Stdint_3List[] = - "stdint.h\0"; + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -701,7 +701,7 @@ tSCC zAix_Stdint_4Name[] = * File name selection pattern */ tSCC zAix_Stdint_4List[] = - "stdint.h\0"; + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -742,7 +742,7 @@ tSCC zAix_Stdint_5Name[] = * File name selection pattern */ tSCC zAix_Stdint_5List[] = - "stdint.h\0"; + "stdint-aix.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -2046,7 +2046,7 @@ tSCC zDarwin_Stdint_1Name[] = * File name selection pattern */ tSCC zDarwin_Stdint_1List[] = - "stdint.h\0"; + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -2085,7 +2085,7 @@ tSCC zDarwin_Stdint_2Name[] = * File name selection pattern */ tSCC zDarwin_Stdint_2List[] = - "stdint.h\0"; + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -2134,7 +2134,7 @@ tSCC zDarwin_Stdint_3Name[] = * File name selection pattern */ tSCC zDarwin_Stdint_3List[] = - "stdint.h\0"; + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -2179,7 +2179,7 @@ tSCC zDarwin_Stdint_4Name[] = * File name selection pattern */ tSCC zDarwin_Stdint_4List[] = - "stdint.h\0"; + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -2224,7 +2224,7 @@ tSCC zDarwin_Stdint_5Name[] = * File name selection pattern */ tSCC zDarwin_Stdint_5List[] = - "stdint.h\0"; + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -2271,7 +2271,7 @@ tSCC zDarwin_Stdint_6Name[] = * File name selection pattern */ tSCC zDarwin_Stdint_6List[] = - "stdint.h\0"; + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -2320,7 +2320,7 @@ tSCC zDarwin_Stdint_7Name[] = * File name selection pattern */ tSCC zDarwin_Stdint_7List[] = - "stdint.h\0"; + "stdint-darwin.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -3964,7 +3964,7 @@ tSCC zHpux_C99_IntptrName[] = * File name selection pattern */ tSCC zHpux_C99_IntptrList[] = - "stdint.h\0"; + "stdint-hpux11.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -3997,7 +3997,7 @@ tSCC zHpux_C99_InttypesName[] = * File name selection pattern */ tSCC zHpux_C99_InttypesList[] = - "inttypes.h\0stdint.h\0"; + "inttypes.h\0stdint-hpux11.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -4028,7 +4028,7 @@ tSCC zHpux_C99_Inttypes2Name[] = * File name selection pattern */ tSCC zHpux_C99_Inttypes2List[] = - "stdint.h\0"; + "stdint-hpux11.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -4059,7 +4059,7 @@ tSCC zHpux_Stdint_Least_FastName[] = * File name selection pattern */ tSCC zHpux_Stdint_Least_FastList[] = - "stdint.h\0"; + "stdint-hpux11.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -4082,11 +4082,7 @@ static tTestDesc aHpux_Stdint_Least_FastTests[] = { */ static const char* apzHpux_Stdint_Least_FastPatch[] = { "format", - "#ifdef __LP64__\n\ -# define\tUINT_%164_MAX\tULONG_MAX\n\ -#else\n\ -%0\n\ -#endif", + "# define\tUINT_%164_MAX\t__UINT64_MAX__", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -4709,38 +4705,38 @@ typedef int socklen_t;\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Irix_Stdint_C99 fix + * Description of Irix_Stdint_C99_Mode fix */ -tSCC zIrix_Stdint_C99Name[] = - "irix_stdint_c99"; +tSCC zIrix_Stdint_C99_ModeName[] = + "irix_stdint_c99_mode"; /* * File name selection pattern */ -tSCC zIrix_Stdint_C99List[] = +tSCC zIrix_Stdint_C99_ModeList[] = "stdint.h\0"; /* * Machine/OS name selection pattern */ -tSCC* apzIrix_Stdint_C99Machs[] = { +tSCC* apzIrix_Stdint_C99_ModeMachs[] = { "mips-sgi-irix6.5", (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ -tSCC zIrix_Stdint_C99Select0[] = +tSCC zIrix_Stdint_C99_ModeSelect0[] = "(#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 }, }; +#define IRIX_STDINT_C99_MODE_TEST_CT 1 +static tTestDesc aIrix_Stdint_C99_ModeTests[] = { + { TT_EGREP, zIrix_Stdint_C99_ModeSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Irix_Stdint_C99 + * Fix Command Arguments for Irix_Stdint_C99_Mode */ -static const char* apzIrix_Stdint_C99Patch[] = { +static const char* apzIrix_Stdint_C99_ModePatch[] = { "format", "#if 0\n\ %2", @@ -4748,6 +4744,83 @@ static const char* apzIrix_Stdint_C99Patch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Irix_Stdint_C99_Types fix + */ +tSCC zIrix_Stdint_C99_TypesName[] = + "irix_stdint_c99_types"; + +/* + * File name selection pattern + */ +tSCC zIrix_Stdint_C99_TypesList[] = + "stdint-irix65.h\0stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_Stdint_C99_TypesMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; +#define IRIX_STDINT_C99_TYPES_TEST_CT 0 +#define aIrix_Stdint_C99_TypesTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Irix_Stdint_C99_Types + */ +static const char* apzIrix_Stdint_C99_TypesPatch[] = { sed_cmd_z, + "-e", "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@#define INT64_MIN (-0x7fffffffffffffffLL - 1)@", + "-e", "s@^#define INT64_MAX.*0x7fffffffffffffff$@#define INT64_MAX 0x7fffffffffffffffLL@", + "-e", "s@^#define UINT32_MAX.*0xffffffff$@#define UINT32_MAX 0xffffffffU@", + "-e", "s@^#define UINT64_MAX.*0xffffffffffffffff$@#define UINT64_MAX 0xffffffffffffffffULL@", + "-e", "s@^#define INTPTR_MIN.*INT32_MIN$@#define INTPTR_MIN (-0x7fffffffL - 1)@", + "-e", "s@^#define INTPTR_MAX.*INT32_MAX$@#define INTPTR_MAX 0x7fffffffL@", + "-e", "s@^#define UINTPTR_MAX.*UINT32_MAX$@#define UINTPTR_MAX 0xffffffffUL@", + "-e", "s@^#define INTPTR_MIN.*INT64_MIN@#define INTPTR_MIN (-0x7fffffffffffffffL - 1)@", + "-e", "s@^#define INTPTR_MAX.*INT64_MAX$@#define INTPTR_MAX 0x7fffffffffffffffL@", + "-e", "s@^#define UINTPTR_MAX.*UINT64_MAX$@#define UINTPTR_MAX 0xffffffffffffffffUL@", + "-e", "s@^#define PTRDIFF_MIN.*INT64_MIN$@#define PTRDIFF_MIN (-0x7fffffffffffffffL - 1)@", + "-e", "s@^#define PTRDIFF_MAX.*INT64_MAX$@#define PTRDIFF_MAX 0x7fffffffffffffffL@", + "-e", "s@^#define SIZE_MAX.*UINT64_MAX$@#define SIZE_MAX 0xffffffffffffffffUL@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Irix_Stdint_C99_Macros fix + */ +tSCC zIrix_Stdint_C99_MacrosName[] = + "irix_stdint_c99_macros"; + +/* + * File name selection pattern + */ +tSCC zIrix_Stdint_C99_MacrosList[] = + "stdint-irix65.h\0stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_Stdint_C99_MacrosMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; +#define IRIX_STDINT_C99_MACROS_TEST_CT 0 +#define aIrix_Stdint_C99_MacrosTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Irix_Stdint_C99_Macros + */ +static const char* apzIrix_Stdint_C99_MacrosPatch[] = { sed_cmd_z, + "-e", "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x) (x)@", + "-e", "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x) (x)@", + "-e", "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x) (x)@", + "-e", "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x) (x ## LL)@", + "-e", "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x) (x)@", + "-e", "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x) (x)@", + "-e", "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x) (x ## U)@", + "-e", "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x) (x ## ULL)@", + "-e", "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x) (x ## LL)@", + "-e", "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x) (x ## ULL)@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Irix_Stdio_Va_List fix */ tSCC zIrix_Stdio_Va_ListName[] = @@ -5304,7 +5377,7 @@ tSCC zNewlib_Stdint_1Name[] = * File name selection pattern */ tSCC zNewlib_Stdint_1List[] = - "stdint.h\0"; + "stdint-newlib.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -5351,7 +5424,7 @@ tSCC zNewlib_Stdint_2Name[] = * File name selection pattern */ tSCC zNewlib_Stdint_2List[] = - "stdint.h\0"; + "stdint-newlib.h\0stdint.h\0"; /* * Machine/OS name selection pattern */ @@ -6562,13 +6635,17 @@ tSCC zSolaris_Int_ConstList[] = /* * Machine/OS name selection pattern */ -#define apzSolaris_Int_ConstMachs (const char**)NULL +tSCC* apzSolaris_Int_ConstMachs[] = { + "*-*-solaris2*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ tSCC zSolaris_Int_ConstSelect0[] = - "@\\(#\\)int_const.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\ +(/*.**/)\n\ +#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*"; #define SOLARIS_INT_CONST_TEST_CT 1 static tTestDesc aSolaris_Int_ConstTests[] = { @@ -6582,9 +6659,6 @@ static const char* apzSolaris_Int_ConstPatch[] = { "#define\tUINT8_C(c)\t(c)\n\ %1\n\ #define\tUINT16_C(c)\t(c)", - "^#define[ \t]+UINT8_C\\(c\\)[ \t]+__CONCAT__.*\n\ -(/*.**/)\n\ -#define[ \t]+UINT16_C\\(c\\)[ \t]+__CONCAT__.*", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -6602,13 +6676,16 @@ tSCC zSolaris_Int_Limits_1List[] = /* * Machine/OS name selection pattern */ -#define apzSolaris_Int_Limits_1Machs (const char**)NULL +tSCC* apzSolaris_Int_Limits_1Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ tSCC zSolaris_Int_Limits_1Select0[] = - "@\\(#\\)int_limits.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\ +#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)"; #define SOLARIS_INT_LIMITS_1_TEST_CT 1 static tTestDesc aSolaris_Int_Limits_1Tests[] = { @@ -6621,8 +6698,6 @@ static const char* apzSolaris_Int_Limits_1Patch[] = { "format", "#define\tUINT8_MAX\t(255)\n\ #define\tUINT16_MAX\t(65535)", - "^#define[ \t]+UINT8_MAX[ \t]+\\(255U\\)\n\ -#define[ \t]+UINT16_MAX[ \t]+\\(65535U\\)", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -6640,13 +6715,15 @@ tSCC zSolaris_Int_Limits_2List[] = /* * Machine/OS name selection pattern */ -#define apzSolaris_Int_Limits_2Machs (const char**)NULL +tSCC* apzSolaris_Int_Limits_2Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found */ tSCC zSolaris_Int_Limits_2Select0[] = - "@\\(#\\)int_limits.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*"; #define SOLARIS_INT_LIMITS_2_TEST_CT 1 static tTestDesc aSolaris_Int_Limits_2Tests[] = { @@ -6658,7 +6735,43 @@ static tTestDesc aSolaris_Int_Limits_2Tests[] = { static const char* apzSolaris_Int_Limits_2Patch[] = { "format", "#define\t%1_FAST16_%2 %132_%2", - "^#define[ \t]+(INT|UINT)_FAST16_(MAX|MIN)[ \t](INT|UINT)16.*", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Int_Limits_3 fix + */ +tSCC zSolaris_Int_Limits_3Name[] = + "solaris_int_limits_3"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Int_Limits_3List[] = + "sys/int_limits.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_Int_Limits_3Machs[] = { + "*-*-solaris2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Int_Limits_3Select0[] = + "^#define[ \t]+SIZE_MAX[ \t]+4294967295UL"; + +#define SOLARIS_INT_LIMITS_3_TEST_CT 1 +static tTestDesc aSolaris_Int_Limits_3Tests[] = { + { TT_EGREP, zSolaris_Int_Limits_3Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Int_Limits_3 + */ +static const char* apzSolaris_Int_Limits_3Patch[] = { + "format", + "#define\tSIZE_MAX\t4294967295U", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -8243,9 +8356,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 244 +#define REGEX_COUNT 245 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 202 +#define FIX_COUNT 205 /* * Enumerate the fixes @@ -8365,7 +8478,9 @@ typedef enum { IRIX_COMPLEX_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, IRIX_SOCKLEN_T_FIXIDX, - IRIX_STDINT_C99_FIXIDX, + IRIX_STDINT_C99_MODE_FIXIDX, + IRIX_STDINT_C99_TYPES_FIXIDX, + IRIX_STDINT_C99_MACROS_FIXIDX, IRIX_STDIO_VA_LIST_FIXIDX, IRIX_WCSFTIME_FIXIDX, KANDR_CONCAT_FIXIDX, @@ -8414,6 +8529,7 @@ typedef enum { SOLARIS_INT_CONST_FIXIDX, SOLARIS_INT_LIMITS_1_FIXIDX, SOLARIS_INT_LIMITS_2_FIXIDX, + SOLARIS_INT_LIMITS_3_FIXIDX, SOLARIS_INT_TYPES_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, STATSSWTCH_FIXIDX, @@ -9026,10 +9142,20 @@ 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_Stdint_C99_ModeName, zIrix_Stdint_C99_ModeList, + apzIrix_Stdint_C99_ModeMachs, + IRIX_STDINT_C99_MODE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aIrix_Stdint_C99_ModeTests, apzIrix_Stdint_C99_ModePatch, 0 }, + + { zIrix_Stdint_C99_TypesName, zIrix_Stdint_C99_TypesList, + apzIrix_Stdint_C99_TypesMachs, + IRIX_STDINT_C99_TYPES_TEST_CT, FD_MACH_ONLY, + aIrix_Stdint_C99_TypesTests, apzIrix_Stdint_C99_TypesPatch, 0 }, + + { zIrix_Stdint_C99_MacrosName, zIrix_Stdint_C99_MacrosList, + apzIrix_Stdint_C99_MacrosMachs, + IRIX_STDINT_C99_MACROS_TEST_CT, FD_MACH_ONLY, + aIrix_Stdint_C99_MacrosTests, apzIrix_Stdint_C99_MacrosPatch, 0 }, { zIrix_Stdio_Va_ListName, zIrix_Stdio_Va_ListList, apzIrix_Stdio_Va_ListMachs, @@ -9271,6 +9397,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Int_Limits_2Tests, apzSolaris_Int_Limits_2Patch, 0 }, + { zSolaris_Int_Limits_3Name, zSolaris_Int_Limits_3List, + apzSolaris_Int_Limits_3Machs, + SOLARIS_INT_LIMITS_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_Limits_3Tests, apzSolaris_Int_Limits_3Patch, 0 }, + { zSolaris_Int_TypesName, zSolaris_Int_TypesList, apzSolaris_Int_TypesMachs, SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,