inclhack.def (solaris_mutex_init_2): Escape braces in regexp that don't form a range...

	* 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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 44832d1e2105a458cb546c25dbbfeb6a637c3cf1..2c988b9d705120a008d5ef74ba7d507b959fb6de 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,9 +1,15 @@
+2003-07-17  Zack Weinberg  <zack@codesourcery.com>
+
+       * 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  <rth@redhat.com>
 
-        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  <steven@gcc.gnu.org>
 
@@ -25,7 +31,7 @@
        Move the entry of "-mimpure-text" before that of "-mv8".
 
 2003-07-17  Eric Botcazou <ebotcazou@libertysurf.fr>
-            Phil Edwards <phil@jaj.com>
+           Phil Edwards <phil@jaj.com>
 
        * 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  <pinskia@physics.uc.edu>
-       
+
        * doc/install.texi (--without-headers): New.
 
        Partial Fix PR/10129

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 8bb2b0fcb8a6678b6e5099325fea3812feab20dc..c25527be893d8a82371979efb77378c34f1ad88b 100644 (file)
--- 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 63f5ce00ce4b07c16fd1ee603f7114f2db7094b5..7fd6f451da029df18c6996b87c6aaebdc6a5f277 100644 (file)
--- 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"