source: clfs-embedded/patches/dropbear-0.48.1-autotool-1.patch@ 4b17097

Last change on this file since 4b17097 was 419755e, checked in by Maarten Lankhorst <m.b.lankhorst@…>, 18 years ago

Add autotool patch for dropbear

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