Daniel Franke - [fixincludes, backport, committed] PR30272, remove cabsl from math.h (original) (raw)

This is the mail archive of the gcc-patches@gcc.gnu.orgmailing list for the GCC project.

• From: Daniel Franke
• To: gcc-patches at gcc dot gnu dot org
• Cc: Philippe Schaffnit
• Date: Tue, 6 Feb 2007 20:12:25 +0200
• Subject: [fixincludes, backport, committed] PR30272, remove cabsl from math.h

Committed to 4.2 branch:

2007-02-07 Daniel Franke franke.daniel@gmail.com

    Backport from mainline:
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.

Tested on mips-sgi-irix6.5 by Philippe Schaffnit and on i686-pc-linux-gnu by myself.

Regards Daniel

Index: inclhack.def

--- inclhack.def (revision 121654) +++ inclhack.def (working copy) @@ -1032,9 +1032,8 @@ 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[ \t]*\([^\)]*\);"; + sed = "s/^extern[ \t]*double[ \t]*cabs[ \t]*([^\)]*);//"; + sed = "s/^extern[ \t]*long[ \t]*double[ \t]*cabsl[ \t]*([^\)]);//"; test_text = "#ifdef __STDC__\n" "extern double cabs(struct dbl_hypot);\n" @@ -1044,7 +1043,8 @@ "extern double cabs ( _Complex z );\n" "extern double cabs(); / This is a comment\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 );"; }; / Index: fixincl.x

--- fixincl.x (revision 121654) +++ fixincl.x (working copy) @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Thursday November 2, 2006 at 04:04:21 PM PST + * It has been AutoGen-ed Tuesday February 6, 2007 at 06:51:14 PM CET * From the definitions inclhack.def * and the template file fixincl / -/ DO NOT CVS-MERGE THIS FILE, EITHER Thu Nov 2 16:04:21 PST 2006 +/* DO NOT CVS-MERGE THIS FILE, EITHER Di 6. Feb 18:51:14 CET 2007 * * You must regenerate it. Use the ./genfixes script. * @@ -1673,10 +1673,9 @@ /* * Fix Command Arguments for Broken_Cabs / -static const char apzBroken_CabsPatch[] = { - "format", - "", - "^extern[ \t]+double[ \t]+cabs[ \t]\([^\)]\);", +static const char apzBroken_CabsPatch[] = { "sed", + "-e", "s/^extern[ \t]double[ \t]cabs[ \t]([^\)]);//", + "-e", "s/^extern[ \t]long[ \t]double[ \t]cabsl[ \t]([^\)]);//", (char)NULL }; / * * * * * * * * * * * * * * * * * * * * * * * * * @@ -8658,7 +8657,7 @@ { zBroken_CabsName, zBroken_CabsList, apzBroken_CabsMachs, - BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + BROKEN_CABS_TEST_CT, FD_MACH_ONLY, aBroken_CabsTests, apzBroken_CabsPatch, 0 }, { zBroken_NanName, zBroken_NanList, Index: tests/base/math.h

--- tests/base/math.h (revision 121654) +++ tests/base/math.h (working copy) @@ -34,6 +34,7 @@ /* This is a comment and it ends here. / + #endif / BROKEN_CABS_CHECK */