<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/a06582682ce4d8698fa65fd215bac59fc828ada8">https://github.com/macports/macports-base/commit/a06582682ce4d8698fa65fd215bac59fc828ada8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a06582682ce4d8698fa65fd215bac59fc828ada8
</span>Author: Toby Peterson <toby@macports.org>
AuthorDate: Fri Jul 17 00:39:05 2020 -0700

<span style='display:block; white-space:pre;color:#404040;'>    auto*: bump config.guess to 2020-07-12 and config.sub to 2020-07-10
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    These changes are functional, arm64/aarch64 is now recognized.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit bfc05448ec6887a0363eb096ed4b83e465470a71)
</span>---
 config.guess | 126 ++++++++-----
 config.sub   | 606 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 414 insertions(+), 318 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/config.guess b/config.guess
</span><span style='display:block; white-space:pre;color:#808080;'>index 79d1317f..e94095c5 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/config.guess
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/config.guess
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> #! /bin/sh
 # Attempt to guess a canonical system name.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#   Copyright 1992-2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#   Copyright 1992-2020 Free Software Foundation, Inc.
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-timestamp='2019-03-04'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+timestamp='2020-07-12'
</span> 
 # 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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ version="\
</span> GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Copyright 1992-2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Copyright 1992-2020 Free Software Foundation, Inc.
</span> 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,6 +99,8 @@ tmp=
</span> trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
 
 set_cc_for_build() {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # prevent multiple calls if $tmp is already set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    test "$tmp" && return 0
</span>     : "${TMPDIR=/tmp}"
     # shellcheck disable=SC2039
     { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,6 +264,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
</span>     *:SolidBSD:*:*)
        echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
        exit ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    *:OS108:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   exit ;;
</span>     macppc:MirBSD:*:*)
        echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
        exit ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,12 +276,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
</span>     *:Sortix:*:*)
        echo "$UNAME_MACHINE"-unknown-sortix
        exit ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    *:Twizzler:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   echo "$UNAME_MACHINE"-unknown-twizzler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   exit ;;
</span>     *:Redox:*:*)
        echo "$UNAME_MACHINE"-unknown-redox
        exit ;;
     mips:OSF1:*.*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        echo mips-dec-osf1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        exit ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   echo mips-dec-osf1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   exit ;;
</span>     alpha:OSF1:*:*)
        case $UNAME_RELEASE in
        *4.0)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -918,7 +926,7 @@ EOF
</span>   echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
        exit ;;
     alpha:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
</span>     EV5)   UNAME_MACHINE=alphaev5 ;;
          EV56)  UNAME_MACHINE=alphaev56 ;;
          PCA56) UNAME_MACHINE=alphapca56 ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1087,7 +1095,17 @@ EOF
</span>   echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
        exit ;;
     x86_64:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   LIBCABI=$LIBC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           grep IS_X32 >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           LIBCABI="$LIBC"x32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
</span>   exit ;;
     xtensa*:Linux:*:*)
        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1324,39 +1342,43 @@ EOF
</span>     *:Rhapsody:*:*)
        echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
        exit ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    arm64:Darwin:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   echo aarch64-apple-darwin"$UNAME_RELEASE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   exit ;;
</span>     *:Darwin:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set_cc_for_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if test "$UNAME_PROCESSOR" = unknown ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       UNAME_PROCESSOR=powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   UNAME_PROCESSOR=`uname -p`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   case $UNAME_PROCESSOR in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       unknown) UNAME_PROCESSOR=powerpc ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if command -v xcode-select > /dev/null 2> /dev/null && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ! xcode-select --print-path > /dev/null 2> /dev/null ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       # Avoid executing cc if there is no toolchain installed as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       # cc will be a stub that puts up a graphical alert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       # prompting the user to install developer tools.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       CC_FOR_BUILD=no_compiler_found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       set_cc_for_build
</span>   fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  grep IS_64BIT_ARCH >/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-               case $UNAME_PROCESSOR in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   i386) UNAME_PROCESSOR=x86_64 ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   powerpc) UNAME_PROCESSOR=powerpc64 ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-               esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  grep IS_PPC >/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-               UNAME_PROCESSOR=powerpc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              grep IS_64BIT_ARCH >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           case $UNAME_PROCESSOR in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               i386) UNAME_PROCESSOR=x86_64 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               powerpc) UNAME_PROCESSOR=powerpc64 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              grep IS_PPC >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           UNAME_PROCESSOR=powerpc
</span>       fi
        elif test "$UNAME_PROCESSOR" = i386 ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # Avoid executing cc on OS X 10.9, as it ships with a stub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       # that puts up a graphical alert prompting to install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       # developer tools.  Any system running Mac OS X 10.7 or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       # later (Darwin 11 and later) is required to have a 64-bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       # processor. This is not true of the ARM version of Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       # that Apple uses in portable devices.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       UNAME_PROCESSOR=x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       # uname -m returns i386 or x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       UNAME_PROCESSOR=$UNAME_MACHINE
</span>   fi
        echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
        exit ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1468,6 +1490,14 @@ cat > "$dummy.c" <<EOF
</span> #include <sys/types.h>
 #include <sys/utsname.h>
 #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined(_SIZE_T_) || defined(SIGLOST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <sys/utsname.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> main ()
 {
 #if defined (sony)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1554,19 +1584,24 @@ main ()
</span> #else
   printf ("vax-dec-bsd\n"); exit (0);
 #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined(_SIZE_T_) || defined(SIGLOST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  struct utsname un;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  uname (&un);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
</span> #else
   printf ("vax-dec-ultrix\n"); exit (0);
 #endif
 #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> #if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
 #if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <signal.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if defined(_SIZE_T_) /* >= ULTRIX4 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  printf ("mips-dec-ultrix4\n"); exit (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined(_SIZE_T_) || defined(SIGLOST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  struct utsname *un;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  uname (&un);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  printf ("mips-dec-ultrix3\n"); exit (0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  printf ("mips-dec-ultrix\n"); exit (0);
</span> #endif
 #endif
 #endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1607,6 +1642,12 @@ copies of config.guess and config.sub with the latest versions from:
</span>   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
<span style='display:block; white-space:pre;background:#e0ffe0;'>+EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+year=`echo $timestamp | sed 's,-.*,,'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# shellcheck disable=SC2003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   cat >&2 <<EOF
</span> 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1634,6 +1675,7 @@ UNAME_RELEASE = "$UNAME_RELEASE"
</span> UNAME_SYSTEM  = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span> 
 exit 1
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/config.sub b/config.sub
</span><span style='display:block; white-space:pre;color:#808080;'>index a44fd8ae..3d9a8dc3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/config.sub
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/config.sub
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> #! /bin/sh
 # Configuration validation subroutine script.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#   Copyright 1992-2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#   Copyright 1992-2020 Free Software Foundation, Inc.
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-timestamp='2019-01-05'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+timestamp='2020-07-10'
</span> 
 # 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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
</span> version="\
 GNU config.sub ($timestamp)
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Copyright 1992-2019 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Copyright 1992-2020 Free Software Foundation, Inc.
</span> 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,28 +124,27 @@ case $1 in
</span>           ;;
        *-*-*-*)
                basic_machine=$field1-$field2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=$field3-$field4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=$field3-$field4
</span>           ;;
        *-*-*)
                # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
                # parts
                maybe_os=$field2-$field3
                case $maybe_os in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   nto-qnx* | linux-* | uclinux-uclibc* \
</span>                   | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
                        | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
                        | storm-chaos* | os2-emx* | rtmk-nova*)
                                basic_machine=$field1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=$maybe_os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=$maybe_os
</span>                           ;;
                        android-linux)
                                basic_machine=$field1-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=linux-android
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=linux-android
</span>                           ;;
                        *)
                                basic_machine=$field1-$field2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=$field3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=$field3
</span>                           ;;
                esac
                ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +153,7 @@ case $1 in
</span>           case $field1-$field2 in
                        decstation-3100)
                                basic_machine=mips-dec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        *-*)
                                # Second component is usually, but not always the OS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,7 +161,7 @@ case $1 in
</span>                                   # Prevent following clause from handling this valid os
                                        sun*os*)
                                                basic_machine=$field1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                                os=$field2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                           basic_os=$field2
</span>                                           ;;
                                        # Manufacturers
                                        dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,11 +174,11 @@ case $1 in
</span>                                   | microblaze* | sim | cisco \
                                        | oki | wec | wrs | winbond)
                                                basic_machine=$field1-$field2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                           basic_os=
</span>                                           ;;
                                        *)
                                                basic_machine=$field1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                                os=$field2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                           basic_os=$field2
</span>                                           ;;
                                esac
                        ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,450 +190,451 @@ case $1 in
</span>           case $field1 in
                        386bsd)
                                basic_machine=i386-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        a29khif)
                                basic_machine=a29k-amd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=udi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=udi
</span>                           ;;
                        adobe68k)
                                basic_machine=m68010-adobe
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=scout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=scout
</span>                           ;;
                        alliant)
                                basic_machine=fx80-alliant
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        altos | altos3068)
                                basic_machine=m68k-altos
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        am29k)
                                basic_machine=a29k-none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        amdahl)
                                basic_machine=580-amdahl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv
</span>                           ;;
                        amiga)
                                basic_machine=m68k-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        amigaos | amigados)
                                basic_machine=m68k-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=amigaos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=amigaos
</span>                           ;;
                        amigaunix | amix)
                                basic_machine=m68k-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv4
</span>                           ;;
                        apollo68)
                                basic_machine=m68k-apollo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv
</span>                           ;;
                        apollo68bsd)
                                basic_machine=m68k-apollo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        aros)
                                basic_machine=i386-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=aros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=aros
</span>                           ;;
                        aux)
                                basic_machine=m68k-apple
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=aux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=aux
</span>                           ;;
                        balance)
                                basic_machine=ns32k-sequent
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=dynix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=dynix
</span>                           ;;
                        blackfin)
                                basic_machine=bfin-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=linux
</span>                           ;;
                        cegcc)
                                basic_machine=arm-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=cegcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=cegcc
</span>                           ;;
                        convex-c1)
                                basic_machine=c1-convex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        convex-c2)
                                basic_machine=c2-convex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        convex-c32)
                                basic_machine=c32-convex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        convex-c34)
                                basic_machine=c34-convex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        convex-c38)
                                basic_machine=c38-convex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        cray)
                                basic_machine=j90-cray
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=unicos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=unicos
</span>                           ;;
                        crds | unos)
                                basic_machine=m68k-crds
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        da30)
                                basic_machine=m68k-da30
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        decstation | pmax | pmin | dec3100 | decstatn)
                                basic_machine=mips-dec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        delta88)
                                basic_machine=m88k-motorola
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv3
</span>                           ;;
                        dicos)
                                basic_machine=i686-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=dicos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=dicos
</span>                           ;;
                        djgpp)
                                basic_machine=i586-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=msdosdjgpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=msdosdjgpp
</span>                           ;;
                        ebmon29k)
                                basic_machine=a29k-amd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=ebmon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=ebmon
</span>                           ;;
                        es1800 | OSE68k | ose68k | ose | OSE)
                                basic_machine=m68k-ericsson
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=ose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=ose
</span>                           ;;
                        gmicro)
                                basic_machine=tron-gmicro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv
</span>                           ;;
                        go32)
                                basic_machine=i386-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=go32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=go32
</span>                           ;;
                        h8300hms)
                                basic_machine=h8300-hitachi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=hms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=hms
</span>                           ;;
                        h8300xray)
                                basic_machine=h8300-hitachi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=xray
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=xray
</span>                           ;;
                        h8500hms)
                                basic_machine=h8500-hitachi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=hms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=hms
</span>                           ;;
                        harris)
                                basic_machine=m88k-harris
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv3
</span>                           ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        hp300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   hp300 | hp300hpux)
</span>                           basic_machine=m68k-hp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                                basic_os=hpux
</span>                           ;;
                        hp300bsd)
                                basic_machine=m68k-hp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=bsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   hp300hpux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           basic_machine=m68k-hp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           os=hpux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=bsd
</span>                           ;;
                        hppaosf)
                                basic_machine=hppa1.1-hp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=osf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=osf
</span>                           ;;
                        hppro)
                                basic_machine=hppa1.1-hp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=proelf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=proelf
</span>                           ;;
                        i386mach)
                                basic_machine=i386-mach
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=mach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   vsta)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           basic_machine=i386-pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           os=vsta
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=mach
</span>                           ;;
                        isi68 | isi)
                                basic_machine=m68k-isi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv
</span>                           ;;
                        m68knommu)
                                basic_machine=m68k-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=linux
</span>                           ;;
                        magnum | m3230)
                                basic_machine=mips-mips
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv
</span>                           ;;
                        merlin)
                                basic_machine=ns32k-utek
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv
</span>                           ;;
                        mingw64)
                                basic_machine=x86_64-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=mingw64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=mingw64
</span>                           ;;
                        mingw32)
                                basic_machine=i686-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=mingw32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=mingw32
</span>                           ;;
                        mingw32ce)
                                basic_machine=arm-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=mingw32ce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=mingw32ce
</span>                           ;;
                        monitor)
                                basic_machine=m68k-rom68k
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=coff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=coff
</span>                           ;;
                        morphos)
                                basic_machine=powerpc-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=morphos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=morphos
</span>                           ;;
                        moxiebox)
                                basic_machine=moxie-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=moxiebox
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=moxiebox
</span>                           ;;
                        msdos)
                                basic_machine=i386-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=msdos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=msdos
</span>                           ;;
                        msys)
                                basic_machine=i686-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=msys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=msys
</span>                           ;;
                        mvs)
                                basic_machine=i370-ibm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=mvs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=mvs
</span>                           ;;
                        nacl)
                                basic_machine=le32-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=nacl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=nacl
</span>                           ;;
                        ncr3000)
                                basic_machine=i486-ncr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv4
</span>                           ;;
                        netbsd386)
                                basic_machine=i386-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=netbsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=netbsd
</span>                           ;;
                        netwinder)
                                basic_machine=armv4l-rebel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=linux
</span>                           ;;
                        news | news700 | news800 | news900)
                                basic_machine=m68k-sony
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=newsos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=newsos
</span>                           ;;
                        news1000)
                                basic_machine=m68030-sony
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=newsos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=newsos
</span>                           ;;
                        necv70)
                                basic_machine=v70-nec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv
</span>                           ;;
                        nh3000)
                                basic_machine=m68k-harris
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=cxux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=cxux
</span>                           ;;
                        nh[45]000)
                                basic_machine=m88k-harris
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=cxux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=cxux
</span>                           ;;
                        nindy960)
                                basic_machine=i960-intel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=nindy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=nindy
</span>                           ;;
                        mon960)
                                basic_machine=i960-intel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=mon960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=mon960
</span>                           ;;
                        nonstopux)
                                basic_machine=mips-compaq
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=nonstopux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=nonstopux
</span>                           ;;
                        os400)
                                basic_machine=powerpc-ibm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=os400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=os400
</span>                           ;;
                        OSE68000 | ose68000)
                                basic_machine=m68000-ericsson
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=ose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=ose
</span>                           ;;
                        os68k)
                                basic_machine=m68k-none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=os68k
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=os68k
</span>                           ;;
                        paragon)
                                basic_machine=i860-intel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=osf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=osf
</span>                           ;;
                        parisc)
                                basic_machine=hppa-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   psp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_machine=mipsallegrexel-sony
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=psp
</span>                           ;;
                        pw32)
                                basic_machine=i586-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=pw32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=pw32
</span>                           ;;
                        rdos | rdos64)
                                basic_machine=x86_64-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=rdos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=rdos
</span>                           ;;
                        rdos32)
                                basic_machine=i386-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=rdos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=rdos
</span>                           ;;
                        rom68k)
                                basic_machine=m68k-rom68k
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=coff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=coff
</span>                           ;;
                        sa29200)
                                basic_machine=a29k-amd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=udi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=udi
</span>                           ;;
                        sei)
                                basic_machine=mips-sei
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=seiux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=seiux
</span>                           ;;
                        sequent)
                                basic_machine=i386-sequent
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        sps7)
                                basic_machine=m68k-bull
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv2
</span>                           ;;
                        st2000)
                                basic_machine=m68k-tandem
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        stratus)
                                basic_machine=i860-stratus
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv4
</span>                           ;;
                        sun2)
                                basic_machine=m68000-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        sun2os3)
                                basic_machine=m68000-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sunos3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sunos3
</span>                           ;;
                        sun2os4)
                                basic_machine=m68000-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sunos4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sunos4
</span>                           ;;
                        sun3)
                                basic_machine=m68k-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        sun3os3)
                                basic_machine=m68k-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sunos3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sunos3
</span>                           ;;
                        sun3os4)
                                basic_machine=m68k-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sunos4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sunos4
</span>                           ;;
                        sun4)
                                basic_machine=sparc-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        sun4os3)
                                basic_machine=sparc-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sunos3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sunos3
</span>                           ;;
                        sun4os4)
                                basic_machine=sparc-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sunos4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sunos4
</span>                           ;;
                        sun4sol2)
                                basic_machine=sparc-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=solaris2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=solaris2
</span>                           ;;
                        sun386 | sun386i | roadrunner)
                                basic_machine=i386-sun
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                        sv1)
                                basic_machine=sv1-cray
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=unicos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=unicos
</span>                           ;;
                        symmetry)
                                basic_machine=i386-sequent
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=dynix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=dynix
</span>                           ;;
                        t3e)
                                basic_machine=alphaev5-cray
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=unicos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=unicos
</span>                           ;;
                        t90)
                                basic_machine=t90-cray
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=unicos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=unicos
</span>                           ;;
                        toad1)
                                basic_machine=pdp10-xkl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=tops20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=tops20
</span>                           ;;
                        tpf)
                                basic_machine=s390x-ibm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=tpf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=tpf
</span>                           ;;
                        udi29k)
                                basic_machine=a29k-amd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=udi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=udi
</span>                           ;;
                        ultra3)
                                basic_machine=a29k-nyu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sym1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sym1
</span>                           ;;
                        v810 | necv810)
                                basic_machine=v810-nec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=none
</span>                           ;;
                        vaxv)
                                basic_machine=vax-dec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=sysv
</span>                           ;;
                        vms)
                                basic_machine=vax-dec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=vms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=vms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   vsta)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_machine=i386-pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=vsta
</span>                           ;;
                        vxworks960)
                                basic_machine=i960-wrs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=vxworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=vxworks
</span>                           ;;
                        vxworks68)
                                basic_machine=m68k-wrs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=vxworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=vxworks
</span>                           ;;
                        vxworks29k)
                                basic_machine=a29k-wrs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=vxworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=vxworks
</span>                           ;;
                        xbox)
                                basic_machine=i686-pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=mingw32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=mingw32
</span>                           ;;
                        ymp)
                                basic_machine=ymp-cray
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=unicos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=unicos
</span>                           ;;
                        *)
                                basic_machine=$1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                os=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           basic_os=
</span>                           ;;
                esac
                ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -686,17 +686,17 @@ case $basic_machine in
</span>   bluegene*)
                cpu=powerpc
                vendor=ibm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=cnk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=cnk
</span>           ;;
        decsystem10* | dec10*)
                cpu=pdp10
                vendor=dec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=tops10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=tops10
</span>           ;;
        decsystem20* | dec20*)
                cpu=pdp10
                vendor=dec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=tops20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=tops20
</span>           ;;
        delta | 3300 | motorola-3300 | motorola-delta \
              | 3300-motorola | delta-motorola)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -706,7 +706,7 @@ case $basic_machine in
</span>   dpx2*)
                cpu=m68k
                vendor=bull
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=sysv3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=sysv3
</span>           ;;
        encore | umax | mmax)
                cpu=ns32k
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -715,7 +715,7 @@ case $basic_machine in
</span>   elxsi)
                cpu=elxsi
                vendor=elxsi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-bsd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os:-bsd}
</span>           ;;
        fx2800)
                cpu=i860
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -728,7 +728,7 @@ case $basic_machine in
</span>   h3050r* | hiux*)
                cpu=hppa1.1
                vendor=hitachi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=hiuxwe2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=hiuxwe2
</span>           ;;
        hp3k9[0-9][0-9] | hp9[0-9][0-9])
                cpu=hppa1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -771,36 +771,36 @@ case $basic_machine in
</span>   i*86v32)
                cpu=`echo "$1" | sed -e 's/86.*/86/'`
                vendor=pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=sysv32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=sysv32
</span>           ;;
        i*86v4*)
                cpu=`echo "$1" | sed -e 's/86.*/86/'`
                vendor=pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=sysv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=sysv4
</span>           ;;
        i*86v)
                cpu=`echo "$1" | sed -e 's/86.*/86/'`
                vendor=pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=sysv
</span>           ;;
        i*86sol2)
                cpu=`echo "$1" | sed -e 's/86.*/86/'`
                vendor=pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=solaris2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=solaris2
</span>           ;;
        j90 | j90-cray)
                cpu=j90
                vendor=cray
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-unicos}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os:-unicos}
</span>           ;;
        iris | iris4d)
                cpu=mips
                vendor=sgi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           case $basic_os in
</span>               irix*)
                        ;;
                    *)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        os=irix4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   basic_os=irix4
</span>                   ;;
                esac
                ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -811,26 +811,26 @@ case $basic_machine in
</span>   *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
                cpu=m68k
                vendor=atari
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=mint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=mint
</span>           ;;
        news-3600 | risc-news)
                cpu=mips
                vendor=sony
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=newsos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=newsos
</span>           ;;
        next | m*-next)
                cpu=m68k
                vendor=next
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           case $basic_os in
</span>               openstep*)
                        ;;
                    nextstep*)
                        ;;
                    ns2*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                      os=nextstep2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 basic_os=nextstep2
</span>                   ;;
                    *)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                      os=nextstep3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 basic_os=nextstep3
</span>                   ;;
                esac
                ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -841,12 +841,12 @@ case $basic_machine in
</span>   op50n-* | op60c-*)
                cpu=hppa1.1
                vendor=oki
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=proelf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=proelf
</span>           ;;
        pa-hitachi)
                cpu=hppa1.1
                vendor=hitachi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=hiuxwe2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=hiuxwe2
</span>           ;;
        pbd)
                cpu=sparc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -883,12 +883,12 @@ case $basic_machine in
</span>   sde)
                cpu=mipsisa32
                vendor=sde
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-elf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os:-elf}
</span>           ;;
        simso-wrs)
                cpu=sparclite
                vendor=wrs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=vxworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=vxworks
</span>           ;;
        tower | tower-32)
                cpu=m68k
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -905,7 +905,7 @@ case $basic_machine in
</span>   w89k-*)
                cpu=hppa1.1
                vendor=winbond
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=proelf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=proelf
</span>           ;;
        none)
                cpu=none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -958,11 +958,11 @@ case $cpu-$vendor in
</span>   # some cases the only manufacturer, in others, it is the most popular.
        craynv-unknown)
                vendor=cray
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-unicosmp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os:-unicosmp}
</span>           ;;
        c90-unknown | c90-cray)
                vendor=cray
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-unicos}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${Basic_os:-unicos}
</span>           ;;
        fx80-unknown)
                vendor=alliant
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1006,7 +1006,7 @@ case $cpu-$vendor in
</span>   dpx20-unknown | dpx20-bull)
                cpu=rs6000
                vendor=bull
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-bosx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os:-bosx}
</span>           ;;
 
        # Here we normalize CPU types irrespective of the vendor
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1015,7 +1015,7 @@ case $cpu-$vendor in
</span>           ;;
        blackfin-*)
                cpu=bfin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=linux
</span>           ;;
        c54x-*)
                cpu=tic54x
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1028,7 +1028,7 @@ case $cpu-$vendor in
</span>           ;;
        e500v[12]-*)
                cpu=powerpc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=$os"spe"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os}"spe"
</span>           ;;
        mips3*-*)
                cpu=mips64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1038,7 +1038,7 @@ case $cpu-$vendor in
</span>           ;;
        m68knommu-*)
                cpu=m68k
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=linux
</span>           ;;
        m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
                cpu=s12z
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1048,7 +1048,7 @@ case $cpu-$vendor in
</span>           ;;
        parisc-*)
                cpu=hppa
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=linux
</span>           ;;
        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                cpu=i586
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1104,11 +1104,14 @@ case $cpu-$vendor in
</span>   xscale-* | xscalee[bl]-*)
                cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
                ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        arm64-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           cpu=aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span> 
        # Recognize the canonical CPU Types that limit and/or modify the
        # company names they are paired with.
        cr16-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-elf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os:-elf}
</span>           ;;
        crisv32-* | etraxfs*-*)
                cpu=crisv32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1119,7 +1122,7 @@ case $cpu-$vendor in
</span>           vendor=axis
                ;;
        crx-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-elf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os:-elf}
</span>           ;;
        neo-tandem)
                cpu=neo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1141,16 +1144,12 @@ case $cpu-$vendor in
</span>           cpu=nsx
                vendor=tandem
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        s390-*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           cpu=s390
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           vendor=ibm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   s390x-*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           cpu=s390x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           vendor=ibm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   mipsallegrexel-sony)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           cpu=mipsallegrexel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           vendor=sony
</span>           ;;
        tile*-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=${os:-linux-gnu}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           basic_os=${basic_os:-linux-gnu}
</span>           ;;
 
        *)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1167,12 +1166,12 @@ case $cpu-$vendor in
</span>                   | am33_2.0 \
                        | amdgcn \
                        | arc | arceb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        | arm  | arm[lb]e | arme[lb] | armv* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   | arm | arm[lb]e | arme[lb] | armv* \
</span>                   | avr | avr32 \
                        | asmjs \
                        | ba \
                        | be32 | be64 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        | bfin | bs2000 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   | bfin | bpf | bs2000 \
</span>                   | c[123]* | c30 | [cjt]90 | c4x \
                        | c8051 | clipper | craynv | csky | cydra \
                        | d10v | d30v | dlx | dsp16xx \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1232,6 +1231,7 @@ case $cpu-$vendor in
</span>                   | pyramid \
                        | riscv | riscv32 | riscv64 \
                        | rl78 | romp | rs6000 | rx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        | s390 | s390x \
</span>                   | score \
                        | sh | shl \
                        | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1247,7 +1247,8 @@ case $cpu-$vendor in
</span>                   | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
                        | vax \
                        | visium \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        | w65 | wasm32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   | w65 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   | wasm32 | wasm64 \
</span>                   | we32k \
                        | x86 | x86_64 | xc16x | xgate | xps100 \
                        | xstormy16 | xtensa* \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1277,8 +1278,43 @@ esac
</span> 
 # Decode manufacturer-specific aliases for certain operating systems.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ x$os != x ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ x$basic_os != x ]
</span> then
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set os.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+case $basic_os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   gnu/linux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           kernel=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   nto-qnx*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           kernel=nto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   *-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           # shellcheck disable=SC2162
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           IFS="-" read kernel os <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$basic_os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Default OS when just kernel was specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   nto*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           kernel=nto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           os=`echo $basic_os | sed -e 's|nto|qnx|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   linux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           kernel=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           os=`echo $basic_os | sed -e 's|linux|gnu|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           kernel=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           os=$basic_os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# etc.)
</span> case $os in
        # First match some system type aliases that might get confused
        # with valid system types.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1298,9 +1334,6 @@ case $os in
</span>   unixware*)
                os=sysv4.2uw
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        gnu/linux*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span>   # es1800 is here to avoid being matched by es* (a different OS)
        es1800*)
                os=ose
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1324,10 +1357,7 @@ case $os in
</span>   sco3.2.[4-9]*)
                os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        sco3.2v[4-9]* | sco5v6*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           # Don't forget version if it is 3.2v4 or newer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   scout)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   sco*v* | scout)
</span>           # Don't match below
                ;;
        sco*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1336,40 +1366,6 @@ case $os in
</span>   psos*)
                os=psos
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Now accept the basic system types.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   # The portable systems comes first.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   # Each alternative MUST end in a * to match a version number.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   # sysv* is not here because it comes later, after sysvr4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | sym* | kopensolaris* | plan9* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | aos* | aros* | cloudabi* | sortix* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | knetbsd* | mirbsd* | netbsd* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | bitrig* | openbsd* | solidbsd* | libertybsd* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | chorusrdb* | cegcc* | glidix* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | linux-newlib* | linux-musl* | linux-uclibc* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | uxpv* | beos* | mpeix* | udk* | moxiebox* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | interix* | uwin* | mks* | rhapsody* | darwin* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | openstep* | oskit* | conix* | pw32* | nonstopux* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | storm-chaos* | tops10* | tenex* | tops20* | its* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | os2* | vos* | palmos* | uclinux* | nucleus* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | morphos* | superux* | rtmk* | windiss* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | skyos* | haiku* | rdos* | toppers* | drops* | es* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        | midnightbsd* | amdhsa* | unleashed* | emscripten*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   # Remember, each alternative MUST END IN *, to match a version number.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span>   qnx*)
                case $cpu in
                    x86 | i*86)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1382,31 +1378,19 @@ case $os in
</span>   hiux*)
                os=hiuxwe2
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        nto-qnx*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   nto*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           os=`echo $os | sed -e 's|nto|nto-qnx|'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   sim | xray | os68k* | v88r* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       | windows* | osx | abug | netware* | os9* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   linux-dietlibc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           os=linux-dietlibc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   linux*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           os=`echo $os | sed -e 's|linux|linux-gnu|'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span>   lynx*178)
                os=lynxos178
                ;;
        lynx*5)
                os=lynxos5
                ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        lynxos*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           # don't get caught up in next wildcard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span>   lynx*)
                os=lynxos
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        mac*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   mac[0-9]*)
</span>           os=`echo "$os" | sed -e 's|mac|macos|'`
                ;;
        opened*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1451,9 +1435,6 @@ case $os in
</span>   ns2)
                os=nextstep2
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        nsk*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           os=nsk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span>   # Preserve the version number of sinix5.
        sinix5.*)
                os=`echo $os | sed -e 's|sinix|sysv|'`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1479,18 +1460,12 @@ case $os in
</span>   sysvr4)
                os=sysv4
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # This must come after sysvr4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   sysv*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span>   ose*)
                os=ose
                ;;
        *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
                os=mint
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        zvmoe)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           os=zvmoe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span>   dicos*)
                os=dicos
                ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1507,19 +1482,11 @@ case $os in
</span>                   ;;
                esac
                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        nacl*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ios)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   none)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   *-eabi)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;
</span>   *)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           # No normalization, but not necessarily accepted, that comes below.
</span>           ;;
 esac
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> else
 
 # Here we handle the default operating systems that come with various machines.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1532,6 +1499,7 @@ else
</span> # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+kernel=
</span> case $cpu-$vendor in
        score-*)
                os=elf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1543,7 +1511,8 @@ case $cpu-$vendor in
</span>           os=riscix1.2
                ;;
        arm*-rebel)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                os=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           kernel=linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           os=gnu
</span>           ;;
        arm*-semi)
                os=aout
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1709,84 +1678,169 @@ case $cpu-$vendor in
</span>           os=none
                ;;
 esac
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> fi
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Now, validate our (potentially fixed-up) OS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Sometimes we do "kernel-abi", so those need to count as OSes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   musl* | newlib* | uclibc*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Likewise for "kernel-libc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   eabi | eabihf | gnueabi | gnueabihf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Now accept the basic system types.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # The portable systems comes first.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Each alternative MUST end in a * to match a version number.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | hiux* | abug | nacl* | netware* | windows* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | os9* | macos* | osx* | ios* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | mpw* | magic* | mmixware* | mon960* | lnews* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | aos* | aros* | cloudabi* | sortix* | twizzler* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | mirbsd* | netbsd* | dicos* | openedition* | ose* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | udi* | lites* | ieee* | go32* | aux* | hcos* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | chorusrdb* | cegcc* | glidix* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | midipix* | mingw32* | mingw64* | mint* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | uxpv* | beos* | mpeix* | udk* | moxiebox* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | interix* | uwin* | mks* | rhapsody* | darwin* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | openstep* | oskit* | conix* | pw32* | nonstopux* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | storm-chaos* | tops10* | tenex* | tops20* | its* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | skyos* | haiku* | rdos* | toppers* | drops* | es* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        | nsk* | powerunix* | genode* | zvmoe* )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # This one is extra strict with allowed versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           # Don't forget version if it is 3.2v4 or newer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   none)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# As a final step for OS-related things, validate the OS-kernel combination
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (given a valid OS), if there is a kernel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+case $kernel-$os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   -dietlibc* | -newlib* | -musl* | -uclibc* )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           # These are just libc implementations, not actual OSes, and thus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           # require a kernel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   kfreebsd*-gnu* | kopensolaris*-gnu*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   nto-qnx*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   *-eabi* | *-gnueabi*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   -*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           # Blank kernel with real OS is always fine.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   *-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
 case $vendor in
        unknown)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                case $os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   riscix*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           case $cpu-$os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-riscix*)
</span>                           vendor=acorn
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sunos*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-sunos*)
</span>                           vendor=sun
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        cnk*|-aix*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-cnk* | *-aix*)
</span>                           vendor=ibm
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        beos*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-beos*)
</span>                           vendor=be
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        hpux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-hpux*)
</span>                           vendor=hp
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        mpeix*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-mpeix*)
</span>                           vendor=hp
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        hiux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-hiux*)
</span>                           vendor=hitachi
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        unos*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-unos*)
</span>                           vendor=crds
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        dgux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-dgux*)
</span>                           vendor=dg
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        luna*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-luna*)
</span>                           vendor=omron
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        genix*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-genix*)
</span>                           vendor=ns
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        clix*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-clix*)
</span>                           vendor=intergraph
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        mvs* | opened*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-mvs* | *-opened*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           vendor=ibm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-os400*)
</span>                           vendor=ibm
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        os400*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   s390-* | s390x-*)
</span>                           vendor=ibm
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ptx*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-ptx*)
</span>                           vendor=sequent
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        tpf*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-tpf*)
</span>                           vendor=ibm
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        vxsim* | vxworks* | windiss*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-vxsim* | *-vxworks* | *-windiss*)
</span>                           vendor=wrs
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        aux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-aux*)
</span>                           vendor=apple
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        hms*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-hms*)
</span>                           vendor=hitachi
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        mpw* | macos*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-mpw* | *-macos*)
</span>                           vendor=apple
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
</span>                           vendor=atari
                                ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        vos*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   *-vos*)
</span>                           vendor=stratus
                                ;;
                esac
                ;;
 esac
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "$cpu-$vendor-$os"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
</span> exit
 
 # Local variables:
</pre><pre style='margin:0'>

</pre>