diff options
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index f6288d2661d..41818d5605a 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 June 29, 2007 at 06:59:26 PM MEST + * It has been AutoGen-ed Saturday July 7, 2007 at 11:23:30 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jun 29 18:59:26 MEST 2007 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Jul 7 23:23:30 EDT 2007 * * You must regenerate it. Use the ./genfixes script. * @@ -5629,7 +5629,7 @@ static tTestDesc aSolaris_Math_4Tests[] = { static const char* apzSolaris_Math_4Patch[] = { "format", "#define\tfpclassify(x) \\\n\ - __extension__ ({ __typeof(x) __x_fp = (x); \\\n\ + __extension__ ({ const __typeof(x) __x_fp = (x); \\\n\ \t\t isnan(__x_fp) \\\n\ \t\t ? FP_NAN \\\n\ \t\t : isinf(__x_fp) \\\n\ @@ -5682,8 +5682,12 @@ static tTestDesc aSolaris_Math_5Tests[] = { static const char* apzSolaris_Math_5Patch[] = { "format", "#define\tisfinite(x) \\\n\ - __extension__ ({ __typeof (x) __x_f = (x); \\\n\ -\t\t __builtin_expect(!isnan(__x_f - __x_f), 1); })", + __extension__ ({ const __typeof (x) __x_f = (x); \\\n\ +\t\t __builtin_expect(sizeof(__x_f) == sizeof(float) \\\n\ +\t\t\t ? islessequal(__builtin_fabsf(__x_f),__FLT_MAX__) \\\n\ +\t\t\t : sizeof(__x_f) == sizeof(long double) \\\n\ +\t\t\t ? islessequal(__builtin_fabsl(__x_f),__LDBL_MAX__) \\\n\ +\t\t\t : islessequal(__builtin_fabs(__x_f),__DBL_MAX__), 1); })", "^#define[ \t]+isfinite\\(x\\)[ \t]+__builtin_isfinite\\(x\\)", (char*)NULL }; @@ -5727,8 +5731,12 @@ static tTestDesc aSolaris_Math_6Tests[] = { static const char* apzSolaris_Math_6Patch[] = { "format", "#define\tisinf(x) \\\n\ - __extension__ ({ __typeof (x) __x_i = (x); \\\n\ -\t\t __builtin_expect(!isnan(__x_i) && !isfinite(__x_i), 0); })", + __extension__ ({ const __typeof (x) __x_i = (x); \\\n\ +\t\t __builtin_expect(sizeof(__x_i) == sizeof(float) \\\n\ +\t\t\t ? isgreater(__builtin_fabsf(__x_i),__FLT_MAX__) \\\n\ +\t\t\t : sizeof(__x_i) == sizeof(long double) \\\n\ +\t\t\t ? isgreater(__builtin_fabsl(__x_i),__LDBL_MAX__) \\\n\ +\t\t\t : isgreater(__builtin_fabs(__x_i),__DBL_MAX__), 0); })", "^#define[ \t]+isinf\\(x\\)[ \t]+__builtin_isinf\\(x\\)", (char*)NULL }; @@ -5772,14 +5780,13 @@ static tTestDesc aSolaris_Math_7Tests[] = { static const char* apzSolaris_Math_7Patch[] = { "format", "#define\tisnormal(x) \\\n\ - __extension__ ({ __typeof(x) __x_n = (x); \\\n\ -\t\t if (__x_n < 0.0) __x_n = -__x_n; \\\n\ + __extension__ ({ const __typeof(x) __x_n = (x); \\\n\ \t\t __builtin_expect(isfinite(__x_n) \\\n\ \t\t\t\t && (sizeof(__x_n) == sizeof(float) \\\n\ -\t\t\t\t\t ? __x_n >= __FLT_MIN__ \\\n\ +\t\t\t\t\t ? isgreaterequal(__builtin_fabsf(__x_n),__FLT_MIN__) \\\n\ \t\t\t\t\t : sizeof(__x_n) == sizeof(long double) \\\n\ -\t\t\t\t\t ? __x_n >= __LDBL_MIN__ \\\n\ -\t\t\t\t\t : __x_n >= __DBL_MIN__), 1); })", +\t\t\t\t\t ? isgreaterequal(__builtin_fabsl(__x_n),__LDBL_MIN__) \\\n\ +\t\t\t\t\t : isgreaterequal(__builtin_fabs(__x_n),__DBL_MIN__)), 1); })", "^#define[ \t]+isnormal\\(x\\)[ \t]+__builtin_isnormal\\(x\\)", (char*)NULL }; |