[thewidgetfactory/f19] actual patch to support aarch64

Luya Tshimbalanga luya at fedoraproject.org
Fri Aug 16 21:41:42 UTC 2013


commit 2fe07d908944538370d61e79d9c8a2a3b13325b3
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Fri Aug 16 14:41:33 2013 -0700

    actual patch to support aarch64

 ...aarch64.patch => thewidgetfactory-aarch64.patch |  981 +++++++++++++++-----
 1 files changed, 736 insertions(+), 245 deletions(-)
---
diff --git a/gdesklets-aarch64.patch b/thewidgetfactory-aarch64.patch
similarity index 60%
rename from gdesklets-aarch64.patch
rename to thewidgetfactory-aarch64.patch
index 8668b99..87215f4 100644
--- a/gdesklets-aarch64.patch
+++ b/thewidgetfactory-aarch64.patch
@@ -1,16 +1,16 @@
-diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
---- gdesklets-0.36.3/config.guess	2011-01-23 13:56:08.000000000 -0600
-+++ gdesklets-0.36.3-aarch64/config.guess	2013-03-03 04:57:13.771899628 -0600
+diff -urN thewidgetfactory-0.2.1/config.guess thewidgetfactory-0.2.1-aarch64/config.guess
+--- thewidgetfactory-0.2.1/config.guess	2006-03-25 15:22:37.000000000 -0600
++++ thewidgetfactory-0.2.1-aarch64/config.guess	2013-03-08 08:41:03.217036956 -0600
 @@ -1,10 +1,10 @@
  #! /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
--#   Free Software Foundation, Inc.
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 +#   2011, 2012 Free Software Foundation, Inc.
  
--timestamp='2009-12-30'
+-timestamp='2006-02-27'
 +timestamp='2012-09-25'
  
  # This file is free software; you can redistribute it and/or modify it
@@ -26,25 +26,45 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -57,8 +55,8 @@
+@@ -27,16 +25,16 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches at 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.
+ #
+-# 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;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,7 +54,8 @@
+ GNU config.guess ($timestamp)
  
  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 Free
--Software Foundation, Inc.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++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.
+ 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."
-@@ -140,35 +138,12 @@
+@@ -139,29 +138,12 @@
  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/*)
+-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
 -	eval $set_cc_for_build
--	cat <<-EOF > $dummy.c
+-	cat << EOF > $dummy.c
 -	#include <features.h>
 -	#ifdef __UCLIBC__
 -	# ifdef __UCLIBC_CONFIG_VERSION__
@@ -53,16 +73,11 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 -	LIBC=uclibc
 -	# endif
 -	#else
--	# ifdef __dietlibc__
--	LIBC=dietlibc
--	# else
 -	LIBC=gnu
--	# endif
 -	#endif
--	EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
--	;;
--esac
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
+-fi
 -
  # Note: order is significant - the case branches are not exclusive.
  
@@ -74,7 +89,24 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
  	# switched to ELF, *-*-netbsd* would select the old
  	# object file format.  This provides both forward
-@@ -204,7 +179,7 @@
+@@ -178,6 +160,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
++	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -186,7 +169,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -196,7 +179,7 @@
  		fi
  		;;
  	    *)
@@ -83,7 +115,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  		;;
  	esac
  	# The OS release
-@@ -225,6 +200,10 @@
+@@ -217,6 +200,10 @@
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
  	echo "${machine}-${os}${release}"
  	exit ;;
@@ -94,7 +126,16 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      *:OpenBSD:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
  	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -247,7 +226,7 @@
+@@ -228,7 +215,7 @@
+ 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ 	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ 	exit ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+@@ -239,7 +226,7 @@
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
  		;;
  	*5.*)
@@ -103,7 +144,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  		;;
  	esac
  	# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -293,7 +272,10 @@
+@@ -285,7 +272,10 @@
  	# 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'`
@@ -115,7 +156,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      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
-@@ -319,12 +301,12 @@
+@@ -311,12 +301,12 @@
  	echo s390-ibm-zvmoe
  	exit ;;
      *:OS400:*:*)
@@ -130,7 +171,43 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  	echo arm-unknown-riscos
  	exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -418,23 +400,23 @@
+@@ -340,14 +330,33 @@
+ 	case `/usr/bin/uname -p` in
+ 	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+-    i86pc:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	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) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+@@ -391,23 +400,23 @@
      # MiNT.  But MiNT is downward compatible to TOS, so this should
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
@@ -163,7 +240,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      m68k:machten:*:*)
  	echo m68k-apple-machten${UNAME_RELEASE}
  	exit ;;
-@@ -504,8 +486,8 @@
+@@ -477,8 +486,8 @@
  	echo m88k-motorola-sysv3
  	exit ;;
      AViiON:dgux:*:*)
@@ -174,7 +251,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
  	then
  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -518,7 +500,7 @@
+@@ -491,7 +500,7 @@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
@@ -183,16 +260,16 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
  	exit ;;
-@@ -575,7 +557,7 @@
+@@ -548,7 +557,7 @@
  		echo rs6000-ibm-aix3.2
  	fi
  	exit ;;
--    *:AIX:*:[456])
+-    *:AIX:*:[45])
 +    *: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
  		IBM_ARCH=rs6000
-@@ -618,52 +600,52 @@
+@@ -591,52 +600,52 @@
  	    9000/[678][0-9][0-9])
  		if [ -x /usr/bin/getconf ]; then
  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@@ -222,10 +299,6 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  		    eval $set_cc_for_build
 -		    sed 's/^              //' << EOF >$dummy.c
 +		    sed 's/^		//' << EOF >$dummy.c
-+
-+		#define _HPUX_SOURCE
-+		#include <stdlib.h>
-+		#include <unistd.h>
  
 -              #define _HPUX_SOURCE
 -              #include <stdlib.h>
@@ -257,6 +330,10 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 -              	}
 -                  exit (0);
 -              }
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
++
 +		int main ()
 +		{
 +		#if defined(_SC_KERNEL_BITS)
@@ -286,7 +363,16 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  EOF
  		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
  		    test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -754,22 +736,22 @@
+@@ -656,7 +665,7 @@
+ 	    # => hppa64-hp-hpux11.23
+ 
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+-		grep __LP64__ >/dev/null
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -727,22 +736,22 @@
  	exit ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
@@ -314,7 +400,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      CRAY*Y-MP:*:*:*)
  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit ;;
-@@ -793,14 +775,14 @@
+@@ -766,14 +775,14 @@
  	exit ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -336,7 +422,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  	exit ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -812,30 +794,35 @@
+@@ -785,38 +794,51 @@
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit ;;
      *:FreeBSD:*:*)
@@ -345,8 +431,8 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 -		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/[-(].*//'` ;;
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
  	    *)
 -		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
@@ -355,10 +441,13 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
  	exit ;;
+-    i*:MINGW*:*)
+-	echo ${UNAME_MACHINE}-pc-mingw32
 +    *:MINGW64*:*)
 +	echo ${UNAME_MACHINE}-pc-mingw64
-+	exit ;;
-     *:MINGW*:*)
+ 	exit ;;
+-    i*:MSYS_NT-*:*:*)
++    *:MINGW*:*)
  	echo ${UNAME_MACHINE}-pc-mingw32
  	exit ;;
 +    i*:MSYS*:*)
@@ -373,24 +462,34 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit ;;
-     *:Interix*:*)
--    	case ${UNAME_MACHINE} in
+-    x86:Interix*:[345]*)
+-	echo i586-pc-interix${UNAME_RELEASE}
+-	exit ;;
+-    EM64T:Interix*:[345]*)
+-	echo x86_64-unknown-interix${UNAME_RELEASE}
+-	exit ;;
++    *:Interix*:*)
 +	case ${UNAME_MACHINE} in
- 	    x86)
- 		echo i586-pc-interix${UNAME_RELEASE}
- 		exit ;;
-@@ -872,15 +859,22 @@
- 	exit ;;
-     *:GNU:*:*)
- 	# 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 ;;
-     *:GNU/*:*:*)
- 	# other systems with GNU libc and userland
--	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``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 ;;
++	    x86)
++		echo i586-pc-interix${UNAME_RELEASE}
++		exit ;;
++	    authenticamd | genuineintel | EM64T)
++		echo x86_64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	    IA64)
++		echo ia64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -846,190 +868,144 @@
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
@@ -401,30 +500,28 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 +	UNAME_MACHINE=aarch64_be
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -890,44 +884,61 @@
- 	  EV6)   UNAME_MACHINE=alphaev6 ;;
- 	  EV67)  UNAME_MACHINE=alphaev67 ;;
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
 +	esac
- 	objdump --private-headers /bin/sh | grep -q ld.so.1
--	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	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}
- 	exit ;;
++	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-${LIBC}
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
 +	    echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	else
--	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++	else
 +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 +		| grep -q __ARM_PCS_VFP
 +	    then
@@ -432,10 +529,9 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 +	    else
 +		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
 +	    fi
- 	fi
- 	exit ;;
-     avr32*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	fi
++	exit ;;
++    avr32*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
      cris:Linux:*:*)
@@ -452,9 +548,8 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 +	exit ;;
 +    hexagon:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     i*86:Linux:*:*)
--	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++	exit ;;
++    i*86:Linux:*:*)
 +	LIBC=gnu
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
@@ -477,25 +572,85 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
-     mips:Linux:*:* | mips64:Linux:*:*)
+-    mips:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips
+-	#undef mipsel
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+-	;;
+-    mips64:Linux:*:*)
++    mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -946,51 +957,54 @@
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips64
+-	#undef mips64el
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
  	#endif
  EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
      or32:Linux:*:*)
 -	echo or32-unknown-linux-${LIBC}
+-	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-${LIBC}
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
-     padre:Linux:*:*)
--	echo sparc-unknown-linux-${LIBC}
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-${LIBC}
++    padre:Linux:*:*)
 +	echo sparc-unknown-linux-gnu
  	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-${LIBC}
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
 +	echo hppa64-unknown-linux-gnu
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
@@ -509,19 +664,19 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 +	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
  	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-${LIBC}
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-${LIBC}
++    ppc64:Linux:*:*)
 +	echo powerpc64-unknown-linux-gnu
- 	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-${LIBC}
++	exit ;;
++    ppc:Linux:*:*)
 +	echo powerpc-unknown-linux-gnu
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
  	exit ;;
      sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
      sh*:Linux:*:*)
@@ -542,14 +697,79 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      x86_64:Linux:*:*)
 -	echo x86_64-unknown-linux-${LIBC}
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     xtensa*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    xtensa*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
+-		exit ;;
+-	  coff-i386)
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
+-		exit ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
+-		exit ;;
+-	esac
+-	# This should get integrated into the C code below, but now we hack
+-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^LIBC/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -999,11 +1013,11 @@
+ 	# earlier versions are messed up and put the nodename in both
+@@ -1037,11 +1013,11 @@
  	echo i386-sequent-sysv4
  	exit ;;
      i*86:UNIX_SV:4.2MP:2.*)
@@ -565,7 +785,16 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  	exit ;;
      i*86:OS/2:*:*)
-@@ -1035,7 +1049,7 @@
+@@ -1058,7 +1034,7 @@
+     i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     i*86:*DOS:*:*)
+@@ -1073,7 +1049,7 @@
  	fi
  	exit ;;
      i*86:*:5:[678]*)
@@ -574,24 +803,25 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  	case `/bin/uname -X | grep "^Machine"` in
  	    *486*)	     UNAME_MACHINE=i486 ;;
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
-@@ -1063,13 +1077,13 @@
+@@ -1101,10 +1077,13 @@
  	exit ;;
      pc:*:*:*)
  	# Left here for compatibility:
 -        # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i586.
+-        # the processor, so we play safe by assuming i386.
+-	echo i386-pc-msdosdjgpp
+-        exit ;;
 +	# 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
- 	# this is a cross-build.
- 	echo i586-pc-msdosdjgpp
--        exit ;;
++	# 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
++	# this is a cross-build.
++	echo i586-pc-msdosdjgpp
 +	exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
  	exit ;;
-@@ -1104,8 +1118,8 @@
+@@ -1139,8 +1118,18 @@
  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
  	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
@@ -599,10 +829,29 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
 -          && { 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 \
-@@ -1148,10 +1162,10 @@
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+@@ -1153,7 +1142,7 @@
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+@@ -1173,10 +1162,10 @@
  		echo ns32k-sni-sysv
  	fi
  	exit ;;
@@ -617,7 +866,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      *:UNIX_System_V:4*:FTX*)
  	# From Gerald Hewes <hewes at openmarket.com>.
  	# How about differentiating between stratus architectures? -djm
-@@ -1177,11 +1191,11 @@
+@@ -1202,11 +1191,11 @@
  	exit ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  	if [ -d /usr/nec ]; then
@@ -632,17 +881,53 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  	echo powerpc-be-beos
  	exit ;;
-@@ -1194,6 +1208,9 @@
-     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
- 	echo i586-pc-haiku
+@@ -1216,6 +1205,12 @@
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
  	exit ;;
++    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
++	echo i586-pc-haiku
++	exit ;;
 +    x86_64:Haiku:*:*)
 +	echo x86_64-unknown-haiku
 +	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
-@@ -1246,7 +1263,10 @@
+@@ -1225,6 +1220,15 @@
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit ;;
++    SX-7:SUPER-UX:*:*)
++	echo sx7-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8:SUPER-UX:*:*)
++	echo sx8-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8R:SUPER-UX:*:*)
++	echo sx8r-nec-superux${UNAME_RELEASE}
++	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+@@ -1234,6 +1238,16 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	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}
+@@ -1249,7 +1263,10 @@
      *:QNX:*:4*)
  	echo i386-pc-qnx
  	exit ;;
@@ -654,7 +939,7 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  	echo nse-tandem-nsk${UNAME_RELEASE}
  	exit ;;
      NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1291,13 +1311,13 @@
+@@ -1294,13 +1311,13 @@
  	echo pdp10-unknown-its
  	exit ;;
      SEI:*:*:SEIUX)
@@ -670,10 +955,13 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  	case "${UNAME_MACHINE}" in
  	    A*) echo alpha-dec-vms ; exit ;;
  	    I*) echo ia64-dec-vms ; exit ;;
-@@ -1315,11 +1335,11 @@
-     i*86:AROS:*:*)
- 	echo ${UNAME_MACHINE}-pc-aros
+@@ -1315,11 +1332,14 @@
+     i*86:rdos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
++    i*86:AROS:*:*)
++	echo ${UNAME_MACHINE}-pc-aros
++	exit ;;
 +    x86_64:VMkernel:*:*)
 +	echo ${UNAME_MACHINE}-unknown-esx
 +	exit ;;
@@ -700,19 +988,31 @@ diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
  #endif
  #endif
  
-diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
---- gdesklets-0.36.3/config.sub	2011-01-23 13:56:08.000000000 -0600
-+++ gdesklets-0.36.3-aarch64/config.sub	2013-03-03 04:57:13.812894887 -0600
+@@ -1475,9 +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
+ 
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/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
+diff -urN thewidgetfactory-0.2.1/config.sub thewidgetfactory-0.2.1-aarch64/config.sub
+--- thewidgetfactory-0.2.1/config.sub	2006-03-25 15:22:37.000000000 -0600
++++ thewidgetfactory-0.2.1-aarch64/config.sub	2013-03-08 08:41:03.237034649 -0600
 @@ -1,10 +1,10 @@
  #! /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
--#   Free Software Foundation, Inc.
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 +#   2011, 2012 Free Software Foundation, Inc.
  
--timestamp='2010-01-22'
+-timestamp='2006-02-27'
 +timestamp='2012-10-10'
  
  # This file is (in principle) common to ALL GNU software.
@@ -728,18 +1028,35 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -76,8 +74,8 @@
+@@ -32,13 +30,16 @@
+ 
+ 
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# 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.
+@@ -72,7 +73,8 @@
+ version="\
  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 Free
--Software Foundation, Inc.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++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.
+ 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."
-@@ -124,13 +122,18 @@
+@@ -120,12 +122,18 @@
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
@@ -748,7 +1065,7 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
 +  knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
++  kopensolaris*-gnu* | \
    storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -760,23 +1077,22 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
    *)
      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
      if [ $basic_machine != $1 ]
-@@ -153,12 +156,12 @@
+@@ -148,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 | \
--	-apple | -axis | -knuth | -cray | -microblaze)
+-	-apple | -axis | -knuth | -cray)
 +	-apple | -axis | -knuth | -cray | -microblaze*)
  		os=
  		basic_machine=$1
  		;;
--        -bluegene*)
--	        os=-cnk
 +	-bluegene*)
 +		os=-cnk
- 		;;
++		;;
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
-@@ -174,10 +177,10 @@
+ 		basic_machine=$1
+@@ -166,10 +177,10 @@
  		os=-chorusos
  		basic_machine=$1
  		;;
@@ -790,7 +1106,7 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	-hiux*)
  		os=-hiuxwe2
  		;;
-@@ -222,6 +225,12 @@
+@@ -214,6 +225,12 @@
  	-isc*)
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
@@ -803,7 +1119,7 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	-lynx*)
  		os=-lynxos
  		;;
-@@ -246,20 +255,25 @@
+@@ -238,23 +255,32 @@
  	# Some are omitted here because they have special meanings below.
  	1750a | 580 \
  	| a29k \
@@ -811,28 +1127,41 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| 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 \
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 +        | be32 | be64 \
  	| bfin \
  	| c4x | clipper \
 -	| d10v | d30v | dlx | dsp16xx | dvp \
+-	| fr30 | frv \
 +	| d10v | d30v | dlx | dsp16xx \
 +	| epiphany \
- 	| fido | fr30 | frv \
++	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| hexagon \
  	| i370 | i860 | i960 | ia64 \
  	| ip2k | iq2000 \
+-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 +	| le32 | le64 \
- 	| lm32 \
- 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
--	| maxq | mb | microblaze | mcore | mep | metag \
++	| lm32 \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 +	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
  	| mips64 | mips64el \
-@@ -282,29 +296,39 @@
- 	| moxie \
+-	| mips64vr | mips64vrel \
++	| mips64octeon | mips64octeonel \
+ 	| mips64orion | mips64orionel \
++	| mips64r5900 | mips64r5900el \
++	| mips64vr | mips64vrel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
+@@ -267,31 +293,42 @@
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
++	| moxie \
  	| mt \
  	| msp430 \
 +	| nds32 | nds32le | nds32be \
@@ -844,28 +1173,29 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
 -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle \
  	| pyramid \
--	| rx \
+-	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | sheb | shle | sh[1234]le | sh3ele \
 +	| 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 \
++	| score \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
  	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
  	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
--	| spu | strongarm \
+-	| strongarm \
 -	| tahoe | thumb | tic4x | tic80 | tron \
+-	| v850 | v850e \
 +	| spu \
 +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- 	| ubicom32 \
--	| v850 | v850e \
++	| ubicom32 \
 +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
  	| we32k \
--	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+-	| z8k)
 +	| x86 | xc16x | xstormy16 | xtensa \
- 	| z8k | z80)
++	| z8k | z80)
  		basic_machine=$basic_machine-unknown
  		;;
--	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
--		# Motorola 68HC11/12.
+-	m32c)
+-		basic_machine=$basic_machine-unknown
 +	c54x)
 +		basic_machine=tic54x-unknown
 +		;;
@@ -874,12 +1204,14 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
 +		;;
 +	c6x)
 +		basic_machine=tic6x-unknown
-+		;;
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
+-		# Motorola 68HC11/12.
 +	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
  		basic_machine=$basic_machine-unknown
  		os=-none
  		;;
-@@ -314,6 +338,21 @@
+@@ -301,6 +338,21 @@
  		basic_machine=mt-unknown
  		;;
  
@@ -901,7 +1233,7 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
-@@ -328,25 +367,30 @@
+@@ -315,29 +367,37 @@
  	# Recognize the basic CPU types with company name.
  	580-* \
  	| a29k-* \
@@ -910,7 +1242,8 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
- 	| avr-* | avr32-* \
+-	| avr-* \
++	| avr-* | avr32-* \
 +	| be32-* | be64-* \
  	| bfin-* | bs2000-* \
 -	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
@@ -918,23 +1251,33 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	| clipper-* | craynv-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
  	| elxsi-* \
- 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 +	| hexagon-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| ip2k-* | iq2000-* \
+-	| m32r-* | m32rle-* \
 +	| le32-* | le64-* \
- 	| lm32-* \
- 	| m32c-* | m32r-* | m32rle-* \
++	| lm32-* \
++	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
--	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+-	| m88110-* | m88k-* | maxq-* | mcore-* \
 +	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 +	| microblaze-* | microblazeel-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
  	| mips64-* | mips64el-* \
-@@ -368,26 +412,29 @@
+-	| mips64vr-* | mips64vrel-* \
++	| mips64octeon-* | mips64octeonel-* \
+ 	| mips64orion-* | mips64orionel-* \
++	| mips64r5900-* | mips64r5900el-* \
++	| mips64vr-* | mips64vrel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
+@@ -352,29 +412,36 @@
  	| mmix-* \
  	| mt-* \
  	| msp430-* \
@@ -947,9 +1290,10 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
 -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
  	| pyramid-* \
--	| romp-* | rs6000-* | rx-* \
+-	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | shbe-* | sheb-* \
 +	| rl78-* | romp-* | rs6000-* | rx-* \
- 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| 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-* \
@@ -958,20 +1302,29 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
 +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 +	| tahoe-* \
  	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
--	| tile-* | tilegx-* \
 +	| tile*-* \
  	| tron-* \
- 	| ubicom32-* \
 -	| v850-* | v850e-* | vax-* \
++	| ubicom32-* \
 +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 +	| vax-* \
  	| we32k-* \
--	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| xstormy16-* | xtensa-* \
 +	| x86-* | x86_64-* | xc16x-* | xps100-* \
- 	| xstormy16-* | xtensa*-* \
++	| xstormy16-* | xtensa*-* \
  	| ymp-* \
- 	| z8k-* | z80-*)
-@@ -412,7 +459,7 @@
+-	| z8k-*)
++	| z8k-* | z80-*)
+ 		;;
+-	m32c-*)
++	# Recognize the basic CPU types without company name, with glob match.
++	xtensa*)
++		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -392,7 +459,7 @@
  		basic_machine=a29k-amd
  		os=-udi
  		;;
@@ -980,10 +1333,33 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  		basic_machine=abacus-unknown
  		;;
  	adobe68k)
-@@ -482,11 +529,20 @@
- 		basic_machine=powerpc-ibm
- 		os=-cnk
+@@ -438,6 +505,10 @@
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
++	aros)
++		basic_machine=i386-pc
++		os=-aros
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -446,10 +517,35 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
  		;;
++	blackfin)
++		basic_machine=bfin-unknown
++		os=-linux
++		;;
++	blackfin-*)
++		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
 +	c54x-*)
 +		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
@@ -997,21 +1373,36 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  		basic_machine=c90-cray
  		os=-unicos
  		;;
--        cegcc)
 +	cegcc)
- 		basic_machine=arm-unknown
- 		os=-cegcc
- 		;;
-@@ -518,7 +574,7 @@
++		basic_machine=arm-unknown
++		os=-cegcc
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+@@ -478,8 +574,8 @@
  		basic_machine=craynv-cray
  		os=-unicosmp
  		;;
--	cr16)
+-	cr16c)
+-		basic_machine=cr16c-unknown
 +	cr16 | cr16-*)
- 		basic_machine=cr16-unknown
++		basic_machine=cr16-unknown
  		os=-elf
  		;;
-@@ -676,7 +732,6 @@
+ 	crds | unos)
+@@ -517,6 +613,10 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	dicos)
++		basic_machine=i686-pc
++		os=-dicos
++		;;
+ 	djgpp)
+ 		basic_machine=i586-pc
+ 		os=-msdosdjgpp
+@@ -632,7 +732,6 @@
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		;;
@@ -1019,14 +1410,28 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
-@@ -734,9 +789,13 @@
+@@ -671,6 +770,14 @@
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	m68knommu)
++		basic_machine=m68k-unknown
++		os=-linux
++		;;
++	m68knommu-*)
++		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -682,10 +789,21 @@
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
--        microblaze)
 +	microblaze*)
- 		basic_machine=microblaze-xilinx
- 		;;
++		basic_machine=microblaze-xilinx
++		;;
 +	mingw64)
 +		basic_machine=x86_64-pc
 +		os=-mingw64
@@ -1034,7 +1439,15 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	mingw32)
  		basic_machine=i386-pc
  		os=-mingw32
-@@ -752,24 +811,6 @@
+ 		;;
++	mingw32ce)
++		basic_machine=arm-unknown
++		os=-mingw32ce
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -693,24 +811,6 @@
  		basic_machine=m68k-atari
  		os=-mint
  		;;
@@ -1059,7 +1472,7 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
-@@ -791,10 +832,18 @@
+@@ -732,10 +832,18 @@
  	ms1-*)
  		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
  		;;
@@ -1078,7 +1491,7 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	ncr3000)
  		basic_machine=i486-ncr
  		os=-sysv4
-@@ -859,6 +908,12 @@
+@@ -800,6 +908,12 @@
  	np1)
  		basic_machine=np1-gould
  		;;
@@ -1091,7 +1504,22 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	nsr-tandem)
  		basic_machine=nsr-tandem
  		;;
-@@ -941,9 +996,10 @@
+@@ -830,6 +944,14 @@
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
++	parisc)
++		basic_machine=hppa-unknown
++		os=-linux
++		;;
++	parisc-*)
++		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -874,9 +996,10 @@
  		;;
  	power)	basic_machine=power-ibm
  		;;
@@ -1104,7 +1532,28 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
-@@ -1037,6 +1093,9 @@
+@@ -931,6 +1054,10 @@
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+@@ -942,6 +1069,9 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sh5el)
++		basic_machine=sh5le-unknown
++		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -963,6 +1093,9 @@
  		basic_machine=i860-stratus
  		os=-sysv4
  		;;
@@ -1114,7 +1563,7 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	sun2)
  		basic_machine=m68000-sun
  		;;
-@@ -1093,25 +1152,8 @@
+@@ -1019,17 +1152,9 @@
  		basic_machine=t90-cray
  		os=-unicos
  		;;
@@ -1129,19 +1578,13 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
 -	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
++	tile*)
 +		basic_machine=$basic_machine-unknown
- 		os=-linux-gnu
++		os=-linux-gnu
  		;;
  	tx39)
-@@ -1181,6 +1223,9 @@
+ 		basic_machine=mipstx39-unknown
+@@ -1098,6 +1223,9 @@
  	xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
@@ -1151,7 +1594,27 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	ymp)
  		basic_machine=ymp-cray
  		os=-unicos
-@@ -1278,11 +1323,11 @@
+@@ -1106,6 +1234,10 @@
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1144,7 +1276,7 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+ 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+@@ -1191,9 +1323,12 @@
  if [ x"$os" != x"" ]
  then
  case $os in
@@ -1160,14 +1623,24 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
 +	# 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
 +	-auroraux)
 +		os=-auroraux
- 		;;
++		;;
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-@@ -1312,18 +1357,19 @@
+ 		;;
+@@ -1214,21 +1349,23 @@
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+-	      | -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* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* \
++	      | -aos* | -aros* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1177,21 +1650,26 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
+-	      | -chorusos* | -chorusrdb* \
 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -chorusos* | -chorusrdb* | -cegcc* \
 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 +	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+@@ -1236,7 +1373,7 @@
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-@@ -1366,7 +1412,7 @@
+-	      | -skyos* | -haiku* | -rdos* | -irx*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1275,7 +1412,7 @@
  	-opened*)
  		os=-openedition
  		;;
@@ -1200,7 +1678,7 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  		os=-os400
  		;;
  	-wince*)
-@@ -1415,7 +1461,7 @@
+@@ -1324,7 +1461,7 @@
  	-sinix*)
  		os=-sysv4
  		;;
@@ -1209,36 +1687,38 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  		os=-tpf
  		;;
  	-triton*)
-@@ -1460,8 +1506,8 @@
- 	-dicos*)
- 		os=-dicos
+@@ -1366,6 +1503,11 @@
+ 	-zvmoe)
+ 		os=-zvmoe
  		;;
--        -nacl*)
--	        ;;
++	-dicos*)
++		os=-dicos
++		;;
 +	-nacl*)
 +		;;
  	-none)
  		;;
  	*)
-@@ -1484,10 +1530,10 @@
+@@ -1388,6 +1530,12 @@
  # system, and we'll never get to this point.
  
  case $basic_machine in
--        score-*)
 +	score-*)
- 		os=-elf
- 		;;
--        spu-*)
++		os=-elf
++		;;
 +	spu-*)
- 		os=-elf
- 		;;
++		os=-elf
++		;;
  	*-acorn)
-@@ -1499,8 +1545,20 @@
+ 		os=-riscix1.2
+ 		;;
+@@ -1397,9 +1545,21 @@
  	arm*-semi)
  		os=-aout
  		;;
--        c4x-* | tic4x-*)
--        	os=-coff
+-    c4x-* | tic4x-*)
+-        os=-coff
+-        ;;
 +	c4x-* | tic4x-*)
 +		os=-coff
 +		;;
@@ -1253,10 +1733,11 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
 +		;;
 +	tic6x-*)
 +		os=-coff
- 		;;
++		;;
  	# This must come before the *-dec entry.
  	pdp10-*)
-@@ -1520,14 +1578,11 @@
+ 		os=-tops20
+@@ -1418,13 +1578,13 @@
  		;;
  	m68000-sun)
  		os=-sunos3
@@ -1267,12 +1748,13 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  	m68*-cisco)
  		os=-aout
  		;;
--        mep-*)
 +	mep-*)
++		os=-elf
++		;;
+ 	mips*-cisco)
  		os=-elf
  		;;
- 	mips*-cisco)
-@@ -1554,7 +1609,7 @@
+@@ -1449,7 +1609,7 @@
  	*-ibm)
  		os=-aix
  		;;
@@ -1281,3 +1763,12 @@ diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
  		os=-mmixware
  		;;
  	*-wec)
+@@ -1554,7 +1714,7 @@
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)


More information about the scm-commits mailing list