2 files changed, 274 insertions, 331 deletions

diff --git a/config.guess b/config.guess
index c5636280d..c4bd827a7 100755
--- a/config.guess
+++ b/config.guess
@@ -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,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2012-12-23'
+timestamp='2016-05-15'
 
 # 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
@@ -22,19 +20,17 @@ timestamp='2012-12-23'
 # 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
+# http://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,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 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, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2016 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."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+        # 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'`
+        ;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -153,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # 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)`
+        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 ;;
+            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.
+        # 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
                 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -182,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                 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
         # Debian GNU/NetBSD machines have a different userland, and
         # thus, need a distinct triplet. However, they do not need
@@ -192,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                 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.//'`
@@ -208,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
         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 ;;
     *:ekkoBSD:*:*)
         echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
         exit ;;
@@ -220,6 +256,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:MirBSD:*:*)
         echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
         exit ;;
+    *:Sortix:*:*)
+        echo ${UNAME_MACHINE}-unknown-sortix
+        exit ;;
     alpha:OSF1:*:*)
         case $UNAME_RELEASE in
         *4.0)
@@ -236,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         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'`
+        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
@@ -344,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
         eval $set_cc_for_build
-        SUN_ARCH="i386"
+        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/[^.]*//'`
@@ -378,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         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}
@@ -564,8 +603,9 @@ EOF
         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}
         fi
@@ -602,13 +642,13 @@ EOF
                     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
+                      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
+                          32) HP_ARCH=hppa2.0n ;;
+                          64) HP_ARCH=hppa2.0w ;;
+                          '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
                         esac ;;
                     esac
                 fi
@@ -647,11 +687,11 @@ EOF
                     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
 
@@ -664,12 +704,12 @@ EOF
             # $ 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}
@@ -774,14 +814,14 @@ EOF
         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_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+        FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -811,7 +851,7 @@ EOF
     *:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
         exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
         echo ${UNAME_MACHINE}-pc-msys
         exit ;;
     i*:windows32*:*)
@@ -859,21 +899,21 @@ EOF
         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
         exit ;;
     aarch64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     aarch64_be:Linux:*:*)
         UNAME_MACHINE=aarch64_be
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     alpha:Linux:*:*)
         case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -886,59 +926,60 @@ EOF
           EV68*) UNAME_MACHINE=alphaev68 ;;
         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
         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
             if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
                 | grep -q __ARM_PCS_VFP
             then
-                echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
             else
-                echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+                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 ${UNAME_MACHINE}-axis-linux-gnu
+        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
         exit ;;
     crisv32:Linux:*:*)
-        echo ${UNAME_MACHINE}-axis-linux-gnu
+        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+        exit ;;
+    e2k:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     frv:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
         exit ;;
     hexagon:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        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
@@ -957,60 +998,63 @@ EOF
         #endif
 EOF
         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
         ;;
-    or32:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+    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-gnu
+        echo powerpc64le-unknown-linux-${LIBC}
         exit ;;
     ppcle:Linux:*:*)
-        echo powerpcle-unknown-linux-gnu
+        echo powerpcle-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}-unknown-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 ${UNAME_MACHINE}-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.
@@ -1086,7 +1130,7 @@ EOF
         # 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 ;;
@@ -1235,6 +1279,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
         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}
         exit ;;
@@ -1243,24 +1290,36 @@ EOF
         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
+        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
+            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
@@ -1291,7 +1350,7 @@ EOF
         # "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"
@@ -1333,7 +1392,7 @@ EOF
         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
@@ -1344,171 +1403,25 @@ EOF
     x86_64:VMkernel:*:*)
         echo ${UNAME_MACHINE}-unknown-esx
         exit ;;
-esac
-
-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
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-        printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-        printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-        { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# 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
+    amd64:Isilon\ OneFS:*:*)
+        echo x86_64-unknown-onefs
         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
+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
+  http://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
+  http://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
 
diff --git a/config.sub b/config.sub
index eee8dccb0..9feb73bf0 100755
--- a/config.sub
+++ b/config.sub
@@ -1,24 +1,18 @@
 #! /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,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2012-12-23'
+timestamp='2016-06-20'
 
-# 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
+# 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, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-12-23'
 # 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.
@@ -38,7 +33,7 @@ timestamp='2012-12-23'
 # 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
+# http://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
@@ -58,8 +53,7 @@ timestamp='2012-12-23'
 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.
 
@@ -73,9 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 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, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2016 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."
@@ -124,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -259,19 +251,21 @@ case $basic_machine in
         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
         | am33_2.0 \
-        | arc \
+        | 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 \
-        | epiphany \
-        | fido | fr30 | frv \
+        | e2k | epiphany \
+        | fido | fr30 | frv | ft32 \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | hexagon \
         | i370 | i860 | i960 | ia64 \
         | ip2k | iq2000 \
+        | k1om \
         | le32 | le64 \
         | lm32 \
         | m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -289,26 +283,29 @@ case $basic_machine in
         | 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 \
-        | open8 \
-        | or32 \
+        | open8 | or1k | or1knd | or32 \
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle \
         | pyramid \
+        | 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 \
@@ -316,6 +313,7 @@ case $basic_machine in
         | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
         | ubicom32 \
         | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+        | visium \
         | we32k \
         | x86 | xc16x | xstormy16 | xtensa \
         | z8k | z80)
@@ -330,7 +328,10 @@ case $basic_machine in
         c6x)
                 basic_machine=tic6x-unknown
                 ;;
-        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+        leon|leon[3-9])
+                basic_machine=sparc-$basic_machine
+                ;;
+        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
                 basic_machine=$basic_machine-unknown
                 os=-none
                 ;;
@@ -372,21 +373,23 @@ case $basic_machine in
         | 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-* \
         | hexagon-* \
         | i*86-* | i860-* | i960-* | ia64-* \
         | ip2k-* | iq2000-* \
+        | k1om-* \
         | le32-* | le64-* \
         | lm32-* \
         | m32c-* | m32r-* | m32rle-* \
@@ -406,28 +409,33 @@ case $basic_machine in
         | 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-* \
         | pyramid-* \
+        | riscv32-* | riscv64-* \
         | rl78-* | romp-* | rs6000-* | rx-* \
         | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
         | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
         | tahoe-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
         | tile*-* \
@@ -435,6 +443,7 @@ case $basic_machine in
         | ubicom32-* \
         | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
         | vax-* \
+        | visium-* \
         | we32k-* \
         | x86-* | x86_64-* | xc16x-* | xps100-* \
         | xstormy16-* | xtensa*-* \
@@ -511,6 +520,9 @@ case $basic_machine in
                 basic_machine=i386-pc
                 os=-aros
                 ;;
+        asmjs)
+                basic_machine=asmjs-unknown
+                ;;
         aux)
                 basic_machine=m68k-apple
                 os=-aux
@@ -631,6 +643,14 @@ case $basic_machine in
                 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
@@ -772,6 +792,9 @@ case $basic_machine in
                 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
@@ -799,7 +822,7 @@ case $basic_machine in
                 os=-mingw64
                 ;;
         mingw32)
-                basic_machine=i386-pc
+                basic_machine=i686-pc
                 os=-mingw32
                 ;;
         mingw32ce)
@@ -827,6 +850,10 @@ case $basic_machine in
                 basic_machine=powerpc-unknown
                 os=-morphos
                 ;;
+        moxiebox)
+                basic_machine=moxie-unknown
+                os=-moxiebox
+                ;;
         msdos)
                 basic_machine=i386-pc
                 os=-msdos
@@ -835,7 +862,7 @@ case $basic_machine in
                 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
         msys)
-                basic_machine=i386-pc
+                basic_machine=i686-pc
                 os=-msys
                 ;;
         mvs)
@@ -1357,29 +1384,30 @@ case $os in
         -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* \
-              | -bitrig* | -openbsd* | -solidbsd* \
+              | -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* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+              | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
               | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-              | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+              | -onefs* | -tirtos* | -phoenix*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
@@ -1503,9 +1531,6 @@ case $os in
         -aros*)
                 os=-aros
                 ;;
-        -kaos*)
-                os=-kaos
-                ;;
         -zvmoe)
                 os=-zvmoe
                 ;;
@@ -1514,6 +1539,8 @@ case $os in
                 ;;
         -nacl*)
                 ;;
+        -ios)
+                ;;
         -none)
                 ;;
         *)
@@ -1554,6 +1581,9 @@ case $basic_machine in
         c4x-* | tic4x-*)
                 os=-coff
                 ;;
+        c8051-*)
+                os=-elf
+                ;;
         hexagon-*)
                 os=-elf
                 ;;