RubyGems - nokogiri - Versions diffs - 1.12.5 → 1.13.8 - Mend

nokogiri 1.12.5 → 1.13.8

Potentially problematic release.

This version of nokogiri might be problematic. Click here for more details.

Files changed (113) hide show

checksums.yaml +4 -4
data/Gemfile +2 -0
data/README.md +9 -7
data/bin/nokogiri +63 -50
data/dependencies.yml +13 -64
data/ext/nokogiri/extconf.rb +66 -44
data/ext/nokogiri/gumbo.c +1 -1
data/ext/nokogiri/html4_sax_parser_context.c +2 -3
data/ext/nokogiri/nokogiri.h +8 -0
data/ext/nokogiri/xml_attr.c +2 -2
data/ext/nokogiri/xml_attribute_decl.c +3 -3
data/ext/nokogiri/xml_cdata.c +1 -1
data/ext/nokogiri/xml_document.c +36 -36
data/ext/nokogiri/xml_document_fragment.c +0 -2
data/ext/nokogiri/xml_dtd.c +10 -10
data/ext/nokogiri/xml_element_decl.c +3 -3
data/ext/nokogiri/xml_encoding_handler.c +25 -11
data/ext/nokogiri/xml_entity_decl.c +5 -5
data/ext/nokogiri/xml_node.c +707 -381
data/ext/nokogiri/xml_node_set.c +4 -4
data/ext/nokogiri/xml_reader.c +88 -11
data/ext/nokogiri/xml_sax_parser_context.c +10 -3
data/ext/nokogiri/xml_schema.c +3 -3
data/ext/nokogiri/xml_text.c +1 -1
data/ext/nokogiri/xml_xpath_context.c +73 -50
data/ext/nokogiri/xslt_stylesheet.c +107 -9
data/gumbo-parser/src/parser.c +0 -11
data/lib/nokogiri/class_resolver.rb +67 -0
data/lib/nokogiri/css/node.rb +9 -8
data/lib/nokogiri/css/parser.rb +360 -341
data/lib/nokogiri/css/parser.y +249 -244
data/lib/nokogiri/css/parser_extras.rb +22 -20
data/lib/nokogiri/css/syntax_error.rb +1 -0
data/lib/nokogiri/css/tokenizer.rb +4 -3
data/lib/nokogiri/css/tokenizer.rex +3 -2
data/lib/nokogiri/css/xpath_visitor.rb +179 -82
data/lib/nokogiri/css.rb +38 -6
data/lib/nokogiri/decorators/slop.rb +8 -7
data/lib/nokogiri/extension.rb +1 -1
data/lib/nokogiri/gumbo.rb +1 -0
data/lib/nokogiri/html.rb +16 -10
data/lib/nokogiri/html4/builder.rb +1 -0
data/lib/nokogiri/html4/document.rb +88 -77
data/lib/nokogiri/html4/document_fragment.rb +11 -7
data/lib/nokogiri/html4/element_description.rb +1 -0
data/lib/nokogiri/html4/element_description_defaults.rb +426 -520
data/lib/nokogiri/html4/entity_lookup.rb +2 -1
data/lib/nokogiri/html4/sax/parser.rb +5 -2
data/lib/nokogiri/html4/sax/parser_context.rb +1 -0
data/lib/nokogiri/html4/sax/push_parser.rb +7 -7
data/lib/nokogiri/html4.rb +11 -5
data/lib/nokogiri/html5/document.rb +27 -10
data/lib/nokogiri/html5/document_fragment.rb +5 -2
data/lib/nokogiri/html5/node.rb +10 -3
data/lib/nokogiri/html5.rb +69 -64
data/lib/nokogiri/jruby/dependencies.rb +10 -9
data/lib/nokogiri/syntax_error.rb +1 -0
data/lib/nokogiri/version/constant.rb +2 -1
data/lib/nokogiri/version/info.rb +20 -13
data/lib/nokogiri/version.rb +1 -0
data/lib/nokogiri/xml/attr.rb +5 -3
data/lib/nokogiri/xml/attribute_decl.rb +2 -1
data/lib/nokogiri/xml/builder.rb +34 -32
data/lib/nokogiri/xml/cdata.rb +2 -1
data/lib/nokogiri/xml/character_data.rb +1 -0
data/lib/nokogiri/xml/document.rb +144 -103
data/lib/nokogiri/xml/document_fragment.rb +41 -38
data/lib/nokogiri/xml/dtd.rb +3 -2
data/lib/nokogiri/xml/element_content.rb +1 -0
data/lib/nokogiri/xml/element_decl.rb +2 -1
data/lib/nokogiri/xml/entity_decl.rb +3 -2
data/lib/nokogiri/xml/entity_reference.rb +1 -0
data/lib/nokogiri/xml/namespace.rb +2 -0
data/lib/nokogiri/xml/node/save_options.rb +8 -4
data/lib/nokogiri/xml/node.rb +521 -351
data/lib/nokogiri/xml/node_set.rb +50 -54
data/lib/nokogiri/xml/notation.rb +12 -0
data/lib/nokogiri/xml/parse_options.rb +12 -7
data/lib/nokogiri/xml/pp/character_data.rb +8 -6
data/lib/nokogiri/xml/pp/node.rb +24 -26
data/lib/nokogiri/xml/pp.rb +1 -0
data/lib/nokogiri/xml/processing_instruction.rb +2 -1
data/lib/nokogiri/xml/reader.rb +20 -24
data/lib/nokogiri/xml/relax_ng.rb +1 -0
data/lib/nokogiri/xml/sax/document.rb +20 -19
data/lib/nokogiri/xml/sax/parser.rb +37 -34
data/lib/nokogiri/xml/sax/parser_context.rb +7 -3
data/lib/nokogiri/xml/sax/push_parser.rb +5 -5
data/lib/nokogiri/xml/sax.rb +1 -0
data/lib/nokogiri/xml/schema.rb +7 -6
data/lib/nokogiri/xml/searchable.rb +93 -62
data/lib/nokogiri/xml/syntax_error.rb +5 -4
data/lib/nokogiri/xml/text.rb +1 -0
data/lib/nokogiri/xml/xpath/syntax_error.rb +2 -1
data/lib/nokogiri/xml/xpath.rb +12 -0
data/lib/nokogiri/xml/xpath_context.rb +2 -3
data/lib/nokogiri/xml.rb +4 -3
data/lib/nokogiri/xslt/stylesheet.rb +1 -0
data/lib/nokogiri/xslt.rb +21 -13
data/lib/nokogiri.rb +19 -16
data/lib/xsd/xmlparser/nokogiri.rb +25 -24
data/patches/libxml2/0004-use-glibc-strlen.patch +3 -3
data/patches/libxml2/0006-update-automake-files-for-arm64.patch +2443 -1914
data/patches/libxml2/0008-htmlParseComment-handle-abruptly-closed-comments.patch +61 -0
data/patches/libxml2/0009-allow-wildcard-namespaces.patch +77 -0
data/patches/libxslt/0001-update-automake-files-for-arm64.patch +2445 -1919
data/ports/archives/libxml2-2.9.14.tar.xz +0 -0
data/ports/archives/libxslt-1.1.35.tar.xz +0 -0
metadata +104 -32
data/patches/libxml2/0007-Fix-XPath-recursion-limit.patch +0 -31
data/patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch +0 -19
data/ports/archives/libxml2-2.9.12.tar.gz +0 -0
data/ports/archives/libxslt-1.1.34.tar.gz +0 -0

data/patches/libxml2/0006-update-automake-files-for-arm64.patch CHANGED Viewed

@@ -9,7 +9,7 @@ aarch64/arm64/M1 can compile.
 -#   Copyright 1992-2018 Free Software Foundation, Inc.
 +#   Copyright 1992-2020 Free Software Foundation, Inc.
--timestamp='2018-08-29'
+-timestamp='2018-02-22'
 +timestamp='2020-11-07'
  # This file is free software; you can redistribute it and/or modify it
@@ -41,1045 +41,2213 @@ aarch64/arm64/M1 can compile.
         exit 1 ;;
      *local*)
-@@ -111,7 +111,8 @@
+@@ -110,1223 +110,1167 @@
+     exit 1;;
  esac
- # Split fields of configuration type
--IFS="-" read -r field1 field2 field3 field4 <<EOF
+-# 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* | \
+-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+-  kopensolaris*-gnu* | cloudabi*-eabi* | \
+-  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
+-    ;;
+-  *)
+-    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+-    if [ "$basic_machine" != "$1" ]
+-    then os=`echo "$1" | sed 's/.*-/-/'`
+-    else os=; fi
+-    ;;
+-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
+-### 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
+-		;;
+-	-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/'`
+-		;;
+-	-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
+-		;;
+-	-lynx*5)
+-		os=-lynxos5
++# Split fields of configuration type
 +# shellcheck disable=SC2162
 +IFS="-" read field1 field2 field3 field4 <<EOF
- $1
- EOF
-@@ -123,37 +124,36 @@
++$1
++EOF
++
++# Separate into logical components for further validation
++case $1 in
++	*-*-*-*-*)
++		echo Invalid configuration \`"$1"\': more than four components >&2
++		exit 1
  		;;
- 	*-*-*-*)
- 		basic_machine=$field1-$field2
--		os=$field3-$field4
+-	-lynx*)
+-		os=-lynxos
++	*-*-*-*)
++		basic_machine=$field1-$field2
 +		basic_os=$field3-$field4
  		;;
- 	*-*-*)
- 		# 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* \
+-	-ptx*)
+-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
++	*-*-*)
++		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
++		# parts
++		maybe_os=$field2-$field3
++		case $maybe_os in
 +			nto-qnx* | linux-* | uclinux-uclibc* \
- 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
- 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
- 			| storm-chaos* | os2-emx* | rtmk-nova*)
- 				basic_machine=$field1
--				os=$maybe_os
++			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
++			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
++			| storm-chaos* | os2-emx* | rtmk-nova*)
++				basic_machine=$field1
 +				basic_os=$maybe_os
- 				;;
- 			android-linux)
- 				basic_machine=$field1-unknown
--				os=linux-android
++				;;
++			android-linux)
++				basic_machine=$field1-unknown
 +				basic_os=linux-android
- 				;;
- 			*)
- 				basic_machine=$field1-$field2
--				os=$field3
++				;;
++			*)
++				basic_machine=$field1-$field2
 +				basic_os=$field3
- 				;;
- 		esac
++				;;
++		esac
  		;;
- 	*-*)
--		# A lone config we happen to match not fitting any patern
+-	-psos*)
+-		os=-psos
++	*-*)
 +		# A lone config we happen to match not fitting any pattern
- 		case $field1-$field2 in
- 			decstation-3100)
- 				basic_machine=mips-dec
--				os=
++		case $field1-$field2 in
++			decstation-3100)
++				basic_machine=mips-dec
 +				basic_os=
- 				;;
- 			*-*)
- 				# Second component is usually, but not always the OS
-@@ -161,7 +161,7 @@
- 					# Prevent following clause from handling this valid os
- 					sun*os*)
- 						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
 +						basic_os=$field2
- 						;;
- 					# Manufacturers
- 					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-@@ -174,11 +174,11 @@
- 					| microblaze* | sim | cisco \
- 					| oki | wec | wrs | winbond)
- 						basic_machine=$field1-$field2
--						os=
++						;;
++					# 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)
++						basic_machine=$field1-$field2
 +						basic_os=
- 						;;
- 					*)
- 						basic_machine=$field1
--						os=$field2
++						;;
++					*)
++						basic_machine=$field1
 +						basic_os=$field2
- 						;;
- 				esac
- 			;;
-@@ -190,450 +190,451 @@
- 		case $field1 in
- 			386bsd)
- 				basic_machine=i386-pc
--				os=bsd
++						;;
++				esac
++			;;
++		esac
+ 		;;
+-	-mint | -mint[0-9]*)
+-		basic_machine=m68k-atari
+-		os=-mint
++	*)
++		# Convert single-component short-hands not valid as part of
++		# multi-component configurations.
++		case $field1 in
++			386bsd)
++				basic_machine=i386-pc
 +				basic_os=bsd
- 				;;
- 			a29khif)
- 				basic_machine=a29k-amd
--				os=udi
++				;;
++			a29khif)
++				basic_machine=a29k-amd
 +				basic_os=udi
- 				;;
- 			adobe68k)
- 				basic_machine=m68010-adobe
--				os=scout
++				;;
++			adobe68k)
++				basic_machine=m68010-adobe
 +				basic_os=scout
- 				;;
- 			alliant)
- 				basic_machine=fx80-alliant
--				os=
++				;;
++			alliant)
++				basic_machine=fx80-alliant
 +				basic_os=
- 				;;
- 			altos | altos3068)
- 				basic_machine=m68k-altos
--				os=
++				;;
++			altos | altos3068)
++				basic_machine=m68k-altos
 +				basic_os=
- 				;;
- 			am29k)
- 				basic_machine=a29k-none
--				os=bsd
++				;;
++			am29k)
++				basic_machine=a29k-none
 +				basic_os=bsd
- 				;;
- 			amdahl)
- 				basic_machine=580-amdahl
--				os=sysv
++				;;
++			amdahl)
++				basic_machine=580-amdahl
 +				basic_os=sysv
- 				;;
- 			amiga)
- 				basic_machine=m68k-unknown
--				os=
++				;;
++			amiga)
++				basic_machine=m68k-unknown
 +				basic_os=
- 				;;
- 			amigaos | amigados)
- 				basic_machine=m68k-unknown
--				os=amigaos
++				;;
++			amigaos | amigados)
++				basic_machine=m68k-unknown
 +				basic_os=amigaos
- 				;;
- 			amigaunix | amix)
- 				basic_machine=m68k-unknown
--				os=sysv4
++				;;
++			amigaunix | amix)
++				basic_machine=m68k-unknown
 +				basic_os=sysv4
- 				;;
- 			apollo68)
- 				basic_machine=m68k-apollo
--				os=sysv
++				;;
++			apollo68)
++				basic_machine=m68k-apollo
 +				basic_os=sysv
- 				;;
- 			apollo68bsd)
- 				basic_machine=m68k-apollo
--				os=bsd
++				;;
++			apollo68bsd)
++				basic_machine=m68k-apollo
 +				basic_os=bsd
- 				;;
- 			aros)
- 				basic_machine=i386-pc
--				os=aros
++				;;
++			aros)
++				basic_machine=i386-pc
 +				basic_os=aros
- 				;;
- 			aux)
- 				basic_machine=m68k-apple
--				os=aux
++				;;
++			aux)
++				basic_machine=m68k-apple
 +				basic_os=aux
- 				;;
- 			balance)
- 				basic_machine=ns32k-sequent
--				os=dynix
++				;;
++			balance)
++				basic_machine=ns32k-sequent
 +				basic_os=dynix
- 				;;
- 			blackfin)
- 				basic_machine=bfin-unknown
--				os=linux
++				;;
++			blackfin)
++				basic_machine=bfin-unknown
 +				basic_os=linux
- 				;;
- 			cegcc)
- 				basic_machine=arm-unknown
--				os=cegcc
++				;;
++			cegcc)
++				basic_machine=arm-unknown
 +				basic_os=cegcc
- 				;;
- 			convex-c1)
- 				basic_machine=c1-convex
--				os=bsd
++				;;
++			convex-c1)
++				basic_machine=c1-convex
 +				basic_os=bsd
- 				;;
- 			convex-c2)
- 				basic_machine=c2-convex
--				os=bsd
++				;;
++			convex-c2)
++				basic_machine=c2-convex
 +				basic_os=bsd
- 				;;
- 			convex-c32)
- 				basic_machine=c32-convex
--				os=bsd
++				;;
++			convex-c32)
++				basic_machine=c32-convex
 +				basic_os=bsd
- 				;;
- 			convex-c34)
- 				basic_machine=c34-convex
--				os=bsd
++				;;
++			convex-c34)
++				basic_machine=c34-convex
 +				basic_os=bsd
- 				;;
- 			convex-c38)
- 				basic_machine=c38-convex
--				os=bsd
++				;;
++			convex-c38)
++				basic_machine=c38-convex
 +				basic_os=bsd
- 				;;
- 			cray)
- 				basic_machine=j90-cray
--				os=unicos
++				;;
++			cray)
++				basic_machine=j90-cray
 +				basic_os=unicos
- 				;;
- 			crds | unos)
- 				basic_machine=m68k-crds
--				os=
++				;;
++			crds | unos)
++				basic_machine=m68k-crds
 +				basic_os=
- 				;;
- 			da30)
- 				basic_machine=m68k-da30
--				os=
++				;;
++			da30)
++				basic_machine=m68k-da30
 +				basic_os=
- 				;;
- 			decstation | pmax | pmin | dec3100 | decstatn)
- 				basic_machine=mips-dec
--				os=
++				;;
++			decstation | pmax | pmin | dec3100 | decstatn)
++				basic_machine=mips-dec
 +				basic_os=
- 				;;
- 			delta88)
- 				basic_machine=m88k-motorola
--				os=sysv3
++				;;
++			delta88)
++				basic_machine=m88k-motorola
 +				basic_os=sysv3
- 				;;
- 			dicos)
- 				basic_machine=i686-pc
--				os=dicos
++				;;
++			dicos)
++				basic_machine=i686-pc
 +				basic_os=dicos
- 				;;
- 			djgpp)
- 				basic_machine=i586-pc
--				os=msdosdjgpp
++				;;
++			djgpp)
++				basic_machine=i586-pc
 +				basic_os=msdosdjgpp
- 				;;
- 			ebmon29k)
- 				basic_machine=a29k-amd
--				os=ebmon
++				;;
++			ebmon29k)
++				basic_machine=a29k-amd
 +				basic_os=ebmon
- 				;;
- 			es1800 | OSE68k | ose68k | ose | OSE)
- 				basic_machine=m68k-ericsson
--				os=ose
++				;;
++			es1800 | OSE68k | ose68k | ose | OSE)
++				basic_machine=m68k-ericsson
 +				basic_os=ose
- 				;;
- 			gmicro)
- 				basic_machine=tron-gmicro
--				os=sysv
++				;;
++			gmicro)
++				basic_machine=tron-gmicro
 +				basic_os=sysv
- 				;;
- 			go32)
- 				basic_machine=i386-pc
--				os=go32
++				;;
++			go32)
++				basic_machine=i386-pc
 +				basic_os=go32
- 				;;
- 			h8300hms)
- 				basic_machine=h8300-hitachi
--				os=hms
++				;;
++			h8300hms)
++				basic_machine=h8300-hitachi
 +				basic_os=hms
- 				;;
- 			h8300xray)
- 				basic_machine=h8300-hitachi
--				os=xray
++				;;
++			h8300xray)
++				basic_machine=h8300-hitachi
 +				basic_os=xray
- 				;;
- 			h8500hms)
- 				basic_machine=h8500-hitachi
--				os=hms
++				;;
++			h8500hms)
++				basic_machine=h8500-hitachi
 +				basic_os=hms
- 				;;
- 			harris)
- 				basic_machine=m88k-harris
--				os=sysv3
++				;;
++			harris)
++				basic_machine=m88k-harris
 +				basic_os=sysv3
- 				;;
--			hp300)
++				;;
 +			hp300 | hp300hpux)
- 				basic_machine=m68k-hp
++				basic_machine=m68k-hp
 +				basic_os=hpux
- 				;;
- 			hp300bsd)
- 				basic_machine=m68k-hp
--				os=bsd
--				;;
--			hp300hpux)
--				basic_machine=m68k-hp
--				os=hpux
++				;;
++			hp300bsd)
++				basic_machine=m68k-hp
 +				basic_os=bsd
- 				;;
- 			hppaosf)
- 				basic_machine=hppa1.1-hp
--				os=osf
++				;;
++			hppaosf)
++				basic_machine=hppa1.1-hp
 +				basic_os=osf
- 				;;
- 			hppro)
- 				basic_machine=hppa1.1-hp
--				os=proelf
++				;;
++			hppro)
++				basic_machine=hppa1.1-hp
 +				basic_os=proelf
- 				;;
- 			i386mach)
- 				basic_machine=i386-mach
--				os=mach
--				;;
--			vsta)
--				basic_machine=i386-pc
--				os=vsta
++				;;
++			i386mach)
++				basic_machine=i386-mach
 +				basic_os=mach
- 				;;
- 			isi68 | isi)
- 				basic_machine=m68k-isi
--				os=sysv
++				;;
++			isi68 | isi)
++				basic_machine=m68k-isi
 +				basic_os=sysv
- 				;;
- 			m68knommu)
- 				basic_machine=m68k-unknown
--				os=linux
++				;;
++			m68knommu)
++				basic_machine=m68k-unknown
 +				basic_os=linux
- 				;;
- 			magnum | m3230)
- 				basic_machine=mips-mips
--				os=sysv
++				;;
++			magnum | m3230)
++				basic_machine=mips-mips
 +				basic_os=sysv
- 				;;
- 			merlin)
- 				basic_machine=ns32k-utek
--				os=sysv
++				;;
++			merlin)
++				basic_machine=ns32k-utek
 +				basic_os=sysv
- 				;;
- 			mingw64)
- 				basic_machine=x86_64-pc
--				os=mingw64
++				;;
++			mingw64)
++				basic_machine=x86_64-pc
 +				basic_os=mingw64
- 				;;
- 			mingw32)
- 				basic_machine=i686-pc
--				os=mingw32
++				;;
++			mingw32)
++				basic_machine=i686-pc
 +				basic_os=mingw32
- 				;;
- 			mingw32ce)
- 				basic_machine=arm-unknown
--				os=mingw32ce
++				;;
++			mingw32ce)
++				basic_machine=arm-unknown
 +				basic_os=mingw32ce
- 				;;
- 			monitor)
- 				basic_machine=m68k-rom68k
--				os=coff
++				;;
++			monitor)
++				basic_machine=m68k-rom68k
 +				basic_os=coff
- 				;;
- 			morphos)
- 				basic_machine=powerpc-unknown
--				os=morphos
++				;;
++			morphos)
++				basic_machine=powerpc-unknown
 +				basic_os=morphos
- 				;;
- 			moxiebox)
- 				basic_machine=moxie-unknown
--				os=moxiebox
++				;;
++			moxiebox)
++				basic_machine=moxie-unknown
 +				basic_os=moxiebox
- 				;;
- 			msdos)
- 				basic_machine=i386-pc
--				os=msdos
++				;;
++			msdos)
++				basic_machine=i386-pc
 +				basic_os=msdos
- 				;;
- 			msys)
- 				basic_machine=i686-pc
--				os=msys
++				;;
++			msys)
++				basic_machine=i686-pc
 +				basic_os=msys
- 				;;
- 			mvs)
- 				basic_machine=i370-ibm
--				os=mvs
++				;;
++			mvs)
++				basic_machine=i370-ibm
 +				basic_os=mvs
- 				;;
- 			nacl)
- 				basic_machine=le32-unknown
--				os=nacl
++				;;
++			nacl)
++				basic_machine=le32-unknown
 +				basic_os=nacl
- 				;;
- 			ncr3000)
- 				basic_machine=i486-ncr
--				os=sysv4
++				;;
++			ncr3000)
++				basic_machine=i486-ncr
 +				basic_os=sysv4
- 				;;
- 			netbsd386)
- 				basic_machine=i386-pc
--				os=netbsd
++				;;
++			netbsd386)
++				basic_machine=i386-pc
 +				basic_os=netbsd
- 				;;
- 			netwinder)
- 				basic_machine=armv4l-rebel
--				os=linux
++				;;
++			netwinder)
++				basic_machine=armv4l-rebel
 +				basic_os=linux
- 				;;
- 			news | news700 | news800 | news900)
- 				basic_machine=m68k-sony
--				os=newsos
++				;;
++			news | news700 | news800 | news900)
++				basic_machine=m68k-sony
 +				basic_os=newsos
- 				;;
- 			news1000)
- 				basic_machine=m68030-sony
--				os=newsos
++				;;
++			news1000)
++				basic_machine=m68030-sony
 +				basic_os=newsos
- 				;;
- 			necv70)
- 				basic_machine=v70-nec
--				os=sysv
++				;;
++			necv70)
++				basic_machine=v70-nec
 +				basic_os=sysv
- 				;;
- 			nh3000)
- 				basic_machine=m68k-harris
--				os=cxux
++				;;
++			nh3000)
++				basic_machine=m68k-harris
 +				basic_os=cxux
- 				;;
- 			nh[45]000)
- 				basic_machine=m88k-harris
--				os=cxux
++				;;
++			nh[45]000)
++				basic_machine=m88k-harris
 +				basic_os=cxux
- 				;;
- 			nindy960)
- 				basic_machine=i960-intel
--				os=nindy
++				;;
++			nindy960)
++				basic_machine=i960-intel
 +				basic_os=nindy
- 				;;
- 			mon960)
- 				basic_machine=i960-intel
--				os=mon960
++				;;
++			mon960)
++				basic_machine=i960-intel
 +				basic_os=mon960
- 				;;
- 			nonstopux)
- 				basic_machine=mips-compaq
--				os=nonstopux
++				;;
++			nonstopux)
++				basic_machine=mips-compaq
 +				basic_os=nonstopux
- 				;;
- 			os400)
- 				basic_machine=powerpc-ibm
--				os=os400
++				;;
++			os400)
++				basic_machine=powerpc-ibm
 +				basic_os=os400
- 				;;
- 			OSE68000 | ose68000)
- 				basic_machine=m68000-ericsson
--				os=ose
++				;;
++			OSE68000 | ose68000)
++				basic_machine=m68000-ericsson
 +				basic_os=ose
- 				;;
- 			os68k)
- 				basic_machine=m68k-none
--				os=os68k
++				;;
++			os68k)
++				basic_machine=m68k-none
 +				basic_os=os68k
- 				;;
- 			paragon)
- 				basic_machine=i860-intel
--				os=osf
++				;;
++			paragon)
++				basic_machine=i860-intel
 +				basic_os=osf
- 				;;
- 			parisc)
- 				basic_machine=hppa-unknown
--				os=linux
++				;;
++			parisc)
++				basic_machine=hppa-unknown
 +				basic_os=linux
 +				;;
 +			psp)
 +				basic_machine=mipsallegrexel-sony
 +				basic_os=psp
- 				;;
- 			pw32)
- 				basic_machine=i586-unknown
--				os=pw32
++				;;
++			pw32)
++				basic_machine=i586-unknown
 +				basic_os=pw32
- 				;;
- 			rdos | rdos64)
- 				basic_machine=x86_64-pc
--				os=rdos
++				;;
++			rdos | rdos64)
++				basic_machine=x86_64-pc
 +				basic_os=rdos
- 				;;
- 			rdos32)
- 				basic_machine=i386-pc
--				os=rdos
++				;;
++			rdos32)
++				basic_machine=i386-pc
 +				basic_os=rdos
- 				;;
- 			rom68k)
- 				basic_machine=m68k-rom68k
--				os=coff
++				;;
++			rom68k)
++				basic_machine=m68k-rom68k
 +				basic_os=coff
- 				;;
- 			sa29200)
- 				basic_machine=a29k-amd
--				os=udi
++				;;
++			sa29200)
++				basic_machine=a29k-amd
 +				basic_os=udi
- 				;;
- 			sei)
- 				basic_machine=mips-sei
--				os=seiux
++				;;
++			sei)
++				basic_machine=mips-sei
 +				basic_os=seiux
- 				;;
- 			sequent)
- 				basic_machine=i386-sequent
--				os=
++				;;
++			sequent)
++				basic_machine=i386-sequent
 +				basic_os=
- 				;;
- 			sps7)
- 				basic_machine=m68k-bull
--				os=sysv2
++				;;
++			sps7)
++				basic_machine=m68k-bull
 +				basic_os=sysv2
- 				;;
- 			st2000)
- 				basic_machine=m68k-tandem
--				os=
++				;;
++			st2000)
++				basic_machine=m68k-tandem
 +				basic_os=
- 				;;
- 			stratus)
- 				basic_machine=i860-stratus
--				os=sysv4
++				;;
++			stratus)
++				basic_machine=i860-stratus
 +				basic_os=sysv4
- 				;;
- 			sun2)
- 				basic_machine=m68000-sun
--				os=
++				;;
++			sun2)
++				basic_machine=m68000-sun
 +				basic_os=
- 				;;
- 			sun2os3)
- 				basic_machine=m68000-sun
--				os=sunos3
++				;;
++			sun2os3)
++				basic_machine=m68000-sun
 +				basic_os=sunos3
- 				;;
- 			sun2os4)
- 				basic_machine=m68000-sun
--				os=sunos4
++				;;
++			sun2os4)
++				basic_machine=m68000-sun
 +				basic_os=sunos4
- 				;;
- 			sun3)
- 				basic_machine=m68k-sun
--				os=
++				;;
++			sun3)
++				basic_machine=m68k-sun
 +				basic_os=
- 				;;
- 			sun3os3)
- 				basic_machine=m68k-sun
--				os=sunos3
++				;;
++			sun3os3)
++				basic_machine=m68k-sun
 +				basic_os=sunos3
- 				;;
- 			sun3os4)
- 				basic_machine=m68k-sun
--				os=sunos4
++				;;
++			sun3os4)
++				basic_machine=m68k-sun
 +				basic_os=sunos4
- 				;;
- 			sun4)
- 				basic_machine=sparc-sun
--				os=
++				;;
++			sun4)
++				basic_machine=sparc-sun
 +				basic_os=
- 				;;
- 			sun4os3)
- 				basic_machine=sparc-sun
--				os=sunos3
++				;;
++			sun4os3)
++				basic_machine=sparc-sun
 +				basic_os=sunos3
- 				;;
- 			sun4os4)
- 				basic_machine=sparc-sun
--				os=sunos4
++				;;
++			sun4os4)
++				basic_machine=sparc-sun
 +				basic_os=sunos4
- 				;;
- 			sun4sol2)
- 				basic_machine=sparc-sun
--				os=solaris2
++				;;
++			sun4sol2)
++				basic_machine=sparc-sun
 +				basic_os=solaris2
- 				;;
- 			sun386 | sun386i | roadrunner)
- 				basic_machine=i386-sun
--				os=
++				;;
++			sun386 | sun386i | roadrunner)
++				basic_machine=i386-sun
 +				basic_os=
- 				;;
- 			sv1)
- 				basic_machine=sv1-cray
--				os=unicos
++				;;
++			sv1)
++				basic_machine=sv1-cray
 +				basic_os=unicos
- 				;;
- 			symmetry)
- 				basic_machine=i386-sequent
--				os=dynix
++				;;
++			symmetry)
++				basic_machine=i386-sequent
 +				basic_os=dynix
- 				;;
- 			t3e)
- 				basic_machine=alphaev5-cray
--				os=unicos
++				;;
++			t3e)
++				basic_machine=alphaev5-cray
 +				basic_os=unicos
- 				;;
- 			t90)
- 				basic_machine=t90-cray
--				os=unicos
++				;;
++			t90)
++				basic_machine=t90-cray
 +				basic_os=unicos
- 				;;
- 			toad1)
- 				basic_machine=pdp10-xkl
--				os=tops20
++				;;
++			toad1)
++				basic_machine=pdp10-xkl
 +				basic_os=tops20
- 				;;
- 			tpf)
- 				basic_machine=s390x-ibm
--				os=tpf
++				;;
++			tpf)
++				basic_machine=s390x-ibm
 +				basic_os=tpf
- 				;;
- 			udi29k)
- 				basic_machine=a29k-amd
--				os=udi
++				;;
++			udi29k)
++				basic_machine=a29k-amd
 +				basic_os=udi
- 				;;
- 			ultra3)
- 				basic_machine=a29k-nyu
--				os=sym1
++				;;
++			ultra3)
++				basic_machine=a29k-nyu
 +				basic_os=sym1
- 				;;
- 			v810 | necv810)
- 				basic_machine=v810-nec
--				os=none
++				;;
++			v810 | necv810)
++				basic_machine=v810-nec
 +				basic_os=none
- 				;;
- 			vaxv)
- 				basic_machine=vax-dec
--				os=sysv
++				;;
++			vaxv)
++				basic_machine=vax-dec
 +				basic_os=sysv
- 				;;
- 			vms)
- 				basic_machine=vax-dec
--				os=vms
++				;;
++			vms)
++				basic_machine=vax-dec
 +				basic_os=vms
 +				;;
 +			vsta)
 +				basic_machine=i386-pc
 +				basic_os=vsta
- 				;;
- 			vxworks960)
- 				basic_machine=i960-wrs
--				os=vxworks
++				;;
++			vxworks960)
++				basic_machine=i960-wrs
 +				basic_os=vxworks
- 				;;
- 			vxworks68)
- 				basic_machine=m68k-wrs
--				os=vxworks
++				;;
++			vxworks68)
++				basic_machine=m68k-wrs
 +				basic_os=vxworks
- 				;;
- 			vxworks29k)
- 				basic_machine=a29k-wrs
--				os=vxworks
++				;;
++			vxworks29k)
++				basic_machine=a29k-wrs
 +				basic_os=vxworks
- 				;;
- 			xbox)
- 				basic_machine=i686-pc
--				os=mingw32
++				;;
++			xbox)
++				basic_machine=i686-pc
 +				basic_os=mingw32
- 				;;
- 			ymp)
- 				basic_machine=ymp-cray
--				os=unicos
++				;;
++			ymp)
++				basic_machine=ymp-cray
 +				basic_os=unicos
- 				;;
- 			*)
- 				basic_machine=$1
--				os=
++				;;
++			*)
++				basic_machine=$1
 +				basic_os=
- 				;;
- 		esac
++				;;
++		esac
+ 		;;
+ esac
+-# Decode aliases for certain CPU-COMPANY combinations.
++# Decode 1-component or ad-hoc basic machines
+ case $basic_machine in
+-	# Recognize the basic CPU types without company name.
+-	# Some are omitted here because they have special meanings below.
+-	1750a | 580 \
+-	| a29k \
+-	| aarch64 | aarch64_be \
+-	| 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 \
+-	| 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 | ia16 | 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 | pj | pjl \
+-	| powerpc | powerpc64 | powerpc64le | powerpcle \
+-	| pru \
+-	| pyramid \
+-	| riscv32 | riscv64 \
+-	| rl78 | rx \
+-	| score \
+-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]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 \
+-	| wasm32 \
+-	| x86 | xc16x | xstormy16 | xtensa \
+-	| z8k | z80)
+-		basic_machine=$basic_machine-unknown
+-		;;
+-	c54x)
+-		basic_machine=tic54x-unknown
+-		;;
+-	c55x)
+-		basic_machine=tic55x-unknown
+-		;;
+-	c6x)
+-		basic_machine=tic6x-unknown
+-		;;
+-	leon|leon[3-9])
+-		basic_machine=sparc-$basic_machine
+-		;;
+-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+-		basic_machine=$basic_machine-unknown
+-		os=-none
++	# Here we handle the default manufacturer of certain CPU types.  It is in
++	# some cases the only manufacturer, in others, it is the most popular.
++	w89k)
++		cpu=hppa1.1
++		vendor=winbond
+ 		;;
+-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
++	op50n)
++		cpu=hppa1.1
++		vendor=oki
+ 		;;
+-	ms1)
+-		basic_machine=mt-unknown
++	op60c)
++		cpu=hppa1.1
++		vendor=oki
+ 		;;
+-
+-	strongarm | thumb | xscale)
+-		basic_machine=arm-unknown
++	ibm*)
++		cpu=i370
++		vendor=ibm
+ 		;;
+-	xgate)
+-		basic_machine=$basic_machine-unknown
+-		os=-none
++	orion105)
++		cpu=clipper
++		vendor=highlevel
+ 		;;
+-	xscaleeb)
+-		basic_machine=armeb-unknown
++	mac | mpw | mac-mpw)
++		cpu=m68k
++		vendor=apple
+ 		;;
+-
+-	xscaleel)
+-		basic_machine=armel-unknown
++	pmac | pmac-mpw)
++		cpu=powerpc
++		vendor=apple
+ 		;;
+-	# 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.
+-	580-* \
+-	| 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-* | ia16-* | 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-* \
+-	| pru-* \
+-	| 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-* \
+-	| wasm32-* \
+-	| we32k-* \
+-	| x86-* | x86_64-* | xc16x-* | xps100-* \
+-	| xstormy16-* | xtensa*-* \
+-	| ymp-* \
+-	| z8k-* | z80-*)
+-		;;
+-	# Recognize the basic CPU types without company name, with glob match.
+-	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.
+-	386bsd)
+-		basic_machine=i386-pc
+-		os=-bsd
+-		;;
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+-		basic_machine=m68000-att
++		cpu=m68000
++		vendor=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
++		cpu=we32k
++		vendor=att
  		;;
-@@ -685,17 +686,17 @@
  	bluegene*)
- 		cpu=powerpc
- 		vendor=ibm
--		os=cnk
+-		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
+-		;;
+-	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
+-		;;
+-	crx)
+-		basic_machine=crx-unknown
+-		os=-elf
+-		;;
+-	da30 | da30-*)
+-		basic_machine=m68k-da30
+-		;;
+-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+-		basic_machine=mips-dec
++		cpu=powerpc
++		vendor=ibm
 +		basic_os=cnk
  		;;
  	decsystem10* | dec10*)
- 		cpu=pdp10
- 		vendor=dec
--		os=tops10
+-		basic_machine=pdp10-dec
+-		os=-tops10
++		cpu=pdp10
++		vendor=dec
 +		basic_os=tops10
  		;;
  	decsystem20* | dec20*)
- 		cpu=pdp10
- 		vendor=dec
--		os=tops20
+-		basic_machine=pdp10-dec
+-		os=-tops20
++		cpu=pdp10
++		vendor=dec
 +		basic_os=tops20
  		;;
  	delta | 3300 | motorola-3300 | motorola-delta \
  	      | 3300-motorola | delta-motorola)
-@@ -705,7 +706,7 @@
+-		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
++		cpu=m68k
++		vendor=motorola
+ 		;;
  	dpx2*)
- 		cpu=m68k
- 		vendor=bull
--		os=sysv3
+-		basic_machine=m68k-bull
+-		os=-sysv3
+-		;;
+-	e500v[12])
+-		basic_machine=powerpc-unknown
+-		os=$os"spe"
+-		;;
+-	e500v[12]-*)
+-		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
++		cpu=m68k
++		vendor=bull
 +		basic_os=sysv3
  		;;
  	encore | umax | mmax)
- 		cpu=ns32k
-@@ -714,7 +715,7 @@
- 	elxsi)
- 		cpu=elxsi
- 		vendor=elxsi
--		os=${os:-bsd}
+-		basic_machine=ns32k-encore
++		cpu=ns32k
++		vendor=encore
+ 		;;
+-	es1800 | OSE68k | ose68k | ose | OSE)
+-		basic_machine=m68k-ericsson
+-		os=-ose
++	elxsi)
++		cpu=elxsi
++		vendor=elxsi
 +		basic_os=${basic_os:-bsd}
  		;;
  	fx2800)
- 		cpu=i860
-@@ -727,7 +728,7 @@
+-		basic_machine=i860-alliant
++		cpu=i860
++		vendor=alliant
+ 		;;
+ 	genix)
+-		basic_machine=ns32k-ns
+-		;;
+-	gmicro)
+-		basic_machine=tron-gmicro
+-		os=-sysv
+-		;;
+-	go32)
+-		basic_machine=i386-pc
+-		os=-go32
++		cpu=ns32k
++		vendor=ns
+ 		;;
  	h3050r* | hiux*)
- 		cpu=hppa1.1
- 		vendor=hitachi
--		os=hiuxwe2
+-		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
++		cpu=hppa1.1
++		vendor=hitachi
 +		basic_os=hiuxwe2
  		;;
  	hp3k9[0-9][0-9] | hp9[0-9][0-9])
- 		cpu=hppa1.0
-@@ -768,38 +769,38 @@
- 		vendor=hp
+-		basic_machine=hppa1.0-hp
++		cpu=hppa1.0
++		vendor=hp
+ 		;;
+ 	hp9k2[0-9][0-9] | hp9k31[0-9])
+-		basic_machine=m68000-hp
++		cpu=m68000
++		vendor=hp
+ 		;;
+ 	hp9k3[2-9][0-9])
+-		basic_machine=m68k-hp
++		cpu=m68k
++		vendor=hp
+ 		;;
+ 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+-		basic_machine=hppa1.0-hp
++		cpu=hppa1.0
++		vendor=hp
+ 		;;
+ 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+-		basic_machine=hppa1.1-hp
++		cpu=hppa1.1
++		vendor=hp
+ 		;;
+ 	hp9k78[0-9] | hp78[0-9])
+ 		# FIXME: really hppa2.0-hp
+-		basic_machine=hppa1.1-hp
++		cpu=hppa1.1
++		vendor=hp
+ 		;;
+ 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ 		# FIXME: really hppa2.0-hp
+-		basic_machine=hppa1.1-hp
++		cpu=hppa1.1
++		vendor=hp
+ 		;;
+ 	hp9k8[0-9][13679] | hp8[0-9][13679])
+-		basic_machine=hppa1.1-hp
++		cpu=hppa1.1
++		vendor=hp
+ 		;;
+ 	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
++		cpu=hppa1.0
++		vendor=hp
  		;;
  	i*86v32)
--		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+-		os=-sysv32
 +		cpu=$(echo "$1" | sed -e 's/86.*/86/')
- 		vendor=pc
--		os=sysv32
++		vendor=pc
 +		basic_os=sysv32
  		;;
  	i*86v4*)
--		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+-		os=-sysv4
 +		cpu=$(echo "$1" | sed -e 's/86.*/86/')
- 		vendor=pc
--		os=sysv4
++		vendor=pc
 +		basic_os=sysv4
  		;;
  	i*86v)
--		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+-		os=-sysv
 +		cpu=$(echo "$1" | sed -e 's/86.*/86/')
- 		vendor=pc
--		os=sysv
++		vendor=pc
 +		basic_os=sysv
  		;;
  	i*86sol2)
--		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+-		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
 +		cpu=$(echo "$1" | sed -e 's/86.*/86/')
- 		vendor=pc
--		os=solaris2
++		vendor=pc
 +		basic_os=solaris2
- 		;;
- 	j90 | j90-cray)
- 		cpu=j90
- 		vendor=cray
--		os=${os:-unicos}
++		;;
++	j90 | j90-cray)
++		cpu=j90
++		vendor=cray
 +		basic_os=${basic_os:-unicos}
  		;;
  	iris | iris4d)
- 		cpu=mips
- 		vendor=sgi
+-		basic_machine=mips-sgi
 -		case $os in
+-		    -irix*)
++		cpu=mips
++		vendor=sgi
 +		case $basic_os in
- 		    irix*)
++		    irix*)
  			;;
  		    *)
--			os=irix4
+-			os=-irix4
 +			basic_os=irix4
  			;;
  		esac
  		;;
-@@ -810,24 +811,26 @@
- 	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
- 		cpu=m68k
- 		vendor=atari
--		os=mint
+-	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
+-		;;
+-	*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/'`
++		cpu=m68000
++		vendor=convergent
+ 		;;
+-	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
++	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
++		cpu=m68k
++		vendor=atari
 +		basic_os=mint
  		;;
  	news-3600 | risc-news)
- 		cpu=mips
- 		vendor=sony
--		os=newsos
+-		basic_machine=mips-sony
+-		os=-newsos
+-		;;
+-	necv70)
+-		basic_machine=v70-nec
+-		os=-sysv
++		cpu=mips
++		vendor=sony
 +		basic_os=newsos
  		;;
  	next | m*-next)
- 		cpu=m68k
- 		vendor=next
+-		basic_machine=m68k-next
 -		case $os in
--		    nextstep* )
+-		    -nextstep* )
++		cpu=m68k
++		vendor=next
 +		case $basic_os in
 +		    openstep*)
 +		        ;;
 +		    nextstep*)
  			;;
- 		    ns2*)
--		      os=nextstep2
+-		    -ns2*)
+-		      os=-nextstep2
++		    ns2*)
 +		      basic_os=nextstep2
  			;;
  		    *)
--		      os=nextstep3
+-		      os=-nextstep3
 +		      basic_os=nextstep3
  			;;
  		esac
  		;;
-@@ -838,12 +841,12 @@
+-	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
+-		;;
+-	neo-tandem)
+-		basic_machine=neo-tandem
+-		;;
+-	nse-tandem)
+-		basic_machine=nse-tandem
+-		;;
+-	nsr-tandem)
+-		basic_machine=nsr-tandem
+-		;;
+-	nsv-tandem)
+-		basic_machine=nsv-tandem
+-		;;
+-	nsx-tandem)
+-		basic_machine=nsx-tandem
++		cpu=np1
++		vendor=gould
+ 		;;
  	op50n-* | op60c-*)
- 		cpu=hppa1.1
- 		vendor=oki
--		os=proelf
+-		basic_machine=hppa1.1-oki
+-		os=-proelf
+-		;;
+-	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
++		cpu=hppa1.1
++		vendor=oki
 +		basic_os=proelf
  		;;
  	pa-hitachi)
- 		cpu=hppa1.1
- 		vendor=hitachi
--		os=hiuxwe2
+-		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
++		cpu=hppa1.1
++		vendor=hitachi
 +		basic_os=hiuxwe2
  		;;
  	pbd)
- 		cpu=sparc
-@@ -880,12 +883,12 @@
- 	sde)
- 		cpu=mipsisa32
- 		vendor=sde
--		os=${os:-elf}
+-		basic_machine=sparc-tti
++		cpu=sparc
++		vendor=tti
+ 		;;
+ 	pbb)
+-		basic_machine=m68k-tti
++		cpu=m68k
++		vendor=tti
+ 		;;
+-	pc532 | pc532-*)
+-		basic_machine=ns32k-pc532
++	pc532)
++		cpu=ns32k
++		vendor=pc532
+ 		;;
+-	pc98)
+-		basic_machine=i386-pc
++	pn)
++		cpu=pn
++		vendor=gould
+ 		;;
+-	pc98-*)
+-		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	power)
++		cpu=power
++		vendor=ibm
+ 		;;
+-	pentium | p5 | k5 | k6 | nexgen | viac3)
+-		basic_machine=i586-pc
++	ps2)
++		cpu=i386
++		vendor=ibm
+ 		;;
+-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+-		basic_machine=i686-pc
++	rm[46]00)
++		cpu=mips
++		vendor=siemens
+ 		;;
+-	pentiumii | pentium2 | pentiumiii | pentium3)
+-		basic_machine=i686-pc
++	rtpc | rtpc-*)
++		cpu=romp
++		vendor=ibm
+ 		;;
+-	pentium4)
+-		basic_machine=i786-pc
++	sde)
++		cpu=mipsisa32
++		vendor=sde
 +		basic_os=${basic_os:-elf}
  		;;
- 	simso-wrs)
- 		cpu=sparclite
- 		vendor=wrs
--		os=vxworks
+-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+-		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	simso-wrs)
++		cpu=sparclite
++		vendor=wrs
 +		basic_os=vxworks
  		;;
- 	tower | tower-32)
- 		cpu=m68k
-@@ -902,7 +905,7 @@
- 	w89k-*)
- 		cpu=hppa1.1
- 		vendor=winbond
--		os=proelf
+-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	tower | tower-32)
++		cpu=m68k
++		vendor=ncr
+ 		;;
+-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	vpp*|vx|vx-*)
++		cpu=f301
++		vendor=fujitsu
+ 		;;
+-	pentium4-*)
+-		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	w65)
++		cpu=w65
++		vendor=wdc
+ 		;;
+-	pn)
+-		basic_machine=pn-gould
++	w89k-*)
++		cpu=hppa1.1
++		vendor=winbond
 +		basic_os=proelf
  		;;
- 	none)
- 		cpu=none
-@@ -914,11 +917,12 @@
- 		;;
- 	leon-*|leon[3-9]-*)
- 		cpu=sparc
--		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+-	power)	basic_machine=power-ibm
++	none)
++		cpu=none
++		vendor=none
+ 		;;
+-	ppc | ppcbe)	basic_machine=powerpc-unknown
++	leon|leon[3-9])
++		cpu=sparc
++		vendor=$basic_machine
+ 		;;
+-	ppc-* | ppcbe-*)
+-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	leon-*|leon[3-9]-*)
++		cpu=sparc
 +		vendor=$(echo "$basic_machine" | sed 's/-.*//')
  		;;
- 	*-*)
--		IFS="-" read -r cpu vendor <<EOF
+-	ppcle | powerpclittle)
+-		basic_machine=powerpcle-unknown
++
++	*-*)
 +		# shellcheck disable=SC2162
 +		IFS="-" read cpu vendor <<EOF
- $basic_machine
- EOF
++$basic_machine
++EOF
  		;;
-@@ -950,15 +954,15 @@
- # Decode basic machines in the full and proper CPU-Company form.
- case $cpu-$vendor in
--	# Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
+-	ppcle-* | powerpclittle-*)
+-		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	# 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)
++		cpu=$basic_machine
++		vendor=pc
+ 		;;
+-	ppc64)	basic_machine=powerpc64-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
++		vendor=pc
+ 		;;
+-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	x64 | amd64)
++		cpu=x86_64
++		vendor=pc
+ 		;;
+-	ppc64le | powerpc64little)
+-		basic_machine=powerpc64le-unknown
++	# Recognize the basic CPU types without company name.
++	*)
++		cpu=$basic_machine
++		vendor=unknown
+ 		;;
+-	ppc64le-* | powerpc64little-*)
+-		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++esac
++
++unset -v basic_machine
++
++# Decode basic machines in the full and proper CPU-Company form.
++case $cpu-$vendor in
 +	# 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
--		os=${os:-unicosmp}
++	# some cases the only manufacturer, in others, it is the most popular.
++	craynv-unknown)
++		vendor=cray
 +		basic_os=${basic_os:-unicosmp}
  		;;
- 	c90-unknown | c90-cray)
- 		vendor=cray
--		os=${os:-unicos}
+-	ps2)
+-		basic_machine=i386-ibm
++	c90-unknown | c90-cray)
++		vendor=cray
 +		basic_os=${Basic_os:-unicos}
  		;;
- 	fx80-unknown)
- 		vendor=alliant
-@@ -1002,7 +1006,7 @@
- 	dpx20-unknown | dpx20-bull)
- 		cpu=rs6000
- 		vendor=bull
--		os=${os:-bosx}
+-	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
++	fx80-unknown)
++		vendor=alliant
+ 		;;
+-	rm[46]00)
+-		basic_machine=mips-siemens
++	romp-unknown)
++		vendor=ibm
+ 		;;
+-	rtpc | rtpc-*)
+-		basic_machine=romp-ibm
++	mmix-unknown)
++		vendor=knuth
+ 		;;
+-	s390 | s390-*)
+-		basic_machine=s390-ibm
++	microblaze-unknown | microblazeel-unknown)
++		vendor=xilinx
+ 		;;
+-	s390x | s390x-*)
+-		basic_machine=s390x-ibm
++	rs6000-unknown)
++		vendor=ibm
+ 		;;
+-	sa29200)
+-		basic_machine=a29k-amd
+-		os=-udi
++	vax-unknown)
++		vendor=dec
+ 		;;
+-	sb1)
+-		basic_machine=mipsisa64sb1-unknown
++	pdp11-unknown)
++		vendor=dec
+ 		;;
+-	sb1el)
+-		basic_machine=mipsisa64sb1el-unknown
++	we32k-unknown)
++		vendor=att
+ 		;;
+-	sde)
+-		basic_machine=mipsisa32-sde
+-		os=-elf
++	cydra-unknown)
++		vendor=cydrome
+ 		;;
+-	sei)
+-		basic_machine=mips-sei
+-		os=-seiux
++	i370-ibm*)
++		vendor=ibm
+ 		;;
+-	sequent)
+-		basic_machine=i386-sequent
++	orion-unknown)
++		vendor=highlevel
+ 		;;
+-	sh5el)
+-		basic_machine=sh5le-unknown
++	xps-unknown | xps100-unknown)
++		cpu=xps100
++		vendor=honeywell
+ 		;;
+-	simso-wrs)
+-		basic_machine=sparclite-wrs
+-		os=-vxworks
++
++	# Here we normalize CPU types with a missing or matching vendor
++	dpx20-unknown | dpx20-bull)
++		cpu=rs6000
++		vendor=bull
 +		basic_os=${basic_os:-bosx}
  		;;
- 	# Here we normalize CPU types irrespective of the vendor
-@@ -1011,7 +1015,7 @@
- 		;;
- 	blackfin-*)
- 		cpu=bfin
--		os=linux
+-	sps7)
+-		basic_machine=m68k-bull
+-		os=-sysv2
+-		;;
+-	spur)
+-		basic_machine=spur-unknown
+-		;;
+-	st2000)
+-		basic_machine=m68k-tandem
+-		;;
+-	stratus)
+-		basic_machine=i860-stratus
+-		os=-sysv4
++
++	# Here we normalize CPU types irrespective of the vendor
++	amd64-*)
++		cpu=x86_64
+ 		;;
+-	strongarm-* | thumb-*)
+-		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++	blackfin-*)
++		cpu=bfin
 +		basic_os=linux
  		;;
- 	c54x-*)
- 		cpu=tic54x
-@@ -1024,7 +1028,7 @@
- 		;;
- 	e500v[12]-*)
- 		cpu=powerpc
--		os=$os"spe"
+-	sun2)
+-		basic_machine=m68000-sun
++	c54x-*)
++		cpu=tic54x
+ 		;;
+-	sun2os3)
+-		basic_machine=m68000-sun
+-		os=-sunos3
++	c55x-*)
++		cpu=tic55x
+ 		;;
+-	sun2os4)
+-		basic_machine=m68000-sun
+-		os=-sunos4
++	c6x-*)
++		cpu=tic6x
+ 		;;
+-	sun3os3)
+-		basic_machine=m68k-sun
+-		os=-sunos3
++	e500v[12]-*)
++		cpu=powerpc
 +		basic_os=${basic_os}"spe"
  		;;
- 	mips3*-*)
- 		cpu=mips64
-@@ -1034,7 +1038,7 @@
- 		;;
- 	m68knommu-*)
- 		cpu=m68k
--		os=linux
+-	sun3os4)
+-		basic_machine=m68k-sun
+-		os=-sunos4
++	mips3*-*)
++		cpu=mips64
+ 		;;
+-	sun4os3)
+-		basic_machine=sparc-sun
+-		os=-sunos3
++	ms1-*)
++		cpu=mt
+ 		;;
+-	sun4os4)
+-		basic_machine=sparc-sun
+-		os=-sunos4
++	m68knommu-*)
++		cpu=m68k
 +		basic_os=linux
  		;;
- 	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
- 		cpu=s12z
-@@ -1044,7 +1048,7 @@
- 		;;
- 	parisc-*)
- 		cpu=hppa
--		os=linux
+-	sun4sol2)
+-		basic_machine=sparc-sun
+-		os=-solaris2
++	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
++		cpu=s12z
+ 		;;
+-	sun3 | sun3-*)
+-		basic_machine=m68k-sun
++	openrisc-*)
++		cpu=or32
+ 		;;
+-	sun4)
+-		basic_machine=sparc-sun
++	parisc-*)
++		cpu=hppa
 +		basic_os=linux
  		;;
- 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		cpu=i586
-@@ -1080,7 +1084,7 @@
- 		cpu=mipsisa64sb1el
- 		;;
- 	sh5e[lb]-*)
--		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+-	sun386 | sun386i | roadrunner)
+-		basic_machine=i386-sun
++	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
++		cpu=i586
+ 		;;
+-	sv1)
+-		basic_machine=sv1-cray
+-		os=-unicos
++	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
++		cpu=i686
+ 		;;
+-	symmetry)
+-		basic_machine=i386-sequent
+-		os=-dynix
++	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
++		cpu=i686
+ 		;;
+-	t3e)
+-		basic_machine=alphaev5-cray
+-		os=-unicos
++	pentium4-*)
++		cpu=i786
+ 		;;
+-	t90)
+-		basic_machine=t90-cray
+-		os=-unicos
++	pc98-*)
++		cpu=i386
+ 		;;
+-	tile*)
+-		basic_machine=$basic_machine-unknown
+-		os=-linux-gnu
++	ppc-* | ppcbe-*)
++		cpu=powerpc
+ 		;;
+-	tx39)
+-		basic_machine=mipstx39-unknown
++	ppcle-* | powerpclittle-*)
++		cpu=powerpcle
+ 		;;
+-	tx39el)
+-		basic_machine=mipstx39el-unknown
++	ppc64-*)
++		cpu=powerpc64
+ 		;;
+-	toad1)
+-		basic_machine=pdp10-xkl
+-		os=-tops20
++	ppc64le-* | powerpc64little-*)
++		cpu=powerpc64le
+ 		;;
+-	tower | tower-32)
+-		basic_machine=m68k-ncr
++	sb1-*)
++		cpu=mipsisa64sb1
+ 		;;
+-	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
++	sb1el-*)
++		cpu=mipsisa64sb1el
+ 		;;
+-	vpp*|vx|vx-*)
+-		basic_machine=f301-fujitsu
++	sh5e[lb]-*)
 +		cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/')
  		;;
- 	spur-*)
- 		cpu=spur
-@@ -1098,13 +1102,16 @@
- 		cpu=x86_64
+-	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
++	spur-*)
++		cpu=spur
+ 		;;
+-	w89k-*)
+-		basic_machine=hppa1.1-winbond
+-		os=-proelf
++	strongarm-* | thumb-*)
++		cpu=arm
+ 		;;
+-	x64)
+-		basic_machine=x86_64-pc
++	tx39-*)
++		cpu=mipstx39
+ 		;;
+-	xbox)
+-		basic_machine=i686-pc
+-		os=-mingw32
++	tx39el-*)
++		cpu=mipstx39el
+ 		;;
+-	xps | xps100)
+-		basic_machine=xps100-honeywell
++	x64-*)
++		cpu=x86_64
  		;;
  	xscale-* | xscalee[bl]-*)
--		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+-		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 +		cpu=$(echo "$cpu" | sed 's/^xscale/arm/')
-+		;;
+ 		;;
+-	ymp)
+-		basic_machine=ymp-cray
+-		os=-unicos
+-		;;
+-	none)
+-		basic_machine=none-none
+-		os=-none
 +	arm64-*)
 +		cpu=aarch64
  		;;
--	# Recognize the cannonical CPU Types that limit and/or modify the
+-# Here we handle the default manufacturer of certain CPU types.  It is in
+-# some cases the only manufacturer, in others, it is the most popular.
+-	w89k)
+-		basic_machine=hppa1.1-winbond
+-		;;
+-	op50n)
+-		basic_machine=hppa1.1-oki
+-		;;
+-	op60c)
+-		basic_machine=hppa1.1-oki
 +	# Recognize the canonical CPU Types that limit and/or modify the
- 	# company names they are paired with.
- 	cr16-*)
--		os=${os:-elf}
++	# company names they are paired with.
++	cr16-*)
 +		basic_os=${basic_os:-elf}
  		;;
- 	crisv32-* | etraxfs*-*)
- 		cpu=crisv32
-@@ -1115,7 +1122,7 @@
- 		vendor=axis
- 		;;
- 	crx-*)
--		os=${os:-elf}
+-	romp)
+-		basic_machine=romp-ibm
++	crisv32-* | etraxfs*-*)
++		cpu=crisv32
++		vendor=axis
+ 		;;
+-	mmix)
+-		basic_machine=mmix-knuth
++	cris-* | etrax*-*)
++		cpu=cris
++		vendor=axis
+ 		;;
+-	rs6000)
+-		basic_machine=rs6000-ibm
++	crx-*)
 +		basic_os=${basic_os:-elf}
  		;;
- 	neo-tandem)
- 		cpu=neo
-@@ -1137,20 +1144,16 @@
- 		cpu=nsx
- 		vendor=tandem
- 		;;
--	s390-*)
--		cpu=s390
--		vendor=ibm
+-	vax)
+-		basic_machine=vax-dec
 -		;;
--	s390x-*)
--		cpu=s390x
--		vendor=ibm
+-	pdp11)
+-		basic_machine=pdp11-dec
+-		;;
+-	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
++	neo-tandem)
++		cpu=neo
++		vendor=tandem
+ 		;;
+-	cydra)
+-		basic_machine=cydra-cydrome
++	nse-tandem)
++		cpu=nse
++		vendor=tandem
+ 		;;
+-	orion)
+-		basic_machine=orion-highlevel
++	nsr-tandem)
++		cpu=nsr
++		vendor=tandem
+ 		;;
+-	orion105)
+-		basic_machine=clipper-highlevel
++	nsv-tandem)
++		cpu=nsv
++		vendor=tandem
+ 		;;
+-	mac | mpw | mac-mpw)
+-		basic_machine=m68k-apple
++	nsx-tandem)
++		cpu=nsx
++		vendor=tandem
+ 		;;
+-	pmac | pmac-mpw)
+-		basic_machine=powerpc-apple
 +	mipsallegrexel-sony)
 +		cpu=mipsallegrexel
 +		vendor=sony
  		;;
- 	tile*-*)
--		os=${os:-linux-gnu}
+-	*-unknown)
+-		# Make sure to match an already-canonicalized machine name.
++	tile*-*)
 +		basic_os=${basic_os:-linux-gnu}
  		;;
++
  	*)
--		# Recognize the cannonical CPU types that are allowed with any
+-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+-		exit 1
 +		# Recognize the canonical CPU types that are allowed with any
- 		# company name.
- 		case $cpu in
- 			1750a | 580 \
-@@ -1161,13 +1164,14 @@
- 			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
- 			| alphapca5[67] | alpha64pca5[67] \
- 			| am33_2.0 \
++		# company name.
++		case $cpu in
++			1750a | 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 \
 +			| amdgcn \
- 			| arc | arceb \
--			| arm  | arm[lb]e | arme[lb] | armv* \
++			| arc | arceb \
 +			| arm | arm[lb]e | arme[lb] | armv* \
- 			| avr | avr32 \
- 			| asmjs \
- 			| ba \
- 			| be32 | be64 \
--			| bfin | bs2000 \
++			| avr | avr32 \
++			| asmjs \
++			| ba \
++			| be32 | be64 \
 +			| bfin | bpf | bs2000 \
- 			| c[123]* | c30 | [cjt]90 | c4x \
- 			| c8051 | clipper | craynv | csky | cydra \
- 			| d10v | d30v | dlx | dsp16xx \
-@@ -1182,13 +1186,13 @@
- 			| le32 | le64 \
- 			| lm32 \
- 			| m32c | m32r | m32rle \
--			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
--			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
++			| 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 \
 +			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
- 			| m88110 | m88k | maxq | mb | mcore | mep | metag \
- 			| microblaze | microblazeel \
- 			| mips | mipsbe | mipseb | mipsel | mipsle \
- 			| mips16 \
--			| mips64 | mips64el \
++			| m88110 | m88k | maxq | mb | mcore | mep | metag \
++			| microblaze | microblazeel \
++			| mips | mipsbe | mipseb | mipsel | mipsle \
++			| mips16 \
 +			| mips64 | mips64eb | mips64el \
- 			| mips64octeon | mips64octeonel \
- 			| mips64orion | mips64orionel \
- 			| mips64r5900 | mips64r5900el \
-@@ -1215,19 +1219,22 @@
- 			| nds32 | nds32le | nds32be \
- 			| nfp \
- 			| nios | nios2 | nios2eb | nios2el \
--			| none | np1 | ns16k | ns32k \
++			| 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 | nvptx \
- 			| open8 \
- 			| or1k* \
- 			| or32 \
- 			| orion \
++			| open8 \
++			| or1k* \
++			| or32 \
++			| orion \
 +			| picochip \
- 			| pdp10 | pdp11 | pj | pjl | pn | power \
- 			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
- 			| pru \
- 			| pyramid \
- 			| riscv | riscv32 | riscv64 \
- 			| rl78 | romp | rs6000 | rx \
++			| pdp10 | pdp11 | pj | pjl | pn | power \
++			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
++			| pru \
++			| pyramid \
++			| riscv | riscv32 | riscv64 \
++			| rl78 | romp | rs6000 | rx \
 +			| s390 | s390x \
- 			| score \
--			| sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
++			| score \
 +			| sh | shl \
 +			| 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 \
-@@ -1237,10 +1244,11 @@
- 			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
- 			| tron \
- 			| ubicom32 \
--			| v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
++			| 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 \
 +			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
- 			| vax \
- 			| visium \
--			| wasm32 \
++			| vax \
++			| visium \
 +			| w65 \
 +			| wasm32 | wasm64 \
- 			| we32k \
- 			| x86 | x86_64 | xc16x | xgate | xps100 \
- 			| xstormy16 | xtensa* \
-@@ -1270,8 +1278,47 @@
++			| we32k \
++			| x86 | x86_64 | xc16x | xgate | xps100 \
++			| xstormy16 | xtensa* \
++			| ymp \
++			| z8k | z80)
++				;;
++
++			*)
++				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
++				exit 1
++				;;
++		esac
+ 		;;
+ esac
+ # Here we canonicalize certain aliases for manufacturers.
+-case $basic_machine in
+-	*-digital*)
+-		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
++case $vendor in
++	digital*)
++		vendor=dec
+ 		;;
+-	*-commodore*)
+-		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
++	commodore*)
++		vendor=cbm
+ 		;;
+ 	*)
+ 		;;
+@@ -1334,203 +1278,213 @@
  # Decode manufacturer-specific aliases for certain operating systems.
--if [ x$os != x ]
+-if [ x"$os" != x"" ]
 +if test x$basic_os != x
  then
 +
@@ -1124,184 +2292,301 @@ aarch64/arm64/M1 can compile.
  case $os in
  	# First match some system type aliases that might get confused
  	# with valid system types.
-@@ -1283,7 +1330,7 @@
- 		os=cnk
- 		;;
- 	solaris1 | solaris1.*)
+-	# -solaris* is a basic system type, with this one exception.
+-	-auroraux)
+-		os=-auroraux
++	# solaris* is a basic system type, with this one exception.
++	auroraux)
++		os=auroraux
+ 		;;
+-	-solaris1 | -solaris1.*)
 -		os=`echo $os | sed -e 's|solaris1|sunos4|'`
++	bluegene*)
++		os=cnk
+ 		;;
+-	-solaris)
+-		os=-solaris2
++	solaris1 | solaris1.*)
 +		os=$(echo $os | sed -e 's|solaris1|sunos4|')
  		;;
- 	solaris)
- 		os=solaris2
-@@ -1291,9 +1338,6 @@
- 	unixware*)
- 		os=sysv4.2uw
+-	-unixware*)
+-		os=-sysv4.2uw
++	solaris)
++		os=solaris2
  		;;
--	gnu/linux*)
+-	-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
-@@ -1315,12 +1359,9 @@
- 		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.
-+		os=$(echo $os | sed -e 's/sco3.2./sco3.2v/')
++	unixware*)
++		os=sysv4.2uw
  		;;
--	scout)
-+	sco*v* | scout)
- 		# Don't match below
- 		;;
- 	sco*)
-@@ -1329,78 +1370,26 @@
- 	psos*)
- 		os=psos
+ 	# es1800 is here to avoid being matched by es* (a different OS)
+-	-es1800*)
+-		os=-ose
++	es1800*)
++		os=ose
  		;;
 -	# Now accept the basic system types.
 -	# The portable systems comes first.
 -	# Each alternative MUST end in a * to match a version number.
--	# sysv* is not here because it comes later, after sysvr4.
--	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
--	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
--	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
--	     | sym* | kopensolaris* | plan9* \
--	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
--	     | aos* | aros* | cloudabi* | sortix* \
--	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
--	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
--	     | knetbsd* | mirbsd* | netbsd* \
--	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
--	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
--	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
--	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
--	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
--	     | chorusrdb* | cegcc* | glidix* \
--	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
--	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
--	     | linux-newlib* | linux-musl* | linux-uclibc* \
--	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
--	     | interix* | uwin* | mks* | rhapsody* | darwin* \
--	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
--	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
--	     | os2* | vos* | palmos* | uclinux* | nucleus* \
--	     | morphos* | superux* | rtmk* | windiss* \
--	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
--	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
--	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
--	     | midnightbsd*)
+-	# -sysv* is not here because it comes later, after sysvr4.
+-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+-	      | -sym* | -kopensolaris* | -plan9* \
+-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* | -aros* | -cloudabi* | -sortix* \
+-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+-	      | -morphos* | -superux* | -rtmk* | -windiss* \
+-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+-	      | -midnightbsd*)
 -	# Remember, each alternative MUST END IN *, to match a version number.
 -		;;
- 	qnx*)
--		case $cpu in
--		    x86 | i*86)
+-	-qnx*)
+-		case $basic_machine in
+-		    x86-* | i*86-*)
 -			;;
 -		    *)
--			os=nto-$os
+-			os=-nto$os
 -			;;
 -		esac
-+		os=qnx
++	# Some version numbers need modification
++	chorusos*)
++		os=chorusos
  		;;
- 	hiux*)
- 		os=hiuxwe2
+-	-nto-qnx*)
++	isc)
++		os=isc2.2
  		;;
--	nto-qnx*)
--		;;
--	nto*)
+-	-nto*)
 -		os=`echo $os | sed -e 's|nto|nto-qnx|'`
--		;;
--	sim | xray | os68k* | v88r* \
--	    | windows* | osx | abug | netware* | os9* \
--	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
--		;;
--	linux-dietlibc)
--		os=linux-dietlibc
--		;;
--	linux*)
++	sco6)
++		os=sco5v6
+ 		;;
+-	-sim | -xray | -os68k* | -v88r* \
+-	      | -windows* | -osx | -abug | -netware* | -os9* \
+-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
++	sco5)
++		os=sco3.2v5
+ 		;;
+-	-mac*)
+-		os=`echo "$os" | sed -e 's|mac|macos|'`
++	sco4)
++		os=sco3.2v4
+ 		;;
+-	-linux-dietlibc)
+-		os=-linux-dietlibc
++	sco3.2.[4-9]*)
++		os=$(echo $os | sed -e 's/sco3.2./sco3.2v/')
+ 		;;
+-	-linux*)
 -		os=`echo $os | sed -e 's|linux|linux-gnu|'`
--		;;
- 	lynx*178)
- 		os=lynxos178
++	sco*v* | scout)
++		# Don't match below
+ 		;;
+-	-sunos5*)
+-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
++	sco*)
++		os=sco3.2v2
+ 		;;
+-	-sunos6*)
+-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
++	psos*)
++		os=psos
  		;;
- 	lynx*5)
- 		os=lynxos5
+-	-opened*)
+-		os=-openedition
++	qnx*)
++		os=qnx
+ 		;;
+-	-os400*)
+-		os=-os400
++	hiux*)
++		os=hiuxwe2
+ 		;;
+-	-wince*)
+-		os=-wince
++	lynx*178)
++		os=lynxos178
+ 		;;
+-	-utek*)
+-		os=-bsd
++	lynx*5)
++		os=lynxos5
  		;;
+-	-dynix*)
+-		os=-bsd
 +	lynxos*)
 +		# don't get caught up in next wildcard
-+		;;
- 	lynx*)
- 		os=lynxos
  		;;
--	mac*)
--		os=`echo "$os" | sed -e 's|mac|macos|'`
+-	-acis*)
+-		os=-aos
++	lynx*)
++		os=lynxos
+ 		;;
+-	-atheos*)
+-		os=-atheos
 +	mac[0-9]*)
 +		os=$(echo "$os" | sed -e 's|mac|macos|')
  		;;
- 	opened*)
- 		os=openedition
-@@ -1409,10 +1398,10 @@
- 		os=os400
+-	-syllable*)
+-		os=-syllable
++	opened*)
++		os=openedition
  		;;
- 	sunos5*)
--		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+-	-386bsd)
+-		os=-bsd
++	os400*)
++		os=os400
+ 		;;
+-	-ctix* | -uts*)
+-		os=-sysv
++	sunos5*)
 +		os=$(echo "$os" | sed -e 's|sunos5|solaris2|')
  		;;
- 	sunos6*)
--		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+-	-nova*)
+-		os=-rtmk-nova
++	sunos6*)
 +		os=$(echo "$os" | sed -e 's|sunos6|solaris3|')
  		;;
- 	wince*)
- 		os=wince
-@@ -1444,12 +1433,9 @@
- 	ns2)
- 		os=nextstep2
+-	-ns2)
+-		os=-nextstep2
++	wince*)
++		os=wince
  		;;
--	nsk*)
--		os=nsk
--		;;
- 	# Preserve the version number of sinix5.
- 	sinix5.*)
+-	-nsk*)
+-		os=-nsk
++	utek*)
++		os=bsd
+ 		;;
+-	# Preserve the version number of sinix5.
+-	-sinix5.*)
 -		os=`echo $os | sed -e 's|sinix|sysv|'`
++	dynix*)
++		os=bsd
++		;;
++	acis*)
++		os=aos
++		;;
++	atheos*)
++		os=atheos
++		;;
++	syllable*)
++		os=syllable
++		;;
++	386bsd)
++		os=bsd
++		;;
++	ctix* | uts*)
++		os=sysv
+ 		;;
+-	-sinix*)
+-		os=-sysv4
++	nova*)
++		os=rtmk-nova
+ 		;;
+-	-tpf*)
+-		os=-tpf
++	ns2)
++		os=nextstep2
+ 		;;
+-	-triton*)
+-		os=-sysv3
++	# Preserve the version number of sinix5.
++	sinix5.*)
 +		os=$(echo $os | sed -e 's|sinix|sysv|')
  		;;
- 	sinix*)
- 		os=sysv4
-@@ -1472,18 +1458,12 @@
- 	sysvr4)
- 		os=sysv4
- 		;;
--	# This must come after sysvr4.
--	sysv*)
--		;;
- 	ose*)
- 		os=ose
- 		;;
- 	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
- 		os=mint
- 		;;
--	zvmoe)
--		os=zvmoe
--		;;
- 	dicos*)
- 		os=dicos
- 		;;
-@@ -1500,19 +1480,11 @@
+-	-oss*)
+-		os=-sysv3
++	sinix*)
++		os=sysv4
+ 		;;
+-	-svr4*)
+-		os=-sysv4
++	tpf*)
++		os=tpf
+ 		;;
+-	-svr3)
+-		os=-sysv3
++	triton*)
++		os=sysv3
+ 		;;
+-	-sysvr4)
+-		os=-sysv4
++	oss*)
++		os=sysv3
+ 		;;
+-	# This must come after -sysvr4.
+-	-sysv*)
++	svr4*)
++		os=sysv4
+ 		;;
+-	-ose*)
+-		os=-ose
++	svr3)
++		os=sysv3
+ 		;;
+-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+-		os=-mint
++	sysvr4)
++		os=sysv4
+ 		;;
+-	-zvmoe)
+-		os=-zvmoe
++	ose*)
++		os=ose
+ 		;;
+-	-dicos*)
+-		os=-dicos
++	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
++		os=mint
+ 		;;
+-	-pikeos*)
++	dicos*)
++		os=dicos
++		;;
++	pikeos*)
+ 		# Until real need of OS specific support for
+ 		# particular features comes up, bare metal
+ 		# configurations are quite functional.
+-		case $basic_machine in
++		case $cpu in
+ 		    arm*)
+-			os=-eabi
++			os=eabi
+ 			;;
+ 		    *)
+-			os=-elf
++			os=elf
  			;;
  		esac
  		;;
--	nacl*)
+-	-nacl*)
 -		;;
--	ios)
--		;;
--	none)
+-	-ios)
 -		;;
--	*-eabi)
+-	-none)
 -		;;
  	*)
+-		# Get rid of the `-' at the beginning of $os.
+-		os=`echo $os | sed 's/[^-]*-//'`
 -		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 -		exit 1
 +		# No normalization, but not necessarily accepted, that comes below.
@@ -1311,26 +2596,244 @@ aarch64/arm64/M1 can compile.
  else
  # Here we handle the default operating systems that come with various machines.
-@@ -1525,6 +1497,7 @@
+@@ -1543,258 +1497,356 @@
  # will signal an error saying that MANUFACTURER isn't an operating
  # system, and we'll never get to this point.
+-case $basic_machine in
 +kernel=
- case $cpu-$vendor in
++case $cpu-$vendor in
  	score-*)
- 		os=elf
-@@ -1536,7 +1509,8 @@
- 		os=riscix1.2
+-		os=-elf
++		os=elf
+ 		;;
+ 	spu-*)
+-		os=-elf
++		os=elf
+ 		;;
+ 	*-acorn)
+-		os=-riscix1.2
++		os=riscix1.2
  		;;
  	arm*-rebel)
--		os=linux
+-		os=-linux
 +		kernel=linux
 +		os=gnu
  		;;
  	arm*-semi)
- 		os=aout
-@@ -1702,84 +1676,173 @@
- 		os=none
+-		os=-aout
++		os=aout
+ 		;;
+ 	c4x-* | tic4x-*)
+-		os=-coff
++		os=coff
+ 		;;
+ 	c8051-*)
+-		os=-elf
++		os=elf
++		;;
++	clipper-intergraph)
++		os=clix
+ 		;;
+ 	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
++		os=sunos4.1.1
+ 		;;
+ 	pru-*)
+-		os=-elf
++		os=elf
+ 		;;
+ 	*-be)
+-		os=-beos
++		os=beos
+ 		;;
+ 	*-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)
+-		os=-nextstep
++		os=nextstep
+ 		;;
+ 	*-sequent)
+-		os=-ptx
++		os=ptx
+ 		;;
+ 	*-crds)
+-		os=-unos
++		os=unos
+ 		;;
+ 	*-ns)
+-		os=-genix
++		os=genix
+ 		;;
+ 	i370-*)
+-		os=-mvs
++		os=mvs
+ 		;;
+ 	*-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
++		os=mint
++		;;
++	*-wrs)
++		os=vxworks
+ 		;;
+ 	*)
+-		os=-none
++		os=none
  		;;
  esac
 +
@@ -1423,1089 +2926,115 @@ aarch64/arm64/M1 can compile.
 +
  # Here we handle the case where we know the os, and the CPU type, but not the
  # manufacturer.  We pick the logical manufacturer.
- case $vendor in
- 	unknown)
+-vendor=unknown
+-case $basic_machine in
+-	*-unknown)
 -		case $os in
--			riscix*)
+-			-riscix*)
++case $vendor in
++	unknown)
 +		case $cpu-$os in
 +			*-riscix*)
  				vendor=acorn
  				;;
--			sunos*)
+-			-sunos*)
 +			*-sunos*)
  				vendor=sun
  				;;
--			cnk*|-aix*)
+-			-cnk*|-aix*)
 +			*-cnk* | *-aix*)
  				vendor=ibm
  				;;
--			beos*)
+-			-beos*)
 +			*-beos*)
  				vendor=be
  				;;
--			hpux*)
+-			-hpux*)
 +			*-hpux*)
  				vendor=hp
  				;;
--			mpeix*)
+-			-mpeix*)
 +			*-mpeix*)
  				vendor=hp
  				;;
--			hiux*)
+-			-hiux*)
 +			*-hiux*)
  				vendor=hitachi
  				;;
--			unos*)
+-			-unos*)
 +			*-unos*)
  				vendor=crds
  				;;
--			dgux*)
+-			-dgux*)
 +			*-dgux*)
  				vendor=dg
  				;;
--			luna*)
+-			-luna*)
 +			*-luna*)
  				vendor=omron
  				;;
--			genix*)
+-			-genix*)
 +			*-genix*)
  				vendor=ns
  				;;
--			clix*)
+-			-mvs* | -opened*)
 +			*-clix*)
- 				vendor=intergraph
- 				;;
--			mvs* | opened*)
++				vendor=intergraph
++				;;
 +			*-mvs* | *-opened*)
 +				vendor=ibm
 +				;;
 +			*-os400*)
  				vendor=ibm
  				;;
--			os400*)
+-			-os400*)
 +			s390-* | s390x-*)
  				vendor=ibm
  				;;
--			ptx*)
+-			-ptx*)
 +			*-ptx*)
  				vendor=sequent
  				;;
--			tpf*)
+-			-tpf*)
 +			*-tpf*)
  				vendor=ibm
  				;;
--			vxsim* | vxworks* | windiss*)
+-			-vxsim* | -vxworks* | -windiss*)
 +			*-vxsim* | *-vxworks* | *-windiss*)
  				vendor=wrs
  				;;
--			aux*)
+-			-aux*)
 +			*-aux*)
  				vendor=apple
  				;;
--			hms*)
+-			-hms*)
 +			*-hms*)
  				vendor=hitachi
  				;;
--			mpw* | macos*)
+-			-mpw* | -macos*)
 +			*-mpw* | *-macos*)
  				vendor=apple
  				;;
--			*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
  				vendor=atari
  				;;
--			vos*)
+-			-vos*)
 +			*-vos*)
  				vendor=stratus
  				;;
  		esac
+-		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
  		;;
  esac
--echo "$cpu-$vendor-$os"
+-echo "$basic_machine$os"
 +echo "$cpu-$vendor-${kernel:+$kernel-}$os"
  exit
  # Local variables:
---- a/config.guess
-+++ b/config.guess
-@@ -1,8 +1,8 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--#   Copyright 1992-2018 Free Software Foundation, Inc.
-+#   Copyright 1992-2020 Free Software Foundation, Inc.
--timestamp='2018-08-29'
-+timestamp='2020-11-07'
- # 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
-@@ -32,7 +32,7 @@
- # Please send patches to <config-patches@gnu.org>.
--me=`echo "$0" | sed -e 's,.*/,,'`
-+me=$(echo "$0" | sed -e 's,.*/,,')
- usage="\
- Usage: $0 [OPTION]
-@@ -50,7 +50,7 @@
- GNU config.guess ($timestamp)
- Originally written by Per Bothner.
--Copyright 1992-2018 Free Software Foundation, Inc.
-+Copyright 1992-2020 Free Software Foundation, Inc.
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -96,13 +96,14 @@
- tmp=
- # shellcheck disable=SC2172
--trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
--trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
-+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
- set_cc_for_build() {
-+    # prevent multiple calls if $tmp is already set
-+    test "$tmp" && return 0
-     : "${TMPDIR=/tmp}"
-     # shellcheck disable=SC2039
--    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+    { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } ||
- 	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
- 	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- 	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
-@@ -130,10 +131,10 @@
- 	PATH=$PATH:/.attbin ; export PATH
- fi
--UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
--UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
--UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
--UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown
-+UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown
-+UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown
- case "$UNAME_SYSTEM" in
- Linux|GNU|GNU/*)
-@@ -149,17 +150,15 @@
- 	#elif defined(__dietlibc__)
- 	LIBC=dietlibc
- 	#else
-+	#include <stdarg.h>
-+	#ifdef __DEFINED_va_list
-+	LIBC=musl
-+	#else
- 	LIBC=gnu
- 	#endif
-+	#endif
- 	EOF
--	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
--
--	# If ldd exists, use it to detect musl libc.
--	if command -v ldd >/dev/null && \
--		ldd --version 2>&1 | grep -q ^musl
--	then
--	    LIBC=musl
--	fi
-+	eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')"
- 	;;
- esac
-@@ -178,19 +177,20 @@
- 	# Note: NetBSD doesn't particularly care about the vendor
- 	# portion of the name.  We always set it to "unknown".
- 	sysctl="sysctl -n hw.machine_arch"
--	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-+	UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \
- 	    "/sbin/$sysctl" 2>/dev/null || \
- 	    "/usr/sbin/$sysctl" 2>/dev/null || \
--	    echo unknown)`
-+	    echo unknown))
- 	case "$UNAME_MACHINE_ARCH" in
-+	    aarch64eb) machine=aarch64_be-unknown ;;
- 	    armeb) machine=armeb-unknown ;;
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
- 	    sh5el) machine=sh5le-unknown ;;
- 	    earmv*)
--		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
--		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
-+		arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,')
-+		endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p')
- 		machine="${arch}${endian}"-unknown
- 		;;
- 	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
-@@ -221,7 +221,7 @@
- 	case "$UNAME_MACHINE_ARCH" in
- 	    earm*)
- 		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
--		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
-+		abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr")
- 		;;
- 	esac
- 	# The OS release
-@@ -234,7 +234,7 @@
- 		release='-gnu'
- 		;;
- 	    *)
--		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
-+		release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2)
- 		;;
- 	esac
- 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-@@ -243,15 +243,15 @@
- 	echo "$machine-${os}${release}${abi-}"
- 	exit ;;
-     *:Bitrig:*:*)
--	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+	UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//')
- 	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
- 	exit ;;
-     *:OpenBSD:*:*)
--	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//')
- 	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
- 	exit ;;
-     *:LibertyBSD:*:*)
--	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-+	UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//')
- 	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
- 	exit ;;
-     *:MidnightBSD:*:*)
-@@ -263,6 +263,9 @@
-     *:SolidBSD:*:*)
- 	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
- 	exit ;;
-+    *:OS108:*:*)
-+	echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
-+	exit ;;
-     macppc:MirBSD:*:*)
- 	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
- 	exit ;;
-@@ -272,26 +275,29 @@
-     *:Sortix:*:*)
- 	echo "$UNAME_MACHINE"-unknown-sortix
- 	exit ;;
-+    *:Twizzler:*:*)
-+	echo "$UNAME_MACHINE"-unknown-twizzler
-+	exit ;;
-     *:Redox:*:*)
- 	echo "$UNAME_MACHINE"-unknown-redox
- 	exit ;;
-     mips:OSF1:*.*)
--        echo mips-dec-osf1
--        exit ;;
-+	echo mips-dec-osf1
-+	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
--		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+		UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}')
- 		;;
- 	*5.*)
--		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}')
- 		;;
- 	esac
- 	# According to Compaq, /usr/sbin/psrinfo has been available on
- 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
- 	# covers most systems running today.  This code pipes the CPU
- 	# types through head -n 1, so we only detect the type of CPU 0.
--	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1)
- 	case "$ALPHA_CPU_TYPE" in
- 	    "EV4 (21064)")
- 		UNAME_MACHINE=alpha ;;
-@@ -329,7 +335,7 @@
- 	# A Tn.n version is a released field test version.
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
--	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
-+	echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)"
- 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
- 	exitcode=$?
- 	trap '' 0
-@@ -363,7 +369,7 @@
- 	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
--	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+	if test "$( (/bin/universe) 2>/dev/null)" = att ; then
- 		echo pyramid-pyramid-sysv3
- 	else
- 		echo pyramid-pyramid-bsd
-@@ -376,54 +382,59 @@
- 	echo sparc-icl-nx6
- 	exit ;;
-     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
--	case `/usr/bin/uname -p` in
-+	case $(/usr/bin/uname -p) in
- 	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     s390x:SunOS:*:*)
--	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-+	echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
- 	exit ;;
-     sun4H:SunOS:5.*:*)
--	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-+	echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- 	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
--	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-+	echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
- 	exit ;;
-     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- 	echo i386-pc-auroraux"$UNAME_RELEASE"
- 	exit ;;
-     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
--	UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
--	case `isainfo -b` in
--	    32)
--		echo i386-pc-solaris2"$UNAME_REL"
--		;;
--	    64)
--		echo x86_64-pc-solaris2"$UNAME_REL"
--		;;
--	esac
-+	set_cc_for_build
-+	SUN_ARCH=i386
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if test "$CC_FOR_BUILD" != no_compiler_found; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH=x86_64
-+	    fi
-+	fi
-+	echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- 	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
--	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-+	echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- 	exit ;;
-     sun4*:SunOS:*:*)
--	case "`/usr/bin/arch -k`" in
-+	case "$(/usr/bin/arch -k)" in
- 	    Series*|S4*)
--		UNAME_RELEASE=`uname -v`
-+		UNAME_RELEASE=$(uname -v)
- 		;;
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
--	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
-+	echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')"
- 	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos"$UNAME_RELEASE"
- 	exit ;;
-     sun*:*:4.2BSD:*)
--	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null)
- 	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
--	case "`/bin/arch`" in
-+	case "$(/bin/arch)" in
- 	    sun3)
- 		echo m68k-sun-sunos"$UNAME_RELEASE"
- 		;;
-@@ -503,8 +514,8 @@
- 	}
- EOF
- 	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
--	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
--	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
-+	  dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') &&
-+	  SYSTEM_NAME=$("$dummy" "$dummyarg") &&
- 	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos"$UNAME_RELEASE"
- 	exit ;;
-@@ -531,11 +542,11 @@
- 	exit ;;
-     AViiON:dgux:*:*)
- 	# DG/UX returns AViiON for all architectures
--	UNAME_PROCESSOR=`/usr/bin/uname -p`
--	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
-+	UNAME_PROCESSOR=$(/usr/bin/uname -p)
-+	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
- 	then
--	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
--	       [ "$TARGET_BINARY_INTERFACE"x = x ]
-+	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
-+	       test "$TARGET_BINARY_INTERFACE"x = x
- 	    then
- 		echo m88k-dg-dgux"$UNAME_RELEASE"
- 	    else
-@@ -559,17 +570,17 @@
- 	echo m68k-tektronix-bsd
- 	exit ;;
-     *:IRIX*:*:*)
--	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
-+	echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')"
- 	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- 	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
--	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-+	exit ;;               # Note that: echo "'$(uname -s)'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
- 	exit ;;
-     ia64:AIX:*:*)
--	if [ -x /usr/bin/oslevel ] ; then
--		IBM_REV=`/usr/bin/oslevel`
-+	if test -x /usr/bin/oslevel ; then
-+		IBM_REV=$(/usr/bin/oslevel)
- 	else
- 		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
- 	fi
-@@ -589,7 +600,7 @@
- 			exit(0);
- 			}
- EOF
--		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
-+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy")
- 		then
- 			echo "$SYSTEM_NAME"
- 		else
-@@ -602,15 +613,15 @@
- 	fi
- 	exit ;;
-     *:AIX:*:[4567])
--	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+	IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }')
- 	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
- 	else
- 		IBM_ARCH=powerpc
- 	fi
--	if [ -x /usr/bin/lslpp ] ; then
--		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
--			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
-+	if test -x /usr/bin/lslpp ; then
-+		IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc |
-+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/)
- 	else
- 		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
- 	fi
-@@ -638,14 +649,14 @@
- 	echo m68k-hp-bsd4.4
- 	exit ;;
-     9000/[34678]??:HP-UX:*:*)
--	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-+	HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
- 	case "$UNAME_MACHINE" in
- 	    9000/31?)            HP_ARCH=m68000 ;;
- 	    9000/[34]??)         HP_ARCH=m68k ;;
- 	    9000/[678][0-9][0-9])
--		if [ -x /usr/bin/getconf ]; then
--		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
--		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+		if test -x /usr/bin/getconf; then
-+		    sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null)
-+		    sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null)
- 		    case "$sc_cpu_version" in
- 		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
- 		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
-@@ -657,7 +668,7 @@
- 			esac ;;
- 		    esac
- 		fi
--		if [ "$HP_ARCH" = "" ]; then
-+		if test "$HP_ARCH" = ""; then
- 		    set_cc_for_build
- 		    sed 's/^		//' << EOF > "$dummy.c"
-@@ -692,11 +703,11 @@
- 		    exit (0);
- 		}
- EOF
--		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
-+		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy")
- 		    test -z "$HP_ARCH" && HP_ARCH=hppa
- 		fi ;;
- 	esac
--	if [ "$HP_ARCH" = hppa2.0w ]
-+	if test "$HP_ARCH" = hppa2.0w
- 	then
- 	    set_cc_for_build
-@@ -720,7 +731,7 @@
- 	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
- 	exit ;;
-     ia64:HP-UX:*:*)
--	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-+	HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
- 	echo ia64-hp-hpux"$HPUX_REV"
- 	exit ;;
-     3050*:HI-UX:*:*)
-@@ -750,7 +761,7 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
-+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") &&
- 		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
- 	exit ;;
-@@ -770,7 +781,7 @@
- 	echo hppa1.0-hp-osf
- 	exit ;;
-     i*86:OSF1:*:*)
--	if [ -x /usr/sbin/sysversion ] ; then
-+	if test -x /usr/sbin/sysversion ; then
- 	    echo "$UNAME_MACHINE"-unknown-osf1mk
- 	else
- 	    echo "$UNAME_MACHINE"-unknown-osf1
-@@ -819,14 +830,14 @@
- 	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- 	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
--	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
--	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
--	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
-+	FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
-+	FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///')
-+	FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/')
- 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- 	exit ;;
-     5000:UNIX_System_V:4.*:*)
--	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
--	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-+	FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///')
-+	FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/')
- 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- 	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-@@ -839,25 +850,25 @@
- 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
- 	exit ;;
-     arm:FreeBSD:*:*)
--	UNAME_PROCESSOR=`uname -p`
-+	UNAME_PROCESSOR=$(uname -p)
- 	set_cc_for_build
- 	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- 	    | grep -q __ARM_PCS_VFP
- 	then
--	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
-+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
- 	else
--	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
-+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
- 	fi
- 	exit ;;
-     *:FreeBSD:*:*)
--	UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	UNAME_PROCESSOR=$(/usr/bin/uname -p)
- 	case "$UNAME_PROCESSOR" in
- 	    amd64)
- 		UNAME_PROCESSOR=x86_64 ;;
- 	    i386)
- 		UNAME_PROCESSOR=i586 ;;
- 	esac
--	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-+	echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
- 	exit ;;
-     i*:CYGWIN*:*)
- 	echo "$UNAME_MACHINE"-pc-cygwin
-@@ -890,18 +901,18 @@
- 	echo "$UNAME_MACHINE"-pc-uwin
- 	exit ;;
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
--	echo x86_64-unknown-cygwin
-+	echo x86_64-pc-cygwin
- 	exit ;;
-     prep*:SunOS:5.*:*)
--	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-+	echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- 	exit ;;
-     *:GNU:*:*)
- 	# the GNU system
--	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
-+	echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
- 	exit ;;
-     *:GNU/*:*:*)
- 	# other systems with GNU libc and userland
--	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
-+	echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC"
- 	exit ;;
-     *:Minix:*:*)
- 	echo "$UNAME_MACHINE"-unknown-minix
-@@ -914,7 +925,7 @@
- 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     alpha:Linux:*:*)
--	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
- 	  EV56)  UNAME_MACHINE=alphaev56 ;;
- 	  PCA56) UNAME_MACHINE=alphapca56 ;;
-@@ -981,22 +992,50 @@
- 	exit ;;
-     mips:Linux:*:* | mips64:Linux:*:*)
- 	set_cc_for_build
-+	IS_GLIBC=0
-+	test x"${LIBC}" = xgnu && IS_GLIBC=1
- 	sed 's/^	//' << EOF > "$dummy.c"
- 	#undef CPU
--	#undef ${UNAME_MACHINE}
--	#undef ${UNAME_MACHINE}el
-+	#undef mips
-+	#undef mipsel
-+	#undef mips64
-+	#undef mips64el
-+	#if ${IS_GLIBC} && defined(_ABI64)
-+	LIBCABI=gnuabi64
-+	#else
-+	#if ${IS_GLIBC} && defined(_ABIN32)
-+	LIBCABI=gnuabin32
-+	#else
-+	LIBCABI=${LIBC}
-+	#endif
-+	#endif
-+
-+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-+	CPU=mipsisa64r6
-+	#else
-+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-+	CPU=mipsisa32r6
-+	#else
-+	#if defined(__mips64)
-+	CPU=mips64
-+	#else
-+	CPU=mips
-+	#endif
-+	#endif
-+	#endif
-+
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=${UNAME_MACHINE}el
-+	MIPS_ENDIAN=el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=${UNAME_MACHINE}
-+	MIPS_ENDIAN=
- 	#else
--	CPU=
-+	MIPS_ENDIAN=
- 	#endif
- 	#endif
- EOF
--	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
--	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
-+	eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')"
-+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
- 	;;
-     mips64el:Linux:*:*)
- 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-@@ -1015,7 +1054,7 @@
- 	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
--	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+	case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in
- 	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
- 	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
- 	  *)    echo hppa-unknown-linux-"$LIBC" ;;
-@@ -1055,7 +1094,17 @@
- 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-+	set_cc_for_build
-+	LIBCABI=$LIBC
-+	if test "$CC_FOR_BUILD" != no_compiler_found; then
-+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_X32 >/dev/null
-+	    then
-+		LIBCABI="$LIBC"x32
-+	    fi
-+	fi
-+	echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
- 	exit ;;
-     xtensa*:Linux:*:*)
- 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-@@ -1095,7 +1144,7 @@
- 	echo "$UNAME_MACHINE"-pc-msdosdjgpp
- 	exit ;;
-     i*86:*:4.*:*)
--	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
-+	UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//')
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- 		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
- 	else
-@@ -1104,19 +1153,19 @@
- 	exit ;;
-     i*86:*:5:[678]*)
- 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
--	case `/bin/uname -X | grep "^Machine"` in
-+	case $(/bin/uname -X | grep "^Machine") in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
--	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
-+	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
- 	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
--		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+		UNAME_REL=$(sed -n 's/.*Version //p' </usr/options/cb.name)
- 		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
- 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
--		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+		UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //'))
- 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
- 		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- 			&& UNAME_MACHINE=i586
-@@ -1166,7 +1215,7 @@
-     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
--	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	&& OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid)
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- 	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-@@ -1177,7 +1226,7 @@
-     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- 	OS_REL='.3'
- 	test -r /etc/.relid \
--	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	    && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid)
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- 	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-@@ -1210,7 +1259,7 @@
- 	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
--		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+		UNAME_MACHINE=$( (uname -p) 2>/dev/null)
- 		echo "$UNAME_MACHINE"-sni-sysv4
- 	else
- 		echo ns32k-sni-sysv
-@@ -1244,7 +1293,7 @@
- 	echo mips-sony-newsos6
- 	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
--	if [ -d /usr/nec ]; then
-+	if test -d /usr/nec; then
- 		echo mips-nec-sysv"$UNAME_RELEASE"
- 	else
- 		echo mips-unknown-sysv"$UNAME_RELEASE"
-@@ -1292,44 +1341,48 @@
-     *:Rhapsody:*:*)
- 	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
- 	exit ;;
-+    arm64:Darwin:*:*)
-+	echo aarch64-apple-darwin"$UNAME_RELEASE"
-+	exit ;;
-     *:Darwin:*:*)
--	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
--	set_cc_for_build
--	if test "$UNAME_PROCESSOR" = unknown ; then
--	    UNAME_PROCESSOR=powerpc
-+	UNAME_PROCESSOR=$(uname -p)
-+	case $UNAME_PROCESSOR in
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	if command -v xcode-select > /dev/null 2> /dev/null && \
-+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
-+	    # Avoid executing cc if there is no toolchain installed as
-+	    # cc will be a stub that puts up a graphical alert
-+	    # prompting the user to install developer tools.
-+	    CC_FOR_BUILD=no_compiler_found
-+	else
-+	    set_cc_for_build
- 	fi
--	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
--	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
--		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
--		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
--		       grep IS_64BIT_ARCH >/dev/null
--		then
--		    case $UNAME_PROCESSOR in
--			i386) UNAME_PROCESSOR=x86_64 ;;
--			powerpc) UNAME_PROCESSOR=powerpc64 ;;
--		    esac
--		fi
--		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
--		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
--		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
--		       grep IS_PPC >/dev/null
--		then
--		    UNAME_PROCESSOR=powerpc
--		fi
-+	if test "$CC_FOR_BUILD" != no_compiler_found; then
-+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		   grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		case $UNAME_PROCESSOR in
-+		    i386) UNAME_PROCESSOR=x86_64 ;;
-+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
-+		esac
-+	    fi
-+	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-+	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		   grep IS_PPC >/dev/null
-+	    then
-+		UNAME_PROCESSOR=powerpc
- 	    fi
- 	elif test "$UNAME_PROCESSOR" = i386 ; then
--	    # Avoid executing cc on OS X 10.9, as it ships with a stub
--	    # that puts up a graphical alert prompting to install
--	    # developer tools.  Any system running Mac OS X 10.7 or
--	    # later (Darwin 11 and later) is required to have a 64-bit
--	    # processor. This is not true of the ARM version of Darwin
--	    # that Apple uses in portable devices.
--	    UNAME_PROCESSOR=x86_64
-+	    # uname -m returns i386 or x86_64
-+	    UNAME_PROCESSOR=$UNAME_MACHINE
- 	fi
- 	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
- 	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
--	UNAME_PROCESSOR=`uname -p`
-+	UNAME_PROCESSOR=$(uname -p)
- 	if test "$UNAME_PROCESSOR" = x86; then
- 		UNAME_PROCESSOR=i386
- 		UNAME_MACHINE=pc
-@@ -1397,10 +1450,10 @@
- 	echo mips-sei-seiux"$UNAME_RELEASE"
- 	exit ;;
-     *:DragonFly:*:*)
--	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-+	echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
- 	exit ;;
-     *:*VMS:*:*)
--	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	UNAME_MACHINE=$( (uname -p) 2>/dev/null)
- 	case "$UNAME_MACHINE" in
- 	    A*) echo alpha-dec-vms ; exit ;;
- 	    I*) echo ia64-dec-vms ; exit ;;
-@@ -1410,7 +1463,7 @@
- 	echo i386-pc-xenix
- 	exit ;;
-     i*86:skyos:*:*)
--	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
-+	echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')"
- 	exit ;;
-     i*86:rdos:*:*)
- 	echo "$UNAME_MACHINE"-pc-rdos
-@@ -1424,8 +1477,148 @@
-     amd64:Isilon\ OneFS:*:*)
- 	echo x86_64-unknown-onefs
- 	exit ;;
-+    *:Unleashed:*:*)
-+	echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
-+	exit ;;
- esac
-+# No uname command or uname output not recognized.
-+set_cc_for_build
-+cat > "$dummy.c" <<EOF
-+#ifdef _SEQUENT_
-+#include <sys/types.h>
-+#include <sys/utsname.h>
-+#endif
-+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-+#include <signal.h>
-+#if defined(_SIZE_T_) || defined(SIGLOST)
-+#include <sys/utsname.h>
-+#endif
-+#endif
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-+     I don't know....  */
-+  printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+  printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+  "4"
-+#else
-+  ""
-+#endif
-+  ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+  int version;
-+  version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null);
-+  if (version < 4)
-+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  else
-+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+  exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+  printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+  printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+  printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+  printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+  printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+  printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+  struct utsname un;
-+
-+  uname(&un);
-+  if (strncmp(un.version, "V2", 2) == 0) {
-+    printf ("i386-sequent-ptx2\n"); exit (0);
-+  }
-+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+    printf ("i386-sequent-ptx1\n"); exit (0);
-+  }
-+  printf ("i386-sequent-ptx\n"); exit (0);
-+#endif
-+
-+#if defined (vax)
-+#if !defined (ultrix)
-+#include <sys/param.h>
-+#if defined (BSD)
-+#if BSD == 43
-+  printf ("vax-dec-bsd4.3\n"); exit (0);
-+#else
-+#if BSD == 199006
-+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+#else
-+  printf ("vax-dec-bsd\n"); exit (0);
-+#endif
-+#endif
-+#else
-+  printf ("vax-dec-bsd\n"); exit (0);
-+#endif
-+#else
-+#if defined(_SIZE_T_) || defined(SIGLOST)
-+  struct utsname un;
-+  uname (&un);
-+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
-+#else
-+  printf ("vax-dec-ultrix\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-+#if defined(_SIZE_T_) || defined(SIGLOST)
-+  struct utsname *un;
-+  uname (&un);
-+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
-+#else
-+  printf ("mips-dec-ultrix\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+  printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+  exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) &&
-+	{ echo "$SYSTEM_NAME"; exit; }
-+
-+# Apollos put the system type in the environment.
-+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
-+
- echo "$0: unable to guess system type" >&2
- case "$UNAME_MACHINE:$UNAME_SYSTEM" in
-@@ -1448,6 +1641,12 @@
-   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
- and
-   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-+EOF
-+
-+year=$(echo $timestamp | sed 's,-.*,,')
-+# shellcheck disable=SC2003
-+if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then
-+   cat >&2 <<EOF
- If $0 has already been updated, send the following data and any
- information you think might be pertinent to config-patches@gnu.org to
-@@ -1455,26 +1654,27 @@
- config.guess timestamp = $timestamp
--uname -m = `(uname -m) 2>/dev/null || echo unknown`
--uname -r = `(uname -r) 2>/dev/null || echo unknown`
--uname -s = `(uname -s) 2>/dev/null || echo unknown`
--uname -v = `(uname -v) 2>/dev/null || echo unknown`
--
--/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
--/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
--
--hostinfo               = `(hostinfo) 2>/dev/null`
--/bin/universe          = `(/bin/universe) 2>/dev/null`
--/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
--/bin/arch              = `(/bin/arch) 2>/dev/null`
--/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
--/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+uname -m = $( (uname -m) 2>/dev/null || echo unknown)
-+uname -r = $( (uname -r) 2>/dev/null || echo unknown)
-+uname -s = $( (uname -s) 2>/dev/null || echo unknown)
-+uname -v = $( (uname -v) 2>/dev/null || echo unknown)
-+
-+/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null)
-+/bin/uname -X     = $( (/bin/uname -X) 2>/dev/null)
-+
-+hostinfo               = $( (hostinfo) 2>/dev/null)
-+/bin/universe          = $( (/bin/universe) 2>/dev/null)
-+/usr/bin/arch -k       = $( (/usr/bin/arch -k) 2>/dev/null)
-+/bin/arch              = $( (/bin/arch) 2>/dev/null)
-+/usr/bin/oslevel       = $( (/usr/bin/oslevel) 2>/dev/null)
-+/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null)
- UNAME_MACHINE = "$UNAME_MACHINE"
- UNAME_RELEASE = "$UNAME_RELEASE"
- UNAME_SYSTEM  = "$UNAME_SYSTEM"
- UNAME_VERSION = "$UNAME_VERSION"
- EOF
-+fi
- exit 1
+-# eval: (add-hook 'write-file-functions 'time-stamp)
++# eval: (add-hook 'before-save-hook 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"