diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-14 23:59:48 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-14 23:59:48 +0000 |
| commit | 19754f2bc5c13782e2a7c5065bfede9299f723f6 (patch) | |
| tree | fd1048b792f897e82eb68a18af704ad9417bd01b | |
| parent | 58841df845bd3af33863522070a28bce87ac3e37 (diff) | |
| download | gcc-19754f2bc5c13782e2a7c5065bfede9299f723f6.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100960 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | fixincludes/ChangeLog | 9 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 6 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 7 | ||||
| -rw-r--r-- | fixincludes/tests/base/math.h | 1 |
4 files changed, 18 insertions, 5 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 7ecea475eba..b985434dafd 100644 --- 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 9b39019fe6f..a91d8e3b74b 100644 --- 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 447997b14fb..798e8bcb207 100644 --- 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 945cc04e11e..37d34c58d60 100644 --- 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 */ |