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