Updated from master source.

3 files changed, 73 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index f618eec730a..bf31ef0dfe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-09-17  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * config.guess, config.sub: Updated from master source.
+
         * configure.in (OTHER_FILES): Define using autoconf not cpp.
 
 2009-09-14  Dan Nicolaescu  <dann@ics.uci.edu>
diff --git a/config.guess b/config.guess
index c466aa76364..4ecc47985e3 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +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, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2008-12-11'
+timestamp='2009-09-16'
 
 # 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
@@ -27,16 +27,16 @@ timestamp='2008-12-11'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -170,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?
@@ -324,6 +324,9 @@ 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 ;;
@@ -335,11 +338,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         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.  Note that the full path to
-        # /usr/bin/echo is necessary to work around the shell builtins for
-        # echo that do not handle newlines.
+        # This test works for both compilers.
         if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-            if /usr/bin/echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \
+            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
@@ -655,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
@@ -821,6 +822,9 @@ EOF
     [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
@@ -881,40 +885,17 @@ EOF
     m68*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
-    mips:Linux:*:*)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #undef CPU
-        #undef mips
-        #undef mipsel
-        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-        CPU=mipsel
-        #else
-        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-        CPU=mips
-        #else
-        CPU=
-        #endif
-        #endif
-EOF
-        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; }
-        ;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
         eval $set_cc_for_build
         sed 's/^        //' << EOF >$dummy.c
         #undef CPU
-        #undef mips64
-        #undef mips64el
+        #undef ${UNAME_MACHINE}
+        #undef ${UNAME_MACHINE}el
         #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-        CPU=mips64el
+        CPU=${UNAME_MACHINE}el
         #else
         #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-        CPU=mips64
+        CPU=${UNAME_MACHINE}
         #else
         CPU=
         #endif
@@ -946,7 +927,7 @@ 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 ;;
@@ -1000,14 +981,6 @@ EOF
           elf32-i386)
                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                 ;;
-          a.out-i386-linux)
-                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                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
@@ -1073,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:*:*)
@@ -1117,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
@@ -1156,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 ;;
@@ -1168,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:*:*)
@@ -1342,6 +1328,9 @@ EOF
     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
diff --git a/config.sub b/config.sub
index 9489dc7867b..750b1c263a6 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2008-12-11'
+timestamp='2009-09-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2008-12-11'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -122,6 +125,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   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/'`
@@ -148,10 +152,13 @@ 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 | -knuth | -cray)
+        -apple | -axis | -knuth | -cray | -microblaze)
                 os=
                 basic_machine=$1
                 ;;
+        -bluegene*)
+                os=-cnk
+                ;;
         -sim | -cisco | -oki | -wec | -winbond)
                 os=
                 basic_machine=$1
@@ -271,6 +278,7 @@ case $basic_machine in
         | mipsisa64sr71k | mipsisa64sr71kel \
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
+        | moxie \
         | mt \
         | msp430 \
         | nios | nios2 \
@@ -335,7 +343,7 @@ case $basic_machine in
         | lm32-* \
         | m32c-* | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
@@ -445,6 +453,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
@@ -461,6 +473,10 @@ case $basic_machine in
                 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
                 os=-linux
                 ;;
+        bluegene*)
+                basic_machine=powerpc-ibm
+                os=-cnk
+                ;;
         c90)
                 basic_machine=c90-cray
                 os=-unicos
@@ -713,6 +729,9 @@ case $basic_machine in
                 basic_machine=ns32k-utek
                 os=-sysv
                 ;;
+        microblaze)
+                basic_machine=microblaze-xilinx
+                ;;
         mingw32)
                 basic_machine=i386-pc
                 os=-mingw32
@@ -1254,10 +1273,11 @@ 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* \
@@ -1606,7 +1626,7 @@ case $basic_machine in
                         -sunos*)
                                 vendor=sun
                                 ;;
-                        -aix*)
+                        -cnk*|-aix*)
                                 vendor=ibm
                                 ;;
                         -beos*)