1999-05-22 Ben Elliston <bje@cygnus.com>

	* config.guess: Merge with FSF version. Future changes will be
	more accurately recorded in this ChangeLog.
	* config.sub: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27093 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/ChangeLog b/ChangeLog
index bd6687f..1ab5831 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-05-22  Ben Elliston  <bje@cygnus.com>
+
+       * config.guess: Merge with FSF version. Future changes will be
+       more accurately recorded in this ChangeLog.
+       * config.sub: Likewise.
+

 Thu May 20 10:00:42 1999   Stephen L Moshier  <moshier@world.std.com>
 
         * Makefile.in (GCC_FOR_TARGET): Add -I$(build_tooldir)/include.
 Thu May 20 10:00:42 1999   Stephen L Moshier  <moshier@world.std.com>
 
         * Makefile.in (GCC_FOR_TARGET): Add -I$(build_tooldir)/include.

diff --git a/config.guess b/config.guess
index a91e750..ff7803f 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -1,6 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #! /bin/sh
 # Attempt to guess a canonical system name.

-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 1999 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
 #
 # 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.
 
 # 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 the Autoconf mailing list <autoconf@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
 #
 # 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).
 #
 
 # (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
 # 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
 
 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.
 
 
 # Note: order is significant - the case branches are not exclusive.
 


@@ -59,7 +76,7 @@ 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.
        # 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

        .globl main
        .ent main
 main:
        .globl main
        .ent main
 main:


@@ -76,9 +93,9 @@ main:
        ret \$31,(\$26),1
        .end main
 EOF
        ret \$31,(\$26),1
        .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
        if test "$?" = 0 ; then

-               ./dummy
+               ./$dummy

                case "$?" in
                        7)
                                UNAME_MACHINE="alpha"
                case "$?" in
                        7)
                                UNAME_MACHINE="alpha"


@@ -97,15 +114,15 @@ EOF
                                ;;
                esac
        fi
                                ;;
                esac
        fi

-       rm -f dummy.s dummy
+       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*:*)
        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 generic posix subsystem?
-       # Should we change UNAME_MACHINE based on the output of uname 
-       # instead of the specific alpha model.
+       # How do we know it's Interix rather than the generic POSIX subsystem?
+       # Should we change UNAME_MACHINE based on the output of uname instead
+       # of the specific Alpha model?

        echo alpha-pc-interix
        echo alpha-pc-interix

-       exit 0;;
+       exit 0 ;;

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


@@ -148,7 +165,7 @@ EOF
     SR2?01:HI-UX/MPP:*:*)
        echo hppa1.1-hitachi-hiuxmpp
        exit 0;;
     SR2?01:HI-UX/MPP:*:*)
        echo hppa1.1-hitachi-hiuxmpp
        exit 0;;

-    Pyramid*:OSx*:*:*|MIS*: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
        # 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


@@ -156,7 +173,7 @@ EOF
                echo pyramid-pyramid-bsd
        fi
        exit 0 ;;
                echo pyramid-pyramid-bsd
        fi
        exit 0 ;;

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

        echo pyramid-pyramid-svr4
        exit 0 ;;
     sun4H:SunOS:5.*:*)
        echo pyramid-pyramid-svr4
        exit 0 ;;
     sun4H:SunOS:5.*:*)


@@ -207,6 +224,32 @@ EOF
     atari*:OpenBSD:*:*)
        echo m68k-unknown-openbsd${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*:NetBSD:*:*)
        echo m68k-sun-netbsd${UNAME_RELEASE}
        exit 0 ;;
     sun3*:NetBSD:*:*)
        echo m68k-sun-netbsd${UNAME_RELEASE}
        exit 0 ;;


@@ -228,6 +271,9 @@ EOF
     powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
        exit 0 ;;
     powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
        exit 0 ;;

+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;

     RISC*:Mach:*:*)
        echo mips-dec-mach_bsd4.3
        exit 0 ;;
     RISC*:Mach:*:*)
        echo mips-dec-mach_bsd4.3
        exit 0 ;;


@@ -237,12 +283,16 @@ EOF
     VAX*:ULTRIX*:*:*)
        echo vax-dec-ultrix${UNAME_RELEASE}
        exit 0 ;;
     VAX*:ULTRIX*:*:*)
        echo vax-dec-ultrix${UNAME_RELEASE}
        exit 0 ;;

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

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

-       sed 's/^        //' << EOF >dummy.c
-       int main (argc, argv) int argc; char **argv; {
+       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);
        #if defined (host_mips) && defined (MIPSEB)
        #if defined (SYSTYPE_SYSV)
          printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);


@@ -257,10 +307,10 @@ EOF
          exit (-1);
        }
 EOF
          exit (-1);
        }
 EOF

-       ${CC-cc} dummy.c -o dummy \
-         && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-         && rm dummy.c dummy && exit 0
-       rm -f dummy.c dummy
+       $CC_FOR_BUILD $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:*:*)
        echo mips-mips-riscos${UNAME_RELEASE}
        exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)


@@ -312,7 +362,7 @@ EOF
        exit 0 ;;
     *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
        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()
                #include <sys/systemcfg.h>
 
                main()


@@ -323,8 +373,8 @@ EOF
                        exit(0);
                        }
 EOF
                        exit(0);
                        }
 EOF

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

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


@@ -333,7 +383,8 @@ EOF
        fi
        exit 0 ;;
     *:AIX:*:4)
        fi
        exit 0 ;;
     *:AIX:*:4)

-       if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+       if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then

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


@@ -366,33 +417,29 @@ EOF
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
        echo m68k-hp-bsd4.4
        exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
        echo m68k-hp-bsd4.4
        exit 0 ;;

-    *9??*:MPE/iX:*:*)
-       echo hppa1.0-hp-mpeix
-       exit 0 ;;

     9000/[34678]??:HP-UX:*:*)
        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
     9000/[34678]??:HP-UX:*:*)
        case "${UNAME_MACHINE}" in
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;

-           9000/[678][0-9][0-9] )
-
-              sed 's/^              //' << EOF >dummy.c
+           9000/[678][0-9][0-9])
+              sed 's/^              //' << EOF >$dummy.c

               #include <stdlib.h>
               #include <unistd.h>
               #include <stdlib.h>
               #include <unistd.h>

-              
+

               int main ()
               {
               #if defined(_SC_KERNEL_BITS)
                   long bits = sysconf(_SC_KERNEL_BITS);
               int main ()
               {
               #if defined(_SC_KERNEL_BITS)
                   long bits = sysconf(_SC_KERNEL_BITS);

-              #endif 
+              #endif

                   long cpu  = sysconf (_SC_CPU_VERSION);
                   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_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)
               #if defined(_SC_KERNEL_BITS)

-                   switch (bits) 
+                   switch (bits)

                        {
                        case 64: puts ("hppa2.0w"); break;
                        case 32: puts ("hppa2.0n"); break;
                        {
                        case 64: puts ("hppa2.0w"); break;
                        case 32: puts ("hppa2.0n"); break;


@@ -400,20 +447,20 @@ EOF
                        } break;
               #else  /* !defined(_SC_KERNEL_BITS) */
                    puts ("hppa2.0"); break;
                        } break;
               #else  /* !defined(_SC_KERNEL_BITS) */
                    puts ("hppa2.0"); break;

-              #endif 
+              #endif

                default: puts ("hppa1.0"); break;
                }
                   exit (0);
               }
 EOF
                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
+       ($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:*:*)
        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 ()
        #include <unistd.h>
        int
        main ()


@@ -438,8 +485,8 @@ EOF
          exit (0);
        }
 EOF
          exit (0);
        }
 EOF

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

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


@@ -448,6 +495,9 @@ EOF
     9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
        exit 0 ;;
     9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
        exit 0 ;;

+    *9??*:MPE/iX:*:*)
+       echo hppa1.0-hp-mpeix
+       exit 0 ;;

     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
        echo hppa1.1-hp-osf
        exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
        echo hppa1.1-hp-osf
        exit 0 ;;


@@ -499,6 +549,9 @@ EOF
     CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE}
        exit 0 ;;
     CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE}
        exit 0 ;;

+    CRAY*T3E:*:*:*)
+       echo t3e-cray-unicosmk${UNAME_RELEASE}
+       exit 0 ;;

     CRAY-2:*:*:*)
        echo cray2-cray-unicos
         exit 0 ;;
     CRAY-2:*:*:*)
        echo cray2-cray-unicos
         exit 0 ;;


@@ -516,15 +569,23 @@ EOF
     hp300:OpenBSD:*:*)
        echo m68k-unknown-openbsd${UNAME_RELEASE}
        exit 0 ;;
     hp300:OpenBSD:*:*)
        echo m68k-unknown-openbsd${UNAME_RELEASE}
        exit 0 ;;

-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)

        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
        exit 0 ;;
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
        exit 0 ;;

+    sparc*:BSD/OS:*:*)
+       echo sparc-unknown-bsdi${UNAME_RELEASE}
+       exit 0 ;;
+    *:BSD/OS:*:*)
+       echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+       exit 0 ;;

     *:FreeBSD:*:*)
     *:FreeBSD:*:*)

-        if test -x /usr/bin/objformat -a "elf" = "`/usr/bin/objformat`"; then
-          echo ${UNAME_MACHINE}-unknown-freebsdelf
-        else
-         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-      fi
+       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/[-_].*/\./'`
        exit 0 ;;
     *:NetBSD:*:*)
        echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`


@@ -533,23 +594,22 @@ EOF
        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
        exit 0 ;;
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
        exit 0 ;;
     i*:CYGWIN*:*)

-       echo ${UNAME_MACHINE}-pc-cygwin32
+       echo ${UNAME_MACHINE}-pc-cygwin

        exit 0 ;;
     i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
        exit 0 ;;
     i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)

-        # How do we know it's Interix rather than generic posix subsystem?
+       # 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
        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we

-       # change UNAME_MACHINE based on the output of uname instead of
-       # i386?
+       # 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 i386-pc-interix
        exit 0 ;;
     i*:UWIN*:*)
        echo ${UNAME_MACHINE}-pc-uwin
        exit 0 ;;
     p*:CYGWIN*:*)

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

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


@@ -566,8 +626,9 @@ EOF
        esac
 
        # The BFD linker knows what the default object file format is, so
        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
        ld_supported_emulations=`echo $ld_help_string \
                         | sed -ne '/supported emulations:/!d
                                    s/[         ][      ]*/ /g


@@ -613,7 +674,7 @@ EOF
        esac
 
        if test "${UNAME_MACHINE}" = "alpha" ; then
        esac
 
        if test "${UNAME_MACHINE}" = "alpha" ; then

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

                .globl main
                .ent main
        main:
                .globl main
                .ent main
        main:


@@ -631,9 +692,9 @@ EOF
                .end main
 EOF
                LIBC=""
                .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
                if test "$?" = 0 ; then

-                       ./dummy
+                       ./$dummy

                        case "$?" in
                        7)
                                UNAME_MACHINE="alpha"
                        case "$?" in
                        7)
                                UNAME_MACHINE="alpha"


@@ -650,22 +711,23 @@ EOF
                        16)
                                UNAME_MACHINE="alphaev6"
                                ;;
                        16)
                                UNAME_MACHINE="alphaev6"
                                ;;

-                       esac    
+                       esac

 
 

-                       objdump --private-headers dummy | \
+                       objdump --private-headers $dummy | \

                          grep ld.so.1 > /dev/null
                        if test "$?" = 0 ; then
                                LIBC="libc1"
                        fi
                          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
                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
 #ifdef __MIPSEB__
   printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif


@@ -675,8 +737,8 @@ main(argc, argv)
   return 0;
 }
 EOF
   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.
        else
          # Either a pre-BFD a.out linker (linux-gnuoldld)
          # or one that does not give us useful --help.


@@ -695,12 +757,13 @@ EOF
            ;;
          esac
          # Determine whether the default compiler is a.out or elf
            ;;
          esac
          # Determine whether the default compiler is a.out or elf

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

 #include <features.h>
 #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
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2


@@ -717,8 +780,8 @@ main(argc, argv)
   return 0;
 }
 EOF
   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.
        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.


@@ -741,17 +804,13 @@ EOF
        fi
        exit 0 ;;
     i?86:*:5:7*)
        fi
        exit 0 ;;
     i?86:*:5:7*)

-       UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-       (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-       (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-               && UNAME_MACHINE=i586
-# 5.0.4c returns "Pent II".  5.0.5 returns PentII
-       (/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}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
-       exit 0 ;;
+       UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+       (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+       (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
+       (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
+       (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
+       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+       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`
     i?86:*:3.2:*)
        if test -f /usr/options/cb.name; then
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`


@@ -761,12 +820,10 @@ 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 i80486 >/dev/null) && UNAME_MACHINE=i486
                (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
                        && UNAME_MACHINE=i586

-               (/bin/uname -X|egrep '^Machine.*PentII' >/dev/null) \
+               (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \

                        && UNAME_MACHINE=i686
                        && UNAME_MACHINE=i686

-               (/bin/uname -X|egrep '^Machine.*Pent II' >/dev/null) \
+               (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \

                        && UNAME_MACHINE=i686
                        && 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
                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
        else
                echo ${UNAME_MACHINE}-pc-sysv32


@@ -813,7 +870,7 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
        exit 0 ;;
     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.*:*)
        echo i386-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)


@@ -825,6 +882,9 @@ EOF
     SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
        exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
        exit 0 ;;

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

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


@@ -855,7 +915,7 @@ EOF
     news*:NEWS-OS:*:6*)
        echo mips-sony-newsos6
        exit 0 ;;
     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:*:* | R4000:UNIX_SV:*:*)

        if [ -d /usr/nec ]; then
                echo mips-nec-sysv${UNAME_RELEASE}
        else
        if [ -d /usr/nec ]; then
                echo mips-nec-sysv${UNAME_RELEASE}
        else


@@ -871,12 +931,24 @@ EOF
     BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
        echo i586-pc-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 ;;

 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 

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

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


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

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

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


@@ -974,8 +1049,8 @@ main ()
 }
 EOF
 
 }
 EOF
 

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

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

diff --git a/config.sub b/config.sub
index 3bb8d2c..2436b45 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -98,13 +98,13 @@ case $os in
                os=
                basic_machine=$1
                ;;
                os=
                basic_machine=$1
                ;;

-       -sim | -cisco | -oki | -wec | -winbond )        # EGCS LOCAL
+       -sim | -cisco | -oki | -wec | -winbond)

                os=
                basic_machine=$1
                ;;
                os=
                basic_machine=$1
                ;;

-       -scout)                                         # EGCS LOCAL
+       -scout)

                ;;
                ;;

-       -wrs)                                           # EGCS LOCAL
+       -wrs)

                os=vxworks
                basic_machine=$1
                ;;
                os=vxworks
                basic_machine=$1
                ;;


@@ -163,38 +163,22 @@ case $basic_machine in
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.
        tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.
        tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \

-               | arme[lb] | pyramid | mn10200 | mn10300 \
-               | tron | a29k | 580 | i960 | h8300 \
+               | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+               | 580 | i960 | h8300 \

                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \

-               | alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
+               | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \

                | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
                | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \

-               | 1750a | dsp16xx | pdp11 \
-               | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-               | mipstx39 | mipstx39el \
-               | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x)
+               | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+               | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+               | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+               | mips64vr5000 | miprs64vr5000el \
+               | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+               | thumb | d10v)

                basic_machine=$basic_machine-unknown
                ;;
                basic_machine=$basic_machine-unknown
                ;;

-       m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
-               | h8500 | w65) # EGCS LOCAL
-               ;;
-       thumb)
-               basic_machine=$basic_machine-unknown
-               ;;
-       mips64vr4300 | mips64vr4300el) # EGCS LOCAL jsmith/vr4300
-               basic_machine=$basic_machine-unknown
-               ;;
-       mips64vr4100 | mips64vr4100el) # EGCS LOCAL jsmith/vr4100
-               basic_machine=$basic_machine-unknown
-               ;;
-       mips64vr5000 | mips64vr5000el) # EGCS LOCAL ian/vr5000
-               basic_machine=$basic_machine-unknown
-               ;;
-       mips16)
-               basic_machine=$basic_machine-unknown
-               ;;
-       d10v)
-               basic_machine=$basic_machine-unknown
+       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)

                ;;
                ;;

+

        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
        # (2) the word "unknown" tends to confuse beginning users.
        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
        # (2) the word "unknown" tends to confuse beginning users.


@@ -210,41 +194,24 @@ case $basic_machine in
        vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
        vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \

-             | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+             | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \

              | xmp-* | ymp-* \
              | xmp-* | ymp-* \

-             | hppa-* | hppa1.0-* | hppa1.1-* \
-             | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-             | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
-             | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
-             | xps100-* | clipper-* | orion-* \
+             | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+             | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+             | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+             | clipper-* | orion-* \

              | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
              | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \

-             | sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
-             | mips64el-* | mips64orion-* | mips64orionel-*  \
+             | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+             | mips64el-* | mips64orion-* | mips64orionel-* \
+             | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \

              | mipstx39-* | mipstx39el-* \
              | mipstx39-* | mipstx39el-* \

-             | f301-* | arm*-*)
-               ;;
-       m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # EGCS LOCAL
-               ;;
-       thumb-*) # EGCS LOCAL angela/thumb
-               ;;
-       v850-*) # EGCS LOCAL
-               ;;
-       d30v-*) # EGCS LOCAL
-               ;;
-       mips64vr4300-* | mips64vr4300el-*) # EGCS LOCAL jsmith/vr4300
-               ;;
-       mips64vr4100-* | mips64vr4100el-*) # EGCS LOCAL jsmith/vr4100
-               ;;
-       mips16-*) # EGCS LOCAL krk/mips16
-               ;;
-       tic30-*) # EGCS LOCAL ian/tic30
-               ;;
-       c30-*) # EGCS LOCAL ian/tic30
-               basic_machine=tic30-unknown
+             | f301-* | armv*-* | t3e-* \
+             | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+             | thumb-* | v850-* | d30v-* | tic30-* | c30-* )

                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.

-       386bsd)                                         # EGCS LOCAL
+       386bsd)

                basic_machine=i386-unknown
                os=-bsd
                ;;
                basic_machine=i386-unknown
                os=-bsd
                ;;


@@ -254,11 +221,11 @@ case $basic_machine in
        3b*)
                basic_machine=we32k-att
                ;;
        3b*)
                basic_machine=we32k-att
                ;;

-       a29khif)                                        # EGCS LOCAL
+       a29khif)

                basic_machine=a29k-amd
                os=-udi
                ;;
                basic_machine=a29k-amd
                os=-udi
                ;;

-       adobe68k)                                       # EGCS LOCAL
+       adobe68k)

                basic_machine=m68010-adobe
                os=-scout
                ;;
                basic_machine=m68010-adobe
                os=-scout
                ;;


@@ -291,7 +258,7 @@ case $basic_machine in
                basic_machine=m68k-apollo
                os=-sysv
                ;;
                basic_machine=m68k-apollo
                os=-sysv
                ;;

-       apollo68bsd)                                    # EGCS LOCAL
+       apollo68bsd)

                basic_machine=m68k-apollo
                os=-bsd
                ;;
                basic_machine=m68k-apollo
                os=-bsd
                ;;


@@ -371,7 +338,7 @@ case $basic_machine in
        encore | umax | mmax)
                basic_machine=ns32k-encore
                ;;
        encore | umax | mmax)
                basic_machine=ns32k-encore
                ;;

-       es1800 | OSE68k | ose68k | ose | OSE)           # EGCS LOCAL
+       es1800 | OSE68k | ose68k | ose | OSE)

                basic_machine=m68k-ericsson
                os=-ose
                ;;
                basic_machine=m68k-ericsson
                os=-ose
                ;;


@@ -393,11 +360,11 @@ case $basic_machine in
                basic_machine=h8300-hitachi
                os=-hms
                ;;
                basic_machine=h8300-hitachi
                os=-hms
                ;;

-       h8300xray)                                      # EGCS LOCAL
+       h8300xray)

                basic_machine=h8300-hitachi
                os=-xray
                ;;
                basic_machine=h8300-hitachi
                os=-xray
                ;;

-       h8500hms)                                       # EGCS LOCAL
+       h8500hms)

                basic_machine=h8500-hitachi
                os=-hms
                ;;
                basic_machine=h8500-hitachi
                os=-hms
                ;;


@@ -416,22 +383,6 @@ case $basic_machine in
                basic_machine=m68k-hp
                os=-hpux
                ;;
                basic_machine=m68k-hp
                os=-hpux
                ;;

-        w89k-*)                                                # EGCS LOCAL
-                basic_machine=hppa1.1-winbond
-                os=-proelf
-                ;;
-        op50n-*)                                       # EGCS LOCAL
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        op60c-*)                                       # EGCS LOCAL
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        hppro)                                         # EGCS LOCAL
-                basic_machine=hppa1.1-hp
-                os=-proelf
-                ;;

        hp3k9[0-9][0-9] | hp9[0-9][0-9])
                basic_machine=hppa1.0-hp
                ;;
        hp3k9[0-9][0-9] | hp9[0-9][0-9])
                basic_machine=hppa1.0-hp
                ;;


@@ -441,22 +392,21 @@ case $basic_machine in
        hp9k3[2-9][0-9])
                basic_machine=m68k-hp
                ;;
        hp9k3[2-9][0-9])
                basic_machine=m68k-hp
                ;;

-       hp9k6[0-9][0-9] | hp6[0-9][0-9] )
+       hp9k6[0-9][0-9] | hp6[0-9][0-9])

                basic_machine=hppa1.0-hp
                ;;
                basic_machine=hppa1.0-hp
                ;;

-       hp9k7[0-79][0-9] | hp7[0-79][0-9] )
+       hp9k7[0-79][0-9] | hp7[0-79][0-9])

                basic_machine=hppa1.1-hp
                ;;
                basic_machine=hppa1.1-hp
                ;;

-       hp9k78[0-9] | hp78[0-9] )
+       hp9k78[0-9] | hp78[0-9])

                # FIXME: really hppa2.0-hp
                basic_machine=hppa1.1-hp
                ;;
                # 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 )
+       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
                ;;
                # FIXME: really hppa2.0-hp
                basic_machine=hppa1.1-hp
                ;;

-       hp9k8[0-9][13679] | hp8[0-9][13679] )
+       hp9k8[0-9][13679] | hp8[0-9][13679])

                basic_machine=hppa1.1-hp
                ;;
        hp9k8[0-9][0-9] | hp8[0-9][0-9])
                basic_machine=hppa1.1-hp
                ;;
        hp9k8[0-9][0-9] | hp8[0-9][0-9])


@@ -465,10 +415,14 @@ case $basic_machine in
        hppa-next)
                os=-nextstep3
                ;;
        hppa-next)
                os=-nextstep3
                ;;

-       hppaosf)                                        # EGCS LOCAL
+       hppaosf)

                basic_machine=hppa1.1-hp
                os=-osf
                ;;
                basic_machine=hppa1.1-hp
                os=-osf
                ;;

+       hppro)
+               basic_machine=hppa1.1-hp
+               os=-proelf
+               ;;

        i370-ibm* | ibm*)
                basic_machine=i370-ibm
                os=-mvs
        i370-ibm* | ibm*)
                basic_machine=i370-ibm
                os=-mvs


@@ -490,15 +444,15 @@ case $basic_machine in
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-solaris2
                ;;
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-solaris2
                ;;

-       i386mach)                                       # EGCS LOCAL
+       i386mach)

                basic_machine=i386-mach
                os=-mach
                ;;
                basic_machine=i386-mach
                os=-mach
                ;;

-       i386-vsta | vsta)                               # EGCS LOCAL
+       i386-vsta | vsta)

                basic_machine=i386-unknown
                os=-vsta
                ;;
                basic_machine=i386-unknown
                os=-vsta
                ;;

-       i386-go32 | go32)                               # EGCS LOCAL
+       i386-go32 | go32)

                basic_machine=i386-unknown
                os=-go32
                ;;
                basic_machine=i386-unknown
                os=-go32
                ;;


@@ -534,6 +488,10 @@ case $basic_machine in
        miniframe)
                basic_machine=m68000-convergent
                ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;

+       *mint | *MiNT)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;

        mipsel*-linux*)
                basic_machine=mipsel-unknown
                os=-linux-gnu
        mipsel*-linux*)
                basic_machine=mipsel-unknown
                os=-linux-gnu


@@ -548,12 +506,12 @@ case $basic_machine in
        mips3*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                ;;
        mips3*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                ;;

-       monitor)                                        # EGCS LOCAL
+       monitor)

                basic_machine=m68k-rom68k
                os=-coff
                ;;
                basic_machine=m68k-rom68k
                os=-coff
                ;;

-       msdos)                                          # EGCS LOCAL
-               basic_machine=i386-unknown      
+       msdos)
+               basic_machine=i386-unknown

                os=-msdos
                ;;
        ncr3000)
                os=-msdos
                ;;
        ncr3000)


@@ -561,7 +519,7 @@ case $basic_machine in
                os=-sysv4
                ;;
        netbsd386)
                os=-sysv4
                ;;
        netbsd386)

-               basic_machine=i386-unknown              # EGCS LOCAL
+               basic_machine=i386-unknown

                os=-netbsd
                ;;
        netwinder)
                os=-netbsd
                ;;
        netwinder)


@@ -580,7 +538,7 @@ case $basic_machine in
                basic_machine=mips-sony
                os=-newsos
                ;;
                basic_machine=mips-sony
                os=-newsos
                ;;

-       necv70)                                         # EGCS LOCAL
+       necv70)

                basic_machine=v70-nec
                os=-sysv
                ;;
                basic_machine=v70-nec
                os=-sysv
                ;;


@@ -609,18 +567,22 @@ case $basic_machine in
                basic_machine=i960-intel
                os=-nindy
                ;;
                basic_machine=i960-intel
                os=-nindy
                ;;

-       mon960)                                         # EGCS LOCAL
+       mon960)

                basic_machine=i960-intel
                os=-mon960
                ;;
        np1)
                basic_machine=np1-gould
                ;;
                basic_machine=i960-intel
                os=-mon960
                ;;
        np1)
                basic_machine=np1-gould
                ;;

-       OSE68000 | ose68000)                            # EGCS LOCAL
+       op50n-* | op60c-*)
+               basic_machine=hppa1.1-oki
+               os=-proelf
+               ;;
+       OSE68000 | ose68000)

                basic_machine=m68000-ericsson
                os=-ose
                ;;
                basic_machine=m68000-ericsson
                os=-ose
                ;;

-       os68k)                                          # EGCS LOCAL
+       os68k)

                basic_machine=m68k-none
                os=-os68k
                ;;
                basic_machine=m68k-none
                os=-os68k
                ;;


@@ -677,7 +639,7 @@ case $basic_machine in
        ps2)
                basic_machine=i386-ibm
                ;;
        ps2)
                basic_machine=i386-ibm
                ;;

-       rom68k)                                         # EGCS LOCAL
+       rom68k)

                basic_machine=m68k-rom68k
                os=-coff
                ;;
                basic_machine=m68k-rom68k
                os=-coff
                ;;


@@ -687,7 +649,7 @@ case $basic_machine in
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;

-       sa29200)                                        # EGCS LOCAL
+       sa29200)

                basic_machine=a29k-amd
                os=-udi
                ;;
                basic_machine=a29k-amd
                os=-udi
                ;;


@@ -698,7 +660,7 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
                basic_machine=sh-hitachi
                os=-hms
                ;;

-       sparclite-wrs)                                  # EGCS LOCAL
+       sparclite-wrs)

                basic_machine=sparclite-wrs
                os=-vxworks
                ;;
                basic_machine=sparclite-wrs
                os=-vxworks
                ;;


@@ -709,10 +671,10 @@ case $basic_machine in
        spur)
                basic_machine=spur-unknown
                ;;
        spur)
                basic_machine=spur-unknown
                ;;

-       st2000)                                         # EGCS LOCAL
+       st2000)

                basic_machine=m68k-tandem
                ;;
                basic_machine=m68k-tandem
                ;;

-       stratus)                                        # EGCS LOCAL
+       stratus)

                basic_machine=i860-stratus
                os=-sysv4
                ;;
                basic_machine=i860-stratus
                os=-sysv4
                ;;


@@ -760,6 +722,10 @@ case $basic_machine in
                basic_machine=i386-sequent
                os=-dynix
                ;;
                basic_machine=i386-sequent
                os=-dynix
                ;;

+       t3e)
+               basic_machine=t3e-cray
+               os=-unicos
+               ;;

        tx39)
                basic_machine=mipstx39-unknown
                ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;


@@ -777,7 +743,7 @@ case $basic_machine in
                basic_machine=a29k-nyu
                os=-sym1
                ;;
                basic_machine=a29k-nyu
                os=-sym1
                ;;

-       v810 | necv810)                                 # EGCS LOCAL
+       v810 | necv810)

                basic_machine=v810-nec
                os=-none
                ;;
                basic_machine=v810-nec
                os=-none
                ;;


@@ -804,9 +770,13 @@ case $basic_machine in
                basic_machine=a29k-wrs
                os=-vxworks
                ;;
                basic_machine=a29k-wrs
                os=-vxworks
                ;;

-       w65*)                                           # EGCS LOCAL
-               basic_machine=w65-wdc
-               os=-none
+       w65*)
+               basic_machine=w65-wdc
+               os=-none
+               ;;
+       w89k-*)
+               basic_machine=hppa1.1-winbond
+               os=-proelf

                ;;
        xmp)
                basic_machine=xmp-cray
                ;;
        xmp)
                basic_machine=xmp-cray


@@ -815,7 +785,7 @@ case $basic_machine in
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;

-       z8k-*-coff)                                     # EGCS LOCAL
+       z8k-*-coff)

                basic_machine=z8k-unknown
                os=-sim
                ;;
                basic_machine=z8k-unknown
                os=-sim
                ;;


@@ -826,13 +796,13 @@ case $basic_machine in
 
 # 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.
 
 # 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)                                           # EGCS LOCAL
+       w89k)

                basic_machine=hppa1.1-winbond
                ;;
                basic_machine=hppa1.1-winbond
                ;;

-       op50n)                                          # EGCS LOCAL
+       op50n)

                basic_machine=hppa1.1-oki
                ;;
                basic_machine=hppa1.1-oki
                ;;

-       op60c)                                          # EGCS LOCAL
+       op60c)

                basic_machine=hppa1.1-oki
                ;;
        mips)
                basic_machine=hppa1.1-oki
                ;;
        mips)


@@ -869,16 +839,16 @@ case $basic_machine in
        orion105)
                basic_machine=clipper-highlevel
                ;;
        orion105)
                basic_machine=clipper-highlevel
                ;;

-       mac | mpw | mac-mpw)                            # EGCS LOCAL
+       mac | mpw | mac-mpw)

                basic_machine=m68k-apple
                ;;
                basic_machine=m68k-apple
                ;;

-       pmac | pmac-mpw)                                # EGCS LOCAL
+       pmac | pmac-mpw)

                basic_machine=powerpc-apple
                ;;
                basic_machine=powerpc-apple
                ;;

-       c4x*)
-               basic_machine=c4x-none
-               os=-coff
-               ;;
+       c4x*)
+               basic_machine=c4x-none
+               os=-coff
+               ;;

        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1
        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1


@@ -937,18 +907,16 @@ case $os in
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \

-             | -interix* | -uwin* )
+             | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)

        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;

-       # EGCS LOCAL

        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \

-             | -windows* | -osx | -abug |  -netware* | -os9* | -beos* \
-             | -macos* | -mpw* | -magic* | -mon960* | -lnews* )
+             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+             | -macos* | -mpw* | -magic* | -mon960* | -lnews*)

                ;;
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
                ;;
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;

-       # END EGCS LOCAL

        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;


@@ -973,7 +941,7 @@ case $os in
        -acis*)
                os=-aos
                ;;
        -acis*)
                os=-aos
                ;;

-       -386bsd)                                        # EGCS LOCAL
+       -386bsd)

                os=-bsd
                ;;
        -ctix* | -uts*)
                os=-bsd
                ;;
        -ctix* | -uts*)


@@ -1007,15 +975,18 @@ case $os in
        # This must come after -sysvr4.
        -sysv*)
                ;;
        # This must come after -sysvr4.
        -sysv*)
                ;;

-       -ose*)                                          # EGCS LOCAL
+       -ose*)

                os=-ose
                ;;
                os=-ose
                ;;

-       -es1800*)                                       # EGCS LOCAL
+       -es1800*)

                os=-ose
                ;;
        -xenix)
                os=-xenix
                ;;
                os=-ose
                ;;
        -xenix)
                os=-xenix
                ;;

+        -*mint | -*MiNT)
+               os=-mint
+               ;;

        -none)
                ;;
        *)
        -none)
                ;;
        *)


@@ -1065,15 +1036,15 @@ case $basic_machine in
                # default.
                # os=-sunos4
                ;;
                # default.
                # os=-sunos4
                ;;

-       m68*-cisco)                                     # EGCS LOCAL
+       m68*-cisco)

                os=-aout
                ;;
                os=-aout
                ;;

-       mips*-cisco)                                    # EGCS LOCAL
+       mips*-cisco)
+               os=-elf
+               ;;
+       mips*-*)

                os=-elf
                ;;
                os=-elf
                ;;

-        mips*-*)                                        # EGCS LOCAL
-                os=-elf
-                ;;

        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;
        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;


@@ -1086,13 +1057,13 @@ case $basic_machine in
        *-ibm)
                os=-aix
                ;;
        *-ibm)
                os=-aix
                ;;

-       *-wec)                                          # EGCS LOCAL
+       *-wec)

                os=-proelf
                ;;
                os=-proelf
                ;;

-       *-winbond)                                      # EGCS LOCAL
+       *-winbond)

                os=-proelf
                ;;
                os=-proelf
                ;;

-       *-oki)                                          # EGCS LOCAL
+       *-oki)

                os=-proelf
                ;;
        *-hp)
                os=-proelf
                ;;
        *-hp)


@@ -1158,15 +1129,18 @@ case $basic_machine in
        f301-fujitsu)
                os=-uxpv
                ;;
        f301-fujitsu)
                os=-uxpv
                ;;

-       *-rom68k)                                       # EGCS LOCAL
+       *-rom68k)

                os=-coff
                ;;
                os=-coff
                ;;

-       *-*bug)                                         # EGCS LOCAL
+       *-*bug)

                os=-coff
                ;;
                os=-coff
                ;;

-       *-apple)                                        # EGCS LOCAL
+       *-apple)

                os=-macos
                ;;
                os=-macos
                ;;

+       *-atari*)
+               os=-mint
+               ;;

        *)
                os=-none
                ;;
        *)
                os=-none
                ;;


@@ -1224,12 +1198,15 @@ case $basic_machine in
                        -aux*)
                                vendor=apple
                                ;;
                        -aux*)
                                vendor=apple
                                ;;

-                       -hms*)                          # EGCS LOCAL
+                       -hms*)

                                vendor=hitachi
                                ;;
                                vendor=hitachi
                                ;;

-                       -mpw* | -macos*)                # EGCS LOCAL
+                       -mpw* | -macos*)

                                vendor=apple
                                ;;
                                vendor=apple
                                ;;

+                       -*mint | -*MiNT)
+                               vendor=atari
+                               ;;

                esac
                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                ;;
                esac
                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                ;;