1.1 --- a/build-scripts/config.guess Wed Oct 07 08:03:32 2009 +0000
1.2 +++ b/build-scripts/config.guess Thu Oct 08 07:09:04 2009 +0000
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 Free Software Foundation,
1.8 -# Inc.
1.9 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
1.10 +# Free Software Foundation, Inc.
1.11
1.12 -timestamp='2007-12-12'
1.13 +timestamp='2009-09-18'
1.14
1.15 # This file is free software; you can redistribute it and/or modify it
1.16 # under the terms of the GNU General Public License as published by
1.17 @@ -27,16 +27,16 @@
1.18 # the same distribution terms that you use for the rest of that program.
1.19
1.20
1.21 -# Originally written by Per Bothner <per@bothner.com>.
1.22 -# Please send patches to <config-patches@gnu.org>. Submit a context
1.23 -# diff and a properly formatted ChangeLog entry.
1.24 +# Originally written by Per Bothner. Please send patches (context
1.25 +# diff format) to <config-patches@gnu.org> and include a ChangeLog
1.26 +# entry.
1.27 #
1.28 # This script attempts to guess a canonical system name similar to
1.29 # config.sub. If it succeeds, it prints the system name on stdout, and
1.30 # exits with 0. Otherwise, it exits with 1.
1.31 #
1.32 -# The plan is that this can be called by configure scripts if you
1.33 -# don't specify an explicit build system type.
1.34 +# You can get the latest version of this script from:
1.35 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1.36
1.37 me=`echo "$0" | sed -e 's,.*/,,'`
1.38
1.39 @@ -56,8 +56,8 @@
1.40 GNU config.guess ($timestamp)
1.41
1.42 Originally written by Per Bothner.
1.43 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
1.44 -Free Software Foundation, Inc.
1.45 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
1.46 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1.47
1.48 This is free software; see the source for copying conditions. There is NO
1.49 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1.50 @@ -170,7 +170,7 @@
1.51 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
1.52 eval $set_cc_for_build
1.53 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
1.54 - | grep __ELF__ >/dev/null
1.55 + | grep -q __ELF__
1.56 then
1.57 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
1.58 # Return netbsd for either. FIX?
1.59 @@ -324,6 +324,9 @@
1.60 case `/usr/bin/uname -p` in
1.61 sparc) echo sparc-icl-nx7; exit ;;
1.62 esac ;;
1.63 + s390x:SunOS:*:*)
1.64 + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1.65 + exit ;;
1.66 sun4H:SunOS:5.*:*)
1.67 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1.68 exit ;;
1.69 @@ -331,7 +334,20 @@
1.70 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1.71 exit ;;
1.72 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
1.73 - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1.74 + eval $set_cc_for_build
1.75 + SUN_ARCH="i386"
1.76 + # If there is a compiler, see if it is configured for 64-bit objects.
1.77 + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
1.78 + # This test works for both compilers.
1.79 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1.80 + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
1.81 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1.82 + grep IS_64BIT_ARCH >/dev/null
1.83 + then
1.84 + SUN_ARCH="x86_64"
1.85 + fi
1.86 + fi
1.87 + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1.88 exit ;;
1.89 sun4*:SunOS:6*:*)
1.90 # According to config.sub, this is the proper way to canonicalize
1.91 @@ -532,7 +548,7 @@
1.92 echo rs6000-ibm-aix3.2
1.93 fi
1.94 exit ;;
1.95 - *:AIX:*:[45])
1.96 + *:AIX:*:[456])
1.97 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
1.98 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
1.99 IBM_ARCH=rs6000
1.100 @@ -640,7 +656,7 @@
1.101 # => hppa64-hp-hpux11.23
1.102
1.103 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
1.104 - grep __LP64__ >/dev/null
1.105 + grep -q __LP64__
1.106 then
1.107 HP_ARCH="hppa2.0w"
1.108 else
1.109 @@ -796,7 +812,7 @@
1.110 x86)
1.111 echo i586-pc-interix${UNAME_RELEASE}
1.112 exit ;;
1.113 - EM64T | authenticamd)
1.114 + EM64T | authenticamd | genuineintel)
1.115 echo x86_64-unknown-interix${UNAME_RELEASE}
1.116 exit ;;
1.117 IA64)
1.118 @@ -806,6 +822,9 @@
1.119 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
1.120 echo i${UNAME_MACHINE}-pc-mks
1.121 exit ;;
1.122 + 8664:Windows_NT:*)
1.123 + echo x86_64-pc-mks
1.124 + exit ;;
1.125 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
1.126 # How do we know it's Interix rather than the generic POSIX subsystem?
1.127 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
1.128 @@ -835,6 +854,20 @@
1.129 i*86:Minix:*:*)
1.130 echo ${UNAME_MACHINE}-pc-minix
1.131 exit ;;
1.132 + alpha:Linux:*:*)
1.133 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
1.134 + EV5) UNAME_MACHINE=alphaev5 ;;
1.135 + EV56) UNAME_MACHINE=alphaev56 ;;
1.136 + PCA56) UNAME_MACHINE=alphapca56 ;;
1.137 + PCA57) UNAME_MACHINE=alphapca56 ;;
1.138 + EV6) UNAME_MACHINE=alphaev6 ;;
1.139 + EV67) UNAME_MACHINE=alphaev67 ;;
1.140 + EV68*) UNAME_MACHINE=alphaev68 ;;
1.141 + esac
1.142 + objdump --private-headers /bin/sh | grep -q ld.so.1
1.143 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
1.144 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
1.145 + exit ;;
1.146 arm*:Linux:*:*)
1.147 eval $set_cc_for_build
1.148 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
1.149 @@ -857,6 +890,9 @@
1.150 frv:Linux:*:*)
1.151 echo frv-unknown-linux-gnu
1.152 exit ;;
1.153 + i*86:Linux:*:*)
1.154 + echo ${UNAME_MACHINE}-pc-linux-gnu
1.155 + exit ;;
1.156 ia64:Linux:*:*)
1.157 echo ${UNAME_MACHINE}-unknown-linux-gnu
1.158 exit ;;
1.159 @@ -866,40 +902,17 @@
1.160 m68*:Linux:*:*)
1.161 echo ${UNAME_MACHINE}-unknown-linux-gnu
1.162 exit ;;
1.163 - mips:Linux:*:*)
1.164 + mips:Linux:*:* | mips64:Linux:*:*)
1.165 eval $set_cc_for_build
1.166 sed 's/^ //' << EOF >$dummy.c
1.167 #undef CPU
1.168 - #undef mips
1.169 - #undef mipsel
1.170 + #undef ${UNAME_MACHINE}
1.171 + #undef ${UNAME_MACHINE}el
1.172 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
1.173 - CPU=mipsel
1.174 + CPU=${UNAME_MACHINE}el
1.175 #else
1.176 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
1.177 - CPU=mips
1.178 - #else
1.179 - CPU=
1.180 - #endif
1.181 - #endif
1.182 -EOF
1.183 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1.184 - /^CPU/{
1.185 - s: ::g
1.186 - p
1.187 - }'`"
1.188 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
1.189 - ;;
1.190 - mips64:Linux:*:*)
1.191 - eval $set_cc_for_build
1.192 - sed 's/^ //' << EOF >$dummy.c
1.193 - #undef CPU
1.194 - #undef mips64
1.195 - #undef mips64el
1.196 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
1.197 - CPU=mips64el
1.198 - #else
1.199 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
1.200 - CPU=mips64
1.201 + CPU=${UNAME_MACHINE}
1.202 #else
1.203 CPU=
1.204 #endif
1.205 @@ -915,25 +928,11 @@
1.206 or32:Linux:*:*)
1.207 echo or32-unknown-linux-gnu
1.208 exit ;;
1.209 - ppc:Linux:*:*)
1.210 - echo powerpc-unknown-linux-gnu
1.211 + padre:Linux:*:*)
1.212 + echo sparc-unknown-linux-gnu
1.213 exit ;;
1.214 - ppc64:Linux:*:*)
1.215 - echo powerpc64-unknown-linux-gnu
1.216 - exit ;;
1.217 - alpha:Linux:*:*)
1.218 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
1.219 - EV5) UNAME_MACHINE=alphaev5 ;;
1.220 - EV56) UNAME_MACHINE=alphaev56 ;;
1.221 - PCA56) UNAME_MACHINE=alphapca56 ;;
1.222 - PCA57) UNAME_MACHINE=alphapca56 ;;
1.223 - EV6) UNAME_MACHINE=alphaev6 ;;
1.224 - EV67) UNAME_MACHINE=alphaev67 ;;
1.225 - EV68*) UNAME_MACHINE=alphaev68 ;;
1.226 - esac
1.227 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
1.228 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
1.229 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
1.230 + parisc64:Linux:*:* | hppa64:Linux:*:*)
1.231 + echo hppa64-unknown-linux-gnu
1.232 exit ;;
1.233 parisc:Linux:*:* | hppa:Linux:*:*)
1.234 # Look for CPU level
1.235 @@ -943,8 +942,11 @@
1.236 *) echo hppa-unknown-linux-gnu ;;
1.237 esac
1.238 exit ;;
1.239 - parisc64:Linux:*:* | hppa64:Linux:*:*)
1.240 - echo hppa64-unknown-linux-gnu
1.241 + ppc64:Linux:*:*)
1.242 + echo powerpc64-unknown-linux-gnu
1.243 + exit ;;
1.244 + ppc:Linux:*:*)
1.245 + echo powerpc-unknown-linux-gnu
1.246 exit ;;
1.247 s390:Linux:*:* | s390x:Linux:*:*)
1.248 echo ${UNAME_MACHINE}-ibm-linux
1.249 @@ -967,69 +969,6 @@
1.250 xtensa*:Linux:*:*)
1.251 echo ${UNAME_MACHINE}-unknown-linux-gnu
1.252 exit ;;
1.253 - i*86:Linux:*:*)
1.254 - # The BFD linker knows what the default object file format is, so
1.255 - # first see if it will tell us. cd to the root directory to prevent
1.256 - # problems with other programs or directories called `ld' in the path.
1.257 - # Set LC_ALL=C to ensure ld outputs messages in English.
1.258 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
1.259 - | sed -ne '/supported targets:/!d
1.260 - s/[ ][ ]*/ /g
1.261 - s/.*supported targets: *//
1.262 - s/ .*//
1.263 - p'`
1.264 - case "$ld_supported_targets" in
1.265 - elf32-i386)
1.266 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
1.267 - ;;
1.268 - a.out-i386-linux)
1.269 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
1.270 - exit ;;
1.271 - coff-i386)
1.272 - echo "${UNAME_MACHINE}-pc-linux-gnucoff"
1.273 - exit ;;
1.274 - "")
1.275 - # Either a pre-BFD a.out linker (linux-gnuoldld) or
1.276 - # one that does not give us useful --help.
1.277 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
1.278 - exit ;;
1.279 - esac
1.280 - # Determine whether the default compiler is a.out or elf
1.281 - eval $set_cc_for_build
1.282 - sed 's/^ //' << EOF >$dummy.c
1.283 - #include <features.h>
1.284 - #ifdef __ELF__
1.285 - # ifdef __GLIBC__
1.286 - # if __GLIBC__ >= 2
1.287 - LIBC=gnu
1.288 - # else
1.289 - LIBC=gnulibc1
1.290 - # endif
1.291 - # else
1.292 - LIBC=gnulibc1
1.293 - # endif
1.294 - #else
1.295 - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1.296 - LIBC=gnu
1.297 - #else
1.298 - LIBC=gnuaout
1.299 - #endif
1.300 - #endif
1.301 - #ifdef __dietlibc__
1.302 - LIBC=dietlibc
1.303 - #endif
1.304 -EOF
1.305 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1.306 - /^LIBC/{
1.307 - s: ::g
1.308 - p
1.309 - }'`"
1.310 - test x"${LIBC}" != x && {
1.311 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1.312 - exit
1.313 - }
1.314 - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1.315 - ;;
1.316 i*86:DYNIX/ptx:4*:*)
1.317 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1.318 # earlier versions are messed up and put the nodename in both
1.319 @@ -1058,7 +997,7 @@
1.320 i*86:syllable:*:*)
1.321 echo ${UNAME_MACHINE}-pc-syllable
1.322 exit ;;
1.323 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1.324 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1.325 echo i386-unknown-lynxos${UNAME_RELEASE}
1.326 exit ;;
1.327 i*86:*DOS:*:*)
1.328 @@ -1102,8 +1041,11 @@
1.329 pc:*:*:*)
1.330 # Left here for compatibility:
1.331 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1.332 - # the processor, so we play safe by assuming i386.
1.333 - echo i386-pc-msdosdjgpp
1.334 + # the processor, so we play safe by assuming i586.
1.335 + # Note: whatever this is, it MUST be the same as what config.sub
1.336 + # prints for the "djgpp" host, or else GDB configury will decide that
1.337 + # this is a cross-build.
1.338 + echo i586-pc-msdosdjgpp
1.339 exit ;;
1.340 Intel:Mach:3*:*)
1.341 echo i386-pc-mach3
1.342 @@ -1141,6 +1083,16 @@
1.343 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1.344 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1.345 && { echo i486-ncr-sysv4; exit; } ;;
1.346 + NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1.347 + OS_REL='.3'
1.348 + test -r /etc/.relid \
1.349 + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1.350 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1.351 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1.352 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1.353 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1.354 + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1.355 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1.356 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1.357 echo m68k-unknown-lynxos${UNAME_RELEASE}
1.358 exit ;;
1.359 @@ -1153,7 +1105,7 @@
1.360 rs6000:LynxOS:2.*:*)
1.361 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1.362 exit ;;
1.363 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1.364 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1.365 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1.366 exit ;;
1.367 SM[BE]S:UNIX_SV:*:*)
1.368 @@ -1216,6 +1168,9 @@
1.369 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
1.370 echo i586-pc-beos
1.371 exit ;;
1.372 + BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
1.373 + echo i586-pc-haiku
1.374 + exit ;;
1.375 SX-4:SUPER-UX:*:*)
1.376 echo sx4-nec-superux${UNAME_RELEASE}
1.377 exit ;;
1.378 @@ -1243,6 +1198,16 @@
1.379 *:Darwin:*:*)
1.380 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1.381 case $UNAME_PROCESSOR in
1.382 + i386)
1.383 + eval $set_cc_for_build
1.384 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1.385 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1.386 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1.387 + grep IS_64BIT_ARCH >/dev/null
1.388 + then
1.389 + UNAME_PROCESSOR="x86_64"
1.390 + fi
1.391 + fi ;;
1.392 unknown) UNAME_PROCESSOR=powerpc ;;
1.393 esac
1.394 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1.395 @@ -1324,6 +1289,9 @@
1.396 i*86:rdos:*:*)
1.397 echo ${UNAME_MACHINE}-pc-rdos
1.398 exit ;;
1.399 + i*86:AROS:*:*)
1.400 + echo ${UNAME_MACHINE}-pc-aros
1.401 + exit ;;
1.402 esac
1.403
1.404 #echo '(No uname command or uname output not recognized.)' 1>&2
1.405 @@ -1484,9 +1452,9 @@
1.406 the operating system you are using. It is advised that you
1.407 download the most up to date version of the config scripts from
1.408
1.409 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
1.410 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1.411 and
1.412 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
1.413 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1.414
1.415 If the version you run ($0) is already up to date, please
1.416 send the following data and any information you think might be
2.1 --- a/build-scripts/config.sub Wed Oct 07 08:03:32 2009 +0000
2.2 +++ b/build-scripts/config.sub Thu Oct 08 07:09:04 2009 +0000
2.3 @@ -1,10 +1,10 @@
2.4 #! /bin/sh
2.5 # Configuration validation subroutine script.
2.6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2.7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
2.8 -# Inc.
2.9 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
2.10 +# Free Software Foundation, Inc.
2.11
2.12 -timestamp='2007-12-05'
2.13 +timestamp='2009-10-07'
2.14
2.15 # This file is (in principle) common to ALL GNU software.
2.16 # The presence of a machine in this file suggests that SOME GNU software
2.17 @@ -32,13 +32,16 @@
2.18
2.19
2.20 # Please send patches to <config-patches@gnu.org>. Submit a context
2.21 -# diff and a properly formatted ChangeLog entry.
2.22 +# diff and a properly formatted GNU ChangeLog entry.
2.23 #
2.24 # Configuration subroutine to validate and canonicalize a configuration type.
2.25 # Supply the specified configuration type as an argument.
2.26 # If it is invalid, we print an error message on stderr and exit with code 1.
2.27 # Otherwise, we print the canonical config type on stdout and succeed.
2.28
2.29 +# You can get the latest version of this script from:
2.30 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
2.31 +
2.32 # This file is supposed to be the same for all GNU packages
2.33 # and recognize all the CPU types, system types and aliases
2.34 # that are meaningful with *any* GNU software.
2.35 @@ -72,8 +75,8 @@
2.36 version="\
2.37 GNU config.sub ($timestamp)
2.38
2.39 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
2.40 -Free Software Foundation, Inc.
2.41 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2.42 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2.43
2.44 This is free software; see the source for copying conditions. There is NO
2.45 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
2.46 @@ -122,6 +125,7 @@
2.47 case $maybe_os in
2.48 nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
2.49 uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
2.50 + kopensolaris*-gnu* | \
2.51 storm-chaos* | os2-emx* | rtmk-nova*)
2.52 os=-$maybe_os
2.53 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
2.54 @@ -148,10 +152,13 @@
2.55 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
2.56 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
2.57 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
2.58 - -apple | -axis | -knuth | -cray)
2.59 + -apple | -axis | -knuth | -cray | -microblaze)
2.60 os=
2.61 basic_machine=$1
2.62 ;;
2.63 + -bluegene*)
2.64 + os=-cnk
2.65 + ;;
2.66 -sim | -cisco | -oki | -wec | -winbond)
2.67 os=
2.68 basic_machine=$1
2.69 @@ -249,13 +256,16 @@
2.70 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
2.71 | i370 | i860 | i960 | ia64 \
2.72 | ip2k | iq2000 \
2.73 + | lm32 \
2.74 | m32c | m32r | m32rle | m68000 | m68k | m88k \
2.75 - | maxq | mb | microblaze | mcore | mep \
2.76 + | maxq | mb | microblaze | mcore | mep | metag \
2.77 | mips | mipsbe | mipseb | mipsel | mipsle \
2.78 | mips16 \
2.79 | mips64 | mips64el \
2.80 + | mips64octeon | mips64octeonel \
2.81 + | mips64orion | mips64orionel \
2.82 + | mips64r5900 | mips64r5900el \
2.83 | mips64vr | mips64vrel \
2.84 - | mips64orion | mips64orionel \
2.85 | mips64vr4100 | mips64vr4100el \
2.86 | mips64vr4300 | mips64vr4300el \
2.87 | mips64vr5000 | mips64vr5000el \
2.88 @@ -268,6 +278,7 @@
2.89 | mipsisa64sr71k | mipsisa64sr71kel \
2.90 | mipstx39 | mipstx39el \
2.91 | mn10200 | mn10300 \
2.92 + | moxie \
2.93 | mt \
2.94 | msp430 \
2.95 | nios | nios2 \
2.96 @@ -276,8 +287,9 @@
2.97 | pdp10 | pdp11 | pj | pjl \
2.98 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
2.99 | pyramid \
2.100 + | rx \
2.101 | score \
2.102 - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
2.103 + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
2.104 | sh64 | sh64le \
2.105 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
2.106 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
2.107 @@ -286,10 +298,10 @@
2.108 | v850 | v850e \
2.109 | we32k \
2.110 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
2.111 - | z8k)
2.112 + | z8k | z80)
2.113 basic_machine=$basic_machine-unknown
2.114 ;;
2.115 - m6811 | m68hc11 | m6812 | m68hc12)
2.116 + m6811 | m68hc11 | m6812 | m68hc12 | picochip)
2.117 # Motorola 68HC11/12.
2.118 basic_machine=$basic_machine-unknown
2.119 os=-none
2.120 @@ -329,14 +341,17 @@
2.121 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
2.122 | i*86-* | i860-* | i960-* | ia64-* \
2.123 | ip2k-* | iq2000-* \
2.124 + | lm32-* \
2.125 | m32c-* | m32r-* | m32rle-* \
2.126 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
2.127 - | m88110-* | m88k-* | maxq-* | mcore-* \
2.128 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
2.129 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
2.130 | mips16-* \
2.131 | mips64-* | mips64el-* \
2.132 + | mips64octeon-* | mips64octeonel-* \
2.133 + | mips64orion-* | mips64orionel-* \
2.134 + | mips64r5900-* | mips64r5900el-* \
2.135 | mips64vr-* | mips64vrel-* \
2.136 - | mips64orion-* | mips64orionel-* \
2.137 | mips64vr4100-* | mips64vr4100el-* \
2.138 | mips64vr4300-* | mips64vr4300el-* \
2.139 | mips64vr5000-* | mips64vr5000el-* \
2.140 @@ -357,21 +372,21 @@
2.141 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
2.142 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
2.143 | pyramid-* \
2.144 - | romp-* | rs6000-* \
2.145 - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
2.146 + | romp-* | rs6000-* | rx-* \
2.147 + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
2.148 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
2.149 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
2.150 | sparclite-* \
2.151 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
2.152 | tahoe-* | thumb-* \
2.153 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
2.154 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
2.155 | tron-* \
2.156 | v850-* | v850e-* | vax-* \
2.157 | we32k-* \
2.158 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
2.159 | xstormy16-* | xtensa*-* \
2.160 | ymp-* \
2.161 - | z8k-*)
2.162 + | z8k-* | z80-*)
2.163 ;;
2.164 # Recognize the basic CPU types without company name, with glob match.
2.165 xtensa*)
2.166 @@ -439,6 +454,10 @@
2.167 basic_machine=m68k-apollo
2.168 os=-bsd
2.169 ;;
2.170 + aros)
2.171 + basic_machine=i386-pc
2.172 + os=-aros
2.173 + ;;
2.174 aux)
2.175 basic_machine=m68k-apple
2.176 os=-aux
2.177 @@ -455,10 +474,18 @@
2.178 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
2.179 os=-linux
2.180 ;;
2.181 + bluegene*)
2.182 + basic_machine=powerpc-ibm
2.183 + os=-cnk
2.184 + ;;
2.185 c90)
2.186 basic_machine=c90-cray
2.187 os=-unicos
2.188 ;;
2.189 + cegcc)
2.190 + basic_machine=arm-unknown
2.191 + os=-cegcc
2.192 + ;;
2.193 convex-c1)
2.194 basic_machine=c1-convex
2.195 os=-bsd
2.196 @@ -526,6 +553,10 @@
2.197 basic_machine=m88k-motorola
2.198 os=-sysv3
2.199 ;;
2.200 + dicos)
2.201 + basic_machine=i686-pc
2.202 + os=-dicos
2.203 + ;;
2.204 djgpp)
2.205 basic_machine=i586-pc
2.206 os=-msdosdjgpp
2.207 @@ -699,6 +730,9 @@
2.208 basic_machine=ns32k-utek
2.209 os=-sysv
2.210 ;;
2.211 + microblaze)
2.212 + basic_machine=microblaze-xilinx
2.213 + ;;
2.214 mingw32)
2.215 basic_machine=i386-pc
2.216 os=-mingw32
2.217 @@ -1049,6 +1083,10 @@
2.218 basic_machine=tic6x-unknown
2.219 os=-coff
2.220 ;;
2.221 + tile*)
2.222 + basic_machine=tile-unknown
2.223 + os=-linux-gnu
2.224 + ;;
2.225 tx39)
2.226 basic_machine=mipstx39-unknown
2.227 ;;
2.228 @@ -1124,6 +1162,10 @@
2.229 basic_machine=z8k-unknown
2.230 os=-sim
2.231 ;;
2.232 + z80-*-coff)
2.233 + basic_machine=z80-unknown
2.234 + os=-sim
2.235 + ;;
2.236 none)
2.237 basic_machine=none-none
2.238 os=-none
2.239 @@ -1162,7 +1204,7 @@
2.240 we32k)
2.241 basic_machine=we32k-att
2.242 ;;
2.243 - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
2.244 + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
2.245 basic_machine=sh-unknown
2.246 ;;
2.247 sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
2.248 @@ -1232,10 +1274,11 @@
2.249 # Each alternative MUST END IN A *, to match a version number.
2.250 # -sysv* is not here because it comes later, after sysvr4.
2.251 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
2.252 - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
2.253 + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
2.254 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
2.255 + | -kopensolaris* \
2.256 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
2.257 - | -aos* \
2.258 + | -aos* | -aros* \
2.259 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
2.260 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
2.261 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
2.262 @@ -1244,7 +1287,7 @@
2.263 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
2.264 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
2.265 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
2.266 - | -chorusos* | -chorusrdb* \
2.267 + | -chorusos* | -chorusrdb* | -cegcc* \
2.268 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
2.269 | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
2.270 | -uxpv* | -beos* | -mpeix* | -udk* \
2.271 @@ -1254,7 +1297,7 @@
2.272 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
2.273 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
2.274 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
2.275 - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
2.276 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
2.277 # Remember, each alternative MUST END IN *, to match a version number.
2.278 ;;
2.279 -qnx*)
2.280 @@ -1296,9 +1339,6 @@
2.281 -os400*)
2.282 os=-os400
2.283 ;;
2.284 - -cegcc*)
2.285 - os=-cegcc
2.286 - ;;
2.287 -wince*)
2.288 os=-wince
2.289 ;;
2.290 @@ -1387,6 +1427,9 @@
2.291 -zvmoe)
2.292 os=-zvmoe
2.293 ;;
2.294 + -dicos*)
2.295 + os=-dicos
2.296 + ;;
2.297 -none)
2.298 ;;
2.299 *)
2.300 @@ -1584,7 +1627,7 @@
2.301 -sunos*)
2.302 vendor=sun
2.303 ;;
2.304 - -aix*)
2.305 + -cnk*|-aix*)
2.306 vendor=ibm
2.307 ;;
2.308 -beos*)