Updated xbitmaps to 1.1.2

Makefile

 all:
-	tar xf xbitmaps-1.1.1.tar.bz2
-	patch -Np1 -d xbitmaps-1.1.1 < xbitmaps-1.1.1-aarch64.patch
-	cd xbitmaps-1.1.1 && ./configure $(XORG_FOLDERS)
-	$(MAKE) -C xbitmaps-1.1.1
-	$(MAKE) -C xbitmaps-1.1.1 install
-	rm -rf xbitmaps-1.1.1
+	tar xf xbitmaps-1.1.2.tar.bz2
+	cd xbitmaps-1.1.2 && ./configure $(XORG_FOLDERS)
+	$(MAKE) -C xbitmaps-1.1.2
+	$(MAKE) -C xbitmaps-1.1.2 install
+	rm -rf xbitmaps-1.1.2

xbitmaps-1.1.1-aarch64.patch

-diff -uNr xbitmaps-1.1.1/config.guess xbitmaps-1.1.1-aarch64/config.guess
---- xbitmaps-1.1.1/config.guess	2010-12-09 06:26:17.000000000 +0000
-+++ xbitmaps-1.1.1-aarch64/config.guess	2018-03-18 03:08:56.615307609 +0000
-@@ -1,14 +1,12 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--#   Free Software Foundation, Inc.
-+#   Copyright 1992-2018 Free Software Foundation, Inc.
- 
--timestamp='2010-08-21'
-+timestamp='2018-03-08'
- 
- # 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
--# the Free Software Foundation; either version 2 of the License, or
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful, but
-@@ -17,26 +15,22 @@
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <https://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--
--# Originally written by Per Bothner.  Please send patches (context
--# diff format) to <config-patches@gnu.org> and include a ChangeLog
--# entry.
-+# the same distribution terms that you use for the rest of that
-+# program.  This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
- #
--# This script attempts to guess a canonical system name similar to
--# config.sub.  If it succeeds, it prints the system name on stdout, and
--# exits with 0.  Otherwise, it exits with 1.
-+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
- #
- # You can get the latest version of this script from:
--# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-+#
-+# Please send patches to <config-patches@gnu.org>.
-+
- 
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
-@@ -45,7 +39,7 @@
- 
- Output the configuration name of the system \`$me' is run on.
- 
--Operation modes:
-+Options:
-   -h, --help         print this help, then exit
-   -t, --time-stamp   print date of last modification, then exit
-   -v, --version      print version number, then exit
-@@ -56,9 +50,7 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
--Software Foundation, Inc.
-+Copyright 1992-2018 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."
-@@ -92,7 +84,7 @@
-   exit 1
- fi
- 
--trap 'exit 1' HUP INT TERM
-+trap 'exit 1' 1 2 15
- 
- # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
- # compiler to aid in system detection is discouraged as it requires
-@@ -106,7 +98,7 @@
- 
- set_cc_for_build='
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
--trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/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) ; } ||
-@@ -115,9 +107,9 @@
- dummy=$tmp/dummy ;
- tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
- case $CC_FOR_BUILD,$HOST_CC,$CC in
-- ,,)    echo "int x;" > $dummy.c ;
-+ ,,)    echo "int x;" > "$dummy.c" ;
- 	for c in cc gcc c89 c99 ; do
--	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
- 	     CC_FOR_BUILD="$c"; break ;
- 	  fi ;
- 	done ;
-@@ -140,12 +132,40 @@
- 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/*)
-+	# If the system lacks a compiler, then just pick glibc.
-+	# We could probably try harder.
-+	LIBC=gnu
-+
-+	eval "$set_cc_for_build"
-+	cat <<-EOF > "$dummy.c"
-+	#include <features.h>
-+	#if defined(__UCLIBC__)
-+	LIBC=uclibc
-+	#elif defined(__dietlibc__)
-+	LIBC=dietlibc
-+	#else
-+	LIBC=gnu
-+	#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
-+	;;
-+esac
-+
- # Note: order is significant - the case branches are not exclusive.
- 
--case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
-     *:NetBSD:*:*)
- 	# NetBSD (nbsd) targets should (where applicable) match one or
--	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
- 	# switched to ELF, *-*-netbsd* would select the old
- 	# object file format.  This provides both forward
-@@ -155,21 +175,31 @@
- 	# 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=`(/sbin/$sysctl 2>/dev/null || \
--	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
--	case "${UNAME_MACHINE_ARCH}" in
-+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-+	    "/sbin/$sysctl" 2>/dev/null || \
-+	    "/usr/sbin/$sysctl" 2>/dev/null || \
-+	    echo unknown)`
-+	case "$UNAME_MACHINE_ARCH" in
- 	    armeb) machine=armeb-unknown ;;
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
- 	    sh5el) machine=sh5le-unknown ;;
--	    *) machine=${UNAME_MACHINE_ARCH}-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'`
-+		machine="${arch}${endian}"-unknown
-+		;;
-+	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
--	# to ELF recently, or will in the future.
--	case "${UNAME_MACHINE_ARCH}" in
-+	# to ELF recently (or will in the future) and ABI.
-+	case "$UNAME_MACHINE_ARCH" in
-+	    earm*)
-+		os=netbsdelf
-+		;;
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
--		eval $set_cc_for_build
-+		eval "$set_cc_for_build"
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- 			| grep -q __ELF__
- 		then
-@@ -181,7 +211,14 @@
- 		fi
- 		;;
- 	    *)
--	        os=netbsd
-+		os=netbsd
-+		;;
-+	esac
-+	# Determine ABI tags.
-+	case "$UNAME_MACHINE_ARCH" in
-+	    earm*)
-+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
- 		;;
- 	esac
- 	# The OS release
-@@ -189,42 +226,62 @@
- 	# thus, need a distinct triplet. However, they do not need
- 	# kernel version information, so it can be replaced with a
- 	# suitable tag, in the style of linux-gnu.
--	case "${UNAME_VERSION}" in
-+	case "$UNAME_VERSION" in
- 	    Debian*)
- 		release='-gnu'
- 		;;
- 	    *)
--		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
- 		;;
- 	esac
- 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
--	echo "${machine}-${os}${release}"
-+	echo "$machine-${os}${release}${abi}"
-+	exit ;;
-+    *: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.//'`
--	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-+	exit ;;
-+    *:LibertyBSD:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-+	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
-+	exit ;;
-+    *:MidnightBSD:*:*)
-+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
- 	exit ;;
-     *:ekkoBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
- 	exit ;;
-     *:SolidBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
- 	exit ;;
-     macppc:MirBSD:*:*)
--	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
- 	exit ;;
-     *:MirBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-+	exit ;;
-+    *:Sortix:*:*)
-+	echo "$UNAME_MACHINE"-unknown-sortix
- 	exit ;;
-+    *:Redox:*:*)
-+	echo "$UNAME_MACHINE"-unknown-redox
-+	exit ;;
-+    mips:OSF1:*.*)
-+        echo mips-dec-osf1
-+        exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
- 		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
-@@ -234,60 +291,54 @@
- 	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" ;;
-+		UNAME_MACHINE=alpha ;;
- 	    "EV4.5 (21064)")
--		UNAME_MACHINE="alpha" ;;
-+		UNAME_MACHINE=alpha ;;
- 	    "LCA4 (21066/21068)")
--		UNAME_MACHINE="alpha" ;;
-+		UNAME_MACHINE=alpha ;;
- 	    "EV5 (21164)")
--		UNAME_MACHINE="alphaev5" ;;
-+		UNAME_MACHINE=alphaev5 ;;
- 	    "EV5.6 (21164A)")
--		UNAME_MACHINE="alphaev56" ;;
-+		UNAME_MACHINE=alphaev56 ;;
- 	    "EV5.6 (21164PC)")
--		UNAME_MACHINE="alphapca56" ;;
-+		UNAME_MACHINE=alphapca56 ;;
- 	    "EV5.7 (21164PC)")
--		UNAME_MACHINE="alphapca57" ;;
-+		UNAME_MACHINE=alphapca57 ;;
- 	    "EV6 (21264)")
--		UNAME_MACHINE="alphaev6" ;;
-+		UNAME_MACHINE=alphaev6 ;;
- 	    "EV6.7 (21264A)")
--		UNAME_MACHINE="alphaev67" ;;
-+		UNAME_MACHINE=alphaev67 ;;
- 	    "EV6.8CB (21264C)")
--		UNAME_MACHINE="alphaev68" ;;
-+		UNAME_MACHINE=alphaev68 ;;
- 	    "EV6.8AL (21264B)")
--		UNAME_MACHINE="alphaev68" ;;
-+		UNAME_MACHINE=alphaev68 ;;
- 	    "EV6.8CX (21264D)")
--		UNAME_MACHINE="alphaev68" ;;
-+		UNAME_MACHINE=alphaev68 ;;
- 	    "EV6.9A (21264/EV69A)")
--		UNAME_MACHINE="alphaev69" ;;
-+		UNAME_MACHINE=alphaev69 ;;
- 	    "EV7 (21364)")
--		UNAME_MACHINE="alphaev7" ;;
-+		UNAME_MACHINE=alphaev7 ;;
- 	    "EV7.9 (21364A)")
--		UNAME_MACHINE="alphaev79" ;;
-+		UNAME_MACHINE=alphaev79 ;;
- 	esac
- 	# A Pn.n version is a patched version.
- 	# A Vn.n version is a released version.
- 	# 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'`
--	exit ;;
--    Alpha\ *:Windows_NT*:*)
--	# How do we know it's Interix rather than the generic POSIX subsystem?
--	# Should we change UNAME_MACHINE based on the output of uname instead
--	# of the specific Alpha model?
--	echo alpha-pc-interix
--	exit ;;
--    21064:Windows_NT:50:3)
--	echo alpha-dec-winnt3.5
--	exit ;;
-+	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
-+	exit $exitcode ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
- 	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
--	echo ${UNAME_MACHINE}-unknown-amigaos
-+	echo "$UNAME_MACHINE"-unknown-amigaos
- 	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
--	echo ${UNAME_MACHINE}-unknown-morphos
-+	echo "$UNAME_MACHINE"-unknown-morphos
- 	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
-@@ -296,12 +347,12 @@
- 	echo s390-ibm-zvmoe
- 	exit ;;
-     *:OS400:*:*)
--        echo powerpc-ibm-os400
-+	echo powerpc-ibm-os400
- 	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
--	echo arm-acorn-riscix${UNAME_RELEASE}
-+	echo arm-acorn-riscix"$UNAME_RELEASE"
- 	exit ;;
--    arm:riscos:*:*|arm:RISCOS:*:*)
-+    arm*:riscos:*:*|arm*:RISCOS:*:*)
- 	echo arm-unknown-riscos
- 	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -326,38 +377,38 @@
- 	    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}
-+	echo i386-pc-auroraux"$UNAME_RELEASE"
- 	exit ;;
-     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
--	eval $set_cc_for_build
--	SUN_ARCH="i386"
-+	eval "$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 [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	if [ "$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) | \
-+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- 		grep IS_64BIT_ARCH >/dev/null
- 	    then
--		SUN_ARCH="x86_64"
-+		SUN_ARCH=x86_64
- 	    fi
- 	fi
--	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	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
-@@ -366,25 +417,25 @@
- 		;;
- 	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}
-+	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`
--	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
- 	case "`/bin/arch`" in
- 	    sun3)
--		echo m68k-sun-sunos${UNAME_RELEASE}
-+		echo m68k-sun-sunos"$UNAME_RELEASE"
- 		;;
- 	    sun4)
--		echo sparc-sun-sunos${UNAME_RELEASE}
-+		echo sparc-sun-sunos"$UNAME_RELEASE"
- 		;;
- 	esac
- 	exit ;;
-     aushp:SunOS:*:*)
--	echo sparc-auspex-sunos${UNAME_RELEASE}
-+	echo sparc-auspex-sunos"$UNAME_RELEASE"
- 	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-@@ -395,44 +446,44 @@
-     # MiNT.  But MiNT is downward compatible to TOS, so this should
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
-+	echo m68k-atari-mint"$UNAME_RELEASE"
- 	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
--	echo m68k-atari-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-atari-mint"$UNAME_RELEASE"
-+	exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
-+	echo m68k-atari-mint"$UNAME_RELEASE"
- 	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
--        echo m68k-milan-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-milan-mint"$UNAME_RELEASE"
-+	exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
--        echo m68k-hades-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-hades-mint"$UNAME_RELEASE"
-+	exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
--        echo m68k-unknown-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-unknown-mint"$UNAME_RELEASE"
-+	exit ;;
-     m68k:machten:*:*)
--	echo m68k-apple-machten${UNAME_RELEASE}
-+	echo m68k-apple-machten"$UNAME_RELEASE"
- 	exit ;;
-     powerpc:machten:*:*)
--	echo powerpc-apple-machten${UNAME_RELEASE}
-+	echo powerpc-apple-machten"$UNAME_RELEASE"
- 	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
- 	exit ;;
-     RISC*:ULTRIX:*:*)
--	echo mips-dec-ultrix${UNAME_RELEASE}
-+	echo mips-dec-ultrix"$UNAME_RELEASE"
- 	exit ;;
-     VAX*:ULTRIX*:*:*)
--	echo vax-dec-ultrix${UNAME_RELEASE}
-+	echo vax-dec-ultrix"$UNAME_RELEASE"
- 	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
--	echo clipper-intergraph-clix${UNAME_RELEASE}
-+	echo clipper-intergraph-clix"$UNAME_RELEASE"
- 	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
-+	eval "$set_cc_for_build"
-+	sed 's/^	//' << EOF > "$dummy.c"
- #ifdef __cplusplus
- #include <stdio.h>  /* for printf() prototype */
- 	int main (int argc, char *argv[]) {
-@@ -441,23 +492,23 @@
- #endif
- 	#if defined (host_mips) && defined (MIPSEB)
- 	#if defined (SYSTYPE_SYSV)
--	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
- 	#endif
- 	#if defined (SYSTYPE_SVR4)
--	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
- 	#endif
- 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
--	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
- 	#endif
- 	#endif
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c &&
--	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
--	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
-+	  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}
-+	echo mips-mips-riscos"$UNAME_RELEASE"
- 	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
-@@ -481,21 +532,21 @@
- 	echo m88k-motorola-sysv3
- 	exit ;;
-     AViiON:dgux:*:*)
--        # DG/UX returns AViiON for all architectures
--        UNAME_PROCESSOR=`/usr/bin/uname -p`
--	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+	# DG/UX returns AViiON for all architectures
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
- 	then
--	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
--	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-+	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
-+	       [ "$TARGET_BINARY_INTERFACE"x = x ]
- 	    then
--		echo m88k-dg-dgux${UNAME_RELEASE}
-+		echo m88k-dg-dgux"$UNAME_RELEASE"
- 	    else
--		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
- 	    fi
- 	else
--	    echo i586-dg-dgux${UNAME_RELEASE}
-+	    echo i586-dg-dgux"$UNAME_RELEASE"
- 	fi
-- 	exit ;;
-+	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
- 	exit ;;
-@@ -510,7 +561,7 @@
- 	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
-@@ -522,14 +573,14 @@
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
- 	else
--		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
- 	fi
--	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
- 	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
--		eval $set_cc_for_build
--		sed 's/^		//' << EOF >$dummy.c
-+		eval "$set_cc_for_build"
-+		sed 's/^		//' << EOF > "$dummy.c"
- 		#include <sys/systemcfg.h>
- 
- 		main()
-@@ -540,7 +591,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
-@@ -554,26 +605,27 @@
- 	exit ;;
-     *:AIX:*:[4567])
- 	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
-+	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/oslevel ] ; then
--		IBM_REV=`/usr/bin/oslevel`
-+	if [ -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}
-+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
- 	fi
--	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
- 	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
- 	exit ;;
--    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
- 	echo romp-ibm-bsd4.4
- 	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
--	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-+	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
- 	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
-@@ -588,67 +640,67 @@
- 	echo m68k-hp-bsd4.4
- 	exit ;;
-     9000/[34678]??:HP-UX:*:*)
--	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
--	case "${UNAME_MACHINE}" in
--	    9000/31? )            HP_ARCH=m68000 ;;
--	    9000/[34]?? )         HP_ARCH=m68k ;;
-+	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`
--                    case "${sc_cpu_version}" in
--                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
--                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
--                      532)                      # CPU_PA_RISC2_0
--                        case "${sc_kernel_bits}" in
--                          32) HP_ARCH="hppa2.0n" ;;
--                          64) HP_ARCH="hppa2.0w" ;;
--			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
--                        esac ;;
--                    esac
-+		    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
-+		      532)                      # CPU_PA_RISC2_0
-+			case "$sc_kernel_bits" in
-+			  32) HP_ARCH=hppa2.0n ;;
-+			  64) HP_ARCH=hppa2.0w ;;
-+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
-+			esac ;;
-+		    esac
- 		fi
--		if [ "${HP_ARCH}" = "" ]; then
--		    eval $set_cc_for_build
--		    sed 's/^              //' << EOF >$dummy.c
--
--              #define _HPUX_SOURCE
--              #include <stdlib.h>
--              #include <unistd.h>
--
--              int main ()
--              {
--              #if defined(_SC_KERNEL_BITS)
--                  long bits = sysconf(_SC_KERNEL_BITS);
--              #endif
--                  long cpu  = sysconf (_SC_CPU_VERSION);
--
--                  switch (cpu)
--              	{
--              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
--              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
--              	case CPU_PA_RISC2_0:
--              #if defined(_SC_KERNEL_BITS)
--              	    switch (bits)
--              		{
--              		case 64: puts ("hppa2.0w"); break;
--              		case 32: puts ("hppa2.0n"); break;
--              		default: puts ("hppa2.0"); break;
--              		} break;
--              #else  /* !defined(_SC_KERNEL_BITS) */
--              	    puts ("hppa2.0"); break;
--              #endif
--              	default: puts ("hppa1.0"); break;
--              	}
--                  exit (0);
--              }
-+		if [ "$HP_ARCH" = "" ]; then
-+		    eval "$set_cc_for_build"
-+		    sed 's/^		//' << EOF > "$dummy.c"
-+
-+		#define _HPUX_SOURCE
-+		#include <stdlib.h>
-+		#include <unistd.h>
-+
-+		int main ()
-+		{
-+		#if defined(_SC_KERNEL_BITS)
-+		    long bits = sysconf(_SC_KERNEL_BITS);
-+		#endif
-+		    long cpu  = sysconf (_SC_CPU_VERSION);
-+
-+		    switch (cpu)
-+			{
-+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+			case CPU_PA_RISC2_0:
-+		#if defined(_SC_KERNEL_BITS)
-+			    switch (bits)
-+				{
-+				case 64: puts ("hppa2.0w"); break;
-+				case 32: puts ("hppa2.0n"); break;
-+				default: puts ("hppa2.0"); break;
-+				} break;
-+		#else  /* !defined(_SC_KERNEL_BITS) */
-+			    puts ("hppa2.0"); break;
-+		#endif
-+			default: puts ("hppa1.0"); break;
-+			}
-+		    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 [ "$HP_ARCH" = hppa2.0w ]
- 	then
--	    eval $set_cc_for_build
-+	    eval "$set_cc_for_build"
- 
- 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
- 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-@@ -659,23 +711,23 @@
- 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
- 	    # => hppa64-hp-hpux11.23
- 
--	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
- 		grep -q __LP64__
- 	    then
--		HP_ARCH="hppa2.0w"
-+		HP_ARCH=hppa2.0w
- 	    else
--		HP_ARCH="hppa64"
-+		HP_ARCH=hppa64
- 	    fi
- 	fi
--	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
- 	exit ;;
-     ia64:HP-UX:*:*)
--	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
--	echo ia64-hp-hpux${HPUX_REV}
-+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-+	echo ia64-hp-hpux"$HPUX_REV"
- 	exit ;;
-     3050*:HI-UX:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
-+	eval "$set_cc_for_build"
-+	sed 's/^	//' << EOF > "$dummy.c"
- 	#include <unistd.h>
- 	int
- 	main ()
-@@ -700,11 +752,11 @@
- 	  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 ;;
--    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
- 	echo hppa1.1-hp-bsd
- 	exit ;;
-     9000/8??:4.3bsd:*:*)
-@@ -713,7 +765,7 @@
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
- 	exit ;;
--    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
- 	echo hppa1.1-hp-osf
- 	exit ;;
-     hp8??:OSF1:*:*)
-@@ -721,9 +773,9 @@
- 	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
--	    echo ${UNAME_MACHINE}-unknown-osf1mk
-+	    echo "$UNAME_MACHINE"-unknown-osf1mk
- 	else
--	    echo ${UNAME_MACHINE}-unknown-osf1
-+	    echo "$UNAME_MACHINE"-unknown-osf1
- 	fi
- 	exit ;;
-     parisc*:Lites*:*:*)
-@@ -731,132 +783,126 @@
- 	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit ;;
-+	exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit ;;
-+	exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit ;;
-+	exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit ;;
-+	exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit ;;
-+	exit ;;
-     CRAY*Y-MP:*:*:*)
--	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- 	exit ;;
-     CRAY*[A-Z]90:*:*:*)
--	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
- 	exit ;;
-     CRAY*TS:*:*:*)
--	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- 	exit ;;
-     CRAY*T3E:*:*:*)
--	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- 	exit ;;
-     CRAY*SV1:*:*:*)
--	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- 	exit ;;
-     *:UNICOS/mp:*:*)
--	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	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/ /_/'`
--        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit ;;
-+	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/ /_/'`
--        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	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:*:*)
--	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
- 	exit ;;
-     sparc*:BSD/OS:*:*)
--	echo sparc-unknown-bsdi${UNAME_RELEASE}
-+	echo sparc-unknown-bsdi"$UNAME_RELEASE"
- 	exit ;;
-     *:BSD/OS:*:*)
--	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
- 	exit ;;
-     *:FreeBSD:*:*)
--	case ${UNAME_MACHINE} in
--	    pc98)
--		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	case "$UNAME_PROCESSOR" in
- 	    amd64)
--		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
--	    *)
--		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+		UNAME_PROCESSOR=x86_64 ;;
-+	    i386)
-+		UNAME_PROCESSOR=i586 ;;
- 	esac
-+	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
- 	exit ;;
-     i*:CYGWIN*:*)
--	echo ${UNAME_MACHINE}-pc-cygwin
-+	echo "$UNAME_MACHINE"-pc-cygwin
-+	exit ;;
-+    *:MINGW64*:*)
-+	echo "$UNAME_MACHINE"-pc-mingw64
- 	exit ;;
-     *:MINGW*:*)
--	echo ${UNAME_MACHINE}-pc-mingw32
-+	echo "$UNAME_MACHINE"-pc-mingw32
- 	exit ;;
--    i*:windows32*:*)
--    	# uname -m includes "-pc" on this system.
--    	echo ${UNAME_MACHINE}-mingw32
-+    *:MSYS*:*)
-+	echo "$UNAME_MACHINE"-pc-msys
- 	exit ;;
-     i*:PW*:*)
--	echo ${UNAME_MACHINE}-pc-pw32
-+	echo "$UNAME_MACHINE"-pc-pw32
- 	exit ;;
-     *:Interix*:*)
--    	case ${UNAME_MACHINE} in
-+	case "$UNAME_MACHINE" in
- 	    x86)
--		echo i586-pc-interix${UNAME_RELEASE}
-+		echo i586-pc-interix"$UNAME_RELEASE"
- 		exit ;;
- 	    authenticamd | genuineintel | EM64T)
--		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		echo x86_64-unknown-interix"$UNAME_RELEASE"
- 		exit ;;
- 	    IA64)
--		echo ia64-unknown-interix${UNAME_RELEASE}
-+		echo ia64-unknown-interix"$UNAME_RELEASE"
- 		exit ;;
- 	esac ;;
--    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
--	echo i${UNAME_MACHINE}-pc-mks
--	exit ;;
--    8664:Windows_NT:*)
--	echo x86_64-pc-mks
--	exit ;;
--    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
--	# How do we know it's Interix rather than the generic POSIX subsystem?
--	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
--	# UNAME_MACHINE based on the output of uname instead of i386?
--	echo i586-pc-interix
--	exit ;;
-     i*:UWIN*:*)
--	echo ${UNAME_MACHINE}-pc-uwin
-+	echo "$UNAME_MACHINE"-pc-uwin
- 	exit ;;
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
--    p*:CYGWIN*:*)
--	echo powerpcle-unknown-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-gnu`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 '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
- 	exit ;;
-     i*86:Minix:*:*)
--	echo ${UNAME_MACHINE}-pc-minix
-+	echo "$UNAME_MACHINE"-pc-minix
-+	exit ;;
-+    aarch64:Linux:*:*)
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	exit ;;
-+    aarch64_be:Linux:*:*)
-+	UNAME_MACHINE=aarch64_be
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -867,56 +913,66 @@
- 	  EV6)   UNAME_MACHINE=alphaev6 ;;
- 	  EV67)  UNAME_MACHINE=alphaev67 ;;
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
-+	esac
- 	objdump --private-headers /bin/sh | grep -q ld.so.1
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	exit ;;
-+    arc:Linux:*:* | arceb:Linux:*:*)
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     arm*:Linux:*:*)
--	eval $set_cc_for_build
-+	eval "$set_cc_for_build"
- 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- 	    | grep -q __ARM_EABI__
- 	then
--	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	else
--	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+		| grep -q __ARM_PCS_VFP
-+	    then
-+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
-+	    else
-+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
-+	    fi
- 	fi
- 	exit ;;
-     avr32*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     cris:Linux:*:*)
--	echo cris-axis-linux-gnu
-+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
- 	exit ;;
-     crisv32:Linux:*:*)
--	echo crisv32-axis-linux-gnu
-+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-+	exit ;;
-+    e2k:Linux:*:*)
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     frv:Linux:*:*)
--    	echo frv-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	exit ;;
-+    hexagon:Linux:*:*)
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     i*86:Linux:*:*)
--	LIBC=gnu
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#ifdef __dietlibc__
--	LIBC=dietlibc
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
--	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
- 	exit ;;
-     ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	exit ;;
-+    k1om:Linux:*:*)
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     m32r*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     mips:Linux:*:* | mips64:Linux:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
-+	eval "$set_cc_for_build"
-+	sed 's/^	//' << EOF > "$dummy.c"
- 	#undef CPU
- 	#undef ${UNAME_MACHINE}
- 	#undef ${UNAME_MACHINE}el
-@@ -930,55 +986,70 @@
- 	#endif
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-+	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
- 	;;
--    or32:Linux:*:*)
--	echo or32-unknown-linux-gnu
-+    mips64el:Linux:*:*)
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	exit ;;
-+    openrisc*:Linux:*:*)
-+	echo or1k-unknown-linux-"$LIBC"
-+	exit ;;
-+    or32:Linux:*:* | or1k*:Linux:*:*)
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     padre:Linux:*:*)
--	echo sparc-unknown-linux-gnu
-+	echo sparc-unknown-linux-"$LIBC"
- 	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+	echo hppa64-unknown-linux-"$LIBC"
- 	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
--	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
--	  *)    echo hppa-unknown-linux-gnu ;;
-+	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
-+	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
-+	  *)    echo hppa-unknown-linux-"$LIBC" ;;
- 	esac
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-unknown-linux-"$LIBC"
- 	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-unknown-linux-"$LIBC"
-+	exit ;;
-+    ppc64le:Linux:*:*)
-+	echo powerpc64le-unknown-linux-"$LIBC"
-+	exit ;;
-+    ppcle:Linux:*:*)
-+	echo powerpcle-unknown-linux-"$LIBC"
-+	exit ;;
-+    riscv32:Linux:*:* | riscv64:Linux:*:*)
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
--	echo ${UNAME_MACHINE}-ibm-linux
-+	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
- 	exit ;;
-     sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     tile*:Linux:*:*)
--	echo ${UNAME_MACHINE}-tilera-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     vax:Linux:*:*)
--	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo x86_64-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
- 	exit ;;
-     xtensa*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -987,54 +1058,54 @@
- 	echo i386-sequent-sysv4
- 	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
--        # Unixware is an offshoot of SVR4, but it has its own version
--        # number series starting with 2...
--        # I am not positive that other SVR4 systems won't match this,
-+	# Unixware is an offshoot of SVR4, but it has its own version
-+	# number series starting with 2...
-+	# I am not positive that other SVR4 systems won't match this,
- 	# I just have to hope.  -- rms.
--        # Use sysv4.2uw... so that sysv4* matches it.
--	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+	# Use sysv4.2uw... so that sysv4* matches it.
-+	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
- 	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
--	echo ${UNAME_MACHINE}-pc-os2-emx
-+	echo "$UNAME_MACHINE"-pc-os2-emx
- 	exit ;;
-     i*86:XTS-300:*:STOP)
--	echo ${UNAME_MACHINE}-unknown-stop
-+	echo "$UNAME_MACHINE"-unknown-stop
- 	exit ;;
-     i*86:atheos:*:*)
--	echo ${UNAME_MACHINE}-unknown-atheos
-+	echo "$UNAME_MACHINE"-unknown-atheos
- 	exit ;;
-     i*86:syllable:*:*)
--	echo ${UNAME_MACHINE}-pc-syllable
-+	echo "$UNAME_MACHINE"-pc-syllable
- 	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
--	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	echo i386-unknown-lynxos"$UNAME_RELEASE"
- 	exit ;;
-     i*86:*DOS:*:*)
--	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	echo "$UNAME_MACHINE"-pc-msdosdjgpp
- 	exit ;;
--    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
--	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+    i*86:*:4.*:*)
-+	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}
-+		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
- 	else
--		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
- 	fi
- 	exit ;;
-     i*86:*:5:[678]*)
--    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	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`
--		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+		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/.*= //')`
- 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-@@ -1044,20 +1115,20 @@
- 			&& UNAME_MACHINE=i686
- 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- 			&& UNAME_MACHINE=i686
--		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
- 	else
--		echo ${UNAME_MACHINE}-pc-sysv32
-+		echo "$UNAME_MACHINE"-pc-sysv32
- 	fi
- 	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
--        # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i586.
-+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-+	# the processor, so we play safe by assuming i586.
- 	# Note: whatever this is, it MUST be the same as what config.sub
--	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# prints for the "djgpp" host, or else GDB configure will decide that
- 	# this is a cross-build.
- 	echo i586-pc-msdosdjgpp
--        exit ;;
-+	exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
- 	exit ;;
-@@ -1066,9 +1137,9 @@
- 	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
--	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
--	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-+	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
- 	fi
- 	exit ;;
-     mini*:CTIX:SYS*5:*)
-@@ -1088,39 +1159,39 @@
- 	test -r /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; }
-+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
--        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && { echo i486-ncr-sysv4; exit; } ;;
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4; exit; } ;;
-     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`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
--	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
--	echo m68k-unknown-lynxos${UNAME_RELEASE}
-+	echo m68k-unknown-lynxos"$UNAME_RELEASE"
- 	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
- 	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
--	echo sparc-unknown-lynxos${UNAME_RELEASE}
-+	echo sparc-unknown-lynxos"$UNAME_RELEASE"
- 	exit ;;
-     rs6000:LynxOS:2.*:*)
--	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
- 	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
--	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
- 	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
--	echo mips-dde-sysv${UNAME_RELEASE}
-+	echo mips-dde-sysv"$UNAME_RELEASE"
- 	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
-@@ -1131,15 +1202,15 @@
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
--		echo ${UNAME_MACHINE}-sni-sysv4
-+		echo "$UNAME_MACHINE"-sni-sysv4
- 	else
- 		echo ns32k-sni-sysv
- 	fi
- 	exit ;;
--    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                      # says <Richard.M.Bartel@ccMail.Census.GOV>
--        echo i586-unisys-sysv4
--        exit ;;
-+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+			# says <Richard.M.Bartel@ccMail.Census.GOV>
-+	echo i586-unisys-sysv4
-+	exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
-@@ -1151,25 +1222,25 @@
- 	exit ;;
-     i*86:VOS:*:*)
- 	# From Paul.Green@stratus.com.
--	echo ${UNAME_MACHINE}-stratus-vos
-+	echo "$UNAME_MACHINE"-stratus-vos
- 	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo hppa1.1-stratus-vos
- 	exit ;;
-     mc68*:A/UX:*:*)
--	echo m68k-apple-aux${UNAME_RELEASE}
-+	echo m68k-apple-aux"$UNAME_RELEASE"
- 	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
- 	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
--	        echo mips-nec-sysv${UNAME_RELEASE}
-+		echo mips-nec-sysv"$UNAME_RELEASE"
- 	else
--	        echo mips-unknown-sysv${UNAME_RELEASE}
-+		echo mips-unknown-sysv"$UNAME_RELEASE"
- 	fi
--        exit ;;
-+	exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
- 	exit ;;
-@@ -1182,63 +1253,97 @@
-     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
- 	echo i586-pc-haiku
- 	exit ;;
-+    x86_64:Haiku:*:*)
-+	echo x86_64-unknown-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
--	echo sx4-nec-superux${UNAME_RELEASE}
-+	echo sx4-nec-superux"$UNAME_RELEASE"
- 	exit ;;
-     SX-5:SUPER-UX:*:*)
--	echo sx5-nec-superux${UNAME_RELEASE}
-+	echo sx5-nec-superux"$UNAME_RELEASE"
- 	exit ;;
-     SX-6:SUPER-UX:*:*)
--	echo sx6-nec-superux${UNAME_RELEASE}
-+	echo sx6-nec-superux"$UNAME_RELEASE"
- 	exit ;;
-     SX-7:SUPER-UX:*:*)
--	echo sx7-nec-superux${UNAME_RELEASE}
-+	echo sx7-nec-superux"$UNAME_RELEASE"
- 	exit ;;
-     SX-8:SUPER-UX:*:*)
--	echo sx8-nec-superux${UNAME_RELEASE}
-+	echo sx8-nec-superux"$UNAME_RELEASE"
- 	exit ;;
-     SX-8R:SUPER-UX:*:*)
--	echo sx8r-nec-superux${UNAME_RELEASE}
-+	echo sx8r-nec-superux"$UNAME_RELEASE"
-+	exit ;;
-+    SX-ACE:SUPER-UX:*:*)
-+	echo sxace-nec-superux"$UNAME_RELEASE"
- 	exit ;;
-     Power*:Rhapsody:*:*)
--	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
- 	exit ;;
-     *:Rhapsody:*:*)
--	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
- 	exit ;;
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
--	case $UNAME_PROCESSOR in
--	    i386)
--		eval $set_cc_for_build
--		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
--		      UNAME_PROCESSOR="x86_64"
--		  fi
--		fi ;;
--	    unknown) UNAME_PROCESSOR=powerpc ;;
--	esac
--	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	eval "$set_cc_for_build"
-+	if test "$UNAME_PROCESSOR" = unknown ; then
-+	    UNAME_PROCESSOR=powerpc
-+	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
-+	    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
-+	fi
-+	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
- 	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
--	if test "$UNAME_PROCESSOR" = "x86"; then
-+	if test "$UNAME_PROCESSOR" = x86; then
- 		UNAME_PROCESSOR=i386
- 		UNAME_MACHINE=pc
- 	fi
--	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
- 	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
- 	exit ;;
--    NSE-?:NONSTOP_KERNEL:*:*)
--	echo nse-tandem-nsk${UNAME_RELEASE}
-+    NEO-*:NONSTOP_KERNEL:*:*)
-+	echo neo-tandem-nsk"$UNAME_RELEASE"
- 	exit ;;
--    NSR-?:NONSTOP_KERNEL:*:*)
--	echo nsr-tandem-nsk${UNAME_RELEASE}
-+    NSE-*:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk"$UNAME_RELEASE"
-+	exit ;;
-+    NSR-*:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk"$UNAME_RELEASE"
-+	exit ;;
-+    NSV-*:NONSTOP_KERNEL:*:*)
-+	echo nsv-tandem-nsk"$UNAME_RELEASE"
-+	exit ;;
-+    NSX-*:NONSTOP_KERNEL:*:*)
-+	echo nsx-tandem-nsk"$UNAME_RELEASE"
- 	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
-@@ -1247,18 +1352,18 @@
- 	echo bs2000-siemens-sysv
- 	exit ;;
-     DS/*:UNIX_System_V:*:*)
--	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
- 	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
- 	# operating systems.
--	if test "$cputype" = "386"; then
-+	if test "$cputype" = 386; then
- 	    UNAME_MACHINE=i386
- 	else
- 	    UNAME_MACHINE="$cputype"
- 	fi
--	echo ${UNAME_MACHINE}-unknown-plan9
-+	echo "$UNAME_MACHINE"-unknown-plan9
- 	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
-@@ -1279,14 +1384,14 @@
- 	echo pdp10-unknown-its
- 	exit ;;
-     SEI:*:*:SEIUX)
--        echo mips-sei-seiux${UNAME_RELEASE}
-+	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`
--	case "${UNAME_MACHINE}" in
-+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "$UNAME_MACHINE" in
- 	    A*) echo alpha-dec-vms ; exit ;;
- 	    I*) echo ia64-dec-vms ; exit ;;
- 	    V*) echo vax-dec-vms ; exit ;;
-@@ -1295,182 +1400,48 @@
- 	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
-+	echo "$UNAME_MACHINE"-pc-rdos
- 	exit ;;
-     i*86:AROS:*:*)
--	echo ${UNAME_MACHINE}-pc-aros
-+	echo "$UNAME_MACHINE"-pc-aros
-+	exit ;;
-+    x86_64:VMkernel:*:*)
-+	echo "$UNAME_MACHINE"-unknown-esx
-+	exit ;;
-+    amd64:Isilon\ OneFS:*:*)
-+	echo x86_64-unknown-onefs
- 	exit ;;
- esac
- 
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
--eval $set_cc_for_build
--cat >$dummy.c <<EOF
--#ifdef _SEQUENT_
--# include <sys/types.h>
--# include <sys/utsname.h>
--#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 (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix\n"); exit (0);
--#endif
--
--#if defined (hp300) && !defined (hpux)
--  printf ("m68k-hp-bsd\n"); exit (0);
--#endif
-+echo "$0: unable to guess system type" >&2
- 
--#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
-+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
-+    mips:Linux | mips64:Linux)
-+	# If we got here on MIPS GNU/Linux, output extra information.
-+	cat >&2 <<EOF
- 
--#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
--    printf ("vax-dec-ultrix\n"); exit (0);
--# endif
--#endif
--
--#if defined (alliant) && defined (i860)
--  printf ("i860-alliant-bsd\n"); exit (0);
--#endif
--
--  exit (1);
--}
-+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
-+the system type. Please install a C compiler and try again.
- 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; }
--
--# Convex versions that predate uname can use getsysinfo(1)
--
--if [ -x /usr/convex/getsysinfo ]
--then
--    case `getsysinfo -f cpu_type` in
--    c1*)
--	echo c1-convex-bsd
--	exit ;;
--    c2*)
--	if getsysinfo -f scalar_acc
--	then echo c32-convex-bsd
--	else echo c2-convex-bsd
--	fi
--	exit ;;
--    c34*)
--	echo c34-convex-bsd
--	exit ;;
--    c38*)
--	echo c38-convex-bsd
--	exit ;;
--    c4*)
--	echo c4-convex-bsd
--	exit ;;
--    esac
--fi
-+	;;
-+esac
- 
- cat >&2 <<EOF
--$0: unable to guess system type
- 
--This script, last modified $timestamp, has failed to recognize
--the operating system you are using. It is advised that you
--download the most up to date version of the config scripts from
-+This script (version $timestamp), has failed to recognize the
-+operating system you are using. If your script is old, overwrite *all*
-+copies of config.guess and config.sub with the latest versions from:
- 
--  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
- and
--  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
- 
--If the version you run ($0) is already up to date, please
--send the following data and any information you think might be
--pertinent to <config-patches@gnu.org> in order to provide the needed
--information to handle your system.
-+If $0 has already been updated, send the following data and any
-+information you think might be pertinent to config-patches@gnu.org to
-+provide the necessary information to handle your system.
- 
- config.guess timestamp = $timestamp
- 
-@@ -1489,16 +1460,16 @@
- /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}
-+UNAME_MACHINE = "$UNAME_MACHINE"
-+UNAME_RELEASE = "$UNAME_RELEASE"
-+UNAME_SYSTEM  = "$UNAME_SYSTEM"
-+UNAME_VERSION = "$UNAME_VERSION"
- EOF
- 
- exit 1
- 
- # Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# eval: (add-hook 'before-save-hook 'time-stamp)
- # time-stamp-start: "timestamp='"
- # time-stamp-format: "%:y-%02m-%02d"
- # time-stamp-end: "'"
-diff -uNr xbitmaps-1.1.1/config.sub xbitmaps-1.1.1-aarch64/config.sub
---- xbitmaps-1.1.1/config.sub	2010-12-09 06:26:17.000000000 +0000
-+++ xbitmaps-1.1.1-aarch64/config.sub	2018-03-18 03:08:56.618640939 +0000
-@@ -1,38 +1,31 @@
- #! /bin/sh
- # Configuration validation subroutine script.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--#   Free Software Foundation, Inc.
--
--timestamp='2010-09-11'
--
--# This file is (in principle) common to ALL GNU software.
--# The presence of a machine in this file suggests that SOME GNU software
--# can handle that machine.  It does not imply ALL GNU software can.
--#
--# 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
--# the Free Software Foundation; either version 2 of the License, or
-+#   Copyright 1992-2018 Free Software Foundation, Inc.
-+
-+timestamp='2018-03-08'
-+
-+# 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
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <https://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+# the same distribution terms that you use for the rest of that
-+# program.  This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
- 
- 
--# Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted GNU ChangeLog entry.
-+# Please send patches to <config-patches@gnu.org>.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
-@@ -40,7 +33,7 @@
- # Otherwise, we print the canonical config type on stdout and succeed.
- 
- # You can get the latest version of this script from:
--# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
- 
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
-@@ -60,12 +53,11 @@
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
- usage="\
--Usage: $0 [OPTION] CPU-MFR-OPSYS
--       $0 [OPTION] ALIAS
-+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
- 
- Canonicalize a configuration name.
- 
--Operation modes:
-+Options:
-   -h, --help         print this help, then exit
-   -t, --time-stamp   print date of last modification, then exit
-   -v, --version      print version number, then exit
-@@ -75,9 +67,7 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
--Software Foundation, Inc.
-+Copyright 1992-2018 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."
-@@ -104,7 +94,7 @@
- 
-     *local*)
-        # First pass through any local machine types.
--       echo $1
-+       echo "$1"
-        exit ;;
- 
-     * )
-@@ -122,20 +112,24 @@
- 
- # 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/'`
-+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
--  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
--  knetbsd*-gnu* | netbsd*-gnu* | \
--  kopensolaris*-gnu* | \
-+  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/'`
-+    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/.*-/-/'`
-+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-+    if [ "$basic_machine" != "$1" ]
-+    then os=`echo "$1" | sed 's/.*-/-/'`
-     else os=; fi
-     ;;
- esac
-@@ -154,12 +148,12 @@
- 	-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)
-+	-apple | -axis | -knuth | -cray | -microblaze*)
- 		os=
- 		basic_machine=$1
- 		;;
--        -bluegene*)
--	        os=-cnk
-+	-bluegene*)
-+		os=-cnk
- 		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
-@@ -175,62 +169,65 @@
- 		os=-chorusos
- 		basic_machine=$1
- 		;;
-- 	-chorusrdb)
-- 		os=-chorusrdb
-+	-chorusrdb)
-+		os=-chorusrdb
- 		basic_machine=$1
-- 		;;
-+		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
- 	-sco6)
- 		os=-sco5v6
--		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- 		;;
- 	-sco5)
- 		os=-sco3.2v5
--		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- 		;;
- 	-sco4)
- 		os=-sco3.2v4
--		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		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/'`
-+		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/'`
-+		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/'`
-+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- 		;;
- 	-sco*)
- 		os=-sco3.2v2
--		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- 		;;
- 	-udk*)
--		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- 		;;
- 	-isc)
- 		os=-isc2.2
--		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		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/'`
-+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-lynx*178)
-+		os=-lynxos178
-+		;;
-+	-lynx*5)
-+		os=-lynxos5
- 		;;
- 	-lynx*)
- 		os=-lynxos
- 		;;
- 	-ptx*)
--		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
--		;;
--	-windowsnt*)
--		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
- 		;;
- 	-psos*)
- 		os=-psos
-@@ -247,20 +244,29 @@
- 	# 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 | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| arc | arceb \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| avr | avr32 \
-+	| ba \
-+	| be32 | be64 \
- 	| bfin \
--	| c4x | clipper \
-+	| c4x | c8051 | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
--	| fido | fr30 | frv \
-+	| e2k | epiphany \
-+	| fido | fr30 | frv | ft32 \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
--	| i370 | i860 | i960 | ia64 \
-+	| hexagon \
-+	| i370 | i860 | i960 | ia16 | ia64 \
- 	| ip2k | iq2000 \
-+	| k1om \
-+	| le32 | le64 \
- 	| lm32 \
- 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
--	| maxq | mb | microblaze | mcore | mep | metag \
-+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
-@@ -274,34 +280,40 @@
- 	| 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 \
-+	| nios | nios2 | nios2eb | nios2el \
- 	| ns16k | ns32k \
--	| or32 \
--	| pdp10 | pdp11 | pj | pjl \
--	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| open8 | or1k | or1knd | or32 \
-+	| pdp10 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle \
-+	| pru \
- 	| pyramid \
--	| rx \
-+	| riscv32 | riscv64 \
-+	| rl78 | rx \
- 	| score \
--	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| 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 | strongarm \
--	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-+	| spu \
-+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- 	| ubicom32 \
--	| v850 | v850e \
--	| we32k \
--	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-+	| visium \
-+	| wasm32 \
-+	| x86 | xc16x | xstormy16 | xtensa \
- 	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
-@@ -314,17 +326,34 @@
- 	c6x)
- 		basic_machine=tic6x-unknown
- 		;;
--	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
--		# Motorola 68HC11/12.
-+	leon|leon[3-9])
-+		basic_machine=sparc-$basic_machine
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- 		basic_machine=$basic_machine-unknown
- 		os=-none
- 		;;
--	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
- 		;;
- 	ms1)
- 		basic_machine=mt-unknown
- 		;;
- 
-+	strongarm | thumb | xscale)
-+		basic_machine=arm-unknown
-+		;;
-+	xgate)
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	xscaleeb)
-+		basic_machine=armeb-unknown
-+		;;
-+
-+	xscaleel)
-+		basic_machine=armel-unknown
-+		;;
-+
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
- 	# (2) the word "unknown" tends to confuse beginning users.
-@@ -333,31 +362,38 @@
- 	  ;;
- 	# Object if more than one company name word.
- 	*-*-*)
--		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		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-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
- 	| avr-* | avr32-* \
-+	| ba-* \
-+	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
--	| clipper-* | craynv-* | cydra-* \
-+	| c8051-* | clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
--	| elxsi-* \
-+	| e2k-* | elxsi-* \
- 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
--	| i*86-* | i860-* | i960-* | ia64-* \
-+	| 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-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+	| microblaze-* | microblazeel-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
-@@ -371,35 +407,45 @@
- 	| 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-* \
-+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| open8-* \
-+	| or1k*-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
--	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-+	| pru-* \
- 	| pyramid-* \
--	| romp-* | rs6000-* | rx-* \
-+	| 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-* | strongarm-* | sv1-* | sx?-* \
--	| tahoe-* | thumb-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-+	| tahoe-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
--	| tile-* | tilegx-* \
-+	| tile*-* \
- 	| tron-* \
- 	| ubicom32-* \
--	| v850-* | v850e-* | vax-* \
-+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-+	| vax-* \
-+	| visium-* \
-+	| wasm32-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* \
- 	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
- 	| z8k-* | z80-*)
-@@ -411,7 +457,7 @@
- 	# 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-unknown
-+		basic_machine=i386-pc
- 		os=-bsd
- 		;;
- 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-@@ -424,7 +470,7 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
--    	abacus)
-+	abacus)
- 		basic_machine=abacus-unknown
- 		;;
- 	adobe68k)
-@@ -445,7 +491,7 @@
- 		basic_machine=x86_64-pc
- 		;;
- 	amd64-*)
--		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	amdahl)
- 		basic_machine=580-amdahl
-@@ -474,6 +520,9 @@
- 		basic_machine=i386-pc
- 		os=-aros
- 		;;
-+	asmjs)
-+		basic_machine=asmjs-unknown
-+		;;
- 	aux)
- 		basic_machine=m68k-apple
- 		os=-aux
-@@ -487,7 +536,7 @@
- 		os=-linux
- 		;;
- 	blackfin-*)
--		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		os=-linux
- 		;;
- 	bluegene*)
-@@ -495,19 +544,19 @@
- 		os=-cnk
- 		;;
- 	c54x-*)
--		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	c55x-*)
--		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	c6x-*)
--		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
--        cegcc)
-+	cegcc)
- 		basic_machine=arm-unknown
- 		os=-cegcc
- 		;;
-@@ -539,7 +588,7 @@
- 		basic_machine=craynv-cray
- 		os=-unicosmp
- 		;;
--	cr16)
-+	cr16 | cr16-*)
- 		basic_machine=cr16-unknown
- 		os=-elf
- 		;;
-@@ -590,10 +639,18 @@
- 		basic_machine=rs6000-bull
- 		os=-bosx
- 		;;
--	dpx2* | dpx2*-bull)
-+	dpx2*)
- 		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
-@@ -683,9 +740,6 @@
- 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
- 		basic_machine=hppa1.0-hp
- 		;;
--	hppa-next)
--		os=-nextstep3
--		;;
- 	hppaosf)
- 		basic_machine=hppa1.1-hp
- 		os=-osf
-@@ -697,28 +751,27 @@
- 	i370-ibm* | ibm*)
- 		basic_machine=i370-ibm
- 		;;
--# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
- 	i*86v32)
--		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- 		os=-sysv32
- 		;;
- 	i*86v4*)
--		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- 		os=-sysv4
- 		;;
- 	i*86v)
--		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- 		os=-sysv
- 		;;
- 	i*86sol2)
--		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- 		os=-solaris2
- 		;;
- 	i386mach)
- 		basic_machine=i386-mach
- 		os=-mach
- 		;;
--	i386-vsta | vsta)
-+	vsta)
- 		basic_machine=i386-unknown
- 		os=-vsta
- 		;;
-@@ -736,17 +789,17 @@
- 		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/^[^-]*-//'`
-+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		os=-linux
- 		;;
--	m88k-omron*)
--		basic_machine=m88k-omron
--		;;
- 	magnum | m3230)
- 		basic_machine=mips-mips
- 		os=-sysv
-@@ -755,11 +808,15 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
--        microblaze)
-+	microblaze*)
- 		basic_machine=microblaze-xilinx
- 		;;
-+	mingw64)
-+		basic_machine=x86_64-pc
-+		os=-mingw64
-+		;;
- 	mingw32)
--		basic_machine=i386-pc
-+		basic_machine=i686-pc
- 		os=-mingw32
- 		;;
- 	mingw32ce)
-@@ -774,10 +831,10 @@
- 		os=-mint
- 		;;
- 	mips3*-*)
--		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
- 		;;
- 	mips3*)
--		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
- 		;;
- 	monitor)
- 		basic_machine=m68k-rom68k
-@@ -787,17 +844,29 @@
- 		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-/'`
-+		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
-@@ -826,7 +895,7 @@
- 		basic_machine=v70-nec
- 		os=-sysv
- 		;;
--	next | m*-next )
-+	next | m*-next)
- 		basic_machine=m68k-next
- 		case $os in
- 		    -nextstep* )
-@@ -862,15 +931,21 @@
- 	np1)
- 		basic_machine=np1-gould
- 		;;
--        neo-tandem)
-+	neo-tandem)
- 		basic_machine=neo-tandem
- 		;;
--        nse-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
-+		;;
- 	op50n-* | op60c-*)
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
-@@ -903,7 +978,7 @@
- 		os=-linux
- 		;;
- 	parisc-*)
--		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		os=-linux
- 		;;
- 	pbd)
-@@ -919,7 +994,7 @@
- 		basic_machine=i386-pc
- 		;;
- 	pc98-*)
--		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
-@@ -934,41 +1009,42 @@
- 		basic_machine=i786-pc
- 		;;
- 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
--		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
--		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
--		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	pentium4-*)
--		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	pn)
- 		basic_machine=pn-gould
- 		;;
- 	power)	basic_machine=power-ibm
- 		;;
--	ppc)	basic_machine=powerpc-unknown
-+	ppc | ppcbe)	basic_machine=powerpc-unknown
- 		;;
--	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+	ppc-* | ppcbe-*)
-+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
--	ppcle | powerpclittle | ppc-le | powerpc-little)
-+	ppcle | powerpclittle)
- 		basic_machine=powerpcle-unknown
- 		;;
- 	ppcle-* | powerpclittle-*)
--		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	ppc64)	basic_machine=powerpc64-unknown
- 		;;
--	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
--	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+	ppc64le | powerpc64little)
- 		basic_machine=powerpc64le-unknown
- 		;;
- 	ppc64le-* | powerpc64little-*)
--		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	ps2)
- 		basic_machine=i386-ibm
-@@ -977,7 +1053,11 @@
- 		basic_machine=i586-unknown
- 		os=-pw32
- 		;;
--	rdos)
-+	rdos | rdos64)
-+		basic_machine=x86_64-pc
-+		os=-rdos
-+		;;
-+	rdos32)
- 		basic_machine=i386-pc
- 		os=-rdos
- 		;;
-@@ -1018,17 +1098,10 @@
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
--	sh)
--		basic_machine=sh-hitachi
--		os=-hms
--		;;
- 	sh5el)
- 		basic_machine=sh5le-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
--	sparclite-wrs | simso-wrs)
-+	simso-wrs)
- 		basic_machine=sparclite-wrs
- 		os=-vxworks
- 		;;
-@@ -1046,6 +1119,9 @@
- 		basic_machine=i860-stratus
- 		os=-sysv4
- 		;;
-+	strongarm-* | thumb-*)
-+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-+		;;
- 	sun2)
- 		basic_machine=m68000-sun
- 		;;
-@@ -1102,13 +1178,8 @@
- 		basic_machine=t90-cray
- 		os=-unicos
- 		;;
--        # This must be matched before tile*.
--        tilegx*)
--		basic_machine=tilegx-unknown
--		os=-linux-gnu
--		;;
- 	tile*)
--		basic_machine=tile-unknown
-+		basic_machine=$basic_machine-unknown
- 		os=-linux-gnu
- 		;;
- 	tx39)
-@@ -1171,6 +1242,9 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
-+	x64)
-+		basic_machine=x86_64-pc
-+		;;
- 	xbox)
- 		basic_machine=i686-pc
- 		os=-mingw32
-@@ -1178,18 +1252,13 @@
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-+	xscale-* | xscalee[bl]-*)
-+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
-+		;;
- 	ymp)
- 		basic_machine=ymp-cray
- 		os=-unicos
- 		;;
--	z8k-*-coff)
--		basic_machine=z8k-unknown
--		os=-sim
--		;;
--	z80-*-coff)
--		basic_machine=z80-unknown
--		os=-sim
--		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -1218,10 +1287,6 @@
- 	vax)
- 		basic_machine=vax-dec
- 		;;
--	pdp10)
--		# there are many clones, so DEC is not a safe bet
--		basic_machine=pdp10-unknown
--		;;
- 	pdp11)
- 		basic_machine=pdp11-dec
- 		;;
-@@ -1231,9 +1296,6 @@
- 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
--		basic_machine=sparc-sun
--		;;
- 	cydra)
- 		basic_machine=cydra-cydrome
- 		;;
-@@ -1253,7 +1315,7 @@
- 		# Make sure to match an already-canonicalized machine name.
- 		;;
- 	*)
--		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
- 		exit 1
- 		;;
- esac
-@@ -1261,10 +1323,10 @@
- # Here we canonicalize certain aliases for manufacturers.
- case $basic_machine in
- 	*-digital*)
--		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
- 		;;
- 	*-commodore*)
--		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
- 		;;
- 	*)
- 		;;
-@@ -1275,11 +1337,11 @@
- if [ x"$os" != x"" ]
- then
- case $os in
--        # First match some system type aliases
--        # that might get confused with valid system types.
-+	# First match some system type aliases that might get confused
-+	# with valid system types.
- 	# -solaris* is a basic system type, with this one exception.
--        -auroraux)
--	        os=-auroraux
-+	-auroraux)
-+		os=-auroraux
- 		;;
- 	-solaris1 | -solaris1.*)
- 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-@@ -1287,45 +1349,48 @@
- 	-solaris)
- 		os=-solaris2
- 		;;
--	-svr4*)
--		os=-sysv4
--		;;
- 	-unixware*)
- 		os=-sysv4.2uw
- 		;;
- 	-gnu/linux*)
- 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- 		;;
--	# First accept the basic system types.
-+	# es1800 is here to avoid being matched by es* (a different OS)
-+	-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.
-+	# 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* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
--	      | -sym* | -kopensolaris* \
-+	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -cloudabi* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
--	      | -openbsd* | -solidbsd* \
-+	      | -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* \
--	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-android* \
--	      | -linux-newlib* | -linux-uclibc* \
--	      | -uxpv* | -beos* | -mpeix* | -udk* \
--	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
-+	      | -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* | -rtmk-nova* | -windiss* \
-+	      | -morphos* | -superux* | -rtmk* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-+	      | -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*)
-@@ -1342,12 +1407,12 @@
- 	-nto*)
- 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
--	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-+	-sim | -xray | -os68k* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
--		os=`echo $os | sed -e 's|mac|macos|'`
-+		os=`echo "$os" | sed -e 's|mac|macos|'`
- 		;;
- 	-linux-dietlibc)
- 		os=-linux-dietlibc
-@@ -1356,26 +1421,20 @@
- 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
- 		;;
- 	-sunos5*)
--		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
- 		;;
- 	-sunos6*)
--		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
- 		;;
- 	-opened*)
- 		os=-openedition
- 		;;
--        -os400*)
-+	-os400*)
- 		os=-os400
- 		;;
- 	-wince*)
- 		os=-wince
- 		;;
--	-osfrose*)
--		os=-osfrose
--		;;
--	-osf*)
--		os=-osf
--		;;
- 	-utek*)
- 		os=-bsd
- 		;;
-@@ -1400,7 +1459,7 @@
- 	-nova*)
- 		os=-rtmk-nova
- 		;;
--	-ns2 )
-+	-ns2)
- 		os=-nextstep2
- 		;;
- 	-nsk*)
-@@ -1413,7 +1472,7 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
--        -tpf*)
-+	-tpf*)
- 		os=-tpf
- 		;;
- 	-triton*)
-@@ -1422,7 +1481,7 @@
- 	-oss*)
- 		os=-sysv3
- 		;;
--	-svr4)
-+	-svr4*)
- 		os=-sysv4
- 		;;
- 	-svr3)
-@@ -1437,35 +1496,38 @@
- 	-ose*)
- 		os=-ose
- 		;;
--	-es1800*)
--		os=-ose
--		;;
--	-xenix)
--		os=-xenix
--		;;
- 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- 		os=-mint
- 		;;
--	-aros*)
--		os=-aros
--		;;
--	-kaos*)
--		os=-kaos
--		;;
- 	-zvmoe)
- 		os=-zvmoe
- 		;;
- 	-dicos*)
- 		os=-dicos
- 		;;
--        -nacl*)
--	        ;;
-+	-pikeos*)
-+		# Until real need of OS specific support for
-+		# particular features comes up, bare metal
-+		# configurations are quite functional.
-+		case $basic_machine in
-+		    arm*)
-+			os=-eabi
-+			;;
-+		    *)
-+			os=-elf
-+			;;
-+		esac
-+		;;
-+	-nacl*)
-+		;;
-+	-ios)
-+		;;
- 	-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
-+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
- 		exit 1
- 		;;
- esac
-@@ -1482,10 +1544,10 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
--        score-*)
-+	score-*)
- 		os=-elf
- 		;;
--        spu-*)
-+	spu-*)
- 		os=-elf
- 		;;
- 	*-acorn)
-@@ -1497,8 +1559,14 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--        c4x-* | tic4x-*)
--        	os=-coff
-+	c4x-* | tic4x-*)
-+		os=-coff
-+		;;
-+	c8051-*)
-+		os=-elf
-+		;;
-+	hexagon-*)
-+		os=-elf
- 		;;
- 	tic54x-*)
- 		os=-coff
-@@ -1527,14 +1595,11 @@
- 		;;
- 	m68000-sun)
- 		os=-sunos3
--		# This also exists in the configure program, but was not the
--		# default.
--		# os=-sunos4
- 		;;
- 	m68*-cisco)
- 		os=-aout
- 		;;
--        mep-*)
-+	mep-*)
- 		os=-elf
- 		;;
- 	mips*-cisco)
-@@ -1552,16 +1617,16 @@
- 	sparc-* | *-sun)
- 		os=-sunos4.1.1
- 		;;
-+	pru-*)
-+		os=-elf
-+		;;
- 	*-be)
- 		os=-beos
- 		;;
--	*-haiku)
--		os=-haiku
--		;;
- 	*-ibm)
- 		os=-aix
- 		;;
--    	*-knuth)
-+	*-knuth)
- 		os=-mmixware
- 		;;
- 	*-wec)
-@@ -1597,7 +1662,7 @@
- 	m88k-omron*)
- 		os=-luna
- 		;;
--	*-next )
-+	*-next)
- 		os=-nextstep
- 		;;
- 	*-sequent)
-@@ -1612,9 +1677,6 @@
- 	i370-*)
- 		os=-mvs
- 		;;
--	*-next)
--		os=-nextstep3
--		;;
- 	*-gould)
- 		os=-sysv
- 		;;
-@@ -1724,15 +1786,15 @@
- 				vendor=stratus
- 				;;
- 		esac
--		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
- 		;;
- esac
- 
--echo $basic_machine$os
-+echo "$basic_machine$os"
- exit
- 
- # Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# eval: (add-hook 'before-save-hook 'time-stamp)
- # time-stamp-start: "timestamp='"
- # time-stamp-format: "%:y-%02m-%02d"
- # time-stamp-end: "'"