From db9340999e129a40a7a1a8ad5f7fd69004b191b3 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Fri, 15 Feb 2002 06:28:33 +0000
Subject: [PATCH] 2002-02-15  Wendy Palm  <wendyp@cray.com>

	* config.guess (CRAY*X-MP:*:*:*, CRAY-2:*:*:*): Remove, as we know
	they no longer exist in the field.
	* config.sub (cray2, xmp): Likewise.
	(cray, ymp, [cj]90-cray): basic_machine is now j90-cray.
	(sv1-cray, cray-t3e, cray-t3d, cray-t90): New basic machine patterns.
---
 ChangeLog    |  8 ++++++++
 config.guess |  8 +-------
 config.sub   | 28 ++++++----------------------
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fc6f16..d3d7d8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-02-15  Wendy Palm  <wendyp@cray.com>
+
+	* config.guess (CRAY*X-MP:*:*:*, CRAY-2:*:*:*): Remove, as we know
+	they no longer exist in the field.
+	* config.sub (cray2, xmp): Likewise.
+	(cray, ymp, [cj]90-cray): basic_machine is now j90-cray.
+	(sv1-cray, cray-t3e, cray-t3d, cray-t90): New basic machine patterns.
+
 2002-02-15  Ben Elliston  <bje@redhat.com>
 
 	* config.sub: Accept m68060.
diff --git a/config.guess b/config.guess
index 182c2a1..88eaf68 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-02-12'
+timestamp='2002-02-15'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -683,9 +683,6 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
@@ -707,9 +704,6 @@ EOF
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        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 796ad37..3fb1a16 100755
--- a/config.sub
+++ b/config.sub
@@ -285,7 +285,7 @@ case $basic_machine in
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
+	| clipper-* | cydra-* \
 	| d10v-* | d30v-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | fx80-* \
@@ -311,7 +311,7 @@ case $basic_machine in
 	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
 	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
@@ -397,16 +397,8 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	cray | ymp | sv1 | [cj]90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -878,16 +870,12 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
-	t3e)
-		basic_machine=t3e-cray
+	t3d | t3e | t90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
@@ -954,10 +942,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-windows32-msvcrt
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;