From b87809441e5e0db81717e55fa25e04348298bfdd Mon Sep 17 00:00:00 2001 From: davek Date: Tue, 5 Feb 2008 02:36:32 +0000 Subject: [PATCH] 2008-02-04 Ismail Dnmez * inclhack.def: (bsd_stdio_attrs_conflict, freebsd_gcc3_breakage, freebsd_gcc4_breakage, hppa_hpux_fp_macros, hpux11_abs, netbsd_c99_inline_1, netbsd_c99_inline_2, netbsd_extra_semicolon): Add quotes around mach entries. * fixincl.x: Regenerate with latest autogen (5.9.4), updating license to GPLv3. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132110 138bc75d-0d04-0410-961f-82ee72b054a4 --- fixincludes/ChangeLog | 9 +++++++++ fixincludes/fixincl.x | 25 ++++++++++--------------- fixincludes/inclhack.def | 18 +++++++++--------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 48b6cc18df2..7a8c78a99cd 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,12 @@ +2008-02-04 Ismail Dönmez + + * inclhack.def: (bsd_stdio_attrs_conflict, freebsd_gcc3_breakage, + freebsd_gcc4_breakage, hppa_hpux_fp_macros, hpux11_abs, + netbsd_c99_inline_1, netbsd_c99_inline_2, netbsd_extra_semicolon): Add + quotes around mach entries. + * fixincl.x: Regenerate with latest autogen (5.9.4), updating license + to GPLv3. + 2008-02-04 Hans-Peter Nilsson PR other/31405 diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 3be69a6b4dc..f6602004e62 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 Monday January 7, 2008 at 09:24:53 PM CET + * It has been AutoGen-ed Monday February 4, 2008 at 09:22:58 PM GMTST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jan 7 21:24:53 CET 2008 +/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Feb 4 21:22:58 GMTST 2008 * * You must regenerate it. Use the ./genfixes script. * @@ -22,23 +22,18 @@ * inclhack copyright (c) 1998, 1999, 2000, 2001 * The Free Software Foundation, Inc. * - * inclhack is free software. + * inclhack is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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 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 + * inclhack is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with inclhack. If not, write to: - * The Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /* * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index cff517b366e..fd8a694a9f7 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -1085,8 +1085,8 @@ fix = { */ fix = { hackname = bsd_stdio_attrs_conflict; - mach = *-*-*bsd*; - mach = *-*-*darwin*; + mach = "*-*-*bsd*"; + mach = "*-*-*darwin*"; files = stdio.h; select = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$"; c_fix = format; @@ -1303,7 +1303,7 @@ fix = { */ fix = { hackname = freebsd_gcc3_breakage; - mach = *-*-freebsd*; + mach = "*-*-freebsd*"; files = sys/cdefs.h; select = '^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7$'; bypass = '__GNUC__[ \t]*([>=]=[ \t]*[3-9]|>[ \t]*2)'; @@ -1320,7 +1320,7 @@ fix = { */ fix = { hackname = freebsd_gcc4_breakage; - mach = *-*-freebsd*; + mach = "*-*-freebsd*"; files = sys/cdefs.h; select = '^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 \|\| __GNUC__ == 3$'; c_fix = format; @@ -1602,7 +1602,7 @@ fix = { fix = { hackname = hppa_hpux_fp_macros; - mach = hppa*-hp-hpux11*; + mach = "hppa*-hp-hpux11*"; files = math.h; select = "#[ \t]*define[ \t]*FP_NORMAL.*\n" "#[ \t]*define[ \t]*FP_ZERO.*\n" @@ -1711,7 +1711,7 @@ fix = { */ fix = { hackname = hpux11_abs; - mach = ia64-hp-hpux11*; + mach = "ia64-hp-hpux11*"; files = stdlib.h; select = "ifndef _MATH_INCLUDED"; c_fix = format; @@ -2653,7 +2653,7 @@ fix = { */ fix = { hackname = netbsd_c99_inline_1; - mach = *-*-netbsd*; + mach = "*-*-netbsd*"; files = signal.h; select = "extern __inline int"; @@ -2666,7 +2666,7 @@ fix = { fix = { hackname = netbsd_c99_inline_2; - mach = *-*-netbsd*; + mach = "*-*-netbsd*"; files = signal.h; select = "#define _SIGINLINE extern __inline"; @@ -2688,7 +2688,7 @@ fix = { */ fix = { hackname = netbsd_extra_semicolon; - mach = *-*-netbsd*; + mach = "*-*-netbsd*"; files = sys/cdefs.h; select = "#define[ \t]*__END_DECLS[ \t]*};"; -- 2.11.4.GIT