Changeset 15561

Timestamp:

2008-05-18T22:21:01+12:00 (16 years ago)

Author:

davidb

Message:

config.guess and config.sub updated to be the same as the ones used in mgpp. Older files didn't know about 64-bit architecture

Location:

indexers/trunk/mg

Files:

• config.guess (modified) (28 diffs)
• config.sub (modified) (54 diffs)

indexers/trunk/mg/config.guess

@@ -1 @@
-#!/bin/sh
+#! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-#
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+timestamp='2001-07-12'
+
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15 +18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
@@ -23 +26 @@
 
 # Written by Per Bothner <[email protected]>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to <[email protected]>.
 #
 # This script attempts to guess a canonical system name similar to
@@ -30 +33 @@
 #
 # 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 <[email protected]>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+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
+
+
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
+    for c in cc gcc c89 ; do
+      ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+      if test $? = 0 ; then
+         CC_FOR_BUILD="$c"; break ;
+      fi ;
+    done ;
+    rm -f $dummy.c $dummy.o $dummy.rel ;
+    if test x"$CC_FOR_BUILD" = x ; then
+      CC_FOR_BUILD=no_compiler_found ;
+    fi
+    ;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# ([email protected] 8/24/94.)
+# ([email protected] 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
     PATH=$PATH:/.attbin ; export PATH
@@ -44 +121 @@
 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_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-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
-    alpha:OSF1:V*:*)
-    # After 1.2, OSF1 uses "V1.3" for uname -r.
-    echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`
+    *: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.
+    # Determine the machine/vendor (is the vendor relevant).
+    case "${UNAME_MACHINE}" in
+        amiga) machine=m68k-unknown ;;
+        arm32) machine=arm-unknown ;;
+        atari*) machine=m68k-atari ;;
+        sun3*) machine=m68k-sun ;;
+        mac68k) machine=m68k-apple ;;
+        macppc) machine=powerpc-apple ;;
+        hp3[0-9][05]) machine=m68k-hp ;;
+        ibmrt|romp-ibm) machine=romp-ibm ;;
+        *) machine=${UNAME_MACHINE}-unknown ;;
+    esac
+    # The Operating System including object format, if it has switched
+    # to ELF recently, or will in the future.
+    case "${UNAME_MACHINE}" in
+        i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+        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
+    release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+    # 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 ;;
     alpha:OSF1:*:*)
+    if test $UNAME_RELEASE = "V4.0"; then
+        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+    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.
-    echo alpha-dec-osf${UNAME_RELEASE}
-        exit 0 ;;
+    cat <<EOF >$dummy.s
+    .data
+\$Lformat:
+    .byte 37,100,45,37,120,10,0 # "%d-%x\n"
+
+    .text
+    .globl main
+    .align 4
+    .ent main
+main:
+    .frame \$30,16,\$26,0
+    ldgp \$29,0(\$27)
+    .prologue 1
+    .long 0x47e03d80 # implver \$0
+    lda \$2,-1
+    .long 0x47e20c21 # amask \$2,\$1
+    lda \$16,\$Lformat
+    mov \$0,\$17
+    not \$1,\$18
+    jsr \$26,printf
+    ldgp \$29,0(\$26)
+    mov 0,\$16
+    jsr \$26,exit
+    .end main
+EOF
+    eval $set_cc_for_build
+    $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+    if test "$?" = 0 ; then
+        case `./$dummy` in
+            0-0)
+                UNAME_MACHINE="alpha"
+                ;;
+            1-0)
+                UNAME_MACHINE="alphaev5"
+                ;;
+            1-1)
+                UNAME_MACHINE="alphaev56"
+                ;;
+            1-101)
+                UNAME_MACHINE="alphapca56"
+                ;;
+            2-303)
+                UNAME_MACHINE="alphaev6"
+                ;;
+            2-307)
+                UNAME_MACHINE="alphaev67"
+                ;;
+        esac
+    fi
+    rm -f $dummy.s $dummy
+    echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+    exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+    # How do we know it's Interix rather than the generic POSIX subsystem?
+    # Should we change UNAME_MACHINE based on the output of uname instead
+    # of the specific Alpha model?
+    echo alpha-pc-interix
+    exit 0 ;;
+    21064:Windows_NT:50:3)
+    echo alpha-dec-winnt3.5
+    exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+    echo m68k-unknown-sysv4
+    exit 0;;
+    amiga:OpenBSD:*:*)
+    echo m68k-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+    echo ${UNAME_MACHINE}-unknown-amigaos
+    exit 0 ;;
+    arc64:OpenBSD:*:*)
+    echo mips64el-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    arc:OpenBSD:*:*)
+    echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    hkmips:OpenBSD:*:*)
+    echo mips-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    pmax:OpenBSD:*:*)
+    echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    sgi:OpenBSD:*:*)
+    echo mips-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+    echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    *:OS/390:*:*)
+    echo i370-ibm-openedition
+    exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
     echo arm-acorn-riscix${UNAME_RELEASE}
     exit 0;;
-    Pyramid*:OSx*:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+    echo hppa1.1-hitachi-hiuxmpp
+    exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+    # [email protected] (Earle F. Ake) contributed MIS and NILE.
     if test "`(/bin/universe) 2>/dev/null`" = att ; then
         echo pyramid-pyramid-sysv3
@@ -70 +286 @@
     fi
     exit 0 ;;
-    sun4*:SunOS:5.*:*)
+    NILE*:*:*:dcosx)
+    echo pyramid-pyramid-svr4
+    exit 0 ;;
+    sun4H:SunOS:5.*:*)
+    echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
     echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    exit 0 ;;
+    i86pc:SunOS:5.*:*)
+    echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
     exit 0 ;;
     sun4*:SunOS:6*:*)
@@ -80 +305 @@
     exit 0 ;;
     sun4*:SunOS:*:*)
+    case "`/usr/bin/arch -k`" in
+        Series*|S4*)
+        UNAME_RELEASE=`uname -v`
+        ;;
+    esac
     # Japanese Language versions have a version number like `4.1.3-JL'.
     echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -86 +316 @@
     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`
+    test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+    case "`/bin/arch`" in
+        sun3)
+        echo m68k-sun-sunos${UNAME_RELEASE}
+        ;;
+        sun4)
+        echo sparc-sun-sunos${UNAME_RELEASE}
+        ;;
+    esac
+    exit 0 ;;
+    aushp:SunOS:*:*)
+    echo sparc-auspex-sunos${UNAME_RELEASE}
+    exit 0 ;;
+    atari*:OpenBSD:*:*)
+    echo m68k-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+    exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+    echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+    exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    sun3*:OpenBSD:*:*)
+    echo m68k-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    mac68k:OpenBSD:*:*)
+    echo m68k-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+    echo m68k-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+    echo m88k-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    powerpc:machten:*:*)
+    echo powerpc-apple-machten${UNAME_RELEASE}
+    exit 0 ;;
+    RISC*:Mach:*:*)
+    echo mips-dec-mach_bsd4.3
+    exit 0 ;;
     RISC*:ULTRIX:*:*)
     echo mips-dec-ultrix${UNAME_RELEASE}
@@ -92 +384 @@
     echo vax-dec-ultrix${UNAME_RELEASE}
     exit 0 ;;
-    mips:*:5*:RISCos)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+    echo clipper-intergraph-clix${UNAME_RELEASE}
+    exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+    sed 's/^    //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+    int main (int argc, char *argv[]) {
+#else
+    int main (argc, argv) int argc; char *argv[]; {
+#endif
+    #if defined (host_mips) && defined (MIPSEB)
+    #if defined (SYSTYPE_SYSV)
+      printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+    #endif
+    #if defined (SYSTYPE_SVR4)
+      printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+    #endif
+    #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+      printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+    #endif
+    #endif
+      exit (-1);
+    }
+EOF
+    eval $set_cc_for_build
+    $CC_FOR_BUILD $dummy.c -o $dummy \
+      && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+      && rm -f $dummy.c $dummy && exit 0
+    rm -f $dummy.c $dummy
     echo mips-mips-riscos${UNAME_RELEASE}
+    exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+    echo powerpc-motorola-powermax
+    exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+    echo powerpc-harris-powerunix
     exit 0 ;;
     m88k:CX/UX:7*:*)
@@ -105 +432 @@
     exit 0 ;;
     AViiON:dgux:*:*)
-    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-         -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+    if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+    then
+        if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+           [ ${TARGET_BINARY_INTERFACE}x = x ]
+        then
         echo m88k-dg-dgux${UNAME_RELEASE}
+        else
+        echo m88k-dg-dguxbcs${UNAME_RELEASE}
+        fi
     else
-        echo m88k-dg-dguxbcs${UNAME_RELEASE}
+        echo i586-dg-dgux${UNAME_RELEASE}
     fi
     exit 0 ;;
@@ -125 +460 @@
     echo m68k-tektronix-bsd
     exit 0 ;;
-    *:IRIX:*:*)
-    echo mips-sgi-irix${UNAME_RELEASE}
-    exit 0 ;;
-    i[34]86:AIX:*:*)
+    *:IRIX*:*:*)
+    echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+    exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+    echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+    exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
     echo i386-ibm-aix
+    exit 0 ;;
+    ia64:AIX:*:*)
+    if [ -x /usr/bin/oslevel ] ; then
+        IBM_REV=`/usr/bin/oslevel`
+    else
+        IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+    fi
+    echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
     exit 0 ;;
     *:AIX:2:3)
     if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-        sed 's/^        //' << EOF >dummy.c
+        sed 's/^        //' << EOF >$dummy.c
         #include <sys/systemcfg.h>
 
@@ -144 +490 @@
             }
 EOF
-        ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-        rm -f dummy.c dummy
+        eval $set_cc_for_build
+        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         echo rs6000-ibm-aix3.2.5
     elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -153 +500 @@
     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 | head -1 | awk '{ print $1 }'`
+    if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
         IBM_ARCH=rs6000
     else
         IBM_ARCH=powerpc
     fi
-    if grep bos410 /usr/include/stdio.h >/dev/null 2>&1; then
-        IBM_REV=4.1
-    elif grep bos411 /usr/include/stdio.h >/dev/null 2>&1; then
-        IBM_REV=4.1.1
+    if [ -x /usr/bin/oslevel ] ; then
+        IBM_REV=`/usr/bin/oslevel`
     else
-        IBM_REV=4.${UNAME_RELEASE}
+        IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
     fi
     echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -171 +517 @@
     echo rs6000-ibm-aix
     exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+    echo romp-ibm-bsd4.4
+    exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+    echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+    exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
     echo rs6000-bull-bosx
@@ -183 +535 @@
     echo m68k-hp-bsd4.4
     exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
+    9000/[34678]??:HP-UX:*:*)
+    HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
     case "${UNAME_MACHINE}" in
         9000/31? )            HP_ARCH=m68000 ;;
         9000/[34]?? )         HP_ARCH=m68k ;;
-        9000/7?? | 9000/8?7 ) HP_ARCH=hppa1.1 ;;
-        9000/8?? )            HP_ARCH=hppa1.0 ;;
+        9000/[678][0-9][0-9])
+              case "${HPUX_REV}" in
+                11.[0-9][0-9])
+                  if [ -x /usr/bin/getconf ]; then
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+                        esac ;;
+                    esac
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
+              sed 's/^              //' << EOF >$dummy.c
+
+              #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
+    eval $set_cc_for_build
+    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+    rm -f $dummy.c $dummy
+    fi ;;
     esac
+    echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+    exit 0 ;;
+    ia64:HP-UX:*:*)
     HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-    echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+    echo ia64-hp-hpux${HPUX_REV}
     exit 0 ;;
     3050*:HI-UX:*:*)
-    sed 's/^    //' << EOF >dummy.c
+    sed 's/^    //' << EOF >$dummy.c
     #include <unistd.h>
     int
@@ -219 +629 @@
     }
 EOF
-    ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-    rm -f dummy.c dummy
+    eval $set_cc_for_build
+    $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+    rm -f $dummy.c $dummy
     echo unknown-hitachi-hiuxwe2
     exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?7:4.3bsd:*:* )
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
     echo hppa1.1-hp-bsd
     exit 0 ;;
@@ -229 +640 @@
     echo hppa1.0-hp-bsd
     exit 0 ;;
-    hp7??:OSF1:*:* | hp8?7:OSF1:*:* )
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+    echo hppa1.0-hp-mpeix
+    exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
     echo hppa1.1-hp-osf
     exit 0 ;;
     hp8??:OSF1:*:*)
     echo hppa1.0-hp-osf
+    exit 0 ;;
+    i*86:OSF1:*:*)
+    if [ -x /usr/sbin/sysversion ] ; then
+        echo ${UNAME_MACHINE}-unknown-osf1mk
+    else
+        echo ${UNAME_MACHINE}-unknown-osf1
+    fi
+    exit 0 ;;
+    parisc*:Lites*:*:*)
+    echo hppa1.1-hp-lites
+    exit 0 ;;
+    hppa*:OpenBSD:*:*)
+    echo hppa-unknown-openbsd
     exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
@@ -253 +680 @@
     echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:UNICOS:*:*)
+    CRAY*X-MP:*:*:*)
     echo xmp-cray-unicos
         exit 0 ;;
-    CRAY*Y-MP:UNICOS:*:*)
-    echo ymp-cray-unicos
-        exit 0 ;;
-    CRAY-2:UNICOS:*:*)
+    CRAY*Y-MP:*:*:*)
+    echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+    exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+    echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+    | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+          -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+          -e 's/\.[^.]*$/.X/'
+    exit 0 ;;
+    CRAY*TS:*:*:*)
+    echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+    exit 0 ;;
+    CRAY*T3D:*:*:*)
+    echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+    exit 0 ;;
+    CRAY*T3E:*:*:*)
+    echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+    exit 0 ;;
+    CRAY*SV1:*:*:*)
+    echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+    exit 0 ;;
+    CRAY-2:*:*:*)
     echo cray2-cray-unicos
         exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-    echo m68k-hp-netbsd${UNAME_RELEASE}
-    exit 0 ;;
-    i[34]86:BSD/386:*:*)
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+    FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    hp300:OpenBSD:*:*)
+    echo m68k-unknown-openbsd${UNAME_RELEASE}
+    exit 0 ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+    exit 0 ;;
+    sparc*:BSD/OS:*:*)
+    echo sparc-unknown-bsdi${UNAME_RELEASE}
+    exit 0 ;;
+    *:BSD/OS:*:*)
     echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
     exit 0 ;;
@@ -271 +728 @@
     echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
     exit 0 ;;
-    *:NetBSD:*:*)
-    echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+    *:OpenBSD:*:*)
+    echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+    exit 0 ;;
+    i*:CYGWIN*:*)
+    echo ${UNAME_MACHINE}-pc-cygwin
+    exit 0 ;;
+    i*:MINGW*:*)
+    echo ${UNAME_MACHINE}-pc-mingw32
+    exit 0 ;;
+    i*:PW*:*)
+    echo ${UNAME_MACHINE}-pc-pw32
+    exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+    # How do we know it's Interix rather than the generic POSIX subsystem?
+    # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+    # UNAME_MACHINE based on the output of uname instead of i386?
+    echo i386-pc-interix
+    exit 0 ;;
+    i*:UWIN*:*)
+    echo ${UNAME_MACHINE}-pc-uwin
+    exit 0 ;;
+    p*:CYGWIN*:*)
+    echo powerpcle-unknown-cygwin
+    exit 0 ;;
+    prep*:SunOS:5.*:*)
+    echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
     exit 0 ;;
     *:GNU:*:*)
-    echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-    exit 0 ;;
-    *:Linux:*:*)
+    echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+    exit 0 ;;
+    i*86:Minix:*:*)
+    echo ${UNAME_MACHINE}-pc-minix
+    exit 0 ;;
+    arm*:Linux:*:*)
+    echo ${UNAME_MACHINE}-unknown-linux-gnu
+    exit 0 ;;
+    ia64:Linux:*:*)
     echo ${UNAME_MACHINE}-unknown-linux
     exit 0 ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i[34]86:DYNIX/ptx:4*:*)
+    m68*:Linux:*:*)
+    echo ${UNAME_MACHINE}-unknown-linux-gnu
+    exit 0 ;;
+    mips:Linux:*:*)
+    case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
+      big)    echo mips-unknown-linux-gnu && exit 0 ;;
+      little) echo mipsel-unknown-linux-gnu && exit 0 ;;
+    esac
+    ;;
+    ppc:Linux:*:*)
+    echo powerpc-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=alphaev67 ;;
+        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 ;;
+    sh*:Linux:*:*)
+    echo ${UNAME_MACHINE}-unknown-linux-gnu
+    exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+    echo ${UNAME_MACHINE}-unknown-linux-gnu
+    exit 0 ;;
+    x86_64:Linux:*:*)
+    echo x86_64-unknown-linux-gnu
+    exit 0 ;;
+    i*86:Linux:*:*)
+    # The BFD linker knows what the default object file format is, so
+    # first see if it will tell us. cd to the root directory to prevent
+    # problems with other programs or directories called `ld' in the path.
+    ld_supported_targets=`cd /; ld --help 2>&1 \
+             | sed -ne '/supported targets:/!d
+                    s/[     ][  ]*/ /g
+                    s/.*supported targets: *//
+                    s/ .*//
+                    p'`
+        case "$ld_supported_targets" in
+      elf32-i386)
+        TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+        ;;
+      a.out-i386-linux)
+        echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+        exit 0 ;;       
+      coff-i386)
+        echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+        exit 0 ;;
+      "")
+        # Either a pre-BFD a.out linker (linux-gnuoldld) or
+        # one that does not give us useful --help.
+        echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+        exit 0 ;;
+    esac
+    # Determine whether the default compiler is a.out or elf
+    cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+    int main (int argc, char *argv[]) {
+#else
+    int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-pc-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+    eval $set_cc_for_build
+    $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+    rm -f $dummy.c $dummy
+    test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+    ;;
+    i*86:DYNIX/ptx:4*:*)
+    # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+    # earlier versions are messed up and put the nodename in both
+    # sysname and nodename.
     echo i386-sequent-sysv4
     exit 0 ;;
-    i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+    # I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+    echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+    exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+    UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
     if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-        echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+        echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
     else
-        echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
-    fi
-    exit 0 ;;
-    i[34]86:*:3.2:*)
-    if /bin/uname -X 2>/dev/null >/dev/null ; then
+        echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+    fi
+    exit 0 ;;
+    i*86:*:5:[78]*)
+    case `/bin/uname -X | grep "^Machine"` in
+        *486*)       UNAME_MACHINE=i486 ;;
+        *Pentium)        UNAME_MACHINE=i586 ;;
+        *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+    esac
+    echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+    exit 0 ;;
+    i*86:*:3.2:*)
+    if test -f /usr/options/cb.name; then
+        UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+        echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+    elif /bin/uname -X 2>/dev/null >/dev/null ; then
         UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
         (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-        echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
-    elif test -f /usr/options/cb.name; then
-        UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-        echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
+        (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+            && UNAME_MACHINE=i586
+        (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+            && UNAME_MACHINE=i686
+        (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+            && UNAME_MACHINE=i686
+        echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
     else
-        echo ${UNAME_MACHINE}-unknown-sysv32
-    fi
-    exit 0 ;;
+        echo ${UNAME_MACHINE}-pc-sysv32
+    fi
+    exit 0 ;;
+    i*86:*DOS:*:*)
+    echo ${UNAME_MACHINE}-pc-msdosdjgpp
+    exit 0 ;;
+    pc:*:*:*)
+    # Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+    echo i386-pc-msdosdjgpp
+        exit 0 ;;
     Intel:Mach:3*:*)
-    echo i386-unknown-mach3
+    echo i386-pc-mach3
+    exit 0 ;;
+    paragon:*:*:*)
+    echo i860-intel-osf1
     exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
@@ -318 +946 @@
     echo m68010-convergent-sysv
     exit 0 ;;
-    M680[234]0:*:R3V[567]*:*)
+    M68*:*:R3V[567]*:*)
     test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4.3 && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    OS_REL=''
+    test -r /etc/.relid \
+    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+    /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+      && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+    /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+      && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m680[234]0:LynxOS:2.2*:*)
-    echo m68k-lynx-lynxos${UNAME_RELEASE}
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+    echo m68k-unknown-lynxos${UNAME_RELEASE}
     exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
     echo m68k-atari-sysv4
     exit 0 ;;
-    i[34]86:LynxOS:2.2*:*)
-    echo i386-lynx-lynxos${UNAME_RELEASE}
-    exit 0 ;;
-    TSUNAMI:LynxOS:2.2*:*)
-    echo sparc-lynx-lynxos${UNAME_RELEASE}
-    exit 0 ;;
-    rs6000:LynxOS:2.2*:*)
-    echo rs6000-lynx-lynxos${UNAME_RELEASE}
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    echo i386-unknown-lynxos${UNAME_RELEASE}
+    exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+    echo sparc-unknown-lynxos${UNAME_RELEASE}
+    exit 0 ;;
+    rs6000:LynxOS:2.*:*)
+    echo rs6000-unknown-lynxos${UNAME_RELEASE}
+    exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    echo powerpc-unknown-lynxos${UNAME_RELEASE}
+    exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+    echo mips-dde-sysv${UNAME_RELEASE}
+    exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+    echo mips-sni-sysv4
     exit 0 ;;
     RM*:SINIX-*:*:*)
@@ -352 +994 @@
     fi
     exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <[email protected]>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+    # From Gerald Hewes <[email protected]>.
+    # How about differentiating between stratus architectures? -djm
+    echo hppa1.1-stratus-sysv4
+    exit 0 ;;
+    *:*:*:FTX*)
+    # From [email protected].
+    echo i860-stratus-sysv4
+    exit 0 ;;
+    mc68*:A/UX:*:*)
+    echo m68k-apple-aux${UNAME_RELEASE}
+    exit 0 ;;
+    news*:NEWS-OS:6*:*)
+    echo mips-sony-newsos6
+    exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+    if [ -d /usr/nec ]; then
+            echo mips-nec-sysv${UNAME_RELEASE}
+    else
+            echo mips-unknown-sysv${UNAME_RELEASE}
+    fi
+        exit 0 ;;
+    BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+    echo powerpc-be-beos
+    exit 0 ;;
+    BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+    echo powerpc-apple-beos
+    exit 0 ;;
+    BePC:BeOS:*:*)  # BeOS running on Intel PC compatible.
+    echo i586-pc-beos
+    exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+    echo sx4-nec-superux${UNAME_RELEASE}
+    exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+    echo sx5-nec-superux${UNAME_RELEASE}
+    exit 0 ;;
+    Power*:Rhapsody:*:*)
+    echo powerpc-apple-rhapsody${UNAME_RELEASE}
+    exit 0 ;;
+    *:Rhapsody:*:*)
+    echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+    exit 0 ;;
+    *:Darwin:*:*)
+    echo `uname -p`-apple-darwin${UNAME_RELEASE}
+    exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+    if test "${UNAME_MACHINE}" = "x86pc"; then
+        UNAME_MACHINE=pc
+    fi
+    echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+    exit 0 ;;
+    *:QNX:*:4*)
+    echo i386-pc-qnx
+    exit 0 ;;
+    NSR-[KW]: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 ;;
+    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 ;;
+    *: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 ;;
 esac
 
@@ -357 +1104 @@
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
-cat >dummy.c <<EOF
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
 main ()
 {
@@ -366 +1117 @@
   printf ("mips-sony-bsd\n"); exit (0);
 #else
-  printf ("m68k-sony-newsos\n"); exit (0);
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+      ""
+#endif
+         ); exit (0);
 #endif
 #endif
@@ -384 +1142 @@
   int version;
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
   exit (0);
 #endif
@@ -401 +1162 @@
 
 #if defined (__386BSD__)
-  printf ("i386-unknown-bsd\n"); exit (0);
+  printf ("i386-pc-bsd\n"); exit (0);
 #endif
 
@@ -414 +1175 @@
 
 #if defined (_SEQUENT_)
-  printf ("i386-sequent-ptx\n"); exit (0);
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
 #endif
 
 #if defined (vax)
-#if !defined (ultrix)
-  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
 #endif
 
@@ -433 +1218 @@
 EOF
 
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
+eval $set_cc_for_build
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
@@ -466 +1252 @@
 fi
 
-#echo '(Unable to guess system type)' 1>&2
+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 <[email protected]> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
 
 exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:

indexers/trunk/mg/config.sub

@@ -1 @@
-#!/bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+timestamp='2001-06-08'
+
 # 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. 
+# can handle that machine.  It does not imply ALL GNU software can.
 #
 # This file is free software; you can redistribute it and/or modify
@@ -18 +22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
@@ -25 +30 @@
 # the same distribution terms that you use for the rest of that program.
 
+# Please send patches to <[email protected]>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -41 +48 @@
 # machine specification into a single specification in the form:
 #   CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-# First pass through any local machine types.
-case $1 in
-    *local*)
-        echo $1
-        exit 0
-        ;;
-    *)
-    ;;
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <[email protected]>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - ) # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS (if any).
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-if [ $basic_machine != $1 ]
-then os=`echo $1 | sed 's/.*-/-/'`
-else os=; fi
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
 
 ### Let's recognize common machines as not being operating systems so
@@ -72 +143 @@
     -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
     -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-    -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
+    -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+    -apple | -axis)
         os=
         basic_machine=$1
         ;;
+    -sim | -cisco | -oki | -wec | -winbond)
+        os=
+        basic_machine=$1
+        ;;
+    -scout)
+        ;;
+    -wrs)
+        os=-vxworks
+        basic_machine=$1
+        ;;
+    -chorusos*)
+        os=-chorusos
+        basic_machine=$1
+        ;;
+    -chorusrdb)
+        os=-chorusrdb
+        basic_machine=$1
+        ;;
     -hiux*)
         os=-hiuxwe2
         ;;
+    -sco5)
+        os=-sco3.2v5
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
     -sco4)
         os=-sco3.2v4
-        basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
         ;;
     -sco3.2.[4-9]*)
         os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-        basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
         ;;
     -sco3.2v[4-9]*)
         # Don't forget version if it is 3.2v4 or newer.
-        basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
         ;;
     -sco*)
         os=-sco3.2v2
-        basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+        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-unknown/'`
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
         ;;
     -clix*)
@@ -103 +200 @@
         ;;
     -isc*)
-        basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
-        ;;
-    -lynx)
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -lynx*)
         os=-lynxos
         ;;
@@ -113 +210 @@
     -windowsnt*)
         os=`echo $os | sed -e 's/windowsnt/winnt/'`
+        ;;
+    -psos*)
+        os=-psos
+        ;;
+    -mint | -mint[0-9]*)
+        basic_machine=m68k-atari
+        os=-mint
         ;;
 esac
@@ -120 +224 @@
     # Recognize the basic CPU types without company name.
     # Some are omitted here because they have special meanings below.
-    tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
-        | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
-        | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
-        | powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
-        | pdp11 | mips64el | mips64orion | mips64orionel )
+    tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+            | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+        | pyramid | mn10200 | mn10300 | tron | a29k \
+        | 580 | i960 | h8300 \
+        | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+        | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+        | hppa64 \
+        | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+        | alphaev6[78] \
+        | we32k | ns16k | clipper | i370 | sh | sh[34] \
+        | powerpc | powerpcle \
+        | 1750a | dsp16xx | pdp10 | pdp11 \
+        | mips16 | mips64 | mipsel | mips64el \
+        | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+        | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+        | mips64vr5000 | mips64vr5000el | mcore | s390 | s390x \
+        | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
+        | v850 | c4x \
+        | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+        | pj | pjl | h8500 | z8k)
         basic_machine=$basic_machine-unknown
         ;;
+    m6811 | m68hc11 | m6812 | m68hc12)
+        # Motorola 68HC11/12.
+        basic_machine=$basic_machine-unknown
+        os=-none
+        ;;
+    m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+        ;;
+
+    # We use `pc' rather than `unknown'
+    # because (1) that's what they normally are, and
+    # (2) the word "unknown" tends to confuse beginning users.
+    i*86 | x86_64)
+      basic_machine=$basic_machine-pc
+      ;;
     # Object if more than one company name word.
     *-*-*)
@@ -133 +266 @@
         ;;
     # Recognize the basic CPU types with company name.
-    vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-          | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
+    # FIXME: clean up the formatting here.
+    vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+          | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+          | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
           | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-          | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-          | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-          | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-          | pdp11-* | sh-* | powerpc-* | sparc64-* | mips64-* | mipsel-* \
-          | mips64el-* | mips64orion-* | mips64orionel-* )
+          | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+          | xmp-* | ymp-* \
+          | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+          | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+          | hppa2.0n-* | hppa64-* \
+          | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+          | alphaev6[78]-* \
+          | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+          | clipper-* | orion-* \
+          | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
+          | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+          | mips16-* | mips64-* | mipsel-* \
+          | mips64el-* | mips64orion-* | mips64orionel-* \
+          | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+          | mipstx39-* | mipstx39el-* | mcore-* \
+          | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+          | [cjt]90-* \
+          | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+          | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+          | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
         ;;
     # 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
@@ -149 +303 @@
     3b*)
         basic_machine=we32k-att
+        ;;
+    a29khif)
+        basic_machine=a29k-amd
+        os=-udi
+        ;;
+    adobe68k)
+        basic_machine=m68010-adobe
+        os=-scout
         ;;
     alliant | fx80)
@@ -165 +327 @@
         ;;
     amiga | amiga-*)
-        basic_machine=m68k-cbm
-        ;;
-    amigados)
-        basic_machine=m68k-cbm
-        os=-amigados
+        basic_machine=m68k-unknown
+        ;;
+    amigaos | amigados)
+        basic_machine=m68k-unknown
+        os=-amigaos
         ;;
     amigaunix | amix)
-        basic_machine=m68k-cbm
+        basic_machine=m68k-unknown
         os=-sysv4
         ;;
@@ -179 +341 @@
         os=-sysv
         ;;
+    apollo68bsd)
+        basic_machine=m68k-apollo
+        os=-bsd
+        ;;
+    aux)
+        basic_machine=m68k-apple
+        os=-aux
+        ;;
     balance)
         basic_machine=ns32k-sequent
@@ -211 +381 @@
         os=-unicos
         ;;
+    [cjt]90)
+        basic_machine=${basic_machine}-cray
+        os=-unicos
+        ;;
     crds | unos)
         basic_machine=m68k-crds
+        ;;
+    cris | cris-* | etrax*)
+        basic_machine=cris-axis
         ;;
     da30 | da30-*)
@@ -247 +424 @@
         basic_machine=ns32k-encore
         ;;
+    es1800 | OSE68k | ose68k | ose | OSE)
+        basic_machine=m68k-ericsson
+        os=-ose
+        ;;
     fx2800)
         basic_machine=i860-alliant
@@ -257 +438 @@
         os=-sysv
         ;;
+    go32)
+        basic_machine=i386-pc
+        os=-go32
+        ;;
     h3050r* | hiux*)
         basic_machine=hppa1.1-hitachi
@@ -265 +450 @@
         os=-hms
         ;;
+    h8300xray)
+        basic_machine=h8300-hitachi
+        os=-xray
+        ;;
+    h8500hms)
+        basic_machine=h8500-hitachi
+        os=-hms
+        ;;
     harris)
         basic_machine=m88k-harris
@@ -280 +473 @@
         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
@@ -286 +482 @@
         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
         ;;
@@ -292 +502 @@
         basic_machine=hppa1.0-hp
         ;;
+    hppa-next)
+        os=-nextstep3
+        ;;
+    hppaosf)
+        basic_machine=hppa1.1-hp
+        os=-osf
+        ;;
+    hppro)
+        basic_machine=hppa1.1-hp
+        os=-proelf
+        ;;
     i370-ibm* | ibm*)
         basic_machine=i370-ibm
-        os=-mvs
         ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-    i[345]86v32)
-        basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+    i*86v32)
+        basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
         os=-sysv32
         ;;
-    i[345]86v4*)
-        basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+    i*86v4*)
+        basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
         os=-sysv4
         ;;
-    i[345]86v)
-        basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+    i*86v)
+        basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
         os=-sysv
         ;;
-    i[345]86sol2)
-        basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+    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)
@@ -338 +566 @@
         os=-sysv
         ;;
+    mingw32)
+        basic_machine=i386-pc
+        os=-mingw32
+        ;;
     miniframe)
         basic_machine=m68000-convergent
         ;;
+    *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+        basic_machine=m68k-atari
+        os=-mint
+        ;;
+    mipsel*-linux*)
+        basic_machine=mipsel-unknown
+        os=-linux-gnu
+        ;;
+    mips*-linux*)
+        basic_machine=mips-unknown
+        os=-linux-gnu
+        ;;
     mips3*-*)
         basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
@@ -346 +590 @@
     mips3*)
         basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+        ;;
+    mmix*)
+        basic_machine=mmix-knuth
+        os=-mmixware
+        ;;
+    monitor)
+        basic_machine=m68k-rom68k
+        os=-coff
+        ;;
+    msdos)
+        basic_machine=i386-pc
+        os=-msdos
+        ;;
+    mvs)
+        basic_machine=i370-ibm
+        os=-mvs
         ;;
     ncr3000)
@@ -351 +611 @@
         os=-sysv4
         ;;
+    netbsd386)
+        basic_machine=i386-unknown
+        os=-netbsd
+        ;;
+    netwinder)
+        basic_machine=armv4l-rebel
+        os=-linux
+        ;;
     news | news700 | news800 | news900)
         basic_machine=m68k-sony
@@ -362 +630 @@
         basic_machine=mips-sony
         os=-newsos
+        ;;
+    necv70)
+        basic_machine=v70-nec
+        os=-sysv
         ;;
     next | m*-next )
@@ -388 +660 @@
         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
+        ;;
+    OSE68000 | ose68000)
+        basic_machine=m68000-ericsson
+        os=-ose
+        ;;
+    os68k)
+        basic_machine=m68k-none
+        os=-os68k
         ;;
     pa-hitachi)
@@ -408 +703 @@
         basic_machine=ns32k-pc532
         ;;
-    pentium-*)
-        # We will change tis to say i586 once there has been
-        # time for various packages to start to recognize that.
-        basic_machine=i486-`echo $basic_machine | sed 's/^[^-]*-//'`
+    pentium | p5 | k5 | k6 | nexgen)
+        basic_machine=i586-pc
+        ;;
+    pentiumpro | p6 | 6x86 | athlon)
+        basic_machine=i686-pc
+        ;;
+    pentiumii | pentium2)
+        basic_machine=i686-pc
+        ;;
+    pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+        basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pentiumpro-* | p6-* | 6x86-* | athlon-*)
+        basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    pentiumii-* | pentium2-*)
+        basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
         ;;
     pn)
         basic_machine=pn-gould
         ;;
+    power)  basic_machine=power-ibm
+        ;;
+    ppc)    basic_machine=powerpc-unknown
+            ;;
+    ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
+    ppcle | powerpclittle | ppc-le | powerpc-little)
+        basic_machine=powerpcle-unknown
+            ;;
+    ppcle-* | powerpclittle-*)
+        basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
     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
+        ;;
+    sa29200)
+        basic_machine=a29k-amd
+        os=-udi
         ;;
     sequent)
@@ -429 +764 @@
         os=-hms
         ;;
+    sparclite-wrs)
+        basic_machine=sparclite-wrs
+        os=-vxworks
+        ;;
     sps7)
         basic_machine=m68k-bull
@@ -436 +775 @@
         basic_machine=spur-unknown
         ;;
+    st2000)
+        basic_machine=m68k-tandem
+        ;;
+    stratus)
+        basic_machine=i860-stratus
+        os=-sysv4
+        ;;
     sun2)
         basic_machine=m68000-sun
@@ -463 +809 @@
         os=-sunos4
         ;;
+    sun4sol2)
+        basic_machine=sparc-sun
+        os=-solaris2
+        ;;
     sun3 | sun3-*)
         basic_machine=m68k-sun
@@ -471 +821 @@
     sun386 | sun386i | roadrunner)
         basic_machine=i386-sun
+        ;;
+    sv1)
+        basic_machine=sv1-cray
+        os=-unicos
         ;;
     symmetry)
@@ -476 +830 @@
         os=-dynix
         ;;
+    t3e)
+        basic_machine=t3e-cray
+        os=-unicos
+        ;;
+    tic54x | c54x*)
+        basic_machine=tic54x-unknown
+        os=-coff
+        ;;
+    tx39)
+        basic_machine=mipstx39-unknown
+        ;;
+    tx39el)
+        basic_machine=mipstx39el-unknown
+        ;;
     tower | tower-32)
         basic_machine=m68k-ncr
+        ;;
+    udi29k)
+        basic_machine=a29k-amd
+        os=-udi
         ;;
     ultra3)
@@ -483 +855 @@
         os=-sym1
         ;;
+    v810 | necv810)
+        basic_machine=v810-nec
+        os=-none
+        ;;
     vaxv)
         basic_machine=vax-dec
@@ -491 +867 @@
         os=-vms
         ;;
+    vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
     vxworks960)
         basic_machine=i960-wrs
@@ -499 +878 @@
         os=-vxworks
         ;;
+    vxworks29k)
+        basic_machine=a29k-wrs
+        os=-vxworks
+        ;;
+    w65*)
+        basic_machine=w65-wdc
+        os=-none
+        ;;
+    w89k-*)
+        basic_machine=hppa1.1-winbond
+        os=-proelf
+        ;;
+    windows32)
+        basic_machine=i386-pc
+        os=-windows32-msvcrt
+        ;;
     xmp)
         basic_machine=xmp-cray
@@ -506 +901 @@
         basic_machine=xps100-honeywell
         ;;
+    z8k-*-coff)
+        basic_machine=z8k-unknown
+        os=-sim
+        ;;
     none)
         basic_machine=none-none
@@ -513 +912 @@
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
+    w89k)
+        basic_machine=hppa1.1-winbond
+        ;;
+    op50n)
+        basic_machine=hppa1.1-oki
+        ;;
+    op60c)
+        basic_machine=hppa1.1-oki
+        ;;
     mips)
-        basic_machine=mips-mips
+        if [ x$os = x-linux-gnu ]; then
+            basic_machine=mips-unknown
+        else
+            basic_machine=mips-mips
+        fi
         ;;
     romp)
@@ -525 +937 @@
         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
@@ -531 +947 @@
         basic_machine=we32k-att
         ;;
-    sparc)
+    sh3 | sh4)
+        basic_machine=sh-unknown
+        ;;
+    sparc | sparcv9 | sparcv9b)
         basic_machine=sparc-sun
         ;;
@@ -542 +961 @@
     orion105)
         basic_machine=clipper-highlevel
+        ;;
+    mac | mpw | mac-mpw)
+        basic_machine=m68k-apple
+        ;;
+    pmac | pmac-mpw)
+        basic_machine=powerpc-apple
+        ;;
+    c4x*)
+        basic_machine=c4x-none
+        os=-coff
+        ;;
+    *-unknown)
+        # Make sure to match an already-canonicalized machine name.
         ;;
     *)
@@ -566 +998 @@
 then
 case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
     # -solaris* is a basic system type, with this one exception.
     -solaris1 | -solaris1.*)
@@ -573 +1007 @@
         os=-solaris2
         ;;
+    -svr4*)
+        os=-sysv4
+        ;;
+    -unixware*)
+        os=-sysv4.2uw
+        ;;
     -gnu/linux*)
-        os=`echo $os | sed -e 's|gnu/linux|linux|'`
+        os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
         ;;
     # First accept the basic system types.
     # The portable systems comes first.
-    # Each alternative must end in a *, to match a version number.
+    # Each alternative MUST END IN A *, to match a version number.
     # -sysv* is not here because it comes later, after sysvr4.
     -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-          | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
+          | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
           | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-          | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
-          | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-          | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-          | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
-          | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-          | -ptx* | -coff* | -winnt*)
+          | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+          | -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* | -oabi* \
+          | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+          | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+          | -chorusos* | -chorusrdb* \
+          | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+          | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+          | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+          | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+          | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+    # Remember, each alternative MUST END IN *, to match a version number.
+        ;;
+    -qnx*)
+        case $basic_machine in
+            x86-* | i*86-*)
+            ;;
+            *)
+            os=-nto$os
+            ;;
+        esac
+        ;;
+    -nto*)
+        os=-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*)
+        os=`echo $os | sed -e 's|linux|linux-gnu|'`
         ;;
     -sunos5*)
@@ -596 +1067 @@
         os=`echo $os | sed -e 's|sunos6|solaris3|'`
         ;;
+    -opened*)
+        os=-openedition
+        ;;
+    -wince*)
+        os=-wince
+        ;;
     -osfrose*)
         os=-osfrose
@@ -611 +1088 @@
         os=-aos
         ;;
+    -386bsd)
+        os=-bsd
+        ;;
     -ctix* | -uts*)
         os=-sysv
         ;;
+    -ns2 )
+            os=-nextstep2
+        ;;
+    -nsk*)
+        os=-nsk
+        ;;
+    # Preserve the version number of sinix5.
+    -sinix5.*)
+        os=`echo $os | sed -e 's|sinix|sysv|'`
+        ;;
+    -sinix*)
+        os=-sysv4
+        ;;
     -triton*)
         os=-sysv3
@@ -632 +1125 @@
     -sysv*)
         ;;
+    -ose*)
+        os=-ose
+        ;;
+    -es1800*)
+        os=-ose
+        ;;
     -xenix)
         os=-xenix
+        ;;
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+            os=-mint
         ;;
     -none)
@@ -660 +1162 @@
         os=-riscix1.2
         ;;
+    arm*-rebel)
+        os=-linux
+        ;;
+    arm*-semi)
+        os=-aout
+        ;;
+    pdp10-*)
+        os=-tops20
+        ;;
         pdp11-*)
         os=-none
@@ -665 +1176 @@
     *-dec | vax-*)
         os=-ultrix4.2
+        ;;
+    m68*-apollo)
+        os=-domain
         ;;
     i386-sun)
@@ -675 +1189 @@
         # os=-sunos4
         ;;
+    m68*-cisco)
+        os=-aout
+        ;;
+    mips*-cisco)
+        os=-elf
+        ;;
+    mips*-*)
+        os=-elf
+        ;;
     *-tti)  # must be before sparc entry or we get the wrong os.
         os=-sysv3
@@ -681 +1204 @@
         os=-sunos4.1.1
         ;;
+    *-be)
+        os=-beos
+        ;;
     *-ibm)
         os=-aix
         ;;
+    *-wec)
+        os=-proelf
+        ;;
+    *-winbond)
+        os=-proelf
+        ;;
+    *-oki)
+        os=-proelf
+        ;;
     *-hp)
         os=-hpux
@@ -694 +1229 @@
         ;;
     *-cbm)
-        os=-amigados
+        os=-amigaos
         ;;
     *-dg)
@@ -708 +1243 @@
         os=-luna
         ;;
+    *-next )
+        os=-nextstep
+        ;;
     *-sequent)
         os=-ptx
@@ -735 +1273 @@
         os=-irix
         ;;
+        *-siemens)
+        os=-sysv4
+        ;;
     *-masscomp)
         os=-rtu
+        ;;
+    f30[01]-fujitsu | f700-fujitsu)
+        os=-uxpv
+        ;;
+    *-rom68k)
+        os=-coff
+        ;;
+    *-*bug)
+        os=-coff
+        ;;
+    *-apple)
+        os=-macos
+        ;;
+    *-atari*)
+        os=-mint
         ;;
     *)
@@ -756 +1312 @@
                 vendor=sun
                 ;;
-            -lynxos*)
-                vendor=lynx
-                ;;
             -aix*)
                 vendor=ibm
                 ;;
+            -beos*)
+                vendor=be
+                ;;
             -hpux*)
                 vendor=hp
                 ;;
+            -mpeix*)
+                vendor=hp
+                ;;
             -hiux*)
                 vendor=hitachi
@@ -780 +1339 @@
                 vendor=ns
                 ;;
-            -mvs*)
+            -mvs* | -opened*)
                 vendor=ibm
                 ;;
@@ -786 +1345 @@
                 vendor=sequent
                 ;;
+            -vxsim* | -vxworks*)
+                vendor=wrs
+                ;;
+            -aux*)
+                vendor=apple
+                ;;
+            -hms*)
+                vendor=hitachi
+                ;;
+            -mpw* | -macos*)
+                vendor=apple
+                ;;
+            -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                vendor=atari
+                ;;
         esac
         basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
@@ -792 +1366 @@
 
 echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End: