source: scripts/untested/blfs-patches/gtk+-1.2.10-update_config_foo-1.patch@ 23b6afb

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 23b6afb was 617118d, checked in by Jim Gifford <clfs@…>, 19 years ago

r561@server (orig r559): root | 2005-06-05 02:38:49 -0700
Fixed Directory Structure
  • Property mode set to 100644
File size: 51.2 KB
RevLine 
[617118d]1diff -uNr gtk+-1.2.10-orig/config.guess gtk+-1.2.10/config.guess
2--- gtk+-1.2.10-orig/config.guess 2000-02-03 12:07:42.000000000 +1100
3+++ gtk+-1.2.10/config.guess 2005-01-27 01:12:54.606002105 +1100
4@@ -1,8 +1,10 @@
5 #! /bin/sh
6 # Attempt to guess a canonical system name.
7-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
8+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
9 # Free Software Foundation, Inc.
10-#
11+
12+timestamp='2001-09-04'
13+
14 # This file is free software; you can redistribute it and/or modify it
15 # under the terms of the GNU General Public License as published by
16 # the Free Software Foundation; either version 2 of the License, or
17@@ -23,51 +25,153 @@
18 # the same distribution terms that you use for the rest of that program.
19
20 # Written by Per Bothner <bothner@cygnus.com>.
21-# The master version of this file is at the FSF in /home/gd/gnu/lib.
22-# Please send patches to <autoconf-patches@gnu.org>.
23+# Please send patches to <config-patches@gnu.org>.
24 #
25 # This script attempts to guess a canonical system name similar to
26 # config.sub. If it succeeds, it prints the system name on stdout, and
27 # exits with 0. Otherwise, it exits with 1.
28 #
29 # The plan is that this can be called by configure scripts if you
30-# don't specify an explicit system type (host/target name).
31-#
32-# Only a few systems have been added to this list; please add others
33-# (but try to keep the structure clean).
34-#
35+# don't specify an explicit build system type.
36
37-# Use $HOST_CC if defined. $CC may point to a cross-compiler
38-if test x"$CC_FOR_BUILD" = x; then
39- if test x"$HOST_CC" != x; then
40- CC_FOR_BUILD="$HOST_CC"
41- else
42- if test x"$CC" != x; then
43- CC_FOR_BUILD="$CC"
44- else
45- CC_FOR_BUILD=cc
46- fi
47- fi
48+me=`echo "$0" | sed -e 's,.*/,,'`
49+
50+usage="\
51+Usage: $0 [OPTION]
52+
53+Output the configuration name of the system \`$me' is run on.
54+
55+Operation modes:
56+ -h, --help print this help, then exit
57+ -t, --time-stamp print date of last modification, then exit
58+ -v, --version print version number, then exit
59+
60+Report bugs and patches to <config-patches@gnu.org>."
61+
62+version="\
63+GNU config.guess ($timestamp)
64+
65+Originally written by Per Bothner.
66+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
67+Free Software Foundation, Inc.
68+
69+This is free software; see the source for copying conditions. There is NO
70+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
71+
72+help="
73+Try \`$me --help' for more information."
74+
75+# Parse command line
76+while test $# -gt 0 ; do
77+ case $1 in
78+ --time-stamp | --time* | -t )
79+ echo "$timestamp" ; exit 0 ;;
80+ --version | -v )
81+ echo "$version" ; exit 0 ;;
82+ --help | --h* | -h )
83+ echo "$usage"; exit 0 ;;
84+ -- ) # Stop option processing
85+ shift; break ;;
86+ - ) # Use stdin as input.
87+ break ;;
88+ -* )
89+ echo "$me: invalid option $1$help" >&2
90+ exit 1 ;;
91+ * )
92+ break ;;
93+ esac
94+done
95+
96+if test $# != 0; then
97+ echo "$me: too many arguments$help" >&2
98+ exit 1
99 fi
100
101
102+dummy=dummy-$$
103+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
104+
105+# CC_FOR_BUILD -- compiler used by this script.
106+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
107+# use `HOST_CC' if defined, but it is deprecated.
108+
109+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
110+ ,,) echo "int dummy(){}" > $dummy.c ;
111+ for c in cc gcc c89 ; do
112+ ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
113+ if test $? = 0 ; then
114+ CC_FOR_BUILD="$c"; break ;
115+ fi ;
116+ done ;
117+ rm -f $dummy.c $dummy.o $dummy.rel ;
118+ if test x"$CC_FOR_BUILD" = x ; then
119+ CC_FOR_BUILD=no_compiler_found ;
120+ fi
121+ ;;
122+ ,,*) CC_FOR_BUILD=$CC ;;
123+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
124+esac'
125+
126 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
127-# (ghazi@noc.rutgers.edu 8/24/94.)
128+# (ghazi@noc.rutgers.edu 1994-08-24)
129 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
130 PATH=$PATH:/.attbin ; export PATH
131 fi
132
133 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
134 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
135-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
136+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
137 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
138
139-dummy=dummy-$$
140-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
141-
142 # Note: order is significant - the case branches are not exclusive.
143
144 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
145+ *:NetBSD:*:*)
146+ # Netbsd (nbsd) targets should (where applicable) match one or
147+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
148+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
149+ # switched to ELF, *-*-netbsd* would select the old
150+ # object file format. This provides both forward
151+ # compatibility and a consistent mechanism for selecting the
152+ # object file format.
153+ # Determine the machine/vendor (is the vendor relevant).
154+ case "${UNAME_MACHINE}" in
155+ amiga) machine=m68k-unknown ;;
156+ arm32) machine=arm-unknown ;;
157+ atari*) machine=m68k-atari ;;
158+ sun3*) machine=m68k-sun ;;
159+ mac68k) machine=m68k-apple ;;
160+ macppc) machine=powerpc-apple ;;
161+ hp3[0-9][05]) machine=m68k-hp ;;
162+ ibmrt|romp-ibm) machine=romp-ibm ;;
163+ *) machine=${UNAME_MACHINE}-unknown ;;
164+ esac
165+ # The Operating System including object format, if it has switched
166+ # to ELF recently, or will in the future.
167+ case "${UNAME_MACHINE}" in
168+ i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
169+ eval $set_cc_for_build
170+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
171+ | grep __ELF__ >/dev/null
172+ then
173+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
174+ # Return netbsd for either. FIX?
175+ os=netbsd
176+ else
177+ os=netbsdelf
178+ fi
179+ ;;
180+ *)
181+ os=netbsd
182+ ;;
183+ esac
184+ # The OS release
185+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
186+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
187+ # contains redundant information, the shorter form:
188+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
189+ echo "${machine}-${os}${release}"
190+ exit 0 ;;
191 alpha:OSF1:*:*)
192 if test $UNAME_RELEASE = "V4.0"; then
193 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
194@@ -77,41 +181,55 @@
195 # A Xn.n version is an unreleased experimental baselevel.
196 # 1.2 uses "1.2" for uname -r.
197 cat <<EOF >$dummy.s
198+ .data
199+\$Lformat:
200+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
201+
202+ .text
203 .globl main
204+ .align 4
205 .ent main
206 main:
207- .frame \$30,0,\$26,0
208- .prologue 0
209- .long 0x47e03d80 # implver $0
210- lda \$2,259
211- .long 0x47e20c21 # amask $2,$1
212- srl \$1,8,\$2
213- sll \$2,2,\$2
214- sll \$0,3,\$0
215- addl \$1,\$0,\$0
216- addl \$2,\$0,\$0
217- ret \$31,(\$26),1
218+ .frame \$30,16,\$26,0
219+ ldgp \$29,0(\$27)
220+ .prologue 1
221+ .long 0x47e03d80 # implver \$0
222+ lda \$2,-1
223+ .long 0x47e20c21 # amask \$2,\$1
224+ lda \$16,\$Lformat
225+ mov \$0,\$17
226+ not \$1,\$18
227+ jsr \$26,printf
228+ ldgp \$29,0(\$26)
229+ mov 0,\$16
230+ jsr \$26,exit
231 .end main
232 EOF
233+ eval $set_cc_for_build
234 $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
235 if test "$?" = 0 ; then
236- ./$dummy
237- case "$?" in
238- 7)
239+ case `./$dummy` in
240+ 0-0)
241 UNAME_MACHINE="alpha"
242 ;;
243- 15)
244+ 1-0)
245 UNAME_MACHINE="alphaev5"
246 ;;
247- 14)
248+ 1-1)
249 UNAME_MACHINE="alphaev56"
250 ;;
251- 10)
252+ 1-101)
253 UNAME_MACHINE="alphapca56"
254 ;;
255- 16)
256+ 2-303)
257 UNAME_MACHINE="alphaev6"
258 ;;
259+ 2-307)
260+ UNAME_MACHINE="alphaev67"
261+ ;;
262+ 2-1307)
263+ UNAME_MACHINE="alphaev68"
264+ ;;
265 esac
266 fi
267 rm -f $dummy.s $dummy
268@@ -127,11 +245,8 @@
269 echo alpha-dec-winnt3.5
270 exit 0 ;;
271 Amiga*:UNIX_System_V:4.0:*)
272- echo m68k-cbm-sysv4
273+ echo m68k-unknown-sysv4
274 exit 0;;
275- amiga:NetBSD:*:*)
276- echo m68k-cbm-netbsd${UNAME_RELEASE}
277- exit 0 ;;
278 amiga:OpenBSD:*:*)
279 echo m68k-unknown-openbsd${UNAME_RELEASE}
280 exit 0 ;;
281@@ -162,10 +277,7 @@
282 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
283 echo arm-acorn-riscix${UNAME_RELEASE}
284 exit 0;;
285- arm32:NetBSD:*:*)
286- echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
287- exit 0 ;;
288- SR2?01:HI-UX/MPP:*:*)
289+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
290 echo hppa1.1-hitachi-hiuxmpp
291 exit 0;;
292 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
293@@ -221,15 +333,15 @@
294 aushp:SunOS:*:*)
295 echo sparc-auspex-sunos${UNAME_RELEASE}
296 exit 0 ;;
297- atari*:NetBSD:*:*)
298- echo m68k-atari-netbsd${UNAME_RELEASE}
299+ sparc*:NetBSD:*)
300+ echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
301 exit 0 ;;
302 atari*:OpenBSD:*:*)
303 echo m68k-unknown-openbsd${UNAME_RELEASE}
304 exit 0 ;;
305 # The situation for MiNT is a little confusing. The machine name
306 # can be virtually everything (everything which is not
307- # "atarist" or "atariste" at least should have a processor
308+ # "atarist" or "atariste" at least should have a processor
309 # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
310 # to the lowercase version "mint" (or "freemint"). Finally
311 # the system name "TOS" denotes a system which is actually not
312@@ -253,15 +365,9 @@
313 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
314 echo m68k-unknown-mint${UNAME_RELEASE}
315 exit 0 ;;
316- sun3*:NetBSD:*:*)
317- echo m68k-sun-netbsd${UNAME_RELEASE}
318- exit 0 ;;
319 sun3*:OpenBSD:*:*)
320 echo m68k-unknown-openbsd${UNAME_RELEASE}
321 exit 0 ;;
322- mac68k:NetBSD:*:*)
323- echo m68k-apple-netbsd${UNAME_RELEASE}
324- exit 0 ;;
325 mac68k:OpenBSD:*:*)
326 echo m68k-unknown-openbsd${UNAME_RELEASE}
327 exit 0 ;;
328@@ -274,9 +380,6 @@
329 powerpc:machten:*:*)
330 echo powerpc-apple-machten${UNAME_RELEASE}
331 exit 0 ;;
332- macppc:NetBSD:*:*)
333- echo powerpc-apple-netbsd${UNAME_RELEASE}
334- exit 0 ;;
335 RISC*:Mach:*:*)
336 echo mips-dec-mach_bsd4.3
337 exit 0 ;;
338@@ -290,8 +393,10 @@
339 echo clipper-intergraph-clix${UNAME_RELEASE}
340 exit 0 ;;
341 mips:*:*:UMIPS | mips:*:*:RISCos)
342+ eval $set_cc_for_build
343 sed 's/^ //' << EOF >$dummy.c
344 #ifdef __cplusplus
345+#include <stdio.h> /* for printf() prototype */
346 int main (int argc, char *argv[]) {
347 #else
348 int main (argc, argv) int argc; char *argv[]; {
349@@ -312,10 +417,13 @@
350 EOF
351 $CC_FOR_BUILD $dummy.c -o $dummy \
352 && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
353- && rm $dummy.c $dummy && exit 0
354+ && rm -f $dummy.c $dummy && exit 0
355 rm -f $dummy.c $dummy
356 echo mips-mips-riscos${UNAME_RELEASE}
357 exit 0 ;;
358+ Motorola:PowerMAX_OS:*:*)
359+ echo powerpc-motorola-powermax
360+ exit 0 ;;
361 Night_Hawk:Power_UNIX:*:*)
362 echo powerpc-harris-powerunix
363 exit 0 ;;
364@@ -331,7 +439,7 @@
365 AViiON:dgux:*:*)
366 # DG/UX returns AViiON for all architectures
367 UNAME_PROCESSOR=`/usr/bin/uname -p`
368- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
369+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
370 then
371 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
372 [ ${TARGET_BINARY_INTERFACE}x = x ]
373@@ -363,11 +471,20 @@
374 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
375 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
376 exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
377- i?86:AIX:*:*)
378+ i*86:AIX:*:*)
379 echo i386-ibm-aix
380 exit 0 ;;
381+ ia64:AIX:*:*)
382+ if [ -x /usr/bin/oslevel ] ; then
383+ IBM_REV=`/usr/bin/oslevel`
384+ else
385+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
386+ fi
387+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
388+ exit 0 ;;
389 *:AIX:2:3)
390 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
391+ eval $set_cc_for_build
392 sed 's/^ //' << EOF >$dummy.c
393 #include <sys/systemcfg.h>
394
395@@ -379,7 +496,7 @@
396 exit(0);
397 }
398 EOF
399- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
400+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
401 rm -f $dummy.c $dummy
402 echo rs6000-ibm-aix3.2.5
403 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
404@@ -388,9 +505,9 @@
405 echo rs6000-ibm-aix3.2
406 fi
407 exit 0 ;;
408- *:AIX:*:4)
409+ *:AIX:*:[45])
410 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
411- if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
412+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
413 IBM_ARCH=rs6000
414 else
415 IBM_ARCH=powerpc
416@@ -398,7 +515,7 @@
417 if [ -x /usr/bin/oslevel ] ; then
418 IBM_REV=`/usr/bin/oslevel`
419 else
420- IBM_REV=4.${UNAME_RELEASE}
421+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
422 fi
423 echo ${IBM_ARCH}-ibm-aix${IBM_REV}
424 exit 0 ;;
425@@ -408,7 +525,7 @@
426 ibmrt:4.4BSD:*|romp-ibm:BSD:*)
427 echo romp-ibm-bsd4.4
428 exit 0 ;;
429- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
430+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
431 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
432 exit 0 ;; # report: romp-ibm BSD 4.3
433 *:BOSX:*:*)
434@@ -424,11 +541,32 @@
435 echo m68k-hp-bsd4.4
436 exit 0 ;;
437 9000/[34678]??:HP-UX:*:*)
438+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
439 case "${UNAME_MACHINE}" in
440 9000/31? ) HP_ARCH=m68000 ;;
441 9000/[34]?? ) HP_ARCH=m68k ;;
442 9000/[678][0-9][0-9])
443+ case "${HPUX_REV}" in
444+ 11.[0-9][0-9])
445+ if [ -x /usr/bin/getconf ]; then
446+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
447+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
448+ case "${sc_cpu_version}" in
449+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
450+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
451+ 532) # CPU_PA_RISC2_0
452+ case "${sc_kernel_bits}" in
453+ 32) HP_ARCH="hppa2.0n" ;;
454+ 64) HP_ARCH="hppa2.0w" ;;
455+ esac ;;
456+ esac
457+ fi ;;
458+ esac
459+ if [ "${HP_ARCH}" = "" ]; then
460+ eval $set_cc_for_build
461 sed 's/^ //' << EOF >$dummy.c
462+
463+ #define _HPUX_SOURCE
464 #include <stdlib.h>
465 #include <unistd.h>
466
467@@ -459,13 +597,19 @@
468 exit (0);
469 }
470 EOF
471- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
472- rm -f $dummy.c $dummy
473+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
474+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
475+ rm -f $dummy.c $dummy
476+ fi ;;
477 esac
478- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
479 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
480 exit 0 ;;
481+ ia64:HP-UX:*:*)
482+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
483+ echo ia64-hp-hpux${HPUX_REV}
484+ exit 0 ;;
485 3050*:HI-UX:*:*)
486+ eval $set_cc_for_build
487 sed 's/^ //' << EOF >$dummy.c
488 #include <unistd.h>
489 int
490@@ -491,7 +635,7 @@
491 exit (0);
492 }
493 EOF
494- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
495+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
496 rm -f $dummy.c $dummy
497 echo unknown-hitachi-hiuxwe2
498 exit 0 ;;
499@@ -501,7 +645,7 @@
500 9000/8??:4.3bsd:*:*)
501 echo hppa1.0-hp-bsd
502 exit 0 ;;
503- *9??*:MPE/iX:*:*)
504+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
505 echo hppa1.0-hp-mpeix
506 exit 0 ;;
507 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
508@@ -510,7 +654,7 @@
509 hp8??:OSF1:*:*)
510 echo hppa1.0-hp-osf
511 exit 0 ;;
512- i?86:OSF1:*:*)
513+ i*86:OSF1:*:*)
514 if [ -x /usr/sbin/sysversion ] ; then
515 echo ${UNAME_MACHINE}-unknown-osf1mk
516 else
517@@ -545,37 +689,39 @@
518 echo xmp-cray-unicos
519 exit 0 ;;
520 CRAY*Y-MP:*:*:*)
521- echo ymp-cray-unicos${UNAME_RELEASE}
522+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
523 exit 0 ;;
524 CRAY*[A-Z]90:*:*:*)
525 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
526 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
527- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
528+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
529+ -e 's/\.[^.]*$/.X/'
530 exit 0 ;;
531 CRAY*TS:*:*:*)
532- echo t90-cray-unicos${UNAME_RELEASE}
533+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
534+ exit 0 ;;
535+ CRAY*T3D:*:*:*)
536+ echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
537 exit 0 ;;
538 CRAY*T3E:*:*:*)
539- echo alpha-cray-unicosmk${UNAME_RELEASE}
540+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
541+ exit 0 ;;
542+ CRAY*SV1:*:*:*)
543+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
544 exit 0 ;;
545 CRAY-2:*:*:*)
546 echo cray2-cray-unicos
547 exit 0 ;;
548- F300:UNIX_System_V:*:*)
549+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
550+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
551 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
552 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
553- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
554+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
555 exit 0 ;;
556- F301:UNIX_System_V:*:*)
557- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
558- exit 0 ;;
559- hp3[0-9][05]:NetBSD:*:*)
560- echo m68k-hp-netbsd${UNAME_RELEASE}
561- exit 0 ;;
562 hp300:OpenBSD:*:*)
563 echo m68k-unknown-openbsd${UNAME_RELEASE}
564 exit 0 ;;
565- i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
566+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
567 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
568 exit 0 ;;
569 sparc*:BSD/OS:*:*)
570@@ -585,17 +731,8 @@
571 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
572 exit 0 ;;
573 *:FreeBSD:*:*)
574- if test -x /usr/bin/objformat; then
575- if test "elf" = "`/usr/bin/objformat`"; then
576- echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
577- exit 0
578- fi
579- fi
580 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
581 exit 0 ;;
582- *:NetBSD:*:*)
583- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
584- exit 0 ;;
585 *:OpenBSD:*:*)
586 echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
587 exit 0 ;;
588@@ -605,6 +742,9 @@
589 i*:MINGW*:*)
590 echo ${UNAME_MACHINE}-pc-mingw32
591 exit 0 ;;
592+ i*:PW*:*)
593+ echo ${UNAME_MACHINE}-pc-pw32
594+ exit 0 ;;
595 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
596 # How do we know it's Interix rather than the generic POSIX subsystem?
597 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
598@@ -623,172 +763,99 @@
599 *:GNU:*:*)
600 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
601 exit 0 ;;
602- *:Linux:*:*)
603-
604+ i*86:Minix:*:*)
605+ echo ${UNAME_MACHINE}-pc-minix
606+ exit 0 ;;
607+ arm*:Linux:*:*)
608+ echo ${UNAME_MACHINE}-unknown-linux-gnu
609+ exit 0 ;;
610+ ia64:Linux:*:*)
611+ echo ${UNAME_MACHINE}-unknown-linux
612+ exit 0 ;;
613+ m68*:Linux:*:*)
614+ echo ${UNAME_MACHINE}-unknown-linux-gnu
615+ exit 0 ;;
616+ mips:Linux:*:*)
617+ case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
618+ big) echo mips-unknown-linux-gnu && exit 0 ;;
619+ little) echo mipsel-unknown-linux-gnu && exit 0 ;;
620+ esac
621+ ;;
622+ ppc:Linux:*:*)
623+ echo powerpc-unknown-linux-gnu
624+ exit 0 ;;
625+ ppc64:Linux:*:*)
626+ echo powerpc64-unknown-linux-gnu
627+ exit 0 ;;
628+ alpha:Linux:*:*)
629+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
630+ EV5) UNAME_MACHINE=alphaev5 ;;
631+ EV56) UNAME_MACHINE=alphaev56 ;;
632+ PCA56) UNAME_MACHINE=alphapca56 ;;
633+ PCA57) UNAME_MACHINE=alphapca56 ;;
634+ EV6) UNAME_MACHINE=alphaev6 ;;
635+ EV67) UNAME_MACHINE=alphaev67 ;;
636+ EV68*) UNAME_MACHINE=alphaev68 ;;
637+ esac
638+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
639+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
640+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
641+ exit 0 ;;
642+ parisc:Linux:*:* | hppa:Linux:*:*)
643+ # Look for CPU level
644+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
645+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
646+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
647+ *) echo hppa-unknown-linux-gnu ;;
648+ esac
649+ exit 0 ;;
650+ parisc64:Linux:*:* | hppa64:Linux:*:*)
651+ echo hppa64-unknown-linux-gnu
652+ exit 0 ;;
653+ s390:Linux:*:* | s390x:Linux:*:*)
654+ echo ${UNAME_MACHINE}-ibm-linux
655+ exit 0 ;;
656+ sh*:Linux:*:*)
657+ echo ${UNAME_MACHINE}-unknown-linux-gnu
658+ exit 0 ;;
659+ sparc:Linux:*:* | sparc64:Linux:*:*)
660+ echo ${UNAME_MACHINE}-unknown-linux-gnu
661+ exit 0 ;;
662+ x86_64:Linux:*:*)
663+ echo x86_64-unknown-linux-gnu
664+ exit 0 ;;
665+ i*86:Linux:*:*)
666 # The BFD linker knows what the default object file format is, so
667 # first see if it will tell us. cd to the root directory to prevent
668 # problems with other programs or directories called `ld' in the path.
669- ld_help_string=`cd /; ld --help 2>&1`
670- ld_supported_emulations=`echo $ld_help_string \
671- | sed -ne '/supported emulations:/!d
672+ ld_supported_targets=`cd /; ld --help 2>&1 \
673+ | sed -ne '/supported targets:/!d
674 s/[ ][ ]*/ /g
675- s/.*supported emulations: *//
676+ s/.*supported targets: *//
677 s/ .*//
678 p'`
679- case "$ld_supported_emulations" in
680- *ia64)
681- echo "${UNAME_MACHINE}-unknown-linux"
682- exit 0
683+ case "$ld_supported_targets" in
684+ elf32-i386)
685+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
686 ;;
687- i?86linux)
688+ a.out-i386-linux)
689 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
690- exit 0
691- ;;
692- i?86coff)
693+ exit 0 ;;
694+ coff-i386)
695 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
696- exit 0
697- ;;
698- sparclinux)
699- echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
700- exit 0
701- ;;
702- armlinux)
703- echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
704- exit 0
705- ;;
706- elf32arm*)
707- echo "${UNAME_MACHINE}-unknown-linux-gnu"
708- exit 0
709- ;;
710- armelf_linux*)
711- echo "${UNAME_MACHINE}-unknown-linux-gnu"
712- exit 0
713- ;;
714- m68klinux)
715- echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
716- exit 0
717- ;;
718- elf32ppc)
719- # Determine Lib Version
720- cat >$dummy.c <<EOF
721-#include <features.h>
722-#if defined(__GLIBC__)
723-extern char __libc_version[];
724-extern char __libc_release[];
725-#endif
726-main(argc, argv)
727- int argc;
728- char *argv[];
729-{
730-#if defined(__GLIBC__)
731- printf("%s %s\n", __libc_version, __libc_release);
732-#else
733- printf("unkown\n");
734-#endif
735- return 0;
736-}
737-EOF
738- LIBC=""
739- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
740- if test "$?" = 0 ; then
741- ./$dummy | grep 1\.99 > /dev/null
742- if test "$?" = 0 ; then
743- LIBC="libc1"
744- fi
745- fi
746- rm -f $dummy.c $dummy
747- echo powerpc-unknown-linux-gnu${LIBC}
748- exit 0
749- ;;
750+ exit 0 ;;
751+ "")
752+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
753+ # one that does not give us useful --help.
754+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
755+ exit 0 ;;
756 esac
757-
758- if test "${UNAME_MACHINE}" = "alpha" ; then
759- sed 's/^ //' <<EOF >$dummy.s
760- .globl main
761- .ent main
762- main:
763- .frame \$30,0,\$26,0
764- .prologue 0
765- .long 0x47e03d80 # implver $0
766- lda \$2,259
767- .long 0x47e20c21 # amask $2,$1
768- srl \$1,8,\$2
769- sll \$2,2,\$2
770- sll \$0,3,\$0
771- addl \$1,\$0,\$0
772- addl \$2,\$0,\$0
773- ret \$31,(\$26),1
774- .end main
775-EOF
776- LIBC=""
777- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
778- if test "$?" = 0 ; then
779- ./$dummy
780- case "$?" in
781- 7)
782- UNAME_MACHINE="alpha"
783- ;;
784- 15)
785- UNAME_MACHINE="alphaev5"
786- ;;
787- 14)
788- UNAME_MACHINE="alphaev56"
789- ;;
790- 10)
791- UNAME_MACHINE="alphapca56"
792- ;;
793- 16)
794- UNAME_MACHINE="alphaev6"
795- ;;
796- esac
797-
798- objdump --private-headers $dummy | \
799- grep ld.so.1 > /dev/null
800- if test "$?" = 0 ; then
801- LIBC="libc1"
802- fi
803- fi
804- rm -f $dummy.s $dummy
805- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
806- elif test "${UNAME_MACHINE}" = "mips" ; then
807- cat >$dummy.c <<EOF
808-#ifdef __cplusplus
809- int main (int argc, char *argv[]) {
810-#else
811- int main (argc, argv) int argc; char *argv[]; {
812-#endif
813-#ifdef __MIPSEB__
814- printf ("%s-unknown-linux-gnu\n", argv[1]);
815-#endif
816-#ifdef __MIPSEL__
817- printf ("%sel-unknown-linux-gnu\n", argv[1]);
818-#endif
819- return 0;
820-}
821-EOF
822- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
823- rm -f $dummy.c $dummy
824- else
825- # Either a pre-BFD a.out linker (linux-gnuoldld)
826- # or one that does not give us useful --help.
827- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
828- # If ld does not provide *any* "supported emulations:"
829- # that means it is gnuoldld.
830- echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
831- test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
832-
833- case "${UNAME_MACHINE}" in
834- i?86)
835- VENDOR=pc;
836- ;;
837- *)
838- VENDOR=unknown;
839- ;;
840- esac
841- # Determine whether the default compiler is a.out or elf
842- cat >$dummy.c <<EOF
843+ # Determine whether the default compiler is a.out or elf
844+ eval $set_cc_for_build
845+ cat >$dummy.c <<EOF
846 #include <features.h>
847 #ifdef __cplusplus
848+#include <stdio.h> /* for printf() prototype */
849 int main (int argc, char *argv[]) {
850 #else
851 int main (argc, argv) int argc; char *argv[]; {
852@@ -796,28 +863,30 @@
853 #ifdef __ELF__
854 # ifdef __GLIBC__
855 # if __GLIBC__ >= 2
856- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
857+ printf ("%s-pc-linux-gnu\n", argv[1]);
858 # else
859- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
860+ printf ("%s-pc-linux-gnulibc1\n", argv[1]);
861 # endif
862 # else
863- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
864+ printf ("%s-pc-linux-gnulibc1\n", argv[1]);
865 # endif
866 #else
867- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
868+ printf ("%s-pc-linux-gnuaout\n", argv[1]);
869 #endif
870 return 0;
871 }
872 EOF
873- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
874- rm -f $dummy.c $dummy
875- fi ;;
876-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
877-# are messed up and put the nodename in both sysname and nodename.
878- i?86:DYNIX/ptx:4*:*)
879+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
880+ rm -f $dummy.c $dummy
881+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
882+ ;;
883+ i*86:DYNIX/ptx:4*:*)
884+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
885+ # earlier versions are messed up and put the nodename in both
886+ # sysname and nodename.
887 echo i386-sequent-sysv4
888 exit 0 ;;
889- i?86:UNIX_SV:4.2MP:2.*)
890+ i*86:UNIX_SV:4.2MP:2.*)
891 # Unixware is an offshoot of SVR4, but it has its own version
892 # number series starting with 2...
893 # I am not positive that other SVR4 systems won't match this,
894@@ -825,7 +894,7 @@
895 # Use sysv4.2uw... so that sysv4* matches it.
896 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
897 exit 0 ;;
898- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
899+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
900 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
901 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
902 echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
903@@ -833,16 +902,15 @@
904 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
905 fi
906 exit 0 ;;
907- i?86:*:5:7*)
908- # Fixed at (any) Pentium or better
909- UNAME_MACHINE=i586
910- if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
911- echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
912- else
913- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
914- fi
915+ i*86:*:5:[78]*)
916+ case `/bin/uname -X | grep "^Machine"` in
917+ *486*) UNAME_MACHINE=i486 ;;
918+ *Pentium) UNAME_MACHINE=i586 ;;
919+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
920+ esac
921+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
922 exit 0 ;;
923- i?86:*:3.2:*)
924+ i*86:*:3.2:*)
925 if test -f /usr/options/cb.name; then
926 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
927 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
928@@ -860,7 +928,11 @@
929 echo ${UNAME_MACHINE}-pc-sysv32
930 fi
931 exit 0 ;;
932+ i*86:*DOS:*:*)
933+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
934+ exit 0 ;;
935 pc:*:*:*)
936+ # Left here for compatibility:
937 # uname -m prints for DJGPP always 'pc', but it prints nothing about
938 # the processor, so we play safe by assuming i386.
939 echo i386-pc-msdosdjgpp
940@@ -884,7 +956,7 @@
941 exit 0 ;;
942 M68*:*:R3V[567]*:*)
943 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
944- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
945+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
946 OS_REL=''
947 test -r /etc/.relid \
948 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
949@@ -895,21 +967,24 @@
950 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
951 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
952 && echo i486-ncr-sysv4 && exit 0 ;;
953- m68*:LynxOS:2.*:*)
954+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
955 echo m68k-unknown-lynxos${UNAME_RELEASE}
956 exit 0 ;;
957 mc68030:UNIX_System_V:4.*:*)
958 echo m68k-atari-sysv4
959 exit 0 ;;
960- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
961+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
962 echo i386-unknown-lynxos${UNAME_RELEASE}
963 exit 0 ;;
964 TSUNAMI:LynxOS:2.*:*)
965 echo sparc-unknown-lynxos${UNAME_RELEASE}
966 exit 0 ;;
967- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
968+ rs6000:LynxOS:2.*:*)
969 echo rs6000-unknown-lynxos${UNAME_RELEASE}
970 exit 0 ;;
971+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
972+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
973+ exit 0 ;;
974 SM[BE]S:UNIX_SV:*:*)
975 echo mips-dde-sysv${UNAME_RELEASE}
976 exit 0 ;;
977@@ -927,8 +1002,8 @@
978 echo ns32k-sni-sysv
979 fi
980 exit 0 ;;
981- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
982- # says <Richard.M.Bartel@ccMail.Census.GOV>
983+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
984+ # says <Richard.M.Bartel@ccMail.Census.GOV>
985 echo i586-unisys-sysv4
986 exit 0 ;;
987 *:UNIX_System_V:4*:FTX*)
988@@ -940,10 +1015,14 @@
989 # From seanf@swdc.stratus.com.
990 echo i860-stratus-sysv4
991 exit 0 ;;
992+ *:VOS:*:*)
993+ # From Paul.Green@stratus.com.
994+ echo hppa1.1-stratus-vos
995+ exit 0 ;;
996 mc68*:A/UX:*:*)
997 echo m68k-apple-aux${UNAME_RELEASE}
998 exit 0 ;;
999- news*:NEWS-OS:*:6*)
1000+ news*:NEWS-OS:6*:*)
1001 echo mips-sony-newsos6
1002 exit 0 ;;
1003 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1004@@ -974,14 +1053,76 @@
1005 *:Rhapsody:*:*)
1006 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1007 exit 0 ;;
1008+ *:Darwin:*:*)
1009+ echo `uname -p`-apple-darwin${UNAME_RELEASE}
1010+ exit 0 ;;
1011+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
1012+ if test "${UNAME_MACHINE}" = "x86pc"; then
1013+ UNAME_MACHINE=pc
1014+ fi
1015+ echo `uname -p`-${UNAME_MACHINE}-nto-qnx
1016+ exit 0 ;;
1017 *:QNX:*:4*)
1018- echo i386-qnx-qnx${UNAME_VERSION}
1019+ echo i386-pc-qnx
1020+ exit 0 ;;
1021+ NSR-[KW]:NONSTOP_KERNEL:*:*)
1022+ echo nsr-tandem-nsk${UNAME_RELEASE}
1023+ exit 0 ;;
1024+ *:NonStop-UX:*:*)
1025+ echo mips-compaq-nonstopux
1026+ exit 0 ;;
1027+ BS2000:POSIX*:*:*)
1028+ echo bs2000-siemens-sysv
1029+ exit 0 ;;
1030+ DS/*:UNIX_System_V:*:*)
1031+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1032+ exit 0 ;;
1033+ *:Plan9:*:*)
1034+ # "uname -m" is not consistent, so use $cputype instead. 386
1035+ # is converted to i386 for consistency with other x86
1036+ # operating systems.
1037+ if test "$cputype" = "386"; then
1038+ UNAME_MACHINE=i386
1039+ else
1040+ UNAME_MACHINE="$cputype"
1041+ fi
1042+ echo ${UNAME_MACHINE}-unknown-plan9
1043+ exit 0 ;;
1044+ i*86:OS/2:*:*)
1045+ # If we were able to find `uname', then EMX Unix compatibility
1046+ # is probably installed.
1047+ echo ${UNAME_MACHINE}-pc-os2-emx
1048+ exit 0 ;;
1049+ *:TOPS-10:*:*)
1050+ echo pdp10-unknown-tops10
1051+ exit 0 ;;
1052+ *:TENEX:*:*)
1053+ echo pdp10-unknown-tenex
1054+ exit 0 ;;
1055+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1056+ echo pdp10-dec-tops20
1057+ exit 0 ;;
1058+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1059+ echo pdp10-xkl-tops20
1060+ exit 0 ;;
1061+ *:TOPS-20:*:*)
1062+ echo pdp10-unknown-tops20
1063+ exit 0 ;;
1064+ *:ITS:*:*)
1065+ echo pdp10-unknown-its
1066+ exit 0 ;;
1067+ i*86:XTS-300:*:STOP)
1068+ echo ${UNAME_MACHINE}-unknown-stop
1069+ exit 0 ;;
1070+ i*86:atheos:*:*)
1071+ echo ${UNAME_MACHINE}-unknown-atheos
1072 exit 0 ;;
1073 esac
1074
1075 #echo '(No uname command or uname output not recognized.)' 1>&2
1076 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1077
1078+eval $set_cc_for_build
1079 cat >$dummy.c <<EOF
1080 #ifdef _SEQUENT_
1081 # include <sys/types.h>
1082@@ -1068,11 +1209,24 @@
1083 #endif
1084
1085 #if defined (vax)
1086-#if !defined (ultrix)
1087- printf ("vax-dec-bsd\n"); exit (0);
1088-#else
1089- printf ("vax-dec-ultrix\n"); exit (0);
1090-#endif
1091+# if !defined (ultrix)
1092+# include <sys/param.h>
1093+# if defined (BSD)
1094+# if BSD == 43
1095+ printf ("vax-dec-bsd4.3\n"); exit (0);
1096+# else
1097+# if BSD == 199006
1098+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
1099+# else
1100+ printf ("vax-dec-bsd\n"); exit (0);
1101+# endif
1102+# endif
1103+# else
1104+ printf ("vax-dec-bsd\n"); exit (0);
1105+# endif
1106+# else
1107+ printf ("vax-dec-ultrix\n"); exit (0);
1108+# endif
1109 #endif
1110
1111 #if defined (alliant) && defined (i860)
1112@@ -1083,7 +1237,7 @@
1113 }
1114 EOF
1115
1116-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
1117+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
1118 rm -f $dummy.c $dummy
1119
1120 # Apollos put the system type in the environment.
1121@@ -1116,6 +1270,48 @@
1122 esac
1123 fi
1124
1125-#echo '(Unable to guess system type)' 1>&2
1126+cat >&2 <<EOF
1127+$0: unable to guess system type
1128+
1129+This script, last modified $timestamp, has failed to recognize
1130+the operating system you are using. It is advised that you
1131+download the most up to date version of the config scripts from
1132+
1133+ ftp://ftp.gnu.org/pub/gnu/config/
1134+
1135+If the version you run ($0) is already up to date, please
1136+send the following data and any information you think might be
1137+pertinent to <config-patches@gnu.org> in order to provide the needed
1138+information to handle your system.
1139+
1140+config.guess timestamp = $timestamp
1141+
1142+uname -m = `(uname -m) 2>/dev/null || echo unknown`
1143+uname -r = `(uname -r) 2>/dev/null || echo unknown`
1144+uname -s = `(uname -s) 2>/dev/null || echo unknown`
1145+uname -v = `(uname -v) 2>/dev/null || echo unknown`
1146+
1147+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
1148+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
1149+
1150+hostinfo = `(hostinfo) 2>/dev/null`
1151+/bin/universe = `(/bin/universe) 2>/dev/null`
1152+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
1153+/bin/arch = `(/bin/arch) 2>/dev/null`
1154+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
1155+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1156+
1157+UNAME_MACHINE = ${UNAME_MACHINE}
1158+UNAME_RELEASE = ${UNAME_RELEASE}
1159+UNAME_SYSTEM = ${UNAME_SYSTEM}
1160+UNAME_VERSION = ${UNAME_VERSION}
1161+EOF
1162
1163 exit 1
1164+
1165+# Local variables:
1166+# eval: (add-hook 'write-file-hooks 'time-stamp)
1167+# time-stamp-start: "timestamp='"
1168+# time-stamp-format: "%:y-%02m-%02d"
1169+# time-stamp-end: "'"
1170+# End:
1171diff -uNr gtk+-1.2.10-orig/config.sub gtk+-1.2.10/config.sub
1172--- gtk+-1.2.10-orig/config.sub 2000-02-03 12:07:42.000000000 +1100
1173+++ gtk+-1.2.10/config.sub 2005-01-27 01:12:59.011948611 +1100
1174@@ -1,6 +1,10 @@
1175 #! /bin/sh
1176-# Configuration validation subroutine script, version 1.1.
1177-# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
1178+# Configuration validation subroutine script.
1179+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1180+# Free Software Foundation, Inc.
1181+
1182+timestamp='2001-09-07'
1183+
1184 # This file is (in principle) common to ALL GNU software.
1185 # The presence of a machine in this file suggests that SOME GNU software
1186 # can handle that machine. It does not imply ALL GNU software can.
1187@@ -25,6 +29,8 @@
1188 # configuration script generated by Autoconf, you may include it under
1189 # the same distribution terms that you use for the rest of that program.
1190
1191+# Please send patches to <config-patches@gnu.org>.
1192+#
1193 # Configuration subroutine to validate and canonicalize a configuration type.
1194 # Supply the specified configuration type as an argument.
1195 # If it is invalid, we print an error message on stderr and exit with code 1.
1196@@ -45,30 +51,73 @@
1197 # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
1198 # It is wrong to echo any other type of specification.
1199
1200-if [ x$1 = x ]
1201-then
1202- echo Configuration name missing. 1>&2
1203- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
1204- echo "or $0 ALIAS" 1>&2
1205- echo where ALIAS is a recognized configuration type. 1>&2
1206- exit 1
1207-fi
1208+me=`echo "$0" | sed -e 's,.*/,,'`
1209
1210-# First pass through any local machine types.
1211-case $1 in
1212- *local*)
1213- echo $1
1214- exit 0
1215- ;;
1216- *)
1217- ;;
1218+usage="\
1219+Usage: $0 [OPTION] CPU-MFR-OPSYS
1220+ $0 [OPTION] ALIAS
1221+
1222+Canonicalize a configuration name.
1223+
1224+Operation modes:
1225+ -h, --help print this help, then exit
1226+ -t, --time-stamp print date of last modification, then exit
1227+ -v, --version print version number, then exit
1228+
1229+Report bugs and patches to <config-patches@gnu.org>."
1230+
1231+version="\
1232+GNU config.sub ($timestamp)
1233+
1234+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1235+Free Software Foundation, Inc.
1236+
1237+This is free software; see the source for copying conditions. There is NO
1238+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1239+
1240+help="
1241+Try \`$me --help' for more information."
1242+
1243+# Parse command line
1244+while test $# -gt 0 ; do
1245+ case $1 in
1246+ --time-stamp | --time* | -t )
1247+ echo "$timestamp" ; exit 0 ;;
1248+ --version | -v )
1249+ echo "$version" ; exit 0 ;;
1250+ --help | --h* | -h )
1251+ echo "$usage"; exit 0 ;;
1252+ -- ) # Stop option processing
1253+ shift; break ;;
1254+ - ) # Use stdin as input.
1255+ break ;;
1256+ -* )
1257+ echo "$me: invalid option $1$help"
1258+ exit 1 ;;
1259+
1260+ *local*)
1261+ # First pass through any local machine types.
1262+ echo $1
1263+ exit 0;;
1264+
1265+ * )
1266+ break ;;
1267+ esac
1268+done
1269+
1270+case $# in
1271+ 0) echo "$me: missing argument$help" >&2
1272+ exit 1;;
1273+ 1) ;;
1274+ *) echo "$me: too many arguments$help" >&2
1275+ exit 1;;
1276 esac
1277
1278 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
1279 # Here we must recognize all the valid KERNEL-OS combinations.
1280 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1281 case $maybe_os in
1282- linux-gnu*)
1283+ nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
1284 os=-$maybe_os
1285 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1286 ;;
1287@@ -94,7 +143,7 @@
1288 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1289 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1290 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1291- -apple)
1292+ -apple | -axis)
1293 os=
1294 basic_machine=$1
1295 ;;
1296@@ -108,6 +157,14 @@
1297 os=-vxworks
1298 basic_machine=$1
1299 ;;
1300+ -chorusos*)
1301+ os=-chorusos
1302+ basic_machine=$1
1303+ ;;
1304+ -chorusrdb)
1305+ os=-chorusrdb
1306+ basic_machine=$1
1307+ ;;
1308 -hiux*)
1309 os=-hiuxwe2
1310 ;;
1311@@ -166,27 +223,50 @@
1312 case $basic_machine in
1313 # Recognize the basic CPU types without company name.
1314 # Some are omitted here because they have special meanings below.
1315- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
1316- | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
1317- | 580 | i960 | h8300 \
1318- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
1319- | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
1320- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
1321- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
1322- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
1323- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
1324- | mips64vr5000 | miprs64vr5000el | mcore \
1325- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
1326- | thumb | d10v | fr30)
1327+ 1750a | 580 \
1328+ | a29k \
1329+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1330+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
1331+ | c4x | clipper \
1332+ | d10v | d30v | dsp16xx \
1333+ | fr30 \
1334+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1335+ | i370 | i860 | i960 | ia64 \
1336+ | m32r | m68000 | m68k | m88k | mcore \
1337+ | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
1338+ | mips64vr4100 | mips64vr4100el | mips64vr4300 \
1339+ | mips64vr4300el | mips64vr5000 | mips64vr5000el \
1340+ | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
1341+ | mipsisa32 \
1342+ | mn10200 | mn10300 \
1343+ | ns16k | ns32k \
1344+ | openrisc \
1345+ | pdp10 | pdp11 | pj | pjl \
1346+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1347+ | pyramid \
1348+ | s390 | s390x \
1349+ | sh | sh[34] | sh[34]eb | shbe | shle \
1350+ | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
1351+ | stormy16 | strongarm \
1352+ | tahoe | thumb | tic80 | tron \
1353+ | v850 \
1354+ | we32k \
1355+ | x86 | xscale \
1356+ | z8k)
1357 basic_machine=$basic_machine-unknown
1358 ;;
1359- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
1360+ m6811 | m68hc11 | m6812 | m68hc12)
1361+ # Motorola 68HC11/12.
1362+ basic_machine=$basic_machine-unknown
1363+ os=-none
1364+ ;;
1365+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
1366 ;;
1367
1368 # We use `pc' rather than `unknown'
1369 # because (1) that's what they normally are, and
1370 # (2) the word "unknown" tends to confuse beginning users.
1371- i[34567]86)
1372+ i*86 | x86_64)
1373 basic_machine=$basic_machine-pc
1374 ;;
1375 # Object if more than one company name word.
1376@@ -195,24 +275,43 @@
1377 exit 1
1378 ;;
1379 # Recognize the basic CPU types with company name.
1380- # FIXME: clean up the formatting here.
1381- vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
1382- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
1383- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
1384- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
1385- | xmp-* | ymp-* \
1386- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
1387- | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
1388- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
1389- | clipper-* | orion-* \
1390- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
1391- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
1392- | mips64el-* | mips64orion-* | mips64orionel-* \
1393- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
1394- | mipstx39-* | mipstx39el-* | mcore-* \
1395- | f301-* | armv*-* | t3e-* \
1396- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
1397- | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
1398+ 580-* \
1399+ | a29k-* \
1400+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
1401+ | alphapca5[67]-* | arc-* \
1402+ | arm-* | armbe-* | armle-* | armv*-* \
1403+ | bs2000-* \
1404+ | c[123]* | c30-* | [cjt]90-* | c54x-* \
1405+ | clipper-* | cray2-* | cydra-* \
1406+ | d10v-* | d30v-* \
1407+ | elxsi-* \
1408+ | f30[01]-* | f700-* | fr30-* | fx80-* \
1409+ | h8300-* | h8500-* \
1410+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1411+ | i*86-* | i860-* | i960-* | ia64-* \
1412+ | m32r-* \
1413+ | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
1414+ | m88110-* | m88k-* | mcore-* \
1415+ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
1416+ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
1417+ | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
1418+ | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
1419+ | none-* | np1-* | ns16k-* | ns32k-* \
1420+ | orion-* \
1421+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1422+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
1423+ | pyramid-* \
1424+ | romp-* | rs6000-* \
1425+ | s390-* | s390x-* \
1426+ | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
1427+ | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
1428+ | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
1429+ | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
1430+ | v850-* | vax-* \
1431+ | we32k-* \
1432+ | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
1433+ | ymp-* \
1434+ | z8k-*)
1435 ;;
1436 # Recognize the various machine names and aliases which stand
1437 # for a CPU type and a company and sometimes even an OS.
1438@@ -249,14 +348,14 @@
1439 os=-sysv
1440 ;;
1441 amiga | amiga-*)
1442- basic_machine=m68k-cbm
1443+ basic_machine=m68k-unknown
1444 ;;
1445 amigaos | amigados)
1446- basic_machine=m68k-cbm
1447+ basic_machine=m68k-unknown
1448 os=-amigaos
1449 ;;
1450 amigaunix | amix)
1451- basic_machine=m68k-cbm
1452+ basic_machine=m68k-unknown
1453 os=-sysv4
1454 ;;
1455 apollo68)
1456@@ -303,13 +402,16 @@
1457 basic_machine=cray2-cray
1458 os=-unicos
1459 ;;
1460- [ctj]90-cray)
1461- basic_machine=c90-cray
1462+ [cjt]90)
1463+ basic_machine=${basic_machine}-cray
1464 os=-unicos
1465 ;;
1466 crds | unos)
1467 basic_machine=m68k-crds
1468 ;;
1469+ cris | cris-* | etrax*)
1470+ basic_machine=cris-axis
1471+ ;;
1472 da30 | da30-*)
1473 basic_machine=m68k-da30
1474 ;;
1475@@ -357,6 +459,10 @@
1476 basic_machine=tron-gmicro
1477 os=-sysv
1478 ;;
1479+ go32)
1480+ basic_machine=i386-pc
1481+ os=-go32
1482+ ;;
1483 h3050r* | hiux*)
1484 basic_machine=hppa1.1-hitachi
1485 os=-hiuxwe2
1486@@ -432,19 +538,19 @@
1487 basic_machine=i370-ibm
1488 ;;
1489 # I'm not sure what "Sysv32" means. Should this be sysv3.2?
1490- i[34567]86v32)
1491+ i*86v32)
1492 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1493 os=-sysv32
1494 ;;
1495- i[34567]86v4*)
1496+ i*86v4*)
1497 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1498 os=-sysv4
1499 ;;
1500- i[34567]86v)
1501+ i*86v)
1502 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1503 os=-sysv
1504 ;;
1505- i[34567]86sol2)
1506+ i*86sol2)
1507 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1508 os=-solaris2
1509 ;;
1510@@ -456,17 +562,6 @@
1511 basic_machine=i386-unknown
1512 os=-vsta
1513 ;;
1514- i386-go32 | go32)
1515- basic_machine=i386-unknown
1516- os=-go32
1517- ;;
1518- i386-mingw32 | mingw32)
1519- basic_machine=i386-unknown
1520- os=-mingw32
1521- ;;
1522- i386-qnx | qnx)
1523- basic_machine=i386-qnx
1524- ;;
1525 iris | iris4d)
1526 basic_machine=mips-sgi
1527 case $os in
1528@@ -492,6 +587,10 @@
1529 basic_machine=ns32k-utek
1530 os=-sysv
1531 ;;
1532+ mingw32)
1533+ basic_machine=i386-pc
1534+ os=-mingw32
1535+ ;;
1536 miniframe)
1537 basic_machine=m68000-convergent
1538 ;;
1539@@ -513,12 +612,16 @@
1540 mips3*)
1541 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
1542 ;;
1543+ mmix*)
1544+ basic_machine=mmix-knuth
1545+ os=-mmixware
1546+ ;;
1547 monitor)
1548 basic_machine=m68k-rom68k
1549 os=-coff
1550 ;;
1551 msdos)
1552- basic_machine=i386-unknown
1553+ basic_machine=i386-pc
1554 os=-msdos
1555 ;;
1556 mvs)
1557@@ -582,9 +685,16 @@
1558 basic_machine=i960-intel
1559 os=-mon960
1560 ;;
1561+ nonstopux)
1562+ basic_machine=mips-compaq
1563+ os=-nonstopux
1564+ ;;
1565 np1)
1566 basic_machine=np1-gould
1567 ;;
1568+ nsr-tandem)
1569+ basic_machine=nsr-tandem
1570+ ;;
1571 op50n-* | op60c-*)
1572 basic_machine=hppa1.1-oki
1573 os=-proelf
1574@@ -614,28 +724,28 @@
1575 pc532 | pc532-*)
1576 basic_machine=ns32k-pc532
1577 ;;
1578- pentium | p5 | k5 | k6 | nexen)
1579+ pentium | p5 | k5 | k6 | nexgen)
1580 basic_machine=i586-pc
1581 ;;
1582- pentiumpro | p6 | 6x86)
1583+ pentiumpro | p6 | 6x86 | athlon)
1584 basic_machine=i686-pc
1585 ;;
1586 pentiumii | pentium2)
1587- basic_machine=i786-pc
1588+ basic_machine=i686-pc
1589 ;;
1590- pentium-* | p5-* | k5-* | k6-* | nexen-*)
1591+ pentium-* | p5-* | k5-* | k6-* | nexgen-*)
1592 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
1593 ;;
1594- pentiumpro-* | p6-* | 6x86-*)
1595+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
1596 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
1597 ;;
1598 pentiumii-* | pentium2-*)
1599- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
1600+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
1601 ;;
1602 pn)
1603 basic_machine=pn-gould
1604 ;;
1605- power) basic_machine=rs6000-ibm
1606+ power) basic_machine=power-ibm
1607 ;;
1608 ppc) basic_machine=powerpc-unknown
1609 ;;
1610@@ -647,9 +757,23 @@
1611 ppcle-* | powerpclittle-*)
1612 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
1613 ;;
1614+ ppc64) basic_machine=powerpc64-unknown
1615+ ;;
1616+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1617+ ;;
1618+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1619+ basic_machine=powerpc64le-unknown
1620+ ;;
1621+ ppc64le-* | powerpc64little-*)
1622+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
1623+ ;;
1624 ps2)
1625 basic_machine=i386-ibm
1626 ;;
1627+ pw32)
1628+ basic_machine=i586-unknown
1629+ os=-pw32
1630+ ;;
1631 rom68k)
1632 basic_machine=m68k-rom68k
1633 os=-coff
1634@@ -729,6 +853,10 @@
1635 sun386 | sun386i | roadrunner)
1636 basic_machine=i386-sun
1637 ;;
1638+ sv1)
1639+ basic_machine=sv1-cray
1640+ os=-unicos
1641+ ;;
1642 symmetry)
1643 basic_machine=i386-sequent
1644 os=-dynix
1645@@ -737,6 +865,10 @@
1646 basic_machine=t3e-cray
1647 os=-unicos
1648 ;;
1649+ tic54x | c54x*)
1650+ basic_machine=tic54x-unknown
1651+ os=-coff
1652+ ;;
1653 tx39)
1654 basic_machine=mipstx39-unknown
1655 ;;
1656@@ -789,6 +921,10 @@
1657 basic_machine=hppa1.1-winbond
1658 os=-proelf
1659 ;;
1660+ windows32)
1661+ basic_machine=i386-pc
1662+ os=-windows32-msvcrt
1663+ ;;
1664 xmp)
1665 basic_machine=xmp-cray
1666 os=-unicos
1667@@ -832,13 +968,20 @@
1668 vax)
1669 basic_machine=vax-dec
1670 ;;
1671+ pdp10)
1672+ # there are many clones, so DEC is not a safe bet
1673+ basic_machine=pdp10-unknown
1674+ ;;
1675 pdp11)
1676 basic_machine=pdp11-dec
1677 ;;
1678 we32k)
1679 basic_machine=we32k-att
1680 ;;
1681- sparc | sparcv9)
1682+ sh3 | sh4 | sh3eb | sh4eb)
1683+ basic_machine=sh-unknown
1684+ ;;
1685+ sparc | sparcv9 | sparcv9b)
1686 basic_machine=sparc-sun
1687 ;;
1688 cydra)
1689@@ -860,6 +1003,9 @@
1690 basic_machine=c4x-none
1691 os=-coff
1692 ;;
1693+ *-unknown)
1694+ # Make sure to match an already-canonicalized machine name.
1695+ ;;
1696 *)
1697 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1698 exit 1
1699@@ -916,14 +1062,30 @@
1700 | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1701 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1702 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1703+ | -chorusos* | -chorusrdb* \
1704 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1705 | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1706- | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
1707+ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
1708+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1709+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1710+ | -os2* | -vos*)
1711 # Remember, each alternative MUST END IN *, to match a version number.
1712 ;;
1713+ -qnx*)
1714+ case $basic_machine in
1715+ x86-* | i*86-*)
1716+ ;;
1717+ *)
1718+ os=-nto$os
1719+ ;;
1720+ esac
1721+ ;;
1722+ -nto*)
1723+ os=-nto-qnx
1724+ ;;
1725 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1726 | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1727- | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
1728+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1729 ;;
1730 -mac*)
1731 os=`echo $os | sed -e 's|mac|macos|'`
1732@@ -940,6 +1102,9 @@
1733 -opened*)
1734 os=-openedition
1735 ;;
1736+ -wince*)
1737+ os=-wince
1738+ ;;
1739 -osfrose*)
1740 os=-osfrose
1741 ;;
1742@@ -964,6 +1129,9 @@
1743 -ns2 )
1744 os=-nextstep2
1745 ;;
1746+ -nsk*)
1747+ os=-nsk
1748+ ;;
1749 # Preserve the version number of sinix5.
1750 -sinix5.*)
1751 os=`echo $os | sed -e 's|sinix|sysv|'`
1752@@ -977,9 +1145,6 @@
1753 -oss*)
1754 os=-sysv3
1755 ;;
1756- -qnx)
1757- os=-qnx4
1758- ;;
1759 -svr4)
1760 os=-sysv4
1761 ;;
1762@@ -1001,7 +1166,7 @@
1763 -xenix)
1764 os=-xenix
1765 ;;
1766- -*mint | -*MiNT)
1767+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1768 os=-mint
1769 ;;
1770 -none)
1771@@ -1035,6 +1200,9 @@
1772 arm*-semi)
1773 os=-aout
1774 ;;
1775+ pdp10-*)
1776+ os=-tops20
1777+ ;;
1778 pdp11-*)
1779 os=-none
1780 ;;
1781@@ -1143,7 +1311,7 @@
1782 *-masscomp)
1783 os=-rtu
1784 ;;
1785- f301-fujitsu)
1786+ f30[01]-fujitsu | f700-fujitsu)
1787 os=-uxpv
1788 ;;
1789 *-rom68k)
1790@@ -1221,12 +1389,23 @@
1791 -mpw* | -macos*)
1792 vendor=apple
1793 ;;
1794- -*mint | -*MiNT)
1795+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1796 vendor=atari
1797 ;;
1798+ -vos*)
1799+ vendor=stratus
1800+ ;;
1801 esac
1802 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
1803 ;;
1804 esac
1805
1806 echo $basic_machine$os
1807+exit 0
1808+
1809+# Local variables:
1810+# eval: (add-hook 'write-file-hooks 'time-stamp)
1811+# time-stamp-start: "timestamp='"
1812+# time-stamp-format: "%:y-%02m-%02d"
1813+# time-stamp-end: "'"
1814+# End:
Note: See TracBrowser for help on using the repository browser.