diff -up a2ps-4.14/auxdir/config.guess.aarch64 a2ps-4.14/auxdir/config.guess

--- a2ps-4.14/auxdir/config.guess.aarch64	2007-12-29 03:28:06.000000000 +0000

+++ a2ps-4.14/auxdir/config.guess	2013-04-29 13:13:51.035686658 +0100

@@ -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 Free Software Foundation,

-#   Inc.

+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

+#   2011, 2012 Free Software Foundation, Inc.

-timestamp='2007-07-22'

+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

@@ -17,9 +17,7 @@ timestamp='2007-07-22'

 # 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

-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA

-# 02110-1301, USA.

+# along with this program; if not, see <http://www.gnu.org/licenses/>.

 #

 # As a special exception to the GNU General Public License, if you

 # distribute this file as part of a program that contains a

@@ -27,16 +25,16 @@ timestamp='2007-07-22'

 # the same distribution terms that you use for the rest of that program.

-# Originally written by Per Bothner <per@bothner.com>.

-# Please send patches to <config-patches@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@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 @@ version="\

 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

+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

@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` |

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

     *:NetBSD:*:*)

 	# NetBSD (nbsd) targets should (where applicable) match one or

-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,

+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,

 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently

 	# switched to ELF, *-*-netbsd* would select the old

 	# object file format.  This provides both forward

@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

 	    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?

@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

 		fi

 		;;

 	    *)

-	        os=netbsd

+		os=netbsd

 		;;

 	esac

 	# The OS release

@@ -201,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.

 	echo "${machine}-${os}${release}"

 	exit ;;

+    *:Bitrig:*:*)

+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`

+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}

+	exit ;;

     *:OpenBSD:*:*)

 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`

 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}

@@ -223,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`

 		;;

 	*5.*)

-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

 		;;

 	esac

 	# According to Compaq, /usr/sbin/psrinfo has been available on

@@ -269,7 +272,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

 	# 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'`

-	exit ;;

+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.

+	exitcode=$?

+	trap '' 0

+	exit $exitcode ;;

     Alpha\ *:Windows_NT*:*)

 	# How do we know it's Interix rather than the generic POSIX subsystem?

 	# Should we change UNAME_MACHINE based on the output of uname instead

@@ -295,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

 	echo s390-ibm-zvmoe

 	exit ;;

     *:OS400:*:*)

-        echo powerpc-ibm-os400

+	echo powerpc-ibm-os400

 	exit ;;

     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

 	echo arm-acorn-riscix${UNAME_RELEASE}

 	exit ;;

-    arm:riscos:*:*|arm:RISCOS:*:*)

+    arm*:riscos:*:*|arm*:RISCOS:*:*)

 	echo arm-unknown-riscos

 	exit ;;

     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)

@@ -324,14 +330,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

 	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:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)

+	echo i386-pc-auroraux${UNAME_RELEASE}

+	exit ;;

     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

+	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

@@ -375,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

     # MiNT.  But MiNT is downward compatible to TOS, so this should

     # be no problem.

     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)

-        echo m68k-atari-mint${UNAME_RELEASE}

+	echo m68k-atari-mint${UNAME_RELEASE}

 	exit ;;

     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)

 	echo m68k-atari-mint${UNAME_RELEASE}

-        exit ;;

+	exit ;;

     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)

-        echo m68k-atari-mint${UNAME_RELEASE}

+	echo m68k-atari-mint${UNAME_RELEASE}

 	exit ;;

     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)

-        echo m68k-milan-mint${UNAME_RELEASE}

-        exit ;;

+	echo m68k-milan-mint${UNAME_RELEASE}

+	exit ;;

     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)

-        echo m68k-hades-mint${UNAME_RELEASE}

-        exit ;;

+	echo m68k-hades-mint${UNAME_RELEASE}

+	exit ;;

     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

-        echo m68k-unknown-mint${UNAME_RELEASE}

-        exit ;;

+	echo m68k-unknown-mint${UNAME_RELEASE}

+	exit ;;

     m68k:machten:*:*)

 	echo m68k-apple-machten${UNAME_RELEASE}

 	exit ;;

@@ -461,8 +486,8 @@ EOF

 	echo m88k-motorola-sysv3

 	exit ;;

     AViiON:dgux:*:*)

-        # DG/UX returns AViiON for all architectures

-        UNAME_PROCESSOR=`/usr/bin/uname -p`

+	# DG/UX returns AViiON for all architectures

+	UNAME_PROCESSOR=`/usr/bin/uname -p`

 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]

 	then

 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \

@@ -475,7 +500,7 @@ EOF

 	else

 	    echo i586-dg-dgux${UNAME_RELEASE}

 	fi

- 	exit ;;

+	exit ;;

     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)

 	echo m88k-dolphin-sysv3

 	exit ;;

@@ -532,7 +557,7 @@ EOF

 		echo rs6000-ibm-aix3.2

 	fi

 	exit ;;

-    *: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

@@ -575,52 +600,52 @@ EOF

 	    9000/[678][0-9][0-9])

 		if [ -x /usr/bin/getconf ]; then

 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`

-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

-                    case "${sc_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" ;;

+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

+		    case "${sc_cpu_version}" in

+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

+		      532)                      # CPU_PA_RISC2_0

+			case "${sc_kernel_bits}" in

+			  32) HP_ARCH="hppa2.0n" ;;

+			  64) HP_ARCH="hppa2.0w" ;;

 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20

-                        esac ;;

-                    esac

+			esac ;;

+		    esac

 		fi

 		if [ "${HP_ARCH}" = "" ]; then

 		    eval $set_cc_for_build

-		    sed 's/^              //' << EOF >$dummy.c

+		    sed 's/^		//' << EOF >$dummy.c

-              #define _HPUX_SOURCE

-              #include <stdlib.h>

-              #include <unistd.h>

-

-              int main ()

-              {

-              #if defined(_SC_KERNEL_BITS)

-                  long bits = sysconf(_SC_KERNEL_BITS);

-              #endif

-                  long cpu  = sysconf (_SC_CPU_VERSION);

-

-                  switch (cpu)

-              	{

-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

-              	case CPU_PA_RISC2_0:

-              #if defined(_SC_KERNEL_BITS)

-              	    switch (bits)

-              		{

-              		case 64: puts ("hppa2.0w"); break;

-              		case 32: puts ("hppa2.0n"); break;

-              		default: puts ("hppa2.0"); break;

-              		} break;

-              #else  /* !defined(_SC_KERNEL_BITS) */

-              	    puts ("hppa2.0"); break;

-              #endif

-              	default: puts ("hppa1.0"); break;

-              	}

-                  exit (0);

-              }

+		#define _HPUX_SOURCE

+		#include <stdlib.h>

+		#include <unistd.h>

+

+		int main ()

+		{

+		#if defined(_SC_KERNEL_BITS)

+		    long bits = sysconf(_SC_KERNEL_BITS);

+		#endif

+		    long cpu  = sysconf (_SC_CPU_VERSION);

+

+		    switch (cpu)

+			{

+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

+			case CPU_PA_RISC2_0:

+		#if defined(_SC_KERNEL_BITS)

+			    switch (bits)

+				{

+				case 64: puts ("hppa2.0w"); break;

+				case 32: puts ("hppa2.0n"); break;

+				default: puts ("hppa2.0"); break;

+				} break;

+		#else  /* !defined(_SC_KERNEL_BITS) */

+			    puts ("hppa2.0"); break;

+		#endif

+			default: puts ("hppa1.0"); break;

+			}

+		    exit (0);

+		}

 EOF

 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`

 		    test -z "$HP_ARCH" && HP_ARCH=hppa

@@ -640,7 +665,7 @@ EOF

 	    # => 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

@@ -711,22 +736,22 @@ EOF

 	exit ;;

     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)

 	echo c1-convex-bsd

-        exit ;;

+	exit ;;

     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)

 	if getsysinfo -f scalar_acc

 	then echo c32-convex-bsd

 	else echo c2-convex-bsd

 	fi

-        exit ;;

+	exit ;;

     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)

 	echo c34-convex-bsd

-        exit ;;

+	exit ;;

     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)

 	echo c38-convex-bsd

-        exit ;;

+	exit ;;

     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)

 	echo c4-convex-bsd

-        exit ;;

+	exit ;;

     CRAY*Y-MP:*:*:*)

 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

 	exit ;;

@@ -750,14 +775,14 @@ EOF

 	exit ;;

     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)

 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

-        exit ;;

+	FUJITSU_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/ /_/'`

-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

 	exit ;;

     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)

 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}

@@ -769,40 +794,51 @@ EOF

 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}

 	exit ;;

     *:FreeBSD:*:*)

-	case ${UNAME_MACHINE} in

-	    pc98)

-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

+	UNAME_PROCESSOR=`/usr/bin/uname -p`

+	case ${UNAME_PROCESSOR} in

 	    amd64)

 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

 	    *)

-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

 	esac

 	exit ;;

     i*:CYGWIN*:*)

 	echo ${UNAME_MACHINE}-pc-cygwin

 	exit ;;

+    *:MINGW64*:*)

+	echo ${UNAME_MACHINE}-pc-mingw64

+	exit ;;

     *:MINGW*:*)

 	echo ${UNAME_MACHINE}-pc-mingw32

 	exit ;;

+    i*:MSYS*:*)

+	echo ${UNAME_MACHINE}-pc-msys

+	exit ;;

     i*:windows32*:*)

-    	# uname -m includes "-pc" on this system.

-    	echo ${UNAME_MACHINE}-mingw32

+	# uname -m includes "-pc" on this system.

+	echo ${UNAME_MACHINE}-mingw32

 	exit ;;

     i*:PW*:*)

 	echo ${UNAME_MACHINE}-pc-pw32

 	exit ;;

-    *:Interix*:[3456]*)

-    	case ${UNAME_MACHINE} in

+    *:Interix*:*)

+	case ${UNAME_MACHINE} in

 	    x86)

 		echo i586-pc-interix${UNAME_RELEASE}

 		exit ;;

-	    EM64T | authenticamd)

+	    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

@@ -832,20 +868,68 @@ EOF

     i*86:Minix:*:*)

 	echo ${UNAME_MACHINE}-pc-minix

 	exit ;;

-    arm*:Linux:*:*)

+    aarch64:Linux:*:*)

 	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

+    aarch64_be:Linux:*:*)

+	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 ;;

+	  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="libc1" ; else LIBC="" ; fi

+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

+	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-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-gnueabi

+	    else

+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf

+	    fi

+	fi

+	exit ;;

     avr32*:Linux:*:*)

 	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     cris:Linux:*:*)

-	echo cris-axis-linux-gnu

+	echo ${UNAME_MACHINE}-axis-linux-gnu

 	exit ;;

     crisv32:Linux:*:*)

-	echo crisv32-axis-linux-gnu

+	echo ${UNAME_MACHINE}-axis-linux-gnu

 	exit ;;

     frv:Linux:*:*)

-    	echo frv-unknown-linux-gnu

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

+	exit ;;

+    hexagon:Linux:*:*)

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

+	exit ;;

+    i*86:Linux:*:*)

+	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-gnu

@@ -856,74 +940,33 @@ EOF

     m68*:Linux:*:*)

 	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

-    mips:Linux:*:*)

+    mips:Linux:*:* | mips64:Linux:*:*)

 	eval $set_cc_for_build

 	sed 's/^	//' << EOF >$dummy.c

 	#undef CPU

-	#undef mips

-	#undef mipsel

+	#undef ${UNAME_MACHINE}

+	#undef ${UNAME_MACHINE}el

 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

-	CPU=mipsel

+	CPU=${UNAME_MACHINE}el

 	#else

 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

-	CPU=mips

+	CPU=${UNAME_MACHINE}

 	#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-gnu"; exit; }

-	;;

-    mips64:Linux:*:*)

-	eval $set_cc_for_build

-	sed 's/^	//' << EOF >$dummy.c

-	#undef CPU

-	#undef mips64

-	#undef mips64el

-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

-	CPU=mips64el

-	#else

-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

-	CPU=mips64

-	#else

-	CPU=

-	#endif

-	#endif

-EOF

-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

-	    /^CPU/{

-		s: ::g

-		p

-	    }'`"

+	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-gnu

-	exit ;;

-    ppc:Linux:*:*)

-	echo powerpc-unknown-linux-gnu

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

-    ppc64:Linux:*:*)

-	echo powerpc64-unknown-linux-gnu

+    padre:Linux:*:*)

+	echo sparc-unknown-linux-gnu

 	exit ;;

-    alpha:Linux:*:*)

-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in

-	  EV5)   UNAME_MACHINE=alphaev5 ;;

-	  EV56)  UNAME_MACHINE=alphaev56 ;;

-	  PCA56) UNAME_MACHINE=alphapca56 ;;

-	  PCA57) UNAME_MACHINE=alphapca56 ;;

-	  EV6)   UNAME_MACHINE=alphaev6 ;;

-	  EV67)  UNAME_MACHINE=alphaev67 ;;

-	  EV68*) UNAME_MACHINE=alphaev68 ;;

-        esac

-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null

-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

+    parisc64:Linux:*:* | hppa64:Linux:*:*)

+	echo hppa64-unknown-linux-gnu

 	exit ;;

     parisc:Linux:*:* | hppa:Linux:*:*)

 	# Look for CPU level

@@ -933,14 +976,17 @@ EOF

 	  *)    echo hppa-unknown-linux-gnu ;;

 	esac

 	exit ;;

-    parisc64:Linux:*:* | hppa64:Linux:*:*)

-	echo hppa64-unknown-linux-gnu

+    ppc64:Linux:*:*)

+	echo powerpc64-unknown-linux-gnu

+	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-gnu

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     sh*:Linux:*:*)

 	echo ${UNAME_MACHINE}-unknown-linux-gnu

@@ -948,78 +994,18 @@ EOF

     sparc:Linux:*:* | sparc64:Linux:*:*)

 	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

+    tile*:Linux:*:*)

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

+	exit ;;

     vax:Linux:*:*)

 	echo ${UNAME_MACHINE}-dec-linux-gnu

 	exit ;;

     x86_64:Linux:*:*)

-	echo x86_64-unknown-linux-gnu

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

-    xtensa:Linux:*:*)

-    	echo xtensa-unknown-linux-gnu

+    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-gnu"

-		;;

-	  a.out-i386-linux)

-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"

-		exit ;;

-	  coff-i386)

-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"

-		exit ;;

-	  "")

-		# Either a pre-BFD a.out linker (linux-gnuoldld) or

-		# one that does not give us useful --help.

-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"

-		exit ;;

-	esac

-	# 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(__SUNPRO_C) || defined(__SUNPRO_CC)

-	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.

 	# earlier versions are messed up and put the nodename in both

@@ -1027,11 +1013,11 @@ EOF

 	echo i386-sequent-sysv4

 	exit ;;

     i*86:UNIX_SV:4.2MP:2.*)

-        # Unixware is an offshoot of SVR4, but it has its own version

-        # number series starting with 2...

-        # I am not positive that other SVR4 systems won't match this,

+	# Unixware is an offshoot of SVR4, but it has its own version

+	# number series starting with 2...