- New config.sub and config.guess to fix problems on SCO. Supplied

   by Gary E. Miller <gem@rellim.com>

1 files changed, 320 insertions, 130 deletions

diff --git a/config.guess b/config.guess
index 2960d6e0d..6b5426161 100755
--- a/config.guess
+++ b/config.guess
@@ -1,6 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   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
@@ -23,6 +24,7 @@
 
 # Written by Per Bothner <bothner@cygnus.com>.
 # The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to <autoconf-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -35,6 +37,20 @@
 # (but try to keep the structure clean).
 #
 
+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
+fi
+
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -46,7 +62,8 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 
 # Note: order is significant - the case branches are not exclusive.
 
@@ -59,46 +76,62 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # 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
+        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,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
+        .frame \$30,16,\$26,0
+        ldgp \$29,0(\$27)
+        .prologue 1
+        .long 0x47e03d80 # implver \$0
+        lda \$2,-1
+        .long 0x47e20c21 # amask \$2,\$1
+        lda \$16,\$Lformat
+        mov \$0,\$17
+        not \$1,\$18
+        jsr \$26,printf
+        ldgp \$29,0(\$26)
+        mov 0,\$16
+        jsr \$26,exit
         .end main
 EOF
-        ${CC-cc} dummy.s -o dummy 2>/dev/null
+        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
         if test "$?" = 0 ; then
-                ./dummy
-                case "$?" in
-                        7)
+                case `./$dummy` in
+                        0-0)
                                 UNAME_MACHINE="alpha"
                                 ;;
-                        15)
+                        1-0)
                                 UNAME_MACHINE="alphaev5"
                                 ;;
-                        14)
+                        1-1)
                                 UNAME_MACHINE="alphaev56"
                                 ;;
-                        10)
+                        1-101)
                                 UNAME_MACHINE="alphapca56"
                                 ;;
-                        16)
+                        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 [[A-Z]] [[a-z]]`
+        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
@@ -133,6 +166,9 @@ EOF
     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;;
@@ -142,7 +178,7 @@ EOF
     SR2?01:HI-UX/MPP:*:*)
         echo hppa1.1-hitachi-hiuxmpp
         exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
         # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
         if test "`(/bin/universe) 2>/dev/null`" = att ; then
                 echo pyramid-pyramid-sysv3
@@ -150,7 +186,7 @@ EOF
                 echo pyramid-pyramid-bsd
         fi
         exit 0 ;;
-    NILE:*:*:dcosx)
+    NILE*:*:*:dcosx)
         echo pyramid-pyramid-svr4
         exit 0 ;;
     sun4H:SunOS:5.*:*)
@@ -201,6 +237,32 @@ EOF
     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*:NetBSD:*:*)
         echo m68k-sun-netbsd${UNAME_RELEASE}
         exit 0 ;;
@@ -234,12 +296,16 @@ EOF
     VAX*:ULTRIX*:*:*)
         echo vax-dec-ultrix${UNAME_RELEASE}
         exit 0 ;;
-    2020:CLIX:*:*)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
         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; {
+        sed 's/^        //' << EOF >$dummy.c
+#ifdef __cplusplus
+        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);
@@ -254,10 +320,10 @@ 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 $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 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -275,15 +341,18 @@ EOF
     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
                 echo m88k-dg-dgux${UNAME_RELEASE}
-        else
+            else
                 echo m88k-dg-dguxbcs${UNAME_RELEASE}
+            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
@@ -309,7 +378,7 @@ EOF
         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>
 
                 main()
@@ -320,8 +389,8 @@ 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 $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
@@ -368,25 +437,25 @@ EOF
         case "${UNAME_MACHINE}" in
             9000/31? )            HP_ARCH=m68000 ;;
             9000/[34]?? )         HP_ARCH=m68k ;;
-            9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
-              sed 's/^              //' << EOF >dummy.c
+            9000/[678][0-9][0-9])
+              sed 's/^              //' << EOF >$dummy.c
               #include <stdlib.h>
               #include <unistd.h>
-              
+
               int main ()
               {
               #if defined(_SC_KERNEL_BITS)
                   long bits = sysconf(_SC_KERNEL_BITS);
-              #endif 
+              #endif
                   long cpu  = sysconf (_SC_CPU_VERSION);
-              
-                  switch (cpu) 
+
+                  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: 
+                case CPU_PA_RISC2_0:
               #if defined(_SC_KERNEL_BITS)
-                    switch (bits) 
+                    switch (bits)
                         {
                         case 64: puts ("hppa2.0w"); break;
                         case 32: puts ("hppa2.0n"); break;
@@ -394,20 +463,20 @@ EOF
                         } break;
               #else  /* !defined(_SC_KERNEL_BITS) */
                     puts ("hppa2.0"); break;
-              #endif 
+              #endif
                 default: puts ("hppa1.0"); break;
                 }
                   exit (0);
               }
 EOF
-        (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
-        rm -f dummy.c dummy
+        (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+        rm -f $dummy.c $dummy
         esac
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
         exit 0 ;;
     3050*:HI-UX:*:*)
-        sed 's/^        //' << EOF >dummy.c
+        sed 's/^        //' << EOF >$dummy.c
         #include <unistd.h>
         int
         main ()
@@ -432,8 +501,8 @@ 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 $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:*:* )
@@ -442,6 +511,9 @@ EOF
     9000/8??:4.3bsd:*:*)
         echo hppa1.0-hp-bsd
         exit 0 ;;
+    *9??*:MPE/iX:*:*)
+        echo hppa1.0-hp-mpeix
+        exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
         echo hppa1.1-hp-osf
         exit 0 ;;
@@ -458,6 +530,9 @@ EOF
     parisc*:Lites*:*:*)
         echo hppa1.1-hp-lites
         exit 0 ;;
+    hppa*:OpenBSD:*:*)
+        echo hppa-unknown-openbsd
+        exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
         echo c1-convex-bsd
         exit 0 ;;
@@ -490,11 +565,14 @@ EOF
     CRAY*TS:*:*:*)
         echo t90-cray-unicos${UNAME_RELEASE}
         exit 0 ;;
+    CRAY*T3E:*:*:*)
+        echo alpha-cray-unicosmk${UNAME_RELEASE}
+        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/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
@@ -507,17 +585,26 @@ EOF
     hp300:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+        exit 0 ;;
     sparc*:BSD/OS:*:*)
         echo sparc-unknown-bsdi${UNAME_RELEASE}
         exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
-        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+    *:BSD/OS:*:*)
+        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
         exit 0 ;;
     *:FreeBSD:*:*)
+        if test -x /usr/bin/objformat; then
+            if test "elf" = "`/usr/bin/objformat`"; then
+                echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+                exit 0
+            fi
+        fi
         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/[-_].*/\./'`
+        echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
         exit 0 ;;
     *:OpenBSD:*:*)
         echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
@@ -528,6 +615,15 @@ EOF
     i*:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
         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 ;;
@@ -538,15 +634,11 @@ EOF
         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
         exit 0 ;;
     *:Linux:*:*)
-        # uname on the ARM produces all sorts of strangeness, and we need to
-        # filter it out.
-        case "$UNAME_MACHINE" in
-          arm* | sa110*)              UNAME_MACHINE="arm" ;;
-        esac
 
         # 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`
+        # 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_help_string=`cd /; ld --help 2>&1`
         ld_supported_emulations=`echo $ld_help_string \
                          | sed -ne '/supported emulations:/!d
                                     s/[         ][      ]*/ /g
@@ -554,68 +646,137 @@ EOF
                                     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 ;;
-          armlinux)   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 ;;
+          *ia64)
+                echo "${UNAME_MACHINE}-unknown-linux"
+                exit 0
+                ;;
+          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
+                ;;
+          armlinux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+                exit 0
+                ;;
+          elf32arm*)
+                echo "${UNAME_MACHINE}-unknown-linux-gnu"
+                exit 0
+                ;;
+          armelf_linux*)
+                echo "${UNAME_MACHINE}-unknown-linux-gnu"
+                exit 0
+                ;;
+          m68klinux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+                exit 0
+                ;;
+          elf32ppc)
+                # Determine Lib Version
+                cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
+#else
+  printf("unkown\n");
+#endif
+  return 0;
+}
+EOF
+                LIBC=""
+                $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+                if test "$?" = 0 ; then
+                        ./$dummy | grep 1\.99 > /dev/null
+                        if test "$?" = 0 ; then
+                                LIBC="libc1"
+                        fi
+                fi      
+                rm -f $dummy.c $dummy
+                echo powerpc-unknown-linux-gnu${LIBC}
+                exit 0
+                ;;
         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
+                cat <<EOF >$dummy.s
+                        .data
+                \$Lformat:
+                        .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+
+                        .text
+                        .globl main
+                        .align 4
+                        .ent main
+                main:
+                        .frame \$30,16,\$26,0
+                        ldgp \$29,0(\$27)
+                        .prologue 1
+                        .long 0x47e03d80 # implver \$0
+                        lda \$2,-1
+                        .long 0x47e20c21 # amask \$2,\$1
+                        lda \$16,\$Lformat
+                        mov \$0,\$17
+                        not \$1,\$18
+                        jsr \$26,printf
+                        ldgp \$29,0(\$26)
+                        mov 0,\$16
+                        jsr \$26,exit
+                        .end main
 EOF
                 LIBC=""
-                ${CC-cc} dummy.s -o dummy 2>/dev/null
+                $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
                 if test "$?" = 0 ; then
-                        ./dummy
-                        case "$?" in
-                        7)
+                        case `./$dummy` in
+                        0-0)
                                 UNAME_MACHINE="alpha"
                                 ;;
-                        15)
+                        1-0)
                                 UNAME_MACHINE="alphaev5"
                                 ;;
-                        14)
+                        1-1)
                                 UNAME_MACHINE="alphaev56"
                                 ;;
-                        10)
+                        1-101)
                                 UNAME_MACHINE="alphapca56"
                                 ;;
-                        16)
+                        2-303)
                                 UNAME_MACHINE="alphaev6"
                                 ;;
-                        esac    
+                        2-307)
+                                UNAME_MACHINE="alphaev67"
+                                ;;
+                        esac
 
-                        objdump --private-headers dummy | \
+                        objdump --private-headers $dummy | \
                           grep ld.so.1 > /dev/null
                         if test "$?" = 0 ; then
                                 LIBC="libc1"
                         fi
-                fi      
-                rm -f dummy.s dummy
+                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[];
-{
+          cat >$dummy.c <<EOF
+#ifdef __cplusplus
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __MIPSEB__
   printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif
@@ -625,8 +786,8 @@ main(argc, argv)
   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
+          $CC_FOR_BUILD $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.
@@ -645,12 +806,13 @@ EOF
             ;;
           esac
           # Determine whether the default compiler is a.out or elf
-          cat >dummy.c <<EOF
+          cat >$dummy.c <<EOF
 #include <features.h>
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+#ifdef __cplusplus
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
@@ -667,8 +829,8 @@ main(argc, argv)
   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
+          $CC_FOR_BUILD $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.
@@ -684,10 +846,20 @@ EOF
         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}-pc-sysv${UNAME_REL}
+        fi
+        exit 0 ;;
+    i?86:*:5:7*)
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+            echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
         else
-                echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+            echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
         fi
         exit 0 ;;
     i?86:*:3.2:*)
@@ -699,18 +871,15 @@ EOF
                 (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
                 (/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}-pc-sysv32
         fi
         exit 0 ;;
-    i?86:UnixWare:*:*)
-        if /bin/uname -X 2>/dev/null >/dev/null ; then
-          (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-            && UNAME_MACHINE=i586
-        fi
-        echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
-        exit 0 ;;
     pc:*:*:*)
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
@@ -752,7 +921,7 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
         exit 0 ;;
-    i?86:LynxOS:2.*:*)
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
         echo i386-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
@@ -764,6 +933,9 @@ EOF
     SM[BE]S:UNIX_SV:*:*)
         echo mips-dde-sysv${UNAME_RELEASE}
         exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+        echo mips-sni-sysv4
+        exit 0 ;;
     RM*:SINIX-*:*:*)
         echo mips-sni-sysv4
         exit 0 ;;
@@ -794,7 +966,7 @@ EOF
     news*:NEWS-OS:*:6*)
         echo mips-sony-newsos6
         exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
         if [ -d /usr/nec ]; then
                 echo mips-nec-sysv${UNAME_RELEASE}
         else
@@ -810,12 +982,27 @@ EOF
     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 ;;
+    *:QNX:*:4*)
+        echo i386-qnx-qnx${UNAME_VERSION}
+        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
 
-cat >dummy.c <<EOF
+cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
 # include <sys/utsname.h>
@@ -853,7 +1040,10 @@ main ()
 #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);
   exit (0);
 #endif
 
@@ -913,8 +1103,8 @@ main ()
 }
 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 $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.