inclhack.def (broken_cabs): Generalize regex.

	* fixinc/inclhack.def (broken_cabs): Generalize regex.
	* fixinc/fixincl.x: Regenerate.

From-SVN: r36669

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86baeccd6ba2c433fac0928ad09f2b58571b2ca2..a0aae79343a7e7f36bc61ed85681614d1bb990c0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-29  David Edelsohn  <edelsohn@gnu.org>
+
+       * fixinc/inclhack.def (broken_cabs): Generalize regex.
+       * fixinc/fixincl.x: Regenerate.
+
 2000-09-29  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
        * loop.c (check_final_value): A GIV is not replaceable if used

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 4fe9d9ddf76797d391ae56e4445f49b9127ede34..c22608163f96a948e8b8df4b0915de4e9b4ed856 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1510,7 +1510,7 @@ tSCC zBroken_CabsList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zBroken_CabsSelect0[] =
-       "^extern double cabs";
+       "^extern[ \\t]+double[ \\t]+cabs";
 
 #define    BROKEN_CABS_TEST_CT  1
 static tTestDesc aBroken_CabsTests[] = {
@@ -1522,7 +1522,7 @@ static tTestDesc aBroken_CabsTests[] = {
 static const char* apzBroken_CabsPatch[] = {
     "format",
     "",
-    "^extern double cabs\\((struct dbl_hypot|)\\);",
+    "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index d3e52024eff7395c35775edd092eed64c030ed5a..c5f9bdce68b5a3f1006d46a8337da660bb29a6bc 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -883,16 +883,16 @@ fix = {
 fix = {
     hackname = broken_cabs;
     files  = "math.h";
-    select = '^extern double cabs';
+    select = '^extern[ \t]+double[ \t]+cabs';
 
     c_fix     = format;
     c_fix_arg = "";
-    c_fix_arg = "^extern double cabs\\((struct dbl_hypot|)\\);";
+    c_fix_arg = "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);";
 
     test_text = "#ifdef __STDC__\n"
-                "extern double cabs(struct dbl_hypot);\n"
+                "extern     double   cabs(struct dbl_hypot);\n"
                 "#else\n"
-                "extern double cabs();\n"
+                "extern     double   cabs();\n"
                 "#endif\n"
                 "extern double cabs(); /* This is a comment\n"
                 "                         and it ends here. */";