OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2018-08-29'
+timestamp='2015-07-28'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # It is wrong to echo any other type of specification.
 me=`echo "$0" | sed -e 's,.*/,,'`
+usage="\
-usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+       $0 [OPTION] ALIAS
 Canonicalize a configuration name.
-Options:
+Operation modes:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
 Report bugs and patches to <config-patches@gnu.org>."
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help" >&2
+       echo "$me: invalid option $1$help"
        exit 1 ;;
     *local*)
        # First pass through any local machine types.
-       echo "$1"
+       echo $1
        exit ;;
     * )
 ) ;;
  *) echo "$me: too many arguments$help" >&2
     exit 1;;
 esac
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-# Split fields of configuration type
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-IFS="-" read -r field1 field2 field3 field4 <<EOF
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
-$1
+    ;;
-EOF
+esac
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
-# Separate into logical components for further validation
+### can provide default operating systems below.
-case $1 in
+case $os in
-	*-*-*-*-*)
+	-sun*os*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
-		exit 1
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
 		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
-	*-*-*-*)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
-		basic_machine=$field1-$field2
+	-sco4)
+		os=-sco3.2v4
-		os=$field3-$field4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	*-*-*)
-		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
-		# parts
-		maybe_os=$field2-$field3
+		;;
-		case $maybe_os in
-			nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
-			| linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
-			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
-			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+	-sco3.2.[4-9]*)
-			| storm-chaos* | os2-emx* | rtmk-nova*)
-				basic_machine=$field1
-				os=$maybe_os
-				;;
-			android-linux)
-				basic_machine=$field1-unknown
-				os=linux-android
-				;;
-			*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-				basic_machine=$field1-$field2
-				os=$field3
-				;;
-		esac
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	*-*)
-		# A lone config we happen to match not fitting any pattern
-		case $field1-$field2 in
+		;;
-			decstation-3100)
-				basic_machine=mips-dec
-				os=
-				;;
-			*-*)
+	-sco3.2v[4-9]*)
-				# Second component is usually, but not always the OS
-				case $field2 in
-					# Prevent following clause from handling this valid os
-					sun*os*)
-						basic_machine=$field1
-						os=$field2
-						;;
-					# Manufacturers
-					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-					| convergent* | ncr* | news | 32* | 3600* | 3100* \
-					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
-					| ultra | tti* | harris | dolphin | highlevel | gould \
-					| cbm | ns | masscomp | apple | axis | knuth | cray \
-					| microblaze* | sim | cisco \
-					| oki | wec | wrs | winbond)
+		# Don't forget version if it is 3.2v4 or newer.
-						basic_machine=$field1-$field2
-						os=
-						;;
-					*)
-						basic_machine=$field1
-						os=$field2
-						;;
-				esac
-			;;
-		esac
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		esac
+		os=-mint
 		;;
 esac
-# Decode 1-component or ad-hoc basic machines
+# Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
+	# Recognize the basic CPU types without company name.
-	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# Some are omitted here because they have special meanings below.
+a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
-	# some cases the only manufacturer, in others, it is the most popular.
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| ba \
+	| be32 | be64 \
+	| bfin \
-	w89k)
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
-		cpu=hppa1.1
+	| z8k | z80)
-		vendor=winbond
+		basic_machine=$basic_machine-unknown
 		;;
-	op50n)
-		cpu=hppa1.1
+	c54x)
-		vendor=oki
+		basic_machine=tic54x-unknown
 		;;
-	op60c)
-		cpu=hppa1.1
+	c55x)
-		vendor=oki
+		basic_machine=tic55x-unknown
-		;;
-	ibm*)
+		;;
-		cpu=i370
+	c6x)
-		vendor=ibm
+		basic_machine=tic6x-unknown
-		;;
-	orion105)
+		;;
-		cpu=clipper
+	leon|leon[3-9])
-		vendor=highlevel
+		basic_machine=sparc-$basic_machine
 		;;
-	mac | mpw | mac-mpw)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		cpu=m68k
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
-		vendor=apple
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
-		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
-	pmac | pmac-mpw)
+		;;
-		cpu=powerpc
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+	# 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*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| ba-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| e2k-* | elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| riscv32-* | riscv64-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| visium-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
-		vendor=apple
+	xtensa*)
-		;;
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+bsd)
 		basic_machine=i386-unknown
-	# Recognize the various machine names and aliases which stand
+		os=-bsd
-	# for a CPU type and a company and sometimes even an OS.
-b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		;;
-		cpu=m68000
+b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
-		vendor=att
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+        asmjs)
+		basic_machine=asmjs-unknown
 		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
-b*)
+	blackfin-*)
-		cpu=we32k
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
-		vendor=att
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
 		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
-	bluegene*)
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
-		cpu=powerpc
+		;;
-		vendor=ibm
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		os=cnk
+		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
+		;;
-		cpu=pdp10
+	decsystem10* | dec10*)
-		vendor=dec
+		basic_machine=pdp10-dec
-		os=tops10
+		os=-tops10
-		;;
-	decsystem20* | dec20*)
+		;;
-		cpu=pdp10
+	decsystem20* | dec20*)
-		vendor=dec
+		basic_machine=pdp10-dec
-		os=tops20
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
-		;;
+	      | 3300-motorola | delta-motorola)
-	delta | 3300 | motorola-3300 | motorola-delta \
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
-	      | 3300-motorola | delta-motorola)
+	ebmon29k)
-		cpu=m68k
+		basic_machine=a29k-amd
-		vendor=motorola
-		;;
+		os=-ebmon
-	dpx2*)
+		;;
-		cpu=m68k
+	elxsi)
-		vendor=bull
+		basic_machine=elxsi-elxsi
-		os=sysv3
-		;;
+		os=-bsd
-	encore | umax | mmax)
+		;;
-		cpu=ns32k
-		vendor=encore
+	encore | umax | mmax)
-		;;
+		basic_machine=ns32k-encore
-	elxsi)
+		;;
-		cpu=elxsi
+	es1800 | OSE68k | ose68k | ose | OSE)
-		vendor=elxsi
+		basic_machine=m68k-ericsson
-		os=${os:-bsd}
-		;;
+		os=-ose
-	fx2800)
+		;;
-		cpu=i860
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
-		vendor=alliant
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
 		;;
-	genix)
+	go32)
-		cpu=ns32k
+		basic_machine=i386-pc
+		os=-go32
-		vendor=ns
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
 		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
-	h3050r* | hiux*)
+		;;
-		cpu=hppa1.1
+	hp300hpux)
-		vendor=hitachi
+		basic_machine=m68k-hp
-		os=hiuxwe2
+		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		;;
-		cpu=hppa1.0
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		vendor=hp
+		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
+		;;
-		cpu=m68000
+	hp9k2[0-9][0-9] | hp9k31[0-9])
-		vendor=hp
+		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
+		;;
-		cpu=m68k
+	hp9k3[2-9][0-9])
-		vendor=hp
+		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		;;
-		cpu=hppa1.0
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		vendor=hp
+		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		;;
-		cpu=hppa1.1
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
+	hp9k78[0-9] | hp78[0-9])
-		cpu=hppa1.1
+		# FIXME: really hppa2.0-hp
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		cpu=hppa1.1
+		# FIXME: really hppa2.0-hp
-		vendor=hp
+		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
+		;;
-		cpu=hppa1.1
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
-		vendor=hp
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
 		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		;;
-		cpu=hppa1.0
+	i370-ibm* | ibm*)
-		vendor=hp
+		basic_machine=i370-ibm
-		;;
-	i*86v32)
+		;;
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+	i*86v32)
-		vendor=pc
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=sysv32
+		os=-sysv32
-		;;
-	i*86v4*)
+		;;
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+	i*86v4*)
-		vendor=pc
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=sysv4
+		os=-sysv4
-		;;
-	i*86v)
+		;;
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+	i*86v)
-		vendor=pc
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=sysv
+		os=-sysv
-		;;
-	i*86sol2)
+		;;
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+	i*86sol2)
-		vendor=pc
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
-		os=solaris2
+		;;
+	i386mach)
-		;;
+		basic_machine=i386-mach
+		os=-mach
-	j90 | j90-cray)
+		;;
-		cpu=j90
+	i386-vsta | vsta)
-		vendor=cray
+		basic_machine=i386-unknown
-		os=${os:-unicos}
+		os=-vsta
-		;;
-	iris | iris4d)
+		;;
-		cpu=mips
+	iris | iris4d)
-		vendor=sgi
+		basic_machine=mips-sgi
 		case $os in
-		    irix*)
+		    -irix*)
 			;;
 		    *)
-			os=irix4
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
-			;;
+		basic_machine=arm-unknown
-		esac
-		;;
+		os=-mingw32ce
-	miniframe)
+		;;
-		cpu=m68000
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		vendor=convergent
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
-	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
-		cpu=m68k
+	news1000)
-		vendor=atari
+		basic_machine=m68030-sony
-		os=mint
+		os=-newsos
 		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
-	news-3600 | risc-news)
+		;;
-		cpu=mips
+	necv70)
-		vendor=sony
+		basic_machine=v70-nec
-		os=newsos
-		;;
+		os=-sysv
-	next | m*-next)
+		;;
-		cpu=m68k
+	next | m*-next )
-		vendor=next
+		basic_machine=m68k-next
 		case $os in
-		    nextstep* )
+		    -nextstep* )
 			;;
-		    ns2*)
+		    -ns2*)
-		      os=nextstep2
+		      os=-nextstep2
 			;;
 		    *)
-		      os=nextstep3
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
-			;;
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
-		esac
+	np1)
+		basic_machine=np1-gould
+		;;
-		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
-	np1)
+		;;
-		cpu=np1
+	nsr-tandem)
+		basic_machine=nsr-tandem
-		vendor=gould
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
-	op50n-* | op60c-*)
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
-		cpu=hppa1.1
+	os68k)
-		vendor=oki
+		basic_machine=m68k-none
+		os=-os68k
-		os=proelf
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
-	pa-hitachi)
+		;;
-		cpu=hppa1.1
+	parisc-*)
-		vendor=hitachi
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=hiuxwe2
+		os=-linux
-		;;
-	pbd)
+		;;
-		cpu=sparc
+	pbd)
-		vendor=tti
+		basic_machine=sparc-tti
-		;;
-	pbb)
+		;;
-		cpu=m68k
+	pbb)
-		vendor=tti
-		;;
+		basic_machine=m68k-tti
-	pc532)
+		;;
-		cpu=ns32k
+	pc532 | pc532-*)
-		vendor=pc532
-		;;
+		basic_machine=ns32k-pc532
-	pn)
+		;;
-		cpu=pn
+	pc98)
-		vendor=gould
-		;;
+		basic_machine=i386-pc
-	power)
+		;;
-		cpu=power
-		vendor=ibm
+	pc98-*)
-		;;
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-	ps2)
+		;;
-		cpu=i386
+	pentium | p5 | k5 | k6 | nexgen | viac3)
-		vendor=ibm
-		;;
+		basic_machine=i586-pc
-	rm[46]00)
+		;;
-		cpu=mips
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		vendor=siemens
+		basic_machine=i686-pc
-		;;
-	rtpc | rtpc-*)
+		;;
-		cpu=romp
-		vendor=ibm
-		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
-	sde)
-		cpu=mipsisa32
-		vendor=sde
-		os=${os:-elf}
+		basic_machine=i686-pc
-		;;
-	simso-wrs)
-		cpu=sparclite
+		;;
-		vendor=wrs
+	pentium4)
-		os=vxworks
-		;;
+		basic_machine=i786-pc
-	tower | tower-32)
+		;;
-		cpu=m68k
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		vendor=ncr
-		;;
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-	vpp*|vx|vx-*)
+		;;
-		cpu=f301
-		vendor=fujitsu
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		;;
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-	w65)
+		;;
-		cpu=w65
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		vendor=wdc
-		;;
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-	w89k-*)
-		cpu=hppa1.1
+		;;
-		vendor=winbond
+	pentium4-*)
-		os=proelf
-		;;
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-	none)
+		;;
-		cpu=none
-		vendor=none
-		;;
+	pn)
-	leon|leon[3-9])
+		basic_machine=pn-gould
-		cpu=sparc
-		vendor=$basic_machine
 		;;
-	leon-*|leon[3-9]-*)
+	power)	basic_machine=power-ibm
-		cpu=sparc
-		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+		;;
-		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
-	*-*)
-		IFS="-" read -r cpu vendor <<EOF
+		;;
-$basic_machine
-EOF
+	ppc-* | ppcbe-*)
-		;;
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
+		;;
-		cpu=$basic_machine
+	ppcle | powerpclittle | ppc-le | powerpc-little)
-		vendor=pc
+		basic_machine=powerpcle-unknown
-		;;
-	# These rules are duplicated from below for sake of the special case above;
-	# i.e. things that normalized to x86 arches should also default to "pc"
-	pc98)
+		;;
-		cpu=i386
+	ppcle-* | powerpclittle-*)
-		vendor=pc
-		;;
-	x64 | amd64)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		cpu=x86_64
+		;;
-		vendor=pc
-		;;
-	# Recognize the basic CPU types without company name.
-	*)
+	ppc64)	basic_machine=powerpc64-unknown
-		cpu=$basic_machine
-		vendor=unknown
-		;;
-esac
+		;;
-unset -v basic_machine
-# Decode basic machines in the full and proper CPU-Company form.
-case $cpu-$vendor in
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
-	craynv-unknown)
+		;;
-		vendor=cray
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		os=${os:-unicosmp}
-		;;
+		basic_machine=powerpc64le-unknown
-	c90-unknown | c90-cray)
+		;;
-		vendor=cray
+	ppc64le-* | powerpc64little-*)
-		os=${os:-unicos}
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
-	fx80-unknown)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
-		vendor=alliant
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
-		;;
+	rom68k)
-	romp-unknown)
+		basic_machine=m68k-rom68k
-		vendor=ibm
+		os=-coff
 		;;
-	mmix-unknown)
+	rm[46]00)
-		vendor=knuth
+		basic_machine=mips-siemens
 		;;
-	microblaze-unknown | microblazeel-unknown)
+	rtpc | rtpc-*)
-		vendor=xilinx
+		basic_machine=romp-ibm
 		;;
-	rs6000-unknown)
+	s390 | s390-*)
-		vendor=ibm
+		basic_machine=s390-ibm
 		;;
-	vax-unknown)
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
-		vendor=dec
+		;;
-		;;
+	sa29200)
-	pdp11-unknown)
+		basic_machine=a29k-amd
-		vendor=dec
+		os=-udi
 		;;
-	we32k-unknown)
+	sb1)
-		vendor=att
+		basic_machine=mipsisa64sb1-unknown
 		;;
-	cydra-unknown)
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
-		vendor=cydrome
+		;;
-		;;
+	sde)
+		basic_machine=mipsisa32-sde
-	i370-ibm*)
+		os=-elf
-		vendor=ibm
+		;;
-		;;
+	sei)
-	orion-unknown)
-		vendor=highlevel
+		basic_machine=mips-sei
-		;;
+		os=-seiux
-	xps-unknown | xps100-unknown)
+		;;
-		cpu=xps100
+	sequent)
-		vendor=honeywell
-		;;
+		basic_machine=i386-sequent
-	# Here we normalize CPU types with a missing or matching vendor
-	dpx20-unknown | dpx20-bull)
+		;;
-		cpu=rs6000
+	sh)
-		vendor=bull
-		os=${os:-bosx}
-		;;
+		basic_machine=sh-hitachi
+		os=-hms
-	# Here we normalize CPU types irrespective of the vendor
+		;;
-	amd64-*)
-		cpu=x86_64
+	sh5el)
-		;;
+		basic_machine=sh5le-unknown
-	blackfin-*)
+		;;
-		cpu=bfin
+	sh64)
+		basic_machine=sh64-unknown
-		os=linux
+		;;
-		;;
+	sparclite-wrs | simso-wrs)
-	c54x-*)
+		basic_machine=sparclite-wrs
+		os=-vxworks
-		cpu=tic54x
+		;;
-		;;
+	sps7)
-	c55x-*)
+		basic_machine=m68k-bull
-		cpu=tic55x
+		os=-sysv2
 		;;
-	c6x-*)
+	spur)
-		cpu=tic6x
-		;;
+		basic_machine=spur-unknown
-	e500v[12]-*)
+		;;
-		cpu=powerpc
+	st2000)
+		basic_machine=m68k-tandem
-		os=$os"spe"
+		;;
-		;;
+	stratus)
-	mips3*-*)
+		basic_machine=i860-stratus
-		cpu=mips64
+		os=-sysv4
 		;;
-	ms1-*)
-		cpu=mt
+	strongarm-* | thumb-*)
-		;;
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-	m68knommu-*)
+		;;
+	sun2)
-		cpu=m68k
+		basic_machine=m68000-sun
-		os=linux
+		;;
-		;;
+	sun2os3)
-	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		basic_machine=m68000-sun
+		os=-sunos3
-		cpu=s12z
+		;;
-		;;
+	sun2os4)
-	openrisc-*)
+		basic_machine=m68000-sun
-		cpu=or32
+		os=-sunos4
 		;;
-	parisc-*)
+	sun3os3)
+		basic_machine=m68k-sun
-		cpu=hppa
+		os=-sunos3
-		os=linux
+		;;
-		;;
+	sun3os4)
+		basic_machine=m68k-sun
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		os=-sunos4
-		cpu=i586
+		;;
-		;;
+	sun4os3)
+		basic_machine=sparc-sun
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		os=-sunos3
-		cpu=i686
+		;;
-		;;
+	sun4os4)
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=sparc-sun
+		os=-sunos4
-		cpu=i686
+		;;
-		;;
+	sun4sol2)
-	pentium4-*)
+		basic_machine=sparc-sun
-		cpu=i786
+		os=-solaris2
 		;;
-	pc98-*)
+	sun3 | sun3-*)
-		cpu=i386
+		basic_machine=m68k-sun
 		;;
-	ppc-* | ppcbe-*)
+	sun4)
-		cpu=powerpc
+		basic_machine=sparc-sun
 		;;
-	ppcle-* | powerpclittle-*)
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
-		cpu=powerpcle
+		;;
-		;;
+	sv1)
+		basic_machine=sv1-cray
-	ppc64-*)
+		os=-unicos
-		cpu=powerpc64
+		;;
-		;;
+	symmetry)
-	ppc64le-* | powerpc64little-*)
+		basic_machine=i386-sequent
+		os=-dynix
-		cpu=powerpc64le
+		;;
-		;;
+	t3e)
-	sb1-*)
+		basic_machine=alphaev5-cray
-		cpu=mipsisa64sb1
+		os=-unicos
+		;;
-		;;
+	t90)
-	sb1el-*)
+		basic_machine=t90-cray
-		cpu=mipsisa64sb1el
+		os=-unicos
+		;;
-		;;
+	tile*)
-	sh5e[lb]-*)
+		basic_machine=$basic_machine-unknown
-		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+		os=-linux-gnu
 		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
-	spur-*)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
-		cpu=spur
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
-		;;
+	w65*)
-	strongarm-* | thumb-*)
+		basic_machine=w65-wdc
+		os=-none
-		cpu=arm
+		;;
-		;;
+	w89k-*)
-	tx39-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
-		cpu=mipstx39
+		;;
-		;;
+	xbox)
-	tx39el-*)
+		basic_machine=i686-pc
-		cpu=mipstx39el
+		os=-mingw32
 		;;
-	x64-*)
+	xps | xps100)
-		cpu=x86_64
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
-		;;
+	none)
-	xscale-* | xscalee[bl]-*)
+		basic_machine=none-none
-		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+		os=-none
 		;;
-	# Recognize the canonical CPU Types that limit and/or modify the
+# Here we handle the default manufacturer of certain CPU types.  It is in
-	# company names they are paired with.
-	cr16-*)
+# some cases the only manufacturer, in others, it is the most popular.
-		os=${os:-elf}
+	w89k)
-		;;
+		basic_machine=hppa1.1-winbond
-	crisv32-* | etraxfs*-*)
-		cpu=crisv32
+		;;
-		vendor=axis
+	op50n)
-		;;
+		basic_machine=hppa1.1-oki
-	cris-* | etrax*-*)
+		;;
-		cpu=cris
+	op60c)
-		vendor=axis
+		basic_machine=hppa1.1-oki
-		;;
-	crx-*)
+		;;
-		os=${os:-elf}
+	romp)
-		;;
+		basic_machine=romp-ibm
-	neo-tandem)
+		;;
-		cpu=neo
-		vendor=tandem
+	mmix)
-		;;
+		basic_machine=mmix-knuth
-	nse-tandem)
+		;;
-		cpu=nse
-		vendor=tandem
+	rs6000)
-		;;
+		basic_machine=rs6000-ibm
-	nsr-tandem)
-		cpu=nsr
+		;;
-		vendor=tandem
+	vax)
-		;;
-	nsv-tandem)
-		cpu=nsv
-		vendor=tandem
+		basic_machine=vax-dec
-		;;
-	nsx-tandem)
-		cpu=nsx
-		vendor=tandem
-		;;
-	s390-*)
-		cpu=s390
-		vendor=ibm
 		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
-	s390x-*)
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
-		cpu=s390x
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
-		vendor=ibm
+		basic_machine=powerpc-apple
-		;;
-	tile*-*)
+		;;
-		os=${os:-linux-gnu}
-		;;
-	*)
-		# Recognize the canonical CPU types that are allowed with any
-		# company name.
-		case $cpu in
-a | 580 \
-			| a29k \
-			| aarch64 | aarch64_be \
-			| abacus \
-			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
-			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
-			| alphapca5[67] | alpha64pca5[67] \
-			| am33_2.0 \
-			| arc | arceb \
-			| arm  | arm[lb]e | arme[lb] | armv* \
-			| avr | avr32 \
-			| asmjs \
-			| ba \
-			| be32 | be64 \
-			| bfin | bs2000 \
-			| c[123]* | c30 | [cjt]90 | c4x \
-			| c8051 | clipper | craynv | csky | cydra \
-			| d10v | d30v | dlx | dsp16xx \
-			| e2k | elxsi | epiphany \
-			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-			| h8300 | h8500 \
-			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-			| hexagon \
-			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
-			| ip2k | iq2000 \
-			| k1om \
-			| le32 | le64 \
-			| lm32 \
-			| m32c | m32r | m32rle \
-			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
-			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
-			| m88110 | m88k | maxq | mb | mcore | mep | metag \
-			| microblaze | microblazeel \
-			| mips | mipsbe | mipseb | mipsel | mipsle \
-			| mips16 \
-			| mips64 | mips64el \
-			| mips64octeon | mips64octeonel \
-			| mips64orion | mips64orionel \
-			| mips64r5900 | mips64r5900el \
-			| mips64vr | mips64vrel \
-			| mips64vr4100 | mips64vr4100el \
-			| mips64vr4300 | mips64vr4300el \
-			| mips64vr5000 | mips64vr5000el \
-			| mips64vr5900 | mips64vr5900el \
-			| mipsisa32 | mipsisa32el \
-			| mipsisa32r2 | mipsisa32r2el \
-			| mipsisa32r6 | mipsisa32r6el \
-			| mipsisa64 | mipsisa64el \
-			| mipsisa64r2 | mipsisa64r2el \
-			| mipsisa64r6 | mipsisa64r6el \
-			| mipsisa64sb1 | mipsisa64sb1el \
-			| mipsisa64sr71k | mipsisa64sr71kel \
-			| mipsr5900 | mipsr5900el \
-			| mipstx39 | mipstx39el \
-			| mmix \
-			| mn10200 | mn10300 \
-			| moxie \
-			| mt \
-			| msp430 \
-			| nds32 | nds32le | nds32be \
-			| nfp \
-			| nios | nios2 | nios2eb | nios2el \
-			| none | np1 | ns16k | ns32k \
-			| open8 \
-			| or1k* \
-			| or32 \
-			| orion \
-			| pdp10 | pdp11 | pj | pjl | pn | power \
-			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
-			| pru \
-			| pyramid \
-			| riscv | riscv32 | riscv64 \
-			| rl78 | romp | rs6000 | rx \
-			| score \
-			| sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
-			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
-			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
-			| sparclite \
-			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
-			| spu \
-			| tahoe \
-			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
-			| tron \
-			| ubicom32 \
-			| v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
-			| vax \
-			| visium \
-			| wasm32 \
-			| we32k \
-			| x86 | x86_64 | xc16x | xgate | xps100 \
-			| xstormy16 | xtensa* \
-			| ymp \
-			| z8k | z80)
+	*-unknown)
-				;;
+		# Make sure to match an already-canonicalized machine name.
-			*)
-				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+		;;
-				exit 1
+	*)
-				;;
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		esac
+		exit 1
 		;;
 esac
 # Here we canonicalize certain aliases for manufacturers.
-case $vendor in
+case $basic_machine in
-	digital*)
+	*-digital*)
-		vendor=dec
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
 		;;
-	commodore*)
+	*-commodore*)
-		vendor=cbm
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
 esac
 # Decode manufacturer-specific aliases for certain operating systems.
-if [ x$os != x ]
+if [ x"$os" != x"" ]
 then
-case $os in
-	# First match some system type aliases that might get confused
-	# with valid system types.
-	# solaris* is a basic system type, with this one exception.
+case $os in
-	auroraux)
+	# First match some system type aliases
-		os=auroraux
+	# that might get confused with valid system types.
-		;;
+	# -solaris* is a basic system type, with this one exception.
-	bluegene*)
+	-auroraux)
-		os=cnk
+		os=-auroraux
 		;;
-	solaris1 | solaris1.*)
+	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	solaris)
-		os=solaris2
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	unixware*)
+		;;
-		os=sysv4.2uw
+	-solaris)
-		;;
+		os=-solaris2
-	gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
-		;;
-	# es1800 is here to avoid being matched by es* (a different OS)
-	es1800*)
-		os=ose
-		;;
-	# Some version numbers need modification
-	chorusos*)
-		os=chorusos
-		;;
-	isc)
-		os=isc2.2
-		;;
-	sco6)
-		os=sco5v6
-		;;
-	sco5)
+	-svr4*)
-		os=sco3.2v5
-		;;
-	sco4)
-		os=sco3.2v4
-		;;
-	sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		;;
-	sco3.2v[4-9]* | sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		;;
-	scout)
-		# Don't match below
+		os=-sysv4
 		;;
-	sco*)
+	-unixware*)
-		os=sco3.2v2
+		os=-sysv4.2uw
 		;;
-	psos*)
+	-gnu/linux*)
-		os=psos
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-	# Now accept the basic system types.
+	# First accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative MUST end in a * to match a version number.
+	# Each alternative MUST END IN A *, to match a version number.
-	# sysv* is not here because it comes later, after sysvr4.
+	# -sysv* is not here because it comes later, after sysvr4.
-	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	     | sym* | kopensolaris* | plan9* \
+	      | -sym* | -kopensolaris* | -plan9* \
-	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	     | aos* | aros* | cloudabi* | sortix* \
+	      | -aos* | -aros* | -cloudabi* \
-	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	     | knetbsd* | mirbsd* | netbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
-	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	     | chorusrdb* | cegcc* | glidix* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	     | linux-newlib* | linux-musl* | linux-uclibc* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	     | interix* | uwin* | mks* | rhapsody* | darwin* \
-	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	     | os2* | vos* | palmos* | uclinux* | nucleus* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	     | morphos* | superux* | rtmk* | windiss* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	     | midnightbsd*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	qnx*)
+	-qnx*)
-		case $cpu in
+		case $basic_machine in
-		    x86 | i*86)
+		    x86-* | i*86-*)
-			;;
-		    *)
+			;;
-			os=nto-$os
-			;;
-		esac
+		    *)
-		;;
+			os=-nto$os
-	hiux*)
+			;;
-		os=hiuxwe2
+		esac
 		;;
-	nto-qnx*)
+	-nto-qnx*)
-		;;
-	nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	sim | xray | os68k* | v88r* \
+	-nto*)
-	    | windows* | osx | abug | netware* | os9* \
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
+		;;
-		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	linux-dietlibc)
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-		os=linux-dietlibc
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
-	linux*)
+	-mac*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	lynx*178)
+	-linux-dietlibc)
-		os=lynxos178
+		os=-linux-dietlibc
 		;;
-	lynx*5)
+	-linux*)
-		os=lynxos5
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
-	lynx*)
+	-sunos5*)
-		os=lynxos
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
-	mac*)
+	-sunos6*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
-	opened*)
+	-opened*)
-		os=openedition
+		os=-openedition
 		;;
-	os400*)
+	-os400*)
-		os=os400
+		os=-os400
 		;;
-	sunos5*)
+	-wince*)
-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+		os=-wince
 		;;
-	sunos6*)
+	-osfrose*)
-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+		os=-osfrose
 		;;
-	wince*)
+	-osf*)
-		os=wince
+		os=-osf
 		;;
-	utek*)
+	-utek*)
-		os=bsd
+		os=-bsd
 		;;
-	dynix*)
+	-dynix*)
-		os=bsd
+		os=-bsd
 		;;
-	acis*)
+	-acis*)
-		os=aos
+		os=-aos
 		;;
-	atheos*)
+	-atheos*)
-		os=atheos
+		os=-atheos
 		;;
-	syllable*)
+	-syllable*)
-		os=syllable
+		os=-syllable
 		;;
-bsd)
+	-386bsd)
-		os=bsd
+		os=-bsd
 		;;
-	ctix* | uts*)
+	-ctix* | -uts*)
-		os=sysv
+		os=-sysv
 		;;
-	nova*)
+	-nova*)
-		os=rtmk-nova
+		os=-rtmk-nova
 		;;
-	ns2)
+	-ns2 )
-		os=nextstep2
+		os=-nextstep2
 		;;
-	nsk*)
+	-nsk*)
-		os=nsk
+		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
-	sinix5.*)
+	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
 		;;
-	sinix*)
+	-sinix*)
-		os=sysv4
+		os=-sysv4
 		;;
-	tpf*)
+	-tpf*)
-		os=tpf
+		os=-tpf
 		;;
-	triton*)
+	-triton*)
-		os=sysv3
+		os=-sysv3
 		;;
-	oss*)
+	-oss*)
-		os=sysv3
+		os=-sysv3
 		;;
-	svr4*)
+	-svr4)
-		os=sysv4
+		os=-sysv4
 		;;
-	svr3)
+	-svr3)
-		os=sysv3
+		os=-sysv3
 		;;
-	sysvr4)
+	-sysvr4)
-		os=sysv4
+		os=-sysv4
 		;;
-	# This must come after sysvr4.
+	# This must come after -sysvr4.
-	sysv*)
+	-sysv*)
 		;;
-	ose*)
+	-ose*)
-		os=ose
+		os=-ose
 		;;
-	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+	-es1800*)
-		os=mint
+		os=-ose
 		;;
-	zvmoe)
-		os=zvmoe
-		;;
-	dicos*)
-		os=dicos
-		;;
+	-xenix)
-	pikeos*)
-		# Until real need of OS specific support for
-		# particular features comes up, bare metal
-		# configurations are quite functional.
-		case $cpu in
-		    arm*)
+		os=-xenix
-			os=eabi
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-			;;
+		os=-mint
-		    *)
+		;;
+	-aros*)
-			os=elf
+		os=-aros
-			;;
+		;;
-		esac
+	-zvmoe)
-		;;
+		os=-zvmoe
-	nacl*)
+		;;
-		;;
+	-dicos*)
+		os=-dicos
+		;;
-	ios)
+	-nacl*)
 		;;
-	none)
+	-none)
 		;;
-	*-eabi)
+	*)
 # "-sun"), then you have to tell the case statement up towards the top
 # that MANUFACTURER isn't an operating system.  Otherwise, code above
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
-case $cpu-$vendor in
+case $basic_machine in
 	score-*)
-		os=elf
+		os=-elf
 		;;
 	spu-*)
-		os=elf
+		os=-elf
 		;;
 	*-acorn)
-		os=riscix1.2
+		os=-riscix1.2
 		;;
 	arm*-rebel)
-		os=linux
+		os=-linux
 		;;
 	arm*-semi)
-		os=aout
+		os=-aout
 		;;
 	c4x-* | tic4x-*)
-		os=coff
+		os=-coff
 		;;
 	c8051-*)
-		os=elf
-		;;
-	clipper-intergraph)
-		os=clix
+		os=-elf
 		;;
 	hexagon-*)
-		os=elf
+		os=-elf
 		;;
 	tic54x-*)
-		os=coff
+		os=-coff
 		;;
 	tic55x-*)
-		os=coff
+		os=-coff
 		;;
 	tic6x-*)
-		os=coff
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=tops20
+		os=-tops20
 		;;
 	pdp11-*)
-		os=none
+		os=-none
 		;;
 	*-dec | vax-*)
-		os=ultrix4.2
+		os=-ultrix4.2
 		;;
 	m68*-apollo)
-		os=domain
+		os=-domain
 		;;
 	i386-sun)
-		os=sunos4.0.2
+		os=-sunos4.0.2
 		;;
 	m68000-sun)
-		os=sunos3
+		os=-sunos3
 		;;
 	m68*-cisco)
-		os=aout
+		os=-aout
 		;;
 	mep-*)
-		os=elf
+		os=-elf
 		;;
 	mips*-cisco)
-		os=elf
+		os=-elf
 		;;
 	mips*-*)
-		os=elf
+		os=-elf
 		;;
 	or32-*)
-		os=coff
+		os=-coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=sysv3
+		os=-sysv3
 		;;
 	sparc-* | *-sun)
-		os=sunos4.1.1
-		;;
-	pru-*)
-		os=elf
+		os=-sunos4.1.1
 		;;
 	*-be)
+		os=-beos
+		;;
+	*-haiku)
-		os=beos
+		os=-haiku
 		;;
 	*-ibm)
-		os=aix
+		os=-aix
 		;;
 	*-knuth)
-		os=mmixware
+		os=-mmixware
 		;;
 	*-wec)
-		os=proelf
+		os=-proelf
 		;;
 	*-winbond)
-		os=proelf
+		os=-proelf
 		;;
 	*-oki)
-		os=proelf
+		os=-proelf
 		;;
 	*-hp)
-		os=hpux
+		os=-hpux
 		;;
 	*-hitachi)
-		os=hiux
+		os=-hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=sysv
+		os=-sysv
 		;;
 	*-cbm)
-		os=amigaos
+		os=-amigaos
 		;;
 	*-dg)
-		os=dgux
+		os=-dgux
 		;;
 	*-dolphin)
-		os=sysv3
+		os=-sysv3
 		;;
 	m68k-ccur)
-		os=rtu
+		os=-rtu
 		;;
 	m88k-omron*)
-		os=luna
+		os=-luna
 		;;
-	*-next)
+	*-next )
-		os=nextstep
+		os=-nextstep
 		;;
 	*-sequent)
-		os=ptx
+		os=-ptx
 		;;
 	*-crds)
-		os=unos
+		os=-unos
 		;;
 	*-ns)
-		os=genix
+		os=-genix
 		;;
 	i370-*)
+		os=-mvs
+		;;
+	*-next)
-		os=mvs
+		os=-nextstep3
 		;;
 	*-gould)
-		os=sysv
+		os=-sysv
 		;;
 	*-highlevel)
-		os=bsd
+		os=-bsd
 		;;
 	*-encore)
-		os=bsd
+		os=-bsd
 		;;
 	*-sgi)
-		os=irix
+		os=-irix
 		;;
 	*-siemens)
-		os=sysv4
+		os=-sysv4
 		;;
 	*-masscomp)
-		os=rtu
+		os=-rtu
 		;;
 	f30[01]-fujitsu | f700-fujitsu)
-		os=uxpv
+		os=-uxpv
 		;;
 	*-rom68k)
-		os=coff
+		os=-coff
 		;;
 	*-*bug)
-		os=coff
+		os=-coff
 		;;
 	*-apple)
-		os=macos
+		os=-macos
 		;;
 	*-atari*)
-		os=mint
-		;;
-	*-wrs)
-		os=vxworks
+		os=-mint
 		;;
 	*)
-		os=none
+		os=-none
 		;;
 esac
 fi
+# Here we handle the case where we know the os, and the CPU type, but not the
-# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
-# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
-case $vendor in
+case $basic_machine in
-	unknown)
+	*-unknown)
 		case $os in
-			riscix*)
+			-riscix*)
 				vendor=acorn
 				;;
-			sunos*)
+			-sunos*)
 				vendor=sun
 				;;
-			cnk*|-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
-			beos*)
+			-beos*)
 				vendor=be
 				;;
-			hpux*)
+			-hpux*)
 				vendor=hp
 				;;
-			mpeix*)
+			-mpeix*)
 				vendor=hp
 				;;
-			hiux*)
+			-hiux*)
 				vendor=hitachi
 				;;
-			unos*)
+			-unos*)
 				vendor=crds
 				;;
-			dgux*)
+			-dgux*)
 				vendor=dg
 				;;
-			luna*)
+			-luna*)
 				vendor=omron
 				;;
-			genix*)
+			-genix*)
-				vendor=ns
-				;;
-			clix*)
-				vendor=intergraph
+				vendor=ns
 				;;
-			mvs* | opened*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			os400*)
+			-os400*)
 				vendor=ibm
 				;;
-			ptx*)
+			-ptx*)
 				vendor=sequent
 				;;
-			tpf*)
+			-tpf*)
 				vendor=ibm
 				;;
-			vxsim* | vxworks* | windiss*)
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
-			aux*)
+			-aux*)
 				vendor=apple
 				;;
-			hms*)
+			-hms*)
 				vendor=hitachi
 				;;
-			mpw* | macos*)
+			-mpw* | -macos*)
 				vendor=apple
 				;;
-			*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
-			vos*)
+			-vos*)
 				vendor=stratus
+				;;
-				;;
+		esac
-		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
-echo "$cpu-$vendor-$os"
+echo $basic_machine$os
 exit
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)