From 297a4a88aa4714fd0d2f7353d34d89f231a2a31d Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Mon, 7 Nov 2005 22:47:55 +0000 Subject: [PATCH] inclhack.def (sco_math): Add bypass. * fixinc/inclhack.def (sco_math): Add bypass. * fixinc/fixincl.x: Regenerate. From-SVN: r106617 --- gcc/ChangeLog | 6 ++++++ gcc/fixinc/fixincl.x | 35 +++++++++++++++++++++++++---------- gcc/fixinc/inclhack.def | 2 ++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 658eba4c5393..c8e7587fd2cb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-11-07 Steve Ellcey + + PR bootstrap/24688 + * fixinc/inclhack.def (sco_math): Add bypass. + * fixinc/fixincl.x: Regenerate. + 2005-11-07 James E Wilson PR preprocessor/15220 diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index e943e4c6a063..b9eb929b4b97 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 Saturday May 21, 2005 at 05:04:48 PM CEST + * It has been AutoGen-ed Monday November 7, 2005 at 02:33:08 PM PST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Sat May 21 17:04:48 CEST 2005 +/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Nov 7 14:33:08 PST 2005 * * You must regenerate it. Use the ./genfixes script. * @@ -26,7 +26,8 @@ * * You may redistribute it and/or modify it under the terms of the * GNU General Public License, as published by the Free Software - * Foundation; either version 2, or (at your option) any later version. + * Foundation; either version 2 of the License, or (at your option) + * any later version. * * inclhack is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -34,10 +35,10 @@ * See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with inclhack. See the file "COPYING". If not, - * write to: The Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * along with inclhack. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. */ /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -4380,8 +4381,15 @@ tSCC zSco_MathList[] = tSCC zSco_MathSelect0[] = "inline double abs"; -#define SCO_MATH_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSco_MathBypass0[] = + "__GNUG__"; + +#define SCO_MATH_TEST_CT 2 static tTestDesc aSco_MathTests[] = { + { TT_NEGREP, zSco_MathBypass0, (regex_t*)NULL }, { TT_EGREP, zSco_MathSelect0, (regex_t*)NULL }, }; /* @@ -6141,8 +6149,15 @@ tSCC zSysz_Stdlib_For_SunList[] = tSCC zSysz_Stdlib_For_SunSelect0[] = "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\("; -#define SYSZ_STDLIB_FOR_SUN_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zSysz_Stdlib_For_SunBypass0[] = + "_CLASSIC_ANSI_TYPES"; + +#define SYSZ_STDLIB_FOR_SUN_TEST_CT 2 static tTestDesc aSysz_Stdlib_For_SunTests[] = { + { TT_NEGREP, zSysz_Stdlib_For_SunBypass0, (regex_t*)NULL }, { TT_EGREP, zSysz_Stdlib_For_SunSelect0, (regex_t*)NULL }, }; /* @@ -7538,7 +7553,7 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 221 +#define REGEX_COUNT 223 #define MACH_LIST_SIZE_LIMIT 261 #define FIX_COUNT 188 diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index bc0a6ff553f9..3bd13ad06aa4 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2422,6 +2422,7 @@ fix = { files = ods_30_compat/math.h; files = oldstyle/math.h; select = "inline double abs"; + bypass = "__GNUG__"; sed = "/#define.*__fp_class(a) \\\\/i\\\n" "#ifndef __GNUC__\n"; sed = @@ -3668,6 +3669,7 @@ fix = { fix = { hackname = sysz_stdlib_for_sun; files = stdlib.h; + bypass = "_CLASSIC_ANSI_TYPES"; select = "char[ \t]*\\*[ \t]*(calloc|malloc|realloc|bsearch)[ \t]*\\("; c_fix = format; -- 2.47.2