diff options
| author | korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-12 04:00:32 +0000 |
|---|---|---|
| committer | korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-12 04:00:32 +0000 |
| commit | a1f85a87ee46821e09ed82407aed7eb5907941f2 (patch) | |
| tree | c967cfd01c1b8e2ab1072bea11f3bf9aa745ebf2 /fixincludes/inclhack.def | |
| parent | b5c4a747a850e4c8ee59e24b49482363f074b833 (diff) | |
| download | gcc-a1f85a87ee46821e09ed82407aed7eb5907941f2.tar.gz | |
undo some of the damage
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157399 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes/inclhack.def')
| -rw-r--r-- | fixincludes/inclhack.def | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 79295e6ecc8..88d2eebe2a0 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -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 * themselves, which are Sun Studio compiler intrinsics. Remove _Imaginary_I * 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\\)"; test_text = '#ident "@(#)math_c99.h 1.9 04/11/01 SMI"'"\n" - "#undef signbit\n" "#define signbit(x) __builtin_signbit(x)"; }; |