source: scripts_home/scripts/untested/blfs-patches/libfame-0.9.1-update_gnu_config-1.patch@ 1c9c5c3

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 1c9c5c3 was 1c9c5c3, checked in by Jim Gifford <clfs@…>, 19 years ago

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