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