* fixinc/inclhack.def (thread_keyword): Match __thread as last arg.

        * fixinc/fixincl.x, fixinc/tests/base/pthread.h: Rebuild.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53749 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2bcff0..5393a74 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-22  Richard Henderson  <rth@redhat.com>
+
+       * fixinc/inclhack.def (thread_keyword): Match __thread as last arg.
+       * fixinc/fixincl.x, fixinc/tests/base/pthread.h: Rebuild.
+
 2002-05-22  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/6643

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index c8d09d8..968ae23 100644 (file)
--- 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[] =
-       " __thread,";
+       " __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",
-    " __thr,",
+    " __thr%1",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 7b663ef..2ae1e56 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2892,13 +2892,14 @@ fix = {
     hackname  = thread_keyword;
     files     = "pthread.h";
     files     = "bits/sigthread.h";
-    select    = " __thread,";
+    select    = " __thread([,)])";
     c_fix     = format;
-    c_fix_arg = " __thr,";
+    c_fix_arg = " __thr%1";
 
     test_text =
        "extern int pthread_create (pthread_t *__restrict __thread,\n"
-       "extern int pthread_kill (pthread_t __thread, int __signo);";
+       "extern int pthread_kill (pthread_t __thread, int __signo);\n"
+       "extern int pthread_cancel (pthread_t __thread);";
 };
 
 /*

diff --git a/gcc/fixinc/tests/base/pthread.h b/gcc/fixinc/tests/base/pthread.h
index 65d2402..0b2afc7 100644 (file)
--- a/gcc/fixinc/tests/base/pthread.h
+++ b/gcc/fixinc/tests/base/pthread.h
@@ -39,4 +39,5 @@ 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);
+extern int pthread_cancel (pthread_t __thr);
 #endif  /* THREAD_KEYWORD_CHECK */