New config.guess and config.sub

diff --git a/config/config.guess b/config/config.guess
index 193e328202ab22ee8f3f3c7652f80d2231f97fff..7d0185e019ed6b83bca92431ff478d7e19b0037e 100755 (executable)
--- a/config/config.guess
+++ b/config/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2003-10-16'
+timestamp='2004-09-07'
 
 # 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
@@ -53,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -197,15 +197,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
    echo "${machine}-${os}${release}"
    exit 0 ;;
+    amd64:OpenBSD:*:*)
+   echo x86_64-unknown-openbsd${UNAME_RELEASE}
+   exit 0 ;;
     amiga:OpenBSD:*:*)
    echo m68k-unknown-openbsd${UNAME_RELEASE}
    exit 0 ;;
-    arc:OpenBSD:*:*)
-   echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    cats:OpenBSD:*:*)
+   echo arm-unknown-openbsd${UNAME_RELEASE}
    exit 0 ;;
     hp300:OpenBSD:*:*)
    echo m68k-unknown-openbsd${UNAME_RELEASE}
    exit 0 ;;
+    luna88k:OpenBSD:*:*)
+       echo m88k-unknown-openbsd${UNAME_RELEASE}
+   exit 0 ;;
     mac68k:OpenBSD:*:*)
    echo m68k-unknown-openbsd${UNAME_RELEASE}
    exit 0 ;;
@@ -221,28 +227,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
    echo powerpc-unknown-openbsd${UNAME_RELEASE}
    exit 0 ;;
-    pegasos:OpenBSD:*:*)
-   echo powerpc-unknown-openbsd${UNAME_RELEASE}
-   exit 0 ;;
-    pmax:OpenBSD:*:*)
-   echo mipsel-unknown-openbsd${UNAME_RELEASE}
-   exit 0 ;;
     sgi:OpenBSD:*:*)
-   echo mipseb-unknown-openbsd${UNAME_RELEASE}
+   echo mips64-unknown-openbsd${UNAME_RELEASE}
    exit 0 ;;
     sun3:OpenBSD:*:*)
    echo m68k-unknown-openbsd${UNAME_RELEASE}
    exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-   echo mipsel-unknown-openbsd${UNAME_RELEASE}
-   exit 0 ;;
     *:OpenBSD:*:*)
    echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
    exit 0 ;;
+    *:ekkoBSD:*:*)
+   echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+   exit 0 ;;
+    macppc:MirBSD:*:*)
+   echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+   exit 0 ;;
+    *:MirBSD:*:*)
+   echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+   exit 0 ;;
     alpha:OSF1:*:*)
-   if test $UNAME_RELEASE = "V4.0"; then
+   case $UNAME_RELEASE in
+   *4.0)
        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-   fi
+       ;;
+   *5.*)
+           UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+       ;;
+   esac
    # According to Compaq, /usr/sbin/psrinfo has been available on
    # OSF/1 and Tru64 systems produced since 1995.  I hope that
    # covers most systems running today.  This code pipes the CPU
@@ -280,14 +291,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        "EV7.9 (21364A)")
        UNAME_MACHINE="alphaev79" ;;
    esac
+   # A Pn.n version is a patched version.
    # A Vn.n version is a released version.
    # A Tn.n version is a released field test version.
    # A Xn.n version is an unreleased experimental baselevel.
    # 1.2 uses "1.2" for uname -r.
-   echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-   exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-   echo alpha-hp-vms
+   echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    exit 0 ;;
     Alpha\ *:Windows_NT*:*)
    # How do we know it's Interix rather than the generic POSIX subsystem?
@@ -405,6 +414,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+   echo m68k-apple-machten${UNAME_RELEASE}
+   exit 0 ;;
     powerpc:machten:*:*)
    echo powerpc-apple-machten${UNAME_RELEASE}
    exit 0 ;;
@@ -740,7 +752,7 @@ EOF
    echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    exit 0 ;;
     *:UNICOS/mp:*:*)
-   echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+   echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
    FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -763,21 +775,7 @@ EOF
    echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
    exit 0 ;;
     *:FreeBSD:*:*)
-   # Determine whether the default compiler uses glibc.
-   eval $set_cc_for_build
-   sed 's/^    //' << EOF >$dummy.c
-   #include 
-   #if __GLIBC__ >= 2
-   LIBC=gnu
-   #else
-   LIBC=
-   #endif
-EOF
-   eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-   # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-   # FreeBSD's kernel, but not the complete OS.
-   case ${LIBC} in gnu) kernel_only='k' ;; esac
-   echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+   echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    exit 0 ;;
     i*:CYGWIN*:*)
    echo ${UNAME_MACHINE}-pc-cygwin
@@ -826,9 +824,18 @@ EOF
     cris:Linux:*:*)
    echo cris-axis-linux-gnu
    exit 0 ;;
+    crisv32:Linux:*:*)
+   echo crisv32-axis-linux-gnu
+   exit 0 ;;
+    frv:Linux:*:*)
+       echo frv-unknown-linux-gnu
+   exit 0 ;;
     ia64:Linux:*:*)
    echo ${UNAME_MACHINE}-unknown-linux-gnu
    exit 0 ;;
+    m32r*:Linux:*:*)
+   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   exit 0 ;;
     m68*:Linux:*:*)
    echo ${UNAME_MACHINE}-unknown-linux-gnu
    exit 0 ;;
@@ -997,6 +1004,9 @@ EOF
     i*86:atheos:*:*)
    echo ${UNAME_MACHINE}-unknown-atheos
    exit 0 ;;
+   i*86:syllable:*:*)
+   echo ${UNAME_MACHINE}-pc-syllable
+   exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
    echo i386-unknown-lynxos${UNAME_RELEASE}
    exit 0 ;;
@@ -1066,9 +1076,9 @@ EOF
     M680?0:D-NIX:5.3:*)
    echo m68k-diab-dnix
    exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    M68*:*:R3V[5678]*:*)
    test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
    OS_REL=''
    test -r /etc/.relid \
    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1166,9 +1176,10 @@ EOF
    echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
    exit 0 ;;
     *:Darwin:*:*)
-   case `uname -p` in
+   UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+   case $UNAME_PROCESSOR in
        *86) UNAME_PROCESSOR=i686 ;;
-       powerpc) UNAME_PROCESSOR=powerpc ;;
+       unknown) UNAME_PROCESSOR=powerpc ;;
    esac
    echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
    exit 0 ;;
@@ -1183,7 +1194,7 @@ EOF
     *:QNX:*:4*)
    echo i386-pc-qnx
    exit 0 ;;
-    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
    echo nsr-tandem-nsk${UNAME_RELEASE}
    exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1227,6 +1238,16 @@ EOF
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
    exit 0 ;;
+    *:DragonFly:*:*)
+   echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+   exit 0 ;;
+    *:*VMS:*:*)
+       UNAME_MACHINE=`(uname -p) 2>/dev/null`
+   case "${UNAME_MACHINE}" in
+       A*) echo alpha-dec-vms && exit 0 ;;
+       I*) echo ia64-dec-vms && exit 0 ;;
+       V*) echo vax-dec-vms && exit 0 ;;
+   esac
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

diff --git a/config/config.sub b/config/config.sub
index e1e455b776e002a285f2b509eebacce95be1c15d..edb6b663ca2b30ff0dd886e09137ebb59b6e4568 100755 (executable)
--- a/config/config.sub
+++ b/config/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2003-11-03'
+timestamp='2004-08-29'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@ Report bugs and patches to ."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -145,7 +145,7 @@ case $os in
    -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
    -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
    -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-   -apple | -axis)
+   -apple | -axis | -knuth | -cray)
        os=
        basic_machine=$1
        ;;
@@ -237,7 +237,7 @@ case $basic_machine in
    | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
    | i370 | i860 | i960 | ia64 \
    | ip2k | iq2000 \
-   | m32r | m68000 | m68k | m88k | mcore \
+   | m32r | m32rle | m68000 | m68k | m88k | mcore \
    | mips | mipsbe | mipseb | mipsel | mipsle \
    | mips16 \
    | mips64 | mips64el \
@@ -262,7 +262,7 @@ case $basic_machine in
    | pyramid \
    | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
    | sh64 | sh64le \
-   | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+   | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
    | strongarm \
    | tahoe | thumb | tic4x | tic80 | tron \
    | v850 | v850e \
@@ -300,7 +300,7 @@ case $basic_machine in
    | avr-* \
    | bs2000-* \
    | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-   | clipper-* | cydra-* \
+   | clipper-* | craynv-* | cydra-* \
    | d10v-* | d30v-* | dlx-* \
    | elxsi-* \
    | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -308,7 +308,7 @@ case $basic_machine in
    | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
    | i*86-* | i860-* | i960-* | ia64-* \
    | ip2k-* | iq2000-* \
-   | m32r-* \
+   | m32r-* | m32rle-* \
    | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
    | m88110-* | m88k-* | mcore-* \
    | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -326,8 +326,9 @@ case $basic_machine in
    | mipsisa64sb1-* | mipsisa64sb1el-* \
    | mipsisa64sr71k-* | mipsisa64sr71kel-* \
    | mipstx39-* | mipstx39el-* \
+   | mmix-* \
    | msp430-* \
-   | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+   | none-* | np1-* | ns16k-* | ns32k-* \
    | orion-* \
    | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -336,7 +337,7 @@ case $basic_machine in
    | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
    | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
    | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-   | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+   | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
    | tahoe-* | thumb-* \
    | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
    | tron-* \
@@ -363,6 +364,9 @@ case $basic_machine in
        basic_machine=a29k-amd
        os=-udi
        ;;
+       abacus)
+       basic_machine=abacus-unknown
+       ;;
    adobe68k)
        basic_machine=m68010-adobe
        os=-scout
@@ -380,6 +384,9 @@ case $basic_machine in
    amd64)
        basic_machine=x86_64-pc
        ;;
+   amd64-*)
+       basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+       ;;
    amdahl)
        basic_machine=580-amdahl
        os=-sysv
@@ -439,12 +446,27 @@ case $basic_machine in
        basic_machine=j90-cray
        os=-unicos
        ;;
+   craynv)
+       basic_machine=craynv-cray
+       os=-unicosmp
+       ;;
+   cr16c)
+       basic_machine=cr16c-unknown
+       os=-elf
+       ;;
    crds | unos)
        basic_machine=m68k-crds
        ;;
+   crisv32 | crisv32-* | etraxfs*)
+       basic_machine=crisv32-axis
+       ;;
    cris | cris-* | etrax*)
        basic_machine=cris-axis
        ;;
+   crx)
+       basic_machine=crx-unknown
+       os=-elf
+       ;;
    da30 | da30-*)
        basic_machine=m68k-da30
        ;;
@@ -645,10 +667,6 @@ case $basic_machine in
    mips3*)
        basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
        ;;
-   mmix*)
-       basic_machine=mmix-knuth
-       os=-mmixware
-       ;;
    monitor)
        basic_machine=m68k-rom68k
        os=-coff
@@ -729,10 +747,6 @@ case $basic_machine in
    np1)
        basic_machine=np1-gould
        ;;
-   nv1)
-       basic_machine=nv1-cray
-       os=-unicosmp
-       ;;
    nsr-tandem)
        basic_machine=nsr-tandem
        ;;
@@ -1045,6 +1059,9 @@ case $basic_machine in
    romp)
        basic_machine=romp-ibm
        ;;
+   mmix)
+       basic_machine=mmix-knuth
+       ;;
    rs6000)
        basic_machine=rs6000-ibm
        ;;
@@ -1067,7 +1084,7 @@ case $basic_machine in
    sh64)
        basic_machine=sh64-unknown
        ;;
-   sparc | sparcv9 | sparcv9b)
+   sparc | sparcv8 | sparcv9 | sparcv9b)
        basic_machine=sparc-sun
        ;;
    cydra)
@@ -1140,8 +1157,9 @@ case $os in
          | -aos* \
          | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
          | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-         | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-         | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+         | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+         | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+         | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
          | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
          | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
          | -chorusos* | -chorusrdb* \
@@ -1152,7 +1170,7 @@ case $os in
          | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
          | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
          | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-         | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+         | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
    # Remember, each alternative MUST END IN *, to match a version number.
        ;;
    -qnx*)
@@ -1215,6 +1233,9 @@ case $os in
    -atheos*)
        os=-atheos
        ;;
+   -syllable*)
+       os=-syllable
+       ;;
    -386bsd)
        os=-bsd
        ;;
@@ -1356,6 +1377,9 @@ case $basic_machine in
    *-ibm)
        os=-aix
        ;;
+       *-knuth)
+       os=-mmixware
+       ;;
    *-wec)
        os=-proelf
        ;;