diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2003-08-01 22:48:24 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2003-08-01 22:48:24 +0000 |
| commit | 93b8a7a857dd21c1960575c00828f1af0883de7f (patch) | |
| tree | 6372b18e8603b152b4920cb2f2a759e6398b48c2 /gcc/fixinc | |
| parent | f920765d48d5349329051d416b44601295362870 (diff) | |
| download | gcc-93b8a7a857dd21c1960575c00828f1af0883de7f.zip gcc-93b8a7a857dd21c1960575c00828f1af0883de7f.tar.gz gcc-93b8a7a857dd21c1960575c00828f1af0883de7f.tar.bz2 | |
inclhack.def (broken_cabs): Make matching more generous.
* fixinc/inclhack.def (broken_cabs): Make matching more generous.
* fixinc/fixincl.x: Regenerate.
* fixinc/tests/base/math.h: Regenerate to match test_text change.
From-SVN: r70076
Diffstat (limited to 'gcc/fixinc')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 8 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 10 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/math.h | 1 |
3 files changed, 12 insertions, 7 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 5b0edc7..5522a55 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Thursday July 31, 2003 at 07:32:15 PM EDT + * It has been AutoGen-ed Friday August 1, 2003 at 06:47:22 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Jul 31 19:32:15 EDT 2003 +/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Aug 1 18:47:22 EDT 2003 * * You must regenerate it. Use the ./genfixes script. * @@ -1270,7 +1270,7 @@ tSCC zBroken_CabsName[] = * File name selection pattern */ tSCC zBroken_CabsList[] = - "|math.h|"; + "|math.h|architecture/ppc/math.h|architecture/i386/math.h|"; /* * Machine/OS name selection pattern */ @@ -1292,7 +1292,7 @@ static tTestDesc aBroken_CabsTests[] = { static const char* apzBroken_CabsPatch[] = { "format", "", - "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);", + "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 2958fe6..7c5922b 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -783,21 +783,25 @@ fix = { * This conflicts with C99. Discovered on AIX. * SunOS4 has its cabs() declaration followed by a comment which * terminates on the following line. + * Darwin hides its broken cabs in architecture-specific subdirs. */ fix = { hackname = broken_cabs; - files = "math.h"; - select = '^extern[ \t]+double[ \t]+cabs'; + files = "math.h"; + files = "architecture/ppc/math.h"; + files = "architecture/i386/math.h"; + select = '^extern[ \t]+double[ \t]+cabs'; c_fix = format; c_fix_arg = ""; - c_fix_arg = "^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);"; + c_fix_arg = "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);"; test_text = "#ifdef __STDC__\n" "extern double cabs(struct dbl_hypot);\n" "#else\n" "extern double cabs();\n" "#endif\n" + "extern double cabs ( _Complex z );\n" "extern double cabs(); /* This is a comment\n" " and it ends here. */"; }; diff --git a/gcc/fixinc/tests/base/math.h b/gcc/fixinc/tests/base/math.h index cff0a59..51fe6b5 100644 --- a/gcc/fixinc/tests/base/math.h +++ b/gcc/fixinc/tests/base/math.h @@ -25,6 +25,7 @@ struct exception; #else #endif + /* This is a comment and it ends here. */ #endif /* BROKEN_CABS_CHECK */ |