Merge

Wed, 25 Mar 2015 11:31:19 -0700

author
asaha
date
Wed, 25 Mar 2015 11:31:19 -0700
changeset 1383
fdc9d03bed70
parent 1382
09958adbb427
parent 1329
195ccfafe077
child 1384
9756462247ea

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Mar 18 18:09:23 2015 -0700
     1.2 +++ b/.hgtags	Wed Mar 25 11:31:19 2015 -0700
     1.3 @@ -404,3 +404,4 @@
     1.4  e532f3672f635bd83c673c349b7563db6dd470bb jdk8u60-b05
     1.5  74dbdbcb6aac9fd62f3599ad4e0a1f930b1e9ac1 jdk8u60-b06
     1.6  ea714a39e902fb8729f71f2d0f634855646e297d jdk8u60-b07
     1.7 +0785e45b19c864264f2054a8130c49fe6f70925c jdk8u60-b08
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/common/autoconf/build-aux/autoconf-config.sub	Wed Mar 25 11:31:19 2015 -0700
     2.3 @@ -0,0 +1,1684 @@
     2.4 +#! /bin/sh
     2.5 +
     2.6 +#
     2.7 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     2.8 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.9 +#
    2.10 +# This code is free software; you can redistribute it and/or modify it
    2.11 +# under the terms of the GNU General Public License version 2 only, as
    2.12 +# published by the Free Software Foundation.  Oracle designates this
    2.13 +# particular file as subject to the "Classpath" exception as provided
    2.14 +# by Oracle in the LICENSE file that accompanied this code.
    2.15 +#
    2.16 +# This code is distributed in the hope that it will be useful, but WITHOUT
    2.17 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.18 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.19 +# version 2 for more details (a copy is included in the LICENSE file that
    2.20 +# accompanied this code).
    2.21 +#
    2.22 +# You should have received a copy of the GNU General Public License version
    2.23 +# 2 along with this work; if not, write to the Free Software Foundation,
    2.24 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.25 +#
    2.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.27 +# or visit www.oracle.com if you need additional information or have any
    2.28 +# questions.
    2.29 +#
    2.30 +
    2.31 +# Configuration validation subroutine script.
    2.32 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2.33 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    2.34 +#   Free Software Foundation, Inc.
    2.35 +
    2.36 +timestamp='2008-01-16'
    2.37 +
    2.38 +# This file is (in principle) common to ALL GNU software.
    2.39 +# The presence of a machine in this file suggests that SOME GNU software
    2.40 +# can handle that machine.  It does not imply ALL GNU software can.
    2.41 +#
    2.42 +# This file is free software; you can redistribute it and/or modify
    2.43 +# it under the terms of the GNU General Public License as published by
    2.44 +# the Free Software Foundation; either version 2 of the License, or
    2.45 +# (at your option) any later version.
    2.46 +#
    2.47 +# This program is distributed in the hope that it will be useful,
    2.48 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    2.49 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    2.50 +# GNU General Public License for more details.
    2.51 +#
    2.52 +# You should have received a copy of the GNU General Public License
    2.53 +# along with this program; if not, write to the Free Software
    2.54 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    2.55 +# 02110-1301, USA.
    2.56 +#
    2.57 +# As a special exception to the GNU General Public License, if you
    2.58 +# distribute this file as part of a program that contains a
    2.59 +# configuration script generated by Autoconf, you may include it under
    2.60 +# the same distribution terms that you use for the rest of that program.
    2.61 +
    2.62 +
    2.63 +# Please send patches to <config-patches@gnu.org>.  Submit a context
    2.64 +# diff and a properly formatted ChangeLog entry.
    2.65 +#
    2.66 +# Configuration subroutine to validate and canonicalize a configuration type.
    2.67 +# Supply the specified configuration type as an argument.
    2.68 +# If it is invalid, we print an error message on stderr and exit with code 1.
    2.69 +# Otherwise, we print the canonical config type on stdout and succeed.
    2.70 +
    2.71 +# This file is supposed to be the same for all GNU packages
    2.72 +# and recognize all the CPU types, system types and aliases
    2.73 +# that are meaningful with *any* GNU software.
    2.74 +# Each package is responsible for reporting which valid configurations
    2.75 +# it does not support.  The user should be able to distinguish
    2.76 +# a failure to support a valid configuration from a meaningless
    2.77 +# configuration.
    2.78 +
    2.79 +# The goal of this file is to map all the various variations of a given
    2.80 +# machine specification into a single specification in the form:
    2.81 +#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
    2.82 +# or in some cases, the newer four-part form:
    2.83 +#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
    2.84 +# It is wrong to echo any other type of specification.
    2.85 +
    2.86 +me=`echo "$0" | sed -e 's,.*/,,'`
    2.87 +
    2.88 +usage="\
    2.89 +Usage: $0 [OPTION] CPU-MFR-OPSYS
    2.90 +       $0 [OPTION] ALIAS
    2.91 +
    2.92 +Canonicalize a configuration name.
    2.93 +
    2.94 +Operation modes:
    2.95 +  -h, --help         print this help, then exit
    2.96 +  -t, --time-stamp   print date of last modification, then exit
    2.97 +  -v, --version      print version number, then exit
    2.98 +
    2.99 +Report bugs and patches to <config-patches@gnu.org>."
   2.100 +
   2.101 +version="\
   2.102 +GNU config.sub ($timestamp)
   2.103 +
   2.104 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
   2.105 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
   2.106 +
   2.107 +This is free software; see the source for copying conditions.  There is NO
   2.108 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
   2.109 +
   2.110 +help="
   2.111 +Try \`$me --help' for more information."
   2.112 +
   2.113 +# Parse command line
   2.114 +while test $# -gt 0 ; do
   2.115 +  case $1 in
   2.116 +    --time-stamp | --time* | -t )
   2.117 +       echo "$timestamp" ; exit ;;
   2.118 +    --version | -v )
   2.119 +       echo "$version" ; exit ;;
   2.120 +    --help | --h* | -h )
   2.121 +       echo "$usage"; exit ;;
   2.122 +    -- )     # Stop option processing
   2.123 +       shift; break ;;
   2.124 +    - )	# Use stdin as input.
   2.125 +       break ;;
   2.126 +    -* )
   2.127 +       echo "$me: invalid option $1$help"
   2.128 +       exit 1 ;;
   2.129 +
   2.130 +    *local*)
   2.131 +       # First pass through any local machine types.
   2.132 +       echo $1
   2.133 +       exit ;;
   2.134 +
   2.135 +    * )
   2.136 +       break ;;
   2.137 +  esac
   2.138 +done
   2.139 +
   2.140 +case $# in
   2.141 + 0) echo "$me: missing argument$help" >&2
   2.142 +    exit 1;;
   2.143 + 1) ;;
   2.144 + *) echo "$me: too many arguments$help" >&2
   2.145 +    exit 1;;
   2.146 +esac
   2.147 +
   2.148 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
   2.149 +# Here we must recognize all the valid KERNEL-OS combinations.
   2.150 +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   2.151 +case $maybe_os in
   2.152 +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   2.153 +  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
   2.154 +  storm-chaos* | os2-emx* | rtmk-nova*)
   2.155 +    os=-$maybe_os
   2.156 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   2.157 +    ;;
   2.158 +  *)
   2.159 +    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
   2.160 +    if [ $basic_machine != $1 ]
   2.161 +    then os=`echo $1 | sed 's/.*-/-/'`
   2.162 +    else os=; fi
   2.163 +    ;;
   2.164 +esac
   2.165 +
   2.166 +### Let's recognize common machines as not being operating systems so
   2.167 +### that things like config.sub decstation-3100 work.  We also
   2.168 +### recognize some manufacturers as not being operating systems, so we
   2.169 +### can provide default operating systems below.
   2.170 +case $os in
   2.171 +	-sun*os*)
   2.172 +		# Prevent following clause from handling this invalid input.
   2.173 +		;;
   2.174 +	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
   2.175 +	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
   2.176 +	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
   2.177 +	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   2.178 +	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   2.179 +	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   2.180 +	-apple | -axis | -knuth | -cray)
   2.181 +		os=
   2.182 +		basic_machine=$1
   2.183 +		;;
   2.184 +	-sim | -cisco | -oki | -wec | -winbond)
   2.185 +		os=
   2.186 +		basic_machine=$1
   2.187 +		;;
   2.188 +	-scout)
   2.189 +		;;
   2.190 +	-wrs)
   2.191 +		os=-vxworks
   2.192 +		basic_machine=$1
   2.193 +		;;
   2.194 +	-chorusos*)
   2.195 +		os=-chorusos
   2.196 +		basic_machine=$1
   2.197 +		;;
   2.198 + 	-chorusrdb)
   2.199 + 		os=-chorusrdb
   2.200 +		basic_machine=$1
   2.201 + 		;;
   2.202 +	-hiux*)
   2.203 +		os=-hiuxwe2
   2.204 +		;;
   2.205 +	-sco6)
   2.206 +		os=-sco5v6
   2.207 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.208 +		;;
   2.209 +	-sco5)
   2.210 +		os=-sco3.2v5
   2.211 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.212 +		;;
   2.213 +	-sco4)
   2.214 +		os=-sco3.2v4
   2.215 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.216 +		;;
   2.217 +	-sco3.2.[4-9]*)
   2.218 +		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
   2.219 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.220 +		;;
   2.221 +	-sco3.2v[4-9]*)
   2.222 +		# Don't forget version if it is 3.2v4 or newer.
   2.223 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.224 +		;;
   2.225 +	-sco5v6*)
   2.226 +		# Don't forget version if it is 3.2v4 or newer.
   2.227 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.228 +		;;
   2.229 +	-sco*)
   2.230 +		os=-sco3.2v2
   2.231 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.232 +		;;
   2.233 +	-udk*)
   2.234 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.235 +		;;
   2.236 +	-isc)
   2.237 +		os=-isc2.2
   2.238 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.239 +		;;
   2.240 +	-clix*)
   2.241 +		basic_machine=clipper-intergraph
   2.242 +		;;
   2.243 +	-isc*)
   2.244 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   2.245 +		;;
   2.246 +	-lynx*)
   2.247 +		os=-lynxos
   2.248 +		;;
   2.249 +	-ptx*)
   2.250 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
   2.251 +		;;
   2.252 +	-windowsnt*)
   2.253 +		os=`echo $os | sed -e 's/windowsnt/winnt/'`
   2.254 +		;;
   2.255 +	-psos*)
   2.256 +		os=-psos
   2.257 +		;;
   2.258 +	-mint | -mint[0-9]*)
   2.259 +		basic_machine=m68k-atari
   2.260 +		os=-mint
   2.261 +		;;
   2.262 +esac
   2.263 +
   2.264 +# Decode aliases for certain CPU-COMPANY combinations.
   2.265 +case $basic_machine in
   2.266 +	# Recognize the basic CPU types without company name.
   2.267 +	# Some are omitted here because they have special meanings below.
   2.268 +	1750a | 580 \
   2.269 +	| a29k \
   2.270 +	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
   2.271 +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
   2.272 +	| am33_2.0 \
   2.273 +	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
   2.274 +	| bfin \
   2.275 +	| c4x | clipper \
   2.276 +	| d10v | d30v | dlx | dsp16xx \
   2.277 +	| fido | fr30 | frv \
   2.278 +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   2.279 +	| i370 | i860 | i960 | ia64 \
   2.280 +	| ip2k | iq2000 \
   2.281 +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
   2.282 +	| maxq | mb | microblaze | mcore | mep \
   2.283 +	| mips | mipsbe | mipseb | mipsel | mipsle \
   2.284 +	| mips16 \
   2.285 +	| mips64 | mips64el \
   2.286 +	| mips64vr | mips64vrel \
   2.287 +	| mips64orion | mips64orionel \
   2.288 +	| mips64vr4100 | mips64vr4100el \
   2.289 +	| mips64vr4300 | mips64vr4300el \
   2.290 +	| mips64vr5000 | mips64vr5000el \
   2.291 +	| mips64vr5900 | mips64vr5900el \
   2.292 +	| mipsisa32 | mipsisa32el \
   2.293 +	| mipsisa32r2 | mipsisa32r2el \
   2.294 +	| mipsisa64 | mipsisa64el \
   2.295 +	| mipsisa64r2 | mipsisa64r2el \
   2.296 +	| mipsisa64sb1 | mipsisa64sb1el \
   2.297 +	| mipsisa64sr71k | mipsisa64sr71kel \
   2.298 +	| mipstx39 | mipstx39el \
   2.299 +	| mn10200 | mn10300 \
   2.300 +	| mt \
   2.301 +	| msp430 \
   2.302 +	| nios | nios2 \
   2.303 +	| ns16k | ns32k \
   2.304 +	| or32 \
   2.305 +	| pdp10 | pdp11 | pj | pjl \
   2.306 +	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   2.307 +	| pyramid \
   2.308 +	| score \
   2.309 +	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   2.310 +	| sh64 | sh64le \
   2.311 +	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
   2.312 +	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
   2.313 +	| spu | strongarm \
   2.314 +	| tahoe | thumb | tic4x | tic80 | tron \
   2.315 +	| v850 | v850e \
   2.316 +	| we32k \
   2.317 +	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
   2.318 +	| z8k)
   2.319 +		basic_machine=$basic_machine-unknown
   2.320 +		;;
   2.321 +	m6811 | m68hc11 | m6812 | m68hc12)
   2.322 +		# Motorola 68HC11/12.
   2.323 +		basic_machine=$basic_machine-unknown
   2.324 +		os=-none
   2.325 +		;;
   2.326 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
   2.327 +		;;
   2.328 +	ms1)
   2.329 +		basic_machine=mt-unknown
   2.330 +		;;
   2.331 +
   2.332 +	# We use `pc' rather than `unknown'
   2.333 +	# because (1) that's what they normally are, and
   2.334 +	# (2) the word "unknown" tends to confuse beginning users.
   2.335 +	i*86 | x86_64)
   2.336 +	  basic_machine=$basic_machine-pc
   2.337 +	  ;;
   2.338 +	# Object if more than one company name word.
   2.339 +	*-*-*)
   2.340 +		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
   2.341 +		exit 1
   2.342 +		;;
   2.343 +	# Recognize the basic CPU types with company name.
   2.344 +	580-* \
   2.345 +	| a29k-* \
   2.346 +	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
   2.347 +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
   2.348 +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
   2.349 +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
   2.350 +	| avr-* | avr32-* \
   2.351 +	| bfin-* | bs2000-* \
   2.352 +	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
   2.353 +	| clipper-* | craynv-* | cydra-* \
   2.354 +	| d10v-* | d30v-* | dlx-* \
   2.355 +	| elxsi-* \
   2.356 +	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
   2.357 +	| h8300-* | h8500-* \
   2.358 +	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   2.359 +	| i*86-* | i860-* | i960-* | ia64-* \
   2.360 +	| ip2k-* | iq2000-* \
   2.361 +	| m32c-* | m32r-* | m32rle-* \
   2.362 +	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   2.363 +	| m88110-* | m88k-* | maxq-* | mcore-* \
   2.364 +	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
   2.365 +	| mips16-* \
   2.366 +	| mips64-* | mips64el-* \
   2.367 +	| mips64vr-* | mips64vrel-* \
   2.368 +	| mips64orion-* | mips64orionel-* \
   2.369 +	| mips64vr4100-* | mips64vr4100el-* \
   2.370 +	| mips64vr4300-* | mips64vr4300el-* \
   2.371 +	| mips64vr5000-* | mips64vr5000el-* \
   2.372 +	| mips64vr5900-* | mips64vr5900el-* \
   2.373 +	| mipsisa32-* | mipsisa32el-* \
   2.374 +	| mipsisa32r2-* | mipsisa32r2el-* \
   2.375 +	| mipsisa64-* | mipsisa64el-* \
   2.376 +	| mipsisa64r2-* | mipsisa64r2el-* \
   2.377 +	| mipsisa64sb1-* | mipsisa64sb1el-* \
   2.378 +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
   2.379 +	| mipstx39-* | mipstx39el-* \
   2.380 +	| mmix-* \
   2.381 +	| mt-* \
   2.382 +	| msp430-* \
   2.383 +	| nios-* | nios2-* \
   2.384 +	| none-* | np1-* | ns16k-* | ns32k-* \
   2.385 +	| orion-* \
   2.386 +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   2.387 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   2.388 +	| pyramid-* \
   2.389 +	| romp-* | rs6000-* \
   2.390 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
   2.391 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   2.392 +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
   2.393 +	| sparclite-* \
   2.394 +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
   2.395 +	| tahoe-* | thumb-* \
   2.396 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
   2.397 +	| tron-* \
   2.398 +	| v850-* | v850e-* | vax-* \
   2.399 +	| we32k-* \
   2.400 +	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
   2.401 +	| xstormy16-* | xtensa*-* \
   2.402 +	| ymp-* \
   2.403 +	| z8k-*)
   2.404 +		;;
   2.405 +	# Recognize the basic CPU types without company name, with glob match.
   2.406 +	xtensa*)
   2.407 +		basic_machine=$basic_machine-unknown
   2.408 +		;;
   2.409 +	# Recognize the various machine names and aliases which stand
   2.410 +	# for a CPU type and a company and sometimes even an OS.
   2.411 +	386bsd)
   2.412 +		basic_machine=i386-unknown
   2.413 +		os=-bsd
   2.414 +		;;
   2.415 +	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
   2.416 +		basic_machine=m68000-att
   2.417 +		;;
   2.418 +	3b*)
   2.419 +		basic_machine=we32k-att
   2.420 +		;;
   2.421 +	a29khif)
   2.422 +		basic_machine=a29k-amd
   2.423 +		os=-udi
   2.424 +		;;
   2.425 +    	abacus)
   2.426 +		basic_machine=abacus-unknown
   2.427 +		;;
   2.428 +	adobe68k)
   2.429 +		basic_machine=m68010-adobe
   2.430 +		os=-scout
   2.431 +		;;
   2.432 +	alliant | fx80)
   2.433 +		basic_machine=fx80-alliant
   2.434 +		;;
   2.435 +	altos | altos3068)
   2.436 +		basic_machine=m68k-altos
   2.437 +		;;
   2.438 +	am29k)
   2.439 +		basic_machine=a29k-none
   2.440 +		os=-bsd
   2.441 +		;;
   2.442 +	amd64)
   2.443 +		basic_machine=x86_64-pc
   2.444 +		;;
   2.445 +	amd64-*)
   2.446 +		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.447 +		;;
   2.448 +	amdahl)
   2.449 +		basic_machine=580-amdahl
   2.450 +		os=-sysv
   2.451 +		;;
   2.452 +	amiga | amiga-*)
   2.453 +		basic_machine=m68k-unknown
   2.454 +		;;
   2.455 +	amigaos | amigados)
   2.456 +		basic_machine=m68k-unknown
   2.457 +		os=-amigaos
   2.458 +		;;
   2.459 +	amigaunix | amix)
   2.460 +		basic_machine=m68k-unknown
   2.461 +		os=-sysv4
   2.462 +		;;
   2.463 +	apollo68)
   2.464 +		basic_machine=m68k-apollo
   2.465 +		os=-sysv
   2.466 +		;;
   2.467 +	apollo68bsd)
   2.468 +		basic_machine=m68k-apollo
   2.469 +		os=-bsd
   2.470 +		;;
   2.471 +	aux)
   2.472 +		basic_machine=m68k-apple
   2.473 +		os=-aux
   2.474 +		;;
   2.475 +	balance)
   2.476 +		basic_machine=ns32k-sequent
   2.477 +		os=-dynix
   2.478 +		;;
   2.479 +	blackfin)
   2.480 +		basic_machine=bfin-unknown
   2.481 +		os=-linux
   2.482 +		;;
   2.483 +	blackfin-*)
   2.484 +		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.485 +		os=-linux
   2.486 +		;;
   2.487 +	c90)
   2.488 +		basic_machine=c90-cray
   2.489 +		os=-unicos
   2.490 +		;;
   2.491 +	convex-c1)
   2.492 +		basic_machine=c1-convex
   2.493 +		os=-bsd
   2.494 +		;;
   2.495 +	convex-c2)
   2.496 +		basic_machine=c2-convex
   2.497 +		os=-bsd
   2.498 +		;;
   2.499 +	convex-c32)
   2.500 +		basic_machine=c32-convex
   2.501 +		os=-bsd
   2.502 +		;;
   2.503 +	convex-c34)
   2.504 +		basic_machine=c34-convex
   2.505 +		os=-bsd
   2.506 +		;;
   2.507 +	convex-c38)
   2.508 +		basic_machine=c38-convex
   2.509 +		os=-bsd
   2.510 +		;;
   2.511 +	cray | j90)
   2.512 +		basic_machine=j90-cray
   2.513 +		os=-unicos
   2.514 +		;;
   2.515 +	craynv)
   2.516 +		basic_machine=craynv-cray
   2.517 +		os=-unicosmp
   2.518 +		;;
   2.519 +	cr16)
   2.520 +		basic_machine=cr16-unknown
   2.521 +		os=-elf
   2.522 +		;;
   2.523 +	crds | unos)
   2.524 +		basic_machine=m68k-crds
   2.525 +		;;
   2.526 +	crisv32 | crisv32-* | etraxfs*)
   2.527 +		basic_machine=crisv32-axis
   2.528 +		;;
   2.529 +	cris | cris-* | etrax*)
   2.530 +		basic_machine=cris-axis
   2.531 +		;;
   2.532 +	crx)
   2.533 +		basic_machine=crx-unknown
   2.534 +		os=-elf
   2.535 +		;;
   2.536 +	da30 | da30-*)
   2.537 +		basic_machine=m68k-da30
   2.538 +		;;
   2.539 +	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
   2.540 +		basic_machine=mips-dec
   2.541 +		;;
   2.542 +	decsystem10* | dec10*)
   2.543 +		basic_machine=pdp10-dec
   2.544 +		os=-tops10
   2.545 +		;;
   2.546 +	decsystem20* | dec20*)
   2.547 +		basic_machine=pdp10-dec
   2.548 +		os=-tops20
   2.549 +		;;
   2.550 +	delta | 3300 | motorola-3300 | motorola-delta \
   2.551 +	      | 3300-motorola | delta-motorola)
   2.552 +		basic_machine=m68k-motorola
   2.553 +		;;
   2.554 +	delta88)
   2.555 +		basic_machine=m88k-motorola
   2.556 +		os=-sysv3
   2.557 +		;;
   2.558 +	djgpp)
   2.559 +		basic_machine=i586-pc
   2.560 +		os=-msdosdjgpp
   2.561 +		;;
   2.562 +	dpx20 | dpx20-*)
   2.563 +		basic_machine=rs6000-bull
   2.564 +		os=-bosx
   2.565 +		;;
   2.566 +	dpx2* | dpx2*-bull)
   2.567 +		basic_machine=m68k-bull
   2.568 +		os=-sysv3
   2.569 +		;;
   2.570 +	ebmon29k)
   2.571 +		basic_machine=a29k-amd
   2.572 +		os=-ebmon
   2.573 +		;;
   2.574 +	elxsi)
   2.575 +		basic_machine=elxsi-elxsi
   2.576 +		os=-bsd
   2.577 +		;;
   2.578 +	encore | umax | mmax)
   2.579 +		basic_machine=ns32k-encore
   2.580 +		;;
   2.581 +	es1800 | OSE68k | ose68k | ose | OSE)
   2.582 +		basic_machine=m68k-ericsson
   2.583 +		os=-ose
   2.584 +		;;
   2.585 +	fx2800)
   2.586 +		basic_machine=i860-alliant
   2.587 +		;;
   2.588 +	genix)
   2.589 +		basic_machine=ns32k-ns
   2.590 +		;;
   2.591 +	gmicro)
   2.592 +		basic_machine=tron-gmicro
   2.593 +		os=-sysv
   2.594 +		;;
   2.595 +	go32)
   2.596 +		basic_machine=i386-pc
   2.597 +		os=-go32
   2.598 +		;;
   2.599 +	h3050r* | hiux*)
   2.600 +		basic_machine=hppa1.1-hitachi
   2.601 +		os=-hiuxwe2
   2.602 +		;;
   2.603 +	h8300hms)
   2.604 +		basic_machine=h8300-hitachi
   2.605 +		os=-hms
   2.606 +		;;
   2.607 +	h8300xray)
   2.608 +		basic_machine=h8300-hitachi
   2.609 +		os=-xray
   2.610 +		;;
   2.611 +	h8500hms)
   2.612 +		basic_machine=h8500-hitachi
   2.613 +		os=-hms
   2.614 +		;;
   2.615 +	harris)
   2.616 +		basic_machine=m88k-harris
   2.617 +		os=-sysv3
   2.618 +		;;
   2.619 +	hp300-*)
   2.620 +		basic_machine=m68k-hp
   2.621 +		;;
   2.622 +	hp300bsd)
   2.623 +		basic_machine=m68k-hp
   2.624 +		os=-bsd
   2.625 +		;;
   2.626 +	hp300hpux)
   2.627 +		basic_machine=m68k-hp
   2.628 +		os=-hpux
   2.629 +		;;
   2.630 +	hp3k9[0-9][0-9] | hp9[0-9][0-9])
   2.631 +		basic_machine=hppa1.0-hp
   2.632 +		;;
   2.633 +	hp9k2[0-9][0-9] | hp9k31[0-9])
   2.634 +		basic_machine=m68000-hp
   2.635 +		;;
   2.636 +	hp9k3[2-9][0-9])
   2.637 +		basic_machine=m68k-hp
   2.638 +		;;
   2.639 +	hp9k6[0-9][0-9] | hp6[0-9][0-9])
   2.640 +		basic_machine=hppa1.0-hp
   2.641 +		;;
   2.642 +	hp9k7[0-79][0-9] | hp7[0-79][0-9])
   2.643 +		basic_machine=hppa1.1-hp
   2.644 +		;;
   2.645 +	hp9k78[0-9] | hp78[0-9])
   2.646 +		# FIXME: really hppa2.0-hp
   2.647 +		basic_machine=hppa1.1-hp
   2.648 +		;;
   2.649 +	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
   2.650 +		# FIXME: really hppa2.0-hp
   2.651 +		basic_machine=hppa1.1-hp
   2.652 +		;;
   2.653 +	hp9k8[0-9][13679] | hp8[0-9][13679])
   2.654 +		basic_machine=hppa1.1-hp
   2.655 +		;;
   2.656 +	hp9k8[0-9][0-9] | hp8[0-9][0-9])
   2.657 +		basic_machine=hppa1.0-hp
   2.658 +		;;
   2.659 +	hppa-next)
   2.660 +		os=-nextstep3
   2.661 +		;;
   2.662 +	hppaosf)
   2.663 +		basic_machine=hppa1.1-hp
   2.664 +		os=-osf
   2.665 +		;;
   2.666 +	hppro)
   2.667 +		basic_machine=hppa1.1-hp
   2.668 +		os=-proelf
   2.669 +		;;
   2.670 +	i370-ibm* | ibm*)
   2.671 +		basic_machine=i370-ibm
   2.672 +		;;
   2.673 +# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   2.674 +	i*86v32)
   2.675 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   2.676 +		os=-sysv32
   2.677 +		;;
   2.678 +	i*86v4*)
   2.679 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   2.680 +		os=-sysv4
   2.681 +		;;
   2.682 +	i*86v)
   2.683 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   2.684 +		os=-sysv
   2.685 +		;;
   2.686 +	i*86sol2)
   2.687 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   2.688 +		os=-solaris2
   2.689 +		;;
   2.690 +	i386mach)
   2.691 +		basic_machine=i386-mach
   2.692 +		os=-mach
   2.693 +		;;
   2.694 +	i386-vsta | vsta)
   2.695 +		basic_machine=i386-unknown
   2.696 +		os=-vsta
   2.697 +		;;
   2.698 +	iris | iris4d)
   2.699 +		basic_machine=mips-sgi
   2.700 +		case $os in
   2.701 +		    -irix*)
   2.702 +			;;
   2.703 +		    *)
   2.704 +			os=-irix4
   2.705 +			;;
   2.706 +		esac
   2.707 +		;;
   2.708 +	isi68 | isi)
   2.709 +		basic_machine=m68k-isi
   2.710 +		os=-sysv
   2.711 +		;;
   2.712 +	m68knommu)
   2.713 +		basic_machine=m68k-unknown
   2.714 +		os=-linux
   2.715 +		;;
   2.716 +	m68knommu-*)
   2.717 +		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.718 +		os=-linux
   2.719 +		;;
   2.720 +	m88k-omron*)
   2.721 +		basic_machine=m88k-omron
   2.722 +		;;
   2.723 +	magnum | m3230)
   2.724 +		basic_machine=mips-mips
   2.725 +		os=-sysv
   2.726 +		;;
   2.727 +	merlin)
   2.728 +		basic_machine=ns32k-utek
   2.729 +		os=-sysv
   2.730 +		;;
   2.731 +	mingw32)
   2.732 +		basic_machine=i386-pc
   2.733 +		os=-mingw32
   2.734 +		;;
   2.735 +	mingw32ce)
   2.736 +		basic_machine=arm-unknown
   2.737 +		os=-mingw32ce
   2.738 +		;;
   2.739 +	miniframe)
   2.740 +		basic_machine=m68000-convergent
   2.741 +		;;
   2.742 +	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
   2.743 +		basic_machine=m68k-atari
   2.744 +		os=-mint
   2.745 +		;;
   2.746 +	mips3*-*)
   2.747 +		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
   2.748 +		;;
   2.749 +	mips3*)
   2.750 +		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   2.751 +		;;
   2.752 +	monitor)
   2.753 +		basic_machine=m68k-rom68k
   2.754 +		os=-coff
   2.755 +		;;
   2.756 +	morphos)
   2.757 +		basic_machine=powerpc-unknown
   2.758 +		os=-morphos
   2.759 +		;;
   2.760 +	msdos)
   2.761 +		basic_machine=i386-pc
   2.762 +		os=-msdos
   2.763 +		;;
   2.764 +	ms1-*)
   2.765 +		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
   2.766 +		;;
   2.767 +	mvs)
   2.768 +		basic_machine=i370-ibm
   2.769 +		os=-mvs
   2.770 +		;;
   2.771 +	ncr3000)
   2.772 +		basic_machine=i486-ncr
   2.773 +		os=-sysv4
   2.774 +		;;
   2.775 +	netbsd386)
   2.776 +		basic_machine=i386-unknown
   2.777 +		os=-netbsd
   2.778 +		;;
   2.779 +	netwinder)
   2.780 +		basic_machine=armv4l-rebel
   2.781 +		os=-linux
   2.782 +		;;
   2.783 +	news | news700 | news800 | news900)
   2.784 +		basic_machine=m68k-sony
   2.785 +		os=-newsos
   2.786 +		;;
   2.787 +	news1000)
   2.788 +		basic_machine=m68030-sony
   2.789 +		os=-newsos
   2.790 +		;;
   2.791 +	news-3600 | risc-news)
   2.792 +		basic_machine=mips-sony
   2.793 +		os=-newsos
   2.794 +		;;
   2.795 +	necv70)
   2.796 +		basic_machine=v70-nec
   2.797 +		os=-sysv
   2.798 +		;;
   2.799 +	next | m*-next )
   2.800 +		basic_machine=m68k-next
   2.801 +		case $os in
   2.802 +		    -nextstep* )
   2.803 +			;;
   2.804 +		    -ns2*)
   2.805 +		      os=-nextstep2
   2.806 +			;;
   2.807 +		    *)
   2.808 +		      os=-nextstep3
   2.809 +			;;
   2.810 +		esac
   2.811 +		;;
   2.812 +	nh3000)
   2.813 +		basic_machine=m68k-harris
   2.814 +		os=-cxux
   2.815 +		;;
   2.816 +	nh[45]000)
   2.817 +		basic_machine=m88k-harris
   2.818 +		os=-cxux
   2.819 +		;;
   2.820 +	nindy960)
   2.821 +		basic_machine=i960-intel
   2.822 +		os=-nindy
   2.823 +		;;
   2.824 +	mon960)
   2.825 +		basic_machine=i960-intel
   2.826 +		os=-mon960
   2.827 +		;;
   2.828 +	nonstopux)
   2.829 +		basic_machine=mips-compaq
   2.830 +		os=-nonstopux
   2.831 +		;;
   2.832 +	np1)
   2.833 +		basic_machine=np1-gould
   2.834 +		;;
   2.835 +	nsr-tandem)
   2.836 +		basic_machine=nsr-tandem
   2.837 +		;;
   2.838 +	op50n-* | op60c-*)
   2.839 +		basic_machine=hppa1.1-oki
   2.840 +		os=-proelf
   2.841 +		;;
   2.842 +	openrisc | openrisc-*)
   2.843 +		basic_machine=or32-unknown
   2.844 +		;;
   2.845 +	os400)
   2.846 +		basic_machine=powerpc-ibm
   2.847 +		os=-os400
   2.848 +		;;
   2.849 +	OSE68000 | ose68000)
   2.850 +		basic_machine=m68000-ericsson
   2.851 +		os=-ose
   2.852 +		;;
   2.853 +	os68k)
   2.854 +		basic_machine=m68k-none
   2.855 +		os=-os68k
   2.856 +		;;
   2.857 +	pa-hitachi)
   2.858 +		basic_machine=hppa1.1-hitachi
   2.859 +		os=-hiuxwe2
   2.860 +		;;
   2.861 +	paragon)
   2.862 +		basic_machine=i860-intel
   2.863 +		os=-osf
   2.864 +		;;
   2.865 +	parisc)
   2.866 +		basic_machine=hppa-unknown
   2.867 +		os=-linux
   2.868 +		;;
   2.869 +	parisc-*)
   2.870 +		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.871 +		os=-linux
   2.872 +		;;
   2.873 +	pbd)
   2.874 +		basic_machine=sparc-tti
   2.875 +		;;
   2.876 +	pbb)
   2.877 +		basic_machine=m68k-tti
   2.878 +		;;
   2.879 +	pc532 | pc532-*)
   2.880 +		basic_machine=ns32k-pc532
   2.881 +		;;
   2.882 +	pc98)
   2.883 +		basic_machine=i386-pc
   2.884 +		;;
   2.885 +	pc98-*)
   2.886 +		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.887 +		;;
   2.888 +	pentium | p5 | k5 | k6 | nexgen | viac3)
   2.889 +		basic_machine=i586-pc
   2.890 +		;;
   2.891 +	pentiumpro | p6 | 6x86 | athlon | athlon_*)
   2.892 +		basic_machine=i686-pc
   2.893 +		;;
   2.894 +	pentiumii | pentium2 | pentiumiii | pentium3)
   2.895 +		basic_machine=i686-pc
   2.896 +		;;
   2.897 +	pentium4)
   2.898 +		basic_machine=i786-pc
   2.899 +		;;
   2.900 +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
   2.901 +		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.902 +		;;
   2.903 +	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   2.904 +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.905 +		;;
   2.906 +	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
   2.907 +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.908 +		;;
   2.909 +	pentium4-*)
   2.910 +		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.911 +		;;
   2.912 +	pn)
   2.913 +		basic_machine=pn-gould
   2.914 +		;;
   2.915 +	power)	basic_machine=power-ibm
   2.916 +		;;
   2.917 +	ppc)	basic_machine=powerpc-unknown
   2.918 +		;;
   2.919 +	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.920 +		;;
   2.921 +	ppcle | powerpclittle | ppc-le | powerpc-little)
   2.922 +		basic_machine=powerpcle-unknown
   2.923 +		;;
   2.924 +	ppcle-* | powerpclittle-*)
   2.925 +		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.926 +		;;
   2.927 +	ppc64)	basic_machine=powerpc64-unknown
   2.928 +		;;
   2.929 +	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.930 +		;;
   2.931 +	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
   2.932 +		basic_machine=powerpc64le-unknown
   2.933 +		;;
   2.934 +	ppc64le-* | powerpc64little-*)
   2.935 +		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
   2.936 +		;;
   2.937 +	ps2)
   2.938 +		basic_machine=i386-ibm
   2.939 +		;;
   2.940 +	pw32)
   2.941 +		basic_machine=i586-unknown
   2.942 +		os=-pw32
   2.943 +		;;
   2.944 +	rdos)
   2.945 +		basic_machine=i386-pc
   2.946 +		os=-rdos
   2.947 +		;;
   2.948 +	rom68k)
   2.949 +		basic_machine=m68k-rom68k
   2.950 +		os=-coff
   2.951 +		;;
   2.952 +	rm[46]00)
   2.953 +		basic_machine=mips-siemens
   2.954 +		;;
   2.955 +	rtpc | rtpc-*)
   2.956 +		basic_machine=romp-ibm
   2.957 +		;;
   2.958 +	s390 | s390-*)
   2.959 +		basic_machine=s390-ibm
   2.960 +		;;
   2.961 +	s390x | s390x-*)
   2.962 +		basic_machine=s390x-ibm
   2.963 +		;;
   2.964 +	sa29200)
   2.965 +		basic_machine=a29k-amd
   2.966 +		os=-udi
   2.967 +		;;
   2.968 +	sb1)
   2.969 +		basic_machine=mipsisa64sb1-unknown
   2.970 +		;;
   2.971 +	sb1el)
   2.972 +		basic_machine=mipsisa64sb1el-unknown
   2.973 +		;;
   2.974 +	sde)
   2.975 +		basic_machine=mipsisa32-sde
   2.976 +		os=-elf
   2.977 +		;;
   2.978 +	sei)
   2.979 +		basic_machine=mips-sei
   2.980 +		os=-seiux
   2.981 +		;;
   2.982 +	sequent)
   2.983 +		basic_machine=i386-sequent
   2.984 +		;;
   2.985 +	sh)
   2.986 +		basic_machine=sh-hitachi
   2.987 +		os=-hms
   2.988 +		;;
   2.989 +	sh5el)
   2.990 +		basic_machine=sh5le-unknown
   2.991 +		;;
   2.992 +	sh64)
   2.993 +		basic_machine=sh64-unknown
   2.994 +		;;
   2.995 +	sparclite-wrs | simso-wrs)
   2.996 +		basic_machine=sparclite-wrs
   2.997 +		os=-vxworks
   2.998 +		;;
   2.999 +	sps7)
  2.1000 +		basic_machine=m68k-bull
  2.1001 +		os=-sysv2
  2.1002 +		;;
  2.1003 +	spur)
  2.1004 +		basic_machine=spur-unknown
  2.1005 +		;;
  2.1006 +	st2000)
  2.1007 +		basic_machine=m68k-tandem
  2.1008 +		;;
  2.1009 +	stratus)
  2.1010 +		basic_machine=i860-stratus
  2.1011 +		os=-sysv4
  2.1012 +		;;
  2.1013 +	sun2)
  2.1014 +		basic_machine=m68000-sun
  2.1015 +		;;
  2.1016 +	sun2os3)
  2.1017 +		basic_machine=m68000-sun
  2.1018 +		os=-sunos3
  2.1019 +		;;
  2.1020 +	sun2os4)
  2.1021 +		basic_machine=m68000-sun
  2.1022 +		os=-sunos4
  2.1023 +		;;
  2.1024 +	sun3os3)
  2.1025 +		basic_machine=m68k-sun
  2.1026 +		os=-sunos3
  2.1027 +		;;
  2.1028 +	sun3os4)
  2.1029 +		basic_machine=m68k-sun
  2.1030 +		os=-sunos4
  2.1031 +		;;
  2.1032 +	sun4os3)
  2.1033 +		basic_machine=sparc-sun
  2.1034 +		os=-sunos3
  2.1035 +		;;
  2.1036 +	sun4os4)
  2.1037 +		basic_machine=sparc-sun
  2.1038 +		os=-sunos4
  2.1039 +		;;
  2.1040 +	sun4sol2)
  2.1041 +		basic_machine=sparc-sun
  2.1042 +		os=-solaris2
  2.1043 +		;;
  2.1044 +	sun3 | sun3-*)
  2.1045 +		basic_machine=m68k-sun
  2.1046 +		;;
  2.1047 +	sun4)
  2.1048 +		basic_machine=sparc-sun
  2.1049 +		;;
  2.1050 +	sun386 | sun386i | roadrunner)
  2.1051 +		basic_machine=i386-sun
  2.1052 +		;;
  2.1053 +	sv1)
  2.1054 +		basic_machine=sv1-cray
  2.1055 +		os=-unicos
  2.1056 +		;;
  2.1057 +	symmetry)
  2.1058 +		basic_machine=i386-sequent
  2.1059 +		os=-dynix
  2.1060 +		;;
  2.1061 +	t3e)
  2.1062 +		basic_machine=alphaev5-cray
  2.1063 +		os=-unicos
  2.1064 +		;;
  2.1065 +	t90)
  2.1066 +		basic_machine=t90-cray
  2.1067 +		os=-unicos
  2.1068 +		;;
  2.1069 +	tic54x | c54x*)
  2.1070 +		basic_machine=tic54x-unknown
  2.1071 +		os=-coff
  2.1072 +		;;
  2.1073 +	tic55x | c55x*)
  2.1074 +		basic_machine=tic55x-unknown
  2.1075 +		os=-coff
  2.1076 +		;;
  2.1077 +	tic6x | c6x*)
  2.1078 +		basic_machine=tic6x-unknown
  2.1079 +		os=-coff
  2.1080 +		;;
  2.1081 +	tile*)
  2.1082 +		basic_machine=tile-unknown
  2.1083 +		os=-linux-gnu
  2.1084 +		;;
  2.1085 +	tx39)
  2.1086 +		basic_machine=mipstx39-unknown
  2.1087 +		;;
  2.1088 +	tx39el)
  2.1089 +		basic_machine=mipstx39el-unknown
  2.1090 +		;;
  2.1091 +	toad1)
  2.1092 +		basic_machine=pdp10-xkl
  2.1093 +		os=-tops20
  2.1094 +		;;
  2.1095 +	tower | tower-32)
  2.1096 +		basic_machine=m68k-ncr
  2.1097 +		;;
  2.1098 +	tpf)
  2.1099 +		basic_machine=s390x-ibm
  2.1100 +		os=-tpf
  2.1101 +		;;
  2.1102 +	udi29k)
  2.1103 +		basic_machine=a29k-amd
  2.1104 +		os=-udi
  2.1105 +		;;
  2.1106 +	ultra3)
  2.1107 +		basic_machine=a29k-nyu
  2.1108 +		os=-sym1
  2.1109 +		;;
  2.1110 +	v810 | necv810)
  2.1111 +		basic_machine=v810-nec
  2.1112 +		os=-none
  2.1113 +		;;
  2.1114 +	vaxv)
  2.1115 +		basic_machine=vax-dec
  2.1116 +		os=-sysv
  2.1117 +		;;
  2.1118 +	vms)
  2.1119 +		basic_machine=vax-dec
  2.1120 +		os=-vms
  2.1121 +		;;
  2.1122 +	vpp*|vx|vx-*)
  2.1123 +		basic_machine=f301-fujitsu
  2.1124 +		;;
  2.1125 +	vxworks960)
  2.1126 +		basic_machine=i960-wrs
  2.1127 +		os=-vxworks
  2.1128 +		;;
  2.1129 +	vxworks68)
  2.1130 +		basic_machine=m68k-wrs
  2.1131 +		os=-vxworks
  2.1132 +		;;
  2.1133 +	vxworks29k)
  2.1134 +		basic_machine=a29k-wrs
  2.1135 +		os=-vxworks
  2.1136 +		;;
  2.1137 +	w65*)
  2.1138 +		basic_machine=w65-wdc
  2.1139 +		os=-none
  2.1140 +		;;
  2.1141 +	w89k-*)
  2.1142 +		basic_machine=hppa1.1-winbond
  2.1143 +		os=-proelf
  2.1144 +		;;
  2.1145 +	xbox)
  2.1146 +		basic_machine=i686-pc
  2.1147 +		os=-mingw32
  2.1148 +		;;
  2.1149 +	xps | xps100)
  2.1150 +		basic_machine=xps100-honeywell
  2.1151 +		;;
  2.1152 +	ymp)
  2.1153 +		basic_machine=ymp-cray
  2.1154 +		os=-unicos
  2.1155 +		;;
  2.1156 +	z8k-*-coff)
  2.1157 +		basic_machine=z8k-unknown
  2.1158 +		os=-sim
  2.1159 +		;;
  2.1160 +	none)
  2.1161 +		basic_machine=none-none
  2.1162 +		os=-none
  2.1163 +		;;
  2.1164 +
  2.1165 +# Here we handle the default manufacturer of certain CPU types.  It is in
  2.1166 +# some cases the only manufacturer, in others, it is the most popular.
  2.1167 +	w89k)
  2.1168 +		basic_machine=hppa1.1-winbond
  2.1169 +		;;
  2.1170 +	op50n)
  2.1171 +		basic_machine=hppa1.1-oki
  2.1172 +		;;
  2.1173 +	op60c)
  2.1174 +		basic_machine=hppa1.1-oki
  2.1175 +		;;
  2.1176 +	romp)
  2.1177 +		basic_machine=romp-ibm
  2.1178 +		;;
  2.1179 +	mmix)
  2.1180 +		basic_machine=mmix-knuth
  2.1181 +		;;
  2.1182 +	rs6000)
  2.1183 +		basic_machine=rs6000-ibm
  2.1184 +		;;
  2.1185 +	vax)
  2.1186 +		basic_machine=vax-dec
  2.1187 +		;;
  2.1188 +	pdp10)
  2.1189 +		# there are many clones, so DEC is not a safe bet
  2.1190 +		basic_machine=pdp10-unknown
  2.1191 +		;;
  2.1192 +	pdp11)
  2.1193 +		basic_machine=pdp11-dec
  2.1194 +		;;
  2.1195 +	we32k)
  2.1196 +		basic_machine=we32k-att
  2.1197 +		;;
  2.1198 +	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
  2.1199 +		basic_machine=sh-unknown
  2.1200 +		;;
  2.1201 +	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
  2.1202 +		basic_machine=sparc-sun
  2.1203 +		;;
  2.1204 +	cydra)
  2.1205 +		basic_machine=cydra-cydrome
  2.1206 +		;;
  2.1207 +	orion)
  2.1208 +		basic_machine=orion-highlevel
  2.1209 +		;;
  2.1210 +	orion105)
  2.1211 +		basic_machine=clipper-highlevel
  2.1212 +		;;
  2.1213 +	mac | mpw | mac-mpw)
  2.1214 +		basic_machine=m68k-apple
  2.1215 +		;;
  2.1216 +	pmac | pmac-mpw)
  2.1217 +		basic_machine=powerpc-apple
  2.1218 +		;;
  2.1219 +	*-unknown)
  2.1220 +		# Make sure to match an already-canonicalized machine name.
  2.1221 +		;;
  2.1222 +	*)
  2.1223 +		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  2.1224 +		exit 1
  2.1225 +		;;
  2.1226 +esac
  2.1227 +
  2.1228 +# Here we canonicalize certain aliases for manufacturers.
  2.1229 +case $basic_machine in
  2.1230 +	*-digital*)
  2.1231 +		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
  2.1232 +		;;
  2.1233 +	*-commodore*)
  2.1234 +		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
  2.1235 +		;;
  2.1236 +	*)
  2.1237 +		;;
  2.1238 +esac
  2.1239 +
  2.1240 +# Decode manufacturer-specific aliases for certain operating systems.
  2.1241 +
  2.1242 +if [ x"$os" != x"" ]
  2.1243 +then
  2.1244 +case $os in
  2.1245 +        # First match some system type aliases
  2.1246 +        # that might get confused with valid system types.
  2.1247 +	# -solaris* is a basic system type, with this one exception.
  2.1248 +	-solaris1 | -solaris1.*)
  2.1249 +		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  2.1250 +		;;
  2.1251 +	-solaris)
  2.1252 +		os=-solaris2
  2.1253 +		;;
  2.1254 +	-svr4*)
  2.1255 +		os=-sysv4
  2.1256 +		;;
  2.1257 +	-unixware*)
  2.1258 +		os=-sysv4.2uw
  2.1259 +		;;
  2.1260 +	-gnu/linux*)
  2.1261 +		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  2.1262 +		;;
  2.1263 +	# First accept the basic system types.
  2.1264 +	# The portable systems comes first.
  2.1265 +	# Each alternative MUST END IN A *, to match a version number.
  2.1266 +	# -sysv* is not here because it comes later, after sysvr4.
  2.1267 +	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  2.1268 +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  2.1269 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
  2.1270 +	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
  2.1271 +	      | -aos* \
  2.1272 +	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  2.1273 +	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  2.1274 +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
  2.1275 +	      | -openbsd* | -solidbsd* \
  2.1276 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  2.1277 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  2.1278 +	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  2.1279 +	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  2.1280 +	      | -chorusos* | -chorusrdb* \
  2.1281 +	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  2.1282 +	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  2.1283 +	      | -uxpv* | -beos* | -mpeix* | -udk* \
  2.1284 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  2.1285 +	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  2.1286 +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  2.1287 +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  2.1288 +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  2.1289 +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
  2.1290 +	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
  2.1291 +	# Remember, each alternative MUST END IN *, to match a version number.
  2.1292 +		;;
  2.1293 +	-qnx*)
  2.1294 +		case $basic_machine in
  2.1295 +		    x86-* | i*86-*)
  2.1296 +			;;
  2.1297 +		    *)
  2.1298 +			os=-nto$os
  2.1299 +			;;
  2.1300 +		esac
  2.1301 +		;;
  2.1302 +	-nto-qnx*)
  2.1303 +		;;
  2.1304 +	-nto*)
  2.1305 +		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  2.1306 +		;;
  2.1307 +	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  2.1308 +	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
  2.1309 +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  2.1310 +		;;
  2.1311 +	-mac*)
  2.1312 +		os=`echo $os | sed -e 's|mac|macos|'`
  2.1313 +		;;
  2.1314 +	-linux-dietlibc)
  2.1315 +		os=-linux-dietlibc
  2.1316 +		;;
  2.1317 +	-linux*)
  2.1318 +		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  2.1319 +		;;
  2.1320 +	-sunos5*)
  2.1321 +		os=`echo $os | sed -e 's|sunos5|solaris2|'`
  2.1322 +		;;
  2.1323 +	-sunos6*)
  2.1324 +		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  2.1325 +		;;
  2.1326 +	-opened*)
  2.1327 +		os=-openedition
  2.1328 +		;;
  2.1329 +        -os400*)
  2.1330 +		os=-os400
  2.1331 +		;;
  2.1332 +	-wince*)
  2.1333 +		os=-wince
  2.1334 +		;;
  2.1335 +	-osfrose*)
  2.1336 +		os=-osfrose
  2.1337 +		;;
  2.1338 +	-osf*)
  2.1339 +		os=-osf
  2.1340 +		;;
  2.1341 +	-utek*)
  2.1342 +		os=-bsd
  2.1343 +		;;
  2.1344 +	-dynix*)
  2.1345 +		os=-bsd
  2.1346 +		;;
  2.1347 +	-acis*)
  2.1348 +		os=-aos
  2.1349 +		;;
  2.1350 +	-atheos*)
  2.1351 +		os=-atheos
  2.1352 +		;;
  2.1353 +	-syllable*)
  2.1354 +		os=-syllable
  2.1355 +		;;
  2.1356 +	-386bsd)
  2.1357 +		os=-bsd
  2.1358 +		;;
  2.1359 +	-ctix* | -uts*)
  2.1360 +		os=-sysv
  2.1361 +		;;
  2.1362 +	-nova*)
  2.1363 +		os=-rtmk-nova
  2.1364 +		;;
  2.1365 +	-ns2 )
  2.1366 +		os=-nextstep2
  2.1367 +		;;
  2.1368 +	-nsk*)
  2.1369 +		os=-nsk
  2.1370 +		;;
  2.1371 +	# Preserve the version number of sinix5.
  2.1372 +	-sinix5.*)
  2.1373 +		os=`echo $os | sed -e 's|sinix|sysv|'`
  2.1374 +		;;
  2.1375 +	-sinix*)
  2.1376 +		os=-sysv4
  2.1377 +		;;
  2.1378 +        -tpf*)
  2.1379 +		os=-tpf
  2.1380 +		;;
  2.1381 +	-triton*)
  2.1382 +		os=-sysv3
  2.1383 +		;;
  2.1384 +	-oss*)
  2.1385 +		os=-sysv3
  2.1386 +		;;
  2.1387 +	-svr4)
  2.1388 +		os=-sysv4
  2.1389 +		;;
  2.1390 +	-svr3)
  2.1391 +		os=-sysv3
  2.1392 +		;;
  2.1393 +	-sysvr4)
  2.1394 +		os=-sysv4
  2.1395 +		;;
  2.1396 +	# This must come after -sysvr4.
  2.1397 +	-sysv*)
  2.1398 +		;;
  2.1399 +	-ose*)
  2.1400 +		os=-ose
  2.1401 +		;;
  2.1402 +	-es1800*)
  2.1403 +		os=-ose
  2.1404 +		;;
  2.1405 +	-xenix)
  2.1406 +		os=-xenix
  2.1407 +		;;
  2.1408 +	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  2.1409 +		os=-mint
  2.1410 +		;;
  2.1411 +	-aros*)
  2.1412 +		os=-aros
  2.1413 +		;;
  2.1414 +	-kaos*)
  2.1415 +		os=-kaos
  2.1416 +		;;
  2.1417 +	-zvmoe)
  2.1418 +		os=-zvmoe
  2.1419 +		;;
  2.1420 +	-none)
  2.1421 +		;;
  2.1422 +	*)
  2.1423 +		# Get rid of the `-' at the beginning of $os.
  2.1424 +		os=`echo $os | sed 's/[^-]*-//'`
  2.1425 +		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
  2.1426 +		exit 1
  2.1427 +		;;
  2.1428 +esac
  2.1429 +else
  2.1430 +
  2.1431 +# Here we handle the default operating systems that come with various machines.
  2.1432 +# The value should be what the vendor currently ships out the door with their
  2.1433 +# machine or put another way, the most popular os provided with the machine.
  2.1434 +
  2.1435 +# Note that if you're going to try to match "-MANUFACTURER" here (say,
  2.1436 +# "-sun"), then you have to tell the case statement up towards the top
  2.1437 +# that MANUFACTURER isn't an operating system.  Otherwise, code above
  2.1438 +# will signal an error saying that MANUFACTURER isn't an operating
  2.1439 +# system, and we'll never get to this point.
  2.1440 +
  2.1441 +case $basic_machine in
  2.1442 +        score-*)
  2.1443 +		os=-elf
  2.1444 +		;;
  2.1445 +        spu-*)
  2.1446 +		os=-elf
  2.1447 +		;;
  2.1448 +	*-acorn)
  2.1449 +		os=-riscix1.2
  2.1450 +		;;
  2.1451 +	arm*-rebel)
  2.1452 +		os=-linux
  2.1453 +		;;
  2.1454 +	arm*-semi)
  2.1455 +		os=-aout
  2.1456 +		;;
  2.1457 +        c4x-* | tic4x-*)
  2.1458 +        	os=-coff
  2.1459 +		;;
  2.1460 +	# This must come before the *-dec entry.
  2.1461 +	pdp10-*)
  2.1462 +		os=-tops20
  2.1463 +		;;
  2.1464 +	pdp11-*)
  2.1465 +		os=-none
  2.1466 +		;;
  2.1467 +	*-dec | vax-*)
  2.1468 +		os=-ultrix4.2
  2.1469 +		;;
  2.1470 +	m68*-apollo)
  2.1471 +		os=-domain
  2.1472 +		;;
  2.1473 +	i386-sun)
  2.1474 +		os=-sunos4.0.2
  2.1475 +		;;
  2.1476 +	m68000-sun)
  2.1477 +		os=-sunos3
  2.1478 +		# This also exists in the configure program, but was not the
  2.1479 +		# default.
  2.1480 +		# os=-sunos4
  2.1481 +		;;
  2.1482 +	m68*-cisco)
  2.1483 +		os=-aout
  2.1484 +		;;
  2.1485 +        mep-*)
  2.1486 +		os=-elf
  2.1487 +		;;
  2.1488 +	mips*-cisco)
  2.1489 +		os=-elf
  2.1490 +		;;
  2.1491 +	mips*-*)
  2.1492 +		os=-elf
  2.1493 +		;;
  2.1494 +	or32-*)
  2.1495 +		os=-coff
  2.1496 +		;;
  2.1497 +	*-tti)	# must be before sparc entry or we get the wrong os.
  2.1498 +		os=-sysv3
  2.1499 +		;;
  2.1500 +	sparc-* | *-sun)
  2.1501 +		os=-sunos4.1.1
  2.1502 +		;;
  2.1503 +	*-be)
  2.1504 +		os=-beos
  2.1505 +		;;
  2.1506 +	*-haiku)
  2.1507 +		os=-haiku
  2.1508 +		;;
  2.1509 +	*-ibm)
  2.1510 +		os=-aix
  2.1511 +		;;
  2.1512 +    	*-knuth)
  2.1513 +		os=-mmixware
  2.1514 +		;;
  2.1515 +	*-wec)
  2.1516 +		os=-proelf
  2.1517 +		;;
  2.1518 +	*-winbond)
  2.1519 +		os=-proelf
  2.1520 +		;;
  2.1521 +	*-oki)
  2.1522 +		os=-proelf
  2.1523 +		;;
  2.1524 +	*-hp)
  2.1525 +		os=-hpux
  2.1526 +		;;
  2.1527 +	*-hitachi)
  2.1528 +		os=-hiux
  2.1529 +		;;
  2.1530 +	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
  2.1531 +		os=-sysv
  2.1532 +		;;
  2.1533 +	*-cbm)
  2.1534 +		os=-amigaos
  2.1535 +		;;
  2.1536 +	*-dg)
  2.1537 +		os=-dgux
  2.1538 +		;;
  2.1539 +	*-dolphin)
  2.1540 +		os=-sysv3
  2.1541 +		;;
  2.1542 +	m68k-ccur)
  2.1543 +		os=-rtu
  2.1544 +		;;
  2.1545 +	m88k-omron*)
  2.1546 +		os=-luna
  2.1547 +		;;
  2.1548 +	*-next )
  2.1549 +		os=-nextstep
  2.1550 +		;;
  2.1551 +	*-sequent)
  2.1552 +		os=-ptx
  2.1553 +		;;
  2.1554 +	*-crds)
  2.1555 +		os=-unos
  2.1556 +		;;
  2.1557 +	*-ns)
  2.1558 +		os=-genix
  2.1559 +		;;
  2.1560 +	i370-*)
  2.1561 +		os=-mvs
  2.1562 +		;;
  2.1563 +	*-next)
  2.1564 +		os=-nextstep3
  2.1565 +		;;
  2.1566 +	*-gould)
  2.1567 +		os=-sysv
  2.1568 +		;;
  2.1569 +	*-highlevel)
  2.1570 +		os=-bsd
  2.1571 +		;;
  2.1572 +	*-encore)
  2.1573 +		os=-bsd
  2.1574 +		;;
  2.1575 +	*-sgi)
  2.1576 +		os=-irix
  2.1577 +		;;
  2.1578 +	*-siemens)
  2.1579 +		os=-sysv4
  2.1580 +		;;
  2.1581 +	*-masscomp)
  2.1582 +		os=-rtu
  2.1583 +		;;
  2.1584 +	f30[01]-fujitsu | f700-fujitsu)
  2.1585 +		os=-uxpv
  2.1586 +		;;
  2.1587 +	*-rom68k)
  2.1588 +		os=-coff
  2.1589 +		;;
  2.1590 +	*-*bug)
  2.1591 +		os=-coff
  2.1592 +		;;
  2.1593 +	*-apple)
  2.1594 +		os=-macos
  2.1595 +		;;
  2.1596 +	*-atari*)
  2.1597 +		os=-mint
  2.1598 +		;;
  2.1599 +	*)
  2.1600 +		os=-none
  2.1601 +		;;
  2.1602 +esac
  2.1603 +fi
  2.1604 +
  2.1605 +# Here we handle the case where we know the os, and the CPU type, but not the
  2.1606 +# manufacturer.  We pick the logical manufacturer.
  2.1607 +vendor=unknown
  2.1608 +case $basic_machine in
  2.1609 +	*-unknown)
  2.1610 +		case $os in
  2.1611 +			-riscix*)
  2.1612 +				vendor=acorn
  2.1613 +				;;
  2.1614 +			-sunos*)
  2.1615 +				vendor=sun
  2.1616 +				;;
  2.1617 +			-aix*)
  2.1618 +				vendor=ibm
  2.1619 +				;;
  2.1620 +			-beos*)
  2.1621 +				vendor=be
  2.1622 +				;;
  2.1623 +			-hpux*)
  2.1624 +				vendor=hp
  2.1625 +				;;
  2.1626 +			-mpeix*)
  2.1627 +				vendor=hp
  2.1628 +				;;
  2.1629 +			-hiux*)
  2.1630 +				vendor=hitachi
  2.1631 +				;;
  2.1632 +			-unos*)
  2.1633 +				vendor=crds
  2.1634 +				;;
  2.1635 +			-dgux*)
  2.1636 +				vendor=dg
  2.1637 +				;;
  2.1638 +			-luna*)
  2.1639 +				vendor=omron
  2.1640 +				;;
  2.1641 +			-genix*)
  2.1642 +				vendor=ns
  2.1643 +				;;
  2.1644 +			-mvs* | -opened*)
  2.1645 +				vendor=ibm
  2.1646 +				;;
  2.1647 +			-os400*)
  2.1648 +				vendor=ibm
  2.1649 +				;;
  2.1650 +			-ptx*)
  2.1651 +				vendor=sequent
  2.1652 +				;;
  2.1653 +			-tpf*)
  2.1654 +				vendor=ibm
  2.1655 +				;;
  2.1656 +			-vxsim* | -vxworks* | -windiss*)
  2.1657 +				vendor=wrs
  2.1658 +				;;
  2.1659 +			-aux*)
  2.1660 +				vendor=apple
  2.1661 +				;;
  2.1662 +			-hms*)
  2.1663 +				vendor=hitachi
  2.1664 +				;;
  2.1665 +			-mpw* | -macos*)
  2.1666 +				vendor=apple
  2.1667 +				;;
  2.1668 +			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  2.1669 +				vendor=atari
  2.1670 +				;;
  2.1671 +			-vos*)
  2.1672 +				vendor=stratus
  2.1673 +				;;
  2.1674 +		esac
  2.1675 +		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
  2.1676 +		;;
  2.1677 +esac
  2.1678 +
  2.1679 +echo $basic_machine$os
  2.1680 +exit
  2.1681 +
  2.1682 +# Local variables:
  2.1683 +# eval: (add-hook 'write-file-hooks 'time-stamp)
  2.1684 +# time-stamp-start: "timestamp='"
  2.1685 +# time-stamp-format: "%:y-%02m-%02d"
  2.1686 +# time-stamp-end: "'"
  2.1687 +# End:
     3.1 --- a/common/autoconf/build-aux/config.sub	Wed Mar 18 18:09:23 2015 -0700
     3.2 +++ b/common/autoconf/build-aux/config.sub	Wed Mar 25 11:31:19 2015 -0700
     3.3 @@ -1,14 +1,11 @@
     3.4 -#! /bin/sh
     3.5 -
     3.6 +#!/bin/sh
     3.7  #
     3.8 -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     3.9 +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
    3.10  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3.11  #
    3.12  # This code is free software; you can redistribute it and/or modify it
    3.13  # under the terms of the GNU General Public License version 2 only, as
    3.14 -# published by the Free Software Foundation.  Oracle designates this
    3.15 -# particular file as subject to the "Classpath" exception as provided
    3.16 -# by Oracle in the LICENSE file that accompanied this code.
    3.17 +# published by the Free Software Foundation.
    3.18  #
    3.19  # This code is distributed in the hope that it will be useful, but WITHOUT
    3.20  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.21 @@ -25,1660 +22,43 @@
    3.22  # questions.
    3.23  #
    3.24  
    3.25 -# Configuration validation subroutine script.
    3.26 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    3.27 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    3.28 -#   Free Software Foundation, Inc.
    3.29 +# This is a wrapper for the config.guess from autoconf. The latter
    3.30 +# does not know about all of our platforms. Instead of patching the
    3.31 +# autoconf system (which might easily get lost in a future update), we
    3.32 +# wrap it and fix the broken property, if needed.
    3.33  
    3.34 -timestamp='2008-01-16'
    3.35 +DIR=`dirname $0`
    3.36  
    3.37 -# This file is (in principle) common to ALL GNU software.
    3.38 -# The presence of a machine in this file suggests that SOME GNU software
    3.39 -# can handle that machine.  It does not imply ALL GNU software can.
    3.40 -#
    3.41 -# This file is free software; you can redistribute it and/or modify
    3.42 -# it under the terms of the GNU General Public License as published by
    3.43 -# the Free Software Foundation; either version 2 of the License, or
    3.44 -# (at your option) any later version.
    3.45 -#
    3.46 -# This program is distributed in the hope that it will be useful,
    3.47 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
    3.48 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    3.49 -# GNU General Public License for more details.
    3.50 -#
    3.51 -# You should have received a copy of the GNU General Public License
    3.52 -# along with this program; if not, write to the Free Software
    3.53 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    3.54 -# 02110-1301, USA.
    3.55 -#
    3.56 -# As a special exception to the GNU General Public License, if you
    3.57 -# distribute this file as part of a program that contains a
    3.58 -# configuration script generated by Autoconf, you may include it under
    3.59 -# the same distribution terms that you use for the rest of that program.
    3.60 +# First, filter out everything that doesn't begin with "aarch64-"
    3.61 +if ! echo $* | grep '^aarch64-' >/dev/null ; then
    3.62 +    . $DIR/autoconf-config.sub "$@"
    3.63 +    # autoconf-config.sub exits, so we never reach here, but just in
    3.64 +    # case we do:
    3.65 +    exit
    3.66 +fi
    3.67  
    3.68 -
    3.69 -# Please send patches to <config-patches@gnu.org>.  Submit a context
    3.70 -# diff and a properly formatted ChangeLog entry.
    3.71 -#
    3.72 -# Configuration subroutine to validate and canonicalize a configuration type.
    3.73 -# Supply the specified configuration type as an argument.
    3.74 -# If it is invalid, we print an error message on stderr and exit with code 1.
    3.75 -# Otherwise, we print the canonical config type on stdout and succeed.
    3.76 -
    3.77 -# This file is supposed to be the same for all GNU packages
    3.78 -# and recognize all the CPU types, system types and aliases
    3.79 -# that are meaningful with *any* GNU software.
    3.80 -# Each package is responsible for reporting which valid configurations
    3.81 -# it does not support.  The user should be able to distinguish
    3.82 -# a failure to support a valid configuration from a meaningless
    3.83 -# configuration.
    3.84 -
    3.85 -# The goal of this file is to map all the various variations of a given
    3.86 -# machine specification into a single specification in the form:
    3.87 -#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
    3.88 -# or in some cases, the newer four-part form:
    3.89 -#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
    3.90 -# It is wrong to echo any other type of specification.
    3.91 -
    3.92 -me=`echo "$0" | sed -e 's,.*/,,'`
    3.93 -
    3.94 -usage="\
    3.95 -Usage: $0 [OPTION] CPU-MFR-OPSYS
    3.96 -       $0 [OPTION] ALIAS
    3.97 -
    3.98 -Canonicalize a configuration name.
    3.99 -
   3.100 -Operation modes:
   3.101 -  -h, --help         print this help, then exit
   3.102 -  -t, --time-stamp   print date of last modification, then exit
   3.103 -  -v, --version      print version number, then exit
   3.104 -
   3.105 -Report bugs and patches to <config-patches@gnu.org>."
   3.106 -
   3.107 -version="\
   3.108 -GNU config.sub ($timestamp)
   3.109 -
   3.110 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
   3.111 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
   3.112 -
   3.113 -This is free software; see the source for copying conditions.  There is NO
   3.114 -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
   3.115 -
   3.116 -help="
   3.117 -Try \`$me --help' for more information."
   3.118 -
   3.119 -# Parse command line
   3.120  while test $# -gt 0 ; do
   3.121 -  case $1 in
   3.122 -    --time-stamp | --time* | -t )
   3.123 -       echo "$timestamp" ; exit ;;
   3.124 -    --version | -v )
   3.125 -       echo "$version" ; exit ;;
   3.126 -    --help | --h* | -h )
   3.127 -       echo "$usage"; exit ;;
   3.128 -    -- )     # Stop option processing
   3.129 -       shift; break ;;
   3.130 -    - )	# Use stdin as input.
   3.131 -       break ;;
   3.132 -    -* )
   3.133 -       echo "$me: invalid option $1$help"
   3.134 -       exit 1 ;;
   3.135 -
   3.136 -    *local*)
   3.137 -       # First pass through any local machine types.
   3.138 -       echo $1
   3.139 -       exit ;;
   3.140 -
   3.141 -    * )
   3.142 -       break ;;
   3.143 -  esac
   3.144 +    case $1 in 
   3.145 +        -- )   # Stop option processing
   3.146 +            shift; break ;;
   3.147 +        aarch64-* )
   3.148 +            config=`echo $1 | sed 's/^aarch64-/arm-/'`
   3.149 +            sub_args="$sub_args $config"
   3.150 +            shift; ;;
   3.151 +        - )    # Use stdin as input.
   3.152 +            sub_args="$sub_args $1"
   3.153 +            shift; break ;;
   3.154 +        * )
   3.155 +            sub_args="$sub_args $1"
   3.156 +            shift; ;;
   3.157 +    esac
   3.158  done
   3.159  
   3.160 -case $# in
   3.161 - 0) echo "$me: missing argument$help" >&2
   3.162 -    exit 1;;
   3.163 - 1) ;;
   3.164 - *) echo "$me: too many arguments$help" >&2
   3.165 -    exit 1;;
   3.166 -esac
   3.167 +result=`. $DIR/autoconf-config.sub $sub_args "$@"`
   3.168 +exitcode=$?
   3.169  
   3.170 -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
   3.171 -# Here we must recognize all the valid KERNEL-OS combinations.
   3.172 -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   3.173 -case $maybe_os in
   3.174 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   3.175 -  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
   3.176 -  storm-chaos* | os2-emx* | rtmk-nova*)
   3.177 -    os=-$maybe_os
   3.178 -    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   3.179 -    ;;
   3.180 -  *)
   3.181 -    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
   3.182 -    if [ $basic_machine != $1 ]
   3.183 -    then os=`echo $1 | sed 's/.*-/-/'`
   3.184 -    else os=; fi
   3.185 -    ;;
   3.186 -esac
   3.187 +result=`echo $result | sed "s/^arm-/aarch64-/"`
   3.188  
   3.189 -### Let's recognize common machines as not being operating systems so
   3.190 -### that things like config.sub decstation-3100 work.  We also
   3.191 -### recognize some manufacturers as not being operating systems, so we
   3.192 -### can provide default operating systems below.
   3.193 -case $os in
   3.194 -	-sun*os*)
   3.195 -		# Prevent following clause from handling this invalid input.
   3.196 -		;;
   3.197 -	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
   3.198 -	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
   3.199 -	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
   3.200 -	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   3.201 -	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   3.202 -	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   3.203 -	-apple | -axis | -knuth | -cray)
   3.204 -		os=
   3.205 -		basic_machine=$1
   3.206 -		;;
   3.207 -	-sim | -cisco | -oki | -wec | -winbond)
   3.208 -		os=
   3.209 -		basic_machine=$1
   3.210 -		;;
   3.211 -	-scout)
   3.212 -		;;
   3.213 -	-wrs)
   3.214 -		os=-vxworks
   3.215 -		basic_machine=$1
   3.216 -		;;
   3.217 -	-chorusos*)
   3.218 -		os=-chorusos
   3.219 -		basic_machine=$1
   3.220 -		;;
   3.221 - 	-chorusrdb)
   3.222 - 		os=-chorusrdb
   3.223 -		basic_machine=$1
   3.224 - 		;;
   3.225 -	-hiux*)
   3.226 -		os=-hiuxwe2
   3.227 -		;;
   3.228 -	-sco6)
   3.229 -		os=-sco5v6
   3.230 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.231 -		;;
   3.232 -	-sco5)
   3.233 -		os=-sco3.2v5
   3.234 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.235 -		;;
   3.236 -	-sco4)
   3.237 -		os=-sco3.2v4
   3.238 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.239 -		;;
   3.240 -	-sco3.2.[4-9]*)
   3.241 -		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
   3.242 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.243 -		;;
   3.244 -	-sco3.2v[4-9]*)
   3.245 -		# Don't forget version if it is 3.2v4 or newer.
   3.246 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.247 -		;;
   3.248 -	-sco5v6*)
   3.249 -		# Don't forget version if it is 3.2v4 or newer.
   3.250 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.251 -		;;
   3.252 -	-sco*)
   3.253 -		os=-sco3.2v2
   3.254 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.255 -		;;
   3.256 -	-udk*)
   3.257 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.258 -		;;
   3.259 -	-isc)
   3.260 -		os=-isc2.2
   3.261 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.262 -		;;
   3.263 -	-clix*)
   3.264 -		basic_machine=clipper-intergraph
   3.265 -		;;
   3.266 -	-isc*)
   3.267 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   3.268 -		;;
   3.269 -	-lynx*)
   3.270 -		os=-lynxos
   3.271 -		;;
   3.272 -	-ptx*)
   3.273 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
   3.274 -		;;
   3.275 -	-windowsnt*)
   3.276 -		os=`echo $os | sed -e 's/windowsnt/winnt/'`
   3.277 -		;;
   3.278 -	-psos*)
   3.279 -		os=-psos
   3.280 -		;;
   3.281 -	-mint | -mint[0-9]*)
   3.282 -		basic_machine=m68k-atari
   3.283 -		os=-mint
   3.284 -		;;
   3.285 -esac
   3.286 +echo $result
   3.287 +exit $exitcode
   3.288  
   3.289 -# Decode aliases for certain CPU-COMPANY combinations.
   3.290 -case $basic_machine in
   3.291 -	# Recognize the basic CPU types without company name.
   3.292 -	# Some are omitted here because they have special meanings below.
   3.293 -	1750a | 580 \
   3.294 -	| a29k \
   3.295 -	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
   3.296 -	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
   3.297 -	| am33_2.0 \
   3.298 -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
   3.299 -	| bfin \
   3.300 -	| c4x | clipper \
   3.301 -	| d10v | d30v | dlx | dsp16xx \
   3.302 -	| fido | fr30 | frv \
   3.303 -	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   3.304 -	| i370 | i860 | i960 | ia64 \
   3.305 -	| ip2k | iq2000 \
   3.306 -	| m32c | m32r | m32rle | m68000 | m68k | m88k \
   3.307 -	| maxq | mb | microblaze | mcore | mep \
   3.308 -	| mips | mipsbe | mipseb | mipsel | mipsle \
   3.309 -	| mips16 \
   3.310 -	| mips64 | mips64el \
   3.311 -	| mips64vr | mips64vrel \
   3.312 -	| mips64orion | mips64orionel \
   3.313 -	| mips64vr4100 | mips64vr4100el \
   3.314 -	| mips64vr4300 | mips64vr4300el \
   3.315 -	| mips64vr5000 | mips64vr5000el \
   3.316 -	| mips64vr5900 | mips64vr5900el \
   3.317 -	| mipsisa32 | mipsisa32el \
   3.318 -	| mipsisa32r2 | mipsisa32r2el \
   3.319 -	| mipsisa64 | mipsisa64el \
   3.320 -	| mipsisa64r2 | mipsisa64r2el \
   3.321 -	| mipsisa64sb1 | mipsisa64sb1el \
   3.322 -	| mipsisa64sr71k | mipsisa64sr71kel \
   3.323 -	| mipstx39 | mipstx39el \
   3.324 -	| mn10200 | mn10300 \
   3.325 -	| mt \
   3.326 -	| msp430 \
   3.327 -	| nios | nios2 \
   3.328 -	| ns16k | ns32k \
   3.329 -	| or32 \
   3.330 -	| pdp10 | pdp11 | pj | pjl \
   3.331 -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   3.332 -	| pyramid \
   3.333 -	| score \
   3.334 -	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   3.335 -	| sh64 | sh64le \
   3.336 -	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
   3.337 -	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
   3.338 -	| spu | strongarm \
   3.339 -	| tahoe | thumb | tic4x | tic80 | tron \
   3.340 -	| v850 | v850e \
   3.341 -	| we32k \
   3.342 -	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
   3.343 -	| z8k)
   3.344 -		basic_machine=$basic_machine-unknown
   3.345 -		;;
   3.346 -	m6811 | m68hc11 | m6812 | m68hc12)
   3.347 -		# Motorola 68HC11/12.
   3.348 -		basic_machine=$basic_machine-unknown
   3.349 -		os=-none
   3.350 -		;;
   3.351 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
   3.352 -		;;
   3.353 -	ms1)
   3.354 -		basic_machine=mt-unknown
   3.355 -		;;
   3.356 -
   3.357 -	# We use `pc' rather than `unknown'
   3.358 -	# because (1) that's what they normally are, and
   3.359 -	# (2) the word "unknown" tends to confuse beginning users.
   3.360 -	i*86 | x86_64)
   3.361 -	  basic_machine=$basic_machine-pc
   3.362 -	  ;;
   3.363 -	# Object if more than one company name word.
   3.364 -	*-*-*)
   3.365 -		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
   3.366 -		exit 1
   3.367 -		;;
   3.368 -	# Recognize the basic CPU types with company name.
   3.369 -	580-* \
   3.370 -	| a29k-* \
   3.371 -	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
   3.372 -	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
   3.373 -	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
   3.374 -	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
   3.375 -	| avr-* | avr32-* \
   3.376 -	| bfin-* | bs2000-* \
   3.377 -	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
   3.378 -	| clipper-* | craynv-* | cydra-* \
   3.379 -	| d10v-* | d30v-* | dlx-* \
   3.380 -	| elxsi-* \
   3.381 -	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
   3.382 -	| h8300-* | h8500-* \
   3.383 -	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   3.384 -	| i*86-* | i860-* | i960-* | ia64-* \
   3.385 -	| ip2k-* | iq2000-* \
   3.386 -	| m32c-* | m32r-* | m32rle-* \
   3.387 -	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   3.388 -	| m88110-* | m88k-* | maxq-* | mcore-* \
   3.389 -	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
   3.390 -	| mips16-* \
   3.391 -	| mips64-* | mips64el-* \
   3.392 -	| mips64vr-* | mips64vrel-* \
   3.393 -	| mips64orion-* | mips64orionel-* \
   3.394 -	| mips64vr4100-* | mips64vr4100el-* \
   3.395 -	| mips64vr4300-* | mips64vr4300el-* \
   3.396 -	| mips64vr5000-* | mips64vr5000el-* \
   3.397 -	| mips64vr5900-* | mips64vr5900el-* \
   3.398 -	| mipsisa32-* | mipsisa32el-* \
   3.399 -	| mipsisa32r2-* | mipsisa32r2el-* \
   3.400 -	| mipsisa64-* | mipsisa64el-* \
   3.401 -	| mipsisa64r2-* | mipsisa64r2el-* \
   3.402 -	| mipsisa64sb1-* | mipsisa64sb1el-* \
   3.403 -	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
   3.404 -	| mipstx39-* | mipstx39el-* \
   3.405 -	| mmix-* \
   3.406 -	| mt-* \
   3.407 -	| msp430-* \
   3.408 -	| nios-* | nios2-* \
   3.409 -	| none-* | np1-* | ns16k-* | ns32k-* \
   3.410 -	| orion-* \
   3.411 -	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   3.412 -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   3.413 -	| pyramid-* \
   3.414 -	| romp-* | rs6000-* \
   3.415 -	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
   3.416 -	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   3.417 -	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
   3.418 -	| sparclite-* \
   3.419 -	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
   3.420 -	| tahoe-* | thumb-* \
   3.421 -	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
   3.422 -	| tron-* \
   3.423 -	| v850-* | v850e-* | vax-* \
   3.424 -	| we32k-* \
   3.425 -	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
   3.426 -	| xstormy16-* | xtensa*-* \
   3.427 -	| ymp-* \
   3.428 -	| z8k-*)
   3.429 -		;;
   3.430 -	# Recognize the basic CPU types without company name, with glob match.
   3.431 -	xtensa*)
   3.432 -		basic_machine=$basic_machine-unknown
   3.433 -		;;
   3.434 -	# Recognize the various machine names and aliases which stand
   3.435 -	# for a CPU type and a company and sometimes even an OS.
   3.436 -	386bsd)
   3.437 -		basic_machine=i386-unknown
   3.438 -		os=-bsd
   3.439 -		;;
   3.440 -	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
   3.441 -		basic_machine=m68000-att
   3.442 -		;;
   3.443 -	3b*)
   3.444 -		basic_machine=we32k-att
   3.445 -		;;
   3.446 -	a29khif)
   3.447 -		basic_machine=a29k-amd
   3.448 -		os=-udi
   3.449 -		;;
   3.450 -    	abacus)
   3.451 -		basic_machine=abacus-unknown
   3.452 -		;;
   3.453 -	adobe68k)
   3.454 -		basic_machine=m68010-adobe
   3.455 -		os=-scout
   3.456 -		;;
   3.457 -	alliant | fx80)
   3.458 -		basic_machine=fx80-alliant
   3.459 -		;;
   3.460 -	altos | altos3068)
   3.461 -		basic_machine=m68k-altos
   3.462 -		;;
   3.463 -	am29k)
   3.464 -		basic_machine=a29k-none
   3.465 -		os=-bsd
   3.466 -		;;
   3.467 -	amd64)
   3.468 -		basic_machine=x86_64-pc
   3.469 -		;;
   3.470 -	amd64-*)
   3.471 -		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.472 -		;;
   3.473 -	amdahl)
   3.474 -		basic_machine=580-amdahl
   3.475 -		os=-sysv
   3.476 -		;;
   3.477 -	amiga | amiga-*)
   3.478 -		basic_machine=m68k-unknown
   3.479 -		;;
   3.480 -	amigaos | amigados)
   3.481 -		basic_machine=m68k-unknown
   3.482 -		os=-amigaos
   3.483 -		;;
   3.484 -	amigaunix | amix)
   3.485 -		basic_machine=m68k-unknown
   3.486 -		os=-sysv4
   3.487 -		;;
   3.488 -	apollo68)
   3.489 -		basic_machine=m68k-apollo
   3.490 -		os=-sysv
   3.491 -		;;
   3.492 -	apollo68bsd)
   3.493 -		basic_machine=m68k-apollo
   3.494 -		os=-bsd
   3.495 -		;;
   3.496 -	aux)
   3.497 -		basic_machine=m68k-apple
   3.498 -		os=-aux
   3.499 -		;;
   3.500 -	balance)
   3.501 -		basic_machine=ns32k-sequent
   3.502 -		os=-dynix
   3.503 -		;;
   3.504 -	blackfin)
   3.505 -		basic_machine=bfin-unknown
   3.506 -		os=-linux
   3.507 -		;;
   3.508 -	blackfin-*)
   3.509 -		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.510 -		os=-linux
   3.511 -		;;
   3.512 -	c90)
   3.513 -		basic_machine=c90-cray
   3.514 -		os=-unicos
   3.515 -		;;
   3.516 -	convex-c1)
   3.517 -		basic_machine=c1-convex
   3.518 -		os=-bsd
   3.519 -		;;
   3.520 -	convex-c2)
   3.521 -		basic_machine=c2-convex
   3.522 -		os=-bsd
   3.523 -		;;
   3.524 -	convex-c32)
   3.525 -		basic_machine=c32-convex
   3.526 -		os=-bsd
   3.527 -		;;
   3.528 -	convex-c34)
   3.529 -		basic_machine=c34-convex
   3.530 -		os=-bsd
   3.531 -		;;
   3.532 -	convex-c38)
   3.533 -		basic_machine=c38-convex
   3.534 -		os=-bsd
   3.535 -		;;
   3.536 -	cray | j90)
   3.537 -		basic_machine=j90-cray
   3.538 -		os=-unicos
   3.539 -		;;
   3.540 -	craynv)
   3.541 -		basic_machine=craynv-cray
   3.542 -		os=-unicosmp
   3.543 -		;;
   3.544 -	cr16)
   3.545 -		basic_machine=cr16-unknown
   3.546 -		os=-elf
   3.547 -		;;
   3.548 -	crds | unos)
   3.549 -		basic_machine=m68k-crds
   3.550 -		;;
   3.551 -	crisv32 | crisv32-* | etraxfs*)
   3.552 -		basic_machine=crisv32-axis
   3.553 -		;;
   3.554 -	cris | cris-* | etrax*)
   3.555 -		basic_machine=cris-axis
   3.556 -		;;
   3.557 -	crx)
   3.558 -		basic_machine=crx-unknown
   3.559 -		os=-elf
   3.560 -		;;
   3.561 -	da30 | da30-*)
   3.562 -		basic_machine=m68k-da30
   3.563 -		;;
   3.564 -	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
   3.565 -		basic_machine=mips-dec
   3.566 -		;;
   3.567 -	decsystem10* | dec10*)
   3.568 -		basic_machine=pdp10-dec
   3.569 -		os=-tops10
   3.570 -		;;
   3.571 -	decsystem20* | dec20*)
   3.572 -		basic_machine=pdp10-dec
   3.573 -		os=-tops20
   3.574 -		;;
   3.575 -	delta | 3300 | motorola-3300 | motorola-delta \
   3.576 -	      | 3300-motorola | delta-motorola)
   3.577 -		basic_machine=m68k-motorola
   3.578 -		;;
   3.579 -	delta88)
   3.580 -		basic_machine=m88k-motorola
   3.581 -		os=-sysv3
   3.582 -		;;
   3.583 -	djgpp)
   3.584 -		basic_machine=i586-pc
   3.585 -		os=-msdosdjgpp
   3.586 -		;;
   3.587 -	dpx20 | dpx20-*)
   3.588 -		basic_machine=rs6000-bull
   3.589 -		os=-bosx
   3.590 -		;;
   3.591 -	dpx2* | dpx2*-bull)
   3.592 -		basic_machine=m68k-bull
   3.593 -		os=-sysv3
   3.594 -		;;
   3.595 -	ebmon29k)
   3.596 -		basic_machine=a29k-amd
   3.597 -		os=-ebmon
   3.598 -		;;
   3.599 -	elxsi)
   3.600 -		basic_machine=elxsi-elxsi
   3.601 -		os=-bsd
   3.602 -		;;
   3.603 -	encore | umax | mmax)
   3.604 -		basic_machine=ns32k-encore
   3.605 -		;;
   3.606 -	es1800 | OSE68k | ose68k | ose | OSE)
   3.607 -		basic_machine=m68k-ericsson
   3.608 -		os=-ose
   3.609 -		;;
   3.610 -	fx2800)
   3.611 -		basic_machine=i860-alliant
   3.612 -		;;
   3.613 -	genix)
   3.614 -		basic_machine=ns32k-ns
   3.615 -		;;
   3.616 -	gmicro)
   3.617 -		basic_machine=tron-gmicro
   3.618 -		os=-sysv
   3.619 -		;;
   3.620 -	go32)
   3.621 -		basic_machine=i386-pc
   3.622 -		os=-go32
   3.623 -		;;
   3.624 -	h3050r* | hiux*)
   3.625 -		basic_machine=hppa1.1-hitachi
   3.626 -		os=-hiuxwe2
   3.627 -		;;
   3.628 -	h8300hms)
   3.629 -		basic_machine=h8300-hitachi
   3.630 -		os=-hms
   3.631 -		;;
   3.632 -	h8300xray)
   3.633 -		basic_machine=h8300-hitachi
   3.634 -		os=-xray
   3.635 -		;;
   3.636 -	h8500hms)
   3.637 -		basic_machine=h8500-hitachi
   3.638 -		os=-hms
   3.639 -		;;
   3.640 -	harris)
   3.641 -		basic_machine=m88k-harris
   3.642 -		os=-sysv3
   3.643 -		;;
   3.644 -	hp300-*)
   3.645 -		basic_machine=m68k-hp
   3.646 -		;;
   3.647 -	hp300bsd)
   3.648 -		basic_machine=m68k-hp
   3.649 -		os=-bsd
   3.650 -		;;
   3.651 -	hp300hpux)
   3.652 -		basic_machine=m68k-hp
   3.653 -		os=-hpux
   3.654 -		;;
   3.655 -	hp3k9[0-9][0-9] | hp9[0-9][0-9])
   3.656 -		basic_machine=hppa1.0-hp
   3.657 -		;;
   3.658 -	hp9k2[0-9][0-9] | hp9k31[0-9])
   3.659 -		basic_machine=m68000-hp
   3.660 -		;;
   3.661 -	hp9k3[2-9][0-9])
   3.662 -		basic_machine=m68k-hp
   3.663 -		;;
   3.664 -	hp9k6[0-9][0-9] | hp6[0-9][0-9])
   3.665 -		basic_machine=hppa1.0-hp
   3.666 -		;;
   3.667 -	hp9k7[0-79][0-9] | hp7[0-79][0-9])
   3.668 -		basic_machine=hppa1.1-hp
   3.669 -		;;
   3.670 -	hp9k78[0-9] | hp78[0-9])
   3.671 -		# FIXME: really hppa2.0-hp
   3.672 -		basic_machine=hppa1.1-hp
   3.673 -		;;
   3.674 -	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
   3.675 -		# FIXME: really hppa2.0-hp
   3.676 -		basic_machine=hppa1.1-hp
   3.677 -		;;
   3.678 -	hp9k8[0-9][13679] | hp8[0-9][13679])
   3.679 -		basic_machine=hppa1.1-hp
   3.680 -		;;
   3.681 -	hp9k8[0-9][0-9] | hp8[0-9][0-9])
   3.682 -		basic_machine=hppa1.0-hp
   3.683 -		;;
   3.684 -	hppa-next)
   3.685 -		os=-nextstep3
   3.686 -		;;
   3.687 -	hppaosf)
   3.688 -		basic_machine=hppa1.1-hp
   3.689 -		os=-osf
   3.690 -		;;
   3.691 -	hppro)
   3.692 -		basic_machine=hppa1.1-hp
   3.693 -		os=-proelf
   3.694 -		;;
   3.695 -	i370-ibm* | ibm*)
   3.696 -		basic_machine=i370-ibm
   3.697 -		;;
   3.698 -# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   3.699 -	i*86v32)
   3.700 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   3.701 -		os=-sysv32
   3.702 -		;;
   3.703 -	i*86v4*)
   3.704 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   3.705 -		os=-sysv4
   3.706 -		;;
   3.707 -	i*86v)
   3.708 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   3.709 -		os=-sysv
   3.710 -		;;
   3.711 -	i*86sol2)
   3.712 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   3.713 -		os=-solaris2
   3.714 -		;;
   3.715 -	i386mach)
   3.716 -		basic_machine=i386-mach
   3.717 -		os=-mach
   3.718 -		;;
   3.719 -	i386-vsta | vsta)
   3.720 -		basic_machine=i386-unknown
   3.721 -		os=-vsta
   3.722 -		;;
   3.723 -	iris | iris4d)
   3.724 -		basic_machine=mips-sgi
   3.725 -		case $os in
   3.726 -		    -irix*)
   3.727 -			;;
   3.728 -		    *)
   3.729 -			os=-irix4
   3.730 -			;;
   3.731 -		esac
   3.732 -		;;
   3.733 -	isi68 | isi)
   3.734 -		basic_machine=m68k-isi
   3.735 -		os=-sysv
   3.736 -		;;
   3.737 -	m68knommu)
   3.738 -		basic_machine=m68k-unknown
   3.739 -		os=-linux
   3.740 -		;;
   3.741 -	m68knommu-*)
   3.742 -		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.743 -		os=-linux
   3.744 -		;;
   3.745 -	m88k-omron*)
   3.746 -		basic_machine=m88k-omron
   3.747 -		;;
   3.748 -	magnum | m3230)
   3.749 -		basic_machine=mips-mips
   3.750 -		os=-sysv
   3.751 -		;;
   3.752 -	merlin)
   3.753 -		basic_machine=ns32k-utek
   3.754 -		os=-sysv
   3.755 -		;;
   3.756 -	mingw32)
   3.757 -		basic_machine=i386-pc
   3.758 -		os=-mingw32
   3.759 -		;;
   3.760 -	mingw32ce)
   3.761 -		basic_machine=arm-unknown
   3.762 -		os=-mingw32ce
   3.763 -		;;
   3.764 -	miniframe)
   3.765 -		basic_machine=m68000-convergent
   3.766 -		;;
   3.767 -	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
   3.768 -		basic_machine=m68k-atari
   3.769 -		os=-mint
   3.770 -		;;
   3.771 -	mips3*-*)
   3.772 -		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
   3.773 -		;;
   3.774 -	mips3*)
   3.775 -		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   3.776 -		;;
   3.777 -	monitor)
   3.778 -		basic_machine=m68k-rom68k
   3.779 -		os=-coff
   3.780 -		;;
   3.781 -	morphos)
   3.782 -		basic_machine=powerpc-unknown
   3.783 -		os=-morphos
   3.784 -		;;
   3.785 -	msdos)
   3.786 -		basic_machine=i386-pc
   3.787 -		os=-msdos
   3.788 -		;;
   3.789 -	ms1-*)
   3.790 -		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
   3.791 -		;;
   3.792 -	mvs)
   3.793 -		basic_machine=i370-ibm
   3.794 -		os=-mvs
   3.795 -		;;
   3.796 -	ncr3000)
   3.797 -		basic_machine=i486-ncr
   3.798 -		os=-sysv4
   3.799 -		;;
   3.800 -	netbsd386)
   3.801 -		basic_machine=i386-unknown
   3.802 -		os=-netbsd
   3.803 -		;;
   3.804 -	netwinder)
   3.805 -		basic_machine=armv4l-rebel
   3.806 -		os=-linux
   3.807 -		;;
   3.808 -	news | news700 | news800 | news900)
   3.809 -		basic_machine=m68k-sony
   3.810 -		os=-newsos
   3.811 -		;;
   3.812 -	news1000)
   3.813 -		basic_machine=m68030-sony
   3.814 -		os=-newsos
   3.815 -		;;
   3.816 -	news-3600 | risc-news)
   3.817 -		basic_machine=mips-sony
   3.818 -		os=-newsos
   3.819 -		;;
   3.820 -	necv70)
   3.821 -		basic_machine=v70-nec
   3.822 -		os=-sysv
   3.823 -		;;
   3.824 -	next | m*-next )
   3.825 -		basic_machine=m68k-next
   3.826 -		case $os in
   3.827 -		    -nextstep* )
   3.828 -			;;
   3.829 -		    -ns2*)
   3.830 -		      os=-nextstep2
   3.831 -			;;
   3.832 -		    *)
   3.833 -		      os=-nextstep3
   3.834 -			;;
   3.835 -		esac
   3.836 -		;;
   3.837 -	nh3000)
   3.838 -		basic_machine=m68k-harris
   3.839 -		os=-cxux
   3.840 -		;;
   3.841 -	nh[45]000)
   3.842 -		basic_machine=m88k-harris
   3.843 -		os=-cxux
   3.844 -		;;
   3.845 -	nindy960)
   3.846 -		basic_machine=i960-intel
   3.847 -		os=-nindy
   3.848 -		;;
   3.849 -	mon960)
   3.850 -		basic_machine=i960-intel
   3.851 -		os=-mon960
   3.852 -		;;
   3.853 -	nonstopux)
   3.854 -		basic_machine=mips-compaq
   3.855 -		os=-nonstopux
   3.856 -		;;
   3.857 -	np1)
   3.858 -		basic_machine=np1-gould
   3.859 -		;;
   3.860 -	nsr-tandem)
   3.861 -		basic_machine=nsr-tandem
   3.862 -		;;
   3.863 -	op50n-* | op60c-*)
   3.864 -		basic_machine=hppa1.1-oki
   3.865 -		os=-proelf
   3.866 -		;;
   3.867 -	openrisc | openrisc-*)
   3.868 -		basic_machine=or32-unknown
   3.869 -		;;
   3.870 -	os400)
   3.871 -		basic_machine=powerpc-ibm
   3.872 -		os=-os400
   3.873 -		;;
   3.874 -	OSE68000 | ose68000)
   3.875 -		basic_machine=m68000-ericsson
   3.876 -		os=-ose
   3.877 -		;;
   3.878 -	os68k)
   3.879 -		basic_machine=m68k-none
   3.880 -		os=-os68k
   3.881 -		;;
   3.882 -	pa-hitachi)
   3.883 -		basic_machine=hppa1.1-hitachi
   3.884 -		os=-hiuxwe2
   3.885 -		;;
   3.886 -	paragon)
   3.887 -		basic_machine=i860-intel
   3.888 -		os=-osf
   3.889 -		;;
   3.890 -	parisc)
   3.891 -		basic_machine=hppa-unknown
   3.892 -		os=-linux
   3.893 -		;;
   3.894 -	parisc-*)
   3.895 -		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.896 -		os=-linux
   3.897 -		;;
   3.898 -	pbd)
   3.899 -		basic_machine=sparc-tti
   3.900 -		;;
   3.901 -	pbb)
   3.902 -		basic_machine=m68k-tti
   3.903 -		;;
   3.904 -	pc532 | pc532-*)
   3.905 -		basic_machine=ns32k-pc532
   3.906 -		;;
   3.907 -	pc98)
   3.908 -		basic_machine=i386-pc
   3.909 -		;;
   3.910 -	pc98-*)
   3.911 -		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.912 -		;;
   3.913 -	pentium | p5 | k5 | k6 | nexgen | viac3)
   3.914 -		basic_machine=i586-pc
   3.915 -		;;
   3.916 -	pentiumpro | p6 | 6x86 | athlon | athlon_*)
   3.917 -		basic_machine=i686-pc
   3.918 -		;;
   3.919 -	pentiumii | pentium2 | pentiumiii | pentium3)
   3.920 -		basic_machine=i686-pc
   3.921 -		;;
   3.922 -	pentium4)
   3.923 -		basic_machine=i786-pc
   3.924 -		;;
   3.925 -	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
   3.926 -		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.927 -		;;
   3.928 -	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   3.929 -		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.930 -		;;
   3.931 -	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
   3.932 -		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.933 -		;;
   3.934 -	pentium4-*)
   3.935 -		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.936 -		;;
   3.937 -	pn)
   3.938 -		basic_machine=pn-gould
   3.939 -		;;
   3.940 -	power)	basic_machine=power-ibm
   3.941 -		;;
   3.942 -	ppc)	basic_machine=powerpc-unknown
   3.943 -		;;
   3.944 -	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.945 -		;;
   3.946 -	ppcle | powerpclittle | ppc-le | powerpc-little)
   3.947 -		basic_machine=powerpcle-unknown
   3.948 -		;;
   3.949 -	ppcle-* | powerpclittle-*)
   3.950 -		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.951 -		;;
   3.952 -	ppc64)	basic_machine=powerpc64-unknown
   3.953 -		;;
   3.954 -	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.955 -		;;
   3.956 -	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
   3.957 -		basic_machine=powerpc64le-unknown
   3.958 -		;;
   3.959 -	ppc64le-* | powerpc64little-*)
   3.960 -		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
   3.961 -		;;
   3.962 -	ps2)
   3.963 -		basic_machine=i386-ibm
   3.964 -		;;
   3.965 -	pw32)
   3.966 -		basic_machine=i586-unknown
   3.967 -		os=-pw32
   3.968 -		;;
   3.969 -	rdos)
   3.970 -		basic_machine=i386-pc
   3.971 -		os=-rdos
   3.972 -		;;
   3.973 -	rom68k)
   3.974 -		basic_machine=m68k-rom68k
   3.975 -		os=-coff
   3.976 -		;;
   3.977 -	rm[46]00)
   3.978 -		basic_machine=mips-siemens
   3.979 -		;;
   3.980 -	rtpc | rtpc-*)
   3.981 -		basic_machine=romp-ibm
   3.982 -		;;
   3.983 -	s390 | s390-*)
   3.984 -		basic_machine=s390-ibm
   3.985 -		;;
   3.986 -	s390x | s390x-*)
   3.987 -		basic_machine=s390x-ibm
   3.988 -		;;
   3.989 -	sa29200)
   3.990 -		basic_machine=a29k-amd
   3.991 -		os=-udi
   3.992 -		;;
   3.993 -	sb1)
   3.994 -		basic_machine=mipsisa64sb1-unknown
   3.995 -		;;
   3.996 -	sb1el)
   3.997 -		basic_machine=mipsisa64sb1el-unknown
   3.998 -		;;
   3.999 -	sde)
  3.1000 -		basic_machine=mipsisa32-sde
  3.1001 -		os=-elf
  3.1002 -		;;
  3.1003 -	sei)
  3.1004 -		basic_machine=mips-sei
  3.1005 -		os=-seiux
  3.1006 -		;;
  3.1007 -	sequent)
  3.1008 -		basic_machine=i386-sequent
  3.1009 -		;;
  3.1010 -	sh)
  3.1011 -		basic_machine=sh-hitachi
  3.1012 -		os=-hms
  3.1013 -		;;
  3.1014 -	sh5el)
  3.1015 -		basic_machine=sh5le-unknown
  3.1016 -		;;
  3.1017 -	sh64)
  3.1018 -		basic_machine=sh64-unknown
  3.1019 -		;;
  3.1020 -	sparclite-wrs | simso-wrs)
  3.1021 -		basic_machine=sparclite-wrs
  3.1022 -		os=-vxworks
  3.1023 -		;;
  3.1024 -	sps7)
  3.1025 -		basic_machine=m68k-bull
  3.1026 -		os=-sysv2
  3.1027 -		;;
  3.1028 -	spur)
  3.1029 -		basic_machine=spur-unknown
  3.1030 -		;;
  3.1031 -	st2000)
  3.1032 -		basic_machine=m68k-tandem
  3.1033 -		;;
  3.1034 -	stratus)
  3.1035 -		basic_machine=i860-stratus
  3.1036 -		os=-sysv4
  3.1037 -		;;
  3.1038 -	sun2)
  3.1039 -		basic_machine=m68000-sun
  3.1040 -		;;
  3.1041 -	sun2os3)
  3.1042 -		basic_machine=m68000-sun
  3.1043 -		os=-sunos3
  3.1044 -		;;
  3.1045 -	sun2os4)
  3.1046 -		basic_machine=m68000-sun
  3.1047 -		os=-sunos4
  3.1048 -		;;
  3.1049 -	sun3os3)
  3.1050 -		basic_machine=m68k-sun
  3.1051 -		os=-sunos3
  3.1052 -		;;
  3.1053 -	sun3os4)
  3.1054 -		basic_machine=m68k-sun
  3.1055 -		os=-sunos4
  3.1056 -		;;
  3.1057 -	sun4os3)
  3.1058 -		basic_machine=sparc-sun
  3.1059 -		os=-sunos3
  3.1060 -		;;
  3.1061 -	sun4os4)
  3.1062 -		basic_machine=sparc-sun
  3.1063 -		os=-sunos4
  3.1064 -		;;
  3.1065 -	sun4sol2)
  3.1066 -		basic_machine=sparc-sun
  3.1067 -		os=-solaris2
  3.1068 -		;;
  3.1069 -	sun3 | sun3-*)
  3.1070 -		basic_machine=m68k-sun
  3.1071 -		;;
  3.1072 -	sun4)
  3.1073 -		basic_machine=sparc-sun
  3.1074 -		;;
  3.1075 -	sun386 | sun386i | roadrunner)
  3.1076 -		basic_machine=i386-sun
  3.1077 -		;;
  3.1078 -	sv1)
  3.1079 -		basic_machine=sv1-cray
  3.1080 -		os=-unicos
  3.1081 -		;;
  3.1082 -	symmetry)
  3.1083 -		basic_machine=i386-sequent
  3.1084 -		os=-dynix
  3.1085 -		;;
  3.1086 -	t3e)
  3.1087 -		basic_machine=alphaev5-cray
  3.1088 -		os=-unicos
  3.1089 -		;;
  3.1090 -	t90)
  3.1091 -		basic_machine=t90-cray
  3.1092 -		os=-unicos
  3.1093 -		;;
  3.1094 -	tic54x | c54x*)
  3.1095 -		basic_machine=tic54x-unknown
  3.1096 -		os=-coff
  3.1097 -		;;
  3.1098 -	tic55x | c55x*)
  3.1099 -		basic_machine=tic55x-unknown
  3.1100 -		os=-coff
  3.1101 -		;;
  3.1102 -	tic6x | c6x*)
  3.1103 -		basic_machine=tic6x-unknown
  3.1104 -		os=-coff
  3.1105 -		;;
  3.1106 -	tile*)
  3.1107 -		basic_machine=tile-unknown
  3.1108 -		os=-linux-gnu
  3.1109 -		;;
  3.1110 -	tx39)
  3.1111 -		basic_machine=mipstx39-unknown
  3.1112 -		;;
  3.1113 -	tx39el)
  3.1114 -		basic_machine=mipstx39el-unknown
  3.1115 -		;;
  3.1116 -	toad1)
  3.1117 -		basic_machine=pdp10-xkl
  3.1118 -		os=-tops20
  3.1119 -		;;
  3.1120 -	tower | tower-32)
  3.1121 -		basic_machine=m68k-ncr
  3.1122 -		;;
  3.1123 -	tpf)
  3.1124 -		basic_machine=s390x-ibm
  3.1125 -		os=-tpf
  3.1126 -		;;
  3.1127 -	udi29k)
  3.1128 -		basic_machine=a29k-amd
  3.1129 -		os=-udi
  3.1130 -		;;
  3.1131 -	ultra3)
  3.1132 -		basic_machine=a29k-nyu
  3.1133 -		os=-sym1
  3.1134 -		;;
  3.1135 -	v810 | necv810)
  3.1136 -		basic_machine=v810-nec
  3.1137 -		os=-none
  3.1138 -		;;
  3.1139 -	vaxv)
  3.1140 -		basic_machine=vax-dec
  3.1141 -		os=-sysv
  3.1142 -		;;
  3.1143 -	vms)
  3.1144 -		basic_machine=vax-dec
  3.1145 -		os=-vms
  3.1146 -		;;
  3.1147 -	vpp*|vx|vx-*)
  3.1148 -		basic_machine=f301-fujitsu
  3.1149 -		;;
  3.1150 -	vxworks960)
  3.1151 -		basic_machine=i960-wrs
  3.1152 -		os=-vxworks
  3.1153 -		;;
  3.1154 -	vxworks68)
  3.1155 -		basic_machine=m68k-wrs
  3.1156 -		os=-vxworks
  3.1157 -		;;
  3.1158 -	vxworks29k)
  3.1159 -		basic_machine=a29k-wrs
  3.1160 -		os=-vxworks
  3.1161 -		;;
  3.1162 -	w65*)
  3.1163 -		basic_machine=w65-wdc
  3.1164 -		os=-none
  3.1165 -		;;
  3.1166 -	w89k-*)
  3.1167 -		basic_machine=hppa1.1-winbond
  3.1168 -		os=-proelf
  3.1169 -		;;
  3.1170 -	xbox)
  3.1171 -		basic_machine=i686-pc
  3.1172 -		os=-mingw32
  3.1173 -		;;
  3.1174 -	xps | xps100)
  3.1175 -		basic_machine=xps100-honeywell
  3.1176 -		;;
  3.1177 -	ymp)
  3.1178 -		basic_machine=ymp-cray
  3.1179 -		os=-unicos
  3.1180 -		;;
  3.1181 -	z8k-*-coff)
  3.1182 -		basic_machine=z8k-unknown
  3.1183 -		os=-sim
  3.1184 -		;;
  3.1185 -	none)
  3.1186 -		basic_machine=none-none
  3.1187 -		os=-none
  3.1188 -		;;
  3.1189 -
  3.1190 -# Here we handle the default manufacturer of certain CPU types.  It is in
  3.1191 -# some cases the only manufacturer, in others, it is the most popular.
  3.1192 -	w89k)
  3.1193 -		basic_machine=hppa1.1-winbond
  3.1194 -		;;
  3.1195 -	op50n)
  3.1196 -		basic_machine=hppa1.1-oki
  3.1197 -		;;
  3.1198 -	op60c)
  3.1199 -		basic_machine=hppa1.1-oki
  3.1200 -		;;
  3.1201 -	romp)
  3.1202 -		basic_machine=romp-ibm
  3.1203 -		;;
  3.1204 -	mmix)
  3.1205 -		basic_machine=mmix-knuth
  3.1206 -		;;
  3.1207 -	rs6000)
  3.1208 -		basic_machine=rs6000-ibm
  3.1209 -		;;
  3.1210 -	vax)
  3.1211 -		basic_machine=vax-dec
  3.1212 -		;;
  3.1213 -	pdp10)
  3.1214 -		# there are many clones, so DEC is not a safe bet
  3.1215 -		basic_machine=pdp10-unknown
  3.1216 -		;;
  3.1217 -	pdp11)
  3.1218 -		basic_machine=pdp11-dec
  3.1219 -		;;
  3.1220 -	we32k)
  3.1221 -		basic_machine=we32k-att
  3.1222 -		;;
  3.1223 -	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
  3.1224 -		basic_machine=sh-unknown
  3.1225 -		;;
  3.1226 -	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
  3.1227 -		basic_machine=sparc-sun
  3.1228 -		;;
  3.1229 -	cydra)
  3.1230 -		basic_machine=cydra-cydrome
  3.1231 -		;;
  3.1232 -	orion)
  3.1233 -		basic_machine=orion-highlevel
  3.1234 -		;;
  3.1235 -	orion105)
  3.1236 -		basic_machine=clipper-highlevel
  3.1237 -		;;
  3.1238 -	mac | mpw | mac-mpw)
  3.1239 -		basic_machine=m68k-apple
  3.1240 -		;;
  3.1241 -	pmac | pmac-mpw)
  3.1242 -		basic_machine=powerpc-apple
  3.1243 -		;;
  3.1244 -	*-unknown)
  3.1245 -		# Make sure to match an already-canonicalized machine name.
  3.1246 -		;;
  3.1247 -	*)
  3.1248 -		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  3.1249 -		exit 1
  3.1250 -		;;
  3.1251 -esac
  3.1252 -
  3.1253 -# Here we canonicalize certain aliases for manufacturers.
  3.1254 -case $basic_machine in
  3.1255 -	*-digital*)
  3.1256 -		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
  3.1257 -		;;
  3.1258 -	*-commodore*)
  3.1259 -		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
  3.1260 -		;;
  3.1261 -	*)
  3.1262 -		;;
  3.1263 -esac
  3.1264 -
  3.1265 -# Decode manufacturer-specific aliases for certain operating systems.
  3.1266 -
  3.1267 -if [ x"$os" != x"" ]
  3.1268 -then
  3.1269 -case $os in
  3.1270 -        # First match some system type aliases
  3.1271 -        # that might get confused with valid system types.
  3.1272 -	# -solaris* is a basic system type, with this one exception.
  3.1273 -	-solaris1 | -solaris1.*)
  3.1274 -		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  3.1275 -		;;
  3.1276 -	-solaris)
  3.1277 -		os=-solaris2
  3.1278 -		;;
  3.1279 -	-svr4*)
  3.1280 -		os=-sysv4
  3.1281 -		;;
  3.1282 -	-unixware*)
  3.1283 -		os=-sysv4.2uw
  3.1284 -		;;
  3.1285 -	-gnu/linux*)
  3.1286 -		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  3.1287 -		;;
  3.1288 -	# First accept the basic system types.
  3.1289 -	# The portable systems comes first.
  3.1290 -	# Each alternative MUST END IN A *, to match a version number.
  3.1291 -	# -sysv* is not here because it comes later, after sysvr4.
  3.1292 -	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  3.1293 -	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  3.1294 -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
  3.1295 -	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
  3.1296 -	      | -aos* \
  3.1297 -	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  3.1298 -	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  3.1299 -	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
  3.1300 -	      | -openbsd* | -solidbsd* \
  3.1301 -	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  3.1302 -	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  3.1303 -	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  3.1304 -	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  3.1305 -	      | -chorusos* | -chorusrdb* \
  3.1306 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  3.1307 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  3.1308 -	      | -uxpv* | -beos* | -mpeix* | -udk* \
  3.1309 -	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  3.1310 -	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  3.1311 -	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  3.1312 -	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  3.1313 -	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  3.1314 -	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
  3.1315 -	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
  3.1316 -	# Remember, each alternative MUST END IN *, to match a version number.
  3.1317 -		;;
  3.1318 -	-qnx*)
  3.1319 -		case $basic_machine in
  3.1320 -		    x86-* | i*86-*)
  3.1321 -			;;
  3.1322 -		    *)
  3.1323 -			os=-nto$os
  3.1324 -			;;
  3.1325 -		esac
  3.1326 -		;;
  3.1327 -	-nto-qnx*)
  3.1328 -		;;
  3.1329 -	-nto*)
  3.1330 -		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  3.1331 -		;;
  3.1332 -	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  3.1333 -	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
  3.1334 -	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  3.1335 -		;;
  3.1336 -	-mac*)
  3.1337 -		os=`echo $os | sed -e 's|mac|macos|'`
  3.1338 -		;;
  3.1339 -	-linux-dietlibc)
  3.1340 -		os=-linux-dietlibc
  3.1341 -		;;
  3.1342 -	-linux*)
  3.1343 -		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  3.1344 -		;;
  3.1345 -	-sunos5*)
  3.1346 -		os=`echo $os | sed -e 's|sunos5|solaris2|'`
  3.1347 -		;;
  3.1348 -	-sunos6*)
  3.1349 -		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  3.1350 -		;;
  3.1351 -	-opened*)
  3.1352 -		os=-openedition
  3.1353 -		;;
  3.1354 -        -os400*)
  3.1355 -		os=-os400
  3.1356 -		;;
  3.1357 -	-wince*)
  3.1358 -		os=-wince
  3.1359 -		;;
  3.1360 -	-osfrose*)
  3.1361 -		os=-osfrose
  3.1362 -		;;
  3.1363 -	-osf*)
  3.1364 -		os=-osf
  3.1365 -		;;
  3.1366 -	-utek*)
  3.1367 -		os=-bsd
  3.1368 -		;;
  3.1369 -	-dynix*)
  3.1370 -		os=-bsd
  3.1371 -		;;
  3.1372 -	-acis*)
  3.1373 -		os=-aos
  3.1374 -		;;
  3.1375 -	-atheos*)
  3.1376 -		os=-atheos
  3.1377 -		;;
  3.1378 -	-syllable*)
  3.1379 -		os=-syllable
  3.1380 -		;;
  3.1381 -	-386bsd)
  3.1382 -		os=-bsd
  3.1383 -		;;
  3.1384 -	-ctix* | -uts*)
  3.1385 -		os=-sysv
  3.1386 -		;;
  3.1387 -	-nova*)
  3.1388 -		os=-rtmk-nova
  3.1389 -		;;
  3.1390 -	-ns2 )
  3.1391 -		os=-nextstep2
  3.1392 -		;;
  3.1393 -	-nsk*)
  3.1394 -		os=-nsk
  3.1395 -		;;
  3.1396 -	# Preserve the version number of sinix5.
  3.1397 -	-sinix5.*)
  3.1398 -		os=`echo $os | sed -e 's|sinix|sysv|'`
  3.1399 -		;;
  3.1400 -	-sinix*)
  3.1401 -		os=-sysv4
  3.1402 -		;;
  3.1403 -        -tpf*)
  3.1404 -		os=-tpf
  3.1405 -		;;
  3.1406 -	-triton*)
  3.1407 -		os=-sysv3
  3.1408 -		;;
  3.1409 -	-oss*)
  3.1410 -		os=-sysv3
  3.1411 -		;;
  3.1412 -	-svr4)
  3.1413 -		os=-sysv4
  3.1414 -		;;
  3.1415 -	-svr3)
  3.1416 -		os=-sysv3
  3.1417 -		;;
  3.1418 -	-sysvr4)
  3.1419 -		os=-sysv4
  3.1420 -		;;
  3.1421 -	# This must come after -sysvr4.
  3.1422 -	-sysv*)
  3.1423 -		;;
  3.1424 -	-ose*)
  3.1425 -		os=-ose
  3.1426 -		;;
  3.1427 -	-es1800*)
  3.1428 -		os=-ose
  3.1429 -		;;
  3.1430 -	-xenix)
  3.1431 -		os=-xenix
  3.1432 -		;;
  3.1433 -	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  3.1434 -		os=-mint
  3.1435 -		;;
  3.1436 -	-aros*)
  3.1437 -		os=-aros
  3.1438 -		;;
  3.1439 -	-kaos*)
  3.1440 -		os=-kaos
  3.1441 -		;;
  3.1442 -	-zvmoe)
  3.1443 -		os=-zvmoe
  3.1444 -		;;
  3.1445 -	-none)
  3.1446 -		;;
  3.1447 -	*)
  3.1448 -		# Get rid of the `-' at the beginning of $os.
  3.1449 -		os=`echo $os | sed 's/[^-]*-//'`
  3.1450 -		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
  3.1451 -		exit 1
  3.1452 -		;;
  3.1453 -esac
  3.1454 -else
  3.1455 -
  3.1456 -# Here we handle the default operating systems that come with various machines.
  3.1457 -# The value should be what the vendor currently ships out the door with their
  3.1458 -# machine or put another way, the most popular os provided with the machine.
  3.1459 -
  3.1460 -# Note that if you're going to try to match "-MANUFACTURER" here (say,
  3.1461 -# "-sun"), then you have to tell the case statement up towards the top
  3.1462 -# that MANUFACTURER isn't an operating system.  Otherwise, code above
  3.1463 -# will signal an error saying that MANUFACTURER isn't an operating
  3.1464 -# system, and we'll never get to this point.
  3.1465 -
  3.1466 -case $basic_machine in
  3.1467 -        score-*)
  3.1468 -		os=-elf
  3.1469 -		;;
  3.1470 -        spu-*)
  3.1471 -		os=-elf
  3.1472 -		;;
  3.1473 -	*-acorn)
  3.1474 -		os=-riscix1.2
  3.1475 -		;;
  3.1476 -	arm*-rebel)
  3.1477 -		os=-linux
  3.1478 -		;;
  3.1479 -	arm*-semi)
  3.1480 -		os=-aout
  3.1481 -		;;
  3.1482 -        c4x-* | tic4x-*)
  3.1483 -        	os=-coff
  3.1484 -		;;
  3.1485 -	# This must come before the *-dec entry.
  3.1486 -	pdp10-*)
  3.1487 -		os=-tops20
  3.1488 -		;;
  3.1489 -	pdp11-*)
  3.1490 -		os=-none
  3.1491 -		;;
  3.1492 -	*-dec | vax-*)
  3.1493 -		os=-ultrix4.2
  3.1494 -		;;
  3.1495 -	m68*-apollo)
  3.1496 -		os=-domain
  3.1497 -		;;
  3.1498 -	i386-sun)
  3.1499 -		os=-sunos4.0.2
  3.1500 -		;;
  3.1501 -	m68000-sun)
  3.1502 -		os=-sunos3
  3.1503 -		# This also exists in the configure program, but was not the
  3.1504 -		# default.
  3.1505 -		# os=-sunos4
  3.1506 -		;;
  3.1507 -	m68*-cisco)
  3.1508 -		os=-aout
  3.1509 -		;;
  3.1510 -        mep-*)
  3.1511 -		os=-elf
  3.1512 -		;;
  3.1513 -	mips*-cisco)
  3.1514 -		os=-elf
  3.1515 -		;;
  3.1516 -	mips*-*)
  3.1517 -		os=-elf
  3.1518 -		;;
  3.1519 -	or32-*)
  3.1520 -		os=-coff
  3.1521 -		;;
  3.1522 -	*-tti)	# must be before sparc entry or we get the wrong os.
  3.1523 -		os=-sysv3
  3.1524 -		;;
  3.1525 -	sparc-* | *-sun)
  3.1526 -		os=-sunos4.1.1
  3.1527 -		;;
  3.1528 -	*-be)
  3.1529 -		os=-beos
  3.1530 -		;;
  3.1531 -	*-haiku)
  3.1532 -		os=-haiku
  3.1533 -		;;
  3.1534 -	*-ibm)
  3.1535 -		os=-aix
  3.1536 -		;;
  3.1537 -    	*-knuth)
  3.1538 -		os=-mmixware
  3.1539 -		;;
  3.1540 -	*-wec)
  3.1541 -		os=-proelf
  3.1542 -		;;
  3.1543 -	*-winbond)
  3.1544 -		os=-proelf
  3.1545 -		;;
  3.1546 -	*-oki)
  3.1547 -		os=-proelf
  3.1548 -		;;
  3.1549 -	*-hp)
  3.1550 -		os=-hpux
  3.1551 -		;;
  3.1552 -	*-hitachi)
  3.1553 -		os=-hiux
  3.1554 -		;;
  3.1555 -	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
  3.1556 -		os=-sysv
  3.1557 -		;;
  3.1558 -	*-cbm)
  3.1559 -		os=-amigaos
  3.1560 -		;;
  3.1561 -	*-dg)
  3.1562 -		os=-dgux
  3.1563 -		;;
  3.1564 -	*-dolphin)
  3.1565 -		os=-sysv3
  3.1566 -		;;
  3.1567 -	m68k-ccur)
  3.1568 -		os=-rtu
  3.1569 -		;;
  3.1570 -	m88k-omron*)
  3.1571 -		os=-luna
  3.1572 -		;;
  3.1573 -	*-next )
  3.1574 -		os=-nextstep
  3.1575 -		;;
  3.1576 -	*-sequent)
  3.1577 -		os=-ptx
  3.1578 -		;;
  3.1579 -	*-crds)
  3.1580 -		os=-unos
  3.1581 -		;;
  3.1582 -	*-ns)
  3.1583 -		os=-genix
  3.1584 -		;;
  3.1585 -	i370-*)
  3.1586 -		os=-mvs
  3.1587 -		;;
  3.1588 -	*-next)
  3.1589 -		os=-nextstep3
  3.1590 -		;;
  3.1591 -	*-gould)
  3.1592 -		os=-sysv
  3.1593 -		;;
  3.1594 -	*-highlevel)
  3.1595 -		os=-bsd
  3.1596 -		;;
  3.1597 -	*-encore)
  3.1598 -		os=-bsd
  3.1599 -		;;
  3.1600 -	*-sgi)
  3.1601 -		os=-irix
  3.1602 -		;;
  3.1603 -	*-siemens)
  3.1604 -		os=-sysv4
  3.1605 -		;;
  3.1606 -	*-masscomp)
  3.1607 -		os=-rtu
  3.1608 -		;;
  3.1609 -	f30[01]-fujitsu | f700-fujitsu)
  3.1610 -		os=-uxpv
  3.1611 -		;;
  3.1612 -	*-rom68k)
  3.1613 -		os=-coff
  3.1614 -		;;
  3.1615 -	*-*bug)
  3.1616 -		os=-coff
  3.1617 -		;;
  3.1618 -	*-apple)
  3.1619 -		os=-macos
  3.1620 -		;;
  3.1621 -	*-atari*)
  3.1622 -		os=-mint
  3.1623 -		;;
  3.1624 -	*)
  3.1625 -		os=-none
  3.1626 -		;;
  3.1627 -esac
  3.1628 -fi
  3.1629 -
  3.1630 -# Here we handle the case where we know the os, and the CPU type, but not the
  3.1631 -# manufacturer.  We pick the logical manufacturer.
  3.1632 -vendor=unknown
  3.1633 -case $basic_machine in
  3.1634 -	*-unknown)
  3.1635 -		case $os in
  3.1636 -			-riscix*)
  3.1637 -				vendor=acorn
  3.1638 -				;;
  3.1639 -			-sunos*)
  3.1640 -				vendor=sun
  3.1641 -				;;
  3.1642 -			-aix*)
  3.1643 -				vendor=ibm
  3.1644 -				;;
  3.1645 -			-beos*)
  3.1646 -				vendor=be
  3.1647 -				;;
  3.1648 -			-hpux*)
  3.1649 -				vendor=hp
  3.1650 -				;;
  3.1651 -			-mpeix*)
  3.1652 -				vendor=hp
  3.1653 -				;;
  3.1654 -			-hiux*)
  3.1655 -				vendor=hitachi
  3.1656 -				;;
  3.1657 -			-unos*)
  3.1658 -				vendor=crds
  3.1659 -				;;
  3.1660 -			-dgux*)
  3.1661 -				vendor=dg
  3.1662 -				;;
  3.1663 -			-luna*)
  3.1664 -				vendor=omron
  3.1665 -				;;
  3.1666 -			-genix*)
  3.1667 -				vendor=ns
  3.1668 -				;;
  3.1669 -			-mvs* | -opened*)
  3.1670 -				vendor=ibm
  3.1671 -				;;
  3.1672 -			-os400*)
  3.1673 -				vendor=ibm
  3.1674 -				;;
  3.1675 -			-ptx*)
  3.1676 -				vendor=sequent
  3.1677 -				;;
  3.1678 -			-tpf*)
  3.1679 -				vendor=ibm
  3.1680 -				;;
  3.1681 -			-vxsim* | -vxworks* | -windiss*)
  3.1682 -				vendor=wrs
  3.1683 -				;;
  3.1684 -			-aux*)
  3.1685 -				vendor=apple
  3.1686 -				;;
  3.1687 -			-hms*)
  3.1688 -				vendor=hitachi
  3.1689 -				;;
  3.1690 -			-mpw* | -macos*)
  3.1691 -				vendor=apple
  3.1692 -				;;
  3.1693 -			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  3.1694 -				vendor=atari
  3.1695 -				;;
  3.1696 -			-vos*)
  3.1697 -				vendor=stratus
  3.1698 -				;;
  3.1699 -		esac
  3.1700 -		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
  3.1701 -		;;
  3.1702 -esac
  3.1703 -
  3.1704 -echo $basic_machine$os
  3.1705 -exit
  3.1706 -
  3.1707 -# Local variables:
  3.1708 -# eval: (add-hook 'write-file-hooks 'time-stamp)
  3.1709 -# time-stamp-start: "timestamp='"
  3.1710 -# time-stamp-format: "%:y-%02m-%02d"
  3.1711 -# time-stamp-end: "'"
  3.1712 -# End:
     4.1 --- a/common/autoconf/configure	Wed Mar 18 18:09:23 2015 -0700
     4.2 +++ b/common/autoconf/configure	Wed Mar 25 11:31:19 2015 -0700
     4.3 @@ -28,6 +28,10 @@
     4.4    exit 1
     4.5  fi
     4.6  
     4.7 +# Force autoconf to use bash. This also means we must disable autoconf re-exec.
     4.8 +export CONFIG_SHELL=$BASH
     4.9 +export _as_can_reexec=no
    4.10 +
    4.11  CONFIGURE_COMMAND_LINE="$@"
    4.12  conf_script_dir=`dirname $0`
    4.13  
     5.1 --- a/common/autoconf/configure.ac	Wed Mar 18 18:09:23 2015 -0700
     5.2 +++ b/common/autoconf/configure.ac	Wed Mar 25 11:31:19 2015 -0700
     5.3 @@ -53,6 +53,7 @@
     5.4  
     5.5  AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK])
     5.6  AC_DEFUN_ONCE([CUSTOM_LATE_HOOK])
     5.7 +AC_DEFUN_ONCE([CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK])
     5.8  
     5.9  # This line needs to be here, verbatim, after all includes and the dummy hook
    5.10  # definitions. It is replaced with custom functionality when building
    5.11 @@ -237,6 +238,7 @@
    5.12  
    5.13  # Create the actual output files. Now the main work of configure is done.
    5.14  AC_OUTPUT
    5.15 +CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK
    5.16  
    5.17  # Try to move the config.log file to the output directory.
    5.18  if test -e ./config.log; then
     6.1 --- a/common/autoconf/generated-configure.sh	Wed Mar 18 18:09:23 2015 -0700
     6.2 +++ b/common/autoconf/generated-configure.sh	Wed Mar 25 11:31:19 2015 -0700
     6.3 @@ -3871,13 +3871,14 @@
     6.4  
     6.5  
     6.6  
     6.7 +
     6.8  # This line needs to be here, verbatim, after all includes and the dummy hook
     6.9  # definitions. It is replaced with custom functionality when building
    6.10  # custom sources.
    6.11  #CUSTOM_AUTOCONF_INCLUDE
    6.12  
    6.13  # Do not change or remove the following line, it is needed for consistency checks:
    6.14 -DATE_WHEN_GENERATED=1425379745
    6.15 +DATE_WHEN_GENERATED=1426765548
    6.16  
    6.17  ###############################################################################
    6.18  #
    6.19 @@ -6827,6 +6828,12 @@
    6.20        VAR_CPU_BITS=32
    6.21        VAR_CPU_ENDIAN=little
    6.22        ;;
    6.23 +    aarch64)
    6.24 +      VAR_CPU=aarch64
    6.25 +      VAR_CPU_ARCH=aarch64
    6.26 +      VAR_CPU_BITS=64
    6.27 +      VAR_CPU_ENDIAN=little
    6.28 +      ;;
    6.29      powerpc)
    6.30        VAR_CPU=ppc
    6.31        VAR_CPU_ARCH=ppc
    6.32 @@ -6958,6 +6965,12 @@
    6.33        VAR_CPU_BITS=32
    6.34        VAR_CPU_ENDIAN=little
    6.35        ;;
    6.36 +    aarch64)
    6.37 +      VAR_CPU=aarch64
    6.38 +      VAR_CPU_ARCH=aarch64
    6.39 +      VAR_CPU_BITS=64
    6.40 +      VAR_CPU_ENDIAN=little
    6.41 +      ;;
    6.42      powerpc)
    6.43        VAR_CPU=ppc
    6.44        VAR_CPU_ARCH=ppc
    6.45 @@ -7972,6 +7985,9 @@
    6.46    if test "x$VAR_CPU" = xppc64 ; then
    6.47      INCLUDE_SA=false
    6.48    fi
    6.49 +  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
    6.50 +    INCLUDE_SA=false
    6.51 +  fi
    6.52  
    6.53  
    6.54    if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
    6.55 @@ -16763,7 +16779,7 @@
    6.56  
    6.57  
    6.58        # jtreg win32 script works for everybody
    6.59 -      JTREGEXE="$JT_HOME/win32/bin/jtreg"
    6.60 +      JTREGEXE="$JT_HOME/bin/jtreg"
    6.61  
    6.62        if test ! -f "$JTREGEXE"; then
    6.63          as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
    6.64 @@ -37467,6 +37483,7 @@
    6.65  fi
    6.66  
    6.67  
    6.68 +
    6.69  # Try to move the config.log file to the output directory.
    6.70  if test -e ./config.log; then
    6.71    $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
     7.1 --- a/common/autoconf/jdk-options.m4	Wed Mar 18 18:09:23 2015 -0700
     7.2 +++ b/common/autoconf/jdk-options.m4	Wed Mar 25 11:31:19 2015 -0700
     7.3 @@ -161,6 +161,9 @@
     7.4    if test "x$VAR_CPU" = xppc64 ; then
     7.5      INCLUDE_SA=false
     7.6    fi
     7.7 +  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
     7.8 +    INCLUDE_SA=false
     7.9 +  fi
    7.10    AC_SUBST(INCLUDE_SA)
    7.11  
    7.12    if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
     8.1 --- a/common/autoconf/platform.m4	Wed Mar 18 18:09:23 2015 -0700
     8.2 +++ b/common/autoconf/platform.m4	Wed Mar 25 11:31:19 2015 -0700
     8.3 @@ -48,6 +48,12 @@
     8.4        VAR_CPU_BITS=32
     8.5        VAR_CPU_ENDIAN=little
     8.6        ;;
     8.7 +    aarch64)
     8.8 +      VAR_CPU=aarch64
     8.9 +      VAR_CPU_ARCH=aarch64
    8.10 +      VAR_CPU_BITS=64
    8.11 +      VAR_CPU_ENDIAN=little
    8.12 +      ;;
    8.13      powerpc)
    8.14        VAR_CPU=ppc
    8.15        VAR_CPU_ARCH=ppc
     9.1 --- a/common/autoconf/toolchain.m4	Wed Mar 18 18:09:23 2015 -0700
     9.2 +++ b/common/autoconf/toolchain.m4	Wed Mar 25 11:31:19 2015 -0700
     9.3 @@ -1294,7 +1294,7 @@
     9.4        BASIC_FIXUP_PATH([JT_HOME])
     9.5  
     9.6        # jtreg win32 script works for everybody
     9.7 -      JTREGEXE="$JT_HOME/win32/bin/jtreg"
     9.8 +      JTREGEXE="$JT_HOME/bin/jtreg"
     9.9  
    9.10        if test ! -f "$JTREGEXE"; then
    9.11          AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE])

mercurial