diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 4 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 8 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/pthread.h | 1 |
4 files changed, 13 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index be18bdd2050..d88f8bbf14d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2002-05-22 Richard Henderson <rth@redhat.com> + + * fixinc/inclhack.def (thread_keyword): Allow as any prototype arg. + * fixinc/fixincl.x, fixinc/tests/base/pthread.h: Rebuild. + Wed May 22 18:39:57 2002 J"orn Rennecke <joern.rennecke@superh.com> * t-sh (LIB2FUNCS_EXTRA): Now embed-bb.c. diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 7d5f0bbd7b9..c8d09d8ef77 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -4587,7 +4587,7 @@ tSCC zThread_KeywordList[] = * content selection pattern - do fix if pattern found */ tSCC zThread_KeywordSelect0[] = - "pthread_t __thread([^a-z0-9_])"; + " __thread,"; #define THREAD_KEYWORD_TEST_CT 1 static tTestDesc aThread_KeywordTests[] = { @@ -4598,7 +4598,7 @@ static tTestDesc aThread_KeywordTests[] = { */ static const char* apzThread_KeywordPatch[] = { "format", - "pthread_t __thr%1", + " __thr,", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index bebdd538486..7b663ef971c 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2892,11 +2892,13 @@ fix = { hackname = thread_keyword; files = "pthread.h"; files = "bits/sigthread.h"; - select = "pthread_t __thread([^a-z0-9_])"; + select = " __thread,"; c_fix = format; - c_fix_arg = 'pthread_t __thr%1'; + c_fix_arg = " __thr,"; - test_text = "extern int pthread_kill (pthread_t __thread, int __signo);"; + test_text = + "extern int pthread_create (pthread_t *__restrict __thread,\n" + "extern int pthread_kill (pthread_t __thread, int __signo);"; }; /* diff --git a/gcc/fixinc/tests/base/pthread.h b/gcc/fixinc/tests/base/pthread.h index e24fcf90f4d..65d2402db03 100644 --- a/gcc/fixinc/tests/base/pthread.h +++ b/gcc/fixinc/tests/base/pthread.h @@ -37,5 +37,6 @@ extern int __page_size; #if defined( THREAD_KEYWORD_CHECK ) +extern int pthread_create (pthread_t *__restrict __thr, extern int pthread_kill (pthread_t __thr, int __signo); #endif /* THREAD_KEYWORD_CHECK */ |