diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2006-09-29 19:14:58 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2006-09-29 19:14:58 +0000 |
| commit | a77d42cf21045ccdc2dfe83082fd56f4906ef36c (patch) | |
| tree | a90431ae9f443273785d6aa6f3f715b217aa2583 /fixincludes/fixincl.x | |
| parent | 504652cb4501b29e69030425430013c5b533bbbf (diff) | |
| download | gcc-a77d42cf21045ccdc2dfe83082fd56f4906ef36c.tar.gz | |
inclhack.def (solaris_mutex_init_2): Update for Solaris9.
* inclhack.def (solaris_mutex_init_2): Update for Solaris9.
Prevent it from running on solaris10 or later.
(solaris_once_init_2): Fix comment.
* tests/base/pthread.h: Update.
* fixincl.x: Regenerate.
From-SVN: r117310
Diffstat (limited to 'fixincludes/fixincl.x')
| -rw-r--r-- | fixincludes/fixincl.x | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 742897e0be6..e9c8b882b58 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 Wednesday September 27, 2006 at 08:16:42 PM EDT + * It has been AutoGen-ed Thursday September 28, 2006 at 11:06:33 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Sep 27 20:16:42 EDT 2006 +/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Sep 28 23:06:33 EDT 2006 * * You must regenerate it. Use the ./genfixes script. * @@ -5471,7 +5471,10 @@ tSCC zSolaris_Mutex_Init_2List[] = /* * Machine/OS name selection pattern */ -#define apzSolaris_Mutex_Init_2Machs (const char**)NULL +tSCC* apzSolaris_Mutex_Init_2Machs[] = { + "*-*-solaris2.[0-9]", + "*-*-solaris2.[0-9][!0-9]*", + (const char*)NULL }; /* * content selection pattern - do fix if pattern found @@ -5491,9 +5494,10 @@ static const char* apzSolaris_Mutex_Init_2Patch[] = { "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n\ %0\n\ #else\n\ -%1, {0}}%3\n\ +%1, {0}}%4\n\ #endif", - "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+\\{.*),[ \t]*0\\}(|[ \t].*)$", + "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+(|/*.**/[ \t]*\\\\\n\ +[ \t]*)\\{.*),[ \t]*0\\}(|[ \t].*)$", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * |