1.1 --- a/scripts/config.guess Mon Apr 27 17:05:49 2009 +0000
1.2 +++ b/scripts/config.guess Sun Aug 30 00:35:58 2009 +0200
1.3 @@ -1,10 +1,10 @@
1.4 #! /bin/sh
1.5 # Attempt to guess a canonical system name.
1.6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1.7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
1.8 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
1.9 # Free Software Foundation, Inc.
1.10
1.11 -timestamp='2009-02-03'
1.12 +timestamp='2009-06-10'
1.13
1.14 # This file is free software; you can redistribute it and/or modify it
1.15 # under the terms of the GNU General Public License as published by
1.16 @@ -170,7 +170,7 @@
1.17 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
1.18 eval $set_cc_for_build
1.19 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
1.20 - | grep __ELF__ >/dev/null
1.21 + | grep -q __ELF__
1.22 then
1.23 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
1.24 # Return netbsd for either. FIX?
1.25 @@ -324,6 +324,9 @@
1.26 case `/usr/bin/uname -p` in
1.27 sparc) echo sparc-icl-nx7; exit ;;
1.28 esac ;;
1.29 + s390x:SunOS:*:*)
1.30 + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1.31 + exit ;;
1.32 sun4H:SunOS:5.*:*)
1.33 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1.34 exit ;;
1.35 @@ -653,7 +656,7 @@
1.36 # => hppa64-hp-hpux11.23
1.37
1.38 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
1.39 - grep __LP64__ >/dev/null
1.40 + grep -q __LP64__
1.41 then
1.42 HP_ARCH="hppa2.0w"
1.43 else
1.44 @@ -819,6 +822,9 @@
1.45 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
1.46 echo i${UNAME_MACHINE}-pc-mks
1.47 exit ;;
1.48 + 8664:Windows_NT:*)
1.49 + echo x86_64-pc-mks
1.50 + exit ;;
1.51 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
1.52 # How do we know it's Interix rather than the generic POSIX subsystem?
1.53 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
1.54 @@ -879,40 +885,17 @@
1.55 m68*:Linux:*:*)
1.56 echo ${UNAME_MACHINE}-unknown-linux-gnu
1.57 exit ;;
1.58 - mips:Linux:*:*)
1.59 + mips:Linux:*:* | mips64:Linux:*:*)
1.60 eval $set_cc_for_build
1.61 sed 's/^ //' << EOF >$dummy.c
1.62 #undef CPU
1.63 - #undef mips
1.64 - #undef mipsel
1.65 + #undef ${UNAME_MACHINE}
1.66 + #undef ${UNAME_MACHINE}el
1.67 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
1.68 - CPU=mipsel
1.69 + CPU=${UNAME_MACHINE}el
1.70 #else
1.71 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
1.72 - CPU=mips
1.73 - #else
1.74 - CPU=
1.75 - #endif
1.76 - #endif
1.77 -EOF
1.78 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1.79 - /^CPU/{
1.80 - s: ::g
1.81 - p
1.82 - }'`"
1.83 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
1.84 - ;;
1.85 - mips64:Linux:*:*)
1.86 - eval $set_cc_for_build
1.87 - sed 's/^ //' << EOF >$dummy.c
1.88 - #undef CPU
1.89 - #undef mips64
1.90 - #undef mips64el
1.91 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
1.92 - CPU=mips64el
1.93 - #else
1.94 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
1.95 - CPU=mips64
1.96 + CPU=${UNAME_MACHINE}
1.97 #else
1.98 CPU=
1.99 #endif
1.100 @@ -944,7 +927,7 @@
1.101 EV67) UNAME_MACHINE=alphaev67 ;;
1.102 EV68*) UNAME_MACHINE=alphaev68 ;;
1.103 esac
1.104 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
1.105 + objdump --private-headers /bin/sh | grep -q ld.so.1
1.106 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
1.107 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
1.108 exit ;;
1.109 @@ -998,14 +981,6 @@
1.110 elf32-i386)
1.111 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
1.112 ;;
1.113 - a.out-i386-linux)
1.114 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
1.115 - exit ;;
1.116 - "")
1.117 - # Either a pre-BFD a.out linker (linux-gnuoldld) or
1.118 - # one that does not give us useful --help.
1.119 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
1.120 - exit ;;
1.121 esac
1.122 # Determine whether the default compiler is a.out or elf
1.123 eval $set_cc_for_build
1.124 @@ -1071,7 +1046,7 @@
1.125 i*86:syllable:*:*)
1.126 echo ${UNAME_MACHINE}-pc-syllable
1.127 exit ;;
1.128 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1.129 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1.130 echo i386-unknown-lynxos${UNAME_RELEASE}
1.131 exit ;;
1.132 i*86:*DOS:*:*)
1.133 @@ -1179,7 +1154,7 @@
1.134 rs6000:LynxOS:2.*:*)
1.135 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1.136 exit ;;
1.137 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1.138 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1.139 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1.140 exit ;;
1.141 SM[BE]S:UNIX_SV:*:*)