1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.1.3/backport-config.sub.patch Sat Feb 24 11:00:05 2007 +0000
1.3 @@ -0,0 +1,834 @@
1.4 +# Backport glibc-2.3.2's config.sub to glibc-2.1.3
1.5 +# Should fix nonfatal but annoying like
1.6 +# checking build system type... Invalid configuration `x86_64-unknown-linux-gnu': machine `x86_64-unknown' not recognized
1.7 +# ../glibc-2.1.3/configure: line 1227: test: i686-unknown-linux-gnu: unary operator expected
1.8 +# checking build system type... Configuration name missing.
1.9 +
1.10 +
1.11 +--- glibc-2.1.3/scripts/config.sub 2004-03-24 13:27:06.000000000 -0800
1.12 ++++ glibc-2.3.2/scripts/config.sub 2002-07-10 00:24:32.000000000 -0700
1.13 +@@ -1,6 +1,10 @@
1.14 + #! /bin/sh
1.15 +-# Configuration validation subroutine script, version 1.1.
1.16 +-# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
1.17 ++# Configuration validation subroutine script.
1.18 ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1.19 ++# 2000, 2001, 2002 Free Software Foundation, Inc.
1.20 ++
1.21 ++timestamp='2002-07-03'
1.22 ++
1.23 + # This file is (in principle) common to ALL GNU software.
1.24 + # The presence of a machine in this file suggests that SOME GNU software
1.25 + # can handle that machine. It does not imply ALL GNU software can.
1.26 +@@ -25,6 +29,9 @@
1.27 + # configuration script generated by Autoconf, you may include it under
1.28 + # the same distribution terms that you use for the rest of that program.
1.29 +
1.30 ++# Please send patches to <config-patches@gnu.org>. Submit a context
1.31 ++# diff and a properly formatted ChangeLog entry.
1.32 ++#
1.33 + # Configuration subroutine to validate and canonicalize a configuration type.
1.34 + # Supply the specified configuration type as an argument.
1.35 + # If it is invalid, we print an error message on stderr and exit with code 1.
1.36 +@@ -45,30 +52,73 @@
1.37 + # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
1.38 + # It is wrong to echo any other type of specification.
1.39 +
1.40 +-if [ x$1 = x ]
1.41 +-then
1.42 +- echo Configuration name missing. 1>&2
1.43 +- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
1.44 +- echo "or $0 ALIAS" 1>&2
1.45 +- echo where ALIAS is a recognized configuration type. 1>&2
1.46 +- exit 1
1.47 +-fi
1.48 ++me=`echo "$0" | sed -e 's,.*/,,'`
1.49 +
1.50 +-# First pass through any local machine types.
1.51 +-case $1 in
1.52 +- *local*)
1.53 +- echo $1
1.54 +- exit 0
1.55 +- ;;
1.56 +- *)
1.57 +- ;;
1.58 ++usage="\
1.59 ++Usage: $0 [OPTION] CPU-MFR-OPSYS
1.60 ++ $0 [OPTION] ALIAS
1.61 ++
1.62 ++Canonicalize a configuration name.
1.63 ++
1.64 ++Operation modes:
1.65 ++ -h, --help print this help, then exit
1.66 ++ -t, --time-stamp print date of last modification, then exit
1.67 ++ -v, --version print version number, then exit
1.68 ++
1.69 ++Report bugs and patches to <config-patches@gnu.org>."
1.70 ++
1.71 ++version="\
1.72 ++GNU config.sub ($timestamp)
1.73 ++
1.74 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1.75 ++Free Software Foundation, Inc.
1.76 ++
1.77 ++This is free software; see the source for copying conditions. There is NO
1.78 ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1.79 ++
1.80 ++help="
1.81 ++Try \`$me --help' for more information."
1.82 ++
1.83 ++# Parse command line
1.84 ++while test $# -gt 0 ; do
1.85 ++ case $1 in
1.86 ++ --time-stamp | --time* | -t )
1.87 ++ echo "$timestamp" ; exit 0 ;;
1.88 ++ --version | -v )
1.89 ++ echo "$version" ; exit 0 ;;
1.90 ++ --help | --h* | -h )
1.91 ++ echo "$usage"; exit 0 ;;
1.92 ++ -- ) # Stop option processing
1.93 ++ shift; break ;;
1.94 ++ - ) # Use stdin as input.
1.95 ++ break ;;
1.96 ++ -* )
1.97 ++ echo "$me: invalid option $1$help"
1.98 ++ exit 1 ;;
1.99 ++
1.100 ++ *local*)
1.101 ++ # First pass through any local machine types.
1.102 ++ echo $1
1.103 ++ exit 0;;
1.104 ++
1.105 ++ * )
1.106 ++ break ;;
1.107 ++ esac
1.108 ++done
1.109 ++
1.110 ++case $# in
1.111 ++ 0) echo "$me: missing argument$help" >&2
1.112 ++ exit 1;;
1.113 ++ 1) ;;
1.114 ++ *) echo "$me: too many arguments$help" >&2
1.115 ++ exit 1;;
1.116 + esac
1.117 +
1.118 + # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
1.119 + # Here we must recognize all the valid KERNEL-OS combinations.
1.120 + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1.121 + case $maybe_os in
1.122 +- linux-gnu*)
1.123 ++ nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
1.124 + os=-$maybe_os
1.125 + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1.126 + ;;
1.127 +@@ -94,7 +144,7 @@
1.128 + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1.129 + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1.130 + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1.131 +- -apple)
1.132 ++ -apple | -axis)
1.133 + os=
1.134 + basic_machine=$1
1.135 + ;;
1.136 +@@ -108,6 +158,14 @@
1.137 + os=-vxworks
1.138 + basic_machine=$1
1.139 + ;;
1.140 ++ -chorusos*)
1.141 ++ os=-chorusos
1.142 ++ basic_machine=$1
1.143 ++ ;;
1.144 ++ -chorusrdb)
1.145 ++ os=-chorusrdb
1.146 ++ basic_machine=$1
1.147 ++ ;;
1.148 + -hiux*)
1.149 + os=-hiuxwe2
1.150 + ;;
1.151 +@@ -166,27 +224,58 @@
1.152 + case $basic_machine in
1.153 + # Recognize the basic CPU types without company name.
1.154 + # Some are omitted here because they have special meanings below.
1.155 +- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
1.156 +- | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
1.157 +- | 580 | i960 | h8300 \
1.158 +- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
1.159 +- | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
1.160 +- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
1.161 +- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
1.162 +- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
1.163 +- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
1.164 +- | mips64vr5000 | miprs64vr5000el | mcore \
1.165 +- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
1.166 +- | thumb | d10v | fr30)
1.167 ++ 1750a | 580 \
1.168 ++ | a29k \
1.169 ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1.170 ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1.171 ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
1.172 ++ | c4x | clipper \
1.173 ++ | d10v | d30v | dlx | dsp16xx \
1.174 ++ | fr30 | frv \
1.175 ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1.176 ++ | i370 | i860 | i960 | ia64 \
1.177 ++ | ip2k \
1.178 ++ | m32r | m68000 | m68k | m88k | mcore \
1.179 ++ | mips | mipsbe | mipseb | mipsel | mipsle \
1.180 ++ | mips16 \
1.181 ++ | mips64 | mips64el \
1.182 ++ | mips64orion | mips64orionel \
1.183 ++ | mips64vr4100 | mips64vr4100el \
1.184 ++ | mips64vr4300 | mips64vr4300el \
1.185 ++ | mips64vr5000 | mips64vr5000el \
1.186 ++ | mipsisa32 | mipsisa32el \
1.187 ++ | mipsisa64 | mipsisa64el \
1.188 ++ | mipsisa64sb1 | mipsisa64sb1el \
1.189 ++ | mipstx39 | mipstx39el \
1.190 ++ | mn10200 | mn10300 \
1.191 ++ | ns16k | ns32k \
1.192 ++ | openrisc | or32 \
1.193 ++ | pdp10 | pdp11 | pj | pjl \
1.194 ++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1.195 ++ | pyramid \
1.196 ++ | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
1.197 ++ | sh64 | sh64le \
1.198 ++ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
1.199 ++ | strongarm \
1.200 ++ | tahoe | thumb | tic80 | tron \
1.201 ++ | v850 | v850e \
1.202 ++ | we32k \
1.203 ++ | x86 | xscale | xstormy16 | xtensa \
1.204 ++ | z8k)
1.205 ++ basic_machine=$basic_machine-unknown
1.206 ++ ;;
1.207 ++ m6811 | m68hc11 | m6812 | m68hc12)
1.208 ++ # Motorola 68HC11/12.
1.209 + basic_machine=$basic_machine-unknown
1.210 ++ os=-none
1.211 + ;;
1.212 +- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
1.213 ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
1.214 + ;;
1.215 +
1.216 + # We use `pc' rather than `unknown'
1.217 + # because (1) that's what they normally are, and
1.218 + # (2) the word "unknown" tends to confuse beginning users.
1.219 +- i[34567]86)
1.220 ++ i*86 | x86_64)
1.221 + basic_machine=$basic_machine-pc
1.222 + ;;
1.223 + # Object if more than one company name word.
1.224 +@@ -195,24 +284,54 @@
1.225 + exit 1
1.226 + ;;
1.227 + # Recognize the basic CPU types with company name.
1.228 +- # FIXME: clean up the formatting here.
1.229 +- vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
1.230 +- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
1.231 +- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
1.232 +- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
1.233 +- | xmp-* | ymp-* \
1.234 +- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
1.235 +- | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
1.236 +- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
1.237 +- | clipper-* | orion-* \
1.238 +- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
1.239 +- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
1.240 +- | mips64el-* | mips64orion-* | mips64orionel-* \
1.241 +- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
1.242 +- | mipstx39-* | mipstx39el-* | mcore-* \
1.243 +- | f301-* | armv*-* | t3e-* \
1.244 +- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
1.245 +- | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
1.246 ++ 580-* \
1.247 ++ | a29k-* \
1.248 ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
1.249 ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
1.250 ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
1.251 ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
1.252 ++ | avr-* \
1.253 ++ | bs2000-* \
1.254 ++ | c[123]* | c30-* | [cjt]90-* | c54x-* \
1.255 ++ | clipper-* | cydra-* \
1.256 ++ | d10v-* | d30v-* | dlx-* \
1.257 ++ | elxsi-* \
1.258 ++ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
1.259 ++ | h8300-* | h8500-* \
1.260 ++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1.261 ++ | i*86-* | i860-* | i960-* | ia64-* \
1.262 ++ | ip2k-* \
1.263 ++ | m32r-* \
1.264 ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
1.265 ++ | m88110-* | m88k-* | mcore-* \
1.266 ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
1.267 ++ | mips16-* \
1.268 ++ | mips64-* | mips64el-* \
1.269 ++ | mips64orion-* | mips64orionel-* \
1.270 ++ | mips64vr4100-* | mips64vr4100el-* \
1.271 ++ | mips64vr4300-* | mips64vr4300el-* \
1.272 ++ | mips64vr5000-* | mips64vr5000el-* \
1.273 ++ | mipsisa32-* | mipsisa32el-* \
1.274 ++ | mipsisa64-* | mipsisa64el-* \
1.275 ++ | mipsisa64sb1-* | mipsisa64sb1el-* \
1.276 ++ | mipstx39 | mipstx39el \
1.277 ++ | none-* | np1-* | ns16k-* | ns32k-* \
1.278 ++ | orion-* \
1.279 ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1.280 ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
1.281 ++ | pyramid-* \
1.282 ++ | romp-* | rs6000-* \
1.283 ++ | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
1.284 ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1.285 ++ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
1.286 ++ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
1.287 ++ | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
1.288 ++ | v850-* | v850e-* | vax-* \
1.289 ++ | we32k-* \
1.290 ++ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
1.291 ++ | xtensa-* \
1.292 ++ | ymp-* \
1.293 ++ | z8k-*)
1.294 + ;;
1.295 + # Recognize the various machine names and aliases which stand
1.296 + # for a CPU type and a company and sometimes even an OS.
1.297 +@@ -249,14 +368,14 @@
1.298 + os=-sysv
1.299 + ;;
1.300 + amiga | amiga-*)
1.301 +- basic_machine=m68k-cbm
1.302 ++ basic_machine=m68k-unknown
1.303 + ;;
1.304 + amigaos | amigados)
1.305 +- basic_machine=m68k-cbm
1.306 ++ basic_machine=m68k-unknown
1.307 + os=-amigaos
1.308 + ;;
1.309 + amigaunix | amix)
1.310 +- basic_machine=m68k-cbm
1.311 ++ basic_machine=m68k-unknown
1.312 + os=-sysv4
1.313 + ;;
1.314 + apollo68)
1.315 +@@ -275,6 +394,10 @@
1.316 + basic_machine=ns32k-sequent
1.317 + os=-dynix
1.318 + ;;
1.319 ++ c90)
1.320 ++ basic_machine=c90-cray
1.321 ++ os=-unicos
1.322 ++ ;;
1.323 + convex-c1)
1.324 + basic_machine=c1-convex
1.325 + os=-bsd
1.326 +@@ -295,27 +418,30 @@
1.327 + basic_machine=c38-convex
1.328 + os=-bsd
1.329 + ;;
1.330 +- cray | ymp)
1.331 +- basic_machine=ymp-cray
1.332 +- os=-unicos
1.333 +- ;;
1.334 +- cray2)
1.335 +- basic_machine=cray2-cray
1.336 +- os=-unicos
1.337 +- ;;
1.338 +- [ctj]90-cray)
1.339 +- basic_machine=c90-cray
1.340 ++ cray | j90)
1.341 ++ basic_machine=j90-cray
1.342 + os=-unicos
1.343 + ;;
1.344 + crds | unos)
1.345 + basic_machine=m68k-crds
1.346 + ;;
1.347 ++ cris | cris-* | etrax*)
1.348 ++ basic_machine=cris-axis
1.349 ++ ;;
1.350 + da30 | da30-*)
1.351 + basic_machine=m68k-da30
1.352 + ;;
1.353 + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
1.354 + basic_machine=mips-dec
1.355 + ;;
1.356 ++ decsystem10* | dec10*)
1.357 ++ basic_machine=pdp10-dec
1.358 ++ os=-tops10
1.359 ++ ;;
1.360 ++ decsystem20* | dec20*)
1.361 ++ basic_machine=pdp10-dec
1.362 ++ os=-tops20
1.363 ++ ;;
1.364 + delta | 3300 | motorola-3300 | motorola-delta \
1.365 + | 3300-motorola | delta-motorola)
1.366 + basic_machine=m68k-motorola
1.367 +@@ -357,6 +483,10 @@
1.368 + basic_machine=tron-gmicro
1.369 + os=-sysv
1.370 + ;;
1.371 ++ go32)
1.372 ++ basic_machine=i386-pc
1.373 ++ os=-go32
1.374 ++ ;;
1.375 + h3050r* | hiux*)
1.376 + basic_machine=hppa1.1-hitachi
1.377 + os=-hiuxwe2
1.378 +@@ -432,19 +562,19 @@
1.379 + basic_machine=i370-ibm
1.380 + ;;
1.381 + # I'm not sure what "Sysv32" means. Should this be sysv3.2?
1.382 +- i[34567]86v32)
1.383 ++ i*86v32)
1.384 + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1.385 + os=-sysv32
1.386 + ;;
1.387 +- i[34567]86v4*)
1.388 ++ i*86v4*)
1.389 + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1.390 + os=-sysv4
1.391 + ;;
1.392 +- i[34567]86v)
1.393 ++ i*86v)
1.394 + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1.395 + os=-sysv
1.396 + ;;
1.397 +- i[34567]86sol2)
1.398 ++ i*86sol2)
1.399 + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1.400 + os=-solaris2
1.401 + ;;
1.402 +@@ -456,17 +586,6 @@
1.403 + basic_machine=i386-unknown
1.404 + os=-vsta
1.405 + ;;
1.406 +- i386-go32 | go32)
1.407 +- basic_machine=i386-unknown
1.408 +- os=-go32
1.409 +- ;;
1.410 +- i386-mingw32 | mingw32)
1.411 +- basic_machine=i386-unknown
1.412 +- os=-mingw32
1.413 +- ;;
1.414 +- i386-qnx | qnx)
1.415 +- basic_machine=i386-qnx
1.416 +- ;;
1.417 + iris | iris4d)
1.418 + basic_machine=mips-sgi
1.419 + case $os in
1.420 +@@ -492,6 +611,10 @@
1.421 + basic_machine=ns32k-utek
1.422 + os=-sysv
1.423 + ;;
1.424 ++ mingw32)
1.425 ++ basic_machine=i386-pc
1.426 ++ os=-mingw32
1.427 ++ ;;
1.428 + miniframe)
1.429 + basic_machine=m68000-convergent
1.430 + ;;
1.431 +@@ -499,26 +622,26 @@
1.432 + basic_machine=m68k-atari
1.433 + os=-mint
1.434 + ;;
1.435 +- mipsel*-linux*)
1.436 +- basic_machine=mipsel-unknown
1.437 +- os=-linux-gnu
1.438 +- ;;
1.439 +- mips*-linux*)
1.440 +- basic_machine=mips-unknown
1.441 +- os=-linux-gnu
1.442 +- ;;
1.443 + mips3*-*)
1.444 + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
1.445 + ;;
1.446 + mips3*)
1.447 + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
1.448 + ;;
1.449 ++ mmix*)
1.450 ++ basic_machine=mmix-knuth
1.451 ++ os=-mmixware
1.452 ++ ;;
1.453 + monitor)
1.454 + basic_machine=m68k-rom68k
1.455 + os=-coff
1.456 + ;;
1.457 ++ morphos)
1.458 ++ basic_machine=powerpc-unknown
1.459 ++ os=-morphos
1.460 ++ ;;
1.461 + msdos)
1.462 +- basic_machine=i386-unknown
1.463 ++ basic_machine=i386-pc
1.464 + os=-msdos
1.465 + ;;
1.466 + mvs)
1.467 +@@ -582,13 +705,24 @@
1.468 + basic_machine=i960-intel
1.469 + os=-mon960
1.470 + ;;
1.471 ++ nonstopux)
1.472 ++ basic_machine=mips-compaq
1.473 ++ os=-nonstopux
1.474 ++ ;;
1.475 + np1)
1.476 + basic_machine=np1-gould
1.477 + ;;
1.478 ++ nsr-tandem)
1.479 ++ basic_machine=nsr-tandem
1.480 ++ ;;
1.481 + op50n-* | op60c-*)
1.482 + basic_machine=hppa1.1-oki
1.483 + os=-proelf
1.484 + ;;
1.485 ++ or32 | or32-*)
1.486 ++ basic_machine=or32-unknown
1.487 ++ os=-coff
1.488 ++ ;;
1.489 + OSE68000 | ose68000)
1.490 + basic_machine=m68000-ericsson
1.491 + os=-ose
1.492 +@@ -614,28 +748,28 @@
1.493 + pc532 | pc532-*)
1.494 + basic_machine=ns32k-pc532
1.495 + ;;
1.496 +- pentium | p5 | k5 | k6 | nexen)
1.497 ++ pentium | p5 | k5 | k6 | nexgen | viac3)
1.498 + basic_machine=i586-pc
1.499 + ;;
1.500 +- pentiumpro | p6 | 6x86)
1.501 ++ pentiumpro | p6 | 6x86 | athlon)
1.502 + basic_machine=i686-pc
1.503 + ;;
1.504 + pentiumii | pentium2)
1.505 +- basic_machine=i786-pc
1.506 ++ basic_machine=i686-pc
1.507 + ;;
1.508 +- pentium-* | p5-* | k5-* | k6-* | nexen-*)
1.509 ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
1.510 + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
1.511 + ;;
1.512 +- pentiumpro-* | p6-* | 6x86-*)
1.513 ++ pentiumpro-* | p6-* | 6x86-* | athlon-*)
1.514 + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
1.515 + ;;
1.516 + pentiumii-* | pentium2-*)
1.517 +- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
1.518 ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
1.519 + ;;
1.520 + pn)
1.521 + basic_machine=pn-gould
1.522 + ;;
1.523 +- power) basic_machine=rs6000-ibm
1.524 ++ power) basic_machine=power-ibm
1.525 + ;;
1.526 + ppc) basic_machine=powerpc-unknown
1.527 + ;;
1.528 +@@ -647,9 +781,23 @@
1.529 + ppcle-* | powerpclittle-*)
1.530 + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
1.531 + ;;
1.532 ++ ppc64) basic_machine=powerpc64-unknown
1.533 ++ ;;
1.534 ++ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1.535 ++ ;;
1.536 ++ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1.537 ++ basic_machine=powerpc64le-unknown
1.538 ++ ;;
1.539 ++ ppc64le-* | powerpc64little-*)
1.540 ++ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
1.541 ++ ;;
1.542 + ps2)
1.543 + basic_machine=i386-ibm
1.544 + ;;
1.545 ++ pw32)
1.546 ++ basic_machine=i586-unknown
1.547 ++ os=-pw32
1.548 ++ ;;
1.549 + rom68k)
1.550 + basic_machine=m68k-rom68k
1.551 + os=-coff
1.552 +@@ -660,6 +808,12 @@
1.553 + rtpc | rtpc-*)
1.554 + basic_machine=romp-ibm
1.555 + ;;
1.556 ++ s390 | s390-*)
1.557 ++ basic_machine=s390-ibm
1.558 ++ ;;
1.559 ++ s390x | s390x-*)
1.560 ++ basic_machine=s390x-ibm
1.561 ++ ;;
1.562 + sa29200)
1.563 + basic_machine=a29k-amd
1.564 + os=-udi
1.565 +@@ -671,7 +825,7 @@
1.566 + basic_machine=sh-hitachi
1.567 + os=-hms
1.568 + ;;
1.569 +- sparclite-wrs)
1.570 ++ sparclite-wrs | simso-wrs)
1.571 + basic_machine=sparclite-wrs
1.572 + os=-vxworks
1.573 + ;;
1.574 +@@ -729,20 +883,40 @@
1.575 + sun386 | sun386i | roadrunner)
1.576 + basic_machine=i386-sun
1.577 + ;;
1.578 ++ sv1)
1.579 ++ basic_machine=sv1-cray
1.580 ++ os=-unicos
1.581 ++ ;;
1.582 + symmetry)
1.583 + basic_machine=i386-sequent
1.584 + os=-dynix
1.585 + ;;
1.586 ++ t3d)
1.587 ++ basic_machine=alpha-cray
1.588 ++ os=-unicos
1.589 ++ ;;
1.590 + t3e)
1.591 +- basic_machine=t3e-cray
1.592 ++ basic_machine=alphaev5-cray
1.593 ++ os=-unicos
1.594 ++ ;;
1.595 ++ t90)
1.596 ++ basic_machine=t90-cray
1.597 + os=-unicos
1.598 + ;;
1.599 ++ tic54x | c54x*)
1.600 ++ basic_machine=tic54x-unknown
1.601 ++ os=-coff
1.602 ++ ;;
1.603 + tx39)
1.604 + basic_machine=mipstx39-unknown
1.605 + ;;
1.606 + tx39el)
1.607 + basic_machine=mipstx39el-unknown
1.608 + ;;
1.609 ++ toad1)
1.610 ++ basic_machine=pdp10-xkl
1.611 ++ os=-tops20
1.612 ++ ;;
1.613 + tower | tower-32)
1.614 + basic_machine=m68k-ncr
1.615 + ;;
1.616 +@@ -789,13 +963,17 @@
1.617 + basic_machine=hppa1.1-winbond
1.618 + os=-proelf
1.619 + ;;
1.620 +- xmp)
1.621 +- basic_machine=xmp-cray
1.622 +- os=-unicos
1.623 ++ windows32)
1.624 ++ basic_machine=i386-pc
1.625 ++ os=-windows32-msvcrt
1.626 + ;;
1.627 + xps | xps100)
1.628 + basic_machine=xps100-honeywell
1.629 + ;;
1.630 ++ ymp)
1.631 ++ basic_machine=ymp-cray
1.632 ++ os=-unicos
1.633 ++ ;;
1.634 + z8k-*-coff)
1.635 + basic_machine=z8k-unknown
1.636 + os=-sim
1.637 +@@ -816,13 +994,6 @@
1.638 + op60c)
1.639 + basic_machine=hppa1.1-oki
1.640 + ;;
1.641 +- mips)
1.642 +- if [ x$os = x-linux-gnu ]; then
1.643 +- basic_machine=mips-unknown
1.644 +- else
1.645 +- basic_machine=mips-mips
1.646 +- fi
1.647 +- ;;
1.648 + romp)
1.649 + basic_machine=romp-ibm
1.650 + ;;
1.651 +@@ -832,13 +1003,23 @@
1.652 + vax)
1.653 + basic_machine=vax-dec
1.654 + ;;
1.655 ++ pdp10)
1.656 ++ # there are many clones, so DEC is not a safe bet
1.657 ++ basic_machine=pdp10-unknown
1.658 ++ ;;
1.659 + pdp11)
1.660 + basic_machine=pdp11-dec
1.661 + ;;
1.662 + we32k)
1.663 + basic_machine=we32k-att
1.664 + ;;
1.665 +- sparc | sparcv9)
1.666 ++ sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
1.667 ++ basic_machine=sh-unknown
1.668 ++ ;;
1.669 ++ sh64)
1.670 ++ basic_machine=sh64-unknown
1.671 ++ ;;
1.672 ++ sparc | sparcv9 | sparcv9b)
1.673 + basic_machine=sparc-sun
1.674 + ;;
1.675 + cydra)
1.676 +@@ -860,6 +1041,9 @@
1.677 + basic_machine=c4x-none
1.678 + os=-coff
1.679 + ;;
1.680 ++ *-unknown)
1.681 ++ # Make sure to match an already-canonicalized machine name.
1.682 ++ ;;
1.683 + *)
1.684 + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1.685 + exit 1
1.686 +@@ -916,14 +1100,31 @@
1.687 + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1.688 + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1.689 + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1.690 ++ | -chorusos* | -chorusrdb* \
1.691 + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1.692 + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1.693 +- | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
1.694 ++ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
1.695 ++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1.696 ++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1.697 ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1.698 ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
1.699 + # Remember, each alternative MUST END IN *, to match a version number.
1.700 + ;;
1.701 ++ -qnx*)
1.702 ++ case $basic_machine in
1.703 ++ x86-* | i*86-*)
1.704 ++ ;;
1.705 ++ *)
1.706 ++ os=-nto$os
1.707 ++ ;;
1.708 ++ esac
1.709 ++ ;;
1.710 ++ -nto*)
1.711 ++ os=-nto-qnx
1.712 ++ ;;
1.713 + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1.714 + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1.715 +- | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
1.716 ++ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1.717 + ;;
1.718 + -mac*)
1.719 + os=`echo $os | sed -e 's|mac|macos|'`
1.720 +@@ -940,6 +1141,9 @@
1.721 + -opened*)
1.722 + os=-openedition
1.723 + ;;
1.724 ++ -wince*)
1.725 ++ os=-wince
1.726 ++ ;;
1.727 + -osfrose*)
1.728 + os=-osfrose
1.729 + ;;
1.730 +@@ -955,15 +1159,24 @@
1.731 + -acis*)
1.732 + os=-aos
1.733 + ;;
1.734 ++ -atheos*)
1.735 ++ os=-atheos
1.736 ++ ;;
1.737 + -386bsd)
1.738 + os=-bsd
1.739 + ;;
1.740 + -ctix* | -uts*)
1.741 + os=-sysv
1.742 + ;;
1.743 ++ -nova*)
1.744 ++ os=-rtmk-nova
1.745 ++ ;;
1.746 + -ns2 )
1.747 + os=-nextstep2
1.748 + ;;
1.749 ++ -nsk*)
1.750 ++ os=-nsk
1.751 ++ ;;
1.752 + # Preserve the version number of sinix5.
1.753 + -sinix5.*)
1.754 + os=`echo $os | sed -e 's|sinix|sysv|'`
1.755 +@@ -977,9 +1190,6 @@
1.756 + -oss*)
1.757 + os=-sysv3
1.758 + ;;
1.759 +- -qnx)
1.760 +- os=-qnx4
1.761 +- ;;
1.762 + -svr4)
1.763 + os=-sysv4
1.764 + ;;
1.765 +@@ -1001,7 +1211,7 @@
1.766 + -xenix)
1.767 + os=-xenix
1.768 + ;;
1.769 +- -*mint | -*MiNT)
1.770 ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1.771 + os=-mint
1.772 + ;;
1.773 + -none)
1.774 +@@ -1035,6 +1245,10 @@
1.775 + arm*-semi)
1.776 + os=-aout
1.777 + ;;
1.778 ++ # This must come before the *-dec entry.
1.779 ++ pdp10-*)
1.780 ++ os=-tops20
1.781 ++ ;;
1.782 + pdp11-*)
1.783 + os=-none
1.784 + ;;
1.785 +@@ -1062,6 +1276,9 @@
1.786 + mips*-*)
1.787 + os=-elf
1.788 + ;;
1.789 ++ or32-*)
1.790 ++ os=-coff
1.791 ++ ;;
1.792 + *-tti) # must be before sparc entry or we get the wrong os.
1.793 + os=-sysv3
1.794 + ;;
1.795 +@@ -1143,7 +1360,7 @@
1.796 + *-masscomp)
1.797 + os=-rtu
1.798 + ;;
1.799 +- f301-fujitsu)
1.800 ++ f30[01]-fujitsu | f700-fujitsu)
1.801 + os=-uxpv
1.802 + ;;
1.803 + *-rom68k)
1.804 +@@ -1209,7 +1426,7 @@
1.805 + -ptx*)
1.806 + vendor=sequent
1.807 + ;;
1.808 +- -vxsim* | -vxworks*)
1.809 ++ -vxsim* | -vxworks* | -windiss*)
1.810 + vendor=wrs
1.811 + ;;
1.812 + -aux*)
1.813 +@@ -1221,12 +1438,23 @@
1.814 + -mpw* | -macos*)
1.815 + vendor=apple
1.816 + ;;
1.817 +- -*mint | -*MiNT)
1.818 ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1.819 + vendor=atari
1.820 + ;;
1.821 ++ -vos*)
1.822 ++ vendor=stratus
1.823 ++ ;;
1.824 + esac
1.825 + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
1.826 + ;;
1.827 + esac
1.828 +
1.829 + echo $basic_machine$os
1.830 ++exit 0
1.831 ++
1.832 ++# Local variables:
1.833 ++# eval: (add-hook 'write-file-hooks 'time-stamp)
1.834 ++# time-stamp-start: "timestamp='"
1.835 ++# time-stamp-format: "%:y-%02m-%02d"
1.836 ++# time-stamp-end: "'"
1.837 ++# End: