4 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f53127240..f710f8f64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
      enter 3.6
  - (bal) The days of lack of int64_t support are over.  Sorry kids.
  - (bal) scp.c 'limit' conflicts with Cray.  Rename to 'limitbw'
+ - (bal) Collection of Cray patches (bsd-cray.h fix for CRAYT3E and improved
+   guessing rules)
 
 20030318
  - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1233,4 +1235,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2633.2.2 2003/03/21 00:54:03 mouring Exp $
+$Id: ChangeLog,v 1.2633.2.3 2003/03/21 01:07:44 mouring Exp $
diff --git a/config.guess b/config.guess
index fd30ab031..e8f206123 100755
--- a/config.guess
+++ b/config.guess
@@ -726,6 +726,9 @@ EOF
     CRAY*SV1:*:*:*)
         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
+    *:UNICOS/mp:*:*)
+        echo nv1-cray-unicosmp | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
diff --git a/config.sub b/config.sub
index a03c1d15a..a0b7bb9e8 100755
--- a/config.sub
+++ b/config.sub
@@ -315,7 +315,7 @@ case $basic_machine in
         | mipsisa64-* | mipsisa64el-* \
         | mipsisa64sb1-* | mipsisa64sb1el-* \
         | mipstx39 | mipstx39el \
-        | none-* | np1-* | ns16k-* | ns32k-* \
+        | none-* | np1-* | ns16k-* | ns32k-* | nv1-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -715,6 +715,9 @@ case $basic_machine in
         nsr-tandem)
                 basic_machine=nsr-tandem
                 ;;
+        nv1)
+                basic_machine=nv1-cray
+                ;;
         op50n-* | op60c-*)
                 basic_machine=hppa1.1-oki
                 os=-proelf
diff --git a/openbsd-compat/bsd-cray.h b/openbsd-compat/bsd-cray.h
index 9a15cb251..68947c92f 100644
--- a/openbsd-compat/bsd-cray.h
+++ b/openbsd-compat/bsd-cray.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: bsd-cray.h,v 1.6 2003/01/27 21:15:11 mouring Exp $
+ * $Id: bsd-cray.h,v 1.6.2.1 2003/03/21 01:07:45 mouring Exp $
  *
  * bsd-cray.h
  *
@@ -49,8 +49,10 @@ extern	char   cray_tmpdir[];			/* cray tmpdir */
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN  64
 #endif
+#ifndef _CRAYT3E
 #include <sys/ttold.h>
 #define TIOCGPGRP (tIOC|20)
 #endif
+#endif
 
 #endif /* _BSD_CRAY_H */