Add PentiumII (i786). Add '7' to all i[3456] entries.libc-980613libc-980612libc-980611libc-980610libc-980609libc-980608libc-980607libc-980606libc-980605libc-980604libc-980603libc-980602libc-980601libc-980531libc-980530libc-980529libc-980528libc-980527libc-980526libc-980525libc-980524libc-980523libc-980522libc-980521libc-980520libc-980519libc-980518libc-980517libc-980516libc-980515libc-980514libc-980513libc-980512libc-980510libc-980509libc-980508libc-980507libc-980506libc-980505libc-980504libc-980503libc-980502libc-980501libc-980430libc-980429libc-980428libc-980414libc-980413libc-980412libc-980411libc-980410libc-980409libc-980408libc-980407libc-980406libc-980405libc-980404libc-980403libc-980402libc-980401libc-980331libc-980330libc-980329libc-980328libc-980327libc-980326libc-980325libc-980324libc-980323libc-980322libc-980321libc-980320libc-980319libc-980318libc-980317libc-980316libc-980315libc-980314libc-980313libc-980312libc-980311libc-980310libc-980309libc-980308libc-980307libc-980306libc-980304libc-980303libc-980302libc-980301libc-980228libc-980227libc-980226libc-980225libc-980224libc-980223libc-980222libc-980221libc-980220libc-980219libc-980218libc-980217libc-980216libc-980215libc-980214gcc_2_8_1-980315gcc-2_8_1-RELEASEgcc-2_8_1-980413gcc-2_8_1-980412gcc-2_8_1-980407gcc-2_8_1-980401before-miles-orphaned-changes

Add AMD and Cyrix names for P5 and P6.

1 files changed, 18 insertions, 20 deletions

diff --git a/config.sub b/config.sub
index 213a6d47d67..e24b8504126 100755
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -162,7 +162,7 @@ case $basic_machine in
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[3456]86)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -171,7 +171,7 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
@@ -350,19 +350,19 @@ case $basic_machine in
 		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[3456]86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[3456]86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[3456]86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -469,25 +469,23 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5)
-		basic_machine=i586-intel
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
 		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-*)
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould