1.1 --- a/scripts/config.guess Tue Sep 01 10:41:44 2009 +0200
1.2 +++ b/scripts/config.guess Mon Nov 16 22:37:39 2009 +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-08-19'
1.8 +timestamp='2009-09-18'
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 @@ -854,6 +854,20 @@
1.13 i*86:Minix:*:*)
1.14 echo ${UNAME_MACHINE}-pc-minix
1.15 exit ;;
1.16 + alpha:Linux:*:*)
1.17 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
1.18 + EV5) UNAME_MACHINE=alphaev5 ;;
1.19 + EV56) UNAME_MACHINE=alphaev56 ;;
1.20 + PCA56) UNAME_MACHINE=alphapca56 ;;
1.21 + PCA57) UNAME_MACHINE=alphapca56 ;;
1.22 + EV6) UNAME_MACHINE=alphaev6 ;;
1.23 + EV67) UNAME_MACHINE=alphaev67 ;;
1.24 + EV68*) UNAME_MACHINE=alphaev68 ;;
1.25 + esac
1.26 + objdump --private-headers /bin/sh | grep -q ld.so.1
1.27 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
1.28 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
1.29 + exit ;;
1.30 arm*:Linux:*:*)
1.31 eval $set_cc_for_build
1.32 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
1.33 @@ -876,6 +890,9 @@
1.34 frv:Linux:*:*)
1.35 echo frv-unknown-linux-gnu
1.36 exit ;;
1.37 + i*86:Linux:*:*)
1.38 + echo ${UNAME_MACHINE}-pc-linux-gnu
1.39 + exit ;;
1.40 ia64:Linux:*:*)
1.41 echo ${UNAME_MACHINE}-unknown-linux-gnu
1.42 exit ;;
1.43 @@ -911,29 +928,12 @@
1.44 or32:Linux:*:*)
1.45 echo or32-unknown-linux-gnu
1.46 exit ;;
1.47 - ppc:Linux:*:*)
1.48 - echo powerpc-unknown-linux-gnu
1.49 - exit ;;
1.50 - ppc64:Linux:*:*)
1.51 - echo powerpc64-unknown-linux-gnu
1.52 - exit ;;
1.53 - alpha:Linux:*:*)
1.54 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
1.55 - EV5) UNAME_MACHINE=alphaev5 ;;
1.56 - EV56) UNAME_MACHINE=alphaev56 ;;
1.57 - PCA56) UNAME_MACHINE=alphapca56 ;;
1.58 - PCA57) UNAME_MACHINE=alphapca56 ;;
1.59 - EV6) UNAME_MACHINE=alphaev6 ;;
1.60 - EV67) UNAME_MACHINE=alphaev67 ;;
1.61 - EV68*) UNAME_MACHINE=alphaev68 ;;
1.62 - esac
1.63 - objdump --private-headers /bin/sh | grep -q ld.so.1
1.64 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
1.65 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
1.66 - exit ;;
1.67 padre:Linux:*:*)
1.68 echo sparc-unknown-linux-gnu
1.69 exit ;;
1.70 + parisc64:Linux:*:* | hppa64:Linux:*:*)
1.71 + echo hppa64-unknown-linux-gnu
1.72 + exit ;;
1.73 parisc:Linux:*:* | hppa:Linux:*:*)
1.74 # Look for CPU level
1.75 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
1.76 @@ -942,8 +942,11 @@
1.77 *) echo hppa-unknown-linux-gnu ;;
1.78 esac
1.79 exit ;;
1.80 - parisc64:Linux:*:* | hppa64:Linux:*:*)
1.81 - echo hppa64-unknown-linux-gnu
1.82 + ppc64:Linux:*:*)
1.83 + echo powerpc64-unknown-linux-gnu
1.84 + exit ;;
1.85 + ppc:Linux:*:*)
1.86 + echo powerpc-unknown-linux-gnu
1.87 exit ;;
1.88 s390:Linux:*:* | s390x:Linux:*:*)
1.89 echo ${UNAME_MACHINE}-ibm-linux
1.90 @@ -966,58 +969,6 @@
1.91 xtensa*:Linux:*:*)
1.92 echo ${UNAME_MACHINE}-unknown-linux-gnu
1.93 exit ;;
1.94 - i*86:Linux:*:*)
1.95 - # The BFD linker knows what the default object file format is, so
1.96 - # first see if it will tell us. cd to the root directory to prevent
1.97 - # problems with other programs or directories called `ld' in the path.
1.98 - # Set LC_ALL=C to ensure ld outputs messages in English.
1.99 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
1.100 - | sed -ne '/supported targets:/!d
1.101 - s/[ ][ ]*/ /g
1.102 - s/.*supported targets: *//
1.103 - s/ .*//
1.104 - p'`
1.105 - case "$ld_supported_targets" in
1.106 - elf32-i386)
1.107 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
1.108 - ;;
1.109 - esac
1.110 - # Determine whether the default compiler is a.out or elf
1.111 - eval $set_cc_for_build
1.112 - sed 's/^ //' << EOF >$dummy.c
1.113 - #include <features.h>
1.114 - #ifdef __ELF__
1.115 - # ifdef __GLIBC__
1.116 - # if __GLIBC__ >= 2
1.117 - LIBC=gnu
1.118 - # else
1.119 - LIBC=gnulibc1
1.120 - # endif
1.121 - # else
1.122 - LIBC=gnulibc1
1.123 - # endif
1.124 - #else
1.125 - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1.126 - LIBC=gnu
1.127 - #else
1.128 - LIBC=gnuaout
1.129 - #endif
1.130 - #endif
1.131 - #ifdef __dietlibc__
1.132 - LIBC=dietlibc
1.133 - #endif
1.134 -EOF
1.135 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1.136 - /^LIBC/{
1.137 - s: ::g
1.138 - p
1.139 - }'`"
1.140 - test x"${LIBC}" != x && {
1.141 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1.142 - exit
1.143 - }
1.144 - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1.145 - ;;
1.146 i*86:DYNIX/ptx:4*:*)
1.147 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1.148 # earlier versions are messed up and put the nodename in both
1.149 @@ -1247,6 +1198,16 @@
1.150 *:Darwin:*:*)
1.151 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1.152 case $UNAME_PROCESSOR in
1.153 + i386)
1.154 + eval $set_cc_for_build
1.155 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1.156 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1.157 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1.158 + grep IS_64BIT_ARCH >/dev/null
1.159 + then
1.160 + UNAME_PROCESSOR="x86_64"
1.161 + fi
1.162 + fi ;;
1.163 unknown) UNAME_PROCESSOR=powerpc ;;
1.164 esac
1.165 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}