X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=blobdiff_plain;f=config.sub;h=d79f104ed780978826a2bf930e68734976b38597;hp=5f719f581de372f3ad593c961327be2044d01979;hb=1d6fdda4595d68cf26bbffd4915863450a976420;hpb=cf32d2f78052a724fda29e73add9e390f18bea02

diff --git a/config.sub b/config.sub
index 5f719f581d..d79f104ed7 100755
--- a/config.sub
+++ b/config.sub
@@ -70,19 +70,18 @@ case $os in
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		os=-sco3.2v4
-		basic_machine=i386-unknown
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=i386-unknown
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=i386-unknown
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
 		;;
 	-isc*)
-		basic_machine=i386-unknown
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
 		;;
 esac
 
@@ -113,45 +112,22 @@ case $basic_machine in
 		basic_machine=vax-dec
 		os=-vms
 		;;
-	i386v32)
-		basic_machine=i386-unknown
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[34]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
 		os=-sysv32
 		;;
-	i386-sco* | i386sco | sco)
-		basic_machine=i386-unknown
-		os=-sco3.2v2
-		;;
-	i386-isc* | isc)
-		basic_machine=i386-unknown
-		os=-isc
-		;;
-	i486v32)
-		basic_machine=i486-unknown
-		os=-sysv32
-		;;
-	i486-sco* | i486sco | sco)
-		basic_machine=i486-unknown
-		os=-sco3.2v2
-		;;
-	i486-isc* | isc)
-		basic_machine=i486-unknown
-		os=-isc
-		;;
-	i386v4*)
-		basic_machine=i386-unknown
-		os=-sysv4
-		;;
-	i486v4*)
-		basic_machine=i486-unknown
+	i[34]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
 		os=-sysv4
 		;;
-	i386v)
-		basic_machine=i386-unknown
+	i[34]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
 		os=-sysv
 		;;
-	i486v)
-		basic_machine=i486-unknown
-		os=-sysv
+	i[34]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+		os=-solaris2
 		;;
 	spur)
 		basic_machine=spur-unknown
@@ -366,7 +342,7 @@ case $basic_machine in
 		;;
 	delta88)
 		basic_machine=m88k-motorola
-		os=-m88kbcs
+		os=-sysv3
 		;;
 	dpx2)
 		basic_machine=m68k-bull
@@ -382,7 +358,7 @@ case $basic_machine in
 		;;
 	harris)
 		basic_machine=m88k-harris
-		os=-m88kbcs
+		os=-sysv3
 		;;
 	hp300bsd)
 		basic_machine=m68k-hp
@@ -501,7 +477,7 @@ case $os in
 	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]* | -hpux* \
 	      | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
-	      | -nindy* | -vxworks* | -ebmon* | -hds* | -m88kbcs* \
+	      | -nindy* | -vxworks* | -ebmon* | -hds*  \
 	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* )
 		;;
 	-sunos5*)