undo some of the damage

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157399 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 2 insertions, 107 deletions

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 572637e8454..b1d095fbba2 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,19 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
-<<<<<<< .mine
- * 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
+ * It has been AutoGen-ed  March 11, 2010 at 07:56:32 PM by AutoGen 5.10.1
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-<<<<<<< .mine
-/* 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
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Mar 11 19:56:32 PST 2010
  *
  * 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
  */
 tSCC zSolaris_ComplexName[] =
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)";
 };