Fix addToolVersion.sh after breakage with support for gcc-4.3 (stupid anyway...).
/trunk/tools/addToolVersion.sh | 18 10 8 0 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
1 # Backport from gcc-3.3.3
3 # Invalid configuration `x86_64-host_unknown-linux-gnu': machine `x86_64-host_unknown' not recognized
4 # Unrecognized host system name x86_64-host_unknown-linux-gnu.
5 # when configuring on chip types or operating systems like x86_64 or Darwin
6 # which are newer than gcc-2.95
8 --- gcc-2.95.3/config.sub.old 1999-08-04 01:09:26.000000000 -0700
9 +++ gcc-2.95.3/config.sub 2004-03-24 11:28:24.000000000 -0800
12 -# Configuration validation subroutine script, version 1.1.
13 -# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
14 +# Configuration validation subroutine script.
15 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
16 +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
18 +timestamp='2003-01-28'
20 # This file is (in principle) common to ALL GNU software.
21 # The presence of a machine in this file suggests that SOME GNU software
22 # can handle that machine. It does not imply ALL GNU software can.
24 # configuration script generated by Autoconf, you may include it under
25 # the same distribution terms that you use for the rest of that program.
27 +# Please send patches to <config-patches@gnu.org>. Submit a context
28 +# diff and a properly formatted ChangeLog entry.
30 # Configuration subroutine to validate and canonicalize a configuration type.
31 # Supply the specified configuration type as an argument.
32 # If it is invalid, we print an error message on stderr and exit with code 1.
34 # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
35 # It is wrong to echo any other type of specification.
39 - echo Configuration name missing. 1>&2
40 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
41 - echo "or $0 ALIAS" 1>&2
42 - echo where ALIAS is a recognized configuration type. 1>&2
45 +me=`echo "$0" | sed -e 's,.*/,,'`
47 -# First pass through any local machine types.
56 +Usage: $0 [OPTION] CPU-MFR-OPSYS
59 +Canonicalize a configuration name.
62 + -h, --help print this help, then exit
63 + -t, --time-stamp print date of last modification, then exit
64 + -v, --version print version number, then exit
66 +Report bugs and patches to <config-patches@gnu.org>."
69 +GNU config.sub ($timestamp)
71 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
72 +Free Software Foundation, Inc.
74 +This is free software; see the source for copying conditions. There is NO
75 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
78 +Try \`$me --help' for more information."
81 +while test $# -gt 0 ; do
83 + --time-stamp | --time* | -t )
84 + echo "$timestamp" ; exit 0 ;;
86 + echo "$version" ; exit 0 ;;
87 + --help | --h* | -h )
88 + echo "$usage"; exit 0 ;;
89 + -- ) # Stop option processing
91 + - ) # Use stdin as input.
94 + echo "$me: invalid option $1$help"
98 + # First pass through any local machine types.
108 + 0) echo "$me: missing argument$help" >&2
111 + *) echo "$me: too many arguments$help" >&2
115 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
116 # Here we must recognize all the valid KERNEL-OS combinations.
117 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
120 + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
122 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
125 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
126 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
127 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
133 - -sim | -cisco | -oki | -wec | -winbond ) # EGCS LOCAL
134 + -sim | -cisco | -oki | -wec | -winbond)
138 - -scout) # EGCS LOCAL
157 @@ -156,49 +214,72 @@
161 + -mint | -mint[0-9]*)
162 + basic_machine=m68k-atari
167 # Decode aliases for certain CPU-COMPANY combinations.
168 case $basic_machine in
169 # Recognize the basic CPU types without company name.
170 # Some are omitted here because they have special meanings below.
171 - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
172 - | arme[lb] | pyramid | mn10200 | mn10300 \
173 - | tron | a29k | 580 | i960 | h8300 \
174 - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
175 - | alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
176 - | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
177 - | 1750a | dsp16xx | pdp11 \
178 - | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
179 - | mipstx39 | mipstx39el \
180 - | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x)
181 - basic_machine=$basic_machine-unknown
183 - m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
184 - | h8500 | w65) # EGCS LOCAL
187 - basic_machine=$basic_machine-unknown
189 - mips64vr4300 | mips64vr4300el) # EGCS LOCAL jsmith/vr4300
192 + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
193 + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
194 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
196 + | d10v | d30v | dlx | dsp16xx \
198 + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
199 + | i370 | i860 | i960 | ia64 \
201 + | m32r | m68000 | m68k | m88k | mcore \
202 + | mips | mipsbe | mipseb | mipsel | mipsle \
204 + | mips64 | mips64el \
205 + | mips64vr | mips64vrel \
206 + | mips64orion | mips64orionel \
207 + | mips64vr4100 | mips64vr4100el \
208 + | mips64vr4300 | mips64vr4300el \
209 + | mips64vr5000 | mips64vr5000el \
210 + | mipsisa32 | mipsisa32el \
211 + | mipsisa32r2 | mipsisa32r2el \
212 + | mipsisa64 | mipsisa64el \
213 + | mipsisa64sb1 | mipsisa64sb1el \
214 + | mipsisa64sr71k | mipsisa64sr71kel \
215 + | mipstx39 | mipstx39el \
216 + | mn10200 | mn10300 \
219 + | openrisc | or32 \
220 + | pdp10 | pdp11 | pj | pjl \
221 + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
223 + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
225 + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
227 + | tahoe | thumb | tic80 | tron \
230 + | x86 | xscale | xstormy16 | xtensa \
232 basic_machine=$basic_machine-unknown
234 - mips64vr4100 | mips64vr4100el) # EGCS LOCAL jsmith/vr4100
235 - basic_machine=$basic_machine-unknown
237 - mips64vr5000 | mips64vr5000el) # EGCS LOCAL ian/vr5000
238 - basic_machine=$basic_machine-unknown
241 + m6811 | m68hc11 | m6812 | m68hc12)
242 + # Motorola 68HC11/12.
243 basic_machine=$basic_machine-unknown
247 - basic_machine=$basic_machine-unknown
248 + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
251 # We use `pc' rather than `unknown'
252 # because (1) that's what they normally are, and
253 # (2) the word "unknown" tends to confuse beginning users.
256 basic_machine=$basic_machine-pc
258 # Object if more than one company name word.
259 @@ -207,44 +288,62 @@
262 # Recognize the basic CPU types with company name.
263 - vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
264 - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
265 - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
266 - | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
268 - | hppa-* | hppa1.0-* | hppa1.1-* \
269 - | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
270 - | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
271 - | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
272 - | xps100-* | clipper-* | orion-* \
273 - | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
274 - | sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
275 - | mips64el-* | mips64orion-* | mips64orionel-* \
276 - | mipstx39-* | mipstx39el-* \
279 - m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # EGCS LOCAL
281 - thumb-*) # EGCS LOCAL angela/thumb
283 - v850-*) # EGCS LOCAL
285 - d30v-*) # EGCS LOCAL
287 - mips64vr4300-* | mips64vr4300el-*) # EGCS LOCAL jsmith/vr4300
289 - mips64vr4100-* | mips64vr4100el-*) # EGCS LOCAL jsmith/vr4100
291 - mips16-*) # EGCS LOCAL krk/mips16
293 - tic30-*) # EGCS LOCAL ian/tic30
295 - c30-*) # EGCS LOCAL ian/tic30
296 - basic_machine=tic30-unknown
299 + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
300 + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
301 + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
302 + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
305 + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
306 + | clipper-* | cydra-* \
307 + | d10v-* | d30v-* | dlx-* \
309 + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
310 + | h8300-* | h8500-* \
311 + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
312 + | i*86-* | i860-* | i960-* | ia64-* \
315 + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
316 + | m88110-* | m88k-* | mcore-* \
317 + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
319 + | mips64-* | mips64el-* \
320 + | mips64vr-* | mips64vrel-* \
321 + | mips64orion-* | mips64orionel-* \
322 + | mips64vr4100-* | mips64vr4100el-* \
323 + | mips64vr4300-* | mips64vr4300el-* \
324 + | mips64vr5000-* | mips64vr5000el-* \
325 + | mipsisa32-* | mipsisa32el-* \
326 + | mipsisa32r2-* | mipsisa32r2el-* \
327 + | mipsisa64-* | mipsisa64el-* \
328 + | mipsisa64sb1-* | mipsisa64sb1el-* \
329 + | mipsisa64sr71k-* | mipsisa64sr71kel-* \
330 + | mipstx39-* | mipstx39el-* \
332 + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
334 + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
335 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
337 + | romp-* | rs6000-* \
338 + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
339 + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
340 + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
341 + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
342 + | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
343 + | v850-* | v850e-* | vax-* \
345 + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
350 # Recognize the various machine names and aliases which stand
351 # for a CPU type and a company and sometimes even an OS.
352 - 386bsd) # EGCS LOCAL
354 basic_machine=i386-unknown
357 @@ -254,11 +353,11 @@
359 basic_machine=we32k-att
361 - a29khif) # EGCS LOCAL
363 basic_machine=a29k-amd
366 - adobe68k) # EGCS LOCAL
368 basic_machine=m68010-adobe
371 @@ -277,21 +376,21 @@
375 - basic_machine=m68k-cbm
376 + basic_machine=m68k-unknown
379 - basic_machine=m68k-cbm
380 + basic_machine=m68k-unknown
384 - basic_machine=m68k-cbm
385 + basic_machine=m68k-unknown
389 basic_machine=m68k-apollo
392 - apollo68bsd) # EGCS LOCAL
394 basic_machine=m68k-apollo
398 basic_machine=ns32k-sequent
402 + basic_machine=c90-cray
406 basic_machine=c1-convex
408 @@ -323,27 +426,30 @@
409 basic_machine=c38-convex
413 - basic_machine=ymp-cray
417 - basic_machine=cray2-cray
421 - basic_machine=c90-cray
423 + basic_machine=j90-cray
427 basic_machine=m68k-crds
429 + cris | cris-* | etrax*)
430 + basic_machine=cris-axis
433 basic_machine=m68k-da30
435 decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
436 basic_machine=mips-dec
438 + decsystem10* | dec10*)
439 + basic_machine=pdp10-dec
442 + decsystem20* | dec20*)
443 + basic_machine=pdp10-dec
446 delta | 3300 | motorola-3300 | motorola-delta \
447 | 3300-motorola | delta-motorola)
448 basic_machine=m68k-motorola
450 encore | umax | mmax)
451 basic_machine=ns32k-encore
453 - es1800 | OSE68k | ose68k | ose | OSE) # EGCS LOCAL
454 + es1800 | OSE68k | ose68k | ose | OSE)
455 basic_machine=m68k-ericsson
459 basic_machine=tron-gmicro
463 + basic_machine=i386-pc
467 basic_machine=hppa1.1-hitachi
469 @@ -393,11 +503,11 @@
470 basic_machine=h8300-hitachi
473 - h8300xray) # EGCS LOCAL
475 basic_machine=h8300-hitachi
478 - h8500hms) # EGCS LOCAL
480 basic_machine=h8500-hitachi
484 basic_machine=m68k-hp
487 - w89k-*) # EGCS LOCAL
488 - basic_machine=hppa1.1-winbond
491 - op50n-*) # EGCS LOCAL
492 - basic_machine=hppa1.1-oki
495 - op60c-*) # EGCS LOCAL
496 - basic_machine=hppa1.1-oki
499 - hppro) # EGCS LOCAL
500 - basic_machine=hppa1.1-hp
503 hp3k9[0-9][0-9] | hp9[0-9][0-9])
504 basic_machine=hppa1.0-hp
506 @@ -441,22 +535,21 @@
508 basic_machine=m68k-hp
510 - hp9k6[0-9][0-9] | hp6[0-9][0-9] )
511 + hp9k6[0-9][0-9] | hp6[0-9][0-9])
512 basic_machine=hppa1.0-hp
514 - hp9k7[0-79][0-9] | hp7[0-79][0-9] )
515 + hp9k7[0-79][0-9] | hp7[0-79][0-9])
516 basic_machine=hppa1.1-hp
518 - hp9k78[0-9] | hp78[0-9] )
519 + hp9k78[0-9] | hp78[0-9])
520 # FIXME: really hppa2.0-hp
521 basic_machine=hppa1.1-hp
523 - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | \
524 - hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893 )
525 + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
526 # FIXME: really hppa2.0-hp
527 basic_machine=hppa1.1-hp
529 - hp9k8[0-9][13679] | hp8[0-9][13679] )
530 + hp9k8[0-9][13679] | hp8[0-9][13679])
531 basic_machine=hppa1.1-hp
533 hp9k8[0-9][0-9] | hp8[0-9][0-9])
534 @@ -465,47 +558,42 @@
538 - hppaosf) # EGCS LOCAL
540 basic_machine=hppa1.1-hp
544 + basic_machine=hppa1.1-hp
548 basic_machine=i370-ibm
551 # I'm not sure what "Sysv32" means. Should this be sysv3.2?
554 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
559 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
564 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
569 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
572 - i386mach) # EGCS LOCAL
574 basic_machine=i386-mach
577 - i386-vsta | vsta) # EGCS LOCAL
579 basic_machine=i386-unknown
582 - i386-go32 | go32) # EGCS LOCAL
583 - basic_machine=i386-unknown
586 - i386-mingw32 | mingw32)
587 - basic_machine=i386-unknown
591 basic_machine=mips-sgi
593 @@ -531,16 +619,16 @@
594 basic_machine=ns32k-utek
598 + basic_machine=i386-pc
602 basic_machine=m68000-convergent
605 - basic_machine=mipsel-unknown
609 - basic_machine=mips-unknown
611 + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
612 + basic_machine=m68k-atari
616 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
617 @@ -548,24 +636,36 @@
619 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
621 - monitor) # EGCS LOCAL
623 + basic_machine=mmix-knuth
627 basic_machine=m68k-rom68k
630 - msdos) # EGCS LOCAL
631 - basic_machine=i386-unknown
633 + basic_machine=powerpc-unknown
637 + basic_machine=i386-pc
641 + basic_machine=i370-ibm
645 basic_machine=i486-ncr
649 - basic_machine=i386-unknown # EGCS LOCAL
650 + basic_machine=i386-unknown
654 - basic_machine=armv4l-corel
655 + basic_machine=armv4l-rebel
658 news | news700 | news800 | news900)
660 basic_machine=mips-sony
663 - necv70) # EGCS LOCAL
665 basic_machine=v70-nec
668 @@ -609,18 +709,37 @@
669 basic_machine=i960-intel
672 - mon960) # EGCS LOCAL
674 basic_machine=i960-intel
678 + basic_machine=mips-compaq
682 basic_machine=np1-gould
684 - OSE68000 | ose68000) # EGCS LOCAL
686 + basic_machine=nv1-cray
690 + basic_machine=nsr-tandem
693 + basic_machine=hppa1.1-oki
697 + basic_machine=or32-unknown
700 + OSE68000 | ose68000)
701 basic_machine=m68000-ericsson
704 - os68k) # EGCS LOCAL
706 basic_machine=m68k-none
709 @@ -638,46 +757,60 @@
711 basic_machine=m68k-tti
715 basic_machine=ns32k-pc532
717 - pentium | p5 | k5 | k6 | nexen)
718 + pentium | p5 | k5 | k6 | nexgen | viac3)
719 basic_machine=i586-pc
721 - pentiumpro | p6 | 6x86)
722 + pentiumpro | p6 | 6x86 | athlon | athlon_*)
723 basic_machine=i686-pc
725 pentiumii | pentium2)
726 - basic_machine=i786-pc
727 + basic_machine=i686-pc
729 - pentium-* | p5-* | k5-* | k6-* | nexen-*)
730 + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
731 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
733 - pentiumpro-* | p6-* | 6x86-*)
734 + pentiumpro-* | p6-* | 6x86-* | athlon-*)
735 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
737 pentiumii-* | pentium2-*)
738 - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
739 + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
742 basic_machine=pn-gould
744 - power) basic_machine=rs6000-ibm
745 + power) basic_machine=power-ibm
747 ppc) basic_machine=powerpc-unknown
750 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
752 ppcle | powerpclittle | ppc-le | powerpc-little)
753 basic_machine=powerpcle-unknown
756 ppcle-* | powerpclittle-*)
757 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
759 + ppc64) basic_machine=powerpc64-unknown
761 + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
763 + ppc64le | powerpc64little | ppc64-le | powerpc64-little)
764 + basic_machine=powerpc64le-unknown
766 + ppc64le-* | powerpc64little-*)
767 + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
770 basic_machine=i386-ibm
772 - rom68k) # EGCS LOCAL
774 + basic_machine=i586-unknown
778 basic_machine=m68k-rom68k
781 @@ -687,10 +820,22 @@
783 basic_machine=romp-ibm
785 - sa29200) # EGCS LOCAL
787 + basic_machine=s390-ibm
790 + basic_machine=s390x-ibm
793 basic_machine=a29k-amd
797 + basic_machine=mipsisa64sb1-unknown
800 + basic_machine=mipsisa64sb1el-unknown
803 basic_machine=i386-sequent
806 basic_machine=sh-hitachi
809 - sparclite-wrs) # EGCS LOCAL
810 + sparclite-wrs | simso-wrs)
811 basic_machine=sparclite-wrs
814 @@ -709,10 +854,10 @@
816 basic_machine=spur-unknown
818 - st2000) # EGCS LOCAL
820 basic_machine=m68k-tandem
822 - stratus) # EGCS LOCAL
824 basic_machine=i860-stratus
827 @@ -756,16 +901,40 @@
828 sun386 | sun386i | roadrunner)
829 basic_machine=i386-sun
832 + basic_machine=sv1-cray
836 basic_machine=i386-sequent
840 + basic_machine=alphaev5-cray
844 + basic_machine=t90-cray
848 + basic_machine=tic4x-unknown
852 + basic_machine=tic54x-unknown
856 basic_machine=mipstx39-unknown
859 basic_machine=mipstx39el-unknown
862 + basic_machine=pdp10-xkl
866 basic_machine=m68k-ncr
869 basic_machine=a29k-nyu
872 - v810 | necv810) # EGCS LOCAL
874 basic_machine=v810-nec
881 - basic_machine=f301-fujitsu
883 + basic_machine=f301-fujitsu
886 basic_machine=i960-wrs
888 @@ -804,18 +973,22 @@
889 basic_machine=a29k-wrs
893 - basic_machine=w65-wdc
896 + basic_machine=w65-wdc
900 - basic_machine=xmp-cray
903 + basic_machine=hppa1.1-winbond
908 basic_machine=xps100-honeywell
910 - z8k-*-coff) # EGCS LOCAL
912 + basic_machine=ymp-cray
916 basic_machine=z8k-unknown
919 @@ -826,22 +999,15 @@
921 # Here we handle the default manufacturer of certain CPU types. It is in
922 # some cases the only manufacturer, in others, it is the most popular.
925 basic_machine=hppa1.1-winbond
927 - op50n) # EGCS LOCAL
929 basic_machine=hppa1.1-oki
931 - op60c) # EGCS LOCAL
933 basic_machine=hppa1.1-oki
936 - if [ x$os = x-linux-gnu ]; then
937 - basic_machine=mips-unknown
939 - basic_machine=mips-mips
943 basic_machine=romp-ibm
945 @@ -851,16 +1017,26 @@
947 basic_machine=vax-dec
950 + # there are many clones, so DEC is not a safe bet
951 + basic_machine=pdp10-unknown
954 basic_machine=pdp11-dec
957 basic_machine=we32k-att
960 + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
961 + basic_machine=sh-unknown
964 + basic_machine=sh64-unknown
966 + sparc | sparcv9 | sparcv9b)
967 basic_machine=sparc-sun
971 basic_machine=cydra-cydrome
974 @@ -869,16 +1045,15 @@
976 basic_machine=clipper-highlevel
978 - mac | mpw | mac-mpw) # EGCS LOCAL
979 + mac | mpw | mac-mpw)
980 basic_machine=m68k-apple
982 - pmac | pmac-mpw) # EGCS LOCAL
984 basic_machine=powerpc-apple
987 - basic_machine=c4x-none
991 + # Make sure to match an already-canonicalized machine name.
994 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
996 @@ -935,20 +1110,38 @@
997 | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
998 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
999 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1000 + | -chorusos* | -chorusrdb* \
1001 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1002 | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1003 - | -interix* | -uwin* )
1004 + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1005 + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1006 + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1007 + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1008 + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1009 + | -powermax* | -dnix* | -microbsd*)
1010 # Remember, each alternative MUST END IN *, to match a version number.
1014 + case $basic_machine in
1025 + os=`echo $os | sed -e 's|nto|nto-qnx|'`
1027 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1028 - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1029 - | -macos* | -mpw* | -magic* | -mon960* | -lnews* )
1030 + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1031 + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1034 os=`echo $os | sed -e 's|mac|macos|'`
1038 os=`echo $os | sed -e 's|linux|linux-gnu|'`
1040 @@ -958,6 +1151,12 @@
1042 os=`echo $os | sed -e 's|sunos6|solaris3|'`
1053 @@ -973,14 +1172,23 @@
1057 - -386bsd) # EGCS LOCAL
1077 # Preserve the version number of sinix5.
1079 @@ -1007,15 +1215,21 @@
1080 # This must come after -sysvr4.
1083 - -ose*) # EGCS LOCAL
1087 - -es1800*) # EGCS LOCAL
1094 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1103 @@ -1041,13 +1255,17 @@
1115 + # This must come before the *-dec entry.
1123 @@ -1065,15 +1283,18 @@
1127 - m68*-cisco) # EGCS LOCAL
1131 - mips*-cisco) # EGCS LOCAL
1135 - mips*-*) # EGCS LOCAL
1144 *-tti) # must be before sparc entry or we get the wrong os.
1147 @@ -1086,13 +1307,13 @@
1151 - *-wec) # EGCS LOCAL
1155 - *-winbond) # EGCS LOCAL
1159 - *-oki) # EGCS LOCAL
1164 @@ -1137,36 +1358,39 @@
1191 + f30[01]-fujitsu | f700-fujitsu)
1194 - *-rom68k) # EGCS LOCAL
1198 - *-*bug) # EGCS LOCAL
1202 - *-apple) # EGCS LOCAL
1212 @@ -1212,27 +1436,41 @@
1223 - -vxsim* | -vxworks*)
1224 + -vxsim* | -vxworks* | -windiss*)
1230 - -hms*) # EGCS LOCAL
1234 - -mpw* | -macos*) # EGCS LOCAL
1238 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1245 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
1249 echo $basic_machine$os
1253 +# eval: (add-hook 'write-file-hooks 'time-stamp)
1254 +# time-stamp-start: "timestamp='"
1255 +# time-stamp-format: "%:y-%02m-%02d"
1256 +# time-stamp-end: "'"