Update config.guess and config.sub
authorPeter Eisentraut <peter@eisentraut.org>
Sat, 27 Apr 2019 12:25:00 +0000 (14:25 +0200)
committerPeter Eisentraut <peter@eisentraut.org>
Sat, 27 Apr 2019 12:25:00 +0000 (14:25 +0200)
config/config.guess
config/config.sub

index 883a6713bf0350955aa7b8e2781b92c65f0c0121..79d1317f52b49ae6910f58a96a65d55abb479fb5 100644 (file)
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2018-05-19'
+timestamp='2019-03-04'
 
 # 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
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,8 +84,6 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,38 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
- ,,)    echo "int x;" > "$dummy.c" ;
-   for c in cc gcc c89 c99 ; do
-     if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-        CC_FOR_BUILD="$c"; break ;
-     fi ;
-   done ;
-   if test x"$CC_FOR_BUILD" = x ; then
-     CC_FOR_BUILD=no_compiler_found ;
-   fi
-   ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+   { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+   ,,)    echo "int x;" > "$dummy.c"
+          for driver in cc gcc c89 c99 ; do
+          if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+              CC_FOR_BUILD="$driver"
+              break
+          fi
+          done
+          if test x"$CC_FOR_BUILD" = x ; then
+          CC_FOR_BUILD=no_compiler_found
+          fi
+          ;;
+   ,,*)   CC_FOR_BUILD=$CC ;;
+   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
    PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -138,7 +140,7 @@ Linux|GNU|GNU/*)
    # We could probably try harder.
    LIBC=gnu
 
-   eval "$set_cc_for_build"
+   set_cc_for_build
    cat <<-EOF > "$dummy.c"
    #include <features.h>
    #if defined(__UCLIBC__)
@@ -199,7 +201,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
        os=netbsdelf
        ;;
        arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-       eval "$set_cc_for_build"
+       set_cc_for_build
        if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
            | grep -q __ELF__
        then
@@ -389,7 +391,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
    echo i386-pc-auroraux"$UNAME_RELEASE"
    exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-   eval "$set_cc_for_build"
+   set_cc_for_build
    SUN_ARCH=i386
    # If there is a compiler, see if it is configured for 64-bit objects.
    # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
@@ -482,7 +484,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
    echo clipper-intergraph-clix"$UNAME_RELEASE"
    exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-   eval "$set_cc_for_build"
+   set_cc_for_build
    sed 's/^    //' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -579,7 +581,7 @@ EOF
    exit ;;
     *:AIX:2:3)
    if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-       eval "$set_cc_for_build"
+       set_cc_for_build
        sed 's/^        //' << EOF > "$dummy.c"
        #include <sys/systemcfg.h>
 
@@ -660,7 +662,7 @@ EOF
            esac
        fi
        if [ "$HP_ARCH" = "" ]; then
-           eval "$set_cc_for_build"
+           set_cc_for_build
            sed 's/^        //' << EOF > "$dummy.c"
 
        #define _HPUX_SOURCE
@@ -700,7 +702,7 @@ EOF
    esac
    if [ "$HP_ARCH" = hppa2.0w ]
    then
-       eval "$set_cc_for_build"
+       set_cc_for_build
 
        # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
        # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -726,7 +728,7 @@ EOF
    echo ia64-hp-hpux"$HPUX_REV"
    exit ;;
     3050*:HI-UX:*:*)
-   eval "$set_cc_for_build"
+   set_cc_for_build
    sed 's/^    //' << EOF > "$dummy.c"
    #include <unistd.h>
    int
@@ -840,6 +842,17 @@ EOF
     *:BSD/OS:*:*)
    echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
    exit ;;
+    arm:FreeBSD:*:*)
+   UNAME_PROCESSOR=`uname -p`
+   set_cc_for_build
+   if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+       | grep -q __ARM_PCS_VFP
+   then
+       echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+   else
+       echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+   fi
+   exit ;;
     *:FreeBSD:*:*)
    UNAME_PROCESSOR=`/usr/bin/uname -p`
    case "$UNAME_PROCESSOR" in
@@ -881,7 +894,7 @@ EOF
    echo "$UNAME_MACHINE"-pc-uwin
    exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-   echo x86_64-unknown-cygwin
+   echo x86_64-pc-cygwin
    exit ;;
     prep*:SunOS:5.*:*)
    echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
@@ -894,8 +907,8 @@ EOF
    # other systems with GNU libc and userland
    echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
    exit ;;
-    i*86:Minix:*:*)
-   echo "$UNAME_MACHINE"-pc-minix
+    *:Minix:*:*)
+   echo "$UNAME_MACHINE"-unknown-minix
    exit ;;
     aarch64:Linux:*:*)
    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -922,7 +935,7 @@ EOF
    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
    exit ;;
     arm*:Linux:*:*)
-   eval "$set_cc_for_build"
+   set_cc_for_build
    if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
        | grep -q __ARM_EABI__
    then
@@ -971,23 +984,51 @@ EOF
    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
    exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-   eval "$set_cc_for_build"
+   set_cc_for_build
+   IS_GLIBC=0
+   test x"${LIBC}" = xgnu && IS_GLIBC=1
    sed 's/^    //' << EOF > "$dummy.c"
    #undef CPU
-   #undef ${UNAME_MACHINE}
-   #undef ${UNAME_MACHINE}el
+   #undef mips
+   #undef mipsel
+   #undef mips64
+   #undef mips64el
+   #if ${IS_GLIBC} && defined(_ABI64)
+   LIBCABI=gnuabi64
+   #else
+   #if ${IS_GLIBC} && defined(_ABIN32)
+   LIBCABI=gnuabin32
+   #else
+   LIBCABI=${LIBC}
+   #endif
+   #endif
+
+   #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+   CPU=mipsisa64r6
+   #else
+   #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+   CPU=mipsisa32r6
+   #else
+   #if defined(__mips64)
+   CPU=mips64
+   #else
+   CPU=mips
+   #endif
+   #endif
+   #endif
+
    #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-   CPU=${UNAME_MACHINE}el
+   MIPS_ENDIAN=el
    #else
    #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-   CPU=${UNAME_MACHINE}
+   MIPS_ENDIAN=
    #else
-   CPU=
+   MIPS_ENDIAN=
    #endif
    #endif
 EOF
-   eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-   test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+   eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
+   test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
    ;;
     mips64el:Linux:*:*)
    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1100,7 +1141,7 @@ EOF
        *Pentium)        UNAME_MACHINE=i586 ;;
        *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
    esac
-   echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+   echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
    exit ;;
     i*86:*:3.2:*)
    if test -f /usr/options/cb.name; then
@@ -1285,7 +1326,7 @@ EOF
    exit ;;
     *:Darwin:*:*)
    UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-   eval "$set_cc_for_build"
+   set_cc_for_build
    if test "$UNAME_PROCESSOR" = unknown ; then
        UNAME_PROCESSOR=powerpc
    fi
@@ -1358,6 +1399,7 @@ EOF
    # "uname -m" is not consistent, so use $cputype instead. 386
    # is converted to i386 for consistency with other x86
    # operating systems.
+   # shellcheck disable=SC2154
    if test "$cputype" = 386; then
        UNAME_MACHINE=i386
    else
@@ -1414,8 +1456,135 @@ EOF
     amd64:Isilon\ OneFS:*:*)
    echo x86_64-unknown-onefs
    exit ;;
+    *:Unleashed:*:*)
+   echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+   exit ;;
 esac
 
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+  "4"
+#else
+  ""
+#endif
+  ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+  struct utsname un;
+
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) /* >= ULTRIX4 */
+  printf ("mips-dec-ultrix4\n"); exit (0);
+#else
+#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST)
+  printf ("mips-dec-ultrix3\n"); exit (0);
+#endif
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+   { echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
 echo "$0: unable to guess system type" >&2
 
 case "$UNAME_MACHINE:$UNAME_SYSTEM" in
index d1f5b549034905ad3fb686701d6249b4a2464a42..f53af5a2da7d16b2e6b2e02ac11fbac8e6235878 100644 (file)
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2018-05-24'
+timestamp='2019-01-05'
 
 # 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
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,7 +89,7 @@ while test $# -gt 0 ; do
     - )    # Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
@@ -111,7 +111,8 @@ case $# in
 esac
 
 # Split fields of configuration type
-IFS="-" read -r field1 field2 field3 field4 <<EOF
+# shellcheck disable=SC2162
+IFS="-" read field1 field2 field3 field4 <<EOF
 $1
 EOF
 
@@ -149,29 +150,39 @@ case $1 in
        esac
        ;;
    *-*)
-       # Second component is usually, but not always the OS
-       case $field2 in
-           # Prevent following clause from handling this valid os
-           sun*os*)
-               basic_machine=$field1
-               os=$field2
-               ;;
-           # Manufacturers
-           dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* \
-           | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-           | unicom* | ibm* | next | hp | isi* | apollo | altos* \
-           | convergent* | ncr* | news | 32* | 3600* | 3100* | hitachi* \
-           | c[123]* | convex* | sun | crds | omron* | dg | ultra | tti* \
-           | harris | dolphin | highlevel | gould | cbm | ns | masscomp \
-           | apple | axis | knuth | cray | microblaze* \
-           | sim | cisco | oki | wec | wrs | winbond)
-               basic_machine=$field1-$field2
+       # A lone config we happen to match not fitting any pattern
+       case $field1-$field2 in
+           decstation-3100)
+               basic_machine=mips-dec
                os=
                ;;
-           *)
-               basic_machine=$field1
-               os=$field2
-               ;;
+           *-*)
+               # Second component is usually, but not always the OS
+               case $field2 in
+                   # Prevent following clause from handling this valid os
+                   sun*os*)
+                       basic_machine=$field1
+                       os=$field2
+                       ;;
+                   # Manufacturers
+                   dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+                   | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+                   | unicom* | ibm* | next | hp | isi* | apollo | altos* \
+                   | convergent* | ncr* | news | 32* | 3600* | 3100* \
+                   | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+                   | ultra | tti* | harris | dolphin | highlevel | gould \
+                   | cbm | ns | masscomp | apple | axis | knuth | cray \
+                   | microblaze* | sim | cisco \
+                   | oki | wec | wrs | winbond)
+                       basic_machine=$field1-$field2
+                       os=
+                       ;;
+                   *)
+                       basic_machine=$field1
+                       os=$field2
+                       ;;
+               esac
+           ;;
        esac
        ;;
    *)
@@ -190,6 +201,14 @@ case $1 in
                basic_machine=m68010-adobe
                os=scout
                ;;
+           alliant)
+               basic_machine=fx80-alliant
+               os=
+               ;;
+           altos | altos3068)
+               basic_machine=m68k-altos
+               os=
+               ;;
            am29k)
                basic_machine=a29k-none
                os=bsd
@@ -198,6 +217,10 @@ case $1 in
                basic_machine=580-amdahl
                os=sysv
                ;;
+           amiga)
+               basic_machine=m68k-unknown
+               os=
+               ;;
            amigaos | amigados)
                basic_machine=m68k-unknown
                os=amigaos
@@ -234,13 +257,41 @@ case $1 in
                basic_machine=arm-unknown
                os=cegcc
                ;;
+           convex-c1)
+               basic_machine=c1-convex
+               os=bsd
+               ;;
+           convex-c2)
+               basic_machine=c2-convex
+               os=bsd
+               ;;
+           convex-c32)
+               basic_machine=c32-convex
+               os=bsd
+               ;;
+           convex-c34)
+               basic_machine=c34-convex
+               os=bsd
+               ;;
+           convex-c38)
+               basic_machine=c38-convex
+               os=bsd
+               ;;
            cray)
                basic_machine=j90-cray
                os=unicos
                ;;
-           craynv)
-               basic_machine=craynv-cray
-               os=unicosmp
+           crds | unos)
+               basic_machine=m68k-crds
+               os=
+               ;;
+           da30)
+               basic_machine=m68k-da30
+               os=
+               ;;
+           decstation | pmax | pmin | dec3100 | decstatn)
+               basic_machine=mips-dec
+               os=
                ;;
            delta88)
                basic_machine=m88k-motorola
@@ -286,6 +337,9 @@ case $1 in
                basic_machine=m88k-harris
                os=sysv3
                ;;
+           hp300)
+               basic_machine=m68k-hp
+               ;;
            hp300bsd)
                basic_machine=m68k-hp
                os=bsd
@@ -307,7 +361,7 @@ case $1 in
                os=mach
                ;;
            vsta)
-               basic_machine=i386-unknown
+               basic_machine=i386-pc
                os=vsta
                ;;
            isi68 | isi)
@@ -371,7 +425,7 @@ case $1 in
                os=sysv4
                ;;
            netbsd386)
-               basic_machine=i386-unknown
+               basic_machine=i386-pc
                os=netbsd
                ;;
            netwinder)
@@ -454,14 +508,26 @@ case $1 in
                basic_machine=mips-sei
                os=seiux
                ;;
+           sequent)
+               basic_machine=i386-sequent
+               os=
+               ;;
            sps7)
                basic_machine=m68k-bull
                os=sysv2
                ;;
+           st2000)
+               basic_machine=m68k-tandem
+               os=
+               ;;
            stratus)
                basic_machine=i860-stratus
                os=sysv4
                ;;
+           sun2)
+               basic_machine=m68000-sun
+               os=
+               ;;
            sun2os3)
                basic_machine=m68000-sun
                os=sunos3
@@ -470,6 +536,10 @@ case $1 in
                basic_machine=m68000-sun
                os=sunos4
                ;;
+           sun3)
+               basic_machine=m68k-sun
+               os=
+               ;;
            sun3os3)
                basic_machine=m68k-sun
                os=sunos3
@@ -478,6 +548,10 @@ case $1 in
                basic_machine=m68k-sun
                os=sunos4
                ;;
+           sun4)
+               basic_machine=sparc-sun
+               os=
+               ;;
            sun4os3)
                basic_machine=sparc-sun
                os=sunos3
@@ -490,6 +564,10 @@ case $1 in
                basic_machine=sparc-sun
                os=solaris2
                ;;
+           sun386 | sun386i | roadrunner)
+               basic_machine=i386-sun
+               os=
+               ;;
            sv1)
                basic_machine=sv1-cray
                os=unicos
@@ -562,417 +640,162 @@ case $1 in
        ;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-   # Recognize the basic CPU types without company name.
-   # Some are omitted here because they have special meanings below.
-   1750a | 580 \
-   | a29k \
-   | aarch64 | aarch64_be \
-   | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-   | am33_2.0 \
-   | arc | arceb \
-   | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
-   | avr | avr32 \
-   | ba \
-   | be32 | be64 \
-   | bfin \
-   | c4x | c8051 | clipper | csky \
-   | d10v | d30v | dlx | dsp16xx \
-   | e2k | epiphany \
-   | fido | fr30 | frv | ft32 \
-   | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-   | hexagon \
-   | i370 | i860 | i960 | ia16 | ia64 \
-   | ip2k | iq2000 \
-   | k1om \
-   | le32 | le64 \
-   | lm32 \
-   | m32c | m32r | m32rle | m68000 | m68k | m88k \
-   | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-   | mips | mipsbe | mipseb | mipsel | mipsle \
-   | mips16 \
-   | mips64 | mips64el \
-   | mips64octeon | mips64octeonel \
-   | mips64orion | mips64orionel \
-   | mips64r5900 | mips64r5900el \
-   | mips64vr | mips64vrel \
-   | mips64vr4100 | mips64vr4100el \
-   | mips64vr4300 | mips64vr4300el \
-   | mips64vr5000 | mips64vr5000el \
-   | mips64vr5900 | mips64vr5900el \
-   | mipsisa32 | mipsisa32el \
-   | mipsisa32r2 | mipsisa32r2el \
-   | mipsisa32r6 | mipsisa32r6el \
-   | mipsisa64 | mipsisa64el \
-   | mipsisa64r2 | mipsisa64r2el \
-   | mipsisa64r6 | mipsisa64r6el \
-   | mipsisa64sb1 | mipsisa64sb1el \
-   | mipsisa64sr71k | mipsisa64sr71kel \
-   | mipsr5900 | mipsr5900el \
-   | mipstx39 | mipstx39el \
-   | mn10200 | mn10300 \
-   | moxie \
-   | mt \
-   | msp430 \
-   | nds32 | nds32le | nds32be \
-   | nfp \
-   | nios | nios2 | nios2eb | nios2el \
-   | ns16k | ns32k \
-   | open8 | or1k | or1knd | or32 \
-   | pdp10 | pj | pjl \
-   | powerpc | powerpc64 | powerpc64le | powerpcle \
-   | pru \
-   | pyramid \
-   | riscv32 | riscv64 \
-   | rl78 | rx \
-   | score \
-   | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-   | sh64 | sh64le \
-   | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-   | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-   | spu \
-   | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-   | ubicom32 \
-   | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-   | visium \
-   | wasm32 \
-   | x86 | xc16x | xstormy16 | xtensa \
-   | z8k | z80)
-       basic_machine=$basic_machine-unknown
-       ;;
-   c54x)
-       basic_machine=tic54x-unknown
-       ;;
-   c55x)
-       basic_machine=tic55x-unknown
-       ;;
-   c6x)
-       basic_machine=tic6x-unknown
-       ;;
-   leon|leon[3-9])
-       basic_machine=sparc-$basic_machine
-       ;;
-   m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-       basic_machine=$basic_machine-unknown
-       os=${os:-none}
-       ;;
-   m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+   # Here we handle the default manufacturer of certain CPU types.  It is in
+   # some cases the only manufacturer, in others, it is the most popular.
+   w89k)
+       cpu=hppa1.1
+       vendor=winbond
        ;;
-   m9s12z | m68hcs12z | hcs12z | s12z)
-       basic_machine=s12z-unknown
-       os=${os:-none}
+   op50n)
+       cpu=hppa1.1
+       vendor=oki
        ;;
-   ms1)
-       basic_machine=mt-unknown
+   op60c)
+       cpu=hppa1.1
+       vendor=oki
        ;;
-   strongarm | thumb | xscale)
-       basic_machine=arm-unknown
+   ibm*)
+       cpu=i370
+       vendor=ibm
        ;;
-   xgate)
-       basic_machine=$basic_machine-unknown
-       os=${os:-none}
+   orion105)
+       cpu=clipper
+       vendor=highlevel
        ;;
-   xscaleeb)
-       basic_machine=armeb-unknown
+   mac | mpw | mac-mpw)
+       cpu=m68k
+       vendor=apple
        ;;
-
-   xscaleel)
-       basic_machine=armel-unknown
+   pmac | pmac-mpw)
+       cpu=powerpc
+       vendor=apple
        ;;
 
-   # We use `pc' rather than `unknown'
-   # because (1) that's what they normally are, and
-   # (2) the word "unknown" tends to confuse beginning users.
-   i*86 | x86_64)
-     basic_machine=$basic_machine-pc
-     ;;
-   # Recognize the basic CPU types with company name.
-   580-* \
-   | a29k-* \
-   | aarch64-* | aarch64_be-* \
-   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-   | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-   | avr-* | avr32-* \
-   | ba-* \
-   | be32-* | be64-* \
-   | bfin-* | bs2000-* \
-   | c[123]* | c30-* | [cjt]90-* | c4x-* \
-   | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
-   | d10v-* | d30v-* | dlx-* \
-   | e2k-* | elxsi-* \
-   | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-   | h8300-* | h8500-* \
-   | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-   | hexagon-* \
-   | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-   | ip2k-* | iq2000-* \
-   | k1om-* \
-   | le32-* | le64-* \
-   | lm32-* \
-   | m32c-* | m32r-* | m32rle-* \
-   | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-   | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-   | microblaze-* | microblazeel-* \
-   | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-   | mips16-* \
-   | mips64-* | mips64el-* \
-   | mips64octeon-* | mips64octeonel-* \
-   | mips64orion-* | mips64orionel-* \
-   | mips64r5900-* | mips64r5900el-* \
-   | mips64vr-* | mips64vrel-* \
-   | mips64vr4100-* | mips64vr4100el-* \
-   | mips64vr4300-* | mips64vr4300el-* \
-   | mips64vr5000-* | mips64vr5000el-* \
-   | mips64vr5900-* | mips64vr5900el-* \
-   | mipsisa32-* | mipsisa32el-* \
-   | mipsisa32r2-* | mipsisa32r2el-* \
-   | mipsisa32r6-* | mipsisa32r6el-* \
-   | mipsisa64-* | mipsisa64el-* \
-   | mipsisa64r2-* | mipsisa64r2el-* \
-   | mipsisa64r6-* | mipsisa64r6el-* \
-   | mipsisa64sb1-* | mipsisa64sb1el-* \
-   | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-   | mipsr5900-* | mipsr5900el-* \
-   | mipstx39-* | mipstx39el-* \
-   | mmix-* \
-   | mt-* \
-   | msp430-* \
-   | nds32-* | nds32le-* | nds32be-* \
-   | nfp-* \
-   | nios-* | nios2-* | nios2eb-* | nios2el-* \
-   | none-* | np1-* | ns16k-* | ns32k-* \
-   | open8-* \
-   | or1k*-* \
-   | orion-* \
-   | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-   | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-   | pru-* \
-   | pyramid-* \
-   | riscv32-* | riscv64-* \
-   | rl78-* | romp-* | rs6000-* | rx-* \
-   | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-   | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-   | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-   | sparclite-* \
-   | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-   | tahoe-* \
-   | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-   | tile*-* \
-   | tron-* \
-   | ubicom32-* \
-   | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-   | vax-* \
-   | visium-* \
-   | wasm32-* \
-   | we32k-* \
-   | x86-* | x86_64-* | xc16x-* | xps100-* \
-   | xstormy16-* | xtensa*-* \
-   | ymp-* \
-   | z8k-* | z80-*)
-       ;;
-   # Recognize the basic CPU types without company name, with glob match.
-   xtensa*)
-       basic_machine=$basic_machine-unknown
-       ;;
    # Recognize the various machine names and aliases which stand
    # for a CPU type and a company and sometimes even an OS.
    3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-       basic_machine=m68000-att
+       cpu=m68000
+       vendor=att
        ;;
    3b*)
-       basic_machine=we32k-att
-       ;;
-   abacus)
-       basic_machine=abacus-unknown
-       ;;
-   alliant | fx80)
-       basic_machine=fx80-alliant
-       ;;
-   altos | altos3068)
-       basic_machine=m68k-altos
-       ;;
-   amd64)
-       basic_machine=x86_64-pc
-       ;;
-   amd64-*)
-       basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-       ;;
-   amiga | amiga-*)
-       basic_machine=m68k-unknown
-       ;;
-   asmjs)
-       basic_machine=asmjs-unknown
-       ;;
-   blackfin-*)
-       basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-       os=linux
+       cpu=we32k
+       vendor=att
        ;;
    bluegene*)
-       basic_machine=powerpc-ibm
+       cpu=powerpc
+       vendor=ibm
        os=cnk
        ;;
-   c54x-*)
-       basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-       ;;
-   c55x-*)
-       basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-       ;;
-   c6x-*)
-       basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-       ;;
-   c90)
-       basic_machine=c90-cray
-       os=${os:-unicos}
-       ;;
-   convex-c1)
-       basic_machine=c1-convex
-       os=bsd
-       ;;
-   convex-c2)
-       basic_machine=c2-convex
-       os=bsd
-       ;;
-   convex-c32)
-       basic_machine=c32-convex
-       os=bsd
-       ;;
-   convex-c34)
-       basic_machine=c34-convex
-       os=bsd
-       ;;
-   convex-c38)
-       basic_machine=c38-convex
-       os=bsd
-       ;;
-   cr16 | cr16-*)
-       basic_machine=cr16-unknown
-       os=${os:-elf}
-       ;;
-   crds | unos)
-       basic_machine=m68k-crds
-       ;;
-   crisv32 | crisv32-* | etraxfs*)
-       basic_machine=crisv32-axis
-       ;;
-   cris | cris-* | etrax*)
-       basic_machine=cris-axis
-       ;;
-   crx)
-       basic_machine=crx-unknown
-       os=${os:-elf}
-       ;;
-   da30 | da30-*)
-       basic_machine=m68k-da30
-       ;;
-   decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-       basic_machine=mips-dec
-       ;;
    decsystem10* | dec10*)
-       basic_machine=pdp10-dec
+       cpu=pdp10
+       vendor=dec
        os=tops10
        ;;
    decsystem20* | dec20*)
-       basic_machine=pdp10-dec
+       cpu=pdp10
+       vendor=dec
        os=tops20
        ;;
    delta | 3300 | motorola-3300 | motorola-delta \
          | 3300-motorola | delta-motorola)
-       basic_machine=m68k-motorola
-       ;;
-   dpx20 | dpx20-*)
-       basic_machine=rs6000-bull
-       os=${os:-bosx}
+       cpu=m68k
+       vendor=motorola
        ;;
    dpx2*)
-       basic_machine=m68k-bull
+       cpu=m68k
+       vendor=bull
        os=sysv3
        ;;
-   e500v[12])
-       basic_machine=powerpc-unknown
-       os=$os"spe"
-       ;;
-   e500v[12]-*)
-       basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-       os=$os"spe"
-       ;;
    encore | umax | mmax)
-       basic_machine=ns32k-encore
+       cpu=ns32k
+       vendor=encore
        ;;
    elxsi)
-       basic_machine=elxsi-elxsi
+       cpu=elxsi
+       vendor=elxsi
        os=${os:-bsd}
        ;;
    fx2800)
-       basic_machine=i860-alliant
+       cpu=i860
+       vendor=alliant
        ;;
    genix)
-       basic_machine=ns32k-ns
+       cpu=ns32k
+       vendor=ns
        ;;
    h3050r* | hiux*)
-       basic_machine=hppa1.1-hitachi
+       cpu=hppa1.1
+       vendor=hitachi
        os=hiuxwe2
        ;;
-   hp300-*)
-       basic_machine=m68k-hp
-       ;;
    hp3k9[0-9][0-9] | hp9[0-9][0-9])
-       basic_machine=hppa1.0-hp
+       cpu=hppa1.0
+       vendor=hp
        ;;
    hp9k2[0-9][0-9] | hp9k31[0-9])
-       basic_machine=m68000-hp
+       cpu=m68000
+       vendor=hp
        ;;
    hp9k3[2-9][0-9])
-       basic_machine=m68k-hp
+       cpu=m68k
+       vendor=hp
        ;;
    hp9k6[0-9][0-9] | hp6[0-9][0-9])
-       basic_machine=hppa1.0-hp
+       cpu=hppa1.0
+       vendor=hp
        ;;
    hp9k7[0-79][0-9] | hp7[0-79][0-9])
-       basic_machine=hppa1.1-hp
+       cpu=hppa1.1
+       vendor=hp
        ;;
    hp9k78[0-9] | hp78[0-9])
        # FIXME: really hppa2.0-hp
-       basic_machine=hppa1.1-hp
+       cpu=hppa1.1
+       vendor=hp
        ;;
    hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
        # FIXME: really hppa2.0-hp
-       basic_machine=hppa1.1-hp
+       cpu=hppa1.1
+       vendor=hp
        ;;
    hp9k8[0-9][13679] | hp8[0-9][13679])
-       basic_machine=hppa1.1-hp
+       cpu=hppa1.1
+       vendor=hp
        ;;
    hp9k8[0-9][0-9] | hp8[0-9][0-9])
-       basic_machine=hppa1.0-hp
-       ;;
-   i370-ibm* | ibm*)
-       basic_machine=i370-ibm
+       cpu=hppa1.0
+       vendor=hp
        ;;
    i*86v32)
-       basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+       cpu=`echo "$1" | sed -e 's/86.*/86/'`
+       vendor=pc
        os=sysv32
        ;;
    i*86v4*)
-       basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+       cpu=`echo "$1" | sed -e 's/86.*/86/'`
+       vendor=pc
        os=sysv4
        ;;
    i*86v)
-       basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+       cpu=`echo "$1" | sed -e 's/86.*/86/'`
+       vendor=pc
        os=sysv
        ;;
    i*86sol2)
-       basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+       cpu=`echo "$1" | sed -e 's/86.*/86/'`
+       vendor=pc
        os=solaris2
        ;;
    j90 | j90-cray)
-       basic_machine=j90-cray
+       cpu=j90
+       vendor=cray
        os=${os:-unicos}
        ;;
    iris | iris4d)
-       basic_machine=mips-sgi
+       cpu=mips
+       vendor=sgi
        case $os in
            irix*)
            ;;
@@ -981,40 +804,27 @@ case $basic_machine in
            ;;
        esac
        ;;
-   leon-*|leon[3-9]-*)
-       basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-       ;;
-   m68knommu-*)
-       basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-       os=linux
-       ;;
-   microblaze*)
-       basic_machine=microblaze-xilinx
-       ;;
    miniframe)
-       basic_machine=m68000-convergent
+       cpu=m68000
+       vendor=convergent
        ;;
    *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
-       basic_machine=m68k-atari
+       cpu=m68k
+       vendor=atari
        os=mint
        ;;
-   mips3*-*)
-       basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
-       ;;
-   mips3*)
-       basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
-       ;;
-   ms1-*)
-       basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
-       ;;
    news-3600 | risc-news)
-       basic_machine=mips-sony
+       cpu=mips
+       vendor=sony
        os=newsos
        ;;
    next | m*-next)
-       basic_machine=m68k-next
+       cpu=m68k
+       vendor=next
        case $os in
-           nextstep* )
+           openstep*)
+               ;;
+           nextstep*)
            ;;
            ns2*)
              os=nextstep2
@@ -1025,260 +835,442 @@ case $basic_machine in
        esac
        ;;
    np1)
-       basic_machine=np1-gould
+       cpu=np1
+       vendor=gould
        ;;
-   neo-tandem)
-       basic_machine=neo-tandem
+   op50n-* | op60c-*)
+       cpu=hppa1.1
+       vendor=oki
+       os=proelf
        ;;
-   nse-tandem)
-       basic_machine=nse-tandem
+   pa-hitachi)
+       cpu=hppa1.1
+       vendor=hitachi
+       os=hiuxwe2
        ;;
-   nsr-tandem)
-       basic_machine=nsr-tandem
+   pbd)
+       cpu=sparc
+       vendor=tti
        ;;
-   nsv-tandem)
-       basic_machine=nsv-tandem
+   pbb)
+       cpu=m68k
+       vendor=tti
        ;;
-   nsx-tandem)
-       basic_machine=nsx-tandem
+   pc532)
+       cpu=ns32k
+       vendor=pc532
        ;;
-   op50n-* | op60c-*)
-       basic_machine=hppa1.1-oki
-       os=proelf
+   pn)
+       cpu=pn
+       vendor=gould
        ;;
-   openrisc | openrisc-*)
-       basic_machine=or32-unknown
+   power)
+       cpu=power
+       vendor=ibm
        ;;
-   pa-hitachi)
-       basic_machine=hppa1.1-hitachi
-       os=hiuxwe2
+   ps2)
+       cpu=i386
+       vendor=ibm
        ;;
-   parisc-*)
-       basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-       os=linux
+   rm[46]00)
+       cpu=mips
+       vendor=siemens
        ;;
-   pbd)
-       basic_machine=sparc-tti
+   rtpc | rtpc-*)
+       cpu=romp
+       vendor=ibm
        ;;
-   pbb)
-       basic_machine=m68k-tti
+   sde)
+       cpu=mipsisa32
+       vendor=sde
+       os=${os:-elf}
        ;;
-   pc532 | pc532-*)
-       basic_machine=ns32k-pc532
+   simso-wrs)
+       cpu=sparclite
+       vendor=wrs
+       os=vxworks
        ;;
-   pc98)
-       basic_machine=i386-pc
+   tower | tower-32)
+       cpu=m68k
+       vendor=ncr
        ;;
-   pc98-*)
-       basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   vpp*|vx|vx-*)
+       cpu=f301
+       vendor=fujitsu
+       ;;
+   w65)
+       cpu=w65
+       vendor=wdc
+       ;;
+   w89k-*)
+       cpu=hppa1.1
+       vendor=winbond
+       os=proelf
        ;;
-   pentium | p5 | k5 | k6 | nexgen | viac3)
-       basic_machine=i586-pc
+   none)
+       cpu=none
+       vendor=none
        ;;
-   pentiumpro | p6 | 6x86 | athlon | athlon_*)
-       basic_machine=i686-pc
+   leon|leon[3-9])
+       cpu=sparc
+       vendor=$basic_machine
        ;;
-   pentiumii | pentium2 | pentiumiii | pentium3)
-       basic_machine=i686-pc
+   leon-*|leon[3-9]-*)
+       cpu=sparc
+       vendor=`echo "$basic_machine" | sed 's/-.*//'`
        ;;
-   pentium4)
-       basic_machine=i786-pc
+
+   *-*)
+       # shellcheck disable=SC2162
+       IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
        ;;
-   pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-       basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   # We use `pc' rather than `unknown'
+   # because (1) that's what they normally are, and
+   # (2) the word "unknown" tends to confuse beginning users.
+   i*86 | x86_64)
+       cpu=$basic_machine
+       vendor=pc
        ;;
-   pentiumpro-* | p6-* | 6x86-* | athlon-*)
-       basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   # These rules are duplicated from below for sake of the special case above;
+   # i.e. things that normalized to x86 arches should also default to "pc"
+   pc98)
+       cpu=i386
+       vendor=pc
        ;;
-   pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-       basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   x64 | amd64)
+       cpu=x86_64
+       vendor=pc
        ;;
-   pentium4-*)
-       basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   # Recognize the basic CPU types without company name.
+   *)
+       cpu=$basic_machine
+       vendor=unknown
        ;;
-   pn)
-       basic_machine=pn-gould
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+   # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+   # some cases the only manufacturer, in others, it is the most popular.
+   craynv-unknown)
+       vendor=cray
+       os=${os:-unicosmp}
+       ;;
+   c90-unknown | c90-cray)
+       vendor=cray
+       os=${os:-unicos}
        ;;
-   power)  basic_machine=power-ibm
+   fx80-unknown)
+       vendor=alliant
        ;;
-   ppc | ppcbe)    basic_machine=powerpc-unknown
+   romp-unknown)
+       vendor=ibm
        ;;
-   ppc-* | ppcbe-*)
-       basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   mmix-unknown)
+       vendor=knuth
        ;;
-   ppcle | powerpclittle)
-       basic_machine=powerpcle-unknown
+   microblaze-unknown | microblazeel-unknown)
+       vendor=xilinx
        ;;
-   ppcle-* | powerpclittle-*)
-       basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   rs6000-unknown)
+       vendor=ibm
        ;;
-   ppc64)  basic_machine=powerpc64-unknown
+   vax-unknown)
+       vendor=dec
        ;;
-   ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   pdp11-unknown)
+       vendor=dec
        ;;
-   ppc64le | powerpc64little)
-       basic_machine=powerpc64le-unknown
+   we32k-unknown)
+       vendor=att
        ;;
-   ppc64le-* | powerpc64little-*)
-       basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   cydra-unknown)
+       vendor=cydrome
        ;;
-   ps2)
-       basic_machine=i386-ibm
+   i370-ibm*)
+       vendor=ibm
        ;;
-   rm[46]00)
-       basic_machine=mips-siemens
+   orion-unknown)
+       vendor=highlevel
        ;;
-   rtpc | rtpc-*)
-       basic_machine=romp-ibm
+   xps-unknown | xps100-unknown)
+       cpu=xps100
+       vendor=honeywell
+       ;;
+
+   # Here we normalize CPU types with a missing or matching vendor
+   dpx20-unknown | dpx20-bull)
+       cpu=rs6000
+       vendor=bull
+       os=${os:-bosx}
        ;;
-   s390 | s390-*)
-       basic_machine=s390-ibm
+
+   # Here we normalize CPU types irrespective of the vendor
+   amd64-*)
+       cpu=x86_64
        ;;
-   s390x | s390x-*)
-       basic_machine=s390x-ibm
+   blackfin-*)
+       cpu=bfin
+       os=linux
        ;;
-   sb1)
-       basic_machine=mipsisa64sb1-unknown
+   c54x-*)
+       cpu=tic54x
        ;;
-   sb1el)
-       basic_machine=mipsisa64sb1el-unknown
+   c55x-*)
+       cpu=tic55x
        ;;
-   sde)
-       basic_machine=mipsisa32-sde
-       os=${os:-elf}
+   c6x-*)
+       cpu=tic6x
        ;;
-   sequent)
-       basic_machine=i386-sequent
+   e500v[12]-*)
+       cpu=powerpc
+       os=$os"spe"
        ;;
-   sh5el)
-       basic_machine=sh5le-unknown
+   mips3*-*)
+       cpu=mips64
        ;;
-   simso-wrs)
-       basic_machine=sparclite-wrs
-       os=vxworks
+   ms1-*)
+       cpu=mt
        ;;
-   spur)
-       basic_machine=spur-unknown
+   m68knommu-*)
+       cpu=m68k
+       os=linux
        ;;
-   st2000)
-       basic_machine=m68k-tandem
+   m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+       cpu=s12z
        ;;
-   strongarm-* | thumb-*)
-       basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+   openrisc-*)
+       cpu=or32
        ;;
-   sun2)
-       basic_machine=m68000-sun
+   parisc-*)
+       cpu=hppa
+       os=linux
        ;;
-   sun3 | sun3-*)
-       basic_machine=m68k-sun
+   pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+       cpu=i586
        ;;
-   sun4)
-       basic_machine=sparc-sun
+   pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+       cpu=i686
        ;;
-   sun386 | sun386i | roadrunner)
-       basic_machine=i386-sun
+   pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+       cpu=i686
        ;;
-   tile*)
-       basic_machine=$basic_machine-unknown
-       os=linux-gnu
+   pentium4-*)
+       cpu=i786
        ;;
-   tx39)
-       basic_machine=mipstx39-unknown
+   pc98-*)
+       cpu=i386
        ;;
-   tx39el)
-       basic_machine=mipstx39el-unknown
+   ppc-* | ppcbe-*)
+       cpu=powerpc
        ;;
-   tower | tower-32)
-       basic_machine=m68k-ncr
+   ppcle-* | powerpclittle-*)
+       cpu=powerpcle
        ;;
-   vpp*|vx|vx-*)
-       basic_machine=f301-fujitsu
+   ppc64-*)
+       cpu=powerpc64
        ;;
-   w65*)
-       basic_machine=w65-wdc
-       os=none
+   ppc64le-* | powerpc64little-*)
+       cpu=powerpc64le
        ;;
-   w89k-*)
-       basic_machine=hppa1.1-winbond
-       os=proelf
+   sb1-*)
+       cpu=mipsisa64sb1
        ;;
-   x64)
-       basic_machine=x86_64-pc
+   sb1el-*)
+       cpu=mipsisa64sb1el
        ;;
-   xps | xps100)
-       basic_machine=xps100-honeywell
+   sh5e[lb]-*)
+       cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
        ;;
-   xscale-* | xscalee[bl]-*)
-       basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+   spur-*)
+       cpu=spur
        ;;
-   none)
-       basic_machine=none-none
-       os=${os:-none}
+   strongarm-* | thumb-*)
+       cpu=arm
        ;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-   w89k)
-       basic_machine=hppa1.1-winbond
+   tx39-*)
+       cpu=mipstx39
        ;;
-   op50n)
-       basic_machine=hppa1.1-oki
+   tx39el-*)
+       cpu=mipstx39el
        ;;
-   op60c)
-       basic_machine=hppa1.1-oki
+   x64-*)
+       cpu=x86_64
        ;;
-   romp)
-       basic_machine=romp-ibm
+   xscale-* | xscalee[bl]-*)
+       cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
        ;;
-   mmix)
-       basic_machine=mmix-knuth
+
+   # Recognize the canonical CPU Types that limit and/or modify the
+   # company names they are paired with.
+   cr16-*)
+       os=${os:-elf}
        ;;
-   rs6000)
-       basic_machine=rs6000-ibm
+   crisv32-* | etraxfs*-*)
+       cpu=crisv32
+       vendor=axis
        ;;
-   vax)
-       basic_machine=vax-dec
+   cris-* | etrax*-*)
+       cpu=cris
+       vendor=axis
        ;;
-   pdp11)
-       basic_machine=pdp11-dec
+   crx-*)
+       os=${os:-elf}
        ;;
-   we32k)
-       basic_machine=we32k-att
+   neo-tandem)
+       cpu=neo
+       vendor=tandem
        ;;
-   sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-       basic_machine=sh-unknown
+   nse-tandem)
+       cpu=nse
+       vendor=tandem
        ;;
-   cydra)
-       basic_machine=cydra-cydrome
+   nsr-tandem)
+       cpu=nsr
+       vendor=tandem
        ;;
-   orion)
-       basic_machine=orion-highlevel
+   nsv-tandem)
+       cpu=nsv
+       vendor=tandem
        ;;
-   orion105)
-       basic_machine=clipper-highlevel
+   nsx-tandem)
+       cpu=nsx
+       vendor=tandem
        ;;
-   mac | mpw | mac-mpw)
-       basic_machine=m68k-apple
+   s390-*)
+       cpu=s390
+       vendor=ibm
        ;;
-   pmac | pmac-mpw)
-       basic_machine=powerpc-apple
+   s390x-*)
+       cpu=s390x
+       vendor=ibm
        ;;
-   *-unknown)
-       # Make sure to match an already-canonicalized machine name.
+   tile*-*)
+       os=${os:-linux-gnu}
        ;;
+
    *)
-       echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-       exit 1
+       # Recognize the canonical CPU types that are allowed with any
+       # company name.
+       case $cpu in
+           1750a | 580 \
+           | a29k \
+           | aarch64 | aarch64_be \
+           | abacus \
+           | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+           | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+           | alphapca5[67] | alpha64pca5[67] \
+           | am33_2.0 \
+           | amdgcn \
+           | arc | arceb \
+           | arm  | arm[lb]e | arme[lb] | armv* \
+           | avr | avr32 \
+           | asmjs \
+           | ba \
+           | be32 | be64 \
+           | bfin | bs2000 \
+           | c[123]* | c30 | [cjt]90 | c4x \
+           | c8051 | clipper | craynv | csky | cydra \
+           | d10v | d30v | dlx | dsp16xx \
+           | e2k | elxsi | epiphany \
+           | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+           | h8300 | h8500 \
+           | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+           | hexagon \
+           | i370 | i*86 | i860 | i960 | ia16 | ia64 \
+           | ip2k | iq2000 \
+           | k1om \
+           | le32 | le64 \
+           | lm32 \
+           | m32c | m32r | m32rle \
+           | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+           | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+           | m88110 | m88k | maxq | mb | mcore | mep | metag \
+           | microblaze | microblazeel \
+           | mips | mipsbe | mipseb | mipsel | mipsle \
+           | mips16 \
+           | mips64 | mips64eb | mips64el \
+           | mips64octeon | mips64octeonel \
+           | mips64orion | mips64orionel \
+           | mips64r5900 | mips64r5900el \
+           | mips64vr | mips64vrel \
+           | mips64vr4100 | mips64vr4100el \
+           | mips64vr4300 | mips64vr4300el \
+           | mips64vr5000 | mips64vr5000el \
+           | mips64vr5900 | mips64vr5900el \
+           | mipsisa32 | mipsisa32el \
+           | mipsisa32r2 | mipsisa32r2el \
+           | mipsisa32r6 | mipsisa32r6el \
+           | mipsisa64 | mipsisa64el \
+           | mipsisa64r2 | mipsisa64r2el \
+           | mipsisa64r6 | mipsisa64r6el \
+           | mipsisa64sb1 | mipsisa64sb1el \
+           | mipsisa64sr71k | mipsisa64sr71kel \
+           | mipsr5900 | mipsr5900el \
+           | mipstx39 | mipstx39el \
+           | mmix \
+           | mn10200 | mn10300 \
+           | moxie \
+           | mt \
+           | msp430 \
+           | nds32 | nds32le | nds32be \
+           | nfp \
+           | nios | nios2 | nios2eb | nios2el \
+           | none | np1 | ns16k | ns32k | nvptx \
+           | open8 \
+           | or1k* \
+           | or32 \
+           | orion \
+           | picochip \
+           | pdp10 | pdp11 | pj | pjl | pn | power \
+           | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+           | pru \
+           | pyramid \
+           | riscv | riscv32 | riscv64 \
+           | rl78 | romp | rs6000 | rx \
+           | score \
+           | sh | shl \
+           | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+           | sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+           | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+           | sparclite \
+           | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+           | spu \
+           | tahoe \
+           | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+           | tron \
+           | ubicom32 \
+           | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+           | vax \
+           | visium \
+           | w65 \
+           | wasm32 | wasm64 \
+           | we32k \
+           | x86 | x86_64 | xc16x | xgate | xps100 \
+           | xstormy16 | xtensa* \
+           | ymp \
+           | z8k | z80)
+               ;;
+
+           *)
+               echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+               exit 1
+               ;;
+       esac
        ;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-   *-digital*)
-       basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+case $vendor in
+   digital*)
+       vendor=dec
        ;;
-   *-commodore*)
-       basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+   commodore*)
+       vendor=cbm
        ;;
    *)
        ;;
@@ -1356,7 +1348,7 @@ case $os in
         | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
         | aos* | aros* | cloudabi* | sortix* \
         | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-        | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \
+        | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
         | knetbsd* | mirbsd* | netbsd* \
         | bitrig* | openbsd* | solidbsd* | libertybsd* \
         | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
@@ -1376,12 +1368,12 @@ case $os in
         | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
         | skyos* | haiku* | rdos* | toppers* | drops* | es* \
         | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-        | midnightbsd*)
+        | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
    # Remember, each alternative MUST END IN *, to match a version number.
        ;;
    qnx*)
-       case $basic_machine in
-           x86-* | i*86-*)
+       case $cpu in
+           x86 | i*86)
            ;;
            *)
            os=nto-$os
@@ -1507,7 +1499,7 @@ case $os in
        # Until real need of OS specific support for
        # particular features comes up, bare metal
        # configurations are quite functional.
-       case $basic_machine in
+       case $cpu in
            arm*)
            os=eabi
            ;;
@@ -1541,7 +1533,7 @@ else
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+case $cpu-$vendor in
    score-*)
        os=elf
        ;;
@@ -1722,9 +1714,8 @@ fi
 
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-   *-unknown)
+case $vendor in
+   unknown)
        case $os in
            riscix*)
                vendor=acorn
@@ -1793,11 +1784,10 @@ case $basic_machine in
                vendor=stratus
                ;;
        esac
-       basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
        ;;
 esac
 
-echo "$basic_machine-$os"
+echo "$cpu-$vendor-$os"
 exit
 
 # Local variables: