Mercurial > hg > CbC > CbC_gcc
diff fixincludes/fixincl.x @ 55:77e2b8dfacca gcc-4.4.5
update it from 4.4.3 to 4.5.0
author | ryoma <e075725@ie.u-ryukyu.ac.jp> |
---|---|
date | Fri, 12 Feb 2010 23:39:51 +0900 |
parents | a06113de4d67 |
children | b7f97abdc517 |
line wrap: on
line diff
--- a/fixincludes/fixincl.x Sun Feb 07 18:28:00 2010 +0900 +++ b/fixincludes/fixincl.x Fri Feb 12 23:39:51 2010 +0900 @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Saturday February 28, 2009 at 10:11:41 AM PST + * It has been AutoGen-ed Tuesday October 20, 2009 at 04:21:49 PM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Feb 28 10:11:41 PST 2009 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Oct 20 16:21:49 PDT 2009 * * 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 180 fixup descriptions. + * This file contains 202 fixup descriptions. * * See README for more information. * @@ -485,6 +485,43 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aix_Complex fix + */ +tSCC zAix_ComplexName[] = + "aix_complex"; + +/* + * File name selection pattern + */ +tSCC zAix_ComplexList[] = + "complex.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_ComplexMachs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_ComplexSelect0[] = + "#define[ \t]_Complex_I[ \t]__I"; + +#define AIX_COMPLEX_TEST_CT 1 +static tTestDesc aAix_ComplexTests[] = { + { TT_EGREP, zAix_ComplexSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Complex + */ +static const char* apzAix_ComplexPatch[] = { + "format", + "#define _Complex_I (__extension__ 1.0iF)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aix_Pthread fix */ tSCC zAix_PthreadName[] = @@ -522,6 +559,219 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Aix_Stdint_1 fix + */ +tSCC zAix_Stdint_1Name[] = + "aix_stdint_1"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdint_1List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdint_1Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdint_1Select0[] = + "#define[ \t]UINT8_MAX[ \t]\\(255U\\)\n\ +#define[ \t]UINT16_MAX[ \t]\\(65535U\\)"; + +#define AIX_STDINT_1_TEST_CT 1 +static tTestDesc aAix_Stdint_1Tests[] = { + { TT_EGREP, zAix_Stdint_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdint_1 + */ +static const char* apzAix_Stdint_1Patch[] = { + "format", + "#define UINT8_MAX\t(255)\n\ +#define UINT16_MAX\t(65535)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdint_2 fix + */ +tSCC zAix_Stdint_2Name[] = + "aix_stdint_2"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdint_2List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdint_2Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdint_2Select0[] = + "#define[ \t]INTPTR_MIN[ \t]INT64_MIN\n\ +#define[ \t]INTPTR_MAX[ \t]INT64_MAX\n\ +#define[ \t]UINTPTR_MAX[ \t]UINT64_MAX\n\ +#else\n\ +#define[ \t]INTPTR_MIN[ \t]INT32_MIN\n\ +#define[ \t]INTPTR_MAX[ \t]INT32_MAX\n\ +#define[ \t]UINTPTR_MAX[ \t]UINT32_MAX"; + +#define AIX_STDINT_2_TEST_CT 1 +static tTestDesc aAix_Stdint_2Tests[] = { + { TT_EGREP, zAix_Stdint_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdint_2 + */ +static const char* apzAix_Stdint_2Patch[] = { + "format", + "#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\ +#define INTPTR_MAX\t9223372036854775807L\n\ +#define UINTPTR_MAX\t18446744073709551615UL\n\ +#else\n\ +#define INTPTR_MIN\t(-INTPTR_MAX-1)\n\ +#define INTPTR_MAX\t2147483647L\n\ +#define UINTPTR_MAX\t4294967295UL", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdint_3 fix + */ +tSCC zAix_Stdint_3Name[] = + "aix_stdint_3"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdint_3List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdint_3Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdint_3Select0[] = + "#define[ \t]PTRDIFF_MIN[ \t]INT64_MIN\n\ +#define[ \t]PTRDIFF_MAX[ \t]INT64_MAX\n\ +#else\n\ +#define[ \t]PTRDIFF_MIN[ \t]*INT32_MIN\n\ +#define[ \t]PTRDIFF_MAX[ \t]*INT32_MAX"; + +#define AIX_STDINT_3_TEST_CT 1 +static tTestDesc aAix_Stdint_3Tests[] = { + { TT_EGREP, zAix_Stdint_3Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdint_3 + */ +static const char* apzAix_Stdint_3Patch[] = { + "format", + "#define PTRDIFF_MIN\t(-9223372036854775807L - 1)\n\ +#define PTRDIFF_MAX\t9223372036854775807L\n\ +#else\n\ +#define PTRDIFF_MIN\t(-2147483647L - 1)\n\ +#define PTRDIFF_MAX\t2147483647L", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdint_4 fix + */ +tSCC zAix_Stdint_4Name[] = + "aix_stdint_4"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdint_4List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdint_4Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdint_4Select0[] = + "#define[ \t]SIZE_MAX[ \t]UINT64_MAX\n\ +#else\n\ +#define[ \t]SIZE_MAX[ \t]*UINT32_MAX"; + +#define AIX_STDINT_4_TEST_CT 1 +static tTestDesc aAix_Stdint_4Tests[] = { + { TT_EGREP, zAix_Stdint_4Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdint_4 + */ +static const char* apzAix_Stdint_4Patch[] = { + "format", + "#define SIZE_MAX\t18446744073709551615UL\n\ +#else\n\ +#define SIZE_MAX\t4294967295UL", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Aix_Stdint_5 fix + */ +tSCC zAix_Stdint_5Name[] = + "aix_stdint_5"; + +/* + * File name selection pattern + */ +tSCC zAix_Stdint_5List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAix_Stdint_5Machs[] = { + "*-*-aix*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAix_Stdint_5Select0[] = + "#define[ \t]UINT8_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)\n\ +#define[ \t]UINT16_C\\(c\\)[ \t]__CONCAT__\\(c,U\\)"; + +#define AIX_STDINT_5_TEST_CT 1 +static tTestDesc aAix_Stdint_5Tests[] = { + { TT_EGREP, zAix_Stdint_5Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Aix_Stdint_5 + */ +static const char* apzAix_Stdint_5Patch[] = { + "format", + "#define UINT8_C(c)\tc\n\ +#define UINT16_C(c)\tc", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Aix_Sysmachine fix */ tSCC zAix_SysmachineName[] = @@ -557,45 +807,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Aix_Syswait fix - */ -tSCC zAix_SyswaitName[] = - "aix_syswait"; - -/* - * File name selection pattern - */ -tSCC zAix_SyswaitList[] = - "sys/wait.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzAix_SyswaitMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zAix_SyswaitSelect0[] = - "^extern pid_t wait3\\(\\);\n"; -tSCC zAix_SyswaitSelect1[] = - "bos325,"; - -#define AIX_SYSWAIT_TEST_CT 2 -static tTestDesc aAix_SyswaitTests[] = { - { TT_EGREP, zAix_SyswaitSelect0, (regex_t*)NULL }, - { TT_EGREP, zAix_SyswaitSelect1, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Aix_Syswait - */ -static const char* apzAix_SyswaitPatch[] = { - "format", - "struct rusage;\n\ -%0", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Aix_Syswait_2 fix */ tSCC zAix_Syswait_2Name[] = @@ -1826,6 +2037,324 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Darwin_Stdint_1 fix + */ +tSCC zDarwin_Stdint_1Name[] = + "darwin_stdint_1"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_1List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_1Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Stdint_1Select0[] = + "#define UINT8_C\\(v\\)[ \t]+\\(v ## U\\)\n\ +#define UINT16_C\\(v\\)[ \t]+\\(v ## U\\)"; + +#define DARWIN_STDINT_1_TEST_CT 1 +static tTestDesc aDarwin_Stdint_1Tests[] = { + { TT_EGREP, zDarwin_Stdint_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_1 + */ +static const char* apzDarwin_Stdint_1Patch[] = { + "format", + "#define UINT8_C(v)\tv\n\ +#define UINT16_C(v)\tv", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Stdint_2 fix + */ +tSCC zDarwin_Stdint_2Name[] = + "darwin_stdint_2"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_2List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_2Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Stdint_2Select0[] = + "#if __WORDSIZE == 64\n\ +#define INTPTR_MIN[ \t]+INT64_MIN\n\ +#define INTPTR_MAX[ \t]+INT64_MAX\n\ +#else\n\ +#define INTPTR_MIN[ \t]+INT32_MIN\n\ +#define INTPTR_MAX[ \t]+INT32_MAX\n\ +#endif"; + +#define DARWIN_STDINT_2_TEST_CT 1 +static tTestDesc aDarwin_Stdint_2Tests[] = { + { TT_EGREP, zDarwin_Stdint_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_2 + */ +static const char* apzDarwin_Stdint_2Patch[] = { + "format", + "#if __WORDSIZE == 64\n\ +#define INTPTR_MAX 9223372036854775807L\n\ +#define INTPTR_MIN (-INTPTR_MAX-1)\n\ +#else\n\ +#define INTPTR_MAX 2147483647L\n\ +#define INTPTR_MIN (-INTPTR_MAX-1)\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Stdint_3 fix + */ +tSCC zDarwin_Stdint_3Name[] = + "darwin_stdint_3"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_3List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_3Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Stdint_3Select0[] = + "#if __WORDSIZE == 64\n\ +#define UINTPTR_MAX[ \t]+UINT64_MAX\n\ +#else\n\ +#define UINTPTR_MAX[ \t]+UINT32_MAX\n\ +#endif"; + +#define DARWIN_STDINT_3_TEST_CT 1 +static tTestDesc aDarwin_Stdint_3Tests[] = { + { TT_EGREP, zDarwin_Stdint_3Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_3 + */ +static const char* apzDarwin_Stdint_3Patch[] = { + "format", + "#if __WORDSIZE == 64\n\ +#define UINTPTR_MAX 18446744073709551615UL\n\ +#else\n\ +#define UINTPTR_MAX 4294967295UL\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Stdint_4 fix + */ +tSCC zDarwin_Stdint_4Name[] = + "darwin_stdint_4"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_4List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_4Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Stdint_4Select0[] = + "#if __WORDSIZE == 64\n\ +#define SIZE_MAX[ \t]+UINT64_MAX\n\ +#else\n\ +#define SIZE_MAX[ \t]+UINT32_MAX\n\ +#endif"; + +#define DARWIN_STDINT_4_TEST_CT 1 +static tTestDesc aDarwin_Stdint_4Tests[] = { + { TT_EGREP, zDarwin_Stdint_4Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_4 + */ +static const char* apzDarwin_Stdint_4Patch[] = { + "format", + "#if __WORDSIZE == 64\n\ +#define SIZE_MAX 18446744073709551615UL\n\ +#else\n\ +#define SIZE_MAX 4294967295UL\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Stdint_5 fix + */ +tSCC zDarwin_Stdint_5Name[] = + "darwin_stdint_5"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_5List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_5Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Stdint_5Select0[] = + "#define INTMAX_MIN[ \t]+INT64_MIN\n\ +#define INTMAX_MAX[ \t]+INT64_MAX\n\n\ +#define UINTMAX_MAX[ \t]+UINT64_MAX"; + +#define DARWIN_STDINT_5_TEST_CT 1 +static tTestDesc aDarwin_Stdint_5Tests[] = { + { TT_EGREP, zDarwin_Stdint_5Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_5 + */ +static const char* apzDarwin_Stdint_5Patch[] = { + "format", + "#if __WORDSIZE == 64\n\ +#define INTMAX_MIN (-9223372036854775807L - 1)\n\ +#define INTMAX_MAX 9223372036854775807L\n\ +#define UINTMAX_MAX 18446744073709551615UL\n\ +#else\n\ +#define INTMAX_MIN (-9223372036854775807LL - 1)\n\ +#define INTMAX_MAX 9223372036854775807LL\n\ +#define UINTMAX_MAX 18446744073709551615ULL\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Stdint_6 fix + */ +tSCC zDarwin_Stdint_6Name[] = + "darwin_stdint_6"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_6List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_6Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Stdint_6Select0[] = + "#if __WORDSIZE == 64\n\ +#define PTRDIFF_MIN[ \t]+INT64_MIN\n\ +#define PTRDIFF_MAX[ \t]+INT64_MAX\n\ +#else\n\ +#define PTRDIFF_MIN[ \t]+INT32_MIN\n\ +#define PTRDIFF_MAX[ \t]+INT32_MAX\n\ +#endif"; + +#define DARWIN_STDINT_6_TEST_CT 1 +static tTestDesc aDarwin_Stdint_6Tests[] = { + { TT_EGREP, zDarwin_Stdint_6Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_6 + */ +static const char* apzDarwin_Stdint_6Patch[] = { + "format", + "#if __WORDSIZE == 64\n\ +#define PTRDIFF_MIN (-9223372036854775807L - 1)\n\ +#define PTRDIFF_MAX 9223372036854775807L\n\ +#else\n\ +#define PTRDIFF_MIN (-2147483647 - 1)\n\ +#define PTRDIFF_MAX 2147483647\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Darwin_Stdint_7 fix + */ +tSCC zDarwin_Stdint_7Name[] = + "darwin_stdint_7"; + +/* + * File name selection pattern + */ +tSCC zDarwin_Stdint_7List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzDarwin_Stdint_7Machs[] = { + "*-*-darwin*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zDarwin_Stdint_7Select0[] = + "#define INTMAX_C\\(v\\)[ \t]+\\(v ## LL\\)\n\ +#define UINTMAX_C\\(v\\)[ \t]+\\(v ## ULL\\)"; + +#define DARWIN_STDINT_7_TEST_CT 1 +static tTestDesc aDarwin_Stdint_7Tests[] = { + { TT_EGREP, zDarwin_Stdint_7Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Darwin_Stdint_7 + */ +static const char* apzDarwin_Stdint_7Patch[] = { + "format", + "#if __WORDSIZE == 64\n\ +#define INTMAX_C(v) (v ## L)\n\ +#define UINTMAX_C(v) (v ## UL)\n\ +#else\n\ +#define INTMAX_C(v) (v ## LL)\n\ +#define UINTMAX_C(v) (v ## ULL)\n\ +#endif", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Dec_Intern_Asm fix */ tSCC zDec_Intern_AsmName[] = @@ -1933,48 +2462,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Exception_Structure fix - */ -tSCC zException_StructureName[] = - "exception_structure"; - -/* - * File name selection pattern - */ -tSCC zException_StructureList[] = - "math.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzException_StructureMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zException_StructureSelect0[] = - "matherr"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zException_StructureBypass0[] = - "matherr.*(struct exception|__MATH_EXCEPTION|[ \\t]*__FP_EXCEPTION[ \\t]*\\*[ \\t]*)"; - -#define EXCEPTION_STRUCTURE_TEST_CT 2 -static tTestDesc aException_StructureTests[] = { - { TT_NEGREP, zException_StructureBypass0, (regex_t*)NULL }, - { TT_EGREP, zException_StructureSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Exception_Structure - */ -static const char* apzException_StructurePatch[] = { - "wrap", - "struct exception;\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Freebsd_Gcc3_Breakage fix */ tSCC zFreebsd_Gcc3_BreakageName[] = @@ -2157,11 +2644,23 @@ * Fix Command Arguments for Glibc_C99_Inline_2 */ static const char* apzGlibc_C99_Inline_2Patch[] = { sed_cmd_z, - "-e", "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ + "-e", "s/extern int \\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int \\1/", + "-e", "s/extern int \\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ extern\\\n\ #endif\\\n\ __inline__ int \\1/", - "-e", "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ + "-e", "s/extern int \\(mknod\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int \\1/", + "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\(stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ +extern\\\n\ +#endif\\\n\ +__inline__ int __REDIRECT\\1 (\\2/", + "-e", "s/extern int __REDIRECT\\(_NTH\\)\\{0,1\\} (\\([lf]stat\\)/#ifdef __GNUC_GNU_INLINE__\\\n\ extern\\\n\ #endif\\\n\ __inline__ int __REDIRECT\\1 (\\2/", @@ -2287,15 +2786,106 @@ * Fix Command Arguments for Glibc_Mutex_Init */ static const char* apzGlibc_Mutex_InitPatch[] = { sed_cmd_z, - "-e", "/define[ \t]\\+PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n\ + "-e", "/define[ \t]\\{1,\\}PTHREAD_MUTEX_INITIALIZER[ \t]*\\\\/{\n\ N\n\ s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\ }", - "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/", - "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\|ERRORCHECK\\|ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/", - "-e", "/define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\+PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# else\\n# \\1\\n { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\n# endif/", + "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0 }/", + "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0 }/", + "-e", "s/{ \\(0, 0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0 }/", + "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(RECURSIVE\\)_NP\\) }/{ \\1, 0, 0 }/", + "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ERRORCHECK\\)_NP\\) }/{ \\1, 0, 0 }/", + "-e", "s/{ \\(0, 0, 0, PTHREAD_MUTEX_\\(ADAPTIVE\\)_NP\\) }/{ \\1, 0, 0 }/", + "-e", "/define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\/N;s/^[ \t]*#[ \t]*\\(define[ \t]\\{1,\\}PTHREAD_RWLOCK_INITIALIZER[ \t]*\\\\\\)\\n[ \t]*{ { 0, } }/# if __WORDSIZE == 64\\\n\ +# \\1\\\n\ + { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\ +# else\\\n\ +# \\1\\\n\ + { { 0, 0, 0, 0, 0, 0, 0, 0 } }\\\n\ +# endif/", "-e", "s/{ \\(0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP\\) }/{ \\1, 0 }/", - "-e", "/define[ \t]\\+PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/", + "-e", "/define[ \t]\\{1,\\}PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Glibc_Stdint fix + */ +tSCC zGlibc_StdintName[] = + "glibc_stdint"; + +/* + * File name selection pattern + */ +tSCC zGlibc_StdintList[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzGlibc_StdintMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zGlibc_StdintSelect0[] = + "GNU C Library"; + +#define GLIBC_STDINT_TEST_CT 1 +static tTestDesc aGlibc_StdintTests[] = { + { TT_EGREP, zGlibc_StdintSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Glibc_Stdint + */ +static const char* apzGlibc_StdintPatch[] = { + "format", + "# define UINT8_C(c)\tc\n\ +# define UINT16_C(c)\tc", + "# define UINT8_C\\(c\\)\tc ## U\n\ +# define UINT16_C\\(c\\)\tc ## U", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Glibc_Tgmath fix + */ +tSCC zGlibc_TgmathName[] = + "glibc_tgmath"; + +/* + * File name selection pattern + */ +tSCC zGlibc_TgmathList[] = + "tgmath.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzGlibc_TgmathMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zGlibc_TgmathSelect0[] = + "\\(\\(\\(type\\) 0.25\\) && \\(\\(type\\) 0.25 - 1\\)\\)"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zGlibc_TgmathBypass0[] = + "__floating_type\\(type\\) \\\\\n\ +.*__builtin_classify_type"; + +#define GLIBC_TGMATH_TEST_CT 2 +static tTestDesc aGlibc_TgmathTests[] = { + { TT_NEGREP, zGlibc_TgmathBypass0, (regex_t*)NULL }, + { TT_EGREP, zGlibc_TgmathSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Glibc_Tgmath + */ +static const char* apzGlibc_TgmathPatch[] = { + "format", + "(__builtin_classify_type ((type) 0) == 8 || (__builtin_classify_type ((type) 0) == 9 && __builtin_classify_type (__real__ ((type) 0)) == 8))", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -2893,41 +3483,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Uint32_C fix - */ -tSCC zHpux11_Uint32_CName[] = - "hpux11_uint32_c"; - -/* - * File name selection pattern - */ -tSCC zHpux11_Uint32_CList[] = - "inttypes.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzHpux11_Uint32_CMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zHpux11_Uint32_CSelect0[] = - "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)"; - -#define HPUX11_UINT32_C_TEST_CT 1 -static tTestDesc aHpux11_Uint32_CTests[] = { - { TT_EGREP, zHpux11_Uint32_CSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Hpux11_Uint32_C - */ -static const char* apzHpux11_Uint32_CPatch[] = { - "format", - "#define UINT32_C(__c) __CONCAT__(__c,ul)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Hpux11_Vsnprintf fix */ tSCC zHpux11_VsnprintfName[] = @@ -3095,7 +3650,10 @@ /* * Machine/OS name selection pattern */ -#define apzHpux_Long_DoubleMachs (const char**)NULL +tSCC* apzHpux_Long_DoubleMachs[] = { + "*-*-hpux10*", + "*-*-hpux11.[012]*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -3124,6 +3682,43 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux_Long_Double_2 fix + */ +tSCC zHpux_Long_Double_2Name[] = + "hpux_long_double_2"; + +/* + * File name selection pattern + */ +tSCC zHpux_Long_Double_2List[] = + "stdlib.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Long_Double_2Machs[] = { + "hppa*-*-hpux11.3*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Long_Double_2Select0[] = + "#[ \t]*if[ \t]*!defined\\(__ia64\\) \\|\\| defined\\(_PROTOTYPES\\) \\|\\| defined\\(_LONG_DOUBLE_STRUCT\\)"; + +#define HPUX_LONG_DOUBLE_2_TEST_CT 1 +static tTestDesc aHpux_Long_Double_2Tests[] = { + { TT_EGREP, zHpux_Long_Double_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Long_Double_2 + */ +static const char* apzHpux_Long_Double_2Patch[] = { + "format", + "# if !defined(_PROTOTYPES) || defined(_LONG_DOUBLE_STRUCT)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Hpux_Systime fix */ tSCC zHpux_SystimeName[] = @@ -3360,6 +3955,212 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Hpux_C99_Intptr fix + */ +tSCC zHpux_C99_IntptrName[] = + "hpux_c99_intptr"; + +/* + * File name selection pattern + */ +tSCC zHpux_C99_IntptrList[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_C99_IntptrMachs[] = { + "*-hp-hpux11.3*", + (const char*)NULL }; +#define HPUX_C99_INTPTR_TEST_CT 0 +#define aHpux_C99_IntptrTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Hpux_C99_Intptr + */ +static const char* apzHpux_C99_IntptrPatch[] = { sed_cmd_z, + "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MAX[ \t]*INT32_MAX[ \t]*$@#define PTRDIFF_MAX (2147483647l)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*PTRDIFF_MIN[ \t]*INT32_MIN[ \t]*$@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MAX[ \t]*INT32_MAX[ \t]*$@#define INTPTR_MAX (2147483647l)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INTPTR_MIN[ \t]*INT32_MIN[ \t]*$@#define INTPTR_MIN (-INTPTR_MAX - 1)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINTPTR_MAX[ \t]*UINT32_MAX[ \t]*$@#define UINTPTR_MAX (4294967295ul)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*SIZE_MAX[ \t]*UINT32_MAX[ \t]*$@#define SIZE_MAX (4294967295ul)@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_C99_Inttypes fix + */ +tSCC zHpux_C99_InttypesName[] = + "hpux_c99_inttypes"; + +/* + * File name selection pattern + */ +tSCC zHpux_C99_InttypesList[] = + "inttypes.h\0stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_C99_InttypesMachs[] = { + "*-hp-hpux11.[23]*", + (const char*)NULL }; +#define HPUX_C99_INTTYPES_TEST_CT 0 +#define aHpux_C99_InttypesTests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Hpux_C99_Inttypes + */ +static const char* apzHpux_C99_InttypesPatch[] = { sed_cmd_z, + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT8_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*__CONCAT_U__(__c)[ \t]*$@#define UINT16_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT32_C(__c)[ \t]*__CONCAT__(__c,l)[ \t]*$@#define INT32_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT32_C(__c)[ \t].*$@#define UINT32_C(__c) __CONCAT__(__c,u)@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_C99_Inttypes2 fix + */ +tSCC zHpux_C99_Inttypes2Name[] = + "hpux_c99_inttypes2"; + +/* + * File name selection pattern + */ +tSCC zHpux_C99_Inttypes2List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_C99_Inttypes2Machs[] = { + "*-hp-hpux11.2*", + (const char*)NULL }; +#define HPUX_C99_INTTYPES2_TEST_CT 0 +#define aHpux_C99_Inttypes2Tests (tTestDesc*)NULL + +/* + * Fix Command Arguments for Hpux_C99_Inttypes2 + */ +static const char* apzHpux_C99_Inttypes2Patch[] = { sed_cmd_z, + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT8_C(__c)[ \t]*((signed char)(__c))[ \t]*$@#define INT8_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT8_C(__c)[ \t]*((unsigned char)(__c))[ \t]*$@#define UINT8_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*INT16_C(__c)[ \t]*((short)(__c))[ \t]*$@#define INT16_C(__c) (__c)@", + "-e", "s@^[ \t]*#[ \t]*define[ \t]*UINT16_C(__c)[ \t]*((unsigned short)(__c))[ \t]*$@#define UINT16_C(__c) (__c)@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_Stdint_Least_Fast fix + */ +tSCC zHpux_Stdint_Least_FastName[] = + "hpux_stdint_least_fast"; + +/* + * File name selection pattern + */ +tSCC zHpux_Stdint_Least_FastList[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Stdint_Least_FastMachs[] = { + "*-hp-hpux11.2*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Stdint_Least_FastSelect0[] = + "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX"; + +#define HPUX_STDINT_LEAST_FAST_TEST_CT 1 +static tTestDesc aHpux_Stdint_Least_FastTests[] = { + { TT_EGREP, zHpux_Stdint_Least_FastSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Stdint_Least_Fast + */ +static const char* apzHpux_Stdint_Least_FastPatch[] = { + "format", + "# define\tUINT_%164_MAX\t__UINT64_MAX__", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_Inttype_Int8_T fix + */ +tSCC zHpux_Inttype_Int8_TName[] = + "hpux_inttype_int8_t"; + +/* + * File name selection pattern + */ +tSCC zHpux_Inttype_Int8_TList[] = + "sys/_inttypes.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Inttype_Int8_TMachs[] = { + "*-hp-hpux1[01].*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Inttype_Int8_TSelect0[] = + "^[ \t]*typedef[ \t]*char[ \t]*int(_least){0,1}8_t.*"; + +#define HPUX_INTTYPE_INT8_T_TEST_CT 1 +static tTestDesc aHpux_Inttype_Int8_TTests[] = { + { TT_EGREP, zHpux_Inttype_Int8_TSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Inttype_Int8_T + */ +static const char* apzHpux_Inttype_Int8_TPatch[] = { + "format", + "typedef signed char int%18_t;", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Hpux_Imaginary_I fix + */ +tSCC zHpux_Imaginary_IName[] = + "hpux_imaginary_i"; + +/* + * File name selection pattern + */ +tSCC zHpux_Imaginary_IList[] = + "complex.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzHpux_Imaginary_IMachs[] = { + "ia64-hp-hpux11.*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zHpux_Imaginary_ISelect0[] = + "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*"; + +#define HPUX_IMAGINARY_I_TEST_CT 1 +static tTestDesc aHpux_Imaginary_ITests[] = { + { TT_EGREP, zHpux_Imaginary_ISelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Hpux_Imaginary_I + */ +static const char* apzHpux_Imaginary_IPatch[] = { + "format", + "#define _Complex_I (__extension__ 1.0iF)", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Huge_Val_Hex fix */ tSCC zHuge_Val_HexName[] = @@ -3788,6 +4589,45 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Irix_Complex fix + */ +tSCC zIrix_ComplexName[] = + "irix_complex"; + +/* + * File name selection pattern + */ +tSCC zIrix_ComplexList[] = + "complex.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzIrix_ComplexMachs[] = { + "mips-sgi-irix6.5", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zIrix_ComplexSelect0[] = + "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)"; + +#define IRIX_COMPLEX_TEST_CT 1 +static tTestDesc aIrix_ComplexTests[] = { + { TT_EGREP, zIrix_ComplexSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Irix_Complex + */ +static const char* apzIrix_ComplexPatch[] = { sed_cmd_z, + "-e", "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/#define _Complex_I (__extension__ 1.0iF)/", + "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d", + "-e", "/#define[ \t]_Imaginary_I/d", + "-e", "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Irix_Limits_Const fix */ tSCC zIrix_Limits_ConstName[] = @@ -3978,76 +4818,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Isc_Fmod fix - */ -tSCC zIsc_FmodName[] = - "isc_fmod"; - -/* - * File name selection pattern - */ -tSCC zIsc_FmodList[] = - "math.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzIsc_FmodMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIsc_FmodSelect0[] = - "fmod\\(double\\)"; - -#define ISC_FMOD_TEST_CT 1 -static tTestDesc aIsc_FmodTests[] = { - { TT_EGREP, zIsc_FmodSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Isc_Fmod - */ -static const char* apzIsc_FmodPatch[] = { - "format", - "fmod(double, double)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Description of Isc_Omits_With_Stdc fix - */ -tSCC zIsc_Omits_With_StdcName[] = - "isc_omits_with_stdc"; - -/* - * File name selection pattern - */ -tSCC zIsc_Omits_With_StdcList[] = - "stdio.h\0math.h\0ctype.h\0sys/limits.h\0sys/fcntl.h\0sys/dirent.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzIsc_Omits_With_StdcMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zIsc_Omits_With_StdcSelect0[] = - "!defined\\(__STDC__\\) && !defined\\(_POSIX_SOURCE\\)"; - -#define ISC_OMITS_WITH_STDC_TEST_CT 1 -static tTestDesc aIsc_Omits_With_StdcTests[] = { - { TT_EGREP, zIsc_Omits_With_StdcSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Isc_Omits_With_Stdc - */ -static const char* apzIsc_Omits_With_StdcPatch[] = { - "format", - "!defined(_POSIX_SOURCE)", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Kandr_Concat fix */ tSCC zKandr_ConcatName[] = @@ -4402,41 +5172,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Nested_Sys_Limits fix - */ -tSCC zNested_Sys_LimitsName[] = - "nested_sys_limits"; - -/* - * File name selection pattern - */ -tSCC zNested_Sys_LimitsList[] = - "sys/limits.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzNested_Sys_LimitsMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zNested_Sys_LimitsSelect0[] = - "CHILD_MAX"; - -#define NESTED_SYS_LIMITS_TEST_CT 1 -static tTestDesc aNested_Sys_LimitsTests[] = { - { TT_EGREP, zNested_Sys_LimitsSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Nested_Sys_Limits - */ -static const char* apzNested_Sys_LimitsPatch[] = { sed_cmd_z, - "-e", "/CHILD_MAX/s,/\\* Max, Max,", - "-e", "/OPEN_MAX/s,/\\* Max, Max,", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Netbsd_C99_Inline_1 fix */ tSCC zNetbsd_C99_Inline_1Name[] = @@ -4556,6 +5291,96 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Newlib_Stdint_1 fix + */ +tSCC zNewlib_Stdint_1Name[] = + "newlib_stdint_1"; + +/* + * File name selection pattern + */ +tSCC zNewlib_Stdint_1List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzNewlib_Stdint_1Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zNewlib_Stdint_1Select0[] = + "@todo - Add support for wint_t types"; + +#define NEWLIB_STDINT_1_TEST_CT 1 +static tTestDesc aNewlib_Stdint_1Tests[] = { + { TT_EGREP, zNewlib_Stdint_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Newlib_Stdint_1 + */ +static const char* apzNewlib_Stdint_1Patch[] = { sed_cmd_z, + "-e", "s@#define INT32_MIN.*@#define INT32_MIN (-INT32_MAX - 1)@", + "-e", "s@#define INT32_MAX.*@#define INT32_MAX __INT32_MAX__@", + "-e", "s@#define UINT32_MAX.*@#define UINT32_MAX __UINT32_MAX__@", + "-e", "s@#define INT_LEAST32_MIN.*@#define INT_LEAST32_MIN (-INT_LEAST32_MAX - 1)@", + "-e", "s@#define INT_LEAST32_MAX.*@#define INT_LEAST32_MAX __INT_LEAST32_MAX__@", + "-e", "s@#define UINT_LEAST32_MAX.*@#define UINT_LEAST32_MAX __UINT_LEAST32_MAX__@", + "-e", "s@#define INT_FAST\\([0-9]*\\)_MIN.*@#define INT_FAST\\1_MIN (-INT_FAST\\1_MAX - 1)@", + "-e", "s@#define INT_FAST\\([0-9]*\\)_MAX.*@#define INT_FAST\\1_MAX __INT_FAST\\1_MAX__@", + "-e", "s@#define UINT_FAST\\([0-9]*\\)_MAX.*@#define UINT_FAST\\1_MAX __UINT_FAST\\1_MAX__@", + "-e", "s@#define SIZE_MAX.*@#define SIZE_MAX __SIZE_MAX__@", + "-e", "s@#define PTRDIFF_MIN.*@#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)@", + "-e", "s@#define PTRDIFF_MAX.*@#define PTRDIFF_MAX __PTRDIFF_MAX__@", + "-e", "s@#define UINT8_C.*@#define UINT8_C(c) __UINT8_C(c)@", + "-e", "s@#define UINT16_C.*@#define UINT16_C(c) __UINT16_C(c)@", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Newlib_Stdint_2 fix + */ +tSCC zNewlib_Stdint_2Name[] = + "newlib_stdint_2"; + +/* + * File name selection pattern + */ +tSCC zNewlib_Stdint_2List[] = + "stdint.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzNewlib_Stdint_2Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zNewlib_Stdint_2Select0[] = + "@todo - Add support for wint_t types"; + +#define NEWLIB_STDINT_2_TEST_CT 1 +static tTestDesc aNewlib_Stdint_2Tests[] = { + { TT_EGREP, zNewlib_Stdint_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Newlib_Stdint_2 + */ +static const char* apzNewlib_Stdint_2Patch[] = { + "format", + "#define INTMAX_MAX __INTMAX_MAX__\n\ +#define INTMAX_MIN (-INTMAX_MAX - 1)\n\ +#define UINTMAX_MAX __UINTMAX_MAX__\n\ +#define WCHAR_MAX __WCHAR_MAX__\n\ +#define WCHAR_MIN __WCHAR_MIN__\n\ +#define WINT_MAX __WINT_MAX__\n\ +#define WINT_MIN __WINT_MIN__\n\n\ +%0", + "/\\*\\* Macros for minimum-width integer constant expressions \\*/", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Next_Math_Prefix fix */ tSCC zNext_Math_PrefixName[] = @@ -4959,41 +5784,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Pthread_Page_Size fix - */ -tSCC zPthread_Page_SizeName[] = - "pthread_page_size"; - -/* - * File name selection pattern - */ -tSCC zPthread_Page_SizeList[] = - "pthread.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzPthread_Page_SizeMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zPthread_Page_SizeSelect0[] = - "^int __page_size"; - -#define PTHREAD_PAGE_SIZE_TEST_CT 1 -static tTestDesc aPthread_Page_SizeTests[] = { - { TT_EGREP, zPthread_Page_SizeSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Pthread_Page_Size - */ -static const char* apzPthread_Page_SizePatch[] = { - "format", - "extern %0", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Pthread_Incomplete_Struct_Argument fix */ tSCC zPthread_Incomplete_Struct_ArgumentName[] = @@ -5247,56 +6037,41 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Sco_Math fix - */ -tSCC zSco_MathName[] = - "sco_math"; - -/* - * File name selection pattern - */ -tSCC zSco_MathList[] = - "math.h\0*/math.h\0"; -/* - * Machine/OS name selection pattern - */ -#define apzSco_MathMachs (const char**)NULL - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zSco_MathSelect0[] = - "inline double abs"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zSco_MathBypass0[] = - "__GNUG__"; - -#define SCO_MATH_TEST_CT 2 -static tTestDesc aSco_MathTests[] = { - { TT_NEGREP, zSco_MathBypass0, (regex_t*)NULL }, - { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Sco_Math - */ -static const char* apzSco_MathPatch[] = { sed_cmd_z, - "-e", "/#define.*__fp_class(a) \\\\/i\\\n\ -#ifndef __GNUC__\n", - "-e", "/.*__builtin_generic/a\\\n\ -#else\\\n\ -#define __fp_class(a) \\\\\\\n\ - __builtin_choose_expr(__builtin_types_compatible_p(typeof(a),long double),\\\\\\\n\ - __fpclassifyl(a), \\\\\\\n\ - __builtin_choose_expr(__builtin_types_compatible_p(typeof(a), float), \\\\\\\n\ - __fpclassifyf(a),__fpclassify(a)))\\\n\ -#endif", - "-e", "/extern \"C\\+\\+\"/N;/inline double abs/i\\\n\ -#ifndef __GNUC__\n", - "-e", "/inline long double trunc/N;/inline long double trunc.*}.*extern \"C\\+\\+\"/a\\\n\ -#endif /* ! __GNUC__ */", + * Description of Solaris_Complex fix + */ +tSCC zSolaris_ComplexName[] = + "solaris_complex"; + +/* + * File name selection pattern + */ +tSCC zSolaris_ComplexList[] = + "complex.h\0"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzSolaris_ComplexMachs[] = { + "*-*-solaris2.*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_ComplexSelect0[] = + "#define[ \t]_Complex_I[ \t]_Complex_I"; + +#define SOLARIS_COMPLEX_TEST_CT 1 +static tTestDesc aSolaris_ComplexTests[] = { + { TT_EGREP, zSolaris_ComplexSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Complex + */ +static const char* apzSolaris_ComplexPatch[] = { sed_cmd_z, + "-e", "s/#define[ \t]_Complex_I[ \t]_Complex_I/#define\t_Complex_I\t(__extension__ 1.0iF)/", + "-e", "/#define[ \t]_Imaginary_I[ \t]_Imaginary_I/d", + "-e", "/#define[ \t]imaginary[ \t]_Imaginary/d", + "-e", "s/#define[ \t]I[ \t]\\{1,\\}_Imaginary_I/#define\tI\t\t_Complex_I/", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -5770,6 +6545,162 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Solaris_Int_Const fix + */ +tSCC zSolaris_Int_ConstName[] = + "solaris_int_const"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Int_ConstList[] = + "sys/int_const.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Int_ConstMachs (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 SOLARIS_INT_CONST_TEST_CT 1 +static tTestDesc aSolaris_Int_ConstTests[] = { + { TT_EGREP, zSolaris_Int_ConstSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Int_Const + */ +static const char* apzSolaris_Int_ConstPatch[] = { + "format", + "#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 }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Int_Limits_1 fix + */ +tSCC zSolaris_Int_Limits_1Name[] = + "solaris_int_limits_1"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Int_Limits_1List[] = + "sys/int_limits.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Int_Limits_1Machs (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 SOLARIS_INT_LIMITS_1_TEST_CT 1 +static tTestDesc aSolaris_Int_Limits_1Tests[] = { + { TT_EGREP, zSolaris_Int_Limits_1Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Int_Limits_1 + */ +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 }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Solaris_Int_Limits_2 fix + */ +tSCC zSolaris_Int_Limits_2Name[] = + "solaris_int_limits_2"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Int_Limits_2List[] = + "sys/int_limits.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Int_Limits_2Machs (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 SOLARIS_INT_LIMITS_2_TEST_CT 1 +static tTestDesc aSolaris_Int_Limits_2Tests[] = { + { TT_EGREP, zSolaris_Int_Limits_2Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Int_Limits_2 + */ +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_Types fix + */ +tSCC zSolaris_Int_TypesName[] = + "solaris_int_types"; + +/* + * File name selection pattern + */ +tSCC zSolaris_Int_TypesList[] = + "sys/int_types.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzSolaris_Int_TypesMachs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zSolaris_Int_TypesSelect0[] = + "__STDC__ - 0 == 0"; + +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSolaris_Int_TypesBypass0[] = + "_LONGLONG_TYPE"; + +#define SOLARIS_INT_TYPES_TEST_CT 2 +static tTestDesc aSolaris_Int_TypesTests[] = { + { TT_NEGREP, zSolaris_Int_TypesBypass0, (regex_t*)NULL }, + { TT_EGREP, zSolaris_Int_TypesSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Solaris_Int_Types + */ +static const char* apzSolaris_Int_TypesPatch[] = { + "format", + "(defined(_STDC_C99) || !defined(_STRICT_STDC) || defined(__GNUC__))", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Solaris_Stdio_Tag fix */ tSCC zSolaris_Stdio_TagName[] = @@ -7259,7 +8190,7 @@ static const char* apzX11_NewPatch[] = { sed_cmd_z, "-e", "/Widget\told, new;/i\\\n\ #ifdef __cplusplus\\\n\ -\tWidget\told, c_new;\\\n\ +\\\tWidget\told, c_new;\\\n\ #else\n", "-e", "/Widget\told, new;/a\\\n\ #endif\n", @@ -7308,9 +8239,9 @@ * * List of all fixes */ -#define REGEX_COUNT 226 +#define REGEX_COUNT 244 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 180 +#define FIX_COUNT 202 /* * Enumerate the fixes @@ -7324,9 +8255,14 @@ AAB_FD_ZERO_SELECTBITS_H_FIXIDX, AAB_SOLARIS_SYS_VARARGS_H_FIXIDX, AAB_SUN_MEMCPY_FIXIDX, + AIX_COMPLEX_FIXIDX, AIX_PTHREAD_FIXIDX, + AIX_STDINT_1_FIXIDX, + AIX_STDINT_2_FIXIDX, + AIX_STDINT_3_FIXIDX, + AIX_STDINT_4_FIXIDX, + AIX_STDINT_5_FIXIDX, AIX_SYSMACHINE_FIXIDX, - AIX_SYSWAIT_FIXIDX, AIX_SYSWAIT_2_FIXIDX, AIX_VOLATILE_FIXIDX, ALPHA___ASSERT_FIXIDX, @@ -7359,10 +8295,16 @@ DARWIN_EXTERNC_FIXIDX, DARWIN_GCC4_BREAKAGE_FIXIDX, DARWIN_PRIVATE_EXTERN_FIXIDX, + DARWIN_STDINT_1_FIXIDX, + DARWIN_STDINT_2_FIXIDX, + DARWIN_STDINT_3_FIXIDX, + DARWIN_STDINT_4_FIXIDX, + DARWIN_STDINT_5_FIXIDX, + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, DEC_INTERN_ASM_FIXIDX, DJGPP_WCHAR_H_FIXIDX, ECD_CURSOR_FIXIDX, - EXCEPTION_STRUCTURE_FIXIDX, FREEBSD_GCC3_BREAKAGE_FIXIDX, FREEBSD_GCC4_BREAKAGE_FIXIDX, GLIBC_C99_INLINE_1_FIXIDX, @@ -7371,6 +8313,8 @@ GLIBC_C99_INLINE_3_FIXIDX, GLIBC_C99_INLINE_4_FIXIDX, GLIBC_MUTEX_INIT_FIXIDX, + GLIBC_STDINT_FIXIDX, + GLIBC_TGMATH_FIXIDX, GNU_TYPES_FIXIDX, HP_INLINE_FIXIDX, HP_SYSFILE_FIXIDX, @@ -7385,18 +8329,24 @@ HPUX11_PTHREAD_CONST_FIXIDX, HPUX11_SIZE_T_FIXIDX, HPUX11_SNPRINTF_FIXIDX, - HPUX11_UINT32_C_FIXIDX, HPUX11_VSNPRINTF_FIXIDX, HPUX8_BOGUS_INLINES_FIXIDX, HPUX_CTYPE_MACROS_FIXIDX, HPUX_HTONL_FIXIDX, HPUX_LONG_DOUBLE_FIXIDX, + HPUX_LONG_DOUBLE_2_FIXIDX, HPUX_SYSTIME_FIXIDX, HPUX_SPU_INFO_FIXIDX, HPUX11_EXTERN_SENDFILE_FIXIDX, HPUX11_EXTERN_SENDPATH_FIXIDX, HPUX_EXTERN_ERRNO_FIXIDX, HPUX_PTHREAD_INITIALIZERS_FIXIDX, + HPUX_C99_INTPTR_FIXIDX, + HPUX_C99_INTTYPES_FIXIDX, + HPUX_C99_INTTYPES2_FIXIDX, + HPUX_STDINT_LEAST_FAST_FIXIDX, + HPUX_INTTYPE_INT8_T_FIXIDX, + HPUX_IMAGINARY_I_FIXIDX, HUGE_VAL_HEX_FIXIDX, HUGE_VALF_HEX_FIXIDX, HUGE_VALL_HEX_FIXIDX, @@ -7408,13 +8358,12 @@ IRIX___GENERIC1_FIXIDX, IRIX___GENERIC2_FIXIDX, IRIX_ASM_APOSTROPHE_FIXIDX, + IRIX_COMPLEX_FIXIDX, IRIX_LIMITS_CONST_FIXIDX, IRIX_SOCKLEN_T_FIXIDX, IRIX_STDINT_C99_FIXIDX, IRIX_STDIO_VA_LIST_FIXIDX, IRIX_WCSFTIME_FIXIDX, - ISC_FMOD_FIXIDX, - ISC_OMITS_WITH_STDC_FIXIDX, KANDR_CONCAT_FIXIDX, LINUX_IA64_UCONTEXT_FIXIDX, LYNXOS_NO_WARNING_IN_SYS_TIME_H_FIXIDX, @@ -7424,10 +8373,11 @@ MATH_EXCEPTION_FIXIDX, MATH_HUGE_VAL_FROM_DBL_MAX_FIXIDX, NESTED_AUTH_DES_FIXIDX, - NESTED_SYS_LIMITS_FIXIDX, NETBSD_C99_INLINE_1_FIXIDX, NETBSD_C99_INLINE_2_FIXIDX, NETBSD_EXTRA_SEMICOLON_FIXIDX, + NEWLIB_STDINT_1_FIXIDX, + NEWLIB_STDINT_2_FIXIDX, NEXT_MATH_PREFIX_FIXIDX, NEXT_TEMPLATE_FIXIDX, NEXT_VOLITILE_FIXIDX, @@ -7438,7 +8388,6 @@ OPENBSD_VA_START_FIXIDX, OSF_NAMESPACE_A_FIXIDX, OSF_NAMESPACE_C_FIXIDX, - PTHREAD_PAGE_SIZE_FIXIDX, PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_FIXIDX, READ_RET_TYPE_FIXIDX, RPC_XDR_LVALUE_CAST_A_FIXIDX, @@ -7446,7 +8395,7 @@ RS6000_DOUBLE_FIXIDX, RS6000_FCHMOD_FIXIDX, RS6000_PARAM_FIXIDX, - SCO_MATH_FIXIDX, + SOLARIS_COMPLEX_FIXIDX, SOLARIS_MATH_1_FIXIDX, SOLARIS_MATH_2_FIXIDX, SOLARIS_MATH_3_FIXIDX, @@ -7458,6 +8407,10 @@ SOLARIS_RWLOCK_INIT_1_FIXIDX, SOLARIS_ONCE_INIT_1_FIXIDX, SOLARIS_ONCE_INIT_2_FIXIDX, + SOLARIS_INT_CONST_FIXIDX, + SOLARIS_INT_LIMITS_1_FIXIDX, + SOLARIS_INT_LIMITS_2_FIXIDX, + SOLARIS_INT_TYPES_FIXIDX, SOLARIS_STDIO_TAG_FIXIDX, STATSSWTCH_FIXIDX, STDIO_STDARG_H_FIXIDX, @@ -7539,21 +8492,46 @@ AAB_SUN_MEMCPY_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Sun_MemcpyTests, apzAab_Sun_MemcpyPatch, 0 }, + { zAix_ComplexName, zAix_ComplexList, + apzAix_ComplexMachs, + AIX_COMPLEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_ComplexTests, apzAix_ComplexPatch, 0 }, + { zAix_PthreadName, zAix_PthreadList, apzAix_PthreadMachs, AIX_PTHREAD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_PthreadTests, apzAix_PthreadPatch, 0 }, + { zAix_Stdint_1Name, zAix_Stdint_1List, + apzAix_Stdint_1Machs, + AIX_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_1Tests, apzAix_Stdint_1Patch, 0 }, + + { zAix_Stdint_2Name, zAix_Stdint_2List, + apzAix_Stdint_2Machs, + AIX_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_2Tests, apzAix_Stdint_2Patch, 0 }, + + { zAix_Stdint_3Name, zAix_Stdint_3List, + apzAix_Stdint_3Machs, + AIX_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_3Tests, apzAix_Stdint_3Patch, 0 }, + + { zAix_Stdint_4Name, zAix_Stdint_4List, + apzAix_Stdint_4Machs, + AIX_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_4Tests, apzAix_Stdint_4Patch, 0 }, + + { zAix_Stdint_5Name, zAix_Stdint_5List, + apzAix_Stdint_5Machs, + AIX_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aAix_Stdint_5Tests, apzAix_Stdint_5Patch, 0 }, + { zAix_SysmachineName, zAix_SysmachineList, apzAix_SysmachineMachs, AIX_SYSMACHINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAix_SysmachineTests, apzAix_SysmachinePatch, 0 }, - { zAix_SyswaitName, zAix_SyswaitList, - apzAix_SyswaitMachs, - AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aAix_SyswaitTests, apzAix_SyswaitPatch, 0 }, - { zAix_Syswait_2Name, zAix_Syswait_2List, apzAix_Syswait_2Machs, AIX_SYSWAIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7714,6 +8692,41 @@ DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aDarwin_Private_ExternTests, apzDarwin_Private_ExternPatch, 0 }, + { zDarwin_Stdint_1Name, zDarwin_Stdint_1List, + apzDarwin_Stdint_1Machs, + DARWIN_STDINT_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_1Tests, apzDarwin_Stdint_1Patch, 0 }, + + { zDarwin_Stdint_2Name, zDarwin_Stdint_2List, + apzDarwin_Stdint_2Machs, + DARWIN_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_2Tests, apzDarwin_Stdint_2Patch, 0 }, + + { zDarwin_Stdint_3Name, zDarwin_Stdint_3List, + apzDarwin_Stdint_3Machs, + DARWIN_STDINT_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_3Tests, apzDarwin_Stdint_3Patch, 0 }, + + { zDarwin_Stdint_4Name, zDarwin_Stdint_4List, + apzDarwin_Stdint_4Machs, + DARWIN_STDINT_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_4Tests, apzDarwin_Stdint_4Patch, 0 }, + + { zDarwin_Stdint_5Name, zDarwin_Stdint_5List, + apzDarwin_Stdint_5Machs, + DARWIN_STDINT_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_5Tests, apzDarwin_Stdint_5Patch, 0 }, + + { zDarwin_Stdint_6Name, zDarwin_Stdint_6List, + apzDarwin_Stdint_6Machs, + DARWIN_STDINT_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_6Tests, apzDarwin_Stdint_6Patch, 0 }, + + { zDarwin_Stdint_7Name, zDarwin_Stdint_7List, + apzDarwin_Stdint_7Machs, + DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 }, + { zDec_Intern_AsmName, zDec_Intern_AsmList, apzDec_Intern_AsmMachs, DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, @@ -7729,11 +8742,6 @@ ECD_CURSOR_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aEcd_CursorTests, apzEcd_CursorPatch, 0 }, - { zException_StructureName, zException_StructureList, - apzException_StructureMachs, - EXCEPTION_STRUCTURE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aException_StructureTests, apzException_StructurePatch, 0 }, - { zFreebsd_Gcc3_BreakageName, zFreebsd_Gcc3_BreakageList, apzFreebsd_Gcc3_BreakageMachs, FREEBSD_GCC3_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7774,6 +8782,16 @@ GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY, aGlibc_Mutex_InitTests, apzGlibc_Mutex_InitPatch, 0 }, + { zGlibc_StdintName, zGlibc_StdintList, + apzGlibc_StdintMachs, + GLIBC_STDINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_StdintTests, apzGlibc_StdintPatch, 0 }, + + { zGlibc_TgmathName, zGlibc_TgmathList, + apzGlibc_TgmathMachs, + GLIBC_TGMATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_TgmathTests, apzGlibc_TgmathPatch, 0 }, + { zGnu_TypesName, zGnu_TypesList, apzGnu_TypesMachs, GNU_TYPES_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE, @@ -7844,11 +8862,6 @@ HPUX11_SNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_SnprintfTests, apzHpux11_SnprintfPatch, 0 }, - { zHpux11_Uint32_CName, zHpux11_Uint32_CList, - apzHpux11_Uint32_CMachs, - HPUX11_UINT32_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux11_Uint32_CTests, apzHpux11_Uint32_CPatch, 0 }, - { zHpux11_VsnprintfName, zHpux11_VsnprintfList, apzHpux11_VsnprintfMachs, HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7874,6 +8887,11 @@ HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY, aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 }, + { zHpux_Long_Double_2Name, zHpux_Long_Double_2List, + apzHpux_Long_Double_2Machs, + HPUX_LONG_DOUBLE_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Long_Double_2Tests, apzHpux_Long_Double_2Patch, 0 }, + { zHpux_SystimeName, zHpux_SystimeList, apzHpux_SystimeMachs, HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7904,6 +8922,36 @@ HPUX_PTHREAD_INITIALIZERS_TEST_CT, FD_MACH_ONLY, aHpux_Pthread_InitializersTests, apzHpux_Pthread_InitializersPatch, 0 }, + { zHpux_C99_IntptrName, zHpux_C99_IntptrList, + apzHpux_C99_IntptrMachs, + HPUX_C99_INTPTR_TEST_CT, FD_MACH_ONLY, + aHpux_C99_IntptrTests, apzHpux_C99_IntptrPatch, 0 }, + + { zHpux_C99_InttypesName, zHpux_C99_InttypesList, + apzHpux_C99_InttypesMachs, + HPUX_C99_INTTYPES_TEST_CT, FD_MACH_ONLY, + aHpux_C99_InttypesTests, apzHpux_C99_InttypesPatch, 0 }, + + { zHpux_C99_Inttypes2Name, zHpux_C99_Inttypes2List, + apzHpux_C99_Inttypes2Machs, + HPUX_C99_INTTYPES2_TEST_CT, FD_MACH_ONLY, + aHpux_C99_Inttypes2Tests, apzHpux_C99_Inttypes2Patch, 0 }, + + { zHpux_Stdint_Least_FastName, zHpux_Stdint_Least_FastList, + apzHpux_Stdint_Least_FastMachs, + HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Stdint_Least_FastTests, apzHpux_Stdint_Least_FastPatch, 0 }, + + { zHpux_Inttype_Int8_TName, zHpux_Inttype_Int8_TList, + apzHpux_Inttype_Int8_TMachs, + HPUX_INTTYPE_INT8_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Inttype_Int8_TTests, apzHpux_Inttype_Int8_TPatch, 0 }, + + { zHpux_Imaginary_IName, zHpux_Imaginary_IList, + apzHpux_Imaginary_IMachs, + HPUX_IMAGINARY_I_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux_Imaginary_ITests, apzHpux_Imaginary_IPatch, 0 }, + { zHuge_Val_HexName, zHuge_Val_HexList, apzHuge_Val_HexMachs, HUGE_VAL_HEX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7959,6 +9007,11 @@ IRIX_ASM_APOSTROPHE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_Asm_ApostropheTests, apzIrix_Asm_ApostrophePatch, 0 }, + { zIrix_ComplexName, zIrix_ComplexList, + apzIrix_ComplexMachs, + IRIX_COMPLEX_TEST_CT, FD_MACH_ONLY, + aIrix_ComplexTests, apzIrix_ComplexPatch, 0 }, + { zIrix_Limits_ConstName, zIrix_Limits_ConstList, apzIrix_Limits_ConstMachs, IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -7984,16 +9037,6 @@ IRIX_WCSFTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aIrix_WcsftimeTests, apzIrix_WcsftimePatch, 0 }, - { zIsc_FmodName, zIsc_FmodList, - apzIsc_FmodMachs, - ISC_FMOD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIsc_FmodTests, apzIsc_FmodPatch, 0 }, - - { zIsc_Omits_With_StdcName, zIsc_Omits_With_StdcList, - apzIsc_Omits_With_StdcMachs, - ISC_OMITS_WITH_STDC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aIsc_Omits_With_StdcTests, apzIsc_Omits_With_StdcPatch, 0 }, - { zKandr_ConcatName, zKandr_ConcatList, apzKandr_ConcatMachs, KANDR_CONCAT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8039,11 +9082,6 @@ NESTED_AUTH_DES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aNested_Auth_DesTests, apzNested_Auth_DesPatch, 0 }, - { zNested_Sys_LimitsName, zNested_Sys_LimitsList, - apzNested_Sys_LimitsMachs, - 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, @@ -8059,6 +9097,16 @@ NETBSD_EXTRA_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aNetbsd_Extra_SemicolonTests, apzNetbsd_Extra_SemicolonPatch, 0 }, + { zNewlib_Stdint_1Name, zNewlib_Stdint_1List, + apzNewlib_Stdint_1Machs, + NEWLIB_STDINT_1_TEST_CT, FD_MACH_ONLY, + aNewlib_Stdint_1Tests, apzNewlib_Stdint_1Patch, 0 }, + + { zNewlib_Stdint_2Name, zNewlib_Stdint_2List, + apzNewlib_Stdint_2Machs, + NEWLIB_STDINT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aNewlib_Stdint_2Tests, apzNewlib_Stdint_2Patch, 0 }, + { zNext_Math_PrefixName, zNext_Math_PrefixList, apzNext_Math_PrefixMachs, NEXT_MATH_PREFIX_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8109,11 +9157,6 @@ OSF_NAMESPACE_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aOsf_Namespace_CTests, apzOsf_Namespace_CPatch, 0 }, - { zPthread_Page_SizeName, zPthread_Page_SizeList, - apzPthread_Page_SizeMachs, - PTHREAD_PAGE_SIZE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aPthread_Page_SizeTests, apzPthread_Page_SizePatch, 0 }, - { zPthread_Incomplete_Struct_ArgumentName, zPthread_Incomplete_Struct_ArgumentList, apzPthread_Incomplete_Struct_ArgumentMachs, PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @@ -8149,10 +9192,10 @@ RS6000_PARAM_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aRs6000_ParamTests, apzRs6000_ParamPatch, 0 }, - { zSco_MathName, zSco_MathList, - apzSco_MathMachs, - SCO_MATH_TEST_CT, FD_MACH_ONLY, - aSco_MathTests, apzSco_MathPatch, 0 }, + { zSolaris_ComplexName, zSolaris_ComplexList, + apzSolaris_ComplexMachs, + SOLARIS_COMPLEX_TEST_CT, FD_MACH_ONLY, + aSolaris_ComplexTests, apzSolaris_ComplexPatch, 0 }, { zSolaris_Math_1Name, zSolaris_Math_1List, apzSolaris_Math_1Machs, @@ -8209,6 +9252,26 @@ SOLARIS_ONCE_INIT_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aSolaris_Once_Init_2Tests, apzSolaris_Once_Init_2Patch, 0 }, + { zSolaris_Int_ConstName, zSolaris_Int_ConstList, + apzSolaris_Int_ConstMachs, + SOLARIS_INT_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_ConstTests, apzSolaris_Int_ConstPatch, 0 }, + + { zSolaris_Int_Limits_1Name, zSolaris_Int_Limits_1List, + apzSolaris_Int_Limits_1Machs, + SOLARIS_INT_LIMITS_1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_Limits_1Tests, apzSolaris_Int_Limits_1Patch, 0 }, + + { zSolaris_Int_Limits_2Name, zSolaris_Int_Limits_2List, + apzSolaris_Int_Limits_2Machs, + SOLARIS_INT_LIMITS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_Limits_2Tests, apzSolaris_Int_Limits_2Patch, 0 }, + + { zSolaris_Int_TypesName, zSolaris_Int_TypesList, + apzSolaris_Int_TypesMachs, + SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aSolaris_Int_TypesTests, apzSolaris_Int_TypesPatch, 0 }, + { zSolaris_Stdio_TagName, zSolaris_Stdio_TagList, apzSolaris_Stdio_TagMachs, SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,