From 8dc02d7f198b65e706ea797104df528f5c17e67a Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@redhat.com>
Date: Wed, 22 May 2002 14:29:38 -0700
Subject: inclhack.def (thread_keyword): Match __thread as last arg.

        * fixinc/inclhack.def (thread_keyword): Match __thread as last arg.
        * fixinc/fixincl.x, fixinc/tests/base/pthread.h: Rebuild.

From-SVN: r53749
---
 gcc/fixinc/fixincl.x            | 4 ++--
 gcc/fixinc/inclhack.def         | 7 ++++---
 gcc/fixinc/tests/base/pthread.h | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'gcc/fixinc')

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index c8d09d8..968ae23 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[] =
-       " __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
--- 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
--- 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 */
-- 
cgit v1.1