- (bal) Collection of Cray patches (bsd-cray.h fix for CRAYT3E and improved

   guessing rules)

diff --git a/ChangeLog b/ChangeLog
index d4e95c24e1e3a7ec1ee0f0b22c64918d73fed4b2..1ec5853a5e52ab3866706b0bc817a3499b210c67 100644 (file)
--- 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]

diff --git a/config.guess b/config.guess
index fd30ab0314cd95a2544eaaefb5ebf4291c52805c..e8f2061233dddb5fed44ed5282de9380f3ac766b 100755 (executable)
--- 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 a03c1d15a868c20a8831f8dd9c67b7df27b84686..a0b7bb9e8b3442196293899ea23bbc4dacda5f59 100755 (executable)
--- 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 bfe51765680a6a06053f66bb4a61032ca21cbb78..191ebb03867f7b39e262e77c3aec86b068ac1cff 100644 (file)
--- a/openbsd-compat/bsd-cray.h
+++ b/openbsd-compat/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 */