re PR target/30272 (Build failure under SGI Irix (GFortran))

2007-01-25  Daniel Franke <franke.daniel@gmail.com>

        PR target/30272
        * inclhack.def(broken_cabs): Also remove definition of cabsl.
        * fixincl.x: Regenerate.
        * tests/base/math.h: Update.

From-SVN: r121182

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index b22314e..0149f62 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-25  Daniel Franke <franke.daniel@gmail.com>
+
+       PR target/30272
+       * inclhack.def(broken_cabs): Also remove definition of cabsl.
+       * fixincl.x: Regenerate.
+       * tests/base/math.h: Update.
+
 2007-01-05  Bruce Korb <bkorb@gnu.org>, 
             Daniel Franke <franke.daniel@gmail.com>
 

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 6c080fa..795b852 100644 (file)
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Saturday January  6, 2007 at 10:08:19 AM PST
+ * It has been AutoGen-ed  Monday January 15, 2007 at 09:38:13 PM CET
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Jan  6 10:08:19 PST 2007
+/* DO NOT SVN-MERGE THIS FILE, EITHER Mo Jan 15 21:38:13 CET 2007
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -1676,10 +1676,9 @@ static tTestDesc aBroken_CabsTests[] = {
 /*
  *  Fix Command Arguments for Broken_Cabs
  */
-static const char* apzBroken_CabsPatch[] = {
-    "format",
-    "",
-    "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);",
+static const char* apzBroken_CabsPatch[] = { "sed",
+    "-e", "s/^extern[ \t]*double[ \t]*cabs[ \t]*([^\\)]*);//",
+    "-e", "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*([^\\)]*);//",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -8820,7 +8819,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
 
   {  zBroken_CabsName,    zBroken_CabsList,
      apzBroken_CabsMachs,
-     BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     BROKEN_CABS_TEST_CT, FD_MACH_ONLY,
      aBroken_CabsTests,   apzBroken_CabsPatch, 0 },
 
   {  zBroken_NanName,    zBroken_NanList,

diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index c52e4a0..242f5af 100644 (file)
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1031,9 +1031,8 @@ fix = {
     files    = math.h, "architecture/*/math.h";
     select   = "^extern[ \t]+double[ \t]+cabs";
 
-    c_fix     = format;
-    c_fix_arg = "";
-    c_fix_arg = "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);";
+    sed       = "s/^extern[ \t]*double[ \t]*cabs[ \t]*\([^\\\)]*\);//";
+    sed       = "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*\([^\\\)]*\);//";
 
     test_text = "#ifdef __STDC__\n"
                 "extern     double   cabs(struct dbl_hypot);\n"
@@ -1043,7 +1042,8 @@ fix = {
                 "extern double cabs ( _Complex z );\n"
                 "extern double cabs(); /* This is a comment\n"
                 "                         and it ends here. */\n"
-               "extern double  cabs(struct __cabs_s);";
+                "extern double cabs(struct __cabs_s);\n"
+                "extern long double cabsl( struct __cabsl_s );";
 };
 
 /*

diff --git a/fixincludes/tests/base/math.h b/fixincludes/tests/base/math.h
index fbe670e..6b6ae09 100644 (file)
--- a/fixincludes/tests/base/math.h
+++ b/fixincludes/tests/base/math.h
@@ -34,6 +34,7 @@ struct exception;
  /* This is a comment
                          and it ends here. */
 
+
 #endif  /* BROKEN_CABS_CHECK */