Attachment 934291 Details for Bug 1122669 – patch for the issue.

patch for the issue.

patch.txt (text/plain), 91.80 KB, created by Jean-frederic Clere on 2014-09-04 06:43:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-frederic Clere

Created: 2014-09-04 06:43:41 UTC

Size: 91.80 KB

patch

obsolete

>Index: build_apache_snmp.sh
>===================================================================
>--- build_apache_snmp.sh	(revision 11283)
>+++ build_apache_snmp.sh	(working copy)
>@@ -82,6 +82,10 @@
>     if [ "x`automake --help | grep ignore-deps`" != "x" ]; then
>       IGNORE_DEPS="--ignore-deps"
>     fi
>+    # add missing if automake supports it
>+    if [ "x`automake --help | grep add-missing`" != "x" ]; then
>+      IGNORE_DEPS="$IGNORE_DEPS --add-missing"
>+    fi
> 
>     echo "Preparing smi..."
> #    (cd snmp_common/libsmi && [ -f Makefile ] && make -i clean >/dev/null 2>&1)
>Index: snmp_common/libsmi/config.guess
>===================================================================
>--- snmp_common/libsmi/config.guess	(revision 11283)
>+++ snmp_common/libsmi/config.guess	(working copy)
>@@ -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
>-#   Free Software Foundation, Inc.
>+#   Copyright 1992-2013 Free Software Foundation, Inc.
> 
>-timestamp='2001-03-30'
>+timestamp='2013-04-24'
> 
> # 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,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., 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 program.
>-
>-# Written by Per Bothner <bothner@cygnus.com>.
>-# Please send patches to <config-patches@gnu.org>.
>+# the same distribution terms that you use for the rest of that
>+# program.  This Exception is an additional permission under section 7
>+# of the GNU General Public License, version 3 ("GPLv3").
> #
>-# This script attempts to guess a canonical system name similar to
>-# config.sub.  If it succeeds, it prints the system name on stdout, and
>-# exits with 0.  Otherwise, it exits with 1.
>+# Originally written by Per Bothner.
> #
>-# 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
>+#
>+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
> 
>+
> me=`echo "$0" | sed -e 's,.*/,,'`
> 
> usage="\
>@@ -52,8 +50,7 @@
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
>-Free Software Foundation, Inc.
>+Copyright 1992-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."
>@@ -65,11 +62,11 @@
> 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.
>@@ -87,33 +84,45 @@
>   exit 1
> fi
> 
>+trap 'exit 1' 1 2 15
> 
>-dummy=dummy-$$
>-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
>+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
>+# compiler to aid in system detection is discouraged as it requires
>+# temporary files to be created and, as you can see below, it is a
>+# headache to deal with in a portable fashion.
> 
>-# CC_FOR_BUILD -- compiler used by this script.
> # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
> # use `HOST_CC' if defined, but it is deprecated.
> 
>+# Portable tmp directory creation inspired by the Autoconf team.
>+
>+set_cc_for_build='
>+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
>+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
>+: ${TMPDIR=/tmp} ;
>+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>+dummy=$tmp/dummy ;
>+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
> case $CC_FOR_BUILD,$HOST_CC,$CC in
>- ,,)    echo "int dummy(){}" > $dummy.c
>-	for c in cc gcc c89 ; do
>-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
>-	  if test $? = 0 ; then
>-	     CC_FOR_BUILD="$c"; break
>-	  fi
>-	done
>-	rm -f $dummy.c $dummy.o $dummy.rel
>+ ,,)    echo "int x;" > $dummy.c ;
>+	for c in cc gcc c89 c99 ; do
>+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
>+	     CC_FOR_BUILD="$c"; break ;
>+	  fi ;
>+	done ;
> 	if test x"$CC_FOR_BUILD" = x ; then
>-	  CC_FOR_BUILD=no_compiler_found
>+	  CC_FOR_BUILD=no_compiler_found ;
> 	fi
> 	;;
>  ,,*)   CC_FOR_BUILD=$CC ;;
>  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
>-esac
>+esac ; set_cc_for_build= ;'
> 
> # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
>-# (ghazi@noc.rutgers.edu 8/24/94.)
>+# (ghazi@noc.rutgers.edu 1994-08-24)
> if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
> 	PATH=$PATH:/.attbin ; export PATH
> fi
>@@ -127,31 +136,34 @@
> 
> 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*,
>+	# NetBSD (nbsd) targets should (where applicable) match one or
>+	# 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
> 	# compatibility and a consistent mechanism for selecting the
> 	# object file format.
>-	# Determine the machine/vendor (is the vendor relevant).
>-	case "${UNAME_MACHINE}" in
>-	    amiga) machine=m68k-unknown ;;
>-	    arm32) machine=arm-unknown ;;
>-	    atari*) machine=m68k-atari ;;
>-	    sun3*) machine=m68k-sun ;;
>-	    mac68k) machine=m68k-apple ;;
>-	    macppc) machine=powerpc-apple ;;
>-	    hp3[0-9][05]) machine=m68k-hp ;;
>-	    ibmrt|romp-ibm) machine=romp-ibm ;;
>-	    *) machine=${UNAME_MACHINE}-unknown ;;
>+	#
>+	# Note: NetBSD doesn't particularly care about the vendor
>+	# portion of the name.  We always set it to "unknown".
>+	sysctl="sysctl -n hw.machine_arch"
>+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
>+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
>+	case "${UNAME_MACHINE_ARCH}" in
>+	    armeb) machine=armeb-unknown ;;
>+	    arm*) machine=arm-unknown ;;
>+	    sh3el) machine=shl-unknown ;;
>+	    sh3eb) machine=sh-unknown ;;
>+	    sh5el) machine=sh5le-unknown ;;
>+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
> 	esac
> 	# The Operating System including object format, if it has switched
> 	# to ELF recently, or will in the future.
>-	case "${UNAME_MACHINE}" in
>-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
>+	case "${UNAME_MACHINE_ARCH}" in
>+	    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?
>@@ -161,120 +173,139 @@
> 		fi
> 		;;
> 	    *)
>-	        os=netbsd
>+		os=netbsd
> 		;;
> 	esac
> 	# The OS release
>-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
>+	# Debian GNU/NetBSD machines have a different userland, and
>+	# thus, need a distinct triplet. However, they do not need
>+	# kernel version information, so it can be replaced with a
>+	# suitable tag, in the style of linux-gnu.
>+	case "${UNAME_VERSION}" in
>+	    Debian*)
>+		release='-gnu'
>+		;;
>+	    *)
>+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
>+		;;
>+	esac
> 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
> 	# contains redundant information, the shorter form:
> 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
> 	echo "${machine}-${os}${release}"
>-	exit 0 ;;
>+	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}
>+	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 = "V4.0"; then
>+	case $UNAME_RELEASE in
>+	*4.0)
> 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
>-	fi
>+		;;
>+	*5.*)
>+		UNAME_RELEASE=`/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
>+	# types through head -n 1, so we only detect the type of CPU 0.
>+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
>+	case "$ALPHA_CPU_TYPE" in
>+	    "EV4 (21064)")
>+		UNAME_MACHINE="alpha" ;;
>+	    "EV4.5 (21064)")
>+		UNAME_MACHINE="alpha" ;;
>+	    "LCA4 (21066/21068)")
>+		UNAME_MACHINE="alpha" ;;
>+	    "EV5 (21164)")
>+		UNAME_MACHINE="alphaev5" ;;
>+	    "EV5.6 (21164A)")
>+		UNAME_MACHINE="alphaev56" ;;
>+	    "EV5.6 (21164PC)")
>+		UNAME_MACHINE="alphapca56" ;;
>+	    "EV5.7 (21164PC)")
>+		UNAME_MACHINE="alphapca57" ;;
>+	    "EV6 (21264)")
>+		UNAME_MACHINE="alphaev6" ;;
>+	    "EV6.7 (21264A)")
>+		UNAME_MACHINE="alphaev67" ;;
>+	    "EV6.8CB (21264C)")
>+		UNAME_MACHINE="alphaev68" ;;
>+	    "EV6.8AL (21264B)")
>+		UNAME_MACHINE="alphaev68" ;;
>+	    "EV6.8CX (21264D)")
>+		UNAME_MACHINE="alphaev68" ;;
>+	    "EV6.9A (21264/EV69A)")
>+		UNAME_MACHINE="alphaev69" ;;
>+	    "EV7 (21364)")
>+		UNAME_MACHINE="alphaev7" ;;
>+	    "EV7.9 (21364A)")
>+		UNAME_MACHINE="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.
>-	cat <<EOF >$dummy.s
>-	.data
>-\$Lformat:
>-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
>-
>-	.text
>-	.globl main
>-	.align 4
>-	.ent main
>-main:
>-	.frame \$30,16,\$26,0
>-	ldgp \$29,0(\$27)
>-	.prologue 1
>-	.long 0x47e03d80 # implver \$0
>-	lda \$2,-1
>-	.long 0x47e20c21 # amask \$2,\$1
>-	lda \$16,\$Lformat
>-	mov \$0,\$17
>-	not \$1,\$18
>-	jsr \$26,printf
>-	ldgp \$29,0(\$26)
>-	mov 0,\$16
>-	jsr \$26,exit
>-	.end main
>-EOF
>-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
>-	if test "$?" = 0 ; then
>-		case `./$dummy` in
>-			0-0)
>-				UNAME_MACHINE="alpha"
>-				;;
>-			1-0)
>-				UNAME_MACHINE="alphaev5"
>-				;;
>-			1-1)
>-				UNAME_MACHINE="alphaev56"
>-				;;
>-			1-101)
>-				UNAME_MACHINE="alphapca56"
>-				;;
>-			2-303)
>-				UNAME_MACHINE="alphaev6"
>-				;;
>-			2-307)
>-				UNAME_MACHINE="alphaev67"
>-				;;
>-		esac
>-	fi
>-	rm -f $dummy.s $dummy
>-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
>-	exit 0 ;;
>+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
>+	# 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
> 	# 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;;
>-    amiga:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     *:[Aa]miga[Oo][Ss]:*:*)
> 	echo ${UNAME_MACHINE}-unknown-amigaos
>-	exit 0 ;;
>-    arc64:OpenBSD:*:*)
>-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    arc:OpenBSD:*:*)
>-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    hkmips:OpenBSD:*:*)
>-	echo mips-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    pmax:OpenBSD:*:*)
>-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    sgi:OpenBSD:*:*)
>-	echo mips-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    wgrisc:OpenBSD:*:*)
>-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>+    *:[Mm]orph[Oo][Ss]:*:*)
>+	echo ${UNAME_MACHINE}-unknown-morphos
>+	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`" = att ; then
>@@ -282,25 +313,51 @@
> 	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 ;;
>+    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 ;;
>+	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 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="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
> 	# 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*)
>@@ -309,12 +366,12 @@
> 	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=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
>+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
> 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
> 	case "`/bin/arch`" in
> 	    sun3)
>@@ -324,13 +381,10 @@
> 		echo sparc-sun-sunos${UNAME_RELEASE}
> 		;;
> 	esac
>-	exit 0 ;;
>+	exit ;;
>     aushp:SunOS:*:*)
> 	echo sparc-auspex-sunos${UNAME_RELEASE}
>-	exit 0 ;;
>-    atari*:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${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
>@@ -340,51 +394,43 @@
>     # 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 ;;
>-    sun3*:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    mac68k:OpenBSD:*:*)
>-	echo m68k-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 ;;
>+	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
> #ifdef __cplusplus
> #include <stdio.h>  /* for printf() prototype */
>@@ -406,27 +452,36 @@
> 	  exit (-1);
> 	}
> EOF
>-	$CC_FOR_BUILD $dummy.c -o $dummy \
>-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \
>-	  && rm -f $dummy.c $dummy && exit 0
>-	rm -f $dummy.c $dummy
>+	$CC_FOR_BUILD -o $dummy $dummy.c &&
>+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` &&
>+	  SYSTEM_NAME=`$dummy $dummyarg` &&
>+	    { echo "$SYSTEM_NAME"; exit; }
> 	echo mips-mips-riscos${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>+    Motorola:PowerMAX_OS:*:*)
>+	echo powerpc-motorola-powermax
>+	exit ;;
>+    Motorola:*:4.3:PL8-*)
>+	echo powerpc-harris-powermax
>+	exit ;;
>+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
>+	echo powerpc-harris-powermax
>+	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=`/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 ] || \
>@@ -439,29 +494,29 @@
> 	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 (BSD)
> 	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 '
>-    i?86: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=`/usr/bin/oslevel`
>@@ -469,9 +524,10 @@
> 		IBM_REV=${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
> 		sed 's/^		//' << EOF >$dummy.c
> 		#include <sys/systemcfg.h>
> 
>@@ -483,17 +539,20 @@
> 			exit(0);
> 			}
> EOF
>-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
>-		rm -f $dummy.c $dummy
>-		echo rs6000-ibm-aix3.2.5
>+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$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])
>-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
>+	exit ;;
>+    *: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
> 	else
>@@ -505,28 +564,28 @@
> 		IBM_REV=${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=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
> 	case "${UNAME_MACHINE}" in
>@@ -533,68 +592,88 @@
> 	    9000/31? )            HP_ARCH=m68000 ;;
> 	    9000/[34]?? )         HP_ARCH=m68k ;;
> 	    9000/[678][0-9][0-9])
>-              case "${HPUX_REV}" in
>-                11.[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" ;;
>-                        esac ;;
>-                    esac
>-                  fi ;;
>-              esac
>-              if [ "${HP_ARCH}" = "" ]; then
>-              sed 's/^              //' << EOF >$dummy.c
>+		if [ -x /usr/bin/getconf ]; then
>+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
>+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
>+		    case "${sc_cpu_version}" in
>+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
>+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
>+		      532)                      # CPU_PA_RISC2_0
>+			case "${sc_kernel_bits}" in
>+			  32) HP_ARCH="hppa2.0n" ;;
>+			  64) HP_ARCH="hppa2.0w" ;;
>+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
>+			esac ;;
>+		    esac
>+		fi
>+		if [ "${HP_ARCH}" = "" ]; then
>+		    eval $set_cc_for_build
>+		    sed 's/^		//' << EOF >$dummy.c
> 
>-              #define _HPUX_SOURCE
>-              #include <stdlib.h>
>-              #include <unistd.h>
>+		#define _HPUX_SOURCE
>+		#include <stdlib.h>
>+		#include <unistd.h>
> 
>-              int main ()
>-              {
>-              #if defined(_SC_KERNEL_BITS)
>-                  long bits = sysconf(_SC_KERNEL_BITS);
>-              #endif
>-                  long cpu  = sysconf (_SC_CPU_VERSION);
>+		int main ()
>+		{
>+		#if defined(_SC_KERNEL_BITS)
>+		    long bits = sysconf(_SC_KERNEL_BITS);
>+		#endif
>+		    long cpu  = sysconf (_SC_CPU_VERSION);
> 
>-                  switch (cpu)
>-              	{
>-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
>-              	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= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
>-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
>-	rm -f $dummy.c $dummy
>-	fi ;;
>+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
>+		    test -z "$HP_ARCH" && HP_ARCH=hppa
>+		fi ;;
> 	esac
>+	if [ ${HP_ARCH} = "hppa2.0w" ]
>+	then
>+	    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 compiler
>+	    # generating 64-bit code.  GNU and HP use different nomenclature:
>+	    #
>+	    # $ CC_FOR_BUILD=cc ./config.guess
>+	    # => hppa2.0w-hp-hpux11.23
>+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
>+	    # => hppa64-hp-hpux11.23
>+
>+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
>+		grep -q __LP64__
>+	    then
>+		HP_ARCH="hppa2.0w"
>+	    else
>+		HP_ARCH="hppa64"
>+	    fi
>+	fi
> 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
>-	exit 0 ;;
>+	exit ;;
>     ia64:HP-UX:*:*)
> 	HPUX_REV=`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
> 	#include <unistd.h>
> 	int
>@@ -620,239 +699,280 @@
> 	  exit (0);
> 	}
> EOF
>-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
>-	rm -f $dummy.c $dummy
>+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$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 ;;
>-    *9??*:MPE/iX:*:*)
>+	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 ;;
>-    i?86:OSF1:*:*)
>+	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 ;;
>-    hppa*:OpenBSD:*:*)
>-	echo hppa-unknown-openbsd
>-	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 ;;
>-    CRAY*X-MP:*:*:*)
>-	echo xmp-cray-unicos
>-        exit 0 ;;
>+	exit ;;
>     CRAY*Y-MP:*:*:*)
>-	echo ymp-cray-unicos${UNAME_RELEASE}
>-	exit 0 ;;
>+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>+	exit ;;
>     CRAY*[A-Z]90:*:*:*)
> 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
> 	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
>-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
>-	exit 0 ;;
>+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
>+	      -e 's/\.[^.]*$/.X/'
>+	exit ;;
>     CRAY*TS:*:*:*)
> 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>-	exit 0 ;;
>-    CRAY*T3D:*:*:*)
>-	echo alpha-cray-unicosmk${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 ;;
>-    CRAY-2:*:*:*)
>-	echo cray2-cray-unicos
>-        exit 0 ;;
>+	exit ;;
>+    *:UNICOS/mp:*:*)
>+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>+	exit ;;
>     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
> 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
>-        FUJITSU_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 0 ;;
>-    hp300:OpenBSD:*:*)
>-	echo m68k-unknown-openbsd${UNAME_RELEASE}
>-	exit 0 ;;
>-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
>+	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}"
>+	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 ;;
>+	exit ;;
>     *:FreeBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>-	exit 0 ;;
>-    *:OpenBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
>-	exit 0 ;;
>+	UNAME_PROCESSOR=`/usr/bin/uname -p`
>+	case ${UNAME_PROCESSOR} in
>+	    amd64)
>+		echo x86_64-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 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 ;;
>+	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 ;;
>+    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 i386-pc-interix
>-	exit 0 ;;
>+	echo i586-pc-interix
>+	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:*:*)
>+	# the GNU system
> 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
>-	exit 0 ;;
>+	exit ;;
>+    *:GNU/*:*:*)
>+	# other systems with GNU libc and userland
>+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
>+	exit ;;
>     i*86:Minix:*:*)
> 	echo ${UNAME_MACHINE}-pc-minix
>-	exit 0 ;;
>+	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 ;;
>+	  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 ;;
>+    arc:Linux:*:* | arceb:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	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 0 ;;
>+	exit ;;
>+    cris:Linux:*:*)
>+	echo ${UNAME_MACHINE}-axis-linux-gnu
>+	exit ;;
>+    crisv32:Linux:*:*)
>+	echo ${UNAME_MACHINE}-axis-linux-gnu
>+	exit ;;
>+    frv:Linux:*:*)
>+	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
>+	#else
>+	#include <features.h>
>+	#ifdef __UCLIBC__
>+	LIBC=uclibc
>+	#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
>-	exit 0 ;;
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>+    m32r*:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     m68*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
>-	exit 0 ;;
>-    mips:Linux:*:*)
>-	cat >$dummy.c <<EOF
>-#ifdef __cplusplus
>-#include <stdio.h>  /* for printf() prototype */
>-int main (int argc, char *argv[]) {
>-#else
>-int main (argc, argv) int argc; char *argv[]; {
>-#endif
>-#ifdef __MIPSEB__
>-  printf ("%s-unknown-linux-gnu\n", argv[1]);
>-#endif
>-#ifdef __MIPSEL__
>-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
>-#endif
>-  return 0;
>-}
>+	exit ;;
>+    mips:Linux:*:* | mips64:Linux:*:*)
>+	eval $set_cc_for_build
>+	sed 's/^	//' << EOF >$dummy.c
>+	#undef CPU
>+	#undef ${UNAME_MACHINE}
>+	#undef ${UNAME_MACHINE}el
>+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
>+	CPU=${UNAME_MACHINE}el
>+	#else
>+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
>+	CPU=${UNAME_MACHINE}
>+	#else
>+	CPU=
>+	#endif
>+	#endif
> EOF
>-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
>-	rm -f $dummy.c $dummy
>+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
>+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>-    ppc:Linux:*:*)
>-	# Determine Lib Version
>-	cat >$dummy.c <<EOF
>-#include <features.h>
>-#if defined(__GLIBC__)
>-extern char __libc_version[];
>-extern char __libc_release[];
>-#endif
>-main(argc, argv)
>-     int argc;
>-     char *argv[];
>-{
>-#if defined(__GLIBC__)
>-  printf("%s %s\n", __libc_version, __libc_release);
>-#else
>-  printf("unknown\n");
>-#endif
>-  return 0;
>-}
>-EOF
>-	LIBC=""
>-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
>-	if test "$?" = 0 ; then
>-		./$dummy | grep 1\.99 > /dev/null
>-		if test "$?" = 0 ; then LIBC="libc1" ; fi
>-	fi
>-	rm -f $dummy.c $dummy
>-	echo powerpc-unknown-linux-gnu${LIBC}
>-	exit 0 ;;
>-    alpha:Linux:*:*)
>-	cat <<EOF >$dummy.s
>-	  .data
>-	  \$Lformat:
>-		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
>-	   .text
>-		.globl main
>-		.align 4
>-		.ent main
>-	    main:
>-		.frame \$30,16,\$26,0
>-		ldgp \$29,0(\$27)
>-		.prologue 1
>-		.long 0x47e03d80 # implver \$0
>-		lda \$2,-1
>-		.long 0x47e20c21 # amask \$2,\$1
>-		lda \$16,\$Lformat
>-		mov \$0,\$17
>-		not \$1,\$18
>-		jsr \$26,printf
>-		ldgp \$29,0(\$26)
>-		mov 0,\$16
>-		jsr \$26,exit
>-		.end main
>-EOF
>-	LIBC=""
>-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
>-	if test "$?" = 0 ; then
>-		case `./$dummy` in
>-		0-0)	UNAME_MACHINE="alpha" ;;
>-		1-0)	UNAME_MACHINE="alphaev5" ;;
>-		1-1)    UNAME_MACHINE="alphaev56" ;;
>-		1-101)	UNAME_MACHINE="alphapca56" ;;
>-		2-303)	UNAME_MACHINE="alphaev6" ;;
>-		2-307)	UNAME_MACHINE="alphaev67" ;;
>-		esac
>-		objdump --private-headers $dummy | \
>-		  grep ld.so.1 > /dev/null
>-		if test "$?" = 0 ; then
>-			LIBC="libc1"
>-		fi
>-	fi
>-	rm -f $dummy.s $dummy
>-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
>-	exit 0 ;;
>+    or1k:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>+    or32:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>+    padre:Linux:*:*)
>+	echo sparc-unknown-linux-gnu
>+	exit ;;
>+    parisc64:Linux:*:* | hppa64:Linux:*:*)
>+	echo hppa64-unknown-linux-gnu
>+	exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
> 	# Look for CPU level
> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>@@ -860,102 +980,74 @@
> 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
> 	  *)    echo hppa-unknown-linux-gnu ;;
> 	esac
>-	exit 0 ;;
>-    parisc64:Linux:*:* | hppa64:Linux:*:*)
>-	echo hppa64-unknown-linux-gnu
>-	exit 0 ;;
>+	exit ;;
>+    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 0 ;;
>+	exit ;;
>+    sh64*:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     sh*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
>-	exit 0 ;;
>+	exit ;;
>     sparc:Linux:*:* | sparc64:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
>-	exit 0 ;;
>+	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
>-	exit 0 ;;
>-    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.
>-	ld_supported_emulations=`cd /; ld --help 2>&1 \
>-			 | sed -ne '/supported emulations:/!d
>-				    s/[ 	][ 	]*/ /g
>-				    s/.*supported emulations: *//
>-				    s/ .*//
>-				    p'`
>-        case "$ld_supported_emulations" in
>-	  i?86linux)
>-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
>-		exit 0
>-		;;
>-	  elf_i?86)
>-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
>-		;;
>-	  i?86coff)
>-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
>-		exit 0
>-		;;
>-	esac
>-	# Either a pre-BFD a.out linker (linux-gnuoldld)
>-	# or one that does not give us useful --help.
>-	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
>-	# If ld does not provide *any* "supported emulations:"
>-	# that means it is gnuoldld.
>-	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
>-	case "${UNAME_MACHINE}" in
>-	i?86)
>-	  VENDOR=pc;
>-	  ;;
>-	*)
>-	  VENDOR=unknown;
>-	  ;;
>-	esac
>-	# Determine whether the default compiler is a.out or elf
>-	cat >$dummy.c <<EOF
>-#include <features.h>
>-#ifdef __cplusplus
>-#include <stdio.h>  /* for printf() prototype */
>-	int main (int argc, char *argv[]) {
>-#else
>-	int main (argc, argv) int argc; char *argv[]; {
>-#endif
>-#ifdef __ELF__
>-# ifdef __GLIBC__
>-#  if __GLIBC__ >= 2
>-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
>-#  else
>-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
>-#  endif
>-# else
>-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
>-# endif
>-#else
>-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
>-#endif
>-  return 0;
>-}
>-EOF
>-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
>-	rm -f $dummy.c $dummy
>-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
>-	;;
>-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
>-# are messed up and put the nodename in both sysname and nodename.
>-    i?86:DYNIX/ptx:4*:*)
>+	LIBC=gnu
>+	test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc
>+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
>+	exit ;;
>+    xtensa*:Linux:*:*)
>+	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	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
>+	# sysname and nodename.
> 	echo i386-sequent-sysv4
>-	exit 0 ;;
>-    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,
>+	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,
> 	# 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 0 ;;
>-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
>+	exit ;;
>+    i*86:OS/2:*:*)
>+	# If we were able to find `uname', then EMX Unix compatibility
>+	# is probably installed.
>+	echo ${UNAME_MACHINE}-pc-os2-emx
>+	exit ;;
>+    i*86:XTS-300:*:STOP)
>+	echo ${UNAME_MACHINE}-unknown-stop
>+	exit ;;
>+    i*86:atheos:*:*)
>+	echo ${UNAME_MACHINE}-unknown-atheos
>+	exit ;;
>+    i*86:syllable:*:*)
>+	echo ${UNAME_MACHINE}-pc-syllable
>+	exit ;;
>+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
>+	echo i386-unknown-lynxos${UNAME_RELEASE}
>+	exit ;;
>+    i*86:*DOS:*:*)
>+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
>+	exit ;;
>+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
> 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
> 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
> 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
>@@ -962,49 +1054,49 @@
> 	else
> 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
> 	fi
>-	exit 0 ;;
>-    i?86:*:5:7*)
>-        # Fixed at (any) Pentium or better
>-        UNAME_MACHINE=i586
>-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
>-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
>-	else
>-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
>-	fi
>-	exit 0 ;;
>-    i?86:*:3.2:*)
>+	exit ;;
>+    i*86:*:5:[678]*)
>+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
>+	case `/bin/uname -X | grep "^Machine"` in
>+	    *486*)	     UNAME_MACHINE=i486 ;;
>+	    *Pentium)	     UNAME_MACHINE=i586 ;;
>+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
>+	esac
>+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
>+	exit ;;
>+    i*86:*:3.2:*)
> 	if test -f /usr/options/cb.name; then
> 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
> 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
> 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
>-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
>-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
>-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
>+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
>+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
>+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
> 			&& UNAME_MACHINE=i586
>-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
>+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
> 			&& UNAME_MACHINE=i686
>-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
>+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
> 			&& UNAME_MACHINE=i686
> 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
> 	else
> 		echo ${UNAME_MACHINE}-pc-sysv32
> 	fi
>-	exit 0 ;;
>-    i?86:*DOS:*:*)
>-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
>-	exit 0 ;;
>+	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 i386.
>-	echo i386-pc-msdosdjgpp
>-        exit 0 ;;
>+	# 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 ;;
>     Intel:Mach:3*:*)
> 	echo i386-pc-mach3
>-	exit 0 ;;
>+	exit ;;
>     paragon:*:*:*)
> 	echo i860-intel-osf1
>-	exit 0 ;;
>+	exit ;;
>     i860:*:4.*:*) # i860-SVR4
> 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
> 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
>@@ -1011,51 +1103,64 @@
> 	else # Add other i860-SVR4 vendors below as they are discovered.
> 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
> 	fi
>-	exit 0 ;;
>+	exit ;;
>     mini*:CTIX:SYS*5:*)
> 	# "miniframe"
> 	echo m68010-convergent-sysv
>-	exit 0 ;;
>-    M68*:*:R3V[567]*:*)
>-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
>-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
>+	exit ;;
>+    mc68k:UNIX:SYSTEM5:3.51m)
>+	echo m68k-convergent-sysv
>+	exit ;;
>+    M680?0:D-NIX:5.3:*)
>+	echo m68k-diab-dnix
>+	exit ;;
>+    M68*:*:R3V[5678]*:*)
>+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
>+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
> 	OS_REL=''
> 	test -r /etc/.relid \
> 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
> 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
>+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
> 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
>+	  && { 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 0 ;;
>+	/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 \
>+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     mc68030:UNIX_System_V:4.*:*)
> 	echo m68k-atari-sysv4
>-	exit 0 ;;
>-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:* | i?86:LynxOS:4.0*:*)
>-	echo i386-unknown-lynxos${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     TSUNAMI:LynxOS:2.*:*)
> 	echo sparc-unknown-lynxos${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     rs6000:LynxOS:2.*:*)
> 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
>-	exit 0 ;;
>-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
>+	exit ;;
>+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
> 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     SM[BE]S:UNIX_SV:*:*)
> 	echo mips-dde-sysv${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     RM*:ReliantUNIX-*:*:*)
> 	echo mips-sni-sysv4
>-	exit 0 ;;
>+	exit ;;
>     RM*:SINIX-*:*:*)
> 	echo mips-sni-sysv4
>-	exit 0 ;;
>+	exit ;;
>     *:SINIX-*:*:*)
> 	if uname -p 2>/dev/null >/dev/null ; then
> 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
>@@ -1063,78 +1168,126 @@
> 	else
> 		echo ns32k-sni-sysv
> 	fi
>-	exit 0 ;;
>-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
>-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
>-        echo i586-unisys-sysv4
>-        exit 0 ;;
>+	exit ;;
>+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
>+			# says <Richard.M.Bartel@ccMail.Census.GOV>
>+	echo i586-unisys-sysv4
>+	exit ;;
>     *:UNIX_System_V:4*:FTX*)
> 	# From Gerald Hewes <hewes@openmarket.com>.
> 	# How about differentiating between stratus architectures? -djm
> 	echo hppa1.1-stratus-sysv4
>-	exit 0 ;;
>+	exit ;;
>     *:*:*:FTX*)
> 	# From seanf@swdc.stratus.com.
> 	echo i860-stratus-sysv4
>-	exit 0 ;;
>+	exit ;;
>+    i*86:VOS:*:*)
>+	# From Paul.Green@stratus.com.
>+	echo ${UNAME_MACHINE}-stratus-vos
>+	exit ;;
>+    *:VOS:*:*)
>+	# From Paul.Green@stratus.com.
>+	echo hppa1.1-stratus-vos
>+	exit ;;
>     mc68*:A/UX:*:*)
> 	echo m68k-apple-aux${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     news*:NEWS-OS:6*:*)
> 	echo mips-sony-newsos6
>-	exit 0 ;;
>+	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 0 ;;
>+	exit ;;
>     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
> 	echo powerpc-be-beos
>-	exit 0 ;;
>+	exit ;;
>     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
> 	echo powerpc-apple-beos
>-	exit 0 ;;
>+	exit ;;
>     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
> 	echo i586-pc-beos
>-	exit 0 ;;
>+	exit ;;
>+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
>+	echo i586-pc-haiku
>+	exit ;;
>+    x86_64:Haiku:*:*)
>+	echo x86_64-unknown-haiku
>+	exit ;;
>     SX-4:SUPER-UX:*:*)
> 	echo sx4-nec-superux${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     SX-5:SUPER-UX:*:*)
> 	echo sx5-nec-superux${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>+    SX-6:SUPER-UX:*:*)
>+	echo sx6-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-7:SUPER-UX:*:*)
>+	echo sx7-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8:SUPER-UX:*:*)
>+	echo sx8-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8R:SUPER-UX:*:*)
>+	echo sx8r-nec-superux${UNAME_RELEASE}
>+	exit ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     *:Rhapsody:*:*)
> 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     *:Darwin:*:*)
>-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
>-	exit 0 ;;
>+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
>+	case $UNAME_PROCESSOR in
>+	    i386)
>+		eval $set_cc_for_build
>+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
>+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
>+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
>+		      grep IS_64BIT_ARCH >/dev/null
>+		  then
>+		      UNAME_PROCESSOR="x86_64"
>+		  fi
>+		fi ;;
>+	    unknown) UNAME_PROCESSOR=powerpc ;;
>+	esac
>+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>+	exit ;;
>     *:procnto*:*:* | *:QNX:[0123456789]*:*)
>-	if test "${UNAME_MACHINE}" = "x86pc"; then
>+	UNAME_PROCESSOR=`uname -p`
>+	if test "$UNAME_PROCESSOR" = "x86"; then
>+		UNAME_PROCESSOR=i386
> 		UNAME_MACHINE=pc
> 	fi
>-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
>-	exit 0 ;;
>+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
>+	exit ;;
>     *:QNX:*:4*)
> 	echo i386-pc-qnx
>-	exit 0 ;;
>-    NSR-[KW]:NONSTOP_KERNEL:*:*)
>+	exit ;;
>+    NEO-?:NONSTOP_KERNEL:*:*)
>+	echo neo-tandem-nsk${UNAME_RELEASE}
>+	exit ;;
>+    NSE-*:NONSTOP_KERNEL:*:*)
>+	echo nse-tandem-nsk${UNAME_RELEASE}
>+	exit ;;
>+    NSR-?:NONSTOP_KERNEL:*:*)
> 	echo nsr-tandem-nsk${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     *:NonStop-UX:*:*)
> 	echo mips-compaq-nonstopux
>-	exit 0 ;;
>+	exit ;;
>     BS2000:POSIX*:*:*)
> 	echo bs2000-siemens-sysv
>-	exit 0 ;;
>+	exit ;;
>     DS/*:UNIX_System_V:*:*)
> 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
>-	exit 0 ;;
>+	exit ;;
>     *:Plan9:*:*)
> 	# "uname -m" is not consistent, so use $cputype instead. 386
> 	# is converted to i386 for consistency with other x86
>@@ -1145,35 +1298,56 @@
> 	    UNAME_MACHINE="$cputype"
> 	fi
> 	echo ${UNAME_MACHINE}-unknown-plan9
>-	exit 0 ;;
>-    i?86:OS/2:*:*)
>-	# If we were able to find `uname', then EMX Unix compatibility
>-	# is probably installed.
>-	echo ${UNAME_MACHINE}-pc-os2-emx
>-	exit 0 ;;
>+	exit ;;
>     *:TOPS-10:*:*)
> 	echo pdp10-unknown-tops10
>-	exit 0 ;;
>+	exit ;;
>     *:TENEX:*:*)
> 	echo pdp10-unknown-tenex
>-	exit 0 ;;
>+	exit ;;
>     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
> 	echo pdp10-dec-tops20
>-	exit 0 ;;
>+	exit ;;
>     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
> 	echo pdp10-xkl-tops20
>-	exit 0 ;;
>+	exit ;;
>     *:TOPS-20:*:*)
> 	echo pdp10-unknown-tops20
>-	exit 0 ;;
>+	exit ;;
>     *:ITS:*:*)
> 	echo pdp10-unknown-its
>-	exit 0 ;;
>+	exit ;;
>+    SEI:*:*:SEIUX)
>+	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`
>+	case "${UNAME_MACHINE}" in
>+	    A*) echo alpha-dec-vms ; exit ;;
>+	    I*) echo ia64-dec-vms ; exit ;;
>+	    V*) echo vax-dec-vms ; exit ;;
>+	esac ;;
>+    *:XENIX:*:SysV)
>+	echo i386-pc-xenix
>+	exit ;;
>+    i*86:skyos:*:*)
>+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
>+	exit ;;
>+    i*86:rdos:*:*)
>+	echo ${UNAME_MACHINE}-pc-rdos
>+	exit ;;
>+    i*86:AROS:*:*)
>+	echo ${UNAME_MACHINE}-pc-aros
>+	exit ;;
>+    x86_64:VMkernel:*:*)
>+	echo ${UNAME_MACHINE}-unknown-esx
>+	exit ;;
> esac
> 
>-#echo '(No uname command or uname output not recognized.)' 1>&2
>-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
>-
>+eval $set_cc_for_build
> cat >$dummy.c <<EOF
> #ifdef _SEQUENT_
> # include <sys/types.h>
>@@ -1190,16 +1364,16 @@
> #include <sys/param.h>
>   printf ("m68k-sony-newsos%s\n",
> #ifdef NEWSOS4
>-          "4"
>+	"4"
> #else
>-	  ""
>+	""
> #endif
>-         ); exit (0);
>+	); exit (0);
> #endif
> #endif
> 
> #if defined (__arm) && defined (__acorn) && defined (__unix)
>-  printf ("arm-acorn-riscix"); exit (0);
>+  printf ("arm-acorn-riscix\n"); exit (0);
> #endif
> 
> #if defined (hp300) && !defined (hpux)
>@@ -1288,12 +1462,12 @@
> }
> EOF
> 
>-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
>-rm -f $dummy.c $dummy
>+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
>+	{ echo "$SYSTEM_NAME"; exit; }
> 
> # Apollos put the system type in the environment.
> 
>-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
>+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
> 
> # Convex versions that predate uname can use getsysinfo(1)
> 
>@@ -1302,22 +1476,22 @@
>     case `getsysinfo -f cpu_type` in
>     c1*)
> 	echo c1-convex-bsd
>-	exit 0 ;;
>+	exit ;;
>     c2*)
> 	if getsysinfo -f scalar_acc
> 	then echo c32-convex-bsd
> 	else echo c2-convex-bsd
> 	fi
>-	exit 0 ;;
>+	exit ;;
>     c34*)
> 	echo c34-convex-bsd
>-	exit 0 ;;
>+	exit ;;
>     c38*)
> 	echo c38-convex-bsd
>-	exit 0 ;;
>+	exit ;;
>     c4*)
> 	echo c4-convex-bsd
>-	exit 0 ;;
>+	exit ;;
>     esac
> fi
> 
>@@ -1328,7 +1502,9 @@
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-    ftp://ftp.gnu.org/pub/gnu/config/
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
>+and
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
>Index: snmp_common/libsmi/config.sub
>===================================================================
>--- snmp_common/libsmi/config.sub	(revision 11283)
>+++ snmp_common/libsmi/config.sub	(working copy)
>@@ -1,35 +1,31 @@
> #! /bin/sh
> # Configuration validation subroutine script.
>-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
>-#   Free Software Foundation, Inc.
>+#   Copyright 1992-2013 Free Software Foundation, Inc.
> 
>-timestamp='2001-03-30'
>+timestamp='2013-04-24'
> 
>-# This file is (in principle) common to ALL GNU software.
>-# The presence of a machine in this file suggests that SOME GNU software
>-# can handle that machine.  It does not imply ALL GNU software can.
>-#
>-# This file is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2 of the License, or
>+# This file is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
> # (at your option) any later version.
> #
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# This program is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+# General Public License for more details.
> #
> # 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 program.
>+# the same distribution terms that you use for the rest of that
>+# program.  This Exception is an additional permission under section 7
>+# of the GNU General Public License, version 3 ("GPLv3").
> 
>-# Please send patches to <config-patches@gnu.org>.
>+
>+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
> #
> # Configuration subroutine to validate and canonicalize a configuration type.
> # Supply the specified configuration type as an argument.
>@@ -36,6 +32,9 @@
> # If it is invalid, we print an error message on stderr and exit with code 1.
> # Otherwise, we print the canonical config type on stdout and succeed.
> 
>+# You can get the latest version of this script from:
>+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
>+
> # This file is supposed to be the same for all GNU packages
> # and recognize all the CPU types, system types and aliases
> # that are meaningful with *any* GNU software.
>@@ -69,8 +68,7 @@
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
>-Free Software Foundation, Inc.
>+Copyright 1992-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."
>@@ -82,11 +80,11 @@
> 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.
>@@ -98,7 +96,7 @@
>     *local*)
>        # First pass through any local machine types.
>        echo $1
>-       exit 0;;
>+       exit ;;
> 
>     * )
>        break ;;
>@@ -117,10 +115,18 @@
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
>+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
>+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
>+  knetbsd*-gnu* | netbsd*-gnu* | \
>+  kopensolaris*-gnu* | \
>+  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 ]
>@@ -143,10 +149,13 @@
> 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
> 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
> 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
>-	-apple | -axis)
>+	-apple | -axis | -knuth | -cray | -microblaze*)
> 		os=
> 		basic_machine=$1
> 		;;
>+	-bluegene*)
>+		os=-cnk
>+		;;
> 	-sim | -cisco | -oki | -wec | -winbond)
> 		os=
> 		basic_machine=$1
>@@ -157,9 +166,21 @@
> 		os=-vxworks
> 		basic_machine=$1
> 		;;
>+	-chorusos*)
>+		os=-chorusos
>+		basic_machine=$1
>+		;;
>+	-chorusrdb)
>+		os=-chorusrdb
>+		basic_machine=$1
>+		;;
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>+	-sco6)
>+		os=-sco5v6
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco5)
> 		os=-sco3.2v5
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -176,6 +197,10 @@
> 		# Don't forget version if it is 3.2v4 or newer.
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-sco5v6*)
>+		# Don't forget version if it is 3.2v4 or newer.
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco*)
> 		os=-sco3.2v2
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -193,6 +218,12 @@
> 	-isc*)
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-lynx*178)
>+		os=-lynxos178
>+		;;
>+	-lynx*5)
>+		os=-lynxos5
>+		;;
> 	-lynx*)
> 		os=-lynxos
> 		;;
>@@ -215,39 +246,113 @@
> case $basic_machine in
> 	# Recognize the basic CPU types without company name.
> 	# Some are omitted here because they have special meanings below.
>-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
>-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
>-		| pyramid | mn10200 | mn10300 | tron | a29k \
>-		| 580 | i960 | h8300 \
>-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
>-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
>-		| hppa64 \
>-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
>-		| alphaev6[78] \
>-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
>-		| powerpc | powerpcle \
>-		| 1750a | dsp16xx | pdp10 | pdp11 \
>-		| mips16 | mips64 | mipsel | mips64el \
>-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
>-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
>-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
>-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
>-		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
>-		| pj | pjl | h8500)
>+	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 | arceb \
>+	| 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 | microblazeel | mcore | mep | metag \
>+	| mips | mipsbe | mipseb | mipsel | mipsle \
>+	| mips16 \
>+	| mips64 | mips64el \
>+	| mips64octeon | mips64octeonel \
>+	| mips64orion | mips64orionel \
>+	| mips64r5900 | mips64r5900el \
>+	| mips64vr | mips64vrel \
>+	| mips64vr4100 | mips64vr4100el \
>+	| mips64vr4300 | mips64vr4300el \
>+	| mips64vr5000 | mips64vr5000el \
>+	| mips64vr5900 | mips64vr5900el \
>+	| mipsisa32 | mipsisa32el \
>+	| mipsisa32r2 | mipsisa32r2el \
>+	| mipsisa64 | mipsisa64el \
>+	| mipsisa64r2 | mipsisa64r2el \
>+	| mipsisa64sb1 | mipsisa64sb1el \
>+	| mipsisa64sr71k | mipsisa64sr71kel \
>+	| mipsr5900 | mipsr5900el \
>+	| mipstx39 | mipstx39el \
>+	| mn10200 | mn10300 \
>+	| moxie \
>+	| mt \
>+	| msp430 \
>+	| nds32 | nds32le | nds32be \
>+	| nios | nios2 | nios2eb | nios2el \
>+	| ns16k | ns32k \
>+	| open8 \
>+	| or1k | or32 \
>+	| pdp10 | pdp11 | pj | pjl \
>+	| powerpc | powerpc64 | powerpc64le | powerpcle \
>+	| pyramid \
>+	| 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 \
>+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
>+	| ubicom32 \
>+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
>+	| we32k \
>+	| x86 | xc16x | xstormy16 | xtensa \
>+	| z8k | z80)
> 		basic_machine=$basic_machine-unknown
> 		;;
>-	m6811 | m68hc11 | m6812 | m68hc12)
>-		# Motorola 68HC11/12.
>+	c54x)
>+		basic_machine=tic54x-unknown
>+		;;
>+	c55x)
>+		basic_machine=tic55x-unknown
>+		;;
>+	c6x)
>+		basic_machine=tic6x-unknown
>+		;;
>+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
> 		basic_machine=$basic_machine-unknown
> 		os=-none
> 		;;
>-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
>+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
>+	ms1)
>+		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.
>-	i[234567]86 | x86_64)
>+	i*86 | x86_64)
> 	  basic_machine=$basic_machine-pc
> 	  ;;
> 	# Object if more than one company name word.
>@@ -256,31 +361,85 @@
> 		exit 1
> 		;;
> 	# Recognize the basic CPU types with company name.
>-	# FIXME: clean up the formatting here.
>-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
>-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
>-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
>-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
>-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
>-	      | xmp-* | ymp-* \
>-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
>-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
>-	      | hppa2.0n-* | hppa64-* \
>-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
>-	      | alphaev6[78]-* \
>-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
>-	      | clipper-* | orion-* \
>-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
>-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
>-	      | mips64el-* | mips64orion-* | mips64orionel-* \
>-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
>-	      | mipstx39-* | mipstx39el-* | mcore-* \
>-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
>-	      | [cjt]90-* \
>-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
>-	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
>-	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
>+	580-* \
>+	| a29k-* \
>+	| aarch64-* | aarch64_be-* \
>+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
>+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
>+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
>+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>+	| avr-* | avr32-* \
>+	| be32-* | be64-* \
>+	| bfin-* | bs2000-* \
>+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
>+	| clipper-* | craynv-* | cydra-* \
>+	| d10v-* | d30v-* | dlx-* \
>+	| elxsi-* \
>+	| 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-* | microblazeel-* \
>+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
>+	| mips16-* \
>+	| mips64-* | mips64el-* \
>+	| mips64octeon-* | mips64octeonel-* \
>+	| mips64orion-* | mips64orionel-* \
>+	| mips64r5900-* | mips64r5900el-* \
>+	| mips64vr-* | mips64vrel-* \
>+	| mips64vr4100-* | mips64vr4100el-* \
>+	| mips64vr4300-* | mips64vr4300el-* \
>+	| mips64vr5000-* | mips64vr5000el-* \
>+	| mips64vr5900-* | mips64vr5900el-* \
>+	| mipsisa32-* | mipsisa32el-* \
>+	| mipsisa32r2-* | mipsisa32r2el-* \
>+	| mipsisa64-* | mipsisa64el-* \
>+	| mipsisa64r2-* | mipsisa64r2el-* \
>+	| mipsisa64sb1-* | mipsisa64sb1el-* \
>+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
>+	| mipsr5900-* | mipsr5900el-* \
>+	| mipstx39-* | mipstx39el-* \
>+	| mmix-* \
>+	| mt-* \
>+	| msp430-* \
>+	| nds32-* | nds32le-* | nds32be-* \
>+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
>+	| none-* | np1-* | ns16k-* | ns32k-* \
>+	| open8-* \
>+	| orion-* \
>+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
>+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
>+	| pyramid-* \
>+	| rl78-* | romp-* | rs6000-* | rx-* \
>+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
>+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
>+	| sparclite-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
>+	| tahoe-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tile*-* \
>+	| tron-* \
>+	| ubicom32-* \
>+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
>+	| vax-* \
>+	| we32k-* \
>+	| x86-* | x86_64-* | xc16x-* | xps100-* \
>+	| xstormy16-* | xtensa*-* \
>+	| ymp-* \
>+	| z8k-* | z80-*)
> 		;;
>+	# Recognize the basic CPU types without company name, with glob match.
>+	xtensa*)
>+		basic_machine=$basic_machine-unknown
>+		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
> 	386bsd)
>@@ -297,6 +456,9 @@
> 		basic_machine=a29k-amd
> 		os=-udi
> 		;;
>+	abacus)
>+		basic_machine=abacus-unknown
>+		;;
> 	adobe68k)
> 		basic_machine=m68010-adobe
> 		os=-scout
>@@ -311,6 +473,12 @@
> 		basic_machine=a29k-none
> 		os=-bsd
> 		;;
>+	amd64)
>+		basic_machine=x86_64-pc
>+		;;
>+	amd64-*)
>+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	amdahl)
> 		basic_machine=580-amdahl
> 		os=-sysv
>@@ -334,6 +502,10 @@
> 		basic_machine=m68k-apollo
> 		os=-bsd
> 		;;
>+	aros)
>+		basic_machine=i386-pc
>+		os=-aros
>+		;;
> 	aux)
> 		basic_machine=m68k-apple
> 		os=-aux
>@@ -342,6 +514,35 @@
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	blackfin)
>+		basic_machine=bfin-unknown
>+		os=-linux
>+		;;
>+	blackfin-*)
>+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
>+	bluegene*)
>+		basic_machine=powerpc-ibm
>+		os=-cnk
>+		;;
>+	c54x-*)
>+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
>+	c55x-*)
>+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
>+	c6x-*)
>+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
>+	c90)
>+		basic_machine=c90-cray
>+		os=-unicos
>+		;;
>+	cegcc)
>+		basic_machine=arm-unknown
>+		os=-cegcc
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -362,24 +563,31 @@
> 		basic_machine=c38-convex
> 		os=-bsd
> 		;;
>-	cray | ymp)
>-		basic_machine=ymp-cray
>+	cray | j90)
>+		basic_machine=j90-cray
> 		os=-unicos
> 		;;
>-	cray2)
>-		basic_machine=cray2-cray
>-		os=-unicos
>+	craynv)
>+		basic_machine=craynv-cray
>+		os=-unicosmp
> 		;;
>-	[cjt]90)
>-		basic_machine=${basic_machine}-cray
>-		os=-unicos
>+	cr16 | cr16-*)
>+		basic_machine=cr16-unknown
>+		os=-elf
> 		;;
> 	crds | unos)
> 		basic_machine=m68k-crds
> 		;;
>+	crisv32 | crisv32-* | etraxfs*)
>+		basic_machine=crisv32-axis
>+		;;
> 	cris | cris-* | etrax*)
> 		basic_machine=cris-axis
> 		;;
>+	crx)
>+		basic_machine=crx-unknown
>+		os=-elf
>+		;;
> 	da30 | da30-*)
> 		basic_machine=m68k-da30
> 		;;
>@@ -386,6 +594,14 @@
> 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
> 		basic_machine=mips-dec
> 		;;
>+	decsystem10* | dec10*)
>+		basic_machine=pdp10-dec
>+		os=-tops10
>+		;;
>+	decsystem20* | dec20*)
>+		basic_machine=pdp10-dec
>+		os=-tops20
>+		;;
> 	delta | 3300 | motorola-3300 | motorola-delta \
> 	      | 3300-motorola | delta-motorola)
> 		basic_machine=m68k-motorola
>@@ -394,6 +610,14 @@
> 		basic_machine=m88k-motorola
> 		os=-sysv3
> 		;;
>+	dicos)
>+		basic_machine=i686-pc
>+		os=-dicos
>+		;;
>+	djgpp)
>+		basic_machine=i586-pc
>+		os=-msdosdjgpp
>+		;;
> 	dpx20 | dpx20-*)
> 		basic_machine=rs6000-bull
> 		os=-bosx
>@@ -505,20 +729,19 @@
> 	i370-ibm* | ibm*)
> 		basic_machine=i370-ibm
> 		;;
>-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
>-	i[34567]86v32)
>+	i*86v32)
> 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
> 		os=-sysv32
> 		;;
>-	i[34567]86v4*)
>+	i*86v4*)
> 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
> 		os=-sysv4
> 		;;
>-	i[34567]86v)
>+	i*86v)
> 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
> 		os=-sysv
> 		;;
>-	i[34567]86sol2)
>+	i*86sol2)
> 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
> 		os=-solaris2
> 		;;
>@@ -544,6 +767,14 @@
> 		basic_machine=m68k-isi
> 		os=-sysv
> 		;;
>+	m68knommu)
>+		basic_machine=m68k-unknown
>+		os=-linux
>+		;;
>+	m68knommu-*)
>+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	m88k-omron*)
> 		basic_machine=m88k-omron
> 		;;
>@@ -555,10 +786,21 @@
> 		basic_machine=ns32k-utek
> 		os=-sysv
> 		;;
>+	microblaze*)
>+		basic_machine=microblaze-xilinx
>+		;;
>+	mingw64)
>+		basic_machine=x86_64-pc
>+		os=-mingw64
>+		;;
> 	mingw32)
> 		basic_machine=i386-pc
> 		os=-mingw32
> 		;;
>+	mingw32ce)
>+		basic_machine=arm-unknown
>+		os=-mingw32ce
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>@@ -566,14 +808,6 @@
> 		basic_machine=m68k-atari
> 		os=-mint
> 		;;
>-	mipsel*-linux*)
>-		basic_machine=mipsel-unknown
>-		os=-linux-gnu
>-		;;
>-	mips*-linux*)
>-		basic_machine=mips-unknown
>-		os=-linux-gnu
>-		;;
> 	mips3*-*)
> 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
> 		;;
>@@ -580,22 +814,33 @@
> 	mips3*)
> 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
> 		;;
>-	mmix*)
>-		basic_machine=mmix-knuth
>-		os=-mmixware
>-		;;
> 	monitor)
> 		basic_machine=m68k-rom68k
> 		os=-coff
> 		;;
>+	morphos)
>+		basic_machine=powerpc-unknown
>+		os=-morphos
>+		;;
> 	msdos)
> 		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	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
>@@ -660,6 +905,12 @@
> 	np1)
> 		basic_machine=np1-gould
> 		;;
>+	neo-tandem)
>+		basic_machine=neo-tandem
>+		;;
>+	nse-tandem)
>+		basic_machine=nse-tandem
>+		;;
> 	nsr-tandem)
> 		basic_machine=nsr-tandem
> 		;;
>@@ -667,6 +918,13 @@
> 		basic_machine=hppa1.1-oki
> 		os=-proelf
> 		;;
>+	openrisc | openrisc-*)
>+		basic_machine=or32-unknown
>+		;;
>+	os400)
>+		basic_machine=powerpc-ibm
>+		os=-os400
>+		;;
> 	OSE68000 | ose68000)
> 		basic_machine=m68000-ericsson
> 		os=-ose
>@@ -683,6 +941,14 @@
> 		basic_machine=i860-intel
> 		os=-osf
> 		;;
>+	parisc)
>+		basic_machine=hppa-unknown
>+		os=-linux
>+		;;
>+	parisc-*)
>+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	pbd)
> 		basic_machine=sparc-tti
> 		;;
>@@ -689,42 +955,65 @@
> 	pbb)
> 		basic_machine=m68k-tti
> 		;;
>-        pc532 | pc532-*)
>+	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>-	pentium | p5 | k5 | k6 | nexgen)
>+	pc98)
>+		basic_machine=i386-pc
>+		;;
>+	pc98-*)
>+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
>+	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>-	pentiumpro | p6 | 6x86 | athlon)
>+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
> 		basic_machine=i686-pc
> 		;;
>-	pentiumii | pentium2)
>+	pentiumii | pentium2 | pentiumiii | pentium3)
> 		basic_machine=i686-pc
> 		;;
>-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
>+	pentium4)
>+		basic_machine=i786-pc
>+		;;
>+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
> 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
> 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
> 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
>-	pentiumii-* | pentium2-*)
>+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
> 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
>+	pentium4-*)
>+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	pn)
> 		basic_machine=pn-gould
> 		;;
> 	power)	basic_machine=power-ibm
> 		;;
>-	ppc)	basic_machine=powerpc-unknown
>-	        ;;
>-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
>+	ppc | ppcbe)	basic_machine=powerpc-unknown
> 		;;
>+	ppc-* | ppcbe-*)
>+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	ppcle | powerpclittle | ppc-le | powerpc-little)
> 		basic_machine=powerpcle-unknown
>-	        ;;
>+		;;
> 	ppcle-* | powerpclittle-*)
> 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
> 		;;
>+	ppc64)	basic_machine=powerpc64-unknown
>+		;;
>+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
>+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
>+		basic_machine=powerpc64le-unknown
>+		;;
>+	ppc64le-* | powerpc64little-*)
>+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	ps2)
> 		basic_machine=i386-ibm
> 		;;
>@@ -732,6 +1021,14 @@
> 		basic_machine=i586-unknown
> 		os=-pw32
> 		;;
>+	rdos | rdos64)
>+		basic_machine=x86_64-pc
>+		os=-rdos
>+		;;
>+	rdos32)
>+		basic_machine=i386-pc
>+		os=-rdos
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -742,10 +1039,30 @@
> 	rtpc | rtpc-*)
> 		basic_machine=romp-ibm
> 		;;
>+	s390 | s390-*)
>+		basic_machine=s390-ibm
>+		;;
>+	s390x | s390x-*)
>+		basic_machine=s390x-ibm
>+		;;
> 	sa29200)
> 		basic_machine=a29k-amd
> 		os=-udi
> 		;;
>+	sb1)
>+		basic_machine=mipsisa64sb1-unknown
>+		;;
>+	sb1el)
>+		basic_machine=mipsisa64sb1el-unknown
>+		;;
>+	sde)
>+		basic_machine=mipsisa32-sde
>+		os=-elf
>+		;;
>+	sei)
>+		basic_machine=mips-sei
>+		os=-seiux
>+		;;
> 	sequent)
> 		basic_machine=i386-sequent
> 		;;
>@@ -753,7 +1070,13 @@
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>-	sparclite-wrs)
>+	sh5el)
>+		basic_machine=sh5le-unknown
>+		;;
>+	sh64)
>+		basic_machine=sh64-unknown
>+		;;
>+	sparclite-wrs | simso-wrs)
> 		basic_machine=sparclite-wrs
> 		os=-vxworks
> 		;;
>@@ -771,6 +1094,9 @@
> 		basic_machine=i860-stratus
> 		os=-sysv4
> 		;;
>+	strongarm-* | thumb-*)
>+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	sun2)
> 		basic_machine=m68000-sun
> 		;;
>@@ -820,13 +1146,17 @@
> 		os=-dynix
> 		;;
> 	t3e)
>-		basic_machine=t3e-cray
>+		basic_machine=alphaev5-cray
> 		os=-unicos
> 		;;
>-	tic54x | c54x*)
>-		basic_machine=tic54x-unknown
>-		os=-coff
>+	t90)
>+		basic_machine=t90-cray
>+		os=-unicos
> 		;;
>+	tile*)
>+		basic_machine=$basic_machine-unknown
>+		os=-linux-gnu
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
>@@ -833,9 +1163,17 @@
> 	tx39el)
> 		basic_machine=mipstx39el-unknown
> 		;;
>+	toad1)
>+		basic_machine=pdp10-xkl
>+		os=-tops20
>+		;;
> 	tower | tower-32)
> 		basic_machine=m68k-ncr
> 		;;
>+	tpf)
>+		basic_machine=s390x-ibm
>+		os=-tpf
>+		;;
> 	udi29k)
> 		basic_machine=a29k-amd
> 		os=-udi
>@@ -857,8 +1195,8 @@
> 		os=-vms
> 		;;
> 	vpp*|vx|vx-*)
>-               basic_machine=f301-fujitsu
>-               ;;
>+		basic_machine=f301-fujitsu
>+		;;
> 	vxworks960)
> 		basic_machine=i960-wrs
> 		os=-vxworks
>@@ -879,17 +1217,28 @@
> 		basic_machine=hppa1.1-winbond
> 		os=-proelf
> 		;;
>-	xmp)
>-		basic_machine=xmp-cray
>-		os=-unicos
>+	xbox)
>+		basic_machine=i686-pc
>+		os=-mingw32
> 		;;
>-        xps | xps100)
>+	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
>+		;;
> 	z8k-*-coff)
> 		basic_machine=z8k-unknown
> 		os=-sim
> 		;;
>+	z80-*-coff)
>+		basic_machine=z80-unknown
>+		os=-sim
>+		;;
> 	none)
> 		basic_machine=none-none
> 		os=-none
>@@ -906,16 +1255,12 @@
> 	op60c)
> 		basic_machine=hppa1.1-oki
> 		;;
>-	mips)
>-		if [ x$os = x-linux-gnu ]; then
>-			basic_machine=mips-unknown
>-		else
>-			basic_machine=mips-mips
>-		fi
>-		;;
> 	romp)
> 		basic_machine=romp-ibm
> 		;;
>+	mmix)
>+		basic_machine=mmix-knuth
>+		;;
> 	rs6000)
> 		basic_machine=rs6000-ibm
> 		;;
>@@ -932,13 +1277,13 @@
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sh3 | sh4)
>+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
> 		basic_machine=sh-unknown
> 		;;
>-	sparc | sparcv9)
>+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
> 		basic_machine=sparc-sun
> 		;;
>-        cydra)
>+	cydra)
> 		basic_machine=cydra-cydrome
> 		;;
> 	orion)
>@@ -953,10 +1298,6 @@
> 	pmac | pmac-mpw)
> 		basic_machine=powerpc-apple
> 		;;
>-	c4x*)
>-		basic_machine=c4x-none
>-		os=-coff
>-		;;
> 	*-unknown)
> 		# Make sure to match an already-canonicalized machine name.
> 		;;
>@@ -983,9 +1324,12 @@
> 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
>+		;;
> 	-solaris1 | -solaris1.*)
> 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
> 		;;
>@@ -1006,26 +1350,36 @@
> 	# Each alternative MUST END IN A *, to match a version number.
> 	# -sysv* is not here because it comes later, after sysvr4.
> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
>-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
>-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
>+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
>+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
>+	      | -sym* | -kopensolaris* | -plan9* \
> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
>-	      | -aos* \
>+	      | -aos* | -aros* \
> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
>-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
>+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
>+	      | -bitrig* | -openbsd* | -solidbsd* \
>+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
>+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
>-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
>+	      | -chorusos* | -chorusrdb* | -cegcc* \
>+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
>+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
>+	      | -uxpv* | -beos* | -mpeix* | -udk* \
>+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
>-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
>+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
>+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
>+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
>+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
> 	-qnx*)
> 		case $basic_machine in
>-		    x86-* | i[34567]86-*)
>+		    x86-* | i*86-*)
> 			;;
> 		    *)
> 			os=-nto$os
>@@ -1032,16 +1386,21 @@
> 			;;
> 		esac
> 		;;
>+	-nto-qnx*)
>+		;;
> 	-nto*)
>-		os=-nto-qnx
>+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
> 		;;
> 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
>-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
>+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
> 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
> 		;;
> 	-mac*)
> 		os=`echo $os | sed -e 's|mac|macos|'`
> 		;;
>+	-linux-dietlibc)
>+		os=-linux-dietlibc
>+		;;
> 	-linux*)
> 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
> 		;;
>@@ -1054,6 +1413,9 @@
> 	-opened*)
> 		os=-openedition
> 		;;
>+	-os400*)
>+		os=-os400
>+		;;
> 	-wince*)
> 		os=-wince
> 		;;
>@@ -1072,6 +1434,12 @@
> 	-acis*)
> 		os=-aos
> 		;;
>+	-atheos*)
>+		os=-atheos
>+		;;
>+	-syllable*)
>+		os=-syllable
>+		;;
> 	-386bsd)
> 		os=-bsd
> 		;;
>@@ -1078,8 +1446,11 @@
> 	-ctix* | -uts*)
> 		os=-sysv
> 		;;
>+	-nova*)
>+		os=-rtmk-nova
>+		;;
> 	-ns2 )
>-	        os=-nextstep2
>+		os=-nextstep2
> 		;;
> 	-nsk*)
> 		os=-nsk
>@@ -1091,6 +1462,9 @@
> 	-sinix*)
> 		os=-sysv4
> 		;;
>+	-tpf*)
>+		os=-tpf
>+		;;
> 	-triton*)
> 		os=-sysv3
> 		;;
>@@ -1118,9 +1492,20 @@
> 	-xenix)
> 		os=-xenix
> 		;;
>-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
>-	        os=-mint
>+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
>+		os=-mint
> 		;;
>+	-aros*)
>+		os=-aros
>+		;;
>+	-zvmoe)
>+		os=-zvmoe
>+		;;
>+	-dicos*)
>+		os=-dicos
>+		;;
>+	-nacl*)
>+		;;
> 	-none)
> 		;;
> 	*)
>@@ -1143,6 +1528,12 @@
> # system, and we'll never get to this point.
> 
> case $basic_machine in
>+	score-*)
>+		os=-elf
>+		;;
>+	spu-*)
>+		os=-elf
>+		;;
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>@@ -1152,10 +1543,26 @@
> 	arm*-semi)
> 		os=-aout
> 		;;
>+	c4x-* | tic4x-*)
>+		os=-coff
>+		;;
>+	hexagon-*)
>+		os=-elf
>+		;;
>+	tic54x-*)
>+		os=-coff
>+		;;
>+	tic55x-*)
>+		os=-coff
>+		;;
>+	tic6x-*)
>+		os=-coff
>+		;;
>+	# This must come before the *-dec entry.
> 	pdp10-*)
> 		os=-tops20
> 		;;
>-        pdp11-*)
>+	pdp11-*)
> 		os=-none
> 		;;
> 	*-dec | vax-*)
>@@ -1169,13 +1576,13 @@
> 		;;
> 	m68000-sun)
> 		os=-sunos3
>-		# This also exists in the configure program, but was not the
>-		# default.
>-		# os=-sunos4
> 		;;
> 	m68*-cisco)
> 		os=-aout
> 		;;
>+	mep-*)
>+		os=-elf
>+		;;
> 	mips*-cisco)
> 		os=-elf
> 		;;
>@@ -1182,6 +1589,12 @@
> 	mips*-*)
> 		os=-elf
> 		;;
>+	or1k-*)
>+		os=-elf
>+		;;
>+	or32-*)
>+		os=-coff
>+		;;
> 	*-tti)	# must be before sparc entry or we get the wrong os.
> 		os=-sysv3
> 		;;
>@@ -1191,9 +1604,15 @@
> 	*-be)
> 		os=-beos
> 		;;
>+	*-haiku)
>+		os=-haiku
>+		;;
> 	*-ibm)
> 		os=-aix
> 		;;
>+	*-knuth)
>+		os=-mmixware
>+		;;
> 	*-wec)
> 		os=-proelf
> 		;;
>@@ -1245,19 +1664,19 @@
> 	*-next)
> 		os=-nextstep3
> 		;;
>-        *-gould)
>+	*-gould)
> 		os=-sysv
> 		;;
>-        *-highlevel)
>+	*-highlevel)
> 		os=-bsd
> 		;;
> 	*-encore)
> 		os=-bsd
> 		;;
>-        *-sgi)
>+	*-sgi)
> 		os=-irix
> 		;;
>-        *-siemens)
>+	*-siemens)
> 		os=-sysv4
> 		;;
> 	*-masscomp)
>@@ -1296,7 +1715,7 @@
> 			-sunos*)
> 				vendor=sun
> 				;;
>-			-aix*)
>+			-cnk*|-aix*)
> 				vendor=ibm
> 				;;
> 			-beos*)
>@@ -1326,10 +1745,16 @@
> 			-mvs* | -opened*)
> 				vendor=ibm
> 				;;
>+			-os400*)
>+				vendor=ibm
>+				;;
> 			-ptx*)
> 				vendor=sequent
> 				;;
>-			-vxsim* | -vxworks*)
>+			-tpf*)
>+				vendor=ibm
>+				;;
>+			-vxsim* | -vxworks* | -windiss*)
> 				vendor=wrs
> 				;;
> 			-aux*)
>@@ -1344,6 +1769,9 @@
> 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
> 				vendor=atari
> 				;;
>+			-vos*)
>+				vendor=stratus
>+				;;
> 		esac
> 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
> 		;;
>@@ -1350,7 +1778,7 @@
> esac
> 
> echo $basic_machine$os
>-exit 0
>+exit
> 
> # Local variables:
> # eval: (add-hook 'write-file-hooks 'time-stamp)
>Index: snmp2.0/src/snmpcommon/generic-logging.c
>===================================================================
>--- snmp2.0/src/snmpcommon/generic-logging.c	(revision 11283)
>+++ snmp2.0/src/snmpcommon/generic-logging.c	(working copy)
>@@ -54,7 +54,11 @@
> 						void *data, int datalen)
> {
> struct sockaddr fromaddr;
>+#ifdef __socklen_t_defined
>+socklen_t fromaddrlength = sizeof(struct sockaddr);
>+#else
> int fromaddrlength = sizeof(struct sockaddr);
>+#endif
> 
> 	if (logpath) {
>             datalen = recvfrom(logpath->socket[RECIPIENT], data, datalen,
>Index: snmp2.0/src/snmpcommon/generic-logging.h
>===================================================================
>--- snmp2.0/src/snmpcommon/generic-logging.h	(revision 11283)
>+++ snmp2.0/src/snmpcommon/generic-logging.h	(working copy)
>@@ -18,7 +18,11 @@
> 
> typedef struct {
>     int socket[ PIPEENDS ];
>+#ifdef __socklen_t_defined
>+    socklen_t address_size[ PIPEENDS ];
>+#else
>     size_t address_size[ PIPEENDS ];
>+#endif
>     struct sockaddr_in address[ PIPEENDS ];
> } snmpcommon_logpath_t;
> 
>Index: snmp_common/ucd-snmp/snmplib/snmp_api.c
>===================================================================
>--- snmp_common/ucd-snmp/snmplib/snmp_api.c	(revision 11283)
>+++ snmp_common/ucd-snmp/snmplib/snmp_api.c	(working copy)
>@@ -3698,7 +3698,12 @@
>     size_t length = PACKET_LENGTH;
>     struct sockaddr_in *isp_addr;
>     struct sockaddr_in *pduIp;
>-    int result, addr_size;
>+    int result;
>+#ifdef __socklen_t_defined
>+    socklen_t addr_size;
>+#else
>+    int addr_size;
>+#endif
>     long reqid;
> 
>     session = slp->session; isp = slp->internal;
>@@ -3968,8 +3973,13 @@
>     struct snmp_pdu *pdu;
>     struct request_list *rp, *orp = NULL;
>     int ret;
>+#ifdef __socklen_t_defined
>+    socklen_t addrlen;
>+    socklen_t fromlength;
>+#else
>     size_t addrlen;
>     size_t fromlength;
>+#endif
> 
>     sp = slp->session; isp = slp->internal;
>     if (!sp || !isp) {
>@@ -4486,7 +4496,12 @@
>   struct snmp_session *sp;
>   struct snmp_internal_session *isp;
>   struct timeval now;
>-  int result, addr_size;
>+  int result;
>+#ifdef __socklen_t_defined
>+  socklen_t addr_size;
>+#else
>+  int addr_size;
>+#endif
> 
>   sp = slp->session; isp = slp->internal;
>   if (!sp || !isp) {

Actions: View

Attachments on bug 1122669: 934291