diff options
| author | sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-21 23:01:44 +0000 |
|---|---|---|
| committer | sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-21 23:01:44 +0000 |
| commit | 4964185aa300ebc18ff67ed6ab93ca2c9b8ec7e9 (patch) | |
| tree | d4ca4c848df4eccaad3ec2e2d77c908f698df07b /fixincludes | |
| parent | 030aa7500e0eed6b43b074f168fee3eef50daeef (diff) | |
| download | gcc-4964185aa300ebc18ff67ed6ab93ca2c9b8ec7e9.tar.gz | |
* inclhack.def (alpha_pthread_init): Fix technical problems with
the last check-in caused by CVS variable substitution.
* fixincl.x: Likewise.
* tests/base/pthread.h: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90989 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 7 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 6 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 12 | ||||
| -rw-r--r-- | fixincludes/tests/base/pthread.h | 2 |
4 files changed, 17 insertions, 10 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index ace5d2a75e6..25a4e7ffb34 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,4 +1,11 @@ 2004-11-20 Roger Sayle <roger@eyesopen.com> + + * inclhack.def (alpha_pthread_init): Fix technical problems with + the last check-in caused by CVS variable substitution. + * fixincl.x: Likewise. + * tests/base/pthread.h: Likewise. + +2004-11-20 Roger Sayle <roger@eyesopen.com> Bruce Korb <bkorb@gnu.org> * inclhack.def (alpha_pthread_init): New fix. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index ff772117d1e..10466cebfd9 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 Sunday November 21, 2004 at 09:09:46 AM MST + * It has been AutoGen-ed Sunday November 21, 2004 at 03:52:23 PM MST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Sun Nov 21 09:09:46 MST 2004 +/* DO NOT CVS-MERGE THIS FILE, EITHER Sun Nov 21 15:52:23 MST 2004 * * You must regenerate it. Use the ./genfixes script. * @@ -1106,7 +1106,7 @@ tSCC* apzAlpha_Pthread_InitMachs[] = { * content selection pattern - do fix if pattern found */ tSCC zAlpha_Pthread_InitSelect0[] = - " \\* @\\(#\\)\\$RCSfile: pthread\\.h,v \\$ \\$Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) \\$Date: 2000/08/15 15:30:13 \\$"; + " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$"; #define ALPHA_PTHREAD_INIT_TEST_CT 1 static tTestDesc aAlpha_Pthread_InitTests[] = { diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 37f23117283..8c012f753d6 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -714,9 +714,9 @@ fix = { fix = { hackname = alpha_pthread_init; files = pthread.h; - select = ' \* @\(#\)\$' 'RCSfile: pthread\.h,v \$' - ' \$' 'Revision: 1\.1\.33\.21 \$ \(DEC\)' - ' \$' 'Date: 2000/08/15 15:30:13 \$'; + select = ' \* @\(#\).RCSfile: pthread\.h,v \$' + ' .Revision: 1\.1\.33\.21 \$ \(DEC\)' + ' .Date: 2000/08/15 15:30:13 \$'; mach = "alpha*-dec-osf*"; sed = "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n" "s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n" @@ -725,9 +725,9 @@ fix = { "s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n" "s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n"; test_text = "/*\n" - " * @(#)\\$" "RCSfile: pthread.h,v \\$ \\$" - "Revision: 1.1.33.21 \\$ (DEC) \\$" - "Date: 2000/08/15 15:30:13 \\$\n" + " * @(#)_RCSfile: pthread.h,v \\$ " + "_Revision: 1.1.33.21 \\$ (DEC) " + "_Date: 2000/08/15 15:30:13 \\$\n" " */\n" "#ifndef _PTHREAD_NOMETER_STATIC\n" "# define PTHREAD_MUTEX_INITIALIZER \\\n" diff --git a/fixincludes/tests/base/pthread.h b/fixincludes/tests/base/pthread.h index 735c0ef7ffd..767c6e2774b 100644 --- a/fixincludes/tests/base/pthread.h +++ b/fixincludes/tests/base/pthread.h @@ -37,7 +37,7 @@ #if defined( ALPHA_PTHREAD_INIT_CHECK ) /* - * @(#)$RCSfile: pthread.h,v $ $Revision: 1.1.33.21 $ (DEC) $Date: 2000/08/15 15:30:13 $ + * @(#)_RCSfile: pthread.h,v $ _Revision: 1.1.33.21 $ (DEC) _Date: 2000/08/15 15:30:13 $ */ #ifndef _PTHREAD_NOMETER_STATIC # define PTHREAD_MUTEX_INITIALIZER {_PTHREAD_MSTATE_CONFIG, _PTHREAD_MVALID | _PTHREAD_MVF_STA, 0, 0, 0, 0, 0, 0 } |