summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xconfig.guess590
-rwxr-xr-xconfig.sub136
3 files changed, 439 insertions, 290 deletions
diff --git a/ChangeLog b/ChangeLog
index c3aef85c0..4ef54244a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
17 [ssh.c] 17 [ssh.c]
18 fix -O for cases where no ControlPath has been specified or socket at 18 fix -O for cases where no ControlPath has been specified or socket at
19 ControlPath is not contactable; spotted by and ok avsm@ 19 ControlPath is not contactable; spotted by and ok avsm@
20 - (tim) [config.guess config.sub] Update to '2005-05-27' version.
20 21
2120050531 2220050531
22 - (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at 23 - (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at
@@ -2665,4 +2666,4 @@
2665 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2666 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2666 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2667 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2667 2668
2668$Id: ChangeLog,v 1.3807 2005/06/01 13:08:51 dtucker Exp $ 2669$Id: ChangeLog,v 1.3808 2005/06/02 02:57:45 tim Exp $
diff --git a/config.guess b/config.guess
index 5adbef1f9..6d71f752f 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
1#! /bin/sh 1#! /bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. 4# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
5 5
6timestamp='2003-10-03' 6timestamp='2005-05-27'
7 7
8# This file is free software; you can redistribute it and/or modify it 8# This file is free software; you can redistribute it and/or modify it
9# under the terms of the GNU General Public License as published by 9# under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@ timestamp='2003-10-03'
17# 17#
18# You should have received a copy of the GNU General Public License 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 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. 20# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
21# 02110-1301, USA.
21# 22#
22# As a special exception to the GNU General Public License, if you 23# As a special exception to the GNU General Public License, if you
23# distribute this file as part of a program that contains a 24# distribute this file as part of a program that contains a
24# configuration script generated by Autoconf, you may include it under 25# configuration script generated by Autoconf, you may include it under
25# the same distribution terms that you use for the rest of that program. 26# the same distribution terms that you use for the rest of that program.
26 27
28
27# Originally written by Per Bothner <per@bothner.com>. 29# Originally written by Per Bothner <per@bothner.com>.
28# Please send patches to <config-patches@gnu.org>. Submit a context 30# Please send patches to <config-patches@gnu.org>. Submit a context
29# diff and a properly formatted ChangeLog entry. 31# diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@ version="\
53GNU config.guess ($timestamp) 55GNU config.guess ($timestamp)
54 56
55Originally written by Per Bothner. 57Originally written by Per Bothner.
56Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 58Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
57Free Software Foundation, Inc. 59Free Software Foundation, Inc.
58 60
59This is free software; see the source for copying conditions. There is NO 61This is free software; see the source for copying conditions. There is NO
@@ -66,11 +68,11 @@ Try \`$me --help' for more information."
66while test $# -gt 0 ; do 68while test $# -gt 0 ; do
67 case $1 in 69 case $1 in
68 --time-stamp | --time* | -t ) 70 --time-stamp | --time* | -t )
69 echo "$timestamp" ; exit 0 ;; 71 echo "$timestamp" ; exit ;;
70 --version | -v ) 72 --version | -v )
71 echo "$version" ; exit 0 ;; 73 echo "$version" ; exit ;;
72 --help | --h* | -h ) 74 --help | --h* | -h )
73 echo "$usage"; exit 0 ;; 75 echo "$usage"; exit ;;
74 -- ) # Stop option processing 76 -- ) # Stop option processing
75 shift; break ;; 77 shift; break ;;
76 - ) # Use stdin as input. 78 - ) # Use stdin as input.
@@ -196,50 +198,64 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
196 # contains redundant information, the shorter form: 198 # contains redundant information, the shorter form:
197 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 199 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
198 echo "${machine}-${os}${release}" 200 echo "${machine}-${os}${release}"
199 exit 0 ;; 201 exit ;;
202 amd64:OpenBSD:*:*)
203 echo x86_64-unknown-openbsd${UNAME_RELEASE}
204 exit ;;
200 amiga:OpenBSD:*:*) 205 amiga:OpenBSD:*:*)
201 echo m68k-unknown-openbsd${UNAME_RELEASE} 206 echo m68k-unknown-openbsd${UNAME_RELEASE}
202 exit 0 ;; 207 exit ;;
203 arc:OpenBSD:*:*) 208 cats:OpenBSD:*:*)
204 echo mipsel-unknown-openbsd${UNAME_RELEASE} 209 echo arm-unknown-openbsd${UNAME_RELEASE}
205 exit 0 ;; 210 exit ;;
206 hp300:OpenBSD:*:*) 211 hp300:OpenBSD:*:*)
207 echo m68k-unknown-openbsd${UNAME_RELEASE} 212 echo m68k-unknown-openbsd${UNAME_RELEASE}
208 exit 0 ;; 213 exit ;;
214 luna88k:OpenBSD:*:*)
215 echo m88k-unknown-openbsd${UNAME_RELEASE}
216 exit ;;
209 mac68k:OpenBSD:*:*) 217 mac68k:OpenBSD:*:*)
210 echo m68k-unknown-openbsd${UNAME_RELEASE} 218 echo m68k-unknown-openbsd${UNAME_RELEASE}
211 exit 0 ;; 219 exit ;;
212 macppc:OpenBSD:*:*) 220 macppc:OpenBSD:*:*)
213 echo powerpc-unknown-openbsd${UNAME_RELEASE} 221 echo powerpc-unknown-openbsd${UNAME_RELEASE}
214 exit 0 ;; 222 exit ;;
215 mvme68k:OpenBSD:*:*) 223 mvme68k:OpenBSD:*:*)
216 echo m68k-unknown-openbsd${UNAME_RELEASE} 224 echo m68k-unknown-openbsd${UNAME_RELEASE}
217 exit 0 ;; 225 exit ;;
218 mvme88k:OpenBSD:*:*) 226 mvme88k:OpenBSD:*:*)
219 echo m88k-unknown-openbsd${UNAME_RELEASE} 227 echo m88k-unknown-openbsd${UNAME_RELEASE}
220 exit 0 ;; 228 exit ;;
221 mvmeppc:OpenBSD:*:*) 229 mvmeppc:OpenBSD:*:*)
222 echo powerpc-unknown-openbsd${UNAME_RELEASE} 230 echo powerpc-unknown-openbsd${UNAME_RELEASE}
223 exit 0 ;; 231 exit ;;
224 pmax:OpenBSD:*:*)
225 echo mipsel-unknown-openbsd${UNAME_RELEASE}
226 exit 0 ;;
227 sgi:OpenBSD:*:*) 232 sgi:OpenBSD:*:*)
228 echo mipseb-unknown-openbsd${UNAME_RELEASE} 233 echo mips64-unknown-openbsd${UNAME_RELEASE}
229 exit 0 ;; 234 exit ;;
230 sun3:OpenBSD:*:*) 235 sun3:OpenBSD:*:*)
231 echo m68k-unknown-openbsd${UNAME_RELEASE} 236 echo m68k-unknown-openbsd${UNAME_RELEASE}
232 exit 0 ;; 237 exit ;;
233 wgrisc:OpenBSD:*:*)
234 echo mipsel-unknown-openbsd${UNAME_RELEASE}
235 exit 0 ;;
236 *:OpenBSD:*:*) 238 *:OpenBSD:*:*)
237 echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} 239 echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
238 exit 0 ;; 240 exit ;;
241 *:ekkoBSD:*:*)
242 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
243 exit ;;
244 macppc:MirBSD:*:*)
245 echo powerppc-unknown-mirbsd${UNAME_RELEASE}
246 exit ;;
247 *:MirBSD:*:*)
248 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
249 exit ;;
239 alpha:OSF1:*:*) 250 alpha:OSF1:*:*)
240 if test $UNAME_RELEASE = "V4.0"; then 251 case $UNAME_RELEASE in
252 *4.0)
241 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` 253 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
242 fi 254 ;;
255 *5.*)
256 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
257 ;;
258 esac
243 # According to Compaq, /usr/sbin/psrinfo has been available on 259 # According to Compaq, /usr/sbin/psrinfo has been available on
244 # OSF/1 and Tru64 systems produced since 1995. I hope that 260 # OSF/1 and Tru64 systems produced since 1995. I hope that
245 # covers most systems running today. This code pipes the CPU 261 # covers most systems running today. This code pipes the CPU
@@ -277,42 +293,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
277 "EV7.9 (21364A)") 293 "EV7.9 (21364A)")
278 UNAME_MACHINE="alphaev79" ;; 294 UNAME_MACHINE="alphaev79" ;;
279 esac 295 esac
296 # A Pn.n version is a patched version.
280 # A Vn.n version is a released version. 297 # A Vn.n version is a released version.
281 # A Tn.n version is a released field test version. 298 # A Tn.n version is a released field test version.
282 # A Xn.n version is an unreleased experimental baselevel. 299 # A Xn.n version is an unreleased experimental baselevel.
283 # 1.2 uses "1.2" for uname -r. 300 # 1.2 uses "1.2" for uname -r.
284 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 301 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
285 exit 0 ;; 302 exit ;;
286 Alpha*:OpenVMS:*:*)
287 echo alpha-hp-vms
288 exit 0 ;;
289 Alpha\ *:Windows_NT*:*) 303 Alpha\ *:Windows_NT*:*)
290 # How do we know it's Interix rather than the generic POSIX subsystem? 304 # How do we know it's Interix rather than the generic POSIX subsystem?
291 # Should we change UNAME_MACHINE based on the output of uname instead 305 # Should we change UNAME_MACHINE based on the output of uname instead
292 # of the specific Alpha model? 306 # of the specific Alpha model?
293 echo alpha-pc-interix 307 echo alpha-pc-interix
294 exit 0 ;; 308 exit ;;
295 21064:Windows_NT:50:3) 309 21064:Windows_NT:50:3)
296 echo alpha-dec-winnt3.5 310 echo alpha-dec-winnt3.5
297 exit 0 ;; 311 exit ;;
298 Amiga*:UNIX_System_V:4.0:*) 312 Amiga*:UNIX_System_V:4.0:*)
299 echo m68k-unknown-sysv4 313 echo m68k-unknown-sysv4
300 exit 0;; 314 exit ;;
301 *:[Aa]miga[Oo][Ss]:*:*) 315 *:[Aa]miga[Oo][Ss]:*:*)
302 echo ${UNAME_MACHINE}-unknown-amigaos 316 echo ${UNAME_MACHINE}-unknown-amigaos
303 exit 0 ;; 317 exit ;;
304 *:[Mm]orph[Oo][Ss]:*:*) 318 *:[Mm]orph[Oo][Ss]:*:*)
305 echo ${UNAME_MACHINE}-unknown-morphos 319 echo ${UNAME_MACHINE}-unknown-morphos
306 exit 0 ;; 320 exit ;;
307 *:OS/390:*:*) 321 *:OS/390:*:*)
308 echo i370-ibm-openedition 322 echo i370-ibm-openedition
309 exit 0 ;; 323 exit ;;
324 *:z/VM:*:*)
325 echo s390-ibm-zvmoe
326 exit ;;
327 *:OS400:*:*)
328 echo powerpc-ibm-os400
329 exit ;;
310 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 330 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
311 echo arm-acorn-riscix${UNAME_RELEASE} 331 echo arm-acorn-riscix${UNAME_RELEASE}
312 exit 0;; 332 exit ;;
333 arm:riscos:*:*|arm:RISCOS:*:*)
334 echo arm-unknown-riscos
335 exit ;;
313 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) 336 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
314 echo hppa1.1-hitachi-hiuxmpp 337 echo hppa1.1-hitachi-hiuxmpp
315 exit 0;; 338 exit ;;
316 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) 339 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
317 # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. 340 # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
318 if test "`(/bin/universe) 2>/dev/null`" = att ; then 341 if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -320,32 +343,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
320 else 343 else
321 echo pyramid-pyramid-bsd 344 echo pyramid-pyramid-bsd
322 fi 345 fi
323 exit 0 ;; 346 exit ;;
324 NILE*:*:*:dcosx) 347 NILE*:*:*:dcosx)
325 echo pyramid-pyramid-svr4 348 echo pyramid-pyramid-svr4
326 exit 0 ;; 349 exit ;;
327 DRS?6000:unix:4.0:6*) 350 DRS?6000:unix:4.0:6*)
328 echo sparc-icl-nx6 351 echo sparc-icl-nx6
329 exit 0 ;; 352 exit ;;
330 DRS?6000:UNIX_SV:4.2*:7*) 353 DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
331 case `/usr/bin/uname -p` in 354 case `/usr/bin/uname -p` in
332 sparc) echo sparc-icl-nx7 && exit 0 ;; 355 sparc) echo sparc-icl-nx7; exit ;;
333 esac ;; 356 esac ;;
334 sun4H:SunOS:5.*:*) 357 sun4H:SunOS:5.*:*)
335 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 358 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
336 exit 0 ;; 359 exit ;;
337 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 360 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
338 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 361 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
339 exit 0 ;; 362 exit ;;
340 i86pc:SunOS:5.*:*) 363 i86pc:SunOS:5.*:*)
341 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 364 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
342 exit 0 ;; 365 exit ;;
343 sun4*:SunOS:6*:*) 366 sun4*:SunOS:6*:*)
344 # According to config.sub, this is the proper way to canonicalize 367 # According to config.sub, this is the proper way to canonicalize
345 # SunOS6. Hard to guess exactly what SunOS6 will be like, but 368 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
346 # it's likely to be more like Solaris than SunOS4. 369 # it's likely to be more like Solaris than SunOS4.
347 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 370 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
348 exit 0 ;; 371 exit ;;
349 sun4*:SunOS:*:*) 372 sun4*:SunOS:*:*)
350 case "`/usr/bin/arch -k`" in 373 case "`/usr/bin/arch -k`" in
351 Series*|S4*) 374 Series*|S4*)
@@ -354,10 +377,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
354 esac 377 esac
355 # Japanese Language versions have a version number like `4.1.3-JL'. 378 # Japanese Language versions have a version number like `4.1.3-JL'.
356 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` 379 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
357 exit 0 ;; 380 exit ;;
358 sun3*:SunOS:*:*) 381 sun3*:SunOS:*:*)
359 echo m68k-sun-sunos${UNAME_RELEASE} 382 echo m68k-sun-sunos${UNAME_RELEASE}
360 exit 0 ;; 383 exit ;;
361 sun*:*:4.2BSD:*) 384 sun*:*:4.2BSD:*)
362 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` 385 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
363 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 386 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -369,10 +392,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
369 echo sparc-sun-sunos${UNAME_RELEASE} 392 echo sparc-sun-sunos${UNAME_RELEASE}
370 ;; 393 ;;
371 esac 394 esac
372 exit 0 ;; 395 exit ;;
373 aushp:SunOS:*:*) 396 aushp:SunOS:*:*)
374 echo sparc-auspex-sunos${UNAME_RELEASE} 397 echo sparc-auspex-sunos${UNAME_RELEASE}
375 exit 0 ;; 398 exit ;;
376 # The situation for MiNT is a little confusing. The machine name 399 # The situation for MiNT is a little confusing. The machine name
377 # can be virtually everything (everything which is not 400 # can be virtually everything (everything which is not
378 # "atarist" or "atariste" at least should have a processor 401 # "atarist" or "atariste" at least should have a processor
@@ -383,37 +406,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
383 # be no problem. 406 # be no problem.
384 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 407 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
385 echo m68k-atari-mint${UNAME_RELEASE} 408 echo m68k-atari-mint${UNAME_RELEASE}
386 exit 0 ;; 409 exit ;;
387 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 410 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
388 echo m68k-atari-mint${UNAME_RELEASE} 411 echo m68k-atari-mint${UNAME_RELEASE}
389 exit 0 ;; 412 exit ;;
390 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 413 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
391 echo m68k-atari-mint${UNAME_RELEASE} 414 echo m68k-atari-mint${UNAME_RELEASE}
392 exit 0 ;; 415 exit ;;
393 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 416 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
394 echo m68k-milan-mint${UNAME_RELEASE} 417 echo m68k-milan-mint${UNAME_RELEASE}
395 exit 0 ;; 418 exit ;;
396 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 419 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
397 echo m68k-hades-mint${UNAME_RELEASE} 420 echo m68k-hades-mint${UNAME_RELEASE}
398 exit 0 ;; 421 exit ;;
399 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 422 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
400 echo m68k-unknown-mint${UNAME_RELEASE} 423 echo m68k-unknown-mint${UNAME_RELEASE}
401 exit 0 ;; 424 exit ;;
425 m68k:machten:*:*)
426 echo m68k-apple-machten${UNAME_RELEASE}
427 exit ;;
402 powerpc:machten:*:*) 428 powerpc:machten:*:*)
403 echo powerpc-apple-machten${UNAME_RELEASE} 429 echo powerpc-apple-machten${UNAME_RELEASE}
404 exit 0 ;; 430 exit ;;
405 RISC*:Mach:*:*) 431 RISC*:Mach:*:*)
406 echo mips-dec-mach_bsd4.3 432 echo mips-dec-mach_bsd4.3
407 exit 0 ;; 433 exit ;;
408 RISC*:ULTRIX:*:*) 434 RISC*:ULTRIX:*:*)
409 echo mips-dec-ultrix${UNAME_RELEASE} 435 echo mips-dec-ultrix${UNAME_RELEASE}
410 exit 0 ;; 436 exit ;;
411 VAX*:ULTRIX*:*:*) 437 VAX*:ULTRIX*:*:*)
412 echo vax-dec-ultrix${UNAME_RELEASE} 438 echo vax-dec-ultrix${UNAME_RELEASE}
413 exit 0 ;; 439 exit ;;
414 2020:CLIX:*:* | 2430:CLIX:*:*) 440 2020:CLIX:*:* | 2430:CLIX:*:*)
415 echo clipper-intergraph-clix${UNAME_RELEASE} 441 echo clipper-intergraph-clix${UNAME_RELEASE}
416 exit 0 ;; 442 exit ;;
417 mips:*:*:UMIPS | mips:*:*:RISCos) 443 mips:*:*:UMIPS | mips:*:*:RISCos)
418 eval $set_cc_for_build 444 eval $set_cc_for_build
419 sed 's/^ //' << EOF >$dummy.c 445 sed 's/^ //' << EOF >$dummy.c
@@ -437,32 +463,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
437 exit (-1); 463 exit (-1);
438 } 464 }
439EOF 465EOF
440 $CC_FOR_BUILD -o $dummy $dummy.c \ 466 $CC_FOR_BUILD -o $dummy $dummy.c &&
441 && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ 467 dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
442 && exit 0 468 SYSTEM_NAME=`$dummy $dummyarg` &&
469 { echo "$SYSTEM_NAME"; exit; }
443 echo mips-mips-riscos${UNAME_RELEASE} 470 echo mips-mips-riscos${UNAME_RELEASE}
444 exit 0 ;; 471 exit ;;
445 Motorola:PowerMAX_OS:*:*) 472 Motorola:PowerMAX_OS:*:*)
446 echo powerpc-motorola-powermax 473 echo powerpc-motorola-powermax
447 exit 0 ;; 474 exit ;;
448 Motorola:*:4.3:PL8-*) 475 Motorola:*:4.3:PL8-*)
449 echo powerpc-harris-powermax 476 echo powerpc-harris-powermax
450 exit 0 ;; 477 exit ;;
451 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) 478 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
452 echo powerpc-harris-powermax 479 echo powerpc-harris-powermax
453 exit 0 ;; 480 exit ;;
454 Night_Hawk:Power_UNIX:*:*) 481 Night_Hawk:Power_UNIX:*:*)
455 echo powerpc-harris-powerunix 482 echo powerpc-harris-powerunix
456 exit 0 ;; 483 exit ;;
457 m88k:CX/UX:7*:*) 484 m88k:CX/UX:7*:*)
458 echo m88k-harris-cxux7 485 echo m88k-harris-cxux7
459 exit 0 ;; 486 exit ;;
460 m88k:*:4*:R4*) 487 m88k:*:4*:R4*)
461 echo m88k-motorola-sysv4 488 echo m88k-motorola-sysv4
462 exit 0 ;; 489 exit ;;
463 m88k:*:3*:R3*) 490 m88k:*:3*:R3*)
464 echo m88k-motorola-sysv3 491 echo m88k-motorola-sysv3
465 exit 0 ;; 492 exit ;;
466 AViiON:dgux:*:*) 493 AViiON:dgux:*:*)
467 # DG/UX returns AViiON for all architectures 494 # DG/UX returns AViiON for all architectures
468 UNAME_PROCESSOR=`/usr/bin/uname -p` 495 UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -478,29 +505,29 @@ EOF
478 else 505 else
479 echo i586-dg-dgux${UNAME_RELEASE} 506 echo i586-dg-dgux${UNAME_RELEASE}
480 fi 507 fi
481 exit 0 ;; 508 exit ;;
482 M88*:DolphinOS:*:*) # DolphinOS (SVR3) 509 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
483 echo m88k-dolphin-sysv3 510 echo m88k-dolphin-sysv3
484 exit 0 ;; 511 exit ;;
485 M88*:*:R3*:*) 512 M88*:*:R3*:*)
486 # Delta 88k system running SVR3 513 # Delta 88k system running SVR3
487 echo m88k-motorola-sysv3 514 echo m88k-motorola-sysv3
488 exit 0 ;; 515 exit ;;
489 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) 516 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
490 echo m88k-tektronix-sysv3 517 echo m88k-tektronix-sysv3
491 exit 0 ;; 518 exit ;;
492 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) 519 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
493 echo m68k-tektronix-bsd 520 echo m68k-tektronix-bsd
494 exit 0 ;; 521 exit ;;
495 *:IRIX*:*:*) 522 *:IRIX*:*:*)
496 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` 523 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
497 exit 0 ;; 524 exit ;;
498 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. 525 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
499 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id 526 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
500 exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' 527 exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
501 i*86:AIX:*:*) 528 i*86:AIX:*:*)
502 echo i386-ibm-aix 529 echo i386-ibm-aix
503 exit 0 ;; 530 exit ;;
504 ia64:AIX:*:*) 531 ia64:AIX:*:*)
505 if [ -x /usr/bin/oslevel ] ; then 532 if [ -x /usr/bin/oslevel ] ; then
506 IBM_REV=`/usr/bin/oslevel` 533 IBM_REV=`/usr/bin/oslevel`
@@ -508,7 +535,7 @@ EOF
508 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 535 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
509 fi 536 fi
510 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} 537 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
511 exit 0 ;; 538 exit ;;
512 *:AIX:2:3) 539 *:AIX:2:3)
513 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then 540 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
514 eval $set_cc_for_build 541 eval $set_cc_for_build
@@ -523,14 +550,18 @@ EOF
523 exit(0); 550 exit(0);
524 } 551 }
525EOF 552EOF
526 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 553 if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
527 echo rs6000-ibm-aix3.2.5 554 then
555 echo "$SYSTEM_NAME"
556 else
557 echo rs6000-ibm-aix3.2.5
558 fi
528 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then 559 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
529 echo rs6000-ibm-aix3.2.4 560 echo rs6000-ibm-aix3.2.4
530 else 561 else
531 echo rs6000-ibm-aix3.2 562 echo rs6000-ibm-aix3.2
532 fi 563 fi
533 exit 0 ;; 564 exit ;;
534 *:AIX:*:[45]) 565 *:AIX:*:[45])
535 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 566 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
536 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 567 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -544,28 +575,28 @@ EOF
544 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 575 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
545 fi 576 fi
546 echo ${IBM_ARCH}-ibm-aix${IBM_REV} 577 echo ${IBM_ARCH}-ibm-aix${IBM_REV}
547 exit 0 ;; 578 exit ;;
548 *:AIX:*:*) 579 *:AIX:*:*)
549 echo rs6000-ibm-aix 580 echo rs6000-ibm-aix
550 exit 0 ;; 581 exit ;;
551 ibmrt:4.4BSD:*|romp-ibm:BSD:*) 582 ibmrt:4.4BSD:*|romp-ibm:BSD:*)
552 echo romp-ibm-bsd4.4 583 echo romp-ibm-bsd4.4
553 exit 0 ;; 584 exit ;;
554 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and 585 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
555 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to 586 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
556 exit 0 ;; # report: romp-ibm BSD 4.3 587 exit ;; # report: romp-ibm BSD 4.3
557 *:BOSX:*:*) 588 *:BOSX:*:*)
558 echo rs6000-bull-bosx 589 echo rs6000-bull-bosx
559 exit 0 ;; 590 exit ;;
560 DPX/2?00:B.O.S.:*:*) 591 DPX/2?00:B.O.S.:*:*)
561 echo m68k-bull-sysv3 592 echo m68k-bull-sysv3
562 exit 0 ;; 593 exit ;;
563 9000/[34]??:4.3bsd:1.*:*) 594 9000/[34]??:4.3bsd:1.*:*)
564 echo m68k-hp-bsd 595 echo m68k-hp-bsd
565 exit 0 ;; 596 exit ;;
566 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) 597 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
567 echo m68k-hp-bsd4.4 598 echo m68k-hp-bsd4.4
568 exit 0 ;; 599 exit ;;
569 9000/[34678]??:HP-UX:*:*) 600 9000/[34678]??:HP-UX:*:*)
570 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 601 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
571 case "${UNAME_MACHINE}" in 602 case "${UNAME_MACHINE}" in
@@ -629,7 +660,18 @@ EOF
629 then 660 then
630 # avoid double evaluation of $set_cc_for_build 661 # avoid double evaluation of $set_cc_for_build
631 test -n "$CC_FOR_BUILD" || eval $set_cc_for_build 662 test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
632 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null 663
664 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
665 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
666 # generating 64-bit code. GNU and HP use different nomenclature:
667 #
668 # $ CC_FOR_BUILD=cc ./config.guess
669 # => hppa2.0w-hp-hpux11.23
670 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
671 # => hppa64-hp-hpux11.23
672
673 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
674 grep __LP64__ >/dev/null
633 then 675 then
634 HP_ARCH="hppa2.0w" 676 HP_ARCH="hppa2.0w"
635 else 677 else
@@ -637,11 +679,11 @@ EOF
637 fi 679 fi
638 fi 680 fi
639 echo ${HP_ARCH}-hp-hpux${HPUX_REV} 681 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
640 exit 0 ;; 682 exit ;;
641 ia64:HP-UX:*:*) 683 ia64:HP-UX:*:*)
642 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 684 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
643 echo ia64-hp-hpux${HPUX_REV} 685 echo ia64-hp-hpux${HPUX_REV}
644 exit 0 ;; 686 exit ;;
645 3050*:HI-UX:*:*) 687 3050*:HI-UX:*:*)
646 eval $set_cc_for_build 688 eval $set_cc_for_build
647 sed 's/^ //' << EOF >$dummy.c 689 sed 's/^ //' << EOF >$dummy.c
@@ -669,153 +711,166 @@ EOF
669 exit (0); 711 exit (0);
670 } 712 }
671EOF 713EOF
672 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 714 $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
715 { echo "$SYSTEM_NAME"; exit; }
673 echo unknown-hitachi-hiuxwe2 716 echo unknown-hitachi-hiuxwe2
674 exit 0 ;; 717 exit ;;
675 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) 718 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
676 echo hppa1.1-hp-bsd 719 echo hppa1.1-hp-bsd
677 exit 0 ;; 720 exit ;;
678 9000/8??:4.3bsd:*:*) 721 9000/8??:4.3bsd:*:*)
679 echo hppa1.0-hp-bsd 722 echo hppa1.0-hp-bsd
680 exit 0 ;; 723 exit ;;
681 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) 724 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
682 echo hppa1.0-hp-mpeix 725 echo hppa1.0-hp-mpeix
683 exit 0 ;; 726 exit ;;
684 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) 727 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
685 echo hppa1.1-hp-osf 728 echo hppa1.1-hp-osf
686 exit 0 ;; 729 exit ;;
687 hp8??:OSF1:*:*) 730 hp8??:OSF1:*:*)
688 echo hppa1.0-hp-osf 731 echo hppa1.0-hp-osf
689 exit 0 ;; 732 exit ;;
690 i*86:OSF1:*:*) 733 i*86:OSF1:*:*)
691 if [ -x /usr/sbin/sysversion ] ; then 734 if [ -x /usr/sbin/sysversion ] ; then
692 echo ${UNAME_MACHINE}-unknown-osf1mk 735 echo ${UNAME_MACHINE}-unknown-osf1mk
693 else 736 else
694 echo ${UNAME_MACHINE}-unknown-osf1 737 echo ${UNAME_MACHINE}-unknown-osf1
695 fi 738 fi
696 exit 0 ;; 739 exit ;;
697 parisc*:Lites*:*:*) 740 parisc*:Lites*:*:*)
698 echo hppa1.1-hp-lites 741 echo hppa1.1-hp-lites
699 exit 0 ;; 742 exit ;;
700 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) 743 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
701 echo c1-convex-bsd 744 echo c1-convex-bsd
702 exit 0 ;; 745 exit ;;
703 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) 746 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
704 if getsysinfo -f scalar_acc 747 if getsysinfo -f scalar_acc
705 then echo c32-convex-bsd 748 then echo c32-convex-bsd
706 else echo c2-convex-bsd 749 else echo c2-convex-bsd
707 fi 750 fi
708 exit 0 ;; 751 exit ;;
709 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) 752 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
710 echo c34-convex-bsd 753 echo c34-convex-bsd
711 exit 0 ;; 754 exit ;;
712 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) 755 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
713 echo c38-convex-bsd 756 echo c38-convex-bsd
714 exit 0 ;; 757 exit ;;
715 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) 758 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
716 echo c4-convex-bsd 759 echo c4-convex-bsd
717 exit 0 ;; 760 exit ;;
718 CRAY*Y-MP:*:*:*) 761 CRAY*Y-MP:*:*:*)
719 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 762 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
720 exit 0 ;; 763 exit ;;
721 CRAY*[A-Z]90:*:*:*) 764 CRAY*[A-Z]90:*:*:*)
722 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ 765 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
723 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ 766 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
724 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ 767 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
725 -e 's/\.[^.]*$/.X/' 768 -e 's/\.[^.]*$/.X/'
726 exit 0 ;; 769 exit ;;
727 CRAY*TS:*:*:*) 770 CRAY*TS:*:*:*)
728 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 771 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
729 exit 0 ;; 772 exit ;;
730 CRAY*T3E:*:*:*) 773 CRAY*T3E:*:*:*)
731 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 774 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
732 exit 0 ;; 775 exit ;;
733 CRAY*SV1:*:*:*) 776 CRAY*SV1:*:*:*)
734 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 777 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
735 exit 0 ;; 778 exit ;;
736 *:UNICOS/mp:*:*) 779 *:UNICOS/mp:*:*)
737 echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 780 echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
738 exit 0 ;; 781 exit ;;
739 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 782 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
740 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 783 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
741 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 784 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
742 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 785 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
743 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 786 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
744 exit 0 ;; 787 exit ;;
788 5000:UNIX_System_V:4.*:*)
789 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
790 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
791 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
792 exit ;;
745 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 793 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
746 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 794 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
747 exit 0 ;; 795 exit ;;
748 sparc*:BSD/OS:*:*) 796 sparc*:BSD/OS:*:*)
749 echo sparc-unknown-bsdi${UNAME_RELEASE} 797 echo sparc-unknown-bsdi${UNAME_RELEASE}
750 exit 0 ;; 798 exit ;;
751 *:BSD/OS:*:*) 799 *:BSD/OS:*:*)
752 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 800 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
753 exit 0 ;; 801 exit ;;
754 *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) 802 *:FreeBSD:*:*)
755 # Determine whether the default compiler uses glibc. 803 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
756 eval $set_cc_for_build 804 exit ;;
757 sed 's/^ //' << EOF >$dummy.c
758 #include <features.h>
759 #if __GLIBC__ >= 2
760 LIBC=gnu
761 #else
762 LIBC=
763 #endif
764EOF
765 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
766 # GNU/FreeBSD systems have a "k" prefix to indicate we are using
767 # FreeBSD's kernel, but not the complete OS.
768 case ${LIBC} in gnu) kernel_only='k' ;; esac
769 echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
770 exit 0 ;;
771 i*:CYGWIN*:*) 805 i*:CYGWIN*:*)
772 echo ${UNAME_MACHINE}-pc-cygwin 806 echo ${UNAME_MACHINE}-pc-cygwin
773 exit 0 ;; 807 exit ;;
774 i*:MINGW*:*) 808 i*:MINGW*:*)
775 echo ${UNAME_MACHINE}-pc-mingw32 809 echo ${UNAME_MACHINE}-pc-mingw32
776 exit 0 ;; 810 exit ;;
811 i*:windows32*:*)
812 # uname -m includes "-pc" on this system.
813 echo ${UNAME_MACHINE}-mingw32
814 exit ;;
777 i*:PW*:*) 815 i*:PW*:*)
778 echo ${UNAME_MACHINE}-pc-pw32 816 echo ${UNAME_MACHINE}-pc-pw32
779 exit 0 ;; 817 exit ;;
780 x86:Interix*:[34]*) 818 x86:Interix*:[34]*)
781 echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' 819 echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
782 exit 0 ;; 820 exit ;;
783 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 821 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
784 echo i${UNAME_MACHINE}-pc-mks 822 echo i${UNAME_MACHINE}-pc-mks
785 exit 0 ;; 823 exit ;;
786 i*:Windows_NT*:* | Pentium*:Windows_NT*:*) 824 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
787 # How do we know it's Interix rather than the generic POSIX subsystem? 825 # How do we know it's Interix rather than the generic POSIX subsystem?
788 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we 826 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
789 # UNAME_MACHINE based on the output of uname instead of i386? 827 # UNAME_MACHINE based on the output of uname instead of i386?
790 echo i586-pc-interix 828 echo i586-pc-interix
791 exit 0 ;; 829 exit ;;
792 i*:UWIN*:*) 830 i*:UWIN*:*)
793 echo ${UNAME_MACHINE}-pc-uwin 831 echo ${UNAME_MACHINE}-pc-uwin
794 exit 0 ;; 832 exit ;;
833 amd64:CYGWIN*:*:*)
834 echo x86_64-unknown-cygwin
835 exit ;;
795 p*:CYGWIN*:*) 836 p*:CYGWIN*:*)
796 echo powerpcle-unknown-cygwin 837 echo powerpcle-unknown-cygwin
797 exit 0 ;; 838 exit ;;
798 prep*:SunOS:5.*:*) 839 prep*:SunOS:5.*:*)
799 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 840 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
800 exit 0 ;; 841 exit ;;
801 *:GNU:*:*) 842 *:GNU:*:*)
843 # the GNU system
802 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` 844 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
803 exit 0 ;; 845 exit ;;
846 *:GNU/*:*:*)
847 # other systems with GNU libc and userland
848 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
849 exit ;;
804 i*86:Minix:*:*) 850 i*86:Minix:*:*)
805 echo ${UNAME_MACHINE}-pc-minix 851 echo ${UNAME_MACHINE}-pc-minix
806 exit 0 ;; 852 exit ;;
807 arm*:Linux:*:*) 853 arm*:Linux:*:*)
808 echo ${UNAME_MACHINE}-unknown-linux-gnu 854 echo ${UNAME_MACHINE}-unknown-linux-gnu
809 exit 0 ;; 855 exit ;;
810 cris:Linux:*:*) 856 cris:Linux:*:*)
811 echo cris-axis-linux-gnu 857 echo cris-axis-linux-gnu
812 exit 0 ;; 858 exit ;;
859 crisv32:Linux:*:*)
860 echo crisv32-axis-linux-gnu
861 exit ;;
862 frv:Linux:*:*)
863 echo frv-unknown-linux-gnu
864 exit ;;
813 ia64:Linux:*:*) 865 ia64:Linux:*:*)
814 echo ${UNAME_MACHINE}-unknown-linux-gnu 866 echo ${UNAME_MACHINE}-unknown-linux-gnu
815 exit 0 ;; 867 exit ;;
868 m32r*:Linux:*:*)
869 echo ${UNAME_MACHINE}-unknown-linux-gnu
870 exit ;;
816 m68*:Linux:*:*) 871 m68*:Linux:*:*)
817 echo ${UNAME_MACHINE}-unknown-linux-gnu 872 echo ${UNAME_MACHINE}-unknown-linux-gnu
818 exit 0 ;; 873 exit ;;
819 mips:Linux:*:*) 874 mips:Linux:*:*)
820 eval $set_cc_for_build 875 eval $set_cc_for_build
821 sed 's/^ //' << EOF >$dummy.c 876 sed 's/^ //' << EOF >$dummy.c
@@ -833,7 +888,7 @@ EOF
833 #endif 888 #endif
834EOF 889EOF
835 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 890 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
836 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 891 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
837 ;; 892 ;;
838 mips64:Linux:*:*) 893 mips64:Linux:*:*)
839 eval $set_cc_for_build 894 eval $set_cc_for_build
@@ -852,14 +907,14 @@ EOF
852 #endif 907 #endif
853EOF 908EOF
854 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 909 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
855 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 910 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
856 ;; 911 ;;
857 ppc:Linux:*:*) 912 ppc:Linux:*:*)
858 echo powerpc-unknown-linux-gnu 913 echo powerpc-unknown-linux-gnu
859 exit 0 ;; 914 exit ;;
860 ppc64:Linux:*:*) 915 ppc64:Linux:*:*)
861 echo powerpc64-unknown-linux-gnu 916 echo powerpc64-unknown-linux-gnu
862 exit 0 ;; 917 exit ;;
863 alpha:Linux:*:*) 918 alpha:Linux:*:*)
864 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 919 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
865 EV5) UNAME_MACHINE=alphaev5 ;; 920 EV5) UNAME_MACHINE=alphaev5 ;;
@@ -873,7 +928,7 @@ EOF
873 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null 928 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
874 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 929 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
875 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 930 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
876 exit 0 ;; 931 exit ;;
877 parisc:Linux:*:* | hppa:Linux:*:*) 932 parisc:Linux:*:* | hppa:Linux:*:*)
878 # Look for CPU level 933 # Look for CPU level
879 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 934 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -881,25 +936,25 @@ EOF
881 PA8*) echo hppa2.0-unknown-linux-gnu ;; 936 PA8*) echo hppa2.0-unknown-linux-gnu ;;
882 *) echo hppa-unknown-linux-gnu ;; 937 *) echo hppa-unknown-linux-gnu ;;
883 esac 938 esac
884 exit 0 ;; 939 exit ;;
885 parisc64:Linux:*:* | hppa64:Linux:*:*) 940 parisc64:Linux:*:* | hppa64:Linux:*:*)
886 echo hppa64-unknown-linux-gnu 941 echo hppa64-unknown-linux-gnu
887 exit 0 ;; 942 exit ;;
888 s390:Linux:*:* | s390x:Linux:*:*) 943 s390:Linux:*:* | s390x:Linux:*:*)
889 echo ${UNAME_MACHINE}-ibm-linux 944 echo ${UNAME_MACHINE}-ibm-linux
890 exit 0 ;; 945 exit ;;
891 sh64*:Linux:*:*) 946 sh64*:Linux:*:*)
892 echo ${UNAME_MACHINE}-unknown-linux-gnu 947 echo ${UNAME_MACHINE}-unknown-linux-gnu
893 exit 0 ;; 948 exit ;;
894 sh*:Linux:*:*) 949 sh*:Linux:*:*)
895 echo ${UNAME_MACHINE}-unknown-linux-gnu 950 echo ${UNAME_MACHINE}-unknown-linux-gnu
896 exit 0 ;; 951 exit ;;
897 sparc:Linux:*:* | sparc64:Linux:*:*) 952 sparc:Linux:*:* | sparc64:Linux:*:*)
898 echo ${UNAME_MACHINE}-unknown-linux-gnu 953 echo ${UNAME_MACHINE}-unknown-linux-gnu
899 exit 0 ;; 954 exit ;;
900 x86_64:Linux:*:*) 955 x86_64:Linux:*:*)
901 echo x86_64-unknown-linux-gnu 956 echo x86_64-unknown-linux-gnu
902 exit 0 ;; 957 exit ;;
903 i*86:Linux:*:*) 958 i*86:Linux:*:*)
904 # The BFD linker knows what the default object file format is, so 959 # The BFD linker knows what the default object file format is, so
905 # first see if it will tell us. cd to the root directory to prevent 960 # first see if it will tell us. cd to the root directory to prevent
@@ -917,15 +972,15 @@ EOF
917 ;; 972 ;;
918 a.out-i386-linux) 973 a.out-i386-linux)
919 echo "${UNAME_MACHINE}-pc-linux-gnuaout" 974 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
920 exit 0 ;; 975 exit ;;
921 coff-i386) 976 coff-i386)
922 echo "${UNAME_MACHINE}-pc-linux-gnucoff" 977 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
923 exit 0 ;; 978 exit ;;
924 "") 979 "")
925 # Either a pre-BFD a.out linker (linux-gnuoldld) or 980 # Either a pre-BFD a.out linker (linux-gnuoldld) or
926 # one that does not give us useful --help. 981 # one that does not give us useful --help.
927 echo "${UNAME_MACHINE}-pc-linux-gnuoldld" 982 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
928 exit 0 ;; 983 exit ;;
929 esac 984 esac
930 # Determine whether the default compiler is a.out or elf 985 # Determine whether the default compiler is a.out or elf
931 eval $set_cc_for_build 986 eval $set_cc_for_build
@@ -953,15 +1008,18 @@ EOF
953 #endif 1008 #endif
954EOF 1009EOF
955 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` 1010 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
956 test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 1011 test x"${LIBC}" != x && {
957 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 1012 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1013 exit
1014 }
1015 test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
958 ;; 1016 ;;
959 i*86:DYNIX/ptx:4*:*) 1017 i*86:DYNIX/ptx:4*:*)
960 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 1018 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
961 # earlier versions are messed up and put the nodename in both 1019 # earlier versions are messed up and put the nodename in both
962 # sysname and nodename. 1020 # sysname and nodename.
963 echo i386-sequent-sysv4 1021 echo i386-sequent-sysv4
964 exit 0 ;; 1022 exit ;;
965 i*86:UNIX_SV:4.2MP:2.*) 1023 i*86:UNIX_SV:4.2MP:2.*)
966 # Unixware is an offshoot of SVR4, but it has its own version 1024 # Unixware is an offshoot of SVR4, but it has its own version
967 # number series starting with 2... 1025 # number series starting with 2...
@@ -969,24 +1027,27 @@ EOF
969 # I just have to hope. -- rms. 1027 # I just have to hope. -- rms.
970 # Use sysv4.2uw... so that sysv4* matches it. 1028 # Use sysv4.2uw... so that sysv4* matches it.
971 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 1029 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
972 exit 0 ;; 1030 exit ;;
973 i*86:OS/2:*:*) 1031 i*86:OS/2:*:*)
974 # If we were able to find `uname', then EMX Unix compatibility 1032 # If we were able to find `uname', then EMX Unix compatibility
975 # is probably installed. 1033 # is probably installed.
976 echo ${UNAME_MACHINE}-pc-os2-emx 1034 echo ${UNAME_MACHINE}-pc-os2-emx
977 exit 0 ;; 1035 exit ;;
978 i*86:XTS-300:*:STOP) 1036 i*86:XTS-300:*:STOP)
979 echo ${UNAME_MACHINE}-unknown-stop 1037 echo ${UNAME_MACHINE}-unknown-stop
980 exit 0 ;; 1038 exit ;;
981 i*86:atheos:*:*) 1039 i*86:atheos:*:*)
982 echo ${UNAME_MACHINE}-unknown-atheos 1040 echo ${UNAME_MACHINE}-unknown-atheos
983 exit 0 ;; 1041 exit ;;
1042 i*86:syllable:*:*)
1043 echo ${UNAME_MACHINE}-pc-syllable
1044 exit ;;
984 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) 1045 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
985 echo i386-unknown-lynxos${UNAME_RELEASE} 1046 echo i386-unknown-lynxos${UNAME_RELEASE}
986 exit 0 ;; 1047 exit ;;
987 i*86:*DOS:*:*) 1048 i*86:*DOS:*:*)
988 echo ${UNAME_MACHINE}-pc-msdosdjgpp 1049 echo ${UNAME_MACHINE}-pc-msdosdjgpp
989 exit 0 ;; 1050 exit ;;
990 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) 1051 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
991 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` 1052 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
992 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then 1053 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -994,16 +1055,16 @@ EOF
994 else 1055 else
995 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} 1056 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
996 fi 1057 fi
997 exit 0 ;; 1058 exit ;;
998 i*86:*:5:[678]*) 1059 i*86:*:5:[678]*)
999 # Unixware 7.x, OpenUNIX 8, & OpenServer 6 1060 # UnixWare 7.x, OpenUNIX and OpenServer 6.
1000 case `/bin/uname -X | grep "^Machine"` in 1061 case `/bin/uname -X | grep "^Machine"` in
1001 *486*) UNAME_MACHINE=i486 ;; 1062 *486*) UNAME_MACHINE=i486 ;;
1002 *Pentium) UNAME_MACHINE=i586 ;; 1063 *Pentium) UNAME_MACHINE=i586 ;;
1003 *Pent*|*Celeron) UNAME_MACHINE=i686 ;; 1064 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1004 esac 1065 esac
1005 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} 1066 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1006 exit 0 ;; 1067 exit ;;
1007 i*86:*:3.2:*) 1068 i*86:*:3.2:*)
1008 if test -f /usr/options/cb.name; then 1069 if test -f /usr/options/cb.name; then
1009 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` 1070 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1021,73 +1082,73 @@ EOF
1021 else 1082 else
1022 echo ${UNAME_MACHINE}-pc-sysv32 1083 echo ${UNAME_MACHINE}-pc-sysv32
1023 fi 1084 fi
1024 exit 0 ;; 1085 exit ;;
1025 pc:*:*:*) 1086 pc:*:*:*)
1026 # Left here for compatibility: 1087 # Left here for compatibility:
1027 # uname -m prints for DJGPP always 'pc', but it prints nothing about 1088 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1028 # the processor, so we play safe by assuming i386. 1089 # the processor, so we play safe by assuming i386.
1029 echo i386-pc-msdosdjgpp 1090 echo i386-pc-msdosdjgpp
1030 exit 0 ;; 1091 exit ;;
1031 Intel:Mach:3*:*) 1092 Intel:Mach:3*:*)
1032 echo i386-pc-mach3 1093 echo i386-pc-mach3
1033 exit 0 ;; 1094 exit ;;
1034 paragon:*:*:*) 1095 paragon:*:*:*)
1035 echo i860-intel-osf1 1096 echo i860-intel-osf1
1036 exit 0 ;; 1097 exit ;;
1037 i860:*:4.*:*) # i860-SVR4 1098 i860:*:4.*:*) # i860-SVR4
1038 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then 1099 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1039 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 1100 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1040 else # Add other i860-SVR4 vendors below as they are discovered. 1101 else # Add other i860-SVR4 vendors below as they are discovered.
1041 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 1102 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
1042 fi 1103 fi
1043 exit 0 ;; 1104 exit ;;
1044 mini*:CTIX:SYS*5:*) 1105 mini*:CTIX:SYS*5:*)
1045 # "miniframe" 1106 # "miniframe"
1046 echo m68010-convergent-sysv 1107 echo m68010-convergent-sysv
1047 exit 0 ;; 1108 exit ;;
1048 mc68k:UNIX:SYSTEM5:3.51m) 1109 mc68k:UNIX:SYSTEM5:3.51m)
1049 echo m68k-convergent-sysv 1110 echo m68k-convergent-sysv
1050 exit 0 ;; 1111 exit ;;
1051 M680?0:D-NIX:5.3:*) 1112 M680?0:D-NIX:5.3:*)
1052 echo m68k-diab-dnix 1113 echo m68k-diab-dnix
1053 exit 0 ;; 1114 exit ;;
1054 M68*:*:R3V[567]*:*) 1115 M68*:*:R3V[5678]*:*)
1055 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 1116 test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1056 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) 1117 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)
1057 OS_REL='' 1118 OS_REL=''
1058 test -r /etc/.relid \ 1119 test -r /etc/.relid \
1059 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 1120 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1060 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1121 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1061 && echo i486-ncr-sysv4.3${OS_REL} && exit 0 1122 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1062 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1123 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1063 && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 1124 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1064 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 1125 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1065 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1126 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1066 && echo i486-ncr-sysv4 && exit 0 ;; 1127 && { echo i486-ncr-sysv4; exit; } ;;
1067 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 1128 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1068 echo m68k-unknown-lynxos${UNAME_RELEASE} 1129 echo m68k-unknown-lynxos${UNAME_RELEASE}
1069 exit 0 ;; 1130 exit ;;
1070 mc68030:UNIX_System_V:4.*:*) 1131 mc68030:UNIX_System_V:4.*:*)
1071 echo m68k-atari-sysv4 1132 echo m68k-atari-sysv4
1072 exit 0 ;; 1133 exit ;;
1073 TSUNAMI:LynxOS:2.*:*) 1134 TSUNAMI:LynxOS:2.*:*)
1074 echo sparc-unknown-lynxos${UNAME_RELEASE} 1135 echo sparc-unknown-lynxos${UNAME_RELEASE}
1075 exit 0 ;; 1136 exit ;;
1076 rs6000:LynxOS:2.*:*) 1137 rs6000:LynxOS:2.*:*)
1077 echo rs6000-unknown-lynxos${UNAME_RELEASE} 1138 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1078 exit 0 ;; 1139 exit ;;
1079 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) 1140 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1080 echo powerpc-unknown-lynxos${UNAME_RELEASE} 1141 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1081 exit 0 ;; 1142 exit ;;
1082 SM[BE]S:UNIX_SV:*:*) 1143 SM[BE]S:UNIX_SV:*:*)
1083 echo mips-dde-sysv${UNAME_RELEASE} 1144 echo mips-dde-sysv${UNAME_RELEASE}
1084 exit 0 ;; 1145 exit ;;
1085 RM*:ReliantUNIX-*:*:*) 1146 RM*:ReliantUNIX-*:*:*)
1086 echo mips-sni-sysv4 1147 echo mips-sni-sysv4
1087 exit 0 ;; 1148 exit ;;
1088 RM*:SINIX-*:*:*) 1149 RM*:SINIX-*:*:*)
1089 echo mips-sni-sysv4 1150 echo mips-sni-sysv4
1090 exit 0 ;; 1151 exit ;;
1091 *:SINIX-*:*:*) 1152 *:SINIX-*:*:*)
1092 if uname -p 2>/dev/null >/dev/null ; then 1153 if uname -p 2>/dev/null >/dev/null ; then
1093 UNAME_MACHINE=`(uname -p) 2>/dev/null` 1154 UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1095,68 +1156,73 @@ EOF
1095 else 1156 else
1096 echo ns32k-sni-sysv 1157 echo ns32k-sni-sysv
1097 fi 1158 fi
1098 exit 0 ;; 1159 exit ;;
1099 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 1160 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1100 # says <Richard.M.Bartel@ccMail.Census.GOV> 1161 # says <Richard.M.Bartel@ccMail.Census.GOV>
1101 echo i586-unisys-sysv4 1162 echo i586-unisys-sysv4
1102 exit 0 ;; 1163 exit ;;
1103 *:UNIX_System_V:4*:FTX*) 1164 *:UNIX_System_V:4*:FTX*)
1104 # From Gerald Hewes <hewes@openmarket.com>. 1165 # From Gerald Hewes <hewes@openmarket.com>.
1105 # How about differentiating between stratus architectures? -djm 1166 # How about differentiating between stratus architectures? -djm
1106 echo hppa1.1-stratus-sysv4 1167 echo hppa1.1-stratus-sysv4
1107 exit 0 ;; 1168 exit ;;
1108 *:*:*:FTX*) 1169 *:*:*:FTX*)
1109 # From seanf@swdc.stratus.com. 1170 # From seanf@swdc.stratus.com.
1110 echo i860-stratus-sysv4 1171 echo i860-stratus-sysv4
1111 exit 0 ;; 1172 exit ;;
1173 i*86:VOS:*:*)
1174 # From Paul.Green@stratus.com.
1175 echo ${UNAME_MACHINE}-stratus-vos
1176 exit ;;
1112 *:VOS:*:*) 1177 *:VOS:*:*)
1113 # From Paul.Green@stratus.com. 1178 # From Paul.Green@stratus.com.
1114 echo hppa1.1-stratus-vos 1179 echo hppa1.1-stratus-vos
1115 exit 0 ;; 1180 exit ;;
1116 mc68*:A/UX:*:*) 1181 mc68*:A/UX:*:*)
1117 echo m68k-apple-aux${UNAME_RELEASE} 1182 echo m68k-apple-aux${UNAME_RELEASE}
1118 exit 0 ;; 1183 exit ;;
1119 news*:NEWS-OS:6*:*) 1184 news*:NEWS-OS:6*:*)
1120 echo mips-sony-newsos6 1185 echo mips-sony-newsos6
1121 exit 0 ;; 1186 exit ;;
1122 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) 1187 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1123 if [ -d /usr/nec ]; then 1188 if [ -d /usr/nec ]; then
1124 echo mips-nec-sysv${UNAME_RELEASE} 1189 echo mips-nec-sysv${UNAME_RELEASE}
1125 else 1190 else
1126 echo mips-unknown-sysv${UNAME_RELEASE} 1191 echo mips-unknown-sysv${UNAME_RELEASE}
1127 fi 1192 fi
1128 exit 0 ;; 1193 exit ;;
1129 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. 1194 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1130 echo powerpc-be-beos 1195 echo powerpc-be-beos
1131 exit 0 ;; 1196 exit ;;
1132 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. 1197 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
1133 echo powerpc-apple-beos 1198 echo powerpc-apple-beos
1134 exit 0 ;; 1199 exit ;;
1135 BePC:BeOS:*:*) # BeOS running on Intel PC compatible. 1200 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
1136 echo i586-pc-beos 1201 echo i586-pc-beos
1137 exit 0 ;; 1202 exit ;;
1138 SX-4:SUPER-UX:*:*) 1203 SX-4:SUPER-UX:*:*)
1139 echo sx4-nec-superux${UNAME_RELEASE} 1204 echo sx4-nec-superux${UNAME_RELEASE}
1140 exit 0 ;; 1205 exit ;;
1141 SX-5:SUPER-UX:*:*) 1206 SX-5:SUPER-UX:*:*)
1142 echo sx5-nec-superux${UNAME_RELEASE} 1207 echo sx5-nec-superux${UNAME_RELEASE}
1143 exit 0 ;; 1208 exit ;;
1144 SX-6:SUPER-UX:*:*) 1209 SX-6:SUPER-UX:*:*)
1145 echo sx6-nec-superux${UNAME_RELEASE} 1210 echo sx6-nec-superux${UNAME_RELEASE}
1146 exit 0 ;; 1211 exit ;;
1147 Power*:Rhapsody:*:*) 1212 Power*:Rhapsody:*:*)
1148 echo powerpc-apple-rhapsody${UNAME_RELEASE} 1213 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1149 exit 0 ;; 1214 exit ;;
1150 *:Rhapsody:*:*) 1215 *:Rhapsody:*:*)
1151 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 1216 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1152 exit 0 ;; 1217 exit ;;
1153 *:Darwin:*:*) 1218 *:Darwin:*:*)
1154 case `uname -p` in 1219 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1220 case $UNAME_PROCESSOR in
1155 *86) UNAME_PROCESSOR=i686 ;; 1221 *86) UNAME_PROCESSOR=i686 ;;
1156 powerpc) UNAME_PROCESSOR=powerpc ;; 1222 unknown) UNAME_PROCESSOR=powerpc ;;
1157 esac 1223 esac
1158 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1224 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1159 exit 0 ;; 1225 exit ;;
1160 *:procnto*:*:* | *:QNX:[0123456789]*:*) 1226 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1161 UNAME_PROCESSOR=`uname -p` 1227 UNAME_PROCESSOR=`uname -p`
1162 if test "$UNAME_PROCESSOR" = "x86"; then 1228 if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1164,22 +1230,25 @@ EOF
1164 UNAME_MACHINE=pc 1230 UNAME_MACHINE=pc
1165 fi 1231 fi
1166 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 1232 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1167 exit 0 ;; 1233 exit ;;
1168 *:QNX:*:4*) 1234 *:QNX:*:4*)
1169 echo i386-pc-qnx 1235 echo i386-pc-qnx
1170 exit 0 ;; 1236 exit ;;
1171 NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) 1237 NSE-?:NONSTOP_KERNEL:*:*)
1238 echo nse-tandem-nsk${UNAME_RELEASE}
1239 exit ;;
1240 NSR-?:NONSTOP_KERNEL:*:*)
1172 echo nsr-tandem-nsk${UNAME_RELEASE} 1241 echo nsr-tandem-nsk${UNAME_RELEASE}
1173 exit 0 ;; 1242 exit ;;
1174 *:NonStop-UX:*:*) 1243 *:NonStop-UX:*:*)
1175 echo mips-compaq-nonstopux 1244 echo mips-compaq-nonstopux
1176 exit 0 ;; 1245 exit ;;
1177 BS2000:POSIX*:*:*) 1246 BS2000:POSIX*:*:*)
1178 echo bs2000-siemens-sysv 1247 echo bs2000-siemens-sysv
1179 exit 0 ;; 1248 exit ;;
1180 DS/*:UNIX_System_V:*:*) 1249 DS/*:UNIX_System_V:*:*)
1181 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} 1250 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1182 exit 0 ;; 1251 exit ;;
1183 *:Plan9:*:*) 1252 *:Plan9:*:*)
1184 # "uname -m" is not consistent, so use $cputype instead. 386 1253 # "uname -m" is not consistent, so use $cputype instead. 386
1185 # is converted to i386 for consistency with other x86 1254 # is converted to i386 for consistency with other x86
@@ -1190,28 +1259,44 @@ EOF
1190 UNAME_MACHINE="$cputype" 1259 UNAME_MACHINE="$cputype"
1191 fi 1260 fi
1192 echo ${UNAME_MACHINE}-unknown-plan9 1261 echo ${UNAME_MACHINE}-unknown-plan9
1193 exit 0 ;; 1262 exit ;;
1194 *:TOPS-10:*:*) 1263 *:TOPS-10:*:*)
1195 echo pdp10-unknown-tops10 1264 echo pdp10-unknown-tops10
1196 exit 0 ;; 1265 exit ;;
1197 *:TENEX:*:*) 1266 *:TENEX:*:*)
1198 echo pdp10-unknown-tenex 1267 echo pdp10-unknown-tenex
1199 exit 0 ;; 1268 exit ;;
1200 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) 1269 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1201 echo pdp10-dec-tops20 1270 echo pdp10-dec-tops20
1202 exit 0 ;; 1271 exit ;;
1203 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) 1272 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1204 echo pdp10-xkl-tops20 1273 echo pdp10-xkl-tops20
1205 exit 0 ;; 1274 exit ;;
1206 *:TOPS-20:*:*) 1275 *:TOPS-20:*:*)
1207 echo pdp10-unknown-tops20 1276 echo pdp10-unknown-tops20
1208 exit 0 ;; 1277 exit ;;
1209 *:ITS:*:*) 1278 *:ITS:*:*)
1210 echo pdp10-unknown-its 1279 echo pdp10-unknown-its
1211 exit 0 ;; 1280 exit ;;
1212 SEI:*:*:SEIUX) 1281 SEI:*:*:SEIUX)
1213 echo mips-sei-seiux${UNAME_RELEASE} 1282 echo mips-sei-seiux${UNAME_RELEASE}
1214 exit 0 ;; 1283 exit ;;
1284 *:DragonFly:*:*)
1285 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1286 exit ;;
1287 *:*VMS:*:*)
1288 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1289 case "${UNAME_MACHINE}" in
1290 A*) echo alpha-dec-vms ; exit ;;
1291 I*) echo ia64-dec-vms ; exit ;;
1292 V*) echo vax-dec-vms ; exit ;;
1293 esac ;;
1294 *:XENIX:*:SysV)
1295 echo i386-pc-xenix
1296 exit ;;
1297 i*86:skyos:*:*)
1298 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1299 exit ;;
1215esac 1300esac
1216 1301
1217#echo '(No uname command or uname output not recognized.)' 1>&2 1302#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1243,7 +1328,7 @@ main ()
1243#endif 1328#endif
1244 1329
1245#if defined (__arm) && defined (__acorn) && defined (__unix) 1330#if defined (__arm) && defined (__acorn) && defined (__unix)
1246 printf ("arm-acorn-riscix"); exit (0); 1331 printf ("arm-acorn-riscix\n"); exit (0);
1247#endif 1332#endif
1248 1333
1249#if defined (hp300) && !defined (hpux) 1334#if defined (hp300) && !defined (hpux)
@@ -1332,11 +1417,12 @@ main ()
1332} 1417}
1333EOF 1418EOF
1334 1419
1335$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 1420$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1421 { echo "$SYSTEM_NAME"; exit; }
1336 1422
1337# Apollos put the system type in the environment. 1423# Apollos put the system type in the environment.
1338 1424
1339test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } 1425test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1340 1426
1341# Convex versions that predate uname can use getsysinfo(1) 1427# Convex versions that predate uname can use getsysinfo(1)
1342 1428
@@ -1345,22 +1431,22 @@ then
1345 case `getsysinfo -f cpu_type` in 1431 case `getsysinfo -f cpu_type` in
1346 c1*) 1432 c1*)
1347 echo c1-convex-bsd 1433 echo c1-convex-bsd
1348 exit 0 ;; 1434 exit ;;
1349 c2*) 1435 c2*)
1350 if getsysinfo -f scalar_acc 1436 if getsysinfo -f scalar_acc
1351 then echo c32-convex-bsd 1437 then echo c32-convex-bsd
1352 else echo c2-convex-bsd 1438 else echo c2-convex-bsd
1353 fi 1439 fi
1354 exit 0 ;; 1440 exit ;;
1355 c34*) 1441 c34*)
1356 echo c34-convex-bsd 1442 echo c34-convex-bsd
1357 exit 0 ;; 1443 exit ;;
1358 c38*) 1444 c38*)
1359 echo c38-convex-bsd 1445 echo c38-convex-bsd
1360 exit 0 ;; 1446 exit ;;
1361 c4*) 1447 c4*)
1362 echo c4-convex-bsd 1448 echo c4-convex-bsd
1363 exit 0 ;; 1449 exit ;;
1364 esac 1450 esac
1365fi 1451fi
1366 1452
@@ -1371,7 +1457,9 @@ This script, last modified $timestamp, has failed to recognize
1371the operating system you are using. It is advised that you 1457the operating system you are using. It is advised that you
1372download the most up to date version of the config scripts from 1458download the most up to date version of the config scripts from
1373 1459
1374 ftp://ftp.gnu.org/pub/gnu/config/ 1460 http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
1461and
1462 http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
1375 1463
1376If the version you run ($0) is already up to date, please 1464If the version you run ($0) is already up to date, please
1377send the following data and any information you think might be 1465send the following data and any information you think might be
diff --git a/config.sub b/config.sub
index 1f31816b9..519f2cd00 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
1#! /bin/sh 1#! /bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. 4# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
5 5
6timestamp='2003-08-18' 6timestamp='2005-05-12'
7 7
8# This file is (in principle) common to ALL GNU software. 8# This file is (in principle) common to ALL GNU software.
9# The presence of a machine in this file suggests that SOME GNU software 9# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2003-08-18'
21# 21#
22# You should have received a copy of the GNU General Public License 22# You should have received a copy of the GNU General Public License
23# along with this program; if not, write to the Free Software 23# along with this program; if not, write to the Free Software
24# Foundation, Inc., 59 Temple Place - Suite 330, 24# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
25# Boston, MA 02111-1307, USA. 25# 02110-1301, USA.
26 26#
27# As a special exception to the GNU General Public License, if you 27# As a special exception to the GNU General Public License, if you
28# distribute this file as part of a program that contains a 28# distribute this file as part of a program that contains a
29# configuration script generated by Autoconf, you may include it under 29# configuration script generated by Autoconf, you may include it under
30# the same distribution terms that you use for the rest of that program. 30# the same distribution terms that you use for the rest of that program.
31 31
32
32# Please send patches to <config-patches@gnu.org>. Submit a context 33# Please send patches to <config-patches@gnu.org>. Submit a context
33# diff and a properly formatted ChangeLog entry. 34# diff and a properly formatted ChangeLog entry.
34# 35#
@@ -70,7 +71,7 @@ Report bugs and patches to <config-patches@gnu.org>."
70version="\ 71version="\
71GNU config.sub ($timestamp) 72GNU config.sub ($timestamp)
72 73
73Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 74Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
74Free Software Foundation, Inc. 75Free Software Foundation, Inc.
75 76
76This is free software; see the source for copying conditions. There is NO 77This is free software; see the source for copying conditions. There is NO
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
83while test $# -gt 0 ; do 84while test $# -gt 0 ; do
84 case $1 in 85 case $1 in
85 --time-stamp | --time* | -t ) 86 --time-stamp | --time* | -t )
86 echo "$timestamp" ; exit 0 ;; 87 echo "$timestamp" ; exit ;;
87 --version | -v ) 88 --version | -v )
88 echo "$version" ; exit 0 ;; 89 echo "$version" ; exit ;;
89 --help | --h* | -h ) 90 --help | --h* | -h )
90 echo "$usage"; exit 0 ;; 91 echo "$usage"; exit ;;
91 -- ) # Stop option processing 92 -- ) # Stop option processing
92 shift; break ;; 93 shift; break ;;
93 - ) # Use stdin as input. 94 - ) # Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
99 *local*) 100 *local*)
100 # First pass through any local machine types. 101 # First pass through any local machine types.
101 echo $1 102 echo $1
102 exit 0;; 103 exit ;;
103 104
104 * ) 105 * )
105 break ;; 106 break ;;
@@ -118,7 +119,8 @@ esac
118# Here we must recognize all the valid KERNEL-OS combinations. 119# Here we must recognize all the valid KERNEL-OS combinations.
119maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 120maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
120case $maybe_os in 121case $maybe_os in
121 nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) 122 nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
123 kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
122 os=-$maybe_os 124 os=-$maybe_os
123 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 125 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
124 ;; 126 ;;
@@ -144,7 +146,7 @@ case $os in
144 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ 146 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
145 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ 147 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
146 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ 148 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
147 -apple | -axis) 149 -apple | -axis | -knuth | -cray)
148 os= 150 os=
149 basic_machine=$1 151 basic_machine=$1
150 ;; 152 ;;
@@ -230,13 +232,14 @@ case $basic_machine in
230 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ 232 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
231 | am33_2.0 \ 233 | am33_2.0 \
232 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ 234 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
235 | bfin \
233 | c4x | clipper \ 236 | c4x | clipper \
234 | d10v | d30v | dlx | dsp16xx \ 237 | d10v | d30v | dlx | dsp16xx \
235 | fr30 | frv \ 238 | fr30 | frv \
236 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ 239 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
237 | i370 | i860 | i960 | ia64 \ 240 | i370 | i860 | i960 | ia64 \
238 | ip2k | iq2000 \ 241 | ip2k | iq2000 \
239 | m32r | m68000 | m68k | m88k | mcore \ 242 | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
240 | mips | mipsbe | mipseb | mipsel | mipsle \ 243 | mips | mipsbe | mipseb | mipsel | mipsle \
241 | mips16 \ 244 | mips16 \
242 | mips64 | mips64el \ 245 | mips64 | mips64el \
@@ -261,12 +264,13 @@ case $basic_machine in
261 | pyramid \ 264 | pyramid \
262 | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ 265 | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
263 | sh64 | sh64le \ 266 | sh64 | sh64le \
264 | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ 267 | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
268 | sparcv8 | sparcv9 | sparcv9b \
265 | strongarm \ 269 | strongarm \
266 | tahoe | thumb | tic4x | tic80 | tron \ 270 | tahoe | thumb | tic4x | tic80 | tron \
267 | v850 | v850e \ 271 | v850 | v850e \
268 | we32k \ 272 | we32k \
269 | x86 | xscale | xstormy16 | xtensa \ 273 | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
270 | z8k) 274 | z8k)
271 basic_machine=$basic_machine-unknown 275 basic_machine=$basic_machine-unknown
272 ;; 276 ;;
@@ -297,9 +301,9 @@ case $basic_machine in
297 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ 301 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
298 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ 302 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
299 | avr-* \ 303 | avr-* \
300 | bs2000-* \ 304 | bfin-* | bs2000-* \
301 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ 305 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
302 | clipper-* | cydra-* \ 306 | clipper-* | craynv-* | cydra-* \
303 | d10v-* | d30v-* | dlx-* \ 307 | d10v-* | d30v-* | dlx-* \
304 | elxsi-* \ 308 | elxsi-* \
305 | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ 309 | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -307,9 +311,9 @@ case $basic_machine in
307 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 311 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
308 | i*86-* | i860-* | i960-* | ia64-* \ 312 | i*86-* | i860-* | i960-* | ia64-* \
309 | ip2k-* | iq2000-* \ 313 | ip2k-* | iq2000-* \
310 | m32r-* \ 314 | m32r-* | m32rle-* \
311 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 315 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
312 | m88110-* | m88k-* | mcore-* \ 316 | m88110-* | m88k-* | maxq-* | mcore-* \
313 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 317 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
314 | mips16-* \ 318 | mips16-* \
315 | mips64-* | mips64el-* \ 319 | mips64-* | mips64el-* \
@@ -325,8 +329,9 @@ case $basic_machine in
325 | mipsisa64sb1-* | mipsisa64sb1el-* \ 329 | mipsisa64sb1-* | mipsisa64sb1el-* \
326 | mipsisa64sr71k-* | mipsisa64sr71kel-* \ 330 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
327 | mipstx39-* | mipstx39el-* \ 331 | mipstx39-* | mipstx39el-* \
332 | mmix-* \
328 | msp430-* \ 333 | msp430-* \
329 | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ 334 | none-* | np1-* | ns16k-* | ns32k-* \
330 | orion-* \ 335 | orion-* \
331 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 336 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
332 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ 337 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -334,15 +339,16 @@ case $basic_machine in
334 | romp-* | rs6000-* \ 339 | romp-* | rs6000-* \
335 | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ 340 | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
336 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 341 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
337 | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ 342 | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
338 | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ 343 | sparclite-* \
344 | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
339 | tahoe-* | thumb-* \ 345 | tahoe-* | thumb-* \
340 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 346 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
341 | tron-* \ 347 | tron-* \
342 | v850-* | v850e-* | vax-* \ 348 | v850-* | v850e-* | vax-* \
343 | we32k-* \ 349 | we32k-* \
344 | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ 350 | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
345 | xtensa-* \ 351 | xstormy16-* | xtensa-* \
346 | ymp-* \ 352 | ymp-* \
347 | z8k-*) 353 | z8k-*)
348 ;; 354 ;;
@@ -362,6 +368,9 @@ case $basic_machine in
362 basic_machine=a29k-amd 368 basic_machine=a29k-amd
363 os=-udi 369 os=-udi
364 ;; 370 ;;
371 abacus)
372 basic_machine=abacus-unknown
373 ;;
365 adobe68k) 374 adobe68k)
366 basic_machine=m68010-adobe 375 basic_machine=m68010-adobe
367 os=-scout 376 os=-scout
@@ -379,6 +388,9 @@ case $basic_machine in
379 amd64) 388 amd64)
380 basic_machine=x86_64-pc 389 basic_machine=x86_64-pc
381 ;; 390 ;;
391 amd64-*)
392 basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
393 ;;
382 amdahl) 394 amdahl)
383 basic_machine=580-amdahl 395 basic_machine=580-amdahl
384 os=-sysv 396 os=-sysv
@@ -438,12 +450,27 @@ case $basic_machine in
438 basic_machine=j90-cray 450 basic_machine=j90-cray
439 os=-unicos 451 os=-unicos
440 ;; 452 ;;
453 craynv)
454 basic_machine=craynv-cray
455 os=-unicosmp
456 ;;
457 cr16c)
458 basic_machine=cr16c-unknown
459 os=-elf
460 ;;
441 crds | unos) 461 crds | unos)
442 basic_machine=m68k-crds 462 basic_machine=m68k-crds
443 ;; 463 ;;
464 crisv32 | crisv32-* | etraxfs*)
465 basic_machine=crisv32-axis
466 ;;
444 cris | cris-* | etrax*) 467 cris | cris-* | etrax*)
445 basic_machine=cris-axis 468 basic_machine=cris-axis
446 ;; 469 ;;
470 crx)
471 basic_machine=crx-unknown
472 os=-elf
473 ;;
447 da30 | da30-*) 474 da30 | da30-*)
448 basic_machine=m68k-da30 475 basic_machine=m68k-da30
449 ;; 476 ;;
@@ -466,6 +493,10 @@ case $basic_machine in
466 basic_machine=m88k-motorola 493 basic_machine=m88k-motorola
467 os=-sysv3 494 os=-sysv3
468 ;; 495 ;;
496 djgpp)
497 basic_machine=i586-pc
498 os=-msdosdjgpp
499 ;;
469 dpx20 | dpx20-*) 500 dpx20 | dpx20-*)
470 basic_machine=rs6000-bull 501 basic_machine=rs6000-bull
471 os=-bosx 502 os=-bosx
@@ -644,10 +675,6 @@ case $basic_machine in
644 mips3*) 675 mips3*)
645 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown 676 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
646 ;; 677 ;;
647 mmix*)
648 basic_machine=mmix-knuth
649 os=-mmixware
650 ;;
651 monitor) 678 monitor)
652 basic_machine=m68k-rom68k 679 basic_machine=m68k-rom68k
653 os=-coff 680 os=-coff
@@ -728,10 +755,6 @@ case $basic_machine in
728 np1) 755 np1)
729 basic_machine=np1-gould 756 basic_machine=np1-gould
730 ;; 757 ;;
731 nv1)
732 basic_machine=nv1-cray
733 os=-unicosmp
734 ;;
735 nsr-tandem) 758 nsr-tandem)
736 basic_machine=nsr-tandem 759 basic_machine=nsr-tandem
737 ;; 760 ;;
@@ -743,6 +766,10 @@ case $basic_machine in
743 basic_machine=or32-unknown 766 basic_machine=or32-unknown
744 os=-coff 767 os=-coff
745 ;; 768 ;;
769 os400)
770 basic_machine=powerpc-ibm
771 os=-os400
772 ;;
746 OSE68000 | ose68000) 773 OSE68000 | ose68000)
747 basic_machine=m68000-ericsson 774 basic_machine=m68000-ericsson
748 os=-ose 775 os=-ose
@@ -963,6 +990,10 @@ case $basic_machine in
963 tower | tower-32) 990 tower | tower-32)
964 basic_machine=m68k-ncr 991 basic_machine=m68k-ncr
965 ;; 992 ;;
993 tpf)
994 basic_machine=s390x-ibm
995 os=-tpf
996 ;;
966 udi29k) 997 udi29k)
967 basic_machine=a29k-amd 998 basic_machine=a29k-amd
968 os=-udi 999 os=-udi
@@ -1006,6 +1037,10 @@ case $basic_machine in
1006 basic_machine=hppa1.1-winbond 1037 basic_machine=hppa1.1-winbond
1007 os=-proelf 1038 os=-proelf
1008 ;; 1039 ;;
1040 xbox)
1041 basic_machine=i686-pc
1042 os=-mingw32
1043 ;;
1009 xps | xps100) 1044 xps | xps100)
1010 basic_machine=xps100-honeywell 1045 basic_machine=xps100-honeywell
1011 ;; 1046 ;;
@@ -1036,6 +1071,9 @@ case $basic_machine in
1036 romp) 1071 romp)
1037 basic_machine=romp-ibm 1072 basic_machine=romp-ibm
1038 ;; 1073 ;;
1074 mmix)
1075 basic_machine=mmix-knuth
1076 ;;
1039 rs6000) 1077 rs6000)
1040 basic_machine=rs6000-ibm 1078 basic_machine=rs6000-ibm
1041 ;; 1079 ;;
@@ -1058,7 +1096,7 @@ case $basic_machine in
1058 sh64) 1096 sh64)
1059 basic_machine=sh64-unknown 1097 basic_machine=sh64-unknown
1060 ;; 1098 ;;
1061 sparc | sparcv9 | sparcv9b) 1099 sparc | sparcv8 | sparcv9 | sparcv9b)
1062 basic_machine=sparc-sun 1100 basic_machine=sparc-sun
1063 ;; 1101 ;;
1064 cydra) 1102 cydra)
@@ -1131,19 +1169,20 @@ case $os in
1131 | -aos* \ 1169 | -aos* \
1132 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1170 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1133 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1171 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1134 | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ 1172 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1135 | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1173 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1174 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1136 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 1175 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1137 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ 1176 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1138 | -chorusos* | -chorusrdb* \ 1177 | -chorusos* | -chorusrdb* \
1139 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 1178 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1140 | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ 1179 | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
1141 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 1180 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1142 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ 1181 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1143 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ 1182 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1144 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1183 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1145 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1184 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1146 | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) 1185 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
1147 # Remember, each alternative MUST END IN *, to match a version number. 1186 # Remember, each alternative MUST END IN *, to match a version number.
1148 ;; 1187 ;;
1149 -qnx*) 1188 -qnx*)
@@ -1182,6 +1221,9 @@ case $os in
1182 -opened*) 1221 -opened*)
1183 os=-openedition 1222 os=-openedition
1184 ;; 1223 ;;
1224 -os400*)
1225 os=-os400
1226 ;;
1185 -wince*) 1227 -wince*)
1186 os=-wince 1228 os=-wince
1187 ;; 1229 ;;
@@ -1203,6 +1245,9 @@ case $os in
1203 -atheos*) 1245 -atheos*)
1204 os=-atheos 1246 os=-atheos
1205 ;; 1247 ;;
1248 -syllable*)
1249 os=-syllable
1250 ;;
1206 -386bsd) 1251 -386bsd)
1207 os=-bsd 1252 os=-bsd
1208 ;; 1253 ;;
@@ -1225,6 +1270,9 @@ case $os in
1225 -sinix*) 1270 -sinix*)
1226 os=-sysv4 1271 os=-sysv4
1227 ;; 1272 ;;
1273 -tpf*)
1274 os=-tpf
1275 ;;
1228 -triton*) 1276 -triton*)
1229 os=-sysv3 1277 os=-sysv3
1230 ;; 1278 ;;
@@ -1261,6 +1309,9 @@ case $os in
1261 -kaos*) 1309 -kaos*)
1262 os=-kaos 1310 os=-kaos
1263 ;; 1311 ;;
1312 -zvmoe)
1313 os=-zvmoe
1314 ;;
1264 -none) 1315 -none)
1265 ;; 1316 ;;
1266 *) 1317 *)
@@ -1341,6 +1392,9 @@ case $basic_machine in
1341 *-ibm) 1392 *-ibm)
1342 os=-aix 1393 os=-aix
1343 ;; 1394 ;;
1395 *-knuth)
1396 os=-mmixware
1397 ;;
1344 *-wec) 1398 *-wec)
1345 os=-proelf 1399 os=-proelf
1346 ;; 1400 ;;
@@ -1473,9 +1527,15 @@ case $basic_machine in
1473 -mvs* | -opened*) 1527 -mvs* | -opened*)
1474 vendor=ibm 1528 vendor=ibm
1475 ;; 1529 ;;
1530 -os400*)
1531 vendor=ibm
1532 ;;
1476 -ptx*) 1533 -ptx*)
1477 vendor=sequent 1534 vendor=sequent
1478 ;; 1535 ;;
1536 -tpf*)
1537 vendor=ibm
1538 ;;
1479 -vxsim* | -vxworks* | -windiss*) 1539 -vxsim* | -vxworks* | -windiss*)
1480 vendor=wrs 1540 vendor=wrs
1481 ;; 1541 ;;
@@ -1500,7 +1560,7 @@ case $basic_machine in
1500esac 1560esac
1501 1561
1502echo $basic_machine$os 1562echo $basic_machine$os
1503exit 0 1563exit
1504 1564
1505# Local variables: 1565# Local variables:
1506# eval: (add-hook 'write-file-hooks 'time-stamp) 1566# eval: (add-hook 'write-file-hooks 'time-stamp)