Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 04 Jun 2013 21:31:19 -0500
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        Baptiste Daroussin <bapt@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, Steve Wills <swills@FreeBSD.org>, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r319866 - head/Templates
Message-ID:  <51AEA2F7.3090204@FreeBSD.org>
In-Reply-To: <201306041445.r54EjTlK030097@svn.freebsd.org>
References:  <201306041445.r54EjTlK030097@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2TLAWSJVWMSCAHSTSJVWG
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

This apparently breaks ruby's detection of the current ARCH name.

See ports/179313

Reverting to (an older config.sub and config.guess) fixes it for me.

poudriere testport -o lang/ruby19 shows the issue:

> installing extension objects: /prefix/ruby-1.9.3.429_1/lib/ruby/1.9/x86=
_64-freebsd8
> pkg-static: lstat(/prefix/ruby-1.9.3.429_1/include/ruby-1.9/amd64-freeb=
sd8/ruby/config.h): No such file or directory

Note the discrepancy between x86_64 and amd64-freebsd8

Bryan


On 6/4/2013 9:45 AM, Baptiste Daroussin wrote:
> Author: bapt
> Date: Tue Jun  4 14:45:29 2013
> New Revision: 319866
> URL: http://svnweb.freebsd.org/changeset/ports/319866
>=20
> Log:
>   Update to lastest version from upstream
>=20
> Modified:
>   head/Templates/config.guess
>   head/Templates/config.sub
>=20
> Modified: head/Templates/config.guess
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/Templates/config.guess	Tue Jun  4 14:40:29 2013	(r319865)
> +++ head/Templates/config.guess	Tue Jun  4 14:45:29 2013	(r319866)
> @@ -1,13 +1,12 @@
>  #! /bin/sh
>  # Attempt to guess a canonical system name.
> -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
> -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
> +#   Copyright 1992-2013 Free Software Foundation, Inc.
> =20
> -timestamp=3D'2003-07-02'
> +timestamp=3D'2013-05-16'
> =20
>  # This file is free software; you can redistribute it and/or modify it=

>  # under the terms of the GNU General Public License as published by
> -# the Free Software Foundation; either version 2 of the License, or
> +# the Free Software Foundation; either version 3 of the License, or
>  # (at your option) any later version.
>  #
>  # This program is distributed in the hope that it will be useful, but
> @@ -16,24 +15,22 @@ timestamp=3D'2003-07-02'
>  # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307=
, 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
>  # configuration script generated by Autoconf, you may include it under=

> -# the same distribution terms that you use for the rest of that progra=
m.
> -
> -# 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.
> +# the same distribution terms that you use for the rest of that
> +# program.  This Exception is an additional permission under section 7=

> +# of the GNU General Public License, version 3 ("GPLv3").
> +#
> +# Originally written by Per Bothner.
>  #
> -# This script attempts to guess a canonical system name similar to
> -# config.sub.  If it succeeds, it prints the system name on stdout, an=
d
> -# exits with 0.  Otherwise, it exits with 1.
> +# You can get the latest version of this script from:
> +# http://git.savannah.gnu.org/gitweb/?p=3Dconfig.git;a=3Dblob_plain;f=3D=
config.guess;hb=3DHEAD
>  #
> -# The plan is that this can be called by configure scripts if you
> -# don't specify an explicit build system type.
> +# Please send patches with a ChangeLog entry to config-patches@gnu.org=
=2E
> +
> =20
>  me=3D`echo "$0" | sed -e 's,.*/,,'`
> =20
> @@ -53,8 +50,7 @@ version=3D"\
>  GNU config.guess ($timestamp)
> =20
>  Originally written by Per Bothner.
> -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 20=
01
> -Free Software Foundation, Inc.
> +Copyright 1992-2013 Free Software Foundation, Inc.
> =20
>  This is free software; see the source for copying conditions.  There i=
s NO
>  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PUR=
POSE."
> @@ -66,11 +62,11 @@ Try \`$me --help' for more information."
>  while test $# -gt 0 ; do
>    case $1 in
>      --time-stamp | --time* | -t )
> -       echo "$timestamp" ; exit 0 ;;
> +       echo "$timestamp" ; exit ;;
>      --version | -v )
> -       echo "$version" ; exit 0 ;;
> +       echo "$version" ; exit ;;
>      --help | --h* | -h )
> -       echo "$usage"; exit 0 ;;
> +       echo "$usage"; exit ;;
>      -- )     # Stop option processing
>         shift; break ;;
>      - )	# Use stdin as input.
> @@ -104,7 +100,7 @@ set_cc_for_build=3D'
>  trap "exitcode=3D\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/de=
v/null) && exit \$exitcode" 0 ;
>  trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1=
 2 13 15 ;
>  : ${TMPDIR=3D/tmp} ;
> - { tmp=3D`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` =
&& test -n "$tmp" && test -d "$tmp" ; } ||
> + { tmp=3D`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && =
test -n "$tmp" && test -d "$tmp" ; } ||
>   { test -n "$RANDOM" && tmp=3D$TMPDIR/cg$$-$RANDOM && (umask 077 && mk=
dir $tmp) ; } ||
>   { tmp=3D$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: =
creating insecure temp directory" >&2 ; } ||
>   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; ex=
it 1 ; } ;
> @@ -123,7 +119,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
>  	;;
>   ,,*)   CC_FOR_BUILD=3D$CC ;;
>   ,*,*)  CC_FOR_BUILD=3D$HOST_CC ;;
> -esac ;'
> +esac ; set_cc_for_build=3D ;'
> =20
>  # This is needed to find uname on a Pyramid OSx when run in the BSD un=
iverse.
>  # (ghazi@noc.rutgers.edu 1994-08-24)
> @@ -136,12 +132,33 @@ UNAME_RELEASE=3D`(uname -r) 2>/dev/null` |
>  UNAME_SYSTEM=3D`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=3Dunknown
>  UNAME_VERSION=3D`(uname -v) 2>/dev/null` || UNAME_VERSION=3Dunknown
> =20
> +case "${UNAME_SYSTEM}" in
> +Linux|GNU|GNU/*)
> +	# If the system lacks a compiler, then just pick glibc.
> +	# We could probably try harder.
> +	LIBC=3Dgnu
> +
> +	eval $set_cc_for_build
> +	cat <<-EOF > $dummy.c
> +	#include <features.h>
> +	#if defined(__UCLIBC__)
> +	LIBC=3Duclibc
> +	#elif defined(__dietlibc__)
> +	LIBC=3Ddietlibc
> +	#else
> +	LIBC=3Dgnu
> +	#endif
> +	EOF
> +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
> +	;;
> +esac
> +
>  # Note: order is significant - the case branches are not exclusive.
> =20
>  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSIO=
N}" 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
> @@ -158,6 +175,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>  	    arm*) machine=3Darm-unknown ;;
>  	    sh3el) machine=3Dshl-unknown ;;
>  	    sh3eb) machine=3Dsh-unknown ;;
> +	    sh5el) machine=3Dsh5le-unknown ;;
>  	    *) machine=3D${UNAME_MACHINE_ARCH}-unknown ;;
>  	esac
>  	# The Operating System including object format, if it has switched
> @@ -166,7 +184,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 (netbsd=
aout).
>  		    # Return netbsd for either.  FIX?
> @@ -176,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>  		fi
>  		;;
>  	    *)
> -	        os=3Dnetbsd
> +		os=3Dnetbsd
>  		;;
>  	esac
>  	# The OS release
> @@ -196,50 +214,36 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>  	# contains redundant information, the shorter form:
>  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
>  	echo "${machine}-${os}${release}"
> -	exit 0 ;;
> -    amiga:OpenBSD:*:*)
> -	echo m68k-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    arc:OpenBSD:*:*)
> -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    hp300:OpenBSD:*:*)
> -	echo m68k-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    mac68k:OpenBSD:*:*)
> -	echo m68k-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    macppc:OpenBSD:*:*)
> -	echo powerpc-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    mvme68k:OpenBSD:*:*)
> -	echo m68k-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    mvme88k:OpenBSD:*:*)
> -	echo m88k-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    mvmeppc:OpenBSD:*:*)
> -	echo powerpc-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    pmax:OpenBSD:*:*)
> -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    sgi:OpenBSD:*:*)
> -	echo mipseb-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    sun3:OpenBSD:*:*)
> -	echo m68k-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> -    wgrisc:OpenBSD:*:*)
> -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
> +    *:Bitrig:*:*)
> +	UNAME_MACHINE_ARCH=3D`arch | sed 's/Bitrig.//'`
> +	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
> +	exit ;;
>      *:OpenBSD:*:*)
> -	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
> -	exit 0 ;;
> +	UNAME_MACHINE_ARCH=3D`arch | sed 's/OpenBSD.//'`
> +	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
> +	exit ;;
> +    *:ekkoBSD:*:*)
> +	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> +	exit ;;
> +    *:SolidBSD:*:*)
> +	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
> +	exit ;;
> +    macppc:MirBSD:*:*)
> +	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
> +	exit ;;
> +    *:MirBSD:*:*)
> +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
> +	exit ;;
>      alpha:OSF1:*:*)
> -	if test $UNAME_RELEASE =3D "V4.0"; then
> +	case $UNAME_RELEASE in
> +	*4.0)
>  		UNAME_RELEASE=3D`/usr/sbin/sizer -v | awk '{print $3}'`
> -	fi
> +		;;
> +	*5.*)
> +		UNAME_RELEASE=3D`/usr/sbin/sizer -v | awk '{print $4}'`
> +		;;
> +	esac
>  	# According to Compaq, /usr/sbin/psrinfo has been available on
>  	# OSF/1 and Tru64 systems produced since 1995.  I hope that
>  	# covers most systems running today.  This code pipes the CPU
> @@ -277,42 +281,52 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>  	    "EV7.9 (21364A)")
>  		UNAME_MACHINE=3D"alphaev79" ;;
>  	esac
> +	# A Pn.n version is a patched version.
>  	# A Vn.n version is a released version.
>  	# A Tn.n version is a released field test version.
>  	# 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/^[VTX=
]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> -	exit 0 ;;
> -    Alpha*:OpenVMS:*:*)
> -	echo alpha-hp-vms
> -	exit 0 ;;
> +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVT=
X]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
> +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code=
=2E
> +	exitcode=3D$?
> +	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=

>  	# of the specific Alpha model?
>  	echo alpha-pc-interix
> -	exit 0 ;;
> +	exit ;;
>      21064:Windows_NT:50:3)
>  	echo alpha-dec-winnt3.5
> -	exit 0 ;;
> +	exit ;;
>      Amiga*:UNIX_System_V:4.0:*)
>  	echo m68k-unknown-sysv4
> -	exit 0;;
> +	exit ;;
>      *:[Aa]miga[Oo][Ss]:*:*)
>  	echo ${UNAME_MACHINE}-unknown-amigaos
> -	exit 0 ;;
> +	exit ;;
>      *:[Mm]orph[Oo][Ss]:*:*)
>  	echo ${UNAME_MACHINE}-unknown-morphos
> -	exit 0 ;;
> +	exit ;;
>      *:OS/390:*:*)
>  	echo i370-ibm-openedition
> -	exit 0 ;;
> +	exit ;;
> +    *:z/VM:*:*)
> +	echo s390-ibm-zvmoe
> +	exit ;;
> +    *:OS400:*:*)
> +	echo powerpc-ibm-os400
> +	exit ;;
>      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
>  	echo arm-acorn-riscix${UNAME_RELEASE}
> -	exit 0;;
> +	exit ;;
> +    arm*:riscos:*:*|arm*:RISCOS:*:*)
> +	echo arm-unknown-riscos
> +	exit ;;
>      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
>  	echo hppa1.1-hitachi-hiuxmpp
> -	exit 0;;
> +	exit ;;
>      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
>  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
>  	if test "`(/bin/universe) 2>/dev/null`" =3D att ; then
> @@ -320,32 +334,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>  	else
>  		echo pyramid-pyramid-bsd
>  	fi
> -	exit 0 ;;
> +	exit ;;
>      NILE*:*:*:dcosx)
>  	echo pyramid-pyramid-svr4
> -	exit 0 ;;
> +	exit ;;
>      DRS?6000:unix:4.0:6*)
>  	echo sparc-icl-nx6
> -	exit 0 ;;
> -    DRS?6000:UNIX_SV:4.2*:7*)
> +	exit ;;
> +    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
>  	case `/usr/bin/uname -p` in
> -	    sparc) echo sparc-icl-nx7 && exit 0 ;;
> +	    sparc) echo sparc-icl-nx7; exit ;;
>  	esac ;;
> +    s390x:SunOS:*:*)
> +	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^=
=2E]*//'`
> +	exit ;;
>      sun4H:SunOS:5.*:*)
>  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> -	exit 0 ;;
> +	exit ;;
>      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
>  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> -	exit 0 ;;
> -    i86pc:SunOS:5.*:*)
> -	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> -	exit 0 ;;
> +	exit ;;
> +    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=3D"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" !=3D 'no_compiler_found' ]; then
> +	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \=

> +		(CCOPTS=3D $CC_FOR_BUILD -E - 2>/dev/null) | \
> +		grep IS_64BIT_ARCH >/dev/null
> +	    then
> +		SUN_ARCH=3D"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
>  	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
>  	# it's likely to be more like Solaris than SunOS4.
>  	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> -	exit 0 ;;
> +	exit ;;
>      sun4*:SunOS:*:*)
>  	case "`/usr/bin/arch -k`" in
>  	    Series*|S4*)
> @@ -354,10 +387,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>  	esac
>  	# Japanese Language versions have a version number like `4.1.3-JL'.
>  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
> -	exit 0 ;;
> +	exit ;;
>      sun3*:SunOS:*:*)
>  	echo m68k-sun-sunos${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
>      sun*:*:4.2BSD:*)
>  	UNAME_RELEASE=3D`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>=
/dev/null`
>  	test "x${UNAME_RELEASE}" =3D "x" && UNAME_RELEASE=3D3
> @@ -369,10 +402,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>  		echo sparc-sun-sunos${UNAME_RELEASE}
>  		;;
>  	esac
> -	exit 0 ;;
> +	exit ;;
>      aushp:SunOS:*:*)
>  	echo sparc-auspex-sunos${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
>      # The situation for MiNT is a little confusing.  The machine name
>      # can be virtually everything (everything which is not
>      # "atarist" or "atariste" at least should have a processor
> @@ -382,38 +415,41 @@ 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}
> -	exit 0 ;;
> +	echo m68k-atari-mint${UNAME_RELEASE}
> +	exit ;;
>      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
>  	echo m68k-atari-mint${UNAME_RELEASE}
> -        exit 0 ;;
> +	exit ;;
>      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
> -        echo m68k-atari-mint${UNAME_RELEASE}
> -	exit 0 ;;
> +	echo m68k-atari-mint${UNAME_RELEASE}
> +	exit ;;
>      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
> -        echo m68k-milan-mint${UNAME_RELEASE}
> -        exit 0 ;;
> +	echo m68k-milan-mint${UNAME_RELEASE}
> +	exit ;;
>      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
> -        echo m68k-hades-mint${UNAME_RELEASE}
> -        exit 0 ;;
> +	echo m68k-hades-mint${UNAME_RELEASE}
> +	exit ;;
>      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
> -        echo m68k-unknown-mint${UNAME_RELEASE}
> -        exit 0 ;;
> +	echo m68k-unknown-mint${UNAME_RELEASE}
> +	exit ;;
> +    m68k:machten:*:*)
> +	echo m68k-apple-machten${UNAME_RELEASE}
> +	exit ;;
>      powerpc:machten:*:*)
>  	echo powerpc-apple-machten${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
>      RISC*:Mach:*:*)
>  	echo mips-dec-mach_bsd4.3
> -	exit 0 ;;
> +	exit ;;
>      RISC*:ULTRIX:*:*)
>  	echo mips-dec-ultrix${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
>      VAX*:ULTRIX*:*:*)
>  	echo vax-dec-ultrix${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
>      2020:CLIX:*:* | 2430:CLIX:*:*)
>  	echo clipper-intergraph-clix${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
>      mips:*:*:UMIPS | mips:*:*:RISCos)
>  	eval $set_cc_for_build
>  	sed 's/^	//' << EOF >$dummy.c
> @@ -437,35 +473,36 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
>  	  exit (-1);
>  	}
>  EOF
> -	$CC_FOR_BUILD -o $dummy $dummy.c \
> -	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` =
\
> -	  && exit 0
> +	$CC_FOR_BUILD -o $dummy $dummy.c &&
> +	  dummyarg=3D`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'`=
 &&
> +	  SYSTEM_NAME=3D`$dummy $dummyarg` &&
> +	    { echo "$SYSTEM_NAME"; exit; }
>  	echo mips-mips-riscos${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
>      Motorola:PowerMAX_OS:*:*)
>  	echo powerpc-motorola-powermax
> -	exit 0 ;;
> +	exit ;;
>      Motorola:*:4.3:PL8-*)
>  	echo powerpc-harris-powermax
> -	exit 0 ;;
> +	exit ;;
>      Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
>  	echo powerpc-harris-powermax
> -	exit 0 ;;
> +	exit ;;
>      Night_Hawk:Power_UNIX:*:*)
>  	echo powerpc-harris-powerunix
> -	exit 0 ;;
> +	exit ;;
>      m88k:CX/UX:7*:*)
>  	echo m88k-harris-cxux7
> -	exit 0 ;;
> +	exit ;;
>      m88k:*:4*:R4*)
>  	echo m88k-motorola-sysv4
> -	exit 0 ;;
> +	exit ;;
>      m88k:*:3*:R3*)
>  	echo m88k-motorola-sysv3
> -	exit 0 ;;
> +	exit ;;
>      AViiON:dgux:*:*)
> -        # DG/UX returns AViiON for all architectures
> -        UNAME_PROCESSOR=3D`/usr/bin/uname -p`
> +	# DG/UX returns AViiON for all architectures
> +	UNAME_PROCESSOR=3D`/usr/bin/uname -p`
>  	if [ $UNAME_PROCESSOR =3D mc88100 ] || [ $UNAME_PROCESSOR =3D mc88110=
 ]
>  	then
>  	    if [ ${TARGET_BINARY_INTERFACE}x =3D m88kdguxelfx ] || \
> @@ -478,29 +515,29 @@ EOF
>  	else
>  	    echo i586-dg-dgux${UNAME_RELEASE}
>  	fi
> - 	exit 0 ;;
> +	exit ;;
>      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
>  	echo m88k-dolphin-sysv3
> -	exit 0 ;;
> +	exit ;;
>      M88*:*:R3*:*)
>  	# Delta 88k system running SVR3
>  	echo m88k-motorola-sysv3
> -	exit 0 ;;
> +	exit ;;
>      XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
>  	echo m88k-tektronix-sysv3
> -	exit 0 ;;
> +	exit ;;
>      Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BS=
D)
>  	echo m68k-tektronix-bsd
> -	exit 0 ;;
> +	exit ;;
>      *:IRIX*:*:*)
>  	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
> -	exit 0 ;;
> +	exit ;;
>      ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
> -	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
> -	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
> +	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
> +	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
>      i*86:AIX:*:*)
>  	echo i386-ibm-aix
> -	exit 0 ;;
> +	exit ;;
>      ia64:AIX:*:*)
>  	if [ -x /usr/bin/oslevel ] ; then
>  		IBM_REV=3D`/usr/bin/oslevel`
> @@ -508,7 +545,7 @@ EOF
>  		IBM_REV=3D${UNAME_VERSION}.${UNAME_RELEASE}
>  	fi
>  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
> -	exit 0 ;;
> +	exit ;;
>      *:AIX:2:3)
>  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
>  		eval $set_cc_for_build
> @@ -523,15 +560,19 @@ EOF
>  			exit(0);
>  			}
>  EOF
> -		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
> -		echo rs6000-ibm-aix3.2.5
> +		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=3D`$dummy`
> +		then
> +			echo "$SYSTEM_NAME"
> +		else
> +			echo rs6000-ibm-aix3.2.5
> +		fi
>  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
>  		echo rs6000-ibm-aix3.2.4
>  	else
>  		echo rs6000-ibm-aix3.2
>  	fi
> -	exit 0 ;;
> -    *:AIX:*:[45])
> +	exit ;;
> +    *:AIX:*:[4567])
>  	IBM_CPU_ID=3D`/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=3Drs6000
> @@ -544,28 +585,28 @@ EOF
>  		IBM_REV=3D${UNAME_VERSION}.${UNAME_RELEASE}
>  	fi
>  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
> -	exit 0 ;;
> +	exit ;;
>      *:AIX:*:*)
>  	echo rs6000-ibm-aix
> -	exit 0 ;;
> +	exit ;;
>      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
>  	echo romp-ibm-bsd4.4
> -	exit 0 ;;
> +	exit ;;
>      ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
>  	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
> -	exit 0 ;;                           # report: romp-ibm BSD 4.3
> +	exit ;;                             # report: romp-ibm BSD 4.3
>      *:BOSX:*:*)
>  	echo rs6000-bull-bosx
> -	exit 0 ;;
> +	exit ;;
>      DPX/2?00:B.O.S.:*:*)
>  	echo m68k-bull-sysv3
> -	exit 0 ;;
> +	exit ;;
>      9000/[34]??:4.3bsd:1.*:*)
>  	echo m68k-hp-bsd
> -	exit 0 ;;
> +	exit ;;
>      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
>  	echo m68k-hp-bsd4.4
> -	exit 0 ;;
> +	exit ;;
>      9000/[34678]??:HP-UX:*:*)
>  	HPUX_REV=3D`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
>  	case "${UNAME_MACHINE}" in
> @@ -574,52 +615,52 @@ EOF
>  	    9000/[678][0-9][0-9])
>  		if [ -x /usr/bin/getconf ]; then
>  		    sc_cpu_version=3D`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
> -                    sc_kernel_bits=3D`/usr/bin/getconf SC_KERNEL_BITS =
2>/dev/null`
> -                    case "${sc_cpu_version}" in
> -                      523) HP_ARCH=3D"hppa1.0" ;; # CPU_PA_RISC1_0
> -                      528) HP_ARCH=3D"hppa1.1" ;; # CPU_PA_RISC1_1
> -                      532)                      # CPU_PA_RISC2_0
> -                        case "${sc_kernel_bits}" in
> -                          32) HP_ARCH=3D"hppa2.0n" ;;
> -                          64) HP_ARCH=3D"hppa2.0w" ;;
> +		    sc_kernel_bits=3D`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
> +		    case "${sc_cpu_version}" in
> +		      523) HP_ARCH=3D"hppa1.0" ;; # CPU_PA_RISC1_0
> +		      528) HP_ARCH=3D"hppa1.1" ;; # CPU_PA_RISC1_1
> +		      532)                      # CPU_PA_RISC2_0
> +			case "${sc_kernel_bits}" in
> +			  32) HP_ARCH=3D"hppa2.0n" ;;
> +			  64) HP_ARCH=3D"hppa2.0w" ;;
>  			  '') HP_ARCH=3D"hppa2.0" ;;   # HP-UX 10.20
> -                        esac ;;
> -                    esac
> +			esac ;;
> +		    esac
>  		fi
>  		if [ "${HP_ARCH}" =3D "" ]; 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 =3D sysconf(_SC_KERNEL_BITS);
> +		#endif
> +		    long cpu  =3D sysconf (_SC_CPU_VERSION);
> =20
> -              #define _HPUX_SOURCE
> -              #include <stdlib.h>
> -              #include <unistd.h>
> -
> -              int main ()
> -              {
> -              #if defined(_SC_KERNEL_BITS)
> -                  long bits =3D sysconf(_SC_KERNEL_BITS);
> -              #endif
> -                  long cpu  =3D 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);
> -              }
> +		    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=3D $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_A=
RCH=3D`$dummy`
>  		    test -z "$HP_ARCH" && HP_ARCH=3Dhppa
> @@ -627,9 +668,19 @@ EOF
>  	esac
>  	if [ ${HP_ARCH} =3D "hppa2.0w" ]
>  	then
> -	    # avoid double evaluation of $set_cc_for_build
> -	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
> -	    if echo __LP64__ | (CCOPTS=3D $CC_FOR_BUILD -E -) | grep __LP64__=
 >/dev/null
> +	    eval $set_cc_for_build
> +
> +	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating=

> +	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compile=
r
> +	    # generating 64-bit code.  GNU and HP use different nomenclature:=

> +	    #
> +	    # $ CC_FOR_BUILD=3Dcc ./config.guess
> +	    # =3D> hppa2.0w-hp-hpux11.23
> +	    # $ CC_FOR_BUILD=3D"cc +DA2.0w" ./config.guess
> +	    # =3D> hppa64-hp-hpux11.23
> +
> +	    if echo __LP64__ | (CCOPTS=3D $CC_FOR_BUILD -E - 2>/dev/null) |
> +		grep -q __LP64__
>  	    then
>  		HP_ARCH=3D"hppa2.0w"
>  	    else
> @@ -637,11 +688,11 @@ EOF
>  	    fi
>  	fi
>  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
> -	exit 0 ;;
> +	exit ;;
>      ia64:HP-UX:*:*)
>  	HPUX_REV=3D`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
>  	echo ia64-hp-hpux${HPUX_REV}
> -	exit 0 ;;
> +	exit ;;
>      3050*:HI-UX:*:*)
>  	eval $set_cc_for_build
>  	sed 's/^	//' << EOF >$dummy.c
> @@ -669,321 +720,334 @@ EOF
>  	  exit (0);
>  	}
>  EOF
> -	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
> +	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=3D`$dummy` &&
> +		{ echo "$SYSTEM_NAME"; exit; }
>  	echo unknown-hitachi-hiuxwe2
> -	exit 0 ;;
> +	exit ;;
>      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
>  	echo hppa1.1-hp-bsd
> -	exit 0 ;;
> +	exit ;;
>      9000/8??:4.3bsd:*:*)
>  	echo hppa1.0-hp-bsd
> -	exit 0 ;;
> +	exit ;;
>      *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
>  	echo hppa1.0-hp-mpeix
> -	exit 0 ;;
> +	exit ;;
>      hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
>  	echo hppa1.1-hp-osf
> -	exit 0 ;;
> +	exit ;;
>      hp8??:OSF1:*:*)
>  	echo hppa1.0-hp-osf
> -	exit 0 ;;
> +	exit ;;
>      i*86:OSF1:*:*)
>  	if [ -x /usr/sbin/sysversion ] ; then
>  	    echo ${UNAME_MACHINE}-unknown-osf1mk
>  	else
>  	    echo ${UNAME_MACHINE}-unknown-osf1
>  	fi
> -	exit 0 ;;
> +	exit ;;
>      parisc*:Lites*:*:*)
>  	echo hppa1.1-hp-lites
> -	exit 0 ;;
> +	exit ;;
>      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
>  	echo c1-convex-bsd
> -        exit 0 ;;
> +	exit ;;
>      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
>  	if getsysinfo -f scalar_acc
>  	then echo c32-convex-bsd
>  	else echo c2-convex-bsd
>  	fi
> -        exit 0 ;;
> +	exit ;;
>      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
>  	echo c34-convex-bsd
> -        exit 0 ;;
> +	exit ;;
>      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
>  	echo c38-convex-bsd
> -        exit 0 ;;
> +	exit ;;
>      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
>  	echo c4-convex-bsd
> -        exit 0 ;;
> +	exit ;;
>      CRAY*Y-MP:*:*:*)
>  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> -	exit 0 ;;
> +	exit ;;
>      CRAY*[A-Z]90:*:*:*)
>  	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
>  	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
>  	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
>  	      -e 's/\.[^.]*$/.X/'
> -	exit 0 ;;
> +	exit ;;
>      CRAY*TS:*:*:*)
>  	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> -	exit 0 ;;
> +	exit ;;
>      CRAY*T3E:*:*:*)
>  	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'=

> -	exit 0 ;;
> +	exit ;;
>      CRAY*SV1:*:*:*)
>  	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> -	exit 0 ;;
> +	exit ;;
>      *:UNICOS/mp:*:*)
> -	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'=20
> -	exit 0 ;;
> +	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
> +	exit ;;
>      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
>  	FUJITSU_PROC=3D`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghi=
jklmnopqrstuvwxyz'`
> -        FUJITSU_SYS=3D`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abc=
defghijklmnopqrstuvwxyz' | sed -e 's/\///'`
> -        FUJITSU_REL=3D`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
> -        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
> -        exit 0 ;;
> +	FUJITSU_SYS=3D`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghij=
klmnopqrstuvwxyz' | sed -e 's/\///'`
> +	FUJITSU_REL=3D`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
> +	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
> +	exit ;;
> +    5000:UNIX_System_V:4.*:*)
> +	FUJITSU_SYS=3D`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghij=
klmnopqrstuvwxyz' | sed -e 's/\///'`
> +	FUJITSU_REL=3D`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}
> -	exit 0 ;;
> +	exit ;;
>      sparc*:BSD/OS:*:*)
>  	echo sparc-unknown-bsdi${UNAME_RELEASE}
> -	exit 0 ;;
> +	exit ;;
>      *:BSD/OS:*:*)
>  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> -	exit 0 ;;
> -    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
> -	# Determine whether the default compiler uses glibc.
> -	eval $set_cc_for_build
> -	sed 's/^	//' << EOF >$dummy.c
> -	#include <features.h>
> -	#if __GLIBC__ >=3D 2
> -	LIBC=3Dgnu
> -	#else
> -	LIBC=3D
> -	#endif
> -EOF
> -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=3D`
> -	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
> -	# FreeBSD's kernel, but not the complete OS.
> -	case ${LIBC} in gnu) kernel_only=3D'k' ;; esac
> -	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELE=
ASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
> -	exit 0 ;;
> +	exit ;;
> +    *:FreeBSD:*:*)
> +	UNAME_PROCESSOR=3D`/usr/bin/uname -p`
> +	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e =
's/[-(].*//'`
> +	exit ;;
>      i*:CYGWIN*:*)
>  	echo ${UNAME_MACHINE}-pc-cygwin
> -	exit 0 ;;
> -    i*:MINGW*:*)
> +	exit ;;
> +    *:MINGW64*:*)
> +	echo ${UNAME_MACHINE}-pc-mingw64
> +	exit ;;
> +    *:MINGW*:*)
>  	echo ${UNAME_MACHINE}-pc-mingw32
> -	exit 0 ;;
> +	exit ;;
> +    i*:MSYS*:*)
> +	echo ${UNAME_MACHINE}-pc-msys
> +	exit ;;
> +    i*:windows32*:*)
> +	# uname -m includes "-pc" on this system.
> +	echo ${UNAME_MACHINE}-mingw32
> +	exit ;;
>      i*:PW*:*)
>  	echo ${UNAME_MACHINE}-pc-pw32
> -	exit 0 ;;
> -    x86:Interix*:[34]*)
> -	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
> -	exit 0 ;;
> +	exit ;;
> +    *:Interix*:*)
> +	case ${UNAME_MACHINE} in
> +	    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 0 ;;
> +	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
>  	# UNAME_MACHINE based on the output of uname instead of i386?
>  	echo i586-pc-interix
> -	exit 0 ;;
> +	exit ;;
>      i*:UWIN*:*)
>  	echo ${UNAME_MACHINE}-pc-uwin
> -	exit 0 ;;
> +	exit ;;
> +    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
> +	echo x86_64-unknown-cygwin
> +	exit ;;
>      p*:CYGWIN*:*)
>  	echo powerpcle-unknown-cygwin
> -	exit 0 ;;
> +	exit ;;
>      prep*:SunOS:5.*:*)
>  	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*=
//'`
> -	exit 0 ;;
> +	exit ;;
>      *:GNU:*:*)
> -	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${=
UNAME_RELEASE}|sed -e 's,/.*$,,'`
> -	exit 0 ;;
> +	# the GNU system
> +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`ech=
o ${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/[-(].*//'`-${LIB=
C}
> +	exit ;;
>      i*86:Minix:*:*)
>  	echo ${UNAME_MACHINE}-pc-minix
> -	exit 0 ;;
> +	exit ;;
> +    aarch64:Linux:*:*)
> +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> +	exit ;;
> +    aarch64_be:Linux:*:*)
> +	UNAME_MACHINE=3Daarch64_be
> +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> +	exit ;;
> +    alpha:Linux:*:*)
> +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
> +	  EV5)   UNAME_MACHINE=3Dalphaev5 ;;
> +	  EV56)  UNAME_MACHINE=3Dalphaev56 ;;
> +	  PCA56) UNAME_MACHINE=3Dalphapca56 ;;
> +	  PCA57) UNAME_MACHINE=3Dalphapca56 ;;
> +	  EV6)   UNAME_MACHINE=3Dalphaev6 ;;
> +	  EV67)  UNAME_MACHINE=3Dalphaev67 ;;
> +	  EV68*) UNAME_MACHINE=3Dalphaev68 ;;
> +	esac
> +	objdump --private-headers /bin/sh | grep -q ld.so.1
> +	if test "$?" =3D 0 ; then LIBC=3D"gnulibc1" ; fi
> +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> +	exit ;;
> +    arc:Linux:*:* | arceb:Linux:*:*)
> +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> +	exit ;;
>      arm*:Linux:*:*)
> -	echo ${UNAME_MACHINE}-unknown-linux-gnu
> -	exit 0 ;;
> +	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}
> +	else
> +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
> +		| grep -q __ARM_PCS_VFP
> +	    then
> +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
> +	    else
> +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
>=20
> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
>=20


--=20
Regards,
Bryan Drewery


------enig2TLAWSJVWMSCAHSTSJVWG
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRrqL7AAoJEG54KsA8mwz5eEEQAIugvozlYcynZ0kA+gWA+rr5
fqrjNc5bT+Dc+4H7M1qvV0Hhgq8jrhntXk7ucPRBtmHF7+k6ImS3RJENNGeNXWS1
yMUKCJW64e6Rey125UomJrFtXyFEtyX8KutYgEMvipJVn8BSQY2854vq0A2qaKBj
N0d68T5g0gfcq9HDEWXaqlIEuoDbTzAuWYa7/Elzm4fONqy3UztINv8NMIOgqkPX
kyu8q+vHjcvG3TSldgtVNnWTQrOixKXrNwviK/ojShZaBhFWYf+jMqQVClzSrwWP
NeuhiMErCuFeu8nsY7dYtOAWeJfPqG+DPSnOUQahTtRqUzleCFFGlQPKdC7uY84u
c/w+vtOriyMzwSj9pLi8n/fNiFE///5qBo4sfngc/v4+rlkO7IBxBEC+2MO4fK1g
B869zkLA3xQ+7fcE7+WIb19M73or6zJ91QFWhbTaggeKCI2a5xe4ac5OBDcWK+pV
t8Tt0S9o/g5LPmA4j4jMNQR1iBubdvN3s9AbjPdXRZ7W+B2zlpYSqObLBhanAryD
/78Bqk00FzwInC5QV71jVVY7S70hL4W39gtJFZI+73ndDebfpUPyn2U5HcZ0tOGH
1YPDhhsmt+N38lwhcRH04JRN7E00QGUGb61iQzoUIRL7VERuyqcA5xc9BPZdpUy8
yWNoM9mEDPFsXpp7SCo6
=qiJ6
-----END PGP SIGNATURE-----

------enig2TLAWSJVWMSCAHSTSJVWG--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51AEA2F7.3090204>