source: patches/expect-5.44.1.15-config_update-1.patch@ 96f80a4

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 96f80a4 was 1341743, checked in by Joe Ciccone <jciccone@…>, 14 years ago

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