1.1 --- a/scripts/config.guess	Sun Sep 27 12:12:21 2009 +0200
     1.2 +++ b/scripts/config.guess	Tue Jan 12 21:09:30 2010 +0100
     1.3 @@ -4,7 +4,7 @@
     1.4  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
     1.5  #   Free Software Foundation, Inc.
     1.6  
     1.7 -timestamp='2009-09-18'
     1.8 +timestamp='2009-11-19'
     1.9  
    1.10  # This file is free software; you can redistribute it and/or modify it
    1.11  # under the terms of the GNU General Public License as published by
    1.12 @@ -807,12 +807,12 @@
    1.13      i*:PW*:*)
    1.14  	echo ${UNAME_MACHINE}-pc-pw32
    1.15  	exit ;;
    1.16 -    *:Interix*:[3456]*)
    1.17 +    *:Interix*:*)
    1.18      	case ${UNAME_MACHINE} in
    1.19  	    x86)
    1.20  		echo i586-pc-interix${UNAME_RELEASE}
    1.21  		exit ;;
    1.22 -	    EM64T | authenticamd | genuineintel)
    1.23 +	    authenticamd | genuineintel | EM64T)
    1.24  		echo x86_64-unknown-interix${UNAME_RELEASE}
    1.25  		exit ;;
    1.26  	    IA64)
    1.27 @@ -891,7 +891,15 @@
    1.28      	echo frv-unknown-linux-gnu
    1.29  	exit ;;
    1.30      i*86:Linux:*:*)
    1.31 -	echo ${UNAME_MACHINE}-pc-linux-gnu
    1.32 +	LIBC=gnu
    1.33 +	eval $set_cc_for_build
    1.34 +	sed 's/^	//' << EOF >$dummy.c
    1.35 +	#ifdef __dietlibc__
    1.36 +	LIBC=dietlibc
    1.37 +	#endif
    1.38 +EOF
    1.39 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
    1.40 +	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
    1.41  	exit ;;
    1.42      ia64:Linux:*:*)
    1.43  	echo ${UNAME_MACHINE}-unknown-linux-gnu
    1.44 @@ -918,11 +926,7 @@
    1.45  	#endif
    1.46  	#endif
    1.47  EOF
    1.48 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    1.49 -	    /^CPU/{
    1.50 -		s: ::g
    1.51 -		p
    1.52 -	    }'`"
    1.53 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
    1.54  	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    1.55  	;;
    1.56      or32:Linux:*:*)