Skip to content
This repository
Browse code

Add PentiumII (i786). Add '7' to all i[3456] entries.

Add AMD and Cyrix names for P5 and P6.
  • Loading branch information...
commit 59b924567b53a3306011c9c3c3bd39f1ba32f502 1 parent 0ff71cf
authored February 13, 1998

Showing 1 changed file with 18 additions and 20 deletions. Show diff stats Hide diff stats

  1. 38  config.sub
38  config.sub
... ...
@@ -1,6 +1,6 @@
1 1
 #! /bin/sh
2 2
 # Configuration validation subroutine script, version 1.1.
3  
-#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
  3
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
4 4
 # This file is (in principle) common to ALL GNU software.
5 5
 # The presence of a machine in this file suggests that SOME GNU software
6 6
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -162,7 +162,7 @@ case $basic_machine in
162 162
 	# We use `pc' rather than `unknown'
163 163
 	# because (1) that's what they normally are, and
164 164
 	# (2) the word "unknown" tends to confuse beginning users.
165  
-	i[3456]86)
  165
+	i[34567]86)
166 166
 	  basic_machine=$basic_machine-pc
167 167
 	  ;;
168 168
 	# Object if more than one company name word.
@@ -171,7 +171,7 @@ case $basic_machine in
171 171
 		exit 1
172 172
 		;;
173 173
 	# Recognize the basic CPU types with company name.
174  
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
  174
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
175 175
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
176 176
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
177 177
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
@@ -350,19 +350,19 @@ case $basic_machine in
350 350
 		os=-mvs
351 351
 		;;
352 352
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
353  
-	i[3456]86v32)
  353
+	i[34567]86v32)
354 354
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
355 355
 		os=-sysv32
356 356
 		;;
357  
-	i[3456]86v4*)
  357
+	i[34567]86v4*)
358 358
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
359 359
 		os=-sysv4
360 360
 		;;
361  
-	i[3456]86v)
  361
+	i[34567]86v)
362 362
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
363 363
 		os=-sysv
364 364
 		;;
365  
-	i[3456]86sol2)
  365
+	i[34567]86sol2)
366 366
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
367 367
 		os=-solaris2
368 368
 		;;
@@ -469,25 +469,23 @@ case $basic_machine in
469 469
         pc532 | pc532-*)
470 470
 		basic_machine=ns32k-pc532
471 471
 		;;
472  
-	pentium | p5)
473  
-		basic_machine=i586-intel
  472
+	pentium | p5 | k5 | nexen)
  473
+		basic_machine=i586-pc
474 474
 		;;
475  
-	pentiumpro | p6)
476  
-		basic_machine=i686-intel
  475
+	pentiumpro | p6 | k6 | 6x86)
  476
+		basic_machine=i686-pc
477 477
 		;;
478  
-	pentium-* | p5-*)
  478
+	pentiumii | pentium2)
  479
+		basic_machine=i786-pc
  480
+		;;
  481
+	pentium-* | p5-* | k5-* | nexen-*)
479 482
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
480 483
 		;;
481  
-	pentiumpro-* | p6-*)
  484
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
482 485
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
483 486
 		;;
484  
-	k5)
485  
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
486  
-		basic_machine=i586-amd
487  
-		;;
488  
-	nexen)
489  
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
490  
-		basic_machine=i586-nexgen
  487
+	pentiumii-* | pentium2-*)
  488
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
491 489
 		;;
492 490
 	pn)
493 491
 		basic_machine=pn-gould

0 notes on commit 59b9245

Please sign in to comment.
Something went wrong with that request. Please try again.