From ccce12f3f37144781cc4a8cba8992af987ac2561 Mon Sep 17 00:00:00 2001
From: Jeffrey A Law <law@cygnus.com>
Date: Thu, 1 Apr 1999 01:19:07 +0000
Subject: [PATCH] inclhack.def (zzz_ki_syscalls, zzz_time): Fix trigger string
 to only match on hpux11.

        * fixinc/inclhack.def (zzz_ki_syscalls, zzz_time): Fix trigger
        string to only match on hpux11.
        * fixinc/fixincl.x, fixinc/inclhack.sh, fixinc/fixinc.sh: Rebuilt.

From-SVN: r26096
---
 gcc/ChangeLog           | 6 ++++++
 gcc/fixinc/fixincl.sh   | 2 +-
 gcc/fixinc/fixincl.x    | 6 +++---
 gcc/fixinc/inclhack.def | 4 ++--
 gcc/fixinc/inclhack.sh  | 6 +++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c154d5888f5..82f1921d415 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr  1 02:17:18 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* fixinc/inclhack.def (zzz_ki_syscalls, zzz_time): Fix trigger
+	string to only match on hpux11.
+	* fixinc/fixincl.x, fixinc/inclhack.sh, fixinc/fixinc.sh: Rebuilt.
+
 Thu Apr  1 01:09:27 1999  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* fixinc/hackshell.tpl: Complete transition to fixinc.tmp.
diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index 484f812bbdb..149b39953ec 100755
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -2,7 +2,7 @@
 #
 # DO NOT EDIT THIS FILE   (fixincl.sh)
 # 
-# It has been autogen-ed  Thursday April  1, 1999 at 01:07:59 AM MST
+# It has been autogen-ed  Thursday April  1, 1999 at 02:04:52 AM MST
 # From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
 # and the template file   /puke/law//egcs/egcs/gcc/fixinc/inclhack.tpl
 #
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 94752a9fb3b..895f53c14c6 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1,7 +1,7 @@
 /*
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been autogen-ed  Thursday April  1, 1999 at 01:07:59 AM MST
+ * It has been autogen-ed  Thursday April  1, 1999 at 02:04:52 AM MST
  * From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
  * and the template file   /puke/law//egcs/egcs/gcc/fixinc/fixincl.tpl
  *
@@ -3615,7 +3615,7 @@ tSCC zZzz_Ki_CallsList[] =
  *  content selection pattern
  */
 tSCC zZzz_Ki_CallsSelect0[] =
-       "KI_MAX_PROCS is an arbitrary number";
+       "kthread_create_caller_t";
 
 #define    ZZZ_KI_CALLS_TEST_CT  1
 tTestDesc aZzz_Ki_CallsTests[] = {
@@ -3712,7 +3712,7 @@ tSCC zZzz_TimeList[] =
  *  content selection pattern
  */
 tSCC zZzz_TimeSelect0[] =
-       "For CASPEC, look in";
+       "11.0 and later representation of ki time";
 
 #define    ZZZ_TIME_TEST_CT  1
 tTestDesc aZzz_TimeTests[] = {
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 7536da94d99..c827443248c 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2287,7 +2287,7 @@ fix = {
 fix = {
     hackname = zzz_ki_calls;
     files    = sys/ki_calls.h;
-    select   = 'KI_MAX_PROCS is an arbitrary number';
+    select   = 'kthread_create_caller_t';
     shell    =
          "echo \"Removing incorrect fix to <$file>\" >&2\n"
          "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
@@ -2332,7 +2332,7 @@ fix = {
 fix = {
     hackname = zzz_time;
     files    = sys/time.h;
-    select   = 'For CASPEC, look in';
+    select   = '11.0 and later representation of ki time';
     shell    =
          "echo \"Removing incorrect fix to <$file>\" >&2\n"
          "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index ff6ffe1b52c..68eb31f987f 100755
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -2,7 +2,7 @@
 #
 # DO NOT EDIT THIS FILE   (inclhack.sh)
 # 
-# It has been autogen-ed  Thursday April  1, 1999 at 01:17:17 AM MST
+# It has been autogen-ed  Thursday April  1, 1999 at 02:04:52 AM MST
 # From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
 # and the template file   /puke/law//egcs/egcs/gcc/fixinc/inclhack.tpl
 #
@@ -2888,7 +2888,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
     # Fix 100:  Zzz_Ki_Calls
     #
     case "${file}" in ./sys/ki_calls.h )
-    if ( test -n "`egrep 'KI_MAX_PROCS is an arbitrary number' ${file}`"
+    if ( test -n "`egrep 'kthread_create_caller_t' ${file}`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       zzz_ki_calls"
@@ -2966,7 +2966,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
     # Fix 103:  Zzz_Time
     #
     case "${file}" in ./sys/time.h )
-    if ( test -n "`egrep 'For CASPEC, look in' ${file}`"
+    if ( test -n "`egrep '11.0 and later representation of ki time' ${file}`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       zzz_time"
-- 
2.30.2