kbrown / rpms / libreoffice

Forked from rpms/libreoffice 2 years ago
Clone

Blame SOURCES/0001-update-libxmlsec-config.-to-support-ppc64le.patch

f085be
From 106d9b392bd59f52775eeb09e2a4e8b20828894b Mon Sep 17 00:00:00 2001
f085be
From: David Tardon <dtardon@redhat.com>
f085be
Date: Tue, 13 May 2014 16:48:40 +0200
f085be
Subject: [PATCH] update libxmlsec config.* to support ppc64le
f085be
f085be
Change-Id: I4b31729481b7fd538483db5b6e39e1d80e03b3b6
f085be
---
f085be
 external/libxmlsec/UnpackedTarball_xmlsec.mk       |    1 +
f085be
 .../libxmlsec/xmlsec1-update-config.guess.patch.1  | 1630 ++++++++++++++++++++
f085be
 2 files changed, 1631 insertions(+)
f085be
 create mode 100644 external/libxmlsec/xmlsec1-update-config.guess.patch.1
f085be
f085be
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk
f085be
index 6d1cb43..a72deed 100644
f085be
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
f085be
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
f085be
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
f085be
 	external/libxmlsec/xmlsec1-android.patch \
f085be
 	external/libxmlsec/xmlsec1-1.2.14-ansi.patch \
f085be
 	external/libxmlsec/xmlsec1-customkeymanage.patch \
f085be
+	external/libxmlsec/xmlsec1-update-config.guess.patch.1 \
f085be
 ))
f085be
 
f085be
 $(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/mscrypto/akmngr.h,external/libxmlsec/include/akmngr_mscrypto.h))
f085be
diff --git a/external/libxmlsec/xmlsec1-update-config.guess.patch.1 b/external/libxmlsec/xmlsec1-update-config.guess.patch.1
f085be
new file mode 100644
f085be
index 0000000..1b8ea40
f085be
--- /dev/null
f085be
+++ b/external/libxmlsec/xmlsec1-update-config.guess.patch.1
f085be
@@ -0,0 +1,1630 @@
f085be
+From dd15aae9ce221198be486a6e75d5a42f75ff9de6 Mon Sep 17 00:00:00 2001
f085be
+From: David Tardon <dtardon@redhat.com>
f085be
+Date: Tue, 13 May 2014 16:35:04 +0200
f085be
+Subject: [PATCH] update config.* to support ppc64le
f085be
+
f085be
+---
f085be
+ config.guess | 541 +++++++++++++++++++++++++++++------------------------------
f085be
+ config.sub   | 301 ++++++++++++++++++++++-----------
f085be
+ 2 files changed, 472 insertions(+), 370 deletions(-)
f085be
+
f085be
+diff --git a/config.guess b/config.guess
f085be
+index da83314..b79252d 100755
f085be
+--- a/config.guess
f085be
++++ b/config.guess
f085be
+@@ -1,14 +1,12 @@
f085be
+ #! /bin/sh
f085be
+ # Attempt to guess a canonical system name.
f085be
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
f085be
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
f085be
+-#   Free Software Foundation, Inc.
f085be
++#   Copyright 1992-2013 Free Software Foundation, Inc.
f085be
+ 
f085be
+-timestamp='2009-04-27'
f085be
++timestamp='2013-06-10'
f085be
+ 
f085be
+ # This file is free software; you can redistribute it and/or modify it
f085be
+ # under the terms of the GNU General Public License as published by
f085be
+-# the Free Software Foundation; either version 2 of the License, or
f085be
++# the Free Software Foundation; either version 3 of the License, or
f085be
+ # (at your option) any later version.
f085be
+ #
f085be
+ # This program is distributed in the hope that it will be useful, but
f085be
+@@ -17,26 +15,22 @@ timestamp='2009-04-27'
f085be
+ # General Public License for more details.
f085be
+ #
f085be
+ # You should have received a copy of the GNU General Public License
f085be
+-# along with this program; if not, write to the Free Software
f085be
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
f085be
+-# 02110-1301, USA.
f085be
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
f085be
+ #
f085be
+ # As a special exception to the GNU General Public License, if you
f085be
+ # distribute this file as part of a program that contains a
f085be
+ # configuration script generated by Autoconf, you may include it under
f085be
+-# the same distribution terms that you use for the rest of that program.
f085be
+-
f085be
+-
f085be
+-# Originally written by Per Bothner <per@bothner.com>.
f085be
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
f085be
+-# diff and a properly formatted ChangeLog entry.
f085be
++# the same distribution terms that you use for the rest of that
f085be
++# program.  This Exception is an additional permission under section 7
f085be
++# of the GNU General Public License, version 3 ("GPLv3").
f085be
++#
f085be
++# Originally written by Per Bothner.
f085be
+ #
f085be
+-# This script attempts to guess a canonical system name similar to
f085be
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
f085be
+-# exits with 0.  Otherwise, it exits with 1.
f085be
++# You can get the latest version of this script from:
f085be
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
f085be
+ #
f085be
+-# The plan is that this can be called by configure scripts if you
f085be
+-# don't specify an explicit build system type.
f085be
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
f085be
++
f085be
+ 
f085be
+ me=`echo "$0" | sed -e 's,.*/,,'`
f085be
+ 
f085be
+@@ -56,8 +50,7 @@ version="\
f085be
+ GNU config.guess ($timestamp)
f085be
+ 
f085be
+ Originally written by Per Bothner.
f085be
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
f085be
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
f085be
++Copyright 1992-2013 Free Software Foundation, Inc.
f085be
+ 
f085be
+ This is free software; see the source for copying conditions.  There is NO
f085be
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
f085be
+@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
f085be
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
f085be
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
f085be
+ 
f085be
++case "${UNAME_SYSTEM}" in
f085be
++Linux|GNU|GNU/*)
f085be
++	# If the system lacks a compiler, then just pick glibc.
f085be
++	# We could probably try harder.
f085be
++	LIBC=gnu
f085be
++
f085be
++	eval $set_cc_for_build
f085be
++	cat <<-EOF > $dummy.c
f085be
++	#include <features.h>
f085be
++	#if defined(__UCLIBC__)
f085be
++	LIBC=uclibc
f085be
++	#elif defined(__dietlibc__)
f085be
++	LIBC=dietlibc
f085be
++	#else
f085be
++	LIBC=gnu
f085be
++	#endif
f085be
++	EOF
f085be
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
f085be
++	;;
f085be
++esac
f085be
++
f085be
+ # Note: order is significant - the case branches are not exclusive.
f085be
+ 
f085be
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+     *:NetBSD:*:*)
f085be
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
f085be
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
f085be
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
f085be
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
f085be
+ 	# switched to ELF, *-*-netbsd* would select the old
f085be
+ 	# object file format.  This provides both forward
f085be
+@@ -170,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
f085be
+ 		eval $set_cc_for_build
f085be
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
f085be
+-			| grep __ELF__ >/dev/null
f085be
++			| grep -q __ELF__
f085be
+ 		then
f085be
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
f085be
+ 		    # Return netbsd for either.  FIX?
f085be
+@@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+ 		fi
f085be
+ 		;;
f085be
+ 	    *)
f085be
+-	        os=netbsd
f085be
++		os=netbsd
f085be
+ 		;;
f085be
+ 	esac
f085be
+ 	# The OS release
f085be
+@@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
f085be
+ 	echo "${machine}-${os}${release}"
f085be
+ 	exit ;;
f085be
++    *:Bitrig:*:*)
f085be
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
f085be
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
f085be
++	exit ;;
f085be
+     *:OpenBSD:*:*)
f085be
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
f085be
+ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
f085be
+@@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
f085be
+ 		;;
f085be
+ 	*5.*)
f085be
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
f085be
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
f085be
+ 		;;
f085be
+ 	esac
f085be
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
f085be
+@@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+ 	# A Xn.n version is an unreleased experimental baselevel.
f085be
+ 	# 1.2 uses "1.2" for uname -r.
f085be
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
f085be
+-	exit ;;
f085be
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
f085be
++	exitcode=$?
f085be
++	trap '' 0
f085be
++	exit $exitcode ;;
f085be
+     Alpha\ *:Windows_NT*:*)
f085be
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
f085be
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
f085be
+@@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+ 	echo s390-ibm-zvmoe
f085be
+ 	exit ;;
f085be
+     *:OS400:*:*)
f085be
+-        echo powerpc-ibm-os400
f085be
++	echo powerpc-ibm-os400
f085be
+ 	exit ;;
f085be
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
f085be
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+-    arm:riscos:*:*|arm:RISCOS:*:*)
f085be
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
f085be
+ 	echo arm-unknown-riscos
f085be
+ 	exit ;;
f085be
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
f085be
+@@ -333,6 +354,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
f085be
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
f085be
+ 	exit ;;
f085be
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
f085be
++	echo i386-pc-auroraux${UNAME_RELEASE}
f085be
++	exit ;;
f085be
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
f085be
+ 	eval $set_cc_for_build
f085be
+ 	SUN_ARCH="i386"
f085be
+@@ -391,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
f085be
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
f085be
+     # be no problem.
f085be
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
f085be
+-        echo m68k-atari-mint${UNAME_RELEASE}
f085be
++	echo m68k-atari-mint${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
f085be
+ 	echo m68k-atari-mint${UNAME_RELEASE}
f085be
+-        exit ;;
f085be
++	exit ;;
f085be
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
f085be
+-        echo m68k-atari-mint${UNAME_RELEASE}
f085be
++	echo m68k-atari-mint${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
f085be
+-        echo m68k-milan-mint${UNAME_RELEASE}
f085be
+-        exit ;;
f085be
++	echo m68k-milan-mint${UNAME_RELEASE}
f085be
++	exit ;;
f085be
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
f085be
+-        echo m68k-hades-mint${UNAME_RELEASE}
f085be
+-        exit ;;
f085be
++	echo m68k-hades-mint${UNAME_RELEASE}
f085be
++	exit ;;
f085be
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
f085be
+-        echo m68k-unknown-mint${UNAME_RELEASE}
f085be
+-        exit ;;
f085be
++	echo m68k-unknown-mint${UNAME_RELEASE}
f085be
++	exit ;;
f085be
+     m68k:machten:*:*)
f085be
+ 	echo m68k-apple-machten${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+@@ -477,8 +501,8 @@ EOF
f085be
+ 	echo m88k-motorola-sysv3
f085be
+ 	exit ;;
f085be
+     AViiON:dgux:*:*)
f085be
+-        # DG/UX returns AViiON for all architectures
f085be
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
f085be
++	# DG/UX returns AViiON for all architectures
f085be
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
f085be
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
f085be
+ 	then
f085be
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
f085be
+@@ -491,7 +515,7 @@ EOF
f085be
+ 	else
f085be
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
f085be
+ 	fi
f085be
+- 	exit ;;
f085be
++	exit ;;
f085be
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
f085be
+ 	echo m88k-dolphin-sysv3
f085be
+ 	exit ;;
f085be
+@@ -548,7 +572,7 @@ EOF
f085be
+ 		echo rs6000-ibm-aix3.2
f085be
+ 	fi
f085be
+ 	exit ;;
f085be
+-    *:AIX:*:[456])
f085be
++    *:AIX:*:[4567])
f085be
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
f085be
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
f085be
+ 		IBM_ARCH=rs6000
f085be
+@@ -591,52 +615,52 @@ EOF
f085be
+ 	    9000/[678][0-9][0-9])
f085be
+ 		if [ -x /usr/bin/getconf ]; then
f085be
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
f085be
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
f085be
+-                    case "${sc_cpu_version}" in
f085be
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
f085be
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
f085be
+-                      532)                      # CPU_PA_RISC2_0
f085be
+-                        case "${sc_kernel_bits}" in
f085be
+-                          32) HP_ARCH="hppa2.0n" ;;
f085be
+-                          64) HP_ARCH="hppa2.0w" ;;
f085be
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
f085be
++		    case "${sc_cpu_version}" in
f085be
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
f085be
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
f085be
++		      532)                      # CPU_PA_RISC2_0
f085be
++			case "${sc_kernel_bits}" in
f085be
++			  32) HP_ARCH="hppa2.0n" ;;
f085be
++			  64) HP_ARCH="hppa2.0w" ;;
f085be
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
f085be
+-                        esac ;;
f085be
+-                    esac
f085be
++			esac ;;
f085be
++		    esac
f085be
+ 		fi
f085be
+ 		if [ "${HP_ARCH}" = "" ]; then
f085be
+ 		    eval $set_cc_for_build
f085be
+-		    sed 's/^              //' << EOF >$dummy.c
f085be
++		    sed 's/^		//' << EOF >$dummy.c
f085be
+ 
f085be
+-              #define _HPUX_SOURCE
f085be
+-              #include <stdlib.h>
f085be
+-              #include <unistd.h>
f085be
++		#define _HPUX_SOURCE
f085be
++		#include <stdlib.h>
f085be
++		#include <unistd.h>
f085be
+ 
f085be
+-              int main ()
f085be
+-              {
f085be
+-              #if defined(_SC_KERNEL_BITS)
f085be
+-                  long bits = sysconf(_SC_KERNEL_BITS);
f085be
+-              #endif
f085be
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
f085be
++		int main ()
f085be
++		{
f085be
++		#if defined(_SC_KERNEL_BITS)
f085be
++		    long bits = sysconf(_SC_KERNEL_BITS);
f085be
++		#endif
f085be
++		    long cpu  = sysconf (_SC_CPU_VERSION);
f085be
+ 
f085be
+-                  switch (cpu)
f085be
+-              	{
f085be
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
f085be
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
f085be
+-              	case CPU_PA_RISC2_0:
f085be
+-              #if defined(_SC_KERNEL_BITS)
f085be
+-              	    switch (bits)
f085be
+-              		{
f085be
+-              		case 64: puts ("hppa2.0w"); break;
f085be
+-              		case 32: puts ("hppa2.0n"); break;
f085be
+-              		default: puts ("hppa2.0"); break;
f085be
+-              		} break;
f085be
+-              #else  /* !defined(_SC_KERNEL_BITS) */
f085be
+-              	    puts ("hppa2.0"); break;
f085be
+-              #endif
f085be
+-              	default: puts ("hppa1.0"); break;
f085be
+-              	}
f085be
+-                  exit (0);
f085be
+-              }
f085be
++		    switch (cpu)
f085be
++			{
f085be
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
f085be
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
f085be
++			case CPU_PA_RISC2_0:
f085be
++		#if defined(_SC_KERNEL_BITS)
f085be
++			    switch (bits)
f085be
++				{
f085be
++				case 64: puts ("hppa2.0w"); break;
f085be
++				case 32: puts ("hppa2.0n"); break;
f085be
++				default: puts ("hppa2.0"); break;
f085be
++				} break;
f085be
++		#else  /* !defined(_SC_KERNEL_BITS) */
f085be
++			    puts ("hppa2.0"); break;
f085be
++		#endif
f085be
++			default: puts ("hppa1.0"); break;
f085be
++			}
f085be
++		    exit (0);
f085be
++		}
f085be
+ EOF
f085be
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
f085be
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
f085be
+@@ -656,7 +680,7 @@ EOF
f085be
+ 	    # => hppa64-hp-hpux11.23
f085be
+ 
f085be
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
f085be
+-		grep __LP64__ >/dev/null
f085be
++		grep -q __LP64__
f085be
+ 	    then
f085be
+ 		HP_ARCH="hppa2.0w"
f085be
+ 	    else
f085be
+@@ -727,22 +751,22 @@ EOF
f085be
+ 	exit ;;
f085be
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
f085be
+ 	echo c1-convex-bsd
f085be
+-        exit ;;
f085be
++	exit ;;
f085be
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
f085be
+ 	if getsysinfo -f scalar_acc
f085be
+ 	then echo c32-convex-bsd
f085be
+ 	else echo c2-convex-bsd
f085be
+ 	fi
f085be
+-        exit ;;
f085be
++	exit ;;
f085be
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
f085be
+ 	echo c34-convex-bsd
f085be
+-        exit ;;
f085be
++	exit ;;
f085be
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
f085be
+ 	echo c38-convex-bsd
f085be
+-        exit ;;
f085be
++	exit ;;
f085be
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
f085be
+ 	echo c4-convex-bsd
f085be
+-        exit ;;
f085be
++	exit ;;
f085be
+     CRAY*Y-MP:*:*:*)
f085be
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
f085be
+ 	exit ;;
f085be
+@@ -766,14 +790,14 @@ EOF
f085be
+ 	exit ;;
f085be
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
f085be
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
f085be
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
f085be
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
f085be
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
f085be
+-        exit ;;
f085be
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
f085be
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
f085be
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
f085be
++	exit ;;
f085be
+     5000:UNIX_System_V:4.*:*)
f085be
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
f085be
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
f085be
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
f085be
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
f085be
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
f085be
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
f085be
+ 	exit ;;
f085be
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
f085be
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
f085be
+@@ -785,34 +809,39 @@ EOF
f085be
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+     *:FreeBSD:*:*)
f085be
+-	case ${UNAME_MACHINE} in
f085be
+-	    pc98)
f085be
+-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
f085be
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
f085be
++	case ${UNAME_PROCESSOR} in
f085be
+ 	    amd64)
f085be
+ 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
f085be
+ 	    *)
f085be
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
f085be
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
f085be
+ 	esac
f085be
+ 	exit ;;
f085be
+     i*:CYGWIN*:*)
f085be
+ 	echo ${UNAME_MACHINE}-pc-cygwin
f085be
+ 	exit ;;
f085be
++    *:MINGW64*:*)
f085be
++	echo ${UNAME_MACHINE}-pc-mingw64
f085be
++	exit ;;
f085be
+     *:MINGW*:*)
f085be
+ 	echo ${UNAME_MACHINE}-pc-mingw32
f085be
+ 	exit ;;
f085be
++    i*:MSYS*:*)
f085be
++	echo ${UNAME_MACHINE}-pc-msys
f085be
++	exit ;;
f085be
+     i*:windows32*:*)
f085be
+-    	# uname -m includes "-pc" on this system.
f085be
+-    	echo ${UNAME_MACHINE}-mingw32
f085be
++	# uname -m includes "-pc" on this system.
f085be
++	echo ${UNAME_MACHINE}-mingw32
f085be
+ 	exit ;;
f085be
+     i*:PW*:*)
f085be
+ 	echo ${UNAME_MACHINE}-pc-pw32
f085be
+ 	exit ;;
f085be
+-    *:Interix*:[3456]*)
f085be
+-    	case ${UNAME_MACHINE} in
f085be
++    *:Interix*:*)
f085be
++	case ${UNAME_MACHINE} in
f085be
+ 	    x86)
f085be
+ 		echo i586-pc-interix${UNAME_RELEASE}
f085be
+ 		exit ;;
f085be
+-	    EM64T | authenticamd | genuineintel)
f085be
++	    authenticamd | genuineintel | EM64T)
f085be
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
f085be
+ 		exit ;;
f085be
+ 	    IA64)
f085be
+@@ -822,6 +851,9 @@ EOF
f085be
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
f085be
+ 	echo i${UNAME_MACHINE}-pc-mks
f085be
+ 	exit ;;
f085be
++    8664:Windows_NT:*)
f085be
++	echo x86_64-pc-mks
f085be
++	exit ;;
f085be
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
f085be
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
f085be
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
f085be
+@@ -842,210 +874,157 @@ EOF
f085be
+ 	exit ;;
f085be
+     *:GNU:*:*)
f085be
+ 	# the GNU system
f085be
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
f085be
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
f085be
+ 	exit ;;
f085be
+     *:GNU/*:*:*)
f085be
+ 	# other systems with GNU libc and userland
f085be
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
f085be
+ 	exit ;;
f085be
+     i*86:Minix:*:*)
f085be
+ 	echo ${UNAME_MACHINE}-pc-minix
f085be
+ 	exit ;;
f085be
++    aarch64:Linux:*:*)
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    aarch64_be:Linux:*:*)
f085be
++	UNAME_MACHINE=aarch64_be
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    alpha:Linux:*:*)
f085be
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
f085be
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
f085be
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
f085be
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
f085be
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
f085be
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
f085be
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
f085be
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
f085be
++	esac
f085be
++	objdump --private-headers /bin/sh | grep -q ld.so.1
f085be
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    arc:Linux:*:* | arceb:Linux:*:*)
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
+     arm*:Linux:*:*)
f085be
+ 	eval $set_cc_for_build
f085be
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
f085be
+ 	    | grep -q __ARM_EABI__
f085be
+ 	then
f085be
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	else
f085be
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
f085be
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
f085be
++		| grep -q __ARM_PCS_VFP
f085be
++	    then
f085be
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
f085be
++	    else
f085be
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
f085be
++	    fi
f085be
+ 	fi
f085be
+ 	exit ;;
f085be
+     avr32*:Linux:*:*)
f085be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     cris:Linux:*:*)
f085be
+-	echo cris-axis-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     crisv32:Linux:*:*)
f085be
+-	echo crisv32-axis-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     frv:Linux:*:*)
f085be
+-    	echo frv-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    hexagon:Linux:*:*)
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    i*86:Linux:*:*)
f085be
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     ia64:Linux:*:*)
f085be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     m32r*:Linux:*:*)
f085be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     m68*:Linux:*:*)
f085be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+-    mips:Linux:*:*)
f085be
+-	eval $set_cc_for_build
f085be
+-	sed 's/^	//' << EOF >$dummy.c
f085be
+-	#undef CPU
f085be
+-	#undef mips
f085be
+-	#undef mipsel
f085be
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
f085be
+-	CPU=mipsel
f085be
+-	#else
f085be
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
f085be
+-	CPU=mips
f085be
+-	#else
f085be
+-	CPU=
f085be
+-	#endif
f085be
+-	#endif
f085be
+-EOF
f085be
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
f085be
+-	    /^CPU/{
f085be
+-		s: ::g
f085be
+-		p
f085be
+-	    }'`"
f085be
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
f085be
+-	;;
f085be
+-    mips64:Linux:*:*)
f085be
++    mips:Linux:*:* | mips64:Linux:*:*)
f085be
+ 	eval $set_cc_for_build
f085be
+ 	sed 's/^	//' << EOF >$dummy.c
f085be
+ 	#undef CPU
f085be
+-	#undef mips64
f085be
+-	#undef mips64el
f085be
++	#undef ${UNAME_MACHINE}
f085be
++	#undef ${UNAME_MACHINE}el
f085be
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
f085be
+-	CPU=mips64el
f085be
++	CPU=${UNAME_MACHINE}el
f085be
+ 	#else
f085be
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
f085be
+-	CPU=mips64
f085be
++	CPU=${UNAME_MACHINE}
f085be
+ 	#else
f085be
+ 	CPU=
f085be
+ 	#endif
f085be
+ 	#endif
f085be
+ EOF
f085be
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
f085be
+-	    /^CPU/{
f085be
+-		s: ::g
f085be
+-		p
f085be
+-	    }'`"
f085be
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
f085be
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
f085be
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
f085be
+ 	;;
f085be
+-    or32:Linux:*:*)
f085be
+-	echo or32-unknown-linux-gnu
f085be
+-	exit ;;
f085be
+-    ppc:Linux:*:*)
f085be
+-	echo powerpc-unknown-linux-gnu
f085be
++    or1k:Linux:*:*)
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+-    ppc64:Linux:*:*)
f085be
+-	echo powerpc64-unknown-linux-gnu
f085be
+-	exit ;;
f085be
+-    alpha:Linux:*:*)
f085be
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
f085be
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
f085be
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
f085be
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
f085be
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
f085be
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
f085be
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
f085be
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
f085be
+-        esac
f085be
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
f085be
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
f085be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
f085be
++    or32:Linux:*:*)
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     padre:Linux:*:*)
f085be
+-	echo sparc-unknown-linux-gnu
f085be
++	echo sparc-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
f085be
++	echo hppa64-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     parisc:Linux:*:* | hppa:Linux:*:*)
f085be
+ 	# Look for CPU level
f085be
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
f085be
+-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
f085be
+-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
f085be
+-	  *)    echo hppa-unknown-linux-gnu ;;
f085be
++	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
f085be
++	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
f085be
++	  *)    echo hppa-unknown-linux-${LIBC} ;;
f085be
+ 	esac
f085be
+ 	exit ;;
f085be
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
f085be
+-	echo hppa64-unknown-linux-gnu
f085be
++    ppc64:Linux:*:*)
f085be
++	echo powerpc64-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    ppc:Linux:*:*)
f085be
++	echo powerpc-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    ppc64le:Linux:*:*)
f085be
++	echo powerpc64le-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    ppcle:Linux:*:*)
f085be
++	echo powerpcle-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     s390:Linux:*:* | s390x:Linux:*:*)
f085be
+-	echo ${UNAME_MACHINE}-ibm-linux
f085be
++	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     sh64*:Linux:*:*)
f085be
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     sh*:Linux:*:*)
f085be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     sparc:Linux:*:* | sparc64:Linux:*:*)
f085be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
++	exit ;;
f085be
++    tile*:Linux:*:*)
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     vax:Linux:*:*)
f085be
+-	echo ${UNAME_MACHINE}-dec-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     x86_64:Linux:*:*)
f085be
+-	echo x86_64-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+     xtensa*:Linux:*:*)
f085be
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
f085be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
f085be
+ 	exit ;;
f085be
+-    i*86:Linux:*:*)
f085be
+-	# The BFD linker knows what the default object file format is, so
f085be
+-	# first see if it will tell us. cd to the root directory to prevent
f085be
+-	# problems with other programs or directories called `ld' in the path.
f085be
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
f085be
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
f085be
+-			 | sed -ne '/supported targets:/!d
f085be
+-				    s/[ 	][ 	]*/ /g
f085be
+-				    s/.*supported targets: *//
f085be
+-				    s/ .*//
f085be
+-				    p'`
f085be
+-        case "$ld_supported_targets" in
f085be
+-	  elf32-i386)
f085be
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
f085be
+-		;;
f085be
+-	  a.out-i386-linux)
f085be
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
f085be
+-		exit ;;
f085be
+-	  "")
f085be
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
f085be
+-		# one that does not give us useful --help.
f085be
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
f085be
+-		exit ;;
f085be
+-	esac
f085be
+-	# Determine whether the default compiler is a.out or elf
f085be
+-	eval $set_cc_for_build
f085be
+-	sed 's/^	//' << EOF >$dummy.c
f085be
+-	#include <features.h>
f085be
+-	#ifdef __ELF__
f085be
+-	# ifdef __GLIBC__
f085be
+-	#  if __GLIBC__ >= 2
f085be
+-	LIBC=gnu
f085be
+-	#  else
f085be
+-	LIBC=gnulibc1
f085be
+-	#  endif
f085be
+-	# else
f085be
+-	LIBC=gnulibc1
f085be
+-	# endif
f085be
+-	#else
f085be
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
f085be
+-	LIBC=gnu
f085be
+-	#else
f085be
+-	LIBC=gnuaout
f085be
+-	#endif
f085be
+-	#endif
f085be
+-	#ifdef __dietlibc__
f085be
+-	LIBC=dietlibc
f085be
+-	#endif
f085be
+-EOF
f085be
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
f085be
+-	    /^LIBC/{
f085be
+-		s: ::g
f085be
+-		p
f085be
+-	    }'`"
f085be
+-	test x"${LIBC}" != x && {
f085be
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
f085be
+-		exit
f085be
+-	}
f085be
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
f085be
+-	;;
f085be
+     i*86:DYNIX/ptx:4*:*)
f085be
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
f085be
+ 	# earlier versions are messed up and put the nodename in both
f085be
+@@ -1053,11 +1032,11 @@ EOF
f085be
+ 	echo i386-sequent-sysv4
f085be
+ 	exit ;;
f085be
+     i*86:UNIX_SV:4.2MP:2.*)
f085be
+-        # Unixware is an offshoot of SVR4, but it has its own version
f085be
+-        # number series starting with 2...
f085be
+-        # I am not positive that other SVR4 systems won't match this,
f085be
++	# Unixware is an offshoot of SVR4, but it has its own version
f085be
++	# number series starting with 2...
f085be
++	# I am not positive that other SVR4 systems won't match this,
f085be
+ 	# I just have to hope.  -- rms.
f085be
+-        # Use sysv4.2uw... so that sysv4* matches it.
f085be
++	# Use sysv4.2uw... so that sysv4* matches it.
f085be
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
f085be
+ 	exit ;;
f085be
+     i*86:OS/2:*:*)
f085be
+@@ -1074,7 +1053,7 @@ EOF
f085be
+     i*86:syllable:*:*)
f085be
+ 	echo ${UNAME_MACHINE}-pc-syllable
f085be
+ 	exit ;;
f085be
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
f085be
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
f085be
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+     i*86:*DOS:*:*)
f085be
+@@ -1089,7 +1068,7 @@ EOF
f085be
+ 	fi
f085be
+ 	exit ;;
f085be
+     i*86:*:5:[678]*)
f085be
+-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
f085be
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
f085be
+ 	case `/bin/uname -X | grep "^Machine"` in
f085be
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
f085be
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
f085be
+@@ -1117,13 +1096,13 @@ EOF
f085be
+ 	exit ;;
f085be
+     pc:*:*:*)
f085be
+ 	# Left here for compatibility:
f085be
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
f085be
+-        # the processor, so we play safe by assuming i586.
f085be
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
f085be
++	# the processor, so we play safe by assuming i586.
f085be
+ 	# Note: whatever this is, it MUST be the same as what config.sub
f085be
+ 	# prints for the "djgpp" host, or else GDB configury will decide that
f085be
+ 	# this is a cross-build.
f085be
+ 	echo i586-pc-msdosdjgpp
f085be
+-        exit ;;
f085be
++	exit ;;
f085be
+     Intel:Mach:3*:*)
f085be
+ 	echo i386-pc-mach3
f085be
+ 	exit ;;
f085be
+@@ -1158,8 +1137,8 @@ EOF
f085be
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
f085be
+ 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
f085be
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
f085be
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
f085be
+-          && { echo i486-ncr-sysv4; exit; } ;;
f085be
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
f085be
++	  && { echo i486-ncr-sysv4; exit; } ;;
f085be
+     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
f085be
+ 	OS_REL='.3'
f085be
+ 	test -r /etc/.relid \
f085be
+@@ -1182,7 +1161,7 @@ EOF
f085be
+     rs6000:LynxOS:2.*:*)
f085be
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
f085be
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
f085be
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+     SM[BE]S:UNIX_SV:*:*)
f085be
+@@ -1202,10 +1181,10 @@ EOF
f085be
+ 		echo ns32k-sni-sysv
f085be
+ 	fi
f085be
+ 	exit ;;
f085be
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
f085be
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
f085be
+-        echo i586-unisys-sysv4
f085be
+-        exit ;;
f085be
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
f085be
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
f085be
++	echo i586-unisys-sysv4
f085be
++	exit ;;
f085be
+     *:UNIX_System_V:4*:FTX*)
f085be
+ 	# From Gerald Hewes <hewes@openmarket.com>.
f085be
+ 	# How about differentiating between stratus architectures? -djm
f085be
+@@ -1231,11 +1210,11 @@ EOF
f085be
+ 	exit ;;
f085be
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
f085be
+ 	if [ -d /usr/nec ]; then
f085be
+-	        echo mips-nec-sysv${UNAME_RELEASE}
f085be
++		echo mips-nec-sysv${UNAME_RELEASE}
f085be
+ 	else
f085be
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
f085be
++		echo mips-unknown-sysv${UNAME_RELEASE}
f085be
+ 	fi
f085be
+-        exit ;;
f085be
++	exit ;;
f085be
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
f085be
+ 	echo powerpc-be-beos
f085be
+ 	exit ;;
f085be
+@@ -1248,6 +1227,9 @@ EOF
f085be
+     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
f085be
+ 	echo i586-pc-haiku
f085be
+ 	exit ;;
f085be
++    x86_64:Haiku:*:*)
f085be
++	echo x86_64-unknown-haiku
f085be
++	exit ;;
f085be
+     SX-4:SUPER-UX:*:*)
f085be
+ 	echo sx4-nec-superux${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+@@ -1274,9 +1256,21 @@ EOF
f085be
+ 	exit ;;
f085be
+     *:Darwin:*:*)
f085be
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
f085be
+-	case $UNAME_PROCESSOR in
f085be
+-	    unknown) UNAME_PROCESSOR=powerpc ;;
f085be
+-	esac
f085be
++	eval $set_cc_for_build
f085be
++	if test "$UNAME_PROCESSOR" = unknown ; then
f085be
++	    UNAME_PROCESSOR=powerpc
f085be
++	fi
f085be
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
f085be
++	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
f085be
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
f085be
++		grep IS_64BIT_ARCH >/dev/null
f085be
++	    then
f085be
++		case $UNAME_PROCESSOR in
f085be
++		    i386) UNAME_PROCESSOR=x86_64 ;;
f085be
++		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
f085be
++		esac
f085be
++	    fi
f085be
++	fi
f085be
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
f085be
+@@ -1290,7 +1284,10 @@ EOF
f085be
+     *:QNX:*:4*)
f085be
+ 	echo i386-pc-qnx
f085be
+ 	exit ;;
f085be
+-    NSE-?:NONSTOP_KERNEL:*:*)
f085be
++    NEO-?:NONSTOP_KERNEL:*:*)
f085be
++	echo neo-tandem-nsk${UNAME_RELEASE}
f085be
++	exit ;;
f085be
++    NSE-*:NONSTOP_KERNEL:*:*)
f085be
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+     NSR-?:NONSTOP_KERNEL:*:*)
f085be
+@@ -1335,13 +1332,13 @@ EOF
f085be
+ 	echo pdp10-unknown-its
f085be
+ 	exit ;;
f085be
+     SEI:*:*:SEIUX)
f085be
+-        echo mips-sei-seiux${UNAME_RELEASE}
f085be
++	echo mips-sei-seiux${UNAME_RELEASE}
f085be
+ 	exit ;;
f085be
+     *:DragonFly:*:*)
f085be
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
f085be
+ 	exit ;;
f085be
+     *:*VMS:*:*)
f085be
+-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
f085be
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
f085be
+ 	case "${UNAME_MACHINE}" in
f085be
+ 	    A*) echo alpha-dec-vms ; exit ;;
f085be
+ 	    I*) echo ia64-dec-vms ; exit ;;
f085be
+@@ -1359,11 +1356,11 @@ EOF
f085be
+     i*86:AROS:*:*)
f085be
+ 	echo ${UNAME_MACHINE}-pc-aros
f085be
+ 	exit ;;
f085be
++    x86_64:VMkernel:*:*)
f085be
++	echo ${UNAME_MACHINE}-unknown-esx
f085be
++	exit ;;
f085be
+ esac
f085be
+ 
f085be
+-#echo '(No uname command or uname output not recognized.)' 1>&2
f085be
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
f085be
+-
f085be
+ eval $set_cc_for_build
f085be
+ cat >$dummy.c <
f085be
+ #ifdef _SEQUENT_
f085be
+@@ -1381,11 +1378,11 @@ main ()
f085be
+ #include <sys/param.h>
f085be
+   printf ("m68k-sony-newsos%s\n",
f085be
+ #ifdef NEWSOS4
f085be
+-          "4"
f085be
++	"4"
f085be
+ #else
f085be
+-	  ""
f085be
++	""
f085be
+ #endif
f085be
+-         ); exit (0);
f085be
++	); exit (0);
f085be
+ #endif
f085be
+ #endif
f085be
+ 
f085be
+diff --git a/config.sub b/config.sub
f085be
+index 45bad78..d2a9613 100755
f085be
+--- a/config.sub
f085be
++++ b/config.sub
f085be
+@@ -1,44 +1,40 @@
f085be
+ #! /bin/sh
f085be
+ # Configuration validation subroutine script.
f085be
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
f085be
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
f085be
+-#   Free Software Foundation, Inc.
f085be
++#   Copyright 1992-2013 Free Software Foundation, Inc.
f085be
+ 
f085be
+-timestamp='2009-04-17'
f085be
++timestamp='2013-08-10'
f085be
+ 
f085be
+-# This file is (in principle) common to ALL GNU software.
f085be
+-# The presence of a machine in this file suggests that SOME GNU software
f085be
+-# can handle that machine.  It does not imply ALL GNU software can.
f085be
+-#
f085be
+-# This file is free software; you can redistribute it and/or modify
f085be
+-# it under the terms of the GNU General Public License as published by
f085be
+-# the Free Software Foundation; either version 2 of the License, or
f085be
++# This file is free software; you can redistribute it and/or modify it
f085be
++# under the terms of the GNU General Public License as published by
f085be
++# the Free Software Foundation; either version 3 of the License, or
f085be
+ # (at your option) any later version.
f085be
+ #
f085be
+-# This program is distributed in the hope that it will be useful,
f085be
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
f085be
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
f085be
+-# GNU General Public License for more details.
f085be
++# This program is distributed in the hope that it will be useful, but
f085be
++# WITHOUT ANY WARRANTY; without even the implied warranty of
f085be
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
f085be
++# General Public License for more details.
f085be
+ #
f085be
+ # You should have received a copy of the GNU General Public License
f085be
+-# along with this program; if not, write to the Free Software
f085be
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
f085be
+-# 02110-1301, USA.
f085be
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
f085be
+ #
f085be
+ # As a special exception to the GNU General Public License, if you
f085be
+ # distribute this file as part of a program that contains a
f085be
+ # configuration script generated by Autoconf, you may include it under
f085be
+-# the same distribution terms that you use for the rest of that program.
f085be
++# the same distribution terms that you use for the rest of that
f085be
++# program.  This Exception is an additional permission under section 7
f085be
++# of the GNU General Public License, version 3 ("GPLv3").
f085be
+ 
f085be
+ 
f085be
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
f085be
+-# diff and a properly formatted ChangeLog entry.
f085be
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
f085be
+ #
f085be
+ # Configuration subroutine to validate and canonicalize a configuration type.
f085be
+ # Supply the specified configuration type as an argument.
f085be
+ # If it is invalid, we print an error message on stderr and exit with code 1.
f085be
+ # Otherwise, we print the canonical config type on stdout and succeed.
f085be
+ 
f085be
++# You can get the latest version of this script from:
f085be
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
f085be
++
f085be
+ # This file is supposed to be the same for all GNU packages
f085be
+ # and recognize all the CPU types, system types and aliases
f085be
+ # that are meaningful with *any* GNU software.
f085be
+@@ -72,8 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
f085be
+ version="\
f085be
+ GNU config.sub ($timestamp)
f085be
+ 
f085be
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
f085be
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
f085be
++Copyright 1992-2013 Free Software Foundation, Inc.
f085be
+ 
f085be
+ This is free software; see the source for copying conditions.  There is NO
f085be
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
f085be
+@@ -120,13 +115,18 @@ esac
f085be
+ # Here we must recognize all the valid KERNEL-OS combinations.
f085be
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
f085be
+ case $maybe_os in
f085be
+-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
f085be
+-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
f085be
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
f085be
++  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
f085be
++  knetbsd*-gnu* | netbsd*-gnu* | \
f085be
+   kopensolaris*-gnu* | \
f085be
+   storm-chaos* | os2-emx* | rtmk-nova*)
f085be
+     os=-$maybe_os
f085be
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
f085be
+     ;;
f085be
++  android-linux)
f085be
++    os=-linux-android
f085be
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
f085be
++    ;;
f085be
+   *)
f085be
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
f085be
+     if [ $basic_machine != $1 ]
f085be
+@@ -149,10 +149,13 @@ case $os in
f085be
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
f085be
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
f085be
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
f085be
+-	-apple | -axis | -knuth | -cray)
f085be
++	-apple | -axis | -knuth | -cray | -microblaze*)
f085be
+ 		os=
f085be
+ 		basic_machine=$1
f085be
+ 		;;
f085be
++	-bluegene*)
f085be
++		os=-cnk
f085be
++		;;
f085be
+ 	-sim | -cisco | -oki | -wec | -winbond)
f085be
+ 		os=
f085be
+ 		basic_machine=$1
f085be
+@@ -167,10 +170,10 @@ case $os in
f085be
+ 		os=-chorusos
f085be
+ 		basic_machine=$1
f085be
+ 		;;
f085be
+- 	-chorusrdb)
f085be
+- 		os=-chorusrdb
f085be
++	-chorusrdb)
f085be
++		os=-chorusrdb
f085be
+ 		basic_machine=$1
f085be
+- 		;;
f085be
++		;;
f085be
+ 	-hiux*)
f085be
+ 		os=-hiuxwe2
f085be
+ 		;;
f085be
+@@ -215,6 +218,12 @@ case $os in
f085be
+ 	-isc*)
f085be
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
f085be
+ 		;;
f085be
++	-lynx*178)
f085be
++		os=-lynxos178
f085be
++		;;
f085be
++	-lynx*5)
f085be
++		os=-lynxos5
f085be
++		;;
f085be
+ 	-lynx*)
f085be
+ 		os=-lynxos
f085be
+ 		;;
f085be
+@@ -239,20 +248,27 @@ case $basic_machine in
f085be
+ 	# Some are omitted here because they have special meanings below.
f085be
+ 	1750a | 580 \
f085be
+ 	| a29k \
f085be
++	| aarch64 | aarch64_be \
f085be
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
f085be
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
f085be
+ 	| am33_2.0 \
f085be
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
f085be
++	| arc | arceb \
f085be
++	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
f085be
++	| avr | avr32 \
f085be
++	| be32 | be64 \
f085be
+ 	| bfin \
f085be
+-	| c4x | clipper \
f085be
++	| c4x | c8051 | clipper \
f085be
+ 	| d10v | d30v | dlx | dsp16xx \
f085be
++	| epiphany \
f085be
+ 	| fido | fr30 | frv \
f085be
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
f085be
++	| hexagon \
f085be
+ 	| i370 | i860 | i960 | ia64 \
f085be
+ 	| ip2k | iq2000 \
f085be
++	| le32 | le64 \
f085be
+ 	| lm32 \
f085be
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
f085be
+-	| maxq | mb | microblaze | mcore | mep | metag \
f085be
++	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
f085be
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
f085be
+ 	| mips16 \
f085be
+ 	| mips64 | mips64el \
f085be
+@@ -270,32 +286,45 @@ case $basic_machine in
f085be
+ 	| mipsisa64r2 | mipsisa64r2el \
f085be
+ 	| mipsisa64sb1 | mipsisa64sb1el \
f085be
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
f085be
++	| mipsr5900 | mipsr5900el \
f085be
+ 	| mipstx39 | mipstx39el \
f085be
+ 	| mn10200 | mn10300 \
f085be
+ 	| moxie \
f085be
+ 	| mt \
f085be
+ 	| msp430 \
f085be
+-	| nios | nios2 \
f085be
++	| nds32 | nds32le | nds32be \
f085be
++	| nios | nios2 | nios2eb | nios2el \
f085be
+ 	| ns16k | ns32k \
f085be
+-	| or32 \
f085be
++	| open8 \
f085be
++	| or1k | or32 \
f085be
+ 	| pdp10 | pdp11 | pj | pjl \
f085be
+-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
f085be
++	| powerpc | powerpc64 | powerpc64le | powerpcle \
f085be
+ 	| pyramid \
f085be
++	| rl78 | rx \
f085be
+ 	| score \
f085be
+ 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
f085be
+ 	| sh64 | sh64le \
f085be
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
f085be
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
f085be
+-	| spu | strongarm \
f085be
+-	| tahoe | thumb | tic4x | tic80 | tron \
f085be
+-	| v850 | v850e \
f085be
++	| spu \
f085be
++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
f085be
++	| ubicom32 \
f085be
++	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
f085be
+ 	| we32k \
f085be
+-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
f085be
++	| x86 | xc16x | xstormy16 | xtensa \
f085be
+ 	| z8k | z80)
f085be
+ 		basic_machine=$basic_machine-unknown
f085be
+ 		;;
f085be
+-	m6811 | m68hc11 | m6812 | m68hc12)
f085be
+-		# Motorola 68HC11/12.
f085be
++	c54x)
f085be
++		basic_machine=tic54x-unknown
f085be
++		;;
f085be
++	c55x)
f085be
++		basic_machine=tic55x-unknown
f085be
++		;;
f085be
++	c6x)
f085be
++		basic_machine=tic6x-unknown
f085be
++		;;
f085be
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
f085be
+ 		basic_machine=$basic_machine-unknown
f085be
+ 		os=-none
f085be
+ 		;;
f085be
+@@ -305,6 +334,21 @@ case $basic_machine in
f085be
+ 		basic_machine=mt-unknown
f085be
+ 		;;
f085be
+ 
f085be
++	strongarm | thumb | xscale)
f085be
++		basic_machine=arm-unknown
f085be
++		;;
f085be
++	xgate)
f085be
++		basic_machine=$basic_machine-unknown
f085be
++		os=-none
f085be
++		;;
f085be
++	xscaleeb)
f085be
++		basic_machine=armeb-unknown
f085be
++		;;
f085be
++
f085be
++	xscaleel)
f085be
++		basic_machine=armel-unknown
f085be
++		;;
f085be
++
f085be
+ 	# We use `pc' rather than `unknown'
f085be
+ 	# because (1) that's what they normally are, and
f085be
+ 	# (2) the word "unknown" tends to confuse beginning users.
f085be
+@@ -319,25 +363,30 @@ case $basic_machine in
f085be
+ 	# Recognize the basic CPU types with company name.
f085be
+ 	580-* \
f085be
+ 	| a29k-* \
f085be
++	| aarch64-* | aarch64_be-* \
f085be
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
f085be
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
f085be
+-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
f085be
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
f085be
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
f085be
+ 	| avr-* | avr32-* \
f085be
++	| be32-* | be64-* \
f085be
+ 	| bfin-* | bs2000-* \
f085be
+-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
f085be
+-	| clipper-* | craynv-* | cydra-* \
f085be
++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
f085be
++	| c8051-* | clipper-* | craynv-* | cydra-* \
f085be
+ 	| d10v-* | d30v-* | dlx-* \
f085be
+ 	| elxsi-* \
f085be
+ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
f085be
+ 	| h8300-* | h8500-* \
f085be
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
f085be
++	| hexagon-* \
f085be
+ 	| i*86-* | i860-* | i960-* | ia64-* \
f085be
+ 	| ip2k-* | iq2000-* \
f085be
++	| le32-* | le64-* \
f085be
+ 	| lm32-* \
f085be
+ 	| m32c-* | m32r-* | m32rle-* \
f085be
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
f085be
+ 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
f085be
++	| microblaze-* | microblazeel-* \
f085be
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
f085be
+ 	| mips16-* \
f085be
+ 	| mips64-* | mips64el-* \
f085be
+@@ -355,28 +404,34 @@ case $basic_machine in
f085be
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
f085be
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
f085be
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
f085be
++	| mipsr5900-* | mipsr5900el-* \
f085be
+ 	| mipstx39-* | mipstx39el-* \
f085be
+ 	| mmix-* \
f085be
+ 	| mt-* \
f085be
+ 	| msp430-* \
f085be
+-	| nios-* | nios2-* \
f085be
++	| nds32-* | nds32le-* | nds32be-* \
f085be
++	| nios-* | nios2-* | nios2eb-* | nios2el-* \
f085be
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
f085be
++	| open8-* \
f085be
+ 	| orion-* \
f085be
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
f085be
+-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
f085be
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
f085be
+ 	| pyramid-* \
f085be
+-	| romp-* | rs6000-* \
f085be
++	| rl78-* | romp-* | rs6000-* | rx-* \
f085be
+ 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
f085be
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
f085be
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
f085be
+ 	| sparclite-* \
f085be
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
f085be
+-	| tahoe-* | thumb-* \
f085be
+-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
f085be
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
f085be
++	| tahoe-* \
f085be
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
f085be
++	| tile*-* \
f085be
+ 	| tron-* \
f085be
+-	| v850-* | v850e-* | vax-* \
f085be
++	| ubicom32-* \
f085be
++	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
f085be
++	| vax-* \
f085be
+ 	| we32k-* \
f085be
+-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
f085be
++	| x86-* | x86_64-* | xc16x-* | xps100-* \
f085be
+ 	| xstormy16-* | xtensa*-* \
f085be
+ 	| ymp-* \
f085be
+ 	| z8k-* | z80-*)
f085be
+@@ -401,7 +456,7 @@ case $basic_machine in
f085be
+ 		basic_machine=a29k-amd
f085be
+ 		os=-udi
f085be
+ 		;;
f085be
+-    	abacus)
f085be
++	abacus)
f085be
+ 		basic_machine=abacus-unknown
f085be
+ 		;;
f085be
+ 	adobe68k)
f085be
+@@ -467,11 +522,24 @@ case $basic_machine in
f085be
+ 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
+ 		os=-linux
f085be
+ 		;;
f085be
++	bluegene*)
f085be
++		basic_machine=powerpc-ibm
f085be
++		os=-cnk
f085be
++		;;
f085be
++	c54x-*)
f085be
++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
++		;;
f085be
++	c55x-*)
f085be
++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
++		;;
f085be
++	c6x-*)
f085be
++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
++		;;
f085be
+ 	c90)
f085be
+ 		basic_machine=c90-cray
f085be
+ 		os=-unicos
f085be
+ 		;;
f085be
+-        cegcc)
f085be
++	cegcc)
f085be
+ 		basic_machine=arm-unknown
f085be
+ 		os=-cegcc
f085be
+ 		;;
f085be
+@@ -503,7 +571,7 @@ case $basic_machine in
f085be
+ 		basic_machine=craynv-cray
f085be
+ 		os=-unicosmp
f085be
+ 		;;
f085be
+-	cr16)
f085be
++	cr16 | cr16-*)
f085be
+ 		basic_machine=cr16-unknown
f085be
+ 		os=-elf
f085be
+ 		;;
f085be
+@@ -661,7 +729,6 @@ case $basic_machine in
f085be
+ 	i370-ibm* | ibm*)
f085be
+ 		basic_machine=i370-ibm
f085be
+ 		;;
f085be
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
f085be
+ 	i*86v32)
f085be
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
f085be
+ 		os=-sysv32
f085be
+@@ -719,8 +786,15 @@ case $basic_machine in
f085be
+ 		basic_machine=ns32k-utek
f085be
+ 		os=-sysv
f085be
+ 		;;
f085be
++	microblaze*)
f085be
++		basic_machine=microblaze-xilinx
f085be
++		;;
f085be
++	mingw64)
f085be
++		basic_machine=x86_64-pc
f085be
++		os=-mingw64
f085be
++		;;
f085be
+ 	mingw32)
f085be
+-		basic_machine=i386-pc
f085be
++		basic_machine=i686-pc
f085be
+ 		os=-mingw32
f085be
+ 		;;
f085be
+ 	mingw32ce)
f085be
+@@ -755,10 +829,18 @@ case $basic_machine in
f085be
+ 	ms1-*)
f085be
+ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
f085be
+ 		;;
f085be
++	msys)
f085be
++		basic_machine=i686-pc
f085be
++		os=-msys
f085be
++		;;
f085be
+ 	mvs)
f085be
+ 		basic_machine=i370-ibm
f085be
+ 		os=-mvs
f085be
+ 		;;
f085be
++	nacl)
f085be
++		basic_machine=le32-unknown
f085be
++		os=-nacl
f085be
++		;;
f085be
+ 	ncr3000)
f085be
+ 		basic_machine=i486-ncr
f085be
+ 		os=-sysv4
f085be
+@@ -823,6 +905,12 @@ case $basic_machine in
f085be
+ 	np1)
f085be
+ 		basic_machine=np1-gould
f085be
+ 		;;
f085be
++	neo-tandem)
f085be
++		basic_machine=neo-tandem
f085be
++		;;
f085be
++	nse-tandem)
f085be
++		basic_machine=nse-tandem
f085be
++		;;
f085be
+ 	nsr-tandem)
f085be
+ 		basic_machine=nsr-tandem
f085be
+ 		;;
f085be
+@@ -905,9 +993,10 @@ case $basic_machine in
f085be
+ 		;;
f085be
+ 	power)	basic_machine=power-ibm
f085be
+ 		;;
f085be
+-	ppc)	basic_machine=powerpc-unknown
f085be
++	ppc | ppcbe)	basic_machine=powerpc-unknown
f085be
+ 		;;
f085be
+-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
++	ppc-* | ppcbe-*)
f085be
++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
+ 		;;
f085be
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
f085be
+ 		basic_machine=powerpcle-unknown
f085be
+@@ -917,7 +1006,7 @@ case $basic_machine in
f085be
+ 		;;
f085be
+ 	ppc64)	basic_machine=powerpc64-unknown
f085be
+ 		;;
f085be
+-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
++	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
+ 		;;
f085be
+ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
f085be
+ 		basic_machine=powerpc64le-unknown
f085be
+@@ -932,7 +1021,11 @@ case $basic_machine in
f085be
+ 		basic_machine=i586-unknown
f085be
+ 		os=-pw32
f085be
+ 		;;
f085be
+-	rdos)
f085be
++	rdos | rdos64)
f085be
++		basic_machine=x86_64-pc
f085be
++		os=-rdos
f085be
++		;;
f085be
++	rdos32)
f085be
+ 		basic_machine=i386-pc
f085be
+ 		os=-rdos
f085be
+ 		;;
f085be
+@@ -1001,6 +1094,9 @@ case $basic_machine in
f085be
+ 		basic_machine=i860-stratus
f085be
+ 		os=-sysv4
f085be
+ 		;;
f085be
++	strongarm-* | thumb-*)
f085be
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
f085be
++		;;
f085be
+ 	sun2)
f085be
+ 		basic_machine=m68000-sun
f085be
+ 		;;
f085be
+@@ -1057,20 +1153,8 @@ case $basic_machine in
f085be
+ 		basic_machine=t90-cray
f085be
+ 		os=-unicos
f085be
+ 		;;
f085be
+-	tic54x | c54x*)
f085be
+-		basic_machine=tic54x-unknown
f085be
+-		os=-coff
f085be
+-		;;
f085be
+-	tic55x | c55x*)
f085be
+-		basic_machine=tic55x-unknown
f085be
+-		os=-coff
f085be
+-		;;
f085be
+-	tic6x | c6x*)
f085be
+-		basic_machine=tic6x-unknown
f085be
+-		os=-coff
f085be
+-		;;
f085be
+ 	tile*)
f085be
+-		basic_machine=tile-unknown
f085be
++		basic_machine=$basic_machine-unknown
f085be
+ 		os=-linux-gnu
f085be
+ 		;;
f085be
+ 	tx39)
f085be
+@@ -1140,6 +1224,9 @@ case $basic_machine in
f085be
+ 	xps | xps100)
f085be
+ 		basic_machine=xps100-honeywell
f085be
+ 		;;
f085be
++	xscale-* | xscalee[bl]-*)
f085be
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
f085be
++		;;
f085be
+ 	ymp)
f085be
+ 		basic_machine=ymp-cray
f085be
+ 		os=-unicos
f085be
+@@ -1237,9 +1324,12 @@ esac
f085be
+ if [ x"$os" != x"" ]
f085be
+ then
f085be
+ case $os in
f085be
+-        # First match some system type aliases
f085be
+-        # that might get confused with valid system types.
f085be
++	# First match some system type aliases
f085be
++	# that might get confused with valid system types.
f085be
+ 	# -solaris* is a basic system type, with this one exception.
f085be
++	-auroraux)
f085be
++		os=-auroraux
f085be
++		;;
f085be
+ 	-solaris1 | -solaris1.*)
f085be
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
f085be
+ 		;;
f085be
+@@ -1260,22 +1350,23 @@ case $os in
f085be
+ 	# Each alternative MUST END IN A *, to match a version number.
f085be
+ 	# -sysv* is not here because it comes later, after sysvr4.
f085be
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
f085be
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
f085be
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
f085be
+-	      | -kopensolaris* \
f085be
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
f085be
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
f085be
++	      | -sym* | -kopensolaris* | -plan9* \
f085be
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
f085be
+ 	      | -aos* | -aros* \
f085be
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
f085be
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
f085be
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
f085be
+-	      | -openbsd* | -solidbsd* \
f085be
++	      | -bitrig* | -openbsd* | -solidbsd* \
f085be
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
f085be
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
f085be
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
f085be
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
f085be
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
f085be
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
f085be
+-	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
f085be
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
f085be
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
f085be
++	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
f085be
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
f085be
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
f085be
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
f085be
+@@ -1283,7 +1374,7 @@ case $os in
f085be
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
f085be
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
f085be
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
f085be
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
f085be
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
f085be
+ 	# Remember, each alternative MUST END IN *, to match a version number.
f085be
+ 		;;
f085be
+ 	-qnx*)
f085be
+@@ -1322,7 +1413,7 @@ case $os in
f085be
+ 	-opened*)
f085be
+ 		os=-openedition
f085be
+ 		;;
f085be
+-        -os400*)
f085be
++	-os400*)
f085be
+ 		os=-os400
f085be
+ 		;;
f085be
+ 	-wince*)
f085be
+@@ -1371,7 +1462,7 @@ case $os in
f085be
+ 	-sinix*)
f085be
+ 		os=-sysv4
f085be
+ 		;;
f085be
+-        -tpf*)
f085be
++	-tpf*)
f085be
+ 		os=-tpf
f085be
+ 		;;
f085be
+ 	-triton*)
f085be
+@@ -1407,15 +1498,14 @@ case $os in
f085be
+ 	-aros*)
f085be
+ 		os=-aros
f085be
+ 		;;
f085be
+-	-kaos*)
f085be
+-		os=-kaos
f085be
+-		;;
f085be
+ 	-zvmoe)
f085be
+ 		os=-zvmoe
f085be
+ 		;;
f085be
+ 	-dicos*)
f085be
+ 		os=-dicos
f085be
+ 		;;
f085be
++	-nacl*)
f085be
++		;;
f085be
+ 	-none)
f085be
+ 		;;
f085be
+ 	*)
f085be
+@@ -1438,10 +1528,10 @@ else
f085be
+ # system, and we'll never get to this point.
f085be
+ 
f085be
+ case $basic_machine in
f085be
+-        score-*)
f085be
++	score-*)
f085be
+ 		os=-elf
f085be
+ 		;;
f085be
+-        spu-*)
f085be
++	spu-*)
f085be
+ 		os=-elf
f085be
+ 		;;
f085be
+ 	*-acorn)
f085be
+@@ -1453,8 +1543,23 @@ case $basic_machine in
f085be
+ 	arm*-semi)
f085be
+ 		os=-aout
f085be
+ 		;;
f085be
+-        c4x-* | tic4x-*)
f085be
+-        	os=-coff
f085be
++	c4x-* | tic4x-*)
f085be
++		os=-coff
f085be
++		;;
f085be
++	c8051-*)
f085be
++		os=-elf
f085be
++		;;
f085be
++	hexagon-*)
f085be
++		os=-elf
f085be
++		;;
f085be
++	tic54x-*)
f085be
++		os=-coff
f085be
++		;;
f085be
++	tic55x-*)
f085be
++		os=-coff
f085be
++		;;
f085be
++	tic6x-*)
f085be
++		os=-coff
f085be
+ 		;;
f085be
+ 	# This must come before the *-dec entry.
f085be
+ 	pdp10-*)
f085be
+@@ -1474,14 +1579,11 @@ case $basic_machine in
f085be
+ 		;;
f085be
+ 	m68000-sun)
f085be
+ 		os=-sunos3
f085be
+-		# This also exists in the configure program, but was not the
f085be
+-		# default.
f085be
+-		# os=-sunos4
f085be
+ 		;;
f085be
+ 	m68*-cisco)
f085be
+ 		os=-aout
f085be
+ 		;;
f085be
+-        mep-*)
f085be
++	mep-*)
f085be
+ 		os=-elf
f085be
+ 		;;
f085be
+ 	mips*-cisco)
f085be
+@@ -1490,6 +1592,9 @@ case $basic_machine in
f085be
+ 	mips*-*)
f085be
+ 		os=-elf
f085be
+ 		;;
f085be
++	or1k-*)
f085be
++		os=-elf
f085be
++		;;
f085be
+ 	or32-*)
f085be
+ 		os=-coff
f085be
+ 		;;
f085be
+@@ -1508,7 +1613,7 @@ case $basic_machine in
f085be
+ 	*-ibm)
f085be
+ 		os=-aix
f085be
+ 		;;
f085be
+-    	*-knuth)
f085be
++	*-knuth)
f085be
+ 		os=-mmixware
f085be
+ 		;;
f085be
+ 	*-wec)
f085be
+@@ -1613,7 +1718,7 @@ case $basic_machine in
f085be
+ 			-sunos*)
f085be
+ 				vendor=sun
f085be
+ 				;;
f085be
+-			-aix*)
f085be
++			-cnk*|-aix*)
f085be
+ 				vendor=ibm
f085be
+ 				;;
f085be
+ 			-beos*)
f085be
+-- 
f085be
+1.9.0
f085be
+
f085be
-- 
f085be
1.9.0
f085be