Mercurial > jdk8-mips64-public / changeset
changeset
8024467: Update autoconf-config.guess to autoconf 2.69
Thu, 12 Sep 2013 10:38:17 +0200
- author
- ihse
- date
- Thu, 12 Sep 2013 10:38:17 +0200
- changeset 794
- 8dadd26c2a58
- parent 788
- 0874bb4707b7
- child 795
- 64f52ef175a4
8024467: Update autoconf-config.guess to autoconf 2.69
Reviewed-by: erikj
| common/autoconf/build-aux/autoconf-config.guess | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/build-aux/autoconf-config.guess Wed Sep 11 12:08:34 2013 -0400 1.2 +++ b/common/autoconf/build-aux/autoconf-config.guess Thu Sep 12 10:38:17 2013 +0200 1.3 @@ -26,10 +26,10 @@ 1.4 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 -# Free Software Foundation, Inc. 1.9 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 1.10 +# 2011, 2012 Free Software Foundation, Inc. 1.11 1.12 -timestamp='2008-01-23' 1.13 +timestamp='2012-02-10' 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 @@ -42,9 +42,7 @@ 1.18 # General Public License for more details. 1.19 # 1.20 # You should have received a copy of the GNU General Public License 1.21 -# along with this program; if not, write to the Free Software 1.22 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 1.23 -# 02110-1301, USA. 1.24 +# along with this program; if not, see <http://www.gnu.org/licenses/>. 1.25 # 1.26 # As a special exception to the GNU General Public License, if you 1.27 # distribute this file as part of a program that contains a 1.28 @@ -52,16 +50,16 @@ 1.29 # the same distribution terms that you use for the rest of that program. 1.30 1.31 1.32 -# Originally written by Per Bothner <per@bothner.com>. 1.33 -# Please send patches to <config-patches@gnu.org>. Submit a context 1.34 -# diff and a properly formatted ChangeLog entry. 1.35 +# Originally written by Per Bothner. Please send patches (context 1.36 +# diff format) to <config-patches@gnu.org> and include a ChangeLog 1.37 +# entry. 1.38 # 1.39 # This script attempts to guess a canonical system name similar to 1.40 # config.sub. If it succeeds, it prints the system name on stdout, and 1.41 # exits with 0. Otherwise, it exits with 1. 1.42 # 1.43 -# The plan is that this can be called by configure scripts if you 1.44 -# don't specify an explicit build system type. 1.45 +# You can get the latest version of this script from: 1.46 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 1.47 1.48 me=`echo "$0" | sed -e 's,.*/,,'` 1.49 1.50 @@ -81,8 +79,9 @@ 1.51 GNU config.guess ($timestamp) 1.52 1.53 Originally written by Per Bothner. 1.54 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 1.55 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 1.56 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 1.57 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 1.58 +Free Software Foundation, Inc. 1.59 1.60 This is free software; see the source for copying conditions. There is NO 1.61 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 1.62 @@ -169,7 +168,7 @@ 1.63 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in 1.64 *:NetBSD:*:*) 1.65 # NetBSD (nbsd) targets should (where applicable) match one or 1.66 - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, 1.67 + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, 1.68 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently 1.69 # switched to ELF, *-*-netbsd* would select the old 1.70 # object file format. This provides both forward 1.71 @@ -195,7 +194,7 @@ 1.72 arm*|i386|m68k|ns32k|sh3*|sparc|vax) 1.73 eval $set_cc_for_build 1.74 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ 1.75 - | grep __ELF__ >/dev/null 1.76 + | grep -q __ELF__ 1.77 then 1.78 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). 1.79 # Return netbsd for either. FIX? 1.80 @@ -205,7 +204,7 @@ 1.81 fi 1.82 ;; 1.83 *) 1.84 - os=netbsd 1.85 + os=netbsd 1.86 ;; 1.87 esac 1.88 # The OS release 1.89 @@ -248,7 +247,7 @@ 1.90 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` 1.91 ;; 1.92 *5.*) 1.93 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 1.94 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 1.95 ;; 1.96 esac 1.97 # According to Compaq, /usr/sbin/psrinfo has been available on 1.98 @@ -294,7 +293,10 @@ 1.99 # A Xn.n version is an unreleased experimental baselevel. 1.100 # 1.2 uses "1.2" for uname -r. 1.101 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 1.102 - exit ;; 1.103 + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. 1.104 + exitcode=$? 1.105 + trap '' 0 1.106 + exit $exitcode ;; 1.107 Alpha\ *:Windows_NT*:*) 1.108 # How do we know it's Interix rather than the generic POSIX subsystem? 1.109 # Should we change UNAME_MACHINE based on the output of uname instead 1.110 @@ -320,7 +322,7 @@ 1.111 echo s390-ibm-zvmoe 1.112 exit ;; 1.113 *:OS400:*:*) 1.114 - echo powerpc-ibm-os400 1.115 + echo powerpc-ibm-os400 1.116 exit ;; 1.117 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 1.118 echo arm-acorn-riscix${UNAME_RELEASE} 1.119 @@ -349,14 +351,33 @@ 1.120 case `/usr/bin/uname -p` in 1.121 sparc) echo sparc-icl-nx7; exit ;; 1.122 esac ;; 1.123 + s390x:SunOS:*:*) 1.124 + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 1.125 + exit ;; 1.126 sun4H:SunOS:5.*:*) 1.127 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 1.128 exit ;; 1.129 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 1.130 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 1.131 exit ;; 1.132 + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) 1.133 + echo i386-pc-auroraux${UNAME_RELEASE} 1.134 + exit ;; 1.135 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 1.136 - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 1.137 + eval $set_cc_for_build 1.138 + SUN_ARCH="i386" 1.139 + # If there is a compiler, see if it is configured for 64-bit objects. 1.140 + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. 1.141 + # This test works for both compilers. 1.142 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 1.143 + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ 1.144 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 1.145 + grep IS_64BIT_ARCH >/dev/null 1.146 + then 1.147 + SUN_ARCH="x86_64" 1.148 + fi 1.149 + fi 1.150 + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 1.151 exit ;; 1.152 sun4*:SunOS:6*:*) 1.153 # According to config.sub, this is the proper way to canonicalize 1.154 @@ -400,23 +421,23 @@ 1.155 # MiNT. But MiNT is downward compatible to TOS, so this should 1.156 # be no problem. 1.157 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 1.158 - echo m68k-atari-mint${UNAME_RELEASE} 1.159 + echo m68k-atari-mint${UNAME_RELEASE} 1.160 exit ;; 1.161 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 1.162 echo m68k-atari-mint${UNAME_RELEASE} 1.163 - exit ;; 1.164 + exit ;; 1.165 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 1.166 - echo m68k-atari-mint${UNAME_RELEASE} 1.167 + echo m68k-atari-mint${UNAME_RELEASE} 1.168 exit ;; 1.169 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 1.170 - echo m68k-milan-mint${UNAME_RELEASE} 1.171 - exit ;; 1.172 + echo m68k-milan-mint${UNAME_RELEASE} 1.173 + exit ;; 1.174 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 1.175 - echo m68k-hades-mint${UNAME_RELEASE} 1.176 - exit ;; 1.177 + echo m68k-hades-mint${UNAME_RELEASE} 1.178 + exit ;; 1.179 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 1.180 - echo m68k-unknown-mint${UNAME_RELEASE} 1.181 - exit ;; 1.182 + echo m68k-unknown-mint${UNAME_RELEASE} 1.183 + exit ;; 1.184 m68k:machten:*:*) 1.185 echo m68k-apple-machten${UNAME_RELEASE} 1.186 exit ;; 1.187 @@ -486,8 +507,8 @@ 1.188 echo m88k-motorola-sysv3 1.189 exit ;; 1.190 AViiON:dgux:*:*) 1.191 - # DG/UX returns AViiON for all architectures 1.192 - UNAME_PROCESSOR=`/usr/bin/uname -p` 1.193 + # DG/UX returns AViiON for all architectures 1.194 + UNAME_PROCESSOR=`/usr/bin/uname -p` 1.195 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] 1.196 then 1.197 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ 1.198 @@ -500,7 +521,7 @@ 1.199 else 1.200 echo i586-dg-dgux${UNAME_RELEASE} 1.201 fi 1.202 - exit ;; 1.203 + exit ;; 1.204 M88*:DolphinOS:*:*) # DolphinOS (SVR3) 1.205 echo m88k-dolphin-sysv3 1.206 exit ;; 1.207 @@ -557,7 +578,7 @@ 1.208 echo rs6000-ibm-aix3.2 1.209 fi 1.210 exit ;; 1.211 - *:AIX:*:[456]) 1.212 + *:AIX:*:[4567]) 1.213 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 1.214 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 1.215 IBM_ARCH=rs6000 1.216 @@ -600,52 +621,52 @@ 1.217 9000/[678][0-9][0-9]) 1.218 if [ -x /usr/bin/getconf ]; then 1.219 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 1.220 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 1.221 - case "${sc_cpu_version}" in 1.222 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 1.223 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 1.224 - 532) # CPU_PA_RISC2_0 1.225 - case "${sc_kernel_bits}" in 1.226 - 32) HP_ARCH="hppa2.0n" ;; 1.227 - 64) HP_ARCH="hppa2.0w" ;; 1.228 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 1.229 + case "${sc_cpu_version}" in 1.230 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 1.231 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 1.232 + 532) # CPU_PA_RISC2_0 1.233 + case "${sc_kernel_bits}" in 1.234 + 32) HP_ARCH="hppa2.0n" ;; 1.235 + 64) HP_ARCH="hppa2.0w" ;; 1.236 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 1.237 - esac ;; 1.238 - esac 1.239 + esac ;; 1.240 + esac 1.241 fi 1.242 if [ "${HP_ARCH}" = "" ]; then 1.243 eval $set_cc_for_build 1.244 - sed 's/^ //' << EOF >$dummy.c 1.245 + sed 's/^ //' << EOF >$dummy.c 1.246 1.247 - #define _HPUX_SOURCE 1.248 - #include <stdlib.h> 1.249 - #include <unistd.h> 1.250 + #define _HPUX_SOURCE 1.251 + #include <stdlib.h> 1.252 + #include <unistd.h> 1.253 1.254 - int main () 1.255 - { 1.256 - #if defined(_SC_KERNEL_BITS) 1.257 - long bits = sysconf(_SC_KERNEL_BITS); 1.258 - #endif 1.259 - long cpu = sysconf (_SC_CPU_VERSION); 1.260 + int main () 1.261 + { 1.262 + #if defined(_SC_KERNEL_BITS) 1.263 + long bits = sysconf(_SC_KERNEL_BITS); 1.264 + #endif 1.265 + long cpu = sysconf (_SC_CPU_VERSION); 1.266 1.267 - switch (cpu) 1.268 - { 1.269 - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; 1.270 - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; 1.271 - case CPU_PA_RISC2_0: 1.272 - #if defined(_SC_KERNEL_BITS) 1.273 - switch (bits) 1.274 - { 1.275 - case 64: puts ("hppa2.0w"); break; 1.276 - case 32: puts ("hppa2.0n"); break; 1.277 - default: puts ("hppa2.0"); break; 1.278 - } break; 1.279 - #else /* !defined(_SC_KERNEL_BITS) */ 1.280 - puts ("hppa2.0"); break; 1.281 - #endif 1.282 - default: puts ("hppa1.0"); break; 1.283 - } 1.284 - exit (0); 1.285 - } 1.286 + switch (cpu) 1.287 + { 1.288 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; 1.289 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; 1.290 + case CPU_PA_RISC2_0: 1.291 + #if defined(_SC_KERNEL_BITS) 1.292 + switch (bits) 1.293 + { 1.294 + case 64: puts ("hppa2.0w"); break; 1.295 + case 32: puts ("hppa2.0n"); break; 1.296 + default: puts ("hppa2.0"); break; 1.297 + } break; 1.298 + #else /* !defined(_SC_KERNEL_BITS) */ 1.299 + puts ("hppa2.0"); break; 1.300 + #endif 1.301 + default: puts ("hppa1.0"); break; 1.302 + } 1.303 + exit (0); 1.304 + } 1.305 EOF 1.306 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` 1.307 test -z "$HP_ARCH" && HP_ARCH=hppa 1.308 @@ -665,7 +686,7 @@ 1.309 # => hppa64-hp-hpux11.23 1.310 1.311 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | 1.312 - grep __LP64__ >/dev/null 1.313 + grep -q __LP64__ 1.314 then 1.315 HP_ARCH="hppa2.0w" 1.316 else 1.317 @@ -736,22 +757,22 @@ 1.318 exit ;; 1.319 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) 1.320 echo c1-convex-bsd 1.321 - exit ;; 1.322 + exit ;; 1.323 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) 1.324 if getsysinfo -f scalar_acc 1.325 then echo c32-convex-bsd 1.326 else echo c2-convex-bsd 1.327 fi 1.328 - exit ;; 1.329 + exit ;; 1.330 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) 1.331 echo c34-convex-bsd 1.332 - exit ;; 1.333 + exit ;; 1.334 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) 1.335 echo c38-convex-bsd 1.336 - exit ;; 1.337 + exit ;; 1.338 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) 1.339 echo c4-convex-bsd 1.340 - exit ;; 1.341 + exit ;; 1.342 CRAY*Y-MP:*:*:*) 1.343 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 1.344 exit ;; 1.345 @@ -775,14 +796,14 @@ 1.346 exit ;; 1.347 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 1.348 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 1.349 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 1.350 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 1.351 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 1.352 - exit ;; 1.353 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 1.354 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 1.355 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 1.356 + exit ;; 1.357 5000:UNIX_System_V:4.*:*) 1.358 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 1.359 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 1.360 - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 1.361 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 1.362 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 1.363 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 1.364 exit ;; 1.365 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 1.366 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 1.367 @@ -794,13 +815,12 @@ 1.368 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 1.369 exit ;; 1.370 *:FreeBSD:*:*) 1.371 - case ${UNAME_MACHINE} in 1.372 - pc98) 1.373 - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 1.374 + UNAME_PROCESSOR=`/usr/bin/uname -p` 1.375 + case ${UNAME_PROCESSOR} in 1.376 amd64) 1.377 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 1.378 *) 1.379 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 1.380 + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 1.381 esac 1.382 exit ;; 1.383 i*:CYGWIN*:*) 1.384 @@ -809,19 +829,22 @@ 1.385 *:MINGW*:*) 1.386 echo ${UNAME_MACHINE}-pc-mingw32 1.387 exit ;; 1.388 + i*:MSYS*:*) 1.389 + echo ${UNAME_MACHINE}-pc-msys 1.390 + exit ;; 1.391 i*:windows32*:*) 1.392 - # uname -m includes "-pc" on this system. 1.393 - echo ${UNAME_MACHINE}-mingw32 1.394 + # uname -m includes "-pc" on this system. 1.395 + echo ${UNAME_MACHINE}-mingw32 1.396 exit ;; 1.397 i*:PW*:*) 1.398 echo ${UNAME_MACHINE}-pc-pw32 1.399 exit ;; 1.400 - *:Interix*:[3456]*) 1.401 - case ${UNAME_MACHINE} in 1.402 + *:Interix*:*) 1.403 + case ${UNAME_MACHINE} in 1.404 x86) 1.405 echo i586-pc-interix${UNAME_RELEASE} 1.406 exit ;; 1.407 - EM64T | authenticamd) 1.408 + authenticamd | genuineintel | EM64T) 1.409 echo x86_64-unknown-interix${UNAME_RELEASE} 1.410 exit ;; 1.411 IA64) 1.412 @@ -831,6 +854,9 @@ 1.413 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 1.414 echo i${UNAME_MACHINE}-pc-mks 1.415 exit ;; 1.416 + 8664:Windows_NT:*) 1.417 + echo x86_64-pc-mks 1.418 + exit ;; 1.419 i*:Windows_NT*:* | Pentium*:Windows_NT*:*) 1.420 # How do we know it's Interix rather than the generic POSIX subsystem? 1.421 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we 1.422 @@ -860,6 +886,27 @@ 1.423 i*86:Minix:*:*) 1.424 echo ${UNAME_MACHINE}-pc-minix 1.425 exit ;; 1.426 + aarch64:Linux:*:*) 1.427 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.428 + exit ;; 1.429 + aarch64_be:Linux:*:*) 1.430 + UNAME_MACHINE=aarch64_be 1.431 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.432 + exit ;; 1.433 + alpha:Linux:*:*) 1.434 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 1.435 + EV5) UNAME_MACHINE=alphaev5 ;; 1.436 + EV56) UNAME_MACHINE=alphaev56 ;; 1.437 + PCA56) UNAME_MACHINE=alphapca56 ;; 1.438 + PCA57) UNAME_MACHINE=alphapca56 ;; 1.439 + EV6) UNAME_MACHINE=alphaev6 ;; 1.440 + EV67) UNAME_MACHINE=alphaev67 ;; 1.441 + EV68*) UNAME_MACHINE=alphaev68 ;; 1.442 + esac 1.443 + objdump --private-headers /bin/sh | grep -q ld.so.1 1.444 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 1.445 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 1.446 + exit ;; 1.447 arm*:Linux:*:*) 1.448 eval $set_cc_for_build 1.449 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 1.450 @@ -867,20 +914,40 @@ 1.451 then 1.452 echo ${UNAME_MACHINE}-unknown-linux-gnu 1.453 else 1.454 - echo ${UNAME_MACHINE}-unknown-linux-gnueabi 1.455 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ 1.456 + | grep -q __ARM_PCS_VFP 1.457 + then 1.458 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi 1.459 + else 1.460 + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf 1.461 + fi 1.462 fi 1.463 exit ;; 1.464 avr32*:Linux:*:*) 1.465 echo ${UNAME_MACHINE}-unknown-linux-gnu 1.466 exit ;; 1.467 cris:Linux:*:*) 1.468 - echo cris-axis-linux-gnu 1.469 + echo ${UNAME_MACHINE}-axis-linux-gnu 1.470 exit ;; 1.471 crisv32:Linux:*:*) 1.472 - echo crisv32-axis-linux-gnu 1.473 + echo ${UNAME_MACHINE}-axis-linux-gnu 1.474 exit ;; 1.475 frv:Linux:*:*) 1.476 - echo frv-unknown-linux-gnu 1.477 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.478 + exit ;; 1.479 + hexagon:Linux:*:*) 1.480 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.481 + exit ;; 1.482 + i*86:Linux:*:*) 1.483 + LIBC=gnu 1.484 + eval $set_cc_for_build 1.485 + sed 's/^ //' << EOF >$dummy.c 1.486 + #ifdef __dietlibc__ 1.487 + LIBC=dietlibc 1.488 + #endif 1.489 +EOF 1.490 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` 1.491 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 1.492 exit ;; 1.493 ia64:Linux:*:*) 1.494 echo ${UNAME_MACHINE}-unknown-linux-gnu 1.495 @@ -891,74 +958,33 @@ 1.496 m68*:Linux:*:*) 1.497 echo ${UNAME_MACHINE}-unknown-linux-gnu 1.498 exit ;; 1.499 - mips:Linux:*:*) 1.500 + mips:Linux:*:* | mips64:Linux:*:*) 1.501 eval $set_cc_for_build 1.502 sed 's/^ //' << EOF >$dummy.c 1.503 #undef CPU 1.504 - #undef mips 1.505 - #undef mipsel 1.506 + #undef ${UNAME_MACHINE} 1.507 + #undef ${UNAME_MACHINE}el 1.508 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 1.509 - CPU=mipsel 1.510 + CPU=${UNAME_MACHINE}el 1.511 #else 1.512 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 1.513 - CPU=mips 1.514 + CPU=${UNAME_MACHINE} 1.515 #else 1.516 CPU= 1.517 #endif 1.518 #endif 1.519 EOF 1.520 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 1.521 - /^CPU/{ 1.522 - s: ::g 1.523 - p 1.524 - }'`" 1.525 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 1.526 - ;; 1.527 - mips64:Linux:*:*) 1.528 - eval $set_cc_for_build 1.529 - sed 's/^ //' << EOF >$dummy.c 1.530 - #undef CPU 1.531 - #undef mips64 1.532 - #undef mips64el 1.533 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 1.534 - CPU=mips64el 1.535 - #else 1.536 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 1.537 - CPU=mips64 1.538 - #else 1.539 - CPU= 1.540 - #endif 1.541 - #endif 1.542 -EOF 1.543 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 1.544 - /^CPU/{ 1.545 - s: ::g 1.546 - p 1.547 - }'`" 1.548 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 1.549 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 1.550 ;; 1.551 or32:Linux:*:*) 1.552 - echo or32-unknown-linux-gnu 1.553 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.554 exit ;; 1.555 - ppc:Linux:*:*) 1.556 - echo powerpc-unknown-linux-gnu 1.557 + padre:Linux:*:*) 1.558 + echo sparc-unknown-linux-gnu 1.559 exit ;; 1.560 - ppc64:Linux:*:*) 1.561 - echo powerpc64-unknown-linux-gnu 1.562 - exit ;; 1.563 - alpha:Linux:*:*) 1.564 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 1.565 - EV5) UNAME_MACHINE=alphaev5 ;; 1.566 - EV56) UNAME_MACHINE=alphaev56 ;; 1.567 - PCA56) UNAME_MACHINE=alphapca56 ;; 1.568 - PCA57) UNAME_MACHINE=alphapca56 ;; 1.569 - EV6) UNAME_MACHINE=alphaev6 ;; 1.570 - EV67) UNAME_MACHINE=alphaev67 ;; 1.571 - EV68*) UNAME_MACHINE=alphaev68 ;; 1.572 - esac 1.573 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null 1.574 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 1.575 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 1.576 + parisc64:Linux:*:* | hppa64:Linux:*:*) 1.577 + echo hppa64-unknown-linux-gnu 1.578 exit ;; 1.579 parisc:Linux:*:* | hppa:Linux:*:*) 1.580 # Look for CPU level 1.581 @@ -968,14 +994,17 @@ 1.582 *) echo hppa-unknown-linux-gnu ;; 1.583 esac 1.584 exit ;; 1.585 - parisc64:Linux:*:* | hppa64:Linux:*:*) 1.586 - echo hppa64-unknown-linux-gnu 1.587 + ppc64:Linux:*:*) 1.588 + echo powerpc64-unknown-linux-gnu 1.589 + exit ;; 1.590 + ppc:Linux:*:*) 1.591 + echo powerpc-unknown-linux-gnu 1.592 exit ;; 1.593 s390:Linux:*:* | s390x:Linux:*:*) 1.594 echo ${UNAME_MACHINE}-ibm-linux 1.595 exit ;; 1.596 sh64*:Linux:*:*) 1.597 - echo ${UNAME_MACHINE}-unknown-linux-gnu 1.598 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.599 exit ;; 1.600 sh*:Linux:*:*) 1.601 echo ${UNAME_MACHINE}-unknown-linux-gnu 1.602 @@ -983,78 +1012,18 @@ 1.603 sparc:Linux:*:* | sparc64:Linux:*:*) 1.604 echo ${UNAME_MACHINE}-unknown-linux-gnu 1.605 exit ;; 1.606 + tile*:Linux:*:*) 1.607 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.608 + exit ;; 1.609 vax:Linux:*:*) 1.610 echo ${UNAME_MACHINE}-dec-linux-gnu 1.611 exit ;; 1.612 x86_64:Linux:*:*) 1.613 - echo x86_64-unknown-linux-gnu 1.614 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.615 exit ;; 1.616 xtensa*:Linux:*:*) 1.617 - echo ${UNAME_MACHINE}-unknown-linux-gnu 1.618 + echo ${UNAME_MACHINE}-unknown-linux-gnu 1.619 exit ;; 1.620 - i*86:Linux:*:*) 1.621 - # The BFD linker knows what the default object file format is, so 1.622 - # first see if it will tell us. cd to the root directory to prevent 1.623 - # problems with other programs or directories called `ld' in the path. 1.624 - # Set LC_ALL=C to ensure ld outputs messages in English. 1.625 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ 1.626 - | sed -ne '/supported targets:/!d 1.627 - s/[ ][ ]*/ /g 1.628 - s/.*supported targets: *// 1.629 - s/ .*// 1.630 - p'` 1.631 - case "$ld_supported_targets" in 1.632 - elf32-i386) 1.633 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" 1.634 - ;; 1.635 - a.out-i386-linux) 1.636 - echo "${UNAME_MACHINE}-pc-linux-gnuaout" 1.637 - exit ;; 1.638 - coff-i386) 1.639 - echo "${UNAME_MACHINE}-pc-linux-gnucoff" 1.640 - exit ;; 1.641 - "") 1.642 - # Either a pre-BFD a.out linker (linux-gnuoldld) or 1.643 - # one that does not give us useful --help. 1.644 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" 1.645 - exit ;; 1.646 - esac 1.647 - # Determine whether the default compiler is a.out or elf 1.648 - eval $set_cc_for_build 1.649 - sed 's/^ //' << EOF >$dummy.c 1.650 - #include <features.h> 1.651 - #ifdef __ELF__ 1.652 - # ifdef __GLIBC__ 1.653 - # if __GLIBC__ >= 2 1.654 - LIBC=gnu 1.655 - # else 1.656 - LIBC=gnulibc1 1.657 - # endif 1.658 - # else 1.659 - LIBC=gnulibc1 1.660 - # endif 1.661 - #else 1.662 - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) 1.663 - LIBC=gnu 1.664 - #else 1.665 - LIBC=gnuaout 1.666 - #endif 1.667 - #endif 1.668 - #ifdef __dietlibc__ 1.669 - LIBC=dietlibc 1.670 - #endif 1.671 -EOF 1.672 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 1.673 - /^LIBC/{ 1.674 - s: ::g 1.675 - p 1.676 - }'`" 1.677 - test x"${LIBC}" != x && { 1.678 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 1.679 - exit 1.680 - } 1.681 - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } 1.682 - ;; 1.683 i*86:DYNIX/ptx:4*:*) 1.684 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 1.685 # earlier versions are messed up and put the nodename in both 1.686 @@ -1062,11 +1031,11 @@ 1.687 echo i386-sequent-sysv4 1.688 exit ;; 1.689 i*86:UNIX_SV:4.2MP:2.*) 1.690 - # Unixware is an offshoot of SVR4, but it has its own version 1.691 - # number series starting with 2... 1.692 - # I am not positive that other SVR4 systems won't match this, 1.693 + # Unixware is an offshoot of SVR4, but it has its own version 1.694 + # number series starting with 2... 1.695 + # I am not positive that other SVR4 systems won't match this, 1.696 # I just have to hope. -- rms. 1.697 - # Use sysv4.2uw... so that sysv4* matches it. 1.698 + # Use sysv4.2uw... so that sysv4* matches it. 1.699 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 1.700 exit ;; 1.701 i*86:OS/2:*:*) 1.702 @@ -1083,7 +1052,7 @@ 1.703 i*86:syllable:*:*) 1.704 echo ${UNAME_MACHINE}-pc-syllable 1.705 exit ;; 1.706 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) 1.707 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) 1.708 echo i386-unknown-lynxos${UNAME_RELEASE} 1.709 exit ;; 1.710 i*86:*DOS:*:*) 1.711 @@ -1098,7 +1067,7 @@ 1.712 fi 1.713 exit ;; 1.714 i*86:*:5:[678]*) 1.715 - # UnixWare 7.x, OpenUNIX and OpenServer 6. 1.716 + # UnixWare 7.x, OpenUNIX and OpenServer 6. 1.717 case `/bin/uname -X | grep "^Machine"` in 1.718 *486*) UNAME_MACHINE=i486 ;; 1.719 *Pentium) UNAME_MACHINE=i586 ;; 1.720 @@ -1126,10 +1095,13 @@ 1.721 exit ;; 1.722 pc:*:*:*) 1.723 # Left here for compatibility: 1.724 - # uname -m prints for DJGPP always 'pc', but it prints nothing about 1.725 - # the processor, so we play safe by assuming i386. 1.726 - echo i386-pc-msdosdjgpp 1.727 - exit ;; 1.728 + # uname -m prints for DJGPP always 'pc', but it prints nothing about 1.729 + # the processor, so we play safe by assuming i586. 1.730 + # Note: whatever this is, it MUST be the same as what config.sub 1.731 + # prints for the "djgpp" host, or else GDB configury will decide that 1.732 + # this is a cross-build. 1.733 + echo i586-pc-msdosdjgpp 1.734 + exit ;; 1.735 Intel:Mach:3*:*) 1.736 echo i386-pc-mach3 1.737 exit ;; 1.738 @@ -1164,8 +1136,18 @@ 1.739 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1.740 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 1.741 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 1.742 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1.743 - && { echo i486-ncr-sysv4; exit; } ;; 1.744 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1.745 + && { echo i486-ncr-sysv4; exit; } ;; 1.746 + NCR*:*:4.2:* | MPRAS*:*:4.2:*) 1.747 + OS_REL='.3' 1.748 + test -r /etc/.relid \ 1.749 + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 1.750 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1.751 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } 1.752 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1.753 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } 1.754 + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ 1.755 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 1.756 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 1.757 echo m68k-unknown-lynxos${UNAME_RELEASE} 1.758 exit ;; 1.759 @@ -1178,7 +1160,7 @@ 1.760 rs6000:LynxOS:2.*:*) 1.761 echo rs6000-unknown-lynxos${UNAME_RELEASE} 1.762 exit ;; 1.763 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) 1.764 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) 1.765 echo powerpc-unknown-lynxos${UNAME_RELEASE} 1.766 exit ;; 1.767 SM[BE]S:UNIX_SV:*:*) 1.768 @@ -1198,10 +1180,10 @@ 1.769 echo ns32k-sni-sysv 1.770 fi 1.771 exit ;; 1.772 - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 1.773 - # says <Richard.M.Bartel@ccMail.Census.GOV> 1.774 - echo i586-unisys-sysv4 1.775 - exit ;; 1.776 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 1.777 + # says <Richard.M.Bartel@ccMail.Census.GOV> 1.778 + echo i586-unisys-sysv4 1.779 + exit ;; 1.780 *:UNIX_System_V:4*:FTX*) 1.781 # From Gerald Hewes <hewes@openmarket.com>. 1.782 # How about differentiating between stratus architectures? -djm 1.783 @@ -1227,11 +1209,11 @@ 1.784 exit ;; 1.785 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) 1.786 if [ -d /usr/nec ]; then 1.787 - echo mips-nec-sysv${UNAME_RELEASE} 1.788 + echo mips-nec-sysv${UNAME_RELEASE} 1.789 else 1.790 - echo mips-unknown-sysv${UNAME_RELEASE} 1.791 + echo mips-unknown-sysv${UNAME_RELEASE} 1.792 fi 1.793 - exit ;; 1.794 + exit ;; 1.795 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. 1.796 echo powerpc-be-beos 1.797 exit ;; 1.798 @@ -1241,6 +1223,9 @@ 1.799 BePC:BeOS:*:*) # BeOS running on Intel PC compatible. 1.800 echo i586-pc-beos 1.801 exit ;; 1.802 + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. 1.803 + echo i586-pc-haiku 1.804 + exit ;; 1.805 SX-4:SUPER-UX:*:*) 1.806 echo sx4-nec-superux${UNAME_RELEASE} 1.807 exit ;; 1.808 @@ -1267,12 +1252,17 @@ 1.809 exit ;; 1.810 *:Darwin:*:*) 1.811 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1.812 - eval $set_cc_for_build 1.813 - echo "int main(){}" > $dummy.c 1.814 - if test "`$CC_FOR_BUILD -o $dummy $dummy.c; file $dummy | grep -c x86_64`" = 1 ; then 1.815 - UNAME_PROCESSOR=x86_64 1.816 - fi 1.817 case $UNAME_PROCESSOR in 1.818 + i386) 1.819 + eval $set_cc_for_build 1.820 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 1.821 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ 1.822 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 1.823 + grep IS_64BIT_ARCH >/dev/null 1.824 + then 1.825 + UNAME_PROCESSOR="x86_64" 1.826 + fi 1.827 + fi ;; 1.828 unknown) UNAME_PROCESSOR=powerpc ;; 1.829 esac 1.830 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1.831 @@ -1288,6 +1278,9 @@ 1.832 *:QNX:*:4*) 1.833 echo i386-pc-qnx 1.834 exit ;; 1.835 + NEO-?:NONSTOP_KERNEL:*:*) 1.836 + echo neo-tandem-nsk${UNAME_RELEASE} 1.837 + exit ;; 1.838 NSE-?:NONSTOP_KERNEL:*:*) 1.839 echo nse-tandem-nsk${UNAME_RELEASE} 1.840 exit ;; 1.841 @@ -1333,13 +1326,13 @@ 1.842 echo pdp10-unknown-its 1.843 exit ;; 1.844 SEI:*:*:SEIUX) 1.845 - echo mips-sei-seiux${UNAME_RELEASE} 1.846 + echo mips-sei-seiux${UNAME_RELEASE} 1.847 exit ;; 1.848 *:DragonFly:*:*) 1.849 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 1.850 exit ;; 1.851 *:*VMS:*:*) 1.852 - UNAME_MACHINE=`(uname -p) 2>/dev/null` 1.853 + UNAME_MACHINE=`(uname -p) 2>/dev/null` 1.854 case "${UNAME_MACHINE}" in 1.855 A*) echo alpha-dec-vms ; exit ;; 1.856 I*) echo ia64-dec-vms ; exit ;; 1.857 @@ -1354,6 +1347,12 @@ 1.858 i*86:rdos:*:*) 1.859 echo ${UNAME_MACHINE}-pc-rdos 1.860 exit ;; 1.861 + i*86:AROS:*:*) 1.862 + echo ${UNAME_MACHINE}-pc-aros 1.863 + exit ;; 1.864 + x86_64:VMkernel:*:*) 1.865 + echo ${UNAME_MACHINE}-unknown-esx 1.866 + exit ;; 1.867 esac 1.868 1.869 #echo '(No uname command or uname output not recognized.)' 1>&2 1.870 @@ -1376,11 +1375,11 @@ 1.871 #include <sys/param.h> 1.872 printf ("m68k-sony-newsos%s\n", 1.873 #ifdef NEWSOS4 1.874 - "4" 1.875 + "4" 1.876 #else 1.877 - "" 1.878 + "" 1.879 #endif 1.880 - ); exit (0); 1.881 + ); exit (0); 1.882 #endif 1.883 #endif 1.884
