diff --git a/.gitignore b/.gitignore
index 5b6a365..233a161 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/abe-1.1.tar.gz
-/abe-icons.tar.xz
+abe-1.1.tar.gz
diff --git a/abe-1.1-aarch64.patch b/abe-1.1-aarch64.patch
index cf4dd23..5827a0d 100644
--- a/abe-1.1-aarch64.patch
+++ b/abe-1.1-aarch64.patch
@@ -1,23 +1,20 @@
---- config.guess.orig	2005-03-05 09:20:39.000000000 -0700
-+++ config.guess	2016-09-15 15:57:52.672455013 -0600
-@@ -1,13 +1,12 @@
+--- config.guess.orig	2005-03-05 10:20:39.000000000 -0600
++++ config.guess	2013-03-03 00:30:18.802031358 -0600
+@@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -#   Free Software Foundation, Inc.
-+#   Copyright 1992-2016 Free Software Foundation, Inc.
++#   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.
  
 -timestamp='2001-09-04'
-+timestamp='2016-09-11'
++timestamp='2012-09-25'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful, but
-@@ -16,23 +15,22 @@ timestamp='2001-09-04'
+@@ -16,23 +17,24 @@
  # General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
@@ -28,40 +25,37 @@
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
+ # the same distribution terms that you use for the rest of that program.
+ 
 -# Written by Per Bothner <bothner@cygnus.com>.
 -# Please send patches to <config-patches@gnu.org>.
-+# 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").
++
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
  #
--# This script attempts to guess a canonical system name similar to
--# config.sub.  If it succeeds, it prints the system name on stdout, and
--# exits with 0.  Otherwise, it exits with 1.
-+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ # 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.
  #
 -# The plan is that this can be called by configure scripts if you
 -# don't specify an explicit build system type.
 +# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-+#
-+# Please send patches to <config-patches@gnu.org>.
-+
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
  
  me=`echo "$0" | sed -e 's,.*/,,'`
  
-@@ -52,8 +50,7 @@ version="\
+@@ -52,7 +54,8 @@
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright 1992-2016 Free Software Foundation, Inc.
++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."
-@@ -65,11 +62,11 @@ Try \`$me --help' for more information."
+@@ -65,11 +68,11 @@
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
@@ -76,7 +70,7 @@
      -- )     # Stop option processing
         shift; break ;;
      - )	# Use stdin as input.
-@@ -87,30 +84,42 @@ if test $# != 0; then
+@@ -87,30 +90,42 @@
    exit 1
  fi
  
@@ -129,32 +123,7 @@
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -123,36 +132,69 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
- UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
-+case "${UNAME_SYSTEM}" in
-+Linux|GNU|GNU/*)
-+	# If the system lacks a compiler, then just pick glibc.
-+	# We could probably try harder.
-+	LIBC=gnu
-+
-+	eval $set_cc_for_build
-+	cat <<-EOF > $dummy.c
-+	#include <features.h>
-+	#if defined(__UCLIBC__)
-+	LIBC=uclibc
-+	#elif defined(__dietlibc__)
-+	LIBC=dietlibc
-+	#else
-+	LIBC=gnu
-+	#endif
-+	EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-+	;;
-+esac
-+
- # Note: order is significant - the case branches are not exclusive.
+@@ -127,32 +142,34 @@
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
@@ -182,32 +151,21 @@
 +	# Note: NetBSD doesn't particularly care about the vendor
 +	# portion of the name.  We always set it to "unknown".
 +	sysctl="sysctl -n hw.machine_arch"
-+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-+	    /sbin/$sysctl 2>/dev/null || \
-+	    /usr/sbin/$sysctl 2>/dev/null || \
-+	    echo 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 ;;
-+	    earmv*)
-+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-+		machine=${arch}${endian}-unknown
-+		;;
 +	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
--	# to ELF recently, or will in the future.
+ 	# to ELF recently, or will in the future.
 -	case "${UNAME_MACHINE}" in
 -	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-+	# to ELF recently (or will in the future) and ABI.
 +	case "${UNAME_MACHINE_ARCH}" in
-+	    earm*)
-+		os=netbsdelf
-+		;;
 +	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -216,19 +174,12 @@
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -162,124 +204,153 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -162,124 +179,139 @@
  		fi
  		;;
  	    *)
 -	        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
  	# The OS release
@@ -242,15 +193,14 @@
 +		release='-gnu'
 +		;;
 +	    *)
-+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
++		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 "${machine}-${os}${release}"
+ 	echo "${machine}-${os}${release}"
 -	exit 0 ;;
-+	echo "${machine}-${os}${release}${abi}"
 +	exit ;;
 +    *:Bitrig:*:*)
 +	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -260,10 +210,6 @@
 +	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 +	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 +	exit ;;
-+    *:LibertyBSD:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-+	exit ;;
 +    *:ekkoBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 +	exit ;;
@@ -275,9 +221,6 @@
 +	exit ;;
 +    *:MirBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:Sortix:*:*)
-+	echo ${UNAME_MACHINE}-unknown-sortix
 +	exit ;;
      alpha:OSF1:*:*)
 -	if test $UNAME_RELEASE = "V4.0"; then
@@ -297,35 +240,35 @@
 +	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 +	case "$ALPHA_CPU_TYPE" in
 +	    "EV4 (21064)")
-+		UNAME_MACHINE=alpha ;;
++		UNAME_MACHINE="alpha" ;;
 +	    "EV4.5 (21064)")
-+		UNAME_MACHINE=alpha ;;
++		UNAME_MACHINE="alpha" ;;
 +	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE=alpha ;;
++		UNAME_MACHINE="alpha" ;;
 +	    "EV5 (21164)")
-+		UNAME_MACHINE=alphaev5 ;;
++		UNAME_MACHINE="alphaev5" ;;
 +	    "EV5.6 (21164A)")
-+		UNAME_MACHINE=alphaev56 ;;
++		UNAME_MACHINE="alphaev56" ;;
 +	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE=alphapca56 ;;
++		UNAME_MACHINE="alphapca56" ;;
 +	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE=alphapca57 ;;
++		UNAME_MACHINE="alphapca57" ;;
 +	    "EV6 (21264)")
-+		UNAME_MACHINE=alphaev6 ;;
++		UNAME_MACHINE="alphaev6" ;;
 +	    "EV6.7 (21264A)")
-+		UNAME_MACHINE=alphaev67 ;;
++		UNAME_MACHINE="alphaev67" ;;
 +	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE=alphaev68 ;;
++		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE=alphaev68 ;;
++		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE=alphaev68 ;;
++		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE=alphaev69 ;;
++		UNAME_MACHINE="alphaev69" ;;
 +	    "EV7 (21364)")
-+		UNAME_MACHINE=alphaev7 ;;
++		UNAME_MACHINE="alphaev7" ;;
 +	    "EV7.9 (21364A)")
-+		UNAME_MACHINE=alphaev79 ;;
++		UNAME_MACHINE="alphaev79" ;;
 +	esac
 +	# A Pn.n version is a patched version.
  	# A Vn.n version is a released version.
@@ -387,7 +330,7 @@
 -	rm -f $dummy.s $dummy
 -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 -	exit 0 ;;
-+	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
@@ -459,7 +402,7 @@
      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
-@@ -287,25 +358,51 @@ EOF
+@@ -287,25 +319,51 @@
  	else
  		echo pyramid-pyramid-bsd
  	fi
@@ -495,16 +438,16 @@
 +	exit ;;
 +    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 +	eval $set_cc_for_build
-+	SUN_ARCH=i386
++	SUN_ARCH="i386"
 +	# If there is a compiler, see if it is configured for 64-bit objects.
 +	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 +	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 +	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 +		grep IS_64BIT_ARCH >/dev/null
 +	    then
-+		SUN_ARCH=x86_64
++		SUN_ARCH="x86_64"
 +	    fi
 +	fi
 +	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -519,7 +462,7 @@
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
-@@ -314,13 +411,13 @@ EOF
+@@ -314,12 +372,12 @@
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -531,13 +474,11 @@
 +	exit ;;
      sun*:*:4.2BSD:*)
 -	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
--	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 +	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
  	case "`/bin/arch`" in
  	    sun3)
- 		echo m68k-sun-sunos${UNAME_RELEASE}
-@@ -329,16 +426,10 @@ EOF
+@@ -329,16 +387,10 @@
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -556,7 +497,7 @@
      # 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
-@@ -348,50 +439,41 @@ EOF
+@@ -348,50 +400,41 @@
      # MiNT.  But MiNT is downward compatible to TOS, so this should
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
@@ -626,7 +567,7 @@
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -415,30 +497,36 @@ EOF
+@@ -415,30 +458,36 @@
  	  exit (-1);
  	}
  EOF
@@ -675,7 +616,7 @@
  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
  	then
  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -451,29 +539,29 @@ EOF
+@@ -451,29 +500,29 @@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
@@ -714,7 +655,7 @@
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
-@@ -481,7 +569,7 @@ EOF
+@@ -481,7 +530,7 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -723,7 +664,7 @@
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  		eval $set_cc_for_build
-@@ -496,118 +584,140 @@ EOF
+@@ -496,17 +545,20 @@
  			exit(0);
  			}
  EOF
@@ -750,14 +691,7 @@
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
- 		IBM_ARCH=powerpc
- 	fi
--	if [ -x /usr/bin/oslevel ] ; then
--		IBM_REV=`/usr/bin/oslevel`
-+	if [ -x /usr/bin/lslpp ] ; then
-+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
- 	else
+@@ -518,96 +570,114 @@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -816,44 +750,18 @@
 -              if [ "${HP_ARCH}" = "" ]; then
 -	      eval $set_cc_for_build
 -              sed 's/^              //' << EOF >$dummy.c
-+		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_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
-+		fi
-+		if [ "${HP_ARCH}" = "" ]; then
-+		    eval $set_cc_for_build
-+		    sed 's/^		//' << EOF >$dummy.c
- 
+-
 -              #define _HPUX_SOURCE
 -              #include <stdlib.h>
 -              #include <unistd.h>
-+		#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);
-+		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;
@@ -873,6 +781,35 @@
 -              	}
 -                  exit (0);
 -              }
++		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_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
++		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;
@@ -897,11 +834,11 @@
 -	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
 -	    rm -f $dummy.c $dummy
 -	fi ;;
-+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 +		    test -z "$HP_ARCH" && HP_ARCH=hppa
 +		fi ;;
  	esac
-+	if [ ${HP_ARCH} = hppa2.0w ]
++	if [ ${HP_ARCH} = "hppa2.0w" ]
 +	then
 +	    eval $set_cc_for_build
 +
@@ -914,12 +851,12 @@
 +	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 +	    # => hppa64-hp-hpux11.23
 +
-+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
 +		grep -q __LP64__
 +	    then
-+		HP_ARCH=hppa2.0w
++		HP_ARCH="hppa2.0w"
 +	    else
-+		HP_ARCH=hppa64
++		HP_ARCH="hppa64"
 +	    fi
 +	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -933,7 +870,7 @@
      3050*:HI-UX:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -635,158 +745,176 @@ EOF
+@@ -635,158 +705,176 @@
  	  exit (0);
  	}
  EOF
@@ -1038,7 +975,7 @@
 +	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
--	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ 	FUJITSU_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}"
@@ -1046,14 +983,13 @@
 -    hp300:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
-+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 +	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +	exit ;;
 +    5000:UNIX_System_V:4.*:*)
-+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 +	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +	exit ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -1094,7 +1030,7 @@
  	echo ${UNAME_MACHINE}-pc-mingw32
 -	exit 0 ;;
 +	exit ;;
-+    *:MSYS*:*)
++    i*:MSYS*:*)
 +	echo ${UNAME_MACHINE}-pc-msys
 +	exit ;;
 +    i*:windows32*:*)
@@ -1147,26 +1083,30 @@
 -	exit 0 ;;
 +	exit ;;
      *:GNU:*:*)
--	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
 +	# the GNU system
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+-	exit 0 ;;
 +	exit ;;
 +    *:GNU/*:*:*)
 +	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
++	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}-pc-minix
 -	exit 0 ;;
 -    arm*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    aarch64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 -    ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux
 -	exit 0 ;;
 -    m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 -    mips:Linux:*:*)
 -	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
@@ -1180,82 +1120,72 @@
 -    ppc64:Linux:*:*)
 -	echo powerpc64-unknown-linux-gnu
 -	exit 0 ;;
-+	exit ;;
-+    aarch64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
-+    aarch64_be:Linux:*:*)
-+	UNAME_MACHINE=aarch64_be
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -796,104 +924,175 @@ EOF
+@@ -796,11 +884,90 @@
  	  EV6)   UNAME_MACHINE=alphaev6 ;;
  	  EV67)  UNAME_MACHINE=alphaev67 ;;
  	  EV68*) UNAME_MACHINE=alphaev68 ;;
 -        esac
 -	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
 +	esac
 +	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
-+    arc:Linux:*:* | arceb:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+-	exit 0 ;;
 +	exit ;;
 +    arm*:Linux:*:*)
 +	eval $set_cc_for_build
 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +	    | grep -q __ARM_EABI__
 +	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	    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}eabi
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 +	    else
-+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
 +	    fi
 +	fi
 +	exit ;;
 +    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
 +    cris:Linux:*:*)
-+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo ${UNAME_MACHINE}-axis-linux-gnu
 +	exit ;;
 +    crisv32:Linux:*:*)
-+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-+	exit ;;
-+    e2k: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}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
 +    i*86:Linux:*:*)
-+	echo ${UNAME_MACHINE}-pc-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}
-+	exit ;;
-+    k1om: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:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
 +    mips:Linux:*:* | mips64:Linux:*:*)
 +	eval $set_cc_for_build
@@ -1274,29 +1204,23 @@
 +	#endif
 +EOF
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	;;
-+    openrisc*:Linux:*:*)
-+	echo or1k-unknown-linux-${LIBC}
-+	exit ;;
-+    or32:Linux:*:* | or1k*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    or32:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
 +    padre:Linux:*:*)
-+	echo sparc-unknown-linux-${LIBC}
++	echo sparc-unknown-linux-gnu
 +	exit ;;
 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-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
--	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
--	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
--	  *)    echo hppa-unknown-linux-gnu ;;
-+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+@@ -808,92 +975,71 @@
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
 -	exit 0 ;;
 -    parisc64:Linux:*:* | hppa64:Linux:*:*)
@@ -1304,43 +1228,31 @@
 -	exit 0 ;;
 +	exit ;;
 +    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-${LIBC}
++	echo powerpc64-unknown-linux-gnu
 +	exit ;;
 +    ppc: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 powerpc-unknown-linux-gnu
 +	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
--	echo ${UNAME_MACHINE}-ibm-linux
+ 	echo ${UNAME_MACHINE}-ibm-linux
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 +	exit ;;
 +    sh64*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    tile*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
 +    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++	echo ${UNAME_MACHINE}-dec-linux-gnu
 +	exit ;;
      x86_64:Linux:*:*)
 -	echo x86_64-unknown-linux-gnu
@@ -1401,10 +1313,10 @@
 -	rm -f $dummy.c $dummy
 -	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 -	;;
-+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
 +    xtensa*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1449,7 +1361,7 @@
      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
-@@ -901,99 +1100,113 @@ EOF
+@@ -901,99 +1047,113 @@
  	else
  		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  	fi
@@ -1502,7 +1414,7 @@
 +	# 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 configure will decide that
++	# prints for the "djgpp" host, or else GDB configury will decide that
 +	# this is a cross-build.
 +	echo i586-pc-msdosdjgpp
 +	exit ;;
@@ -1602,7 +1514,7 @@
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1001,288 +1214,217 @@ EOF
+@@ -1001,82 +1161,126 @@
  	else
  		echo ns32k-sni-sysv
  	fi
@@ -1691,9 +1603,6 @@
 +	exit ;;
 +    SX-8R:SUPER-UX:*:*)
 +	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-ACE:SUPER-UX:*:*)
-+	echo sxace-nec-superux${UNAME_RELEASE}
 +	exit ;;
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
@@ -1707,37 +1616,25 @@
 -	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 -	exit 0 ;;
 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	eval $set_cc_for_build
-+	if test "$UNAME_PROCESSOR" = unknown ; then
-+	    UNAME_PROCESSOR=powerpc
-+	fi
-+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		    grep IS_64BIT_ARCH >/dev/null
-+		then
-+		    case $UNAME_PROCESSOR in
-+			i386) UNAME_PROCESSOR=x86_64 ;;
-+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-+		    esac
-+		fi
-+	    fi
-+	elif test "$UNAME_PROCESSOR" = i386 ; then
-+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-+	    # that puts up a graphical alert prompting to install
-+	    # developer tools.  Any system running Mac OS X 10.7 or
-+	    # later (Darwin 11 and later) is required to have a 64-bit
-+	    # processor. This is not true of the ARM version of Darwin
-+	    # that Apple uses in portable devices.
-+	    UNAME_PROCESSOR=x86_64
-+	fi
++	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]*:*)
 -	if test "${UNAME_MACHINE}" = "x86pc"; then
 +	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = x86; then
++	if test "$UNAME_PROCESSOR" = "x86"; then
 +		UNAME_PROCESSOR=i386
  		UNAME_MACHINE=pc
  	fi
@@ -1775,11 +1672,7 @@
      *:Plan9:*:*)
  	# "uname -m" is not consistent, so use $cputype instead. 386
  	# is converted to i386 for consistency with other x86
- 	# operating systems.
--	if test "$cputype" = "386"; then
-+	if test "$cputype" = 386; then
- 	    UNAME_MACHINE=i386
- 	else
+@@ -1087,41 +1291,55 @@
  	    UNAME_MACHINE="$cputype"
  	fi
  	echo ${UNAME_MACHINE}-unknown-plan9
@@ -1837,7 +1730,7 @@
 +	echo i386-pc-xenix
 +	exit ;;
 +    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
++	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 +	exit ;;
 +    i*86:rdos:*:*)
 +	echo ${UNAME_MACHINE}-pc-rdos
@@ -1847,220 +1740,109 @@
 +	exit ;;
 +    x86_64:VMkernel:*:*)
 +	echo ${UNAME_MACHINE}-unknown-esx
-+	exit ;;
-+    amd64:Isilon\ OneFS:*:*)
-+	echo x86_64-unknown-onefs
 +	exit ;;
  esac
  
 -#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
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+@@ -1139,16 +1357,16 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
 -          "4"
--#else
++	"4"
+ #else
 -	  ""
--#endif
++	""
+ #endif
 -         ); exit (0);
--#endif
--#endif
--
--#if defined (__arm) && defined (__acorn) && defined (__unix)
++	); exit (0);
+ #endif
+ #endif
+ 
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
 -  printf ("arm-acorn-riscix"); exit (0);
--#endif
--
--#if defined (hp300) && !defined (hpux)
--  printf ("m68k-hp-bsd\n"); exit (0);
--#endif
--
--#if defined (NeXT)
--#if !defined (__ARCHITECTURE__)
--#define __ARCHITECTURE__ "m68k"
--#endif
--  int version;
--  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
--  if (version < 4)
--    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
--  else
--    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
--  exit (0);
--#endif
--
--#if defined (MULTIMAX) || defined (n16)
--#if defined (UMAXV)
--  printf ("ns32k-encore-sysv\n"); exit (0);
--#else
--#if defined (CMU)
--  printf ("ns32k-encore-mach\n"); exit (0);
--#else
--  printf ("ns32k-encore-bsd\n"); exit (0);
--#endif
--#endif
--#endif
--
--#if defined (__386BSD__)
--  printf ("i386-pc-bsd\n"); exit (0);
--#endif
--
--#if defined (sequent)
--#if defined (i386)
--  printf ("i386-sequent-dynix\n"); exit (0);
--#endif
--#if defined (ns32000)
--  printf ("ns32k-sequent-dynix\n"); exit (0);
--#endif
--#endif
--
--#if defined (_SEQUENT_)
--    struct utsname un;
--
--    uname(&un);
--
--    if (strncmp(un.version, "V2", 2) == 0) {
--	printf ("i386-sequent-ptx2\n"); exit (0);
--    }
--    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
--	printf ("i386-sequent-ptx1\n"); exit (0);
--    }
--    printf ("i386-sequent-ptx\n"); exit (0);
--
--#endif
--
--#if defined (vax)
--# if !defined (ultrix)
--#  include <sys/param.h>
--#  if defined (BSD)
--#   if BSD == 43
--      printf ("vax-dec-bsd4.3\n"); exit (0);
--#   else
--#    if BSD == 199006
--      printf ("vax-dec-bsd4.3reno\n"); exit (0);
--#    else
--      printf ("vax-dec-bsd\n"); exit (0);
--#    endif
--#   endif
--#  else
--    printf ("vax-dec-bsd\n"); exit (0);
--#  endif
--# else
--    printf ("vax-dec-ultrix\n"); exit (0);
--# endif
--#endif
--
--#if defined (alliant) && defined (i860)
--  printf ("i860-alliant-bsd\n"); exit (0);
--#endif
--
--  exit (1);
--}
--EOF
--
++  printf ("arm-acorn-riscix\n"); exit (0);
+ #endif
+ 
+ #if defined (hp300) && !defined (hpux)
+@@ -1237,12 +1455,12 @@
+ }
+ EOF
+ 
 -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 -rm -f $dummy.c $dummy
--
--# Apollos put the system type in the environment.
--
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
--
--# 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 0 ;;
--    c2*)
--	if getsysinfo -f scalar_acc
--	then echo c32-convex-bsd
--	else echo c2-convex-bsd
--	fi
--	exit 0 ;;
--    c34*)
--	echo c34-convex-bsd
--	exit 0 ;;
--    c38*)
--	echo c38-convex-bsd
--	exit 0 ;;
--    c4*)
--	echo c4-convex-bsd
--	exit 0 ;;
--    esac
--fi
--
- cat >&2 <<EOF
- $0: unable to guess system type
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++	{ echo "$SYSTEM_NAME"; exit; }
  
--This script, last modified $timestamp, has failed to recognize
--the operating system you are using. It is advised that you
--download the most up to date version of the config scripts from
-+This script (version $timestamp), has failed to recognize the
-+operating system you are using. If your script is old, overwrite
-+config.guess and config.sub with the latest versions from:
+ # Apollos put the system type in the environment.
+ 
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+ 
+ # Convex versions that predate uname can use getsysinfo(1)
+ 
+@@ -1251,22 +1469,22 @@
+     case `getsysinfo -f cpu_type` in
+     c1*)
+ 	echo c1-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c2*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     c34*)
+ 	echo c34-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c38*)
+ 	echo c38-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c4*)
+ 	echo c4-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     esac
+ fi
+ 
+@@ -1277,7 +1495,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
  
 -    ftp://ftp.gnu.org/pub/gnu/config/
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 +and
-+  http://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.sub;hb=HEAD
  
--If the version you run ($0) is already up to date, please
--send the following data and any information you think might be
--pertinent to <config-patches@gnu.org> in order to provide the needed
--information to handle your system.
-+If $0 has already been updated, send the following data and any
-+information you think might be pertinent to config-patches@gnu.org to
-+provide the necessary information to handle your system.
- 
- config.guess timestamp = $timestamp
- 
---- config.sub.orig	2005-03-05 09:20:39.000000000 -0700
-+++ config.sub	2016-09-15 15:58:41.352550325 -0600
-@@ -1,33 +1,29 @@
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+--- config.sub.orig	2005-03-05 10:20:39.000000000 -0600
++++ config.sub	2013-03-03 00:30:18.841026879 -0600
+@@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -#   Free Software Foundation, Inc.
-+#   Copyright 1992-2016 Free Software Foundation, Inc.
++#   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.
  
 -timestamp='2001-09-07'
-+timestamp='2016-09-05'
++timestamp='2012-10-10'
  
--# This file is (in principle) common to ALL GNU software.
--# The presence of a machine in this file suggests that SOME GNU software
--# can handle that machine.  It does not imply ALL GNU software can.
--#
--# This file is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -20,22 +21,25 @@
+ # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
@@ -2072,45 +1854,35 @@
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+# the same distribution terms that you use for the rest of that
-+# program.  This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
-+
+ # the same distribution terms that you use for the rest of that program.
  
- # Please send patches to <config-patches@gnu.org>.
+-# Please send patches to <config-patches@gnu.org>.
++
++# Please send patches to <config-patches@gnu.org>.  Submit a context
++# diff and a properly formatted GNU ChangeLog entry.
  #
-@@ -36,6 +32,9 @@ timestamp='2001-09-07'
+ # 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:
-+# http://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.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.
-@@ -54,8 +53,7 @@ timestamp='2001-09-07'
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
- usage="\
--Usage: $0 [OPTION] CPU-MFR-OPSYS
--       $0 [OPTION] ALIAS
-+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
- 
- Canonicalize a configuration name.
- 
-@@ -69,8 +67,7 @@ Report bugs and patches to <config-patch
+@@ -69,7 +73,8 @@
  version="\
  GNU config.sub ($timestamp)
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright 1992-2016 Free Software Foundation, Inc.
++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."
-@@ -82,11 +79,11 @@ Try \`$me --help' for more information."
+@@ -82,11 +87,11 @@
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
@@ -2125,7 +1897,7 @@
      -- )     # Stop option processing
         shift; break ;;
      - )	# Use stdin as input.
-@@ -98,7 +95,7 @@ while test $# -gt 0 ; do
+@@ -98,7 +103,7 @@
      *local*)
         # First pass through any local machine types.
         echo $1
@@ -2134,15 +1906,15 @@
  
      * )
         break ;;
-@@ -117,10 +114,18 @@ esac
+@@ -117,10 +122,18 @@
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
 -  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
 +  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* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
++  kopensolaris*-gnu* | \
 +  storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -2154,7 +1926,7 @@
    *)
      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
      if [ $basic_machine != $1 ]
-@@ -143,10 +148,13 @@ case $os in
+@@ -143,10 +156,13 @@
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -2169,7 +1941,7 @@
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -161,13 +169,17 @@ case $os in
+@@ -161,13 +177,17 @@
  		os=-chorusos
  		basic_machine=$1
  		;;
@@ -2190,7 +1962,7 @@
  	-sco5)
  		os=-sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -184,6 +196,10 @@ case $os in
+@@ -184,6 +204,10 @@
  		# Don't forget version if it is 3.2v4 or newer.
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
@@ -2201,7 +1973,7 @@
  	-sco*)
  		os=-sco3.2v2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -201,6 +217,12 @@ case $os in
+@@ -201,6 +225,12 @@
  	-isc*)
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
@@ -2214,28 +1986,24 @@
  	-lynx*)
  		os=-lynxos
  		;;
-@@ -225,43 +247,114 @@ case $basic_machine in
+@@ -225,43 +255,103 @@
  	# 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] \
 -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
--	| c4x | clipper \
--	| d10v | d30v | dsp16xx \
--	| fr30 \
 +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 +	| am33_2.0 \
-+	| arc | arceb \
-+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+	| avr | avr32 \
-+	| ba \
-+	| be32 | be64 \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++        | be32 | be64 \
 +	| bfin \
-+	| c4x | c8051 | clipper \
+ 	| c4x | clipper \
+-	| d10v | d30v | dsp16xx \
+-	| fr30 \
 +	| d10v | d30v | dlx | dsp16xx \
-+	| e2k | epiphany \
-+	| fido | fr30 | frv | ft32 \
++	| epiphany \
++	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| hexagon \
  	| i370 | i860 | i960 | ia64 \
@@ -2246,7 +2014,6 @@
 -	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
 -	| mipsisa32 \
 +	| ip2k | iq2000 \
-+	| k1om \
 +	| le32 | le64 \
 +	| lm32 \
 +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -2264,23 +2031,21 @@
 +	| mips64vr5900 | mips64vr5900el \
 +	| mipsisa32 | mipsisa32el \
 +	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa32r6 | mipsisa32r6el \
 +	| mipsisa64 | mipsisa64el \
 +	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64r6 | mipsisa64r6el \
 +	| mipsisa64sb1 | mipsisa64sb1el \
 +	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipsr5900 | mipsr5900el \
 +	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
 +	| moxie \
 +	| mt \
 +	| msp430 \
 +	| nds32 | nds32le | nds32be \
-+	| nios | nios2 | nios2eb | nios2el \
++	| nios | nios2 \
  	| ns16k | ns32k \
 -	| openrisc \
-+	| open8 | or1k | or1knd | or32 \
++	| open8 \
++	| or32 \
  	| pdp10 | pdp11 | pj | pjl \
 -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle \
@@ -2291,10 +2056,9 @@
 -	| stormy16 | strongarm \
 -	| tahoe | thumb | tic80 | tron \
 -	| v850 \
-+	| riscv32 | riscv64 \
 +	| rl78 | rx \
 +	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| 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 \
@@ -2302,7 +2066,6 @@
 +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 +	| ubicom32 \
 +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-+	| visium \
  	| we32k \
 -	| x86 | xscale \
 -	| z8k)
@@ -2321,10 +2084,7 @@
 +	c6x)
 +		basic_machine=tic6x-unknown
 +		;;
-+	leon|leon[3-9])
-+		basic_machine=sparc-$basic_machine
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
  		basic_machine=$basic_machine-unknown
  		os=-none
  		;;
@@ -2351,7 +2111,7 @@
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
-@@ -277,41 +370,89 @@ case $basic_machine in
+@@ -277,41 +367,81 @@
  	# Recognize the basic CPU types with company name.
  	580-* \
  	| a29k-* \
@@ -2363,19 +2123,17 @@
 -	| c[123]* | c30-* | [cjt]90-* | c54x-* \
 -	| clipper-* | cray2-* | cydra-* \
 -	| d10v-* | d30v-* \
--	| elxsi-* \
--	| f30[01]-* | f700-* | fr30-* | fx80-* \
 +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 +	| avr-* | avr32-* \
-+	| ba-* \
 +	| be32-* | be64-* \
 +	| bfin-* | bs2000-* \
 +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-+	| c8051-* | clipper-* | craynv-* | cydra-* \
++	| clipper-* | craynv-* | cydra-* \
 +	| d10v-* | d30v-* | dlx-* \
-+	| e2k-* | elxsi-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | fx80-* \
 +	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -2389,7 +2147,6 @@
 -	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
 -	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 +	| ip2k-* | iq2000-* \
-+	| k1om-* \
 +	| le32-* | le64-* \
 +	| lm32-* \
 +	| m32c-* | m32r-* | m32rle-* \
@@ -2409,22 +2166,18 @@
 +	| mips64vr5900-* | mips64vr5900el-* \
 +	| mipsisa32-* | mipsisa32el-* \
 +	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa32r6-* | mipsisa32r6el-* \
 +	| mipsisa64-* | mipsisa64el-* \
 +	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64r6-* | mipsisa64r6el-* \
 +	| mipsisa64sb1-* | mipsisa64sb1el-* \
 +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipsr5900-* | mipsr5900el-* \
 +	| mipstx39-* | mipstx39el-* \
 +	| mmix-* \
 +	| mt-* \
 +	| msp430-* \
 +	| nds32-* | nds32le-* | nds32be-* \
-+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
++	| nios-* | nios2-* \
  	| none-* | np1-* | ns16k-* | ns32k-* \
 +	| open8-* \
-+	| or1k*-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -2437,13 +2190,12 @@
 -	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
 -	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 -	| v850-* | vax-* \
-+	| riscv32-* | riscv64-* \
 +	| rl78-* | romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 +	| tahoe-* \
 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tile*-* \
@@ -2451,7 +2203,6 @@
 +	| ubicom32-* \
 +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 +	| vax-* \
-+	| visium-* \
  	| we32k-* \
 -	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
 +	| x86-* | x86_64-* | xc16x-* | xps100-* \
@@ -2466,7 +2217,7 @@
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -329,6 +470,9 @@ case $basic_machine in
+@@ -329,6 +459,9 @@
  		basic_machine=a29k-amd
  		os=-udi
  		;;
@@ -2476,7 +2227,7 @@
  	adobe68k)
  		basic_machine=m68010-adobe
  		os=-scout
-@@ -343,6 +487,12 @@ case $basic_machine in
+@@ -343,6 +476,12 @@
  		basic_machine=a29k-none
  		os=-bsd
  		;;
@@ -2489,21 +2240,18 @@
  	amdahl)
  		basic_machine=580-amdahl
  		os=-sysv
-@@ -366,6 +516,13 @@ case $basic_machine in
+@@ -366,6 +505,10 @@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
 +	aros)
 +		basic_machine=i386-pc
 +		os=-aros
-+		;;
-+	asmjs)
-+		basic_machine=asmjs-unknown
 +		;;
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -374,6 +531,35 @@ case $basic_machine in
+@@ -374,6 +517,35 @@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -2539,7 +2287,7 @@
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -394,30 +580,45 @@ case $basic_machine in
+@@ -394,30 +566,45 @@
  		basic_machine=c38-convex
  		os=-bsd
  		;;
@@ -2593,7 +2341,7 @@
  	delta | 3300 | motorola-3300 | motorola-delta \
  	      | 3300-motorola | delta-motorola)
  		basic_machine=m68k-motorola
-@@ -426,6 +627,14 @@ case $basic_machine in
+@@ -426,6 +613,14 @@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -2608,22 +2356,7 @@
  	dpx20 | dpx20-*)
  		basic_machine=rs6000-bull
  		os=-bosx
-@@ -434,6 +643,14 @@ case $basic_machine in
- 		basic_machine=m68k-bull
- 		os=-sysv3
- 		;;
-+	e500v[12])
-+		basic_machine=powerpc-unknown
-+		os=$os"spe"
-+		;;
-+	e500v[12]-*)
-+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=$os"spe"
-+		;;
- 	ebmon29k)
- 		basic_machine=a29k-amd
- 		os=-ebmon
-@@ -537,7 +754,6 @@ case $basic_machine in
+@@ -537,7 +732,6 @@
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		;;
@@ -2631,13 +2364,10 @@
  	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
-@@ -576,6 +792,17 @@ case $basic_machine in
+@@ -576,6 +770,14 @@
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
-+	leon-*|leon[3-9]-*)
-+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-+		;;
 +	m68knommu)
 +		basic_machine=m68k-unknown
 +		os=-linux
@@ -2649,7 +2379,7 @@
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -587,10 +814,21 @@ case $basic_machine in
+@@ -587,10 +789,21 @@
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
@@ -2661,8 +2391,7 @@
 +		os=-mingw64
 +		;;
  	mingw32)
--		basic_machine=i386-pc
-+		basic_machine=i686-pc
+ 		basic_machine=i386-pc
  		os=-mingw32
  		;;
 +	mingw32ce)
@@ -2672,7 +2401,7 @@
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -598,36 +836,43 @@ case $basic_machine in
+@@ -598,36 +811,39 @@
  		basic_machine=m68k-atari
  		os=-mint
  		;;
@@ -2701,10 +2430,6 @@
 +	morphos)
 +		basic_machine=powerpc-unknown
 +		os=-morphos
-+		;;
-+	moxiebox)
-+		basic_machine=moxie-unknown
-+		os=-moxiebox
 +		;;
  	msdos)
  		basic_machine=i386-pc
@@ -2714,7 +2439,7 @@
 +		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 +		;;
 +	msys)
-+		basic_machine=i686-pc
++		basic_machine=i386-pc
 +		os=-msys
 +		;;
  	mvs)
@@ -2728,7 +2453,7 @@
  	ncr3000)
  		basic_machine=i486-ncr
  		os=-sysv4
-@@ -692,6 +937,12 @@ case $basic_machine in
+@@ -692,6 +908,12 @@
  	np1)
  		basic_machine=np1-gould
  		;;
@@ -2741,7 +2466,7 @@
  	nsr-tandem)
  		basic_machine=nsr-tandem
  		;;
-@@ -699,6 +950,13 @@ case $basic_machine in
+@@ -699,6 +921,13 @@
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
@@ -2755,7 +2480,7 @@
  	OSE68000 | ose68000)
  		basic_machine=m68000-ericsson
  		os=-ose
-@@ -715,55 +973,76 @@ case $basic_machine in
+@@ -715,55 +944,76 @@
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -2821,12 +2546,11 @@
 -	        ;;
 -	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 +	ppc | ppcbe)	basic_machine=powerpc-unknown
- 		;;
--	ppcle | powerpclittle | ppc-le | powerpc-little)
++		;;
 +	ppc-* | ppcbe-*)
 +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppcle | powerpclittle)
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
 -	        ;;
 +		;;
@@ -2838,30 +2562,25 @@
 +		;;
  	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
--	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+	ppc64le | powerpc64little)
+ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
  		basic_machine=powerpc64le-unknown
 -	        ;;
 +		;;
  	ppc64le-* | powerpc64little-*)
  		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
-@@ -774,6 +1053,14 @@ case $basic_machine in
+@@ -774,6 +1024,10 @@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
-+	rdos | rdos64)
-+		basic_machine=x86_64-pc
-+		os=-rdos
-+		;;
-+	rdos32)
++	rdos)
 +		basic_machine=i386-pc
 +		os=-rdos
 +		;;
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -784,10 +1071,30 @@ case $basic_machine in
+@@ -784,10 +1038,30 @@
  	rtpc | rtpc-*)
  		basic_machine=romp-ibm
  		;;
@@ -2892,7 +2611,7 @@
  	sequent)
  		basic_machine=i386-sequent
  		;;
-@@ -795,7 +1102,13 @@ case $basic_machine in
+@@ -795,7 +1069,13 @@
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -2907,7 +2626,7 @@
  		basic_machine=sparclite-wrs
  		os=-vxworks
  		;;
-@@ -813,6 +1126,9 @@ case $basic_machine in
+@@ -813,6 +1093,9 @@
  		basic_machine=i860-stratus
  		os=-sysv4
  		;;
@@ -2917,7 +2636,7 @@
  	sun2)
  		basic_machine=m68000-sun
  		;;
-@@ -862,12 +1178,16 @@ case $basic_machine in
+@@ -862,12 +1145,16 @@
  		os=-dynix
  		;;
  	t3e)
@@ -2938,7 +2657,7 @@
  		;;
  	tx39)
  		basic_machine=mipstx39-unknown
-@@ -875,9 +1195,17 @@ case $basic_machine in
+@@ -875,9 +1162,17 @@
  	tx39el)
  		basic_machine=mipstx39el-unknown
  		;;
@@ -2956,7 +2675,7 @@
  	udi29k)
  		basic_machine=a29k-amd
  		os=-udi
-@@ -899,8 +1227,8 @@ case $basic_machine in
+@@ -899,8 +1194,8 @@
  		os=-vms
  		;;
  	vpp*|vx|vx-*)
@@ -2967,7 +2686,7 @@
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
-@@ -921,21 +1249,28 @@ case $basic_machine in
+@@ -921,21 +1216,28 @@
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
@@ -3004,7 +2723,7 @@
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -952,16 +1287,12 @@ case $basic_machine in
+@@ -952,16 +1254,12 @@
  	op60c)
  		basic_machine=hppa1.1-oki
  		;;
@@ -3024,7 +2743,7 @@
  	rs6000)
  		basic_machine=rs6000-ibm
  		;;
-@@ -978,13 +1309,13 @@ case $basic_machine in
+@@ -978,13 +1276,13 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -3041,7 +2760,7 @@
  		basic_machine=cydra-cydrome
  		;;
  	orion)
-@@ -999,10 +1330,6 @@ case $basic_machine in
+@@ -999,10 +1297,6 @@
  	pmac | pmac-mpw)
  		basic_machine=powerpc-apple
  		;;
@@ -3052,7 +2771,7 @@
  	*-unknown)
  		# Make sure to match an already-canonicalized machine name.
  		;;
-@@ -1029,9 +1356,12 @@ esac
+@@ -1029,9 +1323,12 @@
  if [ x"$os" != x"" ]
  then
  case $os in
@@ -3067,7 +2786,7 @@
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
-@@ -1052,23 +1382,32 @@ case $os in
+@@ -1052,23 +1349,31 @@
  	# 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* \
@@ -3075,16 +2794,16 @@
 -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+	      | -sym* | -kopensolaris* | -plan9* \
++	      | -sym* | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 -	      | -aos* \
-+	      | -aos* | -aros* | -cloudabi* | -sortix* \
++	      | -aos* | -aros* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 -	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 -	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* \
 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -3095,9 +2814,9 @@
 -	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 +	      | -chorusos* | -chorusrdb* | -cegcc* \
 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -3105,12 +2824,11 @@
 +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-+	      | -onefs* | -tirtos* | -phoenix*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1080,16 +1419,21 @@ case $os in
+@@ -1080,16 +1385,21 @@
  			;;
  		esac
  		;;
@@ -3134,7 +2852,7 @@
  	-linux*)
  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  		;;
-@@ -1102,6 +1446,9 @@ case $os in
+@@ -1102,6 +1412,9 @@
  	-opened*)
  		os=-openedition
  		;;
@@ -3144,7 +2862,7 @@
  	-wince*)
  		os=-wince
  		;;
-@@ -1120,14 +1467,23 @@ case $os in
+@@ -1120,14 +1433,23 @@
  	-acis*)
  		os=-aos
  		;;
@@ -3169,7 +2887,7 @@
  		;;
  	-nsk*)
  		os=-nsk
-@@ -1139,6 +1495,9 @@ case $os in
+@@ -1139,6 +1461,9 @@
  	-sinix*)
  		os=-sysv4
  		;;
@@ -3179,7 +2897,7 @@
  	-triton*)
  		os=-sysv3
  		;;
-@@ -1166,8 +1525,21 @@ case $os in
+@@ -1166,8 +1491,22 @@
  	-xenix)
  		os=-xenix
  		;;
@@ -3191,6 +2909,9 @@
 +	-aros*)
 +		os=-aros
 +		;;
++	-kaos*)
++		os=-kaos
++		;;
 +	-zvmoe)
 +		os=-zvmoe
 +		;;
@@ -3198,12 +2919,10 @@
 +		os=-dicos
 +		;;
 +	-nacl*)
-+		;;
-+	-ios)
  		;;
  	-none)
  		;;
-@@ -1191,6 +1563,12 @@ else
+@@ -1191,6 +1530,12 @@
  # system, and we'll never get to this point.
  
  case $basic_machine in
@@ -3216,16 +2935,13 @@
  	*-acorn)
  		os=-riscix1.2
  		;;
-@@ -1200,10 +1578,29 @@ case $basic_machine in
+@@ -1200,10 +1545,26 @@
  	arm*-semi)
  		os=-aout
  		;;
 +	c4x-* | tic4x-*)
 +		os=-coff
 +		;;
-+	c8051-*)
-+		os=-elf
-+		;;
 +	hexagon-*)
 +		os=-elf
 +		;;
@@ -3247,7 +2963,7 @@
  		os=-none
  		;;
  	*-dec | vax-*)
-@@ -1217,19 +1614,22 @@ case $basic_machine in
+@@ -1217,19 +1578,22 @@
  		;;
  	m68000-sun)
  		os=-sunos3
@@ -3273,7 +2989,7 @@
  	*-tti)	# must be before sparc entry or we get the wrong os.
  		os=-sysv3
  		;;
-@@ -1239,9 +1639,15 @@ case $basic_machine in
+@@ -1239,9 +1603,15 @@
  	*-be)
  		os=-beos
  		;;
@@ -3289,7 +3005,7 @@
  	*-wec)
  		os=-proelf
  		;;
-@@ -1293,19 +1699,19 @@ case $basic_machine in
+@@ -1293,19 +1663,19 @@
  	*-next)
  		os=-nextstep3
  		;;
@@ -3313,7 +3029,7 @@
  		os=-sysv4
  		;;
  	*-masscomp)
-@@ -1344,7 +1750,7 @@ case $basic_machine in
+@@ -1344,7 +1714,7 @@
  			-sunos*)
  				vendor=sun
  				;;
@@ -3322,7 +3038,7 @@
  				vendor=ibm
  				;;
  			-beos*)
-@@ -1374,10 +1780,16 @@ case $basic_machine in
+@@ -1374,10 +1744,16 @@
  			-mvs* | -opened*)
  				vendor=ibm
  				;;
@@ -3340,7 +3056,7 @@
  				vendor=wrs
  				;;
  			-aux*)
-@@ -1401,7 +1813,7 @@ case $basic_machine in
+@@ -1401,7 +1777,7 @@
  esac
  
  echo $basic_machine$os
diff --git a/abe-1.1-configure-c99.patch b/abe-1.1-configure-c99.patch
deleted file mode 100644
index 581e6cd..0000000
--- a/abe-1.1-configure-c99.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure
-+++ configure
-@@ -960,7 +960,7 @@ cat > conftest.$ac_ext << EOF
- #line 961 "configure"
- #include "confdefs.h"
- 
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-@@ -1418,8 +1418,8 @@ else
- #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
- int main () { int i; for (i = 0; i < 256; i++)
--if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
--exit (0); }
-+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) return 2;
-+return 0; }
- 
- EOF
- if { (eval echo configure:1426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-@@ -2031,7 +2031,7 @@ if test "$ac_x_libraries" = NO; then
- cat > conftest.$ac_ext <<EOF
- #line 2033 "configure"
- #include "confdefs.h"
--
-+#include <X11/Intrinsic.h>
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
diff --git a/abe-1.1-format-security.patch b/abe-1.1-format-security.patch
deleted file mode 100644
index ad88b4b..0000000
--- a/abe-1.1-format-security.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- ./src/Game.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ ./src/Game.c	2013-11-20 12:30:00.000000000 -0700
-@@ -6,21 +6,14 @@ Game game;
- 
- // path_sprintf should not be used by other .c files, as it does not fit for them.
- static void
--path_sprintf(char *path, char *formatted_name, int version)
-+path_sprintf(char *path, const char *name, int version)
- {
--
--  int len;
--
--  printf("path_sprintf (%p, %s, %d)\n", path, formatted_name, version);
--
--  strcpy(path, getSaveGameDir());
--
--  len = strlen(path);
--
-   if(1 == version) {
--    sprintf(path + len, formatted_name);
-+    printf("path_sprintf (%p, %s.dat, %d)\n", path, name, version);
-+    sprintf(path, "%s%s.dat", getSaveGameDir(), name);
-   } else {
--    sprintf(path + len, formatted_name, version);
-+    printf("path_sprintf (%p, %s%d.dat, %d)\n", path, name, version, version);
-+    sprintf(path, "%s%s%d.dat", getSaveGameDir(), name, version);
-   }
- 
- }
-@@ -30,14 +23,14 @@ deleteSavedGame()
- {
-   char path[PATH_SIZE];
-   // version 2
--  path_sprintf(path, "save%d.dat", GAME_VERSION);
-+  path_sprintf(path, "save", GAME_VERSION);
-   remove(path);
--  path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
-+  path_sprintf(path, "savedmap", GAME_VERSION);
-   remove(path);
-   // version 1
--  path_sprintf(path, "save.dat", 1);
-+  path_sprintf(path, "save", 1);
-   remove(path);
--  path_sprintf(path, "savedmap.dat", 1);
-+  path_sprintf(path, "savedmap", 1);
-   remove(path);
- }
- 
-@@ -51,7 +44,7 @@ saveGame()
- 
-   mkshuae();
- 
--  path_sprintf(path, "save%d.dat", GAME_VERSION);
-+  path_sprintf(path, "save", GAME_VERSION);
- 
-   if(!(fp = fopen(path, "wb"))) {
-     err = strerror(errno);
-@@ -79,7 +72,7 @@ saveGame()
-   SDL_RWclose(rwop);
- 
-   // save the map
--  path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
-+  path_sprintf(path, "savedmap", GAME_VERSION);
-   saveMapPath(path);
- }
- 
-@@ -96,7 +89,7 @@ loadGame()
-   version = (int) GAME_VERSION;
- 
-   // load the map
--  path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
-+  path_sprintf(path, "savedmap", GAME_VERSION);
-   if(!loadMapPath(path, 0)) {
-     // if can't find saved map load static map
-     fprintf(stderr,
-@@ -112,9 +105,9 @@ loadGame()
-   // try to find a saved game of any version
-   while(version > 0) {
-     if(version > 1) {
--      path_sprintf(path, "save%d.dat", version);
-+      path_sprintf(path, "save", version);
-     } else {                    // By Pedro: version==1
--      path_sprintf(path, "save.dat", version);
-+      path_sprintf(path, "save", version);
-     }
-     fprintf(stderr, "Trying to load saved game: %s\n", path);
-     fflush(stderr);
diff --git a/abe-finishdrawmap.patch b/abe-finishdrawmap.patch
deleted file mode 100644
index 4e06948..0000000
--- a/abe-finishdrawmap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Map.c~	2005-03-05 10:20:04.000000000 -0600
-+++ src/Map.c	2025-01-08 15:30:08.904971564 -0600
-@@ -945,7 +945,7 @@
-         drawMap();              // this calls finishDrawMap
-       } else {
-         // update the screen
--        finishDrawMap(!map.redraw);
-+        finishDrawMap();
-       }
- 
-       // uncomment to test slow machine game speed
diff --git a/abe.appdata.xml b/abe.appdata.xml
deleted file mode 100644
index 8057fc2..0000000
--- a/abe.appdata.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
- <id>abe.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-1.0+</project_license>
- <name>abe</name>
- <summary>Abe's Amazing Adventure</summary>
- <description>
-  <p>
-   Abe's Amazing Adventure is a scrolling, platform-jumping, key-collecting,
-   ancient pyramid exploring game, vaguely in the style of similar games for
-   the Commodore+4.
-  </p>
-  <p>
-   The game is intended to show young people (I'm writing it for my son's
-   birthday) all the cool games they missed.
-  </p>
- </description>
- <content_rating type="oars-1.0">
-  <content_attribute id="violence-cartoon">mild</content_attribute>
-  <content_attribute id="violence-fantasy">mild</content_attribute>
-  <content_attribute id="violence-realistic">none</content_attribute>
-  <content_attribute id="violence-bloodshed">none</content_attribute>
-  <content_attribute id="violence-sexual">none</content_attribute>
-  <content_attribute id="drugs-alcohol">none</content_attribute>
-  <content_attribute id="drugs-narcotics">none</content_attribute>
-  <content_attribute id="drugs-tobacco">none</content_attribute>
-  <content_attribute id="sex-nudity">none</content_attribute>
-  <content_attribute id="sex-themes">none</content_attribute>
-  <content_attribute id="language-profanity">none</content_attribute>
-  <content_attribute id="language-humor">none</content_attribute>
-  <content_attribute id="language-discrimination">none</content_attribute>
-  <content_attribute id="social-chat">none</content_attribute>
-  <content_attribute id="social-info">none</content_attribute>
-  <content_attribute id="social-audio">none</content_attribute>
-  <content_attribute id="social-location">none</content_attribute>
-  <content_attribute id="social-contacts">none</content_attribute>
-  <content_attribute id="money-purchasing">none</content_attribute>
-  <content_attribute id="money-gambling">none</content_attribute>
- </content_rating>
- <screenshots>
-  <screenshot type="default">
-   <image>http://abe.sourceforge.net/screen0-4-1.png</image>
-   <caption>Abe dodging an obstacle</caption>
-  </screenshot>
-  <screenshot>
-   <image>http://abe.sourceforge.net/screen2-4-2.png</image>
-   <caption>Abe climbing a ladder</caption>
-  </screenshot>
- </screenshots>
- <update_contact>loganjerry@gmail.com</update_contact>
- <developer_name>Gabor Torok</developer_name>
- <developer_name>Pedro Izecksohn</developer_name>
- <developer_name>Alex Clarck</developer_name>
- <url type="homepage">http://abe.sourceforge.net/</url>
- <url type="bugtracker">http://sourceforge.net/p/abe/bugs/</url>
-</component>
diff --git a/abe.png b/abe.png
new file mode 100644
index 0000000..41e380c
Binary files /dev/null and b/abe.png differ
diff --git a/abe.spec b/abe.spec
index fe1259a..1a9bf77 100644
--- a/abe.spec
+++ b/abe.spec
@@ -1,39 +1,29 @@
 Name:           abe
 Version:        1.1
-Release:        55%{?dist}
+Release:        18%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
-License:        GPL-1.0-or-later
+Group:          Amusements/Games
+License:        GPL+
 URL:            http://abe.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/abe/%{name}-%{version}.tar.gz
-Source1:        %{name}-icons.tar.xz
-Source2:        %{name}.appdata.xml
+Source1:        %{name}.png
 # Enable changing the video settings.  Sent upstream 2 Apr 2006:
 # https://sourceforge.net/tracker/?func=detail&aid=1463202&group_id=70141&atid=526743
 Patch0:         %{name}-1.1-settings.patch
 # Fix a double free() bug.  Sent upstream 15 Mar 2011:
 # https://sourceforge.net/tracker/?func=detail&aid=3214269&group_id=70141&atid=526745
 Patch1:         %{name}-1.1-doublefree.patch
-# Fix an incorrect printf format specifier.  Sent upstream 15 Mar 2011:
+# Fix an incorrect printf format specifier.  Sent upstram 15 Mar 2011:
 # https://sourceforge.net/tracker/?func=detail&aid=3214270&group_id=70141&atid=526745
 Patch2:         %{name}-1.1-format.patch
 # Add support for aarch64.  Sent upstream 25 Mar 2013:
 # https://sourceforge.net/tracker/?func=detail&aid=3609029&group_id=70141&atid=526743
 Patch3:         %{name}-1.1-aarch64.patch
-# Fix build failure with -Werror=format-security
-Patch4:         %{name}-1.1-format-security.patch
-Patch5:         %{name}-1.1-configure-c99.patch
-Patch6:         %{name}-finishdrawmap.patch
 
+BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
+BuildRequires:  libXmu-devel libXi-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  gcc-c++
-BuildRequires:  libXi-devel
-BuildRequires:  libXmu-devel
-BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
-BuildRequires: make
-
-Requires:       hicolor-icon-theme
 
 %description
 A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game,
@@ -41,13 +31,9 @@ vaguely in the style of similar games for the Commodore+4.
 
 %prep
 %setup -q
-%patch -P0
-%patch -P1
-%patch -P2
-%patch -P3
-%patch -P4
-%patch -P5
-%patch -P6
+%patch0
+%patch1
+%patch2
 
 # Fix the FSF's address
 sed 's/59 Temple Place, Suite 330, Boston, MA  02111-1307/51 Franklin Street, Suite 500, Boston, MA  02110-1335/' COPYING > COPYING.new
@@ -56,20 +42,18 @@ mv -f COPYING.new COPYING
 
 %build
 %configure --with-data-dir=%{_datadir}/%{name}
-sed -i "s|^CFLAGS =.*|CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)|" src/Makefile
-%make_build
+sed -i "s/^CFLAGS =.*/CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)/" src/Makefile
+make %{?_smp_mflags}
 
 %install
-%make_install
+make DESTDIR=$RPM_BUILD_ROOT install
 
 # make install does not copy the game data files.
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/appdata/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name}
-tar xJf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/appdata/
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 
 cat << EOF > %{name}.desktop
 [Desktop Entry]
@@ -84,132 +68,22 @@ EOF
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop
 
+%post
+update-desktop-database %{_datadir}/applications &>/dev/null
+
+%postun
+if [ $1 -eq 0 ]; then
+    update-desktop-database %{_datadir}/applications &>/dev/null
+fi
+
 %files
-%doc README
-%license COPYING
+%doc COPYING README
 %{_bindir}/*
 %{_datadir}/%{name}
-%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-55
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-54
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-53
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jan 08 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.1-52
-- Patch for GCC 15
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-51
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-50
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-49
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-48
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Mar 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.1-47
-- migrated to SPDX license
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-46
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Dec 06 2022 Peter Fordham <peter.fordham@gmail.com> - 1.1-45
-- Port configure script to C99
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-44
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-43
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-42
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-41
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-40
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1.1-38
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-36
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1-32
-- Remove obsolete scriptlets
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Sep 15 2016 Jerry James <loganjerry@gmail.com> - 1.1-28
-- Add OARS data to the appdata file
-- Update -aarch64 patch with newer config.{guess,sub}
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Wed Aug 13 2014 Jerry James <loganjerry@gmail.com> - 1.1-24
-- Drop unused abe.png file
-- Update -aarch64 patch with newer config.{guess,sub}
-
-* Mon Jul 21 2014 Jerry James <loganjerry@gmail.com> - 1.1-23
-- Add icons of varying sizes
-- Use the new license macro
-
-* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Nov 20 2013 Jerry James <loganjerry@gmail.com> - 1.1-21
-- Add -format-security patch
-
-* Fri Nov  8 2013 Jerry James <loganjerry@gmail.com> - 1.1-20
-- Add an AppData file
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
 * Mon Mar 25 2013 Jerry James <loganjerry@gmail.com> - 1.1-18
 - Add aarch64 support (bz 924964)
 - Fix the FSF's address in COPYING
@@ -283,7 +157,7 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des
 - fix build on gcc4
 - patch to fix issues in #149362
 
-* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Wed Aug 13 2003 Panu Matilainen <pmatilai@welho.com> 0:1.0-0.fdr.3
diff --git a/sources b/sources
index 9c013ca..41b001f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 5537920e1746708e1a631d84d3500f5c  abe-1.1.tar.gz
-e41f81ca337cbfd7251d252232347f6b  abe-icons.tar.xz