Updated mtdev to 1.1.6

169ef206 · Vladimir Bashkirtsev · fbe0baac · 169ef206 · fbe0baac · 169ef206
Commit 169ef206 authored Jul 28, 2021 by Vladimir Bashkirtsev
Showing with 632 additions and 292 deletions

Makefile Makefile +7 -7

mtdev-1.1.5.tar.bz2 mtdev-1.1.5.tar.bz2 +0 -0

mtdev-1.1.6-aarch64.patch mtdev-1.1.6-aarch64.patch +625 -285

mtdev-1.1.6.tar.bz2 mtdev-1.1.6.tar.bz2 +0 -0

No files found.
--- a/Makefile
+++ b/Makefile
 all:
-	tar xf mtdev-1.1.5.tar.bz2
-	patch -Np1 -d mtdev-1.1.5 < mtdev-1.1.5-aarch64.patch
-	cd mtdev-1.1.5 && ./configure --prefix=/usr --disable-static
-	$(MAKE) -C mtdev-1.1.5
-	$(MAKE) -C mtdev-1.1.5 check
-	$(MAKE) -C mtdev-1.1.5 install
-	rm -rf mtdev-1.1.5
+	tar xf mtdev-1.1.6.tar.bz2
+	patch -Np1 -d mtdev-1.1.6 < mtdev-1.1.6-aarch64.patch
+	cd mtdev-1.1.6 && ./configure --prefix=/usr --disable-static
+	$(MAKE) -C mtdev-1.1.6
+	$(MAKE) -C mtdev-1.1.6 check
+	$(MAKE) -C mtdev-1.1.6 install
+	rm -rf mtdev-1.1.6
--- a/mtdev-1.1.5.tar.bz2
+++ b/mtdev-1.1.5.tar.bz2
--- a/mtdev-1.1.5-aarch64.patch
+++ b/mtdev-1.1.5-aarch64.patch
-diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/config.guess
--- mtdev-1.1.5/config-aux/config.guess	2012-02-20 15:04:39.000000000 +0000
-+++ mtdev-1.1.5-aarch64/config-aux/config.guess	2018-03-20 05:19:24.627952746 +0000
+diff -uNr mtdev-1.1.6/config-aux/config.guess mtdev-1.1.6-aarch64/config-aux/config.guess
+--- mtdev-1.1.6/config-aux/config.guess	2010-08-02 17:33:23.000000000 +0930
+++ mtdev-1.1.6-aarch64/config-aux/config.guess	2021-07-28 12:18:41.539414197 +0930
 @@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+-#   Free Software Foundation, Inc.
 +#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2012-01-01'
+-timestamp='2009-12-30'
 +timestamp='2018-03-08'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -69,8 +69,8 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 
 Originally written by Per Bothner.
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+-Software Foundation, Inc.
 +Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -87,7 +87,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-@@ -140,9 +132,37 @@
+@@ -140,12 +132,40 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
@@ -125,7 +125,11 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 +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*,
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# 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
 @@ -155,21 +175,31 @@
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
@@ -165,19 +169,23 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
-@@ -184,40 +214,67 @@
- 		os=netbsd
+@@ -181,7 +211,14 @@
+ 		fi
 		;;
- 	esac
+ 	    *)
+-	        os=netbsd
+		os=netbsd
+		;;
+	esac
 +	# Determine ABI tags.
 +	case "$UNAME_MACHINE_ARCH" in
 +	    earm*)
 +		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
 +		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
-+		;;
-+	esac
+ 		;;
+ 	esac
 	# The OS release
- 	# Debian GNU/NetBSD machines have a different userland, and
+@@ -189,42 +226,62 @@
 	# 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.
@@ -241,7 +249,15 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
-@@ -234,63 +291,54 @@
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 		;;
+ 	*5.*)
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ 		;;
+ 	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -234,60 +291,54 @@
 	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)")
@@ -296,11 +312,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
- 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
- 	exitcode=$?
- 	trap '' 0
- 	exit $exitcode ;;
+-	exit ;;
 -    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
@@ -310,6 +322,11 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 -    21064:Windows_NT:50:3)
 -	echo alpha-dec-winnt3.5
 -	exit ;;
+	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 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit ;;
@@ -323,8 +340,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-@@ -302,9 +350,9 @@
- 	echo powerpc-ibm-os400
+@@ -296,12 +347,12 @@
+ 	echo s390-ibm-zvmoe
+ 	exit ;;
+     *:OS400:*:*)
+-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 -	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -335,7 +356,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -329,38 +377,38 @@
+@@ -326,38 +377,38 @@
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     s390x:SunOS:*:*)
@@ -385,7 +406,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
-@@ -369,25 +417,25 @@
+@@ -366,25 +417,25 @@
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
@@ -417,7 +438,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
-@@ -398,44 +446,44 @@
+@@ -395,44 +446,44 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
@@ -426,24 +447,28 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 -	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit ;;
 +	echo m68k-atari-mint"$UNAME_RELEASE"
- 	exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
 -        echo m68k-atari-mint${UNAME_RELEASE}
 +	echo m68k-atari-mint"$UNAME_RELEASE"
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
 -        echo m68k-milan-mint${UNAME_RELEASE}
+-        exit ;;
 +	echo m68k-milan-mint"$UNAME_RELEASE"
- 	exit ;;
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
 -        echo m68k-hades-mint${UNAME_RELEASE}
+-        exit ;;
 +	echo m68k-hades-mint"$UNAME_RELEASE"
- 	exit ;;
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 -        echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit ;;
 +	echo m68k-unknown-mint"$UNAME_RELEASE"
- 	exit ;;
+	exit ;;
     m68k:machten:*:*)
 -	echo m68k-apple-machten${UNAME_RELEASE}
 +	echo m68k-apple-machten"$UNAME_RELEASE"
@@ -475,7 +500,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
-@@ -444,23 +492,23 @@
+@@ -441,23 +492,23 @@
 #endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
@@ -506,11 +531,15 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-@@ -486,17 +534,17 @@
+@@ -481,21 +532,21 @@
+ 	echo m88k-motorola-sysv3
+ 	exit ;;
     AViiON:dgux:*:*)
- 	# DG/UX returns AViiON for all architectures
- 	UNAME_PROCESSOR=`/usr/bin/uname -p`
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
 -	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 +	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
 	then
 -	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -528,9 +557,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 -	    echo i586-dg-dgux${UNAME_RELEASE}
 +	    echo i586-dg-dgux"$UNAME_RELEASE"
 	fi
- 	exit ;;
+- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-@@ -513,7 +561,7 @@
+ 	echo m88k-dolphin-sysv3
+ 	exit ;;
+@@ -510,7 +561,7 @@
 	echo m68k-tektronix-bsd
 	exit ;;
     *:IRIX*:*:*)
@@ -539,7 +571,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	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
-@@ -525,14 +573,14 @@
+@@ -522,14 +573,14 @@
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
@@ -558,7 +590,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 		#include <sys/systemcfg.h>
 
 		main()
-@@ -543,7 +591,7 @@
+@@ -540,7 +591,7 @@
 			exit(0);
 			}
 EOF
@@ -567,9 +599,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 		then
 			echo "$SYSTEM_NAME"
 		else
-@@ -557,26 +605,27 @@
+@@ -552,28 +603,29 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
 	exit ;;
-     *:AIX:*:[4567])
+-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 -	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 +	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
@@ -602,7 +637,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-@@ -591,28 +640,28 @@
+@@ -588,67 +640,67 @@
 	echo m68k-hp-bsd4.4
 	exit ;;
     9000/[34678]??:HP-UX:*:*)
@@ -617,37 +652,97 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	    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`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 -                    case "${sc_cpu_version}" in
 -                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 -                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+		    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
+-                      532)                      # CPU_PA_RISC2_0
 -                        case "${sc_kernel_bits}" in
 -                          32) HP_ARCH="hppa2.0n" ;;
 -                          64) HP_ARCH="hppa2.0w" ;;
 -			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "$sc_cpu_version" in
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
 +			case "$sc_kernel_bits" in
 +			  32) HP_ARCH=hppa2.0n ;;
 +			  64) HP_ARCH=hppa2.0w ;;
 +			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
- 			esac ;;
- 		    esac
+			esac ;;
+		    esac
 		fi
 -		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);
+-              }
 +		if [ "$HP_ARCH" = "" ]; then
 +		    eval "$set_cc_for_build"
 +		    sed 's/^		//' << EOF > "$dummy.c"
- 
- 		#define _HPUX_SOURCE
- 		#include <stdlib.h>
-@@ -645,13 +694,13 @@
- 		    exit (0);
- 		}
+
+		#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
 -		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 +		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
@@ -662,7 +757,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 
 	    # 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
-@@ -662,23 +711,23 @@
+@@ -659,23 +711,23 @@
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
@@ -694,7 +789,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	#include <unistd.h>
 	int
 	main ()
-@@ -703,11 +752,11 @@
+@@ -700,11 +752,11 @@
 	  exit (0);
 	}
 EOF
@@ -708,7 +803,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	echo hppa1.1-hp-bsd
 	exit ;;
     9000/8??:4.3bsd:*:*)
-@@ -716,7 +765,7 @@
+@@ -713,7 +765,7 @@
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit ;;
@@ -717,7 +812,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	echo hppa1.1-hp-osf
 	exit ;;
     hp8??:OSF1:*:*)
-@@ -724,9 +773,9 @@
+@@ -721,9 +773,9 @@
 	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
@@ -729,9 +824,31 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	fi
 	exit ;;
     parisc*:Lites*:*:*)
-@@ -751,117 +800,109 @@
- 	echo c4-convex-bsd
+@@ -731,132 +783,126 @@
 	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit ;;
+	exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit ;;
+	exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit ;;
+	exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit ;;
+	exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 -	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
@@ -763,17 +880,20 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 -	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 ;;
 +	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 ;;
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +	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}"
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 -	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,13 +908,15 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 +	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
     *:FreeBSD:*:*)
- 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+-	case ${UNAME_MACHINE} in
+-	    pc98)
+-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 +	case "$UNAME_PROCESSOR" in
 	    amd64)
 -		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 -	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +		UNAME_PROCESSOR=x86_64 ;;
 +	    i386)
 +		UNAME_PROCESSOR=i586 ;;
@@ -804,15 +926,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
     i*:CYGWIN*:*)
 -	echo ${UNAME_MACHINE}-pc-cygwin
 +	echo "$UNAME_MACHINE"-pc-cygwin
- 	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
 +    *:MINGW64*:*)
 +	echo "$UNAME_MACHINE"-pc-mingw64
 	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-+    *:MINGW*:*)
+     *:MINGW*:*)
+-	echo ${UNAME_MACHINE}-pc-mingw32
 +	echo "$UNAME_MACHINE"-pc-mingw32
 	exit ;;
 -    i*:windows32*:*)
@@ -890,9 +1009,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -874,63 +915,64 @@
+@@ -867,56 +913,66 @@
+ 	  EV6)   UNAME_MACHINE=alphaev6 ;;
+ 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
- 	esac
+-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -911,15 +1033,14 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 -	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	else
- 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- 		| grep -q __ARM_PCS_VFP
- 	    then
 -	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
 +		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
- 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    else
 +		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
- 	    fi
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
@@ -927,22 +1048,21 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+-	echo cris-axis-linux-gnu
 +	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+-	echo crisv32-axis-linux-gnu
 +	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
 +	exit ;;
 +    e2k:Linux:*:*)
 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-    	echo frv-unknown-linux-gnu
 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     i*86:Linux:*:*)
@@ -980,7 +1100,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	#undef CPU
 	#undef ${UNAME_MACHINE}
 	#undef ${UNAME_MACHINE}el
-@@ -944,55 +986,70 @@
+@@ -930,52 +986,70 @@
 	#endif
 	#endif
 EOF
@@ -990,7 +1110,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 +	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
 	;;
 -    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	echo or32-unknown-linux-gnu
 +    mips64el:Linux:*:*)
 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 +	exit ;;
@@ -1051,9 +1171,8 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
     sparc:Linux:*:* | sparc64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- 	exit ;;
-     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     vax:Linux:*:*)
@@ -1061,7 +1180,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 +	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	echo x86_64-unknown-linux-gnu
 +	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
 	exit ;;
     xtensa*:Linux:*:*)
@@ -1070,11 +1189,20 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -1006,34 +1063,34 @@
- 	# I am not positive that other SVR4 systems won't match this,
+@@ -984,54 +1058,54 @@
+ 	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,
+	# 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.
+-        # Use sysv4.2uw... so that sysv4* matches it.
 -	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	# Use sysv4.2uw... so that sysv4* matches it.
 +	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
 	exit ;;
     i*86:OS/2:*:*)
@@ -1116,7 +1244,10 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-@@ -1043,12 +1100,12 @@
+-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# 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
@@ -1131,7 +1262,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	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
-@@ -1058,9 +1115,9 @@
+@@ -1041,20 +1115,20 @@
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
@@ -1143,16 +1274,22 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	fi
 	exit ;;
     pc:*:*:*)
-@@ -1068,7 +1125,7 @@
- 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
- 	# the processor, so we play safe by assuming i586.
+ 	# 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.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 -	# prints for the "djgpp" host, or else GDB configury will decide that
 +	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
+-        exit ;;
+	exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
 	exit ;;
-@@ -1080,9 +1137,9 @@
+@@ -1063,9 +1137,9 @@
 	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
@@ -1164,7 +1301,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	fi
 	exit ;;
     mini*:CTIX:SYS*5:*)
-@@ -1102,9 +1159,9 @@
+@@ -1085,39 +1159,39 @@
 	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 \
@@ -1174,9 +1311,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 -	  && { echo i586-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; } ;;
-@@ -1113,28 +1170,28 @@
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
+	/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 \
@@ -1213,7 +1353,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-@@ -1145,7 +1202,7 @@
+@@ -1128,15 +1202,15 @@
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1222,7 +1362,19 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	else
 		echo ns32k-sni-sysv
 	fi
-@@ -1165,23 +1222,23 @@
+ 	exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        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
+@@ -1148,25 +1222,25 @@
 	exit ;;
     i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
@@ -1248,9 +1400,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 -	        echo mips-unknown-sysv${UNAME_RELEASE}
 +		echo mips-unknown-sysv"$UNAME_RELEASE"
 	fi
- 	exit ;;
+-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-@@ -1196,66 +1253,97 @@
+ 	echo powerpc-be-beos
+ 	exit ;;
+@@ -1179,63 +1253,97 @@
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
@@ -1355,8 +1510,8 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
+-    NSE-?:NONSTOP_KERNEL:*:*)
+-	echo nse-tandem-nsk${UNAME_RELEASE}
 +    NEO-*:NONSTOP_KERNEL:*:*)
 +	echo neo-tandem-nsk"$UNAME_RELEASE"
 +	exit ;;
@@ -1366,19 +1521,17 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 +    NSR-*:NONSTOP_KERNEL:*:*)
 +	echo nsr-tandem-nsk"$UNAME_RELEASE"
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-+    NSV-*:NONSTOP_KERNEL:*:*)
-+	echo nsv-tandem-nsk"$UNAME_RELEASE"
- 	exit ;;
 -    NSR-?:NONSTOP_KERNEL:*:*)
 -	echo nsr-tandem-nsk${UNAME_RELEASE}
+    NSV-*:NONSTOP_KERNEL:*:*)
+	echo nsv-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
 +    NSX-*:NONSTOP_KERNEL:*:*)
 +	echo nsx-tandem-nsk"$UNAME_RELEASE"
 	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-@@ -1264,18 +1352,18 @@
+@@ -1244,18 +1352,18 @@
 	echo bs2000-siemens-sysv
 	exit ;;
     DS/*:UNIX_System_V:*:*)
@@ -1400,7 +1553,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-@@ -1296,14 +1384,14 @@
+@@ -1276,14 +1384,14 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
@@ -1412,13 +1565,14 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 +	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
 	exit ;;
     *:*VMS:*:*)
- 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 -	case "${UNAME_MACHINE}" in
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +	case "$UNAME_MACHINE" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
 	    V*) echo vax-dec-vms ; exit ;;
-@@ -1312,182 +1400,48 @@
+@@ -1292,182 +1400,48 @@
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
@@ -1472,8 +1626,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 -#if defined (__arm) && defined (__acorn) && defined (__unix)
 -  printf ("arm-acorn-riscix\n"); exit (0);
 -#endif
-+echo "$0: unable to guess system type" >&2
- 
+-
 -#if defined (hp300) && !defined (hpux)
 -  printf ("m68k-hp-bsd\n"); exit (0);
 -#endif
@@ -1502,7 +1655,8 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 -#endif
 -#endif
 -#endif
-
+echo "$0: unable to guess system type" >&2
+ 
 -#if defined (__386BSD__)
 -  printf ("i386-pc-bsd\n"); exit (0);
 -#endif
@@ -1627,7 +1781,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 
 config.guess timestamp = $timestamp
 
-@@ -1506,16 +1460,16 @@
+@@ -1486,16 +1460,16 @@
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 
@@ -1649,17 +1803,17 @@ diff -uNr mtdev-1.1.5/config-aux/config.guess mtdev-1.1.5-aarch64/config-aux/con
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
-diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/config.sub
--- mtdev-1.1.5/config-aux/config.sub	2012-02-20 15:04:39.000000000 +0000
-+++ mtdev-1.1.5-aarch64/config-aux/config.sub	2018-03-20 05:19:24.627952746 +0000
+diff -uNr mtdev-1.1.6/config-aux/config.sub mtdev-1.1.6-aarch64/config-aux/config.sub
+--- mtdev-1.1.6/config-aux/config.sub	2010-08-02 17:33:23.000000000 +0930
+++ mtdev-1.1.6-aarch64/config-aux/config.sub	2021-07-28 12:18:41.540414200 +0930
 @@ -1,38 +1,31 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+-#   Free Software Foundation, Inc.
 -
-timestamp='2012-01-01'
+-timestamp='2010-01-22'
 -
 -# This file is (in principle) common to ALL GNU software.
 -# The presence of a machine in this file suggests that SOME GNU software
@@ -1736,8 +1890,8 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 GNU config.sub ($timestamp)
 
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+-Software Foundation, Inc.
 +Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -1751,17 +1905,17 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
        exit ;;
 
     * )
-@@ -122,20 +112,24 @@
+@@ -122,19 +112,24 @@
 
 # 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.
 -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
 -  kopensolaris*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
 +  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
 +  kopensolaris*-gnu* | cloudabi*-eabi* | \
@@ -1784,7 +1938,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
     else os=; fi
     ;;
 esac
-@@ -154,7 +148,7 @@
+@@ -153,12 +148,12 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -1793,7 +1947,26 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		os=
 		basic_machine=$1
 		;;
-@@ -184,53 +178,56 @@
+-        -bluegene*)
+-	        os=-cnk
+	-bluegene*)
+		os=-cnk
+ 		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+@@ -174,62 +169,65 @@
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+- 	-chorusrdb)
+- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
+ 		basic_machine=$1
+- 		;;
+		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
 		;;
 	-sco6)
 		os=-sco5v6
@@ -1864,7 +2037,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	-psos*)
 		os=-psos
-@@ -247,24 +244,29 @@
+@@ -246,20 +244,29 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
@@ -1873,7 +2046,6 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
 +	| arc | arceb \
 +	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 +	| avr | avr32 \
@@ -1883,17 +2055,16 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 -	| c4x | clipper \
 +	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
 -	| fido | fr30 | frv \
 +	| e2k | epiphany \
 +	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| hexagon \
 -	| i370 | i860 | i960 | ia64 \
+	| hexagon \
 +	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
 +	| k1om \
- 	| le32 | le64 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 -	| maxq | mb | microblaze | mcore | mep | metag \
@@ -1901,7 +2072,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-@@ -278,26 +280,30 @@
+@@ -273,47 +280,80 @@
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
@@ -1917,41 +2088,53 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	| moxie \
 	| mt \
 	| msp430 \
- 	| nds32 | nds32le | nds32be \
 -	| nios | nios2 \
+	| nds32 | nds32le | nds32be \
 +	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
 -	| or32 \
 -	| pdp10 | pdp11 | pj | pjl \
+-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 +	| open8 | or1k | or1knd | or32 \
 +	| pdp10 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 +	| pru \
 	| pyramid \
+-	| rx \
 +	| riscv32 | riscv64 \
- 	| rl78 | rx \
+	| rl78 | rx \
 	| score \
 -	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -305,7 +311,8 @@
- 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+-	| spu | strongarm \
+-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
- 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+-	| v850 | v850e \
 -	| we32k \
+-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 +	| visium \
 +	| wasm32 \
- 	| x86 | xc16x | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
-@@ -319,11 +326,14 @@
- 	c6x)
- 		basic_machine=tic6x-unknown
 		;;
 -	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 +	leon|leon[3-9])
 +		basic_machine=sparc-$basic_machine
 +		;;
@@ -1964,19 +2147,27 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	ms1)
 		basic_machine=mt-unknown
-@@ -332,7 +342,10 @@
- 	strongarm | thumb | xscale)
- 		basic_machine=arm-unknown
 		;;
-
+ 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
 +	xgate)
 +		basic_machine=$basic_machine-unknown
 +		os=-none
 +		;;
- 	xscaleeb)
- 		basic_machine=armeb-unknown
- 		;;
-@@ -349,34 +362,38 @@
+	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.
+@@ -322,31 +362,38 @@
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
@@ -1995,10 +2186,11 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 +	| ba-* \
- 	| be32-* | be64-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 -	| clipper-* | craynv-* | cydra-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 +	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 -	| elxsi-* \
@@ -2006,12 +2198,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| hexagon-* \
 -	| i*86-* | i860-* | i960-* | ia64-* \
+	| hexagon-* \
 +	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 	| ip2k-* | iq2000-* \
 +	| k1om-* \
- 	| le32-* | le64-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -2021,7 +2213,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-@@ -390,28 +407,34 @@
+@@ -360,34 +407,45 @@
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
@@ -2036,38 +2228,46 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
- 	| nds32-* | nds32le-* | nds32be-* \
 -	| nios-* | nios2-* \
+	| nds32-* | nds32le-* | nds32be-* \
 +	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| open8-* \
+	| open8-* \
 +	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 +	| pru-* \
 	| pyramid-* \
+-	| romp-* | rs6000-* | rx-* \
 +	| riscv32-* | riscv64-* \
- 	| rl78-* | romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+-	| tahoe-* | thumb-* \
 +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
- 	| tahoe-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- 	| tile*-* \
-@@ -419,6 +442,8 @@
+-	| tile-* | tilegx-* \
+	| tile*-* \
+ 	| tron-* \
 	| ubicom32-* \
- 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- 	| vax-* \
+-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 +	| visium-* \
 +	| wasm32-* \
 	| we32k-* \
- 	| x86-* | x86_64-* | xc16x-* | xps100-* \
+-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
-@@ -432,7 +457,7 @@
+ 	| ymp-* \
+ 	| z8k-* | z80-*)
+@@ -399,7 +457,7 @@
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -2076,7 +2276,16 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-@@ -466,7 +491,7 @@
+@@ -412,7 +470,7 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+-    	abacus)
+	abacus)
+ 		basic_machine=abacus-unknown
+ 		;;
+ 	adobe68k)
+@@ -433,7 +491,7 @@
 		basic_machine=x86_64-pc
 		;;
 	amd64-*)
@@ -2085,7 +2294,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	amdahl)
 		basic_machine=580-amdahl
-@@ -495,6 +520,9 @@
+@@ -462,6 +520,9 @@
 		basic_machine=i386-pc
 		os=-aros
 		;;
@@ -2095,7 +2304,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
-@@ -508,7 +536,7 @@
+@@ -475,18 +536,27 @@
 		os=-linux
 		;;
 	blackfin-*)
@@ -2104,24 +2313,37 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		os=-linux
 		;;
 	bluegene*)
-@@ -516,13 +544,13 @@
+ 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
- 	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+	c54x-*)
 +		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
 +		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
- 	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
 +		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
+		;;
 	c90)
 		basic_machine=c90-cray
-@@ -611,10 +639,18 @@
+ 		os=-unicos
+ 		;;
+-        cegcc)
+	cegcc)
+ 		basic_machine=arm-unknown
+ 		os=-cegcc
+ 		;;
+@@ -518,7 +588,7 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16)
+	cr16 | cr16-*)
+ 		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+@@ -569,10 +639,18 @@
 		basic_machine=rs6000-bull
 		os=-bosx
 		;;
@@ -2141,7 +2363,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
-@@ -704,9 +740,6 @@
+@@ -662,9 +740,6 @@
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
@@ -2151,9 +2373,11 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	hppaosf)
 		basic_machine=hppa1.1-hp
 		os=-osf
-@@ -719,26 +752,26 @@
+@@ -676,28 +751,27 @@
+ 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
@@ -2183,7 +2407,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
-@@ -756,17 +789,17 @@
+@@ -715,17 +789,17 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
@@ -2205,7 +2429,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
-@@ -775,11 +808,15 @@
+@@ -734,11 +808,15 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
@@ -2223,7 +2447,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		os=-mingw32
 		;;
 	mingw32ce)
-@@ -794,10 +831,10 @@
+@@ -753,10 +831,10 @@
 		os=-mint
 		;;
 	mips3*-*)
@@ -2236,7 +2460,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
-@@ -807,15 +844,19 @@
+@@ -766,17 +844,29 @@
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
@@ -2251,14 +2475,23 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	ms1-*)
 -		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 +		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
- 		;;
- 	msys)
-		basic_machine=i386-pc
+		;;
+	msys)
 +		basic_machine=i686-pc
- 		os=-msys
+		os=-msys
 		;;
 	mvs)
-@@ -854,7 +895,7 @@
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+@@ -805,7 +895,7 @@
 		basic_machine=v70-nec
 		os=-sysv
 		;;
@@ -2267,7 +2500,16 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		basic_machine=m68k-next
 		case $os in
 		    -nextstep* )
-@@ -899,6 +940,12 @@
+@@ -841,9 +931,21 @@
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -2280,7 +2522,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
-@@ -931,7 +978,7 @@
+@@ -876,7 +978,7 @@
 		os=-linux
 		;;
 	parisc-*)
@@ -2289,7 +2531,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		os=-linux
 		;;
 	pbd)
-@@ -947,7 +994,7 @@
+@@ -892,7 +994,7 @@
 		basic_machine=i386-pc
 		;;
 	pc98-*)
@@ -2298,7 +2540,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
-@@ -962,16 +1009,16 @@
+@@ -907,41 +1009,42 @@
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
@@ -2319,11 +2561,14 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	pn)
 		basic_machine=pn-gould
-@@ -981,23 +1028,23 @@
- 	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
- 	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 	power)	basic_machine=power-ibm
+ 		;;
+-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
 +		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 -	ppcle | powerpclittle | ppc-le | powerpc-little)
@@ -2349,7 +2594,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	ps2)
 		basic_machine=i386-ibm
-@@ -1006,7 +1053,11 @@
+@@ -950,7 +1053,11 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
@@ -2362,7 +2607,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		basic_machine=i386-pc
 		os=-rdos
 		;;
-@@ -1047,17 +1098,10 @@
+@@ -991,17 +1098,10 @@
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -2381,16 +2626,44 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
-@@ -1076,7 +1120,7 @@
+@@ -1019,6 +1119,9 @@
+ 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
- 	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+	strongarm-* | thumb-*)
 +		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- 		;;
+		;;
 	sun2)
 		basic_machine=m68000-sun
-@@ -1198,6 +1242,9 @@
+ 		;;
+@@ -1075,25 +1178,8 @@
+ 		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+-	tic54x | c54x*)
+-		basic_machine=tic54x-unknown
+-		os=-coff
+-		;;
+-	tic55x | c55x*)
+-		basic_machine=tic55x-unknown
+-		os=-coff
+-		;;
+-	tic6x | c6x*)
+-		basic_machine=tic6x-unknown
+-		os=-coff
+-		;;
+-        # This must be matched before tile*.
+-        tilegx*)
+-		basic_machine=tilegx-unknown
+-		os=-linux-gnu
+-		;;
+ 	tile*)
+-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
+ 		os=-linux-gnu
+ 		;;
+ 	tx39)
+@@ -1156,6 +1242,9 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
@@ -2400,13 +2673,13 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
-@@ -1206,20 +1253,12 @@
+@@ -1163,18 +1252,13 @@
+ 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
- 	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+	xscale-* | xscalee[bl]-*)
 +		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
- 		;;
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -2422,7 +2695,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	none)
 		basic_machine=none-none
 		os=-none
-@@ -1248,10 +1287,6 @@
+@@ -1203,10 +1287,6 @@
 	vax)
 		basic_machine=vax-dec
 		;;
@@ -2433,7 +2706,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
-@@ -1261,9 +1296,6 @@
+@@ -1216,9 +1296,6 @@
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
@@ -2443,7 +2716,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	cydra)
 		basic_machine=cydra-cydrome
 		;;
-@@ -1283,7 +1315,7 @@
+@@ -1238,7 +1315,7 @@
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
@@ -2452,7 +2725,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		exit 1
 		;;
 esac
-@@ -1291,10 +1323,10 @@
+@@ -1246,10 +1323,10 @@
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
 	*-digital*)
@@ -2465,7 +2738,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	*)
 		;;
-@@ -1305,8 +1337,8 @@
+@@ -1260,11 +1337,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
@@ -2474,9 +2747,14 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 +	# 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
-@@ -1317,45 +1349,48 @@
+-        -auroraux)
+-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
+ 		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+@@ -1272,44 +1349,48 @@
 	-solaris)
 		os=-solaris2
 		;;
@@ -2518,13 +2796,13 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 -	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 -	      | -chorusos* | -chorusrdb* | -cegcc* \
-+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
- 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 -	      | -uxpv* | -beos* | -mpeix* | -udk* \
 -	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 +	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 +	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
@@ -2542,7 +2820,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
-@@ -1372,12 +1407,12 @@
+@@ -1326,12 +1407,12 @@
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
@@ -2558,7 +2836,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	-linux-dietlibc)
 		os=-linux-dietlibc
-@@ -1386,10 +1421,10 @@
+@@ -1340,26 +1421,20 @@
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
@@ -2571,7 +2849,11 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		;;
 	-opened*)
 		os=-openedition
-@@ -1400,12 +1435,6 @@
+ 		;;
+-        -os400*)
+	-os400*)
+ 		os=-os400
+ 		;;
 	-wince*)
 		os=-wince
 		;;
@@ -2584,7 +2866,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	-utek*)
 		os=-bsd
 		;;
-@@ -1430,7 +1459,7 @@
+@@ -1384,7 +1459,7 @@
 	-nova*)
 		os=-rtmk-nova
 		;;
@@ -2593,7 +2875,16 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		os=-nextstep2
 		;;
 	-nsk*)
-@@ -1452,7 +1481,7 @@
+@@ -1397,7 +1472,7 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
+-        -tpf*)
+	-tpf*)
+ 		os=-tpf
+ 		;;
+ 	-triton*)
+@@ -1406,7 +1481,7 @@
 	-oss*)
 		os=-sysv3
 		;;
@@ -2602,7 +2893,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		os=-sysv4
 		;;
 	-svr3)
-@@ -1467,35 +1496,38 @@
+@@ -1421,35 +1496,38 @@
 	-ose*)
 		os=-ose
 		;;
@@ -2627,6 +2918,8 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	-dicos*)
 		os=-dicos
 		;;
+-        -nacl*)
+-	        ;;
 +	-pikeos*)
 +		# Until real need of OS specific support for
 +		# particular features comes up, bare metal
@@ -2640,8 +2933,8 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 +			;;
 +		esac
 +		;;
- 	-nacl*)
- 		;;
+	-nacl*)
+		;;
 +	-ios)
 +		;;
 	-none)
@@ -2654,20 +2947,62 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		exit 1
 		;;
 esac
-@@ -1530,6 +1562,12 @@
- 	c4x-* | tic4x-*)
- 		os=-coff
- 		;;
+@@ -1466,10 +1544,10 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
+-        score-*)
+	score-*)
+ 		os=-elf
+ 		;;
+-        spu-*)
+	spu-*)
+ 		os=-elf
+ 		;;
+ 	*-acorn)
+@@ -1481,8 +1559,23 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-        c4x-* | tic4x-*)
+-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
 +	c8051-*)
 +		os=-elf
 +		;;
 +	hexagon-*)
 +		os=-elf
 +		;;
- 	tic54x-*)
- 		os=-coff
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+ 		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+@@ -1502,14 +1595,11 @@
+ 		;;
+ 	m68000-sun)
+ 		os=-sunos3
+-		# This also exists in the configure program, but was not the
+-		# default.
+-		# os=-sunos4
 		;;
-@@ -1579,12 +1617,12 @@
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+-        mep-*)
+	mep-*)
+ 		os=-elf
+ 		;;
+ 	mips*-cisco)
+@@ -1527,16 +1617,16 @@
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
@@ -2683,7 +3018,12 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	*-ibm)
 		os=-aix
 		;;
-@@ -1624,7 +1662,7 @@
+-    	*-knuth)
+	*-knuth)
+ 		os=-mmixware
+ 		;;
+ 	*-wec)
+@@ -1572,7 +1662,7 @@
 	m88k-omron*)
 		os=-luna
 		;;
@@ -2692,7 +3032,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 		os=-nextstep
 		;;
 	*-sequent)
-@@ -1639,9 +1677,6 @@
+@@ -1587,9 +1677,6 @@
 	i370-*)
 		os=-mvs
 		;;
@@ -2702,7 +3042,7 @@ diff -uNr mtdev-1.1.5/config-aux/config.sub mtdev-1.1.5-aarch64/config-aux/confi
 	*-gould)
 		os=-sysv
 		;;
-@@ -1751,15 +1786,15 @@
+@@ -1699,15 +1786,15 @@
 				vendor=stratus
 				;;
 		esac

--- a/mtdev-1.1.6.tar.bz2
+++ b/mtdev-1.1.6.tar.bz2