tl-update-auto

git-svn-id: svn://tug.org/texlive/trunk@47787 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 400 insertions, 391 deletions

diff --git a/Build/source/build-aux/config.sub b/Build/source/build-aux/config.sub
index 0b4a95027f8..f38250f1daa 100755
--- a/Build/source/build-aux/config.sub
+++ b/Build/source/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-05-14'
+timestamp='2018-05-19'
 
 # 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
@@ -153,8 +153,390 @@ case $1 in
 		os=$field2
 		;;
 	*)
-		basic_machine=$1
-		os=
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				os=scout
+				;;
+			am29k)
+				basic_machine=a29k-none
+				os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				os=sysv
+				;;
+			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
+				;;
+			aros)
+				basic_machine=i386-pc
+				os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				os=cegcc
+				;;
+			cray)
+				basic_machine=j90-cray
+				os=unicos
+				;;
+			craynv)
+				basic_machine=craynv-cray
+				os=unicosmp
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				os=go32
+				;;
+			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
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				os=bsd
+				;;
+			hp300hpux)
+				basic_machine=m68k-hp
+				os=hpux
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				os=mach
+				;;
+			vsta)
+				basic_machine=i386-unknown
+				os=vsta
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				os=mingw32ce
+				;;
+			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
+				;;
+			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
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				os=sysv
+				;;
+			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
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				os=linux
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				os=seiux
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				os=sysv2
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				os=sysv4
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				os=sunos4
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				os=sunos4
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				os=solaris2
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				os=tops20
+				;;
+			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
+				;;
+			vms)
+				basic_machine=vax-dec
+				os=vms
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				os=unicos
+				;;
+			*)
+				basic_machine=$1
+				os=
+				;;
+		esac
 		;;
 esac
 
@@ -356,24 +738,23 @@ case $basic_machine in
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
-		os=none
+		os=${os:-none}
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
 	m9s12z | m68hcs12z | hcs12z | s12z)
 		basic_machine=s12z-unknown
-		os=none
+		os=${os:-none}
 		;;
 	ms1)
 		basic_machine=mt-unknown
 		;;
-
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
 	xgate)
 		basic_machine=$basic_machine-unknown
-		os=none
+		os=${os:-none}
 		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
@@ -481,85 +862,33 @@ case $basic_machine in
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-pc
-		os=bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		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
-		;;
-	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
-		;;
 	blackfin-*)
 		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=linux
@@ -579,11 +908,7 @@ case $basic_machine in
 		;;
 	c90)
 		basic_machine=c90-cray
-		os=unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=cegcc
+		os=${os:-unicos}
 		;;
 	convex-c1)
 		basic_machine=c1-convex
@@ -605,17 +930,9 @@ case $basic_machine in
 		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
+		os=${os:-elf}
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
@@ -628,7 +945,7 @@ case $basic_machine in
 		;;
 	crx)
 		basic_machine=crx-unknown
-		os=elf
+		os=${os:-elf}
 		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
@@ -648,21 +965,9 @@ case $basic_machine in
 	      | 3300-motorola | delta-motorola)
 		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
+		os=${os:-bosx}
 		;;
 	dpx2*)
 		basic_machine=m68k-bull
@@ -676,20 +981,12 @@ case $basic_machine in
 		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=$os"spe"
 		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=bsd
-		;;
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=ose
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=${os:-bsd}
 		;;
 	fx2800)
 		basic_machine=i860-alliant
@@ -697,45 +994,13 @@ case $basic_machine in
 	genix)
 		basic_machine=ns32k-ns
 		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=go32
-		;;
 	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
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=hpux
-		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
@@ -765,14 +1030,6 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=proelf
-		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
@@ -792,13 +1049,9 @@ case $basic_machine in
 		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=solaris2
 		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=mach
-		;;
-	vsta)
-		basic_machine=i386-unknown
-		os=vsta
+	j90 | j90-cray)
+		basic_machine=j90-cray
+		os=${os:-unicos}
 		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
@@ -810,44 +1063,16 @@ case $basic_machine in
 			;;
 		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
 		;;
-	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
-		os=mingw32ce
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -861,65 +1086,13 @@ case $basic_machine in
 	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-/'`
 		;;
-	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
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=newsos
-		;;
 	news-3600 | risc-news)
 		basic_machine=mips-sony
 		os=newsos
 		;;
-	necv70)
-		basic_machine=v70-nec
-		os=sysv
-		;;
 	next | m*-next)
 		basic_machine=m68k-next
 		case $os in
@@ -933,26 +1106,6 @@ case $basic_machine in
 			;;
 		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
-		;;
 	np1)
 		basic_machine=np1-gould
 		;;
@@ -978,30 +1131,10 @@ case $basic_machine in
 	openrisc | openrisc-*)
 		basic_machine=or32-unknown
 		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=os68k
-		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=hiuxwe2
 		;;
-	paragon)
-		basic_machine=i860-intel
-		os=osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=linux
-		;;
 	parisc-*)
 		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=linux
@@ -1074,22 +1207,6 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=coff
-		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
@@ -1102,10 +1219,6 @@ case $basic_machine in
 	s390x | s390x-*)
 		basic_machine=s390x-ibm
 		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=udi
-		;;
 	sb1)
 		basic_machine=mipsisa64sb1-unknown
 		;;
@@ -1114,11 +1227,7 @@ case $basic_machine in
 		;;
 	sde)
 		basic_machine=mipsisa32-sde
-		os=elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=seiux
+		os=${os:-elf}
 		;;
 	sequent)
 		basic_machine=i386-sequent
@@ -1130,54 +1239,18 @@ case $basic_machine in
 		basic_machine=sparclite-wrs
 		os=vxworks
 		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=sysv2
-		;;
 	spur)
 		basic_machine=spur-unknown
 		;;
 	st2000)
 		basic_machine=m68k-tandem
 		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=sysv4
-		;;
 	strongarm-* | thumb-*)
 		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=solaris2
-		;;
 	sun3 | sun3-*)
 		basic_machine=m68k-sun
 		;;
@@ -1187,22 +1260,6 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=unicos
-		;;
 	tile*)
 		basic_machine=$basic_machine-unknown
 		os=linux-gnu
@@ -1213,52 +1270,12 @@ case $basic_machine in
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
-	toad1)
-		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
-		;;
-	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*)
 		basic_machine=w65-wdc
 		os=none
@@ -1270,23 +1287,15 @@ case $basic_machine in
 	x64)
 		basic_machine=x86_64-pc
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=mingw32
-		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
 		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=unicos
-		;;
 	none)
 		basic_machine=none-none
-		os=none
+		os=${os:-none}
 		;;
 
 # Here we handle the default manufacturer of certain CPU types.  It is in