From 78ff95dc17c157fafe2169b9e0bb47c2417dce85 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 17 Jul 2003 18:43:37 +0000 Subject: [PATCH] inclhack.def (solaris_mutex_init_2): Escape braces in regexp that don't form a range expression. * fixinc/inclhack.def (solaris_mutex_init_2): Escape braces in regexp that don't form a range expression. * fixinc/fixincl.def: Regenerate. From-SVN: r69517 --- gcc/ChangeLog | 18 ++++++++++++------ gcc/fixinc/fixincl.x | 6 +++--- gcc/fixinc/inclhack.def | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 44832d1e210..2c988b9d705 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,9 +1,15 @@ +2003-07-17 Zack Weinberg + + * fixinc/inclhack.def (solaris_mutex_init_2): Escape braces + in regexp that don't form a range expression. + * fixinc/fixincl.def: Regenerate. + 2003-07-17 Richard Henderson - PR target/10907 - * config/ia64/ia64.c (ia64_epilogue_uses): GP is live at end - even with !TARGET_CONST_GP. - (ia64_function_ok_for_sibcall): Reject non-local functions. + PR target/10907 + * config/ia64/ia64.c (ia64_epilogue_uses): GP is live at end + even with !TARGET_CONST_GP. + (ia64_function_ok_for_sibcall): Reject non-local functions. 2003-07-17 Steven Bosscher @@ -25,7 +31,7 @@ Move the entry of "-mimpure-text" before that of "-mv8". 2003-07-17 Eric Botcazou - Phil Edwards + Phil Edwards * doc/install.texi (*-*-solaris2*): Document the step-by-step procedure to bootstrap and install. @@ -107,7 +113,7 @@ objc: (simplify_rtx): Likewise. Simplify (lo_sum (high X) X) as X. 2003-07-16 Andrew Pinski - + * doc/install.texi (--without-headers): New. Partial Fix PR/10129 diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 8bb2b0fcb8a..c25527be893 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 Monday July 14, 2003 at 08:37:56 PM EDT + * It has been AutoGen-ed Thursday July 17, 2003 at 10:34:33 AM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Jul 14 20:37:56 EDT 2003 +/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Jul 17 10:34:33 PDT 2003 * * You must regenerate it. Use the ./genfixes script. * @@ -3968,7 +3968,7 @@ static const char* apzSolaris_Mutex_Init_2Patch[] = { #else\n\ %1, {0}}%3\n\ #endif", - "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*),[ \t]*0}(|[ \t].*)$", + "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+\\{.*),[ \t]*0\\}(|[ \t].*)$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 63f5ce00ce4..7fd6f451da0 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2198,8 +2198,8 @@ fix = { "#else\n" "%1, {0}}%3\n" "#endif"; - c_fix_arg = "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*)" - ",[ \t]*0}" "(|[ \t].*)$"; + c_fix_arg = "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+\\{.*)" + ",[ \t]*0\\}" "(|[ \t].*)$"; test_text = '#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n" "#define PTHREAD_MUTEX_INITIALIZER\t{{{0},0}, {{{0}}}, 0}\n"