[fityk] 02/45: Imported Debian patch 0.4.4-1

Stuart Prescott stuart at debian.org
Sun Nov 6 23:35:27 UTC 2016


This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository fityk.

commit 2c3ff79a467362245bc6efa4be20340bea700702
Merge: cfb7d0f 4dbfd3c
Author: Carlo Segre <segre at iit.edu>
Date:   Tue Mar 8 08:37:13 2005 -0600

    Imported Debian patch 0.4.4-1

 INSTALL                            |  14 +-
 Makefile.am                        |   4 +-
 Makefile.in                        |   5 +-
 NEWS                               |  11 +
 TODO                               |  45 ++--
 aclocal.m4                         | 122 +++++++----
 config.guess                       |  18 +-
 config.sub                         |  22 +-
 config/Makefile.in                 |   1 +
 configure                          | 102 ++++++---
 configure.ac                       |  19 +-
 debian/changelog                   |   9 +-
 doc/Makefile.in                    |   3 +-
 doc/fitykhelp.htb                  | Bin 80399 -> 80604 bytes
 doc/fitykhelp.html                 |  12 +-
 doc/fitykhelp.xml                  |   2 +
 doc/fitykhelp_img/Makefile.in      |   1 +
 doc/fitykhelp_img/pseudo_voigt.png | Bin 1992 -> 2166 bytes
 fityk.iss                          |   6 +-
 fityk.spec                         |   2 +-
 samples/Makefile.in                |   1 +
 samples/SiC_Zn.fit                 |   1 +
 samples/nacl01.fit                 |   1 +
 src/Makefile.in                    |   1 +
 src/data.cpp                       | 120 ++++++++---
 src/data.h                         |  23 +-
 src/ffunc.cpp                      |  17 +-
 src/img/Makefile.in                |   1 +
 src/parser.cpp                     |   6 +-
 src/parser.yy                      |   6 +-
 src/pcore.cpp                      |  48 +++--
 src/sum.cpp                        |  70 +++++-
 src/sum.h                          |  11 +-
 src/wx_IO.cpp                      |   9 +-
 src/wx_common.h                    |   3 +-
 src/wx_dlg.cpp                     | 109 +++++++++-
 src/wx_dlg.h                       |  17 +-
 src/wx_gui.cpp                     |  93 +++++---
 src/wx_gui.h                       |  13 +-
 src/wx_pane.cpp                    | 161 +++++++++-----
 src/wx_pane.h                      |  35 +--
 src/wx_plot.cpp                    | 423 ++++++++++++++++++++++++-------------
 src/wx_plot.h                      |  25 ++-
 43 files changed, 1109 insertions(+), 483 deletions(-)

diff --cc config.guess
index 77c7cba,0000000..8229471
mode 100644,000000..100644
--- a/config.guess
+++ b/config.guess
@@@ -1,1441 -1,0 +1,1453 @@@
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 +
- timestamp='2004-08-13'
++timestamp='2004-11-12'
 +
 +# 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
 +# (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.
 +#
 +# 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.
 +#
 +# 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.
 +
 +# Originally written by Per Bothner <per at bothner.com>.
 +# Please send patches to <config-patches at gnu.org>.  Submit a context
 +# diff and a properly formatted ChangeLog entry.
 +#
 +# This script attempts to guess a canonical system name similar to
 +# config.sub.  If it succeeds, it prints the system name on stdout, and
 +# exits with 0.  Otherwise, it exits with 1.
 +#
 +# The plan is that this can be called by configure scripts if you
 +# don't specify an explicit build system type.
 +
 +me=`echo "$0" | sed -e 's,.*/,,'`
 +
 +usage="\
 +Usage: $0 [OPTION]
 +
 +Output the configuration name of the system \`$me' is run on.
 +
 +Operation modes:
 +  -h, --help         print this help, then exit
 +  -t, --time-stamp   print date of last modification, then exit
 +  -v, --version      print version number, then exit
 +
 +Report bugs and patches to <config-patches at gnu.org>."
 +
 +version="\
 +GNU config.guess ($timestamp)
 +
 +Originally written by Per Bothner.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 +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."
 +
 +help="
 +Try \`$me --help' for more information."
 +
 +# Parse command line
 +while test $# -gt 0 ; do
 +  case $1 in
 +    --time-stamp | --time* | -t )
 +       echo "$timestamp" ; exit 0 ;;
 +    --version | -v )
 +       echo "$version" ; exit 0 ;;
 +    --help | --h* | -h )
 +       echo "$usage"; exit 0 ;;
 +    -- )     # Stop option processing
 +       shift; break ;;
 +    - )	# Use stdin as input.
 +       break ;;
 +    -* )
 +       echo "$me: invalid option $1$help" >&2
 +       exit 1 ;;
 +    * )
 +       break ;;
 +  esac
 +done
 +
 +if test $# != 0; then
 +  echo "$me: too many arguments$help" >&2
 +  exit 1
 +fi
 +
 +trap '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.
 +
 +# 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 -q "$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 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 ;
 +	fi
 +	;;
 + ,,*)   CC_FOR_BUILD=$CC ;;
 + ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
 +esac ;'
 +
 +# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 +# (ghazi at noc.rutgers.edu 1994-08-24)
 +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 +	PATH=$PATH:/.attbin ; export PATH
 +fi
 +
 +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 +UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 +
 +# Note: order is significant - the case branches are not exclusive.
 +
 +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*,
 +	# *-*-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.
 +	#
 +	# 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 ;;
 +	    *) 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_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
 +		then
 +		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 +		    # Return netbsd for either.  FIX?
 +		    os=netbsd
 +		else
 +		    os=netbsdelf
 +		fi
 +		;;
 +	    *)
 +	        os=netbsd
 +		;;
 +	esac
 +	# The OS release
 +	# 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 ;;
 +    amd64:OpenBSD:*:*)
 +	echo x86_64-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    amiga:OpenBSD:*:*)
 +	echo m68k-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    cats:OpenBSD:*:*)
 +	echo arm-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    hp300:OpenBSD:*:*)
 +	echo m68k-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    luna88k:OpenBSD:*:*)
 +    	echo m88k-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    mac68k:OpenBSD:*:*)
 +	echo m68k-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    macppc:OpenBSD:*:*)
 +	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    mvme68k:OpenBSD:*:*)
 +	echo m68k-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    mvme88k:OpenBSD:*:*)
 +	echo m88k-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    mvmeppc:OpenBSD:*:*)
 +	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    sgi:OpenBSD:*:*)
 +	echo mips64-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    sun3:OpenBSD:*:*)
 +	echo m68k-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:OpenBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:ekkoBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    macppc:MirBSD:*:*)
 +	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:MirBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 +	exit 0 ;;
 +    alpha:OSF1:*:*)
 +	case $UNAME_RELEASE in
 +	*4.0)
 +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 +		;;
 +	*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.
 +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 +	exit 0 ;;
 +    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 ;;
 +    21064:Windows_NT:50:3)
 +	echo alpha-dec-winnt3.5
 +	exit 0 ;;
 +    Amiga*:UNIX_System_V:4.0:*)
 +	echo m68k-unknown-sysv4
 +	exit 0;;
 +    *:[Aa]miga[Oo][Ss]:*:*)
 +	echo ${UNAME_MACHINE}-unknown-amigaos
 +	exit 0 ;;
 +    *:[Mm]orph[Oo][Ss]:*:*)
 +	echo ${UNAME_MACHINE}-unknown-morphos
 +	exit 0 ;;
 +    *:OS/390:*:*)
 +	echo i370-ibm-openedition
 +	exit 0 ;;
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
++	exit 0 ;;
 +    *:OS400:*:*)
 +        echo powerpc-ibm-os400
 +	exit 0 ;;
 +    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 +	echo arm-acorn-riscix${UNAME_RELEASE}
 +	exit 0;;
 +    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 +	echo hppa1.1-hitachi-hiuxmpp
 +	exit 0;;
 +    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 +	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 +	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 +		echo pyramid-pyramid-sysv3
 +	else
 +		echo pyramid-pyramid-bsd
 +	fi
 +	exit 0 ;;
 +    NILE*:*:*:dcosx)
 +	echo pyramid-pyramid-svr4
 +	exit 0 ;;
 +    DRS?6000:unix:4.0:6*)
 +	echo sparc-icl-nx6
 +	exit 0 ;;
-     DRS?6000:UNIX_SV:4.2*:7*)
++    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 +	case `/usr/bin/uname -p` in
 +	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 +	esac ;;
 +    sun4H:SunOS:5.*:*)
 +	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +	exit 0 ;;
 +    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 ;;
 +    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 ;;
 +    sun4*:SunOS:*:*)
 +	case "`/usr/bin/arch -k`" in
 +	    Series*|S4*)
 +		UNAME_RELEASE=`uname -v`
 +		;;
 +	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 ;;
 +    sun3*:SunOS:*:*)
 +	echo m68k-sun-sunos${UNAME_RELEASE}
 +	exit 0 ;;
 +    sun*:*:4.2BSD:*)
 +	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)
 +		echo m68k-sun-sunos${UNAME_RELEASE}
 +		;;
 +	    sun4)
 +		echo sparc-sun-sunos${UNAME_RELEASE}
 +		;;
 +	esac
 +	exit 0 ;;
 +    aushp:SunOS:*:*)
 +	echo sparc-auspex-sunos${UNAME_RELEASE}
 +	exit 0 ;;
 +    # 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
 +    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
 +    # to the lowercase version "mint" (or "freemint").  Finally
 +    # the system name "TOS" denotes a system which is actually not
 +    # 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 ;;
 +    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 +	echo m68k-atari-mint${UNAME_RELEASE}
 +        exit 0 ;;
 +    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
 +        echo m68k-atari-mint${UNAME_RELEASE}
 +	exit 0 ;;
 +    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
 +        echo m68k-milan-mint${UNAME_RELEASE}
 +        exit 0 ;;
 +    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
 +        echo m68k-hades-mint${UNAME_RELEASE}
 +        exit 0 ;;
 +    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 +        echo m68k-unknown-mint${UNAME_RELEASE}
 +        exit 0 ;;
 +    m68k:machten:*:*)
 +	echo m68k-apple-machten${UNAME_RELEASE}
 +	exit 0 ;;
 +    powerpc:machten:*:*)
 +	echo powerpc-apple-machten${UNAME_RELEASE}
 +	exit 0 ;;
 +    RISC*:Mach:*:*)
 +	echo mips-dec-mach_bsd4.3
 +	exit 0 ;;
 +    RISC*:ULTRIX:*:*)
 +	echo mips-dec-ultrix${UNAME_RELEASE}
 +	exit 0 ;;
 +    VAX*:ULTRIX*:*:*)
 +	echo vax-dec-ultrix${UNAME_RELEASE}
 +	exit 0 ;;
 +    2020:CLIX:*:* | 2430:CLIX:*:*)
 +	echo clipper-intergraph-clix${UNAME_RELEASE}
 +	exit 0 ;;
 +    mips:*:*:UMIPS | mips:*:*:RISCos)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +#ifdef __cplusplus
 +#include <stdio.h>  /* for printf() prototype */
 +	int main (int argc, char *argv[]) {
 +#else
 +	int main (argc, argv) int argc; char *argv[]; {
 +#endif
 +	#if defined (host_mips) && defined (MIPSEB)
 +	#if defined (SYSTYPE_SYSV)
 +	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
 +	#endif
 +	#if defined (SYSTYPE_SVR4)
 +	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
 +	#endif
 +	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
 +	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
 +	#endif
 +	#endif
 +	  exit (-1);
 +	}
 +EOF
 +	$CC_FOR_BUILD -o $dummy $dummy.c \
 +	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
 +	  && exit 0
 +	echo mips-mips-riscos${UNAME_RELEASE}
 +	exit 0 ;;
 +    Motorola:PowerMAX_OS:*:*)
 +	echo powerpc-motorola-powermax
 +	exit 0 ;;
 +    Motorola:*:4.3:PL8-*)
 +	echo powerpc-harris-powermax
 +	exit 0 ;;
 +    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 +	echo powerpc-harris-powermax
 +	exit 0 ;;
 +    Night_Hawk:Power_UNIX:*:*)
 +	echo powerpc-harris-powerunix
 +	exit 0 ;;
 +    m88k:CX/UX:7*:*)
 +	echo m88k-harris-cxux7
 +	exit 0 ;;
 +    m88k:*:4*:R4*)
 +	echo m88k-motorola-sysv4
 +	exit 0 ;;
 +    m88k:*:3*:R3*)
 +	echo m88k-motorola-sysv3
 +	exit 0 ;;
 +    AViiON:dgux:*:*)
 +        # 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 ] || \
 +	       [ ${TARGET_BINARY_INTERFACE}x = x ]
 +	    then
 +		echo m88k-dg-dgux${UNAME_RELEASE}
 +	    else
 +		echo m88k-dg-dguxbcs${UNAME_RELEASE}
 +	    fi
 +	else
 +	    echo i586-dg-dgux${UNAME_RELEASE}
 +	fi
 + 	exit 0 ;;
 +    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 +	echo m88k-dolphin-sysv3
 +	exit 0 ;;
 +    M88*:*:R3*:*)
 +	# Delta 88k system running SVR3
 +	echo m88k-motorola-sysv3
 +	exit 0 ;;
 +    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 +	echo m88k-tektronix-sysv3
 +	exit 0 ;;
 +    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 +	echo m68k-tektronix-bsd
 +	exit 0 ;;
 +    *:IRIX*:*:*)
 +	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 +	exit 0 ;;
 +    ????????: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 i386-ibm-aix
 +	exit 0 ;;
 +    ia64:AIX:*:*)
 +	if [ -x /usr/bin/oslevel ] ; then
 +		IBM_REV=`/usr/bin/oslevel`
 +	else
 +		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 +	fi
 +	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
 +	exit 0 ;;
 +    *: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>
 +
 +		main()
 +			{
 +			if (!__power_pc())
 +				exit(1);
 +			puts("powerpc-ibm-aix3.2.5");
 +			exit(0);
 +			}
 +EOF
 +		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 +		echo rs6000-ibm-aix3.2.5
 +	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 | sed 1q | awk '{ print $1 }'`
 +	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 +		IBM_ARCH=rs6000
 +	else
 +		IBM_ARCH=powerpc
 +	fi
 +	if [ -x /usr/bin/oslevel ] ; then
 +		IBM_REV=`/usr/bin/oslevel`
 +	else
 +		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 +	fi
 +	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 +	exit 0 ;;
 +    *:AIX:*:*)
 +	echo rs6000-ibm-aix
 +	exit 0 ;;
 +    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 +	echo romp-ibm-bsd4.4
 +	exit 0 ;;
 +    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
 +    *:BOSX:*:*)
 +	echo rs6000-bull-bosx
 +	exit 0 ;;
 +    DPX/2?00:B.O.S.:*:*)
 +	echo m68k-bull-sysv3
 +	exit 0 ;;
 +    9000/[34]??:4.3bsd:1.*:*)
 +	echo m68k-hp-bsd
 +	exit 0 ;;
 +    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 +	echo m68k-hp-bsd4.4
 +	exit 0 ;;
 +    9000/[34678]??:HP-UX:*:*)
 +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 +	case "${UNAME_MACHINE}" in
 +	    9000/31? )            HP_ARCH=m68000 ;;
 +	    9000/[34]?? )         HP_ARCH=m68k ;;
 +	    9000/[678][0-9][0-9])
 +		if [ -x /usr/bin/getconf ]; then
 +		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 +                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 +                    case "${sc_cpu_version}" in
 +                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 +                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 +                      532)                      # CPU_PA_RISC2_0
 +                        case "${sc_kernel_bits}" in
 +                          32) HP_ARCH="hppa2.0n" ;;
 +                          64) HP_ARCH="hppa2.0w" ;;
 +			  '') 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>
 +
 +              int main ()
 +              {
 +              #if defined(_SC_KERNEL_BITS)
 +                  long bits = sysconf(_SC_KERNEL_BITS);
 +              #endif
 +                  long cpu  = sysconf (_SC_CPU_VERSION);
 +
 +                  switch (cpu)
 +              	{
 +              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
 +              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
 +              	case CPU_PA_RISC2_0:
 +              #if defined(_SC_KERNEL_BITS)
 +              	    switch (bits)
 +              		{
 +              		case 64: puts ("hppa2.0w"); break;
 +              		case 32: puts ("hppa2.0n"); break;
 +              		default: puts ("hppa2.0"); break;
 +              		} break;
 +              #else  /* !defined(_SC_KERNEL_BITS) */
 +              	    puts ("hppa2.0"); break;
 +              #endif
 +              	default: puts ("hppa1.0"); break;
 +              	}
 +                  exit (0);
 +              }
 +EOF
 +		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 +		    test -z "$HP_ARCH" && HP_ARCH=hppa
 +		fi ;;
 +	esac
 +	if [ ${HP_ARCH} = "hppa2.0w" ]
 +	then
 +	    # avoid double evaluation of $set_cc_for_build
 +	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
 +	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
 +	    then
 +		HP_ARCH="hppa2.0w"
 +	    else
 +		HP_ARCH="hppa64"
 +	    fi
 +	fi
 +	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 +	exit 0 ;;
 +    ia64:HP-UX:*:*)
 +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 +	echo ia64-hp-hpux${HPUX_REV}
 +	exit 0 ;;
 +    3050*:HI-UX:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#include <unistd.h>
 +	int
 +	main ()
 +	{
 +	  long cpu = sysconf (_SC_CPU_VERSION);
 +	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
 +	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
 +	     results, however.  */
 +	  if (CPU_IS_PA_RISC (cpu))
 +	    {
 +	      switch (cpu)
 +		{
 +		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
 +		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
 +		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
 +		  default: puts ("hppa-hitachi-hiuxwe2"); break;
 +		}
 +	    }
 +	  else if (CPU_IS_HP_MC68K (cpu))
 +	    puts ("m68k-hitachi-hiuxwe2");
 +	  else puts ("unknown-hitachi-hiuxwe2");
 +	  exit (0);
 +	}
 +EOF
 +	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 +	echo unknown-hitachi-hiuxwe2
 +	exit 0 ;;
 +    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 +	echo hppa1.1-hp-bsd
 +	exit 0 ;;
 +    9000/8??:4.3bsd:*:*)
 +	echo hppa1.0-hp-bsd
 +	exit 0 ;;
 +    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 +	echo hppa1.0-hp-mpeix
 +	exit 0 ;;
 +    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 +	echo hppa1.1-hp-osf
 +	exit 0 ;;
 +    hp8??:OSF1:*:*)
 +	echo hppa1.0-hp-osf
 +	exit 0 ;;
 +    i*86:OSF1:*:*)
 +	if [ -x /usr/sbin/sysversion ] ; then
 +	    echo ${UNAME_MACHINE}-unknown-osf1mk
 +	else
 +	    echo ${UNAME_MACHINE}-unknown-osf1
 +	fi
 +	exit 0 ;;
 +    parisc*:Lites*:*:*)
 +	echo hppa1.1-hp-lites
 +	exit 0 ;;
 +    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 +	echo c1-convex-bsd
 +        exit 0 ;;
 +    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 +	if getsysinfo -f scalar_acc
 +	then echo c32-convex-bsd
 +	else echo c2-convex-bsd
 +	fi
 +        exit 0 ;;
 +    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 +	echo c34-convex-bsd
 +        exit 0 ;;
 +    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 +	echo c38-convex-bsd
 +        exit 0 ;;
 +    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 +	echo c4-convex-bsd
 +        exit 0 ;;
 +    CRAY*Y-MP:*:*:*)
 +	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit 0 ;;
 +    CRAY*[A-Z]90:*:*:*)
 +	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 +	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 +	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 +	      -e 's/\.[^.]*$/.X/'
 +	exit 0 ;;
 +    CRAY*TS:*:*:*)
 +	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit 0 ;;
 +    CRAY*T3E:*:*:*)
 +	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit 0 ;;
 +    CRAY*SV1:*:*:*)
 +	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit 0 ;;
 +    *:UNICOS/mp:*:*)
 +	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit 0 ;;
 +    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 ;;
 +    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 0 ;;
 +    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 +	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 +	exit 0 ;;
 +    sparc*:BSD/OS:*:*)
 +	echo sparc-unknown-bsdi${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:BSD/OS:*:*)
 +	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:FreeBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 +	exit 0 ;;
 +    i*:CYGWIN*:*)
 +	echo ${UNAME_MACHINE}-pc-cygwin
 +	exit 0 ;;
 +    i*:MINGW*:*)
 +	echo ${UNAME_MACHINE}-pc-mingw32
 +	exit 0 ;;
 +    i*:PW*:*)
 +	echo ${UNAME_MACHINE}-pc-pw32
 +	exit 0 ;;
 +    x86:Interix*:[34]*)
 +	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 +	exit 0 ;;
 +    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 +	echo i${UNAME_MACHINE}-pc-mks
 +	exit 0 ;;
 +    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 +	# How do we know it's Interix rather than the generic POSIX subsystem?
 +	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 +	# UNAME_MACHINE based on the output of uname instead of i386?
 +	echo i586-pc-interix
 +	exit 0 ;;
 +    i*:UWIN*:*)
 +	echo ${UNAME_MACHINE}-pc-uwin
 +	exit 0 ;;
 +    p*:CYGWIN*:*)
 +	echo powerpcle-unknown-cygwin
 +	exit 0 ;;
 +    prep*:SunOS:5.*:*)
 +	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +	exit 0 ;;
 +    *:GNU:*:*)
 +	# the GNU system
 +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 +	exit 0 ;;
 +    *: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 0 ;;
 +    i*86:Minix:*:*)
 +	echo ${UNAME_MACHINE}-pc-minix
 +	exit 0 ;;
 +    arm*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit 0 ;;
 +    cris:Linux:*:*)
 +	echo cris-axis-linux-gnu
 +	exit 0 ;;
++    crisv32:Linux:*:*)
++	echo crisv32-axis-linux-gnu
++	exit 0 ;;
++    frv:Linux:*:*)
++    	echo frv-unknown-linux-gnu
++	exit 0 ;;
 +    ia64:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit 0 ;;
 +    m32r*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit 0 ;;
 +    m68*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit 0 ;;
 +    mips:Linux:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#undef CPU
 +	#undef mips
 +	#undef mipsel
 +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 +	CPU=mipsel
 +	#else
 +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 +	CPU=mips
 +	#else
 +	CPU=
 +	#endif
 +	#endif
 +EOF
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 +	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 +	;;
 +    mips64:Linux:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#undef CPU
 +	#undef mips64
 +	#undef mips64el
 +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 +	CPU=mips64el
 +	#else
 +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 +	CPU=mips64
 +	#else
 +	CPU=
 +	#endif
 +	#endif
 +EOF
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 +	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 +	;;
 +    ppc:Linux:*:*)
 +	echo powerpc-unknown-linux-gnu
 +	exit 0 ;;
 +    ppc64:Linux:*:*)
 +	echo powerpc64-unknown-linux-gnu
 +	exit 0 ;;
 +    alpha:Linux:*:*)
 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
 +	  EV56)  UNAME_MACHINE=alphaev56 ;;
 +	  PCA56) UNAME_MACHINE=alphapca56 ;;
 +	  PCA57) UNAME_MACHINE=alphapca56 ;;
 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
 +        esac
 +	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 +	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 +	exit 0 ;;
 +    parisc:Linux:*:* | hppa:Linux:*:*)
 +	# Look for CPU level
 +	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
 +	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
 +	  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 ;;
 +    s390:Linux:*:* | s390x:Linux:*:*)
 +	echo ${UNAME_MACHINE}-ibm-linux
 +	exit 0 ;;
 +    sh64*:Linux:*:*)
 +    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit 0 ;;
 +    sh*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit 0 ;;
 +    sparc:Linux:*:* | sparc64:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit 0 ;;
 +    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.
 +	# Set LC_ALL=C to ensure ld outputs messages in English.
 +	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
 +			 | sed -ne '/supported targets:/!d
 +				    s/[ 	][ 	]*/ /g
 +				    s/.*supported targets: *//
 +				    s/ .*//
 +				    p'`
 +        case "$ld_supported_targets" in
 +	  elf32-i386)
 +		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 +		;;
 +	  a.out-i386-linux)
 +		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 +		exit 0 ;;
 +	  coff-i386)
 +		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 +		exit 0 ;;
 +	  "")
 +		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 +		# one that does not give us useful --help.
 +		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 +		exit 0 ;;
 +	esac
 +	# Determine whether the default compiler is a.out or elf
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#include <features.h>
 +	#ifdef __ELF__
 +	# ifdef __GLIBC__
 +	#  if __GLIBC__ >= 2
 +	LIBC=gnu
 +	#  else
 +	LIBC=gnulibc1
 +	#  endif
 +	# else
 +	LIBC=gnulibc1
 +	# endif
 +	#else
 +	#ifdef __INTEL_COMPILER
 +	LIBC=gnu
 +	#else
 +	LIBC=gnuaout
 +	#endif
 +	#endif
 +	#ifdef __dietlibc__
 +	LIBC=dietlibc
 +	#endif
 +EOF
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 +	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 +	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 +	;;
 +    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,
 +	# I just have to hope.  -- rms.
 +        # Use sysv4.2uw... so that sysv4* matches it.
 +	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 +	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 ;;
 +    i*86:XTS-300:*:STOP)
 +	echo ${UNAME_MACHINE}-unknown-stop
 +	exit 0 ;;
 +    i*86:atheos:*:*)
 +	echo ${UNAME_MACHINE}-unknown-atheos
 +	exit 0 ;;
 +	i*86:syllable:*:*)
 +	echo ${UNAME_MACHINE}-pc-syllable
 +	exit 0 ;;
 +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 +	echo i386-unknown-lynxos${UNAME_RELEASE}
 +	exit 0 ;;
 +    i*86:*DOS:*:*)
 +	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 +	exit 0 ;;
 +    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}
 +	else
 +		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 +	fi
 +	exit 0 ;;
 +    i*86:*:5:[78]*)
 +	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 0 ;;
 +    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|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|grep '^Machine.*Pent *II' >/dev/null) \
 +			&& UNAME_MACHINE=i686
 +		(/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 ;;
 +    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 ;;
 +    Intel:Mach:3*:*)
 +	echo i386-pc-mach3
 +	exit 0 ;;
 +    paragon:*:*:*)
 +	echo i860-intel-osf1
 +	exit 0 ;;
 +    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
 +	else # Add other i860-SVR4 vendors below as they are discovered.
 +	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 +	fi
 +	exit 0 ;;
 +    mini*:CTIX:SYS*5:*)
 +	# "miniframe"
 +	echo m68010-convergent-sysv
 +	exit 0 ;;
 +    mc68k:UNIX:SYSTEM5:3.51m)
 +	echo m68k-convergent-sysv
 +	exit 0 ;;
 +    M680?0:D-NIX:5.3:*)
 +	echo m68k-diab-dnix
 +	exit 0 ;;
 +    M68*:*:R3V[5678]*:*)
 +	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
 +    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
 +	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 +	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
 +    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 +        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 +          && echo i486-ncr-sysv4 && exit 0 ;;
 +    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 +	echo m68k-unknown-lynxos${UNAME_RELEASE}
 +	exit 0 ;;
 +    mc68030:UNIX_System_V:4.*:*)
 +	echo m68k-atari-sysv4
 +	exit 0 ;;
 +    TSUNAMI:LynxOS:2.*:*)
 +	echo sparc-unknown-lynxos${UNAME_RELEASE}
 +	exit 0 ;;
 +    rs6000:LynxOS:2.*:*)
 +	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 +	exit 0 ;;
 +    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 +	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 +	exit 0 ;;
 +    SM[BE]S:UNIX_SV:*:*)
 +	echo mips-dde-sysv${UNAME_RELEASE}
 +	exit 0 ;;
 +    RM*:ReliantUNIX-*:*:*)
 +	echo mips-sni-sysv4
 +	exit 0 ;;
 +    RM*:SINIX-*:*:*)
 +	echo mips-sni-sysv4
 +	exit 0 ;;
 +    *:SINIX-*:*:*)
 +	if uname -p 2>/dev/null >/dev/null ; then
 +		UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +		echo ${UNAME_MACHINE}-sni-sysv4
 +	else
 +		echo ns32k-sni-sysv
 +	fi
 +	exit 0 ;;
 +    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 +                      # says <Richard.M.Bartel at ccMail.Census.GOV>
 +        echo i586-unisys-sysv4
 +        exit 0 ;;
 +    *:UNIX_System_V:4*:FTX*)
 +	# From Gerald Hewes <hewes at openmarket.com>.
 +	# How about differentiating between stratus architectures? -djm
 +	echo hppa1.1-stratus-sysv4
 +	exit 0 ;;
 +    *:*:*:FTX*)
 +	# From seanf at swdc.stratus.com.
 +	echo i860-stratus-sysv4
 +	exit 0 ;;
 +    *:VOS:*:*)
 +	# From Paul.Green at stratus.com.
 +	echo hppa1.1-stratus-vos
 +	exit 0 ;;
 +    mc68*:A/UX:*:*)
 +	echo m68k-apple-aux${UNAME_RELEASE}
 +	exit 0 ;;
 +    news*:NEWS-OS:6*:*)
 +	echo mips-sony-newsos6
 +	exit 0 ;;
 +    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 +	if [ -d /usr/nec ]; then
 +	        echo mips-nec-sysv${UNAME_RELEASE}
 +	else
 +	        echo mips-unknown-sysv${UNAME_RELEASE}
 +	fi
 +        exit 0 ;;
 +    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 +	echo powerpc-be-beos
 +	exit 0 ;;
 +    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 +	echo powerpc-apple-beos
 +	exit 0 ;;
 +    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 +	echo i586-pc-beos
 +	exit 0 ;;
 +    SX-4:SUPER-UX:*:*)
 +	echo sx4-nec-superux${UNAME_RELEASE}
 +	exit 0 ;;
 +    SX-5:SUPER-UX:*:*)
 +	echo sx5-nec-superux${UNAME_RELEASE}
 +	exit 0 ;;
 +    SX-6:SUPER-UX:*:*)
 +	echo sx6-nec-superux${UNAME_RELEASE}
 +	exit 0 ;;
 +    Power*:Rhapsody:*:*)
 +	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:Rhapsody:*:*)
 +	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:Darwin:*:*)
 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 +	case $UNAME_PROCESSOR in
 +	    *86) UNAME_PROCESSOR=i686 ;;
 +	    unknown) UNAME_PROCESSOR=powerpc ;;
 +	esac
 +	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:procnto*:*:* | *:QNX:[0123456789]*:*)
 +	UNAME_PROCESSOR=`uname -p`
 +	if test "$UNAME_PROCESSOR" = "x86"; then
 +		UNAME_PROCESSOR=i386
 +		UNAME_MACHINE=pc
 +	fi
 +	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:QNX:*:4*)
 +	echo i386-pc-qnx
 +	exit 0 ;;
 +    NSR-?:NONSTOP_KERNEL:*:*)
 +	echo nsr-tandem-nsk${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:NonStop-UX:*:*)
 +	echo mips-compaq-nonstopux
 +	exit 0 ;;
 +    BS2000:POSIX*:*:*)
 +	echo bs2000-siemens-sysv
 +	exit 0 ;;
 +    DS/*:UNIX_System_V:*:*)
 +	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:Plan9:*:*)
 +	# "uname -m" is not consistent, so use $cputype instead. 386
 +	# is converted to i386 for consistency with other x86
 +	# operating systems.
 +	if test "$cputype" = "386"; then
 +	    UNAME_MACHINE=i386
 +	else
 +	    UNAME_MACHINE="$cputype"
 +	fi
 +	echo ${UNAME_MACHINE}-unknown-plan9
 +	exit 0 ;;
 +    *:TOPS-10:*:*)
 +	echo pdp10-unknown-tops10
 +	exit 0 ;;
 +    *:TENEX:*:*)
 +	echo pdp10-unknown-tenex
 +	exit 0 ;;
 +    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 +	echo pdp10-dec-tops20
 +	exit 0 ;;
 +    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 +	echo pdp10-xkl-tops20
 +	exit 0 ;;
 +    *:TOPS-20:*:*)
 +	echo pdp10-unknown-tops20
 +	exit 0 ;;
 +    *:ITS:*:*)
 +	echo pdp10-unknown-its
 +	exit 0 ;;
 +    SEI:*:*:SEIUX)
 +        echo mips-sei-seiux${UNAME_RELEASE}
 +	exit 0 ;;
 +    *:DragonFly:*:*)
 +	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 +	exit 0 ;;
 +    *:*VMS:*:*)
 +    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +	case "${UNAME_MACHINE}" in
 +	    A*) echo alpha-dec-vms && exit 0 ;;
 +	    I*) echo ia64-dec-vms && exit 0 ;;
 +	    V*) echo vax-dec-vms && exit 0 ;;
- 	esac
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
++	exit 0 ;;
 +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>
 +# include <sys/utsname.h>
 +#endif
 +main ()
 +{
 +#if defined (sony)
 +#if defined (MIPSEB)
 +  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
 +     I don't know....  */
 +  printf ("mips-sony-bsd\n"); exit (0);
 +#else
 +#include <sys/param.h>
 +  printf ("m68k-sony-newsos%s\n",
 +#ifdef NEWSOS4
 +          "4"
 +#else
 +	  ""
 +#endif
 +         ); exit (0);
 +#endif
 +#endif
 +
 +#if defined (__arm) && defined (__acorn) && defined (__unix)
 +  printf ("arm-acorn-riscix"); exit (0);
 +#endif
 +
 +#if defined (hp300) && !defined (hpux)
 +  printf ("m68k-hp-bsd\n"); exit (0);
 +#endif
 +
 +#if defined (NeXT)
 +#if !defined (__ARCHITECTURE__)
 +#define __ARCHITECTURE__ "m68k"
 +#endif
 +  int version;
 +  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
 +  if (version < 4)
 +    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
 +  else
 +    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
 +  exit (0);
 +#endif
 +
 +#if defined (MULTIMAX) || defined (n16)
 +#if defined (UMAXV)
 +  printf ("ns32k-encore-sysv\n"); exit (0);
 +#else
 +#if defined (CMU)
 +  printf ("ns32k-encore-mach\n"); exit (0);
 +#else
 +  printf ("ns32k-encore-bsd\n"); exit (0);
 +#endif
 +#endif
 +#endif
 +
 +#if defined (__386BSD__)
 +  printf ("i386-pc-bsd\n"); exit (0);
 +#endif
 +
 +#if defined (sequent)
 +#if defined (i386)
 +  printf ("i386-sequent-dynix\n"); exit (0);
 +#endif
 +#if defined (ns32000)
 +  printf ("ns32k-sequent-dynix\n"); exit (0);
 +#endif
 +#endif
 +
 +#if defined (_SEQUENT_)
 +    struct utsname un;
 +
 +    uname(&un);
 +
 +    if (strncmp(un.version, "V2", 2) == 0) {
 +	printf ("i386-sequent-ptx2\n"); exit (0);
 +    }
 +    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
 +	printf ("i386-sequent-ptx1\n"); exit (0);
 +    }
 +    printf ("i386-sequent-ptx\n"); exit (0);
 +
 +#endif
 +
 +#if defined (vax)
 +# if !defined (ultrix)
 +#  include <sys/param.h>
 +#  if defined (BSD)
 +#   if BSD == 43
 +      printf ("vax-dec-bsd4.3\n"); exit (0);
 +#   else
 +#    if BSD == 199006
 +      printf ("vax-dec-bsd4.3reno\n"); exit (0);
 +#    else
 +      printf ("vax-dec-bsd\n"); exit (0);
 +#    endif
 +#   endif
 +#  else
 +    printf ("vax-dec-bsd\n"); exit (0);
 +#  endif
 +# else
 +    printf ("vax-dec-ultrix\n"); exit (0);
 +# endif
 +#endif
 +
 +#if defined (alliant) && defined (i860)
 +  printf ("i860-alliant-bsd\n"); exit (0);
 +#endif
 +
 +  exit (1);
 +}
 +EOF
 +
 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 +
 +# Apollos put the system type in the environment.
 +
 +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 +
 +# Convex versions that predate uname can use getsysinfo(1)
 +
 +if [ -x /usr/convex/getsysinfo ]
 +then
 +    case `getsysinfo -f cpu_type` in
 +    c1*)
 +	echo c1-convex-bsd
 +	exit 0 ;;
 +    c2*)
 +	if getsysinfo -f scalar_acc
 +	then echo c32-convex-bsd
 +	else echo c2-convex-bsd
 +	fi
 +	exit 0 ;;
 +    c34*)
 +	echo c34-convex-bsd
 +	exit 0 ;;
 +    c38*)
 +	echo c38-convex-bsd
 +	exit 0 ;;
 +    c4*)
 +	echo c4-convex-bsd
 +	exit 0 ;;
 +    esac
 +fi
 +
 +cat >&2 <<EOF
 +$0: unable to guess system type
 +
 +This script, last modified $timestamp, has failed to recognize
 +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/
 +
 +If the version you run ($0) is already up to date, please
 +send the following data and any information you think might be
 +pertinent to <config-patches at gnu.org> in order to provide the needed
 +information to handle your system.
 +
 +config.guess timestamp = $timestamp
 +
 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
 +
 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
 +/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
 +
 +hostinfo               = `(hostinfo) 2>/dev/null`
 +/bin/universe          = `(/bin/universe) 2>/dev/null`
 +/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
 +/bin/arch              = `(/bin/arch) 2>/dev/null`
 +/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 +
 +UNAME_MACHINE = ${UNAME_MACHINE}
 +UNAME_RELEASE = ${UNAME_RELEASE}
 +UNAME_SYSTEM  = ${UNAME_SYSTEM}
 +UNAME_VERSION = ${UNAME_VERSION}
 +EOF
 +
 +exit 1
 +
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "timestamp='"
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
diff --cc config.sub
index ac6de98,0000000..0f84ac2
mode 100644,000000..100644
--- a/config.sub
+++ b/config.sub
@@@ -1,1552 -1,0 +1,1566 @@@
 +#! /bin/sh
 +# Configuration validation subroutine script.
 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 +
- timestamp='2004-06-24'
++timestamp='2004-11-30'
 +
 +# 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
 +# (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.
 +#
 +# 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.
 +
 +# 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.
 +
 +# Please send patches to <config-patches at gnu.org>.  Submit a context
 +# diff and a properly formatted ChangeLog entry.
 +#
 +# Configuration subroutine to validate and canonicalize a configuration type.
 +# Supply the specified configuration type as an argument.
 +# If it is invalid, we print an error message on stderr and exit with code 1.
 +# Otherwise, we print the canonical config type on stdout and succeed.
 +
 +# 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.
 +# Each package is responsible for reporting which valid configurations
 +# it does not support.  The user should be able to distinguish
 +# a failure to support a valid configuration from a meaningless
 +# configuration.
 +
 +# The goal of this file is to map all the various variations of a given
 +# machine specification into a single specification in the form:
 +#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 +# or in some cases, the newer four-part form:
 +#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 +# It is wrong to echo any other type of specification.
 +
 +me=`echo "$0" | sed -e 's,.*/,,'`
 +
 +usage="\
 +Usage: $0 [OPTION] CPU-MFR-OPSYS
 +       $0 [OPTION] ALIAS
 +
 +Canonicalize a configuration name.
 +
 +Operation modes:
 +  -h, --help         print this help, then exit
 +  -t, --time-stamp   print date of last modification, then exit
 +  -v, --version      print version number, then exit
 +
 +Report bugs and patches to <config-patches at gnu.org>."
 +
 +version="\
 +GNU config.sub ($timestamp)
 +
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 +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."
 +
 +help="
 +Try \`$me --help' for more information."
 +
 +# Parse command line
 +while test $# -gt 0 ; do
 +  case $1 in
 +    --time-stamp | --time* | -t )
 +       echo "$timestamp" ; exit 0 ;;
 +    --version | -v )
 +       echo "$version" ; exit 0 ;;
 +    --help | --h* | -h )
 +       echo "$usage"; exit 0 ;;
 +    -- )     # Stop option processing
 +       shift; break ;;
 +    - )	# Use stdin as input.
 +       break ;;
 +    -* )
 +       echo "$me: invalid option $1$help"
 +       exit 1 ;;
 +
 +    *local*)
 +       # First pass through any local machine types.
 +       echo $1
 +       exit 0;;
 +
 +    * )
 +       break ;;
 +  esac
 +done
 +
 +case $# in
 + 0) echo "$me: missing argument$help" >&2
 +    exit 1;;
 + 1) ;;
 + *) echo "$me: too many arguments$help" >&2
 +    exit 1;;
 +esac
 +
 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 +# 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* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
 +  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
 +    os=-$maybe_os
 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
 +    ;;
 +  *)
 +    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
 +    if [ $basic_machine != $1 ]
 +    then os=`echo $1 | sed 's/.*-/-/'`
 +    else os=; fi
 +    ;;
 +esac
 +
 +### Let's recognize common machines as not being operating systems so
 +### that things like config.sub decstation-3100 work.  We also
 +### recognize some manufacturers as not being operating systems, so we
 +### can provide default operating systems below.
 +case $os in
 +	-sun*os*)
 +		# Prevent following clause from handling this invalid input.
 +		;;
 +	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
 +	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
 +	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
 +	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 +	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 +	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
 +	-apple | -axis | -knuth | -cray)
 +		os=
 +		basic_machine=$1
 +		;;
 +	-sim | -cisco | -oki | -wec | -winbond)
 +		os=
 +		basic_machine=$1
 +		;;
 +	-scout)
 +		;;
 +	-wrs)
 +		os=-vxworks
 +		basic_machine=$1
 +		;;
 +	-chorusos*)
 +		os=-chorusos
 +		basic_machine=$1
 +		;;
 + 	-chorusrdb)
 + 		os=-chorusrdb
 +		basic_machine=$1
 + 		;;
 +	-hiux*)
 +		os=-hiuxwe2
 +		;;
 +	-sco5)
 +		os=-sco3.2v5
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco4)
 +		os=-sco3.2v4
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco3.2.[4-9]*)
 +		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco3.2v[4-9]*)
 +		# 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/'`
 +		;;
 +	-udk*)
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-isc)
 +		os=-isc2.2
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-clix*)
 +		basic_machine=clipper-intergraph
 +		;;
 +	-isc*)
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-lynx*)
 +		os=-lynxos
 +		;;
 +	-ptx*)
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
 +		;;
 +	-windowsnt*)
 +		os=`echo $os | sed -e 's/windowsnt/winnt/'`
 +		;;
 +	-psos*)
 +		os=-psos
 +		;;
 +	-mint | -mint[0-9]*)
 +		basic_machine=m68k-atari
 +		os=-mint
 +		;;
 +esac
 +
 +# Decode aliases for certain CPU-COMPANY combinations.
 +case $basic_machine in
 +	# Recognize the basic CPU types without company name.
 +	# Some are omitted here because they have special meanings below.
 +	1750a | 580 \
 +	| a29k \
 +	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 +	| am33_2.0 \
 +	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 +	| c4x | clipper \
 +	| d10v | d30v | dlx | dsp16xx \
 +	| fr30 | frv \
 +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| i370 | i860 | i960 | ia64 \
 +	| ip2k | iq2000 \
 +	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 +	| mips | mipsbe | mipseb | mipsel | mipsle \
 +	| mips16 \
 +	| mips64 | mips64el \
 +	| mips64vr | mips64vrel \
 +	| mips64orion | mips64orionel \
 +	| mips64vr4100 | mips64vr4100el \
 +	| mips64vr4300 | mips64vr4300el \
 +	| mips64vr5000 | mips64vr5000el \
 +	| mipsisa32 | mipsisa32el \
 +	| mipsisa32r2 | mipsisa32r2el \
 +	| mipsisa64 | mipsisa64el \
 +	| mipsisa64r2 | mipsisa64r2el \
 +	| mipsisa64sb1 | mipsisa64sb1el \
 +	| mipsisa64sr71k | mipsisa64sr71kel \
 +	| mipstx39 | mipstx39el \
 +	| mn10200 | mn10300 \
 +	| msp430 \
 +	| ns16k | ns32k \
 +	| openrisc | or32 \
 +	| pdp10 | pdp11 | pj | pjl \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 +	| pyramid \
 +	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh64 | sh64le \
 +	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 +	| strongarm \
 +	| tahoe | thumb | tic4x | tic80 | tron \
 +	| v850 | v850e \
 +	| we32k \
- 	| x86 | xscale | xstormy16 | xtensa \
++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 +	| z8k)
 +		basic_machine=$basic_machine-unknown
 +		;;
 +	m6811 | m68hc11 | m6812 | m68hc12)
 +		# Motorola 68HC11/12.
 +		basic_machine=$basic_machine-unknown
 +		os=-none
 +		;;
 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 +		;;
 +
 +	# 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*86 | x86_64)
 +	  basic_machine=$basic_machine-pc
 +	  ;;
 +	# Object if more than one company name word.
 +	*-*-*)
 +		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 +		exit 1
 +		;;
 +	# Recognize the basic CPU types with company name.
 +	580-* \
 +	| a29k-* \
 +	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 +	| avr-* \
 +	| bs2000-* \
 +	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 +	| clipper-* | craynv-* | cydra-* \
 +	| d10v-* | d30v-* | dlx-* \
 +	| elxsi-* \
 +	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 +	| h8300-* | h8500-* \
 +	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 +	| i*86-* | i860-* | i960-* | ia64-* \
 +	| ip2k-* | iq2000-* \
 +	| m32r-* | m32rle-* \
 +	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 +	| m88110-* | m88k-* | mcore-* \
 +	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 +	| mips16-* \
 +	| mips64-* | mips64el-* \
 +	| mips64vr-* | mips64vrel-* \
 +	| mips64orion-* | mips64orionel-* \
 +	| mips64vr4100-* | mips64vr4100el-* \
 +	| mips64vr4300-* | mips64vr4300el-* \
 +	| mips64vr5000-* | mips64vr5000el-* \
 +	| mipsisa32-* | mipsisa32el-* \
 +	| mipsisa32r2-* | mipsisa32r2el-* \
 +	| mipsisa64-* | mipsisa64el-* \
 +	| mipsisa64r2-* | mipsisa64r2el-* \
 +	| mipsisa64sb1-* | mipsisa64sb1el-* \
 +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 +	| mipstx39-* | mipstx39el-* \
 +	| mmix-* \
 +	| msp430-* \
 +	| none-* | np1-* | ns16k-* | ns32k-* \
 +	| orion-* \
 +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 +	| pyramid-* \
 +	| romp-* | rs6000-* \
 +	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 +	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 +	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 +	| tahoe-* | thumb-* \
 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tron-* \
 +	| v850-* | v850e-* | vax-* \
 +	| we32k-* \
- 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- 	| xtensa-* \
++	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa-* \
 +	| ymp-* \
 +	| z8k-*)
 +		;;
 +	# Recognize the various machine names and aliases which stand
 +	# for a CPU type and a company and sometimes even an OS.
 +	386bsd)
 +		basic_machine=i386-unknown
 +		os=-bsd
 +		;;
 +	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 +		basic_machine=m68000-att
 +		;;
 +	3b*)
 +		basic_machine=we32k-att
 +		;;
 +	a29khif)
 +		basic_machine=a29k-amd
 +		os=-udi
 +		;;
 +    	abacus)
 +		basic_machine=abacus-unknown
 +		;;
 +	adobe68k)
 +		basic_machine=m68010-adobe
 +		os=-scout
 +		;;
 +	alliant | fx80)
 +		basic_machine=fx80-alliant
 +		;;
 +	altos | altos3068)
 +		basic_machine=m68k-altos
 +		;;
 +	am29k)
 +		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
 +		;;
 +	amiga | amiga-*)
 +		basic_machine=m68k-unknown
 +		;;
 +	amigaos | amigados)
 +		basic_machine=m68k-unknown
 +		os=-amigaos
 +		;;
 +	amigaunix | amix)
 +		basic_machine=m68k-unknown
 +		os=-sysv4
 +		;;
 +	apollo68)
 +		basic_machine=m68k-apollo
 +		os=-sysv
 +		;;
 +	apollo68bsd)
 +		basic_machine=m68k-apollo
 +		os=-bsd
 +		;;
 +	aux)
 +		basic_machine=m68k-apple
 +		os=-aux
 +		;;
 +	balance)
 +		basic_machine=ns32k-sequent
 +		os=-dynix
 +		;;
 +	c90)
 +		basic_machine=c90-cray
 +		os=-unicos
 +		;;
 +	convex-c1)
 +		basic_machine=c1-convex
 +		os=-bsd
 +		;;
 +	convex-c2)
 +		basic_machine=c2-convex
 +		os=-bsd
 +		;;
 +	convex-c32)
 +		basic_machine=c32-convex
 +		os=-bsd
 +		;;
 +	convex-c34)
 +		basic_machine=c34-convex
 +		os=-bsd
 +		;;
 +	convex-c38)
 +		basic_machine=c38-convex
 +		os=-bsd
 +		;;
 +	cray | j90)
 +		basic_machine=j90-cray
 +		os=-unicos
 +		;;
 +	craynv)
 +		basic_machine=craynv-cray
 +		os=-unicosmp
 +		;;
 +	cr16c)
 +		basic_machine=cr16c-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
 +		;;
 +	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
 +		;;
 +	delta88)
 +		basic_machine=m88k-motorola
 +		os=-sysv3
 +		;;
++	djgpp)
++		basic_machine=i586-pc
++		os=-msdosdjgpp
++		;;
 +	dpx20 | dpx20-*)
 +		basic_machine=rs6000-bull
 +		os=-bosx
 +		;;
 +	dpx2* | dpx2*-bull)
 +		basic_machine=m68k-bull
 +		os=-sysv3
 +		;;
 +	ebmon29k)
 +		basic_machine=a29k-amd
 +		os=-ebmon
 +		;;
 +	elxsi)
 +		basic_machine=elxsi-elxsi
 +		os=-bsd
 +		;;
 +	encore | umax | mmax)
 +		basic_machine=ns32k-encore
 +		;;
 +	es1800 | OSE68k | ose68k | ose | OSE)
 +		basic_machine=m68k-ericsson
 +		os=-ose
 +		;;
 +	fx2800)
 +		basic_machine=i860-alliant
 +		;;
 +	genix)
 +		basic_machine=ns32k-ns
 +		;;
 +	gmicro)
 +		basic_machine=tron-gmicro
 +		os=-sysv
 +		;;
 +	go32)
 +		basic_machine=i386-pc
 +		os=-go32
 +		;;
 +	h3050r* | hiux*)
 +		basic_machine=hppa1.1-hitachi
 +		os=-hiuxwe2
 +		;;
 +	h8300hms)
 +		basic_machine=h8300-hitachi
 +		os=-hms
 +		;;
 +	h8300xray)
 +		basic_machine=h8300-hitachi
 +		os=-xray
 +		;;
 +	h8500hms)
 +		basic_machine=h8500-hitachi
 +		os=-hms
 +		;;
 +	harris)
 +		basic_machine=m88k-harris
 +		os=-sysv3
 +		;;
 +	hp300-*)
 +		basic_machine=m68k-hp
 +		;;
 +	hp300bsd)
 +		basic_machine=m68k-hp
 +		os=-bsd
 +		;;
 +	hp300hpux)
 +		basic_machine=m68k-hp
 +		os=-hpux
 +		;;
 +	hp3k9[0-9][0-9] | hp9[0-9][0-9])
 +		basic_machine=hppa1.0-hp
 +		;;
 +	hp9k2[0-9][0-9] | hp9k31[0-9])
 +		basic_machine=m68000-hp
 +		;;
 +	hp9k3[2-9][0-9])
 +		basic_machine=m68k-hp
 +		;;
 +	hp9k6[0-9][0-9] | hp6[0-9][0-9])
 +		basic_machine=hppa1.0-hp
 +		;;
 +	hp9k7[0-79][0-9] | hp7[0-79][0-9])
 +		basic_machine=hppa1.1-hp
 +		;;
 +	hp9k78[0-9] | hp78[0-9])
 +		# FIXME: really hppa2.0-hp
 +		basic_machine=hppa1.1-hp
 +		;;
 +	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 +		# FIXME: really hppa2.0-hp
 +		basic_machine=hppa1.1-hp
 +		;;
 +	hp9k8[0-9][13679] | hp8[0-9][13679])
 +		basic_machine=hppa1.1-hp
 +		;;
 +	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 +		basic_machine=hppa1.0-hp
 +		;;
 +	hppa-next)
 +		os=-nextstep3
 +		;;
 +	hppaosf)
 +		basic_machine=hppa1.1-hp
 +		os=-osf
 +		;;
 +	hppro)
 +		basic_machine=hppa1.1-hp
 +		os=-proelf
 +		;;
 +	i370-ibm* | ibm*)
 +		basic_machine=i370-ibm
 +		;;
 +# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 +	i*86v32)
 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		os=-sysv32
 +		;;
 +	i*86v4*)
 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		os=-sysv4
 +		;;
 +	i*86v)
 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		os=-sysv
 +		;;
 +	i*86sol2)
 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		os=-solaris2
 +		;;
 +	i386mach)
 +		basic_machine=i386-mach
 +		os=-mach
 +		;;
 +	i386-vsta | vsta)
 +		basic_machine=i386-unknown
 +		os=-vsta
 +		;;
 +	iris | iris4d)
 +		basic_machine=mips-sgi
 +		case $os in
 +		    -irix*)
 +			;;
 +		    *)
 +			os=-irix4
 +			;;
 +		esac
 +		;;
 +	isi68 | isi)
 +		basic_machine=m68k-isi
 +		os=-sysv
 +		;;
 +	m88k-omron*)
 +		basic_machine=m88k-omron
 +		;;
 +	magnum | m3230)
 +		basic_machine=mips-mips
 +		os=-sysv
 +		;;
 +	merlin)
 +		basic_machine=ns32k-utek
 +		os=-sysv
 +		;;
 +	mingw32)
 +		basic_machine=i386-pc
 +		os=-mingw32
 +		;;
 +	miniframe)
 +		basic_machine=m68000-convergent
 +		;;
 +	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 +		basic_machine=m68k-atari
 +		os=-mint
 +		;;
 +	mips3*-*)
 +		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 +		;;
 +	mips3*)
 +		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 +		;;
 +	monitor)
 +		basic_machine=m68k-rom68k
 +		os=-coff
 +		;;
 +	morphos)
 +		basic_machine=powerpc-unknown
 +		os=-morphos
 +		;;
 +	msdos)
 +		basic_machine=i386-pc
 +		os=-msdos
 +		;;
 +	mvs)
 +		basic_machine=i370-ibm
 +		os=-mvs
 +		;;
 +	ncr3000)
 +		basic_machine=i486-ncr
 +		os=-sysv4
 +		;;
 +	netbsd386)
 +		basic_machine=i386-unknown
 +		os=-netbsd
 +		;;
 +	netwinder)
 +		basic_machine=armv4l-rebel
 +		os=-linux
 +		;;
 +	news | news700 | news800 | news900)
 +		basic_machine=m68k-sony
 +		os=-newsos
 +		;;
 +	news1000)
 +		basic_machine=m68030-sony
 +		os=-newsos
 +		;;
 +	news-3600 | risc-news)
 +		basic_machine=mips-sony
 +		os=-newsos
 +		;;
 +	necv70)
 +		basic_machine=v70-nec
 +		os=-sysv
 +		;;
 +	next | m*-next )
 +		basic_machine=m68k-next
 +		case $os in
 +		    -nextstep* )
 +			;;
 +		    -ns2*)
 +		      os=-nextstep2
 +			;;
 +		    *)
 +		      os=-nextstep3
 +			;;
 +		esac
 +		;;
 +	nh3000)
 +		basic_machine=m68k-harris
 +		os=-cxux
 +		;;
 +	nh[45]000)
 +		basic_machine=m88k-harris
 +		os=-cxux
 +		;;
 +	nindy960)
 +		basic_machine=i960-intel
 +		os=-nindy
 +		;;
 +	mon960)
 +		basic_machine=i960-intel
 +		os=-mon960
 +		;;
 +	nonstopux)
 +		basic_machine=mips-compaq
 +		os=-nonstopux
 +		;;
 +	np1)
 +		basic_machine=np1-gould
 +		;;
 +	nsr-tandem)
 +		basic_machine=nsr-tandem
 +		;;
 +	op50n-* | op60c-*)
 +		basic_machine=hppa1.1-oki
 +		os=-proelf
 +		;;
 +	or32 | or32-*)
 +		basic_machine=or32-unknown
 +		os=-coff
 +		;;
 +	os400)
 +		basic_machine=powerpc-ibm
 +		os=-os400
 +		;;
 +	OSE68000 | ose68000)
 +		basic_machine=m68000-ericsson
 +		os=-ose
 +		;;
 +	os68k)
 +		basic_machine=m68k-none
 +		os=-os68k
 +		;;
 +	pa-hitachi)
 +		basic_machine=hppa1.1-hitachi
 +		os=-hiuxwe2
 +		;;
 +	paragon)
 +		basic_machine=i860-intel
 +		os=-osf
 +		;;
 +	pbd)
 +		basic_machine=sparc-tti
 +		;;
 +	pbb)
 +		basic_machine=m68k-tti
 +		;;
 +	pc532 | pc532-*)
 +		basic_machine=ns32k-pc532
 +		;;
 +	pentium | p5 | k5 | k6 | nexgen | viac3)
 +		basic_machine=i586-pc
 +		;;
 +	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 +		basic_machine=i686-pc
 +		;;
 +	pentiumii | pentium2 | pentiumiii | pentium3)
 +		basic_machine=i686-pc
 +		;;
 +	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-* | 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/^[^-]*-//'`
 +		;;
 +	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
 +		;;
 +	pw32)
 +		basic_machine=i586-unknown
 +		os=-pw32
 +		;;
 +	rom68k)
 +		basic_machine=m68k-rom68k
 +		os=-coff
 +		;;
 +	rm[46]00)
 +		basic_machine=mips-siemens
 +		;;
 +	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
 +		;;
 +	sei)
 +		basic_machine=mips-sei
 +		os=-seiux
 +		;;
 +	sequent)
 +		basic_machine=i386-sequent
 +		;;
 +	sh)
 +		basic_machine=sh-hitachi
 +		os=-hms
 +		;;
 +	sh64)
 +		basic_machine=sh64-unknown
 +		;;
 +	sparclite-wrs | simso-wrs)
 +		basic_machine=sparclite-wrs
 +		os=-vxworks
 +		;;
 +	sps7)
 +		basic_machine=m68k-bull
 +		os=-sysv2
 +		;;
 +	spur)
 +		basic_machine=spur-unknown
 +		;;
 +	st2000)
 +		basic_machine=m68k-tandem
 +		;;
 +	stratus)
 +		basic_machine=i860-stratus
 +		os=-sysv4
 +		;;
 +	sun2)
 +		basic_machine=m68000-sun
 +		;;
 +	sun2os3)
 +		basic_machine=m68000-sun
 +		os=-sunos3
 +		;;
 +	sun2os4)
 +		basic_machine=m68000-sun
 +		os=-sunos4
 +		;;
 +	sun3os3)
 +		basic_machine=m68k-sun
 +		os=-sunos3
 +		;;
 +	sun3os4)
 +		basic_machine=m68k-sun
 +		os=-sunos4
 +		;;
 +	sun4os3)
 +		basic_machine=sparc-sun
 +		os=-sunos3
 +		;;
 +	sun4os4)
 +		basic_machine=sparc-sun
 +		os=-sunos4
 +		;;
 +	sun4sol2)
 +		basic_machine=sparc-sun
 +		os=-solaris2
 +		;;
 +	sun3 | sun3-*)
 +		basic_machine=m68k-sun
 +		;;
 +	sun4)
 +		basic_machine=sparc-sun
 +		;;
 +	sun386 | sun386i | roadrunner)
 +		basic_machine=i386-sun
 +		;;
 +	sv1)
 +		basic_machine=sv1-cray
 +		os=-unicos
 +		;;
 +	symmetry)
 +		basic_machine=i386-sequent
 +		os=-dynix
 +		;;
 +	t3e)
 +		basic_machine=alphaev5-cray
 +		os=-unicos
 +		;;
 +	t90)
 +		basic_machine=t90-cray
 +		os=-unicos
 +		;;
 +	tic54x | c54x*)
 +		basic_machine=tic54x-unknown
 +		os=-coff
 +		;;
 +	tic55x | c55x*)
 +		basic_machine=tic55x-unknown
 +		os=-coff
 +		;;
 +	tic6x | c6x*)
 +		basic_machine=tic6x-unknown
 +		os=-coff
 +		;;
 +	tx39)
 +		basic_machine=mipstx39-unknown
 +		;;
 +	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
 +		;;
 +	ultra3)
 +		basic_machine=a29k-nyu
 +		os=-sym1
 +		;;
 +	v810 | necv810)
 +		basic_machine=v810-nec
 +		os=-none
 +		;;
 +	vaxv)
 +		basic_machine=vax-dec
 +		os=-sysv
 +		;;
 +	vms)
 +		basic_machine=vax-dec
 +		os=-vms
 +		;;
 +	vpp*|vx|vx-*)
 +		basic_machine=f301-fujitsu
 +		;;
 +	vxworks960)
 +		basic_machine=i960-wrs
 +		os=-vxworks
 +		;;
 +	vxworks68)
 +		basic_machine=m68k-wrs
 +		os=-vxworks
 +		;;
 +	vxworks29k)
 +		basic_machine=a29k-wrs
 +		os=-vxworks
 +		;;
 +	w65*)
 +		basic_machine=w65-wdc
 +		os=-none
 +		;;
 +	w89k-*)
 +		basic_machine=hppa1.1-winbond
 +		os=-proelf
 +		;;
++	xbox)
++		basic_machine=i686-pc
++		os=-mingw32
++		;;
 +	xps | xps100)
 +		basic_machine=xps100-honeywell
 +		;;
 +	ymp)
 +		basic_machine=ymp-cray
 +		os=-unicos
 +		;;
 +	z8k-*-coff)
 +		basic_machine=z8k-unknown
 +		os=-sim
 +		;;
 +	none)
 +		basic_machine=none-none
 +		os=-none
 +		;;
 +
 +# Here we handle the default manufacturer of certain CPU types.  It is in
 +# some cases the only manufacturer, in others, it is the most popular.
 +	w89k)
 +		basic_machine=hppa1.1-winbond
 +		;;
 +	op50n)
 +		basic_machine=hppa1.1-oki
 +		;;
 +	op60c)
 +		basic_machine=hppa1.1-oki
 +		;;
 +	romp)
 +		basic_machine=romp-ibm
 +		;;
 +	mmix)
 +		basic_machine=mmix-knuth
 +		;;
 +	rs6000)
 +		basic_machine=rs6000-ibm
 +		;;
 +	vax)
 +		basic_machine=vax-dec
 +		;;
 +	pdp10)
 +		# there are many clones, so DEC is not a safe bet
 +		basic_machine=pdp10-unknown
 +		;;
 +	pdp11)
 +		basic_machine=pdp11-dec
 +		;;
 +	we32k)
 +		basic_machine=we32k-att
 +		;;
 +	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 +		basic_machine=sh-unknown
 +		;;
 +	sh64)
 +		basic_machine=sh64-unknown
 +		;;
 +	sparc | sparcv8 | sparcv9 | sparcv9b)
 +		basic_machine=sparc-sun
 +		;;
 +	cydra)
 +		basic_machine=cydra-cydrome
 +		;;
 +	orion)
 +		basic_machine=orion-highlevel
 +		;;
 +	orion105)
 +		basic_machine=clipper-highlevel
 +		;;
 +	mac | mpw | mac-mpw)
 +		basic_machine=m68k-apple
 +		;;
 +	pmac | pmac-mpw)
 +		basic_machine=powerpc-apple
 +		;;
 +	*-unknown)
 +		# Make sure to match an already-canonicalized machine name.
 +		;;
 +	*)
 +		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 +		exit 1
 +		;;
 +esac
 +
 +# Here we canonicalize certain aliases for manufacturers.
 +case $basic_machine in
 +	*-digital*)
 +		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
 +		;;
 +	*-commodore*)
 +		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
 +		;;
 +	*)
 +		;;
 +esac
 +
 +# Decode manufacturer-specific aliases for certain operating systems.
 +
 +if [ x"$os" != x"" ]
 +then
 +case $os in
 +        # First match some system type aliases
 +        # that might get confused with valid system types.
 +	# -solaris* is a basic system type, with this one exception.
 +	-solaris1 | -solaris1.*)
 +		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 +		;;
 +	-solaris)
 +		os=-solaris2
 +		;;
 +	-svr4*)
 +		os=-sysv4
 +		;;
 +	-unixware*)
 +		os=-sysv4.2uw
 +		;;
 +	-gnu/linux*)
 +		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 +		;;
 +	# First accept the basic system types.
 +	# The portable systems comes first.
 +	# 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* \
 +	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 +	      | -aos* \
 +	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 +	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 +	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 +	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 +	      | -chorusos* | -chorusrdb* \
 +	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 +	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 +	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 +	# Remember, each alternative MUST END IN *, to match a version number.
 +		;;
 +	-qnx*)
 +		case $basic_machine in
 +		    x86-* | i*86-*)
 +			;;
 +		    *)
 +			os=-nto$os
 +			;;
 +		esac
 +		;;
 +	-nto-qnx*)
 +		;;
 +	-nto*)
 +		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 +		;;
 +	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 +	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 +	      | -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|'`
 +		;;
 +	-sunos5*)
 +		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 +		;;
 +	-sunos6*)
 +		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 +		;;
 +	-opened*)
 +		os=-openedition
 +		;;
 +        -os400*)
 +		os=-os400
 +		;;
 +	-wince*)
 +		os=-wince
 +		;;
 +	-osfrose*)
 +		os=-osfrose
 +		;;
 +	-osf*)
 +		os=-osf
 +		;;
 +	-utek*)
 +		os=-bsd
 +		;;
 +	-dynix*)
 +		os=-bsd
 +		;;
 +	-acis*)
 +		os=-aos
 +		;;
 +	-atheos*)
 +		os=-atheos
 +		;;
 +	-syllable*)
 +		os=-syllable
 +		;;
 +	-386bsd)
 +		os=-bsd
 +		;;
 +	-ctix* | -uts*)
 +		os=-sysv
 +		;;
 +	-nova*)
 +		os=-rtmk-nova
 +		;;
 +	-ns2 )
 +		os=-nextstep2
 +		;;
 +	-nsk*)
 +		os=-nsk
 +		;;
 +	# Preserve the version number of sinix5.
 +	-sinix5.*)
 +		os=`echo $os | sed -e 's|sinix|sysv|'`
 +		;;
 +	-sinix*)
 +		os=-sysv4
 +		;;
 +        -tpf*)
 +		os=-tpf
 +		;;
 +	-triton*)
 +		os=-sysv3
 +		;;
 +	-oss*)
 +		os=-sysv3
 +		;;
 +	-svr4)
 +		os=-sysv4
 +		;;
 +	-svr3)
 +		os=-sysv3
 +		;;
 +	-sysvr4)
 +		os=-sysv4
 +		;;
 +	# This must come after -sysvr4.
 +	-sysv*)
 +		;;
 +	-ose*)
 +		os=-ose
 +		;;
 +	-es1800*)
 +		os=-ose
 +		;;
 +	-xenix)
 +		os=-xenix
 +		;;
 +	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +		os=-mint
 +		;;
 +	-aros*)
 +		os=-aros
 +		;;
 +	-kaos*)
 +		os=-kaos
 +		;;
++	-zvmoe)
++		os=-zvmoe
++		;;
 +	-none)
 +		;;
 +	*)
 +		# Get rid of the `-' at the beginning of $os.
 +		os=`echo $os | sed 's/[^-]*-//'`
 +		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
 +		exit 1
 +		;;
 +esac
 +else
 +
 +# Here we handle the default operating systems that come with various machines.
 +# The value should be what the vendor currently ships out the door with their
 +# machine or put another way, the most popular os provided with the machine.
 +
 +# Note that if you're going to try to match "-MANUFACTURER" here (say,
 +# "-sun"), then you have to tell the case statement up towards the top
 +# that MANUFACTURER isn't an operating system.  Otherwise, code above
 +# will signal an error saying that MANUFACTURER isn't an operating
 +# system, and we'll never get to this point.
 +
 +case $basic_machine in
 +	*-acorn)
 +		os=-riscix1.2
 +		;;
 +	arm*-rebel)
 +		os=-linux
 +		;;
 +	arm*-semi)
 +		os=-aout
 +		;;
 +    c4x-* | tic4x-*)
 +        os=-coff
 +        ;;
 +	# This must come before the *-dec entry.
 +	pdp10-*)
 +		os=-tops20
 +		;;
 +	pdp11-*)
 +		os=-none
 +		;;
 +	*-dec | vax-*)
 +		os=-ultrix4.2
 +		;;
 +	m68*-apollo)
 +		os=-domain
 +		;;
 +	i386-sun)
 +		os=-sunos4.0.2
 +		;;
 +	m68000-sun)
 +		os=-sunos3
 +		# This also exists in the configure program, but was not the
 +		# default.
 +		# os=-sunos4
 +		;;
 +	m68*-cisco)
 +		os=-aout
 +		;;
 +	mips*-cisco)
 +		os=-elf
 +		;;
 +	mips*-*)
 +		os=-elf
 +		;;
 +	or32-*)
 +		os=-coff
 +		;;
 +	*-tti)	# must be before sparc entry or we get the wrong os.
 +		os=-sysv3
 +		;;
 +	sparc-* | *-sun)
 +		os=-sunos4.1.1
 +		;;
 +	*-be)
 +		os=-beos
 +		;;
 +	*-ibm)
 +		os=-aix
 +		;;
 +    	*-knuth)
 +		os=-mmixware
 +		;;
 +	*-wec)
 +		os=-proelf
 +		;;
 +	*-winbond)
 +		os=-proelf
 +		;;
 +	*-oki)
 +		os=-proelf
 +		;;
 +	*-hp)
 +		os=-hpux
 +		;;
 +	*-hitachi)
 +		os=-hiux
 +		;;
 +	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 +		os=-sysv
 +		;;
 +	*-cbm)
 +		os=-amigaos
 +		;;
 +	*-dg)
 +		os=-dgux
 +		;;
 +	*-dolphin)
 +		os=-sysv3
 +		;;
 +	m68k-ccur)
 +		os=-rtu
 +		;;
 +	m88k-omron*)
 +		os=-luna
 +		;;
 +	*-next )
 +		os=-nextstep
 +		;;
 +	*-sequent)
 +		os=-ptx
 +		;;
 +	*-crds)
 +		os=-unos
 +		;;
 +	*-ns)
 +		os=-genix
 +		;;
 +	i370-*)
 +		os=-mvs
 +		;;
 +	*-next)
 +		os=-nextstep3
 +		;;
 +	*-gould)
 +		os=-sysv
 +		;;
 +	*-highlevel)
 +		os=-bsd
 +		;;
 +	*-encore)
 +		os=-bsd
 +		;;
 +	*-sgi)
 +		os=-irix
 +		;;
 +	*-siemens)
 +		os=-sysv4
 +		;;
 +	*-masscomp)
 +		os=-rtu
 +		;;
 +	f30[01]-fujitsu | f700-fujitsu)
 +		os=-uxpv
 +		;;
 +	*-rom68k)
 +		os=-coff
 +		;;
 +	*-*bug)
 +		os=-coff
 +		;;
 +	*-apple)
 +		os=-macos
 +		;;
 +	*-atari*)
 +		os=-mint
 +		;;
 +	*)
 +		os=-none
 +		;;
 +esac
 +fi
 +
 +# Here we handle the case where we know the os, and the CPU type, but not the
 +# manufacturer.  We pick the logical manufacturer.
 +vendor=unknown
 +case $basic_machine in
 +	*-unknown)
 +		case $os in
 +			-riscix*)
 +				vendor=acorn
 +				;;
 +			-sunos*)
 +				vendor=sun
 +				;;
 +			-aix*)
 +				vendor=ibm
 +				;;
 +			-beos*)
 +				vendor=be
 +				;;
 +			-hpux*)
 +				vendor=hp
 +				;;
 +			-mpeix*)
 +				vendor=hp
 +				;;
 +			-hiux*)
 +				vendor=hitachi
 +				;;
 +			-unos*)
 +				vendor=crds
 +				;;
 +			-dgux*)
 +				vendor=dg
 +				;;
 +			-luna*)
 +				vendor=omron
 +				;;
 +			-genix*)
 +				vendor=ns
 +				;;
 +			-mvs* | -opened*)
 +				vendor=ibm
 +				;;
 +			-os400*)
 +				vendor=ibm
 +				;;
 +			-ptx*)
 +				vendor=sequent
 +				;;
 +			-tpf*)
 +				vendor=ibm
 +				;;
 +			-vxsim* | -vxworks* | -windiss*)
 +				vendor=wrs
 +				;;
 +			-aux*)
 +				vendor=apple
 +				;;
 +			-hms*)
 +				vendor=hitachi
 +				;;
 +			-mpw* | -macos*)
 +				vendor=apple
 +				;;
 +			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +				vendor=atari
 +				;;
 +			-vos*)
 +				vendor=stratus
 +				;;
 +		esac
 +		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 +		;;
 +esac
 +
 +echo $basic_machine$os
 +exit 0
 +
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "timestamp='"
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
diff --cc debian/changelog
index 56e87b7,0000000..7fb6626
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,0 +1,17 @@@
++fityk (0.4.4-1) unstable; urgency=low
++
++  * New upstream release.  Changes described in NEWS.
++
++ -- Carlo Segre <segre at iit.edu>  Tue,  8 Mar 2005 08:37:13 -0600
++
 +fityk (0.4.3p1-1) unstable; urgency=low
 +
 +  * New upstream release.  Changes described in NEWS.
-   * Sponsored upload by Frank K�ster <frank at debian.org>
 +
-  -- Frank K�ster <frank at debian.org>  Thu,  2 Dec 2004 16:59:43 +0100
++ -- Carlo Segre <segre at iit.edu>  Sat, 20 Nov 2004 12:11:22 -0600
 +
 +fityk (0.4.2-1) unstable; urgency=low
 +
 +  * Initial Release (Closes:  #271166).
 +
 + -- Carlo Segre <segre at iit.edu>  Fri,  10 Sep 2004 11:23:40 -0500

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fityk.git



More information about the debian-science-commits mailing list