From bb2732c0c5909d6322cb60734ec53e719f9b23df Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Fri, 22 Feb 2002 03:31:00 +0000
Subject: [PATCH] 	* config.sub (sv1-*, ymp-*, c90-*): Preserve CPU type
 in output. 	(t3d-*, t3e-*): Canonicalize to alpha and alphaev5.

---
 ChangeLog  |  6 ++++++
 config.sub | 30 +++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e2167b..1d85f58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-22  Ben Elliston  <bje@redhat.com>
+
+	From Kevin Ryde <user42@zip.com.au>:
+	* config.sub (sv1-*, ymp-*, c90-*): Preserve CPU type in output.
+	(t3d-*, t3e-*): Canonicalize to alpha and alphaev5.
+
 2002-02-18  Jim Meyering  <meyering@lucent.com>
 
 	* config.guess: Don't use `head -1'; it's no longer portable.
diff --git a/config.sub b/config.sub
index da01f93..c854eb4 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-02-15'
+timestamp='2002-02-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -308,7 +308,7 @@ case $basic_machine in
 	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -377,6 +377,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -397,7 +401,7 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp | sv1 | [cj]90)
+	cray | j90)
 		basic_machine=j90-cray
 		os=-unicos
 		;;
@@ -870,12 +874,24 @@ 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
 		;;
-	t3d | t3e | t90)
-		basic_machine=${basic_machine}-cray
+	t3d)
+		basic_machine=alpha-cray
+		os=-unicos
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
@@ -945,6 +961,10 @@ case $basic_machine in
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim