re PR target/15266 (libgfortran doesn't compile on IRIX 5.3)

	PR libfortran/15266
	* inclhack.def (broken_cabs): Mention IRIX 5/6 problem.
	Use double quotes in select so \t matches tabs.
	Add IRIX testcase.
	* fixincl.x: Regenerate.
	* tests/base/math.h [BROKEN_CABS_CHECK]: Adapt for new testcase.

From-SVN: r100960

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 7ecea475ebad0935d47f3b55764b896007303a98..b985434dafd9a41af2580b60ec238925cc6d7260 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-15  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       PR libfortran/15266
+       * inclhack.def (broken_cabs): Mention IRIX 5/6 problem.
+       Use double quotes in select so \t matches tabs.
+       Add IRIX testcase.
+       * fixincl.x: Regenerate.
+       * tests/base/math.h [BROKEN_CABS_CHECK]: Adapt for new testcase.
+
 2005-05-22  Danny Smith  <dannysmith@users.souceforge.net>
 
        PR target/21683

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 9b39019fe6fa2335224107ef7bbe71563b476648..a91d8e3b74bba68cfcd0a020f1ac6bab8c5d3dae 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  Thursday May 19, 2005 at 08:56:10 AM CEST
+ * It has been AutoGen-ed  Wednesday June  8, 2005 at 12:02:02 AM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Thu May 19 08:56:10 CEST 2005
+/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Jun  8 00:02:03 MEST 2005
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -1511,7 +1511,7 @@ tSCC zBroken_CabsList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zBroken_CabsSelect0[] =
-       "^extern[ \\t]+double[ \\t]+cabs";
+       "^extern[ \t]+double[ \t]+cabs";
 
 #define    BROKEN_CABS_TEST_CT  1
 static tTestDesc aBroken_CabsTests[] = {

diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 447997b14fb749fc0f85fa87e36d72cdc66565c3..798e8bcb207cd80bd970a4ea378bf2b60d9c6d11 100644 (file)
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -907,6 +907,8 @@ fix = {
 /*
  *  Remove `extern double cabs' declarations from math.h.
  *  This conflicts with C99.  Discovered on AIX.
+ *  IRIX 5 and IRIX 6 before 6.5.18 (where C99 support was introduced)
+ *  declares cabs() to take a struct __cabs_s argument.
  *  SunOS4 has its cabs() declaration followed by a comment which
  *  terminates on the following line.
  *  Darwin hides its broken cabs in architecture-specific subdirs.
@@ -916,7 +918,7 @@ fix = {
     files    = "math.h";
     files    = "architecture/ppc/math.h";
     files    = "architecture/i386/math.h";
-    select   = '^extern[ \t]+double[ \t]+cabs';
+    select   = "^extern[ \t]+double[ \t]+cabs";
 
     c_fix     = format;
     c_fix_arg = "";
@@ -929,7 +931,8 @@ fix = {
                 "#endif\n"
                 "extern double cabs ( _Complex z );\n"
                 "extern double cabs(); /* This is a comment\n"
-                "                         and it ends here. */";
+                "                         and it ends here. */\n"
+               "extern double  cabs(struct __cabs_s);";
 };
 
 

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