source: patches/mktemp-1.5-config_update-1.patch@ 6f9ab64

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

r3947@server (orig r1774): ken | 2006-06-18 07:07:42 -0700
rename mktemp config patch
  • Property mode set to 100644
File size: 56.4 KB
RevLine 
[69cde8d]1Submitted By: Jim Gifford (patches at jg555 dot com)
2Date: 2005-10-01
3Initial Package Version: 1.5
4Origin: Jim Gifford
5Upstream Status: Sent
6Description: Updates config.sub and config.guess
7
8diff -Naur mktemp-1.5.orig/config.guess mktemp-1.5/config.guess
9--- mktemp-1.5.orig/config.guess 2001-07-17 02:57:40.000000000 +0000
10+++ mktemp-1.5/config.guess 2005-10-01 23:24:40.000000000 +0000
11@@ -1,9 +1,9 @@
12 #! /bin/sh
13 # Attempt to guess a canonical system name.
14-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
15-# Free Software Foundation, Inc.
16+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
17+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
18
19-timestamp='2001-04-20'
20+timestamp='2004-11-12'
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@@ -24,8 +24,9 @@
25 # configuration script generated by Autoconf, you may include it under
26 # the same distribution terms that you use for the rest of that program.
27
28-# Written by Per Bothner <bothner@cygnus.com>.
29-# Please send patches to <config-patches@gnu.org>.
30+# Originally written by Per Bothner <per@bothner.com>.
31+# Please send patches to <config-patches@gnu.org>. Submit a context
32+# diff and a properly formatted ChangeLog entry.
33 #
34 # This script attempts to guess a canonical system name similar to
35 # config.sub. If it succeeds, it prints the system name on stdout, and
36@@ -52,7 +53,7 @@
37 GNU config.guess ($timestamp)
38
39 Originally written by Per Bothner.
40-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
41+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
42 Free Software Foundation, Inc.
43
44 This is free software; see the source for copying conditions. There is NO
45@@ -87,33 +88,45 @@
46 exit 1
47 fi
48
49+trap 'exit 1' 1 2 15
50
51-dummy=dummy-$$
52-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
53+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
54+# compiler to aid in system detection is discouraged as it requires
55+# temporary files to be created and, as you can see below, it is a
56+# headache to deal with in a portable fashion.
57
58-# CC_FOR_BUILD -- compiler used by this script.
59 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
60 # use `HOST_CC' if defined, but it is deprecated.
61
62+# Portable tmp directory creation inspired by the Autoconf team.
63+
64+set_cc_for_build='
65+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
66+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
67+: ${TMPDIR=/tmp} ;
68+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
69+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
70+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
71+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
72+dummy=$tmp/dummy ;
73+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
74 case $CC_FOR_BUILD,$HOST_CC,$CC in
75- ,,) echo "int dummy(){}" > $dummy.c
76- for c in cc gcc c89 ; do
77- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
78- if test $? = 0 ; then
79- CC_FOR_BUILD="$c"; break
80- fi
81- done
82- rm -f $dummy.c $dummy.o $dummy.rel
83+ ,,) echo "int x;" > $dummy.c ;
84+ for c in cc gcc c89 c99 ; do
85+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
86+ CC_FOR_BUILD="$c"; break ;
87+ fi ;
88+ done ;
89 if test x"$CC_FOR_BUILD" = x ; then
90- CC_FOR_BUILD=no_compiler_found
91+ CC_FOR_BUILD=no_compiler_found ;
92 fi
93 ;;
94 ,,*) CC_FOR_BUILD=$CC ;;
95 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
96-esac
97+esac ;'
98
99 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
100-# (ghazi@noc.rutgers.edu 8/24/94.)
101+# (ghazi@noc.rutgers.edu 1994-08-24)
102 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
103 PATH=$PATH:/.attbin ; export PATH
104 fi
105@@ -127,29 +140,31 @@
106
107 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
108 *:NetBSD:*:*)
109- # Netbsd (nbsd) targets should (where applicable) match one or
110+ # NetBSD (nbsd) targets should (where applicable) match one or
111 # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
112 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
113 # switched to ELF, *-*-netbsd* would select the old
114 # object file format. This provides both forward
115 # compatibility and a consistent mechanism for selecting the
116 # object file format.
117- # Determine the machine/vendor (is the vendor relevant).
118- case "${UNAME_MACHINE}" in
119- amiga) machine=m68k-unknown ;;
120- arm32) machine=arm-unknown ;;
121- atari*) machine=m68k-atari ;;
122- sun3*) machine=m68k-sun ;;
123- mac68k) machine=m68k-apple ;;
124- macppc) machine=powerpc-apple ;;
125- hp3[0-9][05]) machine=m68k-hp ;;
126- ibmrt|romp-ibm) machine=romp-ibm ;;
127- *) machine=${UNAME_MACHINE}-unknown ;;
128+ #
129+ # Note: NetBSD doesn't particularly care about the vendor
130+ # portion of the name. We always set it to "unknown".
131+ sysctl="sysctl -n hw.machine_arch"
132+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
133+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
134+ case "${UNAME_MACHINE_ARCH}" in
135+ armeb) machine=armeb-unknown ;;
136+ arm*) machine=arm-unknown ;;
137+ sh3el) machine=shl-unknown ;;
138+ sh3eb) machine=sh-unknown ;;
139+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
140 esac
141 # The Operating System including object format, if it has switched
142 # to ELF recently, or will in the future.
143- case "${UNAME_MACHINE}" in
144- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
145+ case "${UNAME_MACHINE_ARCH}" in
146+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
147+ eval $set_cc_for_build
148 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
149 | grep __ELF__ >/dev/null
150 then
151@@ -165,70 +180,123 @@
152 ;;
153 esac
154 # The OS release
155- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
156+ # Debian GNU/NetBSD machines have a different userland, and
157+ # thus, need a distinct triplet. However, they do not need
158+ # kernel version information, so it can be replaced with a
159+ # suitable tag, in the style of linux-gnu.
160+ case "${UNAME_VERSION}" in
161+ Debian*)
162+ release='-gnu'
163+ ;;
164+ *)
165+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
166+ ;;
167+ esac
168 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
169 # contains redundant information, the shorter form:
170 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
171 echo "${machine}-${os}${release}"
172 exit 0 ;;
173+ amd64:OpenBSD:*:*)
174+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
175+ exit 0 ;;
176+ amiga:OpenBSD:*:*)
177+ echo m68k-unknown-openbsd${UNAME_RELEASE}
178+ exit 0 ;;
179+ cats:OpenBSD:*:*)
180+ echo arm-unknown-openbsd${UNAME_RELEASE}
181+ exit 0 ;;
182+ hp300:OpenBSD:*:*)
183+ echo m68k-unknown-openbsd${UNAME_RELEASE}
184+ exit 0 ;;
185+ luna88k:OpenBSD:*:*)
186+ echo m88k-unknown-openbsd${UNAME_RELEASE}
187+ exit 0 ;;
188+ mac68k:OpenBSD:*:*)
189+ echo m68k-unknown-openbsd${UNAME_RELEASE}
190+ exit 0 ;;
191+ macppc:OpenBSD:*:*)
192+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
193+ exit 0 ;;
194+ mvme68k:OpenBSD:*:*)
195+ echo m68k-unknown-openbsd${UNAME_RELEASE}
196+ exit 0 ;;
197+ mvme88k:OpenBSD:*:*)
198+ echo m88k-unknown-openbsd${UNAME_RELEASE}
199+ exit 0 ;;
200+ mvmeppc:OpenBSD:*:*)
201+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
202+ exit 0 ;;
203+ sgi:OpenBSD:*:*)
204+ echo mips64-unknown-openbsd${UNAME_RELEASE}
205+ exit 0 ;;
206+ sun3:OpenBSD:*:*)
207+ echo m68k-unknown-openbsd${UNAME_RELEASE}
208+ exit 0 ;;
209+ *:OpenBSD:*:*)
210+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
211+ exit 0 ;;
212+ *:ekkoBSD:*:*)
213+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
214+ exit 0 ;;
215+ macppc:MirBSD:*:*)
216+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
217+ exit 0 ;;
218+ *:MirBSD:*:*)
219+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
220+ exit 0 ;;
221 alpha:OSF1:*:*)
222- if test $UNAME_RELEASE = "V4.0"; then
223+ case $UNAME_RELEASE in
224+ *4.0)
225 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
226- fi
227+ ;;
228+ *5.*)
229+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
230+ ;;
231+ esac
232+ # According to Compaq, /usr/sbin/psrinfo has been available on
233+ # OSF/1 and Tru64 systems produced since 1995. I hope that
234+ # covers most systems running today. This code pipes the CPU
235+ # types through head -n 1, so we only detect the type of CPU 0.
236+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
237+ case "$ALPHA_CPU_TYPE" in
238+ "EV4 (21064)")
239+ UNAME_MACHINE="alpha" ;;
240+ "EV4.5 (21064)")
241+ UNAME_MACHINE="alpha" ;;
242+ "LCA4 (21066/21068)")
243+ UNAME_MACHINE="alpha" ;;
244+ "EV5 (21164)")
245+ UNAME_MACHINE="alphaev5" ;;
246+ "EV5.6 (21164A)")
247+ UNAME_MACHINE="alphaev56" ;;
248+ "EV5.6 (21164PC)")
249+ UNAME_MACHINE="alphapca56" ;;
250+ "EV5.7 (21164PC)")
251+ UNAME_MACHINE="alphapca57" ;;
252+ "EV6 (21264)")
253+ UNAME_MACHINE="alphaev6" ;;
254+ "EV6.7 (21264A)")
255+ UNAME_MACHINE="alphaev67" ;;
256+ "EV6.8CB (21264C)")
257+ UNAME_MACHINE="alphaev68" ;;
258+ "EV6.8AL (21264B)")
259+ UNAME_MACHINE="alphaev68" ;;
260+ "EV6.8CX (21264D)")
261+ UNAME_MACHINE="alphaev68" ;;
262+ "EV6.9A (21264/EV69A)")
263+ UNAME_MACHINE="alphaev69" ;;
264+ "EV7 (21364)")
265+ UNAME_MACHINE="alphaev7" ;;
266+ "EV7.9 (21364A)")
267+ UNAME_MACHINE="alphaev79" ;;
268+ esac
269+ # A Pn.n version is a patched version.
270 # A Vn.n version is a released version.
271 # A Tn.n version is a released field test version.
272 # A Xn.n version is an unreleased experimental baselevel.
273 # 1.2 uses "1.2" for uname -r.
274- cat <<EOF >$dummy.s
275- .data
276-\$Lformat:
277- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
278-
279- .text
280- .globl main
281- .align 4
282- .ent main
283-main:
284- .frame \$30,16,\$26,0
285- ldgp \$29,0(\$27)
286- .prologue 1
287- .long 0x47e03d80 # implver \$0
288- lda \$2,-1
289- .long 0x47e20c21 # amask \$2,\$1
290- lda \$16,\$Lformat
291- mov \$0,\$17
292- not \$1,\$18
293- jsr \$26,printf
294- ldgp \$29,0(\$26)
295- mov 0,\$16
296- jsr \$26,exit
297- .end main
298-EOF
299- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
300- if test "$?" = 0 ; then
301- case `./$dummy` in
302- 0-0)
303- UNAME_MACHINE="alpha"
304- ;;
305- 1-0)
306- UNAME_MACHINE="alphaev5"
307- ;;
308- 1-1)
309- UNAME_MACHINE="alphaev56"
310- ;;
311- 1-101)
312- UNAME_MACHINE="alphapca56"
313- ;;
314- 2-303)
315- UNAME_MACHINE="alphaev6"
316- ;;
317- 2-307)
318- UNAME_MACHINE="alphaev67"
319- ;;
320- esac
321- fi
322- rm -f $dummy.s $dummy
323- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
324+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
325 exit 0 ;;
326 Alpha\ *:Windows_NT*:*)
327 # How do we know it's Interix rather than the generic POSIX subsystem?
328@@ -242,33 +310,21 @@
329 Amiga*:UNIX_System_V:4.0:*)
330 echo m68k-unknown-sysv4
331 exit 0;;
332- amiga:OpenBSD:*:*)
333- echo m68k-unknown-openbsd${UNAME_RELEASE}
334- exit 0 ;;
335 *:[Aa]miga[Oo][Ss]:*:*)
336 echo ${UNAME_MACHINE}-unknown-amigaos
337 exit 0 ;;
338- arc64:OpenBSD:*:*)
339- echo mips64el-unknown-openbsd${UNAME_RELEASE}
340- exit 0 ;;
341- arc:OpenBSD:*:*)
342- echo mipsel-unknown-openbsd${UNAME_RELEASE}
343- exit 0 ;;
344- hkmips:OpenBSD:*:*)
345- echo mips-unknown-openbsd${UNAME_RELEASE}
346- exit 0 ;;
347- pmax:OpenBSD:*:*)
348- echo mipsel-unknown-openbsd${UNAME_RELEASE}
349- exit 0 ;;
350- sgi:OpenBSD:*:*)
351- echo mips-unknown-openbsd${UNAME_RELEASE}
352- exit 0 ;;
353- wgrisc:OpenBSD:*:*)
354- echo mipsel-unknown-openbsd${UNAME_RELEASE}
355+ *:[Mm]orph[Oo][Ss]:*:*)
356+ echo ${UNAME_MACHINE}-unknown-morphos
357 exit 0 ;;
358 *:OS/390:*:*)
359 echo i370-ibm-openedition
360 exit 0 ;;
361+ *:z/VM:*:*)
362+ echo s390-ibm-zvmoe
363+ exit 0 ;;
364+ *:OS400:*:*)
365+ echo powerpc-ibm-os400
366+ exit 0 ;;
367 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
368 echo arm-acorn-riscix${UNAME_RELEASE}
369 exit 0;;
370@@ -286,6 +342,13 @@
371 NILE*:*:*:dcosx)
372 echo pyramid-pyramid-svr4
373 exit 0 ;;
374+ DRS?6000:unix:4.0:6*)
375+ echo sparc-icl-nx6
376+ exit 0 ;;
377+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
378+ case `/usr/bin/uname -p` in
379+ sparc) echo sparc-icl-nx7 && exit 0 ;;
380+ esac ;;
381 sun4H:SunOS:5.*:*)
382 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
383 exit 0 ;;
384@@ -314,7 +377,7 @@
385 echo m68k-sun-sunos${UNAME_RELEASE}
386 exit 0 ;;
387 sun*:*:4.2BSD:*)
388- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
389+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
390 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
391 case "`/bin/arch`" in
392 sun3)
393@@ -328,9 +391,6 @@
394 aushp:SunOS:*:*)
395 echo sparc-auspex-sunos${UNAME_RELEASE}
396 exit 0 ;;
397- atari*:OpenBSD:*:*)
398- echo m68k-unknown-openbsd${UNAME_RELEASE}
399- exit 0 ;;
400 # The situation for MiNT is a little confusing. The machine name
401 # can be virtually everything (everything which is not
402 # "atarist" or "atariste" at least should have a processor
403@@ -357,17 +417,8 @@
404 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
405 echo m68k-unknown-mint${UNAME_RELEASE}
406 exit 0 ;;
407- sun3*:OpenBSD:*:*)
408- echo m68k-unknown-openbsd${UNAME_RELEASE}
409- exit 0 ;;
410- mac68k:OpenBSD:*:*)
411- echo m68k-unknown-openbsd${UNAME_RELEASE}
412- exit 0 ;;
413- mvme68k:OpenBSD:*:*)
414- echo m68k-unknown-openbsd${UNAME_RELEASE}
415- exit 0 ;;
416- mvme88k:OpenBSD:*:*)
417- echo m88k-unknown-openbsd${UNAME_RELEASE}
418+ m68k:machten:*:*)
419+ echo m68k-apple-machten${UNAME_RELEASE}
420 exit 0 ;;
421 powerpc:machten:*:*)
422 echo powerpc-apple-machten${UNAME_RELEASE}
423@@ -385,6 +436,7 @@
424 echo clipper-intergraph-clix${UNAME_RELEASE}
425 exit 0 ;;
426 mips:*:*:UMIPS | mips:*:*:RISCos)
427+ eval $set_cc_for_build
428 sed 's/^ //' << EOF >$dummy.c
429 #ifdef __cplusplus
430 #include <stdio.h> /* for printf() prototype */
431@@ -406,15 +458,20 @@
432 exit (-1);
433 }
434 EOF
435- $CC_FOR_BUILD $dummy.c -o $dummy \
436- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
437- && rm -f $dummy.c $dummy && exit 0
438- rm -f $dummy.c $dummy
439+ $CC_FOR_BUILD -o $dummy $dummy.c \
440+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
441+ && exit 0
442 echo mips-mips-riscos${UNAME_RELEASE}
443 exit 0 ;;
444 Motorola:PowerMAX_OS:*:*)
445 echo powerpc-motorola-powermax
446 exit 0 ;;
447+ Motorola:*:4.3:PL8-*)
448+ echo powerpc-harris-powermax
449+ exit 0 ;;
450+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
451+ echo powerpc-harris-powermax
452+ exit 0 ;;
453 Night_Hawk:Power_UNIX:*:*)
454 echo powerpc-harris-powerunix
455 exit 0 ;;
456@@ -475,6 +532,7 @@
457 exit 0 ;;
458 *:AIX:2:3)
459 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
460+ eval $set_cc_for_build
461 sed 's/^ //' << EOF >$dummy.c
462 #include <sys/systemcfg.h>
463
464@@ -486,8 +544,7 @@
465 exit(0);
466 }
467 EOF
468- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
469- rm -f $dummy.c $dummy
470+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
471 echo rs6000-ibm-aix3.2.5
472 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
473 echo rs6000-ibm-aix3.2.4
474@@ -496,7 +553,7 @@
475 fi
476 exit 0 ;;
477 *:AIX:*:[45])
478- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
479+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
480 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
481 IBM_ARCH=rs6000
482 else
483@@ -536,10 +593,8 @@
484 9000/31? ) HP_ARCH=m68000 ;;
485 9000/[34]?? ) HP_ARCH=m68k ;;
486 9000/[678][0-9][0-9])
487- case "${HPUX_REV}" in
488- 11.[0-9][0-9])
489- if [ -x /usr/bin/getconf ]; then
490- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
491+ if [ -x /usr/bin/getconf ]; then
492+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
493 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
494 case "${sc_cpu_version}" in
495 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
496@@ -548,12 +603,13 @@
497 case "${sc_kernel_bits}" in
498 32) HP_ARCH="hppa2.0n" ;;
499 64) HP_ARCH="hppa2.0w" ;;
500+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
501 esac ;;
502 esac
503- fi ;;
504- esac
505- if [ "${HP_ARCH}" = "" ]; then
506- sed 's/^ //' << EOF >$dummy.c
507+ fi
508+ if [ "${HP_ARCH}" = "" ]; then
509+ eval $set_cc_for_build
510+ sed 's/^ //' << EOF >$dummy.c
511
512 #define _HPUX_SOURCE
513 #include <stdlib.h>
514@@ -586,11 +642,21 @@
515 exit (0);
516 }
517 EOF
518- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
519- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
520- rm -f $dummy.c $dummy
521- fi ;;
522+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
523+ test -z "$HP_ARCH" && HP_ARCH=hppa
524+ fi ;;
525 esac
526+ if [ ${HP_ARCH} = "hppa2.0w" ]
527+ then
528+ # avoid double evaluation of $set_cc_for_build
529+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
530+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
531+ then
532+ HP_ARCH="hppa2.0w"
533+ else
534+ HP_ARCH="hppa64"
535+ fi
536+ fi
537 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
538 exit 0 ;;
539 ia64:HP-UX:*:*)
540@@ -598,6 +664,7 @@
541 echo ia64-hp-hpux${HPUX_REV}
542 exit 0 ;;
543 3050*:HI-UX:*:*)
544+ eval $set_cc_for_build
545 sed 's/^ //' << EOF >$dummy.c
546 #include <unistd.h>
547 int
548@@ -623,8 +690,7 @@
549 exit (0);
550 }
551 EOF
552- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
553- rm -f $dummy.c $dummy
554+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
555 echo unknown-hitachi-hiuxwe2
556 exit 0 ;;
557 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
558@@ -633,7 +699,7 @@
559 9000/8??:4.3bsd:*:*)
560 echo hppa1.0-hp-bsd
561 exit 0 ;;
562- *9??*:MPE/iX:*:*)
563+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
564 echo hppa1.0-hp-mpeix
565 exit 0 ;;
566 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
567@@ -652,9 +718,6 @@
568 parisc*:Lites*:*:*)
569 echo hppa1.1-hp-lites
570 exit 0 ;;
571- hppa*:OpenBSD:*:*)
572- echo hppa-unknown-openbsd
573- exit 0 ;;
574 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
575 echo c1-convex-bsd
576 exit 0 ;;
577@@ -673,40 +736,37 @@
578 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
579 echo c4-convex-bsd
580 exit 0 ;;
581- CRAY*X-MP:*:*:*)
582- echo xmp-cray-unicos
583- exit 0 ;;
584 CRAY*Y-MP:*:*:*)
585- echo ymp-cray-unicos${UNAME_RELEASE}
586+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
587 exit 0 ;;
588 CRAY*[A-Z]90:*:*:*)
589 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
590 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
591- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
592+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
593+ -e 's/\.[^.]*$/.X/'
594 exit 0 ;;
595 CRAY*TS:*:*:*)
596 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
597 exit 0 ;;
598- CRAY*T3D:*:*:*)
599- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
600- exit 0 ;;
601 CRAY*T3E:*:*:*)
602 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
603 exit 0 ;;
604 CRAY*SV1:*:*:*)
605 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
606 exit 0 ;;
607- CRAY-2:*:*:*)
608- echo cray2-cray-unicos
609- exit 0 ;;
610+ *:UNICOS/mp:*:*)
611+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
612+ exit 0 ;;
613 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
614 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
615 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
616 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
617 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
618 exit 0 ;;
619- hp300:OpenBSD:*:*)
620- echo m68k-unknown-openbsd${UNAME_RELEASE}
621+ 5000:UNIX_System_V:4.*:*)
622+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
623+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
624+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
625 exit 0 ;;
626 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
627 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
628@@ -720,9 +780,6 @@
629 *:FreeBSD:*:*)
630 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
631 exit 0 ;;
632- *:OpenBSD:*:*)
633- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
634- exit 0 ;;
635 i*:CYGWIN*:*)
636 echo ${UNAME_MACHINE}-pc-cygwin
637 exit 0 ;;
638@@ -732,11 +789,17 @@
639 i*:PW*:*)
640 echo ${UNAME_MACHINE}-pc-pw32
641 exit 0 ;;
642+ x86:Interix*:[34]*)
643+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
644+ exit 0 ;;
645+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
646+ echo i${UNAME_MACHINE}-pc-mks
647+ exit 0 ;;
648 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
649 # How do we know it's Interix rather than the generic POSIX subsystem?
650 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
651 # UNAME_MACHINE based on the output of uname instead of i386?
652- echo i386-pc-interix
653+ echo i586-pc-interix
654 exit 0 ;;
655 i*:UWIN*:*)
656 echo ${UNAME_MACHINE}-pc-uwin
657@@ -748,112 +811,93 @@
658 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
659 exit 0 ;;
660 *:GNU:*:*)
661+ # the GNU system
662 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
663 exit 0 ;;
664+ *:GNU/*:*:*)
665+ # other systems with GNU libc and userland
666+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
667+ exit 0 ;;
668 i*86:Minix:*:*)
669 echo ${UNAME_MACHINE}-pc-minix
670 exit 0 ;;
671 arm*:Linux:*:*)
672 echo ${UNAME_MACHINE}-unknown-linux-gnu
673 exit 0 ;;
674+ cris:Linux:*:*)
675+ echo cris-axis-linux-gnu
676+ exit 0 ;;
677+ crisv32:Linux:*:*)
678+ echo crisv32-axis-linux-gnu
679+ exit 0 ;;
680+ frv:Linux:*:*)
681+ echo frv-unknown-linux-gnu
682+ exit 0 ;;
683 ia64:Linux:*:*)
684- echo ${UNAME_MACHINE}-unknown-linux
685+ echo ${UNAME_MACHINE}-unknown-linux-gnu
686+ exit 0 ;;
687+ m32r*:Linux:*:*)
688+ echo ${UNAME_MACHINE}-unknown-linux-gnu
689 exit 0 ;;
690 m68*:Linux:*:*)
691 echo ${UNAME_MACHINE}-unknown-linux-gnu
692 exit 0 ;;
693 mips:Linux:*:*)
694- cat >$dummy.c <<EOF
695-#ifdef __cplusplus
696-#include <stdio.h> /* for printf() prototype */
697-int main (int argc, char *argv[]) {
698-#else
699-int main (argc, argv) int argc; char *argv[]; {
700-#endif
701-#ifdef __MIPSEB__
702- printf ("%s-unknown-linux-gnu\n", argv[1]);
703-#endif
704-#ifdef __MIPSEL__
705- printf ("%sel-unknown-linux-gnu\n", argv[1]);
706-#endif
707- return 0;
708-}
709+ eval $set_cc_for_build
710+ sed 's/^ //' << EOF >$dummy.c
711+ #undef CPU
712+ #undef mips
713+ #undef mipsel
714+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
715+ CPU=mipsel
716+ #else
717+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
718+ CPU=mips
719+ #else
720+ CPU=
721+ #endif
722+ #endif
723 EOF
724- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
725- rm -f $dummy.c $dummy
726+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
727+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
728 ;;
729- ppc:Linux:*:*)
730- # Determine Lib Version
731- cat >$dummy.c <<EOF
732-#include <features.h>
733-#if defined(__GLIBC__)
734-extern char __libc_version[];
735-extern char __libc_release[];
736-#endif
737-main(argc, argv)
738- int argc;
739- char *argv[];
740-{
741-#if defined(__GLIBC__)
742- printf("%s %s\n", __libc_version, __libc_release);
743-#else
744- printf("unknown\n");
745-#endif
746- return 0;
747-}
748+ mips64:Linux:*:*)
749+ eval $set_cc_for_build
750+ sed 's/^ //' << EOF >$dummy.c
751+ #undef CPU
752+ #undef mips64
753+ #undef mips64el
754+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
755+ CPU=mips64el
756+ #else
757+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
758+ CPU=mips64
759+ #else
760+ CPU=
761+ #endif
762+ #endif
763 EOF
764- LIBC=""
765- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
766- if test "$?" = 0 ; then
767- ./$dummy | grep 1\.99 > /dev/null
768- if test "$?" = 0 ; then LIBC="libc1" ; fi
769- fi
770- rm -f $dummy.c $dummy
771- echo powerpc-unknown-linux-gnu${LIBC}
772+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
773+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
774+ ;;
775+ ppc:Linux:*:*)
776+ echo powerpc-unknown-linux-gnu
777+ exit 0 ;;
778+ ppc64:Linux:*:*)
779+ echo powerpc64-unknown-linux-gnu
780 exit 0 ;;
781 alpha:Linux:*:*)
782- cat <<EOF >$dummy.s
783- .data
784- \$Lformat:
785- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
786- .text
787- .globl main
788- .align 4
789- .ent main
790- main:
791- .frame \$30,16,\$26,0
792- ldgp \$29,0(\$27)
793- .prologue 1
794- .long 0x47e03d80 # implver \$0
795- lda \$2,-1
796- .long 0x47e20c21 # amask \$2,\$1
797- lda \$16,\$Lformat
798- mov \$0,\$17
799- not \$1,\$18
800- jsr \$26,printf
801- ldgp \$29,0(\$26)
802- mov 0,\$16
803- jsr \$26,exit
804- .end main
805-EOF
806- LIBC=""
807- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
808- if test "$?" = 0 ; then
809- case `./$dummy` in
810- 0-0) UNAME_MACHINE="alpha" ;;
811- 1-0) UNAME_MACHINE="alphaev5" ;;
812- 1-1) UNAME_MACHINE="alphaev56" ;;
813- 1-101) UNAME_MACHINE="alphapca56" ;;
814- 2-303) UNAME_MACHINE="alphaev6" ;;
815- 2-307) UNAME_MACHINE="alphaev67" ;;
816- esac
817- objdump --private-headers $dummy | \
818- grep ld.so.1 > /dev/null
819- if test "$?" = 0 ; then
820- LIBC="libc1"
821- fi
822- fi
823- rm -f $dummy.s $dummy
824+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
825+ EV5) UNAME_MACHINE=alphaev5 ;;
826+ EV56) UNAME_MACHINE=alphaev56 ;;
827+ PCA56) UNAME_MACHINE=alphapca56 ;;
828+ PCA57) UNAME_MACHINE=alphapca56 ;;
829+ EV6) UNAME_MACHINE=alphaev6 ;;
830+ EV67) UNAME_MACHINE=alphaev67 ;;
831+ EV68*) UNAME_MACHINE=alphaev68 ;;
832+ esac
833+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
834+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
835 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
836 exit 0 ;;
837 parisc:Linux:*:* | hppa:Linux:*:*)
838@@ -870,6 +914,9 @@
839 s390:Linux:*:* | s390x:Linux:*:*)
840 echo ${UNAME_MACHINE}-ibm-linux
841 exit 0 ;;
842+ sh64*:Linux:*:*)
843+ echo ${UNAME_MACHINE}-unknown-linux-gnu
844+ exit 0 ;;
845 sh*:Linux:*:*)
846 echo ${UNAME_MACHINE}-unknown-linux-gnu
847 exit 0 ;;
848@@ -883,71 +930,62 @@
849 # The BFD linker knows what the default object file format is, so
850 # first see if it will tell us. cd to the root directory to prevent
851 # problems with other programs or directories called `ld' in the path.
852- ld_supported_emulations=`cd /; ld --help 2>&1 \
853- | sed -ne '/supported emulations:/!d
854+ # Set LC_ALL=C to ensure ld outputs messages in English.
855+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
856+ | sed -ne '/supported targets:/!d
857 s/[ ][ ]*/ /g
858- s/.*supported emulations: *//
859+ s/.*supported targets: *//
860 s/ .*//
861 p'`
862- case "$ld_supported_emulations" in
863- i*86linux)
864- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
865- exit 0
866- ;;
867- elf_i*86)
868+ case "$ld_supported_targets" in
869+ elf32-i386)
870 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
871 ;;
872- i*86coff)
873+ a.out-i386-linux)
874+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
875+ exit 0 ;;
876+ coff-i386)
877 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
878- exit 0
879- ;;
880- esac
881- # Either a pre-BFD a.out linker (linux-gnuoldld)
882- # or one that does not give us useful --help.
883- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
884- # If ld does not provide *any* "supported emulations:"
885- # that means it is gnuoldld.
886- test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
887- case "${UNAME_MACHINE}" in
888- i*86)
889- VENDOR=pc;
890- ;;
891- *)
892- VENDOR=unknown;
893- ;;
894+ exit 0 ;;
895+ "")
896+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
897+ # one that does not give us useful --help.
898+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
899+ exit 0 ;;
900 esac
901 # Determine whether the default compiler is a.out or elf
902- cat >$dummy.c <<EOF
903-#include <features.h>
904-#ifdef __cplusplus
905-#include <stdio.h> /* for printf() prototype */
906- int main (int argc, char *argv[]) {
907-#else
908- int main (argc, argv) int argc; char *argv[]; {
909-#endif
910-#ifdef __ELF__
911-# ifdef __GLIBC__
912-# if __GLIBC__ >= 2
913- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
914-# else
915- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
916-# endif
917-# else
918- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
919-# endif
920-#else
921- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
922-#endif
923- return 0;
924-}
925+ eval $set_cc_for_build
926+ sed 's/^ //' << EOF >$dummy.c
927+ #include <features.h>
928+ #ifdef __ELF__
929+ # ifdef __GLIBC__
930+ # if __GLIBC__ >= 2
931+ LIBC=gnu
932+ # else
933+ LIBC=gnulibc1
934+ # endif
935+ # else
936+ LIBC=gnulibc1
937+ # endif
938+ #else
939+ #ifdef __INTEL_COMPILER
940+ LIBC=gnu
941+ #else
942+ LIBC=gnuaout
943+ #endif
944+ #endif
945+ #ifdef __dietlibc__
946+ LIBC=dietlibc
947+ #endif
948 EOF
949- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
950- rm -f $dummy.c $dummy
951+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
952+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
953 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
954 ;;
955-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
956-# are messed up and put the nodename in both sysname and nodename.
957 i*86:DYNIX/ptx:4*:*)
958+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
959+ # earlier versions are messed up and put the nodename in both
960+ # sysname and nodename.
961 echo i386-sequent-sysv4
962 exit 0 ;;
963 i*86:UNIX_SV:4.2MP:2.*)
964@@ -958,6 +996,26 @@
965 # Use sysv4.2uw... so that sysv4* matches it.
966 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
967 exit 0 ;;
968+ i*86:OS/2:*:*)
969+ # If we were able to find `uname', then EMX Unix compatibility
970+ # is probably installed.
971+ echo ${UNAME_MACHINE}-pc-os2-emx
972+ exit 0 ;;
973+ i*86:XTS-300:*:STOP)
974+ echo ${UNAME_MACHINE}-unknown-stop
975+ exit 0 ;;
976+ i*86:atheos:*:*)
977+ echo ${UNAME_MACHINE}-unknown-atheos
978+ exit 0 ;;
979+ i*86:syllable:*:*)
980+ echo ${UNAME_MACHINE}-pc-syllable
981+ exit 0 ;;
982+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
983+ echo i386-unknown-lynxos${UNAME_RELEASE}
984+ exit 0 ;;
985+ i*86:*DOS:*:*)
986+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
987+ exit 0 ;;
988 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
989 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
990 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
991@@ -966,36 +1024,32 @@
992 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
993 fi
994 exit 0 ;;
995- i*86:*:5:7*)
996- # Fixed at (any) Pentium or better
997- UNAME_MACHINE=i586
998- if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
999- echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
1000- else
1001- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
1002- fi
1003+ i*86:*:5:[78]*)
1004+ case `/bin/uname -X | grep "^Machine"` in
1005+ *486*) UNAME_MACHINE=i486 ;;
1006+ *Pentium) UNAME_MACHINE=i586 ;;
1007+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1008+ esac
1009+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1010 exit 0 ;;
1011 i*86:*:3.2:*)
1012 if test -f /usr/options/cb.name; then
1013 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1014 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1015 elif /bin/uname -X 2>/dev/null >/dev/null ; then
1016- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
1017- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
1018- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
1019+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
1020+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
1021+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
1022 && UNAME_MACHINE=i586
1023- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
1024+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
1025 && UNAME_MACHINE=i686
1026- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
1027+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1028 && UNAME_MACHINE=i686
1029 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1030 else
1031 echo ${UNAME_MACHINE}-pc-sysv32
1032 fi
1033 exit 0 ;;
1034- i*86:*DOS:*:*)
1035- echo ${UNAME_MACHINE}-pc-msdosdjgpp
1036- exit 0 ;;
1037 pc:*:*:*)
1038 # Left here for compatibility:
1039 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1040@@ -1019,9 +1073,15 @@
1041 # "miniframe"
1042 echo m68010-convergent-sysv
1043 exit 0 ;;
1044- M68*:*:R3V[567]*:*)
1045+ mc68k:UNIX:SYSTEM5:3.51m)
1046+ echo m68k-convergent-sysv
1047+ exit 0 ;;
1048+ M680?0:D-NIX:5.3:*)
1049+ echo m68k-diab-dnix
1050+ exit 0 ;;
1051+ M68*:*:R3V[5678]*:*)
1052 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1053- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
1054+ 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)
1055 OS_REL=''
1056 test -r /etc/.relid \
1057 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1058@@ -1038,9 +1098,6 @@
1059 mc68030:UNIX_System_V:4.*:*)
1060 echo m68k-atari-sysv4
1061 exit 0 ;;
1062- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1063- echo i386-unknown-lynxos${UNAME_RELEASE}
1064- exit 0 ;;
1065 TSUNAMI:LynxOS:2.*:*)
1066 echo sparc-unknown-lynxos${UNAME_RELEASE}
1067 exit 0 ;;
1068@@ -1067,8 +1124,8 @@
1069 echo ns32k-sni-sysv
1070 fi
1071 exit 0 ;;
1072- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1073- # says <Richard.M.Bartel@ccMail.Census.GOV>
1074+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1075+ # says <Richard.M.Bartel@ccMail.Census.GOV>
1076 echo i586-unisys-sysv4
1077 exit 0 ;;
1078 *:UNIX_System_V:4*:FTX*)
1079@@ -1080,6 +1137,10 @@
1080 # From seanf@swdc.stratus.com.
1081 echo i860-stratus-sysv4
1082 exit 0 ;;
1083+ *:VOS:*:*)
1084+ # From Paul.Green@stratus.com.
1085+ echo hppa1.1-stratus-vos
1086+ exit 0 ;;
1087 mc68*:A/UX:*:*)
1088 echo m68k-apple-aux${UNAME_RELEASE}
1089 exit 0 ;;
1090@@ -1108,6 +1169,9 @@
1091 SX-5:SUPER-UX:*:*)
1092 echo sx5-nec-superux${UNAME_RELEASE}
1093 exit 0 ;;
1094+ SX-6:SUPER-UX:*:*)
1095+ echo sx6-nec-superux${UNAME_RELEASE}
1096+ exit 0 ;;
1097 Power*:Rhapsody:*:*)
1098 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1099 exit 0 ;;
1100@@ -1115,18 +1179,25 @@
1101 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1102 exit 0 ;;
1103 *:Darwin:*:*)
1104- echo `uname -p`-apple-darwin${UNAME_RELEASE}
1105+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1106+ case $UNAME_PROCESSOR in
1107+ *86) UNAME_PROCESSOR=i686 ;;
1108+ unknown) UNAME_PROCESSOR=powerpc ;;
1109+ esac
1110+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1111 exit 0 ;;
1112 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1113- if test "${UNAME_MACHINE}" = "x86pc"; then
1114+ UNAME_PROCESSOR=`uname -p`
1115+ if test "$UNAME_PROCESSOR" = "x86"; then
1116+ UNAME_PROCESSOR=i386
1117 UNAME_MACHINE=pc
1118 fi
1119- echo `uname -p`-${UNAME_MACHINE}-nto-qnx
1120+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1121 exit 0 ;;
1122 *:QNX:*:4*)
1123 echo i386-pc-qnx
1124 exit 0 ;;
1125- NSR-[KW]:NONSTOP_KERNEL:*:*)
1126+ NSR-?:NONSTOP_KERNEL:*:*)
1127 echo nsr-tandem-nsk${UNAME_RELEASE}
1128 exit 0 ;;
1129 *:NonStop-UX:*:*)
1130@@ -1149,11 +1220,6 @@
1131 fi
1132 echo ${UNAME_MACHINE}-unknown-plan9
1133 exit 0 ;;
1134- i*86:OS/2:*:*)
1135- # If we were able to find `uname', then EMX Unix compatibility
1136- # is probably installed.
1137- echo ${UNAME_MACHINE}-pc-os2-emx
1138- exit 0 ;;
1139 *:TOPS-10:*:*)
1140 echo pdp10-unknown-tops10
1141 exit 0 ;;
1142@@ -1172,11 +1238,28 @@
1143 *:ITS:*:*)
1144 echo pdp10-unknown-its
1145 exit 0 ;;
1146+ SEI:*:*:SEIUX)
1147+ echo mips-sei-seiux${UNAME_RELEASE}
1148+ exit 0 ;;
1149+ *:DragonFly:*:*)
1150+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1151+ exit 0 ;;
1152+ *:*VMS:*:*)
1153+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
1154+ case "${UNAME_MACHINE}" in
1155+ A*) echo alpha-dec-vms && exit 0 ;;
1156+ I*) echo ia64-dec-vms && exit 0 ;;
1157+ V*) echo vax-dec-vms && exit 0 ;;
1158+ esac ;;
1159+ *:XENIX:*:SysV)
1160+ echo i386-pc-xenix
1161+ exit 0 ;;
1162 esac
1163
1164 #echo '(No uname command or uname output not recognized.)' 1>&2
1165 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1166
1167+eval $set_cc_for_build
1168 cat >$dummy.c <<EOF
1169 #ifdef _SEQUENT_
1170 # include <sys/types.h>
1171@@ -1291,8 +1374,7 @@
1172 }
1173 EOF
1174
1175-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
1176-rm -f $dummy.c $dummy
1177+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
1178
1179 # Apollos put the system type in the environment.
1180
1181diff -Naur mktemp-1.5.orig/config.sub mktemp-1.5/config.sub
1182--- mktemp-1.5.orig/config.sub 2001-07-17 02:57:40.000000000 +0000
1183+++ mktemp-1.5/config.sub 2005-10-01 23:24:44.000000000 +0000
1184@@ -1,9 +1,9 @@
1185 #! /bin/sh
1186 # Configuration validation subroutine script.
1187-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1188-# Free Software Foundation, Inc.
1189+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1190+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1191
1192-timestamp='2001-05-11'
1193+timestamp='2004-11-30'
1194
1195 # This file is (in principle) common to ALL GNU software.
1196 # The presence of a machine in this file suggests that SOME GNU software
1197@@ -29,7 +29,8 @@
1198 # configuration script generated by Autoconf, you may include it under
1199 # the same distribution terms that you use for the rest of that program.
1200
1201-# Please send patches to <config-patches@gnu.org>.
1202+# Please send patches to <config-patches@gnu.org>. Submit a context
1203+# diff and a properly formatted ChangeLog entry.
1204 #
1205 # Configuration subroutine to validate and canonicalize a configuration type.
1206 # Supply the specified configuration type as an argument.
1207@@ -69,7 +70,7 @@
1208 version="\
1209 GNU config.sub ($timestamp)
1210
1211-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1212+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
1213 Free Software Foundation, Inc.
1214
1215 This is free software; see the source for copying conditions. There is NO
1216@@ -117,7 +118,8 @@
1217 # Here we must recognize all the valid KERNEL-OS combinations.
1218 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1219 case $maybe_os in
1220- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
1221+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
1222+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
1223 os=-$maybe_os
1224 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1225 ;;
1226@@ -143,7 +145,7 @@
1227 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1228 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1229 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1230- -apple | -axis)
1231+ -apple | -axis | -knuth | -cray)
1232 os=
1233 basic_machine=$1
1234 ;;
1235@@ -157,6 +159,14 @@
1236 os=-vxworks
1237 basic_machine=$1
1238 ;;
1239+ -chorusos*)
1240+ os=-chorusos
1241+ basic_machine=$1
1242+ ;;
1243+ -chorusrdb)
1244+ os=-chorusrdb
1245+ basic_machine=$1
1246+ ;;
1247 -hiux*)
1248 os=-hiuxwe2
1249 ;;
1250@@ -215,26 +225,50 @@
1251 case $basic_machine in
1252 # Recognize the basic CPU types without company name.
1253 # Some are omitted here because they have special meanings below.
1254- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
1255- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
1256- | pyramid | mn10200 | mn10300 | tron | a29k \
1257- | 580 | i960 | h8300 \
1258- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
1259- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
1260- | hppa64 \
1261- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
1262- | alphaev6[78] \
1263- | we32k | ns16k | clipper | i370 | sh | sh[34] \
1264- | powerpc | powerpcle \
1265- | 1750a | dsp16xx | pdp10 | pdp11 \
1266- | mips16 | mips64 | mipsel | mips64el \
1267- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
1268- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
1269- | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
1270- | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
1271- | v850 | c4x \
1272- | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
1273- | pj | pjl | h8500 | z8k)
1274+ 1750a | 580 \
1275+ | a29k \
1276+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1277+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1278+ | am33_2.0 \
1279+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
1280+ | c4x | clipper \
1281+ | d10v | d30v | dlx | dsp16xx \
1282+ | fr30 | frv \
1283+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1284+ | i370 | i860 | i960 | ia64 \
1285+ | ip2k | iq2000 \
1286+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
1287+ | mips | mipsbe | mipseb | mipsel | mipsle \
1288+ | mips16 \
1289+ | mips64 | mips64el \
1290+ | mips64vr | mips64vrel \
1291+ | mips64orion | mips64orionel \
1292+ | mips64vr4100 | mips64vr4100el \
1293+ | mips64vr4300 | mips64vr4300el \
1294+ | mips64vr5000 | mips64vr5000el \
1295+ | mipsisa32 | mipsisa32el \
1296+ | mipsisa32r2 | mipsisa32r2el \
1297+ | mipsisa64 | mipsisa64el \
1298+ | mipsisa64r2 | mipsisa64r2el \
1299+ | mipsisa64sb1 | mipsisa64sb1el \
1300+ | mipsisa64sr71k | mipsisa64sr71kel \
1301+ | mipstx39 | mipstx39el \
1302+ | mn10200 | mn10300 \
1303+ | msp430 \
1304+ | ns16k | ns32k \
1305+ | openrisc | or32 \
1306+ | pdp10 | pdp11 | pj | pjl \
1307+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1308+ | pyramid \
1309+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
1310+ | sh64 | sh64le \
1311+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
1312+ | strongarm \
1313+ | tahoe | thumb | tic4x | tic80 | tron \
1314+ | v850 | v850e \
1315+ | we32k \
1316+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
1317+ | z8k)
1318 basic_machine=$basic_machine-unknown
1319 ;;
1320 m6811 | m68hc11 | m6812 | m68hc12)
1321@@ -242,7 +276,7 @@
1322 basic_machine=$basic_machine-unknown
1323 os=-none
1324 ;;
1325- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65 | z8k)
1326+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
1327 ;;
1328
1329 # We use `pc' rather than `unknown'
1330@@ -257,31 +291,62 @@
1331 exit 1
1332 ;;
1333 # Recognize the basic CPU types with company name.
1334- # FIXME: clean up the formatting here.
1335- vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
1336- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
1337- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
1338- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
1339- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
1340- | xmp-* | ymp-* \
1341- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
1342- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
1343- | hppa2.0n-* | hppa64-* \
1344- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
1345- | alphaev6[78]-* \
1346- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
1347- | clipper-* | orion-* \
1348- | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
1349- | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
1350- | mips16-* | mips64-* | mipsel-* \
1351- | mips64el-* | mips64orion-* | mips64orionel-* \
1352- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
1353- | mipstx39-* | mipstx39el-* | mcore-* \
1354- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
1355- | [cjt]90-* \
1356- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
1357- | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
1358- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
1359+ 580-* \
1360+ | a29k-* \
1361+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
1362+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
1363+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
1364+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
1365+ | avr-* \
1366+ | bs2000-* \
1367+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
1368+ | clipper-* | craynv-* | cydra-* \
1369+ | d10v-* | d30v-* | dlx-* \
1370+ | elxsi-* \
1371+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
1372+ | h8300-* | h8500-* \
1373+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1374+ | i*86-* | i860-* | i960-* | ia64-* \
1375+ | ip2k-* | iq2000-* \
1376+ | m32r-* | m32rle-* \
1377+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
1378+ | m88110-* | m88k-* | maxq-* | mcore-* \
1379+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
1380+ | mips16-* \
1381+ | mips64-* | mips64el-* \
1382+ | mips64vr-* | mips64vrel-* \
1383+ | mips64orion-* | mips64orionel-* \
1384+ | mips64vr4100-* | mips64vr4100el-* \
1385+ | mips64vr4300-* | mips64vr4300el-* \
1386+ | mips64vr5000-* | mips64vr5000el-* \
1387+ | mipsisa32-* | mipsisa32el-* \
1388+ | mipsisa32r2-* | mipsisa32r2el-* \
1389+ | mipsisa64-* | mipsisa64el-* \
1390+ | mipsisa64r2-* | mipsisa64r2el-* \
1391+ | mipsisa64sb1-* | mipsisa64sb1el-* \
1392+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
1393+ | mipstx39-* | mipstx39el-* \
1394+ | mmix-* \
1395+ | msp430-* \
1396+ | none-* | np1-* | ns16k-* | ns32k-* \
1397+ | orion-* \
1398+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1399+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
1400+ | pyramid-* \
1401+ | romp-* | rs6000-* \
1402+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
1403+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1404+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
1405+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
1406+ | tahoe-* | thumb-* \
1407+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
1408+ | tron-* \
1409+ | v850-* | v850e-* | vax-* \
1410+ | we32k-* \
1411+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
1412+ | xstormy16-* | xtensa-* \
1413+ | ymp-* \
1414+ | z8k-*)
1415 ;;
1416 # Recognize the various machine names and aliases which stand
1417 # for a CPU type and a company and sometimes even an OS.
1418@@ -299,6 +364,9 @@
1419 basic_machine=a29k-amd
1420 os=-udi
1421 ;;
1422+ abacus)
1423+ basic_machine=abacus-unknown
1424+ ;;
1425 adobe68k)
1426 basic_machine=m68010-adobe
1427 os=-scout
1428@@ -313,6 +381,12 @@
1429 basic_machine=a29k-none
1430 os=-bsd
1431 ;;
1432+ amd64)
1433+ basic_machine=x86_64-pc
1434+ ;;
1435+ amd64-*)
1436+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
1437+ ;;
1438 amdahl)
1439 basic_machine=580-amdahl
1440 os=-sysv
1441@@ -344,6 +418,10 @@
1442 basic_machine=ns32k-sequent
1443 os=-dynix
1444 ;;
1445+ c90)
1446+ basic_machine=c90-cray
1447+ os=-unicos
1448+ ;;
1449 convex-c1)
1450 basic_machine=c1-convex
1451 os=-bsd
1452@@ -364,30 +442,45 @@
1453 basic_machine=c38-convex
1454 os=-bsd
1455 ;;
1456- cray | ymp)
1457- basic_machine=ymp-cray
1458+ cray | j90)
1459+ basic_machine=j90-cray
1460 os=-unicos
1461 ;;
1462- cray2)
1463- basic_machine=cray2-cray
1464- os=-unicos
1465+ craynv)
1466+ basic_machine=craynv-cray
1467+ os=-unicosmp
1468 ;;
1469- [cjt]90)
1470- basic_machine=${basic_machine}-cray
1471- os=-unicos
1472+ cr16c)
1473+ basic_machine=cr16c-unknown
1474+ os=-elf
1475 ;;
1476 crds | unos)
1477 basic_machine=m68k-crds
1478 ;;
1479+ crisv32 | crisv32-* | etraxfs*)
1480+ basic_machine=crisv32-axis
1481+ ;;
1482 cris | cris-* | etrax*)
1483 basic_machine=cris-axis
1484 ;;
1485+ crx)
1486+ basic_machine=crx-unknown
1487+ os=-elf
1488+ ;;
1489 da30 | da30-*)
1490 basic_machine=m68k-da30
1491 ;;
1492 decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
1493 basic_machine=mips-dec
1494 ;;
1495+ decsystem10* | dec10*)
1496+ basic_machine=pdp10-dec
1497+ os=-tops10
1498+ ;;
1499+ decsystem20* | dec20*)
1500+ basic_machine=pdp10-dec
1501+ os=-tops20
1502+ ;;
1503 delta | 3300 | motorola-3300 | motorola-delta \
1504 | 3300-motorola | delta-motorola)
1505 basic_machine=m68k-motorola
1506@@ -396,6 +489,10 @@
1507 basic_machine=m88k-motorola
1508 os=-sysv3
1509 ;;
1510+ djgpp)
1511+ basic_machine=i586-pc
1512+ os=-msdosdjgpp
1513+ ;;
1514 dpx20 | dpx20-*)
1515 basic_machine=rs6000-bull
1516 os=-bosx
1517@@ -568,28 +665,20 @@
1518 basic_machine=m68k-atari
1519 os=-mint
1520 ;;
1521- mipsel*-linux*)
1522- basic_machine=mipsel-unknown
1523- os=-linux-gnu
1524- ;;
1525- mips*-linux*)
1526- basic_machine=mips-unknown
1527- os=-linux-gnu
1528- ;;
1529 mips3*-*)
1530 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
1531 ;;
1532 mips3*)
1533 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
1534 ;;
1535- mmix*)
1536- basic_machine=mmix-knuth
1537- os=-mmixware
1538- ;;
1539 monitor)
1540 basic_machine=m68k-rom68k
1541 os=-coff
1542 ;;
1543+ morphos)
1544+ basic_machine=powerpc-unknown
1545+ os=-morphos
1546+ ;;
1547 msdos)
1548 basic_machine=i386-pc
1549 os=-msdos
1550@@ -669,6 +758,14 @@
1551 basic_machine=hppa1.1-oki
1552 os=-proelf
1553 ;;
1554+ or32 | or32-*)
1555+ basic_machine=or32-unknown
1556+ os=-coff
1557+ ;;
1558+ os400)
1559+ basic_machine=powerpc-ibm
1560+ os=-os400
1561+ ;;
1562 OSE68000 | ose68000)
1563 basic_machine=m68000-ericsson
1564 os=-ose
1565@@ -691,42 +788,58 @@
1566 pbb)
1567 basic_machine=m68k-tti
1568 ;;
1569- pc532 | pc532-*)
1570+ pc532 | pc532-*)
1571 basic_machine=ns32k-pc532
1572 ;;
1573- pentium | p5 | k5 | k6 | nexgen)
1574+ pentium | p5 | k5 | k6 | nexgen | viac3)
1575 basic_machine=i586-pc
1576 ;;
1577- pentiumpro | p6 | 6x86 | athlon)
1578+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
1579 basic_machine=i686-pc
1580 ;;
1581- pentiumii | pentium2)
1582+ pentiumii | pentium2 | pentiumiii | pentium3)
1583 basic_machine=i686-pc
1584 ;;
1585- pentium-* | p5-* | k5-* | k6-* | nexgen-*)
1586+ pentium4)
1587+ basic_machine=i786-pc
1588+ ;;
1589+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
1590 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
1591 ;;
1592 pentiumpro-* | p6-* | 6x86-* | athlon-*)
1593 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
1594 ;;
1595- pentiumii-* | pentium2-*)
1596+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
1597 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
1598 ;;
1599+ pentium4-*)
1600+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
1601+ ;;
1602 pn)
1603 basic_machine=pn-gould
1604 ;;
1605 power) basic_machine=power-ibm
1606 ;;
1607 ppc) basic_machine=powerpc-unknown
1608- ;;
1609+ ;;
1610 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1611 ;;
1612 ppcle | powerpclittle | ppc-le | powerpc-little)
1613 basic_machine=powerpcle-unknown
1614- ;;
1615+ ;;
1616 ppcle-* | powerpclittle-*)
1617 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
1618 ;;
1619+ ppc64) basic_machine=powerpc64-unknown
1620+ ;;
1621+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1622+ ;;
1623+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1624+ basic_machine=powerpc64le-unknown
1625+ ;;
1626+ ppc64le-* | powerpc64little-*)
1627+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
1628+ ;;
1629 ps2)
1630 basic_machine=i386-ibm
1631 ;;
1632@@ -744,10 +857,26 @@
1633 rtpc | rtpc-*)
1634 basic_machine=romp-ibm
1635 ;;
1636+ s390 | s390-*)
1637+ basic_machine=s390-ibm
1638+ ;;
1639+ s390x | s390x-*)
1640+ basic_machine=s390x-ibm
1641+ ;;
1642 sa29200)
1643 basic_machine=a29k-amd
1644 os=-udi
1645 ;;
1646+ sb1)
1647+ basic_machine=mipsisa64sb1-unknown
1648+ ;;
1649+ sb1el)
1650+ basic_machine=mipsisa64sb1el-unknown
1651+ ;;
1652+ sei)
1653+ basic_machine=mips-sei
1654+ os=-seiux
1655+ ;;
1656 sequent)
1657 basic_machine=i386-sequent
1658 ;;
1659@@ -755,7 +884,10 @@
1660 basic_machine=sh-hitachi
1661 os=-hms
1662 ;;
1663- sparclite-wrs)
1664+ sh64)
1665+ basic_machine=sh64-unknown
1666+ ;;
1667+ sparclite-wrs | simso-wrs)
1668 basic_machine=sparclite-wrs
1669 os=-vxworks
1670 ;;
1671@@ -822,22 +954,42 @@
1672 os=-dynix
1673 ;;
1674 t3e)
1675- basic_machine=t3e-cray
1676+ basic_machine=alphaev5-cray
1677+ os=-unicos
1678+ ;;
1679+ t90)
1680+ basic_machine=t90-cray
1681 os=-unicos
1682 ;;
1683 tic54x | c54x*)
1684 basic_machine=tic54x-unknown
1685 os=-coff
1686 ;;
1687+ tic55x | c55x*)
1688+ basic_machine=tic55x-unknown
1689+ os=-coff
1690+ ;;
1691+ tic6x | c6x*)
1692+ basic_machine=tic6x-unknown
1693+ os=-coff
1694+ ;;
1695 tx39)
1696 basic_machine=mipstx39-unknown
1697 ;;
1698 tx39el)
1699 basic_machine=mipstx39el-unknown
1700 ;;
1701+ toad1)
1702+ basic_machine=pdp10-xkl
1703+ os=-tops20
1704+ ;;
1705 tower | tower-32)
1706 basic_machine=m68k-ncr
1707 ;;
1708+ tpf)
1709+ basic_machine=s390x-ibm
1710+ os=-tpf
1711+ ;;
1712 udi29k)
1713 basic_machine=a29k-amd
1714 os=-udi
1715@@ -859,8 +1011,8 @@
1716 os=-vms
1717 ;;
1718 vpp*|vx|vx-*)
1719- basic_machine=f301-fujitsu
1720- ;;
1721+ basic_machine=f301-fujitsu
1722+ ;;
1723 vxworks960)
1724 basic_machine=i960-wrs
1725 os=-vxworks
1726@@ -881,13 +1033,17 @@
1727 basic_machine=hppa1.1-winbond
1728 os=-proelf
1729 ;;
1730- xmp)
1731- basic_machine=xmp-cray
1732- os=-unicos
1733+ xbox)
1734+ basic_machine=i686-pc
1735+ os=-mingw32
1736 ;;
1737- xps | xps100)
1738+ xps | xps100)
1739 basic_machine=xps100-honeywell
1740 ;;
1741+ ymp)
1742+ basic_machine=ymp-cray
1743+ os=-unicos
1744+ ;;
1745 z8k-*-coff)
1746 basic_machine=z8k-unknown
1747 os=-sim
1748@@ -908,16 +1064,12 @@
1749 op60c)
1750 basic_machine=hppa1.1-oki
1751 ;;
1752- mips)
1753- if [ x$os = x-linux-gnu ]; then
1754- basic_machine=mips-unknown
1755- else
1756- basic_machine=mips-mips
1757- fi
1758- ;;
1759 romp)
1760 basic_machine=romp-ibm
1761 ;;
1762+ mmix)
1763+ basic_machine=mmix-knuth
1764+ ;;
1765 rs6000)
1766 basic_machine=rs6000-ibm
1767 ;;
1768@@ -934,13 +1086,16 @@
1769 we32k)
1770 basic_machine=we32k-att
1771 ;;
1772- sh3 | sh4)
1773+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
1774 basic_machine=sh-unknown
1775 ;;
1776- sparc | sparcv9 | sparcv9b)
1777+ sh64)
1778+ basic_machine=sh64-unknown
1779+ ;;
1780+ sparc | sparcv8 | sparcv9 | sparcv9b)
1781 basic_machine=sparc-sun
1782 ;;
1783- cydra)
1784+ cydra)
1785 basic_machine=cydra-cydrome
1786 ;;
1787 orion)
1788@@ -955,10 +1110,6 @@
1789 pmac | pmac-mpw)
1790 basic_machine=powerpc-apple
1791 ;;
1792- c4x*)
1793- basic_machine=c4x-none
1794- os=-coff
1795- ;;
1796 *-unknown)
1797 # Make sure to match an already-canonicalized machine name.
1798 ;;
1799@@ -1014,15 +1165,20 @@
1800 | -aos* \
1801 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1802 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1803- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
1804- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1805+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1806+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1807+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1808 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1809 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1810+ | -chorusos* | -chorusrdb* \
1811 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1812- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1813- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
1814+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
1815+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1816 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1817- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
1818+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1819+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1820+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1821+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
1822 # Remember, each alternative MUST END IN *, to match a version number.
1823 ;;
1824 -qnx*)
1825@@ -1034,8 +1190,10 @@
1826 ;;
1827 esac
1828 ;;
1829+ -nto-qnx*)
1830+ ;;
1831 -nto*)
1832- os=-nto-qnx
1833+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
1834 ;;
1835 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1836 | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1837@@ -1044,6 +1202,9 @@
1838 -mac*)
1839 os=`echo $os | sed -e 's|mac|macos|'`
1840 ;;
1841+ -linux-dietlibc)
1842+ os=-linux-dietlibc
1843+ ;;
1844 -linux*)
1845 os=`echo $os | sed -e 's|linux|linux-gnu|'`
1846 ;;
1847@@ -1056,6 +1217,9 @@
1848 -opened*)
1849 os=-openedition
1850 ;;
1851+ -os400*)
1852+ os=-os400
1853+ ;;
1854 -wince*)
1855 os=-wince
1856 ;;
1857@@ -1074,14 +1238,23 @@
1858 -acis*)
1859 os=-aos
1860 ;;
1861+ -atheos*)
1862+ os=-atheos
1863+ ;;
1864+ -syllable*)
1865+ os=-syllable
1866+ ;;
1867 -386bsd)
1868 os=-bsd
1869 ;;
1870 -ctix* | -uts*)
1871 os=-sysv
1872 ;;
1873+ -nova*)
1874+ os=-rtmk-nova
1875+ ;;
1876 -ns2 )
1877- os=-nextstep2
1878+ os=-nextstep2
1879 ;;
1880 -nsk*)
1881 os=-nsk
1882@@ -1093,6 +1266,9 @@
1883 -sinix*)
1884 os=-sysv4
1885 ;;
1886+ -tpf*)
1887+ os=-tpf
1888+ ;;
1889 -triton*)
1890 os=-sysv3
1891 ;;
1892@@ -1120,8 +1296,17 @@
1893 -xenix)
1894 os=-xenix
1895 ;;
1896- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1897- os=-mint
1898+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1899+ os=-mint
1900+ ;;
1901+ -aros*)
1902+ os=-aros
1903+ ;;
1904+ -kaos*)
1905+ os=-kaos
1906+ ;;
1907+ -zvmoe)
1908+ os=-zvmoe
1909 ;;
1910 -none)
1911 ;;
1912@@ -1154,10 +1339,14 @@
1913 arm*-semi)
1914 os=-aout
1915 ;;
1916+ c4x-* | tic4x-*)
1917+ os=-coff
1918+ ;;
1919+ # This must come before the *-dec entry.
1920 pdp10-*)
1921 os=-tops20
1922 ;;
1923- pdp11-*)
1924+ pdp11-*)
1925 os=-none
1926 ;;
1927 *-dec | vax-*)
1928@@ -1184,6 +1373,9 @@
1929 mips*-*)
1930 os=-elf
1931 ;;
1932+ or32-*)
1933+ os=-coff
1934+ ;;
1935 *-tti) # must be before sparc entry or we get the wrong os.
1936 os=-sysv3
1937 ;;
1938@@ -1196,6 +1388,9 @@
1939 *-ibm)
1940 os=-aix
1941 ;;
1942+ *-knuth)
1943+ os=-mmixware
1944+ ;;
1945 *-wec)
1946 os=-proelf
1947 ;;
1948@@ -1247,19 +1442,19 @@
1949 *-next)
1950 os=-nextstep3
1951 ;;
1952- *-gould)
1953+ *-gould)
1954 os=-sysv
1955 ;;
1956- *-highlevel)
1957+ *-highlevel)
1958 os=-bsd
1959 ;;
1960 *-encore)
1961 os=-bsd
1962 ;;
1963- *-sgi)
1964+ *-sgi)
1965 os=-irix
1966 ;;
1967- *-siemens)
1968+ *-siemens)
1969 os=-sysv4
1970 ;;
1971 *-masscomp)
1972@@ -1328,10 +1523,16 @@
1973 -mvs* | -opened*)
1974 vendor=ibm
1975 ;;
1976+ -os400*)
1977+ vendor=ibm
1978+ ;;
1979 -ptx*)
1980 vendor=sequent
1981 ;;
1982- -vxsim* | -vxworks*)
1983+ -tpf*)
1984+ vendor=ibm
1985+ ;;
1986+ -vxsim* | -vxworks* | -windiss*)
1987 vendor=wrs
1988 ;;
1989 -aux*)
1990@@ -1346,6 +1547,9 @@
1991 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1992 vendor=atari
1993 ;;
1994+ -vos*)
1995+ vendor=stratus
1996+ ;;
1997 esac
1998 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
1999 ;;
Note: See TracBrowser for help on using the repository browser.