patches/glibc/2.1.3/backport-config.sub.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Feb 24 11:00:05 2007 +0000 (2007-02-24)
changeset 1 eeea35fbf182
permissions -rw-r--r--
Add the full crosstool-NG sources to the new repository of its own.
You might just say: 'Yeah! crosstool-NG's got its own repo!".
Unfortunately, that's because the previous repo got damaged beyond repair and I had no backup.
That means I'm putting backups in place in the afternoon.
That also means we've lost history... :-(
yann@1
     1
# Backport glibc-2.3.2's config.sub to glibc-2.1.3 
yann@1
     2
# Should fix nonfatal but annoying like
yann@1
     3
#   checking build system type... Invalid configuration `x86_64-unknown-linux-gnu': machine `x86_64-unknown' not recognized
yann@1
     4
#   ../glibc-2.1.3/configure: line 1227: test: i686-unknown-linux-gnu: unary operator expected
yann@1
     5
#   checking build system type... Configuration name missing.
yann@1
     6
yann@1
     7
yann@1
     8
--- glibc-2.1.3/scripts/config.sub	2004-03-24 13:27:06.000000000 -0800
yann@1
     9
+++ glibc-2.3.2/scripts/config.sub	2002-07-10 00:24:32.000000000 -0700
yann@1
    10
@@ -1,6 +1,10 @@
yann@1
    11
 #! /bin/sh
yann@1
    12
-# Configuration validation subroutine script, version 1.1.
yann@1
    13
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
yann@1
    14
+# Configuration validation subroutine script.
yann@1
    15
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
yann@1
    16
+#   2000, 2001, 2002 Free Software Foundation, Inc.
yann@1
    17
+
yann@1
    18
+timestamp='2002-07-03'
yann@1
    19
+
yann@1
    20
 # This file is (in principle) common to ALL GNU software.
yann@1
    21
 # The presence of a machine in this file suggests that SOME GNU software
yann@1
    22
 # can handle that machine.  It does not imply ALL GNU software can.
yann@1
    23
@@ -25,6 +29,9 @@
yann@1
    24
 # configuration script generated by Autoconf, you may include it under
yann@1
    25
 # the same distribution terms that you use for the rest of that program.
yann@1
    26
 
yann@1
    27
+# Please send patches to <config-patches@gnu.org>.  Submit a context
yann@1
    28
+# diff and a properly formatted ChangeLog entry.
yann@1
    29
+#
yann@1
    30
 # Configuration subroutine to validate and canonicalize a configuration type.
yann@1
    31
 # Supply the specified configuration type as an argument.
yann@1
    32
 # If it is invalid, we print an error message on stderr and exit with code 1.
yann@1
    33
@@ -45,30 +52,73 @@
yann@1
    34
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
yann@1
    35
 # It is wrong to echo any other type of specification.
yann@1
    36
 
yann@1
    37
-if [ x$1 = x ]
yann@1
    38
-then
yann@1
    39
-	echo Configuration name missing. 1>&2
yann@1
    40
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
yann@1
    41
-	echo "or     $0 ALIAS" 1>&2
yann@1
    42
-	echo where ALIAS is a recognized configuration type. 1>&2
yann@1
    43
-	exit 1
yann@1
    44
-fi
yann@1
    45
+me=`echo "$0" | sed -e 's,.*/,,'`
yann@1
    46
 
yann@1
    47
-# First pass through any local machine types.
yann@1
    48
-case $1 in
yann@1
    49
-	*local*)
yann@1
    50
-		echo $1
yann@1
    51
-		exit 0
yann@1
    52
-		;;
yann@1
    53
-	*)
yann@1
    54
-	;;
yann@1
    55
+usage="\
yann@1
    56
+Usage: $0 [OPTION] CPU-MFR-OPSYS
yann@1
    57
+       $0 [OPTION] ALIAS
yann@1
    58
+
yann@1
    59
+Canonicalize a configuration name.
yann@1
    60
+
yann@1
    61
+Operation modes:
yann@1
    62
+  -h, --help         print this help, then exit
yann@1
    63
+  -t, --time-stamp   print date of last modification, then exit
yann@1
    64
+  -v, --version      print version number, then exit
yann@1
    65
+
yann@1
    66
+Report bugs and patches to <config-patches@gnu.org>."
yann@1
    67
+
yann@1
    68
+version="\
yann@1
    69
+GNU config.sub ($timestamp)
yann@1
    70
+
yann@1
    71
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
yann@1
    72
+Free Software Foundation, Inc.
yann@1
    73
+
yann@1
    74
+This is free software; see the source for copying conditions.  There is NO
yann@1
    75
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
yann@1
    76
+
yann@1
    77
+help="
yann@1
    78
+Try \`$me --help' for more information."
yann@1
    79
+
yann@1
    80
+# Parse command line
yann@1
    81
+while test $# -gt 0 ; do
yann@1
    82
+  case $1 in
yann@1
    83
+    --time-stamp | --time* | -t )
yann@1
    84
+       echo "$timestamp" ; exit 0 ;;
yann@1
    85
+    --version | -v )
yann@1
    86
+       echo "$version" ; exit 0 ;;
yann@1
    87
+    --help | --h* | -h )
yann@1
    88
+       echo "$usage"; exit 0 ;;
yann@1
    89
+    -- )     # Stop option processing
yann@1
    90
+       shift; break ;;
yann@1
    91
+    - )	# Use stdin as input.
yann@1
    92
+       break ;;
yann@1
    93
+    -* )
yann@1
    94
+       echo "$me: invalid option $1$help"
yann@1
    95
+       exit 1 ;;
yann@1
    96
+
yann@1
    97
+    *local*)
yann@1
    98
+       # First pass through any local machine types.
yann@1
    99
+       echo $1
yann@1
   100
+       exit 0;;
yann@1
   101
+
yann@1
   102
+    * )
yann@1
   103
+       break ;;
yann@1
   104
+  esac
yann@1
   105
+done
yann@1
   106
+
yann@1
   107
+case $# in
yann@1
   108
+ 0) echo "$me: missing argument$help" >&2
yann@1
   109
+    exit 1;;
yann@1
   110
+ 1) ;;
yann@1
   111
+ *) echo "$me: too many arguments$help" >&2
yann@1
   112
+    exit 1;;
yann@1
   113
 esac
yann@1
   114
 
yann@1
   115
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
yann@1
   116
 # Here we must recognize all the valid KERNEL-OS combinations.
yann@1
   117
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
yann@1
   118
 case $maybe_os in
yann@1
   119
-  linux-gnu*)
yann@1
   120
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
yann@1
   121
     os=-$maybe_os
yann@1
   122
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
yann@1
   123
     ;;
yann@1
   124
@@ -94,7 +144,7 @@
yann@1
   125
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
yann@1
   126
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
yann@1
   127
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
yann@1
   128
-	-apple)
yann@1
   129
+	-apple | -axis)
yann@1
   130
 		os=
yann@1
   131
 		basic_machine=$1
yann@1
   132
 		;;
yann@1
   133
@@ -108,6 +158,14 @@
yann@1
   134
 		os=-vxworks
yann@1
   135
 		basic_machine=$1
yann@1
   136
 		;;
yann@1
   137
+	-chorusos*)
yann@1
   138
+		os=-chorusos
yann@1
   139
+		basic_machine=$1
yann@1
   140
+		;;
yann@1
   141
+ 	-chorusrdb)
yann@1
   142
+ 		os=-chorusrdb
yann@1
   143
+		basic_machine=$1
yann@1
   144
+ 		;;
yann@1
   145
 	-hiux*)
yann@1
   146
 		os=-hiuxwe2
yann@1
   147
 		;;
yann@1
   148
@@ -166,27 +224,58 @@
yann@1
   149
 case $basic_machine in
yann@1
   150
 	# Recognize the basic CPU types without company name.
yann@1
   151
 	# Some are omitted here because they have special meanings below.
yann@1
   152
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
yann@1
   153
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
yann@1
   154
-		| 580 | i960 | h8300 \
yann@1
   155
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
yann@1
   156
-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
yann@1
   157
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
yann@1
   158
-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
yann@1
   159
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
yann@1
   160
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
yann@1
   161
-		| mips64vr5000 | miprs64vr5000el | mcore \
yann@1
   162
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
yann@1
   163
-		| thumb | d10v | fr30)
yann@1
   164
+	1750a | 580 \
yann@1
   165
+	| a29k \
yann@1
   166
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
yann@1
   167
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
yann@1
   168
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
yann@1
   169
+	| c4x | clipper \
yann@1
   170
+	| d10v | d30v | dlx | dsp16xx \
yann@1
   171
+	| fr30 | frv \
yann@1
   172
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
yann@1
   173
+	| i370 | i860 | i960 | ia64 \
yann@1
   174
+	| ip2k \
yann@1
   175
+	| m32r | m68000 | m68k | m88k | mcore \
yann@1
   176
+	| mips | mipsbe | mipseb | mipsel | mipsle \
yann@1
   177
+	| mips16 \
yann@1
   178
+	| mips64 | mips64el \
yann@1
   179
+	| mips64orion | mips64orionel \
yann@1
   180
+	| mips64vr4100 | mips64vr4100el \
yann@1
   181
+	| mips64vr4300 | mips64vr4300el \
yann@1
   182
+	| mips64vr5000 | mips64vr5000el \
yann@1
   183
+	| mipsisa32 | mipsisa32el \
yann@1
   184
+	| mipsisa64 | mipsisa64el \
yann@1
   185
+	| mipsisa64sb1 | mipsisa64sb1el \
yann@1
   186
+	| mipstx39 | mipstx39el \
yann@1
   187
+	| mn10200 | mn10300 \
yann@1
   188
+	| ns16k | ns32k \
yann@1
   189
+	| openrisc | or32 \
yann@1
   190
+	| pdp10 | pdp11 | pj | pjl \
yann@1
   191
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
yann@1
   192
+	| pyramid \
yann@1
   193
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
yann@1
   194
+	| sh64 | sh64le \
yann@1
   195
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
yann@1
   196
+	| strongarm \
yann@1
   197
+	| tahoe | thumb | tic80 | tron \
yann@1
   198
+	| v850 | v850e \
yann@1
   199
+	| we32k \
yann@1
   200
+	| x86 | xscale | xstormy16 | xtensa \
yann@1
   201
+	| z8k)
yann@1
   202
+		basic_machine=$basic_machine-unknown
yann@1
   203
+		;;
yann@1
   204
+	m6811 | m68hc11 | m6812 | m68hc12)
yann@1
   205
+		# Motorola 68HC11/12.
yann@1
   206
 		basic_machine=$basic_machine-unknown
yann@1
   207
+		os=-none
yann@1
   208
 		;;
yann@1
   209
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
yann@1
   210
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
yann@1
   211
 		;;
yann@1
   212
 
yann@1
   213
 	# We use `pc' rather than `unknown'
yann@1
   214
 	# because (1) that's what they normally are, and
yann@1
   215
 	# (2) the word "unknown" tends to confuse beginning users.
yann@1
   216
-	i[34567]86)
yann@1
   217
+	i*86 | x86_64)
yann@1
   218
 	  basic_machine=$basic_machine-pc
yann@1
   219
 	  ;;
yann@1
   220
 	# Object if more than one company name word.
yann@1
   221
@@ -195,24 +284,54 @@
yann@1
   222
 		exit 1
yann@1
   223
 		;;
yann@1
   224
 	# Recognize the basic CPU types with company name.
yann@1
   225
-	# FIXME: clean up the formatting here.
yann@1
   226
-	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
yann@1
   227
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
yann@1
   228
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
yann@1
   229
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
yann@1
   230
-	      | xmp-* | ymp-* \
yann@1
   231
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
yann@1
   232
-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
yann@1
   233
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
yann@1
   234
-	      | clipper-* | orion-* \
yann@1
   235
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
yann@1
   236
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
yann@1
   237
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
yann@1
   238
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
yann@1
   239
-	      | mipstx39-* | mipstx39el-* | mcore-* \
yann@1
   240
-	      | f301-* | armv*-* | t3e-* \
yann@1
   241
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
yann@1
   242
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
yann@1
   243
+	580-* \
yann@1
   244
+	| a29k-* \
yann@1
   245
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
yann@1
   246
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
yann@1
   247
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
yann@1
   248
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
yann@1
   249
+	| avr-* \
yann@1
   250
+	| bs2000-* \
yann@1
   251
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
yann@1
   252
+	| clipper-* | cydra-* \
yann@1
   253
+	| d10v-* | d30v-* | dlx-* \
yann@1
   254
+	| elxsi-* \
yann@1
   255
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
yann@1
   256
+	| h8300-* | h8500-* \
yann@1
   257
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
yann@1
   258
+	| i*86-* | i860-* | i960-* | ia64-* \
yann@1
   259
+	| ip2k-* \
yann@1
   260
+	| m32r-* \
yann@1
   261
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
yann@1
   262
+	| m88110-* | m88k-* | mcore-* \
yann@1
   263
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
yann@1
   264
+	| mips16-* \
yann@1
   265
+	| mips64-* | mips64el-* \
yann@1
   266
+	| mips64orion-* | mips64orionel-* \
yann@1
   267
+	| mips64vr4100-* | mips64vr4100el-* \
yann@1
   268
+	| mips64vr4300-* | mips64vr4300el-* \
yann@1
   269
+	| mips64vr5000-* | mips64vr5000el-* \
yann@1
   270
+	| mipsisa32-* | mipsisa32el-* \
yann@1
   271
+	| mipsisa64-* | mipsisa64el-* \
yann@1
   272
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
yann@1
   273
+	| mipstx39 | mipstx39el \
yann@1
   274
+	| none-* | np1-* | ns16k-* | ns32k-* \
yann@1
   275
+	| orion-* \
yann@1
   276
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
yann@1
   277
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
yann@1
   278
+	| pyramid-* \
yann@1
   279
+	| romp-* | rs6000-* \
yann@1
   280
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
yann@1
   281
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
yann@1
   282
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
yann@1
   283
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
yann@1
   284
+	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
yann@1
   285
+	| v850-* | v850e-* | vax-* \
yann@1
   286
+	| we32k-* \
yann@1
   287
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
yann@1
   288
+	| xtensa-* \
yann@1
   289
+	| ymp-* \
yann@1
   290
+	| z8k-*)
yann@1
   291
 		;;
yann@1
   292
 	# Recognize the various machine names and aliases which stand
yann@1
   293
 	# for a CPU type and a company and sometimes even an OS.
yann@1
   294
@@ -249,14 +368,14 @@
yann@1
   295
 		os=-sysv
yann@1
   296
 		;;
yann@1
   297
 	amiga | amiga-*)
yann@1
   298
-		basic_machine=m68k-cbm
yann@1
   299
+		basic_machine=m68k-unknown
yann@1
   300
 		;;
yann@1
   301
 	amigaos | amigados)
yann@1
   302
-		basic_machine=m68k-cbm
yann@1
   303
+		basic_machine=m68k-unknown
yann@1
   304
 		os=-amigaos
yann@1
   305
 		;;
yann@1
   306
 	amigaunix | amix)
yann@1
   307
-		basic_machine=m68k-cbm
yann@1
   308
+		basic_machine=m68k-unknown
yann@1
   309
 		os=-sysv4
yann@1
   310
 		;;
yann@1
   311
 	apollo68)
yann@1
   312
@@ -275,6 +394,10 @@
yann@1
   313
 		basic_machine=ns32k-sequent
yann@1
   314
 		os=-dynix
yann@1
   315
 		;;
yann@1
   316
+	c90)
yann@1
   317
+		basic_machine=c90-cray
yann@1
   318
+		os=-unicos
yann@1
   319
+		;;
yann@1
   320
 	convex-c1)
yann@1
   321
 		basic_machine=c1-convex
yann@1
   322
 		os=-bsd
yann@1
   323
@@ -295,27 +418,30 @@
yann@1
   324
 		basic_machine=c38-convex
yann@1
   325
 		os=-bsd
yann@1
   326
 		;;
yann@1
   327
-	cray | ymp)
yann@1
   328
-		basic_machine=ymp-cray
yann@1
   329
-		os=-unicos
yann@1
   330
-		;;
yann@1
   331
-	cray2)
yann@1
   332
-		basic_machine=cray2-cray
yann@1
   333
-		os=-unicos
yann@1
   334
-		;;
yann@1
   335
-	[ctj]90-cray)
yann@1
   336
-		basic_machine=c90-cray
yann@1
   337
+	cray | j90)
yann@1
   338
+		basic_machine=j90-cray
yann@1
   339
 		os=-unicos
yann@1
   340
 		;;
yann@1
   341
 	crds | unos)
yann@1
   342
 		basic_machine=m68k-crds
yann@1
   343
 		;;
yann@1
   344
+	cris | cris-* | etrax*)
yann@1
   345
+		basic_machine=cris-axis
yann@1
   346
+		;;
yann@1
   347
 	da30 | da30-*)
yann@1
   348
 		basic_machine=m68k-da30
yann@1
   349
 		;;
yann@1
   350
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
yann@1
   351
 		basic_machine=mips-dec
yann@1
   352
 		;;
yann@1
   353
+	decsystem10* | dec10*)
yann@1
   354
+		basic_machine=pdp10-dec
yann@1
   355
+		os=-tops10
yann@1
   356
+		;;
yann@1
   357
+	decsystem20* | dec20*)
yann@1
   358
+		basic_machine=pdp10-dec
yann@1
   359
+		os=-tops20
yann@1
   360
+		;;
yann@1
   361
 	delta | 3300 | motorola-3300 | motorola-delta \
yann@1
   362
 	      | 3300-motorola | delta-motorola)
yann@1
   363
 		basic_machine=m68k-motorola
yann@1
   364
@@ -357,6 +483,10 @@
yann@1
   365
 		basic_machine=tron-gmicro
yann@1
   366
 		os=-sysv
yann@1
   367
 		;;
yann@1
   368
+	go32)
yann@1
   369
+		basic_machine=i386-pc
yann@1
   370
+		os=-go32
yann@1
   371
+		;;
yann@1
   372
 	h3050r* | hiux*)
yann@1
   373
 		basic_machine=hppa1.1-hitachi
yann@1
   374
 		os=-hiuxwe2
yann@1
   375
@@ -432,19 +562,19 @@
yann@1
   376
 		basic_machine=i370-ibm
yann@1
   377
 		;;
yann@1
   378
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
yann@1
   379
-	i[34567]86v32)
yann@1
   380
+	i*86v32)
yann@1
   381
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
yann@1
   382
 		os=-sysv32
yann@1
   383
 		;;
yann@1
   384
-	i[34567]86v4*)
yann@1
   385
+	i*86v4*)
yann@1
   386
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
yann@1
   387
 		os=-sysv4
yann@1
   388
 		;;
yann@1
   389
-	i[34567]86v)
yann@1
   390
+	i*86v)
yann@1
   391
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
yann@1
   392
 		os=-sysv
yann@1
   393
 		;;
yann@1
   394
-	i[34567]86sol2)
yann@1
   395
+	i*86sol2)
yann@1
   396
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
yann@1
   397
 		os=-solaris2
yann@1
   398
 		;;
yann@1
   399
@@ -456,17 +586,6 @@
yann@1
   400
 		basic_machine=i386-unknown
yann@1
   401
 		os=-vsta
yann@1
   402
 		;;
yann@1
   403
-	i386-go32 | go32)
yann@1
   404
-		basic_machine=i386-unknown
yann@1
   405
-		os=-go32
yann@1
   406
-		;;
yann@1
   407
-	i386-mingw32 | mingw32)
yann@1
   408
-		basic_machine=i386-unknown
yann@1
   409
-		os=-mingw32
yann@1
   410
-		;;
yann@1
   411
-	i386-qnx | qnx)
yann@1
   412
-		basic_machine=i386-qnx
yann@1
   413
-		;;
yann@1
   414
 	iris | iris4d)
yann@1
   415
 		basic_machine=mips-sgi
yann@1
   416
 		case $os in
yann@1
   417
@@ -492,6 +611,10 @@
yann@1
   418
 		basic_machine=ns32k-utek
yann@1
   419
 		os=-sysv
yann@1
   420
 		;;
yann@1
   421
+	mingw32)
yann@1
   422
+		basic_machine=i386-pc
yann@1
   423
+		os=-mingw32
yann@1
   424
+		;;
yann@1
   425
 	miniframe)
yann@1
   426
 		basic_machine=m68000-convergent
yann@1
   427
 		;;
yann@1
   428
@@ -499,26 +622,26 @@
yann@1
   429
 		basic_machine=m68k-atari
yann@1
   430
 		os=-mint
yann@1
   431
 		;;
yann@1
   432
-	mipsel*-linux*)
yann@1
   433
-		basic_machine=mipsel-unknown
yann@1
   434
-		os=-linux-gnu
yann@1
   435
-		;;
yann@1
   436
-	mips*-linux*)
yann@1
   437
-		basic_machine=mips-unknown
yann@1
   438
-		os=-linux-gnu
yann@1
   439
-		;;
yann@1
   440
 	mips3*-*)
yann@1
   441
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
yann@1
   442
 		;;
yann@1
   443
 	mips3*)
yann@1
   444
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
yann@1
   445
 		;;
yann@1
   446
+	mmix*)
yann@1
   447
+		basic_machine=mmix-knuth
yann@1
   448
+		os=-mmixware
yann@1
   449
+		;;
yann@1
   450
 	monitor)
yann@1
   451
 		basic_machine=m68k-rom68k
yann@1
   452
 		os=-coff
yann@1
   453
 		;;
yann@1
   454
+	morphos)
yann@1
   455
+		basic_machine=powerpc-unknown
yann@1
   456
+		os=-morphos
yann@1
   457
+		;;
yann@1
   458
 	msdos)
yann@1
   459
-		basic_machine=i386-unknown
yann@1
   460
+		basic_machine=i386-pc
yann@1
   461
 		os=-msdos
yann@1
   462
 		;;
yann@1
   463
 	mvs)
yann@1
   464
@@ -582,13 +705,24 @@
yann@1
   465
 		basic_machine=i960-intel
yann@1
   466
 		os=-mon960
yann@1
   467
 		;;
yann@1
   468
+	nonstopux)
yann@1
   469
+		basic_machine=mips-compaq
yann@1
   470
+		os=-nonstopux
yann@1
   471
+		;;
yann@1
   472
 	np1)
yann@1
   473
 		basic_machine=np1-gould
yann@1
   474
 		;;
yann@1
   475
+	nsr-tandem)
yann@1
   476
+		basic_machine=nsr-tandem
yann@1
   477
+		;;
yann@1
   478
 	op50n-* | op60c-*)
yann@1
   479
 		basic_machine=hppa1.1-oki
yann@1
   480
 		os=-proelf
yann@1
   481
 		;;
yann@1
   482
+	or32 | or32-*)
yann@1
   483
+		basic_machine=or32-unknown
yann@1
   484
+		os=-coff
yann@1
   485
+		;;
yann@1
   486
 	OSE68000 | ose68000)
yann@1
   487
 		basic_machine=m68000-ericsson
yann@1
   488
 		os=-ose
yann@1
   489
@@ -614,28 +748,28 @@
yann@1
   490
         pc532 | pc532-*)
yann@1
   491
 		basic_machine=ns32k-pc532
yann@1
   492
 		;;
yann@1
   493
-	pentium | p5 | k5 | k6 | nexen)
yann@1
   494
+	pentium | p5 | k5 | k6 | nexgen | viac3)
yann@1
   495
 		basic_machine=i586-pc
yann@1
   496
 		;;
yann@1
   497
-	pentiumpro | p6 | 6x86)
yann@1
   498
+	pentiumpro | p6 | 6x86 | athlon)
yann@1
   499
 		basic_machine=i686-pc
yann@1
   500
 		;;
yann@1
   501
 	pentiumii | pentium2)
yann@1
   502
-		basic_machine=i786-pc
yann@1
   503
+		basic_machine=i686-pc
yann@1
   504
 		;;
yann@1
   505
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
yann@1
   506
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
yann@1
   507
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1
   508
 		;;
yann@1
   509
-	pentiumpro-* | p6-* | 6x86-*)
yann@1
   510
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
yann@1
   511
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1
   512
 		;;
yann@1
   513
 	pentiumii-* | pentium2-*)
yann@1
   514
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1
   515
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1
   516
 		;;
yann@1
   517
 	pn)
yann@1
   518
 		basic_machine=pn-gould
yann@1
   519
 		;;
yann@1
   520
-	power)	basic_machine=rs6000-ibm
yann@1
   521
+	power)	basic_machine=power-ibm
yann@1
   522
 		;;
yann@1
   523
 	ppc)	basic_machine=powerpc-unknown
yann@1
   524
 	        ;;
yann@1
   525
@@ -647,9 +781,23 @@
yann@1
   526
 	ppcle-* | powerpclittle-*)
yann@1
   527
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1
   528
 		;;
yann@1
   529
+	ppc64)	basic_machine=powerpc64-unknown
yann@1
   530
+	        ;;
yann@1
   531
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1
   532
+		;;
yann@1
   533
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
yann@1
   534
+		basic_machine=powerpc64le-unknown
yann@1
   535
+	        ;;
yann@1
   536
+	ppc64le-* | powerpc64little-*)
yann@1
   537
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
yann@1
   538
+		;;
yann@1
   539
 	ps2)
yann@1
   540
 		basic_machine=i386-ibm
yann@1
   541
 		;;
yann@1
   542
+	pw32)
yann@1
   543
+		basic_machine=i586-unknown
yann@1
   544
+		os=-pw32
yann@1
   545
+		;;
yann@1
   546
 	rom68k)
yann@1
   547
 		basic_machine=m68k-rom68k
yann@1
   548
 		os=-coff
yann@1
   549
@@ -660,6 +808,12 @@
yann@1
   550
 	rtpc | rtpc-*)
yann@1
   551
 		basic_machine=romp-ibm
yann@1
   552
 		;;
yann@1
   553
+	s390 | s390-*)
yann@1
   554
+		basic_machine=s390-ibm
yann@1
   555
+		;;
yann@1
   556
+	s390x | s390x-*)
yann@1
   557
+		basic_machine=s390x-ibm
yann@1
   558
+		;;
yann@1
   559
 	sa29200)
yann@1
   560
 		basic_machine=a29k-amd
yann@1
   561
 		os=-udi
yann@1
   562
@@ -671,7 +825,7 @@
yann@1
   563
 		basic_machine=sh-hitachi
yann@1
   564
 		os=-hms
yann@1
   565
 		;;
yann@1
   566
-	sparclite-wrs)
yann@1
   567
+	sparclite-wrs | simso-wrs)
yann@1
   568
 		basic_machine=sparclite-wrs
yann@1
   569
 		os=-vxworks
yann@1
   570
 		;;
yann@1
   571
@@ -729,20 +883,40 @@
yann@1
   572
 	sun386 | sun386i | roadrunner)
yann@1
   573
 		basic_machine=i386-sun
yann@1
   574
 		;;
yann@1
   575
+        sv1)
yann@1
   576
+		basic_machine=sv1-cray
yann@1
   577
+		os=-unicos
yann@1
   578
+		;;
yann@1
   579
 	symmetry)
yann@1
   580
 		basic_machine=i386-sequent
yann@1
   581
 		os=-dynix
yann@1
   582
 		;;
yann@1
   583
+	t3d)
yann@1
   584
+		basic_machine=alpha-cray
yann@1
   585
+		os=-unicos
yann@1
   586
+		;;
yann@1
   587
 	t3e)
yann@1
   588
-		basic_machine=t3e-cray
yann@1
   589
+		basic_machine=alphaev5-cray
yann@1
   590
+		os=-unicos
yann@1
   591
+		;;
yann@1
   592
+	t90)
yann@1
   593
+		basic_machine=t90-cray
yann@1
   594
 		os=-unicos
yann@1
   595
 		;;
yann@1
   596
+	tic54x | c54x*)
yann@1
   597
+		basic_machine=tic54x-unknown
yann@1
   598
+		os=-coff
yann@1
   599
+		;;
yann@1
   600
 	tx39)
yann@1
   601
 		basic_machine=mipstx39-unknown
yann@1
   602
 		;;
yann@1
   603
 	tx39el)
yann@1
   604
 		basic_machine=mipstx39el-unknown
yann@1
   605
 		;;
yann@1
   606
+	toad1)
yann@1
   607
+		basic_machine=pdp10-xkl
yann@1
   608
+		os=-tops20
yann@1
   609
+		;;
yann@1
   610
 	tower | tower-32)
yann@1
   611
 		basic_machine=m68k-ncr
yann@1
   612
 		;;
yann@1
   613
@@ -789,13 +963,17 @@
yann@1
   614
 		basic_machine=hppa1.1-winbond
yann@1
   615
 		os=-proelf
yann@1
   616
 		;;
yann@1
   617
-	xmp)
yann@1
   618
-		basic_machine=xmp-cray
yann@1
   619
-		os=-unicos
yann@1
   620
+	windows32)
yann@1
   621
+		basic_machine=i386-pc
yann@1
   622
+		os=-windows32-msvcrt
yann@1
   623
 		;;
yann@1
   624
         xps | xps100)
yann@1
   625
 		basic_machine=xps100-honeywell
yann@1
   626
 		;;
yann@1
   627
+	ymp)
yann@1
   628
+		basic_machine=ymp-cray
yann@1
   629
+		os=-unicos
yann@1
   630
+		;;
yann@1
   631
 	z8k-*-coff)
yann@1
   632
 		basic_machine=z8k-unknown
yann@1
   633
 		os=-sim
yann@1
   634
@@ -816,13 +994,6 @@
yann@1
   635
 	op60c)
yann@1
   636
 		basic_machine=hppa1.1-oki
yann@1
   637
 		;;
yann@1
   638
-	mips)
yann@1
   639
-		if [ x$os = x-linux-gnu ]; then
yann@1
   640
-			basic_machine=mips-unknown
yann@1
   641
-		else
yann@1
   642
-			basic_machine=mips-mips
yann@1
   643
-		fi
yann@1
   644
-		;;
yann@1
   645
 	romp)
yann@1
   646
 		basic_machine=romp-ibm
yann@1
   647
 		;;
yann@1
   648
@@ -832,13 +1003,23 @@
yann@1
   649
 	vax)
yann@1
   650
 		basic_machine=vax-dec
yann@1
   651
 		;;
yann@1
   652
+	pdp10)
yann@1
   653
+		# there are many clones, so DEC is not a safe bet
yann@1
   654
+		basic_machine=pdp10-unknown
yann@1
   655
+		;;
yann@1
   656
 	pdp11)
yann@1
   657
 		basic_machine=pdp11-dec
yann@1
   658
 		;;
yann@1
   659
 	we32k)
yann@1
   660
 		basic_machine=we32k-att
yann@1
   661
 		;;
yann@1
   662
-	sparc | sparcv9)
yann@1
   663
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
yann@1
   664
+		basic_machine=sh-unknown
yann@1
   665
+		;;
yann@1
   666
+	sh64)
yann@1
   667
+		basic_machine=sh64-unknown
yann@1
   668
+		;;
yann@1
   669
+	sparc | sparcv9 | sparcv9b)
yann@1
   670
 		basic_machine=sparc-sun
yann@1
   671
 		;;
yann@1
   672
         cydra)
yann@1
   673
@@ -860,6 +1041,9 @@
yann@1
   674
 		basic_machine=c4x-none
yann@1
   675
 		os=-coff
yann@1
   676
 		;;
yann@1
   677
+	*-unknown)
yann@1
   678
+		# Make sure to match an already-canonicalized machine name.
yann@1
   679
+		;;
yann@1
   680
 	*)
yann@1
   681
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
yann@1
   682
 		exit 1
yann@1
   683
@@ -916,14 +1100,31 @@
yann@1
   684
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
yann@1
   685
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
yann@1
   686
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
yann@1
   687
+	      | -chorusos* | -chorusrdb* \
yann@1
   688
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
yann@1
   689
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
yann@1
   690
-	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
yann@1
   691
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
yann@1
   692
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
yann@1
   693
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
yann@1
   694
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
yann@1
   695
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
yann@1
   696
 	# Remember, each alternative MUST END IN *, to match a version number.
yann@1
   697
 		;;
yann@1
   698
+	-qnx*)
yann@1
   699
+		case $basic_machine in
yann@1
   700
+		    x86-* | i*86-*)
yann@1
   701
+			;;
yann@1
   702
+		    *)
yann@1
   703
+			os=-nto$os
yann@1
   704
+			;;
yann@1
   705
+		esac
yann@1
   706
+		;;
yann@1
   707
+	-nto*)
yann@1
   708
+		os=-nto-qnx
yann@1
   709
+		;;
yann@1
   710
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
yann@1
   711
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
yann@1
   712
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
yann@1
   713
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
yann@1
   714
 		;;
yann@1
   715
 	-mac*)
yann@1
   716
 		os=`echo $os | sed -e 's|mac|macos|'`
yann@1
   717
@@ -940,6 +1141,9 @@
yann@1
   718
 	-opened*)
yann@1
   719
 		os=-openedition
yann@1
   720
 		;;
yann@1
   721
+	-wince*)
yann@1
   722
+		os=-wince
yann@1
   723
+		;;
yann@1
   724
 	-osfrose*)
yann@1
   725
 		os=-osfrose
yann@1
   726
 		;;
yann@1
   727
@@ -955,15 +1159,24 @@
yann@1
   728
 	-acis*)
yann@1
   729
 		os=-aos
yann@1
   730
 		;;
yann@1
   731
+	-atheos*)
yann@1
   732
+		os=-atheos
yann@1
   733
+		;;
yann@1
   734
 	-386bsd)
yann@1
   735
 		os=-bsd
yann@1
   736
 		;;
yann@1
   737
 	-ctix* | -uts*)
yann@1
   738
 		os=-sysv
yann@1
   739
 		;;
yann@1
   740
+	-nova*)
yann@1
   741
+		os=-rtmk-nova
yann@1
   742
+		;;
yann@1
   743
 	-ns2 )
yann@1
   744
 	        os=-nextstep2
yann@1
   745
 		;;
yann@1
   746
+	-nsk*)
yann@1
   747
+		os=-nsk
yann@1
   748
+		;;
yann@1
   749
 	# Preserve the version number of sinix5.
yann@1
   750
 	-sinix5.*)
yann@1
   751
 		os=`echo $os | sed -e 's|sinix|sysv|'`
yann@1
   752
@@ -977,9 +1190,6 @@
yann@1
   753
 	-oss*)
yann@1
   754
 		os=-sysv3
yann@1
   755
 		;;
yann@1
   756
-        -qnx)
yann@1
   757
-		os=-qnx4
yann@1
   758
-		;;
yann@1
   759
 	-svr4)
yann@1
   760
 		os=-sysv4
yann@1
   761
 		;;
yann@1
   762
@@ -1001,7 +1211,7 @@
yann@1
   763
 	-xenix)
yann@1
   764
 		os=-xenix
yann@1
   765
 		;;
yann@1
   766
-        -*mint | -*MiNT)
yann@1
   767
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
yann@1
   768
 	        os=-mint
yann@1
   769
 		;;
yann@1
   770
 	-none)
yann@1
   771
@@ -1035,6 +1245,10 @@
yann@1
   772
 	arm*-semi)
yann@1
   773
 		os=-aout
yann@1
   774
 		;;
yann@1
   775
+	# This must come before the *-dec entry.
yann@1
   776
+	pdp10-*)
yann@1
   777
+		os=-tops20
yann@1
   778
+		;;
yann@1
   779
         pdp11-*)
yann@1
   780
 		os=-none
yann@1
   781
 		;;
yann@1
   782
@@ -1062,6 +1276,9 @@
yann@1
   783
 	mips*-*)
yann@1
   784
 		os=-elf
yann@1
   785
 		;;
yann@1
   786
+	or32-*)
yann@1
   787
+		os=-coff
yann@1
   788
+		;;
yann@1
   789
 	*-tti)	# must be before sparc entry or we get the wrong os.
yann@1
   790
 		os=-sysv3
yann@1
   791
 		;;
yann@1
   792
@@ -1143,7 +1360,7 @@
yann@1
   793
 	*-masscomp)
yann@1
   794
 		os=-rtu
yann@1
   795
 		;;
yann@1
   796
-	f301-fujitsu)
yann@1
   797
+	f30[01]-fujitsu | f700-fujitsu)
yann@1
   798
 		os=-uxpv
yann@1
   799
 		;;
yann@1
   800
 	*-rom68k)
yann@1
   801
@@ -1209,7 +1426,7 @@
yann@1
   802
 			-ptx*)
yann@1
   803
 				vendor=sequent
yann@1
   804
 				;;
yann@1
   805
-			-vxsim* | -vxworks*)
yann@1
   806
+			-vxsim* | -vxworks* | -windiss*)
yann@1
   807
 				vendor=wrs
yann@1
   808
 				;;
yann@1
   809
 			-aux*)
yann@1
   810
@@ -1221,12 +1438,23 @@
yann@1
   811
 			-mpw* | -macos*)
yann@1
   812
 				vendor=apple
yann@1
   813
 				;;
yann@1
   814
-			-*mint | -*MiNT)
yann@1
   815
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
yann@1
   816
 				vendor=atari
yann@1
   817
 				;;
yann@1
   818
+			-vos*)
yann@1
   819
+				vendor=stratus
yann@1
   820
+				;;
yann@1
   821
 		esac
yann@1
   822
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
yann@1
   823
 		;;
yann@1
   824
 esac
yann@1
   825
 
yann@1
   826
 echo $basic_machine$os
yann@1
   827
+exit 0
yann@1
   828
+
yann@1
   829
+# Local variables:
yann@1
   830
+# eval: (add-hook 'write-file-hooks 'time-stamp)
yann@1
   831
+# time-stamp-start: "timestamp='"
yann@1
   832
+# time-stamp-format: "%:y-%02m-%02d"
yann@1
   833
+# time-stamp-end: "'"
yann@1
   834
+# End: