yann@1: # Backport glibc-2.3.2's config.sub to glibc-2.1.3 
yann@1: # Should fix nonfatal but annoying like
yann@1: #   checking build system type... Invalid configuration `x86_64-unknown-linux-gnu': machine `x86_64-unknown' not recognized
yann@1: #   ../glibc-2.1.3/configure: line 1227: test: i686-unknown-linux-gnu: unary operator expected
yann@1: #   checking build system type... Configuration name missing.
yann@1: 
yann@1: 
yann@1: --- glibc-2.1.3/scripts/config.sub	2004-03-24 13:27:06.000000000 -0800
yann@1: +++ glibc-2.3.2/scripts/config.sub	2002-07-10 00:24:32.000000000 -0700
yann@1: @@ -1,6 +1,10 @@
yann@1:  #! /bin/sh
yann@1: -# Configuration validation subroutine script, version 1.1.
yann@1: -#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
yann@1: +# Configuration validation subroutine script.
yann@1: +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
yann@1: +#   2000, 2001, 2002 Free Software Foundation, Inc.
yann@1: +
yann@1: +timestamp='2002-07-03'
yann@1: +
yann@1:  # This file is (in principle) common to ALL GNU software.
yann@1:  # The presence of a machine in this file suggests that SOME GNU software
yann@1:  # can handle that machine.  It does not imply ALL GNU software can.
yann@1: @@ -25,6 +29,9 @@
yann@1:  # configuration script generated by Autoconf, you may include it under
yann@1:  # the same distribution terms that you use for the rest of that program.
yann@1:  
yann@1: +# Please send patches to <config-patches@gnu.org>.  Submit a context
yann@1: +# diff and a properly formatted ChangeLog entry.
yann@1: +#
yann@1:  # Configuration subroutine to validate and canonicalize a configuration type.
yann@1:  # Supply the specified configuration type as an argument.
yann@1:  # If it is invalid, we print an error message on stderr and exit with code 1.
yann@1: @@ -45,30 +52,73 @@
yann@1:  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
yann@1:  # It is wrong to echo any other type of specification.
yann@1:  
yann@1: -if [ x$1 = x ]
yann@1: -then
yann@1: -	echo Configuration name missing. 1>&2
yann@1: -	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
yann@1: -	echo "or     $0 ALIAS" 1>&2
yann@1: -	echo where ALIAS is a recognized configuration type. 1>&2
yann@1: -	exit 1
yann@1: -fi
yann@1: +me=`echo "$0" | sed -e 's,.*/,,'`
yann@1:  
yann@1: -# First pass through any local machine types.
yann@1: -case $1 in
yann@1: -	*local*)
yann@1: -		echo $1
yann@1: -		exit 0
yann@1: -		;;
yann@1: -	*)
yann@1: -	;;
yann@1: +usage="\
yann@1: +Usage: $0 [OPTION] CPU-MFR-OPSYS
yann@1: +       $0 [OPTION] ALIAS
yann@1: +
yann@1: +Canonicalize a configuration name.
yann@1: +
yann@1: +Operation modes:
yann@1: +  -h, --help         print this help, then exit
yann@1: +  -t, --time-stamp   print date of last modification, then exit
yann@1: +  -v, --version      print version number, then exit
yann@1: +
yann@1: +Report bugs and patches to <config-patches@gnu.org>."
yann@1: +
yann@1: +version="\
yann@1: +GNU config.sub ($timestamp)
yann@1: +
yann@1: +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
yann@1: +Free Software Foundation, Inc.
yann@1: +
yann@1: +This is free software; see the source for copying conditions.  There is NO
yann@1: +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
yann@1: +
yann@1: +help="
yann@1: +Try \`$me --help' for more information."
yann@1: +
yann@1: +# Parse command line
yann@1: +while test $# -gt 0 ; do
yann@1: +  case $1 in
yann@1: +    --time-stamp | --time* | -t )
yann@1: +       echo "$timestamp" ; exit 0 ;;
yann@1: +    --version | -v )
yann@1: +       echo "$version" ; exit 0 ;;
yann@1: +    --help | --h* | -h )
yann@1: +       echo "$usage"; exit 0 ;;
yann@1: +    -- )     # Stop option processing
yann@1: +       shift; break ;;
yann@1: +    - )	# Use stdin as input.
yann@1: +       break ;;
yann@1: +    -* )
yann@1: +       echo "$me: invalid option $1$help"
yann@1: +       exit 1 ;;
yann@1: +
yann@1: +    *local*)
yann@1: +       # First pass through any local machine types.
yann@1: +       echo $1
yann@1: +       exit 0;;
yann@1: +
yann@1: +    * )
yann@1: +       break ;;
yann@1: +  esac
yann@1: +done
yann@1: +
yann@1: +case $# in
yann@1: + 0) echo "$me: missing argument$help" >&2
yann@1: +    exit 1;;
yann@1: + 1) ;;
yann@1: + *) echo "$me: too many arguments$help" >&2
yann@1: +    exit 1;;
yann@1:  esac
yann@1:  
yann@1:  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
yann@1:  # Here we must recognize all the valid KERNEL-OS combinations.
yann@1:  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
yann@1:  case $maybe_os in
yann@1: -  linux-gnu*)
yann@1: +  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
yann@1:      os=-$maybe_os
yann@1:      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
yann@1:      ;;
yann@1: @@ -94,7 +144,7 @@
yann@1:  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
yann@1:  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
yann@1:  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
yann@1: -	-apple)
yann@1: +	-apple | -axis)
yann@1:  		os=
yann@1:  		basic_machine=$1
yann@1:  		;;
yann@1: @@ -108,6 +158,14 @@
yann@1:  		os=-vxworks
yann@1:  		basic_machine=$1
yann@1:  		;;
yann@1: +	-chorusos*)
yann@1: +		os=-chorusos
yann@1: +		basic_machine=$1
yann@1: +		;;
yann@1: + 	-chorusrdb)
yann@1: + 		os=-chorusrdb
yann@1: +		basic_machine=$1
yann@1: + 		;;
yann@1:  	-hiux*)
yann@1:  		os=-hiuxwe2
yann@1:  		;;
yann@1: @@ -166,27 +224,58 @@
yann@1:  case $basic_machine in
yann@1:  	# Recognize the basic CPU types without company name.
yann@1:  	# Some are omitted here because they have special meanings below.
yann@1: -	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
yann@1: -		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
yann@1: -		| 580 | i960 | h8300 \
yann@1: -		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
yann@1: -		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
yann@1: -		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
yann@1: -		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
yann@1: -		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
yann@1: -		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
yann@1: -		| mips64vr5000 | miprs64vr5000el | mcore \
yann@1: -		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
yann@1: -		| thumb | d10v | fr30)
yann@1: +	1750a | 580 \
yann@1: +	| a29k \
yann@1: +	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
yann@1: +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
yann@1: +	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
yann@1: +	| c4x | clipper \
yann@1: +	| d10v | d30v | dlx | dsp16xx \
yann@1: +	| fr30 | frv \
yann@1: +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
yann@1: +	| i370 | i860 | i960 | ia64 \
yann@1: +	| ip2k \
yann@1: +	| m32r | m68000 | m68k | m88k | mcore \
yann@1: +	| mips | mipsbe | mipseb | mipsel | mipsle \
yann@1: +	| mips16 \
yann@1: +	| mips64 | mips64el \
yann@1: +	| mips64orion | mips64orionel \
yann@1: +	| mips64vr4100 | mips64vr4100el \
yann@1: +	| mips64vr4300 | mips64vr4300el \
yann@1: +	| mips64vr5000 | mips64vr5000el \
yann@1: +	| mipsisa32 | mipsisa32el \
yann@1: +	| mipsisa64 | mipsisa64el \
yann@1: +	| mipsisa64sb1 | mipsisa64sb1el \
yann@1: +	| mipstx39 | mipstx39el \
yann@1: +	| mn10200 | mn10300 \
yann@1: +	| ns16k | ns32k \
yann@1: +	| openrisc | or32 \
yann@1: +	| pdp10 | pdp11 | pj | pjl \
yann@1: +	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
yann@1: +	| pyramid \
yann@1: +	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
yann@1: +	| sh64 | sh64le \
yann@1: +	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
yann@1: +	| strongarm \
yann@1: +	| tahoe | thumb | tic80 | tron \
yann@1: +	| v850 | v850e \
yann@1: +	| we32k \
yann@1: +	| x86 | xscale | xstormy16 | xtensa \
yann@1: +	| z8k)
yann@1: +		basic_machine=$basic_machine-unknown
yann@1: +		;;
yann@1: +	m6811 | m68hc11 | m6812 | m68hc12)
yann@1: +		# Motorola 68HC11/12.
yann@1:  		basic_machine=$basic_machine-unknown
yann@1: +		os=-none
yann@1:  		;;
yann@1: -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
yann@1: +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
yann@1:  		;;
yann@1:  
yann@1:  	# We use `pc' rather than `unknown'
yann@1:  	# because (1) that's what they normally are, and
yann@1:  	# (2) the word "unknown" tends to confuse beginning users.
yann@1: -	i[34567]86)
yann@1: +	i*86 | x86_64)
yann@1:  	  basic_machine=$basic_machine-pc
yann@1:  	  ;;
yann@1:  	# Object if more than one company name word.
yann@1: @@ -195,24 +284,54 @@
yann@1:  		exit 1
yann@1:  		;;
yann@1:  	# Recognize the basic CPU types with company name.
yann@1: -	# FIXME: clean up the formatting here.
yann@1: -	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
yann@1: -	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
yann@1: -	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
yann@1: -	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
yann@1: -	      | xmp-* | ymp-* \
yann@1: -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
yann@1: -	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
yann@1: -	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
yann@1: -	      | clipper-* | orion-* \
yann@1: -	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
yann@1: -	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
yann@1: -	      | mips64el-* | mips64orion-* | mips64orionel-* \
yann@1: -	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
yann@1: -	      | mipstx39-* | mipstx39el-* | mcore-* \
yann@1: -	      | f301-* | armv*-* | t3e-* \
yann@1: -	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
yann@1: -	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
yann@1: +	580-* \
yann@1: +	| a29k-* \
yann@1: +	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
yann@1: +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
yann@1: +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
yann@1: +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
yann@1: +	| avr-* \
yann@1: +	| bs2000-* \
yann@1: +	| c[123]* | c30-* | [cjt]90-* | c54x-* \
yann@1: +	| clipper-* | cydra-* \
yann@1: +	| d10v-* | d30v-* | dlx-* \
yann@1: +	| elxsi-* \
yann@1: +	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
yann@1: +	| h8300-* | h8500-* \
yann@1: +	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
yann@1: +	| i*86-* | i860-* | i960-* | ia64-* \
yann@1: +	| ip2k-* \
yann@1: +	| m32r-* \
yann@1: +	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
yann@1: +	| m88110-* | m88k-* | mcore-* \
yann@1: +	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
yann@1: +	| mips16-* \
yann@1: +	| mips64-* | mips64el-* \
yann@1: +	| mips64orion-* | mips64orionel-* \
yann@1: +	| mips64vr4100-* | mips64vr4100el-* \
yann@1: +	| mips64vr4300-* | mips64vr4300el-* \
yann@1: +	| mips64vr5000-* | mips64vr5000el-* \
yann@1: +	| mipsisa32-* | mipsisa32el-* \
yann@1: +	| mipsisa64-* | mipsisa64el-* \
yann@1: +	| mipsisa64sb1-* | mipsisa64sb1el-* \
yann@1: +	| mipstx39 | mipstx39el \
yann@1: +	| none-* | np1-* | ns16k-* | ns32k-* \
yann@1: +	| orion-* \
yann@1: +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
yann@1: +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
yann@1: +	| pyramid-* \
yann@1: +	| romp-* | rs6000-* \
yann@1: +	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
yann@1: +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
yann@1: +	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
yann@1: +	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
yann@1: +	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
yann@1: +	| v850-* | v850e-* | vax-* \
yann@1: +	| we32k-* \
yann@1: +	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
yann@1: +	| xtensa-* \
yann@1: +	| ymp-* \
yann@1: +	| z8k-*)
yann@1:  		;;
yann@1:  	# Recognize the various machine names and aliases which stand
yann@1:  	# for a CPU type and a company and sometimes even an OS.
yann@1: @@ -249,14 +368,14 @@
yann@1:  		os=-sysv
yann@1:  		;;
yann@1:  	amiga | amiga-*)
yann@1: -		basic_machine=m68k-cbm
yann@1: +		basic_machine=m68k-unknown
yann@1:  		;;
yann@1:  	amigaos | amigados)
yann@1: -		basic_machine=m68k-cbm
yann@1: +		basic_machine=m68k-unknown
yann@1:  		os=-amigaos
yann@1:  		;;
yann@1:  	amigaunix | amix)
yann@1: -		basic_machine=m68k-cbm
yann@1: +		basic_machine=m68k-unknown
yann@1:  		os=-sysv4
yann@1:  		;;
yann@1:  	apollo68)
yann@1: @@ -275,6 +394,10 @@
yann@1:  		basic_machine=ns32k-sequent
yann@1:  		os=-dynix
yann@1:  		;;
yann@1: +	c90)
yann@1: +		basic_machine=c90-cray
yann@1: +		os=-unicos
yann@1: +		;;
yann@1:  	convex-c1)
yann@1:  		basic_machine=c1-convex
yann@1:  		os=-bsd
yann@1: @@ -295,27 +418,30 @@
yann@1:  		basic_machine=c38-convex
yann@1:  		os=-bsd
yann@1:  		;;
yann@1: -	cray | ymp)
yann@1: -		basic_machine=ymp-cray
yann@1: -		os=-unicos
yann@1: -		;;
yann@1: -	cray2)
yann@1: -		basic_machine=cray2-cray
yann@1: -		os=-unicos
yann@1: -		;;
yann@1: -	[ctj]90-cray)
yann@1: -		basic_machine=c90-cray
yann@1: +	cray | j90)
yann@1: +		basic_machine=j90-cray
yann@1:  		os=-unicos
yann@1:  		;;
yann@1:  	crds | unos)
yann@1:  		basic_machine=m68k-crds
yann@1:  		;;
yann@1: +	cris | cris-* | etrax*)
yann@1: +		basic_machine=cris-axis
yann@1: +		;;
yann@1:  	da30 | da30-*)
yann@1:  		basic_machine=m68k-da30
yann@1:  		;;
yann@1:  	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
yann@1:  		basic_machine=mips-dec
yann@1:  		;;
yann@1: +	decsystem10* | dec10*)
yann@1: +		basic_machine=pdp10-dec
yann@1: +		os=-tops10
yann@1: +		;;
yann@1: +	decsystem20* | dec20*)
yann@1: +		basic_machine=pdp10-dec
yann@1: +		os=-tops20
yann@1: +		;;
yann@1:  	delta | 3300 | motorola-3300 | motorola-delta \
yann@1:  	      | 3300-motorola | delta-motorola)
yann@1:  		basic_machine=m68k-motorola
yann@1: @@ -357,6 +483,10 @@
yann@1:  		basic_machine=tron-gmicro
yann@1:  		os=-sysv
yann@1:  		;;
yann@1: +	go32)
yann@1: +		basic_machine=i386-pc
yann@1: +		os=-go32
yann@1: +		;;
yann@1:  	h3050r* | hiux*)
yann@1:  		basic_machine=hppa1.1-hitachi
yann@1:  		os=-hiuxwe2
yann@1: @@ -432,19 +562,19 @@
yann@1:  		basic_machine=i370-ibm
yann@1:  		;;
yann@1:  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
yann@1: -	i[34567]86v32)
yann@1: +	i*86v32)
yann@1:  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
yann@1:  		os=-sysv32
yann@1:  		;;
yann@1: -	i[34567]86v4*)
yann@1: +	i*86v4*)
yann@1:  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
yann@1:  		os=-sysv4
yann@1:  		;;
yann@1: -	i[34567]86v)
yann@1: +	i*86v)
yann@1:  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
yann@1:  		os=-sysv
yann@1:  		;;
yann@1: -	i[34567]86sol2)
yann@1: +	i*86sol2)
yann@1:  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
yann@1:  		os=-solaris2
yann@1:  		;;
yann@1: @@ -456,17 +586,6 @@
yann@1:  		basic_machine=i386-unknown
yann@1:  		os=-vsta
yann@1:  		;;
yann@1: -	i386-go32 | go32)
yann@1: -		basic_machine=i386-unknown
yann@1: -		os=-go32
yann@1: -		;;
yann@1: -	i386-mingw32 | mingw32)
yann@1: -		basic_machine=i386-unknown
yann@1: -		os=-mingw32
yann@1: -		;;
yann@1: -	i386-qnx | qnx)
yann@1: -		basic_machine=i386-qnx
yann@1: -		;;
yann@1:  	iris | iris4d)
yann@1:  		basic_machine=mips-sgi
yann@1:  		case $os in
yann@1: @@ -492,6 +611,10 @@
yann@1:  		basic_machine=ns32k-utek
yann@1:  		os=-sysv
yann@1:  		;;
yann@1: +	mingw32)
yann@1: +		basic_machine=i386-pc
yann@1: +		os=-mingw32
yann@1: +		;;
yann@1:  	miniframe)
yann@1:  		basic_machine=m68000-convergent
yann@1:  		;;
yann@1: @@ -499,26 +622,26 @@
yann@1:  		basic_machine=m68k-atari
yann@1:  		os=-mint
yann@1:  		;;
yann@1: -	mipsel*-linux*)
yann@1: -		basic_machine=mipsel-unknown
yann@1: -		os=-linux-gnu
yann@1: -		;;
yann@1: -	mips*-linux*)
yann@1: -		basic_machine=mips-unknown
yann@1: -		os=-linux-gnu
yann@1: -		;;
yann@1:  	mips3*-*)
yann@1:  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
yann@1:  		;;
yann@1:  	mips3*)
yann@1:  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
yann@1:  		;;
yann@1: +	mmix*)
yann@1: +		basic_machine=mmix-knuth
yann@1: +		os=-mmixware
yann@1: +		;;
yann@1:  	monitor)
yann@1:  		basic_machine=m68k-rom68k
yann@1:  		os=-coff
yann@1:  		;;
yann@1: +	morphos)
yann@1: +		basic_machine=powerpc-unknown
yann@1: +		os=-morphos
yann@1: +		;;
yann@1:  	msdos)
yann@1: -		basic_machine=i386-unknown
yann@1: +		basic_machine=i386-pc
yann@1:  		os=-msdos
yann@1:  		;;
yann@1:  	mvs)
yann@1: @@ -582,13 +705,24 @@
yann@1:  		basic_machine=i960-intel
yann@1:  		os=-mon960
yann@1:  		;;
yann@1: +	nonstopux)
yann@1: +		basic_machine=mips-compaq
yann@1: +		os=-nonstopux
yann@1: +		;;
yann@1:  	np1)
yann@1:  		basic_machine=np1-gould
yann@1:  		;;
yann@1: +	nsr-tandem)
yann@1: +		basic_machine=nsr-tandem
yann@1: +		;;
yann@1:  	op50n-* | op60c-*)
yann@1:  		basic_machine=hppa1.1-oki
yann@1:  		os=-proelf
yann@1:  		;;
yann@1: +	or32 | or32-*)
yann@1: +		basic_machine=or32-unknown
yann@1: +		os=-coff
yann@1: +		;;
yann@1:  	OSE68000 | ose68000)
yann@1:  		basic_machine=m68000-ericsson
yann@1:  		os=-ose
yann@1: @@ -614,28 +748,28 @@
yann@1:          pc532 | pc532-*)
yann@1:  		basic_machine=ns32k-pc532
yann@1:  		;;
yann@1: -	pentium | p5 | k5 | k6 | nexen)
yann@1: +	pentium | p5 | k5 | k6 | nexgen | viac3)
yann@1:  		basic_machine=i586-pc
yann@1:  		;;
yann@1: -	pentiumpro | p6 | 6x86)
yann@1: +	pentiumpro | p6 | 6x86 | athlon)
yann@1:  		basic_machine=i686-pc
yann@1:  		;;
yann@1:  	pentiumii | pentium2)
yann@1: -		basic_machine=i786-pc
yann@1: +		basic_machine=i686-pc
yann@1:  		;;
yann@1: -	pentium-* | p5-* | k5-* | k6-* | nexen-*)
yann@1: +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
yann@1:  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1:  		;;
yann@1: -	pentiumpro-* | p6-* | 6x86-*)
yann@1: +	pentiumpro-* | p6-* | 6x86-* | athlon-*)
yann@1:  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1:  		;;
yann@1:  	pentiumii-* | pentium2-*)
yann@1: -		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1: +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1:  		;;
yann@1:  	pn)
yann@1:  		basic_machine=pn-gould
yann@1:  		;;
yann@1: -	power)	basic_machine=rs6000-ibm
yann@1: +	power)	basic_machine=power-ibm
yann@1:  		;;
yann@1:  	ppc)	basic_machine=powerpc-unknown
yann@1:  	        ;;
yann@1: @@ -647,9 +781,23 @@
yann@1:  	ppcle-* | powerpclittle-*)
yann@1:  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1:  		;;
yann@1: +	ppc64)	basic_machine=powerpc64-unknown
yann@1: +	        ;;
yann@1: +	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1: +		;;
yann@1: +	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
yann@1: +		basic_machine=powerpc64le-unknown
yann@1: +	        ;;
yann@1: +	ppc64le-* | powerpc64little-*)
yann@1: +		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1: +		;;
yann@1:  	ps2)
yann@1:  		basic_machine=i386-ibm
yann@1:  		;;
yann@1: +	pw32)
yann@1: +		basic_machine=i586-unknown
yann@1: +		os=-pw32
yann@1: +		;;
yann@1:  	rom68k)
yann@1:  		basic_machine=m68k-rom68k
yann@1:  		os=-coff
yann@1: @@ -660,6 +808,12 @@
yann@1:  	rtpc | rtpc-*)
yann@1:  		basic_machine=romp-ibm
yann@1:  		;;
yann@1: +	s390 | s390-*)
yann@1: +		basic_machine=s390-ibm
yann@1: +		;;
yann@1: +	s390x | s390x-*)
yann@1: +		basic_machine=s390x-ibm
yann@1: +		;;
yann@1:  	sa29200)
yann@1:  		basic_machine=a29k-amd
yann@1:  		os=-udi
yann@1: @@ -671,7 +825,7 @@
yann@1:  		basic_machine=sh-hitachi
yann@1:  		os=-hms
yann@1:  		;;
yann@1: -	sparclite-wrs)
yann@1: +	sparclite-wrs | simso-wrs)
yann@1:  		basic_machine=sparclite-wrs
yann@1:  		os=-vxworks
yann@1:  		;;
yann@1: @@ -729,20 +883,40 @@
yann@1:  	sun386 | sun386i | roadrunner)
yann@1:  		basic_machine=i386-sun
yann@1:  		;;
yann@1: +        sv1)
yann@1: +		basic_machine=sv1-cray
yann@1: +		os=-unicos
yann@1: +		;;
yann@1:  	symmetry)
yann@1:  		basic_machine=i386-sequent
yann@1:  		os=-dynix
yann@1:  		;;
yann@1: +	t3d)
yann@1: +		basic_machine=alpha-cray
yann@1: +		os=-unicos
yann@1: +		;;
yann@1:  	t3e)
yann@1: -		basic_machine=t3e-cray
yann@1: +		basic_machine=alphaev5-cray
yann@1: +		os=-unicos
yann@1: +		;;
yann@1: +	t90)
yann@1: +		basic_machine=t90-cray
yann@1:  		os=-unicos
yann@1:  		;;
yann@1: +	tic54x | c54x*)
yann@1: +		basic_machine=tic54x-unknown
yann@1: +		os=-coff
yann@1: +		;;
yann@1:  	tx39)
yann@1:  		basic_machine=mipstx39-unknown
yann@1:  		;;
yann@1:  	tx39el)
yann@1:  		basic_machine=mipstx39el-unknown
yann@1:  		;;
yann@1: +	toad1)
yann@1: +		basic_machine=pdp10-xkl
yann@1: +		os=-tops20
yann@1: +		;;
yann@1:  	tower | tower-32)
yann@1:  		basic_machine=m68k-ncr
yann@1:  		;;
yann@1: @@ -789,13 +963,17 @@
yann@1:  		basic_machine=hppa1.1-winbond
yann@1:  		os=-proelf
yann@1:  		;;
yann@1: -	xmp)
yann@1: -		basic_machine=xmp-cray
yann@1: -		os=-unicos
yann@1: +	windows32)
yann@1: +		basic_machine=i386-pc
yann@1: +		os=-windows32-msvcrt
yann@1:  		;;
yann@1:          xps | xps100)
yann@1:  		basic_machine=xps100-honeywell
yann@1:  		;;
yann@1: +	ymp)
yann@1: +		basic_machine=ymp-cray
yann@1: +		os=-unicos
yann@1: +		;;
yann@1:  	z8k-*-coff)
yann@1:  		basic_machine=z8k-unknown
yann@1:  		os=-sim
yann@1: @@ -816,13 +994,6 @@
yann@1:  	op60c)
yann@1:  		basic_machine=hppa1.1-oki
yann@1:  		;;
yann@1: -	mips)
yann@1: -		if [ x$os = x-linux-gnu ]; then
yann@1: -			basic_machine=mips-unknown
yann@1: -		else
yann@1: -			basic_machine=mips-mips
yann@1: -		fi
yann@1: -		;;
yann@1:  	romp)
yann@1:  		basic_machine=romp-ibm
yann@1:  		;;
yann@1: @@ -832,13 +1003,23 @@
yann@1:  	vax)
yann@1:  		basic_machine=vax-dec
yann@1:  		;;
yann@1: +	pdp10)
yann@1: +		# there are many clones, so DEC is not a safe bet
yann@1: +		basic_machine=pdp10-unknown
yann@1: +		;;
yann@1:  	pdp11)
yann@1:  		basic_machine=pdp11-dec
yann@1:  		;;
yann@1:  	we32k)
yann@1:  		basic_machine=we32k-att
yann@1:  		;;
yann@1: -	sparc | sparcv9)
yann@1: +	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
yann@1: +		basic_machine=sh-unknown
yann@1: +		;;
yann@1: +	sh64)
yann@1: +		basic_machine=sh64-unknown
yann@1: +		;;
yann@1: +	sparc | sparcv9 | sparcv9b)
yann@1:  		basic_machine=sparc-sun
yann@1:  		;;
yann@1:          cydra)
yann@1: @@ -860,6 +1041,9 @@
yann@1:  		basic_machine=c4x-none
yann@1:  		os=-coff
yann@1:  		;;
yann@1: +	*-unknown)
yann@1: +		# Make sure to match an already-canonicalized machine name.
yann@1: +		;;
yann@1:  	*)
yann@1:  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
yann@1:  		exit 1
yann@1: @@ -916,14 +1100,31 @@
yann@1:  	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
yann@1:  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
yann@1:  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
yann@1: +	      | -chorusos* | -chorusrdb* \
yann@1:  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
yann@1:  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
yann@1: -	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
yann@1: +	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
yann@1: +	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
yann@1: +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
yann@1: +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
yann@1: +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
yann@1:  	# Remember, each alternative MUST END IN *, to match a version number.
yann@1:  		;;
yann@1: +	-qnx*)
yann@1: +		case $basic_machine in
yann@1: +		    x86-* | i*86-*)
yann@1: +			;;
yann@1: +		    *)
yann@1: +			os=-nto$os
yann@1: +			;;
yann@1: +		esac
yann@1: +		;;
yann@1: +	-nto*)
yann@1: +		os=-nto-qnx
yann@1: +		;;
yann@1:  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
yann@1:  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
yann@1: -	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
yann@1: +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
yann@1:  		;;
yann@1:  	-mac*)
yann@1:  		os=`echo $os | sed -e 's|mac|macos|'`
yann@1: @@ -940,6 +1141,9 @@
yann@1:  	-opened*)
yann@1:  		os=-openedition
yann@1:  		;;
yann@1: +	-wince*)
yann@1: +		os=-wince
yann@1: +		;;
yann@1:  	-osfrose*)
yann@1:  		os=-osfrose
yann@1:  		;;
yann@1: @@ -955,15 +1159,24 @@
yann@1:  	-acis*)
yann@1:  		os=-aos
yann@1:  		;;
yann@1: +	-atheos*)
yann@1: +		os=-atheos
yann@1: +		;;
yann@1:  	-386bsd)
yann@1:  		os=-bsd
yann@1:  		;;
yann@1:  	-ctix* | -uts*)
yann@1:  		os=-sysv
yann@1:  		;;
yann@1: +	-nova*)
yann@1: +		os=-rtmk-nova
yann@1: +		;;
yann@1:  	-ns2 )
yann@1:  	        os=-nextstep2
yann@1:  		;;
yann@1: +	-nsk*)
yann@1: +		os=-nsk
yann@1: +		;;
yann@1:  	# Preserve the version number of sinix5.
yann@1:  	-sinix5.*)
yann@1:  		os=`echo $os | sed -e 's|sinix|sysv|'`
yann@1: @@ -977,9 +1190,6 @@
yann@1:  	-oss*)
yann@1:  		os=-sysv3
yann@1:  		;;
yann@1: -        -qnx)
yann@1: -		os=-qnx4
yann@1: -		;;
yann@1:  	-svr4)
yann@1:  		os=-sysv4
yann@1:  		;;
yann@1: @@ -1001,7 +1211,7 @@
yann@1:  	-xenix)
yann@1:  		os=-xenix
yann@1:  		;;
yann@1: -        -*mint | -*MiNT)
yann@1: +        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
yann@1:  	        os=-mint
yann@1:  		;;
yann@1:  	-none)
yann@1: @@ -1035,6 +1245,10 @@
yann@1:  	arm*-semi)
yann@1:  		os=-aout
yann@1:  		;;
yann@1: +	# This must come before the *-dec entry.
yann@1: +	pdp10-*)
yann@1: +		os=-tops20
yann@1: +		;;
yann@1:          pdp11-*)
yann@1:  		os=-none
yann@1:  		;;
yann@1: @@ -1062,6 +1276,9 @@
yann@1:  	mips*-*)
yann@1:  		os=-elf
yann@1:  		;;
yann@1: +	or32-*)
yann@1: +		os=-coff
yann@1: +		;;
yann@1:  	*-tti)	# must be before sparc entry or we get the wrong os.
yann@1:  		os=-sysv3
yann@1:  		;;
yann@1: @@ -1143,7 +1360,7 @@
yann@1:  	*-masscomp)
yann@1:  		os=-rtu
yann@1:  		;;
yann@1: -	f301-fujitsu)
yann@1: +	f30[01]-fujitsu | f700-fujitsu)
yann@1:  		os=-uxpv
yann@1:  		;;
yann@1:  	*-rom68k)
yann@1: @@ -1209,7 +1426,7 @@
yann@1:  			-ptx*)
yann@1:  				vendor=sequent
yann@1:  				;;
yann@1: -			-vxsim* | -vxworks*)
yann@1: +			-vxsim* | -vxworks* | -windiss*)
yann@1:  				vendor=wrs
yann@1:  				;;
yann@1:  			-aux*)
yann@1: @@ -1221,12 +1438,23 @@
yann@1:  			-mpw* | -macos*)
yann@1:  				vendor=apple
yann@1:  				;;
yann@1: -			-*mint | -*MiNT)
yann@1: +			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
yann@1:  				vendor=atari
yann@1:  				;;
yann@1: +			-vos*)
yann@1: +				vendor=stratus
yann@1: +				;;
yann@1:  		esac
yann@1:  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
yann@1:  		;;
yann@1:  esac
yann@1:  
yann@1:  echo $basic_machine$os
yann@1: +exit 0
yann@1: +
yann@1: +# Local variables:
yann@1: +# eval: (add-hook 'write-file-hooks 'time-stamp)
yann@1: +# time-stamp-start: "timestamp='"
yann@1: +# time-stamp-format: "%:y-%02m-%02d"
yann@1: +# time-stamp-end: "'"
yann@1: +# End: