re PR target/30272 (Build failure under SGI Irix (GFortran))

2007-01-25  Daniel Franke <franke.daniel@gmail.com>

        PR target/30272
        * inclhack.def(broken_cabs): Also remove definition of cabsl.
        * fixincl.x: Regenerate.
        * tests/base/math.h: Update.

From-SVN: r121182
This commit is contained in:
Daniel Franke 2007-01-25 14:25:01 -05:00 committed by Daniel Franke
parent 79e8b6c016
commit a942e89f3a
4 changed files with 18 additions and 11 deletions

View File

@ -1,3 +1,10 @@
2007-01-25 Daniel Franke <franke.daniel@gmail.com>
PR target/30272
* inclhack.def(broken_cabs): Also remove definition of cabsl.
* fixincl.x: Regenerate.
* tests/base/math.h: Update.
2007-01-05 Bruce Korb <bkorb@gnu.org>, 2007-01-05 Bruce Korb <bkorb@gnu.org>,
Daniel Franke <franke.daniel@gmail.com> Daniel Franke <franke.daniel@gmail.com>

View File

@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
* It has been AutoGen-ed Saturday January 6, 2007 at 10:08:19 AM PST * It has been AutoGen-ed Monday January 15, 2007 at 09:38:13 PM CET
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl * and the template file fixincl
*/ */
/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Jan 6 10:08:19 PST 2007 /* DO NOT SVN-MERGE THIS FILE, EITHER Mo Jan 15 21:38:13 CET 2007
* *
* You must regenerate it. Use the ./genfixes script. * You must regenerate it. Use the ./genfixes script.
* *
@ -1676,10 +1676,9 @@ static tTestDesc aBroken_CabsTests[] = {
/* /*
* Fix Command Arguments for Broken_Cabs * Fix Command Arguments for Broken_Cabs
*/ */
static const char* apzBroken_CabsPatch[] = { static const char* apzBroken_CabsPatch[] = { "sed",
"format", "-e", "s/^extern[ \t]*double[ \t]*cabs[ \t]*([^\\)]*);//",
"", "-e", "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*([^\\)]*);//",
"^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
@ -8820,7 +8819,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
{ zBroken_CabsName, zBroken_CabsList, { zBroken_CabsName, zBroken_CabsList,
apzBroken_CabsMachs, apzBroken_CabsMachs,
BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, BROKEN_CABS_TEST_CT, FD_MACH_ONLY,
aBroken_CabsTests, apzBroken_CabsPatch, 0 }, aBroken_CabsTests, apzBroken_CabsPatch, 0 },
{ zBroken_NanName, zBroken_NanList, { zBroken_NanName, zBroken_NanList,

View File

@ -1031,9 +1031,8 @@ fix = {
files = math.h, "architecture/*/math.h"; files = math.h, "architecture/*/math.h";
select = "^extern[ \t]+double[ \t]+cabs"; select = "^extern[ \t]+double[ \t]+cabs";
c_fix = format; sed = "s/^extern[ \t]*double[ \t]*cabs[ \t]*\([^\\\)]*\);//";
c_fix_arg = ""; sed = "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*\([^\\\)]*\);//";
c_fix_arg = "^extern[ \t]+double[ \t]+cabs[ \t]*\\([^\\)]*\\);";
test_text = "#ifdef __STDC__\n" test_text = "#ifdef __STDC__\n"
"extern double cabs(struct dbl_hypot);\n" "extern double cabs(struct dbl_hypot);\n"
@ -1043,7 +1042,8 @@ fix = {
"extern double cabs ( _Complex z );\n" "extern double cabs ( _Complex z );\n"
"extern double cabs(); /* This is a comment\n" "extern double cabs(); /* This is a comment\n"
" and it ends here. */\n" " and it ends here. */\n"
"extern double cabs(struct __cabs_s);"; "extern double cabs(struct __cabs_s);\n"
"extern long double cabsl( struct __cabsl_s );";
}; };
/* /*

View File

@ -34,6 +34,7 @@ struct exception;
/* This is a comment /* This is a comment
and it ends here. */ and it ends here. */
#endif /* BROKEN_CABS_CHECK */ #endif /* BROKEN_CABS_CHECK */