Manual merge of version 68.11.0esr-1+rpi1 and 78.3.0esr-2 to produce 78.3.0esr-2...
authorPeter Michael Green <plugwash@raspbian.org>
Mon, 5 Oct 2020 12:28:07 +0000 (12:28 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Wed, 7 Oct 2020 09:09:44 +0000 (09:09 +0000)
1  2 
build/moz.configure/arm.configure
build/moz.configure/rust.configure
debian/changelog
debian/patches/series
debian/rules
modules/freetype2/builds/unix/config.guess
old-configure
third_party/rust/backtrace-sys/src/libbacktrace/config.guess
third_party/rust/backtrace-sys/src/libbacktrace/config.sub

Simple merge
index e58ccb6c15052128a2fb349bbb8aa7d66f57ca87,e5122d6b86e9618c0768159d2ad8c4d4a3e12899..af586523b48aa3b3dc29a98de9fdc798054ee5d9
@@@ -226,17 -228,15 +233,17 @@@ def rust_triple_alias(host_or_target, h
  
      host_or_target_str = {host: 'host', target: 'target'}[host_or_target]
  
-     @depends(rustc, host_or_target, c_compiler, rust_supported_targets,
-              arm_target, when=rust_compiler)
+     @depends(rustc, host_or_target, host_or_target_c_compiler,
+              rust_supported_targets, arm_target, when=rust_compiler)
      @checking('for rust %s triplet' % host_or_target_str)
      @imports('os')
-     @imports('subprocess')
 +    @imports('sys')
      @imports(_from='mozbuild.configure.util', _import='LineIO')
      @imports(_from='mozbuild.shellutil', _import='quote')
+     @imports(_from='six', _import='ensure_binary')
      @imports(_from='tempfile', _import='mkstemp')
      @imports(_from='textwrap', _import='dedent')
 +    @imports(_from='__builtin__', _import='repr')
      def rust_target(rustc, host_or_target, compiler_info,
                      rust_supported_targets, arm_target):
          # Rust's --target options are similar to, but not exactly the same
index 4b71962241dab266ce79794586451b3e3ecf9655,94fe75b37f99aed06df619051776a7418db2a6ba..43400c8b6fd4f0757ecf637757487240b7bc622d
- firefox-esr (68.11.0esr-1+rpi1) bullseye-staging; urgency=medium
++firefox-esr (78.3.0esr-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 13 Aug 2020 18:03:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Sep 2020 10:24:13 +0000
 +
- firefox-esr (68.11.0esr-1) unstable; urgency=medium
+ firefox-esr (78.3.0esr-2) unstable; urgency=medium
+   * third-party/rust/authenticator/src/linux/ioctl_mips*.rs: Add missing
+     bindings for mips*.
+  -- Mike Hommey <glandium@debian.org>  Wed, 23 Sep 2020 12:53:29 +0900
+ firefox-esr (78.3.0esr-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2020-43, also known as:
+     CVE-2020-15677, CVE-2020-15676, CVE-2020-15678, CVE-2020-15673.
+   * js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp: Add
+     CodeGenerator::visitWasmRegisterResult function. bz#1649655.
+   * js/src/jit/none/MacroAssembler-none.h: Bump CodeAlignment to 8.
+     bz#1666646.
+  -- Mike Hommey <glandium@debian.org>  Wed, 23 Sep 2020 07:25:27 +0900
+ firefox-esr (78.2.0esr-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2020-32 and mfsa2020-38, also known as:
+     CVE-2020-15652, CVE-2020-6514, CVE-2020-15655, CVE-2020-15653,
+     CVE-2020-6463, CVE-2020-15656, CVE-2020-15658, CVE-2020-15654,
+     CVE-2020-15659, CVE-2020-15664, CVE-2020-15670.
+  -- Mike Hommey <glandium@debian.org>  Thu, 03 Sep 2020 09:30:52 +0900
+ firefox (78.0.2-1) unstable; urgency=medium
+   * New upstream release.
+   * Fix for mfsa2020-28.
+  -- Mike Hommey <glandium@debian.org>  Fri, 10 Jul 2020 09:37:04 +0900
+ firefox (78.0.1-1) unstable; urgency=medium
+   * New upstream release.
+   * debian/rules:
+     - Replace --disable-ion with --disable-jit.
+     - Don't generated the ICU data file for big-endian manually.
+   * js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h,
+     js/src/jit/mips64/MacroAssembler-mips64-inl.h: Add branchTestSymbol
+     and fallibleUnboxPtr. bz#1642265.
+   * config/external/icu/data/*icudata*, config/external/icu/data/moz.build,
+     js/moz.configure: Unify the includion of the ICU data file. bz#1650299.
+   * config/external/icu/common/moz.build,
+     config/external/icu/common/sources.mozbuild,
+     config/external/icu/data/convert_icudata.py,
+     config/external/icu/data/moz.build,
+     config/external/icu/defs.mozbuild,
+     config/external/icu/i18n/moz.build,
+     config/external/icu/i18n/sources.mozbuild,
+     config/external/icu/icupkg/moz.build,
+     config/external/icu/icupkg/sources.mozbuild,
+     config/external/icu/moz.build,
+     config/external/icu/toolutil/moz.build,
+     config/external/icu/toolutil/sources.mozbuild,
+     config/recurse.mk,
+     intl/icu_sources_data.py: Automatically convert the little-endian ICU data
+     file for big-endian builds.
+  -- Mike Hommey <glandium@debian.org>  Fri, 03 Jul 2020 17:07:38 +0900
+ firefox (78.0-1) unstable; urgency=medium
  
    * New upstream release
-   * Fixes for mfsa2020-31, also known as:
-     CVE-2020-15652, CVE-2020-6514, CVE-2020-6463, CVE-2020-15659.
+   * Fixes for mfsa2020-24, also known as:
+     CVE-2020-12415, CVE-2020-12416, CVE-2020-12417, CVE-2020-12418,
+     CVE-2020-12419, CVE-2020-12420, CVE-2020-12421, CVE-2020-12422,
+     CVE-2020-12424, CVE-2020-12425, CVE-2020-12426.
+   * debian/control*: Bump nss build dependency.
+   * debian/control*, debian/rules: Remove build dependency on python2.7.
+   * debian/browser.mozconfig.in: Remove obsolete configure options.
+   * build/virtualenv_packages.txt: Don't install enum and enum34 virtualenv
+     packages in python3 virtualenvs. bz#1632429.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 29 Jul 2020 07:23:16 +0900
+  -- Mike Hommey <glandium@debian.org>  Wed, 01 Jul 2020 10:14:06 +0900
  
- firefox-esr (68.10.0esr-1) unstable; urgency=medium
+ firefox (77.0-1) unstable; urgency=medium
  
    * New upstream release
-   * Fixes for mfsa2020-25, also known as:
-     CVE-2020-12417, CVE-2020-12418, CVE-2020-12419, CVE-2020-12420,
-     CVE-2020-12421.
+   * Fixes for mfsa2020-20, also known as:
+     CVE-2020-12399, CVE-2020-12405, CVE-2020-12406, CVE-2020-12407,
+     CVE-2020-12408, CVE-2020-12409, CVE-2020-12410, CVE-2020-12411.
+   * debian/l10n/gen, debian/l10n_revs.py, debian/latest_nightly.py,
+     debian/rules, debian/symbols.mk: Convert to python 3.
+   * debian/control*: Bump nss and cbindgen build dependencies.
+   * debian/rules:
+     - Revert PKCS11 API change from 76.0.1-1 because the new API is
+       now explicitly used by upstream code.
+     - Stop passing -fno-schedule-insns2 -fno-lifetime-dse and
+       -fno-delete-null-pointer-checks to GCC.
+  -- Mike Hommey <glandium@debian.org>  Wed, 03 Jun 2020 07:53:04 +0900
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 01 Jul 2020 09:08:58 +0900
+ firefox (76.0.1-2) unstable; urgency=medium
  
- firefox-esr (68.9.0esr-1) unstable; urgency=medium
+   * debian/browser.mozconfig.in: Allow addon sideload. Closes: #960084.
+   * debian/control*: Bump nasm build dependency to 2.14.
+  -- Mike Hommey <glandium@debian.org>  Fri, 15 May 2020 09:10:36 +0900
+ firefox (76.0.1-1) unstable; urgency=medium
  
    * New upstream release
-   * Fixes for mfsa2020-21, also known as:
-     CVE-2020-12399, CVE-2020-12405, CVE-2020-12406, CVE-2020-12410.
  
-   * debian/rules: Force using old PKCS11 API when building against newer NSS
-     releases. Closes: #961762.
-   * debian/control*: Bump nss build dependencies.
+   * debian/rules: Force using old PKCS11 API when building against newer
+     NSS releases. Closes: #960012.
+  -- Mike Hommey <glandium@debian.org>  Wed, 13 May 2020 09:09:57 +0900
+ firefox (76.0-2) unstable; urgency=medium
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 03 Jun 2020 06:11:28 +0900
+   * Cargo.lock, third_party/rust/typenum/*: Upgrade typename to 1.12.0.
+     bz#1635671. Fixes FTBFS on i386.
  
- firefox-esr (68.8.0esr-1) unstable; urgency=medium
+  -- Mike Hommey <glandium@debian.org>  Wed, 06 May 2020 14:27:30 +0900
+ firefox (76.0-1) unstable; urgency=medium
  
    * New upstream release
-   * Fixes for mfsa2020-17, also known as:
-     CVE-2020-12387, CVE-2020-6831, CVE-2020-12392, CVE-2020-12395.
+   * Fixes for mfsa2020-16, also known as:
+     CVE-2020-12387, CVE-2020-6831, CVE-2020-12390, CVE-2020-12391,
+     CVE-2020-12392, CVE-2020-12394, CVE-2020-12395, CVE-2020-12396.
+   * debian/control*: Bump nss build dependency.
+   * debian/browser.install.in: Don't install blocklist.xml, it's not there
+     anymore.
+   * config/recurse.mk: Don't depend on in-tree NSS/NSPR when building against
+     system NSS/NSPR. bz#1634926.
+  -- Mike Hommey <glandium@debian.org>  Wed, 06 May 2020 05:41:56 +0900
+ firefox (75.0-2) unstable; urgency=medium
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 06 May 2020 05:29:30 +0900
+   * build/moz.configure/util.configure: In configure, pass extra compiler
+     flags after source path. Fixes FTBFS with --with-system-libvpx with
+     gcc-9 >= 9-20190125-2.
  
- firefox-esr (68.7.0esr-1) unstable; urgency=medium
+  -- Mike Hommey <glandium@debian.org>  Sun, 19 Apr 2020 09:03:28 +0900
+ firefox (75.0-1) unstable; urgency=medium
  
    * New upstream release
-   * Fixes for mfsa2020-13, also known as:
-     CVE-2020-6821, CVE-2020-6822, CVE-2020-6825.
+   * Fixes for mfsa2020-12, also known as:
+     CVE-2020-6821, CVE-2020-6822, CVE-2020-6823, CVE-2020-6824,
+     CVE-2020-6825, CVE-2020-6826.
+   * debian/control*: Bump nss, rustc, cargo, cbindgen and nodejs build
+     dependencies.
+   * debian/control*, debian/rules: Build against libvpx >= 1.8. We used
+     to build-conflicts with that version, but that's not necessary now
+     that upstream needs that version.
+   * debian/browser.install.in: Don't install .chk files, they aren't
+     produced anymore.
+   * debian/browser.install.in, debian/browser.mozconfig.in, debian/control*,
+     debian/rules: Don't build against system sqlite. This is not supported
+     anymore.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 08 Apr 2020 07:54:16 +0900
+   * python/mozbuild/mozbuild/nodeutil.py: Allow to build with older
+     versions of nodejs 10.
  
- firefox-esr (68.6.1esr-1) unstable; urgency=medium
+  -- Mike Hommey <glandium@debian.org>  Wed, 08 Apr 2020 09:41:38 +0900
+ firefox (74.0.1-1) unstable; urgency=medium
  
    * New upstream release
    * Fixes for mfsa2020-11, also known as: CVE-2020-6819, CVE-2020-6820.
index 9f7d0874ff171a118f2e1b59983f4fb2612933e8,e879a878e5e378595687d7c320ca6aea6fd44711..d6a2e3d28334a4a93807190f833428a8f5e06593
@@@ -29,6 -27,4 +27,7 @@@ debian-hacks/Avoid-using-vmrs-vmsr-on-a
  debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch
  debian-hacks/Use-build-id-as-langpack-version-for-reproducibility.patch
  debian-hacks/Don-t-build-ICU-in-parallel.patch
+ debian-hacks/Allow-to-build-with-older-versions-of-nodejs-10.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch
diff --cc debian/rules
index 5bab4b30e3aded4d71f0b21cd15f68fab180432b,386e57054726007ae0ff3cb8609ac443f207c957..be31e92e18ce1bbc6bcbadaae9c67392149e85c2
@@@ -297,16 -271,8 +274,12 @@@ override_dh_auto_clean:
        rm -f $(filter-out debian/control,$(GENERATED_FILES))
        rm -f $$(cat debian/extra-clean 2>/dev/null) debian/extra-clean old-configure js/src/old-configure
        rm -rf stamps l10n $(CARGO_HOME)
 +      find third_party/python/psutil/tmp/ ! -name 'tmpoJXh06.o' -type f -exec rm -f {} +
 +      rm -f third_party/python/psutil/psutil/*.so
 +      rm -rf third_party/python/psutil/build/temp*
 +      rm -rf third_party/python/psutil/build/lib*
        debian/rules debian/control TESTDIR=
  
- ifeq ($(DEB_HOST_ARCH_ENDIAN),big)
-       rm -f config/external/icu/data/$(ICU_DATA_FILE)
- endif
        dh_auto_clean --builddirectory=build-$(PRODUCT)
        dh_auto_clean --builddirectory=build-l10n
        find . -name "*.pyc" -o -name "*.pyo" | xargs --no-run-if-empty rm -f
diff --cc old-configure
index dfee8727eaa4b57448633a0c1ba6d0e03e95fa1a,d37324e996d19c2905ee5ff270fcf27aa6ee30aa..2e35cb903597ede5746acbb358a7832448d96636
@@@ -8519,278 -7529,26 +8519,278 @@@ if test "${with_system_nss+set}" = set
  fi
  
  
 -_SAVE_CFLAGS=$CFLAGS
 -_SAVE_LDFLAGS=$LDFLAGS
 -_SAVE_LIBS=$LIBS
 -if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
 -    CFLAGS="-I${PNG_DIR}/include $CFLAGS"
 -    LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
 -fi
 -if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
 -    MOZ_SYSTEM_PNG=
 +if test -n "$_USE_SYSTEM_NSS"; then
 +    
 +# Check whether --with-nss-prefix or --without-nss-prefix was given.
 +if test "${with_nss_prefix+set}" = set; then
 +  withval="$with_nss_prefix"
 +  nss_config_prefix="$withval"
  else
 -    echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
 -echo "configure:7544: checking for png_get_valid in -lpng" >&5
 -ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 +  nss_config_prefix=""
 +fi
 +
 +
 +# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given.
 +if test "${with_nss_exec_prefix+set}" = set; then
 +  withval="$with_nss_exec_prefix"
 +  nss_config_exec_prefix="$withval"
  else
 -  ac_save_LIBS="$LIBS"
 +  nss_config_exec_prefix=""
 +fi
 +
 +
 +      if test -n "$nss_config_exec_prefix"; then
 +              nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
 +              if test -z "$NSS_CONFIG"; then
 +                      NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
 +              fi
 +      fi
 +      if test -n "$nss_config_prefix"; then
 +              nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
 +              if test -z "$NSS_CONFIG"; then
 +                      NSS_CONFIG=$nss_config_prefix/bin/nss-config
 +              fi
 +      fi
 +
 +      unset ac_cv_path_NSS_CONFIG
 +      # Extract the first word of "nss-config", so it can be a program name with args.
 +set dummy nss-config; ac_word=$2
 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 +echo "configure:8560: checking for $ac_word" >&5
 +if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  case "$NSS_CONFIG" in
 +  /*)
 +  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
 +  ;;
 +  ?:/*)                        
 +  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path.
 +  ;;
 +  *)
 +  IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS=":"
 +  ac_dummy="$PATH"
 +  for ac_dir in $ac_dummy; do 
 +    test -z "$ac_dir" && ac_dir=.
 +    if test -f $ac_dir/$ac_word; then
 +      ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word"
 +      break
 +    fi
 +  done
 +  IFS="$ac_save_ifs"
 +  test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no"
 +  ;;
 +esac
 +fi
 +NSS_CONFIG="$ac_cv_path_NSS_CONFIG"
 +if test -n "$NSS_CONFIG"; then
 +  echo "$ac_t""$NSS_CONFIG" 1>&6
 +else
 +  echo "$ac_t""no" 1>&6
 +fi
 +
-       min_nss_version=3.44.4
++      min_nss_version=3.44.2
 +      echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
 +echo "configure:8595: checking for NSS - version >= $min_nss_version" >&5
 +
 +      no_nss=""
 +      if test "$NSS_CONFIG" = "no"; then
 +              no_nss="yes"
 +      else
 +              NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
 +              NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
 +
 +              nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
 +                      sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'`
 +              nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
 +                      sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'`
 +              nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
 +                      sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'`
 +              if test -z "$nss_config_micro_version"; then
 +                      nss_config_micro_version="0"
 +              fi
 +
 +              min_nss_major_version=`echo $min_nss_version | \
 +                      sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'`
 +              min_nss_minor_version=`echo $min_nss_version | \
 +                      sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'`
 +              min_nss_micro_version=`echo $min_nss_version | \
 +                      sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'`
 +              if test -z "$min_nss_micro_version"; then
 +                      min_nss_micro_version="0"
 +              fi
 +
 +              if test "$nss_config_major_version" -lt "$min_nss_major_version"; then
 +                      no_nss="yes"
 +              elif test "$nss_config_major_version" -eq "$min_nss_major_version" &&
 +                   test "$nss_config_minor_version" -lt "$min_nss_minor_version"; then
 +                      no_nss="yes"
 +              elif test "$nss_config_major_version" -eq "$min_nss_major_version" &&
 +                   test "$nss_config_minor_version" -eq "$min_nss_minor_version" &&
 +                   test "$nss_config_micro_version" -lt "$min_nss_micro_version"; then
 +                      no_nss="yes"
 +              fi
 +      fi
 +
 +      if test -z "$no_nss"; then
 +              echo "$ac_t""yes" 1>&6
 +              MOZ_SYSTEM_NSS=1     
 +      else
 +              echo "$ac_t""no" 1>&6
 +              { echo "configure: error: you don't have NSS installed or your version is too old" 1>&2; echo "configure: error: you don't have NSS installed or your version is too old" 1>&5; exit 1; }
 +      fi
 +
 +
 +      
 +      
 +
 +
 +fi
 +
 +NSS_CFLAGS="$NSS_CFLAGS -I${DIST}/include/nss"
 +if test -z "$MOZ_SYSTEM_NSS"; then
 +   case "${OS_ARCH}" in
 +        # Only few platforms have been tested with GYP
 +        WINNT|Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD|SunOS)
 +            ;;
 +        *)
 +            { echo "configure: error: building in-tree NSS is not supported on this platform. Use --with-system-nss" 1>&2; echo "configure: error: building in-tree NSS is not supported on this platform. Use --with-system-nss" 1>&5; exit 1; }
 +            ;;
 +   esac
 +fi
 +
 +
 +
 +MOZZLIB=1.2.3
 +
 +# Check whether --with-system-zlib or --without-system-zlib was given.
 +if test "${with_system_zlib+set}" = set; then
 +  withval="$with_system_zlib"
 +  ZLIB_DIR=$withval
 +fi
 +
 +
 +if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then
 +    _SAVE_CFLAGS=$CFLAGS
 +    _SAVE_LDFLAGS=$LDFLAGS
 +    _SAVE_LIBS=$LIBS
 +
 +    if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then
 +        MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
 +        MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib"
 +        CFLAGS="$MOZ_ZLIB_CFLAGS $CFLAGS"
 +        LDFLAGS="$MOZ_ZLIB_LIBS $LDFLAGS"
 +    fi
 +    if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then
 +        MOZ_SYSTEM_ZLIB=
 +    else
 +        echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
 +echo "configure:8689: checking for gzread in -lz" >&5
 +ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lz  $LIBS"
 +cat > conftest.$ac_ext <<EOF
 +#line 8697 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
 +    builtin and then its argument prototype would still apply.  */
 +char gzread();
 +
 +int main() {
 +gzread()
 +; return 0; }
 +EOF
 +if { (eval echo configure:8708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=no"
 +fi
 +rm -f conftest*
 +LIBS="$ac_save_LIBS"
 +
 +fi
 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
 +  MOZ_SYSTEM_ZLIB=1 MOZ_ZLIB_LIBS="$MOZ_ZLIB_LIBS -lz"
 +else
 +  echo "$ac_t""no" 1>&6
 +MOZ_SYSTEM_ZLIB=
 +fi
 +
 +        if test "$MOZ_SYSTEM_ZLIB" = 1; then
 +            MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'`
 +            cat > conftest.$ac_ext <<EOF
 +#line 8732 "configure"
 +#include "confdefs.h"
 + #include <stdio.h>
 +                             #include <string.h>
 +                             #include <zlib.h> 
 +int main() {
 + #if ZLIB_VERNUM < $MOZZLIBNUM
 +                             #error "Insufficient zlib version ($MOZZLIBNUM required)."
 +                             #endif 
 +; return 0; }
 +EOF
 +if { (eval echo configure:8743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  rm -rf conftest*
 +  MOZ_SYSTEM_ZLIB=1
 +else
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  rm -rf conftest*
 +  { echo "configure: error: Insufficient zlib version for --with-system-zlib ($MOZZLIB required)" 1>&2; echo "configure: error: Insufficient zlib version for --with-system-zlib ($MOZZLIB required)" 1>&5; exit 1; }
 +fi
 +rm -f conftest*
 +        fi
 +    fi
 +    CFLAGS=$_SAVE_CFLAGS
 +    LDFLAGS=$_SAVE_LDFLAGS
 +    LIBS=$_SAVE_LIBS
 +fi
 +
 +
 +
 +
 +
 +
 +
 +if test -z "$SKIP_LIBRARY_CHECKS"; then
 +
 +# Check whether --with-system-png or --without-system-png was given.
 +if test "${with_system_png+set}" = set; then
 +  withval="$with_system_png"
 +  PNG_DIR=$withval
 +fi
 +
 +
 +_SAVE_CFLAGS=$CFLAGS
 +_SAVE_LDFLAGS=$LDFLAGS
 +_SAVE_LIBS=$LIBS
 +if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
 +    CFLAGS="-I${PNG_DIR}/include $CFLAGS"
 +    LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
 +fi
 +if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
 +    MOZ_SYSTEM_PNG=
 +else
 +    echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
 +echo "configure:8786: checking for png_get_valid in -lpng" >&5
 +ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  ac_save_LIBS="$LIBS"
  LIBS="-lpng  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 7552 "configure"
 +#line 8794 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
  
  
  
-     if test -z "$ICU_DATA_FILE"; then
-         ICU_DATA_FILE="icudt${version}l.dat"
-     fi
 +
 +_INTL_API=yes
 +
 +if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
 +    USE_ICU=1
 +fi
 +
 +
 +
 +MOZ_SYSTEM_ICU=
 +# Check whether --with-system-icu or --without-system-icu was given.
 +if test "${with_system_icu+set}" = set; then
 +  withval="$with_system_icu"
 +  if test "$withval" = "yes"; then
 +    MOZ_SYSTEM_ICU=1
 +  elif test "$withval" = "no"; then
 +    :
 +  else
 +    { echo "configure: error: Option, system-icu, does not take an argument ($withval)." 1>&2; echo "configure: error: Option, system-icu, does not take an argument ($withval)." 1>&5; exit 1; }
 +  fi
 +fi
 +
 +
 +if test -n "$MOZ_SYSTEM_ICU"; then
 +    succeeded=no
 +
 +  if test -z "$PKG_CONFIG"; then
 +     echo "*** The pkg-config script could not be found. Make sure it is"
 +     echo "*** in your path, or set the PKG_CONFIG environment variable"
 +     echo "*** to the full path to pkg-config."
 +     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
 +  else
 +     PKG_CONFIG_MIN_VERSION=0.9.0
 +     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
 +        echo $ac_n "checking for icu-i18n >= 63.1""... $ac_c" 1>&6
 +echo "configure:12204: checking for icu-i18n >= 63.1" >&5
 +
 +        if $PKG_CONFIG --exists "icu-i18n >= 63.1" ; then
 +            echo "$ac_t""yes" 1>&6
 +            succeeded=yes
 +
 +            echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6
 +echo "configure:12211: checking MOZ_ICU_CFLAGS" >&5
 +            MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 63.1"`
 +            echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6
 +
 +            echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6
 +echo "configure:12216: checking MOZ_ICU_LIBS" >&5
 +            ## Remove evil flags like -Wl,--export-dynamic
 +            MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 63.1\" |sed s/-Wl,--export-dynamic//g`"
 +            echo "$ac_t""$MOZ_ICU_LIBS" 1>&6
 +        else
 +            MOZ_ICU_CFLAGS=""
 +            MOZ_ICU_LIBS=""
 +            ## If we have a custom action on failure, don't print errors, but 
 +            ## do set a variable so people can do so.
 +            MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 63.1"`
 +            echo $MOZ_ICU_PKG_ERRORS
 +        fi
 +
 +        
 +        
 +     else
 +        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
 +        echo "*** See http://www.freedesktop.org/software/pkgconfig"
 +     fi
 +  fi
 +
 +  if test $succeeded = yes; then
 +     :
 +  else
 +     if test "$COMPILE_ENVIRONMENT"; then 
 +       { echo "configure: error: Library requirements (icu-i18n >= 63.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 63.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; }
 +     fi
 +  fi
 +
 +    CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS"
 +    CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS"
 +    cat >> confdefs.pytmp <<\EOF
 +    (''' MOZ_SYSTEM_ICU ''', ' 1 ')
 +EOF
 +cat >> confdefs.h <<\EOF
 +#define MOZ_SYSTEM_ICU 1
 +EOF
 +
 +fi
 +
 +
 +
 +# Check whether --with-intl-api or --without-intl-api was given.
 +if test "${with_intl_api+set}" = set; then
 +  withval="$with_intl_api"
 +  _INTL_API=$withval
 +fi
 +
 +
 +ENABLE_INTL_API=
 +EXPOSE_INTL_API=
 +case "$_INTL_API" in
 +no)
 +    ;;
 +build)
 +    ENABLE_INTL_API=1
 +    ;;
 +yes)
 +    ENABLE_INTL_API=1
 +    EXPOSE_INTL_API=1
 +    ;;
 +*)
 +    { echo "configure: error: Invalid value passed to --with-intl-api: $_INTL_API" 1>&2; echo "configure: error: Invalid value passed to --with-intl-api: $_INTL_API" 1>&5; exit 1; }
 +    ;;
 +esac
 +
 +if test -n "$ENABLE_INTL_API"; then
 +    USE_ICU=1
 +fi
 +
 +if test -n "$EXPOSE_INTL_API"; then
 +    cat >> confdefs.pytmp <<\EOF
 +    (''' EXPOSE_INTL_API ''', ' 1 ')
 +EOF
 +cat >> confdefs.h <<\EOF
 +#define EXPOSE_INTL_API 1
 +EOF
 +
 +fi
 +
 +if test -n "$ENABLE_INTL_API"; then
 +    cat >> confdefs.pytmp <<\EOF
 +    (''' ENABLE_INTL_API ''', ' 1 ')
 +EOF
 +cat >> confdefs.h <<\EOF
 +#define ENABLE_INTL_API 1
 +EOF
 +
 +fi
 +
 +if test -n "$USE_ICU"; then
 +    icudir="$_topsrcdir/intl/icu/source"
 +    if test ! -d "$icudir"; then
 +        icudir="$_topsrcdir/../../intl/icu/source"
 +        if test ! -d "$icudir"; then
 +            { echo "configure: error: Cannot find the ICU directory" 1>&2; echo "configure: error: Cannot find the ICU directory" 1>&5; exit 1; }
 +        fi
 +    fi
 +
 +    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
 +    if test x"$version" = x; then
 +       { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; }
 +    fi
 +    MOZ_ICU_VERSION="$version"
 +
 +    # TODO: the l is actually endian-dependent
 +    # We could make this set as 'l' or 'b' for little or big, respectively,
 +    # but we'd need to check in a big-endian version of the file.
++    ICU_DATA_FILE="icudt${version}l.dat"
 +fi
 +
 +
 +
 +
 +
 +
 +if test -n "$USE_ICU"; then
 +            cat >> confdefs.pytmp <<\EOF
 +    (''' U_USING_ICU_NAMESPACE ''', r''' 0 ''')
 +EOF
 +cat >> confdefs.h <<\EOF
 +#define U_USING_ICU_NAMESPACE 0
 +EOF
 +
 +
 +    if test -z "$MOZ_SYSTEM_ICU"; then
 +        case "$OS_TARGET:$CPU_ARCH" in
 +        WINNT:aarch64)
 +                        ;;
 +        *)
 +            if test -z "$YASM" -a -z "$GNU_AS" -a "$COMPILE_ENVIRONMENT"; then
 +                { echo "configure: error: Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api" 1>&2; echo "configure: error: Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api" 1>&5; exit 1; }
 +            fi
 +            ;;
 +        esac
 +                cat >> confdefs.pytmp <<\EOF
 +    (''' U_STATIC_IMPLEMENTATION ''', ' 1 ')
 +EOF
 +cat >> confdefs.h <<\EOF
 +#define U_STATIC_IMPLEMENTATION 1
 +EOF
 +
 +    fi
 +fi
 +
 +
  CFLAGS=`echo \
      $_COMPILATION_CFLAGS \
      $CFLAGS`
@@@ -12464,12 -10472,12 +12462,12 @@@ if test -n "$COMPILE_ENVIRONMENT"; the
  for ac_func in posix_fadvise posix_fallocate
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:12468: checking for $ac_func" >&5
 -echo "configure:10476: checking for $ac_func" >&5
++echo "configure:12466: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 12473 "configure"
 -#line 10481 "configure"
++#line 12471 "configure"
  #define $ac_func innocuous_$ac_func
  #include "confdefs.h"
  #undef $ac_func
@@@ -12496,7 -10504,7 +12494,7 @@@ $ac_func()
  
  ; return 0; }
  EOF
- if { (eval echo configure:12500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -if { (eval echo configure:10508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
@@@ -12528,7 -10536,7 +12526,7 @@@ if test "$MOZ_X11"; the
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
- #line 12532 "configure"
 -#line 10540 "configure"
++#line 12530 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
@@@ -12547,7 -10555,7 +12545,7 @@@ int main() 
      
  ; return 0; }
  EOF
- if { (eval echo configure:12551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 -if { (eval echo configure:10559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:12549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
index f50dcdb6de2af0a2e33f44704da3ec1286e5f291,0000000000000000000000000000000000000000..d622a44e551f209d5e8c5462b3fe53a162f7b330
mode 100755,000000..100755
--- /dev/null
@@@ -1,1480 -1,0 +1,1530 @@@
- #   Copyright 1992-2018 Free Software Foundation, Inc.
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
- timestamp='2018-02-24'
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
 +
- # the Free Software Foundation; either version 3 of the License, or
++timestamp='2012-02-10'
 +
 +# 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
- # along with this program; if not, see <https://www.gnu.org/licenses/>.
++# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful, but
 +# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
- # the same distribution terms that you use for the rest of that
- # program.  This Exception is an additional permission under section 7
- # of the GNU General Public License, version 3 ("GPLv3").
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
- # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
++# the same distribution terms that you use for the rest of that program.
++
++
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
 +#
- # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
- #
- # Please send patches to <config-patches@gnu.org>.
++# This script attempts to guess a canonical system name similar to
++# config.sub.  If it succeeds, it prints the system name on stdout, and
++# exits with 0.  Otherwise, it exits with 1.
 +#
 +# You can get the latest version of this script from:
- Options:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 +
 +me=`echo "$0" | sed -e 's,.*/,,'`
 +
 +usage="\
 +Usage: $0 [OPTION]
 +
 +Output the configuration name of the system \`$me' is run on.
 +
- Copyright 1992-2018 Free Software Foundation, Inc.
++Operation modes:
 +  -h, --help         print this help, then exit
 +  -t, --time-stamp   print date of last modification, then exit
 +  -v, --version      print version number, then exit
 +
 +Report bugs and patches to <config-patches@gnu.org>."
 +
 +version="\
 +GNU config.guess ($timestamp)
 +
 +Originally written by Per Bothner.
-  ,,)    echo "int x;" > "$dummy.c" ;
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++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."
 +
 +help="
 +Try \`$me --help' for more information."
 +
 +# Parse command line
 +while test $# -gt 0 ; do
 +  case $1 in
 +    --time-stamp | --time* | -t )
 +       echo "$timestamp" ; exit ;;
 +    --version | -v )
 +       echo "$version" ; exit ;;
 +    --help | --h* | -h )
 +       echo "$usage"; exit ;;
 +    -- )     # Stop option processing
 +       shift; break ;;
 +    - )       # Use stdin as input.
 +       break ;;
 +    -* )
 +       echo "$me: invalid option $1$help" >&2
 +       exit 1 ;;
 +    * )
 +       break ;;
 +  esac
 +done
 +
 +if test $# != 0; then
 +  echo "$me: too many arguments$help" >&2
 +  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
 +# headache to deal with in a portable fashion.
 +
 +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 +# use `HOST_CC' if defined, but it is deprecated.
 +
 +# 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
-         if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
++ ,,)    echo "int x;" > $dummy.c ;
 +      for c in cc gcc c89 c99 ; do
- case "$UNAME_SYSTEM" in
- Linux|GNU|GNU/*)
-       # If the system lacks a compiler, then just pick glibc.
-       # We could probably try harder.
-       LIBC=gnu
-       eval "$set_cc_for_build"
-       cat <<-EOF > "$dummy.c"
-       #include <features.h>
-       #if defined(__UCLIBC__)
-       LIBC=uclibc
-       #elif defined(__dietlibc__)
-       LIBC=dietlibc
-       #else
-       LIBC=gnu
-       #endif
-       EOF
-       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
-       # If ldd exists, use it to detect musl libc.
-       if command -v ldd >/dev/null && \
-               ldd --version 2>&1 | grep -q ^musl
-       then
-           LIBC=musl
-       fi
-       ;;
- esac
++        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= ;'
 +
 +# 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
 +      PATH=$PATH:/.attbin ; export PATH
 +fi
 +
 +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 +UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 +
- case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 +# Note: order is significant - the case branches are not exclusive.
 +
-       UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-           "/sbin/$sysctl" 2>/dev/null || \
-           "/usr/sbin/$sysctl" 2>/dev/null || \
-           echo unknown)`
-       case "$UNAME_MACHINE_ARCH" in
++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 +    *:NetBSD:*:*)
 +      # NetBSD (nbsd) targets should (where applicable) match one or
 +      # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 +      # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 +      # switched to ELF, *-*-netbsd* would select the old
 +      # object file format.  This provides both forward
 +      # compatibility and a consistent mechanism for selecting the
 +      # object file format.
 +      #
 +      # Note: NetBSD doesn't particularly care about the vendor
 +      # portion of the name.  We always set it to "unknown".
 +      sysctl="sysctl -n hw.machine_arch"
-           earmv*)
-               arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-               endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
-               machine="${arch}${endian}"-unknown
-               ;;
-           *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
++      UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
++          /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++      case "${UNAME_MACHINE_ARCH}" in
 +          armeb) machine=armeb-unknown ;;
 +          arm*) machine=arm-unknown ;;
 +          sh3el) machine=shl-unknown ;;
 +          sh3eb) machine=sh-unknown ;;
 +          sh5el) machine=sh5le-unknown ;;
-       # to ELF recently (or will in the future) and ABI.
-       case "$UNAME_MACHINE_ARCH" in
-           earm*)
-               os=netbsdelf
-               ;;
++          *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 +      esac
 +      # The Operating System including object format, if it has switched
-               eval "$set_cc_for_build"
++      # to ELF recently, or will in the future.
++      case "${UNAME_MACHINE_ARCH}" in
 +          arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-       # Determine ABI tags.
-       case "$UNAME_MACHINE_ARCH" in
-           earm*)
-               expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-               abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
-               ;;
-       esac
++              eval $set_cc_for_build
 +              if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +                      | grep -q __ELF__
 +              then
 +                  # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 +                  # Return netbsd for either.  FIX?
 +                  os=netbsd
 +              else
 +                  os=netbsdelf
 +              fi
 +              ;;
 +          *)
 +              os=netbsd
 +              ;;
 +      esac
-       case "$UNAME_VERSION" in
 +      # The OS release
 +      # Debian GNU/NetBSD machines have a different userland, and
 +      # thus, need a distinct triplet. However, they do not need
 +      # kernel version information, so it can be replaced with a
 +      # suitable tag, in the style of linux-gnu.
-               release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
++      case "${UNAME_VERSION}" in
 +          Debian*)
 +              release='-gnu'
 +              ;;
 +          *)
-       echo "$machine-${os}${release}${abi}"
-       exit ;;
-     *:Bitrig:*:*)
-       UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-       echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
++              release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 +              ;;
 +      esac
 +      # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 +      # contains redundant information, the shorter form:
 +      # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-       echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-       exit ;;
-     *:LibertyBSD:*:*)
-       UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-       echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
-       exit ;;
-     *:MidnightBSD:*:*)
-       echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
++      echo "${machine}-${os}${release}"
 +      exit ;;
 +    *:OpenBSD:*:*)
 +      UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-       echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 +      exit ;;
 +    *:ekkoBSD:*:*)
-       echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 +      exit ;;
 +    *:SolidBSD:*:*)
-       echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 +      exit ;;
 +    macppc:MirBSD:*:*)
-       echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-       exit ;;
-     *:Sortix:*:*)
-       echo "$UNAME_MACHINE"-unknown-sortix
++      echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 +      exit ;;
 +    *:MirBSD:*:*)
-     *:Redox:*:*)
-       echo "$UNAME_MACHINE"-unknown-redox
-       exit ;;
-     mips:OSF1:*.*)
-         echo mips-dec-osf1
-         exit ;;
++      echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 +      exit ;;
-               UNAME_MACHINE=alpha ;;
 +    alpha:OSF1:*:*)
 +      case $UNAME_RELEASE in
 +      *4.0)
 +              UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 +              ;;
 +      *5.*)
 +              UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 +              ;;
 +      esac
 +      # According to Compaq, /usr/sbin/psrinfo has been available on
 +      # OSF/1 and Tru64 systems produced since 1995.  I hope that
 +      # covers most systems running today.  This code pipes the CPU
 +      # types through head -n 1, so we only detect the type of CPU 0.
 +      ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 +      case "$ALPHA_CPU_TYPE" in
 +          "EV4 (21064)")
-               UNAME_MACHINE=alpha ;;
++              UNAME_MACHINE="alpha" ;;
 +          "EV4.5 (21064)")
-               UNAME_MACHINE=alpha ;;
++              UNAME_MACHINE="alpha" ;;
 +          "LCA4 (21066/21068)")
-               UNAME_MACHINE=alphaev5 ;;
++              UNAME_MACHINE="alpha" ;;
 +          "EV5 (21164)")
-               UNAME_MACHINE=alphaev56 ;;
++              UNAME_MACHINE="alphaev5" ;;
 +          "EV5.6 (21164A)")
-               UNAME_MACHINE=alphapca56 ;;
++              UNAME_MACHINE="alphaev56" ;;
 +          "EV5.6 (21164PC)")
-               UNAME_MACHINE=alphapca57 ;;
++              UNAME_MACHINE="alphapca56" ;;
 +          "EV5.7 (21164PC)")
-               UNAME_MACHINE=alphaev6 ;;
++              UNAME_MACHINE="alphapca57" ;;
 +          "EV6 (21264)")
-               UNAME_MACHINE=alphaev67 ;;
++              UNAME_MACHINE="alphaev6" ;;
 +          "EV6.7 (21264A)")
-               UNAME_MACHINE=alphaev68 ;;
++              UNAME_MACHINE="alphaev67" ;;
 +          "EV6.8CB (21264C)")
-               UNAME_MACHINE=alphaev68 ;;
++              UNAME_MACHINE="alphaev68" ;;
 +          "EV6.8AL (21264B)")
-               UNAME_MACHINE=alphaev68 ;;
++              UNAME_MACHINE="alphaev68" ;;
 +          "EV6.8CX (21264D)")
-               UNAME_MACHINE=alphaev69 ;;
++              UNAME_MACHINE="alphaev68" ;;
 +          "EV6.9A (21264/EV69A)")
-               UNAME_MACHINE=alphaev7 ;;
++              UNAME_MACHINE="alphaev69" ;;
 +          "EV7 (21364)")
-               UNAME_MACHINE=alphaev79 ;;
++              UNAME_MACHINE="alphaev7" ;;
 +          "EV7.9 (21364A)")
-       echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
++              UNAME_MACHINE="alphaev79" ;;
 +      esac
 +      # A Pn.n version is a patched version.
 +      # A Vn.n version is a released version.
 +      # A Tn.n version is a released field test version.
 +      # A Xn.n version is an unreleased experimental baselevel.
 +      # 1.2 uses "1.2" for uname -r.
-       echo "$UNAME_MACHINE"-unknown-amigaos
++      echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 +      # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 +      exitcode=$?
 +      trap '' 0
 +      exit $exitcode ;;
++    Alpha\ *:Windows_NT*:*)
++      # How do we know it's Interix rather than the generic POSIX subsystem?
++      # Should we change UNAME_MACHINE based on the output of uname instead
++      # of the specific Alpha model?
++      echo alpha-pc-interix
++      exit ;;
++    21064:Windows_NT:50:3)
++      echo alpha-dec-winnt3.5
++      exit ;;
 +    Amiga*:UNIX_System_V:4.0:*)
 +      echo m68k-unknown-sysv4
 +      exit ;;
 +    *:[Aa]miga[Oo][Ss]:*:*)
-       echo "$UNAME_MACHINE"-unknown-morphos
++      echo ${UNAME_MACHINE}-unknown-amigaos
 +      exit ;;
 +    *:[Mm]orph[Oo][Ss]:*:*)
-       echo arm-acorn-riscix"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE}-unknown-morphos
 +      exit ;;
 +    *:OS/390:*:*)
 +      echo i370-ibm-openedition
 +      exit ;;
 +    *:z/VM:*:*)
 +      echo s390-ibm-zvmoe
 +      exit ;;
 +    *:OS400:*:*)
 +      echo powerpc-ibm-os400
 +      exit ;;
 +    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-     arm*:riscos:*:*|arm*:RISCOS:*:*)
++      echo arm-acorn-riscix${UNAME_RELEASE}
 +      exit ;;
-       echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
++    arm:riscos:*:*|arm:RISCOS:*:*)
 +      echo arm-unknown-riscos
 +      exit ;;
 +    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 +      echo hppa1.1-hitachi-hiuxmpp
 +      exit ;;
 +    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 +      # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 +      if test "`(/bin/universe) 2>/dev/null`" = att ; then
 +              echo pyramid-pyramid-sysv3
 +      else
 +              echo pyramid-pyramid-bsd
 +      fi
 +      exit ;;
 +    NILE*:*:*:dcosx)
 +      echo pyramid-pyramid-svr4
 +      exit ;;
 +    DRS?6000:unix:4.0:6*)
 +      echo sparc-icl-nx6
 +      exit ;;
 +    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 +      case `/usr/bin/uname -p` in
 +          sparc) echo sparc-icl-nx7; exit ;;
 +      esac ;;
 +    s390x:SunOS:*:*)
-       echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++      echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +      exit ;;
 +    sun4H:SunOS:5.*:*)
-       echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
++      echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +      exit ;;
 +    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-       echo i386-pc-auroraux"$UNAME_RELEASE"
++      echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +      exit ;;
 +    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-       eval "$set_cc_for_build"
-       SUN_ARCH=i386
++      echo i386-pc-auroraux${UNAME_RELEASE}
 +      exit ;;
 +    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-       if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++      eval $set_cc_for_build
++      SUN_ARCH="i386"
 +      # If there is a compiler, see if it is configured for 64-bit objects.
 +      # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 +      # This test works for both compilers.
-               (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++      if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 +          if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-               SUN_ARCH=x86_64
++              (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 +              grep IS_64BIT_ARCH >/dev/null
 +          then
-       echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++              SUN_ARCH="x86_64"
 +          fi
 +      fi
-       echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++      echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +      exit ;;
 +    sun4*:SunOS:6*:*)
 +      # According to config.sub, this is the proper way to canonicalize
 +      # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 +      # it's likely to be more like Solaris than SunOS4.
-       echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
++      echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +      exit ;;
 +    sun4*:SunOS:*:*)
 +      case "`/usr/bin/arch -k`" in
 +          Series*|S4*)
 +              UNAME_RELEASE=`uname -v`
 +              ;;
 +      esac
 +      # Japanese Language versions have a version number like `4.1.3-JL'.
-       echo m68k-sun-sunos"$UNAME_RELEASE"
++      echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
 +      exit ;;
 +    sun3*:SunOS:*:*)
-       test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
++      echo m68k-sun-sunos${UNAME_RELEASE}
 +      exit ;;
 +    sun*:*:4.2BSD:*)
 +      UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-               echo m68k-sun-sunos"$UNAME_RELEASE"
++      test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 +      case "`/bin/arch`" in
 +          sun3)
-               echo sparc-sun-sunos"$UNAME_RELEASE"
++              echo m68k-sun-sunos${UNAME_RELEASE}
 +              ;;
 +          sun4)
-       echo sparc-auspex-sunos"$UNAME_RELEASE"
++              echo sparc-sun-sunos${UNAME_RELEASE}
 +              ;;
 +      esac
 +      exit ;;
 +    aushp:SunOS:*:*)
-       echo m68k-atari-mint"$UNAME_RELEASE"
++      echo sparc-auspex-sunos${UNAME_RELEASE}
 +      exit ;;
 +    # The situation for MiNT is a little confusing.  The machine name
 +    # can be virtually everything (everything which is not
 +    # "atarist" or "atariste" at least should have a processor
 +    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
 +    # to the lowercase version "mint" (or "freemint").  Finally
 +    # the system name "TOS" denotes a system which is actually not
 +    # MiNT.  But MiNT is downward compatible to TOS, so this should
 +    # be no problem.
 +    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-       echo m68k-atari-mint"$UNAME_RELEASE"
++      echo m68k-atari-mint${UNAME_RELEASE}
 +      exit ;;
 +    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-       echo m68k-atari-mint"$UNAME_RELEASE"
++      echo m68k-atari-mint${UNAME_RELEASE}
 +      exit ;;
 +    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-       echo m68k-milan-mint"$UNAME_RELEASE"
++      echo m68k-atari-mint${UNAME_RELEASE}
 +      exit ;;
 +    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-       echo m68k-hades-mint"$UNAME_RELEASE"
++      echo m68k-milan-mint${UNAME_RELEASE}
 +      exit ;;
 +    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-       echo m68k-unknown-mint"$UNAME_RELEASE"
++      echo m68k-hades-mint${UNAME_RELEASE}
 +      exit ;;
 +    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-       echo m68k-apple-machten"$UNAME_RELEASE"
++      echo m68k-unknown-mint${UNAME_RELEASE}
 +      exit ;;
 +    m68k:machten:*:*)
-       echo powerpc-apple-machten"$UNAME_RELEASE"
++      echo m68k-apple-machten${UNAME_RELEASE}
 +      exit ;;
 +    powerpc:machten:*:*)
-       echo mips-dec-ultrix"$UNAME_RELEASE"
++      echo powerpc-apple-machten${UNAME_RELEASE}
 +      exit ;;
 +    RISC*:Mach:*:*)
 +      echo mips-dec-mach_bsd4.3
 +      exit ;;
 +    RISC*:ULTRIX:*:*)
-       echo vax-dec-ultrix"$UNAME_RELEASE"
++      echo mips-dec-ultrix${UNAME_RELEASE}
 +      exit ;;
 +    VAX*:ULTRIX*:*:*)
-       echo clipper-intergraph-clix"$UNAME_RELEASE"
++      echo vax-dec-ultrix${UNAME_RELEASE}
 +      exit ;;
 +    2020:CLIX:*:* | 2430:CLIX:*:*)
-       eval "$set_cc_for_build"
-       sed 's/^        //' << EOF > "$dummy.c"
++      echo clipper-intergraph-clix${UNAME_RELEASE}
 +      exit ;;
 +    mips:*:*:UMIPS | mips:*:*:RISCos)
-         printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
++      eval $set_cc_for_build
++      sed 's/^        //' << EOF >$dummy.c
 +#ifdef __cplusplus
 +#include <stdio.h>  /* for printf() prototype */
 +      int main (int argc, char *argv[]) {
 +#else
 +      int main (argc, argv) int argc; char *argv[]; {
 +#endif
 +      #if defined (host_mips) && defined (MIPSEB)
 +      #if defined (SYSTYPE_SYSV)
-         printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
++        printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
 +      #endif
 +      #if defined (SYSTYPE_SVR4)
-         printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
++        printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
 +      #endif
 +      #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-       $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
-         dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-         SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
++        printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
 +      #endif
 +      #endif
 +        exit (-1);
 +      }
 +EOF
-       echo mips-mips-riscos"$UNAME_RELEASE"
++      $CC_FOR_BUILD -o $dummy $dummy.c &&
++        dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++        SYSTEM_NAME=`$dummy $dummyarg` &&
 +          { echo "$SYSTEM_NAME"; exit; }
-       if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
++      echo mips-mips-riscos${UNAME_RELEASE}
 +      exit ;;
 +    Motorola:PowerMAX_OS:*:*)
 +      echo powerpc-motorola-powermax
 +      exit ;;
 +    Motorola:*:4.3:PL8-*)
 +      echo powerpc-harris-powermax
 +      exit ;;
 +    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 +      echo powerpc-harris-powermax
 +      exit ;;
 +    Night_Hawk:Power_UNIX:*:*)
 +      echo powerpc-harris-powerunix
 +      exit ;;
 +    m88k:CX/UX:7*:*)
 +      echo m88k-harris-cxux7
 +      exit ;;
 +    m88k:*:4*:R4*)
 +      echo m88k-motorola-sysv4
 +      exit ;;
 +    m88k:*:3*:R3*)
 +      echo m88k-motorola-sysv3
 +      exit ;;
 +    AViiON:dgux:*:*)
 +      # DG/UX returns AViiON for all architectures
 +      UNAME_PROCESSOR=`/usr/bin/uname -p`
-           if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
-              [ "$TARGET_BINARY_INTERFACE"x = x ]
++      if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 +      then
-               echo m88k-dg-dgux"$UNAME_RELEASE"
++          if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
++             [ ${TARGET_BINARY_INTERFACE}x = x ]
 +          then
-               echo m88k-dg-dguxbcs"$UNAME_RELEASE"
++              echo m88k-dg-dgux${UNAME_RELEASE}
 +          else
-           echo i586-dg-dgux"$UNAME_RELEASE"
++              echo m88k-dg-dguxbcs${UNAME_RELEASE}
 +          fi
 +      else
-       echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
++          echo i586-dg-dgux${UNAME_RELEASE}
 +      fi
 +      exit ;;
 +    M88*:DolphinOS:*:*)       # DolphinOS (SVR3)
 +      echo m88k-dolphin-sysv3
 +      exit ;;
 +    M88*:*:R3*:*)
 +      # Delta 88k system running SVR3
 +      echo m88k-motorola-sysv3
 +      exit ;;
 +    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 +      echo m88k-tektronix-sysv3
 +      exit ;;
 +    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 +      echo m68k-tektronix-bsd
 +      exit ;;
 +    *:IRIX*:*:*)
-               IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
++      echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 +      exit ;;
 +    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 +      echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
 +      exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
 +    i*86:AIX:*:*)
 +      echo i386-ibm-aix
 +      exit ;;
 +    ia64:AIX:*:*)
 +      if [ -x /usr/bin/oslevel ] ; then
 +              IBM_REV=`/usr/bin/oslevel`
 +      else
-       echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
++              IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 +      fi
-               eval "$set_cc_for_build"
-               sed 's/^                //' << EOF > "$dummy.c"
++      echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
 +      exit ;;
 +    *:AIX:2:3)
 +      if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-               if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
++              eval $set_cc_for_build
++              sed 's/^                //' << EOF >$dummy.c
 +              #include <sys/systemcfg.h>
 +
 +              main()
 +                      {
 +                      if (!__power_pc())
 +                              exit(1);
 +                      puts("powerpc-ibm-aix3.2.5");
 +                      exit(0);
 +                      }
 +EOF
-       if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
++              if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
 +              then
 +                      echo "$SYSTEM_NAME"
 +              else
 +                      echo rs6000-ibm-aix3.2.5
 +              fi
 +      elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 +              echo rs6000-ibm-aix3.2.4
 +      else
 +              echo rs6000-ibm-aix3.2
 +      fi
 +      exit ;;
 +    *:AIX:*:[4567])
 +      IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-       if [ -x /usr/bin/lslpp ] ; then
-               IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-                          awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
++      if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 +              IBM_ARCH=rs6000
 +      else
 +              IBM_ARCH=powerpc
 +      fi
-               IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
++      if [ -x /usr/bin/oslevel ] ; then
++              IBM_REV=`/usr/bin/oslevel`
 +      else
-       echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
++              IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 +      fi
-     ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
++      echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 +      exit ;;
 +    *:AIX:*:*)
 +      echo rs6000-ibm-aix
 +      exit ;;
-       echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
++    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 +      echo romp-ibm-bsd4.4
 +      exit ;;
 +    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-       HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-       case "$UNAME_MACHINE" in
-           9000/31?)            HP_ARCH=m68000 ;;
-           9000/[34]??)         HP_ARCH=m68k ;;
++      echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 +      exit ;;                             # report: romp-ibm BSD 4.3
 +    *:BOSX:*:*)
 +      echo rs6000-bull-bosx
 +      exit ;;
 +    DPX/2?00:B.O.S.:*:*)
 +      echo m68k-bull-sysv3
 +      exit ;;
 +    9000/[34]??:4.3bsd:1.*:*)
 +      echo m68k-hp-bsd
 +      exit ;;
 +    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 +      echo m68k-hp-bsd4.4
 +      exit ;;
 +    9000/[34678]??:HP-UX:*:*)
-                   case "$sc_cpu_version" in
-                     523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-                     528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
++      HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++      case "${UNAME_MACHINE}" in
++          9000/31? )            HP_ARCH=m68000 ;;
++          9000/[34]?? )         HP_ARCH=m68k ;;
 +          9000/[678][0-9][0-9])
 +              if [ -x /usr/bin/getconf ]; then
 +                  sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 +                  sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                       case "$sc_kernel_bits" in
-                         32) HP_ARCH=hppa2.0n ;;
-                         64) HP_ARCH=hppa2.0w ;;
-                         '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
++                  case "${sc_cpu_version}" in
++                    523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                    528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 +                    532)                      # CPU_PA_RISC2_0
-               if [ "$HP_ARCH" = "" ]; then
-                   eval "$set_cc_for_build"
-                   sed 's/^            //' << EOF > "$dummy.c"
++                      case "${sc_kernel_bits}" in
++                        32) HP_ARCH="hppa2.0n" ;;
++                        64) HP_ARCH="hppa2.0w" ;;
++                        '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
 +                      esac ;;
 +                  esac
 +              fi
-                   (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
++              if [ "${HP_ARCH}" = "" ]; then
++                  eval $set_cc_for_build
++                  sed 's/^            //' << EOF >$dummy.c
 +
 +              #define _HPUX_SOURCE
 +              #include <stdlib.h>
 +              #include <unistd.h>
 +
 +              int main ()
 +              {
 +              #if defined(_SC_KERNEL_BITS)
 +                  long bits = sysconf(_SC_KERNEL_BITS);
 +              #endif
 +                  long cpu  = sysconf (_SC_CPU_VERSION);
 +
 +                  switch (cpu)
 +                      {
 +                      case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
 +                      case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
 +                      case CPU_PA_RISC2_0:
 +              #if defined(_SC_KERNEL_BITS)
 +                          switch (bits)
 +                              {
 +                              case 64: puts ("hppa2.0w"); break;
 +                              case 32: puts ("hppa2.0n"); break;
 +                              default: puts ("hppa2.0"); break;
 +                              } break;
 +              #else  /* !defined(_SC_KERNEL_BITS) */
 +                          puts ("hppa2.0"); break;
 +              #endif
 +                      default: puts ("hppa1.0"); break;
 +                      }
 +                  exit (0);
 +              }
 +EOF
-       if [ "$HP_ARCH" = hppa2.0w ]
++                  (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 +                  test -z "$HP_ARCH" && HP_ARCH=hppa
 +              fi ;;
 +      esac
-           eval "$set_cc_for_build"
++      if [ ${HP_ARCH} = "hppa2.0w" ]
 +      then
-           if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
++          eval $set_cc_for_build
 +
 +          # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 +          # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
 +          # generating 64-bit code.  GNU and HP use different nomenclature:
 +          #
 +          # $ CC_FOR_BUILD=cc ./config.guess
 +          # => hppa2.0w-hp-hpux11.23
 +          # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 +          # => hppa64-hp-hpux11.23
 +
-               HP_ARCH=hppa2.0w
++          if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
 +              grep -q __LP64__
 +          then
-               HP_ARCH=hppa64
++              HP_ARCH="hppa2.0w"
 +          else
-       echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
++              HP_ARCH="hppa64"
 +          fi
 +      fi
-       HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-       echo ia64-hp-hpux"$HPUX_REV"
++      echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 +      exit ;;
 +    ia64:HP-UX:*:*)
-       eval "$set_cc_for_build"
-       sed 's/^        //' << EOF > "$dummy.c"
++      HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++      echo ia64-hp-hpux${HPUX_REV}
 +      exit ;;
 +    3050*:HI-UX:*:*)
-       $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
++      eval $set_cc_for_build
++      sed 's/^        //' << EOF >$dummy.c
 +      #include <unistd.h>
 +      int
 +      main ()
 +      {
 +        long cpu = sysconf (_SC_CPU_VERSION);
 +        /* The order matters, because CPU_IS_HP_MC68K erroneously returns
 +           true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
 +           results, however.  */
 +        if (CPU_IS_PA_RISC (cpu))
 +          {
 +            switch (cpu)
 +              {
 +                case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
 +                case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
 +                case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
 +                default: puts ("hppa-hitachi-hiuxwe2"); break;
 +              }
 +          }
 +        else if (CPU_IS_HP_MC68K (cpu))
 +          puts ("m68k-hitachi-hiuxwe2");
 +        else puts ("unknown-hitachi-hiuxwe2");
 +        exit (0);
 +      }
 +EOF
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
++      $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
 +              { echo "$SYSTEM_NAME"; exit; }
 +      echo unknown-hitachi-hiuxwe2
 +      exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
++    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 +      echo hppa1.1-hp-bsd
 +      exit ;;
 +    9000/8??:4.3bsd:*:*)
 +      echo hppa1.0-hp-bsd
 +      exit ;;
 +    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 +      echo hppa1.0-hp-mpeix
 +      exit ;;
-           echo "$UNAME_MACHINE"-unknown-osf1mk
++    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 +      echo hppa1.1-hp-osf
 +      exit ;;
 +    hp8??:OSF1:*:*)
 +      echo hppa1.0-hp-osf
 +      exit ;;
 +    i*86:OSF1:*:*)
 +      if [ -x /usr/sbin/sysversion ] ; then
-           echo "$UNAME_MACHINE"-unknown-osf1
++          echo ${UNAME_MACHINE}-unknown-osf1mk
 +      else
-       echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
++          echo ${UNAME_MACHINE}-unknown-osf1
 +      fi
 +      exit ;;
 +    parisc*:Lites*:*:*)
 +      echo hppa1.1-hp-lites
 +      exit ;;
 +    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 +      echo c1-convex-bsd
 +      exit ;;
 +    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 +      if getsysinfo -f scalar_acc
 +      then echo c32-convex-bsd
 +      else echo c2-convex-bsd
 +      fi
 +      exit ;;
 +    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 +      echo c34-convex-bsd
 +      exit ;;
 +    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 +      echo c38-convex-bsd
 +      exit ;;
 +    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 +      echo c4-convex-bsd
 +      exit ;;
 +    CRAY*Y-MP:*:*:*)
-       echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
++      echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +      exit ;;
 +    CRAY*[A-Z]90:*:*:*)
-       echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
++      echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 +      | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 +            -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 +            -e 's/\.[^.]*$/.X/'
 +      exit ;;
 +    CRAY*TS:*:*:*)
-       echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
++      echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +      exit ;;
 +    CRAY*T3E:*:*:*)
-       echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
++      echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +      exit ;;
 +    CRAY*SV1:*:*:*)
-       echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
++      echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +      exit ;;
 +    *:UNICOS/mp:*:*)
-       FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-       FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-       FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
++      echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +      exit ;;
 +    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-       FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-       FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
++      FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++      FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++      FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 +      echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +      exit ;;
 +    5000:UNIX_System_V:4.*:*)
-       echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
++      FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++      FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 +      echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +      exit ;;
 +    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-       echo sparc-unknown-bsdi"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 +      exit ;;
 +    sparc*:BSD/OS:*:*)
-       echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
++      echo sparc-unknown-bsdi${UNAME_RELEASE}
 +      exit ;;
 +    *:BSD/OS:*:*)
-       case "$UNAME_PROCESSOR" in
++      echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 +      exit ;;
 +    *:FreeBSD:*:*)
 +      UNAME_PROCESSOR=`/usr/bin/uname -p`
-               UNAME_PROCESSOR=x86_64 ;;
-           i386)
-               UNAME_PROCESSOR=i586 ;;
++      case ${UNAME_PROCESSOR} in
 +          amd64)
-       echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
++              echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++          *)
++              echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +      esac
-       echo "$UNAME_MACHINE"-pc-cygwin
-       exit ;;
-     *:MINGW64*:*)
-       echo "$UNAME_MACHINE"-pc-mingw64
 +      exit ;;
 +    i*:CYGWIN*:*)
-       echo "$UNAME_MACHINE"-pc-mingw32
++      echo ${UNAME_MACHINE}-pc-cygwin
 +      exit ;;
 +    *:MINGW*:*)
-     *:MSYS*:*)
-       echo "$UNAME_MACHINE"-pc-msys
++      echo ${UNAME_MACHINE}-pc-mingw32
++      exit ;;
++    i*:MSYS*:*)
++      echo ${UNAME_MACHINE}-pc-msys
 +      exit ;;
-       echo "$UNAME_MACHINE"-pc-pw32
++    i*:windows32*:*)
++      # uname -m includes "-pc" on this system.
++      echo ${UNAME_MACHINE}-mingw32
 +      exit ;;
 +    i*:PW*:*)
-       case "$UNAME_MACHINE" in
++      echo ${UNAME_MACHINE}-pc-pw32
 +      exit ;;
 +    *:Interix*:*)
-               echo i586-pc-interix"$UNAME_RELEASE"
++      case ${UNAME_MACHINE} in
 +          x86)
-               echo x86_64-unknown-interix"$UNAME_RELEASE"
++              echo i586-pc-interix${UNAME_RELEASE}
 +              exit ;;
 +          authenticamd | genuineintel | EM64T)
-               echo ia64-unknown-interix"$UNAME_RELEASE"
++              echo x86_64-unknown-interix${UNAME_RELEASE}
 +              exit ;;
 +          IA64)
-       echo "$UNAME_MACHINE"-pc-uwin
++              echo ia64-unknown-interix${UNAME_RELEASE}
 +              exit ;;
 +      esac ;;
++    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++      echo i${UNAME_MACHINE}-pc-mks
++      exit ;;
++    8664:Windows_NT:*)
++      echo x86_64-pc-mks
++      exit ;;
++    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
++      # How do we know it's Interix rather than the generic POSIX subsystem?
++      # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
++      # UNAME_MACHINE based on the output of uname instead of i386?
++      echo i586-pc-interix
++      exit ;;
 +    i*:UWIN*:*)
-       echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++      echo ${UNAME_MACHINE}-pc-uwin
 +      exit ;;
 +    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 +      echo x86_64-unknown-cygwin
 +      exit ;;
++    p*:CYGWIN*:*)
++      echo powerpcle-unknown-cygwin
++      exit ;;
 +    prep*:SunOS:5.*:*)
-       echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
++      echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +      exit ;;
 +    *:GNU:*:*)
 +      # the GNU system
-       echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
++      echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 +      exit ;;
 +    *:GNU/*:*:*)
 +      # other systems with GNU libc and userland
-       echo "$UNAME_MACHINE"-pc-minix
++      echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 +      exit ;;
 +    i*86:Minix:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-pc-minix
 +      exit ;;
 +    aarch64:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    aarch64_be:Linux:*:*)
 +      UNAME_MACHINE=aarch64_be
-       if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-       exit ;;
-     arc:Linux:*:* | arceb:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    alpha:Linux:*:*)
 +      case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 +        EV5)   UNAME_MACHINE=alphaev5 ;;
 +        EV56)  UNAME_MACHINE=alphaev56 ;;
 +        PCA56) UNAME_MACHINE=alphapca56 ;;
 +        PCA57) UNAME_MACHINE=alphapca56 ;;
 +        EV6)   UNAME_MACHINE=alphaev6 ;;
 +        EV67)  UNAME_MACHINE=alphaev67 ;;
 +        EV68*) UNAME_MACHINE=alphaev68 ;;
 +      esac
 +      objdump --private-headers /bin/sh | grep -q ld.so.1
-       eval "$set_cc_for_build"
++      if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++      echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 +      exit ;;
 +    arm*:Linux:*:*)
-           echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      eval $set_cc_for_build
 +      if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +          | grep -q __ARM_EABI__
 +      then
-               echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
++          echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      else
 +          if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 +              | grep -q __ARM_PCS_VFP
 +          then
-               echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
++              echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 +          else
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++              echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
 +          fi
 +      fi
 +      exit ;;
 +    avr32*:Linux:*:*)
-       echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    cris:Linux:*:*)
-       echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-       exit ;;
-     e2k:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-axis-linux-gnu
 +      exit ;;
 +    crisv32:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-axis-linux-gnu
 +      exit ;;
 +    frv:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    hexagon:Linux:*:*)
-       echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    i*86:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-       exit ;;
-     k1om:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      LIBC=gnu
++      eval $set_cc_for_build
++      sed 's/^        //' << EOF >$dummy.c
++      #ifdef __dietlibc__
++      LIBC=dietlibc
++      #endif
++EOF
++      eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++      echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 +      exit ;;
 +    ia64:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    m32r*:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    m68*:Linux:*:*)
-       eval "$set_cc_for_build"
-       sed 's/^        //' << EOF > "$dummy.c"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    mips:Linux:*:* | mips64:Linux:*:*)
-       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-       test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
++      eval $set_cc_for_build
++      sed 's/^        //' << EOF >$dummy.c
 +      #undef CPU
 +      #undef ${UNAME_MACHINE}
 +      #undef ${UNAME_MACHINE}el
 +      #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 +      CPU=${UNAME_MACHINE}el
 +      #else
 +      #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 +      CPU=${UNAME_MACHINE}
 +      #else
 +      CPU=
 +      #endif
 +      #endif
 +EOF
-     mips64el:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-       exit ;;
-     openrisc*:Linux:*:*)
-       echo or1k-unknown-linux-"$LIBC"
-       exit ;;
-     or32:Linux:*:* | or1k*:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++      test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +      ;;
-       echo sparc-unknown-linux-"$LIBC"
++    or32:Linux:*:*)
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    padre:Linux:*:*)
-       echo hppa64-unknown-linux-"$LIBC"
++      echo sparc-unknown-linux-gnu
 +      exit ;;
 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
-         PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
-         PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
-         *)    echo hppa-unknown-linux-"$LIBC" ;;
++      echo hppa64-unknown-linux-gnu
 +      exit ;;
 +    parisc:Linux:*:* | hppa:Linux:*:*)
 +      # Look for CPU level
 +      case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-       echo powerpc64-unknown-linux-"$LIBC"
++        PA7*) echo hppa1.1-unknown-linux-gnu ;;
++        PA8*) echo hppa2.0-unknown-linux-gnu ;;
++        *)    echo hppa-unknown-linux-gnu ;;
 +      esac
 +      exit ;;
 +    ppc64:Linux:*:*)
-       echo powerpc-unknown-linux-"$LIBC"
-       exit ;;
-     ppc64le:Linux:*:*)
-       echo powerpc64le-unknown-linux-"$LIBC"
-       exit ;;
-     ppcle:Linux:*:*)
-       echo powerpcle-unknown-linux-"$LIBC"
-       exit ;;
-     riscv32:Linux:*:* | riscv64:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo powerpc64-unknown-linux-gnu
 +      exit ;;
 +    ppc:Linux:*:*)
-       echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
++      echo powerpc-unknown-linux-gnu
 +      exit ;;
 +    s390:Linux:*:* | s390x:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-ibm-linux
 +      exit ;;
 +    sh64*:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    sh*:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    sparc:Linux:*:* | sparc64:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    tile*:Linux:*:*)
-       echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    vax:Linux:*:*)
-       if objdump -f /bin/sh | grep -q elf32-x86-64; then
-           echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
-       else
-           echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-       fi
++      echo ${UNAME_MACHINE}-dec-linux-gnu
 +      exit ;;
 +    x86_64:Linux:*:*)
-       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    xtensa*:Linux:*:*)
-       echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
++      echo ${UNAME_MACHINE}-unknown-linux-gnu
 +      exit ;;
 +    i*86:DYNIX/ptx:4*:*)
 +      # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 +      # earlier versions are messed up and put the nodename in both
 +      # sysname and nodename.
 +      echo i386-sequent-sysv4
 +      exit ;;
 +    i*86:UNIX_SV:4.2MP:2.*)
 +      # Unixware is an offshoot of SVR4, but it has its own version
 +      # number series starting with 2...
 +      # I am not positive that other SVR4 systems won't match this,
 +      # I just have to hope.  -- rms.
 +      # Use sysv4.2uw... so that sysv4* matches it.
-       echo "$UNAME_MACHINE"-pc-os2-emx
++      echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 +      exit ;;
 +    i*86:OS/2:*:*)
 +      # If we were able to find `uname', then EMX Unix compatibility
 +      # is probably installed.
-       echo "$UNAME_MACHINE"-unknown-stop
++      echo ${UNAME_MACHINE}-pc-os2-emx
 +      exit ;;
 +    i*86:XTS-300:*:STOP)
-       echo "$UNAME_MACHINE"-unknown-atheos
++      echo ${UNAME_MACHINE}-unknown-stop
 +      exit ;;
 +    i*86:atheos:*:*)
-       echo "$UNAME_MACHINE"-pc-syllable
++      echo ${UNAME_MACHINE}-unknown-atheos
 +      exit ;;
 +    i*86:syllable:*:*)
-       echo i386-unknown-lynxos"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE}-pc-syllable
 +      exit ;;
 +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-       echo "$UNAME_MACHINE"-pc-msdosdjgpp
++      echo i386-unknown-lynxos${UNAME_RELEASE}
 +      exit ;;
 +    i*86:*DOS:*:*)
-     i*86:*:4.*:*)
-       UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
++      echo ${UNAME_MACHINE}-pc-msdosdjgpp
 +      exit ;;
-               echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
++      UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 +      if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-               echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
++              echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
 +      else
-       echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
++              echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 +      fi
 +      exit ;;
 +    i*86:*:5:[678]*)
 +      # UnixWare 7.x, OpenUNIX and OpenServer 6.
 +      case `/bin/uname -X | grep "^Machine"` in
 +          *486*)           UNAME_MACHINE=i486 ;;
 +          *Pentium)        UNAME_MACHINE=i586 ;;
 +          *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 +      esac
-               echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
++      echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 +      exit ;;
 +    i*86:*:3.2:*)
 +      if test -f /usr/options/cb.name; then
 +              UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-               echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
++              echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 +      elif /bin/uname -X 2>/dev/null >/dev/null ; then
 +              UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 +              (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
 +              (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 +                      && UNAME_MACHINE=i586
 +              (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 +                      && UNAME_MACHINE=i686
 +              (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 +                      && UNAME_MACHINE=i686
-               echo "$UNAME_MACHINE"-pc-sysv32
++              echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 +      else
-       # prints for the "djgpp" host, or else GDB configure will decide that
++              echo ${UNAME_MACHINE}-pc-sysv32
 +      fi
 +      exit ;;
 +    pc:*:*:*)
 +      # Left here for compatibility:
 +      # uname -m prints for DJGPP always 'pc', but it prints nothing about
 +      # the processor, so we play safe by assuming i586.
 +      # Note: whatever this is, it MUST be the same as what config.sub
-         echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
++      # prints for the "djgpp" host, or else GDB configury will decide that
 +      # this is a cross-build.
 +      echo i586-pc-msdosdjgpp
 +      exit ;;
 +    Intel:Mach:3*:*)
 +      echo i386-pc-mach3
 +      exit ;;
 +    paragon:*:*:*)
 +      echo i860-intel-osf1
 +      exit ;;
 +    i860:*:4.*:*) # i860-SVR4
 +      if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-         echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
++        echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 +      else # Add other i860-SVR4 vendors below as they are discovered.
-         && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
++        echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 +      fi
 +      exit ;;
 +    mini*:CTIX:SYS*5:*)
 +      # "miniframe"
 +      echo m68010-convergent-sysv
 +      exit ;;
 +    mc68k:UNIX:SYSTEM5:3.51m)
 +      echo m68k-convergent-sysv
 +      exit ;;
 +    M680?0:D-NIX:5.3:*)
 +      echo m68k-diab-dnix
 +      exit ;;
 +    M68*:*:R3V[5678]*:*)
 +      test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
 +    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 +      OS_REL=''
 +      test -r /etc/.relid \
 +      && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 +      /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
++        && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 +      /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-           && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
++        && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 +    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 +      /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 +        && { echo i486-ncr-sysv4; exit; } ;;
 +    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 +      OS_REL='.3'
 +      test -r /etc/.relid \
 +          && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 +      /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-           && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
++          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 +      /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-           && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
++          && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
 +      /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-       echo m68k-unknown-lynxos"$UNAME_RELEASE"
++          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 +    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-       echo sparc-unknown-lynxos"$UNAME_RELEASE"
++      echo m68k-unknown-lynxos${UNAME_RELEASE}
 +      exit ;;
 +    mc68030:UNIX_System_V:4.*:*)
 +      echo m68k-atari-sysv4
 +      exit ;;
 +    TSUNAMI:LynxOS:2.*:*)
-       echo rs6000-unknown-lynxos"$UNAME_RELEASE"
++      echo sparc-unknown-lynxos${UNAME_RELEASE}
 +      exit ;;
 +    rs6000:LynxOS:2.*:*)
-       echo powerpc-unknown-lynxos"$UNAME_RELEASE"
++      echo rs6000-unknown-lynxos${UNAME_RELEASE}
 +      exit ;;
 +    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-       echo mips-dde-sysv"$UNAME_RELEASE"
++      echo powerpc-unknown-lynxos${UNAME_RELEASE}
 +      exit ;;
 +    SM[BE]S:UNIX_SV:*:*)
-               echo "$UNAME_MACHINE"-sni-sysv4
++      echo mips-dde-sysv${UNAME_RELEASE}
 +      exit ;;
 +    RM*:ReliantUNIX-*:*:*)
 +      echo mips-sni-sysv4
 +      exit ;;
 +    RM*:SINIX-*:*:*)
 +      echo mips-sni-sysv4
 +      exit ;;
 +    *:SINIX-*:*:*)
 +      if uname -p 2>/dev/null >/dev/null ; then
 +              UNAME_MACHINE=`(uname -p) 2>/dev/null`
-       echo "$UNAME_MACHINE"-stratus-vos
++              echo ${UNAME_MACHINE}-sni-sysv4
 +      else
 +              echo ns32k-sni-sysv
 +      fi
 +      exit ;;
 +    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 +                      # says <Richard.M.Bartel@ccMail.Census.GOV>
 +      echo i586-unisys-sysv4
 +      exit ;;
 +    *:UNIX_System_V:4*:FTX*)
 +      # From Gerald Hewes <hewes@openmarket.com>.
 +      # How about differentiating between stratus architectures? -djm
 +      echo hppa1.1-stratus-sysv4
 +      exit ;;
 +    *:*:*:FTX*)
 +      # From seanf@swdc.stratus.com.
 +      echo i860-stratus-sysv4
 +      exit ;;
 +    i*86:VOS:*:*)
 +      # From Paul.Green@stratus.com.
-       echo m68k-apple-aux"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE}-stratus-vos
 +      exit ;;
 +    *:VOS:*:*)
 +      # From Paul.Green@stratus.com.
 +      echo hppa1.1-stratus-vos
 +      exit ;;
 +    mc68*:A/UX:*:*)
-               echo mips-nec-sysv"$UNAME_RELEASE"
++      echo m68k-apple-aux${UNAME_RELEASE}
 +      exit ;;
 +    news*:NEWS-OS:6*:*)
 +      echo mips-sony-newsos6
 +      exit ;;
 +    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 +      if [ -d /usr/nec ]; then
-               echo mips-unknown-sysv"$UNAME_RELEASE"
++              echo mips-nec-sysv${UNAME_RELEASE}
 +      else
-     x86_64:Haiku:*:*)
-       echo x86_64-unknown-haiku
-       exit ;;
++              echo mips-unknown-sysv${UNAME_RELEASE}
 +      fi
 +      exit ;;
 +    BeBox:BeOS:*:*)   # BeOS running on hardware made by Be, PPC only.
 +      echo powerpc-be-beos
 +      exit ;;
 +    BeMac:BeOS:*:*)   # BeOS running on Mac or Mac clone, PPC only.
 +      echo powerpc-apple-beos
 +      exit ;;
 +    BePC:BeOS:*:*)    # BeOS running on Intel PC compatible.
 +      echo i586-pc-beos
 +      exit ;;
 +    BePC:Haiku:*:*)   # Haiku running on Intel PC compatible.
 +      echo i586-pc-haiku
 +      exit ;;
-       echo sx4-nec-superux"$UNAME_RELEASE"
 +    SX-4:SUPER-UX:*:*)
-       echo sx5-nec-superux"$UNAME_RELEASE"
++      echo sx4-nec-superux${UNAME_RELEASE}
 +      exit ;;
 +    SX-5:SUPER-UX:*:*)
-       echo sx6-nec-superux"$UNAME_RELEASE"
++      echo sx5-nec-superux${UNAME_RELEASE}
 +      exit ;;
 +    SX-6:SUPER-UX:*:*)
-       echo sx7-nec-superux"$UNAME_RELEASE"
++      echo sx6-nec-superux${UNAME_RELEASE}
 +      exit ;;
 +    SX-7:SUPER-UX:*:*)
-       echo sx8-nec-superux"$UNAME_RELEASE"
++      echo sx7-nec-superux${UNAME_RELEASE}
 +      exit ;;
 +    SX-8:SUPER-UX:*:*)
-       echo sx8r-nec-superux"$UNAME_RELEASE"
-       exit ;;
-     SX-ACE:SUPER-UX:*:*)
-       echo sxace-nec-superux"$UNAME_RELEASE"
++      echo sx8-nec-superux${UNAME_RELEASE}
 +      exit ;;
 +    SX-8R:SUPER-UX:*:*)
-       echo powerpc-apple-rhapsody"$UNAME_RELEASE"
++      echo sx8r-nec-superux${UNAME_RELEASE}
 +      exit ;;
 +    Power*:Rhapsody:*:*)
-       echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
++      echo powerpc-apple-rhapsody${UNAME_RELEASE}
 +      exit ;;
 +    *:Rhapsody:*:*)
-       eval "$set_cc_for_build"
-       if test "$UNAME_PROCESSOR" = unknown ; then
-           UNAME_PROCESSOR=powerpc
-       fi
-       if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
-           if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-               if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                      (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-                      grep IS_64BIT_ARCH >/dev/null
-               then
-                   case $UNAME_PROCESSOR in
-                       i386) UNAME_PROCESSOR=x86_64 ;;
-                       powerpc) UNAME_PROCESSOR=powerpc64 ;;
-                   esac
-               fi
-               # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-               if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-                      (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-                      grep IS_PPC >/dev/null
-               then
-                   UNAME_PROCESSOR=powerpc
-               fi
-           fi
-       elif test "$UNAME_PROCESSOR" = i386 ; then
-           # Avoid executing cc on OS X 10.9, as it ships with a stub
-           # that puts up a graphical alert prompting to install
-           # developer tools.  Any system running Mac OS X 10.7 or
-           # later (Darwin 11 and later) is required to have a 64-bit
-           # processor. This is not true of the ARM version of Darwin
-           # that Apple uses in portable devices.
-           UNAME_PROCESSOR=x86_64
-       fi
-       echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 +      exit ;;
 +    *:Darwin:*:*)
 +      UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-       if test "$UNAME_PROCESSOR" = x86; then
++      case $UNAME_PROCESSOR in
++          i386)
++              eval $set_cc_for_build
++              if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++                if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++                    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++                    grep IS_64BIT_ARCH >/dev/null
++                then
++                    UNAME_PROCESSOR="x86_64"
++                fi
++              fi ;;
++          unknown) UNAME_PROCESSOR=powerpc ;;
++      esac
++      echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 +      exit ;;
 +    *:procnto*:*:* | *:QNX:[0123456789]*:*)
 +      UNAME_PROCESSOR=`uname -p`
-       echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
++      if test "$UNAME_PROCESSOR" = "x86"; then
 +              UNAME_PROCESSOR=i386
 +              UNAME_MACHINE=pc
 +      fi
-     NEO-*:NONSTOP_KERNEL:*:*)
-       echo neo-tandem-nsk"$UNAME_RELEASE"
-       exit ;;
-     NSE-*:NONSTOP_KERNEL:*:*)
-       echo nse-tandem-nsk"$UNAME_RELEASE"
++      echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 +      exit ;;
 +    *:QNX:*:4*)
 +      echo i386-pc-qnx
 +      exit ;;
-     NSR-*:NONSTOP_KERNEL:*:*)
-       echo nsr-tandem-nsk"$UNAME_RELEASE"
++    NEO-?:NONSTOP_KERNEL:*:*)
++      echo neo-tandem-nsk${UNAME_RELEASE}
 +      exit ;;
-     NSV-*:NONSTOP_KERNEL:*:*)
-       echo nsv-tandem-nsk"$UNAME_RELEASE"
-       exit ;;
-     NSX-*:NONSTOP_KERNEL:*:*)
-       echo nsx-tandem-nsk"$UNAME_RELEASE"
++    NSE-?:NONSTOP_KERNEL:*:*)
++      echo nse-tandem-nsk${UNAME_RELEASE}
 +      exit ;;
-       echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
++    NSR-?:NONSTOP_KERNEL:*:*)
++      echo nsr-tandem-nsk${UNAME_RELEASE}
 +      exit ;;
 +    *:NonStop-UX:*:*)
 +      echo mips-compaq-nonstopux
 +      exit ;;
 +    BS2000:POSIX*:*:*)
 +      echo bs2000-siemens-sysv
 +      exit ;;
 +    DS/*:UNIX_System_V:*:*)
-       if test "$cputype" = 386; then
++      echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 +      exit ;;
 +    *:Plan9:*:*)
 +      # "uname -m" is not consistent, so use $cputype instead. 386
 +      # is converted to i386 for consistency with other x86
 +      # operating systems.
-       echo "$UNAME_MACHINE"-unknown-plan9
++      if test "$cputype" = "386"; then
 +          UNAME_MACHINE=i386
 +      else
 +          UNAME_MACHINE="$cputype"
 +      fi
-       echo mips-sei-seiux"$UNAME_RELEASE"
++      echo ${UNAME_MACHINE}-unknown-plan9
 +      exit ;;
 +    *:TOPS-10:*:*)
 +      echo pdp10-unknown-tops10
 +      exit ;;
 +    *:TENEX:*:*)
 +      echo pdp10-unknown-tenex
 +      exit ;;
 +    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 +      echo pdp10-dec-tops20
 +      exit ;;
 +    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 +      echo pdp10-xkl-tops20
 +      exit ;;
 +    *:TOPS-20:*:*)
 +      echo pdp10-unknown-tops20
 +      exit ;;
 +    *:ITS:*:*)
 +      echo pdp10-unknown-its
 +      exit ;;
 +    SEI:*:*:SEIUX)
-       echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
++      echo mips-sei-seiux${UNAME_RELEASE}
 +      exit ;;
 +    *:DragonFly:*:*)
-       case "$UNAME_MACHINE" in
++      echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 +      exit ;;
 +    *:*VMS:*:*)
 +      UNAME_MACHINE=`(uname -p) 2>/dev/null`
-       echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
++      case "${UNAME_MACHINE}" in
 +          A*) echo alpha-dec-vms ; exit ;;
 +          I*) echo ia64-dec-vms ; exit ;;
 +          V*) echo vax-dec-vms ; exit ;;
 +      esac ;;
 +    *:XENIX:*:SysV)
 +      echo i386-pc-xenix
 +      exit ;;
 +    i*86:skyos:*:*)
-       echo "$UNAME_MACHINE"-pc-rdos
++      echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 +      exit ;;
 +    i*86:rdos:*:*)
-       echo "$UNAME_MACHINE"-pc-aros
++      echo ${UNAME_MACHINE}-pc-rdos
 +      exit ;;
 +    i*86:AROS:*:*)
-       echo "$UNAME_MACHINE"-unknown-esx
-       exit ;;
-     amd64:Isilon\ OneFS:*:*)
-       echo x86_64-unknown-onefs
++      echo ${UNAME_MACHINE}-pc-aros
 +      exit ;;
 +    x86_64:VMkernel:*:*)
- echo "$0: unable to guess system type" >&2
++      echo ${UNAME_MACHINE}-unknown-esx
 +      exit ;;
 +esac
 +
- case "$UNAME_MACHINE:$UNAME_SYSTEM" in
-     mips:Linux | mips64:Linux)
-       # If we got here on MIPS GNU/Linux, output extra information.
-       cat >&2 <<EOF
++#echo '(No uname command or uname output not recognized.)' 1>&2
++#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
++
++eval $set_cc_for_build
++cat >$dummy.c <<EOF
++#ifdef _SEQUENT_
++# include <sys/types.h>
++# include <sys/utsname.h>
++#endif
++main ()
++{
++#if defined (sony)
++#if defined (MIPSEB)
++  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
++     I don't know....  */
++  printf ("mips-sony-bsd\n"); exit (0);
++#else
++#include <sys/param.h>
++  printf ("m68k-sony-newsos%s\n",
++#ifdef NEWSOS4
++      "4"
++#else
++      ""
++#endif
++      ); exit (0);
++#endif
++#endif
++
++#if defined (__arm) && defined (__acorn) && defined (__unix)
++  printf ("arm-acorn-riscix\n"); exit (0);
++#endif
 +
- NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
- the system type. Please install a C compiler and try again.
++#if defined (hp300) && !defined (hpux)
++  printf ("m68k-hp-bsd\n"); exit (0);
++#endif
++
++#if defined (NeXT)
++#if !defined (__ARCHITECTURE__)
++#define __ARCHITECTURE__ "m68k"
++#endif
++  int version;
++  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
++  if (version < 4)
++    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
++  else
++    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
++  exit (0);
++#endif
++
++#if defined (MULTIMAX) || defined (n16)
++#if defined (UMAXV)
++  printf ("ns32k-encore-sysv\n"); exit (0);
++#else
++#if defined (CMU)
++  printf ("ns32k-encore-mach\n"); exit (0);
++#else
++  printf ("ns32k-encore-bsd\n"); exit (0);
++#endif
++#endif
++#endif
++
++#if defined (__386BSD__)
++  printf ("i386-pc-bsd\n"); exit (0);
++#endif
++
++#if defined (sequent)
++#if defined (i386)
++  printf ("i386-sequent-dynix\n"); exit (0);
++#endif
++#if defined (ns32000)
++  printf ("ns32k-sequent-dynix\n"); exit (0);
++#endif
++#endif
 +
-       ;;
- esac
++#if defined (_SEQUENT_)
++    struct utsname un;
++
++    uname(&un);
++
++    if (strncmp(un.version, "V2", 2) == 0) {
++      printf ("i386-sequent-ptx2\n"); exit (0);
++    }
++    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
++      printf ("i386-sequent-ptx1\n"); exit (0);
++    }
++    printf ("i386-sequent-ptx\n"); exit (0);
++
++#endif
++
++#if defined (vax)
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
++#endif
++
++#if defined (alliant) && defined (i860)
++  printf ("i860-alliant-bsd\n"); exit (0);
++#endif
++
++  exit (1);
++}
 +EOF
- This script (version $timestamp), has failed to recognize the
- operating system you are using. If your script is old, overwrite *all*
- copies of config.guess and config.sub with the latest versions from:
++
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++      { echo "$SYSTEM_NAME"; exit; }
++
++# Apollos put the system type in the environment.
++
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
++
++# Convex versions that predate uname can use getsysinfo(1)
++
++if [ -x /usr/convex/getsysinfo ]
++then
++    case `getsysinfo -f cpu_type` in
++    c1*)
++      echo c1-convex-bsd
++      exit ;;
++    c2*)
++      if getsysinfo -f scalar_acc
++      then echo c32-convex-bsd
++      else echo c2-convex-bsd
++      fi
++      exit ;;
++    c34*)
++      echo c34-convex-bsd
++      exit ;;
++    c38*)
++      echo c38-convex-bsd
++      exit ;;
++    c4*)
++      echo c4-convex-bsd
++      exit ;;
++    esac
++fi
 +
 +cat >&2 <<EOF
++$0: unable to guess system type
 +
-   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
 +
-   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 +and
- If $0 has already been updated, send the following data and any
- information you think might be pertinent to config-patches@gnu.org to
- provide the necessary information to handle your system.
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 +
- UNAME_MACHINE = "$UNAME_MACHINE"
- UNAME_RELEASE = "$UNAME_RELEASE"
- UNAME_SYSTEM  = "$UNAME_SYSTEM"
- UNAME_VERSION = "$UNAME_VERSION"
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches@gnu.org> in order to provide the needed
++information to handle your system.
 +
 +config.guess timestamp = $timestamp
 +
 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
 +
 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
 +/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
 +
 +hostinfo               = `(hostinfo) 2>/dev/null`
 +/bin/universe          = `(/bin/universe) 2>/dev/null`
 +/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
 +/bin/arch              = `(/bin/arch) 2>/dev/null`
 +/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 +
- # eval: (add-hook 'write-file-functions 'time-stamp)
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
 +EOF
 +
 +exit 1
 +
 +# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "timestamp='"
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
index 1d8e98bcee23a0421e4fafe9a6c9ac75180cff25,0000000000000000000000000000000000000000..63634d9a624bd903b5292e5c4f0814fbc608a9d2
mode 100755,000000..100755
--- /dev/null
@@@ -1,1801 -1,0 +1,1794 @@@
- #   Copyright 1992-2018 Free Software Foundation, Inc.
 +#! /bin/sh
 +# Configuration validation subroutine script.
- timestamp='2018-02-22'
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
 +
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 3 of the License, or
++timestamp='2012-02-10'
 +
- # This program is distributed in the hope that it will be useful, but
- # WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- # General Public License for more details.
++# This file is (in principle) common to ALL GNU software.
++# The presence of a machine in this file suggests that SOME GNU software
++# can handle that machine.  It does not imply ALL GNU software can.
++#
++# This file is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
- # along with this program; if not, see <https://www.gnu.org/licenses/>.
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
- # the same distribution terms that you use for the rest of that
- # program.  This Exception is an additional permission under section 7
- # of the GNU General Public License, version 3 ("GPLv3").
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
- # Please send patches to <config-patches@gnu.org>.
++# the same distribution terms that you use for the rest of that program.
 +
 +
- # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
++# Please send patches to <config-patches@gnu.org>.  Submit a context
++# diff and a properly formatted GNU ChangeLog entry.
 +#
 +# Configuration subroutine to validate and canonicalize a configuration type.
 +# Supply the specified configuration type as an argument.
 +# If it is invalid, we print an error message on stderr and exit with code 1.
 +# Otherwise, we print the canonical config type on stdout and succeed.
 +
 +# You can get the latest version of this script from:
- Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 +
 +# This file is supposed to be the same for all GNU packages
 +# and recognize all the CPU types, system types and aliases
 +# that are meaningful with *any* GNU software.
 +# Each package is responsible for reporting which valid configurations
 +# it does not support.  The user should be able to distinguish
 +# a failure to support a valid configuration from a meaningless
 +# configuration.
 +
 +# The goal of this file is to map all the various variations of a given
 +# machine specification into a single specification in the form:
 +#     CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 +# or in some cases, the newer four-part form:
 +#     CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 +# It is wrong to echo any other type of specification.
 +
 +me=`echo "$0" | sed -e 's,.*/,,'`
 +
 +usage="\
- Options:
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
 +
 +Canonicalize a configuration name.
 +
- Copyright 1992-2018 Free Software Foundation, Inc.
++Operation modes:
 +  -h, --help         print this help, then exit
 +  -t, --time-stamp   print date of last modification, then exit
 +  -v, --version      print version number, then exit
 +
 +Report bugs and patches to <config-patches@gnu.org>."
 +
 +version="\
 +GNU config.sub ($timestamp)
 +
-        echo "$1"
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++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."
 +
 +help="
 +Try \`$me --help' for more information."
 +
 +# Parse command line
 +while test $# -gt 0 ; do
 +  case $1 in
 +    --time-stamp | --time* | -t )
 +       echo "$timestamp" ; exit ;;
 +    --version | -v )
 +       echo "$version" ; exit ;;
 +    --help | --h* | -h )
 +       echo "$usage"; exit ;;
 +    -- )     # Stop option processing
 +       shift; break ;;
 +    - )       # Use stdin as input.
 +       break ;;
 +    -* )
 +       echo "$me: invalid option $1$help"
 +       exit 1 ;;
 +
 +    *local*)
 +       # First pass through any local machine types.
- maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++       echo $1
 +       exit ;;
 +
 +    * )
 +       break ;;
 +  esac
 +done
 +
 +case $# in
 + 0) echo "$me: missing argument$help" >&2
 +    exit 1;;
 + 1) ;;
 + *) echo "$me: too many arguments$help" >&2
 +    exit 1;;
 +esac
 +
 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 +# Here we must recognize all the valid KERNEL-OS combinations.
-   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-   kopensolaris*-gnu* | cloudabi*-eabi* | \
++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 +case $maybe_os in
 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-     basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
++  kopensolaris*-gnu* | \
 +  storm-chaos* | os2-emx* | rtmk-nova*)
 +    os=-$maybe_os
-     basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
 +    ;;
 +  android-linux)
 +    os=-linux-android
-     basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-     if [ "$basic_machine" != "$1" ]
-     then os=`echo "$1" | sed 's/.*-/-/'`
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
 +    ;;
 +  *)
-       -apple | -axis | -knuth | -cray | -microblaze*)
++    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
++    if [ $basic_machine != $1 ]
++    then os=`echo $1 | sed 's/.*-/-/'`
 +    else os=; fi
 +    ;;
 +esac
 +
 +### Let's recognize common machines as not being operating systems so
 +### that things like config.sub decstation-3100 work.  We also
 +### recognize some manufacturers as not being operating systems, so we
 +### can provide default operating systems below.
 +case $os in
 +      -sun*os*)
 +              # Prevent following clause from handling this invalid input.
 +              ;;
 +      -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 | \
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++      -apple | -axis | -knuth | -cray | -microblaze)
 +              os=
 +              basic_machine=$1
 +              ;;
 +      -bluegene*)
 +              os=-cnk
 +              ;;
 +      -sim | -cisco | -oki | -wec | -winbond)
 +              os=
 +              basic_machine=$1
 +              ;;
 +      -scout)
 +              ;;
 +      -wrs)
 +              os=-vxworks
 +              basic_machine=$1
 +              ;;
 +      -chorusos*)
 +              os=-chorusos
 +              basic_machine=$1
 +              ;;
 +      -chorusrdb)
 +              os=-chorusrdb
 +              basic_machine=$1
 +              ;;
 +      -hiux*)
 +              os=-hiuxwe2
 +              ;;
 +      -sco6)
 +              os=-sco5v6
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -sco5)
 +              os=-sco3.2v5
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -sco4)
 +              os=-sco3.2v4
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -sco3.2.[4-9]*)
 +              os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -sco3.2v[4-9]*)
 +              # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -sco5v6*)
 +              # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -sco*)
 +              os=-sco3.2v2
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -udk*)
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -isc)
 +              os=-isc2.2
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -lynx*178)
-               os=-lynxos178
-               ;;
-       -lynx*5)
-               os=-lynxos5
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -clix*)
 +              basic_machine=clipper-intergraph
 +              ;;
 +      -isc*)
-               basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +              ;;
 +      -lynx*)
 +              os=-lynxos
 +              ;;
 +      -ptx*)
-       | arc | arceb \
-       | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-       | avr | avr32 \
-       | ba \
-       | be32 | be64 \
++              basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
++              ;;
++      -windowsnt*)
++              os=`echo $os | sed -e 's/windowsnt/winnt/'`
 +              ;;
 +      -psos*)
 +              os=-psos
 +              ;;
 +      -mint | -mint[0-9]*)
 +              basic_machine=m68k-atari
 +              os=-mint
 +              ;;
 +esac
 +
 +# Decode aliases for certain CPU-COMPANY combinations.
 +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 \
-       | c4x | c8051 | clipper \
++      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++        | be32 | be64 \
 +      | bfin \
-       | e2k | epiphany \
-       | fido | fr30 | frv | ft32 \
++      | c4x | clipper \
 +      | d10v | d30v | dlx | dsp16xx \
-       | k1om \
++      | epiphany \
++      | fido | fr30 | frv \
 +      | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +      | hexagon \
 +      | i370 | i860 | i960 | ia16 | ia64 \
 +      | ip2k | iq2000 \
-       | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 +      | le32 | le64 \
 +      | lm32 \
 +      | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | mipsisa32r6 | mipsisa32r6el \
++      | maxq | mb | microblaze | 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 \
-       | mipsisa64r6 | mipsisa64r6el \
 +      | mipsisa64 | mipsisa64el \
 +      | mipsisa64r2 | mipsisa64r2el \
-       | mipsr5900 | mipsr5900el \
 +      | mipsisa64sb1 | mipsisa64sb1el \
 +      | mipsisa64sr71k | mipsisa64sr71kel \
-       | nios | nios2 | nios2eb | nios2el \
 +      | mipstx39 | mipstx39el \
 +      | mn10200 | mn10300 \
 +      | moxie \
 +      | mt \
 +      | msp430 \
 +      | nds32 | nds32le | nds32be \
-       | open8 | or1k | or1knd | or32 \
-       | pdp10 | pj | pjl \
++      | nios | nios2 \
 +      | ns16k | ns32k \
-       | riscv32 | riscv64 \
++      | open8 \
++      | or32 \
++      | pdp10 | pdp11 | pj | pjl \
 +      | powerpc | powerpc64 | powerpc64le | powerpcle \
 +      | pru \
 +      | pyramid \
-       | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 +      | rl78 | rx \
 +      | score \
-       | visium \
-       | wasm32 \
++      | 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 \
 +      | spu \
 +      | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 +      | ubicom32 \
 +      | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-       leon|leon[3-9])
-               basic_machine=sparc-$basic_machine
-               ;;
-       m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
++      | we32k \
 +      | 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
 +              ;;
-       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
++      m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 +              basic_machine=$basic_machine-unknown
 +              os=-none
 +              ;;
-               echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
++      m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 +              ;;
 +      ms1)
 +              basic_machine=mt-unknown
 +              ;;
 +
 +      strongarm | thumb | xscale)
 +              basic_machine=arm-unknown
 +              ;;
 +      xgate)
 +              basic_machine=$basic_machine-unknown
 +              os=-none
 +              ;;
 +      xscaleeb)
 +              basic_machine=armeb-unknown
 +              ;;
 +
 +      xscaleel)
 +              basic_machine=armel-unknown
 +              ;;
 +
 +      # We use `pc' rather than `unknown'
 +      # because (1) that's what they normally are, and
 +      # (2) the word "unknown" tends to confuse beginning users.
 +      i*86 | x86_64)
 +        basic_machine=$basic_machine-pc
 +        ;;
 +      # Object if more than one company name word.
 +      *-*-*)
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
++              echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 +              exit 1
 +              ;;
 +      # Recognize the basic CPU types with company name.
 +      580-* \
 +      | a29k-* \
 +      | aarch64-* | aarch64_be-* \
 +      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 +      | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | ba-* \
++      | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 +      | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 +      | avr-* | avr32-* \
-       | c8051-* | clipper-* | craynv-* | cydra-* \
 +      | be32-* | be64-* \
 +      | bfin-* | bs2000-* \
 +      | c[123]* | c30-* | [cjt]90-* | c4x-* \
-       | e2k-* | elxsi-* \
++      | clipper-* | craynv-* | cydra-* \
 +      | d10v-* | d30v-* | dlx-* \
-       | k1om-* \
++      | 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-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-       | microblaze-* | microblazeel-* \
 +      | le32-* | le64-* \
 +      | lm32-* \
 +      | m32c-* | m32r-* | m32rle-* \
 +      | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | mipsisa32r6-* | mipsisa32r6el-* \
++      | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 +      | 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-* \
-       | mipsisa64r6-* | mipsisa64r6el-* \
 +      | mipsisa64-* | mipsisa64el-* \
 +      | mipsisa64r2-* | mipsisa64r2el-* \
-       | mipsr5900-* | mipsr5900el-* \
 +      | mipsisa64sb1-* | mipsisa64sb1el-* \
 +      | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-       | nios-* | nios2-* | nios2eb-* | nios2el-* \
 +      | mipstx39-* | mipstx39el-* \
 +      | mmix-* \
 +      | mt-* \
 +      | msp430-* \
 +      | nds32-* | nds32le-* | nds32be-* \
-       | or1k*-* \
++      | nios-* | nios2-* \
 +      | none-* | np1-* | ns16k-* | ns32k-* \
 +      | open8-* \
-       | riscv32-* | riscv64-* \
 +      | orion-* \
 +      | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 +      | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 +      | pru-* \
 +      | pyramid-* \
-       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 +      | 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-* \
-       | visium-* \
-       | wasm32-* \
++      | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 +      | tahoe-* \
 +      | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +      | tile*-* \
 +      | tron-* \
 +      | ubicom32-* \
 +      | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 +      | vax-* \
-               basic_machine=i386-pc
 +      | 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.
 +      386bsd)
-               basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=i386-unknown
 +              os=-bsd
 +              ;;
 +      3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 +              basic_machine=m68000-att
 +              ;;
 +      3b*)
 +              basic_machine=we32k-att
 +              ;;
 +      a29khif)
 +              basic_machine=a29k-amd
 +              os=-udi
 +              ;;
 +      abacus)
 +              basic_machine=abacus-unknown
 +              ;;
 +      adobe68k)
 +              basic_machine=m68010-adobe
 +              os=-scout
 +              ;;
 +      alliant | fx80)
 +              basic_machine=fx80-alliant
 +              ;;
 +      altos | altos3068)
 +              basic_machine=m68k-altos
 +              ;;
 +      am29k)
 +              basic_machine=a29k-none
 +              os=-bsd
 +              ;;
 +      amd64)
 +              basic_machine=x86_64-pc
 +              ;;
 +      amd64-*)
-       asmjs)
-               basic_machine=asmjs-unknown
-               ;;
++              basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      amdahl)
 +              basic_machine=580-amdahl
 +              os=-sysv
 +              ;;
 +      amiga | amiga-*)
 +              basic_machine=m68k-unknown
 +              ;;
 +      amigaos | amigados)
 +              basic_machine=m68k-unknown
 +              os=-amigaos
 +              ;;
 +      amigaunix | amix)
 +              basic_machine=m68k-unknown
 +              os=-sysv4
 +              ;;
 +      apollo68)
 +              basic_machine=m68k-apollo
 +              os=-sysv
 +              ;;
 +      apollo68bsd)
 +              basic_machine=m68k-apollo
 +              os=-bsd
 +              ;;
 +      aros)
 +              basic_machine=i386-pc
 +              os=-aros
 +              ;;
-               basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +      aux)
 +              basic_machine=m68k-apple
 +              os=-aux
 +              ;;
 +      balance)
 +              basic_machine=ns32k-sequent
 +              os=-dynix
 +              ;;
 +      blackfin)
 +              basic_machine=bfin-unknown
 +              os=-linux
 +              ;;
 +      blackfin-*)
-               basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              os=-linux
 +              ;;
 +      bluegene*)
 +              basic_machine=powerpc-ibm
 +              os=-cnk
 +              ;;
 +      c54x-*)
-               basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      c55x-*)
-               basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      c6x-*)
-       dpx2*)
++              basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      c90)
 +              basic_machine=c90-cray
 +              os=-unicos
 +              ;;
 +      cegcc)
 +              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 | j90)
 +              basic_machine=j90-cray
 +              os=-unicos
 +              ;;
 +      craynv)
 +              basic_machine=craynv-cray
 +              os=-unicosmp
 +              ;;
 +      cr16 | cr16-*)
 +              basic_machine=cr16-unknown
 +              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=-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
 +              os=-tops10
 +              ;;
 +      decsystem20* | dec20*)
 +              basic_machine=pdp10-dec
 +              os=-tops20
 +              ;;
 +      delta | 3300 | motorola-3300 | motorola-delta \
 +            | 3300-motorola | delta-motorola)
 +              basic_machine=m68k-motorola
 +              ;;
 +      delta88)
 +              basic_machine=m88k-motorola
 +              os=-sysv3
 +              ;;
 +      dicos)
 +              basic_machine=i686-pc
 +              os=-dicos
 +              ;;
 +      djgpp)
 +              basic_machine=i586-pc
 +              os=-msdosdjgpp
 +              ;;
 +      dpx20 | dpx20-*)
 +              basic_machine=rs6000-bull
 +              os=-bosx
 +              ;;
-               basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++      dpx2* | dpx2*-bull)
 +              basic_machine=m68k-bull
 +              os=-sysv3
 +              ;;
 +      e500v[12])
 +              basic_machine=powerpc-unknown
 +              os=$os"spe"
 +              ;;
 +      e500v[12]-*)
-               basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
++              basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              os=$os"spe"
 +              ;;
 +      ebmon29k)
 +              basic_machine=a29k-amd
 +              os=-ebmon
 +              ;;
 +      elxsi)
 +              basic_machine=elxsi-elxsi
 +              os=-bsd
 +              ;;
 +      encore | umax | mmax)
 +              basic_machine=ns32k-encore
 +              ;;
 +      es1800 | OSE68k | ose68k | ose | OSE)
 +              basic_machine=m68k-ericsson
 +              os=-ose
 +              ;;
 +      fx2800)
 +              basic_machine=i860-alliant
 +              ;;
 +      genix)
 +              basic_machine=ns32k-ns
 +              ;;
 +      gmicro)
 +              basic_machine=tron-gmicro
 +              os=-sysv
 +              ;;
 +      go32)
 +              basic_machine=i386-pc
 +              os=-go32
 +              ;;
 +      h3050r* | hiux*)
 +              basic_machine=hppa1.1-hitachi
 +              os=-hiuxwe2
 +              ;;
 +      h8300hms)
 +              basic_machine=h8300-hitachi
 +              os=-hms
 +              ;;
 +      h8300xray)
 +              basic_machine=h8300-hitachi
 +              os=-xray
 +              ;;
 +      h8500hms)
 +              basic_machine=h8500-hitachi
 +              os=-hms
 +              ;;
 +      harris)
 +              basic_machine=m88k-harris
 +              os=-sysv3
 +              ;;
 +      hp300-*)
 +              basic_machine=m68k-hp
 +              ;;
 +      hp300bsd)
 +              basic_machine=m68k-hp
 +              os=-bsd
 +              ;;
 +      hp300hpux)
 +              basic_machine=m68k-hp
 +              os=-hpux
 +              ;;
 +      hp3k9[0-9][0-9] | hp9[0-9][0-9])
 +              basic_machine=hppa1.0-hp
 +              ;;
 +      hp9k2[0-9][0-9] | hp9k31[0-9])
 +              basic_machine=m68000-hp
 +              ;;
 +      hp9k3[2-9][0-9])
 +              basic_machine=m68k-hp
 +              ;;
 +      hp9k6[0-9][0-9] | hp6[0-9][0-9])
 +              basic_machine=hppa1.0-hp
 +              ;;
 +      hp9k7[0-79][0-9] | hp7[0-79][0-9])
 +              basic_machine=hppa1.1-hp
 +              ;;
 +      hp9k78[0-9] | hp78[0-9])
 +              # FIXME: really hppa2.0-hp
 +              basic_machine=hppa1.1-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
 +              ;;
 +      hp9k8[0-9][13679] | hp8[0-9][13679])
 +              basic_machine=hppa1.1-hp
 +              ;;
 +      hp9k8[0-9][0-9] | hp8[0-9][0-9])
 +              basic_machine=hppa1.0-hp
 +              ;;
++      hppa-next)
++              os=-nextstep3
++              ;;
 +      hppaosf)
 +              basic_machine=hppa1.1-hp
 +              os=-osf
 +              ;;
 +      hppro)
 +              basic_machine=hppa1.1-hp
 +              os=-proelf
 +              ;;
 +      i370-ibm* | ibm*)
 +              basic_machine=i370-ibm
 +              ;;
 +      i*86v32)
-               basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +              os=-sysv32
 +              ;;
 +      i*86v4*)
-               basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +              os=-sysv4
 +              ;;
 +      i*86v)
-               basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
++              basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +              os=-sysv
 +              ;;
 +      i*86sol2)
-       vsta)
++              basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +              os=-solaris2
 +              ;;
 +      i386mach)
 +              basic_machine=i386-mach
 +              os=-mach
 +              ;;
-       leon-*|leon[3-9]-*)
-               basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-               ;;
++      i386-vsta | vsta)
 +              basic_machine=i386-unknown
 +              os=-vsta
 +              ;;
 +      iris | iris4d)
 +              basic_machine=mips-sgi
 +              case $os in
 +                  -irix*)
 +                      ;;
 +                  *)
 +                      os=-irix4
 +                      ;;
 +              esac
 +              ;;
 +      isi68 | isi)
 +              basic_machine=m68k-isi
 +              os=-sysv
 +              ;;
-               basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +      m68knommu)
 +              basic_machine=m68k-unknown
 +              os=-linux
 +              ;;
 +      m68knommu-*)
-       microblaze*)
++              basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              os=-linux
 +              ;;
++      m88k-omron*)
++              basic_machine=m88k-omron
++              ;;
 +      magnum | m3230)
 +              basic_machine=mips-mips
 +              os=-sysv
 +              ;;
 +      merlin)
 +              basic_machine=ns32k-utek
 +              os=-sysv
 +              ;;
-       mingw64)
-               basic_machine=x86_64-pc
-               os=-mingw64
-               ;;
++      microblaze)
 +              basic_machine=microblaze-xilinx
 +              ;;
-               basic_machine=i686-pc
 +      mingw32)
-               basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
++              basic_machine=i386-pc
 +              os=-mingw32
 +              ;;
 +      mingw32ce)
 +              basic_machine=arm-unknown
 +              os=-mingw32ce
 +              ;;
 +      miniframe)
 +              basic_machine=m68000-convergent
 +              ;;
 +      *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 +              basic_machine=m68k-atari
 +              os=-mint
 +              ;;
 +      mips3*-*)
-               basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
++              basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 +              ;;
 +      mips3*)
-       moxiebox)
-               basic_machine=moxie-unknown
-               os=-moxiebox
-               ;;
++              basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 +              ;;
 +      monitor)
 +              basic_machine=m68k-rom68k
 +              os=-coff
 +              ;;
 +      morphos)
 +              basic_machine=powerpc-unknown
 +              os=-morphos
 +              ;;
-               basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
 +      msdos)
 +              basic_machine=i386-pc
 +              os=-msdos
 +              ;;
 +      ms1-*)
-               basic_machine=i686-pc
++              basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 +              ;;
 +      msys)
-       next | m*-next)
++              basic_machine=i386-pc
 +              os=-msys
 +              ;;
 +      mvs)
 +              basic_machine=i370-ibm
 +              os=-mvs
 +              ;;
 +      nacl)
 +              basic_machine=le32-unknown
 +              os=-nacl
 +              ;;
 +      ncr3000)
 +              basic_machine=i486-ncr
 +              os=-sysv4
 +              ;;
 +      netbsd386)
 +              basic_machine=i386-unknown
 +              os=-netbsd
 +              ;;
 +      netwinder)
 +              basic_machine=armv4l-rebel
 +              os=-linux
 +              ;;
 +      news | news700 | news800 | news900)
 +              basic_machine=m68k-sony
 +              os=-newsos
 +              ;;
 +      news1000)
 +              basic_machine=m68030-sony
 +              os=-newsos
 +              ;;
 +      news-3600 | risc-news)
 +              basic_machine=mips-sony
 +              os=-newsos
 +              ;;
 +      necv70)
 +              basic_machine=v70-nec
 +              os=-sysv
 +              ;;
-       nsv-tandem)
-               basic_machine=nsv-tandem
-               ;;
++      next | m*-next )
 +              basic_machine=m68k-next
 +              case $os in
 +                  -nextstep* )
 +                      ;;
 +                  -ns2*)
 +                    os=-nextstep2
 +                      ;;
 +                  *)
 +                    os=-nextstep3
 +                      ;;
 +              esac
 +              ;;
 +      nh3000)
 +              basic_machine=m68k-harris
 +              os=-cxux
 +              ;;
 +      nh[45]000)
 +              basic_machine=m88k-harris
 +              os=-cxux
 +              ;;
 +      nindy960)
 +              basic_machine=i960-intel
 +              os=-nindy
 +              ;;
 +      mon960)
 +              basic_machine=i960-intel
 +              os=-mon960
 +              ;;
 +      nonstopux)
 +              basic_machine=mips-compaq
 +              os=-nonstopux
 +              ;;
 +      np1)
 +              basic_machine=np1-gould
 +              ;;
 +      neo-tandem)
 +              basic_machine=neo-tandem
 +              ;;
 +      nse-tandem)
 +              basic_machine=nse-tandem
 +              ;;
 +      nsr-tandem)
 +              basic_machine=nsr-tandem
 +              ;;
-               basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 +      nsx-tandem)
 +              basic_machine=nsx-tandem
 +              ;;
 +      op50n-* | op60c-*)
 +              basic_machine=hppa1.1-oki
 +              os=-proelf
 +              ;;
 +      openrisc | openrisc-*)
 +              basic_machine=or32-unknown
 +              ;;
 +      os400)
 +              basic_machine=powerpc-ibm
 +              os=-os400
 +              ;;
 +      OSE68000 | ose68000)
 +              basic_machine=m68000-ericsson
 +              os=-ose
 +              ;;
 +      os68k)
 +              basic_machine=m68k-none
 +              os=-os68k
 +              ;;
 +      pa-hitachi)
 +              basic_machine=hppa1.1-hitachi
 +              os=-hiuxwe2
 +              ;;
 +      paragon)
 +              basic_machine=i860-intel
 +              os=-osf
 +              ;;
 +      parisc)
 +              basic_machine=hppa-unknown
 +              os=-linux
 +              ;;
 +      parisc-*)
-               basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              os=-linux
 +              ;;
 +      pbd)
 +              basic_machine=sparc-tti
 +              ;;
 +      pbb)
 +              basic_machine=m68k-tti
 +              ;;
 +      pc532 | pc532-*)
 +              basic_machine=ns32k-pc532
 +              ;;
 +      pc98)
 +              basic_machine=i386-pc
 +              ;;
 +      pc98-*)
-               basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      pentium | p5 | k5 | k6 | nexgen | viac3)
 +              basic_machine=i586-pc
 +              ;;
 +      pentiumpro | p6 | 6x86 | athlon | athlon_*)
 +              basic_machine=i686-pc
 +              ;;
 +      pentiumii | pentium2 | pentiumiii | pentium3)
 +              basic_machine=i686-pc
 +              ;;
 +      pentium4)
 +              basic_machine=i786-pc
 +              ;;
 +      pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-               basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      pentiumpro-* | p6-* | 6x86-* | athlon-*)
-               basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-               basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      pentium4-*)
-               basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      pn)
 +              basic_machine=pn-gould
 +              ;;
 +      power)  basic_machine=power-ibm
 +              ;;
 +      ppc | ppcbe)    basic_machine=powerpc-unknown
 +              ;;
 +      ppc-* | ppcbe-*)
-               basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      ppcle | powerpclittle)
 +              basic_machine=powerpcle-unknown
 +              ;;
 +      ppcle-* | powerpclittle-*)
-       ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++              basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      ppc64)  basic_machine=powerpc64-unknown
 +              ;;
-               basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++      ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      ppc64le | powerpc64little)
 +              basic_machine=powerpc64le-unknown
 +              ;;
 +      ppc64le-* | powerpc64little-*)
-       rdos | rdos64)
-               basic_machine=x86_64-pc
-               os=-rdos
-               ;;
-       rdos32)
++              basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      ps2)
 +              basic_machine=i386-ibm
 +              ;;
 +      pw32)
 +              basic_machine=i586-unknown
 +              os=-pw32
 +              ;;
-       simso-wrs)
++      rdos)
 +              basic_machine=i386-pc
 +              os=-rdos
 +              ;;
 +      rom68k)
 +              basic_machine=m68k-rom68k
 +              os=-coff
 +              ;;
 +      rm[46]00)
 +              basic_machine=mips-siemens
 +              ;;
 +      rtpc | rtpc-*)
 +              basic_machine=romp-ibm
 +              ;;
 +      s390 | s390-*)
 +              basic_machine=s390-ibm
 +              ;;
 +      s390x | s390x-*)
 +              basic_machine=s390x-ibm
 +              ;;
 +      sa29200)
 +              basic_machine=a29k-amd
 +              os=-udi
 +              ;;
 +      sb1)
 +              basic_machine=mipsisa64sb1-unknown
 +              ;;
 +      sb1el)
 +              basic_machine=mipsisa64sb1el-unknown
 +              ;;
 +      sde)
 +              basic_machine=mipsisa32-sde
 +              os=-elf
 +              ;;
 +      sei)
 +              basic_machine=mips-sei
 +              os=-seiux
 +              ;;
 +      sequent)
 +              basic_machine=i386-sequent
 +              ;;
++      sh)
++              basic_machine=sh-hitachi
++              os=-hms
++              ;;
 +      sh5el)
 +              basic_machine=sh5le-unknown
 +              ;;
-               basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++      sh64)
++              basic_machine=sh64-unknown
++              ;;
++      sparclite-wrs | simso-wrs)
 +              basic_machine=sparclite-wrs
 +              os=-vxworks
 +              ;;
 +      sps7)
 +              basic_machine=m68k-bull
 +              os=-sysv2
 +              ;;
 +      spur)
 +              basic_machine=spur-unknown
 +              ;;
 +      st2000)
 +              basic_machine=m68k-tandem
 +              ;;
 +      stratus)
 +              basic_machine=i860-stratus
 +              os=-sysv4
 +              ;;
 +      strongarm-* | thumb-*)
-       x64)
-               basic_machine=x86_64-pc
-               ;;
++              basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
 +              ;;
 +      sun2)
 +              basic_machine=m68000-sun
 +              ;;
 +      sun2os3)
 +              basic_machine=m68000-sun
 +              os=-sunos3
 +              ;;
 +      sun2os4)
 +              basic_machine=m68000-sun
 +              os=-sunos4
 +              ;;
 +      sun3os3)
 +              basic_machine=m68k-sun
 +              os=-sunos3
 +              ;;
 +      sun3os4)
 +              basic_machine=m68k-sun
 +              os=-sunos4
 +              ;;
 +      sun4os3)
 +              basic_machine=sparc-sun
 +              os=-sunos3
 +              ;;
 +      sun4os4)
 +              basic_machine=sparc-sun
 +              os=-sunos4
 +              ;;
 +      sun4sol2)
 +              basic_machine=sparc-sun
 +              os=-solaris2
 +              ;;
 +      sun3 | sun3-*)
 +              basic_machine=m68k-sun
 +              ;;
 +      sun4)
 +              basic_machine=sparc-sun
 +              ;;
 +      sun386 | sun386i | roadrunner)
 +              basic_machine=i386-sun
 +              ;;
 +      sv1)
 +              basic_machine=sv1-cray
 +              os=-unicos
 +              ;;
 +      symmetry)
 +              basic_machine=i386-sequent
 +              os=-dynix
 +              ;;
 +      t3e)
 +              basic_machine=alphaev5-cray
 +              os=-unicos
 +              ;;
 +      t90)
 +              basic_machine=t90-cray
 +              os=-unicos
 +              ;;
 +      tile*)
 +              basic_machine=$basic_machine-unknown
 +              os=-linux-gnu
 +              ;;
 +      tx39)
 +              basic_machine=mipstx39-unknown
 +              ;;
 +      tx39el)
 +              basic_machine=mipstx39el-unknown
 +              ;;
 +      toad1)
 +              basic_machine=pdp10-xkl
 +              os=-tops20
 +              ;;
 +      tower | tower-32)
 +              basic_machine=m68k-ncr
 +              ;;
 +      tpf)
 +              basic_machine=s390x-ibm
 +              os=-tpf
 +              ;;
 +      udi29k)
 +              basic_machine=a29k-amd
 +              os=-udi
 +              ;;
 +      ultra3)
 +              basic_machine=a29k-nyu
 +              os=-sym1
 +              ;;
 +      v810 | necv810)
 +              basic_machine=v810-nec
 +              os=-none
 +              ;;
 +      vaxv)
 +              basic_machine=vax-dec
 +              os=-sysv
 +              ;;
 +      vms)
 +              basic_machine=vax-dec
 +              os=-vms
 +              ;;
 +      vpp*|vx|vx-*)
 +              basic_machine=f301-fujitsu
 +              ;;
 +      vxworks960)
 +              basic_machine=i960-wrs
 +              os=-vxworks
 +              ;;
 +      vxworks68)
 +              basic_machine=m68k-wrs
 +              os=-vxworks
 +              ;;
 +      vxworks29k)
 +              basic_machine=a29k-wrs
 +              os=-vxworks
 +              ;;
++      wasm32)
++              basic_machine=wasm32-unknown
++              ;;
 +      w65*)
 +              basic_machine=w65-wdc
 +              os=-none
 +              ;;
 +      w89k-*)
 +              basic_machine=hppa1.1-winbond
 +              os=-proelf
 +              ;;
-               basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 +      xbox)
 +              basic_machine=i686-pc
 +              os=-mingw32
 +              ;;
 +      xps | xps100)
 +              basic_machine=xps100-honeywell
 +              ;;
 +      xscale-* | xscalee[bl]-*)
-               echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
++              basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
 +              ;;
 +      ymp)
 +              basic_machine=ymp-cray
 +              os=-unicos
 +              ;;
++      z8k-*-coff)
++              basic_machine=z8k-unknown
++              os=-sim
++              ;;
++      z80-*-coff)
++              basic_machine=z80-unknown
++              os=-sim
++              ;;
 +      none)
 +              basic_machine=none-none
 +              os=-none
 +              ;;
 +
 +# 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
 +              ;;
 +      op50n)
 +              basic_machine=hppa1.1-oki
 +              ;;
 +      op60c)
 +              basic_machine=hppa1.1-oki
 +              ;;
 +      romp)
 +              basic_machine=romp-ibm
 +              ;;
 +      mmix)
 +              basic_machine=mmix-knuth
 +              ;;
 +      rs6000)
 +              basic_machine=rs6000-ibm
 +              ;;
 +      vax)
 +              basic_machine=vax-dec
 +              ;;
++      pdp10)
++              # there are many clones, so DEC is not a safe bet
++              basic_machine=pdp10-unknown
++              ;;
 +      pdp11)
 +              basic_machine=pdp11-dec
 +              ;;
 +      we32k)
 +              basic_machine=we32k-att
 +              ;;
 +      sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 +              basic_machine=sh-unknown
 +              ;;
++      sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
++              basic_machine=sparc-sun
++              ;;
 +      cydra)
 +              basic_machine=cydra-cydrome
 +              ;;
 +      orion)
 +              basic_machine=orion-highlevel
 +              ;;
 +      orion105)
 +              basic_machine=clipper-highlevel
 +              ;;
 +      mac | mpw | mac-mpw)
 +              basic_machine=m68k-apple
 +              ;;
 +      pmac | pmac-mpw)
 +              basic_machine=powerpc-apple
 +              ;;
 +      *-unknown)
 +              # Make sure to match an already-canonicalized machine name.
 +              ;;
 +      *)
-               basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
++              echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 +              exit 1
 +              ;;
 +esac
 +
 +# Here we canonicalize certain aliases for manufacturers.
 +case $basic_machine in
 +      *-digital*)
-               basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
++              basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
 +              ;;
 +      *-commodore*)
-       # First match some system type aliases that might get confused
-       # with valid system types.
++              basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
 +              ;;
 +      *)
 +              ;;
 +esac
 +
 +# Decode manufacturer-specific aliases for certain operating systems.
 +
 +if [ x"$os" != x"" ]
 +then
 +case $os in
-       # es1800 is here to avoid being matched by es* (a different OS)
-       -es1800*)
-               os=-ose
-               ;;
-       # Now accept the basic system types.
++      # First match some system type aliases
++      # that might get confused with valid system types.
 +      # -solaris* is a basic system type, with this one exception.
 +      -auroraux)
 +              os=-auroraux
 +              ;;
 +      -solaris1 | -solaris1.*)
 +              os=`echo $os | sed -e 's|solaris1|sunos4|'`
 +              ;;
 +      -solaris)
 +              os=-solaris2
 +              ;;
++      -svr4*)
++              os=-sysv4
++              ;;
 +      -unixware*)
 +              os=-sysv4.2uw
 +              ;;
 +      -gnu/linux*)
 +              os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 +              ;;
-       # Each alternative MUST end in a * to match a version number.
++      # First accept the basic system types.
 +      # The portable systems comes first.
-             | -sym* | -kopensolaris* | -plan9* \
++      # Each alternative MUST END IN A *, to match a version number.
 +      # -sysv* is not here because it comes later, after sysvr4.
 +      -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 +            | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 +            | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-             | -aos* | -aros* | -cloudabi* | -sortix* \
++            | -sym* | -kopensolaris* \
 +            | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-             | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-             | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
++            | -aos* | -aros* \
 +            | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 +            | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
++            | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++            | -openbsd* | -solidbsd* \
 +            | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +            | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 +            | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 +            | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-             | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-             | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
++            | -chorusos* | -chorusrdb* | -cegcc* \
 +            | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -morphos* | -superux* | -rtmk* | -windiss* \
++            | -mingw32* | -linux-gnu* | -linux-android* \
++            | -linux-newlib* | -linux-uclibc* \
++            | -uxpv* | -beos* | -mpeix* | -udk* \
++            | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 +            | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 +            | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 +            | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-             | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-             | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-             | -midnightbsd*)
++            | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 +            | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-       -sim | -xray | -os68k* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* \
++            | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 +      # Remember, each alternative MUST END IN *, to match a version number.
 +              ;;
 +      -qnx*)
 +              case $basic_machine in
 +                  x86-* | i*86-*)
 +                      ;;
 +                  *)
 +                      os=-nto$os
 +                      ;;
 +              esac
 +              ;;
 +      -nto-qnx*)
 +              ;;
 +      -nto*)
 +              os=`echo $os | sed -e 's|nto|nto-qnx|'`
 +              ;;
-               os=`echo "$os" | sed -e 's|mac|macos|'`
++      -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
++            | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 +            | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 +              ;;
 +      -mac*)
-               os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
++              os=`echo $os | sed -e 's|mac|macos|'`
 +              ;;
 +      -linux-dietlibc)
 +              os=-linux-dietlibc
 +              ;;
 +      -linux*)
 +              os=`echo $os | sed -e 's|linux|linux-gnu|'`
 +              ;;
 +      -sunos5*)
-               os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
++              os=`echo $os | sed -e 's|sunos5|solaris2|'`
 +              ;;
 +      -sunos6*)
-       -ns2)
++              os=`echo $os | sed -e 's|sunos6|solaris3|'`
 +              ;;
 +      -opened*)
 +              os=-openedition
 +              ;;
 +      -os400*)
 +              os=-os400
 +              ;;
 +      -wince*)
 +              os=-wince
 +              ;;
++      -osfrose*)
++              os=-osfrose
++              ;;
++      -osf*)
++              os=-osf
++              ;;
 +      -utek*)
 +              os=-bsd
 +              ;;
 +      -dynix*)
 +              os=-bsd
 +              ;;
 +      -acis*)
 +              os=-aos
 +              ;;
 +      -atheos*)
 +              os=-atheos
 +              ;;
 +      -syllable*)
 +              os=-syllable
 +              ;;
 +      -386bsd)
 +              os=-bsd
 +              ;;
 +      -ctix* | -uts*)
 +              os=-sysv
 +              ;;
 +      -nova*)
 +              os=-rtmk-nova
 +              ;;
-       -svr4*)
++      -ns2 )
 +              os=-nextstep2
 +              ;;
 +      -nsk*)
 +              os=-nsk
 +              ;;
 +      # Preserve the version number of sinix5.
 +      -sinix5.*)
 +              os=`echo $os | sed -e 's|sinix|sysv|'`
 +              ;;
 +      -sinix*)
 +              os=-sysv4
 +              ;;
 +      -tpf*)
 +              os=-tpf
 +              ;;
 +      -triton*)
 +              os=-sysv3
 +              ;;
 +      -oss*)
 +              os=-sysv3
 +              ;;
-       -pikeos*)
-               # Until real need of OS specific support for
-               # particular features comes up, bare metal
-               # configurations are quite functional.
-               case $basic_machine in
-                   arm*)
-                       os=-eabi
-                       ;;
-                   *)
-                       os=-elf
-                       ;;
-               esac
-               ;;
++      -svr4)
 +              os=-sysv4
 +              ;;
 +      -svr3)
 +              os=-sysv3
 +              ;;
 +      -sysvr4)
 +              os=-sysv4
 +              ;;
 +      # This must come after -sysvr4.
 +      -sysv*)
 +              ;;
 +      -ose*)
 +              os=-ose
 +              ;;
++      -es1800*)
++              os=-ose
++              ;;
++      -xenix)
++              os=-xenix
++              ;;
 +      -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +              os=-mint
 +              ;;
++      -aros*)
++              os=-aros
++              ;;
++      -kaos*)
++              os=-kaos
++              ;;
 +      -zvmoe)
 +              os=-zvmoe
 +              ;;
 +      -dicos*)
 +              os=-dicos
 +              ;;
-               echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 +      -nacl*)
 +              ;;
 +      -ios)
 +              ;;
 +      -none)
 +              ;;
 +      *)
 +              # Get rid of the `-' at the beginning of $os.
 +              os=`echo $os | sed 's/[^-]*-//'`
-       c8051-*)
-               os=-elf
-               ;;
-       hexagon-*)
-               os=-elf
-               ;;
++              echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
 +              exit 1
 +              ;;
 +esac
 +else
 +
 +# Here we handle the default operating systems that come with various machines.
 +# The value should be what the vendor currently ships out the door with their
 +# machine or put another way, the most popular os provided with the machine.
 +
 +# Note that if you're going to try to match "-MANUFACTURER" here (say,
 +# "-sun"), then you have to tell the case statement up towards the top
 +# that MANUFACTURER isn't an operating system.  Otherwise, code above
 +# will signal an error saying that MANUFACTURER isn't an operating
 +# system, and we'll never get to this point.
 +
 +case $basic_machine in
 +      score-*)
 +              os=-elf
 +              ;;
 +      spu-*)
 +              os=-elf
 +              ;;
 +      *-acorn)
 +              os=-riscix1.2
 +              ;;
 +      arm*-rebel)
 +              os=-linux
 +              ;;
 +      arm*-semi)
 +              os=-aout
 +              ;;
 +      c4x-* | tic4x-*)
 +              os=-coff
 +              ;;
-       *-next)
 +      tic54x-*)
 +              os=-coff
 +              ;;
 +      tic55x-*)
 +              os=-coff
 +              ;;
 +      tic6x-*)
 +              os=-coff
 +              ;;
 +      # This must come before the *-dec entry.
 +      pdp10-*)
 +              os=-tops20
 +              ;;
 +      pdp11-*)
 +              os=-none
 +              ;;
 +      *-dec | vax-*)
 +              os=-ultrix4.2
 +              ;;
 +      m68*-apollo)
 +              os=-domain
 +              ;;
 +      i386-sun)
 +              os=-sunos4.0.2
 +              ;;
 +      m68000-sun)
 +              os=-sunos3
 +              ;;
 +      m68*-cisco)
 +              os=-aout
 +              ;;
 +      mep-*)
 +              os=-elf
 +              ;;
 +      mips*-cisco)
 +              os=-elf
 +              ;;
 +      mips*-*)
 +              os=-elf
 +              ;;
 +      or32-*)
 +              os=-coff
 +              ;;
 +      *-tti)  # must be before sparc entry or we get the wrong os.
 +              os=-sysv3
 +              ;;
 +      sparc-* | *-sun)
 +              os=-sunos4.1.1
 +              ;;
 +      pru-*)
 +              os=-elf
 +              ;;
 +      *-be)
 +              os=-beos
 +              ;;
++      *-haiku)
++              os=-haiku
++              ;;
 +      *-ibm)
 +              os=-aix
 +              ;;
 +      *-knuth)
 +              os=-mmixware
 +              ;;
 +      *-wec)
 +              os=-proelf
 +              ;;
 +      *-winbond)
 +              os=-proelf
 +              ;;
 +      *-oki)
 +              os=-proelf
 +              ;;
 +      *-hp)
 +              os=-hpux
 +              ;;
 +      *-hitachi)
 +              os=-hiux
 +              ;;
 +      i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 +              os=-sysv
 +              ;;
 +      *-cbm)
 +              os=-amigaos
 +              ;;
 +      *-dg)
 +              os=-dgux
 +              ;;
 +      *-dolphin)
 +              os=-sysv3
 +              ;;
 +      m68k-ccur)
 +              os=-rtu
 +              ;;
 +      m88k-omron*)
 +              os=-luna
 +              ;;
-               basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
++      *-next )
 +              os=-nextstep
 +              ;;
 +      *-sequent)
 +              os=-ptx
 +              ;;
 +      *-crds)
 +              os=-unos
 +              ;;
 +      *-ns)
 +              os=-genix
 +              ;;
 +      i370-*)
 +              os=-mvs
 +              ;;
++      *-next)
++              os=-nextstep3
++              ;;
 +      *-gould)
 +              os=-sysv
 +              ;;
 +      *-highlevel)
 +              os=-bsd
 +              ;;
 +      *-encore)
 +              os=-bsd
 +              ;;
 +      *-sgi)
 +              os=-irix
 +              ;;
 +      *-siemens)
 +              os=-sysv4
 +              ;;
 +      *-masscomp)
 +              os=-rtu
 +              ;;
 +      f30[01]-fujitsu | f700-fujitsu)
 +              os=-uxpv
 +              ;;
 +      *-rom68k)
 +              os=-coff
 +              ;;
 +      *-*bug)
 +              os=-coff
 +              ;;
 +      *-apple)
 +              os=-macos
 +              ;;
 +      *-atari*)
 +              os=-mint
 +              ;;
 +      *)
 +              os=-none
 +              ;;
 +esac
 +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 $os in
 +                      -riscix*)
 +                              vendor=acorn
 +                              ;;
 +                      -sunos*)
 +                              vendor=sun
 +                              ;;
 +                      -cnk*|-aix*)
 +                              vendor=ibm
 +                              ;;
 +                      -beos*)
 +                              vendor=be
 +                              ;;
 +                      -hpux*)
 +                              vendor=hp
 +                              ;;
 +                      -mpeix*)
 +                              vendor=hp
 +                              ;;
 +                      -hiux*)
 +                              vendor=hitachi
 +                              ;;
 +                      -unos*)
 +                              vendor=crds
 +                              ;;
 +                      -dgux*)
 +                              vendor=dg
 +                              ;;
 +                      -luna*)
 +                              vendor=omron
 +                              ;;
 +                      -genix*)
 +                              vendor=ns
 +                              ;;
 +                      -mvs* | -opened*)
 +                              vendor=ibm
 +                              ;;
 +                      -os400*)
 +                              vendor=ibm
 +                              ;;
 +                      -ptx*)
 +                              vendor=sequent
 +                              ;;
 +                      -tpf*)
 +                              vendor=ibm
 +                              ;;
 +                      -vxsim* | -vxworks* | -windiss*)
 +                              vendor=wrs
 +                              ;;
 +                      -aux*)
 +                              vendor=apple
 +                              ;;
 +                      -hms*)
 +                              vendor=hitachi
 +                              ;;
 +                      -mpw* | -macos*)
 +                              vendor=apple
 +                              ;;
 +                      -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +                              vendor=atari
 +                              ;;
 +                      -vos*)
 +                              vendor=stratus
 +                              ;;
 +              esac
- echo "$basic_machine$os"
++              basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 +              ;;
 +esac
 +
- # eval: (add-hook 'write-file-functions 'time-stamp)
++echo $basic_machine$os
 +exit
 +
 +# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "timestamp='"
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End: