tl-update-auto

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

1 files changed, 34 insertions, 45 deletions

diff --git a/Build/source/libs/icu/icu-src/source/config.sub b/Build/source/libs/icu/icu-src/source/config.sub
index f38250f1daa..ecc5c5e7342 100755
--- a/Build/source/libs/icu/icu-src/source/config.sub
+++ b/Build/source/libs/icu/icu-src/source/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-05-19'
+timestamp='2018-05-23'
 
 # 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
@@ -149,8 +149,30 @@ case $1 in
 		esac
 		;;
 	*-*)
-		basic_machine=$field1
-		os=$field2
+		# 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* | 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* \
+			| sim | cisco | oki | wec | wrs | winbond)
+				basic_machine=$field1-$field2
+				os=
+				;;
+			*)
+				basic_machine=$field1
+				os=$field2
+				;;
+		esac
 		;;
 	*)
 		# Convert single-component short-hands not valid as part of
@@ -545,32 +567,11 @@ esac
 ### recognize some manufacturers as not being operating systems, so we
 ### can provide default operating systems below.
 case $os in
-	sun*os*)
-		# 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
@@ -584,44 +585,27 @@ case $os in
 		;;
 	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/'`
 		;;
 	sco4)
 		os=sco3.2v4
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	sco*)
 		os=sco3.2v2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	udk*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	isc)
 		os=isc2.2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	clix*)
-		basic_machine=clipper-intergraph
-		;;
-	isc*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	lynx*178)
 		os=lynxos178
@@ -638,10 +622,6 @@ case $os in
 	psos*)
 		os=psos
 		;;
-	mint | mint[0-9]*)
-		basic_machine=m68k-atari
-		os=mint
-		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
@@ -1599,6 +1579,9 @@ case $basic_machine in
 	c8051-*)
 		os=elf
 		;;
+	clipper-intergraph)
+		os=clix
+		;;
 	hexagon-*)
 		os=elf
 		;;
@@ -1744,6 +1727,9 @@ case $basic_machine in
 	*-atari*)
 		os=mint
 		;;
+	*-wrs)
+		os=vxworks
+		;;
 	*)
 		os=none
 		;;
@@ -1789,6 +1775,9 @@ case $basic_machine in
 			genix*)
 				vendor=ns
 				;;
+			clix*)
+				vendor=intergraph
+				;;
 			mvs* | opened*)
 				vendor=ibm
 				;;