diff options
| author | David Edelsohn <edelsohn@gnu.org> | 2000-09-29 17:47:32 +0000 |
|---|---|---|
| committer | David Edelsohn <dje@gcc.gnu.org> | 2000-09-29 13:47:32 -0400 |
| commit | a1c63101c48412ffcac56f9c4bb32383f86c3c32 (patch) | |
| tree | a0e8da45ca61fbae492531eddd28c816037471c0 /gcc | |
| parent | 70dd0f7f41c65dd4162cc5184c519bfbec805cfb (diff) | |
| download | gcc-a1c63101c48412ffcac56f9c4bb32383f86c3c32.zip gcc-a1c63101c48412ffcac56f9c4bb32383f86c3c32.tar.gz gcc-a1c63101c48412ffcac56f9c4bb32383f86c3c32.tar.bz2 | |
inclhack.def (broken_cabs): Generalize regex.
* fixinc/inclhack.def (broken_cabs): Generalize regex.
* fixinc/fixincl.x: Regenerate.
From-SVN: r36669
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 4 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 86baecc..a0aae79 100644 --- 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 4fe9d9d..c226081 100644 --- 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 d3e5202..c5f9bdc 100644 --- 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. */"; |