source: patches/expect-5.43.0-config_update-1.patch@ f22b19b

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

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