inclhack.def (solaris_math_5, [...]): Delete fixes.
* inclhack.def (solaris_math_5, solaris_math_6, solaris_math_7): Delete fixes. * tests/base/iso/math_c99.h: Delete associated test baselines. * fixincl.x: Regenerate. From-SVN: r127198
This commit is contained in:
Kaveh R. Ghazi
Kaveh Ghazi
parent
f87000d0c4
commit
d531cdb15c
4 changed files with 17 additions and 278 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2007-08-03 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||
|
||||
* inclhack.def (solaris_math_5, solaris_math_6, solaris_math_7):
|
||||
Delete fixes.
|
||||
* tests/base/iso/math_c99.h: Delete associated test baselines.
|
||||
* fixincl.x: Regenerate.
|
||||
|
||||
2007-07-24 Krister Walfridsson <cato@df.lth.se>
|
||||
|
||||
PR target/30058
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
*
|
||||
* DO NOT EDIT THIS FILE (fixincl.x)
|
||||
*
|
||||
* It has been AutoGen-ed Wednesday July 25, 2007 at 12:50:31 PM CEST
|
||||
* It has been AutoGen-ed Friday August 3, 2007 at 09:50:46 PM EDT
|
||||
* From the definitions inclhack.def
|
||||
* and the template file fixincl
|
||||
*/
|
||||
/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jul 25 12:50:31 CEST 2007
|
||||
/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Aug 3 21:50:46 EDT 2007
|
||||
*
|
||||
* 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 211 fixup descriptions.
|
||||
* This file contains 208 fixup descriptions.
|
||||
*
|
||||
* See README for more information.
|
||||
*
|
||||
|
|
@ -26,8 +26,7 @@
|
|||
*
|
||||
* You may redistribute it and/or modify it under the terms of the
|
||||
* GNU General Public License, as published by the Free Software
|
||||
* Foundation; either version 2 of the License, or (at your option)
|
||||
* any later version.
|
||||
* Foundation; either version 2, or (at your option) any later version.
|
||||
*
|
||||
* inclhack is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
|
|
@ -35,10 +34,10 @@
|
|||
* See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with inclhack. If not, write to:
|
||||
* The Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor
|
||||
* Boston, MA 02110-1301, USA.
|
||||
* along with inclhack. See the file "COPYING". If not,
|
||||
* write to: The Free Software Foundation, Inc.,
|
||||
* 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
|
|
@ -5684,154 +5683,6 @@ static const char* apzSolaris_Math_4Patch[] = {
|
|||
"^#define[ \t]+fpclassify\\(x\\)[ \t]+__builtin_fpclassify\\(x\\)",
|
||||
(char*)NULL };
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description of Solaris_Math_5 fix
|
||||
*/
|
||||
tSCC zSolaris_Math_5Name[] =
|
||||
"solaris_math_5";
|
||||
|
||||
/*
|
||||
* File name selection pattern
|
||||
*/
|
||||
tSCC zSolaris_Math_5List[] =
|
||||
"iso/math_c99.h\0";
|
||||
/*
|
||||
* Machine/OS name selection pattern
|
||||
*/
|
||||
#define apzSolaris_Math_5Machs (const char**)NULL
|
||||
|
||||
/*
|
||||
* content selection pattern - do fix if pattern found
|
||||
*/
|
||||
tSCC zSolaris_Math_5Select0[] =
|
||||
"@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
||||
|
||||
/*
|
||||
* content bypass pattern - skip fix if pattern found
|
||||
*/
|
||||
tSCC zSolaris_Math_5Bypass0[] =
|
||||
"__GNUC__";
|
||||
|
||||
#define SOLARIS_MATH_5_TEST_CT 2
|
||||
static tTestDesc aSolaris_Math_5Tests[] = {
|
||||
{ TT_NEGREP, zSolaris_Math_5Bypass0, (regex_t*)NULL },
|
||||
{ TT_EGREP, zSolaris_Math_5Select0, (regex_t*)NULL }, };
|
||||
|
||||
/*
|
||||
* Fix Command Arguments for Solaris_Math_5
|
||||
*/
|
||||
static const char* apzSolaris_Math_5Patch[] = {
|
||||
"format",
|
||||
"#define\tisfinite(x) \\\n\
|
||||
__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 };
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description of Solaris_Math_6 fix
|
||||
*/
|
||||
tSCC zSolaris_Math_6Name[] =
|
||||
"solaris_math_6";
|
||||
|
||||
/*
|
||||
* File name selection pattern
|
||||
*/
|
||||
tSCC zSolaris_Math_6List[] =
|
||||
"iso/math_c99.h\0";
|
||||
/*
|
||||
* Machine/OS name selection pattern
|
||||
*/
|
||||
#define apzSolaris_Math_6Machs (const char**)NULL
|
||||
|
||||
/*
|
||||
* content selection pattern - do fix if pattern found
|
||||
*/
|
||||
tSCC zSolaris_Math_6Select0[] =
|
||||
"@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
||||
|
||||
/*
|
||||
* content bypass pattern - skip fix if pattern found
|
||||
*/
|
||||
tSCC zSolaris_Math_6Bypass0[] =
|
||||
"__GNUC__";
|
||||
|
||||
#define SOLARIS_MATH_6_TEST_CT 2
|
||||
static tTestDesc aSolaris_Math_6Tests[] = {
|
||||
{ TT_NEGREP, zSolaris_Math_6Bypass0, (regex_t*)NULL },
|
||||
{ TT_EGREP, zSolaris_Math_6Select0, (regex_t*)NULL }, };
|
||||
|
||||
/*
|
||||
* Fix Command Arguments for Solaris_Math_6
|
||||
*/
|
||||
static const char* apzSolaris_Math_6Patch[] = {
|
||||
"format",
|
||||
"#define\tisinf(x) \\\n\
|
||||
__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 };
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description of Solaris_Math_7 fix
|
||||
*/
|
||||
tSCC zSolaris_Math_7Name[] =
|
||||
"solaris_math_7";
|
||||
|
||||
/*
|
||||
* File name selection pattern
|
||||
*/
|
||||
tSCC zSolaris_Math_7List[] =
|
||||
"iso/math_c99.h\0";
|
||||
/*
|
||||
* Machine/OS name selection pattern
|
||||
*/
|
||||
#define apzSolaris_Math_7Machs (const char**)NULL
|
||||
|
||||
/*
|
||||
* content selection pattern - do fix if pattern found
|
||||
*/
|
||||
tSCC zSolaris_Math_7Select0[] =
|
||||
"@\\(#\\)math_c99.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
||||
|
||||
/*
|
||||
* content bypass pattern - skip fix if pattern found
|
||||
*/
|
||||
tSCC zSolaris_Math_7Bypass0[] =
|
||||
"__GNUC__";
|
||||
|
||||
#define SOLARIS_MATH_7_TEST_CT 2
|
||||
static tTestDesc aSolaris_Math_7Tests[] = {
|
||||
{ TT_NEGREP, zSolaris_Math_7Bypass0, (regex_t*)NULL },
|
||||
{ TT_EGREP, zSolaris_Math_7Select0, (regex_t*)NULL }, };
|
||||
|
||||
/*
|
||||
* Fix Command Arguments for Solaris_Math_7
|
||||
*/
|
||||
static const char* apzSolaris_Math_7Patch[] = {
|
||||
"format",
|
||||
"#define\tisnormal(x) \\\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 ? 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 ? 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 };
|
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Description of Solaris_Math_8 fix
|
||||
|
|
@ -8605,9 +8456,9 @@ static const char* apzX11_SprintfPatch[] = {
|
|||
*
|
||||
* List of all fixes
|
||||
*/
|
||||
#define REGEX_COUNT 256
|
||||
#define REGEX_COUNT 250
|
||||
#define MACH_LIST_SIZE_LIMIT 261
|
||||
#define FIX_COUNT 211
|
||||
#define FIX_COUNT 208
|
||||
|
||||
/*
|
||||
* Enumerate the fixes
|
||||
|
|
@ -8751,9 +8602,6 @@ typedef enum {
|
|||
SOLARIS_MATH_2_FIXIDX,
|
||||
SOLARIS_MATH_3_FIXIDX,
|
||||
SOLARIS_MATH_4_FIXIDX,
|
||||
SOLARIS_MATH_5_FIXIDX,
|
||||
SOLARIS_MATH_6_FIXIDX,
|
||||
SOLARIS_MATH_7_FIXIDX,
|
||||
SOLARIS_MATH_8_FIXIDX,
|
||||
SOLARIS_MATH_9_FIXIDX,
|
||||
SOLARIS_MUTEX_INIT_1_FIXIDX,
|
||||
|
|
@ -9517,21 +9365,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
|
|||
SOLARIS_MATH_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
||||
aSolaris_Math_4Tests, apzSolaris_Math_4Patch, 0 },
|
||||
|
||||
{ zSolaris_Math_5Name, zSolaris_Math_5List,
|
||||
apzSolaris_Math_5Machs,
|
||||
SOLARIS_MATH_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
||||
aSolaris_Math_5Tests, apzSolaris_Math_5Patch, 0 },
|
||||
|
||||
{ zSolaris_Math_6Name, zSolaris_Math_6List,
|
||||
apzSolaris_Math_6Machs,
|
||||
SOLARIS_MATH_6_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
||||
aSolaris_Math_6Tests, apzSolaris_Math_6Patch, 0 },
|
||||
|
||||
{ zSolaris_Math_7Name, zSolaris_Math_7List,
|
||||
apzSolaris_Math_7Machs,
|
||||
SOLARIS_MATH_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
||||
aSolaris_Math_7Tests, apzSolaris_Math_7Patch, 0 },
|
||||
|
||||
{ zSolaris_Math_8Name, zSolaris_Math_8List,
|
||||
apzSolaris_Math_8Machs,
|
||||
SOLARIS_MATH_8_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
||||
|
|
|
|||
|
|
@ -3124,67 +3124,6 @@ fix = {
|
|||
"#define fpclassify(x) __builtin_fpclassify(x)";
|
||||
};
|
||||
|
||||
fix = {
|
||||
hackname = solaris_math_5;
|
||||
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
||||
bypass = "__GNUC__";
|
||||
files = iso/math_c99.h;
|
||||
c_fix = format;
|
||||
c_fix_arg = "#define\tisfinite(x) \\\n"
|
||||
" __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); })";
|
||||
c_fix_arg = "^#define[ \t]+isfinite\\(x\\)[ \t]+__builtin_isfinite\\(x\\)";
|
||||
test_text =
|
||||
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
||||
"#undef isfinite\n"
|
||||
"#define isfinite(x) __builtin_isfinite(x)";
|
||||
};
|
||||
|
||||
fix = {
|
||||
hackname = solaris_math_6;
|
||||
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
||||
bypass = "__GNUC__";
|
||||
files = iso/math_c99.h;
|
||||
c_fix = format;
|
||||
c_fix_arg = "#define\tisinf(x) \\\n"
|
||||
" __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); })";
|
||||
c_fix_arg = "^#define[ \t]+isinf\\(x\\)[ \t]+__builtin_isinf\\(x\\)";
|
||||
test_text =
|
||||
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
||||
"#undef isinf\n"
|
||||
"#define isinf(x) __builtin_isinf(x)";
|
||||
};
|
||||
|
||||
fix = {
|
||||
hackname = solaris_math_7;
|
||||
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
||||
bypass = "__GNUC__";
|
||||
files = iso/math_c99.h;
|
||||
c_fix = format;
|
||||
c_fix_arg = "#define\tisnormal(x) \\\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 ? 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 ? isgreaterequal(__builtin_fabsl(__x_n),__LDBL_MIN__) \\\n"
|
||||
"\t\t\t\t\t : isgreaterequal(__builtin_fabs(__x_n),__DBL_MIN__)), 1); })";
|
||||
c_fix_arg = "^#define[ \t]+isnormal\\(x\\)[ \t]+__builtin_isnormal\\(x\\)";
|
||||
test_text =
|
||||
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
|
||||
"#undef isnormal\n"
|
||||
"#define isnormal(x) __builtin_isnormal(x)";
|
||||
};
|
||||
|
||||
fix = {
|
||||
hackname = solaris_math_8;
|
||||
select = '@\(#\)math_c99.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
|
||||
|
|
|
|||
|
|
@ -51,46 +51,6 @@
|
|||
#endif /* SOLARIS_MATH_4_CHECK */
|
||||
|
||||
|
||||
#if defined( SOLARIS_MATH_5_CHECK )
|
||||
#ident "@(#)math_c99.h 1.9 04/11/01 SMI"
|
||||
#undef isfinite
|
||||
#define isfinite(x) \
|
||||
__extension__ ({ const __typeof (x) __x_f = (x); \
|
||||
__builtin_expect(sizeof(__x_f) == sizeof(float) \
|
||||
? islessequal(__builtin_fabsf(__x_f),__FLT_MAX__) \
|
||||
: sizeof(__x_f) == sizeof(long double) \
|
||||
? islessequal(__builtin_fabsl(__x_f),__LDBL_MAX__) \
|
||||
: islessequal(__builtin_fabs(__x_f),__DBL_MAX__), 1); })
|
||||
#endif /* SOLARIS_MATH_5_CHECK */
|
||||
|
||||
|
||||
#if defined( SOLARIS_MATH_6_CHECK )
|
||||
#ident "@(#)math_c99.h 1.9 04/11/01 SMI"
|
||||
#undef isinf
|
||||
#define isinf(x) \
|
||||
__extension__ ({ const __typeof (x) __x_i = (x); \
|
||||
__builtin_expect(sizeof(__x_i) == sizeof(float) \
|
||||
? isgreater(__builtin_fabsf(__x_i),__FLT_MAX__) \
|
||||
: sizeof(__x_i) == sizeof(long double) \
|
||||
? isgreater(__builtin_fabsl(__x_i),__LDBL_MAX__) \
|
||||
: isgreater(__builtin_fabs(__x_i),__DBL_MAX__), 0); })
|
||||
#endif /* SOLARIS_MATH_6_CHECK */
|
||||
|
||||
|
||||
#if defined( SOLARIS_MATH_7_CHECK )
|
||||
#ident "@(#)math_c99.h 1.9 04/11/01 SMI"
|
||||
#undef isnormal
|
||||
#define isnormal(x) \
|
||||
__extension__ ({ const __typeof(x) __x_n = (x); \
|
||||
__builtin_expect(isfinite(__x_n) \
|
||||
&& (sizeof(__x_n) == sizeof(float) \
|
||||
? isgreaterequal(__builtin_fabsf(__x_n),__FLT_MIN__) \
|
||||
: sizeof(__x_n) == sizeof(long double) \
|
||||
? isgreaterequal(__builtin_fabsl(__x_n),__LDBL_MIN__) \
|
||||
: isgreaterequal(__builtin_fabs(__x_n),__DBL_MIN__)), 1); })
|
||||
#endif /* SOLARIS_MATH_7_CHECK */
|
||||
|
||||
|
||||
#if defined( SOLARIS_MATH_8_CHECK )
|
||||
#ident "@(#)math_c99.h 1.9 04/11/01 SMI"
|
||||
#undef signbit
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue