fix jpeg build for x86_64 hosts

SVN-Revision: 3698

diff --git a/openwrt/package/jpeg/patches/jpeg-6b-config_guess.patch b/openwrt/package/jpeg/patches/jpeg-6b-config_guess.patch
index d6912073fc925c3557cd019a693b61d9525284b5..0a3dbd853063f1d148b2b88e275cd00775ea45e4 100644 (file)
--- a/openwrt/package/jpeg/patches/jpeg-6b-config_guess.patch
+++ b/openwrt/package/jpeg/patches/jpeg-6b-config_guess.patch
@@ -1,1532 +1,2850 @@
-The supplied config.guess is just too old.
-Use the one shipped with binutils instead.
-
-diff -ruN jpeg-6b-old/config.guess jpeg-6b-new/config.guess
---- jpeg-6b-old/config.guess   1998-03-25 16:25:38.000000000 +0100
-+++ jpeg-6b-new/config.guess   2004-11-22 21:33:30.000000000 +0100
-@@ -1,7 +1,10 @@
+diff -urN jpeg.old/config.guess jpeg.dev/config.guess
+--- jpeg.old/config.guess      2006-04-21 16:13:37.000000000 +0200
++++ jpeg.dev/config.guess      2006-04-21 16:16:58.000000000 +0200
+@@ -1,10 +1,7 @@

  #! /bin/sh
  # Attempt to guess a canonical system name.
  #! /bin/sh
  # Attempt to guess a canonical system name.

--#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
--#
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-11-12'
-+
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+-
+-timestamp='2004-11-12'
+-
++#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
++#

  # 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 2 of the License, or

-@@ -21,125 +24,314 @@
+@@ -24,314 +21,125 @@

  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
  # 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>.
--# The master version of this file is at the FSF in /home/gd/gnu/lib.
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Written by Per Bothner <bothner@cygnus.com>.
++# The master version of this file is at the FSF in /home/gd/gnu/lib.

  #
  # 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
  #
  # 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 system type (host/target name).
--#
--# Only a few systems have been added to this list; please add others
--# (but try to keep the structure clean).
--#
-+# 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@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 ;'
+-# 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@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 ;'
++# don't specify an explicit system type (host/target name).
++#
++# Only a few systems have been added to this list; please add others
++# (but try to keep the structure clean).
++#

  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  
  # 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)
+-# (ghazi@noc.rutgers.edu 1994-08-24)
++# (ghazi@noc.rutgers.edu 8/24/94.)

  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
  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_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown

  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  

--trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
--
++trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
++

  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  # 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 ;;
+-    *: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:*:*)
      alpha:OSF1:*:*)

--      if test $UNAME_RELEASE = "V4.0"; then
-+      case $UNAME_RELEASE in
-+      *4.0)
+-      case $UNAME_RELEASE in
+-      *4.0)
++      if test $UNAME_RELEASE = "V4.0"; then

                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
                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.
+-              ;;
+-      *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.
++      fi

        # 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.
        # 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
--      .globl main
--      .ent main
--main:
--      .frame \$30,0,\$26,0
--      .prologue 0
--      .long 0x47e03d80 # implver $0
--      lda \$2,259
--      .long 0x47e20c21 # amask $2,$1
--      srl \$1,8,\$2
--      sll \$2,2,\$2
--      sll \$0,3,\$0
--      addl \$1,\$0,\$0
--      addl \$2,\$0,\$0
--      ret \$31,(\$26),1
--      .end main
--EOF
--      ${CC-cc} dummy.s -o dummy 2>/dev/null
--      if test "$?" = 0 ; then
--              ./dummy
--              case "$?" in
--                      7)
--                              UNAME_MACHINE="alpha"
--                              ;;
--                      15)
--                              UNAME_MACHINE="alphaev5"
--                              ;;
--                      14)
--                              UNAME_MACHINE="alphaev56"
--                              ;;
--                      10)
--                              UNAME_MACHINE="alphapca56"
--                              ;;
--                      16)
--                              UNAME_MACHINE="alphaev6"
--                              ;;
--              esac
--      fi
--      rm -f dummy.s dummy
--      echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
-+      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
+-      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
++      cat <<EOF >dummy.s
++      .globl main
++      .ent main
++main:
++      .frame \$30,0,\$26,0
++      .prologue 0
++      .long 0x47e03d80 # implver $0
++      lda \$2,259
++      .long 0x47e20c21 # amask $2,$1
++      srl \$1,8,\$2
++      sll \$2,2,\$2
++      sll \$0,3,\$0
++      addl \$1,\$0,\$0
++      addl \$2,\$0,\$0
++      ret \$31,(\$26),1
++      .end main
++EOF
++      ${CC-cc} dummy.s -o dummy 2>/dev/null
++      if test "$?" = 0 ; then
++              ./dummy
++              case "$?" in
++                      7)
++                              UNAME_MACHINE="alpha"
++                              ;;
++                      15)
++                              UNAME_MACHINE="alphaev5"
++                              ;;
++                      14)
++                              UNAME_MACHINE="alphaev56"
++                              ;;
++                      10)
++                              UNAME_MACHINE="alphapca56"
++                              ;;
++                      16)
++                              UNAME_MACHINE="alphaev6"
++                              ;;
++              esac
++      fi
++      rm -f dummy.s dummy
++      echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`

        exit 0 ;;
      21064:Windows_NT:50:3)
        echo alpha-dec-winnt3.5
        exit 0 ;;
      Amiga*:UNIX_System_V:4.0:*)
        exit 0 ;;
      21064:Windows_NT:50:3)
        echo alpha-dec-winnt3.5
        exit 0 ;;
      Amiga*:UNIX_System_V:4.0:*)

--      echo m68k-cbm-sysv4
-+      echo m68k-unknown-sysv4
+-      echo m68k-unknown-sysv4
++      echo m68k-cbm-sysv4

        exit 0;;
        exit 0;;

--    amiga:NetBSD:*:*)
--      echo m68k-cbm-netbsd${UNAME_RELEASE}
--      exit 0 ;;
--    amiga:OpenBSD:*:*)
--      echo m68k-unknown-openbsd${UNAME_RELEASE}
--      exit 0 ;;
--    arc64:OpenBSD:*:*)
--      echo mips64el-unknown-openbsd${UNAME_RELEASE}
-+    *:[Aa]miga[Oo][Ss]:*:*)
-+      echo ${UNAME_MACHINE}-unknown-amigaos
+-    *:[Aa]miga[Oo][Ss]:*:*)
+-      echo ${UNAME_MACHINE}-unknown-amigaos
++    amiga:NetBSD:*:*)
++      echo m68k-cbm-netbsd${UNAME_RELEASE}
++      exit 0 ;;
++    amiga:OpenBSD:*:*)
++      echo m68k-unknown-openbsd${UNAME_RELEASE}
++      exit 0 ;;
++    arc64:OpenBSD:*:*)
++      echo mips64el-unknown-openbsd${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    arc:OpenBSD:*:*)
--      echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+      echo ${UNAME_MACHINE}-unknown-morphos
+-    *:[Mm]orph[Oo][Ss]:*:*)
+-      echo ${UNAME_MACHINE}-unknown-morphos
++    arc:OpenBSD:*:*)
++      echo mipsel-unknown-openbsd${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    hkmips:OpenBSD:*:*)
--      echo mips-unknown-openbsd${UNAME_RELEASE}
-+    *:OS/390:*:*)
-+      echo i370-ibm-openedition
+-    *:OS/390:*:*)
+-      echo i370-ibm-openedition
++    hkmips:OpenBSD:*:*)
++      echo mips-unknown-openbsd${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    pmax:OpenBSD:*:*)
--      echo mipsel-unknown-openbsd${UNAME_RELEASE}
--      exit 0 ;;
--    sgi:OpenBSD:*:*)
--      echo mips-unknown-openbsd${UNAME_RELEASE}
-+    *:z/VM:*:*)
-+      echo s390-ibm-zvmoe
+-    *:z/VM:*:*)
+-      echo s390-ibm-zvmoe
++    pmax:OpenBSD:*:*)
++      echo mipsel-unknown-openbsd${UNAME_RELEASE}
++      exit 0 ;;
++    sgi:OpenBSD:*:*)
++      echo mips-unknown-openbsd${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    wgrisc:OpenBSD:*:*)
--      echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
+-    *:OS400:*:*)
+-        echo powerpc-ibm-os400
++    wgrisc:OpenBSD:*:*)
++      echo mipsel-unknown-openbsd${UNAME_RELEASE}

        exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
        exit 0;;
        exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
        exit 0;;

--    arm32:NetBSD:*:*)
--      echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--      exit 0 ;;
--    SR2?01:HI-UX/MPP:*:*)
-+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
++    arm32:NetBSD:*:*)
++      echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++      exit 0 ;;
++    SR2?01:HI-UX/MPP:*:*)

        echo hppa1.1-hitachi-hiuxmpp
        exit 0;;
        echo hppa1.1-hitachi-hiuxmpp
        exit 0;;

--    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
-+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
++    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)

        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
        if test "`(/bin/universe) 2>/dev/null`" = att ; then
                echo pyramid-pyramid-sysv3
        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
        if test "`(/bin/universe) 2>/dev/null`" = att ; then
                echo pyramid-pyramid-sysv3

-@@ -147,9 +339,19 @@
+@@ -339,19 +147,9 @@

                echo pyramid-pyramid-bsd
        fi
        exit 0 ;;
                echo pyramid-pyramid-bsd
        fi
        exit 0 ;;

--    NILE:*:*:dcosx)
-+    NILE*:*:*:dcosx)
+-    NILE*:*:*:dcosx)
++    NILE:*:*:dcosx)

        echo pyramid-pyramid-svr4
        exit 0 ;;
        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: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 ;;
+-    DRS?6000:unix:4.0:6*)
+-      echo sparc-icl-nx6
+-      exit 0 ;;
+-    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 ;;
      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;

-@@ -175,7 +377,7 @@
+@@ -377,7 +175,7 @@

        echo m68k-sun-sunos${UNAME_RELEASE}
        exit 0 ;;
      sun*:*:4.2BSD:*)
        echo m68k-sun-sunos${UNAME_RELEASE}
        exit 0 ;;
      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`
+-      UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++      UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`

        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
        case "`/bin/arch`" in
            sun3)
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
        case "`/bin/arch`" in
            sun3)

-@@ -189,29 +391,34 @@
+@@ -391,34 +189,29 @@

      aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
        exit 0 ;;
      aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
        exit 0 ;;

--    atari*:NetBSD:*:*)
--      echo m68k-atari-netbsd${UNAME_RELEASE}
-+    # 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}
+-    # 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}
++    atari*:NetBSD:*:*)
++      echo m68k-atari-netbsd${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    atari*:OpenBSD:*:*)
--      echo m68k-unknown-openbsd${UNAME_RELEASE}
--      exit 0 ;;
--    sun3*:NetBSD:*:*)
--      echo m68k-sun-netbsd${UNAME_RELEASE}
--      exit 0 ;;
--    sun3*:OpenBSD:*:*)
--      echo m68k-unknown-openbsd${UNAME_RELEASE}
--      exit 0 ;;
--    mac68k:NetBSD:*:*)
--      echo m68k-apple-netbsd${UNAME_RELEASE}
--      exit 0 ;;
--    mac68k:OpenBSD:*:*)
--      echo m68k-unknown-openbsd${UNAME_RELEASE}
--      exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--      echo m68k-unknown-openbsd${UNAME_RELEASE}
-+    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}
+-    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}
++    atari*:OpenBSD:*:*)
++      echo m68k-unknown-openbsd${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    mvme88k:OpenBSD:*:*)
--      echo m88k-unknown-openbsd${UNAME_RELEASE}
-+    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}
+-    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}
++    sun3*:NetBSD:*:*)
++      echo m68k-sun-netbsd${UNAME_RELEASE}
++      exit 0 ;;
++    sun3*:OpenBSD:*:*)
++      echo m68k-unknown-openbsd${UNAME_RELEASE}
++      exit 0 ;;
++    mac68k:NetBSD:*:*)
++      echo m68k-apple-netbsd${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 ;;
      powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
        exit 0 ;;
      powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}

-@@ -225,12 +432,18 @@
+@@ -432,18 +225,12 @@

      VAX*:ULTRIX*:*:*)
        echo vax-dec-ultrix${UNAME_RELEASE}
        exit 0 ;;
      VAX*:ULTRIX*:*:*)
        echo vax-dec-ultrix${UNAME_RELEASE}
        exit 0 ;;

--    2020:CLIX:*:*)
-+    2020:CLIX:*:* | 2430:CLIX:*:*)
+-    2020:CLIX:*:* | 2430:CLIX:*:*)
++    2020:CLIX:*:*)

        echo clipper-intergraph-clix${UNAME_RELEASE}
        exit 0 ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)
        echo clipper-intergraph-clix${UNAME_RELEASE}
        exit 0 ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)

--      sed 's/^        //' << EOF >dummy.c
--      int main (argc, argv) int argc; char **argv; {
-+      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
+-      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
++      sed 's/^        //' << EOF >dummy.c
++      int main (argc, argv) int argc; char **argv; {

        #if defined (host_mips) && defined (MIPSEB)
        #if defined (SYSTYPE_SYSV)
          printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
        #if defined (host_mips) && defined (MIPSEB)
        #if defined (SYSTYPE_SYSV)
          printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);

-@@ -245,12 +458,20 @@
+@@ -458,20 +245,12 @@

          exit (-1);
        }
  EOF
          exit (-1);
        }
  EOF

--      ${CC-cc} dummy.c -o dummy \
--        && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--        && rm dummy.c dummy && exit 0
--      rm -f dummy.c dummy
-+      $CC_FOR_BUILD -o $dummy $dummy.c \
-+        && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+        && exit 0
+-      $CC_FOR_BUILD -o $dummy $dummy.c \
+-        && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-        && exit 0
++      ${CC-cc} dummy.c -o dummy \
++        && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++        && rm dummy.c dummy && exit 0
++      rm -f dummy.c dummy

        echo mips-mips-riscos${UNAME_RELEASE}
        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 ;;
+-    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 ;;
      Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
        exit 0 ;;

-@@ -266,15 +487,18 @@
+@@ -487,18 +266,15 @@

      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`

--        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
--      if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
--           -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-+      if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+      then
-+          if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+             [ ${TARGET_BINARY_INTERFACE}x = x ]
-+          then
+-      if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+-      then
+-          if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+-             [ ${TARGET_BINARY_INTERFACE}x = x ]
+-          then
++        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
++      if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
++           -o ${TARGET_BINARY_INTERFACE}x = x ] ; then

                echo m88k-dg-dgux${UNAME_RELEASE}
                echo m88k-dg-dgux${UNAME_RELEASE}

--      else
-+          else
-               echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+          fi
-+      else
-+          echo i586-dg-dgux${UNAME_RELEASE}
+-          else
+-              echo m88k-dg-dguxbcs${UNAME_RELEASE}
+-          fi
+       else
+-          echo i586-dg-dgux${UNAME_RELEASE}
++              echo m88k-dg-dguxbcs${UNAME_RELEASE}

        fi
        fi

--        else echo i586-dg-dgux${UNAME_RELEASE}
--        fi
++        else echo i586-dg-dgux${UNAME_RELEASE}
++        fi

        exit 0 ;;
      M88*:DolphinOS:*:*)       # DolphinOS (SVR3)
        echo m88k-dolphin-sysv3
        exit 0 ;;
      M88*:DolphinOS:*:*)       # DolphinOS (SVR3)
        echo m88k-dolphin-sysv3

-@@ -295,12 +519,21 @@
+@@ -519,21 +295,12 @@

      ????????: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 '
      ????????: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:*:*)
-+    i*86:AIX:*:*)
+-    i*86:AIX:*:*)
++    i?86:AIX:*:*)

        echo i386-ibm-aix
        exit 0 ;;
        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 ;;
+-    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
      *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then

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

                #include <sys/systemcfg.h>
  
                main()
                #include <sys/systemcfg.h>
  
                main()

-@@ -311,8 +544,7 @@
+@@ -544,7 +311,8 @@

                        exit(0);
                        }
  EOF
                        exit(0);
                        }
  EOF

--              ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
--              rm -f dummy.c dummy
-+              $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+-              $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++              ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
++              rm -f dummy.c dummy

                echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4
                echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4

-@@ -320,8 +552,9 @@
+@@ -552,9 +320,8 @@

                echo rs6000-ibm-aix3.2
        fi
        exit 0 ;;
                echo rs6000-ibm-aix3.2
        fi
        exit 0 ;;

--    *:AIX:*:4)
--      if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
-+    *: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
+-    *: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
++    *:AIX:*:4)
++      if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then

                IBM_ARCH=rs6000
        else
                IBM_ARCH=powerpc
                IBM_ARCH=rs6000
        else
                IBM_ARCH=powerpc

-@@ -329,7 +562,7 @@
+@@ -562,7 +329,7 @@

        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
        else
        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
        else

--              IBM_REV=4.${UNAME_RELEASE}
-+              IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+-              IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++              IBM_REV=4.${UNAME_RELEASE}

        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
        exit 0 ;;
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
        exit 0 ;;

-@@ -339,7 +572,7 @@
+@@ -572,7 +339,7 @@

      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
        echo romp-ibm-bsd4.4
        exit 0 ;;
      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
        echo romp-ibm-bsd4.4
        exit 0 ;;

--    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
++    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and

        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
        exit 0 ;;                           # report: romp-ibm BSD 4.3
      *:BOSX:*:*)
        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
        exit 0 ;;                           # report: romp-ibm BSD 4.3
      *:BOSX:*:*)

-@@ -354,18 +587,85 @@
+@@ -587,85 +354,18 @@

      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
        echo m68k-hp-bsd4.4
        exit 0 ;;
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
        echo m68k-hp-bsd4.4
        exit 0 ;;

--    9000/[3478]??:HP-UX:*:*)
-+    9000/[34678]??:HP-UX:*:*)
-+      HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-    9000/[34678]??:HP-UX:*:*)
+-      HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++    9000/[3478]??:HP-UX:*:*)

        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;

--          9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
--          9000/8?? )            HP_ARCH=hppa1.0 ;;
-+          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 ;;
+-          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 ;;
++          9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
++          9000/8?? )            HP_ARCH=hppa1.0 ;;

        esac
        esac

--      HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+      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}
+-      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}
++      echo ${HP_ARCH}-hp-hpux${HPUX_REV}

        exit 0 ;;
        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:*:*)
      3050*:HI-UX:*:*)

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

        #include <unistd.h>
        int
        main ()
        #include <unistd.h>
        int
        main ()

-@@ -390,8 +690,7 @@
+@@ -690,7 +390,8 @@

          exit (0);
        }
  EOF
          exit (0);
        }
  EOF

--      ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
--      rm -f dummy.c dummy
-+      $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+-      $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++      ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
++      rm -f dummy.c dummy

        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )

-@@ -400,13 +699,16 @@
+@@ -699,16 +400,13 @@

      9000/8??:4.3bsd:*:*)
        echo hppa1.0-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 ;;
+-    *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 ;;
      hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
        echo hppa1.1-hp-osf
        exit 0 ;;
      hp8??:OSF1:*:*)
        echo hppa1.0-hp-osf
        exit 0 ;;

--    i?86:OSF1:*:*)
-+    i*86:OSF1:*:*)
+-    i*86:OSF1:*:*)
++    i?86:OSF1:*:*)

        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else
        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else

-@@ -434,196 +736,259 @@
+@@ -736,259 +434,196 @@

      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
          exit 0 ;;
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
          exit 0 ;;

--    CRAY*X-MP:*:*:*)
--      echo xmp-cray-unicos
--        exit 0 ;;
++    CRAY*X-MP:*:*:*)
++      echo xmp-cray-unicos
++        exit 0 ;;

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

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

        exit 0 ;;
      CRAY*[A-Z]90:*:*:*)
        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
        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 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+            -e 's/\.[^.]*$/.X/'
+-            -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+-            -e 's/\.[^.]*$/.X/'
++            -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/

        exit 0 ;;
      CRAY*TS:*:*:*)
        exit 0 ;;
      CRAY*TS:*:*:*)

--      echo t90-cray-unicos${UNAME_RELEASE}
-+      echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-      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/'
++      echo t90-cray-unicos${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    CRAY-2:*:*:*)
--      echo cray2-cray-unicos
--        exit 0 ;;
--    F300:UNIX_System_V:*:*)
--        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
-+    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/\///'`
+-    *: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/\///'`
++    CRAY-2:*:*:*)
++      echo cray2-cray-unicos
++        exit 0 ;;
++    F300:UNIX_System_V:*:*)
++        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`

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

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

          exit 0 ;;
          exit 0 ;;

--    F301:UNIX_System_V:*:*)
--       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
--       exit 0 ;;
--    hp3[0-9][05]:NetBSD:*:*)
--      echo m68k-hp-netbsd${UNAME_RELEASE}
-+    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 ;;
--    hp300:OpenBSD:*:*)
--      echo m68k-unknown-openbsd${UNAME_RELEASE}
+-    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 ;;
 -      exit 0 ;;

--    i?86:BSD/386:*:* | *:BSD/OS:*:*)
-+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-       echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+-      echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++    F301:UNIX_System_V:*:*)
++       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
++       exit 0 ;;
++    hp3[0-9][05]:NetBSD:*:*)
++      echo m68k-hp-netbsd${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    *:FreeBSD:*:*)
--      echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+    sparc*:BSD/OS:*:*)
-+      echo sparc-unknown-bsdi${UNAME_RELEASE}
+-    sparc*:BSD/OS:*:*)
+-      echo sparc-unknown-bsdi${UNAME_RELEASE}
++    hp300:OpenBSD:*:*)
++      echo m68k-unknown-openbsd${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    *:NetBSD:*:*)
--      echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+    *:BSD/OS:*:*)
-+      echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+-    *:BSD/OS:*:*)
+-      echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++    i?86:BSD/386:*:* | *:BSD/OS:*:*)
++      echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}

        exit 0 ;;
        exit 0 ;;

--    *:OpenBSD:*:*)
--      echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+    *:FreeBSD:*:*)
-+      echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+     *:FreeBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

        exit 0 ;;
        exit 0 ;;

-     i*:CYGWIN*:*)
--      echo i386-pc-cygwin32
-+      echo ${UNAME_MACHINE}-pc-cygwin
+-    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/\..*//'
++    *:NetBSD:*:*)
++      echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`

        exit 0 ;;
        exit 0 ;;

-     i*:MINGW*:*)
--      echo i386-pc-mingw32
-+      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
+-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+-      echo i${UNAME_MACHINE}-pc-mks
++    *:OpenBSD:*:*)
++      echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+       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
++    i*:CYGWIN*:*)
++      echo i386-pc-cygwin32
+       exit 0 ;;
+-    i*:UWIN*:*)
+-      echo ${UNAME_MACHINE}-pc-uwin
++    i*:MINGW*:*)
++      echo i386-pc-mingw32

        exit 0 ;;
      p*:CYGWIN*:*)
        exit 0 ;;
      p*:CYGWIN*:*)

--      echo powerpcle-unknown-cygwin32
-+      echo powerpcle-unknown-cygwin
+-      echo powerpcle-unknown-cygwin
++      echo powerpcle-unknown-cygwin32

        exit 0 ;;
      prep*:SunOS:5.*:*)
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
      *:GNU:*:*)
        exit 0 ;;
      prep*:SunOS:5.*:*)
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
      *:GNU:*:*)

-+      # the GNU system
+-      # the GNU system

        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
        exit 0 ;;
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
        exit 0 ;;

--    *:Linux:*:*)
-+    *: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:*:*)
+-    *: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:*:*)
++    *:Linux:*:*)

        # The BFD linker knows what the default object file format is, so
        # The BFD linker knows what the default object file format is, so

--      # first see if it will tell us.
--      ld_help_string=`ld --help 2>&1`
--      ld_supported_emulations=`echo $ld_help_string \
--                       | sed -ne '/supported emulations:/!d
-+      # 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
+-      # 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
++      # first see if it will tell us.
++      ld_help_string=`ld --help 2>&1`
++      ld_supported_emulations=`echo $ld_help_string \
++                       | sed -ne '/supported emulations:/!d

                                    s/[         ][      ]*/ /g
                                    s/[         ][      ]*/ /g

--                                  s/.*supported emulations: *//
-+                                  s/.*supported targets: *//
+-                                  s/.*supported targets: *//
++                                  s/.*supported emulations: *//

                                    s/ .*//
                                    p'`
                                    s/ .*//
                                    p'`

--        case "$ld_supported_emulations" in
--        i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
--        i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
--        sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
--        m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
--        elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+-        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
 -      esac

--
--      if test "${UNAME_MACHINE}" = "alpha" ; then
--              sed 's/^        //'  <<EOF >dummy.s
--              .globl main
--              .ent main
--      main:
--              .frame \$30,0,\$26,0
--              .prologue 0
--              .long 0x47e03d80 # implver $0
--              lda \$2,259
--              .long 0x47e20c21 # amask $2,$1
--              srl \$1,8,\$2
--              sll \$2,2,\$2
--              sll \$0,3,\$0
--              addl \$1,\$0,\$0
--              addl \$2,\$0,\$0
--              ret \$31,(\$26),1
--              .end main
--EOF
--              LIBC=""
--              ${CC-cc} dummy.s -o dummy 2>/dev/null
--              if test "$?" = 0 ; then
--                      ./dummy
--                      case "$?" in
--                      7)
--                              UNAME_MACHINE="alpha"
--                              ;;
--                      15)
--                              UNAME_MACHINE="alphaev5"
--                              ;;
--                      14)
--                              UNAME_MACHINE="alphaev56"
--                              ;;
--                      10)
--                              UNAME_MACHINE="alphapca56"
--                              ;;
--                      16)
--                              UNAME_MACHINE="alphaev6"
--                              ;;
--                      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
--      elif test "${UNAME_MACHINE}" = "mips" ; then
--        cat >dummy.c <<EOF
--main(argc, argv)
--     int argc;
--     char *argv[];
--{
--#ifdef __MIPSEB__
--  printf ("%s-unknown-linux-gnu\n", argv[1]);
--#endif
--#ifdef __MIPSEL__
--  printf ("%sel-unknown-linux-gnu\n", argv[1]);
--#endif
--  return 0;
--}
--EOF
--        ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
--        rm -f dummy.c dummy
--      else
--        # 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.
--        echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
--        test $? != 0 && 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>
--main(argc, argv)
--     int argc;
--     char *argv[];
--{
--#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;
--}
-+        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 ;;
+-      # 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
++        case "$ld_supported_emulations" in
++        i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
++        i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
++        sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
++        m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
++        elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;

 +      esac
 +      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
++
++      if test "${UNAME_MACHINE}" = "alpha" ; then
++              sed 's/^        //'  <<EOF >dummy.s
++              .globl main
++              .ent main
++      main:
++              .frame \$30,0,\$26,0
++              .prologue 0
++              .long 0x47e03d80 # implver $0
++              lda \$2,259
++              .long 0x47e20c21 # amask $2,$1
++              srl \$1,8,\$2
++              sll \$2,2,\$2
++              sll \$0,3,\$0
++              addl \$1,\$0,\$0
++              addl \$2,\$0,\$0
++              ret \$31,(\$26),1
++              .end main
++EOF
++              LIBC=""
++              ${CC-cc} dummy.s -o dummy 2>/dev/null
++              if test "$?" = 0 ; then
++                      ./dummy
++                      case "$?" in
++                      7)
++                              UNAME_MACHINE="alpha"
++                              ;;
++                      15)
++                              UNAME_MACHINE="alphaev5"
++                              ;;
++                      14)
++                              UNAME_MACHINE="alphaev56"
++                              ;;
++                      10)
++                              UNAME_MACHINE="alphapca56"
++                              ;;
++                      16)
++                              UNAME_MACHINE="alphaev6"
++                              ;;
++                      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
++      elif test "${UNAME_MACHINE}" = "mips" ; then
++        cat >dummy.c <<EOF
++main(argc, argv)
++     int argc;
++     char *argv[];
++{
++#ifdef __MIPSEB__
++  printf ("%s-unknown-linux-gnu\n", argv[1]);
++#endif
++#ifdef __MIPSEL__
++  printf ("%sel-unknown-linux-gnu\n", argv[1]);
++#endif
++  return 0;
++}

  EOF
  EOF

--        ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
--        rm -f dummy.c dummy
--      fi ;;
--# 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*:*)
-+      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.
+-      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.
++        ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
++        rm -f dummy.c dummy
++      else
++        # 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.
++        echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
++        test $? != 0 && 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>
++main(argc, argv)
++     int argc;
++     char *argv[];
++{
++#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-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
++        rm -f dummy.c dummy
++      fi ;;
++# 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*:*)

        echo i386-sequent-sysv4
        exit 0 ;;
        echo i386-sequent-sysv4
        exit 0 ;;

--    i?86:UNIX_SV:4.2MP:2.*)
-+    i*86:UNIX_SV:4.2MP:2.*)
+-    i*86:UNIX_SV:4.2MP:2.*)
++    i?86:UNIX_SV:4.2MP:2.*)

          # Unixware is an offshoot of SVR4, but it has its own version
          # number series starting with 2...
          # I am not positive that other SVR4 systems won't match this,
          # Unixware is an offshoot of SVR4, but it has its own version
          # number series starting with 2...
          # I am not positive that other SVR4 systems won't match this,

-@@ -631,28 +996,62 @@
+@@ -996,62 +631,28 @@

          # Use sysv4.2uw... so that sysv4* matches it.
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
        exit 0 ;;
          # 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.*:*)
-+    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$//'`
+-    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$//'`
++    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)

        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then

--              echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-+              echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+-              echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++              echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}

        else
        else

--              echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-+              echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+-              echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++              echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}

        fi
        exit 0 ;;
        fi
        exit 0 ;;

--    i?86:*:3.2:*)
-+    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:*)
+-    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:*)
++    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
        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_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_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_MACHINE=i586
                        && 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
+-              (/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:*:*:*)
                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
        else
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
        exit 0 ;;
      pc:*:*:*)

-+      # Left here for compatibility:
+-      # 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
          # 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

-@@ -674,9 +1073,15 @@
+@@ -1073,15 +674,9 @@

        # "miniframe"
        echo m68010-convergent-sysv
        exit 0 ;;
        # "miniframe"
        echo m68010-convergent-sysv
        exit 0 ;;

--    M68*:*:R3V[567]*:*)
-+    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]*:*)
+-    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]*:*)
++    M68*:*:R3V[567]*:*)

        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;

--    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.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)
+-    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)
++    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)

        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`

-@@ -687,24 +1092,27 @@
+@@ -1092,27 +687,24 @@

      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && echo i486-ncr-sysv4 && 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:2.*:* | m68*:LynxOS:3.0*:*)
+-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
++    m68*:LynxOS:2.*:*)

        echo m68k-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
      mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
        exit 0 ;;
        echo m68k-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
      mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
        exit 0 ;;

--    i?86:LynxOS:2.*:*)
--      echo i386-unknown-lynxos${UNAME_RELEASE}
--      exit 0 ;;
++    i?86:LynxOS:2.*:*)
++      echo i386-unknown-lynxos${UNAME_RELEASE}
++      exit 0 ;;

      TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
      TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;

--    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-+    rs6000:LynxOS:2.*:*)
+-    rs6000:LynxOS:2.*:*)
++    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)

        echo rs6000-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
        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 ;;
+-    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 ;;
      SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
        exit 0 ;;

-+    RM*:ReliantUNIX-*:*:*)
-+      echo mips-sni-sysv4
-+      exit 0 ;;
+-    RM*:ReliantUNIX-*:*:*)
+-      echo mips-sni-sysv4
+-      exit 0 ;;

      RM*:SINIX-*:*:*)
        echo mips-sni-sysv4
        exit 0 ;;
      RM*:SINIX-*:*:*)
        echo mips-sni-sysv4
        exit 0 ;;

-@@ -716,8 +1124,8 @@
+@@ -1124,8 +716,8 @@

                echo ns32k-sni-sysv
        fi
        exit 0 ;;
                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>
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
++    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 ;;
      *:UNIX_System_V:4*:FTX*)
          echo i586-unisys-sysv4
          exit 0 ;;
      *:UNIX_System_V:4*:FTX*)

-@@ -729,25 +1137,130 @@
+@@ -1137,130 +729,25 @@

        # From seanf@swdc.stratus.com.
        echo i860-stratus-sysv4
        exit 0 ;;
        # From seanf@swdc.stratus.com.
        echo i860-stratus-sysv4
        exit 0 ;;

-+    *:VOS:*:*)
-+      # From Paul.Green@stratus.com.
-+      echo hppa1.1-stratus-vos
-+      exit 0 ;;
+-    *:VOS:*:*)
+-      # From Paul.Green@stratus.com.
+-      echo hppa1.1-stratus-vos
+-      exit 0 ;;

      mc68*:A/UX:*:*)
        echo m68k-apple-aux${UNAME_RELEASE}
        exit 0 ;;
      mc68*:A/UX:*:*)
        echo m68k-apple-aux${UNAME_RELEASE}
        exit 0 ;;

--    news*:NEWS-OS:*:6*)
-+    news*:NEWS-OS:6*:*)
+-    news*:NEWS-OS:6*:*)
++    news*:NEWS-OS:*:6*)

        echo mips-sony-newsos6
        exit 0 ;;
        echo mips-sony-newsos6
        exit 0 ;;

--    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
-+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
++    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)

        if [ -d /usr/nec ]; then
                echo mips-nec-sysv${UNAME_RELEASE}
        else
                echo mips-unknown-sysv${UNAME_RELEASE}
        fi
          exit 0 ;;
        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 ;;
-+    *:XENIX:*:SysV)
-+      echo i386-pc-xenix
-+      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 ;;
+-    *: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
  
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
  #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
  

--cat >dummy.c <<EOF
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
++cat >dummy.c <<EOF

  #ifdef _SEQUENT_
  # include <sys/types.h>
  # include <sys/utsname.h>
  #ifdef _SEQUENT_
  # include <sys/types.h>
  # include <sys/utsname.h>

-@@ -785,7 +1298,10 @@
+@@ -1298,10 +785,7 @@

  #endif
    int version;
    version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  #endif
    int version;
    version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;

--  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  if (version < 4)
-+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  else
-+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+-  if (version < 4)
+-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+-  else
+-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
++  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);

    exit (0);
  #endif
  
    exit (0);
  #endif
  

-@@ -830,11 +1346,24 @@
+@@ -1346,24 +830,11 @@

  #endif
  
  #if defined (vax)
  #endif
  
  #if defined (vax)

--#if !defined (ultrix)
--  printf ("vax-dec-bsd\n"); exit (0);
--#else
--  printf ("vax-dec-ultrix\n"); exit (0);
--#endif
-+# 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
+-# 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
++#if !defined (ultrix)
++  printf ("vax-dec-bsd\n"); exit (0);
++#else
++  printf ("vax-dec-ultrix\n"); exit (0);
++#endif

  #endif
  
  #if defined (alliant) && defined (i860)
  #endif
  
  #if defined (alliant) && defined (i860)

-@@ -845,8 +1374,7 @@
+@@ -1374,7 +845,8 @@

  }
  EOF
  
  }
  EOF
  

--${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
--rm -f dummy.c dummy
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
++rm -f dummy.c dummy

  
  # Apollos put the system type in the environment.
  
  
  # Apollos put the system type in the environment.
  

-@@ -878,6 +1406,48 @@
+@@ -1406,48 +878,6 @@

      esac
  fi
  
      esac
  fi
  

--#echo '(Unable to guess system type)' 1>&2
-+cat >&2 <<EOF
-+$0: unable to guess system type
+-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@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
++#echo '(Unable to guess system type)' 1>&2
+ 
+ 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 -urN jpeg.old/config.sub jpeg.dev/config.sub
+--- jpeg.old/config.sub        1998-03-25 16:25:39.000000000 +0100
++++ jpeg.dev/config.sub        2006-04-21 16:16:34.000000000 +0200
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+-# Configuration validation subroutine script, version 1.1.
+-#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

 +
 +

-+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
++timestamp='2004-11-30'

 +
 +

-+    ftp://ftp.gnu.org/pub/gnu/config/
+ # 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.
+@@ -25,6 +29,9 @@
+ # 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@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.
+@@ -45,30 +52,74 @@
+ #     CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+ 
+-if [ x$1 = x ]
+-then
+-      echo Configuration name missing. 1>&2
+-      echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+-      echo "or     $0 ALIAS" 1>&2
+-      echo where ALIAS is a recognized configuration type. 1>&2
+-      exit 1
+-fi
++me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+-# First pass through any local machine types.
+-case $1 in
+-      *local*)
+-              echo $1
+-              exit 0
+-              ;;
+-      *)
+-      ;;
++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

 +
 +

-+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@gnu.org> in order to provide the needed
-+information to handle your system.
++Report bugs and patches to <config-patches@gnu.org>."

 +
 +

-+config.guess timestamp = $timestamp
++version="\
++GNU config.sub ($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`
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++Free Software Foundation, Inc.

 +
 +

-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

 +
 +

-+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`
++help="
++Try \`$me --help' for more information."

 +
 +

-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM  = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
++# 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

  
  

- exit 1
+ # 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
+-  linux-gnu*)
++  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/'`
+     ;;
+@@ -94,15 +145,33 @@
+       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+       -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-      -apple)
++      -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
++              os=-sco3.2v5
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco4)
+@@ -121,6 +190,9 @@
+               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/'`
+@@ -143,26 +215,74 @@
+       -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.
+-      tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+-              | arme[lb] | pyramid | mn10200 | mn10300 \
+-              | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+-              | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+-              | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+-              | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+-              | mipstx39 | mipstx39el \
+-              | sparc | sparclet | sparclite | sparc64 | v850)
++      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 | maxq | 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 | 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[3456]86)
++      i*86 | x86_64)
+         basic_machine=$basic_machine-pc
+         ;;
+       # Object if more than one company name word.
+@@ -171,27 +291,86 @@
+               exit 1
+               ;;
+       # Recognize the basic CPU types with company name.
+-      vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+-            | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+-            | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+-            | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+-            | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+-            | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+-            | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+-            | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+-            | sparc64-* | mips64-* | mipsel-* \
+-            | mips64el-* | mips64orion-* | mips64orionel-*  \
+-            | mipstx39-* | mipstx39el-* \
+-            | f301-*)
++      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-* | maxq-* | 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-* | 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
+               ;;
+@@ -202,25 +381,35 @@
+               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-cbm
++              basic_machine=m68k-unknown
+               ;;
+       amigaos | amigados)
+-              basic_machine=m68k-cbm
++              basic_machine=m68k-unknown
+               os=-amigaos
+               ;;
+       amigaunix | amix)
+-              basic_machine=m68k-cbm
++              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
+@@ -229,6 +418,10 @@
+               basic_machine=ns32k-sequent
+               os=-dynix
+               ;;
++      c90)
++              basic_machine=c90-cray
++              os=-unicos
++              ;;
+       convex-c1)
+               basic_machine=c1-convex
+               os=-bsd
+@@ -249,27 +442,45 @@
+               basic_machine=c38-convex
+               os=-bsd
+               ;;
+-      cray | ymp)
+-              basic_machine=ymp-cray
+-              os=-unicos
+-              ;;
+-      cray2)
+-              basic_machine=cray2-cray
++      cray | j90)
++              basic_machine=j90-cray
+               os=-unicos
+               ;;
+-      [ctj]90-cray)
+-              basic_machine=c90-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
+@@ -278,6 +489,10 @@
+               basic_machine=m88k-motorola
+               os=-sysv3
+               ;;
++      djgpp)
++              basic_machine=i586-pc
++              os=-msdosdjgpp
++              ;;
+       dpx20 | dpx20-*)
+               basic_machine=rs6000-bull
+               os=-bosx
+@@ -297,6 +512,10 @@
+       encore | umax | mmax)
+               basic_machine=ns32k-encore
+               ;;
++      es1800 | OSE68k | ose68k | ose | OSE)
++              basic_machine=m68k-ericsson
++              os=-ose
++              ;;
+       fx2800)
+               basic_machine=i860-alliant
+               ;;
+@@ -307,6 +526,10 @@
+               basic_machine=tron-gmicro
+               os=-sysv
+               ;;
++      go32)
++              basic_machine=i386-pc
++              os=-go32
++              ;;
+       h3050r* | hiux*)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+@@ -315,6 +538,14 @@
+               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
+@@ -330,13 +561,30 @@
+               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
+               ;;
+-      hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
++      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])
+@@ -345,27 +593,42 @@
+       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
+-              os=-mvs
+               ;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+-      i[3456]86v32)
++      i*86v32)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv32
+               ;;
+-      i[3456]86v4*)
++      i*86v4*)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv4
+               ;;
+-      i[3456]86v)
++      i*86v)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv
+               ;;
+-      i[3456]86sol2)
++      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
+@@ -391,16 +654,16 @@
+               basic_machine=ns32k-utek
+               os=-sysv
+               ;;
++      mingw32)
++              basic_machine=i386-pc
++              os=-mingw32
++              ;;
+       miniframe)
+               basic_machine=m68000-convergent
+               ;;
+-      mipsel*-linux*)
+-              basic_machine=mipsel-unknown
+-              os=-linux-gnu
+-              ;;
+-      mips*-linux*)
+-              basic_machine=mips-unknown
+-              os=-linux-gnu
++      *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/'`
+@@ -408,10 +671,34 @@
+       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
+@@ -424,6 +711,10 @@
+               basic_machine=mips-sony
+               os=-newsos
+               ;;
++      necv70)
++              basic_machine=v70-nec
++              os=-sysv
++              ;;
+       next | m*-next )
+               basic_machine=m68k-next
+               case $os in
+@@ -449,9 +740,40 @@
+               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
+@@ -466,53 +788,95 @@
+       pbb)
+               basic_machine=m68k-tti
+               ;;
+-        pc532 | pc532-*)
++      pc532 | pc532-*)
+               basic_machine=ns32k-pc532
+               ;;
+-      pentium | p5)
+-              basic_machine=i586-intel
++      pentium | p5 | k5 | k6 | nexgen | viac3)
++              basic_machine=i586-pc
++              ;;
++      pentiumpro | p6 | 6x86 | athlon | athlon_*)
++              basic_machine=i686-pc
+               ;;
+-      pentiumpro | p6)
+-              basic_machine=i686-intel
++      pentiumii | pentium2 | pentiumiii | pentium3)
++              basic_machine=i686-pc
+               ;;
+-      pentium-* | p5-*)
++      pentium4)
++              basic_machine=i786-pc
++              ;;
++      pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+               basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+-      pentiumpro-* | p6-*)
++      pentiumpro-* | p6-* | 6x86-* | athlon-*)
++              basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++              ;;
++      pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+-      k5)
+-              # We don't have specific support for AMD's K5 yet, so just call it a Pentium
+-              basic_machine=i586-amd
+-              ;;
+-      nexen)
+-              # We don't have specific support for Nexgen yet, so just call it a Pentium
+-              basic_machine=i586-nexgen
++      pentium4-*)
++              basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pn)
+               basic_machine=pn-gould
+               ;;
+-      power)  basic_machine=rs6000-ibm
++      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
+               ;;
+@@ -520,6 +884,13 @@
+               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
+@@ -527,6 +898,13 @@
+       spur)
+               basic_machine=spur-unknown
+               ;;
++      st2000)
++              basic_machine=m68k-tandem
++              ;;
++      stratus)
++              basic_machine=i860-stratus
++              os=-sysv4
++              ;;
+       sun2)
+               basic_machine=m68000-sun
+               ;;
+@@ -567,19 +945,51 @@
+       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
+@@ -588,6 +998,10 @@
+               basic_machine=a29k-nyu
+               os=-sym1
+               ;;
++      v810 | necv810)
++              basic_machine=v810-nec
++              os=-none
++              ;;
+       vaxv)
+               basic_machine=vax-dec
+               os=-sysv
+@@ -597,8 +1011,8 @@
+               os=-vms
+               ;;
+       vpp*|vx|vx-*)
+-               basic_machine=f301-fujitsu
+-               ;;
++              basic_machine=f301-fujitsu
++              ;;
+       vxworks960)
+               basic_machine=i960-wrs
+               os=-vxworks
+@@ -611,13 +1025,29 @@
+               basic_machine=a29k-wrs
+               os=-vxworks
+               ;;
+-      xmp)
+-              basic_machine=xmp-cray
+-              os=-unicos
++      w65*)
++              basic_machine=w65-wdc
++              os=-none
++              ;;
++      w89k-*)
++              basic_machine=hppa1.1-winbond
++              os=-proelf
++              ;;
++      xbox)
++              basic_machine=i686-pc
++              os=-mingw32
+               ;;
+-        xps | xps100)
++      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
+@@ -625,32 +1055,47 @@
+ 
+ # 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.
+-      mips)
+-              if [ x$os = x-linux-gnu ]; then
+-                      basic_machine=mips-unknown
+-              else
+-                      basic_machine=mips-mips
+-              fi
++      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
+               ;;
+-      sparc)
++      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)
++      cydra)
+               basic_machine=cydra-cydrome
+               ;;
+       orion)
+@@ -659,6 +1104,15 @@
+       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
+@@ -711,14 +1165,46 @@
+             | -aos* \
+             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-            | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+-            | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
++            | -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* \
+-            | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-            | -mingw32* | -linux-gnu* | -uxpv*)
++            | -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|'`
+               ;;
+@@ -728,6 +1214,15 @@
+       -sunos6*)
+               os=`echo $os | sed -e 's|sunos6|solaris3|'`
+               ;;
++      -opened*)
++              os=-openedition
++              ;;
++        -os400*)
++              os=-os400
++              ;;
++      -wince*)
++              os=-wince
++              ;;
+       -osfrose*)
+               os=-osfrose
+               ;;
+@@ -743,11 +1238,26 @@
+       -acis*)
+               os=-aos
+               ;;
++      -atheos*)
++              os=-atheos
++              ;;
++      -syllable*)
++              os=-syllable
++              ;;
++      -386bsd)
++              os=-bsd
++              ;;
+       -ctix* | -uts*)
+               os=-sysv
+               ;;
++      -nova*)
++              os=-rtmk-nova
++              ;;
+       -ns2 )
+-              os=-nextstep2
++              os=-nextstep2
++              ;;
++      -nsk*)
++              os=-nsk
+               ;;
+       # Preserve the version number of sinix5.
+       -sinix5.*)
+@@ -756,6 +1266,9 @@
+       -sinix*)
+               os=-sysv4
+               ;;
++        -tpf*)
++              os=-tpf
++              ;;
+       -triton*)
+               os=-sysv3
+               ;;
+@@ -774,9 +1287,27 @@
+       # 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)
+               ;;
+       *)
+@@ -802,10 +1333,20 @@
+       *-acorn)
+               os=-riscix1.2
+               ;;
++      arm*-rebel)
++              os=-linux
++              ;;
+       arm*-semi)
+               os=-aout
+               ;;
+-        pdp11-*)
++    c4x-* | tic4x-*)
++        os=-coff
++        ;;
++      # This must come before the *-dec entry.
++      pdp10-*)
++              os=-tops20
++              ;;
++      pdp11-*)
+               os=-none
+               ;;
+       *-dec | vax-*)
+@@ -823,15 +1364,42 @@
+               # 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
+               ;;
+@@ -874,27 +1442,39 @@
+       *-next)
+               os=-nextstep3
+               ;;
+-        *-gould)
++      *-gould)
+               os=-sysv
+               ;;
+-        *-highlevel)
++      *-highlevel)
+               os=-bsd
+               ;;
+       *-encore)
+               os=-bsd
+               ;;
+-        *-sgi)
++      *-sgi)
+               os=-irix
+               ;;
+-        *-siemens)
++      *-siemens)
+               os=-sysv4
+               ;;
+       *-masscomp)
+               os=-rtu
+               ;;
+-      f301-fujitsu)
++      f30[01]-fujitsu | f700-fujitsu)
+               os=-uxpv
+               ;;
++      *-rom68k)
++              os=-coff
++              ;;
++      *-*bug)
++              os=-coff
++              ;;
++      *-apple)
++              os=-macos
++              ;;
++      *-atari*)
++              os=-mint
++              ;;
+       *)
+               os=-none
+               ;;
+@@ -916,9 +1496,15 @@
+                       -aix*)
+                               vendor=ibm
+                               ;;
++                      -beos*)
++                              vendor=be
++                              ;;
+                       -hpux*)
+                               vendor=hp
+                               ;;
++                      -mpeix*)
++                              vendor=hp
++                              ;;
+                       -hiux*)
+                               vendor=hitachi
+                               ;;
+@@ -934,21 +1520,47 @@
+                       -genix*)
+                               vendor=ns
+                               ;;
+-                      -mvs*)
++                      -mvs* | -opened*)
++                              vendor=ibm
++                              ;;
++                      -os400*)
+                               vendor=ibm
+                               ;;
+                       -ptx*)
+                               vendor=sequent
+                               ;;
+-                      -vxsim* | -vxworks*)
++                      -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)
 +
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)