OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

undo some of the damage

Browse Source 
From-SVN: r157399
This commit is contained in:
Bruce Korb 2010-03-12 04:00:32 +00:00
parent bbf92edb2c
commit 41279bc8c5
2 changed files with 2 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
fixincludes/fixincl.x
View File

@ -2,19 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
<<<<<<< .mine * It has been AutoGen-ed March 11, 2010 at 07:56:32 PM by AutoGen 5.10.1
* It has been AutoGen-ed September 5, 2009 at 01:31:09 PM by AutoGen 5.9.9
=======
* It has been AutoGen-ed Friday January 29, 2010 at 04:49:43 PM MET
>>>>>>> .r157397
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl * and the template file fixincl
*/ */
<<<<<<< .mine /* DO NOT SVN-MERGE THIS FILE, EITHER Thu Mar 11 19:56:32 PST 2010
/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Sep 5 13:31:09 PDT 2009
=======
/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jan 29 16:49:43 MET 2010
>>>>>>> .r157397
* *
* You must regenerate it. Use the ./genfixes script. * You must regenerate it. Use the ./genfixes script.
* *
@ -6122,63 +6114,6 @@ static const char* apzRs6000_ParamPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
<<<<<<< .mine
* 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\n",
"-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__ */\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
=======
>>>>>>> .r157397
* Description of Solaris_Complex fix * Description of Solaris_Complex fix
*/ */
tSCC zSolaris_ComplexName[] = tSCC zSolaris_ComplexName[] =

40
fixincludes/inclhack.def
View File

@ -3248,45 +3248,6 @@ fix = {
/* /*
<<<<<<< .mine
* On OpenServer and on UnixWare 7, <math.h> uses the native compiler
* __builtin_generic. We fix that usage to use the GCC equivalent.
* It also has a plethora of inline functions that conflict with libstdc++.
*/
fix = {
hackname = sco_math;
files = math.h, '*/math.h';
select = "inline double abs";
bypass = "__GNUG__";
sed = "/#define.*__fp_class(a) \\\\/i\\\n"
"#ifndef __GNUC__\n";
sed =
"/.*__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\n";
sed = "/extern \"C++\"/N;"
"/inline double abs/i\\\n"
"#ifndef __GNUC__\n";
sed = "/inline long double trunc/N;"
"/inline long double trunc.*}.*extern \"C++\"/a\\\n"
"#endif /* ! __GNUC__ */\n";
test_text =
"#define __fp_class(a) \\\\\n"
" __builtin_generic(a,\"ld:__fplcassifyl;f:__fpclassifyf;:__fpclassify\")\n";
};
/*
=======
>>>>>>> .r157397
* Solaris 10+ complex.h defines _Complex_I and _Imaginary_I in terms of * Solaris 10+ complex.h defines _Complex_I and _Imaginary_I in terms of
* themselves, which are Sun Studio compiler intrinsics. Remove _Imaginary_I * themselves, which are Sun Studio compiler intrinsics. Remove _Imaginary_I
* and imaginary definitions which are not supported by GCC. * and imaginary definitions which are not supported by GCC.
@ -3390,7 +3351,6 @@ fix = {
c_fix_arg = "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)"; c_fix_arg = "^#define[ \t]+signbit\\(x\\)[ \t]+__builtin_signbit\\(x\\)";
test_text = test_text =
'#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n" '#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n"
"#undef signbit\n"
"#define signbit(x) __builtin_signbit(x)"; "#define signbit(x) __builtin_signbit(x)";
}; };