update config.guess and config.sub to support aarch64

Petr Lautrbach plautrba at redhat.com
Wed Apr 17 22:16:45 EST 2013


On 04/17/2013 01:46 PM, Damien Miller wrote:
> On Tue, 16 Apr 2013, Petr Lautrbach wrote:
>
>> Hello,
>>
>> would it be possible to update config.sub and config.guess to the latest
>> versions (or at least version
>> from automake-1.13.1) in order to support new architectures based on the ARM
>> 64 bit CPU?
>
> I'm not going to import GPL3 code into the OpenSSH source distribution.

I missed that change, sorry.

> Fortunately it looks like the arm64 changes were added before the
> license got updated
>
> Does this have everything you need?

It looks ok since the original suggestion in bug proposed version with
timestamp='2012-09-25' [1] and your version is based on newer timestamp='2012-12-23'
and aarch64 changes are included.


[1] http://ausil.fedorapeople.org/aarch64/openssh/openssh-aarch64.patch

Thanks,

Petr

>
> Index: config.guess
> ===================================================================
> RCS file: /var/cvs/openssh/config.guess,v
> retrieving revision 1.15
> diff -u -p -r1.15 config.guess
> --- config.guess	26 Jan 2011 20:32:14 -0000	1.15
> +++ config.guess	17 Apr 2013 11:39:19 -0000
> @@ -2,9 +2,9 @@
>   # Attempt to guess a canonical system name.
>   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>   #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
> -#   2011 Free Software Foundation, Inc.
> +#   2011, 2012, 2013 Free Software Foundation, Inc.
>
> -timestamp='2011-01-23'
> +timestamp='2012-12-23'
>
>   # 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='2011-01-23'
>   # 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
> @@ -57,8 +55,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, 2011 Free
> -Software Foundation, Inc.
> +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
> +2012, 2013 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."
> @@ -145,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
> @@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>   		fi
>   		;;
>   	    *)
> -	        os=netbsd
> +		os=netbsd
>   		;;
>   	esac
>   	# The OS release
> @@ -202,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}
> @@ -224,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
> @@ -299,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:*:*)
> @@ -398,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 ;;
> @@ -484,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 ] || \
> @@ -498,7 +500,7 @@ EOF
>   	else
>   	    echo i586-dg-dgux${UNAME_RELEASE}
>   	fi
> - 	exit ;;
> +	exit ;;
>       M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
>   	echo m88k-dolphin-sysv3
>   	exit ;;
> @@ -598,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>
>
> -              #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);
> -              }
> +		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
> @@ -734,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 ;;
> @@ -773,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}
> @@ -792,30 +794,35 @@ 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*:*)
> -    	case ${UNAME_MACHINE} in
> +	case ${UNAME_MACHINE} in
>   	    x86)
>   		echo i586-pc-interix${UNAME_RELEASE}
>   		exit ;;
> @@ -861,6 +868,13 @@ EOF
>       i*86:Minix:*:*)
>   	echo ${UNAME_MACHINE}-pc-minix
>   	exit ;;
> +    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 ;;
> @@ -870,7 +884,7 @@ EOF
>   	  EV6)   UNAME_MACHINE=alphaev6 ;;
>   	  EV67)  UNAME_MACHINE=alphaev67 ;;
>   	  EV68*) UNAME_MACHINE=alphaev68 ;;
> -        esac
> +	esac
>   	objdump --private-headers /bin/sh | grep -q ld.so.1
>   	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
>   	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> @@ -882,20 +896,29 @@ EOF
>   	then
>   	    echo ${UNAME_MACHINE}-unknown-linux-gnu
>   	else
> -	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
> +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
> +		| grep -q __ARM_PCS_VFP
> +	    then
> +		echo ${UNAME_MACHINE}-unknown-linux-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
> @@ -937,7 +960,7 @@ EOF
>   	test x"${CPU}" != x&&  { echo "${CPU}-unknown-linux-gnu"; exit; }
>   	;;
>       or32:Linux:*:*)
> -	echo or32-unknown-linux-gnu
> +	echo ${UNAME_MACHINE}-unknown-linux-gnu
>   	exit ;;
>       padre:Linux:*:*)
>   	echo sparc-unknown-linux-gnu
> @@ -963,7 +986,7 @@ EOF
>   	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
> @@ -972,16 +995,16 @@ EOF
>   	echo ${UNAME_MACHINE}-unknown-linux-gnu
>   	exit ;;
>       tile*:Linux:*:*)
> -	echo ${UNAME_MACHINE}-tilera-linux-gnu
> +	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 ${UNAME_MACHINE}-unknown-linux-gnu
> +	echo ${UNAME_MACHINE}-unknown-linux-gnu
>   	exit ;;
>       i*86:DYNIX/ptx:4*:*)
>   	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
> @@ -990,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...
> +	# I am not positive that other SVR4 systems won't match this,
>   	# I just have to hope.  -- rms.
> -        # Use sysv4.2uw... so that sysv4* matches it.
> +	# Use sysv4.2uw... so that sysv4* matches it.
>   	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
>   	exit ;;
>       i*86:OS/2:*:*)
> @@ -1026,7 +1049,7 @@ EOF
>   	fi
>   	exit ;;
>       i*86:*:5:[678]*)
> -    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
> +	# UnixWare 7.x, OpenUNIX and OpenServer 6.
>   	case `/bin/uname -X | grep "^Machine"` in
>   	    *486*)	     UNAME_MACHINE=i486 ;;
>   	    *Pentium)	     UNAME_MACHINE=i586 ;;
> @@ -1054,13 +1077,13 @@ EOF
>   	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.
> +	# 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 ;;
> +	exit ;;
>       Intel:Mach:3*:*)
>   	echo i386-pc-mach3
>   	exit ;;
> @@ -1095,8 +1118,8 @@ EOF
>   	/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:*)
> -        /bin/uname -p 2>/dev/null | grep 86>/dev/null \
> -&&  { echo i486-ncr-sysv4; exit; } ;;
> +	/bin/uname -p 2>/dev/null | grep 86>/dev/null \
> +	&&  { echo i486-ncr-sysv4; exit; } ;;
>       NCR*:*:4.2:* | MPRAS*:*:4.2:*)
>   	OS_REL='.3'
>   	test -r /etc/.relid \
> @@ -1139,10 +1162,10 @@ EOF
>   		echo ns32k-sni-sysv
>   	fi
>   	exit ;;
> -    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
> -                      # says<Richard.M.Bartel at ccMail.Census.GOV>
> -        echo i586-unisys-sysv4
> -        exit ;;
> +    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
> +			# says<Richard.M.Bartel at ccMail.Census.GOV>
> +	echo i586-unisys-sysv4
> +	exit ;;
>       *:UNIX_System_V:4*:FTX*)
>   	# From Gerald Hewes<hewes at openmarket.com>.
>   	# How about differentiating between stratus architectures? -djm
> @@ -1168,11 +1191,11 @@ EOF
>   	exit ;;
>       R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
>   	if [ -d /usr/nec ]; then
> -	        echo mips-nec-sysv${UNAME_RELEASE}
> +		echo mips-nec-sysv${UNAME_RELEASE}
>   	else
> -	        echo mips-unknown-sysv${UNAME_RELEASE}
> +		echo mips-unknown-sysv${UNAME_RELEASE}
>   	fi
> -        exit ;;
> +	exit ;;
>       BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
>   	echo powerpc-be-beos
>   	exit ;;
> @@ -1185,6 +1208,9 @@ EOF
>       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 ;;
> @@ -1240,7 +1266,7 @@ EOF
>       NEO-?:NONSTOP_KERNEL:*:*)
>   	echo neo-tandem-nsk${UNAME_RELEASE}
>   	exit ;;
> -    NSE-?:NONSTOP_KERNEL:*:*)
> +    NSE-*:NONSTOP_KERNEL:*:*)
>   	echo nse-tandem-nsk${UNAME_RELEASE}
>   	exit ;;
>       NSR-?:NONSTOP_KERNEL:*:*)
> @@ -1285,13 +1311,13 @@ EOF
>   	echo pdp10-unknown-its
>   	exit ;;
>       SEI:*:*:SEIUX)
> -        echo mips-sei-seiux${UNAME_RELEASE}
> +	echo mips-sei-seiux${UNAME_RELEASE}
>   	exit ;;
>       *:DragonFly:*:*)
>   	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>   	exit ;;
>       *:*VMS:*:*)
> -    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
> +	UNAME_MACHINE=`(uname -p) 2>/dev/null`
>   	case "${UNAME_MACHINE}" in
>   	    A*) echo alpha-dec-vms ; exit ;;
>   	    I*) echo ia64-dec-vms ; exit ;;
> @@ -1309,11 +1335,11 @@ EOF
>       i*86:AROS:*:*)
>   	echo ${UNAME_MACHINE}-pc-aros
>   	exit ;;
> +    x86_64:VMkernel:*:*)
> +	echo ${UNAME_MACHINE}-unknown-esx
> +	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_
> @@ -1331,11 +1357,11 @@ main ()
>   #include<sys/param.h>
>     printf ("m68k-sony-newsos%s\n",
>   #ifdef NEWSOS4
> -          "4"
> +	"4"
>   #else
> -	  ""
> +	""
>   #endif
> -         ); exit (0);
> +	); exit (0);
>   #endif
>   #endif
>
> Index: config.sub
> ===================================================================
> RCS file: /var/cvs/openssh/config.sub,v
> retrieving revision 1.14
> diff -u -p -r1.14 config.sub
> --- config.sub	26 Jan 2011 20:32:14 -0000	1.14
> +++ config.sub	17 Apr 2013 11:39:19 -0000
> @@ -2,9 +2,9 @@
>   # Configuration validation subroutine script.
>   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>   #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
> -#   2011 Free Software Foundation, Inc.
> +#   2011, 2012, 2013 Free Software Foundation, Inc.
>
> -timestamp='2011-01-01'
> +timestamp='2012-12-23'
>
>   # This file is (in principle) common to ALL GNU software.
>   # The presence of a machine in this file suggests that SOME GNU software
> @@ -21,9 +21,7 @@ timestamp='2011-01-01'
>   # 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
> -# 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
> @@ -76,8 +74,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.
> +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
> +2012, 2013 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."
> @@ -125,13 +123,17 @@ esac
>   maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
>   case $maybe_os in
>     nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
> -  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
> +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
>     knetbsd*-gnu* | netbsd*-gnu* | \
>     kopensolaris*-gnu* | \
>     storm-chaos* | os2-emx* | rtmk-nova*)
>       os=-$maybe_os
>       basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
>       ;;
> +  android-linux)
> +    os=-linux-android
> +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
> +    ;;
>     *)
>       basic_machine=`echo $1 | sed 's/-[^-]*$//'`
>       if [ $basic_machine != $1 ]
> @@ -154,12 +156,12 @@ case $os in
>   	-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 | -microblaze*)
>   		os=
>   		basic_machine=$1
>   		;;
> -        -bluegene*)
> -	        os=-cnk
> +	-bluegene*)
> +		os=-cnk
>   		;;
>   	-sim | -cisco | -oki | -wec | -winbond)
>   		os=
> @@ -175,10 +177,10 @@ case $os in
>   		os=-chorusos
>   		basic_machine=$1
>   		;;
> - 	-chorusrdb)
> - 		os=-chorusrdb
> +	-chorusrdb)
> +		os=-chorusrdb
>   		basic_machine=$1
> - 		;;
> +		;;
>   	-hiux*)
>   		os=-hiuxwe2
>   		;;
> @@ -223,6 +225,12 @@ case $os in
>   	-isc*)
>   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>   		;;
> +	-lynx*178)
> +		os=-lynxos178
> +		;;
> +	-lynx*5)
> +		os=-lynxos5
> +		;;
>   	-lynx*)
>   		os=-lynxos
>   		;;
> @@ -247,20 +255,27 @@ case $basic_machine in
>   	# Some are omitted here because they have special meanings below.
>   	1750a | 580 \
>   	| a29k \
> +	| aarch64 | aarch64_be \
>   	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
>   	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
>   	| am33_2.0 \
> -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
> +	| arc \
> +	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
> +	| avr | avr32 \
> +	| be32 | be64 \
>   	| bfin \
>   	| c4x | clipper \
>   	| d10v | d30v | dlx | dsp16xx \
> +	| epiphany \
>   	| fido | fr30 | frv \
>   	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> +	| hexagon \
>   	| i370 | i860 | i960 | ia64 \
>   	| ip2k | iq2000 \
> +	| le32 | le64 \
>   	| lm32 \
>   	| m32c | m32r | m32rle | m68000 | m68k | m88k \
> -	| maxq | mb | microblaze | mcore | mep | metag \
> +	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
>   	| mips | mipsbe | mipseb | mipsel | mipsle \
>   	| mips16 \
>   	| mips64 | mips64el \
> @@ -286,22 +301,23 @@ case $basic_machine in
>   	| nds32 | nds32le | nds32be \
>   	| nios | nios2 \
>   	| ns16k | ns32k \
> +	| open8 \
>   	| or32 \
>   	| pdp10 | pdp11 | pj | pjl \
> -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> +	| powerpc | powerpc64 | powerpc64le | powerpcle \
>   	| pyramid \
> -	| rx \
> +	| rl78 | rx \
>   	| score \
>   	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
>   	| sh64 | sh64le \
>   	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
>   	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
> -	| spu | strongarm \
> -	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
> +	| spu \
> +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
>   	| ubicom32 \
> -	| v850 | v850e \
> +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
>   	| we32k \
> -	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
> +	| x86 | xc16x | xstormy16 | xtensa \
>   	| z8k | z80)
>   		basic_machine=$basic_machine-unknown
>   		;;
> @@ -314,8 +330,7 @@ case $basic_machine in
>   	c6x)
>   		basic_machine=tic6x-unknown
>   		;;
> -	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
> -		# Motorola 68HC11/12.
> +	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
>   		basic_machine=$basic_machine-unknown
>   		os=-none
>   		;;
> @@ -325,6 +340,21 @@ case $basic_machine in
>   		basic_machine=mt-unknown
>   		;;
>
> +	strongarm | thumb | xscale)
> +		basic_machine=arm-unknown
> +		;;
> +	xgate)
> +		basic_machine=$basic_machine-unknown
> +		os=-none
> +		;;
> +	xscaleeb)
> +		basic_machine=armeb-unknown
> +		;;
> +
> +	xscaleel)
> +		basic_machine=armel-unknown
> +		;;
> +
>   	# We use `pc' rather than `unknown'
>   	# because (1) that's what they normally are, and
>   	# (2) the word "unknown" tends to confuse beginning users.
> @@ -339,11 +369,13 @@ case $basic_machine in
>   	# Recognize the basic CPU types with company name.
>   	580-* \
>   	| a29k-* \
> +	| aarch64-* | aarch64_be-* \
>   	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
>   	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
>   	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
>   	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>   	| avr-* | avr32-* \
> +	| be32-* | be64-* \
>   	| bfin-* | bs2000-* \
>   	| c[123]* | c30-* | [cjt]90-* | c4x-* \
>   	| clipper-* | craynv-* | cydra-* \
> @@ -352,12 +384,15 @@ case $basic_machine in
>   	| 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-* \
> +	| le32-* | le64-* \
>   	| lm32-* \
>   	| m32c-* | m32r-* | m32rle-* \
>   	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
> -	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
> +	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> +	| microblaze-* | microblazeel-* \
>   	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
>   	| mips16-* \
>   	| mips64-* | mips64el-* \
> @@ -382,24 +417,26 @@ case $basic_machine in
>   	| nds32-* | nds32le-* | nds32be-* \
>   	| nios-* | nios2-* \
>   	| none-* | np1-* | ns16k-* | ns32k-* \
> +	| open8-* \
>   	| orion-* \
>   	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
>   	| pyramid-* \
> -	| romp-* | rs6000-* | rx-* \
> +	| rl78-* | romp-* | rs6000-* | rx-* \
>   	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
>   	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>   	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
>   	| sparclite-* \
> -	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
> -	| tahoe-* | thumb-* \
> +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
> +	| tahoe-* \
>   	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
> -	| tile-* | tilegx-* \
> +	| tile*-* \
>   	| tron-* \
>   	| ubicom32-* \
> -	| v850-* | v850e-* | vax-* \
> +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
> +	| vax-* \
>   	| we32k-* \
> -	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
> +	| x86-* | x86_64-* | xc16x-* | xps100-* \
>   	| xstormy16-* | xtensa*-* \
>   	| ymp-* \
>   	| z8k-* | z80-*)
> @@ -424,7 +461,7 @@ case $basic_machine in
>   		basic_machine=a29k-amd
>   		os=-udi
>   		;;
> -    	abacus)
> +	abacus)
>   		basic_machine=abacus-unknown
>   		;;
>   	adobe68k)
> @@ -507,7 +544,7 @@ case $basic_machine in
>   		basic_machine=c90-cray
>   		os=-unicos
>   		;;
> -        cegcc)
> +	cegcc)
>   		basic_machine=arm-unknown
>   		os=-cegcc
>   		;;
> @@ -697,7 +734,6 @@ case $basic_machine in
>   	i370-ibm* | ibm*)
>   		basic_machine=i370-ibm
>   		;;
> -# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
>   	i*86v32)
>   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
>   		os=-sysv32
> @@ -755,9 +791,13 @@ case $basic_machine in
>   		basic_machine=ns32k-utek
>   		os=-sysv
>   		;;
> -        microblaze)
> +	microblaze*)
>   		basic_machine=microblaze-xilinx
>   		;;
> +	mingw64)
> +		basic_machine=x86_64-pc
> +		os=-mingw64
> +		;;
>   	mingw32)
>   		basic_machine=i386-pc
>   		os=-mingw32
> @@ -794,10 +834,18 @@ case $basic_machine in
>   	ms1-*)
>   		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
>   		;;
> +	msys)
> +		basic_machine=i386-pc
> +		os=-msys
> +		;;
>   	mvs)
>   		basic_machine=i370-ibm
>   		os=-mvs
>   		;;
> +	nacl)
> +		basic_machine=le32-unknown
> +		os=-nacl
> +		;;
>   	ncr3000)
>   		basic_machine=i486-ncr
>   		os=-sysv4
> @@ -862,10 +910,10 @@ case $basic_machine in
>   	np1)
>   		basic_machine=np1-gould
>   		;;
> -        neo-tandem)
> +	neo-tandem)
>   		basic_machine=neo-tandem
>   		;;
> -        nse-tandem)
> +	nse-tandem)
>   		basic_machine=nse-tandem
>   		;;
>   	nsr-tandem)
> @@ -950,9 +998,10 @@ case $basic_machine in
>   		;;
>   	power)	basic_machine=power-ibm
>   		;;
> -	ppc)	basic_machine=powerpc-unknown
> +	ppc | ppcbe)	basic_machine=powerpc-unknown
>   		;;
> -	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
> +	ppc-* | ppcbe-*)
> +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
>   		;;
>   	ppcle | powerpclittle | ppc-le | powerpc-little)
>   		basic_machine=powerpcle-unknown
> @@ -977,7 +1026,11 @@ case $basic_machine in
>   		basic_machine=i586-unknown
>   		os=-pw32
>   		;;
> -	rdos)
> +	rdos | rdos64)
> +		basic_machine=x86_64-pc
> +		os=-rdos
> +		;;
> +	rdos32)
>   		basic_machine=i386-pc
>   		os=-rdos
>   		;;
> @@ -1046,6 +1099,9 @@ case $basic_machine in
>   		basic_machine=i860-stratus
>   		os=-sysv4
>   		;;
> +	strongarm-* | thumb-*)
> +		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
> +		;;
>   	sun2)
>   		basic_machine=m68000-sun
>   		;;
> @@ -1102,13 +1158,8 @@ case $basic_machine in
>   		basic_machine=t90-cray
>   		os=-unicos
>   		;;
> -        # This must be matched before tile*.
> -        tilegx*)
> -		basic_machine=tilegx-unknown
> -		os=-linux-gnu
> -		;;
>   	tile*)
> -		basic_machine=tile-unknown
> +		basic_machine=$basic_machine-unknown
>   		os=-linux-gnu
>   		;;
>   	tx39)
> @@ -1178,6 +1229,9 @@ case $basic_machine in
>   	xps | xps100)
>   		basic_machine=xps100-honeywell
>   		;;
> +	xscale-* | xscalee[bl]-*)
> +		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
> +		;;
>   	ymp)
>   		basic_machine=ymp-cray
>   		os=-unicos
> @@ -1275,11 +1329,11 @@ esac
>   if [ x"$os" != x"" ]
>   then
>   case $os in
> -        # First match some system type aliases
> -        # that might get confused with valid system types.
> +	# First match some system type aliases
> +	# that might get confused with valid system types.
>   	# -solaris* is a basic system type, with this one exception.
> -        -auroraux)
> -	        os=-auroraux
> +	-auroraux)
> +		os=-auroraux
>   		;;
>   	-solaris1 | -solaris1.*)
>   		os=`echo $os | sed -e 's|solaris1|sunos4|'`
> @@ -1309,15 +1363,15 @@ case $os in
>   	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
>   	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>   	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
> -	      | -openbsd* | -solidbsd* \
> +	      | -bitrig* | -openbsd* | -solidbsd* \
>   	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
>   	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
>   	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
>   	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>   	      | -chorusos* | -chorusrdb* | -cegcc* \
> -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
> -	      | -mingw32* | -linux-gnu* | -linux-android* \
> -	      | -linux-newlib* | -linux-uclibc* \
> +	      | -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* \
> @@ -1364,7 +1418,7 @@ case $os in
>   	-opened*)
>   		os=-openedition
>   		;;
> -        -os400*)
> +	-os400*)
>   		os=-os400
>   		;;
>   	-wince*)
> @@ -1413,7 +1467,7 @@ case $os in
>   	-sinix*)
>   		os=-sysv4
>   		;;
> -        -tpf*)
> +	-tpf*)
>   		os=-tpf
>   		;;
>   	-triton*)
> @@ -1458,8 +1512,8 @@ case $os in
>   	-dicos*)
>   		os=-dicos
>   		;;
> -        -nacl*)
> -	        ;;
> +	-nacl*)
> +		;;
>   	-none)
>   		;;
>   	*)
> @@ -1482,10 +1536,10 @@ else
>   # system, and we'll never get to this point.
>
>   case $basic_machine in
> -        score-*)
> +	score-*)
>   		os=-elf
>   		;;
> -        spu-*)
> +	spu-*)
>   		os=-elf
>   		;;
>   	*-acorn)
> @@ -1497,8 +1551,11 @@ case $basic_machine in
>   	arm*-semi)
>   		os=-aout
>   		;;
> -        c4x-* | tic4x-*)
> -        	os=-coff
> +	c4x-* | tic4x-*)
> +		os=-coff
> +		;;
> +	hexagon-*)
> +		os=-elf
>   		;;
>   	tic54x-*)
>   		os=-coff
> @@ -1527,14 +1584,11 @@ case $basic_machine in
>   		;;
>   	m68000-sun)
>   		os=-sunos3
> -		# This also exists in the configure program, but was not the
> -		# default.
> -		# os=-sunos4
>   		;;
>   	m68*-cisco)
>   		os=-aout
>   		;;
> -        mep-*)
> +	mep-*)
>   		os=-elf
>   		;;
>   	mips*-cisco)
> @@ -1561,7 +1615,7 @@ case $basic_machine in
>   	*-ibm)
>   		os=-aix
>   		;;
> -    	*-knuth)
> +	*-knuth)
>   		os=-mmixware
>   		;;
>   	*-wec)



More information about the openssh-unix-dev mailing list