crosstool-ng: patches/gcc/2.95.3/130-config.sub.patch@8bde4c6ea47a (annotated)

yann@402	1	# Backport from gcc-3.3.3
yann@402	2	# Fixes errors like
yann@402	3	# Invalid configuration `x86_64-host_unknown-linux-gnu': machine `x86_64-host_unknown' not recognized
yann@402	4	# Unrecognized host system name x86_64-host_unknown-linux-gnu.
yann@402	5	# when configuring on chip types or operating systems like x86_64 or Darwin
yann@402	6	# which are newer than gcc-2.95
yann@402	7
yann@402	8	--- gcc-2.95.3/config.sub.old 1999-08-04 01:09:26.000000000 -0700
yann@402	9	+++ gcc-2.95.3/config.sub 2004-03-24 11:28:24.000000000 -0800
yann@402	10	@@ -1,6 +1,10 @@
yann@402	11	#! /bin/sh
yann@402	12	-# Configuration validation subroutine script, version 1.1.
yann@402	13	-# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
yann@402	14	+# Configuration validation subroutine script.
yann@402	15	+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
yann@402	16	+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
yann@402	17	+
yann@402	18	+timestamp='2003-01-28'
yann@402	19	+
yann@402	20	# This file is (in principle) common to ALL GNU software.
yann@402	21	# The presence of a machine in this file suggests that SOME GNU software
yann@402	22	# can handle that machine. It does not imply ALL GNU software can.
yann@402	23	@@ -25,6 +29,9 @@
yann@402	24	# configuration script generated by Autoconf, you may include it under
yann@402	25	# the same distribution terms that you use for the rest of that program.
yann@402	26
yann@402	27	+# Please send patches to <config-patches@gnu.org>. Submit a context
yann@402	28	+# diff and a properly formatted ChangeLog entry.
yann@402	29	+#
yann@402	30	# Configuration subroutine to validate and canonicalize a configuration type.
yann@402	31	# Supply the specified configuration type as an argument.
yann@402	32	# If it is invalid, we print an error message on stderr and exit with code 1.
yann@402	33	@@ -45,30 +52,73 @@
yann@402	34	# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
yann@402	35	# It is wrong to echo any other type of specification.
yann@402	36
yann@402	37	-if [ x$1 = x ]
yann@402	38	-then
yann@402	39	- echo Configuration name missing. 1>&2
yann@402	40	- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
yann@402	41	- echo "or $0 ALIAS" 1>&2
yann@402	42	- echo where ALIAS is a recognized configuration type. 1>&2
yann@402	43	- exit 1
yann@402	44	-fi
yann@402	45	+me=`echo "$0" \| sed -e 's,.*/,,'`
yann@402	46
yann@402	47	-# First pass through any local machine types.
yann@402	48	-case $1 in
yann@402	49	- local)
yann@402	50	- echo $1
yann@402	51	- exit 0
yann@402	52	- ;;
yann@402	53	- *)
yann@402	54	- ;;
yann@402	55	+usage="\
yann@402	56	+Usage: $0 [OPTION] CPU-MFR-OPSYS
yann@402	57	+ $0 [OPTION] ALIAS
yann@402	58	+
yann@402	59	+Canonicalize a configuration name.
yann@402	60	+
yann@402	61	+Operation modes:
yann@402	62	+ -h, --help print this help, then exit
yann@402	63	+ -t, --time-stamp print date of last modification, then exit
yann@402	64	+ -v, --version print version number, then exit
yann@402	65	+
yann@402	66	+Report bugs and patches to <config-patches@gnu.org>."
yann@402	67	+
yann@402	68	+version="\
yann@402	69	+GNU config.sub ($timestamp)
yann@402	70	+
yann@402	71	+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
yann@402	72	+Free Software Foundation, Inc.
yann@402	73	+
yann@402	74	+This is free software; see the source for copying conditions. There is NO
yann@402	75	+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
yann@402	76	+
yann@402	77	+help="
yann@402	78	+Try \`$me --help' for more information."
yann@402	79	+
yann@402	80	+# Parse command line
yann@402	81	+while test $# -gt 0 ; do
yann@402	82	+ case $1 in
yann@402	83	+ --time-stamp \| --time* \| -t )
yann@402	84	+ echo "$timestamp" ; exit 0 ;;
yann@402	85	+ --version \| -v )
yann@402	86	+ echo "$version" ; exit 0 ;;
yann@402	87	+ --help \| --h* \| -h )
yann@402	88	+ echo "$usage"; exit 0 ;;
yann@402	89	+ -- ) # Stop option processing
yann@402	90	+ shift; break ;;
yann@402	91	+ - ) # Use stdin as input.
yann@402	92	+ break ;;
yann@402	93	+ -* )
yann@402	94	+ echo "$me: invalid option $1$help"
yann@402	95	+ exit 1 ;;
yann@402	96	+
yann@402	97	+ local)
yann@402	98	+ # First pass through any local machine types.
yann@402	99	+ echo $1
yann@402	100	+ exit 0;;
yann@402	101	+
yann@402	102	+ * )
yann@402	103	+ break ;;
yann@402	104	+ esac
yann@402	105	+done
yann@402	106	+
yann@402	107	+case $# in
yann@402	108	+ 0) echo "$me: missing argument$help" >&2
yann@402	109	+ exit 1;;
yann@402	110	+ 1) ;;
yann@402	111	+ *) echo "$me: too many arguments$help" >&2
yann@402	112	+ exit 1;;
yann@402	113	esac
yann@402	114
yann@402	115	# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
yann@402	116	# Here we must recognize all the valid KERNEL-OS combinations.
yann@402	117	maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`
yann@402	118	case $maybe_os in
yann@402	119	- linux-gnu*)
yann@402	120	+ nto-qnx* \| linux-gnu* \| freebsd-gnu \| netbsd-gnu \| storm-chaos* \| os2-emx* \| rtmk-nova*)
yann@402	121	os=-$maybe_os
yann@402	122	basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`
yann@402	123	;;
yann@402	124	@@ -94,20 +144,28 @@
yann@402	125	-convergent* \| -ncr* \| -news \| -32* \| -3600* \| -3100* \| -hitachi* \|\
yann@402	126	-c[123]* \| -convex* \| -sun \| -crds \| -omron* \| -dg \| -ultra \| -tti* \| \
yann@402	127	-harris \| -dolphin \| -highlevel \| -gould \| -cbm \| -ns \| -masscomp \| \
yann@402	128	- -apple)
yann@402	129	+ -apple \| -axis)
yann@402	130	os=
yann@402	131	basic_machine=$1
yann@402	132	;;
yann@402	133	- -sim \| -cisco \| -oki \| -wec \| -winbond ) # EGCS LOCAL
yann@402	134	+ -sim \| -cisco \| -oki \| -wec \| -winbond)
yann@402	135	os=
yann@402	136	basic_machine=$1
yann@402	137	;;
yann@402	138	- -scout) # EGCS LOCAL
yann@402	139	+ -scout)
yann@402	140	;;
yann@402	141	- -wrs) # EGCS LOCAL
yann@402	142	+ -wrs)
yann@402	143	os=-vxworks
yann@402	144	basic_machine=$1
yann@402	145	;;
yann@402	146	+ -chorusos*)
yann@402	147	+ os=-chorusos
yann@402	148	+ basic_machine=$1
yann@402	149	+ ;;
yann@402	150	+ -chorusrdb)
yann@402	151	+ os=-chorusrdb
yann@402	152	+ basic_machine=$1
yann@402	153	+ ;;
yann@402	154	-hiux*)
yann@402	155	os=-hiuxwe2
yann@402	156	;;
yann@402	157	@@ -156,49 +214,72 @@
yann@402	158	-psos*)
yann@402	159	os=-psos
yann@402	160	;;
yann@402	161	+ -mint \| -mint[0-9]*)
yann@402	162	+ basic_machine=m68k-atari
yann@402	163	+ os=-mint
yann@402	164	+ ;;
yann@402	165	esac
yann@402	166
yann@402	167	# Decode aliases for certain CPU-COMPANY combinations.
yann@402	168	case $basic_machine in
yann@402	169	# Recognize the basic CPU types without company name.
yann@402	170	# Some are omitted here because they have special meanings below.
yann@402	171	- tahoe \| i860 \| m32r \| m68k \| m68000 \| m88k \| ns32k \| arc \| arm \
yann@402	172	- \| arme[lb] \| pyramid \| mn10200 \| mn10300 \
yann@402	173	- \| tron \| a29k \| 580 \| i960 \| h8300 \
yann@402	174	- \| hppa \| hppa1.0 \| hppa1.1 \| hppa2.0 \| hppa2.0w \| hppa2.0n \
yann@402	175	- \| alpha \| alphaev5 \| alphaev56 \| alphapca56 \| alphaev6 \
yann@402	176	- \| we32k \| ns16k \| clipper \| i370 \| sh \| powerpc \| powerpcle \
yann@402	177	- \| 1750a \| dsp16xx \| pdp11 \
yann@402	178	- \| mips64 \| mipsel \| mips64el \| mips64orion \| mips64orionel \
yann@402	179	- \| mipstx39 \| mipstx39el \
yann@402	180	- \| sparc \| sparclet \| sparclite \| sparc64 \| sparcv9 \| v850 \| c4x)
yann@402	181	- basic_machine=$basic_machine-unknown
yann@402	182	- ;;
yann@402	183	- m88110 \| m680[012346]0 \| m683?2 \| m68360 \| m5200 \| z8k \| v70 \
yann@402	184	- \| h8500 \| w65) # EGCS LOCAL
yann@402	185	- ;;
yann@402	186	- thumb)
yann@402	187	- basic_machine=$basic_machine-unknown
yann@402	188	- ;;
yann@402	189	- mips64vr4300 \| mips64vr4300el) # EGCS LOCAL jsmith/vr4300
yann@402	190	+ 1750a \| 580 \
yann@402	191	+ \| a29k \
yann@402	192	+ \| alpha \| alphaev[4-8] \| alphaev56 \| alphaev6[78] \| alphapca5[67] \
yann@402	193	+ \| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \| alpha64pca5[67] \
yann@402	194	+ \| arc \| arm \| arm[bl]e \| arme[lb] \| armv[2345] \| armv[345][lb] \| avr \
yann@402	195	+ \| clipper \
yann@402	196	+ \| d10v \| d30v \| dlx \| dsp16xx \
yann@402	197	+ \| fr30 \| frv \
yann@402	198	+ \| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \
yann@402	199	+ \| i370 \| i860 \| i960 \| ia64 \
yann@402	200	+ \| ip2k \
yann@402	201	+ \| m32r \| m68000 \| m68k \| m88k \| mcore \
yann@402	202	+ \| mips \| mipsbe \| mipseb \| mipsel \| mipsle \
yann@402	203	+ \| mips16 \
yann@402	204	+ \| mips64 \| mips64el \
yann@402	205	+ \| mips64vr \| mips64vrel \
yann@402	206	+ \| mips64orion \| mips64orionel \
yann@402	207	+ \| mips64vr4100 \| mips64vr4100el \
yann@402	208	+ \| mips64vr4300 \| mips64vr4300el \
yann@402	209	+ \| mips64vr5000 \| mips64vr5000el \
yann@402	210	+ \| mipsisa32 \| mipsisa32el \
yann@402	211	+ \| mipsisa32r2 \| mipsisa32r2el \
yann@402	212	+ \| mipsisa64 \| mipsisa64el \
yann@402	213	+ \| mipsisa64sb1 \| mipsisa64sb1el \
yann@402	214	+ \| mipsisa64sr71k \| mipsisa64sr71kel \
yann@402	215	+ \| mipstx39 \| mipstx39el \
yann@402	216	+ \| mn10200 \| mn10300 \
yann@402	217	+ \| msp430 \
yann@402	218	+ \| ns16k \| ns32k \
yann@402	219	+ \| openrisc \| or32 \
yann@402	220	+ \| pdp10 \| pdp11 \| pj \| pjl \
yann@402	221	+ \| powerpc \| powerpc64 \| powerpc64le \| powerpcle \| ppcbe \
yann@402	222	+ \| pyramid \
yann@402	223	+ \| sh \| sh[1234] \| sh[23]e \| sh[34]eb \| shbe \| shle \| sh[1234]le \| sh3ele \
yann@402	224	+ \| sh64 \| sh64le \
yann@402	225	+ \| sparc \| sparc64 \| sparc86x \| sparclet \| sparclite \| sparcv9 \| sparcv9b \
yann@402	226	+ \| strongarm \
yann@402	227	+ \| tahoe \| thumb \| tic80 \| tron \
yann@402	228	+ \| v850 \| v850e \
yann@402	229	+ \| we32k \
yann@402	230	+ \| x86 \| xscale \| xstormy16 \| xtensa \
yann@402	231	+ \| z8k)
yann@402	232	basic_machine=$basic_machine-unknown
yann@402	233	;;
yann@402	234	- mips64vr4100 \| mips64vr4100el) # EGCS LOCAL jsmith/vr4100
yann@402	235	- basic_machine=$basic_machine-unknown
yann@402	236	- ;;
yann@402	237	- mips64vr5000 \| mips64vr5000el) # EGCS LOCAL ian/vr5000
yann@402	238	- basic_machine=$basic_machine-unknown
yann@402	239	- ;;
yann@402	240	- mips16)
yann@402	241	+ m6811 \| m68hc11 \| m6812 \| m68hc12)
yann@402	242	+ # Motorola 68HC11/12.
yann@402	243	basic_machine=$basic_machine-unknown
yann@402	244	+ os=-none
yann@402	245	;;
yann@402	246	- d10v)
yann@402	247	- basic_machine=$basic_machine-unknown
yann@402	248	+ m88110 \| m680[12346]0 \| m683?2 \| m68360 \| m5200 \| v70 \| w65 \| z8k)
yann@402	249	;;
yann@402	250	+
yann@402	251	# We use `pc' rather than `unknown'
yann@402	252	# because (1) that's what they normally are, and
yann@402	253	# (2) the word "unknown" tends to confuse beginning users.
yann@402	254	- i[34567]86)
yann@402	255	+ i*86 \| x86_64)
yann@402	256	basic_machine=$basic_machine-pc
yann@402	257	;;
yann@402	258	# Object if more than one company name word.
yann@402	259	@@ -207,44 +288,62 @@
yann@402	260	exit 1
yann@402	261	;;
yann@402	262	# Recognize the basic CPU types with company name.
yann@402	263	- vax-* \| tahoe-* \| i[34567]86-* \| i860-* \| m32r-* \| m68k-* \| m68000-* \
yann@402	264	- \| m88k-* \| sparc-* \| ns32k-* \| fx80-* \| arc-* \| arm-* \| c[123]* \
yann@402	265	- \| mips-* \| pyramid-* \| tron-* \| a29k-* \| romp-* \| rs6000-* \
yann@402	266	- \| power-* \| none-* \| 580-* \| cray2-* \| h8300-* \| i960-* \
yann@402	267	- \| xmp-* \| ymp-* \
yann@402	268	- \| hppa-* \| hppa1.0-* \| hppa1.1-* \
yann@402	269	- \| hppa2.0-* \| hppa2.0w-* \| hppa2.0n-* \
yann@402	270	- \| alpha-* \| alphaev5-* \| alphaev56-* \| alphapca56-* \
yann@402	271	- \| alphaev6-* \| we32k-* \| cydra-* \| ns16k-* \| pn-* \| np1-* \
yann@402	272	- \| xps100-* \| clipper-* \| orion-* \
yann@402	273	- \| sparclite-* \| pdp11-* \| sh-* \| powerpc-* \| powerpcle-* \
yann@402	274	- \| sparc64-* \| sparcv9-* \| sparc86x-* \| mips64-* \| mipsel-* \
yann@402	275	- \| mips64el-* \| mips64orion-* \| mips64orionel-* \
yann@402	276	- \| mipstx39-* \| mipstx39el-* \
yann@402	277	- \| f301-* \| arm-)
yann@402	278	- ;;
yann@402	279	- m88110-* \| m680[01234]0-* \| m683?2-* \| m68360-* \| z8k-* \| h8500-* \| d10v-*) # EGCS LOCAL
yann@402	280	- ;;
yann@402	281	- thumb-*) # EGCS LOCAL angela/thumb
yann@402	282	- ;;
yann@402	283	- v850-*) # EGCS LOCAL
yann@402	284	- ;;
yann@402	285	- d30v-*) # EGCS LOCAL
yann@402	286	- ;;
yann@402	287	- mips64vr4300-* \| mips64vr4300el-*) # EGCS LOCAL jsmith/vr4300
yann@402	288	- ;;
yann@402	289	- mips64vr4100-* \| mips64vr4100el-*) # EGCS LOCAL jsmith/vr4100
yann@402	290	- ;;
yann@402	291	- mips16-*) # EGCS LOCAL krk/mips16
yann@402	292	- ;;
yann@402	293	- tic30-*) # EGCS LOCAL ian/tic30
yann@402	294	- ;;
yann@402	295	- c30-*) # EGCS LOCAL ian/tic30
yann@402	296	- basic_machine=tic30-unknown
yann@402	297	+ 580-* \
yann@402	298	+ \| a29k-* \
yann@402	299	+ \| alpha-* \| alphaev[4-8]-* \| alphaev56-* \| alphaev6[78]-* \
yann@402	300	+ \| alpha64-* \| alpha64ev[4-8]-* \| alpha64ev56-* \| alpha64ev6[78]-* \
yann@402	301	+ \| alphapca5[67]-* \| alpha64pca5[67]-* \| arc-* \
yann@402	302	+ \| arm-* \| armbe-* \| armle-* \| armeb-* \| armv- \
yann@402	303	+ \| avr-* \
yann@402	304	+ \| bs2000-* \
yann@402	305	+ \| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \| c54x-* \
yann@402	306	+ \| clipper-* \| cydra-* \
yann@402	307	+ \| d10v-* \| d30v-* \| dlx-* \
yann@402	308	+ \| elxsi-* \
yann@402	309	+ \| f30[01]-* \| f700-* \| fr30-* \| frv-* \| fx80-* \
yann@402	310	+ \| h8300-* \| h8500-* \
yann@402	311	+ \| hppa-* \| hppa1.[01]-* \| hppa2.0-* \| hppa2.0[nw]-* \| hppa64-* \
yann@402	312	+ \| i86- \| i860-* \| i960-* \| ia64-* \
yann@402	313	+ \| ip2k-* \
yann@402	314	+ \| m32r-* \
yann@402	315	+ \| m68000-* \| m680[012346]0-* \| m68360-* \| m683?2-* \| m68k-* \
yann@402	316	+ \| m88110-* \| m88k-* \| mcore-* \
yann@402	317	+ \| mips-* \| mipsbe-* \| mipseb-* \| mipsel-* \| mipsle-* \
yann@402	318	+ \| mips16-* \
yann@402	319	+ \| mips64-* \| mips64el-* \
yann@402	320	+ \| mips64vr-* \| mips64vrel-* \
yann@402	321	+ \| mips64orion-* \| mips64orionel-* \
yann@402	322	+ \| mips64vr4100-* \| mips64vr4100el-* \
yann@402	323	+ \| mips64vr4300-* \| mips64vr4300el-* \
yann@402	324	+ \| mips64vr5000-* \| mips64vr5000el-* \
yann@402	325	+ \| mipsisa32-* \| mipsisa32el-* \
yann@402	326	+ \| mipsisa32r2-* \| mipsisa32r2el-* \
yann@402	327	+ \| mipsisa64-* \| mipsisa64el-* \
yann@402	328	+ \| mipsisa64sb1-* \| mipsisa64sb1el-* \
yann@402	329	+ \| mipsisa64sr71k-* \| mipsisa64sr71kel-* \
yann@402	330	+ \| mipstx39-* \| mipstx39el-* \
yann@402	331	+ \| msp430-* \
yann@402	332	+ \| none-* \| np1-* \| nv1-* \| ns16k-* \| ns32k-* \
yann@402	333	+ \| orion-* \
yann@402	334	+ \| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \
yann@402	335	+ \| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \| ppcbe-* \
yann@402	336	+ \| pyramid-* \
yann@402	337	+ \| romp-* \| rs6000-* \
yann@402	338	+ \| sh-* \| sh[1234]-* \| sh[23]e-* \| sh[34]eb-* \| shbe-* \
yann@402	339	+ \| shle-* \| sh[1234]le-* \| sh3ele-* \| sh64-* \| sh64le-* \
yann@402	340	+ \| sparc-* \| sparc64-* \| sparc86x-* \| sparclet-* \| sparclite-* \
yann@402	341	+ \| sparcv9-* \| sparcv9b-* \| strongarm-* \| sv1-* \| sx?-* \
yann@402	342	+ \| tahoe-* \| thumb-* \| tic30-* \| tic4x-* \| tic54x-* \| tic80-* \| tron-* \
yann@402	343	+ \| v850-* \| v850e-* \| vax-* \
yann@402	344	+ \| we32k-* \
yann@402	345	+ \| x86-* \| x86_64-* \| xps100-* \| xscale-* \| xstormy16-* \
yann@402	346	+ \| xtensa-* \
yann@402	347	+ \| ymp-* \
yann@402	348	+ \| z8k-*)
yann@402	349	;;
yann@402	350	# Recognize the various machine names and aliases which stand
yann@402	351	# for a CPU type and a company and sometimes even an OS.
yann@402	352	- 386bsd) # EGCS LOCAL
yann@402	353	+ 386bsd)
yann@402	354	basic_machine=i386-unknown
yann@402	355	os=-bsd
yann@402	356	;;
yann@402	357	@@ -254,11 +353,11 @@
yann@402	358	3b*)
yann@402	359	basic_machine=we32k-att
yann@402	360	;;
yann@402	361	- a29khif) # EGCS LOCAL
yann@402	362	+ a29khif)
yann@402	363	basic_machine=a29k-amd
yann@402	364	os=-udi
yann@402	365	;;
yann@402	366	- adobe68k) # EGCS LOCAL
yann@402	367	+ adobe68k)
yann@402	368	basic_machine=m68010-adobe
yann@402	369	os=-scout
yann@402	370	;;
yann@402	371	@@ -277,21 +376,21 @@
yann@402	372	os=-sysv
yann@402	373	;;
yann@402	374	amiga \| amiga-*)
yann@402	375	- basic_machine=m68k-cbm
yann@402	376	+ basic_machine=m68k-unknown
yann@402	377	;;
yann@402	378	amigaos \| amigados)
yann@402	379	- basic_machine=m68k-cbm
yann@402	380	+ basic_machine=m68k-unknown
yann@402	381	os=-amigaos
yann@402	382	;;
yann@402	383	amigaunix \| amix)
yann@402	384	- basic_machine=m68k-cbm
yann@402	385	+ basic_machine=m68k-unknown
yann@402	386	os=-sysv4
yann@402	387	;;
yann@402	388	apollo68)
yann@402	389	basic_machine=m68k-apollo
yann@402	390	os=-sysv
yann@402	391	;;
yann@402	392	- apollo68bsd) # EGCS LOCAL
yann@402	393	+ apollo68bsd)
yann@402	394	basic_machine=m68k-apollo
yann@402	395	os=-bsd
yann@402	396	;;
yann@402	397	@@ -303,6 +402,10 @@
yann@402	398	basic_machine=ns32k-sequent
yann@402	399	os=-dynix
yann@402	400	;;
yann@402	401	+ c90)
yann@402	402	+ basic_machine=c90-cray
yann@402	403	+ os=-unicos
yann@402	404	+ ;;
yann@402	405	convex-c1)
yann@402	406	basic_machine=c1-convex
yann@402	407	os=-bsd
yann@402	408	@@ -323,27 +426,30 @@
yann@402	409	basic_machine=c38-convex
yann@402	410	os=-bsd
yann@402	411	;;
yann@402	412	- cray \| ymp)
yann@402	413	- basic_machine=ymp-cray
yann@402	414	- os=-unicos
yann@402	415	- ;;
yann@402	416	- cray2)
yann@402	417	- basic_machine=cray2-cray
yann@402	418	- os=-unicos
yann@402	419	- ;;
yann@402	420	- [ctj]90-cray)
yann@402	421	- basic_machine=c90-cray
yann@402	422	+ cray \| j90)
yann@402	423	+ basic_machine=j90-cray
yann@402	424	os=-unicos
yann@402	425	;;
yann@402	426	crds \| unos)
yann@402	427	basic_machine=m68k-crds
yann@402	428	;;
yann@402	429	+ cris \| cris-* \| etrax*)
yann@402	430	+ basic_machine=cris-axis
yann@402	431	+ ;;
yann@402	432	da30 \| da30-*)
yann@402	433	basic_machine=m68k-da30
yann@402	434	;;
yann@402	435	decstation \| decstation-3100 \| pmax \| pmax-* \| pmin \| dec3100 \| decstatn)
yann@402	436	basic_machine=mips-dec
yann@402	437	;;
yann@402	438	+ decsystem10* \| dec10*)
yann@402	439	+ basic_machine=pdp10-dec
yann@402	440	+ os=-tops10
yann@402	441	+ ;;
yann@402	442	+ decsystem20* \| dec20*)
yann@402	443	+ basic_machine=pdp10-dec
yann@402	444	+ os=-tops20
yann@402	445	+ ;;
yann@402	446	delta \| 3300 \| motorola-3300 \| motorola-delta \
yann@402	447	\| 3300-motorola \| delta-motorola)
yann@402	448	basic_machine=m68k-motorola
yann@402	449	@@ -371,7 +477,7 @@
yann@402	450	encore \| umax \| mmax)
yann@402	451	basic_machine=ns32k-encore
yann@402	452	;;
yann@402	453	- es1800 \| OSE68k \| ose68k \| ose \| OSE) # EGCS LOCAL
yann@402	454	+ es1800 \| OSE68k \| ose68k \| ose \| OSE)
yann@402	455	basic_machine=m68k-ericsson
yann@402	456	os=-ose
yann@402	457	;;
yann@402	458	@@ -385,6 +491,10 @@
yann@402	459	basic_machine=tron-gmicro
yann@402	460	os=-sysv
yann@402	461	;;
yann@402	462	+ go32)
yann@402	463	+ basic_machine=i386-pc
yann@402	464	+ os=-go32
yann@402	465	+ ;;
yann@402	466	h3050r* \| hiux*)
yann@402	467	basic_machine=hppa1.1-hitachi
yann@402	468	os=-hiuxwe2
yann@402	469	@@ -393,11 +503,11 @@
yann@402	470	basic_machine=h8300-hitachi
yann@402	471	os=-hms
yann@402	472	;;
yann@402	473	- h8300xray) # EGCS LOCAL
yann@402	474	+ h8300xray)
yann@402	475	basic_machine=h8300-hitachi
yann@402	476	os=-xray
yann@402	477	;;
yann@402	478	- h8500hms) # EGCS LOCAL
yann@402	479	+ h8500hms)
yann@402	480	basic_machine=h8500-hitachi
yann@402	481	os=-hms
yann@402	482	;;
yann@402	483	@@ -416,22 +526,6 @@
yann@402	484	basic_machine=m68k-hp
yann@402	485	os=-hpux
yann@402	486	;;
yann@402	487	- w89k-*) # EGCS LOCAL
yann@402	488	- basic_machine=hppa1.1-winbond
yann@402	489	- os=-proelf
yann@402	490	- ;;
yann@402	491	- op50n-*) # EGCS LOCAL
yann@402	492	- basic_machine=hppa1.1-oki
yann@402	493	- os=-proelf
yann@402	494	- ;;
yann@402	495	- op60c-*) # EGCS LOCAL
yann@402	496	- basic_machine=hppa1.1-oki
yann@402	497	- os=-proelf
yann@402	498	- ;;
yann@402	499	- hppro) # EGCS LOCAL
yann@402	500	- basic_machine=hppa1.1-hp
yann@402	501	- os=-proelf
yann@402	502	- ;;
yann@402	503	hp3k9[0-9][0-9] \| hp9[0-9][0-9])
yann@402	504	basic_machine=hppa1.0-hp
yann@402	505	;;
yann@402	506	@@ -441,22 +535,21 @@
yann@402	507	hp9k3[2-9][0-9])
yann@402	508	basic_machine=m68k-hp
yann@402	509	;;
yann@402	510	- hp9k6[0-9][0-9] \| hp6[0-9][0-9] )
yann@402	511	+ hp9k6[0-9][0-9] \| hp6[0-9][0-9])
yann@402	512	basic_machine=hppa1.0-hp
yann@402	513	;;
yann@402	514	- hp9k7[0-79][0-9] \| hp7[0-79][0-9] )
yann@402	515	+ hp9k7[0-79][0-9] \| hp7[0-79][0-9])
yann@402	516	basic_machine=hppa1.1-hp
yann@402	517	;;
yann@402	518	- hp9k78[0-9] \| hp78[0-9] )
yann@402	519	+ hp9k78[0-9] \| hp78[0-9])
yann@402	520	# FIXME: really hppa2.0-hp
yann@402	521	basic_machine=hppa1.1-hp
yann@402	522	;;
yann@402	523	- hp9k8[67]1 \| hp8[67]1 \| hp9k80[24] \| hp80[24] \| \
yann@402	524	- hp9k8[78]9 \| hp8[78]9 \| hp9k893 \| hp893 )
yann@402	525	+ hp9k8[67]1 \| hp8[67]1 \| hp9k80[24] \| hp80[24] \| hp9k8[78]9 \| hp8[78]9 \| hp9k893 \| hp893)
yann@402	526	# FIXME: really hppa2.0-hp
yann@402	527	basic_machine=hppa1.1-hp
yann@402	528	;;
yann@402	529	- hp9k8[0-9][13679] \| hp8[0-9][13679] )
yann@402	530	+ hp9k8[0-9][13679] \| hp8[0-9][13679])
yann@402	531	basic_machine=hppa1.1-hp
yann@402	532	;;
yann@402	533	hp9k8[0-9][0-9] \| hp8[0-9][0-9])
yann@402	534	@@ -465,47 +558,42 @@
yann@402	535	hppa-next)
yann@402	536	os=-nextstep3
yann@402	537	;;
yann@402	538	- hppaosf) # EGCS LOCAL
yann@402	539	+ hppaosf)
yann@402	540	basic_machine=hppa1.1-hp
yann@402	541	os=-osf
yann@402	542	;;
yann@402	543	+ hppro)
yann@402	544	+ basic_machine=hppa1.1-hp
yann@402	545	+ os=-proelf
yann@402	546	+ ;;
yann@402	547	i370-ibm* \| ibm*)
yann@402	548	basic_machine=i370-ibm
yann@402	549	- os=-mvs
yann@402	550	;;
yann@402	551	# I'm not sure what "Sysv32" means. Should this be sysv3.2?
yann@402	552	- i[34567]86v32)
yann@402	553	+ i*86v32)
yann@402	554	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
yann@402	555	os=-sysv32
yann@402	556	;;
yann@402	557	- i[34567]86v4*)
yann@402	558	+ i86v4)
yann@402	559	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
yann@402	560	os=-sysv4
yann@402	561	;;
yann@402	562	- i[34567]86v)
yann@402	563	+ i*86v)
yann@402	564	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
yann@402	565	os=-sysv
yann@402	566	;;
yann@402	567	- i[34567]86sol2)
yann@402	568	+ i*86sol2)
yann@402	569	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
yann@402	570	os=-solaris2
yann@402	571	;;
yann@402	572	- i386mach) # EGCS LOCAL
yann@402	573	+ i386mach)
yann@402	574	basic_machine=i386-mach
yann@402	575	os=-mach
yann@402	576	;;
yann@402	577	- i386-vsta \| vsta) # EGCS LOCAL
yann@402	578	+ i386-vsta \| vsta)
yann@402	579	basic_machine=i386-unknown
yann@402	580	os=-vsta
yann@402	581	;;
yann@402	582	- i386-go32 \| go32) # EGCS LOCAL
yann@402	583	- basic_machine=i386-unknown
yann@402	584	- os=-go32
yann@402	585	- ;;
yann@402	586	- i386-mingw32 \| mingw32)
yann@402	587	- basic_machine=i386-unknown
yann@402	588	- os=-mingw32
yann@402	589	- ;;
yann@402	590	iris \| iris4d)
yann@402	591	basic_machine=mips-sgi
yann@402	592	case $os in
yann@402	593	@@ -531,16 +619,16 @@
yann@402	594	basic_machine=ns32k-utek
yann@402	595	os=-sysv
yann@402	596	;;
yann@402	597	+ mingw32)
yann@402	598	+ basic_machine=i386-pc
yann@402	599	+ os=-mingw32
yann@402	600	+ ;;
yann@402	601	miniframe)
yann@402	602	basic_machine=m68000-convergent
yann@402	603	;;
yann@402	604	- mipsel-linux)
yann@402	605	- basic_machine=mipsel-unknown
yann@402	606	- os=-linux-gnu
yann@402	607	- ;;
yann@402	608	- mips-linux)
yann@402	609	- basic_machine=mips-unknown
yann@402	610	- os=-linux-gnu
yann@402	611	+ mint \| -mint[0-9] \| MiNT \| MiNT[0-9]*)
yann@402	612	+ basic_machine=m68k-atari
yann@402	613	+ os=-mint
yann@402	614	;;
yann@402	615	mips3-)
yann@402	616	basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`
yann@402	617	@@ -548,24 +636,36 @@
yann@402	618	mips3*)
yann@402	619	basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`-unknown
yann@402	620	;;
yann@402	621	- monitor) # EGCS LOCAL
yann@402	622	+ mmix*)
yann@402	623	+ basic_machine=mmix-knuth
yann@402	624	+ os=-mmixware
yann@402	625	+ ;;
yann@402	626	+ monitor)
yann@402	627	basic_machine=m68k-rom68k
yann@402	628	os=-coff
yann@402	629	;;
yann@402	630	- msdos) # EGCS LOCAL
yann@402	631	- basic_machine=i386-unknown
yann@402	632	+ morphos)
yann@402	633	+ basic_machine=powerpc-unknown
yann@402	634	+ os=-morphos
yann@402	635	+ ;;
yann@402	636	+ msdos)
yann@402	637	+ basic_machine=i386-pc
yann@402	638	os=-msdos
yann@402	639	;;
yann@402	640	+ mvs)
yann@402	641	+ basic_machine=i370-ibm
yann@402	642	+ os=-mvs
yann@402	643	+ ;;
yann@402	644	ncr3000)
yann@402	645	basic_machine=i486-ncr
yann@402	646	os=-sysv4
yann@402	647	;;
yann@402	648	netbsd386)
yann@402	649	- basic_machine=i386-unknown # EGCS LOCAL
yann@402	650	+ basic_machine=i386-unknown
yann@402	651	os=-netbsd
yann@402	652	;;
yann@402	653	netwinder)
yann@402	654	- basic_machine=armv4l-corel
yann@402	655	+ basic_machine=armv4l-rebel
yann@402	656	os=-linux
yann@402	657	;;
yann@402	658	news \| news700 \| news800 \| news900)
yann@402	659	@@ -580,7 +680,7 @@
yann@402	660	basic_machine=mips-sony
yann@402	661	os=-newsos
yann@402	662	;;
yann@402	663	- necv70) # EGCS LOCAL
yann@402	664	+ necv70)
yann@402	665	basic_machine=v70-nec
yann@402	666	os=-sysv
yann@402	667	;;
yann@402	668	@@ -609,18 +709,37 @@
yann@402	669	basic_machine=i960-intel
yann@402	670	os=-nindy
yann@402	671	;;
yann@402	672	- mon960) # EGCS LOCAL
yann@402	673	+ mon960)
yann@402	674	basic_machine=i960-intel
yann@402	675	os=-mon960
yann@402	676	;;
yann@402	677	+ nonstopux)
yann@402	678	+ basic_machine=mips-compaq
yann@402	679	+ os=-nonstopux
yann@402	680	+ ;;
yann@402	681	np1)
yann@402	682	basic_machine=np1-gould
yann@402	683	;;
yann@402	684	- OSE68000 \| ose68000) # EGCS LOCAL
yann@402	685	+ nv1)
yann@402	686	+ basic_machine=nv1-cray
yann@402	687	+ os=-unicosmp
yann@402	688	+ ;;
yann@402	689	+ nsr-tandem)
yann@402	690	+ basic_machine=nsr-tandem
yann@402	691	+ ;;
yann@402	692	+ op50n-* \| op60c-*)
yann@402	693	+ basic_machine=hppa1.1-oki
yann@402	694	+ os=-proelf
yann@402	695	+ ;;
yann@402	696	+ or32 \| or32-*)
yann@402	697	+ basic_machine=or32-unknown
yann@402	698	+ os=-coff
yann@402	699	+ ;;
yann@402	700	+ OSE68000 \| ose68000)
yann@402	701	basic_machine=m68000-ericsson
yann@402	702	os=-ose
yann@402	703	;;
yann@402	704	- os68k) # EGCS LOCAL
yann@402	705	+ os68k)
yann@402	706	basic_machine=m68k-none
yann@402	707	os=-os68k
yann@402	708	;;
yann@402	709	@@ -638,46 +757,60 @@
yann@402	710	pbb)
yann@402	711	basic_machine=m68k-tti
yann@402	712	;;
yann@402	713	- pc532 \| pc532-*)
yann@402	714	+ pc532 \| pc532-*)
yann@402	715	basic_machine=ns32k-pc532
yann@402	716	;;
yann@402	717	- pentium \| p5 \| k5 \| k6 \| nexen)
yann@402	718	+ pentium \| p5 \| k5 \| k6 \| nexgen \| viac3)
yann@402	719	basic_machine=i586-pc
yann@402	720	;;
yann@402	721	- pentiumpro \| p6 \| 6x86)
yann@402	722	+ pentiumpro \| p6 \| 6x86 \| athlon \| athlon_*)
yann@402	723	basic_machine=i686-pc
yann@402	724	;;
yann@402	725	pentiumii \| pentium2)
yann@402	726	- basic_machine=i786-pc
yann@402	727	+ basic_machine=i686-pc
yann@402	728	;;
yann@402	729	- pentium-* \| p5-* \| k5-* \| k6-* \| nexen-*)
yann@402	730	+ pentium-* \| p5-* \| k5-* \| k6-* \| nexgen-* \| viac3-*)
yann@402	731	basic_machine=i586-`echo $basic_machine \| sed 's/^[^-]*-//'`
yann@402	732	;;
yann@402	733	- pentiumpro-* \| p6-* \| 6x86-*)
yann@402	734	+ pentiumpro-* \| p6-* \| 6x86-* \| athlon-*)
yann@402	735	basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
yann@402	736	;;
yann@402	737	pentiumii-* \| pentium2-*)
yann@402	738	- basic_machine=i786-`echo $basic_machine \| sed 's/^[^-]*-//'`
yann@402	739	+ basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
yann@402	740	;;
yann@402	741	pn)
yann@402	742	basic_machine=pn-gould
yann@402	743	;;
yann@402	744	- power) basic_machine=rs6000-ibm
yann@402	745	+ power) basic_machine=power-ibm
yann@402	746	;;
yann@402	747	ppc) basic_machine=powerpc-unknown
yann@402	748	- ;;
yann@402	749	+ ;;
yann@402	750	ppc-) basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]-//'`
yann@402	751	;;
yann@402	752	ppcle \| powerpclittle \| ppc-le \| powerpc-little)
yann@402	753	basic_machine=powerpcle-unknown
yann@402	754	- ;;
yann@402	755	+ ;;
yann@402	756	ppcle-* \| powerpclittle-*)
yann@402	757	basic_machine=powerpcle-`echo $basic_machine \| sed 's/^[^-]*-//'`
yann@402	758	;;
yann@402	759	+ ppc64) basic_machine=powerpc64-unknown
yann@402	760	+ ;;
yann@402	761	+ ppc64-) basic_machine=powerpc64-`echo $basic_machine \| sed 's/^[^-]-//'`
yann@402	762	+ ;;
yann@402	763	+ ppc64le \| powerpc64little \| ppc64-le \| powerpc64-little)
yann@402	764	+ basic_machine=powerpc64le-unknown
yann@402	765	+ ;;
yann@402	766	+ ppc64le-* \| powerpc64little-*)
yann@402	767	+ basic_machine=powerpc64le-`echo $basic_machine \| sed 's/^[^-]*-//'`
yann@402	768	+ ;;
yann@402	769	ps2)
yann@402	770	basic_machine=i386-ibm
yann@402	771	;;
yann@402	772	- rom68k) # EGCS LOCAL
yann@402	773	+ pw32)
yann@402	774	+ basic_machine=i586-unknown
yann@402	775	+ os=-pw32
yann@402	776	+ ;;
yann@402	777	+ rom68k)
yann@402	778	basic_machine=m68k-rom68k
yann@402	779	os=-coff
yann@402	780	;;
yann@402	781	@@ -687,10 +820,22 @@
yann@402	782	rtpc \| rtpc-*)
yann@402	783	basic_machine=romp-ibm
yann@402	784	;;
yann@402	785	- sa29200) # EGCS LOCAL
yann@402	786	+ s390 \| s390-*)
yann@402	787	+ basic_machine=s390-ibm
yann@402	788	+ ;;
yann@402	789	+ s390x \| s390x-*)
yann@402	790	+ basic_machine=s390x-ibm
yann@402	791	+ ;;
yann@402	792	+ sa29200)
yann@402	793	basic_machine=a29k-amd
yann@402	794	os=-udi
yann@402	795	;;
yann@402	796	+ sb1)
yann@402	797	+ basic_machine=mipsisa64sb1-unknown
yann@402	798	+ ;;
yann@402	799	+ sb1el)
yann@402	800	+ basic_machine=mipsisa64sb1el-unknown
yann@402	801	+ ;;
yann@402	802	sequent)
yann@402	803	basic_machine=i386-sequent
yann@402	804	;;
yann@402	805	@@ -698,7 +843,7 @@
yann@402	806	basic_machine=sh-hitachi
yann@402	807	os=-hms
yann@402	808	;;
yann@402	809	- sparclite-wrs) # EGCS LOCAL
yann@402	810	+ sparclite-wrs \| simso-wrs)
yann@402	811	basic_machine=sparclite-wrs
yann@402	812	os=-vxworks
yann@402	813	;;
yann@402	814	@@ -709,10 +854,10 @@
yann@402	815	spur)
yann@402	816	basic_machine=spur-unknown
yann@402	817	;;
yann@402	818	- st2000) # EGCS LOCAL
yann@402	819	+ st2000)
yann@402	820	basic_machine=m68k-tandem
yann@402	821	;;
yann@402	822	- stratus) # EGCS LOCAL
yann@402	823	+ stratus)
yann@402	824	basic_machine=i860-stratus
yann@402	825	os=-sysv4
yann@402	826	;;
yann@402	827	@@ -756,16 +901,40 @@
yann@402	828	sun386 \| sun386i \| roadrunner)
yann@402	829	basic_machine=i386-sun
yann@402	830	;;
yann@402	831	+ sv1)
yann@402	832	+ basic_machine=sv1-cray
yann@402	833	+ os=-unicos
yann@402	834	+ ;;
yann@402	835	symmetry)
yann@402	836	basic_machine=i386-sequent
yann@402	837	os=-dynix
yann@402	838	;;
yann@402	839	+ t3e)
yann@402	840	+ basic_machine=alphaev5-cray
yann@402	841	+ os=-unicos
yann@402	842	+ ;;
yann@402	843	+ t90)
yann@402	844	+ basic_machine=t90-cray
yann@402	845	+ os=-unicos
yann@402	846	+ ;;
yann@402	847	+ tic4x \| c4x*)
yann@402	848	+ basic_machine=tic4x-unknown
yann@402	849	+ os=-coff
yann@402	850	+ ;;
yann@402	851	+ tic54x \| c54x*)
yann@402	852	+ basic_machine=tic54x-unknown
yann@402	853	+ os=-coff
yann@402	854	+ ;;
yann@402	855	tx39)
yann@402	856	basic_machine=mipstx39-unknown
yann@402	857	;;
yann@402	858	tx39el)
yann@402	859	basic_machine=mipstx39el-unknown
yann@402	860	;;
yann@402	861	+ toad1)
yann@402	862	+ basic_machine=pdp10-xkl
yann@402	863	+ os=-tops20
yann@402	864	+ ;;
yann@402	865	tower \| tower-32)
yann@402	866	basic_machine=m68k-ncr
yann@402	867	;;
yann@402	868	@@ -777,7 +946,7 @@
yann@402	869	basic_machine=a29k-nyu
yann@402	870	os=-sym1
yann@402	871	;;
yann@402	872	- v810 \| necv810) # EGCS LOCAL
yann@402	873	+ v810 \| necv810)
yann@402	874	basic_machine=v810-nec
yann@402	875	os=-none
yann@402	876	;;
yann@402	877	@@ -790,8 +959,8 @@
yann@402	878	os=-vms
yann@402	879	;;
yann@402	880	vpp\|vx\|vx-)
yann@402	881	- basic_machine=f301-fujitsu
yann@402	882	- ;;
yann@402	883	+ basic_machine=f301-fujitsu
yann@402	884	+ ;;
yann@402	885	vxworks960)
yann@402	886	basic_machine=i960-wrs
yann@402	887	os=-vxworks
yann@402	888	@@ -804,18 +973,22 @@
yann@402	889	basic_machine=a29k-wrs
yann@402	890	os=-vxworks
yann@402	891	;;
yann@402	892	- w65*) # EGCS LOCAL
yann@402	893	- basic_machine=w65-wdc
yann@402	894	- os=-none
yann@402	895	+ w65*)
yann@402	896	+ basic_machine=w65-wdc
yann@402	897	+ os=-none
yann@402	898	;;
yann@402	899	- xmp)
yann@402	900	- basic_machine=xmp-cray
yann@402	901	- os=-unicos
yann@402	902	+ w89k-*)
yann@402	903	+ basic_machine=hppa1.1-winbond
yann@402	904	+ os=-proelf
yann@402	905	;;
yann@402	906	- xps \| xps100)
yann@402	907	+ xps \| xps100)
yann@402	908	basic_machine=xps100-honeywell
yann@402	909	;;
yann@402	910	- z8k-*-coff) # EGCS LOCAL
yann@402	911	+ ymp)
yann@402	912	+ basic_machine=ymp-cray
yann@402	913	+ os=-unicos
yann@402	914	+ ;;
yann@402	915	+ z8k-*-coff)
yann@402	916	basic_machine=z8k-unknown
yann@402	917	os=-sim
yann@402	918	;;
yann@402	919	@@ -826,22 +999,15 @@
yann@402	920
yann@402	921	# Here we handle the default manufacturer of certain CPU types. It is in
yann@402	922	# some cases the only manufacturer, in others, it is the most popular.
yann@402	923	- w89k) # EGCS LOCAL
yann@402	924	+ w89k)
yann@402	925	basic_machine=hppa1.1-winbond
yann@402	926	;;
yann@402	927	- op50n) # EGCS LOCAL
yann@402	928	+ op50n)
yann@402	929	basic_machine=hppa1.1-oki
yann@402	930	;;
yann@402	931	- op60c) # EGCS LOCAL
yann@402	932	+ op60c)
yann@402	933	basic_machine=hppa1.1-oki
yann@402	934	;;
yann@402	935	- mips)
yann@402	936	- if [ x$os = x-linux-gnu ]; then
yann@402	937	- basic_machine=mips-unknown
yann@402	938	- else
yann@402	939	- basic_machine=mips-mips
yann@402	940	- fi
yann@402	941	- ;;
yann@402	942	romp)
yann@402	943	basic_machine=romp-ibm
yann@402	944	;;
yann@402	945	@@ -851,16 +1017,26 @@
yann@402	946	vax)
yann@402	947	basic_machine=vax-dec
yann@402	948	;;
yann@402	949	+ pdp10)
yann@402	950	+ # there are many clones, so DEC is not a safe bet
yann@402	951	+ basic_machine=pdp10-unknown
yann@402	952	+ ;;
yann@402	953	pdp11)
yann@402	954	basic_machine=pdp11-dec
yann@402	955	;;
yann@402	956	we32k)
yann@402	957	basic_machine=we32k-att
yann@402	958	;;
yann@402	959	- sparc \| sparcv9)
yann@402	960	+ sh3 \| sh4 \| sh[34]eb \| sh[1234]le \| sh[23]ele)
yann@402	961	+ basic_machine=sh-unknown
yann@402	962	+ ;;
yann@402	963	+ sh64)
yann@402	964	+ basic_machine=sh64-unknown
yann@402	965	+ ;;
yann@402	966	+ sparc \| sparcv9 \| sparcv9b)
yann@402	967	basic_machine=sparc-sun
yann@402	968	;;
yann@402	969	- cydra)
yann@402	970	+ cydra)
yann@402	971	basic_machine=cydra-cydrome
yann@402	972	;;
yann@402	973	orion)
yann@402	974	@@ -869,16 +1045,15 @@
yann@402	975	orion105)
yann@402	976	basic_machine=clipper-highlevel
yann@402	977	;;
yann@402	978	- mac \| mpw \| mac-mpw) # EGCS LOCAL
yann@402	979	+ mac \| mpw \| mac-mpw)
yann@402	980	basic_machine=m68k-apple
yann@402	981	;;
yann@402	982	- pmac \| pmac-mpw) # EGCS LOCAL
yann@402	983	+ pmac \| pmac-mpw)
yann@402	984	basic_machine=powerpc-apple
yann@402	985	;;
yann@402	986	- c4x*)
yann@402	987	- basic_machine=c4x-none
yann@402	988	- os=-coff
yann@402	989	- ;;
yann@402	990	+ *-unknown)
yann@402	991	+ # Make sure to match an already-canonicalized machine name.
yann@402	992	+ ;;
yann@402	993	*)
yann@402	994	echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
yann@402	995	exit 1
yann@402	996	@@ -935,20 +1110,38 @@
yann@402	997	\| -lynxos* \| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
yann@402	998	\| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
yann@402	999	\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
yann@402	1000	+ \| -chorusos* \| -chorusrdb* \
yann@402	1001	\| -cygwin* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
yann@402	1002	\| -mingw32* \| -linux-gnu* \| -uxpv* \| -beos* \| -mpeix* \| -udk* \
yann@402	1003	- \| -interix* \| -uwin* )
yann@402	1004	+ \| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \
yann@402	1005	+ \| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \
yann@402	1006	+ \| -storm-chaos* \| -tops10* \| -tenex* \| -tops20* \| -its* \
yann@402	1007	+ \| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \
yann@402	1008	+ \| -morphos* \| -superux* \| -rtmk* \| -rtmk-nova* \| -windiss* \
yann@402	1009	+ \| -powermax* \| -dnix* \| -microbsd*)
yann@402	1010	# Remember, each alternative MUST END IN *, to match a version number.
yann@402	1011	;;
yann@402	1012	- # EGCS LOCAL
yann@402	1013	+ -qnx*)
yann@402	1014	+ case $basic_machine in
yann@402	1015	+ x86-* \| i86-)
yann@402	1016	+ ;;
yann@402	1017	+ *)
yann@402	1018	+ os=-nto$os
yann@402	1019	+ ;;
yann@402	1020	+ esac
yann@402	1021	+ ;;
yann@402	1022	+ -nto-qnx*)
yann@402	1023	+ ;;
yann@402	1024	+ -nto*)
yann@402	1025	+ os=`echo $os \| sed -e 's\|nto\|nto-qnx\|'`
yann@402	1026	+ ;;
yann@402	1027	-sim \| -es1800* \| -hms* \| -xray \| -os68k* \| -none* \| -v88r* \
yann@402	1028	- \| -windows* \| -osx \| -abug \| -netware* \| -os9* \| -beos* \
yann@402	1029	- \| -macos* \| -mpw* \| -magic* \| -mon960* \| -lnews* )
yann@402	1030	+ \| -windows* \| -osx \| -abug \| -netware* \| -os9* \| -beos* \
yann@402	1031	+ \| -macos* \| -mpw* \| -magic* \| -mmixware* \| -mon960* \| -lnews*)
yann@402	1032	;;
yann@402	1033	-mac*)
yann@402	1034	os=`echo $os \| sed -e 's\|mac\|macos\|'`
yann@402	1035	;;
yann@402	1036	- # END EGCS LOCAL
yann@402	1037	-linux*)
yann@402	1038	os=`echo $os \| sed -e 's\|linux\|linux-gnu\|'`
yann@402	1039	;;
yann@402	1040	@@ -958,6 +1151,12 @@
yann@402	1041	-sunos6*)
yann@402	1042	os=`echo $os \| sed -e 's\|sunos6\|solaris3\|'`
yann@402	1043	;;
yann@402	1044	+ -opened*)
yann@402	1045	+ os=-openedition
yann@402	1046	+ ;;
yann@402	1047	+ -wince*)
yann@402	1048	+ os=-wince
yann@402	1049	+ ;;
yann@402	1050	-osfrose*)
yann@402	1051	os=-osfrose
yann@402	1052	;;
yann@402	1053	@@ -973,14 +1172,23 @@
yann@402	1054	-acis*)
yann@402	1055	os=-aos
yann@402	1056	;;
yann@402	1057	- -386bsd) # EGCS LOCAL
yann@402	1058	+ -atheos*)
yann@402	1059	+ os=-atheos
yann@402	1060	+ ;;
yann@402	1061	+ -386bsd)
yann@402	1062	os=-bsd
yann@402	1063	;;
yann@402	1064	-ctix* \| -uts*)
yann@402	1065	os=-sysv
yann@402	1066	;;
yann@402	1067	+ -nova*)
yann@402	1068	+ os=-rtmk-nova
yann@402	1069	+ ;;
yann@402	1070	-ns2 )
yann@402	1071	- os=-nextstep2
yann@402	1072	+ os=-nextstep2
yann@402	1073	+ ;;
yann@402	1074	+ -nsk*)
yann@402	1075	+ os=-nsk
yann@402	1076	;;
yann@402	1077	# Preserve the version number of sinix5.
yann@402	1078	-sinix5.*)
yann@402	1079	@@ -1007,15 +1215,21 @@
yann@402	1080	# This must come after -sysvr4.
yann@402	1081	-sysv*)
yann@402	1082	;;
yann@402	1083	- -ose*) # EGCS LOCAL
yann@402	1084	+ -ose*)
yann@402	1085	os=-ose
yann@402	1086	;;
yann@402	1087	- -es1800*) # EGCS LOCAL
yann@402	1088	+ -es1800*)
yann@402	1089	os=-ose
yann@402	1090	;;
yann@402	1091	-xenix)
yann@402	1092	os=-xenix
yann@402	1093	;;
yann@402	1094	+ -mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
yann@402	1095	+ os=-mint
yann@402	1096	+ ;;
yann@402	1097	+ -aros*)
yann@402	1098	+ os=-aros
yann@402	1099	+ ;;
yann@402	1100	-none)
yann@402	1101	;;
yann@402	1102	*)
yann@402	1103	@@ -1041,13 +1255,17 @@
yann@402	1104	*-acorn)
yann@402	1105	os=-riscix1.2
yann@402	1106	;;
yann@402	1107	- arm*-corel)
yann@402	1108	+ arm*-rebel)
yann@402	1109	os=-linux
yann@402	1110	;;
yann@402	1111	arm*-semi)
yann@402	1112	os=-aout
yann@402	1113	;;
yann@402	1114	- pdp11-*)
yann@402	1115	+ # This must come before the *-dec entry.
yann@402	1116	+ pdp10-*)
yann@402	1117	+ os=-tops20
yann@402	1118	+ ;;
yann@402	1119	+ pdp11-*)
yann@402	1120	os=-none
yann@402	1121	;;
yann@402	1122	-dec \| vax-)
yann@402	1123	@@ -1065,15 +1283,18 @@
yann@402	1124	# default.
yann@402	1125	# os=-sunos4
yann@402	1126	;;
yann@402	1127	- m68*-cisco) # EGCS LOCAL
yann@402	1128	+ m68*-cisco)
yann@402	1129	os=-aout
yann@402	1130	;;
yann@402	1131	- mips*-cisco) # EGCS LOCAL
yann@402	1132	+ mips*-cisco)
yann@402	1133	os=-elf
yann@402	1134	;;
yann@402	1135	- mips-) # EGCS LOCAL
yann@402	1136	- os=-elf
yann@402	1137	- ;;
yann@402	1138	+ mips-)
yann@402	1139	+ os=-elf
yann@402	1140	+ ;;
yann@402	1141	+ or32-*)
yann@402	1142	+ os=-coff
yann@402	1143	+ ;;
yann@402	1144	*-tti) # must be before sparc entry or we get the wrong os.
yann@402	1145	os=-sysv3
yann@402	1146	;;
yann@402	1147	@@ -1086,13 +1307,13 @@
yann@402	1148	*-ibm)
yann@402	1149	os=-aix
yann@402	1150	;;
yann@402	1151	- *-wec) # EGCS LOCAL
yann@402	1152	+ *-wec)
yann@402	1153	os=-proelf
yann@402	1154	;;
yann@402	1155	- *-winbond) # EGCS LOCAL
yann@402	1156	+ *-winbond)
yann@402	1157	os=-proelf
yann@402	1158	;;
yann@402	1159	- *-oki) # EGCS LOCAL
yann@402	1160	+ *-oki)
yann@402	1161	os=-proelf
yann@402	1162	;;
yann@402	1163	*-hp)
yann@402	1164	@@ -1137,36 +1358,39 @@
yann@402	1165	*-next)
yann@402	1166	os=-nextstep3
yann@402	1167	;;
yann@402	1168	- *-gould)
yann@402	1169	+ *-gould)
yann@402	1170	os=-sysv
yann@402	1171	;;
yann@402	1172	- *-highlevel)
yann@402	1173	+ *-highlevel)
yann@402	1174	os=-bsd
yann@402	1175	;;
yann@402	1176	*-encore)
yann@402	1177	os=-bsd
yann@402	1178	;;
yann@402	1179	- *-sgi)
yann@402	1180	+ *-sgi)
yann@402	1181	os=-irix
yann@402	1182	;;
yann@402	1183	- *-siemens)
yann@402	1184	+ *-siemens)
yann@402	1185	os=-sysv4
yann@402	1186	;;
yann@402	1187	*-masscomp)
yann@402	1188	os=-rtu
yann@402	1189	;;
yann@402	1190	- f301-fujitsu)
yann@402	1191	+ f30[01]-fujitsu \| f700-fujitsu)
yann@402	1192	os=-uxpv
yann@402	1193	;;
yann@402	1194	- *-rom68k) # EGCS LOCAL
yann@402	1195	+ *-rom68k)
yann@402	1196	os=-coff
yann@402	1197	;;
yann@402	1198	- -bug) # EGCS LOCAL
yann@402	1199	+ -bug)
yann@402	1200	os=-coff
yann@402	1201	;;
yann@402	1202	- *-apple) # EGCS LOCAL
yann@402	1203	+ *-apple)
yann@402	1204	os=-macos
yann@402	1205	;;
yann@402	1206	+ -atari)
yann@402	1207	+ os=-mint
yann@402	1208	+ ;;
yann@402	1209	*)
yann@402	1210	os=-none
yann@402	1211	;;
yann@402	1212	@@ -1212,27 +1436,41 @@
yann@402	1213	-genix*)
yann@402	1214	vendor=ns
yann@402	1215	;;
yann@402	1216	- -mvs*)
yann@402	1217	+ -mvs* \| -opened*)
yann@402	1218	vendor=ibm
yann@402	1219	;;
yann@402	1220	-ptx*)
yann@402	1221	vendor=sequent
yann@402	1222	;;
yann@402	1223	- -vxsim* \| -vxworks*)
yann@402	1224	+ -vxsim* \| -vxworks* \| -windiss*)
yann@402	1225	vendor=wrs
yann@402	1226	;;
yann@402	1227	-aux*)
yann@402	1228	vendor=apple
yann@402	1229	;;
yann@402	1230	- -hms*) # EGCS LOCAL
yann@402	1231	+ -hms*)
yann@402	1232	vendor=hitachi
yann@402	1233	;;
yann@402	1234	- -mpw* \| -macos*) # EGCS LOCAL
yann@402	1235	+ -mpw* \| -macos*)
yann@402	1236	vendor=apple
yann@402	1237	;;
yann@402	1238	+ -mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
yann@402	1239	+ vendor=atari
yann@402	1240	+ ;;
yann@402	1241	+ -vos*)
yann@402	1242	+ vendor=stratus
yann@402	1243	+ ;;
yann@402	1244	esac
yann@402	1245	basic_machine=`echo $basic_machine \| sed "s/unknown/$vendor/"`
yann@402	1246	;;
yann@402	1247	esac
yann@402	1248
yann@402	1249	echo $basic_machine$os
yann@402	1250	+exit 0
yann@402	1251	+
yann@402	1252	+# Local variables:
yann@402	1253	+# eval: (add-hook 'write-file-hooks 'time-stamp)
yann@402	1254	+# time-stamp-start: "timestamp='"
yann@402	1255	+# time-stamp-format: "%:y-%02m-%02d"
yann@402	1256	+# time-stamp-end: "'"
yann@402	1257	+# End:

author	"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
	Sun Feb 17 22:08:06 2008 +0000 (2008-02-17)
changeset 431	8bde4c6ea47a
permissions	-rw-r--r--