| blob | 546fc481ecc16679c5486e4000e5468d1d21b433 |
1 --- config.guess
2 +++ config.guess
3 @@ -1,14 +1,12 @@
4 #! /bin/sh
5 # Attempt to guess a canonical system name.
6 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
8 -# Free Software Foundation, Inc.
9 +# Copyright 1992-2014 Free Software Foundation, Inc.
11 -timestamp='2009-11-20'
12 +timestamp='2014-03-23'
14 # This file is free software; you can redistribute it and/or modify it
15 # under the terms of the GNU General Public License as published by
16 -# the Free Software Foundation; either version 2 of the License, or
17 +# the Free Software Foundation; either version 3 of the License, or
18 # (at your option) any later version.
19 #
20 # This program is distributed in the hope that it will be useful, but
21 @@ -17,26 +15,22 @@
22 # General Public License for more details.
23 #
24 # You should have received a copy of the GNU General Public License
25 -# along with this program; if not, write to the Free Software
26 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
27 -# 02110-1301, USA.
28 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
29 #
30 # As a special exception to the GNU General Public License, if you
31 # distribute this file as part of a program that contains a
32 # configuration script generated by Autoconf, you may include it under
33 -# the same distribution terms that you use for the rest of that program.
34 -
35 -
36 -# Originally written by Per Bothner. Please send patches (context
37 -# diff format) to <config-patches@gnu.org> and include a ChangeLog
38 -# entry.
39 +# the same distribution terms that you use for the rest of that
40 +# program. This Exception is an additional permission under section 7
41 +# of the GNU General Public License, version 3 ("GPLv3").
42 #
43 -# This script attempts to guess a canonical system name similar to
44 -# config.sub. If it succeeds, it prints the system name on stdout, and
45 -# exits with 0. Otherwise, it exits with 1.
46 +# Originally written by Per Bothner.
47 #
48 # You can get the latest version of this script from:
49 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
50 +#
51 +# Please send patches with a ChangeLog entry to config-patches@gnu.org.
52 +
54 me=`echo "$0" | sed -e 's,.*/,,'`
56 @@ -56,8 +50,7 @@
57 GNU config.guess ($timestamp)
59 Originally written by Per Bothner.
60 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
61 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
62 +Copyright 1992-2014 Free Software Foundation, Inc.
64 This is free software; see the source for copying conditions. There is NO
65 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
66 @@ -139,12 +132,33 @@
67 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
68 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
70 +case "${UNAME_SYSTEM}" in
71 +Linux|GNU|GNU/*)
72 + # If the system lacks a compiler, then just pick glibc.
73 + # We could probably try harder.
74 + LIBC=gnu
75 +
76 + eval $set_cc_for_build
77 + cat <<-EOF > $dummy.c
78 + #include <features.h>
79 + #if defined(__UCLIBC__)
80 + LIBC=uclibc
81 + #elif defined(__dietlibc__)
82 + LIBC=dietlibc
83 + #else
84 + LIBC=gnu
85 + #endif
86 + EOF
87 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
88 + ;;
89 +esac
90 +
91 # Note: order is significant - the case branches are not exclusive.
93 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
94 *:NetBSD:*:*)
95 # NetBSD (nbsd) targets should (where applicable) match one or
96 - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
97 + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
98 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
99 # switched to ELF, *-*-netbsd* would select the old
100 # object file format. This provides both forward
101 @@ -180,7 +194,7 @@
102 fi
103 ;;
104 *)
105 - os=netbsd
106 + os=netbsd
107 ;;
108 esac
109 # The OS release
110 @@ -201,6 +215,10 @@
111 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
112 echo "${machine}-${os}${release}"
113 exit ;;
114 + *:Bitrig:*:*)
115 + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
116 + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
117 + exit ;;
118 *:OpenBSD:*:*)
119 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
120 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
121 @@ -223,7 +241,7 @@
122 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
123 ;;
124 *5.*)
125 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
126 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
127 ;;
128 esac
129 # According to Compaq, /usr/sbin/psrinfo has been available on
130 @@ -269,7 +287,10 @@
131 # A Xn.n version is an unreleased experimental baselevel.
132 # 1.2 uses "1.2" for uname -r.
133 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
134 - exit ;;
135 + # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
136 + exitcode=$?
137 + trap '' 0
138 + exit $exitcode ;;
139 Alpha\ *:Windows_NT*:*)
140 # How do we know it's Interix rather than the generic POSIX subsystem?
141 # Should we change UNAME_MACHINE based on the output of uname instead
142 @@ -295,12 +316,12 @@
143 echo s390-ibm-zvmoe
144 exit ;;
145 *:OS400:*:*)
146 - echo powerpc-ibm-os400
147 + echo powerpc-ibm-os400
148 exit ;;
149 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
150 echo arm-acorn-riscix${UNAME_RELEASE}
151 exit ;;
152 - arm:riscos:*:*|arm:RISCOS:*:*)
153 + arm*:riscos:*:*|arm*:RISCOS:*:*)
154 echo arm-unknown-riscos
155 exit ;;
156 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
157 @@ -394,23 +415,23 @@
158 # MiNT. But MiNT is downward compatible to TOS, so this should
159 # be no problem.
160 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
161 - echo m68k-atari-mint${UNAME_RELEASE}
162 + echo m68k-atari-mint${UNAME_RELEASE}
163 exit ;;
164 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
165 echo m68k-atari-mint${UNAME_RELEASE}
166 - exit ;;
167 + exit ;;
168 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
169 - echo m68k-atari-mint${UNAME_RELEASE}
170 + echo m68k-atari-mint${UNAME_RELEASE}
171 exit ;;
172 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
173 - echo m68k-milan-mint${UNAME_RELEASE}
174 - exit ;;
175 + echo m68k-milan-mint${UNAME_RELEASE}
176 + exit ;;
177 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
178 - echo m68k-hades-mint${UNAME_RELEASE}
179 - exit ;;
180 + echo m68k-hades-mint${UNAME_RELEASE}
181 + exit ;;
182 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
183 - echo m68k-unknown-mint${UNAME_RELEASE}
184 - exit ;;
185 + echo m68k-unknown-mint${UNAME_RELEASE}
186 + exit ;;
187 m68k:machten:*:*)
188 echo m68k-apple-machten${UNAME_RELEASE}
189 exit ;;
190 @@ -480,8 +501,8 @@
191 echo m88k-motorola-sysv3
192 exit ;;
193 AViiON:dgux:*:*)
194 - # DG/UX returns AViiON for all architectures
195 - UNAME_PROCESSOR=`/usr/bin/uname -p`
196 + # DG/UX returns AViiON for all architectures
197 + UNAME_PROCESSOR=`/usr/bin/uname -p`
198 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
199 then
200 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
201 @@ -494,7 +515,7 @@
202 else
203 echo i586-dg-dgux${UNAME_RELEASE}
204 fi
205 - exit ;;
206 + exit ;;
207 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
208 echo m88k-dolphin-sysv3
209 exit ;;
210 @@ -551,7 +572,7 @@
211 echo rs6000-ibm-aix3.2
212 fi
213 exit ;;
214 - *:AIX:*:[456])
215 + *:AIX:*:[4567])
216 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
217 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
218 IBM_ARCH=rs6000
219 @@ -594,52 +615,52 @@
220 9000/[678][0-9][0-9])
221 if [ -x /usr/bin/getconf ]; then
222 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
223 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
224 - case "${sc_cpu_version}" in
225 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
226 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
227 - 532) # CPU_PA_RISC2_0
228 - case "${sc_kernel_bits}" in
229 - 32) HP_ARCH="hppa2.0n" ;;
230 - 64) HP_ARCH="hppa2.0w" ;;
231 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
232 + case "${sc_cpu_version}" in
233 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
234 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
235 + 532) # CPU_PA_RISC2_0
236 + case "${sc_kernel_bits}" in
237 + 32) HP_ARCH="hppa2.0n" ;;
238 + 64) HP_ARCH="hppa2.0w" ;;
239 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
240 - esac ;;
241 - esac
242 + esac ;;
243 + esac
244 fi
245 if [ "${HP_ARCH}" = "" ]; then
246 eval $set_cc_for_build
247 - sed 's/^ //' << EOF >$dummy.c
248 + sed 's/^ //' << EOF >$dummy.c
249 +
250 + #define _HPUX_SOURCE
251 + #include <stdlib.h>
252 + #include <unistd.h>
253 +
254 + int main ()
255 + {
256 + #if defined(_SC_KERNEL_BITS)
257 + long bits = sysconf(_SC_KERNEL_BITS);
258 + #endif
259 + long cpu = sysconf (_SC_CPU_VERSION);
261 - #define _HPUX_SOURCE
262 - #include <stdlib.h>
263 - #include <unistd.h>
264 -
265 - int main ()
266 - {
267 - #if defined(_SC_KERNEL_BITS)
268 - long bits = sysconf(_SC_KERNEL_BITS);
269 - #endif
270 - long cpu = sysconf (_SC_CPU_VERSION);
271 -
272 - switch (cpu)
273 - {
274 - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
275 - case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
276 - case CPU_PA_RISC2_0:
277 - #if defined(_SC_KERNEL_BITS)
278 - switch (bits)
279 - {
280 - case 64: puts ("hppa2.0w"); break;
281 - case 32: puts ("hppa2.0n"); break;
282 - default: puts ("hppa2.0"); break;
283 - } break;
284 - #else /* !defined(_SC_KERNEL_BITS) */
285 - puts ("hppa2.0"); break;
286 - #endif
287 - default: puts ("hppa1.0"); break;
288 - }
289 - exit (0);
290 - }
291 + switch (cpu)
292 + {
293 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
294 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
295 + case CPU_PA_RISC2_0:
296 + #if defined(_SC_KERNEL_BITS)
297 + switch (bits)
298 + {
299 + case 64: puts ("hppa2.0w"); break;
300 + case 32: puts ("hppa2.0n"); break;
301 + default: puts ("hppa2.0"); break;
302 + } break;
303 + #else /* !defined(_SC_KERNEL_BITS) */
304 + puts ("hppa2.0"); break;
305 + #endif
306 + default: puts ("hppa1.0"); break;
307 + }
308 + exit (0);
309 + }
310 EOF
311 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
312 test -z "$HP_ARCH" && HP_ARCH=hppa
313 @@ -730,22 +751,22 @@
314 exit ;;
315 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
316 echo c1-convex-bsd
317 - exit ;;
318 + exit ;;
319 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
320 if getsysinfo -f scalar_acc
321 then echo c32-convex-bsd
322 else echo c2-convex-bsd
323 fi
324 - exit ;;
325 + exit ;;
326 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
327 echo c34-convex-bsd
328 - exit ;;
329 + exit ;;
330 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
331 echo c38-convex-bsd
332 - exit ;;
333 + exit ;;
334 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
335 echo c4-convex-bsd
336 - exit ;;
337 + exit ;;
338 CRAY*Y-MP:*:*:*)
339 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
340 exit ;;
341 @@ -769,14 +790,14 @@
342 exit ;;
343 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
344 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
345 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
346 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
347 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
348 - exit ;;
349 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
350 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
351 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
352 + exit ;;
353 5000:UNIX_System_V:4.*:*)
354 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
355 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
356 - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
357 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
358 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
359 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
360 exit ;;
361 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
362 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
363 @@ -788,30 +809,35 @@
364 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
365 exit ;;
366 *:FreeBSD:*:*)
367 - case ${UNAME_MACHINE} in
368 - pc98)
369 - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
370 + UNAME_PROCESSOR=`/usr/bin/uname -p`
371 + case ${UNAME_PROCESSOR} in
372 amd64)
373 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
374 *)
375 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
376 + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
377 esac
378 exit ;;
379 i*:CYGWIN*:*)
380 echo ${UNAME_MACHINE}-pc-cygwin
381 exit ;;
382 + *:MINGW64*:*)
383 + echo ${UNAME_MACHINE}-pc-mingw64
384 + exit ;;
385 *:MINGW*:*)
386 echo ${UNAME_MACHINE}-pc-mingw32
387 exit ;;
388 + *:MSYS*:*)
389 + echo ${UNAME_MACHINE}-pc-msys
390 + exit ;;
391 i*:windows32*:*)
392 - # uname -m includes "-pc" on this system.
393 - echo ${UNAME_MACHINE}-mingw32
394 + # uname -m includes "-pc" on this system.
395 + echo ${UNAME_MACHINE}-mingw32
396 exit ;;
397 i*:PW*:*)
398 echo ${UNAME_MACHINE}-pc-pw32
399 exit ;;
400 *:Interix*:*)
401 - case ${UNAME_MACHINE} in
402 + case ${UNAME_MACHINE} in
403 x86)
404 echo i586-pc-interix${UNAME_RELEASE}
405 exit ;;
406 @@ -848,15 +874,22 @@
407 exit ;;
408 *:GNU:*:*)
409 # the GNU system
410 - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
411 + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
412 exit ;;
413 *:GNU/*:*:*)
414 # other systems with GNU libc and userland
415 - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
416 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
417 exit ;;
418 i*86:Minix:*:*)
419 echo ${UNAME_MACHINE}-pc-minix
420 exit ;;
421 + aarch64:Linux:*:*)
422 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
423 + exit ;;
424 + aarch64_be:Linux:*:*)
425 + UNAME_MACHINE=aarch64_be
426 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
427 + exit ;;
428 alpha:Linux:*:*)
429 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
430 EV5) UNAME_MACHINE=alphaev5 ;;
431 @@ -866,52 +899,56 @@
432 EV6) UNAME_MACHINE=alphaev6 ;;
433 EV67) UNAME_MACHINE=alphaev67 ;;
434 EV68*) UNAME_MACHINE=alphaev68 ;;
435 - esac
436 + esac
437 objdump --private-headers /bin/sh | grep -q ld.so.1
438 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
439 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
440 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
441 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
442 + exit ;;
443 + arc:Linux:*:* | arceb:Linux:*:*)
444 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
445 exit ;;
446 arm*:Linux:*:*)
447 eval $set_cc_for_build
448 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
449 | grep -q __ARM_EABI__
450 then
451 - echo ${UNAME_MACHINE}-unknown-linux-gnu
452 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
453 else
454 - echo ${UNAME_MACHINE}-unknown-linux-gnueabi
455 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
456 + | grep -q __ARM_PCS_VFP
457 + then
458 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
459 + else
460 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
461 + fi
462 fi
463 exit ;;
464 avr32*:Linux:*:*)
465 - echo ${UNAME_MACHINE}-unknown-linux-gnu
466 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
467 exit ;;
468 cris:Linux:*:*)
469 - echo cris-axis-linux-gnu
470 + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
471 exit ;;
472 crisv32:Linux:*:*)
473 - echo crisv32-axis-linux-gnu
474 + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
475 exit ;;
476 frv:Linux:*:*)
477 - echo frv-unknown-linux-gnu
478 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
479 + exit ;;
480 + hexagon:Linux:*:*)
481 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
482 exit ;;
483 i*86:Linux:*:*)
484 - LIBC=gnu
485 - eval $set_cc_for_build
486 - sed 's/^ //' << EOF >$dummy.c
487 - #ifdef __dietlibc__
488 - LIBC=dietlibc
489 - #endif
490 -EOF
491 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
492 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
493 + echo ${UNAME_MACHINE}-pc-linux-${LIBC}
494 exit ;;
495 ia64:Linux:*:*)
496 - echo ${UNAME_MACHINE}-unknown-linux-gnu
497 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
498 exit ;;
499 m32r*:Linux:*:*)
500 - echo ${UNAME_MACHINE}-unknown-linux-gnu
501 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
502 exit ;;
503 m68*:Linux:*:*)
504 - echo ${UNAME_MACHINE}-unknown-linux-gnu
505 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
506 exit ;;
507 mips:Linux:*:* | mips64:Linux:*:*)
508 eval $set_cc_for_build
509 @@ -930,51 +967,63 @@
510 #endif
511 EOF
512 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
513 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
514 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
515 ;;
516 - or32:Linux:*:*)
517 - echo or32-unknown-linux-gnu
518 + openrisc*:Linux:*:*)
519 + echo or1k-unknown-linux-${LIBC}
520 + exit ;;
521 + or32:Linux:*:* | or1k*:Linux:*:*)
522 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
523 exit ;;
524 padre:Linux:*:*)
525 - echo sparc-unknown-linux-gnu
526 + echo sparc-unknown-linux-${LIBC}
527 exit ;;
528 parisc64:Linux:*:* | hppa64:Linux:*:*)
529 - echo hppa64-unknown-linux-gnu
530 + echo hppa64-unknown-linux-${LIBC}
531 exit ;;
532 parisc:Linux:*:* | hppa:Linux:*:*)
533 # Look for CPU level
534 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
535 - PA7*) echo hppa1.1-unknown-linux-gnu ;;
536 - PA8*) echo hppa2.0-unknown-linux-gnu ;;
537 - *) echo hppa-unknown-linux-gnu ;;
538 + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
539 + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
540 + *) echo hppa-unknown-linux-${LIBC} ;;
541 esac
542 exit ;;
543 ppc64:Linux:*:*)
544 - echo powerpc64-unknown-linux-gnu
545 + echo powerpc64-unknown-linux-${LIBC}
546 exit ;;
547 ppc:Linux:*:*)
548 - echo powerpc-unknown-linux-gnu
549 + echo powerpc-unknown-linux-${LIBC}
550 + exit ;;
551 + ppc64le:Linux:*:*)
552 + echo powerpc64le-unknown-linux-${LIBC}
553 + exit ;;
554 + ppcle:Linux:*:*)
555 + echo powerpcle-unknown-linux-${LIBC}
556 exit ;;
557 s390:Linux:*:* | s390x:Linux:*:*)
558 - echo ${UNAME_MACHINE}-ibm-linux
559 + echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
560 exit ;;
561 sh64*:Linux:*:*)
562 - echo ${UNAME_MACHINE}-unknown-linux-gnu
563 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
564 exit ;;
565 sh*:Linux:*:*)
566 - echo ${UNAME_MACHINE}-unknown-linux-gnu
567 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
568 exit ;;
569 sparc:Linux:*:* | sparc64:Linux:*:*)
570 - echo ${UNAME_MACHINE}-unknown-linux-gnu
571 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
572 + exit ;;
573 + tile*:Linux:*:*)
574 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
575 exit ;;
576 vax:Linux:*:*)
577 - echo ${UNAME_MACHINE}-dec-linux-gnu
578 + echo ${UNAME_MACHINE}-dec-linux-${LIBC}
579 exit ;;
580 x86_64:Linux:*:*)
581 - echo x86_64-unknown-linux-gnu
582 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
583 exit ;;
584 xtensa*:Linux:*:*)
585 - echo ${UNAME_MACHINE}-unknown-linux-gnu
586 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
587 exit ;;
588 i*86:DYNIX/ptx:4*:*)
589 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
590 @@ -983,11 +1032,11 @@
591 echo i386-sequent-sysv4
592 exit ;;
593 i*86:UNIX_SV:4.2MP:2.*)
594 - # Unixware is an offshoot of SVR4, but it has its own version
595 - # number series starting with 2...
596 - # I am not positive that other SVR4 systems won't match this,
597 + # Unixware is an offshoot of SVR4, but it has its own version
598 + # number series starting with 2...
599 + # I am not positive that other SVR4 systems won't match this,
600 # I just have to hope. -- rms.
601 - # Use sysv4.2uw... so that sysv4* matches it.
602 + # Use sysv4.2uw... so that sysv4* matches it.
603 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
604 exit ;;
605 i*86:OS/2:*:*)
606 @@ -1019,7 +1068,7 @@
607 fi
608 exit ;;
609 i*86:*:5:[678]*)
610 - # UnixWare 7.x, OpenUNIX and OpenServer 6.
611 + # UnixWare 7.x, OpenUNIX and OpenServer 6.
612 case `/bin/uname -X | grep "^Machine"` in
613 *486*) UNAME_MACHINE=i486 ;;
614 *Pentium) UNAME_MACHINE=i586 ;;
615 @@ -1047,13 +1096,13 @@
616 exit ;;
617 pc:*:*:*)
618 # Left here for compatibility:
619 - # uname -m prints for DJGPP always 'pc', but it prints nothing about
620 - # the processor, so we play safe by assuming i586.
621 + # uname -m prints for DJGPP always 'pc', but it prints nothing about
622 + # the processor, so we play safe by assuming i586.
623 # Note: whatever this is, it MUST be the same as what config.sub
624 # prints for the "djgpp" host, or else GDB configury will decide that
625 # this is a cross-build.
626 echo i586-pc-msdosdjgpp
627 - exit ;;
628 + exit ;;
629 Intel:Mach:3*:*)
630 echo i386-pc-mach3
631 exit ;;
632 @@ -1088,8 +1137,8 @@
633 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
634 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
635 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
636 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
637 - && { echo i486-ncr-sysv4; exit; } ;;
638 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
639 + && { echo i486-ncr-sysv4; exit; } ;;
640 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
641 OS_REL='.3'
642 test -r /etc/.relid \
643 @@ -1132,10 +1181,10 @@
644 echo ns32k-sni-sysv
645 fi
646 exit ;;
647 - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
648 - # says <Richard.M.Bartel@ccMail.Census.GOV>
649 - echo i586-unisys-sysv4
650 - exit ;;
651 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
652 + # says <Richard.M.Bartel@ccMail.Census.GOV>
653 + echo i586-unisys-sysv4
654 + exit ;;
655 *:UNIX_System_V:4*:FTX*)
656 # From Gerald Hewes <hewes@openmarket.com>.
657 # How about differentiating between stratus architectures? -djm
658 @@ -1161,11 +1210,11 @@
659 exit ;;
660 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
661 if [ -d /usr/nec ]; then
662 - echo mips-nec-sysv${UNAME_RELEASE}
663 + echo mips-nec-sysv${UNAME_RELEASE}
664 else
665 - echo mips-unknown-sysv${UNAME_RELEASE}
666 + echo mips-unknown-sysv${UNAME_RELEASE}
667 fi
668 - exit ;;
669 + exit ;;
670 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
671 echo powerpc-be-beos
672 exit ;;
673 @@ -1178,6 +1227,9 @@
674 BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
675 echo i586-pc-haiku
676 exit ;;
677 + x86_64:Haiku:*:*)
678 + echo x86_64-unknown-haiku
679 + exit ;;
680 SX-4:SUPER-UX:*:*)
681 echo sx4-nec-superux${UNAME_RELEASE}
682 exit ;;
683 @@ -1204,19 +1256,31 @@
684 exit ;;
685 *:Darwin:*:*)
686 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
687 - case $UNAME_PROCESSOR in
688 - i386)
689 - eval $set_cc_for_build
690 - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
691 - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
692 - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
693 - grep IS_64BIT_ARCH >/dev/null
694 - then
695 - UNAME_PROCESSOR="x86_64"
696 - fi
697 - fi ;;
698 - unknown) UNAME_PROCESSOR=powerpc ;;
699 - esac
700 + eval $set_cc_for_build
701 + if test "$UNAME_PROCESSOR" = unknown ; then
702 + UNAME_PROCESSOR=powerpc
703 + fi
704 + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
705 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
706 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
707 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
708 + grep IS_64BIT_ARCH >/dev/null
709 + then
710 + case $UNAME_PROCESSOR in
711 + i386) UNAME_PROCESSOR=x86_64 ;;
712 + powerpc) UNAME_PROCESSOR=powerpc64 ;;
713 + esac
714 + fi
715 + fi
716 + elif test "$UNAME_PROCESSOR" = i386 ; then
717 + # Avoid executing cc on OS X 10.9, as it ships with a stub
718 + # that puts up a graphical alert prompting to install
719 + # developer tools. Any system running Mac OS X 10.7 or
720 + # later (Darwin 11 and later) is required to have a 64-bit
721 + # processor. This is not true of the ARM version of Darwin
722 + # that Apple uses in portable devices.
723 + UNAME_PROCESSOR=x86_64
724 + fi
725 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
726 exit ;;
727 *:procnto*:*:* | *:QNX:[0123456789]*:*)
728 @@ -1230,7 +1294,10 @@
729 *:QNX:*:4*)
730 echo i386-pc-qnx
731 exit ;;
732 - NSE-?:NONSTOP_KERNEL:*:*)
733 + NEO-?:NONSTOP_KERNEL:*:*)
734 + echo neo-tandem-nsk${UNAME_RELEASE}
735 + exit ;;
736 + NSE-*:NONSTOP_KERNEL:*:*)
737 echo nse-tandem-nsk${UNAME_RELEASE}
738 exit ;;
739 NSR-?:NONSTOP_KERNEL:*:*)
740 @@ -1275,13 +1342,13 @@
741 echo pdp10-unknown-its
742 exit ;;
743 SEI:*:*:SEIUX)
744 - echo mips-sei-seiux${UNAME_RELEASE}
745 + echo mips-sei-seiux${UNAME_RELEASE}
746 exit ;;
747 *:DragonFly:*:*)
748 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
749 exit ;;
750 *:*VMS:*:*)
751 - UNAME_MACHINE=`(uname -p) 2>/dev/null`
752 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
753 case "${UNAME_MACHINE}" in
754 A*) echo alpha-dec-vms ; exit ;;
755 I*) echo ia64-dec-vms ; exit ;;
756 @@ -1299,158 +1366,10 @@
757 i*86:AROS:*:*)
758 echo ${UNAME_MACHINE}-pc-aros
759 exit ;;
760 -esac
761 -
762 -#echo '(No uname command or uname output not recognized.)' 1>&2
763 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
764 -
765 -eval $set_cc_for_build
766 -cat >$dummy.c <<EOF
767 -#ifdef _SEQUENT_
768 -# include <sys/types.h>
769 -# include <sys/utsname.h>
770 -#endif
771 -main ()
772 -{
773 -#if defined (sony)
774 -#if defined (MIPSEB)
775 - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
776 - I don't know.... */
777 - printf ("mips-sony-bsd\n"); exit (0);
778 -#else
779 -#include <sys/param.h>
780 - printf ("m68k-sony-newsos%s\n",
781 -#ifdef NEWSOS4
782 - "4"
783 -#else
784 - ""
785 -#endif
786 - ); exit (0);
787 -#endif
788 -#endif
789 -
790 -#if defined (__arm) && defined (__acorn) && defined (__unix)
791 - printf ("arm-acorn-riscix\n"); exit (0);
792 -#endif
793 -
794 -#if defined (hp300) && !defined (hpux)
795 - printf ("m68k-hp-bsd\n"); exit (0);
796 -#endif
797 -
798 -#if defined (NeXT)
799 -#if !defined (__ARCHITECTURE__)
800 -#define __ARCHITECTURE__ "m68k"
801 -#endif
802 - int version;
803 - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
804 - if (version < 4)
805 - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
806 - else
807 - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
808 - exit (0);
809 -#endif
810 -
811 -#if defined (MULTIMAX) || defined (n16)
812 -#if defined (UMAXV)
813 - printf ("ns32k-encore-sysv\n"); exit (0);
814 -#else
815 -#if defined (CMU)
816 - printf ("ns32k-encore-mach\n"); exit (0);
817 -#else
818 - printf ("ns32k-encore-bsd\n"); exit (0);
819 -#endif
820 -#endif
821 -#endif
822 -
823 -#if defined (__386BSD__)
824 - printf ("i386-pc-bsd\n"); exit (0);
825 -#endif
826 -
827 -#if defined (sequent)
828 -#if defined (i386)
829 - printf ("i386-sequent-dynix\n"); exit (0);
830 -#endif
831 -#if defined (ns32000)
832 - printf ("ns32k-sequent-dynix\n"); exit (0);
833 -#endif
834 -#endif
835 -
836 -#if defined (_SEQUENT_)
837 - struct utsname un;
838 -
839 - uname(&un);
840 -
841 - if (strncmp(un.version, "V2", 2) == 0) {
842 - printf ("i386-sequent-ptx2\n"); exit (0);
843 - }
844 - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
845 - printf ("i386-sequent-ptx1\n"); exit (0);
846 - }
847 - printf ("i386-sequent-ptx\n"); exit (0);
848 -
849 -#endif
850 -
851 -#if defined (vax)
852 -# if !defined (ultrix)
853 -# include <sys/param.h>
854 -# if defined (BSD)
855 -# if BSD == 43
856 - printf ("vax-dec-bsd4.3\n"); exit (0);
857 -# else
858 -# if BSD == 199006
859 - printf ("vax-dec-bsd4.3reno\n"); exit (0);
860 -# else
861 - printf ("vax-dec-bsd\n"); exit (0);
862 -# endif
863 -# endif
864 -# else
865 - printf ("vax-dec-bsd\n"); exit (0);
866 -# endif
867 -# else
868 - printf ("vax-dec-ultrix\n"); exit (0);
869 -# endif
870 -#endif
871 -
872 -#if defined (alliant) && defined (i860)
873 - printf ("i860-alliant-bsd\n"); exit (0);
874 -#endif
875 -
876 - exit (1);
877 -}
878 -EOF
879 -
880 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
881 - { echo "$SYSTEM_NAME"; exit; }
882 -
883 -# Apollos put the system type in the environment.
884 -
885 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
886 -
887 -# Convex versions that predate uname can use getsysinfo(1)
888 -
889 -if [ -x /usr/convex/getsysinfo ]
890 -then
891 - case `getsysinfo -f cpu_type` in
892 - c1*)
893 - echo c1-convex-bsd
894 - exit ;;
895 - c2*)
896 - if getsysinfo -f scalar_acc
897 - then echo c32-convex-bsd
898 - else echo c2-convex-bsd
899 - fi
900 + x86_64:VMkernel:*:*)
901 + echo ${UNAME_MACHINE}-unknown-esx
902 exit ;;
903 - c34*)
904 - echo c34-convex-bsd
905 - exit ;;
906 - c38*)
907 - echo c38-convex-bsd
908 - exit ;;
909 - c4*)
910 - echo c4-convex-bsd
911 - exit ;;
912 - esac
913 -fi
914 +esac
916 cat >&2 <<EOF
917 $0: unable to guess system type
918 --- config.sub
919 +++ config.sub
920 @@ -1,38 +1,31 @@
921 #! /bin/sh
922 # Configuration validation subroutine script.
923 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
924 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
925 -# Free Software Foundation, Inc.
926 -
927 -timestamp='2009-11-20'
928 -
929 -# This file is (in principle) common to ALL GNU software.
930 -# The presence of a machine in this file suggests that SOME GNU software
931 -# can handle that machine. It does not imply ALL GNU software can.
932 -#
933 -# This file is free software; you can redistribute it and/or modify
934 -# it under the terms of the GNU General Public License as published by
935 -# the Free Software Foundation; either version 2 of the License, or
936 +# Copyright 1992-2014 Free Software Foundation, Inc.
937 +
938 +timestamp='2014-05-01'
939 +
940 +# This file is free software; you can redistribute it and/or modify it
941 +# under the terms of the GNU General Public License as published by
942 +# the Free Software Foundation; either version 3 of the License, or
943 # (at your option) any later version.
944 #
945 -# This program is distributed in the hope that it will be useful,
946 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
947 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
948 -# GNU General Public License for more details.
949 +# This program is distributed in the hope that it will be useful, but
950 +# WITHOUT ANY WARRANTY; without even the implied warranty of
951 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
952 +# General Public License for more details.
953 #
954 # You should have received a copy of the GNU General Public License
955 -# along with this program; if not, write to the Free Software
956 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
957 -# 02110-1301, USA.
958 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
959 #
960 # As a special exception to the GNU General Public License, if you
961 # distribute this file as part of a program that contains a
962 # configuration script generated by Autoconf, you may include it under
963 -# the same distribution terms that you use for the rest of that program.
964 +# the same distribution terms that you use for the rest of that
965 +# program. This Exception is an additional permission under section 7
966 +# of the GNU General Public License, version 3 ("GPLv3").
969 -# Please send patches to <config-patches@gnu.org>. Submit a context
970 -# diff and a properly formatted GNU ChangeLog entry.
971 +# Please send patches with a ChangeLog entry to config-patches@gnu.org.
972 #
973 # Configuration subroutine to validate and canonicalize a configuration type.
974 # Supply the specified configuration type as an argument.
975 @@ -75,8 +68,7 @@
976 version="\
977 GNU config.sub ($timestamp)
979 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
980 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
981 +Copyright 1992-2014 Free Software Foundation, Inc.
983 This is free software; see the source for copying conditions. There is NO
984 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
985 @@ -123,13 +115,18 @@
986 # Here we must recognize all the valid KERNEL-OS combinations.
987 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
988 case $maybe_os in
989 - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
990 - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
991 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
992 + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
993 + knetbsd*-gnu* | netbsd*-gnu* | \
994 kopensolaris*-gnu* | \
995 storm-chaos* | os2-emx* | rtmk-nova*)
996 os=-$maybe_os
997 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
998 ;;
999 + android-linux)
1000 + os=-linux-android
1001 + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
1002 + ;;
1003 *)
1004 basic_machine=`echo $1 | sed 's/-[^-]*$//'`
1005 if [ $basic_machine != $1 ]
1006 @@ -152,12 +149,12 @@
1007 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1008 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1009 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1010 - -apple | -axis | -knuth | -cray | -microblaze)
1011 + -apple | -axis | -knuth | -cray | -microblaze*)
1012 os=
1013 basic_machine=$1
1014 ;;
1015 - -bluegene*)
1016 - os=-cnk
1017 + -bluegene*)
1018 + os=-cnk
1019 ;;
1020 -sim | -cisco | -oki | -wec | -winbond)
1021 os=
1022 @@ -173,10 +170,10 @@
1023 os=-chorusos
1024 basic_machine=$1
1025 ;;
1026 - -chorusrdb)
1027 - os=-chorusrdb
1028 + -chorusrdb)
1029 + os=-chorusrdb
1030 basic_machine=$1
1031 - ;;
1032 + ;;
1033 -hiux*)
1034 os=-hiuxwe2
1035 ;;
1036 @@ -221,6 +218,12 @@
1037 -isc*)
1038 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1039 ;;
1040 + -lynx*178)
1041 + os=-lynxos178
1042 + ;;
1043 + -lynx*5)
1044 + os=-lynxos5
1045 + ;;
1046 -lynx*)
1047 os=-lynxos
1048 ;;
1049 @@ -245,20 +248,28 @@
1050 # Some are omitted here because they have special meanings below.
1051 1750a | 580 \
1052 | a29k \
1053 + | aarch64 | aarch64_be \
1054 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1055 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1056 | am33_2.0 \
1057 - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
1058 + | arc | arceb \
1059 + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
1060 + | avr | avr32 \
1061 + | be32 | be64 \
1062 | bfin \
1063 - | c4x | clipper \
1064 + | c4x | c8051 | clipper \
1065 | d10v | d30v | dlx | dsp16xx \
1066 + | epiphany \
1067 | fido | fr30 | frv \
1068 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1069 + | hexagon \
1070 | i370 | i860 | i960 | ia64 \
1071 | ip2k | iq2000 \
1072 + | k1om \
1073 + | le32 | le64 \
1074 | lm32 \
1075 | m32c | m32r | m32rle | m68000 | m68k | m88k \
1076 - | maxq | mb | microblaze | mcore | mep | metag \
1077 + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
1078 | mips | mipsbe | mipseb | mipsel | mipsle \
1079 | mips16 \
1080 | mips64 | mips64el \
1081 @@ -272,38 +283,50 @@
1082 | mips64vr5900 | mips64vr5900el \
1083 | mipsisa32 | mipsisa32el \
1084 | mipsisa32r2 | mipsisa32r2el \
1085 + | mipsisa32r6 | mipsisa32r6el \
1086 | mipsisa64 | mipsisa64el \
1087 | mipsisa64r2 | mipsisa64r2el \
1088 + | mipsisa64r6 | mipsisa64r6el \
1089 | mipsisa64sb1 | mipsisa64sb1el \
1090 | mipsisa64sr71k | mipsisa64sr71kel \
1091 + | mipsr5900 | mipsr5900el \
1092 | mipstx39 | mipstx39el \
1093 | mn10200 | mn10300 \
1094 | moxie \
1095 | mt \
1096 | msp430 \
1097 - | nios | nios2 \
1098 + | nds32 | nds32le | nds32be \
1099 + | nios | nios2 | nios2eb | nios2el \
1100 | ns16k | ns32k \
1101 - | or32 \
1102 + | open8 | or1k | or1knd | or32 \
1103 | pdp10 | pdp11 | pj | pjl \
1104 - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1105 + | powerpc | powerpc64 | powerpc64le | powerpcle \
1106 | pyramid \
1107 - | rx \
1108 + | rl78 | rx \
1109 | score \
1110 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
1111 | sh64 | sh64le \
1112 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
1113 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
1114 - | spu | strongarm \
1115 - | tahoe | thumb | tic4x | tic80 | tron \
1116 + | spu \
1117 + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
1118 | ubicom32 \
1119 - | v850 | v850e \
1120 + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
1121 | we32k \
1122 - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
1123 + | x86 | xc16x | xstormy16 | xtensa \
1124 | z8k | z80)
1125 basic_machine=$basic_machine-unknown
1126 ;;
1127 - m6811 | m68hc11 | m6812 | m68hc12 | picochip)
1128 - # Motorola 68HC11/12.
1129 + c54x)
1130 + basic_machine=tic54x-unknown
1131 + ;;
1132 + c55x)
1133 + basic_machine=tic55x-unknown
1134 + ;;
1135 + c6x)
1136 + basic_machine=tic6x-unknown
1137 + ;;
1138 + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
1139 basic_machine=$basic_machine-unknown
1140 os=-none
1141 ;;
1142 @@ -313,6 +336,21 @@
1143 basic_machine=mt-unknown
1144 ;;
1146 + strongarm | thumb | xscale)
1147 + basic_machine=arm-unknown
1148 + ;;
1149 + xgate)
1150 + basic_machine=$basic_machine-unknown
1151 + os=-none
1152 + ;;
1153 + xscaleeb)
1154 + basic_machine=armeb-unknown
1155 + ;;
1156 +
1157 + xscaleel)
1158 + basic_machine=armel-unknown
1159 + ;;
1160 +
1161 # We use `pc' rather than `unknown'
1162 # because (1) that's what they normally are, and
1163 # (2) the word "unknown" tends to confuse beginning users.
1164 @@ -327,25 +365,31 @@
1165 # Recognize the basic CPU types with company name.
1166 580-* \
1167 | a29k-* \
1168 + | aarch64-* | aarch64_be-* \
1169 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
1170 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
1171 - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
1172 + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
1173 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
1174 | avr-* | avr32-* \
1175 + | be32-* | be64-* \
1176 | bfin-* | bs2000-* \
1177 - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
1178 - | clipper-* | craynv-* | cydra-* \
1179 + | c[123]* | c30-* | [cjt]90-* | c4x-* \
1180 + | c8051-* | clipper-* | craynv-* | cydra-* \
1181 | d10v-* | d30v-* | dlx-* \
1182 | elxsi-* \
1183 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
1184 | h8300-* | h8500-* \
1185 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1186 + | hexagon-* \
1187 | i*86-* | i860-* | i960-* | ia64-* \
1188 | ip2k-* | iq2000-* \
1189 + | k1om-* \
1190 + | le32-* | le64-* \
1191 | lm32-* \
1192 | m32c-* | m32r-* | m32rle-* \
1193 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
1194 - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
1195 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
1196 + | microblaze-* | microblazeel-* \
1197 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
1198 | mips16-* \
1199 | mips64-* | mips64el-* \
1200 @@ -359,33 +403,41 @@
1201 | mips64vr5900-* | mips64vr5900el-* \
1202 | mipsisa32-* | mipsisa32el-* \
1203 | mipsisa32r2-* | mipsisa32r2el-* \
1204 + | mipsisa32r6-* | mipsisa32r6el-* \
1205 | mipsisa64-* | mipsisa64el-* \
1206 | mipsisa64r2-* | mipsisa64r2el-* \
1207 + | mipsisa64r6-* | mipsisa64r6el-* \
1208 | mipsisa64sb1-* | mipsisa64sb1el-* \
1209 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
1210 + | mipsr5900-* | mipsr5900el-* \
1211 | mipstx39-* | mipstx39el-* \
1212 | mmix-* \
1213 | mt-* \
1214 | msp430-* \
1215 - | nios-* | nios2-* \
1216 + | nds32-* | nds32le-* | nds32be-* \
1217 + | nios-* | nios2-* | nios2eb-* | nios2el-* \
1218 | none-* | np1-* | ns16k-* | ns32k-* \
1219 + | open8-* \
1220 + | or1k*-* \
1221 | orion-* \
1222 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1223 - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
1224 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
1225 | pyramid-* \
1226 - | romp-* | rs6000-* | rx-* \
1227 + | rl78-* | romp-* | rs6000-* | rx-* \
1228 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
1229 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1230 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
1231 | sparclite-* \
1232 - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
1233 - | tahoe-* | thumb-* \
1234 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
1235 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
1236 + | tahoe-* \
1237 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
1238 + | tile*-* \
1239 | tron-* \
1240 | ubicom32-* \
1241 - | v850-* | v850e-* | vax-* \
1242 + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
1243 + | vax-* \
1244 | we32k-* \
1245 - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
1246 + | x86-* | x86_64-* | xc16x-* | xps100-* \
1247 | xstormy16-* | xtensa*-* \
1248 | ymp-* \
1249 | z8k-* | z80-*)
1250 @@ -410,7 +462,7 @@
1251 basic_machine=a29k-amd
1252 os=-udi
1253 ;;
1254 - abacus)
1255 + abacus)
1256 basic_machine=abacus-unknown
1257 ;;
1258 adobe68k)
1259 @@ -480,11 +532,20 @@
1260 basic_machine=powerpc-ibm
1261 os=-cnk
1262 ;;
1263 + c54x-*)
1264 + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
1265 + ;;
1266 + c55x-*)
1267 + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
1268 + ;;
1269 + c6x-*)
1270 + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
1271 + ;;
1272 c90)
1273 basic_machine=c90-cray
1274 os=-unicos
1275 ;;
1276 - cegcc)
1277 + cegcc)
1278 basic_machine=arm-unknown
1279 os=-cegcc
1280 ;;
1281 @@ -516,7 +577,7 @@
1282 basic_machine=craynv-cray
1283 os=-unicosmp
1284 ;;
1285 - cr16)
1286 + cr16 | cr16-*)
1287 basic_machine=cr16-unknown
1288 os=-elf
1289 ;;
1290 @@ -674,7 +735,6 @@
1291 i370-ibm* | ibm*)
1292 basic_machine=i370-ibm
1293 ;;
1294 -# I'm not sure what "Sysv32" means. Should this be sysv3.2?
1295 i*86v32)
1296 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1297 os=-sysv32
1298 @@ -732,11 +792,15 @@
1299 basic_machine=ns32k-utek
1300 os=-sysv
1301 ;;
1302 - microblaze)
1303 + microblaze*)
1304 basic_machine=microblaze-xilinx
1305 ;;
1306 + mingw64)
1307 + basic_machine=x86_64-pc
1308 + os=-mingw64
1309 + ;;
1310 mingw32)
1311 - basic_machine=i386-pc
1312 + basic_machine=i686-pc
1313 os=-mingw32
1314 ;;
1315 mingw32ce)
1316 @@ -771,10 +835,18 @@
1317 ms1-*)
1318 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
1319 ;;
1320 + msys)
1321 + basic_machine=i686-pc
1322 + os=-msys
1323 + ;;
1324 mvs)
1325 basic_machine=i370-ibm
1326 os=-mvs
1327 ;;
1328 + nacl)
1329 + basic_machine=le32-unknown
1330 + os=-nacl
1331 + ;;
1332 ncr3000)
1333 basic_machine=i486-ncr
1334 os=-sysv4
1335 @@ -839,6 +911,12 @@
1336 np1)
1337 basic_machine=np1-gould
1338 ;;
1339 + neo-tandem)
1340 + basic_machine=neo-tandem
1341 + ;;
1342 + nse-tandem)
1343 + basic_machine=nse-tandem
1344 + ;;
1345 nsr-tandem)
1346 basic_machine=nsr-tandem
1347 ;;
1348 @@ -921,9 +999,10 @@
1349 ;;
1350 power) basic_machine=power-ibm
1351 ;;
1352 - ppc) basic_machine=powerpc-unknown
1353 + ppc | ppcbe) basic_machine=powerpc-unknown
1354 ;;
1355 - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1356 + ppc-* | ppcbe-*)
1357 + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1358 ;;
1359 ppcle | powerpclittle | ppc-le | powerpc-little)
1360 basic_machine=powerpcle-unknown
1361 @@ -948,7 +1027,11 @@
1362 basic_machine=i586-unknown
1363 os=-pw32
1364 ;;
1365 - rdos)
1366 + rdos | rdos64)
1367 + basic_machine=x86_64-pc
1368 + os=-rdos
1369 + ;;
1370 + rdos32)
1371 basic_machine=i386-pc
1372 os=-rdos
1373 ;;
1374 @@ -1017,6 +1100,9 @@
1375 basic_machine=i860-stratus
1376 os=-sysv4
1377 ;;
1378 + strongarm-* | thumb-*)
1379 + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1380 + ;;
1381 sun2)
1382 basic_machine=m68000-sun
1383 ;;
1384 @@ -1073,20 +1159,8 @@
1385 basic_machine=t90-cray
1386 os=-unicos
1387 ;;
1388 - tic54x | c54x*)
1389 - basic_machine=tic54x-unknown
1390 - os=-coff
1391 - ;;
1392 - tic55x | c55x*)
1393 - basic_machine=tic55x-unknown
1394 - os=-coff
1395 - ;;
1396 - tic6x | c6x*)
1397 - basic_machine=tic6x-unknown
1398 - os=-coff
1399 - ;;
1400 tile*)
1401 - basic_machine=tile-unknown
1402 + basic_machine=$basic_machine-unknown
1403 os=-linux-gnu
1404 ;;
1405 tx39)
1406 @@ -1156,6 +1230,9 @@
1407 xps | xps100)
1408 basic_machine=xps100-honeywell
1409 ;;
1410 + xscale-* | xscalee[bl]-*)
1411 + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1412 + ;;
1413 ymp)
1414 basic_machine=ymp-cray
1415 os=-unicos
1416 @@ -1253,11 +1330,11 @@
1417 if [ x"$os" != x"" ]
1418 then
1419 case $os in
1420 - # First match some system type aliases
1421 - # that might get confused with valid system types.
1422 + # First match some system type aliases
1423 + # that might get confused with valid system types.
1424 # -solaris* is a basic system type, with this one exception.
1425 - -auroraux)
1426 - os=-auroraux
1427 + -auroraux)
1428 + os=-auroraux
1429 ;;
1430 -solaris1 | -solaris1.*)
1431 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1432 @@ -1281,20 +1358,21 @@
1433 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1434 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1435 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1436 - | -sym* | -kopensolaris* \
1437 + | -sym* | -kopensolaris* | -plan9* \
1438 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1439 | -aos* | -aros* \
1440 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1441 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1442 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1443 - | -openbsd* | -solidbsd* \
1444 + | -bitrig* | -openbsd* | -solidbsd* \
1445 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1446 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1447 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1448 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1449 | -chorusos* | -chorusrdb* | -cegcc* \
1450 - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1451 - | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
1452 + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1453 + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1454 + | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1455 | -uxpv* | -beos* | -mpeix* | -udk* \
1456 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1457 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1458 @@ -1302,7 +1380,7 @@
1459 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1460 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1461 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1462 - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1463 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
1464 # Remember, each alternative MUST END IN *, to match a version number.
1465 ;;
1466 -qnx*)
1467 @@ -1341,7 +1419,7 @@
1468 -opened*)
1469 os=-openedition
1470 ;;
1471 - -os400*)
1472 + -os400*)
1473 os=-os400
1474 ;;
1475 -wince*)
1476 @@ -1390,7 +1468,7 @@
1477 -sinix*)
1478 os=-sysv4
1479 ;;
1480 - -tpf*)
1481 + -tpf*)
1482 os=-tpf
1483 ;;
1484 -triton*)
1485 @@ -1426,15 +1504,14 @@
1486 -aros*)
1487 os=-aros
1488 ;;
1489 - -kaos*)
1490 - os=-kaos
1491 - ;;
1492 -zvmoe)
1493 os=-zvmoe
1494 ;;
1495 -dicos*)
1496 os=-dicos
1497 ;;
1498 + -nacl*)
1499 + ;;
1500 -none)
1501 ;;
1502 *)
1503 @@ -1457,10 +1534,10 @@
1504 # system, and we'll never get to this point.
1506 case $basic_machine in
1507 - score-*)
1508 + score-*)
1509 os=-elf
1510 ;;
1511 - spu-*)
1512 + spu-*)
1513 os=-elf
1514 ;;
1515 *-acorn)
1516 @@ -1472,8 +1549,23 @@
1517 arm*-semi)
1518 os=-aout
1519 ;;
1520 - c4x-* | tic4x-*)
1521 - os=-coff
1522 + c4x-* | tic4x-*)
1523 + os=-coff
1524 + ;;
1525 + c8051-*)
1526 + os=-elf
1527 + ;;
1528 + hexagon-*)
1529 + os=-elf
1530 + ;;
1531 + tic54x-*)
1532 + os=-coff
1533 + ;;
1534 + tic55x-*)
1535 + os=-coff
1536 + ;;
1537 + tic6x-*)
1538 + os=-coff
1539 ;;
1540 # This must come before the *-dec entry.
1541 pdp10-*)
1542 @@ -1493,14 +1585,11 @@
1543 ;;
1544 m68000-sun)
1545 os=-sunos3
1546 - # This also exists in the configure program, but was not the
1547 - # default.
1548 - # os=-sunos4
1549 ;;
1550 m68*-cisco)
1551 os=-aout
1552 ;;
1553 - mep-*)
1554 + mep-*)
1555 os=-elf
1556 ;;
1557 mips*-cisco)
1558 @@ -1527,7 +1616,7 @@
1559 *-ibm)
1560 os=-aix
1561 ;;
1562 - *-knuth)
1563 + *-knuth)
1564 os=-mmixware
1565 ;;
1566 *-wec)