source: patches/file-4.21-config_update-1.patch@ c30178f

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since c30178f was bb52fc7e, checked in by Joe Ciccone <jciccone@…>, 17 years ago

Updated to File 4.21.

  • Property mode set to 100644
File size: 48.3 KB
RevLine 
[2a5f085]1Submitted By: Jim Gifford (patches at jg555 dot com)
[035d431]2Date: 2006-11-02
[2a5f085]3Initial Package Version: 4.18
4Origin: Jim Gifford
5Upstream Status: Unknown
6Description: Updates config.sub and config.guess
7
8diff -Naur file-4.18.orig/config.guess file-4.18/config.guess
9--- file-4.18.orig/config.guess 2006-10-31 11:52:45.000000000 -0800
10+++ file-4.18/config.guess 2006-11-02 09:52:53.634947886 -0800
11@@ -1,12 +1,9 @@
12 #! /bin/sh
13-#
14-# $NetBSD: config.guess,v 1.8 2004/08/14 19:13:55 schmonz Exp $
15-#
16 # Attempt to guess a canonical system name.
17 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
18-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
19+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
20
21-timestamp='2004-06-11'
22+timestamp='2006-01-02'
23
24 # This file is free software; you can redistribute it and/or modify it
25 # under the terms of the GNU General Public License as published by
26@@ -20,13 +17,15 @@
27 #
28 # You should have received a copy of the GNU General Public License
29 # along with this program; if not, write to the Free Software
30-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
31+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
32+# 02110-1301, USA.
33 #
34 # As a special exception to the GNU General Public License, if you
35 # distribute this file as part of a program that contains a
36 # configuration script generated by Autoconf, you may include it under
37 # the same distribution terms that you use for the rest of that program.
38
39+
40 # Originally written by Per Bothner <per@bothner.com>.
41 # Please send patches to <config-patches@gnu.org>. Submit a context
42 # diff and a properly formatted ChangeLog entry.
43@@ -56,7 +55,7 @@
44 GNU config.guess ($timestamp)
45
46 Originally written by Per Bothner.
47-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
48+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
49 Free Software Foundation, Inc.
50
51 This is free software; see the source for copying conditions. There is NO
52@@ -69,11 +68,11 @@
53 while test $# -gt 0 ; do
54 case $1 in
55 --time-stamp | --time* | -t )
56- echo "$timestamp" ; exit 0 ;;
57+ echo "$timestamp" ; exit ;;
58 --version | -v )
59- echo "$version" ; exit 0 ;;
60+ echo "$version" ; exit ;;
61 --help | --h* | -h )
62- echo "$usage"; exit 0 ;;
63+ echo "$usage"; exit ;;
64 -- ) # Stop option processing
65 shift; break ;;
66 - ) # Use stdin as input.
67@@ -126,7 +125,7 @@
68 ;;
69 ,,*) CC_FOR_BUILD=$CC ;;
70 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
71-esac ;'
72+esac ; set_cc_for_build= ;'
73
74 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
75 # (ghazi@noc.rutgers.edu 1994-08-24)
76@@ -161,7 +160,6 @@
77 arm*) machine=arm-unknown ;;
78 sh3el) machine=shl-unknown ;;
79 sh3eb) machine=sh-unknown ;;
80- sh5el) machine=sh5le-unknown ;;
81 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
82 esac
83 # The Operating System including object format, if it has switched
84@@ -200,64 +198,23 @@
85 # contains redundant information, the shorter form:
86 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
87 echo "${machine}-${os}${release}"
88- exit 0 ;;
89- amd64:OpenBSD:*:*)
90- echo x86_64-unknown-openbsd${UNAME_RELEASE}
91- exit 0 ;;
92- amiga:OpenBSD:*:*)
93- echo m68k-unknown-openbsd${UNAME_RELEASE}
94- exit 0 ;;
95- arc:OpenBSD:*:*)
96- echo mipsel-unknown-openbsd${UNAME_RELEASE}
97- exit 0 ;;
98- cats:OpenBSD:*:*)
99- echo arm-unknown-openbsd${UNAME_RELEASE}
100- exit 0 ;;
101- hp300:OpenBSD:*:*)
102- echo m68k-unknown-openbsd${UNAME_RELEASE}
103- exit 0 ;;
104- luna88k:OpenBSD:*:*)
105- echo m88k-unknown-openbsd${UNAME_RELEASE}
106- exit 0 ;;
107- mac68k:OpenBSD:*:*)
108- echo m68k-unknown-openbsd${UNAME_RELEASE}
109- exit 0 ;;
110- macppc:OpenBSD:*:*)
111- echo powerpc-unknown-openbsd${UNAME_RELEASE}
112- exit 0 ;;
113- mvme68k:OpenBSD:*:*)
114- echo m68k-unknown-openbsd${UNAME_RELEASE}
115- exit 0 ;;
116- mvme88k:OpenBSD:*:*)
117- echo m88k-unknown-openbsd${UNAME_RELEASE}
118- exit 0 ;;
119- mvmeppc:OpenBSD:*:*)
120- echo powerpc-unknown-openbsd${UNAME_RELEASE}
121- exit 0 ;;
122- pmax:OpenBSD:*:*)
123- echo mipsel-unknown-openbsd${UNAME_RELEASE}
124- exit 0 ;;
125- sgi:OpenBSD:*:*)
126- echo mipseb-unknown-openbsd${UNAME_RELEASE}
127- exit 0 ;;
128- sun3:OpenBSD:*:*)
129- echo m68k-unknown-openbsd${UNAME_RELEASE}
130- exit 0 ;;
131- wgrisc:OpenBSD:*:*)
132- echo mipsel-unknown-openbsd${UNAME_RELEASE}
133- exit 0 ;;
134+ exit ;;
135 *:OpenBSD:*:*)
136- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
137- exit 0 ;;
138+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
139+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
140+ exit ;;
141 *:ekkoBSD:*:*)
142 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
143- exit 0 ;;
144+ exit ;;
145+ *:SolidBSD:*:*)
146+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
147+ exit ;;
148 macppc:MirBSD:*:*)
149 echo powerppc-unknown-mirbsd${UNAME_RELEASE}
150- exit 0 ;;
151+ exit ;;
152 *:MirBSD:*:*)
153 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
154- exit 0 ;;
155+ exit ;;
156 alpha:OSF1:*:*)
157 case $UNAME_RELEASE in
158 *4.0)
159@@ -310,40 +267,43 @@
160 # A Xn.n version is an unreleased experimental baselevel.
161 # 1.2 uses "1.2" for uname -r.
162 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
163- exit 0 ;;
164- Alpha*:OpenVMS:*:*)
165- echo alpha-hp-vms
166- exit 0 ;;
167+ exit ;;
168 Alpha\ *:Windows_NT*:*)
169 # How do we know it's Interix rather than the generic POSIX subsystem?
170 # Should we change UNAME_MACHINE based on the output of uname instead
171 # of the specific Alpha model?
172 echo alpha-pc-interix
173- exit 0 ;;
174+ exit ;;
175 21064:Windows_NT:50:3)
176 echo alpha-dec-winnt3.5
177- exit 0 ;;
178+ exit ;;
179 Amiga*:UNIX_System_V:4.0:*)
180 echo m68k-unknown-sysv4
181- exit 0;;
182+ exit ;;
183 *:[Aa]miga[Oo][Ss]:*:*)
184 echo ${UNAME_MACHINE}-unknown-amigaos
185- exit 0 ;;
186+ exit ;;
187 *:[Mm]orph[Oo][Ss]:*:*)
188 echo ${UNAME_MACHINE}-unknown-morphos
189- exit 0 ;;
190+ exit ;;
191 *:OS/390:*:*)
192 echo i370-ibm-openedition
193- exit 0 ;;
194+ exit ;;
195+ *:z/VM:*:*)
196+ echo s390-ibm-zvmoe
197+ exit ;;
198 *:OS400:*:*)
199 echo powerpc-ibm-os400
200- exit 0 ;;
201+ exit ;;
202 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
203 echo arm-acorn-riscix${UNAME_RELEASE}
204- exit 0;;
205+ exit ;;
206+ arm:riscos:*:*|arm:RISCOS:*:*)
207+ echo arm-unknown-riscos
208+ exit ;;
209 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
210 echo hppa1.1-hitachi-hiuxmpp
211- exit 0;;
212+ exit ;;
213 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
214 # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
215 if test "`(/bin/universe) 2>/dev/null`" = att ; then
216@@ -351,32 +311,32 @@
217 else
218 echo pyramid-pyramid-bsd
219 fi
220- exit 0 ;;
221+ exit ;;
222 NILE*:*:*:dcosx)
223 echo pyramid-pyramid-svr4
224- exit 0 ;;
225+ exit ;;
226 DRS?6000:unix:4.0:6*)
227 echo sparc-icl-nx6
228- exit 0 ;;
229- DRS?6000:UNIX_SV:4.2*:7*)
230+ exit ;;
231+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
232 case `/usr/bin/uname -p` in
233- sparc) echo sparc-icl-nx7 && exit 0 ;;
234+ sparc) echo sparc-icl-nx7; exit ;;
235 esac ;;
236 sun4H:SunOS:5.*:*)
237 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
238- exit 0 ;;
239+ exit ;;
240 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
241 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
242- exit 0 ;;
243+ exit ;;
244 i86pc:SunOS:5.*:*)
245 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
246- exit 0 ;;
247+ exit ;;
248 sun4*:SunOS:6*:*)
249 # According to config.sub, this is the proper way to canonicalize
250 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
251 # it's likely to be more like Solaris than SunOS4.
252 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
253- exit 0 ;;
254+ exit ;;
255 sun4*:SunOS:*:*)
256 case "`/usr/bin/arch -k`" in
257 Series*|S4*)
258@@ -385,10 +345,10 @@
259 esac
260 # Japanese Language versions have a version number like `4.1.3-JL'.
261 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
262- exit 0 ;;
263+ exit ;;
264 sun3*:SunOS:*:*)
265 echo m68k-sun-sunos${UNAME_RELEASE}
266- exit 0 ;;
267+ exit ;;
268 sun*:*:4.2BSD:*)
269 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
270 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
271@@ -400,10 +360,10 @@
272 echo sparc-sun-sunos${UNAME_RELEASE}
273 ;;
274 esac
275- exit 0 ;;
276+ exit ;;
277 aushp:SunOS:*:*)
278 echo sparc-auspex-sunos${UNAME_RELEASE}
279- exit 0 ;;
280+ exit ;;
281 # The situation for MiNT is a little confusing. The machine name
282 # can be virtually everything (everything which is not
283 # "atarist" or "atariste" at least should have a processor
284@@ -414,40 +374,40 @@
285 # be no problem.
286 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
287 echo m68k-atari-mint${UNAME_RELEASE}
288- exit 0 ;;
289+ exit ;;
290 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
291 echo m68k-atari-mint${UNAME_RELEASE}
292- exit 0 ;;
293+ exit ;;
294 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
295 echo m68k-atari-mint${UNAME_RELEASE}
296- exit 0 ;;
297+ exit ;;
298 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
299 echo m68k-milan-mint${UNAME_RELEASE}
300- exit 0 ;;
301+ exit ;;
302 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
303 echo m68k-hades-mint${UNAME_RELEASE}
304- exit 0 ;;
305+ exit ;;
306 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
307 echo m68k-unknown-mint${UNAME_RELEASE}
308- exit 0 ;;
309+ exit ;;
310 m68k:machten:*:*)
311 echo m68k-apple-machten${UNAME_RELEASE}
312- exit 0 ;;
313+ exit ;;
314 powerpc:machten:*:*)
315 echo powerpc-apple-machten${UNAME_RELEASE}
316- exit 0 ;;
317+ exit ;;
318 RISC*:Mach:*:*)
319 echo mips-dec-mach_bsd4.3
320- exit 0 ;;
321+ exit ;;
322 RISC*:ULTRIX:*:*)
323 echo mips-dec-ultrix${UNAME_RELEASE}
324- exit 0 ;;
325+ exit ;;
326 VAX*:ULTRIX*:*:*)
327 echo vax-dec-ultrix${UNAME_RELEASE}
328- exit 0 ;;
329+ exit ;;
330 2020:CLIX:*:* | 2430:CLIX:*:*)
331 echo clipper-intergraph-clix${UNAME_RELEASE}
332- exit 0 ;;
333+ exit ;;
334 mips:*:*:UMIPS | mips:*:*:RISCos)
335 eval $set_cc_for_build
336 sed 's/^ //' << EOF >$dummy.c
337@@ -471,32 +431,33 @@
338 exit (-1);
339 }
340 EOF
341- $CC_FOR_BUILD -o $dummy $dummy.c \
342- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
343- && exit 0
344+ $CC_FOR_BUILD -o $dummy $dummy.c &&
345+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
346+ SYSTEM_NAME=`$dummy $dummyarg` &&
347+ { echo "$SYSTEM_NAME"; exit; }
348 echo mips-mips-riscos${UNAME_RELEASE}
349- exit 0 ;;
350+ exit ;;
351 Motorola:PowerMAX_OS:*:*)
352 echo powerpc-motorola-powermax
353- exit 0 ;;
354+ exit ;;
355 Motorola:*:4.3:PL8-*)
356 echo powerpc-harris-powermax
357- exit 0 ;;
358+ exit ;;
359 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
360 echo powerpc-harris-powermax
361- exit 0 ;;
362+ exit ;;
363 Night_Hawk:Power_UNIX:*:*)
364 echo powerpc-harris-powerunix
365- exit 0 ;;
366+ exit ;;
367 m88k:CX/UX:7*:*)
368 echo m88k-harris-cxux7
369- exit 0 ;;
370+ exit ;;
371 m88k:*:4*:R4*)
372 echo m88k-motorola-sysv4
373- exit 0 ;;
374+ exit ;;
375 m88k:*:3*:R3*)
376 echo m88k-motorola-sysv3
377- exit 0 ;;
378+ exit ;;
379 AViiON:dgux:*:*)
380 # DG/UX returns AViiON for all architectures
381 UNAME_PROCESSOR=`/usr/bin/uname -p`
382@@ -512,29 +473,29 @@
383 else
384 echo i586-dg-dgux${UNAME_RELEASE}
385 fi
386- exit 0 ;;
387+ exit ;;
388 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
389 echo m88k-dolphin-sysv3
390- exit 0 ;;
391+ exit ;;
392 M88*:*:R3*:*)
393 # Delta 88k system running SVR3
394 echo m88k-motorola-sysv3
395- exit 0 ;;
396+ exit ;;
397 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
398 echo m88k-tektronix-sysv3
399- exit 0 ;;
400+ exit ;;
401 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
402 echo m68k-tektronix-bsd
403- exit 0 ;;
404+ exit ;;
405 *:IRIX*:*:*)
406 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
407- exit 0 ;;
408+ exit ;;
409 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
410- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
411- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
412+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
413+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
414 i*86:AIX:*:*)
415 echo i386-ibm-aix
416- exit 0 ;;
417+ exit ;;
418 ia64:AIX:*:*)
419 if [ -x /usr/bin/oslevel ] ; then
420 IBM_REV=`/usr/bin/oslevel`
421@@ -542,7 +503,7 @@
422 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
423 fi
424 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
425- exit 0 ;;
426+ exit ;;
427 *:AIX:2:3)
428 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
429 eval $set_cc_for_build
430@@ -557,14 +518,18 @@
431 exit(0);
432 }
433 EOF
434- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
435- echo rs6000-ibm-aix3.2.5
436+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
437+ then
438+ echo "$SYSTEM_NAME"
439+ else
440+ echo rs6000-ibm-aix3.2.5
441+ fi
442 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
443 echo rs6000-ibm-aix3.2.4
444 else
445 echo rs6000-ibm-aix3.2
446 fi
447- exit 0 ;;
448+ exit ;;
449 *:AIX:*:[45])
450 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
451 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
452@@ -578,28 +543,28 @@
453 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
454 fi
455 echo ${IBM_ARCH}-ibm-aix${IBM_REV}
456- exit 0 ;;
457+ exit ;;
458 *:AIX:*:*)
459 echo rs6000-ibm-aix
460- exit 0 ;;
461+ exit ;;
462 ibmrt:4.4BSD:*|romp-ibm:BSD:*)
463 echo romp-ibm-bsd4.4
464- exit 0 ;;
465+ exit ;;
466 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
467 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
468- exit 0 ;; # report: romp-ibm BSD 4.3
469+ exit ;; # report: romp-ibm BSD 4.3
470 *:BOSX:*:*)
471 echo rs6000-bull-bosx
472- exit 0 ;;
473+ exit ;;
474 DPX/2?00:B.O.S.:*:*)
475 echo m68k-bull-sysv3
476- exit 0 ;;
477+ exit ;;
478 9000/[34]??:4.3bsd:1.*:*)
479 echo m68k-hp-bsd
480- exit 0 ;;
481+ exit ;;
482 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
483 echo m68k-hp-bsd4.4
484- exit 0 ;;
485+ exit ;;
486 9000/[34678]??:HP-UX:*:*)
487 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
488 case "${UNAME_MACHINE}" in
489@@ -661,9 +626,19 @@
490 esac
491 if [ ${HP_ARCH} = "hppa2.0w" ]
492 then
493- # avoid double evaluation of $set_cc_for_build
494- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
495- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
496+ eval $set_cc_for_build
497+
498+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
499+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
500+ # generating 64-bit code. GNU and HP use different nomenclature:
501+ #
502+ # $ CC_FOR_BUILD=cc ./config.guess
503+ # => hppa2.0w-hp-hpux11.23
504+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
505+ # => hppa64-hp-hpux11.23
506+
507+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
508+ grep __LP64__ >/dev/null
509 then
510 HP_ARCH="hppa2.0w"
511 else
512@@ -671,11 +646,11 @@
513 fi
514 fi
515 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
516- exit 0 ;;
517+ exit ;;
518 ia64:HP-UX:*:*)
519 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
520 echo ia64-hp-hpux${HPUX_REV}
521- exit 0 ;;
522+ exit ;;
523 3050*:HI-UX:*:*)
524 eval $set_cc_for_build
525 sed 's/^ //' << EOF >$dummy.c
526@@ -703,166 +678,171 @@
527 exit (0);
528 }
529 EOF
530- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
531+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
532+ { echo "$SYSTEM_NAME"; exit; }
533 echo unknown-hitachi-hiuxwe2
534- exit 0 ;;
535+ exit ;;
536 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
537 echo hppa1.1-hp-bsd
538- exit 0 ;;
539+ exit ;;
540 9000/8??:4.3bsd:*:*)
541 echo hppa1.0-hp-bsd
542- exit 0 ;;
543+ exit ;;
544 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
545 echo hppa1.0-hp-mpeix
546- exit 0 ;;
547+ exit ;;
548 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
549 echo hppa1.1-hp-osf
550- exit 0 ;;
551+ exit ;;
552 hp8??:OSF1:*:*)
553 echo hppa1.0-hp-osf
554- exit 0 ;;
555+ exit ;;
556 i*86:OSF1:*:*)
557 if [ -x /usr/sbin/sysversion ] ; then
558 echo ${UNAME_MACHINE}-unknown-osf1mk
559 else
560 echo ${UNAME_MACHINE}-unknown-osf1
561 fi
562- exit 0 ;;
563+ exit ;;
564 parisc*:Lites*:*:*)
565 echo hppa1.1-hp-lites
566- exit 0 ;;
567+ exit ;;
568 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
569 echo c1-convex-bsd
570- exit 0 ;;
571+ exit ;;
572 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
573 if getsysinfo -f scalar_acc
574 then echo c32-convex-bsd
575 else echo c2-convex-bsd
576 fi
577- exit 0 ;;
578+ exit ;;
579 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
580 echo c34-convex-bsd
581- exit 0 ;;
582+ exit ;;
583 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
584 echo c38-convex-bsd
585- exit 0 ;;
586+ exit ;;
587 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
588 echo c4-convex-bsd
589- exit 0 ;;
590+ exit ;;
591 CRAY*Y-MP:*:*:*)
592 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
593- exit 0 ;;
594+ exit ;;
595 CRAY*[A-Z]90:*:*:*)
596 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
597 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
598 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
599 -e 's/\.[^.]*$/.X/'
600- exit 0 ;;
601+ exit ;;
602 CRAY*TS:*:*:*)
603 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
604- exit 0 ;;
605+ exit ;;
606 CRAY*T3E:*:*:*)
607 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
608- exit 0 ;;
609+ exit ;;
610 CRAY*SV1:*:*:*)
611 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
612- exit 0 ;;
613+ exit ;;
614 *:UNICOS/mp:*:*)
615- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
616- exit 0 ;;
617+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
618+ exit ;;
619 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
620 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
621 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
622 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
623 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
624- exit 0 ;;
625+ exit ;;
626 5000:UNIX_System_V:4.*:*)
627 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
628 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
629 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
630- exit 0 ;;
631+ exit ;;
632 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
633 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
634- exit 0 ;;
635+ exit ;;
636 sparc*:BSD/OS:*:*)
637 echo sparc-unknown-bsdi${UNAME_RELEASE}
638- exit 0 ;;
639+ exit ;;
640 *:BSD/OS:*:*)
641 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
642- exit 0 ;;
643+ exit ;;
644 *:FreeBSD:*:*)
645- # Determine whether the default compiler uses glibc.
646- eval $set_cc_for_build
647- sed 's/^ //' << EOF >$dummy.c
648- #include <features.h>
649- #if __GLIBC__ >= 2
650- LIBC=gnu
651- #else
652- LIBC=
653- #endif
654-EOF
655- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
656- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
657- # FreeBSD's kernel, but not the complete OS.
658- case ${LIBC} in gnu) kernel_only='k' ;; esac
659- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
660- exit 0 ;;
661+ case ${UNAME_MACHINE} in
662+ pc98)
663+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
664+ *)
665+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
666+ esac
667+ exit ;;
668 i*:CYGWIN*:*)
669 echo ${UNAME_MACHINE}-pc-cygwin
670- exit 0 ;;
671+ exit ;;
672 i*:MINGW*:*)
673 echo ${UNAME_MACHINE}-pc-mingw32
674- exit 0 ;;
675+ exit ;;
676+ i*:windows32*:*)
677+ # uname -m includes "-pc" on this system.
678+ echo ${UNAME_MACHINE}-mingw32
679+ exit ;;
680 i*:PW*:*)
681 echo ${UNAME_MACHINE}-pc-pw32
682- exit 0 ;;
683- x86:Interix*:[34]*)
684+ exit ;;
685+ x86:Interix*:[345]*)
686 echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
687- exit 0 ;;
688+ exit ;;
689 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
690 echo i${UNAME_MACHINE}-pc-mks
691- exit 0 ;;
692+ exit ;;
693 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
694 # How do we know it's Interix rather than the generic POSIX subsystem?
695 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
696 # UNAME_MACHINE based on the output of uname instead of i386?
697 echo i586-pc-interix
698- exit 0 ;;
699+ exit ;;
700 i*:UWIN*:*)
701 echo ${UNAME_MACHINE}-pc-uwin
702- exit 0 ;;
703+ exit ;;
704+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
705+ echo x86_64-unknown-cygwin
706+ exit ;;
707 p*:CYGWIN*:*)
708 echo powerpcle-unknown-cygwin
709- exit 0 ;;
710+ exit ;;
711 prep*:SunOS:5.*:*)
712 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
713- exit 0 ;;
714+ exit ;;
715 *:GNU:*:*)
716 # the GNU system
717 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
718- exit 0 ;;
719+ exit ;;
720 *:GNU/*:*:*)
721 # other systems with GNU libc and userland
722 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
723- exit 0 ;;
724+ exit ;;
725 i*86:Minix:*:*)
726 echo ${UNAME_MACHINE}-pc-minix
727- exit 0 ;;
728+ exit ;;
729 arm*:Linux:*:*)
730 echo ${UNAME_MACHINE}-unknown-linux-gnu
731- exit 0 ;;
732+ exit ;;
733 cris:Linux:*:*)
734 echo cris-axis-linux-gnu
735- exit 0 ;;
736+ exit ;;
737+ crisv32:Linux:*:*)
738+ echo crisv32-axis-linux-gnu
739+ exit ;;
740+ frv:Linux:*:*)
741+ echo frv-unknown-linux-gnu
742+ exit ;;
743 ia64:Linux:*:*)
744 echo ${UNAME_MACHINE}-unknown-linux-gnu
745- exit 0 ;;
746+ exit ;;
747 m32r*:Linux:*:*)
748 echo ${UNAME_MACHINE}-unknown-linux-gnu
749- exit 0 ;;
750+ exit ;;
751 m68*:Linux:*:*)
752 echo ${UNAME_MACHINE}-unknown-linux-gnu
753- exit 0 ;;
754+ exit ;;
755 mips:Linux:*:*)
756 eval $set_cc_for_build
757 sed 's/^ //' << EOF >$dummy.c
758@@ -879,8 +859,8 @@
759 #endif
760 #endif
761 EOF
762- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
763- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
764+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
765+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
766 ;;
767 mips64:Linux:*:*)
768 eval $set_cc_for_build
769@@ -898,15 +878,18 @@
770 #endif
771 #endif
772 EOF
773- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
774- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
775+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
776+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
777 ;;
778+ or32:Linux:*:*)
779+ echo or32-unknown-linux-gnu
780+ exit ;;
781 ppc:Linux:*:*)
782 echo powerpc-unknown-linux-gnu
783- exit 0 ;;
784+ exit ;;
785 ppc64:Linux:*:*)
786 echo powerpc64-unknown-linux-gnu
787- exit 0 ;;
788+ exit ;;
789 alpha:Linux:*:*)
790 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
791 EV5) UNAME_MACHINE=alphaev5 ;;
792@@ -920,7 +903,7 @@
793 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
794 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
795 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
796- exit 0 ;;
797+ exit ;;
798 parisc:Linux:*:* | hppa:Linux:*:*)
799 # Look for CPU level
800 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
801@@ -928,25 +911,28 @@
802 PA8*) echo hppa2.0-unknown-linux-gnu ;;
803 *) echo hppa-unknown-linux-gnu ;;
804 esac
805- exit 0 ;;
806+ exit ;;
807 parisc64:Linux:*:* | hppa64:Linux:*:*)
808 echo hppa64-unknown-linux-gnu
809- exit 0 ;;
810+ exit ;;
811 s390:Linux:*:* | s390x:Linux:*:*)
812 echo ${UNAME_MACHINE}-ibm-linux
813- exit 0 ;;
814+ exit ;;
815 sh64*:Linux:*:*)
816 echo ${UNAME_MACHINE}-unknown-linux-gnu
817- exit 0 ;;
818+ exit ;;
819 sh*:Linux:*:*)
820 echo ${UNAME_MACHINE}-unknown-linux-gnu
821- exit 0 ;;
822+ exit ;;
823 sparc:Linux:*:* | sparc64:Linux:*:*)
824 echo ${UNAME_MACHINE}-unknown-linux-gnu
825- exit 0 ;;
826+ exit ;;
827+ vax:Linux:*:*)
828+ echo ${UNAME_MACHINE}-dec-linux-gnu
829+ exit ;;
830 x86_64:Linux:*:*)
831 echo x86_64-unknown-linux-gnu
832- exit 0 ;;
833+ exit ;;
834 i*86:Linux:*:*)
835 # The BFD linker knows what the default object file format is, so
836 # first see if it will tell us. cd to the root directory to prevent
837@@ -964,15 +950,15 @@
838 ;;
839 a.out-i386-linux)
840 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
841- exit 0 ;;
842+ exit ;;
843 coff-i386)
844 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
845- exit 0 ;;
846+ exit ;;
847 "")
848 # Either a pre-BFD a.out linker (linux-gnuoldld) or
849 # one that does not give us useful --help.
850 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
851- exit 0 ;;
852+ exit ;;
853 esac
854 # Determine whether the default compiler is a.out or elf
855 eval $set_cc_for_build
856@@ -989,7 +975,7 @@
857 LIBC=gnulibc1
858 # endif
859 #else
860- #ifdef __INTEL_COMPILER
861+ #if defined(__INTEL_COMPILER) || defined(__PGI)
862 LIBC=gnu
863 #else
864 LIBC=gnuaout
865@@ -999,16 +985,19 @@
866 LIBC=dietlibc
867 #endif
868 EOF
869- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
870- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
871- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
872+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
873+ test x"${LIBC}" != x && {
874+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
875+ exit
876+ }
877+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
878 ;;
879 i*86:DYNIX/ptx:4*:*)
880 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
881 # earlier versions are messed up and put the nodename in both
882 # sysname and nodename.
883 echo i386-sequent-sysv4
884- exit 0 ;;
885+ exit ;;
886 i*86:UNIX_SV:4.2MP:2.*)
887 # Unixware is an offshoot of SVR4, but it has its own version
888 # number series starting with 2...
889@@ -1016,27 +1005,27 @@
890 # I just have to hope. -- rms.
891 # Use sysv4.2uw... so that sysv4* matches it.
892 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
893- exit 0 ;;
894+ exit ;;
895 i*86:OS/2:*:*)
896 # If we were able to find `uname', then EMX Unix compatibility
897 # is probably installed.
898 echo ${UNAME_MACHINE}-pc-os2-emx
899- exit 0 ;;
900+ exit ;;
901 i*86:XTS-300:*:STOP)
902 echo ${UNAME_MACHINE}-unknown-stop
903- exit 0 ;;
904+ exit ;;
905 i*86:atheos:*:*)
906 echo ${UNAME_MACHINE}-unknown-atheos
907- exit 0 ;;
908- i*86:syllable:*:*)
909+ exit ;;
910+ i*86:syllable:*:*)
911 echo ${UNAME_MACHINE}-pc-syllable
912- exit 0 ;;
913+ exit ;;
914 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
915 echo i386-unknown-lynxos${UNAME_RELEASE}
916- exit 0 ;;
917+ exit ;;
918 i*86:*DOS:*:*)
919 echo ${UNAME_MACHINE}-pc-msdosdjgpp
920- exit 0 ;;
921+ exit ;;
922 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
923 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
924 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
925@@ -1044,15 +1033,16 @@
926 else
927 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
928 fi
929- exit 0 ;;
930- i*86:*:5:[78]*)
931+ exit ;;
932+ i*86:*:5:[678]*)
933+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
934 case `/bin/uname -X | grep "^Machine"` in
935 *486*) UNAME_MACHINE=i486 ;;
936 *Pentium) UNAME_MACHINE=i586 ;;
937 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
938 esac
939 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
940- exit 0 ;;
941+ exit ;;
942 i*86:*:3.2:*)
943 if test -f /usr/options/cb.name; then
944 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
945@@ -1070,73 +1060,73 @@
946 else
947 echo ${UNAME_MACHINE}-pc-sysv32
948 fi
949- exit 0 ;;
950+ exit ;;
951 pc:*:*:*)
952 # Left here for compatibility:
953 # uname -m prints for DJGPP always 'pc', but it prints nothing about
954 # the processor, so we play safe by assuming i386.
955 echo i386-pc-msdosdjgpp
956- exit 0 ;;
957+ exit ;;
958 Intel:Mach:3*:*)
959 echo i386-pc-mach3
960- exit 0 ;;
961+ exit ;;
962 paragon:*:*:*)
963 echo i860-intel-osf1
964- exit 0 ;;
965+ exit ;;
966 i860:*:4.*:*) # i860-SVR4
967 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
968 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
969 else # Add other i860-SVR4 vendors below as they are discovered.
970 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
971 fi
972- exit 0 ;;
973+ exit ;;
974 mini*:CTIX:SYS*5:*)
975 # "miniframe"
976 echo m68010-convergent-sysv
977- exit 0 ;;
978+ exit ;;
979 mc68k:UNIX:SYSTEM5:3.51m)
980 echo m68k-convergent-sysv
981- exit 0 ;;
982+ exit ;;
983 M680?0:D-NIX:5.3:*)
984 echo m68k-diab-dnix
985- exit 0 ;;
986+ exit ;;
987 M68*:*:R3V[5678]*:*)
988- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
989- 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)
990+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
991+ 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)
992 OS_REL=''
993 test -r /etc/.relid \
994 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
995 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
996- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
997+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
998 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
999- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
1000+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1001 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1002 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1003- && echo i486-ncr-sysv4 && exit 0 ;;
1004+ && { echo i486-ncr-sysv4; exit; } ;;
1005 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1006 echo m68k-unknown-lynxos${UNAME_RELEASE}
1007- exit 0 ;;
1008+ exit ;;
1009 mc68030:UNIX_System_V:4.*:*)
1010 echo m68k-atari-sysv4
1011- exit 0 ;;
1012+ exit ;;
1013 TSUNAMI:LynxOS:2.*:*)
1014 echo sparc-unknown-lynxos${UNAME_RELEASE}
1015- exit 0 ;;
1016+ exit ;;
1017 rs6000:LynxOS:2.*:*)
1018 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1019- exit 0 ;;
1020+ exit ;;
1021 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1022 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1023- exit 0 ;;
1024+ exit ;;
1025 SM[BE]S:UNIX_SV:*:*)
1026 echo mips-dde-sysv${UNAME_RELEASE}
1027- exit 0 ;;
1028+ exit ;;
1029 RM*:ReliantUNIX-*:*:*)
1030 echo mips-sni-sysv4
1031- exit 0 ;;
1032+ exit ;;
1033 RM*:SINIX-*:*:*)
1034 echo mips-sni-sysv4
1035- exit 0 ;;
1036+ exit ;;
1037 *:SINIX-*:*:*)
1038 if uname -p 2>/dev/null >/dev/null ; then
1039 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1040@@ -1144,68 +1134,72 @@
1041 else
1042 echo ns32k-sni-sysv
1043 fi
1044- exit 0 ;;
1045+ exit ;;
1046 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1047 # says <Richard.M.Bartel@ccMail.Census.GOV>
1048 echo i586-unisys-sysv4
1049- exit 0 ;;
1050+ exit ;;
1051 *:UNIX_System_V:4*:FTX*)
1052 # From Gerald Hewes <hewes@openmarket.com>.
1053 # How about differentiating between stratus architectures? -djm
1054 echo hppa1.1-stratus-sysv4
1055- exit 0 ;;
1056+ exit ;;
1057 *:*:*:FTX*)
1058 # From seanf@swdc.stratus.com.
1059 echo i860-stratus-sysv4
1060- exit 0 ;;
1061+ exit ;;
1062+ i*86:VOS:*:*)
1063+ # From Paul.Green@stratus.com.
1064+ echo ${UNAME_MACHINE}-stratus-vos
1065+ exit ;;
1066 *:VOS:*:*)
1067 # From Paul.Green@stratus.com.
1068 echo hppa1.1-stratus-vos
1069- exit 0 ;;
1070+ exit ;;
1071 mc68*:A/UX:*:*)
1072 echo m68k-apple-aux${UNAME_RELEASE}
1073- exit 0 ;;
1074+ exit ;;
1075 news*:NEWS-OS:6*:*)
1076 echo mips-sony-newsos6
1077- exit 0 ;;
1078+ exit ;;
1079 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1080 if [ -d /usr/nec ]; then
1081 echo mips-nec-sysv${UNAME_RELEASE}
1082 else
1083 echo mips-unknown-sysv${UNAME_RELEASE}
1084 fi
1085- exit 0 ;;
1086+ exit ;;
1087 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1088 echo powerpc-be-beos
1089- exit 0 ;;
1090+ exit ;;
1091 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
1092 echo powerpc-apple-beos
1093- exit 0 ;;
1094+ exit ;;
1095 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
1096 echo i586-pc-beos
1097- exit 0 ;;
1098+ exit ;;
1099 SX-4:SUPER-UX:*:*)
1100 echo sx4-nec-superux${UNAME_RELEASE}
1101- exit 0 ;;
1102+ exit ;;
1103 SX-5:SUPER-UX:*:*)
1104 echo sx5-nec-superux${UNAME_RELEASE}
1105- exit 0 ;;
1106+ exit ;;
1107 SX-6:SUPER-UX:*:*)
1108 echo sx6-nec-superux${UNAME_RELEASE}
1109- exit 0 ;;
1110+ exit ;;
1111 Power*:Rhapsody:*:*)
1112 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1113- exit 0 ;;
1114+ exit ;;
1115 *:Rhapsody:*:*)
1116 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1117- exit 0 ;;
1118+ exit ;;
1119 *:Darwin:*:*)
1120- case `uname -p` in
1121- *86) UNAME_PROCESSOR=i686 ;;
1122- powerpc) UNAME_PROCESSOR=powerpc ;;
1123+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1124+ case $UNAME_PROCESSOR in
1125+ unknown) UNAME_PROCESSOR=powerpc ;;
1126 esac
1127 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1128- exit 0 ;;
1129+ exit ;;
1130 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1131 UNAME_PROCESSOR=`uname -p`
1132 if test "$UNAME_PROCESSOR" = "x86"; then
1133@@ -1213,22 +1207,25 @@
1134 UNAME_MACHINE=pc
1135 fi
1136 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1137- exit 0 ;;
1138+ exit ;;
1139 *:QNX:*:4*)
1140 echo i386-pc-qnx
1141- exit 0 ;;
1142+ exit ;;
1143+ NSE-?:NONSTOP_KERNEL:*:*)
1144+ echo nse-tandem-nsk${UNAME_RELEASE}
1145+ exit ;;
1146 NSR-?:NONSTOP_KERNEL:*:*)
1147 echo nsr-tandem-nsk${UNAME_RELEASE}
1148- exit 0 ;;
1149+ exit ;;
1150 *:NonStop-UX:*:*)
1151 echo mips-compaq-nonstopux
1152- exit 0 ;;
1153+ exit ;;
1154 BS2000:POSIX*:*:*)
1155 echo bs2000-siemens-sysv
1156- exit 0 ;;
1157+ exit ;;
1158 DS/*:UNIX_System_V:*:*)
1159 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1160- exit 0 ;;
1161+ exit ;;
1162 *:Plan9:*:*)
1163 # "uname -m" is not consistent, so use $cputype instead. 386
1164 # is converted to i386 for consistency with other x86
1165@@ -1239,31 +1236,47 @@
1166 UNAME_MACHINE="$cputype"
1167 fi
1168 echo ${UNAME_MACHINE}-unknown-plan9
1169- exit 0 ;;
1170+ exit ;;
1171 *:TOPS-10:*:*)
1172 echo pdp10-unknown-tops10
1173- exit 0 ;;
1174+ exit ;;
1175 *:TENEX:*:*)
1176 echo pdp10-unknown-tenex
1177- exit 0 ;;
1178+ exit ;;
1179 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1180 echo pdp10-dec-tops20
1181- exit 0 ;;
1182+ exit ;;
1183 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1184 echo pdp10-xkl-tops20
1185- exit 0 ;;
1186+ exit ;;
1187 *:TOPS-20:*:*)
1188 echo pdp10-unknown-tops20
1189- exit 0 ;;
1190+ exit ;;
1191 *:ITS:*:*)
1192 echo pdp10-unknown-its
1193- exit 0 ;;
1194+ exit ;;
1195 SEI:*:*:SEIUX)
1196 echo mips-sei-seiux${UNAME_RELEASE}
1197- exit 0 ;;
1198+ exit ;;
1199 *:DragonFly:*:*)
1200 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1201- exit 0 ;;
1202+ exit ;;
1203+ *:*VMS:*:*)
1204+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
1205+ case "${UNAME_MACHINE}" in
1206+ A*) echo alpha-dec-vms ; exit ;;
1207+ I*) echo ia64-dec-vms ; exit ;;
1208+ V*) echo vax-dec-vms ; exit ;;
1209+ esac ;;
1210+ *:XENIX:*:SysV)
1211+ echo i386-pc-xenix
1212+ exit ;;
1213+ i*86:skyos:*:*)
1214+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1215+ exit ;;
1216+ i*86:rdos:*:*)
1217+ echo ${UNAME_MACHINE}-pc-rdos
1218+ exit ;;
1219 esac
1220
1221 #echo '(No uname command or uname output not recognized.)' 1>&2
1222@@ -1295,7 +1308,7 @@
1223 #endif
1224
1225 #if defined (__arm) && defined (__acorn) && defined (__unix)
1226- printf ("arm-acorn-riscix"); exit (0);
1227+ printf ("arm-acorn-riscix\n"); exit (0);
1228 #endif
1229
1230 #if defined (hp300) && !defined (hpux)
1231@@ -1384,11 +1397,12 @@
1232 }
1233 EOF
1234
1235-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
1236+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1237+ { echo "$SYSTEM_NAME"; exit; }
1238
1239 # Apollos put the system type in the environment.
1240
1241-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
1242+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1243
1244 # Convex versions that predate uname can use getsysinfo(1)
1245
1246@@ -1397,22 +1411,22 @@
1247 case `getsysinfo -f cpu_type` in
1248 c1*)
1249 echo c1-convex-bsd
1250- exit 0 ;;
1251+ exit ;;
1252 c2*)
1253 if getsysinfo -f scalar_acc
1254 then echo c32-convex-bsd
1255 else echo c2-convex-bsd
1256 fi
1257- exit 0 ;;
1258+ exit ;;
1259 c34*)
1260 echo c34-convex-bsd
1261- exit 0 ;;
1262+ exit ;;
1263 c38*)
1264 echo c38-convex-bsd
1265- exit 0 ;;
1266+ exit ;;
1267 c4*)
1268 echo c4-convex-bsd
1269- exit 0 ;;
1270+ exit ;;
1271 esac
1272 fi
1273
1274@@ -1423,7 +1437,9 @@
1275 the operating system you are using. It is advised that you
1276 download the most up to date version of the config scripts from
1277
1278- ftp://ftp.gnu.org/pub/gnu/config/
1279+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
1280+and
1281+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
1282
1283 If the version you run ($0) is already up to date, please
1284 send the following data and any information you think might be
1285diff -Naur file-4.18.orig/config.sub file-4.18/config.sub
1286--- file-4.18.orig/config.sub 2006-10-31 11:52:45.000000000 -0800
1287+++ file-4.18/config.sub 2006-11-02 09:52:53.634947886 -0800
1288@@ -1,12 +1,9 @@
1289 #! /bin/sh
1290-#
1291-# $NetBSD: config.sub,v 1.7 2004/08/14 19:14:42 schmonz Exp $
1292-#
1293 # Configuration validation subroutine script.
1294 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1295-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
1296+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
1297
1298-timestamp='2004-03-12'
1299+timestamp='2006-01-02'
1300
1301 # This file is (in principle) common to ALL GNU software.
1302 # The presence of a machine in this file suggests that SOME GNU software
1303@@ -24,14 +21,15 @@
1304 #
1305 # You should have received a copy of the GNU General Public License
1306 # along with this program; if not, write to the Free Software
1307-# Foundation, Inc., 59 Temple Place - Suite 330,
1308-# Boston, MA 02111-1307, USA.
1309-
1310+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
1311+# 02110-1301, USA.
1312+#
1313 # As a special exception to the GNU General Public License, if you
1314 # distribute this file as part of a program that contains a
1315 # configuration script generated by Autoconf, you may include it under
1316 # the same distribution terms that you use for the rest of that program.
1317
1318+
1319 # Please send patches to <config-patches@gnu.org>. Submit a context
1320 # diff and a properly formatted ChangeLog entry.
1321 #
1322@@ -73,7 +71,7 @@
1323 version="\
1324 GNU config.sub ($timestamp)
1325
1326-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1327+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
1328 Free Software Foundation, Inc.
1329
1330 This is free software; see the source for copying conditions. There is NO
1331@@ -86,11 +84,11 @@
1332 while test $# -gt 0 ; do
1333 case $1 in
1334 --time-stamp | --time* | -t )
1335- echo "$timestamp" ; exit 0 ;;
1336+ echo "$timestamp" ; exit ;;
1337 --version | -v )
1338- echo "$version" ; exit 0 ;;
1339+ echo "$version" ; exit ;;
1340 --help | --h* | -h )
1341- echo "$usage"; exit 0 ;;
1342+ echo "$usage"; exit ;;
1343 -- ) # Stop option processing
1344 shift; break ;;
1345 - ) # Use stdin as input.
1346@@ -102,7 +100,7 @@
1347 *local*)
1348 # First pass through any local machine types.
1349 echo $1
1350- exit 0;;
1351+ exit ;;
1352
1353 * )
1354 break ;;
1355@@ -121,8 +119,9 @@
1356 # Here we must recognize all the valid KERNEL-OS combinations.
1357 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1358 case $maybe_os in
1359- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
1360- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
1361+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
1362+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
1363+ storm-chaos* | os2-emx* | rtmk-nova*)
1364 os=-$maybe_os
1365 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1366 ;;
1367@@ -148,7 +147,7 @@
1368 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1369 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1370 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1371- -apple | -axis)
1372+ -apple | -axis | -knuth | -cray)
1373 os=
1374 basic_machine=$1
1375 ;;
1376@@ -173,6 +172,10 @@
1377 -hiux*)
1378 os=-hiuxwe2
1379 ;;
1380+ -sco6)
1381+ os=-sco5v6
1382+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1383+ ;;
1384 -sco5)
1385 os=-sco3.2v5
1386 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1387@@ -189,6 +192,10 @@
1388 # Don't forget version if it is 3.2v4 or newer.
1389 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1390 ;;
1391+ -sco5v6*)
1392+ # Don't forget version if it is 3.2v4 or newer.
1393+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1394+ ;;
1395 -sco*)
1396 os=-sco3.2v2
1397 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1398@@ -234,13 +241,14 @@
1399 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1400 | am33_2.0 \
1401 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
1402+ | bfin \
1403 | c4x | clipper \
1404 | d10v | d30v | dlx | dsp16xx \
1405 | fr30 | frv \
1406 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1407 | i370 | i860 | i960 | ia64 \
1408 | ip2k | iq2000 \
1409- | m32r | m32rle | m68000 | m68k | m88k | mcore \
1410+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
1411 | mips | mipsbe | mipseb | mipsel | mipsle \
1412 | mips16 \
1413 | mips64 | mips64el \
1414@@ -249,6 +257,7 @@
1415 | mips64vr4100 | mips64vr4100el \
1416 | mips64vr4300 | mips64vr4300el \
1417 | mips64vr5000 | mips64vr5000el \
1418+ | mips64vr5900 | mips64vr5900el \
1419 | mipsisa32 | mipsisa32el \
1420 | mipsisa32r2 | mipsisa32r2el \
1421 | mipsisa64 | mipsisa64el \
1422@@ -257,23 +266,28 @@
1423 | mipsisa64sr71k | mipsisa64sr71kel \
1424 | mipstx39 | mipstx39el \
1425 | mn10200 | mn10300 \
1426+ | mt \
1427 | msp430 \
1428 | ns16k | ns32k \
1429- | openrisc | or32 \
1430+ | or32 \
1431 | pdp10 | pdp11 | pj | pjl \
1432 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1433 | pyramid \
1434- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
1435+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
1436 | sh64 | sh64le \
1437- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
1438+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
1439+ | sparcv8 | sparcv9 | sparcv9b \
1440 | strongarm \
1441 | tahoe | thumb | tic4x | tic80 | tron \
1442 | v850 | v850e \
1443 | we32k \
1444- | x86 | xscale | xstormy16 | xtensa \
1445+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
1446 | z8k)
1447 basic_machine=$basic_machine-unknown
1448 ;;
1449+ m32c)
1450+ basic_machine=$basic_machine-unknown
1451+ ;;
1452 m6811 | m68hc11 | m6812 | m68hc12)
1453 # Motorola 68HC11/12.
1454 basic_machine=$basic_machine-unknown
1455@@ -281,6 +295,9 @@
1456 ;;
1457 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
1458 ;;
1459+ ms1)
1460+ basic_machine=mt-unknown
1461+ ;;
1462
1463 # We use `pc' rather than `unknown'
1464 # because (1) that's what they normally are, and
1465@@ -301,9 +318,9 @@
1466 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
1467 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
1468 | avr-* \
1469- | bs2000-* \
1470+ | bfin-* | bs2000-* \
1471 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
1472- | clipper-* | cydra-* \
1473+ | clipper-* | craynv-* | cydra-* \
1474 | d10v-* | d30v-* | dlx-* \
1475 | elxsi-* \
1476 | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
1477@@ -313,7 +330,7 @@
1478 | ip2k-* | iq2000-* \
1479 | m32r-* | m32rle-* \
1480 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
1481- | m88110-* | m88k-* | mcore-* \
1482+ | m88110-* | m88k-* | maxq-* | mcore-* \
1483 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
1484 | mips16-* \
1485 | mips64-* | mips64el-* \
1486@@ -322,6 +339,7 @@
1487 | mips64vr4100-* | mips64vr4100el-* \
1488 | mips64vr4300-* | mips64vr4300el-* \
1489 | mips64vr5000-* | mips64vr5000el-* \
1490+ | mips64vr5900-* | mips64vr5900el-* \
1491 | mipsisa32-* | mipsisa32el-* \
1492 | mipsisa32r2-* | mipsisa32r2el-* \
1493 | mipsisa64-* | mipsisa64el-* \
1494@@ -329,27 +347,32 @@
1495 | mipsisa64sb1-* | mipsisa64sb1el-* \
1496 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
1497 | mipstx39-* | mipstx39el-* \
1498+ | mmix-* \
1499+ | mt-* \
1500 | msp430-* \
1501- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
1502+ | none-* | np1-* | ns16k-* | ns32k-* \
1503 | orion-* \
1504 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1505 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
1506 | pyramid-* \
1507 | romp-* | rs6000-* \
1508- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
1509+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
1510 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1511- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
1512+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
1513+ | sparclite-* \
1514 | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
1515 | tahoe-* | thumb-* \
1516 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
1517 | tron-* \
1518 | v850-* | v850e-* | vax-* \
1519 | we32k-* \
1520- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
1521- | xtensa-* \
1522+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
1523+ | xstormy16-* | xtensa-* \
1524 | ymp-* \
1525 | z8k-*)
1526 ;;
1527+ m32c-*)
1528+ ;;
1529 # Recognize the various machine names and aliases which stand
1530 # for a CPU type and a company and sometimes even an OS.
1531 386bsd)
1532@@ -448,6 +471,10 @@
1533 basic_machine=j90-cray
1534 os=-unicos
1535 ;;
1536+ craynv)
1537+ basic_machine=craynv-cray
1538+ os=-unicosmp
1539+ ;;
1540 cr16c)
1541 basic_machine=cr16c-unknown
1542 os=-elf
1543@@ -455,6 +482,9 @@
1544 crds | unos)
1545 basic_machine=m68k-crds
1546 ;;
1547+ crisv32 | crisv32-* | etraxfs*)
1548+ basic_machine=crisv32-axis
1549+ ;;
1550 cris | cris-* | etrax*)
1551 basic_machine=cris-axis
1552 ;;
1553@@ -484,6 +514,10 @@
1554 basic_machine=m88k-motorola
1555 os=-sysv3
1556 ;;
1557+ djgpp)
1558+ basic_machine=i586-pc
1559+ os=-msdosdjgpp
1560+ ;;
1561 dpx20 | dpx20-*)
1562 basic_machine=rs6000-bull
1563 os=-bosx
1564@@ -662,10 +696,6 @@
1565 mips3*)
1566 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
1567 ;;
1568- mmix*)
1569- basic_machine=mmix-knuth
1570- os=-mmixware
1571- ;;
1572 monitor)
1573 basic_machine=m68k-rom68k
1574 os=-coff
1575@@ -678,6 +708,9 @@
1576 basic_machine=i386-pc
1577 os=-msdos
1578 ;;
1579+ ms1-*)
1580+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
1581+ ;;
1582 mvs)
1583 basic_machine=i370-ibm
1584 os=-mvs
1585@@ -746,10 +779,6 @@
1586 np1)
1587 basic_machine=np1-gould
1588 ;;
1589- nv1)
1590- basic_machine=nv1-cray
1591- os=-unicosmp
1592- ;;
1593 nsr-tandem)
1594 basic_machine=nsr-tandem
1595 ;;
1596@@ -757,9 +786,8 @@
1597 basic_machine=hppa1.1-oki
1598 os=-proelf
1599 ;;
1600- or32 | or32-*)
1601+ openrisc | openrisc-*)
1602 basic_machine=or32-unknown
1603- os=-coff
1604 ;;
1605 os400)
1606 basic_machine=powerpc-ibm
1607@@ -790,6 +818,12 @@
1608 pc532 | pc532-*)
1609 basic_machine=ns32k-pc532
1610 ;;
1611+ pc98)
1612+ basic_machine=i386-pc
1613+ ;;
1614+ pc98-*)
1615+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
1616+ ;;
1617 pentium | p5 | k5 | k6 | nexgen | viac3)
1618 basic_machine=i586-pc
1619 ;;
1620@@ -846,6 +880,10 @@
1621 basic_machine=i586-unknown
1622 os=-pw32
1623 ;;
1624+ rdos)
1625+ basic_machine=i386-pc
1626+ os=-rdos
1627+ ;;
1628 rom68k)
1629 basic_machine=m68k-rom68k
1630 os=-coff
1631@@ -1032,6 +1070,10 @@
1632 basic_machine=hppa1.1-winbond
1633 os=-proelf
1634 ;;
1635+ xbox)
1636+ basic_machine=i686-pc
1637+ os=-mingw32
1638+ ;;
1639 xps | xps100)
1640 basic_machine=xps100-honeywell
1641 ;;
1642@@ -1062,6 +1104,9 @@
1643 romp)
1644 basic_machine=romp-ibm
1645 ;;
1646+ mmix)
1647+ basic_machine=mmix-knuth
1648+ ;;
1649 rs6000)
1650 basic_machine=rs6000-ibm
1651 ;;
1652@@ -1078,15 +1123,9 @@
1653 we32k)
1654 basic_machine=we32k-att
1655 ;;
1656- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
1657+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1658 basic_machine=sh-unknown
1659 ;;
1660- sh5el)
1661- basic_machine=sh5le-unknown
1662- ;;
1663- sh64)
1664- basic_machine=sh64-unknown
1665- ;;
1666 sparc | sparcv8 | sparcv9 | sparcv9b)
1667 basic_machine=sparc-sun
1668 ;;
1669@@ -1160,20 +1199,23 @@
1670 | -aos* \
1671 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1672 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1673- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1674+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1675+ | -openbsd* | -solidbsd* \
1676 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1677 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1678 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1679 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1680 | -chorusos* | -chorusrdb* \
1681 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1682- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
1683+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1684+ | -uxpv* | -beos* | -mpeix* | -udk* \
1685 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1686 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1687 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1688 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1689 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1690- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
1691+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1692+ | -skyos* | -haiku* | -rdos*)
1693 # Remember, each alternative MUST END IN *, to match a version number.
1694 ;;
1695 -qnx*)
1696@@ -1191,7 +1233,7 @@
1697 os=`echo $os | sed -e 's|nto|nto-qnx|'`
1698 ;;
1699 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1700- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1701+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1702 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1703 ;;
1704 -mac*)
1705@@ -1300,6 +1342,9 @@
1706 -kaos*)
1707 os=-kaos
1708 ;;
1709+ -zvmoe)
1710+ os=-zvmoe
1711+ ;;
1712 -none)
1713 ;;
1714 *)
1715@@ -1377,9 +1422,15 @@
1716 *-be)
1717 os=-beos
1718 ;;
1719+ *-haiku)
1720+ os=-haiku
1721+ ;;
1722 *-ibm)
1723 os=-aix
1724 ;;
1725+ *-knuth)
1726+ os=-mmixware
1727+ ;;
1728 *-wec)
1729 os=-proelf
1730 ;;
1731@@ -1545,7 +1596,7 @@
1732 esac
1733
1734 echo $basic_machine$os
1735-exit 0
1736+exit
1737
1738 # Local variables:
1739 # eval: (add-hook 'write-file-hooks 'time-stamp)
Note: See TracBrowser for help on using the repository browser.