diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2003-03-21 02:05:37 +0100 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2003-03-21 02:05:37 +0100 |
commit | a5a2648b81c9347c241c37e6cba78f1df47e9320 (patch) | |
tree | e395a395626de6cc4d40e3c1cfe6fef25ed62ec3 | |
parent | - (bal) scp.c 'limit' conflicts with Cray. Rename to 'limitbw' (diff) | |
download | openssh-a5a2648b81c9347c241c37e6cba78f1df47e9320.tar.xz openssh-a5a2648b81c9347c241c37e6cba78f1df47e9320.zip |
- (bal) Collection of Cray patches (bsd-cray.h fix for CRAYT3E and improved
guessing rules)
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | config.guess | 3 | ||||
-rwxr-xr-x | config.sub | 5 | ||||
-rw-r--r-- | openbsd-compat/bsd-cray.h | 4 |
4 files changed, 13 insertions, 3 deletions
@@ -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.2635 2003/03/21 00:55:32 mouring Exp $ +$Id: ChangeLog,v 1.2636 2003/03/21 01:05:37 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..a09954f2f 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.7 2003/03/21 01:05:38 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 */ |