diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 59 |
1 files changed, 54 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 285db9a6ac2..fa38cb324eb 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 Saturday March 28, 2009 at 12:12:55 AM UTC + * It has been AutoGen-ed Sunday March 29, 2009 at 01:30:25 AM UTC * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Mar 28 00:12:55 UTC 2009 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Mar 29 01:30:25 UTC 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 177 fixup descriptions. + * This file contains 178 fixup descriptions. * * See README for more information. * @@ -2219,6 +2219,49 @@ s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * 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 \\\\\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 }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Gnu_Types fix */ tSCC zGnu_TypesName[] = @@ -7192,9 +7235,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 221 +#define REGEX_COUNT 223 #define MACH_LIST_SIZE_LIMIT 181 -#define FIX_COUNT 177 +#define FIX_COUNT 178 /* * Enumerate the fixes @@ -7253,6 +7296,7 @@ typedef enum { GLIBC_C99_INLINE_3_FIXIDX, GLIBC_C99_INLINE_4_FIXIDX, GLIBC_MUTEX_INIT_FIXIDX, + GLIBC_TGMATH_FIXIDX, GNU_TYPES_FIXIDX, HP_INLINE_FIXIDX, HP_SYSFILE_FIXIDX, @@ -7645,6 +7689,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY, aGlibc_Mutex_InitTests, apzGlibc_Mutex_InitPatch, 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, |