3 files changed, 316 insertions, 152 deletions

diff --git a/config.guess b/config.guess
index 6d71f752f..e3a2116a7 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2005-05-27'
+timestamp='2009-06-10'
 
 # 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
@@ -55,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -106,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -125,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
         ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
             arm*) machine=arm-unknown ;;
             sh3el) machine=shl-unknown ;;
             sh3eb) machine=sh-unknown ;;
+            sh5el) machine=sh5le-unknown ;;
             *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
         esac
         # The Operating System including object format, if it has switched
@@ -168,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
             arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                 eval $set_cc_for_build
                 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                        | grep __ELF__ >/dev/null
+                        | grep -q __ELF__
                 then
                     # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
                     # Return netbsd for either.  FIX?
@@ -199,50 +201,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
         echo "${machine}-${os}${release}"
         exit ;;
-    amd64:OpenBSD:*:*)
-        echo x86_64-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    amiga:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    cats:OpenBSD:*:*)
-        echo arm-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    hp300:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    luna88k:OpenBSD:*:*)
-        echo m88k-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    mac68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    macppc:OpenBSD:*:*)
-        echo powerpc-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    mvme68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    mvme88k:OpenBSD:*:*)
-        echo m88k-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    mvmeppc:OpenBSD:*:*)
-        echo powerpc-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    sgi:OpenBSD:*:*)
-        echo mips64-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    sun3:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
     *:OpenBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
         exit ;;
     *:ekkoBSD:*:*)
         echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
         exit ;;
+    *:SolidBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+        exit ;;
     macppc:MirBSD:*:*)
-        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
         exit ;;
     *:MirBSD:*:*)
         echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -354,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         case `/usr/bin/uname -p` in
             sparc) echo sparc-icl-nx7; exit ;;
         esac ;;
+    s390x:SunOS:*:*)
+        echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        exit ;;
     sun4H:SunOS:5.*:*)
         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit ;;
-    i86pc:SunOS:5.*:*)
-        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+        eval $set_cc_for_build
+        SUN_ARCH="i386"
+        # If there is a compiler, see if it is configured for 64-bit objects.
+        # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+        # This test works for both compilers.
+        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+            if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                grep IS_64BIT_ARCH >/dev/null
+            then
+                SUN_ARCH="x86_64"
+            fi
+        fi
+        echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit ;;
     sun4*:SunOS:6*:*)
         # According to config.sub, this is the proper way to canonicalize
@@ -562,7 +548,7 @@ EOF
                 echo rs6000-ibm-aix3.2
         fi
         exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                 IBM_ARCH=rs6000
@@ -658,8 +644,7 @@ EOF
         esac
         if [ ${HP_ARCH} = "hppa2.0w" ]
         then
-            # avoid double evaluation of $set_cc_for_build
-            test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+            eval $set_cc_for_build
 
             # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
             # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -671,7 +656,7 @@ EOF
             # => hppa64-hp-hpux11.23
 
             if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-                grep __LP64__ >/dev/null
+                grep -q __LP64__
             then
                 HP_ARCH="hppa2.0w"
             else
@@ -800,12 +785,19 @@ EOF
         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
         exit ;;
     *:FreeBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        case ${UNAME_MACHINE} in
+            pc98)
+                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            amd64)
+                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            *)
+                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        esac
         exit ;;
     i*:CYGWIN*:*)
         echo ${UNAME_MACHINE}-pc-cygwin
         exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
         exit ;;
     i*:windows32*:*)
@@ -815,12 +807,24 @@ EOF
     i*:PW*:*)
         echo ${UNAME_MACHINE}-pc-pw32
         exit ;;
-    x86:Interix*:[34]*)
-        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-        exit ;;
+    *:Interix*:[3456]*)
+        case ${UNAME_MACHINE} in
+            x86)
+                echo i586-pc-interix${UNAME_RELEASE}
+                exit ;;
+            EM64T | authenticamd | genuineintel)
+                echo x86_64-unknown-interix${UNAME_RELEASE}
+                exit ;;
+            IA64)
+                echo ia64-unknown-interix${UNAME_RELEASE}
+                exit ;;
+        esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
         echo i${UNAME_MACHINE}-pc-mks
         exit ;;
+    8664:Windows_NT:*)
+        echo x86_64-pc-mks
+        exit ;;
     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
@@ -830,7 +834,7 @@ EOF
     i*:UWIN*:*)
         echo ${UNAME_MACHINE}-pc-uwin
         exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
         echo x86_64-unknown-cygwin
         exit ;;
     p*:CYGWIN*:*)
@@ -851,6 +855,16 @@ EOF
         echo ${UNAME_MACHINE}-pc-minix
         exit ;;
     arm*:Linux:*:*)
+        eval $set_cc_for_build
+        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+            | grep -q __ARM_EABI__
+        then
+            echo ${UNAME_MACHINE}-unknown-linux-gnu
+        else
+            echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+        fi
+        exit ;;
+    avr32*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
     cris:Linux:*:*)
@@ -871,44 +885,32 @@ EOF
     m68*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
         eval $set_cc_for_build
         sed 's/^        //' << EOF >$dummy.c
         #undef CPU
-        #undef mips
-        #undef mipsel
+        #undef ${UNAME_MACHINE}
+        #undef ${UNAME_MACHINE}el
         #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-        CPU=mipsel
+        CPU=${UNAME_MACHINE}el
         #else
         #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-        CPU=mips
+        CPU=${UNAME_MACHINE}
         #else
         CPU=
         #endif
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-        ;;
-    mips64:Linux:*:*)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #undef CPU
-        #undef mips64
-        #undef mips64el
-        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-        CPU=mips64el
-        #else
-        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-        CPU=mips64
-        #else
-        CPU=
-        #endif
-        #endif
-EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^CPU/{
+                s: ::g
+                p
+            }'`"
         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
         ;;
+    or32:Linux:*:*)
+        echo or32-unknown-linux-gnu
+        exit ;;
     ppc:Linux:*:*)
         echo powerpc-unknown-linux-gnu
         exit ;;
@@ -925,10 +927,13 @@ EOF
           EV67)  UNAME_MACHINE=alphaev67 ;;
           EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+        objdump --private-headers /bin/sh | grep -q ld.so.1
         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
         exit ;;
+    padre:Linux:*:*)
+        echo sparc-unknown-linux-gnu
+        exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level
         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -952,9 +957,15 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
+    vax:Linux:*:*)
+        echo ${UNAME_MACHINE}-dec-linux-gnu
+        exit ;;
     x86_64:Linux:*:*)
         echo x86_64-unknown-linux-gnu
         exit ;;
+    xtensa*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
     i*86:Linux:*:*)
         # The BFD linker knows what the default object file format is, so
         # first see if it will tell us. cd to the root directory to prevent
@@ -970,17 +981,6 @@ EOF
           elf32-i386)
                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                 ;;
-          a.out-i386-linux)
-                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit ;;
-          coff-i386)
-                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-                exit ;;
-          "")
-                # Either a pre-BFD a.out linker (linux-gnuoldld) or
-                # one that does not give us useful --help.
-                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-                exit ;;
         esac
         # Determine whether the default compiler is a.out or elf
         eval $set_cc_for_build
@@ -997,7 +997,7 @@ EOF
         LIBC=gnulibc1
         # endif
         #else
-        #ifdef __INTEL_COMPILER
+        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
         LIBC=gnu
         #else
         LIBC=gnuaout
@@ -1007,7 +1007,11 @@ EOF
         LIBC=dietlibc
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^LIBC/{
+                s: ::g
+                p
+            }'`"
         test x"${LIBC}" != x && {
                 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
                 exit
@@ -1042,7 +1046,7 @@ EOF
     i*86:syllable:*:*)
         echo ${UNAME_MACHINE}-pc-syllable
         exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
         echo i386-unknown-lynxos${UNAME_RELEASE}
         exit ;;
     i*86:*DOS:*:*)
@@ -1086,8 +1090,11 @@ EOF
     pc:*:*:*)
         # Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-        echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+        # Note: whatever this is, it MUST be the same as what config.sub
+        # prints for the "djgpp" host, or else GDB configury will decide that
+        # this is a cross-build.
+        echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
         echo i386-pc-mach3
@@ -1125,6 +1132,16 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+        OS_REL='.3'
+        test -r /etc/.relid \
+            && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+            && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+            && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+        /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+            && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
         echo m68k-unknown-lynxos${UNAME_RELEASE}
         exit ;;
@@ -1137,7 +1154,7 @@ EOF
     rs6000:LynxOS:2.*:*)
         echo rs6000-unknown-lynxos${UNAME_RELEASE}
         exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
         echo powerpc-unknown-lynxos${UNAME_RELEASE}
         exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1200,6 +1217,9 @@ EOF
     BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
         echo i586-pc-beos
         exit ;;
+    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
+        echo i586-pc-haiku
+        exit ;;
     SX-4:SUPER-UX:*:*)
         echo sx4-nec-superux${UNAME_RELEASE}
         exit ;;
@@ -1209,6 +1229,15 @@ EOF
     SX-6:SUPER-UX:*:*)
         echo sx6-nec-superux${UNAME_RELEASE}
         exit ;;
+    SX-7:SUPER-UX:*:*)
+        echo sx7-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-8:SUPER-UX:*:*)
+        echo sx8-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-8R:SUPER-UX:*:*)
+        echo sx8r-nec-superux${UNAME_RELEASE}
+        exit ;;
     Power*:Rhapsody:*:*)
         echo powerpc-apple-rhapsody${UNAME_RELEASE}
         exit ;;
@@ -1218,7 +1247,6 @@ EOF
     *:Darwin:*:*)
         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
         case $UNAME_PROCESSOR in
-            *86) UNAME_PROCESSOR=i686 ;;
             unknown) UNAME_PROCESSOR=powerpc ;;
         esac
         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1297,6 +1325,12 @@ EOF
     i*86:skyos:*:*)
         echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
         exit ;;
+    i*86:rdos:*:*)
+        echo ${UNAME_MACHINE}-pc-rdos
+        exit ;;
+    i*86:AROS:*:*)
+        echo ${UNAME_MACHINE}-pc-aros
+        exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1457,9 +1491,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config.sub b/config.sub
index 519f2cd00..eb0389a69 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2005-05-12'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -71,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -119,8 +120,10 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -150,6 +153,9 @@ case $os in
                 os=
                 basic_machine=$1
                 ;;
+        -bluegene*)
+                os=-cnk
+                ;;
         -sim | -cisco | -oki | -wec | -winbond)
                 os=
                 basic_machine=$1
@@ -171,6 +177,10 @@ case $os in
         -hiux*)
                 os=-hiuxwe2
                 ;;
+        -sco6)
+                os=-sco5v6
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -sco5)
                 os=-sco3.2v5
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +197,10 @@ case $os in
                 # Don't forget version if it is 3.2v4 or newer.
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
+        -sco5v6*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -sco*)
                 os=-sco3.2v2
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,23 +245,28 @@ case $basic_machine in
         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
         | am33_2.0 \
-        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
         | bfin \
         | c4x | clipper \
         | d10v | d30v | dlx | dsp16xx \
-        | fr30 | frv \
+        | fido | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | i370 | i860 | i960 | ia64 \
         | ip2k | iq2000 \
-        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+        | lm32 \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | mcore | mep | metag \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
         | mips64 | mips64el \
-        | mips64vr | mips64vrel \
+        | mips64octeon | mips64octeonel \
         | mips64orion | mips64orionel \
+        | mips64r5900 | mips64r5900el \
+        | mips64vr | mips64vrel \
         | mips64vr4100 | mips64vr4100el \
         | mips64vr4300 | mips64vr4300el \
         | mips64vr5000 | mips64vr5000el \
+        | mips64vr5900 | mips64vr5900el \
         | mipsisa32 | mipsisa32el \
         | mipsisa32r2 | mipsisa32r2el \
         | mipsisa64 | mipsisa64el \
@@ -256,22 +275,26 @@ case $basic_machine in
         | mipsisa64sr71k | mipsisa64sr71kel \
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
+        | moxie \
+        | mt \
         | msp430 \
+        | nios | nios2 \
         | ns16k | ns32k \
-        | openrisc | or32 \
+        | or32 \
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
-        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+        | score \
+        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
-        | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b \
-        | strongarm \
+        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+        | spu | strongarm \
         | tahoe | thumb | tic4x | tic80 | tron \
         | v850 | v850e \
         | we32k \
-        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-        | z8k)
+        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+        | z8k | z80)
                 basic_machine=$basic_machine-unknown
                 ;;
         m6811 | m68hc11 | m6812 | m68hc12)
@@ -281,6 +304,9 @@ case $basic_machine in
                 ;;
         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                 ;;
+        ms1)
+                basic_machine=mt-unknown
+                ;;
 
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
@@ -300,28 +326,32 @@ case $basic_machine in
         | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* \
+        | avr-* | avr32-* \
         | bfin-* | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
         | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
-        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
         | h8300-* | h8500-* \
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
         | i*86-* | i860-* | i960-* | ia64-* \
         | ip2k-* | iq2000-* \
-        | m32r-* | m32rle-* \
+        | lm32-* \
+        | m32c-* | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
-        | mips64vr-* | mips64vrel-* \
+        | mips64octeon-* | mips64octeonel-* \
         | mips64orion-* | mips64orionel-* \
+        | mips64r5900-* | mips64r5900el-* \
+        | mips64vr-* | mips64vrel-* \
         | mips64vr4100-* | mips64vr4100el-* \
         | mips64vr4300-* | mips64vr4300el-* \
         | mips64vr5000-* | mips64vr5000el-* \
+        | mips64vr5900-* | mips64vr5900el-* \
         | mipsisa32-* | mipsisa32el-* \
         | mipsisa32r2-* | mipsisa32r2el-* \
         | mipsisa64-* | mipsisa64el-* \
@@ -330,27 +360,33 @@ case $basic_machine in
         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
         | mipstx39-* | mipstx39el-* \
         | mmix-* \
+        | mt-* \
         | msp430-* \
+        | nios-* | nios2-* \
         | none-* | np1-* | ns16k-* | ns32k-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
         | pyramid-* \
         | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
         | tron-* \
         | v850-* | v850e-* | vax-* \
         | we32k-* \
-        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-        | xstormy16-* | xtensa-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+        | xstormy16-* | xtensa*-* \
         | ymp-* \
-        | z8k-*)
+        | z8k-* | z80-*)
+                ;;
+        # Recognize the basic CPU types without company name, with glob match.
+        xtensa*)
+                basic_machine=$basic_machine-unknown
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
@@ -414,6 +450,10 @@ case $basic_machine in
                 basic_machine=m68k-apollo
                 os=-bsd
                 ;;
+        aros)
+                basic_machine=i386-pc
+                os=-aros
+                ;;
         aux)
                 basic_machine=m68k-apple
                 os=-aux
@@ -422,10 +462,26 @@ case $basic_machine in
                 basic_machine=ns32k-sequent
                 os=-dynix
                 ;;
+        blackfin)
+                basic_machine=bfin-unknown
+                os=-linux
+                ;;
+        blackfin-*)
+                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
+        bluegene*)
+                basic_machine=powerpc-ibm
+                os=-cnk
+                ;;
         c90)
                 basic_machine=c90-cray
                 os=-unicos
                 ;;
+        cegcc)
+                basic_machine=arm-unknown
+                os=-cegcc
+                ;;
         convex-c1)
                 basic_machine=c1-convex
                 os=-bsd
@@ -454,8 +510,8 @@ case $basic_machine in
                 basic_machine=craynv-cray
                 os=-unicosmp
                 ;;
-        cr16c)
-                basic_machine=cr16c-unknown
+        cr16)
+                basic_machine=cr16-unknown
                 os=-elf
                 ;;
         crds | unos)
@@ -493,6 +549,10 @@ case $basic_machine in
                 basic_machine=m88k-motorola
                 os=-sysv3
                 ;;
+        dicos)
+                basic_machine=i686-pc
+                os=-dicos
+                ;;
         djgpp)
                 basic_machine=i586-pc
                 os=-msdosdjgpp
@@ -647,6 +707,14 @@ case $basic_machine in
                 basic_machine=m68k-isi
                 os=-sysv
                 ;;
+        m68knommu)
+                basic_machine=m68k-unknown
+                os=-linux
+                ;;
+        m68knommu-*)
+                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         m88k-omron*)
                 basic_machine=m88k-omron
                 ;;
@@ -662,6 +730,10 @@ case $basic_machine in
                 basic_machine=i386-pc
                 os=-mingw32
                 ;;
+        mingw32ce)
+                basic_machine=arm-unknown
+                os=-mingw32ce
+                ;;
         miniframe)
                 basic_machine=m68000-convergent
                 ;;
@@ -687,6 +759,9 @@ case $basic_machine in
                 basic_machine=i386-pc
                 os=-msdos
                 ;;
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+                ;;
         mvs)
                 basic_machine=i370-ibm
                 os=-mvs
@@ -762,9 +837,8 @@ case $basic_machine in
                 basic_machine=hppa1.1-oki
                 os=-proelf
                 ;;
-        or32 | or32-*)
+        openrisc | openrisc-*)
                 basic_machine=or32-unknown
-                os=-coff
                 ;;
         os400)
                 basic_machine=powerpc-ibm
@@ -786,6 +860,14 @@ case $basic_machine in
                 basic_machine=i860-intel
                 os=-osf
                 ;;
+        parisc)
+                basic_machine=hppa-unknown
+                os=-linux
+                ;;
+        parisc-*)
+                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         pbd)
                 basic_machine=sparc-tti
                 ;;
@@ -795,6 +877,12 @@ case $basic_machine in
         pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
+        pc98)
+                basic_machine=i386-pc
+                ;;
+        pc98-*)
+                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         pentium | p5 | k5 | k6 | nexgen | viac3)
                 basic_machine=i586-pc
                 ;;
@@ -851,6 +939,10 @@ case $basic_machine in
                 basic_machine=i586-unknown
                 os=-pw32
                 ;;
+        rdos)
+                basic_machine=i386-pc
+                os=-rdos
+                ;;
         rom68k)
                 basic_machine=m68k-rom68k
                 os=-coff
@@ -877,6 +969,10 @@ case $basic_machine in
         sb1el)
                 basic_machine=mipsisa64sb1el-unknown
                 ;;
+        sde)
+                basic_machine=mipsisa32-sde
+                os=-elf
+                ;;
         sei)
                 basic_machine=mips-sei
                 os=-seiux
@@ -888,6 +984,9 @@ case $basic_machine in
                 basic_machine=sh-hitachi
                 os=-hms
                 ;;
+        sh5el)
+                basic_machine=sh5le-unknown
+                ;;
         sh64)
                 basic_machine=sh64-unknown
                 ;;
@@ -977,6 +1076,10 @@ case $basic_machine in
                 basic_machine=tic6x-unknown
                 os=-coff
                 ;;
+        tile*)
+                basic_machine=tile-unknown
+                os=-linux-gnu
+                ;;
         tx39)
                 basic_machine=mipstx39-unknown
                 ;;
@@ -1052,6 +1155,10 @@ case $basic_machine in
                 basic_machine=z8k-unknown
                 os=-sim
                 ;;
+        z80-*-coff)
+                basic_machine=z80-unknown
+                os=-sim
+                ;;
         none)
                 basic_machine=none-none
                 os=-none
@@ -1090,13 +1197,10 @@ case $basic_machine in
         we32k)
                 basic_machine=we32k-att
                 ;;
-        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+        sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
                 basic_machine=sh-unknown
                 ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b)
+        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
                 basic_machine=sparc-sun
                 ;;
         cydra)
@@ -1163,26 +1267,30 @@ case $os in
         # Each alternative MUST END IN A *, to match a version number.
         # -sysv* is not here because it comes later, after sysvr4.
         -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-              | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
               | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+              | -kopensolaris* \
               | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-              | -aos* \
+              | -aos* | -aros* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+              | -openbsd* | -solidbsd* \
               | -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* \
+              | -chorusos* | -chorusrdb* | -cegcc* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
@@ -1200,7 +1308,7 @@ case $os in
                 os=`echo $os | sed -e 's|nto|nto-qnx|'`
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
               | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
         -mac*)
@@ -1312,6 +1420,9 @@ case $os in
         -zvmoe)
                 os=-zvmoe
                 ;;
+        -dicos*)
+                os=-dicos
+                ;;
         -none)
                 ;;
         *)
@@ -1334,6 +1445,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+                os=-elf
+                ;;
+        spu-*)
+                os=-elf
+                ;;
         *-acorn)
                 os=-riscix1.2
                 ;;
@@ -1343,9 +1460,9 @@ case $basic_machine in
         arm*-semi)
                 os=-aout
                 ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
         # This must come before the *-dec entry.
         pdp10-*)
                 os=-tops20
@@ -1371,6 +1488,9 @@ case $basic_machine in
         m68*-cisco)
                 os=-aout
                 ;;
+        mep-*)
+                os=-elf
+                ;;
         mips*-cisco)
                 os=-elf
                 ;;
@@ -1389,6 +1509,9 @@ case $basic_machine in
         *-be)
                 os=-beos
                 ;;
+        *-haiku)
+                os=-haiku
+                ;;
         *-ibm)
                 os=-aix
                 ;;
@@ -1497,7 +1620,7 @@ case $basic_machine in
                         -sunos*)
                                 vendor=sun
                                 ;;
-                        -aix*)
+                        -cnk*|-aix*)
                                 vendor=ibm
                                 ;;
                         -beos*)
diff --git a/debian/changelog b/debian/changelog
index 47a6ae1a7..dbf1d40c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:5.1p1-7) UNRELEASED; urgency=low
+
+  * Update config.guess and config.sub from autotools-dev 20090611.1
+    (closes: #538301).
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 24 Jul 2009 18:43:45 +0100
+
 openssh (1:5.1p1-6) unstable; urgency=low
 
   * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather