| blob | a1b628a7eaee022c5f7a8a1abcacb28f360250fd |
1 diff -Naur lmarbles-1.0.8-orig/config.guess lmarbles-1.0.8/config.guess
2 --- lmarbles-1.0.8-orig/config.guess 2013-10-12 15:43:21.528033430 +0200
3 +++ lmarbles-1.0.8/config.guess 2012-03-30 22:31:00.000000000 +0200
4 @@ -1,9 +1,10 @@
5 #! /bin/sh
6 # Attempt to guess a canonical system name.
7 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
8 -# Free Software Foundation, Inc.
9 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
10 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
11 +# 2011, 2012 Free Software Foundation, Inc.
13 -timestamp='2001-09-04'
14 +timestamp='2012-02-10'
16 # This file is free software; you can redistribute it and/or modify it
17 # under the terms of the GNU General Public License as published by
18 @@ -16,23 +17,24 @@
19 # General Public License for more details.
20 #
21 # You should have received a copy of the GNU General Public License
22 -# along with this program; if not, write to the Free Software
23 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
24 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
25 #
26 # As a special exception to the GNU General Public License, if you
27 # distribute this file as part of a program that contains a
28 # configuration script generated by Autoconf, you may include it under
29 # the same distribution terms that you use for the rest of that program.
31 -# Written by Per Bothner <bothner@cygnus.com>.
32 -# Please send patches to <config-patches@gnu.org>.
33 +
34 +# Originally written by Per Bothner. Please send patches (context
35 +# diff format) to <config-patches@gnu.org> and include a ChangeLog
36 +# entry.
37 #
38 # This script attempts to guess a canonical system name similar to
39 # config.sub. If it succeeds, it prints the system name on stdout, and
40 # exits with 0. Otherwise, it exits with 1.
41 #
42 -# The plan is that this can be called by configure scripts if you
43 -# don't specify an explicit build system type.
44 +# You can get the latest version of this script from:
45 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
47 me=`echo "$0" | sed -e 's,.*/,,'`
49 @@ -52,7 +54,8 @@
50 GNU config.guess ($timestamp)
52 Originally written by Per Bothner.
53 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
54 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
55 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
56 Free Software Foundation, Inc.
58 This is free software; see the source for copying conditions. There is NO
59 @@ -65,11 +68,11 @@
60 while test $# -gt 0 ; do
61 case $1 in
62 --time-stamp | --time* | -t )
63 - echo "$timestamp" ; exit 0 ;;
64 + echo "$timestamp" ; exit ;;
65 --version | -v )
66 - echo "$version" ; exit 0 ;;
67 + echo "$version" ; exit ;;
68 --help | --h* | -h )
69 - echo "$usage"; exit 0 ;;
70 + echo "$usage"; exit ;;
71 -- ) # Stop option processing
72 shift; break ;;
73 - ) # Use stdin as input.
74 @@ -87,30 +90,42 @@
75 exit 1
76 fi
78 +trap 'exit 1' 1 2 15
80 -dummy=dummy-$$
81 -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
82 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
83 +# compiler to aid in system detection is discouraged as it requires
84 +# temporary files to be created and, as you can see below, it is a
85 +# headache to deal with in a portable fashion.
87 -# CC_FOR_BUILD -- compiler used by this script.
88 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
89 # use `HOST_CC' if defined, but it is deprecated.
91 -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
92 - ,,) echo "int dummy(){}" > $dummy.c ;
93 - for c in cc gcc c89 ; do
94 - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
95 - if test $? = 0 ; then
96 +# Portable tmp directory creation inspired by the Autoconf team.
97 +
98 +set_cc_for_build='
99 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
100 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
101 +: ${TMPDIR=/tmp} ;
102 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
103 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
104 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
105 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
106 +dummy=$tmp/dummy ;
107 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
108 +case $CC_FOR_BUILD,$HOST_CC,$CC in
109 + ,,) echo "int x;" > $dummy.c ;
110 + for c in cc gcc c89 c99 ; do
111 + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
112 CC_FOR_BUILD="$c"; break ;
113 fi ;
114 done ;
115 - rm -f $dummy.c $dummy.o $dummy.rel ;
116 if test x"$CC_FOR_BUILD" = x ; then
117 CC_FOR_BUILD=no_compiler_found ;
118 fi
119 ;;
120 ,,*) CC_FOR_BUILD=$CC ;;
121 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
122 -esac'
123 +esac ; set_cc_for_build= ;'
125 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
126 # (ghazi@noc.rutgers.edu 1994-08-24)
127 @@ -127,32 +142,34 @@
129 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
130 *:NetBSD:*:*)
131 - # Netbsd (nbsd) targets should (where applicable) match one or
132 - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
133 + # NetBSD (nbsd) targets should (where applicable) match one or
134 + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
135 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
136 # switched to ELF, *-*-netbsd* would select the old
137 # object file format. This provides both forward
138 # compatibility and a consistent mechanism for selecting the
139 # object file format.
140 - # Determine the machine/vendor (is the vendor relevant).
141 - case "${UNAME_MACHINE}" in
142 - amiga) machine=m68k-unknown ;;
143 - arm32) machine=arm-unknown ;;
144 - atari*) machine=m68k-atari ;;
145 - sun3*) machine=m68k-sun ;;
146 - mac68k) machine=m68k-apple ;;
147 - macppc) machine=powerpc-apple ;;
148 - hp3[0-9][05]) machine=m68k-hp ;;
149 - ibmrt|romp-ibm) machine=romp-ibm ;;
150 - *) machine=${UNAME_MACHINE}-unknown ;;
151 + #
152 + # Note: NetBSD doesn't particularly care about the vendor
153 + # portion of the name. We always set it to "unknown".
154 + sysctl="sysctl -n hw.machine_arch"
155 + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
156 + /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
157 + case "${UNAME_MACHINE_ARCH}" in
158 + armeb) machine=armeb-unknown ;;
159 + arm*) machine=arm-unknown ;;
160 + sh3el) machine=shl-unknown ;;
161 + sh3eb) machine=sh-unknown ;;
162 + sh5el) machine=sh5le-unknown ;;
163 + *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
164 esac
165 # The Operating System including object format, if it has switched
166 # to ELF recently, or will in the future.
167 - case "${UNAME_MACHINE}" in
168 - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
169 + case "${UNAME_MACHINE_ARCH}" in
170 + arm*|i386|m68k|ns32k|sh3*|sparc|vax)
171 eval $set_cc_for_build
172 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
173 - | grep __ELF__ >/dev/null
174 + | grep -q __ELF__
175 then
176 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
177 # Return netbsd for either. FIX?
178 @@ -162,124 +179,135 @@
179 fi
180 ;;
181 *)
182 - os=netbsd
183 + os=netbsd
184 ;;
185 esac
186 # The OS release
187 - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
188 + # Debian GNU/NetBSD machines have a different userland, and
189 + # thus, need a distinct triplet. However, they do not need
190 + # kernel version information, so it can be replaced with a
191 + # suitable tag, in the style of linux-gnu.
192 + case "${UNAME_VERSION}" in
193 + Debian*)
194 + release='-gnu'
195 + ;;
196 + *)
197 + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
198 + ;;
199 + esac
200 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
201 # contains redundant information, the shorter form:
202 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
203 echo "${machine}-${os}${release}"
204 - exit 0 ;;
205 + exit ;;
206 + *:OpenBSD:*:*)
207 + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
208 + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
209 + exit ;;
210 + *:ekkoBSD:*:*)
211 + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
212 + exit ;;
213 + *:SolidBSD:*:*)
214 + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
215 + exit ;;
216 + macppc:MirBSD:*:*)
217 + echo powerpc-unknown-mirbsd${UNAME_RELEASE}
218 + exit ;;
219 + *:MirBSD:*:*)
220 + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
221 + exit ;;
222 alpha:OSF1:*:*)
223 - if test $UNAME_RELEASE = "V4.0"; then
224 + case $UNAME_RELEASE in
225 + *4.0)
226 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
227 - fi
228 + ;;
229 + *5.*)
230 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
231 + ;;
232 + esac
233 + # According to Compaq, /usr/sbin/psrinfo has been available on
234 + # OSF/1 and Tru64 systems produced since 1995. I hope that
235 + # covers most systems running today. This code pipes the CPU
236 + # types through head -n 1, so we only detect the type of CPU 0.
237 + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
238 + case "$ALPHA_CPU_TYPE" in
239 + "EV4 (21064)")
240 + UNAME_MACHINE="alpha" ;;
241 + "EV4.5 (21064)")
242 + UNAME_MACHINE="alpha" ;;
243 + "LCA4 (21066/21068)")
244 + UNAME_MACHINE="alpha" ;;
245 + "EV5 (21164)")
246 + UNAME_MACHINE="alphaev5" ;;
247 + "EV5.6 (21164A)")
248 + UNAME_MACHINE="alphaev56" ;;
249 + "EV5.6 (21164PC)")
250 + UNAME_MACHINE="alphapca56" ;;
251 + "EV5.7 (21164PC)")
252 + UNAME_MACHINE="alphapca57" ;;
253 + "EV6 (21264)")
254 + UNAME_MACHINE="alphaev6" ;;
255 + "EV6.7 (21264A)")
256 + UNAME_MACHINE="alphaev67" ;;
257 + "EV6.8CB (21264C)")
258 + UNAME_MACHINE="alphaev68" ;;
259 + "EV6.8AL (21264B)")
260 + UNAME_MACHINE="alphaev68" ;;
261 + "EV6.8CX (21264D)")
262 + UNAME_MACHINE="alphaev68" ;;
263 + "EV6.9A (21264/EV69A)")
264 + UNAME_MACHINE="alphaev69" ;;
265 + "EV7 (21364)")
266 + UNAME_MACHINE="alphaev7" ;;
267 + "EV7.9 (21364A)")
268 + UNAME_MACHINE="alphaev79" ;;
269 + esac
270 + # A Pn.n version is a patched version.
271 # A Vn.n version is a released version.
272 # A Tn.n version is a released field test version.
273 # A Xn.n version is an unreleased experimental baselevel.
274 # 1.2 uses "1.2" for uname -r.
275 - cat <<EOF >$dummy.s
276 - .data
277 -\$Lformat:
278 - .byte 37,100,45,37,120,10,0 # "%d-%x\n"
279 -
280 - .text
281 - .globl main
282 - .align 4
283 - .ent main
284 -main:
285 - .frame \$30,16,\$26,0
286 - ldgp \$29,0(\$27)
287 - .prologue 1
288 - .long 0x47e03d80 # implver \$0
289 - lda \$2,-1
290 - .long 0x47e20c21 # amask \$2,\$1
291 - lda \$16,\$Lformat
292 - mov \$0,\$17
293 - not \$1,\$18
294 - jsr \$26,printf
295 - ldgp \$29,0(\$26)
296 - mov 0,\$16
297 - jsr \$26,exit
298 - .end main
299 -EOF
300 - eval $set_cc_for_build
301 - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
302 - if test "$?" = 0 ; then
303 - case `./$dummy` in
304 - 0-0)
305 - UNAME_MACHINE="alpha"
306 - ;;
307 - 1-0)
308 - UNAME_MACHINE="alphaev5"
309 - ;;
310 - 1-1)
311 - UNAME_MACHINE="alphaev56"
312 - ;;
313 - 1-101)
314 - UNAME_MACHINE="alphapca56"
315 - ;;
316 - 2-303)
317 - UNAME_MACHINE="alphaev6"
318 - ;;
319 - 2-307)
320 - UNAME_MACHINE="alphaev67"
321 - ;;
322 - 2-1307)
323 - UNAME_MACHINE="alphaev68"
324 - ;;
325 - esac
326 - fi
327 - rm -f $dummy.s $dummy
328 - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
329 - exit 0 ;;
330 + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
331 + # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
332 + exitcode=$?
333 + trap '' 0
334 + exit $exitcode ;;
335 Alpha\ *:Windows_NT*:*)
336 # How do we know it's Interix rather than the generic POSIX subsystem?
337 # Should we change UNAME_MACHINE based on the output of uname instead
338 # of the specific Alpha model?
339 echo alpha-pc-interix
340 - exit 0 ;;
341 + exit ;;
342 21064:Windows_NT:50:3)
343 echo alpha-dec-winnt3.5
344 - exit 0 ;;
345 + exit ;;
346 Amiga*:UNIX_System_V:4.0:*)
347 echo m68k-unknown-sysv4
348 - exit 0;;
349 - amiga:OpenBSD:*:*)
350 - echo m68k-unknown-openbsd${UNAME_RELEASE}
351 - exit 0 ;;
352 + exit ;;
353 *:[Aa]miga[Oo][Ss]:*:*)
354 echo ${UNAME_MACHINE}-unknown-amigaos
355 - exit 0 ;;
356 - arc64:OpenBSD:*:*)
357 - echo mips64el-unknown-openbsd${UNAME_RELEASE}
358 - exit 0 ;;
359 - arc:OpenBSD:*:*)
360 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
361 - exit 0 ;;
362 - hkmips:OpenBSD:*:*)
363 - echo mips-unknown-openbsd${UNAME_RELEASE}
364 - exit 0 ;;
365 - pmax:OpenBSD:*:*)
366 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
367 - exit 0 ;;
368 - sgi:OpenBSD:*:*)
369 - echo mips-unknown-openbsd${UNAME_RELEASE}
370 - exit 0 ;;
371 - wgrisc:OpenBSD:*:*)
372 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
373 - exit 0 ;;
374 + exit ;;
375 + *:[Mm]orph[Oo][Ss]:*:*)
376 + echo ${UNAME_MACHINE}-unknown-morphos
377 + exit ;;
378 *:OS/390:*:*)
379 echo i370-ibm-openedition
380 - exit 0 ;;
381 + exit ;;
382 + *:z/VM:*:*)
383 + echo s390-ibm-zvmoe
384 + exit ;;
385 + *:OS400:*:*)
386 + echo powerpc-ibm-os400
387 + exit ;;
388 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
389 echo arm-acorn-riscix${UNAME_RELEASE}
390 - exit 0;;
391 + exit ;;
392 + arm:riscos:*:*|arm:RISCOS:*:*)
393 + echo arm-unknown-riscos
394 + exit ;;
395 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
396 echo hppa1.1-hitachi-hiuxmpp
397 - exit 0;;
398 + exit ;;
399 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
400 # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
401 if test "`(/bin/universe) 2>/dev/null`" = att ; then
402 @@ -287,25 +315,51 @@
403 else
404 echo pyramid-pyramid-bsd
405 fi
406 - exit 0 ;;
407 + exit ;;
408 NILE*:*:*:dcosx)
409 echo pyramid-pyramid-svr4
410 - exit 0 ;;
411 + exit ;;
412 + DRS?6000:unix:4.0:6*)
413 + echo sparc-icl-nx6
414 + exit ;;
415 + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
416 + case `/usr/bin/uname -p` in
417 + sparc) echo sparc-icl-nx7; exit ;;
418 + esac ;;
419 + s390x:SunOS:*:*)
420 + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
421 + exit ;;
422 sun4H:SunOS:5.*:*)
423 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
424 - exit 0 ;;
425 + exit ;;
426 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
427 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
428 - exit 0 ;;
429 - i86pc:SunOS:5.*:*)
430 - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
431 - exit 0 ;;
432 + exit ;;
433 + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
434 + echo i386-pc-auroraux${UNAME_RELEASE}
435 + exit ;;
436 + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
437 + eval $set_cc_for_build
438 + SUN_ARCH="i386"
439 + # If there is a compiler, see if it is configured for 64-bit objects.
440 + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
441 + # This test works for both compilers.
442 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
443 + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
444 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
445 + grep IS_64BIT_ARCH >/dev/null
446 + then
447 + SUN_ARCH="x86_64"
448 + fi
449 + fi
450 + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
451 + exit ;;
452 sun4*:SunOS:6*:*)
453 # According to config.sub, this is the proper way to canonicalize
454 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
455 # it's likely to be more like Solaris than SunOS4.
456 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
457 - exit 0 ;;
458 + exit ;;
459 sun4*:SunOS:*:*)
460 case "`/usr/bin/arch -k`" in
461 Series*|S4*)
462 @@ -314,12 +368,12 @@
463 esac
464 # Japanese Language versions have a version number like `4.1.3-JL'.
465 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
466 - exit 0 ;;
467 + exit ;;
468 sun3*:SunOS:*:*)
469 echo m68k-sun-sunos${UNAME_RELEASE}
470 - exit 0 ;;
471 + exit ;;
472 sun*:*:4.2BSD:*)
473 - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
474 + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
475 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
476 case "`/bin/arch`" in
477 sun3)
478 @@ -329,16 +383,10 @@
479 echo sparc-sun-sunos${UNAME_RELEASE}
480 ;;
481 esac
482 - exit 0 ;;
483 + exit ;;
484 aushp:SunOS:*:*)
485 echo sparc-auspex-sunos${UNAME_RELEASE}
486 - exit 0 ;;
487 - sparc*:NetBSD:*)
488 - echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
489 - exit 0 ;;
490 - atari*:OpenBSD:*:*)
491 - echo m68k-unknown-openbsd${UNAME_RELEASE}
492 - exit 0 ;;
493 + exit ;;
494 # The situation for MiNT is a little confusing. The machine name
495 # can be virtually everything (everything which is not
496 # "atarist" or "atariste" at least should have a processor
497 @@ -348,50 +396,41 @@
498 # MiNT. But MiNT is downward compatible to TOS, so this should
499 # be no problem.
500 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
501 - echo m68k-atari-mint${UNAME_RELEASE}
502 - exit 0 ;;
503 + echo m68k-atari-mint${UNAME_RELEASE}
504 + exit ;;
505 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
506 echo m68k-atari-mint${UNAME_RELEASE}
507 - exit 0 ;;
508 + exit ;;
509 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
510 - echo m68k-atari-mint${UNAME_RELEASE}
511 - exit 0 ;;
512 + echo m68k-atari-mint${UNAME_RELEASE}
513 + exit ;;
514 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
515 - echo m68k-milan-mint${UNAME_RELEASE}
516 - exit 0 ;;
517 + echo m68k-milan-mint${UNAME_RELEASE}
518 + exit ;;
519 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
520 - echo m68k-hades-mint${UNAME_RELEASE}
521 - exit 0 ;;
522 + echo m68k-hades-mint${UNAME_RELEASE}
523 + exit ;;
524 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
525 - echo m68k-unknown-mint${UNAME_RELEASE}
526 - exit 0 ;;
527 - sun3*:OpenBSD:*:*)
528 - echo m68k-unknown-openbsd${UNAME_RELEASE}
529 - exit 0 ;;
530 - mac68k:OpenBSD:*:*)
531 - echo m68k-unknown-openbsd${UNAME_RELEASE}
532 - exit 0 ;;
533 - mvme68k:OpenBSD:*:*)
534 - echo m68k-unknown-openbsd${UNAME_RELEASE}
535 - exit 0 ;;
536 - mvme88k:OpenBSD:*:*)
537 - echo m88k-unknown-openbsd${UNAME_RELEASE}
538 - exit 0 ;;
539 + echo m68k-unknown-mint${UNAME_RELEASE}
540 + exit ;;
541 + m68k:machten:*:*)
542 + echo m68k-apple-machten${UNAME_RELEASE}
543 + exit ;;
544 powerpc:machten:*:*)
545 echo powerpc-apple-machten${UNAME_RELEASE}
546 - exit 0 ;;
547 + exit ;;
548 RISC*:Mach:*:*)
549 echo mips-dec-mach_bsd4.3
550 - exit 0 ;;
551 + exit ;;
552 RISC*:ULTRIX:*:*)
553 echo mips-dec-ultrix${UNAME_RELEASE}
554 - exit 0 ;;
555 + exit ;;
556 VAX*:ULTRIX*:*:*)
557 echo vax-dec-ultrix${UNAME_RELEASE}
558 - exit 0 ;;
559 + exit ;;
560 2020:CLIX:*:* | 2430:CLIX:*:*)
561 echo clipper-intergraph-clix${UNAME_RELEASE}
562 - exit 0 ;;
563 + exit ;;
564 mips:*:*:UMIPS | mips:*:*:RISCos)
565 eval $set_cc_for_build
566 sed 's/^ //' << EOF >$dummy.c
567 @@ -415,30 +454,36 @@
568 exit (-1);
569 }
570 EOF
571 - $CC_FOR_BUILD $dummy.c -o $dummy \
572 - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
573 - && rm -f $dummy.c $dummy && exit 0
574 - rm -f $dummy.c $dummy
575 + $CC_FOR_BUILD -o $dummy $dummy.c &&
576 + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
577 + SYSTEM_NAME=`$dummy $dummyarg` &&
578 + { echo "$SYSTEM_NAME"; exit; }
579 echo mips-mips-riscos${UNAME_RELEASE}
580 - exit 0 ;;
581 + exit ;;
582 Motorola:PowerMAX_OS:*:*)
583 echo powerpc-motorola-powermax
584 - exit 0 ;;
585 + exit ;;
586 + Motorola:*:4.3:PL8-*)
587 + echo powerpc-harris-powermax
588 + exit ;;
589 + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
590 + echo powerpc-harris-powermax
591 + exit ;;
592 Night_Hawk:Power_UNIX:*:*)
593 echo powerpc-harris-powerunix
594 - exit 0 ;;
595 + exit ;;
596 m88k:CX/UX:7*:*)
597 echo m88k-harris-cxux7
598 - exit 0 ;;
599 + exit ;;
600 m88k:*:4*:R4*)
601 echo m88k-motorola-sysv4
602 - exit 0 ;;
603 + exit ;;
604 m88k:*:3*:R3*)
605 echo m88k-motorola-sysv3
606 - exit 0 ;;
607 + exit ;;
608 AViiON:dgux:*:*)
609 - # DG/UX returns AViiON for all architectures
610 - UNAME_PROCESSOR=`/usr/bin/uname -p`
611 + # DG/UX returns AViiON for all architectures
612 + UNAME_PROCESSOR=`/usr/bin/uname -p`
613 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
614 then
615 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
616 @@ -451,29 +496,29 @@
617 else
618 echo i586-dg-dgux${UNAME_RELEASE}
619 fi
620 - exit 0 ;;
621 + exit ;;
622 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
623 echo m88k-dolphin-sysv3
624 - exit 0 ;;
625 + exit ;;
626 M88*:*:R3*:*)
627 # Delta 88k system running SVR3
628 echo m88k-motorola-sysv3
629 - exit 0 ;;
630 + exit ;;
631 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
632 echo m88k-tektronix-sysv3
633 - exit 0 ;;
634 + exit ;;
635 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
636 echo m68k-tektronix-bsd
637 - exit 0 ;;
638 + exit ;;
639 *:IRIX*:*:*)
640 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
641 - exit 0 ;;
642 + exit ;;
643 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
644 - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
645 - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
646 + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
647 + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
648 i*86:AIX:*:*)
649 echo i386-ibm-aix
650 - exit 0 ;;
651 + exit ;;
652 ia64:AIX:*:*)
653 if [ -x /usr/bin/oslevel ] ; then
654 IBM_REV=`/usr/bin/oslevel`
655 @@ -481,7 +526,7 @@
656 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
657 fi
658 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
659 - exit 0 ;;
660 + exit ;;
661 *:AIX:2:3)
662 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
663 eval $set_cc_for_build
664 @@ -496,17 +541,20 @@
665 exit(0);
666 }
667 EOF
668 - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
669 - rm -f $dummy.c $dummy
670 - echo rs6000-ibm-aix3.2.5
671 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
672 + then
673 + echo "$SYSTEM_NAME"
674 + else
675 + echo rs6000-ibm-aix3.2.5
676 + fi
677 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
678 echo rs6000-ibm-aix3.2.4
679 else
680 echo rs6000-ibm-aix3.2
681 fi
682 - exit 0 ;;
683 - *:AIX:*:[45])
684 - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
685 + exit ;;
686 + *:AIX:*:[4567])
687 + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
688 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
689 IBM_ARCH=rs6000
690 else
691 @@ -518,96 +566,114 @@
692 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
693 fi
694 echo ${IBM_ARCH}-ibm-aix${IBM_REV}
695 - exit 0 ;;
696 + exit ;;
697 *:AIX:*:*)
698 echo rs6000-ibm-aix
699 - exit 0 ;;
700 + exit ;;
701 ibmrt:4.4BSD:*|romp-ibm:BSD:*)
702 echo romp-ibm-bsd4.4
703 - exit 0 ;;
704 + exit ;;
705 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
706 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
707 - exit 0 ;; # report: romp-ibm BSD 4.3
708 + exit ;; # report: romp-ibm BSD 4.3
709 *:BOSX:*:*)
710 echo rs6000-bull-bosx
711 - exit 0 ;;
712 + exit ;;
713 DPX/2?00:B.O.S.:*:*)
714 echo m68k-bull-sysv3
715 - exit 0 ;;
716 + exit ;;
717 9000/[34]??:4.3bsd:1.*:*)
718 echo m68k-hp-bsd
719 - exit 0 ;;
720 + exit ;;
721 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
722 echo m68k-hp-bsd4.4
723 - exit 0 ;;
724 + exit ;;
725 9000/[34678]??:HP-UX:*:*)
726 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
727 case "${UNAME_MACHINE}" in
728 9000/31? ) HP_ARCH=m68000 ;;
729 9000/[34]?? ) HP_ARCH=m68k ;;
730 9000/[678][0-9][0-9])
731 - case "${HPUX_REV}" in
732 - 11.[0-9][0-9])
733 - if [ -x /usr/bin/getconf ]; then
734 - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
735 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
736 - case "${sc_cpu_version}" in
737 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
738 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
739 - 532) # CPU_PA_RISC2_0
740 - case "${sc_kernel_bits}" in
741 - 32) HP_ARCH="hppa2.0n" ;;
742 - 64) HP_ARCH="hppa2.0w" ;;
743 - esac ;;
744 - esac
745 - fi ;;
746 - esac
747 - if [ "${HP_ARCH}" = "" ]; then
748 - eval $set_cc_for_build
749 - sed 's/^ //' << EOF >$dummy.c
750 -
751 - #define _HPUX_SOURCE
752 - #include <stdlib.h>
753 - #include <unistd.h>
754 -
755 - int main ()
756 - {
757 - #if defined(_SC_KERNEL_BITS)
758 - long bits = sysconf(_SC_KERNEL_BITS);
759 - #endif
760 - long cpu = sysconf (_SC_CPU_VERSION);
761 -
762 - switch (cpu)
763 - {
764 - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
765 - case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
766 - case CPU_PA_RISC2_0:
767 - #if defined(_SC_KERNEL_BITS)
768 - switch (bits)
769 - {
770 - case 64: puts ("hppa2.0w"); break;
771 - case 32: puts ("hppa2.0n"); break;
772 - default: puts ("hppa2.0"); break;
773 - } break;
774 - #else /* !defined(_SC_KERNEL_BITS) */
775 - puts ("hppa2.0"); break;
776 - #endif
777 - default: puts ("hppa1.0"); break;
778 - }
779 - exit (0);
780 - }
781 + if [ -x /usr/bin/getconf ]; then
782 + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
783 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
784 + case "${sc_cpu_version}" in
785 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
786 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
787 + 532) # CPU_PA_RISC2_0
788 + case "${sc_kernel_bits}" in
789 + 32) HP_ARCH="hppa2.0n" ;;
790 + 64) HP_ARCH="hppa2.0w" ;;
791 + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
792 + esac ;;
793 + esac
794 + fi
795 + if [ "${HP_ARCH}" = "" ]; then
796 + eval $set_cc_for_build
797 + sed 's/^ //' << EOF >$dummy.c
798 +
799 + #define _HPUX_SOURCE
800 + #include <stdlib.h>
801 + #include <unistd.h>
802 +
803 + int main ()
804 + {
805 + #if defined(_SC_KERNEL_BITS)
806 + long bits = sysconf(_SC_KERNEL_BITS);
807 + #endif
808 + long cpu = sysconf (_SC_CPU_VERSION);
809 +
810 + switch (cpu)
811 + {
812 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
813 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
814 + case CPU_PA_RISC2_0:
815 + #if defined(_SC_KERNEL_BITS)
816 + switch (bits)
817 + {
818 + case 64: puts ("hppa2.0w"); break;
819 + case 32: puts ("hppa2.0n"); break;
820 + default: puts ("hppa2.0"); break;
821 + } break;
822 + #else /* !defined(_SC_KERNEL_BITS) */
823 + puts ("hppa2.0"); break;
824 + #endif
825 + default: puts ("hppa1.0"); break;
826 + }
827 + exit (0);
828 + }
829 EOF
830 - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
831 - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
832 - rm -f $dummy.c $dummy
833 - fi ;;
834 + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
835 + test -z "$HP_ARCH" && HP_ARCH=hppa
836 + fi ;;
837 esac
838 + if [ ${HP_ARCH} = "hppa2.0w" ]
839 + then
840 + eval $set_cc_for_build
841 +
842 + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
843 + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
844 + # generating 64-bit code. GNU and HP use different nomenclature:
845 + #
846 + # $ CC_FOR_BUILD=cc ./config.guess
847 + # => hppa2.0w-hp-hpux11.23
848 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
849 + # => hppa64-hp-hpux11.23
850 +
851 + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
852 + grep -q __LP64__
853 + then
854 + HP_ARCH="hppa2.0w"
855 + else
856 + HP_ARCH="hppa64"
857 + fi
858 + fi
859 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
860 - exit 0 ;;
861 + exit ;;
862 ia64:HP-UX:*:*)
863 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
864 echo ia64-hp-hpux${HPUX_REV}
865 - exit 0 ;;
866 + exit ;;
867 3050*:HI-UX:*:*)
868 eval $set_cc_for_build
869 sed 's/^ //' << EOF >$dummy.c
870 @@ -635,158 +701,173 @@
871 exit (0);
872 }
873 EOF
874 - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
875 - rm -f $dummy.c $dummy
876 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
877 + { echo "$SYSTEM_NAME"; exit; }
878 echo unknown-hitachi-hiuxwe2
879 - exit 0 ;;
880 + exit ;;
881 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
882 echo hppa1.1-hp-bsd
883 - exit 0 ;;
884 + exit ;;
885 9000/8??:4.3bsd:*:*)
886 echo hppa1.0-hp-bsd
887 - exit 0 ;;
888 + exit ;;
889 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
890 echo hppa1.0-hp-mpeix
891 - exit 0 ;;
892 + exit ;;
893 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
894 echo hppa1.1-hp-osf
895 - exit 0 ;;
896 + exit ;;
897 hp8??:OSF1:*:*)
898 echo hppa1.0-hp-osf
899 - exit 0 ;;
900 + exit ;;
901 i*86:OSF1:*:*)
902 if [ -x /usr/sbin/sysversion ] ; then
903 echo ${UNAME_MACHINE}-unknown-osf1mk
904 else
905 echo ${UNAME_MACHINE}-unknown-osf1
906 fi
907 - exit 0 ;;
908 + exit ;;
909 parisc*:Lites*:*:*)
910 echo hppa1.1-hp-lites
911 - exit 0 ;;
912 - hppa*:OpenBSD:*:*)
913 - echo hppa-unknown-openbsd
914 - exit 0 ;;
915 + exit ;;
916 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
917 echo c1-convex-bsd
918 - exit 0 ;;
919 + exit ;;
920 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
921 if getsysinfo -f scalar_acc
922 then echo c32-convex-bsd
923 else echo c2-convex-bsd
924 fi
925 - exit 0 ;;
926 + exit ;;
927 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
928 echo c34-convex-bsd
929 - exit 0 ;;
930 + exit ;;
931 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
932 echo c38-convex-bsd
933 - exit 0 ;;
934 + exit ;;
935 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
936 echo c4-convex-bsd
937 - exit 0 ;;
938 - CRAY*X-MP:*:*:*)
939 - echo xmp-cray-unicos
940 - exit 0 ;;
941 + exit ;;
942 CRAY*Y-MP:*:*:*)
943 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
944 - exit 0 ;;
945 + exit ;;
946 CRAY*[A-Z]90:*:*:*)
947 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
948 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
949 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
950 -e 's/\.[^.]*$/.X/'
951 - exit 0 ;;
952 + exit ;;
953 CRAY*TS:*:*:*)
954 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
955 - exit 0 ;;
956 - CRAY*T3D:*:*:*)
957 - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
958 - exit 0 ;;
959 + exit ;;
960 CRAY*T3E:*:*:*)
961 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
962 - exit 0 ;;
963 + exit ;;
964 CRAY*SV1:*:*:*)
965 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
966 - exit 0 ;;
967 - CRAY-2:*:*:*)
968 - echo cray2-cray-unicos
969 - exit 0 ;;
970 + exit ;;
971 + *:UNICOS/mp:*:*)
972 + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
973 + exit ;;
974 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
975 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
976 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
977 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
978 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
979 - exit 0 ;;
980 - hp300:OpenBSD:*:*)
981 - echo m68k-unknown-openbsd${UNAME_RELEASE}
982 - exit 0 ;;
983 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
984 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
985 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
986 + exit ;;
987 + 5000:UNIX_System_V:4.*:*)
988 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
989 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
990 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
991 + exit ;;
992 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
993 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
994 - exit 0 ;;
995 + exit ;;
996 sparc*:BSD/OS:*:*)
997 echo sparc-unknown-bsdi${UNAME_RELEASE}
998 - exit 0 ;;
999 + exit ;;
1000 *:BSD/OS:*:*)
1001 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
1002 - exit 0 ;;
1003 + exit ;;
1004 *:FreeBSD:*:*)
1005 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1006 - exit 0 ;;
1007 - *:OpenBSD:*:*)
1008 - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
1009 - exit 0 ;;
1010 + UNAME_PROCESSOR=`/usr/bin/uname -p`
1011 + case ${UNAME_PROCESSOR} in
1012 + amd64)
1013 + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
1014 + *)
1015 + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
1016 + esac
1017 + exit ;;
1018 i*:CYGWIN*:*)
1019 echo ${UNAME_MACHINE}-pc-cygwin
1020 - exit 0 ;;
1021 - i*:MINGW*:*)
1022 + exit ;;
1023 + *:MINGW*:*)
1024 echo ${UNAME_MACHINE}-pc-mingw32
1025 - exit 0 ;;
1026 + exit ;;
1027 + i*:MSYS*:*)
1028 + echo ${UNAME_MACHINE}-pc-msys
1029 + exit ;;
1030 + i*:windows32*:*)
1031 + # uname -m includes "-pc" on this system.
1032 + echo ${UNAME_MACHINE}-mingw32
1033 + exit ;;
1034 i*:PW*:*)
1035 echo ${UNAME_MACHINE}-pc-pw32
1036 - exit 0 ;;
1037 + exit ;;
1038 + *:Interix*:*)
1039 + case ${UNAME_MACHINE} in
1040 + x86)
1041 + echo i586-pc-interix${UNAME_RELEASE}
1042 + exit ;;
1043 + authenticamd | genuineintel | EM64T)
1044 + echo x86_64-unknown-interix${UNAME_RELEASE}
1045 + exit ;;
1046 + IA64)
1047 + echo ia64-unknown-interix${UNAME_RELEASE}
1048 + exit ;;
1049 + esac ;;
1050 + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
1051 + echo i${UNAME_MACHINE}-pc-mks
1052 + exit ;;
1053 + 8664:Windows_NT:*)
1054 + echo x86_64-pc-mks
1055 + exit ;;
1056 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
1057 # How do we know it's Interix rather than the generic POSIX subsystem?
1058 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
1059 # UNAME_MACHINE based on the output of uname instead of i386?
1060 - echo i386-pc-interix
1061 - exit 0 ;;
1062 + echo i586-pc-interix
1063 + exit ;;
1064 i*:UWIN*:*)
1065 echo ${UNAME_MACHINE}-pc-uwin
1066 - exit 0 ;;
1067 + exit ;;
1068 + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
1069 + echo x86_64-unknown-cygwin
1070 + exit ;;
1071 p*:CYGWIN*:*)
1072 echo powerpcle-unknown-cygwin
1073 - exit 0 ;;
1074 + exit ;;
1075 prep*:SunOS:5.*:*)
1076 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1077 - exit 0 ;;
1078 + exit ;;
1079 *:GNU:*:*)
1080 + # the GNU system
1081 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
1082 - exit 0 ;;
1083 + exit ;;
1084 + *:GNU/*:*:*)
1085 + # other systems with GNU libc and userland
1086 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
1087 + exit ;;
1088 i*86:Minix:*:*)
1089 echo ${UNAME_MACHINE}-pc-minix
1090 - exit 0 ;;
1091 - arm*:Linux:*:*)
1092 + exit ;;
1093 + aarch64:Linux:*:*)
1094 echo ${UNAME_MACHINE}-unknown-linux-gnu
1095 - exit 0 ;;
1096 - ia64:Linux:*:*)
1097 - echo ${UNAME_MACHINE}-unknown-linux
1098 - exit 0 ;;
1099 - m68*:Linux:*:*)
1100 + exit ;;
1101 + aarch64_be:Linux:*:*)
1102 + UNAME_MACHINE=aarch64_be
1103 echo ${UNAME_MACHINE}-unknown-linux-gnu
1104 - exit 0 ;;
1105 - mips:Linux:*:*)
1106 - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
1107 - big) echo mips-unknown-linux-gnu && exit 0 ;;
1108 - little) echo mipsel-unknown-linux-gnu && exit 0 ;;
1109 - esac
1110 - ;;
1111 - ppc:Linux:*:*)
1112 - echo powerpc-unknown-linux-gnu
1113 - exit 0 ;;
1114 - ppc64:Linux:*:*)
1115 - echo powerpc64-unknown-linux-gnu
1116 - exit 0 ;;
1117 + exit ;;
1118 alpha:Linux:*:*)
1119 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
1120 EV5) UNAME_MACHINE=alphaev5 ;;
1121 @@ -796,11 +877,90 @@
1122 EV6) UNAME_MACHINE=alphaev6 ;;
1123 EV67) UNAME_MACHINE=alphaev67 ;;
1124 EV68*) UNAME_MACHINE=alphaev68 ;;
1125 - esac
1126 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
1127 + esac
1128 + objdump --private-headers /bin/sh | grep -q ld.so.1
1129 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
1130 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
1131 - exit 0 ;;
1132 + exit ;;
1133 + arm*:Linux:*:*)
1134 + eval $set_cc_for_build
1135 + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
1136 + | grep -q __ARM_EABI__
1137 + then
1138 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1139 + else
1140 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
1141 + | grep -q __ARM_PCS_VFP
1142 + then
1143 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
1144 + else
1145 + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
1146 + fi
1147 + fi
1148 + exit ;;
1149 + avr32*:Linux:*:*)
1150 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1151 + exit ;;
1152 + cris:Linux:*:*)
1153 + echo ${UNAME_MACHINE}-axis-linux-gnu
1154 + exit ;;
1155 + crisv32:Linux:*:*)
1156 + echo ${UNAME_MACHINE}-axis-linux-gnu
1157 + exit ;;
1158 + frv:Linux:*:*)
1159 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1160 + exit ;;
1161 + hexagon:Linux:*:*)
1162 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1163 + exit ;;
1164 + i*86:Linux:*:*)
1165 + LIBC=gnu
1166 + eval $set_cc_for_build
1167 + sed 's/^ //' << EOF >$dummy.c
1168 + #ifdef __dietlibc__
1169 + LIBC=dietlibc
1170 + #endif
1171 +EOF
1172 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
1173 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1174 + exit ;;
1175 + ia64:Linux:*:*)
1176 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1177 + exit ;;
1178 + m32r*:Linux:*:*)
1179 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1180 + exit ;;
1181 + m68*:Linux:*:*)
1182 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1183 + exit ;;
1184 + mips:Linux:*:* | mips64:Linux:*:*)
1185 + eval $set_cc_for_build
1186 + sed 's/^ //' << EOF >$dummy.c
1187 + #undef CPU
1188 + #undef ${UNAME_MACHINE}
1189 + #undef ${UNAME_MACHINE}el
1190 + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
1191 + CPU=${UNAME_MACHINE}el
1192 + #else
1193 + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
1194 + CPU=${UNAME_MACHINE}
1195 + #else
1196 + CPU=
1197 + #endif
1198 + #endif
1199 +EOF
1200 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
1201 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
1202 + ;;
1203 + or32:Linux:*:*)
1204 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1205 + exit ;;
1206 + padre:Linux:*:*)
1207 + echo sparc-unknown-linux-gnu
1208 + exit ;;
1209 + parisc64:Linux:*:* | hppa64:Linux:*:*)
1210 + echo hppa64-unknown-linux-gnu
1211 + exit ;;
1212 parisc:Linux:*:* | hppa:Linux:*:*)
1213 # Look for CPU level
1214 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
1215 @@ -808,92 +968,71 @@
1216 PA8*) echo hppa2.0-unknown-linux-gnu ;;
1217 *) echo hppa-unknown-linux-gnu ;;
1218 esac
1219 - exit 0 ;;
1220 - parisc64:Linux:*:* | hppa64:Linux:*:*)
1221 - echo hppa64-unknown-linux-gnu
1222 - exit 0 ;;
1223 + exit ;;
1224 + ppc64:Linux:*:*)
1225 + echo powerpc64-unknown-linux-gnu
1226 + exit ;;
1227 + ppc:Linux:*:*)
1228 + echo powerpc-unknown-linux-gnu
1229 + exit ;;
1230 s390:Linux:*:* | s390x:Linux:*:*)
1231 echo ${UNAME_MACHINE}-ibm-linux
1232 - exit 0 ;;
1233 + exit ;;
1234 + sh64*:Linux:*:*)
1235 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1236 + exit ;;
1237 sh*:Linux:*:*)
1238 echo ${UNAME_MACHINE}-unknown-linux-gnu
1239 - exit 0 ;;
1240 + exit ;;
1241 sparc:Linux:*:* | sparc64:Linux:*:*)
1242 echo ${UNAME_MACHINE}-unknown-linux-gnu
1243 - exit 0 ;;
1244 + exit ;;
1245 + tile*:Linux:*:*)
1246 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1247 + exit ;;
1248 + vax:Linux:*:*)
1249 + echo ${UNAME_MACHINE}-dec-linux-gnu
1250 + exit ;;
1251 x86_64:Linux:*:*)
1252 - echo x86_64-unknown-linux-gnu
1253 - exit 0 ;;
1254 - i*86:Linux:*:*)
1255 - # The BFD linker knows what the default object file format is, so
1256 - # first see if it will tell us. cd to the root directory to prevent
1257 - # problems with other programs or directories called `ld' in the path.
1258 - ld_supported_targets=`cd /; ld --help 2>&1 \
1259 - | sed -ne '/supported targets:/!d
1260 - s/[ ][ ]*/ /g
1261 - s/.*supported targets: *//
1262 - s/ .*//
1263 - p'`
1264 - case "$ld_supported_targets" in
1265 - elf32-i386)
1266 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
1267 - ;;
1268 - a.out-i386-linux)
1269 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
1270 - exit 0 ;;
1271 - coff-i386)
1272 - echo "${UNAME_MACHINE}-pc-linux-gnucoff"
1273 - exit 0 ;;
1274 - "")
1275 - # Either a pre-BFD a.out linker (linux-gnuoldld) or
1276 - # one that does not give us useful --help.
1277 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
1278 - exit 0 ;;
1279 - esac
1280 - # Determine whether the default compiler is a.out or elf
1281 - eval $set_cc_for_build
1282 - cat >$dummy.c <<EOF
1283 -#include <features.h>
1284 -#ifdef __cplusplus
1285 -#include <stdio.h> /* for printf() prototype */
1286 - int main (int argc, char *argv[]) {
1287 -#else
1288 - int main (argc, argv) int argc; char *argv[]; {
1289 -#endif
1290 -#ifdef __ELF__
1291 -# ifdef __GLIBC__
1292 -# if __GLIBC__ >= 2
1293 - printf ("%s-pc-linux-gnu\n", argv[1]);
1294 -# else
1295 - printf ("%s-pc-linux-gnulibc1\n", argv[1]);
1296 -# endif
1297 -# else
1298 - printf ("%s-pc-linux-gnulibc1\n", argv[1]);
1299 -# endif
1300 -#else
1301 - printf ("%s-pc-linux-gnuaout\n", argv[1]);
1302 -#endif
1303 - return 0;
1304 -}
1305 -EOF
1306 - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
1307 - rm -f $dummy.c $dummy
1308 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
1309 - ;;
1310 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1311 + exit ;;
1312 + xtensa*:Linux:*:*)
1313 + echo ${UNAME_MACHINE}-unknown-linux-gnu
1314 + exit ;;
1315 i*86:DYNIX/ptx:4*:*)
1316 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1317 # earlier versions are messed up and put the nodename in both
1318 # sysname and nodename.
1319 echo i386-sequent-sysv4
1320 - exit 0 ;;
1321 + exit ;;
1322 i*86:UNIX_SV:4.2MP:2.*)
1323 - # Unixware is an offshoot of SVR4, but it has its own version
1324 - # number series starting with 2...
1325 - # I am not positive that other SVR4 systems won't match this,
1326 + # Unixware is an offshoot of SVR4, but it has its own version
1327 + # number series starting with 2...
1328 + # I am not positive that other SVR4 systems won't match this,
1329 # I just have to hope. -- rms.
1330 - # Use sysv4.2uw... so that sysv4* matches it.
1331 + # Use sysv4.2uw... so that sysv4* matches it.
1332 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1333 - exit 0 ;;
1334 + exit ;;
1335 + i*86:OS/2:*:*)
1336 + # If we were able to find `uname', then EMX Unix compatibility
1337 + # is probably installed.
1338 + echo ${UNAME_MACHINE}-pc-os2-emx
1339 + exit ;;
1340 + i*86:XTS-300:*:STOP)
1341 + echo ${UNAME_MACHINE}-unknown-stop
1342 + exit ;;
1343 + i*86:atheos:*:*)
1344 + echo ${UNAME_MACHINE}-unknown-atheos
1345 + exit ;;
1346 + i*86:syllable:*:*)
1347 + echo ${UNAME_MACHINE}-pc-syllable
1348 + exit ;;
1349 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1350 + echo i386-unknown-lynxos${UNAME_RELEASE}
1351 + exit ;;
1352 + i*86:*DOS:*:*)
1353 + echo ${UNAME_MACHINE}-pc-msdosdjgpp
1354 + exit ;;
1355 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1356 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1357 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1358 @@ -901,99 +1040,113 @@
1359 else
1360 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1361 fi
1362 - exit 0 ;;
1363 - i*86:*:5:[78]*)
1364 + exit ;;
1365 + i*86:*:5:[678]*)
1366 + # UnixWare 7.x, OpenUNIX and OpenServer 6.
1367 case `/bin/uname -X | grep "^Machine"` in
1368 *486*) UNAME_MACHINE=i486 ;;
1369 *Pentium) UNAME_MACHINE=i586 ;;
1370 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1371 esac
1372 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1373 - exit 0 ;;
1374 + exit ;;
1375 i*86:*:3.2:*)
1376 if test -f /usr/options/cb.name; then
1377 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1378 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1379 elif /bin/uname -X 2>/dev/null >/dev/null ; then
1380 - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
1381 - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
1382 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
1383 + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
1384 + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
1385 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
1386 && UNAME_MACHINE=i586
1387 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
1388 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
1389 && UNAME_MACHINE=i686
1390 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
1391 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1392 && UNAME_MACHINE=i686
1393 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1394 else
1395 echo ${UNAME_MACHINE}-pc-sysv32
1396 fi
1397 - exit 0 ;;
1398 - i*86:*DOS:*:*)
1399 - echo ${UNAME_MACHINE}-pc-msdosdjgpp
1400 - exit 0 ;;
1401 + exit ;;
1402 pc:*:*:*)
1403 # Left here for compatibility:
1404 - # uname -m prints for DJGPP always 'pc', but it prints nothing about
1405 - # the processor, so we play safe by assuming i386.
1406 - echo i386-pc-msdosdjgpp
1407 - exit 0 ;;
1408 + # uname -m prints for DJGPP always 'pc', but it prints nothing about
1409 + # the processor, so we play safe by assuming i586.
1410 + # Note: whatever this is, it MUST be the same as what config.sub
1411 + # prints for the "djgpp" host, or else GDB configury will decide that
1412 + # this is a cross-build.
1413 + echo i586-pc-msdosdjgpp
1414 + exit ;;
1415 Intel:Mach:3*:*)
1416 echo i386-pc-mach3
1417 - exit 0 ;;
1418 + exit ;;
1419 paragon:*:*:*)
1420 echo i860-intel-osf1
1421 - exit 0 ;;
1422 + exit ;;
1423 i860:*:4.*:*) # i860-SVR4
1424 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1425 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1426 else # Add other i860-SVR4 vendors below as they are discovered.
1427 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
1428 fi
1429 - exit 0 ;;
1430 + exit ;;
1431 mini*:CTIX:SYS*5:*)
1432 # "miniframe"
1433 echo m68010-convergent-sysv
1434 - exit 0 ;;
1435 - M68*:*:R3V[567]*:*)
1436 - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1437 - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
1438 + exit ;;
1439 + mc68k:UNIX:SYSTEM5:3.51m)
1440 + echo m68k-convergent-sysv
1441 + exit ;;
1442 + M680?0:D-NIX:5.3:*)
1443 + echo m68k-diab-dnix
1444 + exit ;;
1445 + M68*:*:R3V[5678]*:*)
1446 + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1447 + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
1448 OS_REL=''
1449 test -r /etc/.relid \
1450 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1451 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1452 - && echo i486-ncr-sysv4.3${OS_REL} && exit 0
1453 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1454 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1455 - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
1456 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1457 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1458 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1459 - && echo i486-ncr-sysv4 && exit 0 ;;
1460 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1461 + && { echo i486-ncr-sysv4; exit; } ;;
1462 + NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1463 + OS_REL='.3'
1464 + test -r /etc/.relid \
1465 + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1466 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1467 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1468 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1469 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1470 + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1471 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1472 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1473 echo m68k-unknown-lynxos${UNAME_RELEASE}
1474 - exit 0 ;;
1475 + exit ;;
1476 mc68030:UNIX_System_V:4.*:*)
1477 echo m68k-atari-sysv4
1478 - exit 0 ;;
1479 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1480 - echo i386-unknown-lynxos${UNAME_RELEASE}
1481 - exit 0 ;;
1482 + exit ;;
1483 TSUNAMI:LynxOS:2.*:*)
1484 echo sparc-unknown-lynxos${UNAME_RELEASE}
1485 - exit 0 ;;
1486 + exit ;;
1487 rs6000:LynxOS:2.*:*)
1488 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1489 - exit 0 ;;
1490 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1491 + exit ;;
1492 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1493 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1494 - exit 0 ;;
1495 + exit ;;
1496 SM[BE]S:UNIX_SV:*:*)
1497 echo mips-dde-sysv${UNAME_RELEASE}
1498 - exit 0 ;;
1499 + exit ;;
1500 RM*:ReliantUNIX-*:*:*)
1501 echo mips-sni-sysv4
1502 - exit 0 ;;
1503 + exit ;;
1504 RM*:SINIX-*:*:*)
1505 echo mips-sni-sysv4
1506 - exit 0 ;;
1507 + exit ;;
1508 *:SINIX-*:*:*)
1509 if uname -p 2>/dev/null >/dev/null ; then
1510 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1511 @@ -1001,82 +1154,123 @@
1512 else
1513 echo ns32k-sni-sysv
1514 fi
1515 - exit 0 ;;
1516 - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1517 - # says <Richard.M.Bartel@ccMail.Census.GOV>
1518 - echo i586-unisys-sysv4
1519 - exit 0 ;;
1520 + exit ;;
1521 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1522 + # says <Richard.M.Bartel@ccMail.Census.GOV>
1523 + echo i586-unisys-sysv4
1524 + exit ;;
1525 *:UNIX_System_V:4*:FTX*)
1526 # From Gerald Hewes <hewes@openmarket.com>.
1527 # How about differentiating between stratus architectures? -djm
1528 echo hppa1.1-stratus-sysv4
1529 - exit 0 ;;
1530 + exit ;;
1531 *:*:*:FTX*)
1532 # From seanf@swdc.stratus.com.
1533 echo i860-stratus-sysv4
1534 - exit 0 ;;
1535 + exit ;;
1536 + i*86:VOS:*:*)
1537 + # From Paul.Green@stratus.com.
1538 + echo ${UNAME_MACHINE}-stratus-vos
1539 + exit ;;
1540 *:VOS:*:*)
1541 # From Paul.Green@stratus.com.
1542 echo hppa1.1-stratus-vos
1543 - exit 0 ;;
1544 + exit ;;
1545 mc68*:A/UX:*:*)
1546 echo m68k-apple-aux${UNAME_RELEASE}
1547 - exit 0 ;;
1548 + exit ;;
1549 news*:NEWS-OS:6*:*)
1550 echo mips-sony-newsos6
1551 - exit 0 ;;
1552 + exit ;;
1553 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1554 if [ -d /usr/nec ]; then
1555 - echo mips-nec-sysv${UNAME_RELEASE}
1556 + echo mips-nec-sysv${UNAME_RELEASE}
1557 else
1558 - echo mips-unknown-sysv${UNAME_RELEASE}
1559 + echo mips-unknown-sysv${UNAME_RELEASE}
1560 fi
1561 - exit 0 ;;
1562 + exit ;;
1563 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1564 echo powerpc-be-beos
1565 - exit 0 ;;
1566 + exit ;;
1567 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
1568 echo powerpc-apple-beos
1569 - exit 0 ;;
1570 + exit ;;
1571 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
1572 echo i586-pc-beos
1573 - exit 0 ;;
1574 + exit ;;
1575 + BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
1576 + echo i586-pc-haiku
1577 + exit ;;
1578 SX-4:SUPER-UX:*:*)
1579 echo sx4-nec-superux${UNAME_RELEASE}
1580 - exit 0 ;;
1581 + exit ;;
1582 SX-5:SUPER-UX:*:*)
1583 echo sx5-nec-superux${UNAME_RELEASE}
1584 - exit 0 ;;
1585 + exit ;;
1586 + SX-6:SUPER-UX:*:*)
1587 + echo sx6-nec-superux${UNAME_RELEASE}
1588 + exit ;;
1589 + SX-7:SUPER-UX:*:*)
1590 + echo sx7-nec-superux${UNAME_RELEASE}
1591 + exit ;;
1592 + SX-8:SUPER-UX:*:*)
1593 + echo sx8-nec-superux${UNAME_RELEASE}
1594 + exit ;;
1595 + SX-8R:SUPER-UX:*:*)
1596 + echo sx8r-nec-superux${UNAME_RELEASE}
1597 + exit ;;
1598 Power*:Rhapsody:*:*)
1599 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1600 - exit 0 ;;
1601 + exit ;;
1602 *:Rhapsody:*:*)
1603 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1604 - exit 0 ;;
1605 + exit ;;
1606 *:Darwin:*:*)
1607 - echo `uname -p`-apple-darwin${UNAME_RELEASE}
1608 - exit 0 ;;
1609 + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1610 + case $UNAME_PROCESSOR in
1611 + i386)
1612 + eval $set_cc_for_build
1613 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1614 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1615 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1616 + grep IS_64BIT_ARCH >/dev/null
1617 + then
1618 + UNAME_PROCESSOR="x86_64"
1619 + fi
1620 + fi ;;
1621 + unknown) UNAME_PROCESSOR=powerpc ;;
1622 + esac
1623 + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1624 + exit ;;
1625 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1626 - if test "${UNAME_MACHINE}" = "x86pc"; then
1627 + UNAME_PROCESSOR=`uname -p`
1628 + if test "$UNAME_PROCESSOR" = "x86"; then
1629 + UNAME_PROCESSOR=i386
1630 UNAME_MACHINE=pc
1631 fi
1632 - echo `uname -p`-${UNAME_MACHINE}-nto-qnx
1633 - exit 0 ;;
1634 + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1635 + exit ;;
1636 *:QNX:*:4*)
1637 echo i386-pc-qnx
1638 - exit 0 ;;
1639 - NSR-[KW]:NONSTOP_KERNEL:*:*)
1640 + exit ;;
1641 + NEO-?:NONSTOP_KERNEL:*:*)
1642 + echo neo-tandem-nsk${UNAME_RELEASE}
1643 + exit ;;
1644 + NSE-?:NONSTOP_KERNEL:*:*)
1645 + echo nse-tandem-nsk${UNAME_RELEASE}
1646 + exit ;;
1647 + NSR-?:NONSTOP_KERNEL:*:*)
1648 echo nsr-tandem-nsk${UNAME_RELEASE}
1649 - exit 0 ;;
1650 + exit ;;
1651 *:NonStop-UX:*:*)
1652 echo mips-compaq-nonstopux
1653 - exit 0 ;;
1654 + exit ;;
1655 BS2000:POSIX*:*:*)
1656 echo bs2000-siemens-sysv
1657 - exit 0 ;;
1658 + exit ;;
1659 DS/*:UNIX_System_V:*:*)
1660 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1661 - exit 0 ;;
1662 + exit ;;
1663 *:Plan9:*:*)
1664 # "uname -m" is not consistent, so use $cputype instead. 386
1665 # is converted to i386 for consistency with other x86
1666 @@ -1087,36 +1281,53 @@
1667 UNAME_MACHINE="$cputype"
1668 fi
1669 echo ${UNAME_MACHINE}-unknown-plan9
1670 - exit 0 ;;
1671 - i*86:OS/2:*:*)
1672 - # If we were able to find `uname', then EMX Unix compatibility
1673 - # is probably installed.
1674 - echo ${UNAME_MACHINE}-pc-os2-emx
1675 - exit 0 ;;
1676 + exit ;;
1677 *:TOPS-10:*:*)
1678 echo pdp10-unknown-tops10
1679 - exit 0 ;;
1680 + exit ;;
1681 *:TENEX:*:*)
1682 echo pdp10-unknown-tenex
1683 - exit 0 ;;
1684 + exit ;;
1685 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1686 echo pdp10-dec-tops20
1687 - exit 0 ;;
1688 + exit ;;
1689 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1690 echo pdp10-xkl-tops20
1691 - exit 0 ;;
1692 + exit ;;
1693 *:TOPS-20:*:*)
1694 echo pdp10-unknown-tops20
1695 - exit 0 ;;
1696 + exit ;;
1697 *:ITS:*:*)
1698 echo pdp10-unknown-its
1699 - exit 0 ;;
1700 - i*86:XTS-300:*:STOP)
1701 - echo ${UNAME_MACHINE}-unknown-stop
1702 - exit 0 ;;
1703 - i*86:atheos:*:*)
1704 - echo ${UNAME_MACHINE}-unknown-atheos
1705 - exit 0 ;;
1706 + exit ;;
1707 + SEI:*:*:SEIUX)
1708 + echo mips-sei-seiux${UNAME_RELEASE}
1709 + exit ;;
1710 + *:DragonFly:*:*)
1711 + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1712 + exit ;;
1713 + *:*VMS:*:*)
1714 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
1715 + case "${UNAME_MACHINE}" in
1716 + A*) echo alpha-dec-vms ; exit ;;
1717 + I*) echo ia64-dec-vms ; exit ;;
1718 + V*) echo vax-dec-vms ; exit ;;
1719 + esac ;;
1720 + *:XENIX:*:SysV)
1721 + echo i386-pc-xenix
1722 + exit ;;
1723 + i*86:skyos:*:*)
1724 + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1725 + exit ;;
1726 + i*86:rdos:*:*)
1727 + echo ${UNAME_MACHINE}-pc-rdos
1728 + exit ;;
1729 + i*86:AROS:*:*)
1730 + echo ${UNAME_MACHINE}-pc-aros
1731 + exit ;;
1732 + x86_64:VMkernel:*:*)
1733 + echo ${UNAME_MACHINE}-unknown-esx
1734 + exit ;;
1735 esac
1737 #echo '(No uname command or uname output not recognized.)' 1>&2
1738 @@ -1139,16 +1350,16 @@
1739 #include <sys/param.h>
1740 printf ("m68k-sony-newsos%s\n",
1741 #ifdef NEWSOS4
1742 - "4"
1743 + "4"
1744 #else
1745 - ""
1746 + ""
1747 #endif
1748 - ); exit (0);
1749 + ); exit (0);
1750 #endif
1751 #endif
1753 #if defined (__arm) && defined (__acorn) && defined (__unix)
1754 - printf ("arm-acorn-riscix"); exit (0);
1755 + printf ("arm-acorn-riscix\n"); exit (0);
1756 #endif
1758 #if defined (hp300) && !defined (hpux)
1759 @@ -1237,12 +1448,12 @@
1760 }
1761 EOF
1763 -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
1764 -rm -f $dummy.c $dummy
1765 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1766 + { echo "$SYSTEM_NAME"; exit; }
1768 # Apollos put the system type in the environment.
1770 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
1771 +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1773 # Convex versions that predate uname can use getsysinfo(1)
1775 @@ -1251,22 +1462,22 @@
1776 case `getsysinfo -f cpu_type` in
1777 c1*)
1778 echo c1-convex-bsd
1779 - exit 0 ;;
1780 + exit ;;
1781 c2*)
1782 if getsysinfo -f scalar_acc
1783 then echo c32-convex-bsd
1784 else echo c2-convex-bsd
1785 fi
1786 - exit 0 ;;
1787 + exit ;;
1788 c34*)
1789 echo c34-convex-bsd
1790 - exit 0 ;;
1791 + exit ;;
1792 c38*)
1793 echo c38-convex-bsd
1794 - exit 0 ;;
1795 + exit ;;
1796 c4*)
1797 echo c4-convex-bsd
1798 - exit 0 ;;
1799 + exit ;;
1800 esac
1801 fi
1803 @@ -1277,7 +1488,9 @@
1804 the operating system you are using. It is advised that you
1805 download the most up to date version of the config scripts from
1807 - ftp://ftp.gnu.org/pub/gnu/config/
1808 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1809 +and
1810 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1812 If the version you run ($0) is already up to date, please
1813 send the following data and any information you think might be
1814 diff -Naur lmarbles-1.0.8-orig/config.sub lmarbles-1.0.8/config.sub
1815 --- lmarbles-1.0.8-orig/config.sub 2013-10-12 15:43:21.540033536 +0200
1816 +++ lmarbles-1.0.8/config.sub 2012-03-30 22:31:00.000000000 +0200
1817 @@ -1,9 +1,10 @@
1818 #! /bin/sh
1819 # Configuration validation subroutine script.
1820 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1821 -# Free Software Foundation, Inc.
1822 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1823 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
1824 +# 2011, 2012 Free Software Foundation, Inc.
1826 -timestamp='2001-09-07'
1827 +timestamp='2012-02-10'
1829 # This file is (in principle) common to ALL GNU software.
1830 # The presence of a machine in this file suggests that SOME GNU software
1831 @@ -20,22 +21,25 @@
1832 # GNU General Public License for more details.
1833 #
1834 # You should have received a copy of the GNU General Public License
1835 -# along with this program; if not, write to the Free Software
1836 -# Foundation, Inc., 59 Temple Place - Suite 330,
1837 -# Boston, MA 02111-1307, USA.
1838 -
1839 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
1840 +#
1841 # As a special exception to the GNU General Public License, if you
1842 # distribute this file as part of a program that contains a
1843 # configuration script generated by Autoconf, you may include it under
1844 # the same distribution terms that you use for the rest of that program.
1846 -# Please send patches to <config-patches@gnu.org>.
1847 +
1848 +# Please send patches to <config-patches@gnu.org>. Submit a context
1849 +# diff and a properly formatted GNU ChangeLog entry.
1850 #
1851 # Configuration subroutine to validate and canonicalize a configuration type.
1852 # Supply the specified configuration type as an argument.
1853 # If it is invalid, we print an error message on stderr and exit with code 1.
1854 # Otherwise, we print the canonical config type on stdout and succeed.
1856 +# You can get the latest version of this script from:
1857 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1858 +
1859 # This file is supposed to be the same for all GNU packages
1860 # and recognize all the CPU types, system types and aliases
1861 # that are meaningful with *any* GNU software.
1862 @@ -69,7 +73,8 @@
1863 version="\
1864 GNU config.sub ($timestamp)
1866 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1867 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
1868 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
1869 Free Software Foundation, Inc.
1871 This is free software; see the source for copying conditions. There is NO
1872 @@ -82,11 +87,11 @@
1873 while test $# -gt 0 ; do
1874 case $1 in
1875 --time-stamp | --time* | -t )
1876 - echo "$timestamp" ; exit 0 ;;
1877 + echo "$timestamp" ; exit ;;
1878 --version | -v )
1879 - echo "$version" ; exit 0 ;;
1880 + echo "$version" ; exit ;;
1881 --help | --h* | -h )
1882 - echo "$usage"; exit 0 ;;
1883 + echo "$usage"; exit ;;
1884 -- ) # Stop option processing
1885 shift; break ;;
1886 - ) # Use stdin as input.
1887 @@ -98,7 +103,7 @@
1888 *local*)
1889 # First pass through any local machine types.
1890 echo $1
1891 - exit 0;;
1892 + exit ;;
1894 * )
1895 break ;;
1896 @@ -117,10 +122,18 @@
1897 # Here we must recognize all the valid KERNEL-OS combinations.
1898 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1899 case $maybe_os in
1900 - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
1901 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
1902 + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
1903 + knetbsd*-gnu* | netbsd*-gnu* | \
1904 + kopensolaris*-gnu* | \
1905 + storm-chaos* | os2-emx* | rtmk-nova*)
1906 os=-$maybe_os
1907 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1908 ;;
1909 + android-linux)
1910 + os=-linux-android
1911 + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
1912 + ;;
1913 *)
1914 basic_machine=`echo $1 | sed 's/-[^-]*$//'`
1915 if [ $basic_machine != $1 ]
1916 @@ -143,10 +156,13 @@
1917 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1918 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1919 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1920 - -apple | -axis)
1921 + -apple | -axis | -knuth | -cray | -microblaze)
1922 os=
1923 basic_machine=$1
1924 ;;
1925 + -bluegene*)
1926 + os=-cnk
1927 + ;;
1928 -sim | -cisco | -oki | -wec | -winbond)
1929 os=
1930 basic_machine=$1
1931 @@ -161,13 +177,17 @@
1932 os=-chorusos
1933 basic_machine=$1
1934 ;;
1935 - -chorusrdb)
1936 - os=-chorusrdb
1937 + -chorusrdb)
1938 + os=-chorusrdb
1939 basic_machine=$1
1940 - ;;
1941 + ;;
1942 -hiux*)
1943 os=-hiuxwe2
1944 ;;
1945 + -sco6)
1946 + os=-sco5v6
1947 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1948 + ;;
1949 -sco5)
1950 os=-sco3.2v5
1951 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1952 @@ -184,6 +204,10 @@
1953 # Don't forget version if it is 3.2v4 or newer.
1954 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1955 ;;
1956 + -sco5v6*)
1957 + # Don't forget version if it is 3.2v4 or newer.
1958 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1959 + ;;
1960 -sco*)
1961 os=-sco3.2v2
1962 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1963 @@ -225,43 +249,103 @@
1964 # Some are omitted here because they have special meanings below.
1965 1750a | 580 \
1966 | a29k \
1967 + | aarch64 | aarch64_be \
1968 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1969 - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
1970 + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1971 + | am33_2.0 \
1972 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
1973 + | be32 | be64 \
1974 + | bfin \
1975 | c4x | clipper \
1976 - | d10v | d30v | dsp16xx \
1977 - | fr30 \
1978 + | d10v | d30v | dlx | dsp16xx \
1979 + | epiphany \
1980 + | fido | fr30 | frv \
1981 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1982 + | hexagon \
1983 | i370 | i860 | i960 | ia64 \
1984 - | m32r | m68000 | m68k | m88k | mcore \
1985 - | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
1986 - | mips64vr4100 | mips64vr4100el | mips64vr4300 \
1987 - | mips64vr4300el | mips64vr5000 | mips64vr5000el \
1988 - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
1989 - | mipsisa32 \
1990 + | ip2k | iq2000 \
1991 + | le32 | le64 \
1992 + | lm32 \
1993 + | m32c | m32r | m32rle | m68000 | m68k | m88k \
1994 + | maxq | mb | microblaze | mcore | mep | metag \
1995 + | mips | mipsbe | mipseb | mipsel | mipsle \
1996 + | mips16 \
1997 + | mips64 | mips64el \
1998 + | mips64octeon | mips64octeonel \
1999 + | mips64orion | mips64orionel \
2000 + | mips64r5900 | mips64r5900el \
2001 + | mips64vr | mips64vrel \
2002 + | mips64vr4100 | mips64vr4100el \
2003 + | mips64vr4300 | mips64vr4300el \
2004 + | mips64vr5000 | mips64vr5000el \
2005 + | mips64vr5900 | mips64vr5900el \
2006 + | mipsisa32 | mipsisa32el \
2007 + | mipsisa32r2 | mipsisa32r2el \
2008 + | mipsisa64 | mipsisa64el \
2009 + | mipsisa64r2 | mipsisa64r2el \
2010 + | mipsisa64sb1 | mipsisa64sb1el \
2011 + | mipsisa64sr71k | mipsisa64sr71kel \
2012 + | mipstx39 | mipstx39el \
2013 | mn10200 | mn10300 \
2014 + | moxie \
2015 + | mt \
2016 + | msp430 \
2017 + | nds32 | nds32le | nds32be \
2018 + | nios | nios2 \
2019 | ns16k | ns32k \
2020 - | openrisc \
2021 + | open8 \
2022 + | or32 \
2023 | pdp10 | pdp11 | pj | pjl \
2024 - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
2025 + | powerpc | powerpc64 | powerpc64le | powerpcle \
2026 | pyramid \
2027 - | s390 | s390x \
2028 - | sh | sh[34] | sh[34]eb | shbe | shle \
2029 - | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
2030 - | stormy16 | strongarm \
2031 - | tahoe | thumb | tic80 | tron \
2032 - | v850 \
2033 + | rl78 | rx \
2034 + | score \
2035 + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
2036 + | sh64 | sh64le \
2037 + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
2038 + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
2039 + | spu \
2040 + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
2041 + | ubicom32 \
2042 + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
2043 | we32k \
2044 - | x86 | xscale \
2045 - | z8k)
2046 + | x86 | xc16x | xstormy16 | xtensa \
2047 + | z8k | z80)
2048 basic_machine=$basic_machine-unknown
2049 ;;
2050 - m6811 | m68hc11 | m6812 | m68hc12)
2051 - # Motorola 68HC11/12.
2052 + c54x)
2053 + basic_machine=tic54x-unknown
2054 + ;;
2055 + c55x)
2056 + basic_machine=tic55x-unknown
2057 + ;;
2058 + c6x)
2059 + basic_machine=tic6x-unknown
2060 + ;;
2061 + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
2062 basic_machine=$basic_machine-unknown
2063 os=-none
2064 ;;
2065 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
2066 ;;
2067 + ms1)
2068 + basic_machine=mt-unknown
2069 + ;;
2070 +
2071 + strongarm | thumb | xscale)
2072 + basic_machine=arm-unknown
2073 + ;;
2074 + xgate)
2075 + basic_machine=$basic_machine-unknown
2076 + os=-none
2077 + ;;
2078 + xscaleeb)
2079 + basic_machine=armeb-unknown
2080 + ;;
2081 +
2082 + xscaleel)
2083 + basic_machine=armel-unknown
2084 + ;;
2086 # We use `pc' rather than `unknown'
2087 # because (1) that's what they normally are, and
2088 @@ -277,41 +361,80 @@
2089 # Recognize the basic CPU types with company name.
2090 580-* \
2091 | a29k-* \
2092 + | aarch64-* | aarch64_be-* \
2093 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
2094 - | alphapca5[67]-* | arc-* \
2095 - | arm-* | armbe-* | armle-* | armv*-* \
2096 - | bs2000-* \
2097 - | c[123]* | c30-* | [cjt]90-* | c54x-* \
2098 - | clipper-* | cray2-* | cydra-* \
2099 - | d10v-* | d30v-* \
2100 + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
2101 + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
2102 + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
2103 + | avr-* | avr32-* \
2104 + | be32-* | be64-* \
2105 + | bfin-* | bs2000-* \
2106 + | c[123]* | c30-* | [cjt]90-* | c4x-* \
2107 + | clipper-* | craynv-* | cydra-* \
2108 + | d10v-* | d30v-* | dlx-* \
2109 | elxsi-* \
2110 - | f30[01]-* | f700-* | fr30-* | fx80-* \
2111 + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
2112 | h8300-* | h8500-* \
2113 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
2114 + | hexagon-* \
2115 | i*86-* | i860-* | i960-* | ia64-* \
2116 - | m32r-* \
2117 - | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
2118 - | m88110-* | m88k-* | mcore-* \
2119 - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
2120 - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
2121 - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
2122 - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
2123 + | ip2k-* | iq2000-* \
2124 + | le32-* | le64-* \
2125 + | lm32-* \
2126 + | m32c-* | m32r-* | m32rle-* \
2127 + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
2128 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
2129 + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
2130 + | mips16-* \
2131 + | mips64-* | mips64el-* \
2132 + | mips64octeon-* | mips64octeonel-* \
2133 + | mips64orion-* | mips64orionel-* \
2134 + | mips64r5900-* | mips64r5900el-* \
2135 + | mips64vr-* | mips64vrel-* \
2136 + | mips64vr4100-* | mips64vr4100el-* \
2137 + | mips64vr4300-* | mips64vr4300el-* \
2138 + | mips64vr5000-* | mips64vr5000el-* \
2139 + | mips64vr5900-* | mips64vr5900el-* \
2140 + | mipsisa32-* | mipsisa32el-* \
2141 + | mipsisa32r2-* | mipsisa32r2el-* \
2142 + | mipsisa64-* | mipsisa64el-* \
2143 + | mipsisa64r2-* | mipsisa64r2el-* \
2144 + | mipsisa64sb1-* | mipsisa64sb1el-* \
2145 + | mipsisa64sr71k-* | mipsisa64sr71kel-* \
2146 + | mipstx39-* | mipstx39el-* \
2147 + | mmix-* \
2148 + | mt-* \
2149 + | msp430-* \
2150 + | nds32-* | nds32le-* | nds32be-* \
2151 + | nios-* | nios2-* \
2152 | none-* | np1-* | ns16k-* | ns32k-* \
2153 + | open8-* \
2154 | orion-* \
2155 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
2156 - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
2157 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
2158 | pyramid-* \
2159 - | romp-* | rs6000-* \
2160 - | s390-* | s390x-* \
2161 - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
2162 - | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
2163 - | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
2164 - | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
2165 - | v850-* | vax-* \
2166 + | rl78-* | romp-* | rs6000-* | rx-* \
2167 + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
2168 + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
2169 + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
2170 + | sparclite-* \
2171 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
2172 + | tahoe-* \
2173 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
2174 + | tile*-* \
2175 + | tron-* \
2176 + | ubicom32-* \
2177 + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
2178 + | vax-* \
2179 | we32k-* \
2180 - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
2181 + | x86-* | x86_64-* | xc16x-* | xps100-* \
2182 + | xstormy16-* | xtensa*-* \
2183 | ymp-* \
2184 - | z8k-*)
2185 + | z8k-* | z80-*)
2186 + ;;
2187 + # Recognize the basic CPU types without company name, with glob match.
2188 + xtensa*)
2189 + basic_machine=$basic_machine-unknown
2190 ;;
2191 # Recognize the various machine names and aliases which stand
2192 # for a CPU type and a company and sometimes even an OS.
2193 @@ -329,6 +452,9 @@
2194 basic_machine=a29k-amd
2195 os=-udi
2196 ;;
2197 + abacus)
2198 + basic_machine=abacus-unknown
2199 + ;;
2200 adobe68k)
2201 basic_machine=m68010-adobe
2202 os=-scout
2203 @@ -343,6 +469,12 @@
2204 basic_machine=a29k-none
2205 os=-bsd
2206 ;;
2207 + amd64)
2208 + basic_machine=x86_64-pc
2209 + ;;
2210 + amd64-*)
2211 + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
2212 + ;;
2213 amdahl)
2214 basic_machine=580-amdahl
2215 os=-sysv
2216 @@ -366,6 +498,10 @@
2217 basic_machine=m68k-apollo
2218 os=-bsd
2219 ;;
2220 + aros)
2221 + basic_machine=i386-pc
2222 + os=-aros
2223 + ;;
2224 aux)
2225 basic_machine=m68k-apple
2226 os=-aux
2227 @@ -374,6 +510,35 @@
2228 basic_machine=ns32k-sequent
2229 os=-dynix
2230 ;;
2231 + blackfin)
2232 + basic_machine=bfin-unknown
2233 + os=-linux
2234 + ;;
2235 + blackfin-*)
2236 + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
2237 + os=-linux
2238 + ;;
2239 + bluegene*)
2240 + basic_machine=powerpc-ibm
2241 + os=-cnk
2242 + ;;
2243 + c54x-*)
2244 + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
2245 + ;;
2246 + c55x-*)
2247 + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
2248 + ;;
2249 + c6x-*)
2250 + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
2251 + ;;
2252 + c90)
2253 + basic_machine=c90-cray
2254 + os=-unicos
2255 + ;;
2256 + cegcc)
2257 + basic_machine=arm-unknown
2258 + os=-cegcc
2259 + ;;
2260 convex-c1)
2261 basic_machine=c1-convex
2262 os=-bsd
2263 @@ -394,30 +559,45 @@
2264 basic_machine=c38-convex
2265 os=-bsd
2266 ;;
2267 - cray | ymp)
2268 - basic_machine=ymp-cray
2269 + cray | j90)
2270 + basic_machine=j90-cray
2271 os=-unicos
2272 ;;
2273 - cray2)
2274 - basic_machine=cray2-cray
2275 - os=-unicos
2276 + craynv)
2277 + basic_machine=craynv-cray
2278 + os=-unicosmp
2279 ;;
2280 - [cjt]90)
2281 - basic_machine=${basic_machine}-cray
2282 - os=-unicos
2283 + cr16 | cr16-*)
2284 + basic_machine=cr16-unknown
2285 + os=-elf
2286 ;;
2287 crds | unos)
2288 basic_machine=m68k-crds
2289 ;;
2290 + crisv32 | crisv32-* | etraxfs*)
2291 + basic_machine=crisv32-axis
2292 + ;;
2293 cris | cris-* | etrax*)
2294 basic_machine=cris-axis
2295 ;;
2296 + crx)
2297 + basic_machine=crx-unknown
2298 + os=-elf
2299 + ;;
2300 da30 | da30-*)
2301 basic_machine=m68k-da30
2302 ;;
2303 decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
2304 basic_machine=mips-dec
2305 ;;
2306 + decsystem10* | dec10*)
2307 + basic_machine=pdp10-dec
2308 + os=-tops10
2309 + ;;
2310 + decsystem20* | dec20*)
2311 + basic_machine=pdp10-dec
2312 + os=-tops20
2313 + ;;
2314 delta | 3300 | motorola-3300 | motorola-delta \
2315 | 3300-motorola | delta-motorola)
2316 basic_machine=m68k-motorola
2317 @@ -426,6 +606,14 @@
2318 basic_machine=m88k-motorola
2319 os=-sysv3
2320 ;;
2321 + dicos)
2322 + basic_machine=i686-pc
2323 + os=-dicos
2324 + ;;
2325 + djgpp)
2326 + basic_machine=i586-pc
2327 + os=-msdosdjgpp
2328 + ;;
2329 dpx20 | dpx20-*)
2330 basic_machine=rs6000-bull
2331 os=-bosx
2332 @@ -537,7 +725,6 @@
2333 i370-ibm* | ibm*)
2334 basic_machine=i370-ibm
2335 ;;
2336 -# I'm not sure what "Sysv32" means. Should this be sysv3.2?
2337 i*86v32)
2338 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2339 os=-sysv32
2340 @@ -576,6 +763,14 @@
2341 basic_machine=m68k-isi
2342 os=-sysv
2343 ;;
2344 + m68knommu)
2345 + basic_machine=m68k-unknown
2346 + os=-linux
2347 + ;;
2348 + m68knommu-*)
2349 + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
2350 + os=-linux
2351 + ;;
2352 m88k-omron*)
2353 basic_machine=m88k-omron
2354 ;;
2355 @@ -587,10 +782,17 @@
2356 basic_machine=ns32k-utek
2357 os=-sysv
2358 ;;
2359 + microblaze)
2360 + basic_machine=microblaze-xilinx
2361 + ;;
2362 mingw32)
2363 basic_machine=i386-pc
2364 os=-mingw32
2365 ;;
2366 + mingw32ce)
2367 + basic_machine=arm-unknown
2368 + os=-mingw32ce
2369 + ;;
2370 miniframe)
2371 basic_machine=m68000-convergent
2372 ;;
2373 @@ -598,36 +800,39 @@
2374 basic_machine=m68k-atari
2375 os=-mint
2376 ;;
2377 - mipsel*-linux*)
2378 - basic_machine=mipsel-unknown
2379 - os=-linux-gnu
2380 - ;;
2381 - mips*-linux*)
2382 - basic_machine=mips-unknown
2383 - os=-linux-gnu
2384 - ;;
2385 mips3*-*)
2386 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
2387 ;;
2388 mips3*)
2389 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
2390 ;;
2391 - mmix*)
2392 - basic_machine=mmix-knuth
2393 - os=-mmixware
2394 - ;;
2395 monitor)
2396 basic_machine=m68k-rom68k
2397 os=-coff
2398 ;;
2399 + morphos)
2400 + basic_machine=powerpc-unknown
2401 + os=-morphos
2402 + ;;
2403 msdos)
2404 basic_machine=i386-pc
2405 os=-msdos
2406 ;;
2407 + ms1-*)
2408 + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
2409 + ;;
2410 + msys)
2411 + basic_machine=i386-pc
2412 + os=-msys
2413 + ;;
2414 mvs)
2415 basic_machine=i370-ibm
2416 os=-mvs
2417 ;;
2418 + nacl)
2419 + basic_machine=le32-unknown
2420 + os=-nacl
2421 + ;;
2422 ncr3000)
2423 basic_machine=i486-ncr
2424 os=-sysv4
2425 @@ -692,6 +897,12 @@
2426 np1)
2427 basic_machine=np1-gould
2428 ;;
2429 + neo-tandem)
2430 + basic_machine=neo-tandem
2431 + ;;
2432 + nse-tandem)
2433 + basic_machine=nse-tandem
2434 + ;;
2435 nsr-tandem)
2436 basic_machine=nsr-tandem
2437 ;;
2438 @@ -699,6 +910,13 @@
2439 basic_machine=hppa1.1-oki
2440 os=-proelf
2441 ;;
2442 + openrisc | openrisc-*)
2443 + basic_machine=or32-unknown
2444 + ;;
2445 + os400)
2446 + basic_machine=powerpc-ibm
2447 + os=-os400
2448 + ;;
2449 OSE68000 | ose68000)
2450 basic_machine=m68000-ericsson
2451 os=-ose
2452 @@ -715,55 +933,76 @@
2453 basic_machine=i860-intel
2454 os=-osf
2455 ;;
2456 + parisc)
2457 + basic_machine=hppa-unknown
2458 + os=-linux
2459 + ;;
2460 + parisc-*)
2461 + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
2462 + os=-linux
2463 + ;;
2464 pbd)
2465 basic_machine=sparc-tti
2466 ;;
2467 pbb)
2468 basic_machine=m68k-tti
2469 ;;
2470 - pc532 | pc532-*)
2471 + pc532 | pc532-*)
2472 basic_machine=ns32k-pc532
2473 ;;
2474 - pentium | p5 | k5 | k6 | nexgen)
2475 + pc98)
2476 + basic_machine=i386-pc
2477 + ;;
2478 + pc98-*)
2479 + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
2480 + ;;
2481 + pentium | p5 | k5 | k6 | nexgen | viac3)
2482 basic_machine=i586-pc
2483 ;;
2484 - pentiumpro | p6 | 6x86 | athlon)
2485 + pentiumpro | p6 | 6x86 | athlon | athlon_*)
2486 basic_machine=i686-pc
2487 ;;
2488 - pentiumii | pentium2)
2489 + pentiumii | pentium2 | pentiumiii | pentium3)
2490 basic_machine=i686-pc
2491 ;;
2492 - pentium-* | p5-* | k5-* | k6-* | nexgen-*)
2493 + pentium4)
2494 + basic_machine=i786-pc
2495 + ;;
2496 + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
2497 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
2498 ;;
2499 pentiumpro-* | p6-* | 6x86-* | athlon-*)
2500 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
2501 ;;
2502 - pentiumii-* | pentium2-*)
2503 + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
2504 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
2505 ;;
2506 + pentium4-*)
2507 + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
2508 + ;;
2509 pn)
2510 basic_machine=pn-gould
2511 ;;
2512 power) basic_machine=power-ibm
2513 ;;
2514 - ppc) basic_machine=powerpc-unknown
2515 - ;;
2516 - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
2517 + ppc | ppcbe) basic_machine=powerpc-unknown
2518 + ;;
2519 + ppc-* | ppcbe-*)
2520 + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
2521 ;;
2522 ppcle | powerpclittle | ppc-le | powerpc-little)
2523 basic_machine=powerpcle-unknown
2524 - ;;
2525 + ;;
2526 ppcle-* | powerpclittle-*)
2527 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
2528 ;;
2529 ppc64) basic_machine=powerpc64-unknown
2530 - ;;
2531 + ;;
2532 ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
2533 ;;
2534 ppc64le | powerpc64little | ppc64-le | powerpc64-little)
2535 basic_machine=powerpc64le-unknown
2536 - ;;
2537 + ;;
2538 ppc64le-* | powerpc64little-*)
2539 basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
2540 ;;
2541 @@ -774,6 +1013,10 @@
2542 basic_machine=i586-unknown
2543 os=-pw32
2544 ;;
2545 + rdos)
2546 + basic_machine=i386-pc
2547 + os=-rdos
2548 + ;;
2549 rom68k)
2550 basic_machine=m68k-rom68k
2551 os=-coff
2552 @@ -784,10 +1027,30 @@
2553 rtpc | rtpc-*)
2554 basic_machine=romp-ibm
2555 ;;
2556 + s390 | s390-*)
2557 + basic_machine=s390-ibm
2558 + ;;
2559 + s390x | s390x-*)
2560 + basic_machine=s390x-ibm
2561 + ;;
2562 sa29200)
2563 basic_machine=a29k-amd
2564 os=-udi
2565 ;;
2566 + sb1)
2567 + basic_machine=mipsisa64sb1-unknown
2568 + ;;
2569 + sb1el)
2570 + basic_machine=mipsisa64sb1el-unknown
2571 + ;;
2572 + sde)
2573 + basic_machine=mipsisa32-sde
2574 + os=-elf
2575 + ;;
2576 + sei)
2577 + basic_machine=mips-sei
2578 + os=-seiux
2579 + ;;
2580 sequent)
2581 basic_machine=i386-sequent
2582 ;;
2583 @@ -795,7 +1058,13 @@
2584 basic_machine=sh-hitachi
2585 os=-hms
2586 ;;
2587 - sparclite-wrs)
2588 + sh5el)
2589 + basic_machine=sh5le-unknown
2590 + ;;
2591 + sh64)
2592 + basic_machine=sh64-unknown
2593 + ;;
2594 + sparclite-wrs | simso-wrs)
2595 basic_machine=sparclite-wrs
2596 os=-vxworks
2597 ;;
2598 @@ -813,6 +1082,9 @@
2599 basic_machine=i860-stratus
2600 os=-sysv4
2601 ;;
2602 + strongarm-* | thumb-*)
2603 + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
2604 + ;;
2605 sun2)
2606 basic_machine=m68000-sun
2607 ;;
2608 @@ -862,12 +1134,16 @@
2609 os=-dynix
2610 ;;
2611 t3e)
2612 - basic_machine=t3e-cray
2613 + basic_machine=alphaev5-cray
2614 os=-unicos
2615 ;;
2616 - tic54x | c54x*)
2617 - basic_machine=tic54x-unknown
2618 - os=-coff
2619 + t90)
2620 + basic_machine=t90-cray
2621 + os=-unicos
2622 + ;;
2623 + tile*)
2624 + basic_machine=$basic_machine-unknown
2625 + os=-linux-gnu
2626 ;;
2627 tx39)
2628 basic_machine=mipstx39-unknown
2629 @@ -875,9 +1151,17 @@
2630 tx39el)
2631 basic_machine=mipstx39el-unknown
2632 ;;
2633 + toad1)
2634 + basic_machine=pdp10-xkl
2635 + os=-tops20
2636 + ;;
2637 tower | tower-32)
2638 basic_machine=m68k-ncr
2639 ;;
2640 + tpf)
2641 + basic_machine=s390x-ibm
2642 + os=-tpf
2643 + ;;
2644 udi29k)
2645 basic_machine=a29k-amd
2646 os=-udi
2647 @@ -899,8 +1183,8 @@
2648 os=-vms
2649 ;;
2650 vpp*|vx|vx-*)
2651 - basic_machine=f301-fujitsu
2652 - ;;
2653 + basic_machine=f301-fujitsu
2654 + ;;
2655 vxworks960)
2656 basic_machine=i960-wrs
2657 os=-vxworks
2658 @@ -921,21 +1205,28 @@
2659 basic_machine=hppa1.1-winbond
2660 os=-proelf
2661 ;;
2662 - windows32)
2663 - basic_machine=i386-pc
2664 - os=-windows32-msvcrt
2665 - ;;
2666 - xmp)
2667 - basic_machine=xmp-cray
2668 - os=-unicos
2669 + xbox)
2670 + basic_machine=i686-pc
2671 + os=-mingw32
2672 ;;
2673 - xps | xps100)
2674 + xps | xps100)
2675 basic_machine=xps100-honeywell
2676 ;;
2677 + xscale-* | xscalee[bl]-*)
2678 + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
2679 + ;;
2680 + ymp)
2681 + basic_machine=ymp-cray
2682 + os=-unicos
2683 + ;;
2684 z8k-*-coff)
2685 basic_machine=z8k-unknown
2686 os=-sim
2687 ;;
2688 + z80-*-coff)
2689 + basic_machine=z80-unknown
2690 + os=-sim
2691 + ;;
2692 none)
2693 basic_machine=none-none
2694 os=-none
2695 @@ -952,16 +1243,12 @@
2696 op60c)
2697 basic_machine=hppa1.1-oki
2698 ;;
2699 - mips)
2700 - if [ x$os = x-linux-gnu ]; then
2701 - basic_machine=mips-unknown
2702 - else
2703 - basic_machine=mips-mips
2704 - fi
2705 - ;;
2706 romp)
2707 basic_machine=romp-ibm
2708 ;;
2709 + mmix)
2710 + basic_machine=mmix-knuth
2711 + ;;
2712 rs6000)
2713 basic_machine=rs6000-ibm
2714 ;;
2715 @@ -978,13 +1265,13 @@
2716 we32k)
2717 basic_machine=we32k-att
2718 ;;
2719 - sh3 | sh4 | sh3eb | sh4eb)
2720 + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
2721 basic_machine=sh-unknown
2722 ;;
2723 - sparc | sparcv9 | sparcv9b)
2724 + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
2725 basic_machine=sparc-sun
2726 ;;
2727 - cydra)
2728 + cydra)
2729 basic_machine=cydra-cydrome
2730 ;;
2731 orion)
2732 @@ -999,10 +1286,6 @@
2733 pmac | pmac-mpw)
2734 basic_machine=powerpc-apple
2735 ;;
2736 - c4x*)
2737 - basic_machine=c4x-none
2738 - os=-coff
2739 - ;;
2740 *-unknown)
2741 # Make sure to match an already-canonicalized machine name.
2742 ;;
2743 @@ -1029,9 +1312,12 @@
2744 if [ x"$os" != x"" ]
2745 then
2746 case $os in
2747 - # First match some system type aliases
2748 - # that might get confused with valid system types.
2749 + # First match some system type aliases
2750 + # that might get confused with valid system types.
2751 # -solaris* is a basic system type, with this one exception.
2752 + -auroraux)
2753 + os=-auroraux
2754 + ;;
2755 -solaris1 | -solaris1.*)
2756 os=`echo $os | sed -e 's|solaris1|sunos4|'`
2757 ;;
2758 @@ -1052,23 +1338,31 @@
2759 # Each alternative MUST END IN A *, to match a version number.
2760 # -sysv* is not here because it comes later, after sysvr4.
2761 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
2762 - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
2763 - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
2764 + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
2765 + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
2766 + | -sym* | -kopensolaris* \
2767 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
2768 - | -aos* \
2769 + | -aos* | -aros* \
2770 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
2771 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
2772 - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
2773 - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
2774 + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
2775 + | -openbsd* | -solidbsd* \
2776 + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
2777 + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
2778 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
2779 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
2780 - | -chorusos* | -chorusrdb* \
2781 - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
2782 - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
2783 - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
2784 + | -chorusos* | -chorusrdb* | -cegcc* \
2785 + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
2786 + | -mingw32* | -linux-gnu* | -linux-android* \
2787 + | -linux-newlib* | -linux-uclibc* \
2788 + | -uxpv* | -beos* | -mpeix* | -udk* \
2789 + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
2790 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
2791 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
2792 - | -os2* | -vos*)
2793 + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
2794 + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
2795 + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
2796 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
2797 # Remember, each alternative MUST END IN *, to match a version number.
2798 ;;
2799 -qnx*)
2800 @@ -1080,16 +1374,21 @@
2801 ;;
2802 esac
2803 ;;
2804 + -nto-qnx*)
2805 + ;;
2806 -nto*)
2807 - os=-nto-qnx
2808 + os=`echo $os | sed -e 's|nto|nto-qnx|'`
2809 ;;
2810 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
2811 - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
2812 + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
2813 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
2814 ;;
2815 -mac*)
2816 os=`echo $os | sed -e 's|mac|macos|'`
2817 ;;
2818 + -linux-dietlibc)
2819 + os=-linux-dietlibc
2820 + ;;
2821 -linux*)
2822 os=`echo $os | sed -e 's|linux|linux-gnu|'`
2823 ;;
2824 @@ -1102,6 +1401,9 @@
2825 -opened*)
2826 os=-openedition
2827 ;;
2828 + -os400*)
2829 + os=-os400
2830 + ;;
2831 -wince*)
2832 os=-wince
2833 ;;
2834 @@ -1120,14 +1422,23 @@
2835 -acis*)
2836 os=-aos
2837 ;;
2838 + -atheos*)
2839 + os=-atheos
2840 + ;;
2841 + -syllable*)
2842 + os=-syllable
2843 + ;;
2844 -386bsd)
2845 os=-bsd
2846 ;;
2847 -ctix* | -uts*)
2848 os=-sysv
2849 ;;
2850 + -nova*)
2851 + os=-rtmk-nova
2852 + ;;
2853 -ns2 )
2854 - os=-nextstep2
2855 + os=-nextstep2
2856 ;;
2857 -nsk*)
2858 os=-nsk
2859 @@ -1139,6 +1450,9 @@
2860 -sinix*)
2861 os=-sysv4
2862 ;;
2863 + -tpf*)
2864 + os=-tpf
2865 + ;;
2866 -triton*)
2867 os=-sysv3
2868 ;;
2869 @@ -1166,8 +1480,22 @@
2870 -xenix)
2871 os=-xenix
2872 ;;
2873 - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
2874 - os=-mint
2875 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
2876 + os=-mint
2877 + ;;
2878 + -aros*)
2879 + os=-aros
2880 + ;;
2881 + -kaos*)
2882 + os=-kaos
2883 + ;;
2884 + -zvmoe)
2885 + os=-zvmoe
2886 + ;;
2887 + -dicos*)
2888 + os=-dicos
2889 + ;;
2890 + -nacl*)
2891 ;;
2892 -none)
2893 ;;
2894 @@ -1191,6 +1519,12 @@
2895 # system, and we'll never get to this point.
2897 case $basic_machine in
2898 + score-*)
2899 + os=-elf
2900 + ;;
2901 + spu-*)
2902 + os=-elf
2903 + ;;
2904 *-acorn)
2905 os=-riscix1.2
2906 ;;
2907 @@ -1200,10 +1534,23 @@
2908 arm*-semi)
2909 os=-aout
2910 ;;
2911 + c4x-* | tic4x-*)
2912 + os=-coff
2913 + ;;
2914 + tic54x-*)
2915 + os=-coff
2916 + ;;
2917 + tic55x-*)
2918 + os=-coff
2919 + ;;
2920 + tic6x-*)
2921 + os=-coff
2922 + ;;
2923 + # This must come before the *-dec entry.
2924 pdp10-*)
2925 os=-tops20
2926 ;;
2927 - pdp11-*)
2928 + pdp11-*)
2929 os=-none
2930 ;;
2931 *-dec | vax-*)
2932 @@ -1217,19 +1564,22 @@
2933 ;;
2934 m68000-sun)
2935 os=-sunos3
2936 - # This also exists in the configure program, but was not the
2937 - # default.
2938 - # os=-sunos4
2939 ;;
2940 m68*-cisco)
2941 os=-aout
2942 ;;
2943 + mep-*)
2944 + os=-elf
2945 + ;;
2946 mips*-cisco)
2947 os=-elf
2948 ;;
2949 mips*-*)
2950 os=-elf
2951 ;;
2952 + or32-*)
2953 + os=-coff
2954 + ;;
2955 *-tti) # must be before sparc entry or we get the wrong os.
2956 os=-sysv3
2957 ;;
2958 @@ -1239,9 +1589,15 @@
2959 *-be)
2960 os=-beos
2961 ;;
2962 + *-haiku)
2963 + os=-haiku
2964 + ;;
2965 *-ibm)
2966 os=-aix
2967 ;;
2968 + *-knuth)
2969 + os=-mmixware
2970 + ;;
2971 *-wec)
2972 os=-proelf
2973 ;;
2974 @@ -1293,19 +1649,19 @@
2975 *-next)
2976 os=-nextstep3
2977 ;;
2978 - *-gould)
2979 + *-gould)
2980 os=-sysv
2981 ;;
2982 - *-highlevel)
2983 + *-highlevel)
2984 os=-bsd
2985 ;;
2986 *-encore)
2987 os=-bsd
2988 ;;
2989 - *-sgi)
2990 + *-sgi)
2991 os=-irix
2992 ;;
2993 - *-siemens)
2994 + *-siemens)
2995 os=-sysv4
2996 ;;
2997 *-masscomp)
2998 @@ -1344,7 +1700,7 @@
2999 -sunos*)
3000 vendor=sun
3001 ;;
3002 - -aix*)
3003 + -cnk*|-aix*)
3004 vendor=ibm
3005 ;;
3006 -beos*)
3007 @@ -1374,10 +1730,16 @@
3008 -mvs* | -opened*)
3009 vendor=ibm
3010 ;;
3011 + -os400*)
3012 + vendor=ibm
3013 + ;;
3014 -ptx*)
3015 vendor=sequent
3016 ;;
3017 - -vxsim* | -vxworks*)
3018 + -tpf*)
3019 + vendor=ibm
3020 + ;;
3021 + -vxsim* | -vxworks* | -windiss*)
3022 vendor=wrs
3023 ;;
3024 -aux*)
3025 @@ -1401,7 +1763,7 @@
3026 esac
3028 echo $basic_machine$os
3029 -exit 0
3030 +exit
3032 # Local variables:
3033 # eval: (add-hook 'write-file-hooks 'time-stamp)
3034 diff -Naur lmarbles-1.0.8-orig/Makefile.in lmarbles-1.0.8/Makefile.in
3035 --- lmarbles-1.0.8-orig/Makefile.in 2013-10-12 15:43:21.528033430 +0200
3036 +++ lmarbles-1.0.8/Makefile.in 2013-10-12 15:53:32.280063135 +0200
3037 @@ -122,6 +122,7 @@
3038 PACKAGE_NAME = @PACKAGE_NAME@
3039 PACKAGE_STRING = @PACKAGE_STRING@
3040 PACKAGE_TARNAME = @PACKAGE_TARNAME@
3041 +PACKAGE_URL = @PACKAGE_URL@
3042 PACKAGE_VERSION = @PACKAGE_VERSION@
3043 PATH_SEPARATOR = @PATH_SEPARATOR@
3044 RANLIB = @RANLIB@
3045 @@ -192,11 +193,9 @@
3046 win32_inst_script = @win32_inst_script@
3047 SUBDIRS = src
3048 EXTRA_DIST = lmarbles.spec AUTHORS COPYING ChangeLog INSTALL README \
3049 -README-SDL.txt TODO LMarbles.prj lmarbles32.gif lmarbles48.gif \
3050 -lmarbles.desktop.in
3051 +README-SDL.txt TODO LMarbles.prj lmarbles32.gif lmarbles48.gif
3053 desktopdir = $(datadir)/applications
3054 -desktop_DATA = lmarbles.desktop
3055 icondir = $(datadir)/icons
3056 icon_DATA = lmarbles48.gif
3057 AUTOMAKE_OPTIONS = foreign
3058 @@ -258,15 +257,6 @@
3059 distclean-hdr:
3060 -rm -f config.h stamp-h1
3061 uninstall-info-am:
3062 -install-desktopDATA: $(desktop_DATA)
3063 - @$(NORMAL_INSTALL)
3064 - test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
3065 - @list='$(desktop_DATA)'; for p in $$list; do \
3066 - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3067 - f=$(am__strip_dir) \
3068 - echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
3069 - $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
3070 - done
3072 uninstall-desktopDATA:
3073 @$(NORMAL_UNINSTALL)
3074 @@ -469,7 +459,8 @@
3075 || exit 1; \
3076 fi; \
3077 done
3078 - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
3079 + -find "$(distdir)" -type d ! -perm -755 \
3080 + -exec chmod u+rwx,go+rx {} \; -o \
3081 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
3082 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
3083 ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
3084 @@ -667,10 +658,6 @@
3085 uninstall-desktopDATA uninstall-iconDATA uninstall-info-am
3088 -lmarbles.desktop:
3089 - @sed -e "s+Icon=+Icon=$(datadir)/icons/lmarbles48.gif+" \
3090 - < lmarbles.desktop.in > lmarbles.desktop
3091 -
3092 win32text: $(WIN32_TEXT)
3093 @echo Converting text files for win32 installer
3094 @-rm -rf ./win32text
3095 diff -Naur lmarbles-1.0.8-orig/src/cfg.c lmarbles-1.0.8/src/cfg.c
3096 --- lmarbles-1.0.8-orig/src/cfg.c 2013-10-12 15:43:21.532033456 +0200
3097 +++ lmarbles-1.0.8/src/cfg.c 2013-10-12 16:20:25.000141128 +0200
3098 @@ -42,6 +42,8 @@
3099 DIR *dir;
3100 #ifdef _WIN32
3101 snprintf( c_pth, sizeof(c_pth)-1, "%s/lgames", (getenv( "HOME" )?getenv( "HOME" ):".") );
3102 +#elif __AROS__
3103 + snprintf( c_pth, sizeof(c_pth)-1, "%s/.lgames", "/PROGDIR" );
3104 #else
3105 snprintf( c_pth, sizeof(c_pth)-1, "%s/.lgames", getenv( "HOME" ) );
3106 #endif
3107 diff -Naur lmarbles-1.0.8-orig/src/Makefile.in lmarbles-1.0.8/src/Makefile.in
3108 --- lmarbles-1.0.8-orig/src/Makefile.in 2013-10-12 15:43:21.532033456 +0200
3109 +++ lmarbles-1.0.8/src/Makefile.in 2013-10-12 15:45:18.400039174 +0200
3110 @@ -107,6 +107,7 @@
3111 PACKAGE_NAME = @PACKAGE_NAME@
3112 PACKAGE_STRING = @PACKAGE_STRING@
3113 PACKAGE_TARNAME = @PACKAGE_TARNAME@
3114 +PACKAGE_URL = @PACKAGE_URL@
3115 PACKAGE_VERSION = @PACKAGE_VERSION@
3116 PATH_SEPARATOR = @PATH_SEPARATOR@
3117 RANLIB = @RANLIB@
3118 @@ -232,9 +233,9 @@
3119 exit 1;; \
3120 esac; \
3121 done; \
3122 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
3123 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
3124 cd $(top_srcdir) && \
3125 - $(AUTOMAKE) --foreign src/Makefile
3126 + $(AUTOMAKE) --gnu src/Makefile
3127 .PRECIOUS: Makefile
3128 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
3129 @case '$?' in \