* config.guess: Update from upstream sources.

From-SVN: r154349

diff --git a/ChangeLog b/ChangeLog
index 302516fbc00e40d0116456245521151f8dfb648c..cbba7424c31677892016111f007d40ff392bd569 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-20  Ben Elliston  <bje@au.ibm.com>
+
+       * config.guess: Update from upstream sources.
+
 2009-11-16  Alexandre Oliva  <aoliva@redhat.com>
 
        * Makefile.def: Restore host and target settings for gmp.

diff --git a/config.guess b/config.guess
index 5290569263e0714e7422d03b34b42e1790cec3fa..d53e309f4b981ea4a966e53a7133ca290cefd1f3 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-08'
+timestamp='2009-11-19'
 
 # 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
@@ -891,7 +891,15 @@ EOF
        echo frv-unknown-linux-gnu
        exit ;;
     i*86:Linux:*:*)
-       echo ${UNAME_MACHINE}-pc-linux-gnu
+       LIBC=gnu
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
        exit ;;
     ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -918,11 +926,7 @@ EOF
        #endif
        #endif
 EOF
-       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-           /^CPU/{
-               s: ::g
-               p
-           }'`"
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
     or32:Linux:*:*)