Changeset 2721

Timestamp:

2001-08-30T16:54:45+12:00 (23 years ago)

Author:

jrm21

Message:

Updated to newer versions (eg for some alpha machines)

Location:

trunk/gsdl

Files:

• config.guess (modified) (40 diffs)
• config.sub (modified) (39 diffs)

trunk/gsdl/config.guess

@@ -1 +1 @@
 #! /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
@@ -24 +25 @@
 # 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 the Autoconf mailing list <[email protected]>.
 #
 # This script attempts to guess a canonical system name similar to
@@ -36 +38 @@
 #
 
+# 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.
 # ([email protected] 8/24/94.)
@@ -47 +63 @@
 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.
@@ -60 +77 @@
     # 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
@@ -77 +94 @@
     .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
+        ./$dummy
         case "$?" in
             7)
@@ -98 +115 @@
         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)
@@ -143 +166 @@
     echo hppa1.1-hitachi-hiuxmpp
     exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
+    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
@@ -151 +174 @@
     fi
     exit 0 ;;
-    NILE:*:*:dcosx)
+    NILE*:*:*:dcosx)
     echo pyramid-pyramid-svr4
     exit 0 ;;
@@ -202 +225 @@
     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}
@@ -235 +284 @@
     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)
@@ -255 +308 @@
     }
 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 ;;
@@ -310 +363 @@
     *: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>
 
@@ -321 +374 @@
             }
 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
@@ -369 +422 @@
         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;
@@ -395 +448 @@
               #else  /* !defined(_SC_KERNEL_BITS) */
                     puts ("hppa2.0"); break;
-              #endif 
+              #endif
                 default: puts ("hppa1.0"); break;
                 }
@@ -401 +454 @@
               }
 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]*//'`
@@ -408 +461 @@
     exit 0 ;;
     3050*:HI-UX:*:*)
-    sed 's/^    //' << EOF >dummy.c
+    sed 's/^    //' << EOF >$dummy.c
     #include <unistd.h>
     int
@@ -433 +486 @@
     }
 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 ;;
@@ -442 +495 @@
     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:*:* )
@@ -459 +515 @@
     echo hppa1.1-hp-lites
     exit 0 ;;
+    hppa*:OpenBSD:*:*)
+    echo hppa-unknown-openbsd
+    exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
     echo c1-convex-bsd
@@ -491 +550 @@
     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}"
@@ -508 +570 @@
     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 ;;
@@ -528 +599 @@
     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*:*)
@@ -542 +622 @@
     # filter it out.
     case "$UNAME_MACHINE" in
+      armv*)              UNAME_MACHINE=$UNAME_MACHINE ;;
       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
@@ -555 +637 @@
                     p'`
         case "$ld_supported_emulations" in
+      *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 ;;
@@ -560 +643 @@
       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 ;;
+      elf32ppc | elf32ppclinux)
+        # 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
+        sed 's/^    //'  <<EOF >$dummy.s
         .globl main
         .ent main
@@ -582 +694 @@
 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
+            ./$dummy
             case "$?" in
             7)
@@ -601 +713 @@
                 UNAME_MACHINE="alphaev6"
                 ;;
-            esac    
-
-            objdump --private-headers dummy | \
+            esac
+
+            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]);
@@ -626 +739 @@
 }
 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)
@@ -646 +759 @@
       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__
@@ -668 +782 @@
 }
 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
@@ -690 +804 @@
         echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
     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
+    (/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:*)
@@ -700 +822 @@
         (/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:*:*:*)
@@ -753 +872 @@
     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 ;;
@@ -764 +883 @@
     SM[BE]S:UNIX_SV:*:*)
     echo mips-dde-sysv${UNAME_RELEASE}
+    exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+    echo mips-sni-sysv4
     exit 0 ;;
     RM*:SINIX-*:*:*)
@@ -795 +917 @@
     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}
@@ -802 +924 @@
     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}
+    echo powerpc-apple-rhapsody${UNAME_RELEASE}
     exit 0 ;;
     *:Rhapsody:*:*)
     echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
     exit 0 ;;
-    *:Darwin:*:* | *:"Mac OS":*:*)
-    echo `uname -p`-apple-darwin${UNAME_RELEASE}
-    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 ;;
 esac
 
@@ -825 +950 @@
 #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>
@@ -926 +1051 @@
 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.

trunk/gsdl/config.sub

@@ -1 +1 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -99 +99 @@
         basic_machine=$1
         ;;
+    -sim | -cisco | -oki | -wec | -winbond)
+        os=
+        basic_machine=$1
+        ;;
+    -scout)
+        ;;
+    -wrs)
+        os=vxworks
+        basic_machine=$1
+        ;;
     -hiux*)
         os=-hiuxwe2
         ;;
     -sco5)
-        os=sco3.2v5
+        os=-sco3.2v5
         basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
         ;;
@@ -120 +130 @@
     -sco*)
         os=-sco3.2v2
+        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+        ;;
+    -udk*)
         basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
         ;;
@@ -150 +163 @@
     # 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 \
+    tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
         | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-        | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
-        | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-        | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-        | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-        | mipstx39 | mipstx39el \
-        | sparc | sparclet | sparclite | sparc64 | v850)
+        | 580 | i960 | h8300 \
+        | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+        | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+        | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+        | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+        | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+        | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+        | mips64vr5000 | miprs64vr5000el | mcore \
+        | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+        | thumb | 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
@@ -172 +192 @@
         ;;
     # Recognize the basic CPU types with company name.
-    vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+    # FIXME: clean up the formatting here.
+    vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
           | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
           | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-          | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-          | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
-          | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-          | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+          | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+          | xmp-* | ymp-* \
+          | 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-* \
-          | sparc64-* | mips64-* | mipsel-* \
-          | mips64el-* | mips64orion-* | mips64orionel-*  \
-          | mipstx39-* | mipstx39el-* \
-          | f301-*)
+          | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+          | mips64el-* | mips64orion-* | mips64orionel-* \
+          | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+          | mipstx39-* | mipstx39el-* | mcore-* \
+          | 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.
+    386bsd)
+        basic_machine=i386-unknown
+        os=-bsd
+        ;;
     3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
         basic_machine=m68000-att
@@ -192 +222 @@
     3b*)
         basic_machine=we32k-att
+        ;;
+    a29khif)
+        basic_machine=a29k-amd
+        os=-udi
+        ;;
+    adobe68k)
+        basic_machine=m68010-adobe
+        os=-scout
         ;;
     alliant | fx80)
@@ -222 +260 @@
         os=-sysv
         ;;
+    apollo68bsd)
+        basic_machine=m68k-apollo
+        os=-bsd
+        ;;
     aux)
         basic_machine=m68k-apple
@@ -298 +340 @@
         basic_machine=ns32k-encore
         ;;
+    es1800 | OSE68k | ose68k | ose | OSE)
+        basic_machine=m68k-ericsson
+        os=-ose
+        ;;
     fx2800)
         basic_machine=i860-alliant
@@ -316 +362 @@
         os=-hms
         ;;
+    h8300xray)
+        basic_machine=h8300-hitachi
+        os=-xray
+        ;;
+    h8500hms)
+        basic_machine=h8500-hitachi
+        os=-hms
+        ;;
     harris)
         basic_machine=m88k-harris
@@ -331 +385 @@
         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
@@ -337 +394 @@
         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
         ;;
@@ -345 +416 @@
     hppa-next)
         os=-nextstep3
+        ;;
+    hppaosf)
+        basic_machine=hppa1.1-hp
+        os=-osf
+        ;;
+    hppro)
+        basic_machine=hppa1.1-hp
+        os=-proelf
         ;;
     i370-ibm* | ibm*)
@@ -366 +445 @@
         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
+        ;;
+    i386-go32 | go32)
+        basic_machine=i386-unknown
+        os=-go32
+        ;;
+    i386-mingw32 | mingw32)
+        basic_machine=i386-unknown
+        os=-mingw32
         ;;
     iris | iris4d)
@@ -395 +490 @@
         basic_machine=m68000-convergent
         ;;
+    *mint | *MiNT)
+        basic_machine=m68k-atari
+        os=-mint
+        ;;
     mipsel*-linux*)
         basic_machine=mipsel-unknown
@@ -409 +508 @@
         basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
         ;;
+    monitor)
+        basic_machine=m68k-rom68k
+        os=-coff
+        ;;
+    msdos)
+        basic_machine=i386-unknown
+        os=-msdos
+        ;;
     ncr3000)
         basic_machine=i486-ncr
         os=-sysv4
         ;;
+    netbsd386)
+        basic_machine=i386-unknown
+        os=-netbsd
+        ;;
+    netwinder)
+        basic_machine=armv4l-corel
+        os=-linux
+        ;;
     news | news700 | news800 | news900)
         basic_machine=m68k-sony
@@ -424 +539 @@
         basic_machine=mips-sony
         os=-newsos
+        ;;
+    necv70)
+        basic_machine=v70-nec
+        os=-sysv
         ;;
     next | m*-next )
@@ -450 +569 @@
         os=-nindy
         ;;
+    mon960)
+        basic_machine=i960-intel
+        os=-mon960
+        ;;
     np1)
         basic_machine=np1-gould
+        ;;
+    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)
@@ -470 +605 @@
         basic_machine=ns32k-pc532
         ;;
-    pentium | p5 | k5 | nexen)
+    pentium | p5 | k5 | k6 | nexen)
         basic_machine=i586-pc
         ;;
-    pentiumpro | p6 | k6 | 6x86)
+    pentiumpro | p6 | 6x86)
         basic_machine=i686-pc
         ;;
@@ -479 +614 @@
         basic_machine=i786-pc
         ;;
-    pentium-* | p5-* | k5-* | nexen-*)
+    pentium-* | p5-* | k5-* | k6-* | nexen-*)
         basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
         ;;
-    pentiumpro-* | p6-* | k6-* | 6x86-*)
+    pentiumpro-* | p6-* | 6x86-*)
         basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
         ;;
@@ -506 +641 @@
         basic_machine=i386-ibm
         ;;
+    rom68k)
+        basic_machine=m68k-rom68k
+        os=-coff
+        ;;
     rm[46]00)
         basic_machine=mips-siemens
@@ -511 +650 @@
     rtpc | rtpc-*)
         basic_machine=romp-ibm
+        ;;
+    sa29200)
+        basic_machine=a29k-amd
+        os=-udi
         ;;
     sequent)
@@ -519 +662 @@
         os=-hms
         ;;
+    sparclite-wrs)
+        basic_machine=sparclite-wrs
+        os=-vxworks
+        ;;
     sps7)
         basic_machine=m68k-bull
@@ -526 +673 @@
         basic_machine=spur-unknown
         ;;
+    st2000)
+        basic_machine=m68k-tandem
+        ;;
+    stratus)
+        basic_machine=i860-stratus
+        os=-sysv4
+        ;;
     sun2)
         basic_machine=m68000-sun
@@ -570 +724 @@
         os=-dynix
         ;;
+    t3e)
+        basic_machine=t3e-cray
+        os=-unicos
+        ;;
     tx39)
         basic_machine=mipstx39-unknown
@@ -586 +744 @@
         basic_machine=a29k-nyu
         os=-sym1
+        ;;
+    v810 | necv810)
+        basic_machine=v810-nec
+        os=-none
         ;;
     vaxv)
@@ -610 +772 @@
         os=-vxworks
         ;;
+    w65*)
+        basic_machine=w65-wdc
+        os=-none
+        ;;
+    w89k-*)
+        basic_machine=hppa1.1-winbond
+        os=-proelf
+        ;;
     xmp)
         basic_machine=xmp-cray
@@ -617 +787 @@
         basic_machine=xps100-honeywell
         ;;
+    z8k-*-coff)
+        basic_machine=z8k-unknown
+        os=-sim
+        ;;
     none)
         basic_machine=none-none
@@ -624 +798 @@
 # 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)
         if [ x$os = x-linux-gnu ]; then
@@ -646 +829 @@
         basic_machine=we32k-att
         ;;
-    sparc)
+    sparc | sparcv9)
         basic_machine=sparc-sun
         ;;
@@ -657 +840 @@
     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
         ;;
     *)
@@ -711 +904 @@
           | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
           | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-          | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+          | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
           | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
           | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
           | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-          | -mingw32* | -linux-gnu* | -uxpv* | -openstep* | -rhapsody* | -darwin* | -beos*)
+          | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+          | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
     # Remember, each alternative MUST END IN *, to match a version number.
+        ;;
+    -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+          | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+          | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+        ;;
+    -mac*)
+        os=`echo $os | sed -e 's|mac|macos|'`
         ;;
     -linux*)
@@ -741 +942 @@
     -acis*)
         os=-aos
+        ;;
+    -386bsd)
+        os=-bsd
         ;;
     -ctix* | -uts*)
@@ -773 +977 @@
     -sysv*)
         ;;
+    -ose*)
+        os=-ose
+        ;;
+    -es1800*)
+        os=-ose
+        ;;
     -xenix)
         os=-xenix
+        ;;
+        -*mint | -*MiNT)
+            os=-mint
         ;;
     -none)
@@ -801 +1014 @@
         os=-riscix1.2
         ;;
+    arm*-corel)
+        os=-linux
+        ;;
     arm*-semi)
         os=-aout
@@ -822 +1038 @@
         # 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
@@ -834 +1059 @@
         os=-aix
         ;;
+    *-wec)
+        os=-proelf
+        ;;
+    *-winbond)
+        os=-proelf
+        ;;
+    *-oki)
+        os=-proelf
+        ;;
     *-hp)
         os=-hpux
@@ -896 +1130 @@
     f301-fujitsu)
         os=-uxpv
+        ;;
+    *-rom68k)
+        os=-coff
+        ;;
+    *-*bug)
+        os=-coff
+        ;;
+    *-apple)
+        os=-macos
+        ;;
+    *-atari*)
+        os=-mint
         ;;
     *)
@@ -918 +1164 @@
                 vendor=ibm
                 ;;
+            -beos*)
+                vendor=be
+                ;;
             -hpux*)
                 vendor=hp
                 ;;
+            -mpeix*)
+                vendor=hp
+                ;;
             -hiux*)
                 vendor=hitachi
@@ -948 +1200 @@
                 vendor=apple
                 ;;
+            -hms*)
+                vendor=hitachi
+                ;;
+            -mpw* | -macos*)
+                vendor=apple
+                ;;
+            -*mint | -*MiNT)
+                vendor=atari
+                ;;
         esac
         basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`