head	1.8;
access;
symbols
	expat-2-8-5:1.1.1.8
	netbsd-10-2-RELEASE:1.5
	netbsd-9-5-RELEASE:1.3.14.1
	netbsd-11-0-RELEASE:1.6.2.1
	netbsd-11-0-RC7:1.6.2.1
	netbsd-11-0-RC6:1.6.2.1
	netbsd-11-0-RC5:1.6.2.1
	netbsd-11-0-RC4:1.6
	netbsd-11-0-RC3:1.6
	netbsd-11-0-RC2:1.6
	netbsd-11-0-RC1:1.6
	perseant-exfatfs-base-20250801:1.6
	netbsd-11:1.6.0.2
	netbsd-11-base:1.6
	expat-2-7-1:1.1.1.8
	expat-2-7-0:1.1.1.8
	netbsd-10-1-RELEASE:1.5
	perseant-exfatfs-base-20240630:1.5
	perseant-exfatfs:1.5.0.4
	perseant-exfatfs-base:1.5
	netbsd-8-3-RELEASE:1.3.4.1
	netbsd-9-4-RELEASE:1.3.14.1
	netbsd-10-0-RELEASE:1.5
	netbsd-10-0-RC6:1.5
	netbsd-10-0-RC5:1.5
	netbsd-10-0-RC4:1.5
	netbsd-10-0-RC3:1.5
	netbsd-10-0-RC2:1.5
	netbsd-10-0-RC1:1.5
	netbsd-10:1.5.0.2
	netbsd-10-base:1.5
	netbsd-9-3-RELEASE:1.3.14.1
	expat-2-4-6:1.1.1.7
	cjep_sun2x-base1:1.4
	cjep_sun2x:1.4.0.6
	cjep_sun2x-base:1.4
	cjep_staticlib_x-base1:1.4
	netbsd-9-2-RELEASE:1.3.14.1
	cjep_staticlib_x:1.4.0.4
	cjep_staticlib_x-base:1.4
	netbsd-9-1-RELEASE:1.3.14.1
	phil-wifi-20200421:1.4
	phil-wifi-20200411:1.4
	is-mlppp:1.4.0.2
	is-mlppp-base:1.4
	phil-wifi-20200406:1.4
	netbsd-8-2-RELEASE:1.3.4.1
	netbsd-9-0-RELEASE:1.3.14.1
	netbsd-9-0-RC2:1.3.14.1
	netbsd-9-0-RC1:1.3.14.1
	phil-wifi-20191119:1.4
	expat-2-2-8:1.1.1.6
	netbsd-9:1.3.0.14
	netbsd-9-base:1.3
	phil-wifi-20190609:1.3
	netbsd-8-1-RELEASE:1.3
	netbsd-8-1-RC1:1.3
	pgoyette-compat-merge-20190127:1.3
	pgoyette-compat-20190127:1.3
	pgoyette-compat-20190118:1.3
	pgoyette-compat-1226:1.3
	pgoyette-compat-1126:1.3
	pgoyette-compat-1020:1.3
	pgoyette-compat-0930:1.3
	pgoyette-compat-0906:1.3
	netbsd-7-2-RELEASE:1.1.1.2.12.2
	pgoyette-compat-0728:1.3
	netbsd-8-0-RELEASE:1.3
	phil-wifi:1.3.0.12
	phil-wifi-base:1.3
	pgoyette-compat-0625:1.3
	netbsd-8-0-RC2:1.3
	pgoyette-compat-0521:1.3
	pgoyette-compat-0502:1.3
	pgoyette-compat-0422:1.3
	netbsd-8-0-RC1:1.3
	pgoyette-compat-0415:1.3
	pgoyette-compat-0407:1.3
	pgoyette-compat-0330:1.3
	pgoyette-compat-0322:1.3
	pgoyette-compat-0315:1.3
	netbsd-7-1-2-RELEASE:1.1.1.2.12.2
	pgoyette-compat:1.3.0.10
	pgoyette-compat-base:1.3
	netbsd-7-1-1-RELEASE:1.1.1.2.12.2
	matt-nb8-mediatek:1.3.0.8
	matt-nb8-mediatek-base:1.3
	perseant-stdc-iso10646:1.3.0.6
	perseant-stdc-iso10646-base:1.3
	expat-2-2-1:1.1.1.5
	netbsd-8:1.3.0.4
	netbsd-8-base:1.3
	prg-localcount2-base3:1.3
	prg-localcount2-base2:1.3
	prg-localcount2-base1:1.3
	prg-localcount2:1.3.0.2
	prg-localcount2-base:1.3
	pgoyette-localcount-20170426:1.3
	bouyer-socketcan-base1:1.3
	pgoyette-localcount-20170320:1.3
	netbsd-7-1:1.1.1.2.12.2.0.2
	netbsd-7-1-RELEASE:1.1.1.2.12.2
	netbsd-7-1-RC2:1.1.1.2.12.2
	expat-2-2-0:1.1.1.4
	netbsd-7-nhusb-base-20170116:1.1.1.2.12.1
	bouyer-socketcan:1.1.1.3.0.4
	bouyer-socketcan-base:1.1.1.3
	pgoyette-localcount-20170107:1.1.1.3
	netbsd-7-1-RC1:1.1.1.2.12.1
	pgoyette-localcount-20161104:1.1.1.3
	netbsd-7-0-2-RELEASE:1.1.1.2.14.1
	localcount-20160914:1.1.1.3
	netbsd-7-nhusb:1.1.1.2.12.1.0.2
	netbsd-7-nhusb-base:1.1.1.2.12.1
	pgoyette-localcount-20160806:1.1.1.3
	pgoyette-localcount-20160726:1.1.1.3
	pgoyette-localcount:1.1.1.3.0.2
	pgoyette-localcount-base:1.1.1.3
	netbsd-7-0-1-RELEASE:1.1.1.2.14.1
	expat-2-1-1:1.1.1.3
	netbsd-7-0:1.1.1.2.0.14
	netbsd-7-0-RELEASE:1.1.1.2
	netbsd-7-0-RC3:1.1.1.2
	netbsd-7-0-RC2:1.1.1.2
	netbsd-7-0-RC1:1.1.1.2
	netbsd-6-0-6-RELEASE:1.1.1.1
	netbsd-6-1-5-RELEASE:1.1.1.1
	netbsd-7:1.1.1.2.0.12
	netbsd-7-base:1.1.1.2
	yamt-pagecache-base9:1.1.1.2
	yamt-pagecache-tag8:1.1.1.2.2.2
	netbsd-6-1-4-RELEASE:1.1.1.1
	netbsd-6-0-5-RELEASE:1.1.1.1
	tls-earlyentropy:1.1.1.2.0.10
	tls-earlyentropy-base:1.1.1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2
	riastradh-drm2-base3:1.1.1.2
	netbsd-6-1-3-RELEASE:1.1.1.1
	netbsd-6-0-4-RELEASE:1.1.1.1
	netbsd-6-1-2-RELEASE:1.1.1.1
	netbsd-6-0-3-RELEASE:1.1.1.1
	netbsd-6-1-1-RELEASE:1.1.1.1
	riastradh-drm2-base2:1.1.1.2
	riastradh-drm2-base1:1.1.1.2
	riastradh-drm2:1.1.1.2.0.6
	riastradh-drm2-base:1.1.1.2
	netbsd-6-1:1.1.1.1.0.8
	netbsd-6-0-2-RELEASE:1.1.1.1
	netbsd-6-1-RELEASE:1.1.1.1
	netbsd-6-1-RC4:1.1.1.1
	netbsd-6-1-RC3:1.1.1.1
	agc-symver:1.1.1.2.0.8
	agc-symver-base:1.1.1.2
	netbsd-6-1-RC2:1.1.1.1
	netbsd-6-1-RC1:1.1.1.1
	yamt-pagecache-base8:1.1.1.2
	netbsd-6-0-1-RELEASE:1.1.1.1
	yamt-pagecache-base7:1.1.1.2
	matt-nb6-plus-nbase:1.1.1.1
	yamt-pagecache-base6:1.1.1.2
	netbsd-6-0:1.1.1.1.0.6
	netbsd-6-0-RELEASE:1.1.1.1
	netbsd-6-0-RC2:1.1.1.1
	tls-maxphys:1.1.1.2.0.4
	tls-maxphys-base:1.1.1.2
	matt-nb6-plus:1.1.1.1.0.4
	matt-nb6-plus-base:1.1.1.1
	netbsd-6-0-RC1:1.1.1.1
	yamt-pagecache-base5:1.1.1.2
	yamt-pagecache:1.1.1.2.0.2
	yamt-pagecache-base4:1.1.1.2
	expat-2-1-0:1.1.1.2
	netbsd-6:1.1.1.1.0.2
	netbsd-6-base:1.1.1.1
	expat-2-0-1:1.1.1.1
	expat:1.1.1;
locks; strict;
comment	@# @;


1.8
date	2026.09.23.11.43.17;	author nia;	state Exp;
branches;
next	1.7;
commitid	EexwRg3y3jKYTJWG;

1.7
date	2026.06.13.16.50.53;	author jdc;	state dead;
branches;
next	1.6;
commitid	Fg5Ae2fwu3t5TEJG;

1.6
date	2025.03.14.21.26.04;	author wiz;	state Exp;
branches
	1.6.2.1;
next	1.5;
commitid	GGqDNi6jL7Vh45NF;

1.5
date	2022.02.23.15.24.05;	author christos;	state Exp;
branches
	1.5.4.1;
next	1.4;
commitid	YS4T7180BxJ8UKtD;

1.4
date	2019.09.16.06.30.16;	author maya;	state Exp;
branches;
next	1.3;
commitid	b2fnAuE2mgSAAcDB;

1.3
date	2017.02.04.10.56.10;	author spz;	state Exp;
branches
	1.3.4.1
	1.3.12.1
	1.3.14.1;
next	1.2;
commitid	BYzVGXZtJoUYICEz;

1.2
date	2017.02.01.09.26.43;	author sevan;	state Exp;
branches;
next	1.1;
commitid	GAil0cnWzrQL6eEz;

1.1
date	2012.02.11.18.18.21;	author tron;	state Exp;
branches
	1.1.1.1;
next	;

1.6.2.1
date	2026.06.16.08.23.20;	author martin;	state dead;
branches;
next	1.6.2.2;
commitid	CEh2BY99NRqLYZJG;

1.6.2.2
date	2026.10.02.10.09.13;	author martin;	state Exp;
branches;
next	;
commitid	uwsgrsVq2JxO5TXG;

1.5.4.1
date	2025.08.02.05.50.30;	author perseant;	state Exp;
branches;
next	;
commitid	23j6GFaDws3O875G;

1.3.4.1
date	2019.09.17.18.50.05;	author martin;	state Exp;
branches;
next	;
commitid	YklLl72xalI1EoDB;

1.3.12.1
date	2020.04.13.08.02.21;	author martin;	state Exp;
branches;
next	;
commitid	X01YhRUPVUDaec4C;

1.3.14.1
date	2019.09.17.19.51.13;	author martin;	state Exp;
branches;
next	;
commitid	JZUctABQ1ZKdZoDB;

1.1.1.1
date	2012.02.11.18.18.21;	author tron;	state Exp;
branches
	1.1.1.1.2.1
	1.1.1.1.6.1
	1.1.1.1.8.1;
next	1.1.1.2;

1.1.1.2
date	2012.04.06.10.23.13;	author spz;	state Exp;
branches
	1.1.1.2.2.1
	1.1.1.2.12.1
	1.1.1.2.14.1;
next	1.1.1.3;

1.1.1.3
date	2016.05.14.14.30.42;	author spz;	state Exp;
branches
	1.1.1.3.2.1
	1.1.1.3.4.1;
next	1.1.1.4;
commitid	t3RrSVHO5XBpss6z;

1.1.1.4
date	2017.02.04.10.16.06;	author spz;	state Exp;
branches;
next	1.1.1.5;
commitid	B9FyZD57dziavCEz;

1.1.1.5
date	2017.06.17.21.59.07;	author christos;	state Exp;
branches;
next	1.1.1.6;
commitid	ToDV7ynpZaar7MVz;

1.1.1.6
date	2019.09.16.06.21.10;	author maya;	state Exp;
branches;
next	1.1.1.7;
commitid	UzhqcAQ3PxywwcDB;

1.1.1.7
date	2022.02.23.15.21.35;	author christos;	state Exp;
branches;
next	1.1.1.8;
commitid	ZsvHjokwGdDtSKtD;

1.1.1.8
date	2025.03.14.21.23.21;	author wiz;	state Exp;
branches;
next	;
commitid	uDg3iV45APhk35NF;

1.1.1.1.2.1
date	2016.05.18.10.49.23;	author snj;	state Exp;
branches;
next	1.1.1.1.2.2;
commitid	rBQKbLw2qANU6X6z;

1.1.1.1.2.2
date	2017.02.19.07.28.11;	author snj;	state Exp;
branches;
next	;
commitid	idwY0ZKxoPwU5xGz;

1.1.1.1.6.1
date	2016.05.18.10.40.42;	author snj;	state Exp;
branches;
next	1.1.1.1.6.2;
commitid	sn3ewMlOwSnM3X6z;

1.1.1.1.6.2
date	2017.02.19.07.25.35;	author snj;	state Exp;
branches;
next	;
commitid	jAh0mhd653b05xGz;

1.1.1.1.8.1
date	2016.05.18.10.45.13;	author snj;	state Exp;
branches;
next	1.1.1.1.8.2;
commitid	5xlzCAOqLNUu5X6z;

1.1.1.1.8.2
date	2017.02.19.07.26.19;	author snj;	state Exp;
branches;
next	;
commitid	Dgy5ClmXEzfe5xGz;

1.1.1.2.2.1
date	2012.04.06.10.23.13;	author yamt;	state dead;
branches;
next	1.1.1.2.2.2;

1.1.1.2.2.2
date	2012.04.17.00.04.41;	author yamt;	state Exp;
branches;
next	;

1.1.1.2.12.1
date	2016.05.18.09.14.15;	author snj;	state Exp;
branches
	1.1.1.2.12.1.2.1;
next	1.1.1.2.12.2;
commitid	L9D8vOB1Fk8fAW6z;

1.1.1.2.12.2
date	2017.02.19.04.53.23;	author snj;	state Exp;
branches;
next	;
commitid	818vp37ghTFMewGz;

1.1.1.2.12.1.2.1
date	2017.03.13.07.41.23;	author skrll;	state Exp;
branches;
next	;
commitid	vH6VFbpxnMy7rmJz;

1.1.1.2.14.1
date	2016.05.18.09.15.16;	author snj;	state Exp;
branches;
next	1.1.1.2.14.2;
commitid	QP6HLZ4lDbRvAW6z;

1.1.1.2.14.2
date	2017.02.19.04.52.28;	author snj;	state Exp;
branches;
next	;
commitid	R7ppK1AfEy3newGz;

1.1.1.3.2.1
date	2017.03.20.06.56.46;	author pgoyette;	state Exp;
branches;
next	;
commitid	jjw7cAwgyKq7RfKz;

1.1.1.3.4.1
date	2017.04.21.16.52.56;	author bouyer;	state Exp;
branches;
next	;
commitid	dUG7nkTKALCadqOz;


desc
@@


1.8
log
@expat 2.8.5
@
text
@#! /bin/sh
# Configuration validation subroutine script.
#   Copyright 1992-2022 Free Software Foundation, Inc.

# shellcheck disable=SC2006,SC2268 # see below for rationale

timestamp='2022-01-03'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that
# program.  This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").


# Please send patches to <config-patches@@gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.

# You can get the latest version of this script from:
# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub

# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
# Each package is responsible for reporting which valid configurations
# it does not support.  The user should be able to distinguish
# a failure to support a valid configuration from a meaningless
# configuration.

# The goal of this file is to map all the various variations of a given
# machine specification into a single specification in the form:
#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or in some cases, the newer four-part form:
#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.

# The "shellcheck disable" line above the timestamp inhibits complaints
# about features and limitations of the classic Bourne shell that were
# superseded or lifted in POSIX.  However, this script identifies a wide
# variety of pre-POSIX systems that do not have POSIX shells at all, and
# even some reasonably current systems (Solaris 10 as case-in-point) still
# have a pre-POSIX /bin/sh.

me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS

Canonicalize a configuration name.

Options:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit

Report bugs and patches to <config-patches@@gnu.org>."

version="\
GNU config.sub ($timestamp)

Copyright 1992-2022 Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

help="
Try \`$me --help' for more information."

# Parse command line
while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit ;;
    --version | -v )
       echo "$version" ; exit ;;
    --help | --h* | -h )
       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help" >&2
       exit 1 ;;

    *local*)
       # First pass through any local machine types.
       echo "$1"
       exit ;;

    * )
       break ;;
  esac
done

case $# in
 0) echo "$me: missing argument$help" >&2
    exit 1;;
 1) ;;
 *) echo "$me: too many arguments$help" >&2
    exit 1;;
esac

# Split fields of configuration type
# shellcheck disable=SC2162
saved_IFS=$IFS
IFS="-" read field1 field2 field3 field4 <<EOF
$1
EOF
IFS=$saved_IFS

# Separate into logical components for further validation
case $1 in
	*-*-*-*-*)
		echo Invalid configuration \`"$1"\': more than four components >&2
		exit 1
		;;
	*-*-*-*)
		basic_machine=$field1-$field2
		basic_os=$field3-$field4
		;;
	*-*-*)
		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
		# parts
		maybe_os=$field2-$field3
		case $maybe_os in
			nto-qnx* | linux-* | uclinux-uclibc* \
			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
			| storm-chaos* | os2-emx* | rtmk-nova*)
				basic_machine=$field1
				basic_os=$maybe_os
				;;
			android-linux)
				basic_machine=$field1-unknown
				basic_os=linux-android
				;;
			*)
				basic_machine=$field1-$field2
				basic_os=$field3
				;;
		esac
		;;
	*-*)
		# A lone config we happen to match not fitting any pattern
		case $field1-$field2 in
			decstation-3100)
				basic_machine=mips-dec
				basic_os=
				;;
			*-*)
				# Second component is usually, but not always the OS
				case $field2 in
					# Prevent following clause from handling this valid os
					sun*os*)
						basic_machine=$field1
						basic_os=$field2
						;;
					zephyr*)
						basic_machine=$field1-unknown
						basic_os=$field2
						;;
					# Manufacturers
					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
					| convergent* | ncr* | news | 32* | 3600* | 3100* \
					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
					| ultra | tti* | harris | dolphin | highlevel | gould \
					| cbm | ns | masscomp | apple | axis | knuth | cray \
					| microblaze* | sim | cisco \
					| oki | wec | wrs | winbond)
						basic_machine=$field1-$field2
						basic_os=
						;;
					*)
						basic_machine=$field1
						basic_os=$field2
						;;
				esac
			;;
		esac
		;;
	*)
		# Convert single-component short-hands not valid as part of
		# multi-component configurations.
		case $field1 in
			386bsd)
				basic_machine=i386-pc
				basic_os=bsd
				;;
			a29khif)
				basic_machine=a29k-amd
				basic_os=udi
				;;
			adobe68k)
				basic_machine=m68010-adobe
				basic_os=scout
				;;
			alliant)
				basic_machine=fx80-alliant
				basic_os=
				;;
			altos | altos3068)
				basic_machine=m68k-altos
				basic_os=
				;;
			am29k)
				basic_machine=a29k-none
				basic_os=bsd
				;;
			amdahl)
				basic_machine=580-amdahl
				basic_os=sysv
				;;
			amiga)
				basic_machine=m68k-unknown
				basic_os=
				;;
			amigaos | amigados)
				basic_machine=m68k-unknown
				basic_os=amigaos
				;;
			amigaunix | amix)
				basic_machine=m68k-unknown
				basic_os=sysv4
				;;
			apollo68)
				basic_machine=m68k-apollo
				basic_os=sysv
				;;
			apollo68bsd)
				basic_machine=m68k-apollo
				basic_os=bsd
				;;
			aros)
				basic_machine=i386-pc
				basic_os=aros
				;;
			aux)
				basic_machine=m68k-apple
				basic_os=aux
				;;
			balance)
				basic_machine=ns32k-sequent
				basic_os=dynix
				;;
			blackfin)
				basic_machine=bfin-unknown
				basic_os=linux
				;;
			cegcc)
				basic_machine=arm-unknown
				basic_os=cegcc
				;;
			convex-c1)
				basic_machine=c1-convex
				basic_os=bsd
				;;
			convex-c2)
				basic_machine=c2-convex
				basic_os=bsd
				;;
			convex-c32)
				basic_machine=c32-convex
				basic_os=bsd
				;;
			convex-c34)
				basic_machine=c34-convex
				basic_os=bsd
				;;
			convex-c38)
				basic_machine=c38-convex
				basic_os=bsd
				;;
			cray)
				basic_machine=j90-cray
				basic_os=unicos
				;;
			crds | unos)
				basic_machine=m68k-crds
				basic_os=
				;;
			da30)
				basic_machine=m68k-da30
				basic_os=
				;;
			decstation | pmax | pmin | dec3100 | decstatn)
				basic_machine=mips-dec
				basic_os=
				;;
			delta88)
				basic_machine=m88k-motorola
				basic_os=sysv3
				;;
			dicos)
				basic_machine=i686-pc
				basic_os=dicos
				;;
			djgpp)
				basic_machine=i586-pc
				basic_os=msdosdjgpp
				;;
			ebmon29k)
				basic_machine=a29k-amd
				basic_os=ebmon
				;;
			es1800 | OSE68k | ose68k | ose | OSE)
				basic_machine=m68k-ericsson
				basic_os=ose
				;;
			gmicro)
				basic_machine=tron-gmicro
				basic_os=sysv
				;;
			go32)
				basic_machine=i386-pc
				basic_os=go32
				;;
			h8300hms)
				basic_machine=h8300-hitachi
				basic_os=hms
				;;
			h8300xray)
				basic_machine=h8300-hitachi
				basic_os=xray
				;;
			h8500hms)
				basic_machine=h8500-hitachi
				basic_os=hms
				;;
			harris)
				basic_machine=m88k-harris
				basic_os=sysv3
				;;
			hp300 | hp300hpux)
				basic_machine=m68k-hp
				basic_os=hpux
				;;
			hp300bsd)
				basic_machine=m68k-hp
				basic_os=bsd
				;;
			hppaosf)
				basic_machine=hppa1.1-hp
				basic_os=osf
				;;
			hppro)
				basic_machine=hppa1.1-hp
				basic_os=proelf
				;;
			i386mach)
				basic_machine=i386-mach
				basic_os=mach
				;;
			isi68 | isi)
				basic_machine=m68k-isi
				basic_os=sysv
				;;
			m68knommu)
				basic_machine=m68k-unknown
				basic_os=linux
				;;
			magnum | m3230)
				basic_machine=mips-mips
				basic_os=sysv
				;;
			merlin)
				basic_machine=ns32k-utek
				basic_os=sysv
				;;
			mingw64)
				basic_machine=x86_64-pc
				basic_os=mingw64
				;;
			mingw32)
				basic_machine=i686-pc
				basic_os=mingw32
				;;
			mingw32ce)
				basic_machine=arm-unknown
				basic_os=mingw32ce
				;;
			monitor)
				basic_machine=m68k-rom68k
				basic_os=coff
				;;
			morphos)
				basic_machine=powerpc-unknown
				basic_os=morphos
				;;
			moxiebox)
				basic_machine=moxie-unknown
				basic_os=moxiebox
				;;
			msdos)
				basic_machine=i386-pc
				basic_os=msdos
				;;
			msys)
				basic_machine=i686-pc
				basic_os=msys
				;;
			mvs)
				basic_machine=i370-ibm
				basic_os=mvs
				;;
			nacl)
				basic_machine=le32-unknown
				basic_os=nacl
				;;
			ncr3000)
				basic_machine=i486-ncr
				basic_os=sysv4
				;;
			netbsd386)
				basic_machine=i386-pc
				basic_os=netbsd
				;;
			netwinder)
				basic_machine=armv4l-rebel
				basic_os=linux
				;;
			news | news700 | news800 | news900)
				basic_machine=m68k-sony
				basic_os=newsos
				;;
			news1000)
				basic_machine=m68030-sony
				basic_os=newsos
				;;
			necv70)
				basic_machine=v70-nec
				basic_os=sysv
				;;
			nh3000)
				basic_machine=m68k-harris
				basic_os=cxux
				;;
			nh[45]000)
				basic_machine=m88k-harris
				basic_os=cxux
				;;
			nindy960)
				basic_machine=i960-intel
				basic_os=nindy
				;;
			mon960)
				basic_machine=i960-intel
				basic_os=mon960
				;;
			nonstopux)
				basic_machine=mips-compaq
				basic_os=nonstopux
				;;
			os400)
				basic_machine=powerpc-ibm
				basic_os=os400
				;;
			OSE68000 | ose68000)
				basic_machine=m68000-ericsson
				basic_os=ose
				;;
			os68k)
				basic_machine=m68k-none
				basic_os=os68k
				;;
			paragon)
				basic_machine=i860-intel
				basic_os=osf
				;;
			parisc)
				basic_machine=hppa-unknown
				basic_os=linux
				;;
			psp)
				basic_machine=mipsallegrexel-sony
				basic_os=psp
				;;
			pw32)
				basic_machine=i586-unknown
				basic_os=pw32
				;;
			rdos | rdos64)
				basic_machine=x86_64-pc
				basic_os=rdos
				;;
			rdos32)
				basic_machine=i386-pc
				basic_os=rdos
				;;
			rom68k)
				basic_machine=m68k-rom68k
				basic_os=coff
				;;
			sa29200)
				basic_machine=a29k-amd
				basic_os=udi
				;;
			sei)
				basic_machine=mips-sei
				basic_os=seiux
				;;
			sequent)
				basic_machine=i386-sequent
				basic_os=
				;;
			sps7)
				basic_machine=m68k-bull
				basic_os=sysv2
				;;
			st2000)
				basic_machine=m68k-tandem
				basic_os=
				;;
			stratus)
				basic_machine=i860-stratus
				basic_os=sysv4
				;;
			sun2)
				basic_machine=m68000-sun
				basic_os=
				;;
			sun2os3)
				basic_machine=m68000-sun
				basic_os=sunos3
				;;
			sun2os4)
				basic_machine=m68000-sun
				basic_os=sunos4
				;;
			sun3)
				basic_machine=m68k-sun
				basic_os=
				;;
			sun3os3)
				basic_machine=m68k-sun
				basic_os=sunos3
				;;
			sun3os4)
				basic_machine=m68k-sun
				basic_os=sunos4
				;;
			sun4)
				basic_machine=sparc-sun
				basic_os=
				;;
			sun4os3)
				basic_machine=sparc-sun
				basic_os=sunos3
				;;
			sun4os4)
				basic_machine=sparc-sun
				basic_os=sunos4
				;;
			sun4sol2)
				basic_machine=sparc-sun
				basic_os=solaris2
				;;
			sun386 | sun386i | roadrunner)
				basic_machine=i386-sun
				basic_os=
				;;
			sv1)
				basic_machine=sv1-cray
				basic_os=unicos
				;;
			symmetry)
				basic_machine=i386-sequent
				basic_os=dynix
				;;
			t3e)
				basic_machine=alphaev5-cray
				basic_os=unicos
				;;
			t90)
				basic_machine=t90-cray
				basic_os=unicos
				;;
			toad1)
				basic_machine=pdp10-xkl
				basic_os=tops20
				;;
			tpf)
				basic_machine=s390x-ibm
				basic_os=tpf
				;;
			udi29k)
				basic_machine=a29k-amd
				basic_os=udi
				;;
			ultra3)
				basic_machine=a29k-nyu
				basic_os=sym1
				;;
			v810 | necv810)
				basic_machine=v810-nec
				basic_os=none
				;;
			vaxv)
				basic_machine=vax-dec
				basic_os=sysv
				;;
			vms)
				basic_machine=vax-dec
				basic_os=vms
				;;
			vsta)
				basic_machine=i386-pc
				basic_os=vsta
				;;
			vxworks960)
				basic_machine=i960-wrs
				basic_os=vxworks
				;;
			vxworks68)
				basic_machine=m68k-wrs
				basic_os=vxworks
				;;
			vxworks29k)
				basic_machine=a29k-wrs
				basic_os=vxworks
				;;
			xbox)
				basic_machine=i686-pc
				basic_os=mingw32
				;;
			ymp)
				basic_machine=ymp-cray
				basic_os=unicos
				;;
			*)
				basic_machine=$1
				basic_os=
				;;
		esac
		;;
esac

# Decode 1-component or ad-hoc basic machines
case $basic_machine in
	# Here we handle the default manufacturer of certain CPU types.  It is in
	# some cases the only manufacturer, in others, it is the most popular.
	w89k)
		cpu=hppa1.1
		vendor=winbond
		;;
	op50n)
		cpu=hppa1.1
		vendor=oki
		;;
	op60c)
		cpu=hppa1.1
		vendor=oki
		;;
	ibm*)
		cpu=i370
		vendor=ibm
		;;
	orion105)
		cpu=clipper
		vendor=highlevel
		;;
	mac | mpw | mac-mpw)
		cpu=m68k
		vendor=apple
		;;
	pmac | pmac-mpw)
		cpu=powerpc
		vendor=apple
		;;

	# Recognize the various machine names and aliases which stand
	# for a CPU type and a company and sometimes even an OS.
	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
		cpu=m68000
		vendor=att
		;;
	3b*)
		cpu=we32k
		vendor=att
		;;
	bluegene*)
		cpu=powerpc
		vendor=ibm
		basic_os=cnk
		;;
	decsystem10* | dec10*)
		cpu=pdp10
		vendor=dec
		basic_os=tops10
		;;
	decsystem20* | dec20*)
		cpu=pdp10
		vendor=dec
		basic_os=tops20
		;;
	delta | 3300 | motorola-3300 | motorola-delta \
	      | 3300-motorola | delta-motorola)
		cpu=m68k
		vendor=motorola
		;;
	dpx2*)
		cpu=m68k
		vendor=bull
		basic_os=sysv3
		;;
	encore | umax | mmax)
		cpu=ns32k
		vendor=encore
		;;
	elxsi)
		cpu=elxsi
		vendor=elxsi
		basic_os=${basic_os:-bsd}
		;;
	fx2800)
		cpu=i860
		vendor=alliant
		;;
	genix)
		cpu=ns32k
		vendor=ns
		;;
	h3050r* | hiux*)
		cpu=hppa1.1
		vendor=hitachi
		basic_os=hiuxwe2
		;;
	hp3k9[0-9][0-9] | hp9[0-9][0-9])
		cpu=hppa1.0
		vendor=hp
		;;
	hp9k2[0-9][0-9] | hp9k31[0-9])
		cpu=m68000
		vendor=hp
		;;
	hp9k3[2-9][0-9])
		cpu=m68k
		vendor=hp
		;;
	hp9k6[0-9][0-9] | hp6[0-9][0-9])
		cpu=hppa1.0
		vendor=hp
		;;
	hp9k7[0-79][0-9] | hp7[0-79][0-9])
		cpu=hppa1.1
		vendor=hp
		;;
	hp9k78[0-9] | hp78[0-9])
		# FIXME: really hppa2.0-hp
		cpu=hppa1.1
		vendor=hp
		;;
	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
		# FIXME: really hppa2.0-hp
		cpu=hppa1.1
		vendor=hp
		;;
	hp9k8[0-9][13679] | hp8[0-9][13679])
		cpu=hppa1.1
		vendor=hp
		;;
	hp9k8[0-9][0-9] | hp8[0-9][0-9])
		cpu=hppa1.0
		vendor=hp
		;;
	i*86v32)
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
		vendor=pc
		basic_os=sysv32
		;;
	i*86v4*)
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
		vendor=pc
		basic_os=sysv4
		;;
	i*86v)
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
		vendor=pc
		basic_os=sysv
		;;
	i*86sol2)
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
		vendor=pc
		basic_os=solaris2
		;;
	j90 | j90-cray)
		cpu=j90
		vendor=cray
		basic_os=${basic_os:-unicos}
		;;
	iris | iris4d)
		cpu=mips
		vendor=sgi
		case $basic_os in
		    irix*)
			;;
		    *)
			basic_os=irix4
			;;
		esac
		;;
	miniframe)
		cpu=m68000
		vendor=convergent
		;;
	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
		cpu=m68k
		vendor=atari
		basic_os=mint
		;;
	mipsEE* | ee)
		cpu=mips64r5900el
		vendor=scei
		case $os in
		    linux*)
			;;
		    *)
			os=elf
			;;
		esac
		;;
	iop)
		cpu=mipsel
		vendor=scei
		os=irx
		;;
	dvp)
		cpu=dvp
		vendor=scei
		os=elf
		;;
	news-3600 | risc-news)
		cpu=mips
		vendor=sony
		basic_os=newsos
		;;
	next | m*-next)
		cpu=m68k
		vendor=next
		case $basic_os in
		    openstep*)
		        ;;
		    nextstep*)
			;;
		    ns2*)
		      basic_os=nextstep2
			;;
		    *)
		      basic_os=nextstep3
			;;
		esac
		;;
	np1)
		cpu=np1
		vendor=gould
		;;
	op50n-* | op60c-*)
		cpu=hppa1.1
		vendor=oki
		basic_os=proelf
		;;
	pa-hitachi)
		cpu=hppa1.1
		vendor=hitachi
		basic_os=hiuxwe2
		;;
	pbd)
		cpu=sparc
		vendor=tti
		;;
	pbb)
		cpu=m68k
		vendor=tti
		;;
	pc532)
		cpu=ns32k
		vendor=pc532
		;;
	pn)
		cpu=pn
		vendor=gould
		;;
	power)
		cpu=power
		vendor=ibm
		;;
	ps2)
		cpu=i386
		vendor=ibm
		;;
	rm[46]00)
		cpu=mips
		vendor=siemens
		;;
	rtpc | rtpc-*)
		cpu=romp
		vendor=ibm
		;;
	sde)
		cpu=mipsisa32
		vendor=sde
		basic_os=${basic_os:-elf}
		;;
	simso-wrs)
		cpu=sparclite
		vendor=wrs
		basic_os=vxworks
		;;
	tower | tower-32)
		cpu=m68k
		vendor=ncr
		;;
	vpp*|vx|vx-*)
		cpu=f301
		vendor=fujitsu
		;;
	w65)
		cpu=w65
		vendor=wdc
		;;
	w89k-*)
		cpu=hppa1.1
		vendor=winbond
		basic_os=proelf
		;;
	none)
		cpu=none
		vendor=none
		;;
	leon|leon[3-9])
		cpu=sparc
		vendor=$basic_machine
		;;
	leon-*|leon[3-9]-*)
		cpu=sparc
		vendor=`echo "$basic_machine" | sed 's/-.*//'`
		;;

	*-*)
		# shellcheck disable=SC2162
		saved_IFS=$IFS
		IFS="-" read cpu vendor <<EOF
$basic_machine
EOF
		IFS=$saved_IFS
		;;
	# We use `pc' rather than `unknown'
	# because (1) that's what they normally are, and
	# (2) the word "unknown" tends to confuse beginning users.
	i*86 | x86_64)
		cpu=$basic_machine
		vendor=pc
		;;
	# These rules are duplicated from below for sake of the special case above;
	# i.e. things that normalized to x86 arches should also default to "pc"
	pc98)
		cpu=i386
		vendor=pc
		;;
	x64 | amd64)
		cpu=x86_64
		vendor=pc
		;;
	# Recognize the basic CPU types without company name.
	*)
		cpu=$basic_machine
		vendor=unknown
		;;
esac

unset -v basic_machine

# Decode basic machines in the full and proper CPU-Company form.
case $cpu-$vendor in
	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
	# some cases the only manufacturer, in others, it is the most popular.
	craynv-unknown)
		vendor=cray
		basic_os=${basic_os:-unicosmp}
		;;
	c90-unknown | c90-cray)
		vendor=cray
		basic_os=${Basic_os:-unicos}
		;;
	fx80-unknown)
		vendor=alliant
		;;
	romp-unknown)
		vendor=ibm
		;;
	mmix-unknown)
		vendor=knuth
		;;
	microblaze-unknown | microblazeel-unknown)
		vendor=xilinx
		;;
	rs6000-unknown)
		vendor=ibm
		;;
	vax-unknown)
		vendor=dec
		;;
	pdp11-unknown)
		vendor=dec
		;;
	we32k-unknown)
		vendor=att
		;;
	cydra-unknown)
		vendor=cydrome
		;;
	i370-ibm*)
		vendor=ibm
		;;
	orion-unknown)
		vendor=highlevel
		;;
	xps-unknown | xps100-unknown)
		cpu=xps100
		vendor=honeywell
		;;

	# Here we normalize CPU types with a missing or matching vendor
	armh-unknown | armh-alt)
		cpu=armv7l
		vendor=alt
		basic_os=${basic_os:-linux-gnueabihf}
		;;
	dpx20-unknown | dpx20-bull)
		cpu=rs6000
		vendor=bull
		basic_os=${basic_os:-bosx}
		;;

	# Here we normalize CPU types irrespective of the vendor
	amd64-*)
		cpu=x86_64
		;;
	blackfin-*)
		cpu=bfin
		basic_os=linux
		;;
	c54x-*)
		cpu=tic54x
		;;
	c55x-*)
		cpu=tic55x
		;;
	c6x-*)
		cpu=tic6x
		;;
	e500v[12]-*)
		cpu=powerpc
		basic_os=${basic_os}"spe"
		;;
	mips3*-*)
		cpu=mips64
		;;
	ms1-*)
		cpu=mt
		;;
	m68knommu-*)
		cpu=m68k
		basic_os=linux
		;;
	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
		cpu=s12z
		;;
	openrisc-*)
		cpu=or32
		;;
	parisc-*)
		cpu=hppa
		basic_os=linux
		;;
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
		cpu=i586
		;;
	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
		cpu=i686
		;;
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
		cpu=i686
		;;
	pentium4-*)
		cpu=i786
		;;
	pc98-*)
		cpu=i386
		;;
	ppc-* | ppcbe-*)
		cpu=powerpc
		;;
	ppcle-* | powerpclittle-*)
		cpu=powerpcle
		;;
	ppc64-*)
		cpu=powerpc64
		;;
	ppc64le-* | powerpc64little-*)
		cpu=powerpc64le
		;;
	sb1-*)
		cpu=mipsisa64sb1
		;;
	sb1el-*)
		cpu=mipsisa64sb1el
		;;
	sh5e[lb]-*)
		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
		;;
	spur-*)
		cpu=spur
		;;
	strongarm-* | thumb-*)
		cpu=arm
		;;
	tx39-*)
		cpu=mipstx39
		;;
	tx39el-*)
		cpu=mipstx39el
		;;
	x64-*)
		cpu=x86_64
		;;
	xscale-* | xscalee[bl]-*)
		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
		;;
	arm64-* | aarch64le-*)
		cpu=aarch64
		;;

	# Recognize the canonical CPU Types that limit and/or modify the
	# company names they are paired with.
	cr16-*)
		basic_os=${basic_os:-elf}
		;;
	crisv32-* | etraxfs*-*)
		cpu=crisv32
		vendor=axis
		;;
	cris-* | etrax*-*)
		cpu=cris
		vendor=axis
		;;
	crx-*)
		basic_os=${basic_os:-elf}
		;;
	neo-tandem)
		cpu=neo
		vendor=tandem
		;;
	nse-tandem)
		cpu=nse
		vendor=tandem
		;;
	nsr-tandem)
		cpu=nsr
		vendor=tandem
		;;
	nsv-tandem)
		cpu=nsv
		vendor=tandem
		;;
	nsx-tandem)
		cpu=nsx
		vendor=tandem
		;;
	mipsallegrexel-sony)
		cpu=mipsallegrexel
		vendor=sony
		;;
	tile*-*)
		basic_os=${basic_os:-linux-gnu}
		;;

	*)
		# Recognize the canonical CPU types that are allowed with any
		# company name.
		case $cpu in
			1750a | 580 \
			| a29k \
			| aarch64 | aarch64_be \
			| abacus \
			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
			| alphapca5[67] | alpha64pca5[67] \
			| am33_2.0 \
			| amdgcn \
			| arc | arceb | arc32 | arc64 \
			| arm | arm[lb]e | arme[lb] | armv* \
			| avr | avr32 \
			| asmjs \
			| ba \
			| be32 | be64 \
			| bfin | bpf | bs2000 \
			| c[123]* | c30 | [cjt]90 | c4x \
			| c8051 | clipper | craynv | csky | cydra \
			| d10v | d30v | dlx | dsp16xx | dvp \
			| e2k | elxsi | epiphany \
			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
			| h8300 | h8500 \
			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
			| hexagon \
			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
			| ip2k | iq2000 \
			| k1om \
			| le32 | le64 \
			| lm32 \
			| loongarch32 | loongarch64 | loongarchx32 \
			| m32c | m32r | m32rle \
			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
			| m88110 | m88k | maxq | mb | mcore | mep | metag \
			| microblaze | microblazeel \
			| mips | mipsbe | mipseb | mipsel | mipsle \
			| mips16 \
			| mips64 | mips64eb | mips64el \
			| mips64octeon | mips64octeonel \
			| mips64orion | mips64orionel \
			| mips64r5900 | mips64r5900el \
			| mips64vr | mips64vrel \
			| mips64vr4100 | mips64vr4100el \
			| mips64vr4300 | mips64vr4300el \
			| mips64vr5000 | mips64vr5000el \
			| mips64vr5900 | mips64vr5900el \
			| mipsisa32 | mipsisa32el \
			| mipsisa32r2 | mipsisa32r2el \
			| mipsisa32r3 | mipsisa32r3el \
			| mipsisa32r5 | mipsisa32r5el \
			| mipsisa32r6 | mipsisa32r6el \
			| mipsisa64 | mipsisa64el \
			| mipsisa64r2 | mipsisa64r2el \
			| mipsisa64r3 | mipsisa64r3el \
			| mipsisa64r5 | mipsisa64r5el \
			| mipsisa64r6 | mipsisa64r6el \
			| mipsisa64sb1 | mipsisa64sb1el \
			| mipsisa64sr71k | mipsisa64sr71kel \
			| mipsr5900 | mipsr5900el \
			| mipstx39 | mipstx39el \
			| mmix \
			| mn10200 | mn10300 \
			| moxie \
			| mt \
			| msp430 \
			| nds32 | nds32le | nds32be \
			| nfp \
			| nios | nios2 | nios2eb | nios2el \
			| none | np1 | ns16k | ns32k | nvptx \
			| open8 \
			| or1k* \
			| or32 \
			| orion \
			| picochip \
			| pdp10 | pdp11 | pj | pjl | pn | power \
			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
			| pru \
			| pyramid \
			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
			| rl78 | romp | rs6000 | rx \
			| s390 | s390x \
			| score \
			| sh | shl \
			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
			| sparclite \
			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
			| spu \
			| tahoe \
			| thumbv7* \
			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
			| tron \
			| ubicom32 \
			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
			| vax \
			| visium \
			| w65 \
			| wasm32 | wasm64 \
			| we32k \
			| x86 | x86_64 | xc16x | xgate | xps100 \
			| xstormy16 | xtensa* \
			| ymp \
			| z8k | z80)
				;;

			*)
				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
				exit 1
				;;
		esac
		;;
esac

# Here we canonicalize certain aliases for manufacturers.
case $vendor in
	digital*)
		vendor=dec
		;;
	commodore*)
		vendor=cbm
		;;
	*)
		;;
esac

# Decode manufacturer-specific aliases for certain operating systems.

if test x$basic_os != x
then

# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
# set os.
case $basic_os in
	gnu/linux*)
		kernel=linux
		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
		;;
	os2-emx)
		kernel=os2
		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
		;;
	nto-qnx*)
		kernel=nto
		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
		;;
	*-*)
		# shellcheck disable=SC2162
		saved_IFS=$IFS
		IFS="-" read kernel os <<EOF
$basic_os
EOF
		IFS=$saved_IFS
		;;
	# Default OS when just kernel was specified
	nto*)
		kernel=nto
		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
		;;
	linux*)
		kernel=linux
		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
		;;
	*)
		kernel=
		os=$basic_os
		;;
esac

# Now, normalize the OS (knowing we just have one component, it's not a kernel,
# etc.)
case $os in
	# First match some system type aliases that might get confused
	# with valid system types.
	# solaris* is a basic system type, with this one exception.
	auroraux)
		os=auroraux
		;;
	bluegene*)
		os=cnk
		;;
	solaris1 | solaris1.*)
		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
		;;
	solaris)
		os=solaris2
		;;
	unixware*)
		os=sysv4.2uw
		;;
	# es1800 is here to avoid being matched by es* (a different OS)
	es1800*)
		os=ose
		;;
	# Some version numbers need modification
	chorusos*)
		os=chorusos
		;;
	isc)
		os=isc2.2
		;;
	sco6)
		os=sco5v6
		;;
	sco5)
		os=sco3.2v5
		;;
	sco4)
		os=sco3.2v4
		;;
	sco3.2.[4-9]*)
		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
		;;
	sco*v* | scout)
		# Don't match below
		;;
	sco*)
		os=sco3.2v2
		;;
	psos*)
		os=psos
		;;
	qnx*)
		os=qnx
		;;
	hiux*)
		os=hiuxwe2
		;;
	lynx*178)
		os=lynxos178
		;;
	lynx*5)
		os=lynxos5
		;;
	lynxos*)
		# don't get caught up in next wildcard
		;;
	lynx*)
		os=lynxos
		;;
	mac[0-9]*)
		os=`echo "$os" | sed -e 's|mac|macos|'`
		;;
	opened*)
		os=openedition
		;;
	os400*)
		os=os400
		;;
	sunos5*)
		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
		;;
	sunos6*)
		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
		;;
	wince*)
		os=wince
		;;
	utek*)
		os=bsd
		;;
	dynix*)
		os=bsd
		;;
	acis*)
		os=aos
		;;
	atheos*)
		os=atheos
		;;
	syllable*)
		os=syllable
		;;
	386bsd)
		os=bsd
		;;
	ctix* | uts*)
		os=sysv
		;;
	nova*)
		os=rtmk-nova
		;;
	ns2)
		os=nextstep2
		;;
	# Preserve the version number of sinix5.
	sinix5.*)
		os=`echo "$os" | sed -e 's|sinix|sysv|'`
		;;
	sinix*)
		os=sysv4
		;;
	tpf*)
		os=tpf
		;;
	triton*)
		os=sysv3
		;;
	oss*)
		os=sysv3
		;;
	svr4*)
		os=sysv4
		;;
	svr3)
		os=sysv3
		;;
	sysvr4)
		os=sysv4
		;;
	ose*)
		os=ose
		;;
	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
		os=mint
		;;
	dicos*)
		os=dicos
		;;
	pikeos*)
		# Until real need of OS specific support for
		# particular features comes up, bare metal
		# configurations are quite functional.
		case $cpu in
		    arm*)
			os=eabi
			;;
		    *)
			os=elf
			;;
		esac
		;;
	*)
		# No normalization, but not necessarily accepted, that comes below.
		;;
esac

else

# Here we handle the default operating systems that come with various machines.
# The value should be what the vendor currently ships out the door with their
# machine or put another way, the most popular os provided with the machine.

# Note that if you're going to try to match "-MANUFACTURER" here (say,
# "-sun"), then you have to tell the case statement up towards the top
# that MANUFACTURER isn't an operating system.  Otherwise, code above
# will signal an error saying that MANUFACTURER isn't an operating
# system, and we'll never get to this point.

kernel=
case $cpu-$vendor in
	score-*)
		os=elf
		;;
	spu-*)
		os=elf
		;;
	*-acorn)
		os=riscix1.2
		;;
	arm*-rebel)
		kernel=linux
		os=gnu
		;;
	arm*-semi)
		os=aout
		;;
	c4x-* | tic4x-*)
		os=coff
		;;
	c8051-*)
		os=elf
		;;
	clipper-intergraph)
		os=clix
		;;
	hexagon-*)
		os=elf
		;;
	tic54x-*)
		os=coff
		;;
	tic55x-*)
		os=coff
		;;
	tic6x-*)
		os=coff
		;;
	# This must come before the *-dec entry.
	pdp10-*)
		os=tops20
		;;
	pdp11-*)
		os=none
		;;
	*-dec | vax-*)
		os=ultrix4.2
		;;
	m68*-apollo)
		os=domain
		;;
	i386-sun)
		os=sunos4.0.2
		;;
	m68000-sun)
		os=sunos3
		;;
	m68*-cisco)
		os=aout
		;;
	mep-*)
		os=elf
		;;
	mips*-cisco)
		os=elf
		;;
	mips*-*)
		os=elf
		;;
	or32-*)
		os=coff
		;;
	*-tti)	# must be before sparc entry or we get the wrong os.
		os=sysv3
		;;
	sparc-* | *-sun)
		os=sunos4.1.1
		;;
	pru-*)
		os=elf
		;;
	*-be)
		os=beos
		;;
	*-ibm)
		os=aix
		;;
	*-knuth)
		os=mmixware
		;;
	*-wec)
		os=proelf
		;;
	*-winbond)
		os=proelf
		;;
	*-oki)
		os=proelf
		;;
	*-hp)
		os=hpux
		;;
	*-hitachi)
		os=hiux
		;;
	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
		os=sysv
		;;
	*-cbm)
		os=amigaos
		;;
	*-dg)
		os=dgux
		;;
	*-dolphin)
		os=sysv3
		;;
	m68k-ccur)
		os=rtu
		;;
	m88k-omron*)
		os=luna
		;;
	*-next)
		os=nextstep
		;;
	*-sequent)
		os=ptx
		;;
	*-crds)
		os=unos
		;;
	*-ns)
		os=genix
		;;
	i370-*)
		os=mvs
		;;
	*-gould)
		os=sysv
		;;
	*-highlevel)
		os=bsd
		;;
	*-encore)
		os=bsd
		;;
	*-sgi)
		os=irix
		;;
	*-siemens)
		os=sysv4
		;;
	*-masscomp)
		os=rtu
		;;
	f30[01]-fujitsu | f700-fujitsu)
		os=uxpv
		;;
	*-rom68k)
		os=coff
		;;
	*-*bug)
		os=coff
		;;
	*-apple)
		os=macos
		;;
	*-atari*)
		os=mint
		;;
	*-wrs)
		os=vxworks
		;;
	*)
		os=none
		;;
esac

fi

# Now, validate our (potentially fixed-up) OS.
case $os in
	# Sometimes we do "kernel-libc", so those need to count as OSes.
	musl* | newlib* | relibc* | uclibc*)
		;;
	# Likewise for "kernel-abi"
	eabi* | gnueabi*)
		;;
	# VxWorks passes extra cpu info in the 4th filed.
	simlinux | simwindows | spe)
		;;
	# Now accept the basic system types.
	# The portable systems comes first.
	# Each alternative MUST end in a * to match a version number.
	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
	     | hiux* | abug | nacl* | netware* | windows* \
	     | os9* | macos* | osx* | ios* \
	     | mpw* | magic* | mmixware* | mon960* | lnews* \
	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
	     | chorusrdb* | cegcc* | glidix* | serenity* \
	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
	     | midipix* | mingw32* | mingw64* | mint* \
	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
	     | interix* | uwin* | mks* | rhapsody* | darwin* \
	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
	     | storm-chaos* | tops10* | tenex* | tops20* | its* | irx* \
	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
	     | fiwix* )
		;;
	# This one is extra strict with allowed versions
	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
		# Don't forget version if it is 3.2v4 or newer.
		;;
	none)
		;;
	*)
		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
		exit 1
		;;
esac

# As a final step for OS-related things, validate the OS-kernel combination
# (given a valid OS), if there is a kernel.
case $kernel-$os in
	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
		   | linux-musl* | linux-relibc* | linux-uclibc* )
		;;
	uclinux-uclibc* )
		;;
	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
		# These are just libc implementations, not actual OSes, and thus
		# require a kernel.
		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
		exit 1
		;;
	kfreebsd*-gnu* | kopensolaris*-gnu*)
		;;
	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
		;;
	nto-qnx*)
		;;
	os2-emx)
		;;
	*-eabi* | *-gnueabi*)
		;;
	-*)
		# Blank kernel with real OS is always fine.
		;;
	*-*)
		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
		exit 1
		;;
esac

# Here we handle the case where we know the os, and the CPU type, but not the
# manufacturer.  We pick the logical manufacturer.
case $vendor in
	unknown)
		case $cpu-$os in
			*-riscix*)
				vendor=acorn
				;;
			*-sunos*)
				vendor=sun
				;;
			*-cnk* | *-aix*)
				vendor=ibm
				;;
			*-beos*)
				vendor=be
				;;
			*-hpux*)
				vendor=hp
				;;
			*-mpeix*)
				vendor=hp
				;;
			*-hiux*)
				vendor=hitachi
				;;
			*-unos*)
				vendor=crds
				;;
			*-dgux*)
				vendor=dg
				;;
			*-luna*)
				vendor=omron
				;;
			*-genix*)
				vendor=ns
				;;
			*-clix*)
				vendor=intergraph
				;;
			*-mvs* | *-opened*)
				vendor=ibm
				;;
			*-os400*)
				vendor=ibm
				;;
			s390-* | s390x-*)
				vendor=ibm
				;;
			*-ptx*)
				vendor=sequent
				;;
			*-tpf*)
				vendor=ibm
				;;
			*-vxsim* | *-vxworks* | *-windiss*)
				vendor=wrs
				;;
			*-aux*)
				vendor=apple
				;;
			*-hms*)
				vendor=hitachi
				;;
			*-mpw* | *-macos*)
				vendor=apple
				;;
			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
				vendor=atari
				;;
			*-vos*)
				vendor=stratus
				;;
		esac
		;;
esac

echo "$cpu-$vendor-${kernel:+$kernel-}$os"
exit

# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:
@


1.7
log
@Merge expat 2.8.1
@
text
@@


1.6
log
@Merge expat 2.7.0.
@
text
@@


1.6.2.1
log
@Pull up the following revisions, requested by jdc in ticket #311:

	external/mit/expat/dist/lib/libexpat.map.in     up to 1.1.1.1
	external/mit/expat/dist/lib/random_arc4random.c up to 1.1.1.1
	external/mit/expat/dist/lib/random_arc4random.h up to 1.1.1.1
	external/mit/expat/dist/lib/random_arc4random_buf.c up to 1.1.1.1
	external/mit/expat/dist/lib/random_arc4random_buf.h up to 1.1.1.1
	external/mit/expat/dist/lib/random_dev_urandom.c up to 1.1.1.1
	external/mit/expat/dist/lib/random_dev_urandom.h up to 1.1.1.1
	external/mit/expat/dist/lib/random_getentropy.c up to 1.1.1.1
	external/mit/expat/dist/lib/random_getentropy.h up to 1.1.1.1
	external/mit/expat/dist/lib/random_getrandom.c  up to 1.1.1.1
	external/mit/expat/dist/lib/random_getrandom.h  up to 1.1.1.1
	external/mit/expat/dist/lib/random_rand_s.c     up to 1.1.1.1
	external/mit/expat/dist/lib/random_rand_s.h     up to 1.1.1.1
	external/mit/expat/dist/coverage.sh             up to 1.1.1.1
	external/mit/expat/dist/cmake/autotools/expat__linux.cmake.in up to 1.1.1.1
	external/mit/expat/dist/cmake/autotools/expat__macos.cmake.in up to 1.1.1.1
	external/mit/expat/dist/cmake/autotools/expat__windows.cmake.in up to 1.1.1.1
	external/mit/expat/dist/qa.sh                   up to 1.1.1.1
	external/mit/expat/dist/gennmtab/gennmtab.c     up to 1.1.1.1
	external/mit/expat/dist/.clang-format           up to 1.1.1.1
	external/mit/expat/dist/apply-clang-format.sh   up to 1.1.1.1
	external/mit/expat/dist/apply-clang-tidy.sh     up to 1.1.1.1
	external/mit/expat/dist/clean_coverage.sh       up to 1.1.1.1
	external/mit/expat/dist/configure-ac-style.md   up to 1.1.1.1
	external/mit/expat/dist/distribute.sh           up to 1.1.1.1
	external/mit/expat/dist/memory-sanitizer-blacklist.txt up to 1.1.1.1
	external/mit/expat/dist/Makefile.in             delete
	external/mit/expat/dist/aclocal.m4              delete
	external/mit/expat/dist/configure               delete
	external/mit/expat/dist/expat_config.h.in       delete
	external/mit/expat/dist/cmake/autotools/expat.cmake delete
	external/mit/expat/dist/conftools/compile       delete
	external/mit/expat/dist/conftools/ar-lib        delete
	external/mit/expat/dist/conftools/config.guess  delete
	external/mit/expat/dist/conftools/config.sub    delete
	external/mit/expat/dist/conftools/depcomp       delete
	external/mit/expat/dist/conftools/expat.m4      delete
	external/mit/expat/dist/conftools/missing       delete
	external/mit/expat/dist/conftools/install-sh    delete
	external/mit/expat/dist/conftools/ltmain.sh     delete
	external/mit/expat/dist/conftools/test-driver   delete
	external/mit/expat/dist/doc/Makefile.in         delete
	external/mit/expat/dist/doc/xmlwf.1             delete
	external/mit/expat/dist/examples/Makefile.in    delete
	external/mit/expat/dist/lib/Makefile.in         delete
	external/mit/expat/dist/m4/libtool.m4           delete
	external/mit/expat/dist/m4/ltoptions.m4         delete
	external/mit/expat/dist/m4/ltsugar.m4           delete
	external/mit/expat/dist/m4/ltversion.m4         delete
	external/mit/expat/dist/m4/lt~obsolete.m4       delete
	external/mit/expat/dist/tests/benchmark/Makefile.in delete
	external/mit/expat/dist/tests/Makefile.in       delete
	external/mit/expat/dist/tests/acc_tests_cxx.cpp delete
	external/mit/expat/dist/tests/alloc_tests_cxx.cpp delete
	external/mit/expat/dist/tests/basic_tests_cxx.cpp delete
	external/mit/expat/dist/tests/chardata_cxx.cpp  delete
	external/mit/expat/dist/tests/common_cxx.cpp    delete
	external/mit/expat/dist/tests/dummy_cxx.cpp     delete
	external/mit/expat/dist/tests/handlers_cxx.cpp  delete
	external/mit/expat/dist/tests/memcheck_cxx.cpp  delete
	external/mit/expat/dist/tests/minicheck_cxx.cpp delete
	external/mit/expat/dist/tests/misc_tests_cxx.cpp delete
	external/mit/expat/dist/tests/ns_tests_cxx.cpp  delete
	external/mit/expat/dist/tests/nsalloc_tests_cxx.cpp delete
	external/mit/expat/dist/tests/runtests_cxx.cpp  delete
	external/mit/expat/dist/tests/structdata_cxx.cpp delete
	external/mit/expat/dist/xmlwf/Makefile.in       delete
	external/mit/expat/dist/CMake.README            up to 1.1.1.9
	external/mit/expat/dist/CMakeLists.txt          up to 1.1.1.9
	external/mit/expat/dist/Changes                 up to 1.1.1.10
	external/mit/expat/dist/ConfigureChecks.cmake   up to 1.1.1.5
	external/mit/expat/dist/Makefile.am             up to 1.1.1.5
	external/mit/expat/dist/README.md               up to 1.1.1.5
	external/mit/expat/dist/configure.ac            up to 1.1.1.8
	external/mit/expat/dist/expat_config.h.cmake    up to 1.1.1.4
	external/mit/expat/dist/fix-xmltest-log.sh      up to 1.1.1.4
	external/mit/expat/dist/doc/reference.html      up to 1.1.1.9
	external/mit/expat/dist/doc/xmlwf.xml           up to 1.1.1.6
	external/mit/expat/dist/examples/element_declarations.c up to 1.1.1.2
	external/mit/expat/dist/fuzz/xml_lpm_fuzzer.cpp up to 1.1.1.2
	external/mit/expat/dist/fuzz/xml_parse_fuzzer.c up to 1.1.1.3
	external/mit/expat/dist/fuzz/xml_parsebuffer_fuzzer.c up to 1.1.1.3
	external/mit/expat/dist/lib/Makefile.am         up to 1.1.1.4
	external/mit/expat/dist/lib/expat.h             up to 1.1.1.10
	external/mit/expat/dist/lib/expat_external.h    up to 1.1.1.6
	external/mit/expat/dist/lib/internal.h          up to 1.1.1.7
	external/mit/expat/dist/lib/libexpat.def.cmake  up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c          up to 1.12
	external/mit/expat/dist/lib/xmlrole.c           up to 1.1.1.8
	external/mit/expat/dist/lib/xmlrole.h           up to 1.1.1.5
	external/mit/expat/dist/lib/xmltok.c            up to 1.8
	external/mit/expat/dist/lib/xmltok.h            up to 1.6
	external/mit/expat/dist/lib/xmltok_ns.c         up to 1.1.1.4
	external/mit/expat/dist/tests/Makefile.am       up to 1.1.1.4
	external/mit/expat/dist/tests/alloc_tests.c     up to 1.1.1.2
	external/mit/expat/dist/tests/basic_tests.c     up to 1.1.1.2
	external/mit/expat/dist/tests/common.c          up to 1.1.1.3
	external/mit/expat/dist/tests/handlers.c        up to 1.1.1.2
	external/mit/expat/dist/tests/handlers.h        up to 1.1.1.2
	external/mit/expat/dist/tests/memcheck.c        up to 1.1.1.5
	external/mit/expat/dist/tests/minicheck.c       up to 1.1.1.7
	external/mit/expat/dist/tests/minicheck.h       up to 1.1.1.8
	external/mit/expat/dist/tests/misc_tests.c      up to 1.1.1.3
	external/mit/expat/dist/tests/nsalloc_tests.c   up to 1.1.1.2
	external/mit/expat/dist/tests/structdata.c      up to 1.1.1.4
	external/mit/expat/dist/tests/xmltest.sh        up to 1.7
	external/mit/expat/dist/win32/README.txt        up to 1.1.1.7
	external/mit/expat/dist/win32/build_expat_iss.bat up to 1.1.1.4
	external/mit/expat/dist/win32/expat.iss         up to 1.1.1.10
	external/mit/expat/dist/xmlwf/unixfilemap.c     up to 1.1.1.6
	external/mit/expat/dist/xmlwf/xmlfile.c         up to 1.1.1.7
	external/mit/expat/dist/xmlwf/xmlwf.c           up to 1.1.1.9
	external/mit/expat/dist/xmlwf/xmlwf_helpgen.py  up to 1.1.1.4


Import expat 2.8.1 as expat-2-8-1
Merge expat 2.8.1
@
text
@@


1.6.2.2
log
@Pull up the following, requested by nia in ticket #496:

	external/mit/expat/dist/conftools/compile       up to 1.3
	external/mit/expat/dist/conftools/ar-lib        up to 1.3
	external/mit/expat/dist/conftools/config.guess  up to 1.9
	external/mit/expat/dist/conftools/config.sub    up to 1.8
	external/mit/expat/dist/conftools/depcomp       up to 1.3
	external/mit/expat/dist/conftools/install-sh    up to 1.3
	external/mit/expat/dist/conftools/ltmain.sh     up to 1.3
	external/mit/expat/dist/conftools/missing       up to 1.3
	external/mit/expat/dist/conftools/test-driver   up to 1.3
	external/mit/expat/dist/doc/xmlwf.1             up to 1.3
	external/mit/expat/dist/doc/Makefile.in         up to 1.3
	external/mit/expat/dist/examples/Makefile.in    up to 1.3
	external/mit/expat/dist/lib/Makefile.in         up to 1.3
	external/mit/expat/dist/lib/hash_table.h        up to 1.1.1.1
	external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.3
	external/mit/expat/dist/tests/Makefile.in       up to 1.3
	external/mit/expat/dist/tests/hash_tests.c      up to 1.1.1.1
	external/mit/expat/dist/tests/hash_tests.h      up to 1.1.1.1
	external/mit/expat/dist/xmlwf/Makefile.in       up to 1.3
	external/mit/expat/dist/m4/libtool.m4           up to 1.3
	external/mit/expat/dist/m4/ltoptions.m4         up to 1.3
	external/mit/expat/dist/m4/ltsugar.m4           up to 1.3
	external/mit/expat/dist/m4/ltversion.m4         up to 1.3
	external/mit/expat/dist/m4/lt~obsolete.m4       up to 1.3
	external/mit/expat/dist/Makefile.in             up to 1.3
	external/mit/expat/dist/cmake/mingw-toolchain-win32.cmake up to 1.1.1.1
	external/mit/expat/dist/cmake/mingw-toolchain-win64.cmake up to 1.1.1.1
	external/mit/expat/dist/aclocal.m4              up to 1.3
	external/mit/expat/dist/configure               up to 1.3
	external/mit/expat/dist/expat_config.h          up to 1.3
	external/mit/expat/dist/expat_config.h.in       up to 1.3
	external/mit/expat/dist/gennmtab/gennmtab.c     delete
	external/mit/expat/dist/qa.sh                   delete
	external/mit/expat/dist/cmake/mingw-toolchain.cmake delete
	external/mit/expat/dist/coverage.sh             delete
	external/mit/expat/dist/.clang-format           delete
	external/mit/expat/dist/apply-clang-format.sh   delete
	external/mit/expat/dist/apply-clang-tidy.sh     delete
	external/mit/expat/dist/clean_coverage.sh       delete
	external/mit/expat/dist/configure-ac-style.md   delete
	external/mit/expat/dist/distribute.sh           delete
	external/mit/expat/dist/CMake.README            up to 1.1.1.11
	external/mit/expat/dist/CMakeLists.txt          up to 1.1.1.11
	external/mit/expat/dist/Changes                 up to 1.1.1.12
	external/mit/expat/dist/Makefile.am             up to 1.1.1.6
	external/mit/expat/dist/README.md               up to 1.1.1.7
	external/mit/expat/dist/configure.ac            up to 1.1.1.10
	external/mit/expat/dist/fix-xmltest-log.sh      up to 1.1.1.5
	external/mit/expat/dist/cmake/autotools/expat__macos.cmake.in up to 1.1.1.2
	external/mit/expat/dist/doc/reference.html      up to 1.1.1.11
	external/mit/expat/dist/doc/xmlwf.xml           up to 1.1.1.8
	external/mit/expat/dist/examples/element_declarations.c up to 1.1.1.3
	external/mit/expat/dist/examples/elements.c     up to 1.1.1.8
	external/mit/expat/dist/examples/outline.c      up to 1.1.1.7
	external/mit/expat/dist/fuzz/xml_lpm_fuzzer.cpp up to 1.1.1.3
	external/mit/expat/dist/fuzz/xml_parse_fuzzer.c up to 1.1.1.4
	external/mit/expat/dist/fuzz/xml_parsebuffer_fuzzer.c up to 1.1.1.4
	external/mit/expat/dist/lib/Makefile.am         up to 1.1.1.6
	external/mit/expat/dist/lib/ascii.h             up to 1.1.1.4
	external/mit/expat/dist/lib/asciitab.h          up to 1.1.1.4
	external/mit/expat/dist/lib/expat.h             up to 1.1.1.12
	external/mit/expat/dist/lib/expat_external.h    up to 1.1.1.7
	external/mit/expat/dist/lib/fallthrough.h       up to 1.1.1.2
	external/mit/expat/dist/lib/iasciitab.h         up to 1.1.1.4
	external/mit/expat/dist/lib/internal.h          up to 1.1.1.8
	external/mit/expat/dist/lib/latin1tab.h         up to 1.1.1.4
	external/mit/expat/dist/lib/memory_sanitizer.h  up to 1.1.1.2
	external/mit/expat/dist/lib/nametab.h           up to 1.1.1.4
	external/mit/expat/dist/lib/random_arc4random.c up to 1.1.1.2
	external/mit/expat/dist/lib/random_arc4random.h up to 1.1.1.2
	external/mit/expat/dist/lib/random_arc4random_buf.c up to 1.1.1.3
	external/mit/expat/dist/lib/random_arc4random_buf.h up to 1.1.1.2
	external/mit/expat/dist/lib/random_dev_urandom.c up to 1.1.1.3
	external/mit/expat/dist/lib/random_dev_urandom.h up to 1.1.1.2
	external/mit/expat/dist/lib/random_getentropy.c up to 1.1.1.3
	external/mit/expat/dist/lib/random_getentropy.h up to 1.1.1.2
	external/mit/expat/dist/lib/random_getrandom.c  up to 1.1.1.3
	external/mit/expat/dist/lib/random_getrandom.h  up to 1.1.1.2
	external/mit/expat/dist/lib/random_rand_s.c     up to 1.1.1.2
	external/mit/expat/dist/lib/random_rand_s.h     up to 1.1.1.2
	external/mit/expat/dist/lib/siphash.h           up to 1.1.1.6
	external/mit/expat/dist/lib/utf8tab.h           up to 1.1.1.4
	external/mit/expat/dist/lib/winconfig.h         up to 1.1.1.6
	external/mit/expat/dist/lib/xcsinc.c            up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c          up to 1.14
	external/mit/expat/dist/lib/xmlrole.c           up to 1.1.1.9
	external/mit/expat/dist/lib/xmlrole.h           up to 1.1.1.6
	external/mit/expat/dist/lib/xmltok.c            up to 1.10
	external/mit/expat/dist/lib/xmltok.h            up to 1.7
	external/mit/expat/dist/lib/xmltok_impl.c       up to 1.10
	external/mit/expat/dist/lib/xmltok_impl.h       up to 1.1.1.5
	external/mit/expat/dist/lib/xmltok_ns.c         up to 1.1.1.5
	external/mit/expat/dist/tests/Makefile.am       up to 1.1.1.5
	external/mit/expat/dist/tests/acc_tests.c       up to 1.1.1.3
	external/mit/expat/dist/tests/acc_tests.h       up to 1.1.1.2
	external/mit/expat/dist/tests/alloc_tests.c     up to 1.1.1.4
	external/mit/expat/dist/tests/alloc_tests.h     up to 1.1.1.2
	external/mit/expat/dist/tests/basic_tests.c     up to 1.1.1.4
	external/mit/expat/dist/tests/basic_tests.h     up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c        up to 1.1.1.8
	external/mit/expat/dist/tests/chardata.h        up to 1.1.1.4
	external/mit/expat/dist/tests/common.c          up to 1.1.1.5
	external/mit/expat/dist/tests/common.h          up to 1.1.1.3
	external/mit/expat/dist/tests/dummy.c           up to 1.1.1.2
	external/mit/expat/dist/tests/dummy.h           up to 1.1.1.2
	external/mit/expat/dist/tests/handlers.c        up to 1.1.1.4
	external/mit/expat/dist/tests/handlers.h        up to 1.1.1.4
	external/mit/expat/dist/tests/memcheck.c        up to 1.1.1.6
	external/mit/expat/dist/tests/memcheck.h        up to 1.1.1.4
	external/mit/expat/dist/tests/minicheck.c       up to 1.1.1.8
	external/mit/expat/dist/tests/minicheck.h       up to 1.1.1.9
	external/mit/expat/dist/tests/misc_tests.c      up to 1.1.1.5
	external/mit/expat/dist/tests/misc_tests.h      up to 1.1.1.2
	external/mit/expat/dist/tests/ns_tests.c        up to 1.1.1.2
	external/mit/expat/dist/tests/ns_tests.h        up to 1.1.1.2
	external/mit/expat/dist/tests/nsalloc_tests.c   up to 1.1.1.3
	external/mit/expat/dist/tests/nsalloc_tests.h   up to 1.1.1.2
	external/mit/expat/dist/tests/runtests.c        up to 1.1.1.8
	external/mit/expat/dist/tests/structdata.c      up to 1.1.1.5
	external/mit/expat/dist/tests/structdata.h      up to 1.1.1.3
	external/mit/expat/dist/tests/xmltest.sh        up to 1.8
	external/mit/expat/dist/win32/build_expat_iss.bat up to 1.1.1.5
	external/mit/expat/dist/win32/expat.iss         up to 1.1.1.12
	external/mit/expat/dist/xmlwf/codepage.c        up to 1.1.1.6
	external/mit/expat/dist/xmlwf/codepage.h        up to 1.1.1.4
	external/mit/expat/dist/xmlwf/ct.c              up to 1.1.1.4
	external/mit/expat/dist/xmlwf/filemap.h         up to 1.1.1.6
	external/mit/expat/dist/xmlwf/readfilemap.c     up to 1.1.1.8
	external/mit/expat/dist/xmlwf/unixfilemap.c     up to 1.1.1.7
	external/mit/expat/dist/xmlwf/win32filemap.c    up to 1.1.1.7
	external/mit/expat/dist/xmlwf/xmlfile.c         up to 1.1.1.9
	external/mit/expat/dist/xmlwf/xmlfile.h         up to 1.1.1.5
	external/mit/expat/dist/xmlwf/xmlmime.c         up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlmime.h         up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmltchar.h        up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlwf.c           up to 1.1.1.11
	external/mit/expat/dist/xmlwf/xmlwf_helpgen.py  up to 1.1.1.6
	external/mit/expat/dist/xmlwf/xmlwf_helpgen.sh  up to 1.1.1.3
	doc/3RDPARTY					(apply patch)

Update expat to 2.8.5.
@
text
@@


1.5
log
@merge conflicts between expat-2.2.8 and expat-2.4.6
@
text
@d3 1
a3 1
#   Copyright 1992-2021 Free Software Foundation, Inc.
d5 3
a7 1
timestamp='2021-01-07'
d11 1
a11 1
# the Free Software Foundation; either version 3 of the License, or
d55 8
a62 1
me=$(echo "$0" | sed -e 's,.*/,,')
d79 1
a79 1
Copyright 1992-2021 Free Software Foundation, Inc.
d124 1
d128 1
d177 4
d787 1
a787 1
		cpu=$(echo "$1" | sed -e 's/86.*/86/')
d792 1
a792 1
		cpu=$(echo "$1" | sed -e 's/86.*/86/')
d797 1
a797 1
		cpu=$(echo "$1" | sed -e 's/86.*/86/')
d802 1
a802 1
		cpu=$(echo "$1" | sed -e 's/86.*/86/')
d956 1
a956 1
		vendor=$(echo "$basic_machine" | sed 's/-.*//')
d961 1
d965 1
d1044 5
d1130 1
a1130 1
		cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/')
d1148 1
a1148 1
		cpu=$(echo "$cpu" | sed 's/^xscale/arm/')
d1150 1
a1150 1
	arm64-*)
d1211 1
a1211 1
			| arc | arceb \
d1250 2
d1255 2
d1333 1
a1333 1
# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
d1338 1
a1338 1
		os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|')
d1342 1
a1342 1
		os=$(echo $basic_os | sed -e 's|os2-emx|emx|')
d1346 1
a1346 1
		os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|')
d1350 1
d1354 1
d1359 1
a1359 1
		os=$(echo $basic_os | sed -e 's|nto|qnx|')
d1363 1
a1363 1
		os=$(echo $basic_os | sed -e 's|linux|gnu|')
d1384 1
a1384 1
		os=$(echo $os | sed -e 's|solaris1|sunos4|')
d1413 1
a1413 1
		os=$(echo $os | sed -e 's/sco3.2./sco3.2v/')
d1443 1
a1443 1
		os=$(echo "$os" | sed -e 's|mac|macos|')
d1452 1
a1452 1
		os=$(echo "$os" | sed -e 's|sunos5|solaris2|')
d1455 1
a1455 1
		os=$(echo "$os" | sed -e 's|sunos6|solaris3|')
d1489 1
a1489 1
		os=$(echo $os | sed -e 's|sinix|sysv|')
d1735 2
a1736 2
	# Sometimes we do "kernel-abi", so those need to count as OSes.
	musl* | newlib* | uclibc*)
d1738 1
a1738 1
	# Likewise for "kernel-libc"
d1741 3
d1759 1
a1759 1
	     | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
d1764 1
a1764 1
	     | chorusrdb* | cegcc* | glidix* \
d1777 2
a1778 1
	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
d1795 2
a1796 1
	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
d1800 1
a1800 1
	-dietlibc* | -newlib* | -musl* | -uclibc* )
d1808 2
@


1.5.4.1
log
@Sync with HEAD
@
text
@d3 1
a3 1
#   Copyright 1992-2022 Free Software Foundation, Inc.
d5 1
a5 3
# shellcheck disable=SC2006,SC2268 # see below for rationale

timestamp='2022-01-03'
d9 1
a9 1
# the Free Software Foundation, either version 3 of the License, or
d53 1
a53 8
# The "shellcheck disable" line above the timestamp inhibits complaints
# about features and limitations of the classic Bourne shell that were
# superseded or lifted in POSIX.  However, this script identifies a wide
# variety of pre-POSIX systems that do not have POSIX shells at all, and
# even some reasonably current systems (Solaris 10 as case-in-point) still
# have a pre-POSIX /bin/sh.

me=`echo "$0" | sed -e 's,.*/,,'`
d70 1
a70 1
Copyright 1992-2022 Free Software Foundation, Inc.
a114 1
saved_IFS=$IFS
a117 1
IFS=$saved_IFS
a165 4
					zephyr*)
						basic_machine=$field1-unknown
						basic_os=$field2
						;;
d772 1
a772 1
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
d777 1
a777 1
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
d782 1
a782 1
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
d787 1
a787 1
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
d941 1
a941 1
		vendor=`echo "$basic_machine" | sed 's/-.*//'`
a945 1
		saved_IFS=$IFS
a948 1
		IFS=$saved_IFS
a1026 5
	armh-unknown | armh-alt)
		cpu=armv7l
		vendor=alt
		basic_os=${basic_os:-linux-gnueabihf}
		;;
d1108 1
a1108 1
		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
d1126 1
a1126 1
		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
d1128 1
a1128 1
	arm64-* | aarch64le-*)
d1189 1
a1189 1
			| arc | arceb | arc32 | arc64 \
a1227 2
			| mipsisa32r3 | mipsisa32r3el \
			| mipsisa32r5 | mipsisa32r5el \
a1230 2
			| mipsisa64r3 | mipsisa64r3el \
			| mipsisa64r5 | mipsisa64r5el \
d1307 1
a1307 1
# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
d1312 1
a1312 1
		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
d1316 1
a1316 1
		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
d1320 1
a1320 1
		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
a1323 1
		saved_IFS=$IFS
a1326 1
		IFS=$saved_IFS
d1331 1
a1331 1
		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
d1335 1
a1335 1
		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
d1356 1
a1356 1
		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
d1385 1
a1385 1
		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
d1415 1
a1415 1
		os=`echo "$os" | sed -e 's|mac|macos|'`
d1424 1
a1424 1
		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
d1427 1
a1427 1
		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
d1461 1
a1461 1
		os=`echo "$os" | sed -e 's|sinix|sysv|'`
d1707 2
a1708 2
	# Sometimes we do "kernel-libc", so those need to count as OSes.
	musl* | newlib* | relibc* | uclibc*)
d1710 1
a1710 1
	# Likewise for "kernel-abi"
a1712 3
	# VxWorks passes extra cpu info in the 4th filed.
	simlinux | simwindows | spe)
		;;
d1728 1
a1728 1
	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
d1733 1
a1733 1
	     | chorusrdb* | cegcc* | glidix* | serenity* \
d1746 1
a1746 2
	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
	     | fiwix* )
d1763 1
a1763 2
	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
		   | linux-musl* | linux-relibc* | linux-uclibc* )
d1767 1
a1767 1
	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
a1774 2
	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
		;;
@


1.4
log
@Merge expat 2.2.8
@
text
@d3 1
a3 1
#   Copyright 1992-2018 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2018-01-01'
d36 1
a36 1
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d53 1
a53 1
me=`echo "$0" | sed -e 's,.*/,,'`
d70 1
a70 1
Copyright 1992-2018 Free Software Foundation, Inc.
d92 1
a92 1
       echo "$me: invalid option $1$help"
d97 1
a97 1
       echo $1
d113 11
a123 31
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  android-linux)
    os=-linux-android
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
  *)
    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    if [ $basic_machine != $1 ]
    then os=`echo $1 | sed 's/.*-/-/'`
    else os=; fi
    ;;
esac

### Let's recognize common machines as not being operating systems so
### that things like config.sub decstation-3100 work.  We also
### recognize some manufacturers as not being operating systems, so we
### can provide default operating systems below.
case $os in
	-sun*os*)
		# Prevent following clause from handling this invalid input.
d125 3
a127 49
	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
	-apple | -axis | -knuth | -cray | -microblaze*)
		os=
		basic_machine=$1
		;;
	-bluegene*)
		os=-cnk
		;;
	-sim | -cisco | -oki | -wec | -winbond)
		os=
		basic_machine=$1
		;;
	-scout)
		;;
	-wrs)
		os=-vxworks
		basic_machine=$1
		;;
	-chorusos*)
		os=-chorusos
		basic_machine=$1
		;;
	-chorusrdb)
		os=-chorusrdb
		basic_machine=$1
		;;
	-hiux*)
		os=-hiuxwe2
		;;
	-sco6)
		os=-sco5v6
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5)
		os=-sco3.2v5
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco4)
		os=-sco3.2v4
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2.[4-9]*)
		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
d129 21
a149 3
	-sco3.2v[4-9]*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
d151 35
a185 3
	-sco5v6*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
d187 453
a639 35
	-sco*)
		os=-sco3.2v2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-udk*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-isc)
		os=-isc2.2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-clix*)
		basic_machine=clipper-intergraph
		;;
	-isc*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-lynx*178)
		os=-lynxos178
		;;
	-lynx*5)
		os=-lynxos5
		;;
	-lynx*)
		os=-lynxos
		;;
	-ptx*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
		;;
	-psos*)
		os=-psos
		;;
	-mint | -mint[0-9]*)
		basic_machine=m68k-atari
		os=-mint
d643 1
a643 1
# Decode aliases for certain CPU-COMPANY combinations.
d645 5
a649 76
	# Recognize the basic CPU types without company name.
	# Some are omitted here because they have special meanings below.
	1750a | 580 \
	| a29k \
	| aarch64 | aarch64_be \
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
	| am33_2.0 \
	| arc | arceb \
	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
	| avr | avr32 \
	| ba \
	| be32 | be64 \
	| bfin \
	| c4x | c8051 | clipper \
	| d10v | d30v | dlx | dsp16xx \
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
	| hexagon \
	| i370 | i860 | i960 | ia16 | ia64 \
	| ip2k | iq2000 \
	| k1om \
	| le32 | le64 \
	| lm32 \
	| m32c | m32r | m32rle | m68000 | m68k | m88k \
	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
	| mips | mipsbe | mipseb | mipsel | mipsle \
	| mips16 \
	| mips64 | mips64el \
	| mips64octeon | mips64octeonel \
	| mips64orion | mips64orionel \
	| mips64r5900 | mips64r5900el \
	| mips64vr | mips64vrel \
	| mips64vr4100 | mips64vr4100el \
	| mips64vr4300 | mips64vr4300el \
	| mips64vr5000 | mips64vr5000el \
	| mips64vr5900 | mips64vr5900el \
	| mipsisa32 | mipsisa32el \
	| mipsisa32r2 | mipsisa32r2el \
	| mipsisa32r6 | mipsisa32r6el \
	| mipsisa64 | mipsisa64el \
	| mipsisa64r2 | mipsisa64r2el \
	| mipsisa64r6 | mipsisa64r6el \
	| mipsisa64sb1 | mipsisa64sb1el \
	| mipsisa64sr71k | mipsisa64sr71kel \
	| mipsr5900 | mipsr5900el \
	| mipstx39 | mipstx39el \
	| mn10200 | mn10300 \
	| moxie \
	| mt \
	| msp430 \
	| nds32 | nds32le | nds32be \
	| nios | nios2 | nios2eb | nios2el \
	| ns16k | ns32k \
	| open8 | or1k | or1knd | or32 \
	| pdp10 | pdp11 | pj | pjl \
	| powerpc | powerpc64 | powerpc64le | powerpcle \
	| pru \
	| pyramid \
	| riscv32 | riscv64 \
	| rl78 | rx \
	| score \
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
	| sh64 | sh64le \
	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
	| spu \
	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
	| ubicom32 \
	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
	| visium \
	| wasm32 \
	| x86 | xc16x | xstormy16 | xtensa \
	| z8k | z80)
		basic_machine=$basic_machine-unknown
d651 3
a653 2
	c54x)
		basic_machine=tic54x-unknown
d655 3
a657 2
	c55x)
		basic_machine=tic55x-unknown
d659 3
a661 2
	c6x)
		basic_machine=tic6x-unknown
d663 3
a665 2
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
d667 3
a669 3
	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
		basic_machine=$basic_machine-unknown
		os=-none
d671 3
a673 15
	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
		;;
	ms1)
		basic_machine=mt-unknown
		;;

	strongarm | thumb | xscale)
		basic_machine=arm-unknown
		;;
	xgate)
		basic_machine=$basic_machine-unknown
		os=-none
		;;
	xscaleeb)
		basic_machine=armeb-unknown
a675 104
	xscaleel)
		basic_machine=armel-unknown
		;;

	# We use `pc' rather than `unknown'
	# because (1) that's what they normally are, and
	# (2) the word "unknown" tends to confuse beginning users.
	i*86 | x86_64)
	  basic_machine=$basic_machine-pc
	  ;;
	# Object if more than one company name word.
	*-*-*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
	# Recognize the basic CPU types with company name.
	580-* \
	| a29k-* \
	| aarch64-* | aarch64_be-* \
	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
	| avr-* | avr32-* \
	| ba-* \
	| be32-* | be64-* \
	| bfin-* | bs2000-* \
	| c[123]* | c30-* | [cjt]90-* | c4x-* \
	| c8051-* | clipper-* | craynv-* | cydra-* \
	| d10v-* | d30v-* | dlx-* \
	| e2k-* | elxsi-* \
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
	| h8300-* | h8500-* \
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
	| hexagon-* \
	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
	| ip2k-* | iq2000-* \
	| k1om-* \
	| le32-* | le64-* \
	| lm32-* \
	| m32c-* | m32r-* | m32rle-* \
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
	| microblaze-* | microblazeel-* \
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
	| mips16-* \
	| mips64-* | mips64el-* \
	| mips64octeon-* | mips64octeonel-* \
	| mips64orion-* | mips64orionel-* \
	| mips64r5900-* | mips64r5900el-* \
	| mips64vr-* | mips64vrel-* \
	| mips64vr4100-* | mips64vr4100el-* \
	| mips64vr4300-* | mips64vr4300el-* \
	| mips64vr5000-* | mips64vr5000el-* \
	| mips64vr5900-* | mips64vr5900el-* \
	| mipsisa32-* | mipsisa32el-* \
	| mipsisa32r2-* | mipsisa32r2el-* \
	| mipsisa32r6-* | mipsisa32r6el-* \
	| mipsisa64-* | mipsisa64el-* \
	| mipsisa64r2-* | mipsisa64r2el-* \
	| mipsisa64r6-* | mipsisa64r6el-* \
	| mipsisa64sb1-* | mipsisa64sb1el-* \
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
	| mipsr5900-* | mipsr5900el-* \
	| mipstx39-* | mipstx39el-* \
	| mmix-* \
	| mt-* \
	| msp430-* \
	| nds32-* | nds32le-* | nds32be-* \
	| nios-* | nios2-* | nios2eb-* | nios2el-* \
	| none-* | np1-* | ns16k-* | ns32k-* \
	| open8-* \
	| or1k*-* \
	| orion-* \
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
	| pru-* \
	| pyramid-* \
	| riscv32-* | riscv64-* \
	| rl78-* | romp-* | rs6000-* | rx-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
	| sparclite-* \
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
	| tahoe-* \
	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
	| tile*-* \
	| tron-* \
	| ubicom32-* \
	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
	| vax-* \
	| visium-* \
	| wasm32-* \
	| we32k-* \
	| x86-* | x86_64-* | xc16x-* | xps100-* \
	| xstormy16-* | xtensa*-* \
	| ymp-* \
	| z8k-* | z80-*)
		;;
	# Recognize the basic CPU types without company name, with glob match.
	xtensa*)
		basic_machine=$basic_machine-unknown
		;;
a677 4
	386bsd)
		basic_machine=i386-unknown
		os=-bsd
		;;
d679 2
a680 1
		basic_machine=m68000-att
d683 2
a684 74
		basic_machine=we32k-att
		;;
	a29khif)
		basic_machine=a29k-amd
		os=-udi
		;;
	abacus)
		basic_machine=abacus-unknown
		;;
	adobe68k)
		basic_machine=m68010-adobe
		os=-scout
		;;
	alliant | fx80)
		basic_machine=fx80-alliant
		;;
	altos | altos3068)
		basic_machine=m68k-altos
		;;
	am29k)
		basic_machine=a29k-none
		os=-bsd
		;;
	amd64)
		basic_machine=x86_64-pc
		;;
	amd64-*)
		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	amdahl)
		basic_machine=580-amdahl
		os=-sysv
		;;
	amiga | amiga-*)
		basic_machine=m68k-unknown
		;;
	amigaos | amigados)
		basic_machine=m68k-unknown
		os=-amigaos
		;;
	amigaunix | amix)
		basic_machine=m68k-unknown
		os=-sysv4
		;;
	apollo68)
		basic_machine=m68k-apollo
		os=-sysv
		;;
	apollo68bsd)
		basic_machine=m68k-apollo
		os=-bsd
		;;
	aros)
		basic_machine=i386-pc
		os=-aros
		;;
	asmjs)
		basic_machine=asmjs-unknown
		;;
	aux)
		basic_machine=m68k-apple
		os=-aux
		;;
	balance)
		basic_machine=ns32k-sequent
		os=-dynix
		;;
	blackfin)
		basic_machine=bfin-unknown
		os=-linux
		;;
	blackfin-*)
		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
d687 3
a689 70
		basic_machine=powerpc-ibm
		os=-cnk
		;;
	c54x-*)
		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c55x-*)
		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c6x-*)
		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c90)
		basic_machine=c90-cray
		os=-unicos
		;;
	cegcc)
		basic_machine=arm-unknown
		os=-cegcc
		;;
	convex-c1)
		basic_machine=c1-convex
		os=-bsd
		;;
	convex-c2)
		basic_machine=c2-convex
		os=-bsd
		;;
	convex-c32)
		basic_machine=c32-convex
		os=-bsd
		;;
	convex-c34)
		basic_machine=c34-convex
		os=-bsd
		;;
	convex-c38)
		basic_machine=c38-convex
		os=-bsd
		;;
	cray | j90)
		basic_machine=j90-cray
		os=-unicos
		;;
	craynv)
		basic_machine=craynv-cray
		os=-unicosmp
		;;
	cr16 | cr16-*)
		basic_machine=cr16-unknown
		os=-elf
		;;
	crds | unos)
		basic_machine=m68k-crds
		;;
	crisv32 | crisv32-* | etraxfs*)
		basic_machine=crisv32-axis
		;;
	cris | cris-* | etrax*)
		basic_machine=cris-axis
		;;
	crx)
		basic_machine=crx-unknown
		os=-elf
		;;
	da30 | da30-*)
		basic_machine=m68k-da30
		;;
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
		basic_machine=mips-dec
d692 3
a694 2
		basic_machine=pdp10-dec
		os=-tops10
d697 3
a699 2
		basic_machine=pdp10-dec
		os=-tops20
d703 2
a704 17
		basic_machine=m68k-motorola
		;;
	delta88)
		basic_machine=m88k-motorola
		os=-sysv3
		;;
	dicos)
		basic_machine=i686-pc
		os=-dicos
		;;
	djgpp)
		basic_machine=i586-pc
		os=-msdosdjgpp
		;;
	dpx20 | dpx20-*)
		basic_machine=rs6000-bull
		os=-bosx
d707 3
a709 2
		basic_machine=m68k-bull
		os=-sysv3
d711 3
a713 11
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
	ebmon29k)
		basic_machine=a29k-amd
		os=-ebmon
d716 3
a718 9
		basic_machine=elxsi-elxsi
		os=-bsd
		;;
	encore | umax | mmax)
		basic_machine=ns32k-encore
		;;
	es1800 | OSE68k | ose68k | ose | OSE)
		basic_machine=m68k-ericsson
		os=-ose
d721 2
a722 1
		basic_machine=i860-alliant
d725 2
a726 9
		basic_machine=ns32k-ns
		;;
	gmicro)
		basic_machine=tron-gmicro
		os=-sysv
		;;
	go32)
		basic_machine=i386-pc
		os=-go32
d729 3
a731 29
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	h8300hms)
		basic_machine=h8300-hitachi
		os=-hms
		;;
	h8300xray)
		basic_machine=h8300-hitachi
		os=-xray
		;;
	h8500hms)
		basic_machine=h8500-hitachi
		os=-hms
		;;
	harris)
		basic_machine=m88k-harris
		os=-sysv3
		;;
	hp300-*)
		basic_machine=m68k-hp
		;;
	hp300bsd)
		basic_machine=m68k-hp
		os=-bsd
		;;
	hp300hpux)
		basic_machine=m68k-hp
		os=-hpux
d734 2
a735 1
		basic_machine=hppa1.0-hp
d738 2
a739 1
		basic_machine=m68000-hp
d742 2
a743 1
		basic_machine=m68k-hp
d746 2
a747 1
		basic_machine=hppa1.0-hp
d750 2
a751 1
		basic_machine=hppa1.1-hp
d755 2
a756 1
		basic_machine=hppa1.1-hp
d760 2
a761 1
		basic_machine=hppa1.1-hp
d764 2
a765 1
		basic_machine=hppa1.1-hp
d768 2
a769 15
		basic_machine=hppa1.0-hp
		;;
	hppa-next)
		os=-nextstep3
		;;
	hppaosf)
		basic_machine=hppa1.1-hp
		os=-osf
		;;
	hppro)
		basic_machine=hppa1.1-hp
		os=-proelf
		;;
	i370-ibm* | ibm*)
		basic_machine=i370-ibm
d772 3
a774 2
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv32
d777 3
a779 2
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv4
d782 3
a784 2
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv
d787 8
a794 10
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-solaris2
		;;
	i386mach)
		basic_machine=i386-mach
		os=-mach
		;;
	i386-vsta | vsta)
		basic_machine=i386-unknown
		os=-vsta
d797 4
a800 3
		basic_machine=mips-sgi
		case $os in
		    -irix*)
d803 1
a803 1
			os=-irix4
a806 41
	isi68 | isi)
		basic_machine=m68k-isi
		os=-sysv
		;;
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
	m68knommu)
		basic_machine=m68k-unknown
		os=-linux
		;;
	m68knommu-*)
		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
	m88k-omron*)
		basic_machine=m88k-omron
		;;
	magnum | m3230)
		basic_machine=mips-mips
		os=-sysv
		;;
	merlin)
		basic_machine=ns32k-utek
		os=-sysv
		;;
	microblaze*)
		basic_machine=microblaze-xilinx
		;;
	mingw64)
		basic_machine=x86_64-pc
		os=-mingw64
		;;
	mingw32)
		basic_machine=i686-pc
		os=-mingw32
		;;
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
d808 2
a809 1
		basic_machine=m68000-convergent
d811 8
a818 6
	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
d820 1
a820 1
		    -linux*)
d823 1
a823 1
			os=-elf
d828 3
a830 2
		basic_machine=mipsel-scei
		os=-irx
d833 3
a835 59
		basic_machine=dvp-scei
		os=-elf
		;;
	mips3*-*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
		;;
	mips3*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
		;;
	monitor)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	morphos)
		basic_machine=powerpc-unknown
		os=-morphos
		;;
	moxiebox)
		basic_machine=moxie-unknown
		os=-moxiebox
		;;
	msdos)
		basic_machine=i386-pc
		os=-msdos
		;;
	ms1-*)
		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
		;;
	msys)
		basic_machine=i686-pc
		os=-msys
		;;
	mvs)
		basic_machine=i370-ibm
		os=-mvs
		;;
	nacl)
		basic_machine=le32-unknown
		os=-nacl
		;;
	ncr3000)
		basic_machine=i486-ncr
		os=-sysv4
		;;
	netbsd386)
		basic_machine=i386-unknown
		os=-netbsd
		;;
	netwinder)
		basic_machine=armv4l-rebel
		os=-linux
		;;
	news | news700 | news800 | news900)
		basic_machine=m68k-sony
		os=-newsos
		;;
	news1000)
		basic_machine=m68030-sony
		os=-newsos
d838 3
a840 6
		basic_machine=mips-sony
		os=-newsos
		;;
	necv70)
		basic_machine=v70-nec
		os=-sysv
d843 6
a848 3
		basic_machine=m68k-next
		case $os in
		    -nextstep* )
d850 2
a851 2
		    -ns2*)
		      os=-nextstep2
d854 1
a854 1
		      os=-nextstep3
a857 20
	nh3000)
		basic_machine=m68k-harris
		os=-cxux
		;;
	nh[45]000)
		basic_machine=m88k-harris
		os=-cxux
		;;
	nindy960)
		basic_machine=i960-intel
		os=-nindy
		;;
	mon960)
		basic_machine=i960-intel
		os=-mon960
		;;
	nonstopux)
		basic_machine=mips-compaq
		os=-nonstopux
		;;
d859 2
a860 13
		basic_machine=np1-gould
		;;
	neo-tandem)
		basic_machine=neo-tandem
		;;
	nse-tandem)
		basic_machine=nse-tandem
		;;
	nsr-tandem)
		basic_machine=nsr-tandem
		;;
	nsx-tandem)
		basic_machine=nsx-tandem
d863 3
a865 17
		basic_machine=hppa1.1-oki
		os=-proelf
		;;
	openrisc | openrisc-*)
		basic_machine=or32-unknown
		;;
	os400)
		basic_machine=powerpc-ibm
		os=-os400
		;;
	OSE68000 | ose68000)
		basic_machine=m68000-ericsson
		os=-ose
		;;
	os68k)
		basic_machine=m68k-none
		os=-os68k
d868 3
a870 14
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	paragon)
		basic_machine=i860-intel
		os=-osf
		;;
	parisc)
		basic_machine=hppa-unknown
		os=-linux
		;;
	parisc-*)
		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
d873 2
a874 1
		basic_machine=sparc-tti
d877 2
a878 1
		basic_machine=m68k-tti
d880 3
a882 2
	pc532 | pc532-*)
		basic_machine=ns32k-pc532
d884 3
a886 2
	pc98)
		basic_machine=i386-pc
d888 3
a890 2
	pc98-*)
		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
d892 3
a894 2
	pentium | p5 | k5 | k6 | nexgen | viac3)
		basic_machine=i586-pc
d896 3
a898 2
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
		basic_machine=i686-pc
d900 3
a902 2
	pentiumii | pentium2 | pentiumiii | pentium3)
		basic_machine=i686-pc
d904 9
a912 2
	pentium4)
		basic_machine=i786-pc
d914 3
a916 2
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
d918 3
a920 2
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
d922 3
a924 2
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
d926 4
a929 2
	pentium4-*)
		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
d931 3
a933 2
	pn)
		basic_machine=pn-gould
d935 3
a937 1
	power)	basic_machine=power-ibm
d939 3
a941 1
	ppc | ppcbe)	basic_machine=powerpc-unknown
d943 6
a948 2
	ppc-* | ppcbe-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
d950 6
a955 2
	ppcle | powerpclittle)
		basic_machine=powerpcle-unknown
d957 5
a961 2
	ppcle-* | powerpclittle-*)
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
d963 3
a965 1
	ppc64)	basic_machine=powerpc64-unknown
d967 4
a970 1
	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
d972 11
a982 2
	ppc64le | powerpc64little)
		basic_machine=powerpc64le-unknown
d984 3
a986 2
	ppc64le-* | powerpc64little-*)
		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
d988 2
a989 2
	ps2)
		basic_machine=i386-ibm
d991 2
a992 15
	pw32)
		basic_machine=i586-unknown
		os=-pw32
		;;
	rdos | rdos64)
		basic_machine=x86_64-pc
		os=-rdos
		;;
	rdos32)
		basic_machine=i386-pc
		os=-rdos
		;;
	rom68k)
		basic_machine=m68k-rom68k
		os=-coff
d994 2
a995 2
	rm[46]00)
		basic_machine=mips-siemens
d997 2
a998 2
	rtpc | rtpc-*)
		basic_machine=romp-ibm
d1000 2
a1001 2
	s390 | s390-*)
		basic_machine=s390-ibm
d1003 2
a1004 2
	s390x | s390x-*)
		basic_machine=s390x-ibm
d1006 2
a1007 3
	sa29200)
		basic_machine=a29k-amd
		os=-udi
d1009 2
a1010 2
	sb1)
		basic_machine=mipsisa64sb1-unknown
d1012 2
a1013 2
	sb1el)
		basic_machine=mipsisa64sb1el-unknown
d1015 2
a1016 3
	sde)
		basic_machine=mipsisa32-sde
		os=-elf
d1018 2
a1019 3
	sei)
		basic_machine=mips-sei
		os=-seiux
d1021 3
a1023 2
	sequent)
		basic_machine=i386-sequent
d1025 6
a1030 3
	sh)
		basic_machine=sh-hitachi
		os=-hms
d1032 4
a1035 2
	sh5el)
		basic_machine=sh5le-unknown
d1037 3
a1039 2
	sh64)
		basic_machine=sh64-unknown
d1041 2
a1042 3
	sparclite-wrs | simso-wrs)
		basic_machine=sparclite-wrs
		os=-vxworks
d1044 2
a1045 3
	sps7)
		basic_machine=m68k-bull
		os=-sysv2
d1047 2
a1048 2
	spur)
		basic_machine=spur-unknown
d1050 3
a1052 2
	st2000)
		basic_machine=m68k-tandem
d1054 2
a1055 3
	stratus)
		basic_machine=i860-stratus
		os=-sysv4
d1057 2
a1058 2
	strongarm-* | thumb-*)
		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
d1060 3
a1062 2
	sun2)
		basic_machine=m68000-sun
d1064 2
a1065 3
	sun2os3)
		basic_machine=m68000-sun
		os=-sunos3
d1067 2
a1068 3
	sun2os4)
		basic_machine=m68000-sun
		os=-sunos4
d1070 3
a1072 3
	sun3os3)
		basic_machine=m68k-sun
		os=-sunos3
d1074 2
a1075 3
	sun3os4)
		basic_machine=m68k-sun
		os=-sunos4
d1077 2
a1078 3
	sun4os3)
		basic_machine=sparc-sun
		os=-sunos3
d1080 2
a1081 3
	sun4os4)
		basic_machine=sparc-sun
		os=-sunos4
d1083 2
a1084 3
	sun4sol2)
		basic_machine=sparc-sun
		os=-solaris2
d1086 2
a1087 2
	sun3 | sun3-*)
		basic_machine=m68k-sun
d1089 2
a1090 2
	sun4)
		basic_machine=sparc-sun
d1092 2
a1093 2
	sun386 | sun386i | roadrunner)
		basic_machine=i386-sun
d1095 2
a1096 3
	sv1)
		basic_machine=sv1-cray
		os=-unicos
d1098 2
a1099 3
	symmetry)
		basic_machine=i386-sequent
		os=-dynix
d1101 2
a1102 3
	t3e)
		basic_machine=alphaev5-cray
		os=-unicos
d1104 2
a1105 3
	t90)
		basic_machine=t90-cray
		os=-unicos
d1107 2
a1108 3
	tile*)
		basic_machine=$basic_machine-unknown
		os=-linux-gnu
d1110 2
a1111 2
	tx39)
		basic_machine=mipstx39-unknown
d1113 2
a1114 33
	tx39el)
		basic_machine=mipstx39el-unknown
		;;
	toad1)
		basic_machine=pdp10-xkl
		os=-tops20
		;;
	tower | tower-32)
		basic_machine=m68k-ncr
		;;
	tpf)
		basic_machine=s390x-ibm
		os=-tpf
		;;
	udi29k)
		basic_machine=a29k-amd
		os=-udi
		;;
	ultra3)
		basic_machine=a29k-nyu
		os=-sym1
		;;
	v810 | necv810)
		basic_machine=v810-nec
		os=-none
		;;
	vaxv)
		basic_machine=vax-dec
		os=-sysv
		;;
	vms)
		basic_machine=vax-dec
		os=-vms
d1116 2
a1117 28
	vpp*|vx|vx-*)
		basic_machine=f301-fujitsu
		;;
	vxworks960)
		basic_machine=i960-wrs
		os=-vxworks
		;;
	vxworks68)
		basic_machine=m68k-wrs
		os=-vxworks
		;;
	vxworks29k)
		basic_machine=a29k-wrs
		os=-vxworks
		;;
	wasm32)
		basic_machine=wasm32-unknown
		;;
	w65*)
		basic_machine=w65-wdc
		os=-none
		;;
	w89k-*)
		basic_machine=hppa1.1-winbond
		os=-proelf
		;;
	x64)
		basic_machine=x86_64-pc
d1119 2
a1120 3
	xbox)
		basic_machine=i686-pc
		os=-mingw32
d1122 2
a1123 2
	xps | xps100)
		basic_machine=xps100-honeywell
d1126 1
a1126 1
		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
d1128 2
a1129 15
	ymp)
		basic_machine=ymp-cray
		os=-unicos
		;;
	z8k-*-coff)
		basic_machine=z8k-unknown
		os=-sim
		;;
	z80-*-coff)
		basic_machine=z80-unknown
		os=-sim
		;;
	none)
		basic_machine=none-none
		os=-none
d1132 4
a1135 7
# Here we handle the default manufacturer of certain CPU types.  It is in
# some cases the only manufacturer, in others, it is the most popular.
	w89k)
		basic_machine=hppa1.1-winbond
		;;
	op50n)
		basic_machine=hppa1.1-oki
d1137 3
a1139 2
	op60c)
		basic_machine=hppa1.1-oki
d1141 3
a1143 2
	romp)
		basic_machine=romp-ibm
d1145 2
a1146 2
	mmix)
		basic_machine=mmix-knuth
d1148 3
a1150 2
	rs6000)
		basic_machine=rs6000-ibm
d1152 3
a1154 2
	vax)
		basic_machine=vax-dec
d1156 3
a1158 3
	pdp10)
		# there are many clones, so DEC is not a safe bet
		basic_machine=pdp10-unknown
d1160 3
a1162 2
	pdp11)
		basic_machine=pdp11-dec
d1164 3
a1166 2
	we32k)
		basic_machine=we32k-att
d1168 3
a1170 2
	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
		basic_machine=sh-unknown
d1172 2
a1173 20
	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
		basic_machine=sparc-sun
		;;
	cydra)
		basic_machine=cydra-cydrome
		;;
	orion)
		basic_machine=orion-highlevel
		;;
	orion105)
		basic_machine=clipper-highlevel
		;;
	mac | mpw | mac-mpw)
		basic_machine=m68k-apple
		;;
	pmac | pmac-mpw)
		basic_machine=powerpc-apple
		;;
	*-unknown)
		# Make sure to match an already-canonicalized machine name.
d1175 1
d1177 110
a1286 2
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
d1291 3
a1293 3
case $basic_machine in
	*-digital*)
		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
d1295 2
a1296 2
	*-commodore*)
		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
d1304 1
a1304 1
if [ x"$os" != x"" ]
d1306 39
d1348 6
a1353 3
	# -solaris* is a basic system type, with this one exception.
	-auroraux)
		os=-auroraux
d1355 2
a1356 2
	-solaris1 | -solaris1.*)
		os=`echo $os | sed -e 's|solaris1|sunos4|'`
d1358 2
a1359 2
	-solaris)
		os=-solaris2
d1361 2
a1362 2
	-svr4*)
		os=-sysv4
d1364 3
a1366 2
	-unixware*)
		os=-sysv4.2uw
d1368 3
a1370 2
	-gnu/linux*)
		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
d1372 2
a1373 41
	# Now accept the basic system types.
	# The portable systems comes first.
	# Each alternative MUST end in a * to match a version number.
	# -sysv* is not here because it comes later, after sysvr4.
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
	      | -sym* | -kopensolaris* | -plan9* \
	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
	      | -aos* | -aros* | -cloudabi* | -sortix* \
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
	# Remember, each alternative MUST END IN *, to match a version number.
		;;
	-qnx*)
		case $basic_machine in
		    x86-* | i*86-*)
			;;
		    *)
			os=-nto$os
			;;
		esac
d1375 2
a1376 1
	-nto-qnx*)
d1378 2
a1379 2
	-nto*)
		os=`echo $os | sed -e 's|nto|nto-qnx|'`
d1381 2
a1382 3
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
d1384 2
a1385 2
	-mac*)
		os=`echo $os | sed -e 's|mac|macos|'`
d1387 2
a1388 2
	-linux-dietlibc)
		os=-linux-dietlibc
d1390 2
a1391 2
	-linux*)
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
d1393 2
a1394 2
	-sunos5*)
		os=`echo $os | sed -e 's|sunos5|solaris2|'`
d1396 2
a1397 2
	-sunos6*)
		os=`echo $os | sed -e 's|sunos6|solaris3|'`
d1399 2
a1400 2
	-opened*)
		os=-openedition
d1402 2
a1403 2
	-os400*)
		os=-os400
d1405 2
a1406 2
	-wince*)
		os=-wince
d1408 2
a1409 2
	-osfrose*)
		os=-osfrose
d1411 2
a1412 2
	-osf*)
		os=-osf
d1414 2
a1415 2
	-utek*)
		os=-bsd
d1417 2
a1418 2
	-dynix*)
		os=-bsd
d1420 2
a1421 2
	-acis*)
		os=-aos
d1423 2
a1424 2
	-atheos*)
		os=-atheos
d1426 2
a1427 2
	-syllable*)
		os=-syllable
d1429 2
a1430 2
	-386bsd)
		os=-bsd
d1432 2
a1433 2
	-ctix* | -uts*)
		os=-sysv
d1435 2
a1436 2
	-nova*)
		os=-rtmk-nova
d1438 2
a1439 2
	-ns2)
		os=-nextstep2
d1441 2
a1442 2
	-nsk*)
		os=-nsk
d1444 2
a1445 3
	# Preserve the version number of sinix5.
	-sinix5.*)
		os=`echo $os | sed -e 's|sinix|sysv|'`
d1447 2
a1448 2
	-sinix*)
		os=-sysv4
d1450 2
a1451 2
	-tpf*)
		os=-tpf
d1453 2
a1454 2
	-triton*)
		os=-sysv3
d1456 2
a1457 2
	-oss*)
		os=-sysv3
d1459 3
a1461 2
	-svr4)
		os=-sysv4
d1463 2
a1464 2
	-svr3)
		os=-sysv3
d1466 2
a1467 2
	-sysvr4)
		os=-sysv4
d1469 2
a1470 2
	# This must come after -sysvr4.
	-sysv*)
d1472 2
a1473 2
	-ose*)
		os=-ose
d1475 2
a1476 2
	-es1800*)
		os=-ose
d1478 2
a1479 2
	-xenix)
		os=-xenix
d1481 2
a1482 2
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
		os=-mint
d1484 2
a1485 2
	-aros*)
		os=-aros
d1487 2
a1488 2
	-zvmoe)
		os=-zvmoe
d1490 2
a1491 2
	-dicos*)
		os=-dicos
d1493 1
a1493 1
	-pikeos*)
d1497 1
a1497 1
		case $basic_machine in
d1499 1
a1499 1
			os=-eabi
d1502 1
a1502 1
			os=-elf
a1505 6
	-nacl*)
		;;
	-ios)
		;;
	-none)
		;;
d1507 1
a1507 4
		# Get rid of the `-' at the beginning of $os.
		os=`echo $os | sed 's/[^-]*-//'`
		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
		exit 1
d1510 1
d1523 2
a1524 1
case $basic_machine in
d1526 1
a1526 1
		os=-elf
d1529 1
a1529 1
		os=-elf
d1532 1
a1532 1
		os=-riscix1.2
d1535 2
a1536 1
		os=-linux
d1539 1
a1539 1
		os=-aout
d1542 1
a1542 1
		os=-coff
d1545 4
a1548 1
		os=-elf
d1551 1
a1551 1
		os=-elf
d1554 1
a1554 1
		os=-coff
d1557 1
a1557 1
		os=-coff
d1560 1
a1560 1
		os=-coff
d1564 1
a1564 1
		os=-tops20
d1567 1
a1567 1
		os=-none
d1570 1
a1570 1
		os=-ultrix4.2
d1573 1
a1573 1
		os=-domain
d1576 1
a1576 1
		os=-sunos4.0.2
d1579 1
a1579 1
		os=-sunos3
d1582 1
a1582 1
		os=-aout
d1585 1
a1585 1
		os=-elf
d1588 1
a1588 1
		os=-elf
d1591 1
a1591 1
		os=-elf
d1594 1
a1594 1
		os=-coff
d1597 1
a1597 1
		os=-sysv3
d1600 1
a1600 1
		os=-sunos4.1.1
d1603 1
a1603 1
		os=-elf
d1606 1
a1606 4
		os=-beos
		;;
	*-haiku)
		os=-haiku
d1609 1
a1609 1
		os=-aix
d1612 1
a1612 1
		os=-mmixware
d1615 1
a1615 1
		os=-proelf
d1618 1
a1618 1
		os=-proelf
d1621 1
a1621 1
		os=-proelf
d1624 1
a1624 1
		os=-hpux
d1627 1
a1627 1
		os=-hiux
d1630 1
a1630 1
		os=-sysv
d1633 1
a1633 1
		os=-amigaos
d1636 1
a1636 1
		os=-dgux
d1639 1
a1639 1
		os=-sysv3
d1642 1
a1642 1
		os=-rtu
d1645 1
a1645 1
		os=-luna
d1648 1
a1648 1
		os=-nextstep
d1651 1
a1651 1
		os=-ptx
d1654 1
a1654 1
		os=-unos
d1657 1
a1657 1
		os=-genix
d1660 1
a1660 4
		os=-mvs
		;;
	*-next)
		os=-nextstep3
d1663 1
a1663 1
		os=-sysv
d1666 1
a1666 1
		os=-bsd
d1669 1
a1669 1
		os=-bsd
d1672 1
a1672 1
		os=-irix
d1675 1
a1675 1
		os=-sysv4
d1678 1
a1678 1
		os=-rtu
d1681 1
a1681 1
		os=-uxpv
d1684 1
a1684 1
		os=-coff
d1687 1
a1687 1
		os=-coff
d1690 1
a1690 1
		os=-macos
d1693 4
a1696 1
		os=-mint
d1699 1
a1699 1
		os=-none
d1702 1
d1705 85
d1792 4
a1795 5
vendor=unknown
case $basic_machine in
	*-unknown)
		case $os in
			-riscix*)
d1798 1
a1798 1
			-sunos*)
d1801 1
a1801 1
			-cnk*|-aix*)
d1804 1
a1804 1
			-beos*)
d1807 1
a1807 1
			-hpux*)
d1810 1
a1810 1
			-mpeix*)
d1813 1
a1813 1
			-hiux*)
d1816 1
a1816 1
			-unos*)
d1819 1
a1819 1
			-dgux*)
d1822 1
a1822 1
			-luna*)
d1825 1
a1825 1
			-genix*)
d1828 7
a1834 1
			-mvs* | -opened*)
d1837 1
a1837 1
			-os400*)
d1840 1
a1840 1
			-ptx*)
d1843 1
a1843 1
			-tpf*)
d1846 1
a1846 1
			-vxsim* | -vxworks* | -windiss*)
d1849 1
a1849 1
			-aux*)
d1852 1
a1852 1
			-hms*)
d1855 1
a1855 1
			-mpw* | -macos*)
d1858 1
a1858 1
			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
d1861 1
a1861 1
			-vos*)
a1864 1
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
d1868 1
a1868 1
echo $basic_machine$os
d1872 1
a1872 1
# eval: (add-hook 'write-file-functions 'time-stamp)
@


1.3
log
@merge expat-2.2.0 and document
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d18 1
a18 1
# along with this program; if not, see <http://www.gnu.org/licenses/>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d60 1
a60 1
Operation modes:
d70 1
a70 1
Copyright 1992-2017 Free Software Foundation, Inc.
a231 3
	-windowsnt*)
		os=`echo $os | sed -e 's/windowsnt/winnt/'`
		;;
d263 1
a263 1
	| i370 | i860 | i960 | ia64 \
d315 1
a315 1
	| we32k \
d388 1
a388 1
	| i*86-* | i860-* | i960-* | ia64-* \
d446 1
d642 1
a642 1
	dpx2* | dpx2*-bull)
d922 1
a922 1
	next | m*-next )
d967 3
d1265 3
d1276 3
d1386 2
a1387 2
	# First match some system type aliases
	# that might get confused with valid system types.
d1407 1
a1407 1
	# First accept the basic system types.
d1409 1
a1409 1
	# Each alternative MUST END IN A *, to match a version number.
d1437 1
a1437 1
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
d1512 1
a1512 1
	-ns2 )
d1567 13
d1727 1
a1727 1
	*-next )
d1862 1
a1862 1
# eval: (add-hook 'write-file-hooks 'time-stamp)
@


1.3.12.1
log
@Mostly merge changes from HEAD upto 20200411
@
text
@d3 1
a3 1
#   Copyright 1992-2018 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2018-01-01'
d18 1
a18 1
# along with this program; if not, see <https://www.gnu.org/licenses/>.
d36 1
a36 1
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d60 1
a60 1
Options:
d70 1
a70 1
Copyright 1992-2018 Free Software Foundation, Inc.
d232 3
d266 1
a266 1
	| i370 | i860 | i960 | ia16 | ia64 \
d318 1
a318 1
	| wasm32 \
d391 1
a391 1
	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
a448 1
	| wasm32-* \
d644 1
a644 1
	dpx2*)
d924 1
a924 1
	next | m*-next)
a968 3
	nsx-tandem)
		basic_machine=nsx-tandem
		;;
a1263 3
	wasm32)
		basic_machine=wasm32-unknown
		;;
a1271 3
	x64)
		basic_machine=x86_64-pc
		;;
d1379 2
a1380 2
	# First match some system type aliases that might get confused
	# with valid system types.
d1400 1
a1400 1
	# Now accept the basic system types.
d1402 1
a1402 1
	# Each alternative MUST end in a * to match a version number.
d1430 1
a1430 1
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
d1505 1
a1505 1
	-ns2)
a1559 13
	-pikeos*)
		# Until real need of OS specific support for
		# particular features comes up, bare metal
		# configurations are quite functional.
		case $basic_machine in
		    arm*)
			os=-eabi
			;;
		    *)
			os=-elf
			;;
		esac
		;;
d1707 1
a1707 1
	*-next)
d1842 1
a1842 1
# eval: (add-hook 'write-file-functions 'time-stamp)
@


1.3.14.1
log
@Sync to current and pull up the following revisions, requested by maya
in ticket #206:

	external/mit/expat/dist/conftools/test-driver   up to 1.1.1.1
	external/mit/expat/dist/conftools/ar-lib        up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-append-compile-flags.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-append-flag.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-append-link-flags.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-check-compile-flag.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-check-link-flag.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-require-defined.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/compile       up to 1.1.1.1
	external/mit/expat/dist/conftools/depcomp       up to 1.1.1.1
	external/mit/expat/dist/conftools/missing       up to 1.1.1.1
	external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4 up to 1.1.1.1
	external/mit/expat/dist/doc/Makefile.am         up to 1.1.1.1
	external/mit/expat/dist/doc/Makefile.in         up to 1.1.1.1
	external/mit/expat/dist/examples/Makefile.am    up to 1.1.1.1
	external/mit/expat/dist/examples/Makefile.in    up to 1.1.1.1
	external/mit/expat/dist/lib/Makefile.am         up to 1.1.1.1
	external/mit/expat/dist/lib/Makefile.in         up to 1.1.1.1
	external/mit/expat/dist/tests/benchmark/Makefile.am up to 1.1.1.1
	external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.1.1.1
	external/mit/expat/dist/tests/Makefile.am       up to 1.1.1.1
	external/mit/expat/dist/tests/Makefile.in       up to 1.1.1.1
	external/mit/expat/dist/tests/structdata.c      up to 1.1.1.1
	external/mit/expat/dist/tests/structdata.h      up to 1.1.1.1
	external/mit/expat/dist/tests/udiffer.py        up to 1.1.1.1
	external/mit/expat/dist/tests/xmltest.log.expected up to 1.1.1.1
	external/mit/expat/dist/win32/build_expat_iss.bat up to 1.1.1.1
	external/mit/expat/dist/xmlwf/Makefile.am       up to 1.1.1.1
	external/mit/expat/dist/xmlwf/Makefile.in       up to 1.1.1.1
	external/mit/expat/dist/xmlwf/xmlwf_helpgen.py  up to 1.1.1.1
	external/mit/expat/dist/xmlwf/xmlwf_helpgen.sh  up to 1.1.1.1
	external/mit/expat/dist/Makefile.am             up to 1.1.1.1
	external/mit/expat/dist/README.md               up to 1.1.1.1
	external/mit/expat/dist/cmake/expat-config.cmake.in up to 1.1.1.1
	external/mit/expat/dist/cmake/mingw-toolchain.cmake up to 1.1.1.1
	external/mit/expat/dist/acinclude.m4            up to 1.1.1.1
	external/mit/expat/dist/fix-xmltest-log.sh      up to 1.1.1.1
	external/mit/expat/dist/test-driver-wrapper.sh  up to 1.1.1.1
	external/mit/expat/dist/MANIFEST                delete
	external/mit/expat/dist/README                  delete
	external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 delete
	external/mit/expat/dist/conftools/mkinstalldirs delete
	external/mit/expat/dist/xmlwf/xmlurl.h          delete
	external/mit/expat/dist/xmlwf/xmlwin32url.cxx   delete
	external/mit/expat/dist/CMake.README            up to 1.1.1.5
	external/mit/expat/dist/CMakeLists.txt          up to 1.1.1.5
	external/mit/expat/dist/Changes                 up to 1.1.1.6
	external/mit/expat/dist/ConfigureChecks.cmake   up to 1.1.1.2
	external/mit/expat/dist/Makefile.in             up to 1.1.1.6
	external/mit/expat/dist/aclocal.m4              up to 1.1.1.4
	external/mit/expat/dist/configure               up to 1.1.1.6
	external/mit/expat/dist/configure.ac            up to 1.1.1.4
	external/mit/expat/dist/expat_config.h.cmake    up to 1.1.1.2
	external/mit/expat/dist/expat_config.h.in       up to 1.1.1.6
	external/mit/expat/dist/conftools/config.guess  up to 1.4
	external/mit/expat/dist/conftools/config.sub    up to 1.4
	external/mit/expat/dist/conftools/get-version.sh up to 1.1.1.2
	external/mit/expat/dist/conftools/install-sh    up to 1.1.1.5
	external/mit/expat/dist/conftools/ltmain.sh     up to 1.1.1.5
	external/mit/expat/dist/doc/reference.html      up to 1.1.1.5
	external/mit/expat/dist/doc/xmlwf.1             up to 1.1.1.4
	external/mit/expat/dist/doc/xmlwf.xml           up to 1.1.1.2
	external/mit/expat/dist/examples/elements.c     up to 1.1.1.5
	external/mit/expat/dist/examples/outline.c      up to 1.1.1.4
	external/mit/expat/dist/lib/ascii.h             up to 1.1.1.2
	external/mit/expat/dist/lib/asciitab.h          up to 1.1.1.2
	external/mit/expat/dist/lib/expat.h             up to 1.1.1.6
	external/mit/expat/dist/lib/expat_external.h    up to 1.1.1.4
	external/mit/expat/dist/lib/iasciitab.h         up to 1.1.1.2
	external/mit/expat/dist/lib/internal.h          up to 1.1.1.3
	external/mit/expat/dist/lib/latin1tab.h         up to 1.1.1.2
	external/mit/expat/dist/lib/libexpat.def        up to 1.1.1.3
	external/mit/expat/dist/lib/libexpatw.def       up to 1.1.1.3
	external/mit/expat/dist/lib/nametab.h           up to 1.1.1.2
	external/mit/expat/dist/lib/siphash.h           up to 1.1.1.2
	external/mit/expat/dist/lib/utf8tab.h           up to 1.1.1.2
	external/mit/expat/dist/lib/winconfig.h         up to 1.1.1.3
	external/mit/expat/dist/lib/xmlparse.c          up to 1.8
	external/mit/expat/dist/lib/xmlrole.c           up to 1.1.1.5
	external/mit/expat/dist/lib/xmlrole.h           up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.c            up to 1.5
	external/mit/expat/dist/lib/xmltok.h            up to 1.3
	external/mit/expat/dist/lib/xmltok_impl.c       up to 1.6
	external/mit/expat/dist/lib/xmltok_impl.h       up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok_ns.c         up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c        up to 1.1.1.4
	external/mit/expat/dist/tests/chardata.h        up to 1.1.1.2
	external/mit/expat/dist/tests/memcheck.c        up to 1.1.1.2
	external/mit/expat/dist/tests/memcheck.h        up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.c       up to 1.1.1.4
	external/mit/expat/dist/tests/minicheck.h       up to 1.1.1.5
	external/mit/expat/dist/tests/runtests.c        up to 1.1.1.5
	external/mit/expat/dist/tests/runtestspp.cpp    up to 1.1.1.2
	external/mit/expat/dist/tests/xmltest.sh        up to 1.4
	external/mit/expat/dist/tests/benchmark/benchmark.c up to 1.1.1.3
	external/mit/expat/dist/win32/README.txt        up to 1.1.1.5
	external/mit/expat/dist/win32/expat.iss         up to 1.1.1.6
	external/mit/expat/dist/xmlwf/codepage.c        up to 1.1.1.4
	external/mit/expat/dist/xmlwf/codepage.h        up to 1.1.1.2
	external/mit/expat/dist/xmlwf/ct.c              up to 1.1.1.2
	external/mit/expat/dist/xmlwf/filemap.h         up to 1.1.1.3
	external/mit/expat/dist/xmlwf/readfilemap.c     up to 1.1.1.5
	external/mit/expat/dist/xmlwf/unixfilemap.c     up to 1.1.1.4
	external/mit/expat/dist/xmlwf/win32filemap.c    up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlfile.c         up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlfile.h         up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlmime.c         up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlmime.h         up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmltchar.h        up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c           up to 1.1.1.6
	external/mit/expat/lib/libexpat/expat_config.h  up to 1.6
	doc/3RDPARTY					1.1649
	external/mit/xorg/tools/fc-cache/Makefile	1.18

Update expat to 2.2.8.
Define XML_POOR_ENTROPY for the tool version of fc-cache
(we can not assume anything about the build host).
@
text
@d3 1
a3 1
#   Copyright 1992-2018 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2018-01-01'
d18 1
a18 1
# along with this program; if not, see <https://www.gnu.org/licenses/>.
d36 1
a36 1
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d60 1
a60 1
Options:
d70 1
a70 1
Copyright 1992-2018 Free Software Foundation, Inc.
d232 3
d266 1
a266 1
	| i370 | i860 | i960 | ia16 | ia64 \
d318 1
a318 1
	| wasm32 \
d391 1
a391 1
	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
a448 1
	| wasm32-* \
d644 1
a644 1
	dpx2*)
d924 1
a924 1
	next | m*-next)
a968 3
	nsx-tandem)
		basic_machine=nsx-tandem
		;;
a1263 3
	wasm32)
		basic_machine=wasm32-unknown
		;;
a1271 3
	x64)
		basic_machine=x86_64-pc
		;;
d1379 2
a1380 2
	# First match some system type aliases that might get confused
	# with valid system types.
d1400 1
a1400 1
	# Now accept the basic system types.
d1402 1
a1402 1
	# Each alternative MUST end in a * to match a version number.
d1430 1
a1430 1
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
d1505 1
a1505 1
	-ns2)
a1559 13
	-pikeos*)
		# Until real need of OS specific support for
		# particular features comes up, bare metal
		# configurations are quite functional.
		case $basic_machine in
		    arm*)
			os=-eabi
			;;
		    *)
			os=-elf
			;;
		esac
		;;
d1707 1
a1707 1
	*-next)
d1842 1
a1842 1
# eval: (add-hook 'write-file-functions 'time-stamp)
@


1.3.4.1
log
@Sync external/mit/expat to current and pull up the following revisions,
requested by maya in ticket #1376:

	external/mit/expat/dist/conftools/test-driver	up to 1.1.1.1
	external/mit/expat/dist/conftools/ar-lib	up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-append-compile-flags.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-append-flag.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-append-link-flags.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-check-compile-flag.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-check-link-flag.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/ax-require-defined.m4 up to 1.1.1.1
	external/mit/expat/dist/conftools/compile	up to 1.1.1.1
	external/mit/expat/dist/conftools/depcomp	up to 1.1.1.1
	external/mit/expat/dist/conftools/missing	up to 1.1.1.1
	external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4 up to 1.1.1.1
	external/mit/expat/dist/doc/Makefile.am 	up to 1.1.1.1
	external/mit/expat/dist/doc/Makefile.in 	up to 1.1.1.1
	external/mit/expat/dist/examples/Makefile.am	up to 1.1.1.1
	external/mit/expat/dist/examples/Makefile.in	up to 1.1.1.1
	external/mit/expat/dist/lib/Makefile.am 	up to 1.1.1.1
	external/mit/expat/dist/lib/Makefile.in 	up to 1.1.1.1
	external/mit/expat/dist/tests/benchmark/Makefile.am up to 1.1.1.1
	external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.1.1.1
	external/mit/expat/dist/tests/Makefile.am	up to 1.1.1.1
	external/mit/expat/dist/tests/Makefile.in	up to 1.1.1.1
	external/mit/expat/dist/tests/structdata.c	up to 1.1.1.1
	external/mit/expat/dist/tests/structdata.h	up to 1.1.1.1
	external/mit/expat/dist/tests/udiffer.py	up to 1.1.1.1
	external/mit/expat/dist/tests/xmltest.log.expected up to 1.1.1.1
	external/mit/expat/dist/win32/build_expat_iss.bat up to 1.1.1.1
	external/mit/expat/dist/xmlwf/Makefile.am	up to 1.1.1.1
	external/mit/expat/dist/xmlwf/Makefile.in	up to 1.1.1.1
	external/mit/expat/dist/xmlwf/xmlwf_helpgen.py	up to 1.1.1.1
	external/mit/expat/dist/xmlwf/xmlwf_helpgen.sh	up to 1.1.1.1
	external/mit/expat/dist/Makefile.am		up to 1.1.1.1
	external/mit/expat/dist/README.md		up to 1.1.1.1
	external/mit/expat/dist/cmake/expat-config.cmake.in up to 1.1.1.1
	external/mit/expat/dist/cmake/mingw-toolchain.cmake up to 1.1.1.1
	external/mit/expat/dist/acinclude.m4		up to 1.1.1.1
	external/mit/expat/dist/fix-xmltest-log.sh	up to 1.1.1.1
	external/mit/expat/dist/test-driver-wrapper.sh	up to 1.1.1.1
	external/mit/expat/dist/MANIFEST		delete
	external/mit/expat/dist/README			delete
	external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 delete
	external/mit/expat/dist/conftools/mkinstalldirs delete
	external/mit/expat/dist/xmlwf/xmlurl.h		delete
	external/mit/expat/dist/xmlwf/xmlwin32url.cxx	delete
	external/mit/expat/dist/CMake.README		up to 1.1.1.5
	external/mit/expat/dist/CMakeLists.txt		up to 1.1.1.5
	external/mit/expat/dist/Changes 		up to 1.1.1.6
	external/mit/expat/dist/ConfigureChecks.cmake	up to 1.1.1.2
	external/mit/expat/dist/Makefile.in		up to 1.1.1.6
	external/mit/expat/dist/aclocal.m4		up to 1.1.1.4
	external/mit/expat/dist/configure		up to 1.1.1.6
	external/mit/expat/dist/configure.ac		up to 1.1.1.4
	external/mit/expat/dist/expat_config.h.cmake	up to 1.1.1.2
	external/mit/expat/dist/expat_config.h.in	up to 1.1.1.6
	external/mit/expat/dist/conftools/config.guess	up to 1.4
	external/mit/expat/dist/conftools/config.sub	up to 1.4
	external/mit/expat/dist/conftools/get-version.sh up to 1.1.1.2
	external/mit/expat/dist/conftools/install-sh	up to 1.1.1.5
	external/mit/expat/dist/conftools/ltmain.sh	up to 1.1.1.5
	external/mit/expat/dist/doc/reference.html	up to 1.1.1.5
	external/mit/expat/dist/doc/xmlwf.1		up to 1.1.1.4
	external/mit/expat/dist/doc/xmlwf.xml		up to 1.1.1.2
	external/mit/expat/dist/examples/elements.c	up to 1.1.1.5
	external/mit/expat/dist/examples/outline.c	up to 1.1.1.4
	external/mit/expat/dist/lib/ascii.h		up to 1.1.1.2
	external/mit/expat/dist/lib/asciitab.h		up to 1.1.1.2
	external/mit/expat/dist/lib/expat.h		up to 1.1.1.6
	external/mit/expat/dist/lib/expat_external.h	up to 1.1.1.4
	external/mit/expat/dist/lib/iasciitab.h 	up to 1.1.1.2
	external/mit/expat/dist/lib/internal.h		up to 1.1.1.3
	external/mit/expat/dist/lib/latin1tab.h 	up to 1.1.1.2
	external/mit/expat/dist/lib/libexpat.def	up to 1.1.1.3
	external/mit/expat/dist/lib/libexpatw.def	up to 1.1.1.3
	external/mit/expat/dist/lib/nametab.h		up to 1.1.1.2
	external/mit/expat/dist/lib/siphash.h		up to 1.1.1.2
	external/mit/expat/dist/lib/utf8tab.h		up to 1.1.1.2
	external/mit/expat/dist/lib/winconfig.h 	up to 1.1.1.3
	external/mit/expat/dist/lib/xmlparse.c		up to 1.8
	external/mit/expat/dist/lib/xmlrole.c		up to 1.1.1.5
	external/mit/expat/dist/lib/xmlrole.h		up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.c		up to 1.5
	external/mit/expat/dist/lib/xmltok.h		up to 1.3
	external/mit/expat/dist/lib/xmltok_impl.c	up to 1.6
	external/mit/expat/dist/lib/xmltok_impl.h	up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok_ns.c 	up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c	up to 1.1.1.4
	external/mit/expat/dist/tests/chardata.h	up to 1.1.1.2
	external/mit/expat/dist/tests/memcheck.c	up to 1.1.1.2
	external/mit/expat/dist/tests/memcheck.h	up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.c	up to 1.1.1.4
	external/mit/expat/dist/tests/minicheck.h	up to 1.1.1.5
	external/mit/expat/dist/tests/runtests.c	up to 1.1.1.5
	external/mit/expat/dist/tests/runtestspp.cpp	up to 1.1.1.2
	external/mit/expat/dist/tests/xmltest.sh	up to 1.4
	external/mit/expat/dist/tests/benchmark/benchmark.c up to 1.1.1.3
	external/mit/expat/dist/win32/README.txt	up to 1.1.1.5
	external/mit/expat/dist/win32/expat.iss 	up to 1.1.1.6
	external/mit/expat/dist/xmlwf/codepage.c	up to 1.1.1.4
	external/mit/expat/dist/xmlwf/codepage.h	up to 1.1.1.2
	external/mit/expat/dist/xmlwf/ct.c		up to 1.1.1.2
	external/mit/expat/dist/xmlwf/filemap.h 	up to 1.1.1.3
	external/mit/expat/dist/xmlwf/readfilemap.c	up to 1.1.1.5
	external/mit/expat/dist/xmlwf/unixfilemap.c	up to 1.1.1.4
	external/mit/expat/dist/xmlwf/win32filemap.c	up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlfile.c 	up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlfile.h 	up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlmime.c 	up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlmime.h         up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmltchar.h        up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c           up to 1.1.1.6
	external/mit/expat/lib/libexpat/expat_config.h  up to 1.6
	doc/3RDPARTY					1.1649 (patch)
	external/mit/xorg/tools/fc-cache/Makefile	1.18 (patch)

Update expat to 2.2.8.
Define XML_POOR_ENTROPY for the tool version of fc-cache
(we can not assume anything about the build host).
@
text
@d3 1
a3 1
#   Copyright 1992-2018 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2018-01-01'
d18 1
a18 1
# along with this program; if not, see <https://www.gnu.org/licenses/>.
d36 1
a36 1
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d60 1
a60 1
Options:
d70 1
a70 1
Copyright 1992-2018 Free Software Foundation, Inc.
d232 3
d266 1
a266 1
	| i370 | i860 | i960 | ia16 | ia64 \
d318 1
a318 1
	| wasm32 \
d391 1
a391 1
	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
a448 1
	| wasm32-* \
d644 1
a644 1
	dpx2*)
d924 1
a924 1
	next | m*-next)
a968 3
	nsx-tandem)
		basic_machine=nsx-tandem
		;;
a1263 3
	wasm32)
		basic_machine=wasm32-unknown
		;;
a1271 3
	x64)
		basic_machine=x86_64-pc
		;;
d1379 2
a1380 2
	# First match some system type aliases that might get confused
	# with valid system types.
d1400 1
a1400 1
	# Now accept the basic system types.
d1402 1
a1402 1
	# Each alternative MUST end in a * to match a version number.
d1430 1
a1430 1
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
d1505 1
a1505 1
	-ns2)
a1559 13
	-pikeos*)
		# Until real need of OS specific support for
		# particular features comes up, bare metal
		# configurations are quite functional.
		case $basic_machine in
		    arm*)
			os=-eabi
			;;
		    *)
			os=-elf
			;;
		esac
		;;
d1707 1
a1707 1
	*-next)
d1842 1
a1842 1
# eval: (add-hook 'write-file-functions 'time-stamp)
@


1.2
log
@Update supporting files for components which rely on autoconf to allow systems
introducing since release of software to be recognised. This should hopefully
allow the builds to progress a littles further on systems such as the POWER8
which features a little endian 64-bit PowerPC CPU identified as ppc64le.
@
text
@d841 18
d1425 1
a1425 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@


1.1
log
@Initial revision
@
text
@d3 7
a9 13
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
#   Inc.

timestamp='2006-09-20'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine.  It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
d12 4
a15 4
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
d18 1
a18 3
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
# 02110-1301, USA.
d23 3
a25 1
# the same distribution terms that you use for the rest of that program.
d28 1
a28 2
# Please send patches to <config-patches@@gnu.org>.  Submit a context
# diff and a properly formatted ChangeLog entry.
d35 3
d56 1
a56 2
Usage: $0 [OPTION] CPU-MFR-OPSYS
       $0 [OPTION] ALIAS
d70 1
a70 2
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
d117 4
a120 2
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
d125 4
d151 1
a151 1
	-apple | -axis | -knuth | -cray)
d155 3
d172 2
a173 2
 	-chorusrdb)
 		os=-chorusrdb
d175 1
a175 1
 		;;
d220 6
d250 1
d254 5
a258 1
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
d260 1
a260 1
	| c4x | clipper \
d262 2
a263 1
	| fr30 | frv \
d265 1
d268 3
d272 1
a272 1
	| maxq | mb | microblaze | mcore \
d276 3
a279 1
	| mips64orion | mips64orionel \
d286 1
d289 1
d292 1
d295 1
d298 2
a299 1
	| nios | nios2 \
d301 1
a301 1
	| or32 \
d303 2
a304 1
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
d306 2
d309 1
a309 1
	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
d313 5
a317 3
	| spu | strongarm \
	| tahoe | thumb | tic4x | tic80 | tron \
	| v850 | v850e \
d319 2
a320 2
	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
	| z8k)
d323 13
a335 2
	m6811 | m68hc11 | m6812 | m68hc12)
		# Motorola 68HC11/12.
d345 15
d374 1
d377 1
a377 1
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
d380 2
d383 2
a384 2
	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
	| clipper-* | craynv-* | cydra-* \
d386 2
a387 2
	| elxsi-* \
	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
d390 1
d393 3
d398 2
a399 1
	| m88110-* | m88k-* | maxq-* | mcore-* \
d403 3
a406 1
	| mips64orion-* | mips64orionel-* \
d413 1
d416 1
d419 1
d424 2
a425 1
	| nios-* | nios2-* \
d427 2
d431 2
a432 1
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
d434 3
a436 2
	| romp-* | rs6000-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
d440 2
a441 2
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
	| tahoe-* | thumb-* \
d443 1
d445 4
a448 1
	| v850-* | v850e-* | vax-* \
d450 2
a451 2
	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
	| xstormy16-* | xtensa-* \
d453 5
a457 1
	| z8k-*)
d475 1
a475 1
    	abacus)
d521 7
d536 21
d561 4
d593 2
a594 2
	cr16c)
		basic_machine=cr16c-unknown
d632 4
d648 8
a758 1
# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
d797 11
d819 7
d827 1
a827 1
		basic_machine=i386-pc
d830 4
d855 4
d866 4
d874 4
d942 6
d978 8
d1030 1
a1030 1
	ppc)	basic_machine=powerpc-unknown
d1032 2
a1033 1
	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
d1035 1
a1035 1
	ppcle | powerpclittle | ppc-le | powerpc-little)
d1045 1
a1045 1
	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
d1058 5
a1062 1
	rdos)
d1107 3
d1131 3
d1190 3
a1192 11
	tic54x | c54x*)
		basic_machine=tic54x-unknown
		os=-coff
		;;
	tic55x | c55x*)
		basic_machine=tic55x-unknown
		os=-coff
		;;
	tic6x | c6x*)
		basic_machine=tic6x-unknown
		os=-coff
d1261 3
d1272 4
d1314 1
a1314 1
	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
d1361 2
a1362 2
        # First match some system type aliases
        # that might get confused with valid system types.
d1364 3
d1387 3
a1389 2
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
d1391 1
a1391 1
	      | -aos* \
d1395 1
a1395 1
	      | -openbsd* | -solidbsd* \
d1400 5
a1404 4
	      | -chorusos* | -chorusrdb* \
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* \
d1411 2
a1412 1
	      | -skyos* | -haiku* | -rdos* | -toppers*)
d1451 1
a1451 1
        -os400*)
d1500 1
a1500 1
        -tpf*)
a1535 3
	-kaos*)
		os=-kaos
		;;
d1539 7
d1568 1
a1568 1
        score-*)
d1571 1
a1571 1
        spu-*)
d1583 17
a1599 2
        c4x-* | tic4x-*)
        	os=-coff
a1618 3
		# This also exists in the configure program, but was not the
		# default.
		# os=-sunos4
d1623 3
d1641 3
d1653 1
a1653 1
    	*-knuth)
d1758 1
a1758 1
			-aix*)
@


1.1.1.1
log
@Initial import of "expat" 2.0.1 into base:
This is James Clark's expat XML parser library in C. It is a stream
oriented parser that requires setting handlers to deal with the
structure that the parser discovers in the document.

This is the first part of the fix for PR lib/40346.
@
text
@@


1.1.1.1.2.1
log
@Pull up following revision(s) (requested by spz in ticket #1383):
	distrib/sets/lists/base/ad.mips64eb: patch
	distrib/sets/lists/base/ad.mips64el: patch
	distrib/sets/lists/base/md.amd64: patch
	distrib/sets/lists/base/md.sparc64: patch
	distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch
	distrib/sets/lists/comp/ad.mips64eb: patch
	distrib/sets/lists/comp/ad.mips64el: patch
	distrib/sets/lists/comp/md.amd64: patch
	distrib/sets/lists/comp/md.sparc64: patch
	distrib/sets/lists/comp/mi: 1.2035 via patch
	distrib/sets/lists/comp/shl.mi: patch
	external/mit/expat/dist/CMake.README: up to 1.1.1.2
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.3
	external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1
	external/mit/expat/dist/MANIFEST: up to 1.1.1.3
	external/mit/expat/dist/Makefile.in: up to 1.1.1.3
	external/mit/expat/dist/README: up to 1.1.1.3
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.3
	external/mit/expat/dist/configure.ac: up to 1.1.1.1
	external/mit/expat/dist/configure.in: up to 1.1.1.2
	external/mit/expat/dist/expat.pc.in: up to 1.1.1.1
	external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3
	external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2
	external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/stdlib.c: delete
	external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/outline.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.2
	external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4: up to 1.4
	external/mit/expat/dist/conftools/config.guess: up to 1.1.1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.1.1.3
	external/mit/expat/dist/conftools/expat.m4: up to 1.1.1.2
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/libtool.m4: delete
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/mkinstalldirs: up to 1.4
	external/mit/expat/dist/doc/reference.html: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.sgml: up to 1.1.1.3
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.2
	external/mit/expat/dist/examples/elements.dsp: up to 1.1.1.2
	external/mit/expat/dist/examples/outline.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/amigaconfig.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.3
	external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/libexpat.def: up to 1.1.1.2
	external/mit/expat/dist/lib/libexpatw.def: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.4
	external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.c: up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.h: up to 1.1.1.1
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.3
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.1
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.1
	external/mit/expat/dist/tests/README.txt: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.2
	external/mit/expat/dist/tests/runtests.c: up to 1.1.1.2
	external/mit/expat/dist/tests/xmltest.sh: up to 1.1.1.2
	external/mit/expat/dist/tests/benchmark/README.txt: up to 1.1.1.2
	external/mit/expat/dist/tests/benchmark/benchmark.dsp: up to 1.1.1.2
	external/mit/expat/dist/win32/README.txt: up to 1.1.1.2
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.2
	external/mit/expat/lib/libexpat/Makefile: up to 1.2
	external/mit/expat/lib/libexpat/expat.pc.in: up to 1.1
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.3
	external/mit/expat/lib/libexpat/shlib_version: up to 1.3
Update expat to 2.1.1.  Apply fixes for CVE-2016-0718.
@
text
@d3 13
a15 7
#   Copyright 1992-2014 Free Software Foundation, Inc.

timestamp='2014-09-11'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
d18 4
a21 4
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
d24 3
a26 1
# along with this program; if not, see <http://www.gnu.org/licenses/>.
d31 1
a31 3
# the same distribution terms that you use for the rest of that
# program.  This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
d34 2
a35 1
# Please send patches with a ChangeLog entry to config-patches@@gnu.org.
a41 3
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

d75 2
a76 1
Copyright 1992-2014 Free Software Foundation, Inc.
d123 2
a124 4
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
a128 4
  android-linux)
    os=-linux-android
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
d151 1
a151 1
	-apple | -axis | -knuth | -cray | -microblaze*)
a154 3
	-bluegene*)
		os=-cnk
		;;
a216 6
	-lynx*178)
		os=-lynxos178
		;;
	-lynx*5)
		os=-lynxos5
		;;
a240 1
	| aarch64 | aarch64_be \
d244 1
a244 4
	| arc | arceb \
	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
	| avr | avr32 \
	| be32 | be64 \
d246 1
a246 1
	| c4x | c8051 | clipper \
d248 1
a248 2
	| epiphany \
	| fido | fr30 | frv \
a249 1
	| hexagon \
a251 3
	| k1om \
	| le32 | le64 \
	| lm32 \
d253 1
a253 1
	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
d257 1
a257 1
	| mips64octeon | mips64octeonel \
a258 2
	| mips64r5900 | mips64r5900el \
	| mips64vr | mips64vrel \
a264 1
	| mipsisa32r6 | mipsisa32r6el \
a266 1
	| mipsisa64r6 | mipsisa64r6el \
a268 1
	| mipsr5900 | mipsr5900el \
a270 1
	| moxie \
d273 1
a273 2
	| nds32 | nds32le | nds32be \
	| nios | nios2 | nios2eb | nios2el \
d275 1
a275 1
	| open8 | or1k | or1knd | or32 \
d277 1
a277 1
	| powerpc | powerpc64 | powerpc64le | powerpcle \
a278 2
	| riscv32 | riscv64 \
	| rl78 | rx \
d280 1
a280 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
d284 3
a286 4
	| spu \
	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
	| ubicom32 \
	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
d288 2
a289 2
	| x86 | xc16x | xstormy16 | xtensa \
	| z8k | z80)
d292 2
a293 10
	c54x)
		basic_machine=tic54x-unknown
		;;
	c55x)
		basic_machine=tic55x-unknown
		;;
	c6x)
		basic_machine=tic6x-unknown
		;;
	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
a302 15
	strongarm | thumb | xscale)
		basic_machine=arm-unknown
		;;
	xgate)
		basic_machine=$basic_machine-unknown
		os=-none
		;;
	xscaleeb)
		basic_machine=armeb-unknown
		;;

	xscaleel)
		basic_machine=armel-unknown
		;;

a316 1
	| aarch64-* | aarch64_be-* \
d319 1
a319 1
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
a321 1
	| be32-* | be64-* \
d323 2
a324 2
	| c[123]* | c30-* | [cjt]90-* | c4x-* \
	| c8051-* | clipper-* | craynv-* | cydra-* \
d327 1
a327 1
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
a329 1
	| hexagon-* \
a331 3
	| k1om-* \
	| le32-* | le64-* \
	| lm32-* \
d334 1
a334 2
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
	| microblaze-* | microblazeel-* \
d338 1
a338 1
	| mips64octeon-* | mips64octeonel-* \
a339 2
	| mips64r5900-* | mips64r5900el-* \
	| mips64vr-* | mips64vrel-* \
a345 1
	| mipsisa32r6-* | mipsisa32r6el-* \
a347 1
	| mipsisa64r6-* | mipsisa64r6el-* \
a349 1
	| mipsr5900-* | mipsr5900el-* \
d354 1
a354 2
	| nds32-* | nds32le-* | nds32be-* \
	| nios-* | nios2-* | nios2eb-* | nios2el-* \
a355 2
	| open8-* \
	| or1k*-* \
d358 1
a358 1
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
d360 2
a361 2
	| rl78-* | romp-* | rs6000-* | rx-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
d365 2
a366 2
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
	| tahoe-* \
a367 1
	| tile*-* \
d369 1
a369 3
	| ubicom32-* \
	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
	| vax-* \
d371 2
a372 2
	| x86-* | x86_64-* | xc16x-* | xps100-* \
	| xstormy16-* | xtensa*-* \
d374 1
a374 5
	| z8k-* | z80-*)
		;;
	# Recognize the basic CPU types without company name, with glob match.
	xtensa*)
		basic_machine=$basic_machine-unknown
a437 4
	aros)
		basic_machine=i386-pc
		os=-aros
		;;
a445 21
	blackfin)
		basic_machine=bfin-unknown
		os=-linux
		;;
	blackfin-*)
		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
	bluegene*)
		basic_machine=powerpc-ibm
		os=-cnk
		;;
	c54x-*)
		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c55x-*)
		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c6x-*)
		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
a449 4
	cegcc)
		basic_machine=arm-unknown
		os=-cegcc
		;;
d478 2
a479 2
	cr16 | cr16-*)
		basic_machine=cr16-unknown
a516 4
	dicos)
		basic_machine=i686-pc
		os=-dicos
		;;
d632 1
a670 8
	m68knommu)
		basic_machine=m68k-unknown
		os=-linux
		;;
	m68knommu-*)
		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
a681 7
	microblaze*)
		basic_machine=microblaze-xilinx
		;;
	mingw64)
		basic_machine=x86_64-pc
		os=-mingw64
		;;
d683 1
a683 1
		basic_machine=i686-pc
a685 4
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
a706 4
	moxiebox)
		basic_machine=moxie-unknown
		os=-moxiebox
		;;
a713 4
	msys)
		basic_machine=i686-pc
		os=-msys
		;;
a717 4
	nacl)
		basic_machine=le32-unknown
		os=-nacl
		;;
a781 6
	neo-tandem)
		basic_machine=neo-tandem
		;;
	nse-tandem)
		basic_machine=nse-tandem
		;;
a811 8
	parisc)
		basic_machine=hppa-unknown
		os=-linux
		;;
	parisc-*)
		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
d856 1
a856 1
	ppc | ppcbe)	basic_machine=powerpc-unknown
d858 1
a858 2
	ppc-* | ppcbe-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
d883 1
a883 5
	rdos | rdos64)
		basic_machine=x86_64-pc
		os=-rdos
		;;
	rdos32)
a927 3
	sh5el)
		basic_machine=sh5le-unknown
		;;
a948 3
	strongarm-* | thumb-*)
		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
d1005 11
a1015 3
	tile*)
		basic_machine=$basic_machine-unknown
		os=-linux-gnu
a1083 3
	xscale-* | xscalee[bl]-*)
		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
		;;
a1091 4
	z80-*-coff)
		basic_machine=z80-unknown
		os=-sim
		;;
d1130 1
a1130 1
	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
a1179 3
	-auroraux)
		os=-auroraux
		;;
d1200 2
a1201 3
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
	      | -sym* | -kopensolaris* | -plan9* \
d1203 1
a1203 1
	      | -aos* | -aros* \
d1207 1
a1207 1
	      | -bitrig* | -openbsd* | -solidbsd* \
d1212 4
a1215 5
	      | -chorusos* | -chorusrdb* | -cegcc* \
	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
d1222 1
a1222 1
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
d1346 3
a1351 5
	-dicos*)
		os=-dicos
		;;
	-nacl*)
		;;
a1391 15
	c8051-*)
		os=-elf
		;;
	hexagon-*)
		os=-elf
		;;
	tic54x-*)
		os=-coff
		;;
	tic55x-*)
		os=-coff
		;;
	tic6x-*)
		os=-coff
		;;
d1410 3
a1416 3
	mep-*)
		os=-elf
		;;
d1546 1
a1546 1
			-cnk*|-aix*)
@


1.1.1.1.2.2
log
@Pull up following revision(s) (requested by spz in ticket #1435):
	external/mit/expat/dist/CMake.README: up to 1.1.1.3
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3
	external/mit/expat/dist/COPYING: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.4
	external/mit/expat/dist/MANIFEST: up to 1.1.1.4
	external/mit/expat/dist/Makefile.in: up to 1.1.1.4
	external/mit/expat/dist/README: up to 1.1.1.4
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.3
	external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.4
	external/mit/expat/dist/configure.ac: up to 1.1.1.2
	external/mit/expat/dist/conftools/config.guess: up to 1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.3
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4
	external/mit/expat/dist/doc/expat.png: up to 1.1.1.2
	external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.sgml          delete
	external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.3
	external/mit/expat/dist/examples/outline.c: up to 1.1.1.2
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4
	external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.4
	external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/internal.h: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.6
	external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3
	external/mit/expat/dist/lib/xmltok.c: up to 1.3
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.3
	external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.3
	external/mit/expat/dist/tests/runtests.c: up to 1.1.1.3
	external/mit/expat/dist/tests/xmltest.sh: up to 1.2
	external/mit/expat/dist/win32/README.txt: up to 1.1.1.3
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.3
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.4
Update expat to 2.2.0, fixing CVE-2016-0718, CVE-2016-4472,
CVE-2016-5300, and CVE-2012-6702.
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 2
a121 2
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
d173 2
a174 2
	-chorusrdb)
		os=-chorusrdb
d176 1
a176 1
		;;
a257 1
	| ba \
d262 2
a263 2
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
a303 1
	| pru \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a425 1
	| pru-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
d466 1
a466 1
	abacus)
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a635 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1012 1
a1012 1
	ppcle | powerpclittle)
d1022 1
a1022 1
	ppc64le | powerpc64little)
d1338 2
a1339 2
	# First match some system type aliases
	# that might get confused with valid system types.
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1377 1
a1377 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1379 1
a1379 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
d1427 1
a1427 1
	-os400*)
d1476 1
a1476 1
	-tpf*)
a1519 2
	-ios)
		;;
d1542 1
a1542 1
	score-*)
d1545 1
a1545 1
	spu-*)
d1557 2
a1558 2
	c4x-* | tic4x-*)
		os=-coff
a1614 3
	pru-*)
		os=-elf
		;;
d1624 1
a1624 1
	*-knuth)
@


1.1.1.1.8.1
log
@Pull up following revision(s) (requested by spz in ticket #1383):
	distrib/sets/lists/base/ad.mips64eb: patch
	distrib/sets/lists/base/ad.mips64el: patch
	distrib/sets/lists/base/md.amd64: patch
	distrib/sets/lists/base/md.sparc64: patch
	distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch
	distrib/sets/lists/comp/ad.mips64eb: patch
	distrib/sets/lists/comp/ad.mips64el: patch
	distrib/sets/lists/comp/md.amd64: patch
	distrib/sets/lists/comp/md.sparc64: patch
	distrib/sets/lists/comp/mi: 1.2035 via patch
	distrib/sets/lists/comp/shl.mi: patch
	external/mit/expat/dist/CMake.README: up to 1.1.1.2
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.3
	external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1
	external/mit/expat/dist/MANIFEST: up to 1.1.1.3
	external/mit/expat/dist/Makefile.in: up to 1.1.1.3
	external/mit/expat/dist/README: up to 1.1.1.3
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.3
	external/mit/expat/dist/configure.ac: up to 1.1.1.1
	external/mit/expat/dist/configure.in: up to 1.1.1.2
	external/mit/expat/dist/expat.pc.in: up to 1.1.1.1
	external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3
	external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2
	external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/stdlib.c: delete
	external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/outline.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.2
	external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4: up to 1.4
	external/mit/expat/dist/conftools/config.guess: up to 1.1.1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.1.1.3
	external/mit/expat/dist/conftools/expat.m4: up to 1.1.1.2
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/libtool.m4: delete
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/mkinstalldirs: up to 1.4
	external/mit/expat/dist/doc/reference.html: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.sgml: up to 1.1.1.3
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.2
	external/mit/expat/dist/examples/elements.dsp: up to 1.1.1.2
	external/mit/expat/dist/examples/outline.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/amigaconfig.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.3
	external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/libexpat.def: up to 1.1.1.2
	external/mit/expat/dist/lib/libexpatw.def: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.4
	external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.c: up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.h: up to 1.1.1.1
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.3
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.1
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.1
	external/mit/expat/dist/tests/README.txt: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.2
	external/mit/expat/dist/tests/runtests.c: up to 1.1.1.2
	external/mit/expat/dist/tests/xmltest.sh: up to 1.1.1.2
	external/mit/expat/dist/tests/benchmark/README.txt: up to 1.1.1.2
	external/mit/expat/dist/tests/benchmark/benchmark.dsp: up to 1.1.1.2
	external/mit/expat/dist/win32/README.txt: up to 1.1.1.2
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.2
	external/mit/expat/lib/libexpat/Makefile: up to 1.2
	external/mit/expat/lib/libexpat/expat.pc.in: up to 1.1
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.3
	external/mit/expat/lib/libexpat/shlib_version: up to 1.3
Update expat to 2.1.1.  Apply fixes for CVE-2016-0718.
@
text
@d3 13
a15 7
#   Copyright 1992-2014 Free Software Foundation, Inc.

timestamp='2014-09-11'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
d18 4
a21 4
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
d24 3
a26 1
# along with this program; if not, see <http://www.gnu.org/licenses/>.
d31 1
a31 3
# the same distribution terms that you use for the rest of that
# program.  This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
d34 2
a35 1
# Please send patches with a ChangeLog entry to config-patches@@gnu.org.
a41 3
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

d75 2
a76 1
Copyright 1992-2014 Free Software Foundation, Inc.
d123 2
a124 4
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
a128 4
  android-linux)
    os=-linux-android
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
d151 1
a151 1
	-apple | -axis | -knuth | -cray | -microblaze*)
a154 3
	-bluegene*)
		os=-cnk
		;;
a216 6
	-lynx*178)
		os=-lynxos178
		;;
	-lynx*5)
		os=-lynxos5
		;;
a240 1
	| aarch64 | aarch64_be \
d244 1
a244 4
	| arc | arceb \
	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
	| avr | avr32 \
	| be32 | be64 \
d246 1
a246 1
	| c4x | c8051 | clipper \
d248 1
a248 2
	| epiphany \
	| fido | fr30 | frv \
a249 1
	| hexagon \
a251 3
	| k1om \
	| le32 | le64 \
	| lm32 \
d253 1
a253 1
	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
d257 1
a257 1
	| mips64octeon | mips64octeonel \
a258 2
	| mips64r5900 | mips64r5900el \
	| mips64vr | mips64vrel \
a264 1
	| mipsisa32r6 | mipsisa32r6el \
a266 1
	| mipsisa64r6 | mipsisa64r6el \
a268 1
	| mipsr5900 | mipsr5900el \
a270 1
	| moxie \
d273 1
a273 2
	| nds32 | nds32le | nds32be \
	| nios | nios2 | nios2eb | nios2el \
d275 1
a275 1
	| open8 | or1k | or1knd | or32 \
d277 1
a277 1
	| powerpc | powerpc64 | powerpc64le | powerpcle \
a278 2
	| riscv32 | riscv64 \
	| rl78 | rx \
d280 1
a280 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
d284 3
a286 4
	| spu \
	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
	| ubicom32 \
	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
d288 2
a289 2
	| x86 | xc16x | xstormy16 | xtensa \
	| z8k | z80)
d292 2
a293 10
	c54x)
		basic_machine=tic54x-unknown
		;;
	c55x)
		basic_machine=tic55x-unknown
		;;
	c6x)
		basic_machine=tic6x-unknown
		;;
	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
a302 15
	strongarm | thumb | xscale)
		basic_machine=arm-unknown
		;;
	xgate)
		basic_machine=$basic_machine-unknown
		os=-none
		;;
	xscaleeb)
		basic_machine=armeb-unknown
		;;

	xscaleel)
		basic_machine=armel-unknown
		;;

a316 1
	| aarch64-* | aarch64_be-* \
d319 1
a319 1
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
a321 1
	| be32-* | be64-* \
d323 2
a324 2
	| c[123]* | c30-* | [cjt]90-* | c4x-* \
	| c8051-* | clipper-* | craynv-* | cydra-* \
d327 1
a327 1
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
a329 1
	| hexagon-* \
a331 3
	| k1om-* \
	| le32-* | le64-* \
	| lm32-* \
d334 1
a334 2
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
	| microblaze-* | microblazeel-* \
d338 1
a338 1
	| mips64octeon-* | mips64octeonel-* \
a339 2
	| mips64r5900-* | mips64r5900el-* \
	| mips64vr-* | mips64vrel-* \
a345 1
	| mipsisa32r6-* | mipsisa32r6el-* \
a347 1
	| mipsisa64r6-* | mipsisa64r6el-* \
a349 1
	| mipsr5900-* | mipsr5900el-* \
d354 1
a354 2
	| nds32-* | nds32le-* | nds32be-* \
	| nios-* | nios2-* | nios2eb-* | nios2el-* \
a355 2
	| open8-* \
	| or1k*-* \
d358 1
a358 1
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
d360 2
a361 2
	| rl78-* | romp-* | rs6000-* | rx-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
d365 2
a366 2
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
	| tahoe-* \
a367 1
	| tile*-* \
d369 1
a369 3
	| ubicom32-* \
	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
	| vax-* \
d371 2
a372 2
	| x86-* | x86_64-* | xc16x-* | xps100-* \
	| xstormy16-* | xtensa*-* \
d374 1
a374 5
	| z8k-* | z80-*)
		;;
	# Recognize the basic CPU types without company name, with glob match.
	xtensa*)
		basic_machine=$basic_machine-unknown
a437 4
	aros)
		basic_machine=i386-pc
		os=-aros
		;;
a445 21
	blackfin)
		basic_machine=bfin-unknown
		os=-linux
		;;
	blackfin-*)
		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
	bluegene*)
		basic_machine=powerpc-ibm
		os=-cnk
		;;
	c54x-*)
		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c55x-*)
		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c6x-*)
		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
a449 4
	cegcc)
		basic_machine=arm-unknown
		os=-cegcc
		;;
d478 2
a479 2
	cr16 | cr16-*)
		basic_machine=cr16-unknown
a516 4
	dicos)
		basic_machine=i686-pc
		os=-dicos
		;;
d632 1
a670 8
	m68knommu)
		basic_machine=m68k-unknown
		os=-linux
		;;
	m68knommu-*)
		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
a681 7
	microblaze*)
		basic_machine=microblaze-xilinx
		;;
	mingw64)
		basic_machine=x86_64-pc
		os=-mingw64
		;;
d683 1
a683 1
		basic_machine=i686-pc
a685 4
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
a706 4
	moxiebox)
		basic_machine=moxie-unknown
		os=-moxiebox
		;;
a713 4
	msys)
		basic_machine=i686-pc
		os=-msys
		;;
a717 4
	nacl)
		basic_machine=le32-unknown
		os=-nacl
		;;
a781 6
	neo-tandem)
		basic_machine=neo-tandem
		;;
	nse-tandem)
		basic_machine=nse-tandem
		;;
a811 8
	parisc)
		basic_machine=hppa-unknown
		os=-linux
		;;
	parisc-*)
		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
d856 1
a856 1
	ppc | ppcbe)	basic_machine=powerpc-unknown
d858 1
a858 2
	ppc-* | ppcbe-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
d883 1
a883 5
	rdos | rdos64)
		basic_machine=x86_64-pc
		os=-rdos
		;;
	rdos32)
a927 3
	sh5el)
		basic_machine=sh5le-unknown
		;;
a948 3
	strongarm-* | thumb-*)
		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
d1005 11
a1015 3
	tile*)
		basic_machine=$basic_machine-unknown
		os=-linux-gnu
a1083 3
	xscale-* | xscalee[bl]-*)
		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
		;;
a1091 4
	z80-*-coff)
		basic_machine=z80-unknown
		os=-sim
		;;
d1130 1
a1130 1
	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
a1179 3
	-auroraux)
		os=-auroraux
		;;
d1200 2
a1201 3
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
	      | -sym* | -kopensolaris* | -plan9* \
d1203 1
a1203 1
	      | -aos* | -aros* \
d1207 1
a1207 1
	      | -bitrig* | -openbsd* | -solidbsd* \
d1212 4
a1215 5
	      | -chorusos* | -chorusrdb* | -cegcc* \
	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
d1222 1
a1222 1
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
d1346 3
a1351 5
	-dicos*)
		os=-dicos
		;;
	-nacl*)
		;;
a1391 15
	c8051-*)
		os=-elf
		;;
	hexagon-*)
		os=-elf
		;;
	tic54x-*)
		os=-coff
		;;
	tic55x-*)
		os=-coff
		;;
	tic6x-*)
		os=-coff
		;;
d1410 3
a1416 3
	mep-*)
		os=-elf
		;;
d1546 1
a1546 1
			-cnk*|-aix*)
@


1.1.1.1.8.2
log
@Pull up following revision(s) (requested by spz in ticket #1435):
	external/mit/expat/dist/CMake.README: up to 1.1.1.3
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3
	external/mit/expat/dist/COPYING: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.4
	external/mit/expat/dist/MANIFEST: up to 1.1.1.4
	external/mit/expat/dist/Makefile.in: up to 1.1.1.4
	external/mit/expat/dist/README: up to 1.1.1.4
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.3
	external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.4
	external/mit/expat/dist/configure.ac: up to 1.1.1.2
	external/mit/expat/dist/conftools/config.guess: up to 1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.3
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4
	external/mit/expat/dist/doc/expat.png: up to 1.1.1.2
	external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.sgml          delete
	external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.3
	external/mit/expat/dist/examples/outline.c: up to 1.1.1.2
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4
	external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.4
	external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/internal.h: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.6
	external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3
	external/mit/expat/dist/lib/xmltok.c: up to 1.3
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.3
	external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.3
	external/mit/expat/dist/tests/runtests.c: up to 1.1.1.3
	external/mit/expat/dist/tests/xmltest.sh: up to 1.2
	external/mit/expat/dist/win32/README.txt: up to 1.1.1.3
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.3
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.4
Update expat to 2.2.0, fixing CVE-2016-0718, CVE-2016-4472,
CVE-2016-5300, and CVE-2012-6702.
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 2
a121 2
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
d173 2
a174 2
	-chorusrdb)
		os=-chorusrdb
d176 1
a176 1
		;;
a257 1
	| ba \
d262 2
a263 2
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
a303 1
	| pru \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a425 1
	| pru-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
d466 1
a466 1
	abacus)
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a635 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1012 1
a1012 1
	ppcle | powerpclittle)
d1022 1
a1022 1
	ppc64le | powerpc64little)
d1338 2
a1339 2
	# First match some system type aliases
	# that might get confused with valid system types.
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1377 1
a1377 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1379 1
a1379 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
d1427 1
a1427 1
	-os400*)
d1476 1
a1476 1
	-tpf*)
a1519 2
	-ios)
		;;
d1542 1
a1542 1
	score-*)
d1545 1
a1545 1
	spu-*)
d1557 2
a1558 2
	c4x-* | tic4x-*)
		os=-coff
a1614 3
	pru-*)
		os=-elf
		;;
d1624 1
a1624 1
	*-knuth)
@


1.1.1.1.6.1
log
@Pull up following revision(s) (requested by spz in ticket #1383):
	distrib/sets/lists/base/ad.mips64eb: patch
	distrib/sets/lists/base/ad.mips64el: patch
	distrib/sets/lists/base/md.amd64: patch
	distrib/sets/lists/base/md.sparc64: patch
	distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch
	distrib/sets/lists/comp/ad.mips64eb: patch
	distrib/sets/lists/comp/ad.mips64el: patch
	distrib/sets/lists/comp/md.amd64: patch
	distrib/sets/lists/comp/md.sparc64: patch
	distrib/sets/lists/comp/mi: 1.2035 via patch
	distrib/sets/lists/comp/shl.mi: patch
	external/mit/expat/dist/CMake.README: up to 1.1.1.2
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.3
	external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1
	external/mit/expat/dist/MANIFEST: up to 1.1.1.3
	external/mit/expat/dist/Makefile.in: up to 1.1.1.3
	external/mit/expat/dist/README: up to 1.1.1.3
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.3
	external/mit/expat/dist/configure.ac: up to 1.1.1.1
	external/mit/expat/dist/configure.in: up to 1.1.1.2
	external/mit/expat/dist/expat.pc.in: up to 1.1.1.1
	external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3
	external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2
	external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1
	external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/stdlib.c: delete
	external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/outline.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.2
	external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4: up to 1.4
	external/mit/expat/dist/conftools/config.guess: up to 1.1.1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.1.1.3
	external/mit/expat/dist/conftools/expat.m4: up to 1.1.1.2
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/libtool.m4: delete
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/mkinstalldirs: up to 1.4
	external/mit/expat/dist/doc/reference.html: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.sgml: up to 1.1.1.3
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.2
	external/mit/expat/dist/examples/elements.dsp: up to 1.1.1.2
	external/mit/expat/dist/examples/outline.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/amigaconfig.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.3
	external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/libexpat.def: up to 1.1.1.2
	external/mit/expat/dist/lib/libexpatw.def: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.4
	external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.c: up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.h: up to 1.1.1.1
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.3
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.1
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.1
	external/mit/expat/dist/tests/README.txt: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.2
	external/mit/expat/dist/tests/runtests.c: up to 1.1.1.2
	external/mit/expat/dist/tests/xmltest.sh: up to 1.1.1.2
	external/mit/expat/dist/tests/benchmark/README.txt: up to 1.1.1.2
	external/mit/expat/dist/tests/benchmark/benchmark.dsp: up to 1.1.1.2
	external/mit/expat/dist/win32/README.txt: up to 1.1.1.2
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.2
	external/mit/expat/lib/libexpat/Makefile: up to 1.2
	external/mit/expat/lib/libexpat/expat.pc.in: up to 1.1
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.3
	external/mit/expat/lib/libexpat/shlib_version: up to 1.3
Update expat to 2.1.1.  Apply fixes for CVE-2016-0718.
@
text
@d3 13
a15 7
#   Copyright 1992-2014 Free Software Foundation, Inc.

timestamp='2014-09-11'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
d18 4
a21 4
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
d24 3
a26 1
# along with this program; if not, see <http://www.gnu.org/licenses/>.
d31 1
a31 3
# the same distribution terms that you use for the rest of that
# program.  This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
d34 2
a35 1
# Please send patches with a ChangeLog entry to config-patches@@gnu.org.
a41 3
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

d75 2
a76 1
Copyright 1992-2014 Free Software Foundation, Inc.
d123 2
a124 4
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
a128 4
  android-linux)
    os=-linux-android
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
d151 1
a151 1
	-apple | -axis | -knuth | -cray | -microblaze*)
a154 3
	-bluegene*)
		os=-cnk
		;;
a216 6
	-lynx*178)
		os=-lynxos178
		;;
	-lynx*5)
		os=-lynxos5
		;;
a240 1
	| aarch64 | aarch64_be \
d244 1
a244 4
	| arc | arceb \
	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
	| avr | avr32 \
	| be32 | be64 \
d246 1
a246 1
	| c4x | c8051 | clipper \
d248 1
a248 2
	| epiphany \
	| fido | fr30 | frv \
a249 1
	| hexagon \
a251 3
	| k1om \
	| le32 | le64 \
	| lm32 \
d253 1
a253 1
	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
d257 1
a257 1
	| mips64octeon | mips64octeonel \
a258 2
	| mips64r5900 | mips64r5900el \
	| mips64vr | mips64vrel \
a264 1
	| mipsisa32r6 | mipsisa32r6el \
a266 1
	| mipsisa64r6 | mipsisa64r6el \
a268 1
	| mipsr5900 | mipsr5900el \
a270 1
	| moxie \
d273 1
a273 2
	| nds32 | nds32le | nds32be \
	| nios | nios2 | nios2eb | nios2el \
d275 1
a275 1
	| open8 | or1k | or1knd | or32 \
d277 1
a277 1
	| powerpc | powerpc64 | powerpc64le | powerpcle \
a278 2
	| riscv32 | riscv64 \
	| rl78 | rx \
d280 1
a280 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
d284 3
a286 4
	| spu \
	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
	| ubicom32 \
	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
d288 2
a289 2
	| x86 | xc16x | xstormy16 | xtensa \
	| z8k | z80)
d292 2
a293 10
	c54x)
		basic_machine=tic54x-unknown
		;;
	c55x)
		basic_machine=tic55x-unknown
		;;
	c6x)
		basic_machine=tic6x-unknown
		;;
	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
a302 15
	strongarm | thumb | xscale)
		basic_machine=arm-unknown
		;;
	xgate)
		basic_machine=$basic_machine-unknown
		os=-none
		;;
	xscaleeb)
		basic_machine=armeb-unknown
		;;

	xscaleel)
		basic_machine=armel-unknown
		;;

a316 1
	| aarch64-* | aarch64_be-* \
d319 1
a319 1
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
a321 1
	| be32-* | be64-* \
d323 2
a324 2
	| c[123]* | c30-* | [cjt]90-* | c4x-* \
	| c8051-* | clipper-* | craynv-* | cydra-* \
d327 1
a327 1
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
a329 1
	| hexagon-* \
a331 3
	| k1om-* \
	| le32-* | le64-* \
	| lm32-* \
d334 1
a334 2
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
	| microblaze-* | microblazeel-* \
d338 1
a338 1
	| mips64octeon-* | mips64octeonel-* \
a339 2
	| mips64r5900-* | mips64r5900el-* \
	| mips64vr-* | mips64vrel-* \
a345 1
	| mipsisa32r6-* | mipsisa32r6el-* \
a347 1
	| mipsisa64r6-* | mipsisa64r6el-* \
a349 1
	| mipsr5900-* | mipsr5900el-* \
d354 1
a354 2
	| nds32-* | nds32le-* | nds32be-* \
	| nios-* | nios2-* | nios2eb-* | nios2el-* \
a355 2
	| open8-* \
	| or1k*-* \
d358 1
a358 1
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
d360 2
a361 2
	| rl78-* | romp-* | rs6000-* | rx-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
d365 2
a366 2
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
	| tahoe-* \
a367 1
	| tile*-* \
d369 1
a369 3
	| ubicom32-* \
	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
	| vax-* \
d371 2
a372 2
	| x86-* | x86_64-* | xc16x-* | xps100-* \
	| xstormy16-* | xtensa*-* \
d374 1
a374 5
	| z8k-* | z80-*)
		;;
	# Recognize the basic CPU types without company name, with glob match.
	xtensa*)
		basic_machine=$basic_machine-unknown
a437 4
	aros)
		basic_machine=i386-pc
		os=-aros
		;;
a445 21
	blackfin)
		basic_machine=bfin-unknown
		os=-linux
		;;
	blackfin-*)
		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
	bluegene*)
		basic_machine=powerpc-ibm
		os=-cnk
		;;
	c54x-*)
		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c55x-*)
		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c6x-*)
		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
a449 4
	cegcc)
		basic_machine=arm-unknown
		os=-cegcc
		;;
d478 2
a479 2
	cr16 | cr16-*)
		basic_machine=cr16-unknown
a516 4
	dicos)
		basic_machine=i686-pc
		os=-dicos
		;;
d632 1
a670 8
	m68knommu)
		basic_machine=m68k-unknown
		os=-linux
		;;
	m68knommu-*)
		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
a681 7
	microblaze*)
		basic_machine=microblaze-xilinx
		;;
	mingw64)
		basic_machine=x86_64-pc
		os=-mingw64
		;;
d683 1
a683 1
		basic_machine=i686-pc
a685 4
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
a706 4
	moxiebox)
		basic_machine=moxie-unknown
		os=-moxiebox
		;;
a713 4
	msys)
		basic_machine=i686-pc
		os=-msys
		;;
a717 4
	nacl)
		basic_machine=le32-unknown
		os=-nacl
		;;
a781 6
	neo-tandem)
		basic_machine=neo-tandem
		;;
	nse-tandem)
		basic_machine=nse-tandem
		;;
a811 8
	parisc)
		basic_machine=hppa-unknown
		os=-linux
		;;
	parisc-*)
		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
d856 1
a856 1
	ppc | ppcbe)	basic_machine=powerpc-unknown
d858 1
a858 2
	ppc-* | ppcbe-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
d883 1
a883 5
	rdos | rdos64)
		basic_machine=x86_64-pc
		os=-rdos
		;;
	rdos32)
a927 3
	sh5el)
		basic_machine=sh5le-unknown
		;;
a948 3
	strongarm-* | thumb-*)
		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
d1005 11
a1015 3
	tile*)
		basic_machine=$basic_machine-unknown
		os=-linux-gnu
a1083 3
	xscale-* | xscalee[bl]-*)
		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
		;;
a1091 4
	z80-*-coff)
		basic_machine=z80-unknown
		os=-sim
		;;
d1130 1
a1130 1
	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
a1179 3
	-auroraux)
		os=-auroraux
		;;
d1200 2
a1201 3
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
	      | -sym* | -kopensolaris* | -plan9* \
d1203 1
a1203 1
	      | -aos* | -aros* \
d1207 1
a1207 1
	      | -bitrig* | -openbsd* | -solidbsd* \
d1212 4
a1215 5
	      | -chorusos* | -chorusrdb* | -cegcc* \
	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
d1222 1
a1222 1
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
d1346 3
a1351 5
	-dicos*)
		os=-dicos
		;;
	-nacl*)
		;;
a1391 15
	c8051-*)
		os=-elf
		;;
	hexagon-*)
		os=-elf
		;;
	tic54x-*)
		os=-coff
		;;
	tic55x-*)
		os=-coff
		;;
	tic6x-*)
		os=-coff
		;;
d1410 3
a1416 3
	mep-*)
		os=-elf
		;;
d1546 1
a1546 1
			-cnk*|-aix*)
@


1.1.1.1.6.2
log
@Pull up following revision(s) (requested by spz in ticket #1435):
	external/mit/expat/dist/CMake.README: up to 1.1.1.3
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3
	external/mit/expat/dist/COPYING: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.4
	external/mit/expat/dist/MANIFEST: up to 1.1.1.4
	external/mit/expat/dist/Makefile.in: up to 1.1.1.4
	external/mit/expat/dist/README: up to 1.1.1.4
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.3
	external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2
	external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.4
	external/mit/expat/dist/configure.ac: up to 1.1.1.2
	external/mit/expat/dist/conftools/config.guess: up to 1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.3
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4
	external/mit/expat/dist/doc/expat.png: up to 1.1.1.2
	external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.sgml          delete
	external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.3
	external/mit/expat/dist/examples/outline.c: up to 1.1.1.2
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4
	external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.4
	external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/internal.h: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.6
	external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3
	external/mit/expat/dist/lib/xmltok.c: up to 1.3
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.3
	external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.3
	external/mit/expat/dist/tests/runtests.c: up to 1.1.1.3
	external/mit/expat/dist/tests/xmltest.sh: up to 1.2
	external/mit/expat/dist/win32/README.txt: up to 1.1.1.3
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.3
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.4
Update expat to 2.2.0, fixing CVE-2016-0718, CVE-2016-4472,
CVE-2016-5300, and CVE-2012-6702.
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 2
a121 2
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
d173 2
a174 2
	-chorusrdb)
		os=-chorusrdb
d176 1
a176 1
		;;
a257 1
	| ba \
d262 2
a263 2
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
a303 1
	| pru \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a425 1
	| pru-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
d466 1
a466 1
	abacus)
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a635 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1012 1
a1012 1
	ppcle | powerpclittle)
d1022 1
a1022 1
	ppc64le | powerpc64little)
d1338 2
a1339 2
	# First match some system type aliases
	# that might get confused with valid system types.
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1377 1
a1377 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1379 1
a1379 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
d1427 1
a1427 1
	-os400*)
d1476 1
a1476 1
	-tpf*)
a1519 2
	-ios)
		;;
d1542 1
a1542 1
	score-*)
d1545 1
a1545 1
	spu-*)
d1557 2
a1558 2
	c4x-* | tic4x-*)
		os=-coff
a1614 3
	pru-*)
		os=-elf
		;;
d1624 1
a1624 1
	*-knuth)
@


1.1.1.2
log
@import of expat 2.1.0
Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security
issues have been previously fixed in our tree)

relevant Changes:
Release 2.1.0 Sat March 24 2012
        - Bug Fixes:
          #1742315: Harmful XML_ParserCreateNS suggestion.
          #2895533: CVE-2012-1147 - Resource leak in readfilemap.c.
          #1785430: Expat build fails on linux-amd64 with gcc version>=4.1 -O3.
          #1983953, 2517952, 2517962, 2649838:
                Build modifications using autoreconf instead of buildconf.sh.
          #2815947, #2884086: OBJEXT and EXEEXT support while building.
          #1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences.
          #2517938: xmlwf should return non-zero exit status if not well-formed.
          #2517946: Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml.
          #2855609: Dangling positionPtr after error.
          #2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8().
          #2958794: CVE-2012-1148 - Memory leak in poolGrow.
          #2990652: CMake support.
          #3010819: UNEXPECTED_STATE with a trailing "%" in entity value.
          #3206497: Unitialized memory returned from XML_Parse.
          #3287849: make check fails on mingw-w64.
          #3496608: CVE-2012-0876 - Hash DOS attack.
        - Patches:
          #1749198: pkg-config support.
          #3010222: Fix for bug #3010819.
          #3312568: CMake support.
          #3446384: Report byte offsets for attr names and values.
        - New Features / API changes:
          Added new API member XML_SetHashSalt() that allows setting an intial
                value (salt) for hash calculations. This is part of the fix for
                bug #3496608 to randomize hash parameters.
          When compiled with XML_ATTR_INFO defined, adds new API member
                XML_GetAttributeInfo() that allows retrieving the byte
                offsets for attribute names and values (patch #3446384).
          Added CMake build system.
                See bug #2990652 and patch #3312568.
          Added run-benchmark target to Makefile.in - relies on testdata module
                present in the same relative location as in the repository.
@
text
@d4 2
a5 2
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
#   2011 Free Software Foundation, Inc.
d7 1
a7 1
timestamp='2011-03-23'
d35 1
a35 1
# diff and a properly formatted GNU ChangeLog entry.
a41 3
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

d75 2
a76 3
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
d123 2
a124 4
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
d151 1
a151 1
	-apple | -axis | -knuth | -cray | -microblaze)
a154 3
	-bluegene*)
		os=-cnk
		;;
d169 2
a170 2
	-chorusrdb)
		os=-chorusrdb
d172 1
a172 1
		;;
d248 1
a248 1
	| fido | fr30 | frv \
a251 1
	| lm32 \
d253 1
a253 1
	| maxq | mb | microblaze | mcore | mep | metag \
d257 1
a257 1
	| mips64octeon | mips64octeonel \
a258 2
	| mips64r5900 | mips64r5900el \
	| mips64vr | mips64vrel \
a270 1
	| moxie \
a272 1
	| nds32 | nds32le | nds32be \
a274 1
	| open8 \
d277 1
a277 1
	| powerpc | powerpc64 | powerpc64le | powerpcle \
a278 1
	| rx \
d280 1
a280 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
d284 2
a285 3
	| spu \
	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
	| ubicom32 \
d288 2
a289 2
	| x86 | xc16x | xstormy16 | xtensa \
	| z8k | z80)
d292 1
a292 10
	c54x)
		basic_machine=tic54x-unknown
		;;
	c55x)
		basic_machine=tic55x-unknown
		;;
	c6x)
		basic_machine=tic6x-unknown
		;;
	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
a302 12
	strongarm | thumb | xscale)
		basic_machine=arm-unknown
		;;

	xscaleeb)
		basic_machine=armeb-unknown
		;;

	xscaleel)
		basic_machine=armel-unknown
		;;

d323 1
a323 1
	| c[123]* | c30-* | [cjt]90-* | c4x-* \
d327 1
a327 1
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
a331 1
	| lm32-* \
d334 1
a334 1
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
d338 1
a338 1
	| mips64octeon-* | mips64octeonel-* \
a339 2
	| mips64r5900-* | mips64r5900el-* \
	| mips64vr-* | mips64vrel-* \
a353 1
	| nds32-* | nds32le-* | nds32be-* \
a355 1
	| open8-* \
d358 1
a358 1
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
d360 2
a361 2
	| romp-* | rs6000-* | rx-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
d365 2
a366 2
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
	| tahoe-* \
a367 1
	| tile-* | tilegx-* \
a368 1
	| ubicom32-* \
d371 2
a372 2
	| x86-* | x86_64-* | xc16x-* | xps100-* \
	| xstormy16-* | xtensa*-* \
d374 1
a374 5
	| z8k-* | z80-*)
		;;
	# Recognize the basic CPU types without company name, with glob match.
	xtensa*)
		basic_machine=$basic_machine-unknown
d392 1
a392 1
	abacus)
a437 4
	aros)
		basic_machine=i386-pc
		os=-aros
		;;
a445 21
	blackfin)
		basic_machine=bfin-unknown
		os=-linux
		;;
	blackfin-*)
		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
	bluegene*)
		basic_machine=powerpc-ibm
		os=-cnk
		;;
	c54x-*)
		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c55x-*)
		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c6x-*)
		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
a449 4
	cegcc)
		basic_machine=arm-unknown
		os=-cegcc
		;;
d478 2
a479 2
	cr16 | cr16-*)
		basic_machine=cr16-unknown
a516 4
	dicos)
		basic_machine=i686-pc
		os=-dicos
		;;
a670 8
	m68knommu)
		basic_machine=m68k-unknown
		os=-linux
		;;
	m68knommu-*)
		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
a681 3
	microblaze)
		basic_machine=microblaze-xilinx
		;;
a685 4
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
a781 6
	neo-tandem)
		basic_machine=neo-tandem
		;;
	nse-tandem)
		basic_machine=nse-tandem
		;;
a811 8
	parisc)
		basic_machine=hppa-unknown
		os=-linux
		;;
	parisc-*)
		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
d856 1
a856 1
	ppc | ppcbe)	basic_machine=powerpc-unknown
d858 1
a858 2
	ppc-* | ppcbe-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
a927 3
	sh5el)
		basic_machine=sh5le-unknown
		;;
a948 3
	strongarm-* | thumb-*)
		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
d1005 11
a1015 8
	# This must be matched before tile*.
	tilegx*)
		basic_machine=tilegx-unknown
		os=-linux-gnu
		;;
	tile*)
		basic_machine=tile-unknown
		os=-linux-gnu
a1083 3
	xscale-* | xscalee[bl]-*)
		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
		;;
a1091 4
	z80-*-coff)
		basic_machine=z80-unknown
		os=-sim
		;;
d1130 1
a1130 1
	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
d1177 2
a1178 2
	# First match some system type aliases
	# that might get confused with valid system types.
a1179 3
	-auroraux)
		os=-auroraux
		;;
d1200 2
a1201 3
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
	      | -sym* | -kopensolaris* \
d1203 1
a1203 1
	      | -aos* | -aros* \
d1212 1
a1212 1
	      | -chorusos* | -chorusrdb* | -cegcc* \
d1214 1
a1214 2
	      | -mingw32* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-uclibc* \
d1222 1
a1222 1
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
d1261 1
a1261 1
	-os400*)
d1310 1
a1310 1
	-tpf*)
a1351 5
	-dicos*)
		os=-dicos
		;;
	-nacl*)
		;;
d1374 1
a1374 1
	score-*)
d1377 1
a1377 1
	spu-*)
d1389 2
a1390 11
	c4x-* | tic4x-*)
		os=-coff
		;;
	tic54x-*)
		os=-coff
		;;
	tic55x-*)
		os=-coff
		;;
	tic6x-*)
		os=-coff
a1416 3
	mep-*)
		os=-elf
		;;
d1441 1
a1441 1
	*-knuth)
d1546 1
a1546 1
			-cnk*|-aix*)
@


1.1.1.2.14.1
log
@Pull up following revision(s) (requested by spz in ticket #1169):
	distrib/sets/lists/base/ad.aarch64: patch
	distrib/sets/lists/base/ad.arm: patch
	distrib/sets/lists/base/ad.mips: patch
	distrib/sets/lists/base/ad.powerpc: patch
	distrib/sets/lists/base/md.amd64: patch
	distrib/sets/lists/base/md.sparc64: patch
	distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch
	distrib/sets/lists/comp/mi: 1.2035
	distrib/sets/lists/debug/ad.aarch64: patch
	distrib/sets/lists/debug/ad.arm: patch
	distrib/sets/lists/debug/ad.mips: patch
	distrib/sets/lists/debug/ad.powerpc: patch
	distrib/sets/lists/debug/md.amd64: patch
	distrib/sets/lists/debug/md.sparc64: patch
	distrib/sets/lists/debug/shl.mi: 1.133, 1.134 via patch
	doc/3RDPARTY: 1.1316, 1.1330
	external/mit/expat/dist/CMake.README: up to 1.1.1.2
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.3
	external/mit/expat/dist/MANIFEST: up to 1.1.1.3
	external/mit/expat/dist/Makefile.in: up to 1.1.1.3
	external/mit/expat/dist/README: up to 1.1.1.3
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.3
	external/mit/expat/dist/configure.ac: up to 1.1.1.1
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3
	external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/outline.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.2
	external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4: up to 1.4
	external/mit/expat/dist/conftools/config.guess: up to 1.1.1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.1.1.3
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/mkinstalldirs: up to 1.4
	external/mit/expat/dist/doc/reference.html: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.sgml: up to 1.1.1.3
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.2
	external/mit/expat/dist/lib/amigaconfig.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.3
	external/mit/expat/dist/lib/libexpat.def: up to 1.1.1.2
	external/mit/expat/dist/lib/libexpatw.def: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.4
	external/mit/expat/dist/lib/xmltok.c: up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.h: up to 1.1.1.1
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.3
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.2
	external/mit/expat/dist/tests/benchmark/README.txt: up to 1.1.1.2
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.3
	external/mit/expat/lib/libexpat/Makefile: up to 1.2
	external/mit/expat/lib/libexpat/expat.pc.in: up to 1.1
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.3
	external/mit/expat/lib/libexpat/shlib_version: up to 1.3
Update expat to 2.1.1.  Apply fixes for CVE-2016-0718.
@
text
@d3 13
a15 7
#   Copyright 1992-2014 Free Software Foundation, Inc.

timestamp='2014-09-11'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
d18 4
a21 4
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
d24 3
a26 1
# along with this program; if not, see <http://www.gnu.org/licenses/>.
d31 1
a31 3
# the same distribution terms that you use for the rest of that
# program.  This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
d34 2
a35 1
# Please send patches with a ChangeLog entry to config-patches@@gnu.org.
d78 3
a80 1
Copyright 1992-2014 Free Software Foundation, Inc.
d128 1
a128 1
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
a134 4
  android-linux)
    os=-linux-android
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
d157 1
a157 1
	-apple | -axis | -knuth | -cray | -microblaze*)
a225 6
	-lynx*178)
		os=-lynxos178
		;;
	-lynx*5)
		os=-lynxos5
		;;
a249 1
	| aarch64 | aarch64_be \
d253 1
a253 4
	| arc | arceb \
	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
	| avr | avr32 \
	| be32 | be64 \
d255 1
a255 1
	| c4x | c8051 | clipper \
a256 1
	| epiphany \
a258 1
	| hexagon \
a260 2
	| k1om \
	| le32 | le64 \
d263 1
a263 1
	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
a276 1
	| mipsisa32r6 | mipsisa32r6el \
a278 1
	| mipsisa64r6 | mipsisa64r6el \
a280 1
	| mipsr5900 | mipsr5900el \
d287 1
a287 1
	| nios | nios2 | nios2eb | nios2el \
d289 2
a290 1
	| open8 | or1k | or1knd | or32 \
d294 1
a294 2
	| riscv32 | riscv64 \
	| rl78 | rx \
d303 1
a303 1
	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
d318 2
a319 1
	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
d332 1
a332 4
	xgate)
		basic_machine=$basic_machine-unknown
		os=-none
		;;
a354 1
	| aarch64-* | aarch64_be-* \
d357 1
a357 1
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
a359 1
	| be32-* | be64-* \
d362 1
a362 1
	| c8051-* | clipper-* | craynv-* | cydra-* \
a367 1
	| hexagon-* \
a369 2
	| k1om-* \
	| le32-* | le64-* \
d373 1
a373 2
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
	| microblaze-* | microblazeel-* \
a386 1
	| mipsisa32r6-* | mipsisa32r6el-* \
a388 1
	| mipsisa64r6-* | mipsisa64r6el-* \
a390 1
	| mipsr5900-* | mipsr5900el-* \
d396 1
a396 1
	| nios-* | nios2-* | nios2eb-* | nios2el-* \
a398 1
	| or1k*-* \
d403 1
a403 1
	| rl78-* | romp-* | rs6000-* | rx-* \
d411 1
a411 1
	| tile*-* \
d414 1
a414 2
	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
	| vax-* \
d714 1
d772 1
a772 1
	microblaze*)
a774 4
	mingw64)
		basic_machine=x86_64-pc
		os=-mingw64
		;;
d776 1
a776 1
		basic_machine=i686-pc
a803 4
	moxiebox)
		basic_machine=moxie-unknown
		os=-moxiebox
		;;
a810 4
	msys)
		basic_machine=i686-pc
		os=-msys
		;;
a814 4
	nacl)
		basic_machine=le32-unknown
		os=-nacl
		;;
d995 1
a995 5
	rdos | rdos64)
		basic_machine=x86_64-pc
		os=-rdos
		;;
	rdos32)
d1123 5
d1129 1
a1129 1
		basic_machine=$basic_machine-unknown
d1327 1
a1327 1
	      | -sym* | -kopensolaris* | -plan9* \
d1333 1
a1333 1
	      | -bitrig* | -openbsd* | -solidbsd* \
d1339 4
a1342 4
	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
d1349 1
a1349 1
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
d1473 3
a1523 6
	c8051-*)
		os=-elf
		;;
	hexagon-*)
		os=-elf
		;;
d1551 3
@


1.1.1.2.14.2
log
@Pull up following revision(s) (requested by spz in ticket #1361):
	doc/3RDPARTY: 1.398, 1.1407
	external/mit/expat/dist/CMake.README: up to 1.1.1.3
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3
	external/mit/expat/dist/COPYING: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.4
	external/mit/expat/dist/MANIFEST: up to 1.1.1.4
	external/mit/expat/dist/Makefile.in: up to 1.1.1.4
	external/mit/expat/dist/README: up to 1.1.1.4
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.4
	external/mit/expat/dist/configure.ac: up to 1.1.1.2
	external/mit/expat/dist/conftools/config.guess: up to 1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.3
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4
	external/mit/expat/dist/doc/expat.png: up to 1.1.1.2
	external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.sgml          delete
	external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.3
	external/mit/expat/dist/examples/outline.c: up to 1.1.1.2
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4
	external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.4
	external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/internal.h: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.6
	external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3
	external/mit/expat/dist/lib/xmltok.c: up to 1.3
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.3
	external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.3
	external/mit/expat/dist/tests/runtests.c: up to 1.1.1.3
	external/mit/expat/dist/tests/xmltest.sh: up to 1.2
	external/mit/expat/dist/win32/README.txt: up to 1.1.1.3
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.3
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.4
Update expat to 2.2.0, fixing CVE-2016-0718, CVE-2016-4472, CVE-2016-5300,
and CVE-2012-6702.
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 2
a121 2
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
a257 1
	| ba \
d262 2
a263 2
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
a303 1
	| pru \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a425 1
	| pru-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a635 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1012 1
a1012 1
	ppcle | powerpclittle)
d1022 1
a1022 1
	ppc64le | powerpc64little)
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1377 1
a1377 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1379 1
a1379 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
a1519 2
	-ios)
		;;
a1614 3
	pru-*)
		os=-elf
		;;
@


1.1.1.2.12.1
log
@Pull up following revision(s) (requested by spz in ticket #1169):
	distrib/sets/lists/base/ad.aarch64: patch
	distrib/sets/lists/base/ad.arm: patch
	distrib/sets/lists/base/ad.mips: patch
	distrib/sets/lists/base/ad.powerpc: patch
	distrib/sets/lists/base/md.amd64: patch
	distrib/sets/lists/base/md.sparc64: patch
	distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch
	distrib/sets/lists/comp/mi: 1.2035
	distrib/sets/lists/debug/ad.aarch64: patch
	distrib/sets/lists/debug/ad.arm: patch
	distrib/sets/lists/debug/ad.mips: patch
	distrib/sets/lists/debug/ad.powerpc: patch
	distrib/sets/lists/debug/md.amd64: patch
	distrib/sets/lists/debug/md.sparc64: patch
	distrib/sets/lists/debug/shl.mi: 1.133, 1.134 via patch
	doc/3RDPARTY: 1.1316, 1.1330
	external/mit/expat/dist/CMake.README: up to 1.1.1.2
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.3
	external/mit/expat/dist/MANIFEST: up to 1.1.1.3
	external/mit/expat/dist/Makefile.in: up to 1.1.1.3
	external/mit/expat/dist/README: up to 1.1.1.3
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.3
	external/mit/expat/dist/configure.ac: up to 1.1.1.1
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3
	external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/outline.bpr: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.2
	external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4: up to 1.4
	external/mit/expat/dist/conftools/config.guess: up to 1.1.1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.1.1.3
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.3
	external/mit/expat/dist/conftools/mkinstalldirs: up to 1.4
	external/mit/expat/dist/doc/reference.html: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.sgml: up to 1.1.1.3
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.2
	external/mit/expat/dist/lib/amigaconfig.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.3
	external/mit/expat/dist/lib/libexpat.def: up to 1.1.1.2
	external/mit/expat/dist/lib/libexpatw.def: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.4
	external/mit/expat/dist/lib/xmltok.c: up to 1.1.1.2
	external/mit/expat/dist/lib/xmltok.h: up to 1.1.1.1
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.3
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.2
	external/mit/expat/dist/tests/benchmark/README.txt: up to 1.1.1.2
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.3
	external/mit/expat/lib/libexpat/Makefile: up to 1.2
	external/mit/expat/lib/libexpat/expat.pc.in: up to 1.1
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.3
	external/mit/expat/lib/libexpat/shlib_version: up to 1.3
Update expat to 2.1.1.  Apply fixes for CVE-2016-0718.
@
text
@d3 13
a15 7
#   Copyright 1992-2014 Free Software Foundation, Inc.

timestamp='2014-09-11'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
d18 4
a21 4
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
d24 3
a26 1
# along with this program; if not, see <http://www.gnu.org/licenses/>.
d31 1
a31 3
# the same distribution terms that you use for the rest of that
# program.  This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
d34 2
a35 1
# Please send patches with a ChangeLog entry to config-patches@@gnu.org.
d78 3
a80 1
Copyright 1992-2014 Free Software Foundation, Inc.
d128 1
a128 1
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
a134 4
  android-linux)
    os=-linux-android
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
d157 1
a157 1
	-apple | -axis | -knuth | -cray | -microblaze*)
a225 6
	-lynx*178)
		os=-lynxos178
		;;
	-lynx*5)
		os=-lynxos5
		;;
a249 1
	| aarch64 | aarch64_be \
d253 1
a253 4
	| arc | arceb \
	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
	| avr | avr32 \
	| be32 | be64 \
d255 1
a255 1
	| c4x | c8051 | clipper \
a256 1
	| epiphany \
a258 1
	| hexagon \
a260 2
	| k1om \
	| le32 | le64 \
d263 1
a263 1
	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
a276 1
	| mipsisa32r6 | mipsisa32r6el \
a278 1
	| mipsisa64r6 | mipsisa64r6el \
a280 1
	| mipsr5900 | mipsr5900el \
d287 1
a287 1
	| nios | nios2 | nios2eb | nios2el \
d289 2
a290 1
	| open8 | or1k | or1knd | or32 \
d294 1
a294 2
	| riscv32 | riscv64 \
	| rl78 | rx \
d303 1
a303 1
	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
d318 2
a319 1
	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
d332 1
a332 4
	xgate)
		basic_machine=$basic_machine-unknown
		os=-none
		;;
a354 1
	| aarch64-* | aarch64_be-* \
d357 1
a357 1
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
a359 1
	| be32-* | be64-* \
d362 1
a362 1
	| c8051-* | clipper-* | craynv-* | cydra-* \
a367 1
	| hexagon-* \
a369 2
	| k1om-* \
	| le32-* | le64-* \
d373 1
a373 2
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
	| microblaze-* | microblazeel-* \
a386 1
	| mipsisa32r6-* | mipsisa32r6el-* \
a388 1
	| mipsisa64r6-* | mipsisa64r6el-* \
a390 1
	| mipsr5900-* | mipsr5900el-* \
d396 1
a396 1
	| nios-* | nios2-* | nios2eb-* | nios2el-* \
a398 1
	| or1k*-* \
d403 1
a403 1
	| rl78-* | romp-* | rs6000-* | rx-* \
d411 1
a411 1
	| tile*-* \
d414 1
a414 2
	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
	| vax-* \
d714 1
d772 1
a772 1
	microblaze*)
a774 4
	mingw64)
		basic_machine=x86_64-pc
		os=-mingw64
		;;
d776 1
a776 1
		basic_machine=i686-pc
a803 4
	moxiebox)
		basic_machine=moxie-unknown
		os=-moxiebox
		;;
a810 4
	msys)
		basic_machine=i686-pc
		os=-msys
		;;
a814 4
	nacl)
		basic_machine=le32-unknown
		os=-nacl
		;;
d995 1
a995 5
	rdos | rdos64)
		basic_machine=x86_64-pc
		os=-rdos
		;;
	rdos32)
d1123 5
d1129 1
a1129 1
		basic_machine=$basic_machine-unknown
d1327 1
a1327 1
	      | -sym* | -kopensolaris* | -plan9* \
d1333 1
a1333 1
	      | -bitrig* | -openbsd* | -solidbsd* \
d1339 4
a1342 4
	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
d1349 1
a1349 1
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
d1473 3
a1523 6
	c8051-*)
		os=-elf
		;;
	hexagon-*)
		os=-elf
		;;
d1551 3
@


1.1.1.2.12.1.2.1
log
@Sync with netbsd-7-1-RELEASE
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 2
a121 2
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
a257 1
	| ba \
d262 2
a263 2
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
a303 1
	| pru \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a425 1
	| pru-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a635 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1012 1
a1012 1
	ppcle | powerpclittle)
d1022 1
a1022 1
	ppc64le | powerpc64little)
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1377 1
a1377 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1379 1
a1379 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
a1519 2
	-ios)
		;;
a1614 3
	pru-*)
		os=-elf
		;;
@


1.1.1.2.12.2
log
@Pull up following revision(s) (requested by spz in ticket #1361):
	doc/3RDPARTY: 1.398, 1.1407
	external/mit/expat/dist/CMake.README: up to 1.1.1.3
	external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3
	external/mit/expat/dist/COPYING: up to 1.1.1.2
	external/mit/expat/dist/Changes: up to 1.1.1.4
	external/mit/expat/dist/MANIFEST: up to 1.1.1.4
	external/mit/expat/dist/Makefile.in: up to 1.1.1.4
	external/mit/expat/dist/README: up to 1.1.1.4
	external/mit/expat/dist/aclocal.m4: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2
	external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3
	external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2
	external/mit/expat/dist/configure: up to 1.1.1.4
	external/mit/expat/dist/configure.ac: up to 1.1.1.2
	external/mit/expat/dist/conftools/config.guess: up to 1.3
	external/mit/expat/dist/conftools/config.sub: up to 1.3
	external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4
	external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4
	external/mit/expat/dist/doc/expat.png: up to 1.1.1.2
	external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2
	external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3
	external/mit/expat/dist/doc/xmlwf.sgml          delete
	external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1
	external/mit/expat/dist/examples/elements.c: up to 1.1.1.3
	external/mit/expat/dist/examples/outline.c: up to 1.1.1.2
	external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4
	external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expat.h: up to 1.1.1.4
	external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2
	external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3
	external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2
	external/mit/expat/dist/lib/internal.h: up to 1.1.1.2
	external/mit/expat/dist/lib/xmlparse.c: up to 1.6
	external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3
	external/mit/expat/dist/lib/xmltok.c: up to 1.3
	external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5
	external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2
	external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.3
	external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.2
	external/mit/expat/dist/tests/chardata.c: up to 1.1.1.3
	external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.2
	external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.3
	external/mit/expat/dist/tests/runtests.c: up to 1.1.1.3
	external/mit/expat/dist/tests/xmltest.sh: up to 1.2
	external/mit/expat/dist/win32/README.txt: up to 1.1.1.3
	external/mit/expat/dist/win32/expat.iss: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.3
	external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.2
	external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.4
	external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.3
	external/mit/expat/lib/libexpat/expat_config.h: up to 1.4
Update expat to 2.2.0, fixing CVE-2016-0718, CVE-2016-4472, CVE-2016-5300,
and CVE-2012-6702.
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 2
a121 2
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
a257 1
	| ba \
d262 2
a263 2
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
a303 1
	| pru \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a425 1
	| pru-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a635 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1012 1
a1012 1
	ppcle | powerpclittle)
d1022 1
a1022 1
	ppc64le | powerpc64little)
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1377 1
a1377 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1379 1
a1379 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
a1519 2
	-ios)
		;;
a1614 3
	pru-*)
		os=-elf
		;;
@


1.1.1.3
log
@Import of a new expat version. Upstream Changes:

Release 2.1.1 Sat March 12 2016
        Security fixes:
            #582: CVE-2015-1283 - Multiple integer overflows in XML_GetBuffer

        Bug fixes:
            #502: Fix potential null pointer dereference
            #520: Symbol XML_SetHashSalt was not exported
            Output of "xmlwf -h" was incomplete

        Other changes
            #503: Document behavior of calling XML_SetHashSalt with salt 0
            Minor improvements to man page xmlwf(1)
            Improvements to the experimental CMake build system
            libtool now invoked with --verbose
@
text
@d3 13
a15 7
#   Copyright 1992-2014 Free Software Foundation, Inc.

timestamp='2014-09-11'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
d18 4
a21 4
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
d24 3
a26 1
# along with this program; if not, see <http://www.gnu.org/licenses/>.
d31 1
a31 3
# the same distribution terms that you use for the rest of that
# program.  This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
d34 2
a35 1
# Please send patches with a ChangeLog entry to config-patches@@gnu.org.
d78 3
a80 1
Copyright 1992-2014 Free Software Foundation, Inc.
d128 1
a128 1
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
a134 4
  android-linux)
    os=-linux-android
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
d157 1
a157 1
	-apple | -axis | -knuth | -cray | -microblaze*)
a225 6
	-lynx*178)
		os=-lynxos178
		;;
	-lynx*5)
		os=-lynxos5
		;;
a249 1
	| aarch64 | aarch64_be \
d253 1
a253 4
	| arc | arceb \
	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
	| avr | avr32 \
	| be32 | be64 \
d255 1
a255 1
	| c4x | c8051 | clipper \
a256 1
	| epiphany \
a258 1
	| hexagon \
a260 2
	| k1om \
	| le32 | le64 \
d263 1
a263 1
	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
a276 1
	| mipsisa32r6 | mipsisa32r6el \
a278 1
	| mipsisa64r6 | mipsisa64r6el \
a280 1
	| mipsr5900 | mipsr5900el \
d287 1
a287 1
	| nios | nios2 | nios2eb | nios2el \
d289 2
a290 1
	| open8 | or1k | or1knd | or32 \
d294 1
a294 2
	| riscv32 | riscv64 \
	| rl78 | rx \
d303 1
a303 1
	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
d318 2
a319 1
	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
d332 1
a332 4
	xgate)
		basic_machine=$basic_machine-unknown
		os=-none
		;;
a354 1
	| aarch64-* | aarch64_be-* \
d357 1
a357 1
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
a359 1
	| be32-* | be64-* \
d362 1
a362 1
	| c8051-* | clipper-* | craynv-* | cydra-* \
a367 1
	| hexagon-* \
a369 2
	| k1om-* \
	| le32-* | le64-* \
d373 1
a373 2
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
	| microblaze-* | microblazeel-* \
a386 1
	| mipsisa32r6-* | mipsisa32r6el-* \
a388 1
	| mipsisa64r6-* | mipsisa64r6el-* \
a390 1
	| mipsr5900-* | mipsr5900el-* \
d396 1
a396 1
	| nios-* | nios2-* | nios2eb-* | nios2el-* \
a398 1
	| or1k*-* \
d403 1
a403 1
	| rl78-* | romp-* | rs6000-* | rx-* \
d411 1
a411 1
	| tile*-* \
d414 1
a414 2
	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
	| vax-* \
d714 1
d772 1
a772 1
	microblaze*)
a774 4
	mingw64)
		basic_machine=x86_64-pc
		os=-mingw64
		;;
d776 1
a776 1
		basic_machine=i686-pc
a803 4
	moxiebox)
		basic_machine=moxie-unknown
		os=-moxiebox
		;;
a810 4
	msys)
		basic_machine=i686-pc
		os=-msys
		;;
a814 4
	nacl)
		basic_machine=le32-unknown
		os=-nacl
		;;
d995 1
a995 5
	rdos | rdos64)
		basic_machine=x86_64-pc
		os=-rdos
		;;
	rdos32)
d1123 5
d1129 1
a1129 1
		basic_machine=$basic_machine-unknown
d1327 1
a1327 1
	      | -sym* | -kopensolaris* | -plan9* \
d1333 1
a1333 1
	      | -bitrig* | -openbsd* | -solidbsd* \
d1339 4
a1342 4
	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
d1349 1
a1349 1
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
d1473 3
a1523 6
	c8051-*)
		os=-elf
		;;
	hexagon-*)
		os=-elf
		;;
d1551 3
@


1.1.1.3.4.1
log
@Sync with HEAD
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 2
a121 2
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
a257 1
	| ba \
d262 2
a263 2
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
a303 1
	| pru \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a425 1
	| pru-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a635 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1012 1
a1012 1
	ppcle | powerpclittle)
d1022 1
a1022 1
	ppc64le | powerpc64little)
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1377 1
a1377 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1379 1
a1379 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
a1519 2
	-ios)
		;;
a1614 3
	pru-*)
		os=-elf
		;;
@


1.1.1.3.2.1
log
@Sync with HEAD
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 2
a121 2
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
a257 1
	| ba \
d262 2
a263 2
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
a303 1
	| pru \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a425 1
	| pru-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a635 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1012 1
a1012 1
	ppcle | powerpclittle)
d1022 1
a1022 1
	ppc64le | powerpc64little)
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1377 1
a1377 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1379 1
a1379 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
a1519 2
	-ios)
		;;
a1614 3
	pru-*)
		os=-elf
		;;
@


1.1.1.4
log
@from Changes:
    Release 2.2.0 Tue June 21 2016
        Security fixes:
            #537  CVE-2016-0718 -- Fix crash on malformed input
                  CVE-2016-4472 -- Improve insufficient fix to CVE-2015-1283 /
                                   CVE-2015-2716 introduced with Expat 2.1.1
            #499  CVE-2016-5300 -- Use more entropy for hash initialization
                                   than the original fix to CVE-2012-0876
            #519  CVE-2012-6702 -- Resolve troublesome internal call to srand
                                   that was introduced with Expat 2.1.0
                                   when addressing CVE-2012-0876 (issue #496)

        Bug fixes:
                  Fix uninitialized reads of size 1
                    (e.g. in little2_updatePosition)
                  Fix detection of UTF-8 character boundaries

        Other changes:
            #532  Fix compilation for Visual Studio 2010 (keyword "C99")
                  Autotools: Resolve use of "$<" to better support bmake
                  Autotools: Add QA script "qa.sh" (and make target "qa")
                  Autotools: Respect CXXFLAGS if given
                  Autotools: Fix "make run-xmltest"
                  Autotools: Have "make run-xmltest" check for expected output
             p90  CMake: Fix static build (BUILD_shared=OFF) on Windows
            #536  CMake: Add soversion, support -DNO_SONAME=yes to bypass
            #323  CMake: Add suffix "d" to differentiate debug from release
                  CMake: Define WIN32 with CMake on Windows
                  Annotate memory allocators for GCC
                  Address all currently known compile warnings
                  Make sure that API symbols remain visible despite
                    -fvisibility=hidden
                  Remove executable flag from source files
                  Resolve COMPILED_FROM_DSP in favor of WIN32
@
text
@d3 1
a3 1
#   Copyright 1992-2016 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2016-03-30'
d28 1
a28 1
# Please send patches to <config-patches@@gnu.org>.
d36 1
a36 1
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d56 2
a57 1
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
d71 1
a71 1
Copyright 1992-2016 Free Software Foundation, Inc.
d120 1
a120 1
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
a257 1
	| ba \
d261 3
a263 3
	| d10v | d30v | dlx | dsp16xx | dvp \
	| e2k | epiphany \
	| fido | fr30 | frv | ft32 \
d308 1
a308 1
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
a315 1
	| visium \
a329 3
	leon|leon[3-9])
		basic_machine=sparc-$basic_machine
		;;
a374 1
	| ba-* \
d380 1
a380 1
	| e2k-* | elxsi-* \
a426 1
	| riscv32-* | riscv64-* \
d432 1
a432 1
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
a439 1
	| visium-* \
a515 3
	asmjs)
		basic_machine=asmjs-unknown
		;;
a776 3
	leon-*|leon[3-9]-*)
		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
		;;
a817 18
	mipsEE* | ee | ps2)
		basic_machine=mips64r5900el-scei
		case $os in
		    -linux*)
			;;
		    *)
			os=-elf
			;;
		esac
		;;
	iop)
		basic_machine=mipsel-scei
		os=-irx
		;;
	dvp)
		basic_machine=dvp-scei
		os=-elf
		;;
d1368 1
a1368 1
	      | -aos* | -aros* | -cloudabi* | -sortix* \
d1372 1
a1372 1
	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
d1384 1
a1384 1
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
d1388 1
a1388 2
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
	      | -onefs* | -tirtos*)
a1519 2
	-ios)
		;;
@


1.1.1.5
log
@Release 2.2.1 Sat June 17 2017
        Security fixes:
                  CVE-2017-9233 -- External entity infinite loop DoS
                    Details: https://libexpat.github.io/doc/cve-2017-9233/
                    Commit c4bf96bb51dd2a1b0e185374362ee136fe2c9d7f
   [MOX-002]      CVE-2016-9063 -- Detect integer overflow; commit
                    d4f735b88d9932bd5039df2335eefdd0723dbe20
                    (Fixed version of existing downstream patches!)
   (SF.net) #539  Fix regression from fix to CVE-2016-0718 cutting off
                    longer tag names; commits
                    * 896b6c1fd3b842f377d1b62135dccf0a579cf65d
                    * af507cef2c93cb8d40062a0abe43a4f4e9158fb2
             #16    * 0dbbf43fdb20f593ddf4fa1ff67288000dd4a7fd
             #25  More integer overflow detection (function poolGrow); commits
                    * 810b74e4703dcfdd8f404e3cb177d44684775143
                    * 44178553f3539ce69d34abee77a05e879a7982ac
   [MOX-002]      Detect overflow from len=INT_MAX call to XML_Parse; commits
                    * 4be2cb5afcc018d996f34bbbce6374b7befad47f
                    * 7e5b71b748491b6e459e5c9a1d090820f94544d8
   [MOX-005] #30  Use high quality entropy for hash initialization:
                    * arc4random_buf on BSD, systems with libbsd
                      (when configured with --with-libbsd), CloudABI
                    * RtlGenRandom on Windows XP / Server 2003 and later
                    * getrandom on Linux 3.17+
                    In a way, that's still part of CVE-2016-5300.
                    https://github.com/libexpat/libexpat/pull/30/commits
   [MOX-005]      For the low quality entropy extraction fallback code,
                    the parser instance address can no longer leak, commit
                    04ad658bd3079dd15cb60fc67087900f0ff4b083
   [MOX-003]      Prevent use of uninitialised variable; commit
   [MOX-004]        a4dc944f37b664a3ca7199c624a98ee37babdb4b
                  Add missing parameter validation to public API functions
                    and dedicated error code XML_ERROR_INVALID_ARGUMENT:
   [MOX-006]        * NULL checks; commits
                      * d37f74b2b7149a3a95a680c4c4cd2a451a51d60a (merge/many)
                      * 9ed727064b675b7180c98cb3d4f75efba6966681
                      * 6a747c837c50114dfa413994e07c0ba477be4534
                    * Negative length (XML_Parse); commit
   [MOX-002]          70db8d2538a10f4c022655d6895e4c3e78692e7f
   [MOX-001] #35  Change hash algorithm to William Ahern's version of SipHash
                    to go further with fixing CVE-2012-0876.
                    https://github.com/libexpat/libexpat/pull/39/commits

        Bug fixes:
             #32  Fix sharing of hash salt across parsers;
                    relevant where XML_ExternalEntityParserCreate is called
                    prior to XML_Parse, in particular (e.g. FBReader)
             #28  xmlwf: Auto-disable use of memory-mapping (and parsing
                    as a single chunk) for files larger than ~1 GB (2^30 bytes)
                    rather than failing with error "out of memory"
              #3  Fix double free after malloc failure in DTD code; commit
                    7ae9c3d3af433cd4defe95234eae7dc8ed15637f
             #17  Fix memory leak on parser error for unbound XML attribute
                    prefix with new namespaces defined in the same tag;
                    found by Google's OSS-Fuzz; commits
                    * 16f87daae5a16132e479e4f71862128c7a915c73
                    * b47dbc9745932c160893d433220e462bd605f8cd
                  xmlwf on Windows: Add missing calls to CloseHandle

        New features:
             #30  Introduced environment switch EXPAT_ENTROPY_DEBUG=1
                    for runtime debugging of entropy extraction

        Other changes:
                  Increase code coverage
             #33  Reject use of XML_UNICODE_WCHAR_T with sizeof(wchar_t) != 2;
                    XML_UNICODE_WCHAR_T was never meant to be used outside
                    of Windows; 4-byte wchar_t is common on Linux
   (SF.net) #538  Start using -fno-strict-aliasing
   (SF.net) #540  Support compilation against cloudlibc of CloudABI
                  Allow MinGW cross-compilation
   (SF.net) #534  CMake: Introduce option "BUILD_doc" (enabled by default)
                    to bypass compilation of the xmlwf.1 man page
   (SF.net)  pr2  CMake: Introduce option "INSTALL" (enabled by default)
                    to bypass installation of expat files
                  CMake: Fix ninja support
                  Autotools: Add parameters --enable-xml-context [COUNT]
                    and --disable-xml-context; default of context of 1024
                    bytes enabled unchanged
             #14  Drop AmigaOS 4.x code and includes
             #14  Drop ancient build systems:
                    * Borland C++ Builder
                    * OpenVMS
                    * Open Watcom
                    * Visual Studio 6.0
                    * Pre-X Mac OS (MPW Makefile)
                    If you happen to rely on some of these, please get in
                    touch for joining with maintenance.
             #10  Move from WIN32 to _WIN32
             #13  Fix "make run-xmltest" order instability
                  Address compile warnings
                  Bump version info from 7:2:6 to 7:3:6
                  Add AUTHORS file

        Infrastructure:
              #1  Migrate from SourceForge to GitHub (except downloads):
                    https://github.com/libexpat/
              #1  Re-create http://libexpat.org/ project website
                  Start utilizing Travis CI

        Special thanks to:
            Andy Wang
            Don Lewis
            Ed Schouten
            Karl Waclawek
            Pascal Cuoq
            Rhodri James
            Sergei Nikulov
            Tobias Taschner
            Viktor Szakats
                 and
            Core Infrastructure Initiative
            Mozilla Foundation (MOSS Track 3: Secure Open Source)
            Radically Open Security
@
text
@d3 1
a3 1
#   Copyright 1992-2017 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2017-01-01'
d70 1
a70 1
Copyright 1992-2017 Free Software Foundation, Inc.
d120 1
a120 1
  kopensolaris*-gnu* | cloudabi*-eabi* | \
a303 1
	| pru \
a430 1
	| pru-* \
a645 8
	e500v[12])
		basic_machine=powerpc-unknown
		os=$os"spe"
		;;
	e500v[12]-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=$os"spe"
		;;
d1043 1
a1043 1
	ppcle | powerpclittle)
d1053 1
a1053 1
	ppc64le | powerpc64little)
d1408 1
a1408 1
	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
d1410 1
a1410 1
	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d1420 1
a1420 1
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
a1648 3
	pru-*)
		os=-elf
		;;
@


1.1.1.6
log
@Import expat 2.2.8

Release 2.2.8 Fri Septemper 13 2019
        Security fixes:
       #317 #318  CVE-2019-15903 -- Fix heap overflow triggered by
                    XML_GetCurrentLineNumber (or XML_GetCurrentColumnNumber),
                    and deny internal entities closing the doctype;
                    fixed in commit c20b758c332d9a13afbbb276d30db1d183a85d43

        Bug fixes:
            #240  Fix cases where XML_StopParser did not have any effect
                    when called from inside of an end element handler
            #341  xmlwf: Fix exit code for operation without "-d DIRECTORY";
                    previously, only "-d DIRECTORY" would give you a proper
                    exit code:
                      # xmlwf -d . <<<'<not well-formed>' 2>/dev/null ; echo $?
                      2
                      # xmlwf <<<'<not well-formed>' 2>/dev/null ; echo $?
                      0
                    Now both cases return exit code 2.

        Other changes:
       #299 #302  Windows: Replace LoadLibrary hack to access
                    unofficial API function SystemFunction036 (RtlGenRandom)
                    by using official API function rand_s (needs WinXP+)
            #325  Windows: Drop support for Visual Studio <=7.1/2003
                    and document supported compilers in README.md
            #286  Windows: Remove COM code from xmlwf; in case it turns
                    out needed later, there will be a dedicated repository
                    below https://github.com/libexpat/ for that code
            #322  Windows: Remove explicit MSVC solution and project files.
                    You can generate Visual Studio solution files through
                    CMake, e.g.: cmake -G"Visual Studio 15 2017" .
            #338  xmlwf: Make "xmlwf -h" help output more friendly
            #339  examples: Improve elements.c
       #244 #264  Autotools: Add argument --enable-xml-attr-info
       #239 #301  Autotools: Add arguments
                    --with-getrandom
                    --without-getrandom
                    --with-sys-getrandom
                    --without-sys-getrandom
       #312 #343  Autotools: Fix linking issues with "./configure LD=clang"
                  Autotools: Fix "make run-xmltest" for out-of-source builds
       #329 #336  CMake: Pull all options from Expat <=2.2.7 into namespace
                    prefix EXPAT_ with the exception of DOCBOOK_TO_MAN:
                    - BUILD_doc            -> EXPAT_BUILD_DOCS (plural)
                    - BUILD_examples       -> EXPAT_BUILD_EXAMPLES
                    - BUILD_shared         -> EXPAT_SHARED_LIBS
                    - BUILD_tests          -> EXPAT_BUILD_TESTS
                    - BUILD_tools          -> EXPAT_BUILD_TOOLS
                    - DOCBOOK_TO_MAN       -> DOCBOOK_TO_MAN (unchanged)
                    - INSTALL              -> EXPAT_ENABLE_INSTALL
                    - MSVC_USE_STATIC_CRT  -> EXPAT_MSVC_STATIC_CRT
                    - USE_libbsd           -> EXPAT_WITH_LIBBSD
                    - WARNINGS_AS_ERRORS   -> EXPAT_WARNINGS_AS_ERRORS
                    - XML_CONTEXT_BYTES    -> EXPAT_CONTEXT_BYTES
                    - XML_DEV_URANDOM      -> EXPAT_DEV_URANDOM
                    - XML_DTD              -> EXPAT_DTD
                    - XML_NS               -> EXPAT_NS
                    - XML_UNICODE          -> EXPAT_CHAR_TYPE=ushort (!)
                    - XML_UNICODE_WCHAR_T  -> EXPAT_CHAR_TYPE=wchar_t (!)
       #244 #264  CMake: Add argument -DEXPAT_ATTR_INFO=(ON|OFF),
                    default OFF
            #326  CMake: Add argument -DEXPAT_LARGE_SIZE=(ON|OFF),
                    default OFF
            #328  CMake: Add argument -DEXPAT_MIN_SIZE=(ON|OFF),
                    default OFF
       #239 #277  CMake: Add arguments
                    -DEXPAT_WITH_GETRANDOM=(ON|OFF|AUTO), default AUTO
                    -DEXPAT_WITH_SYS_GETRANDOM=(ON|OFF|AUTO), default AUTO
            #326  CMake: Install expat_config.h to include directory
            #326  CMake: Generate and install configuration files for
                    future find_package(expat [..] CONFIG [..])
                  CMake: Now produces a summary of applied configuration
                  CMake: Require C++ compiler only when tests are enabled
            #330  CMake: Fix compilation for 16bit character types,
                    i.e. ex -DXML_UNICODE=ON (and ex -DXML_UNICODE_WCHAR_T=ON)
            #265  CMake: Fix linking with MinGW
            #330  CMake: Add full support for MinGW; to enable, use
                    -DCMAKE_TOOLCHAIN_FILE=[expat]/cmake/mingw-toolchain.cmake
            #330  CMake: Port "make run-xmltest" from GNU Autotools to CMake
            #316  CMake: Windows: Make binary postfix match MSVC
                    Old: expat[d].lib
                    New: expat[w][d][MD|MT].lib
                  CMake: Migrate files from Windows to Unix line endings
            #308  CMake: Integrate OSS-Fuzz fuzzers, option
                    -DEXPAT_BUILD_FUZZERS=(ON|OFF), default OFF
             #14  Drop an OpenVMS support leftover
    #235 #268 ..
    #270 #310 ..
  #313 #331 #333  Address compiler warnings
    #282 #283 ..
       #284 #285  Address cppcheck warnings
       #294 #295  Address Clang Static Analyzer warnings
        #24 #293  Mass-apply clang-format 9 (and ensure conformance during CI)
                  Version info bumped from 7:9:6 to 7:10:6

        Special thanks to:
            David Loffredo
            Joonun Jang
            Khajapasha Mohammed
            Kishore Kunche
            Marco Maggi
            Mitch Phillips
            Rolf Ade
            xantares
            Zhongyuan Zhou
@
text
@d3 1
a3 1
#   Copyright 1992-2018 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2018-01-01'
d18 1
a18 1
# along with this program; if not, see <https://www.gnu.org/licenses/>.
d36 1
a36 1
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
d60 1
a60 1
Options:
d70 1
a70 1
Copyright 1992-2018 Free Software Foundation, Inc.
d232 3
d266 1
a266 1
	| i370 | i860 | i960 | ia16 | ia64 \
d318 1
a318 1
	| wasm32 \
d391 1
a391 1
	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
a448 1
	| wasm32-* \
d644 1
a644 1
	dpx2*)
d924 1
a924 1
	next | m*-next)
a968 3
	nsx-tandem)
		basic_machine=nsx-tandem
		;;
a1263 3
	wasm32)
		basic_machine=wasm32-unknown
		;;
a1271 3
	x64)
		basic_machine=x86_64-pc
		;;
d1379 2
a1380 2
	# First match some system type aliases that might get confused
	# with valid system types.
d1400 1
a1400 1
	# Now accept the basic system types.
d1402 1
a1402 1
	# Each alternative MUST end in a * to match a version number.
d1430 1
a1430 1
	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
d1505 1
a1505 1
	-ns2)
a1559 13
	-pikeos*)
		# Until real need of OS specific support for
		# particular features comes up, bare metal
		# configurations are quite functional.
		case $basic_machine in
		    arm*)
			os=-eabi
			;;
		    *)
			os=-elf
			;;
		esac
		;;
d1707 1
a1707 1
	*-next)
d1842 1
a1842 1
# eval: (add-hook 'write-file-functions 'time-stamp)
@


1.1.1.7
log
@Upgrade expat from 2.2.8 -> 2.4.6 to include the security fixes from 2.4.5

Release 2.4.6 Sun February 20 2022
        Bug fixes:
            #566  Fix a regression introduced by the fix for CVE-2022-25313
                    in release 2.4.5 that affects applications that (1)
                    call function XML_SetElementDeclHandler and (2) are
                    parsing XML that contains nested element declarations
                    (e.g. "<!ELEMENT junk ((bar|foo|xyz+), zebra*)>").

        Other changes:
       #567 #568  Version info bumped from 9:5:8 to 9:6:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Matt Sergeant
            Samanta Navarro
            Sergei Trofimovich
                 and
            NixOS
            Perl XML::Parser

Release 2.4.5 Fri February 18 2022
        Security fixes:
            #562  CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8
                    sequences (e.g. from start tag names) to the XML
                    processing application on top of Expat can cause
                    arbitrary damage (e.g. code execution) depending
                    on how invalid UTF-8 is handled inside the XML
                    processor; validation was not their job but Expat's.
                    Exploits with code execution are known to exist.
            #561  CVE-2022-25236 -- Passing (one or more) namespace separator
                    characters in "xmlns[:prefix]" attribute values
                    made Expat send malformed tag names to the XML
                    processor on top of Expat which can cause
                    arbitrary damage (e.g. code execution) depending
                    on such unexpectable cases are handled inside the XML
                    processor; validation was not their job but Expat's.
                    Exploits with code execution are known to exist.
            #558  CVE-2022-25313 -- Fix stack exhaustion in doctype parsing
                    that could be triggered by e.g. a 2 megabytes
                    file with a large number of opening braces.
                    Expected impact is denial of service or potentially
                    arbitrary code execution.
            #560  CVE-2022-25314 -- Fix integer overflow in function copyString;
                    only affects the encoding name parameter at parser creation
                    time which is often hardcoded (rather than user input),
                    takes a value in the gigabytes to trigger, and a 64-bit
                    machine.  Expected impact is denial of service.
            #559  CVE-2022-25315 -- Fix integer overflow in function storeRawNames;
                    needs input in the gigabytes and a 64-bit machine.
                    Expected impact is denial of service or potentially
                    arbitrary code execution.

        Other changes:
       #557 #564  Version info bumped from 9:4:8 to 9:5:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Ivan Fratric
            Samanta Navarro
                 and
            Google Project Zero
            JetBrains

Release 2.4.4 Sun January 30 2022
        Security fixes:
            #550  CVE-2022-23852 -- Fix signed integer overflow
                    (undefined behavior) in function XML_GetBuffer
                    (that is also called by function XML_Parse internally)
                    for when XML_CONTEXT_BYTES is defined to >0 (which is both
                    common and default).
                    Impact is denial of service or more.
            #551  CVE-2022-23990 -- Fix unsigned integer overflow in function
                    doProlog triggered by large content in element type
                    declarations when there is an element declaration handler
                    present (from a prior call to XML_SetElementDeclHandler).
                    Impact is denial of service or more.

        Bug fixes:
       #544 #545  xmlwf: Fix a memory leak on output file opening error

        Other changes:
            #546  Autotools: Fix broken CMake support under Cygwin
            #554  Windows: Add missing files to the installer to fix
                    compilation with CMake from installed sources
       #552 #554  Version info bumped from 9:3:8 to 9:4:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Carlo Bramini
            hwt0415
            Roland Illig
            Samanta Navarro
                 and
            Clang LeakSan and the Clang team

Release 2.4.3 Sun January 16 2022
        Security fixes:
       #531 #534  CVE-2021-45960 -- Fix issues with left shifts by >=29 places
                    resulting in
                      a) realloc acting as free
                      b) realloc allocating too few bytes
                      c) undefined behavior
                    depending on architecture and precise value
                    for XML documents with >=2^27+1 prefixed attributes
                    on a single XML tag a la
                    "<r xmlns:a='[..]' a:a123='[..]' [..] />"
                    where XML_ParserCreateNS is used to create the parser
                    (which needs argument "-n" when running xmlwf).
                    Impact is denial of service, or more.
       #532 #538  CVE-2021-46143 (ZDI-CAN-16157) -- Fix integer overflow
                    on variable m_groupSize in function doProlog leading
                    to realloc acting as free.
                    Impact is denial of service or more.
            #539  CVE-2022-22822 to CVE-2022-22827 -- Prevent integer overflows
                    near memory allocation at multiple places.  Mitre assigned
                    a dedicated CVE for each involved internal C function:
                    - CVE-2022-22822 for function addBinding
                    - CVE-2022-22823 for function build_model
                    - CVE-2022-22824 for function defineAttribute
                    - CVE-2022-22825 for function lookup
                    - CVE-2022-22826 for function nextScaffoldPart
                    - CVE-2022-22827 for function storeAtts
                    Impact is denial of service or more.

        Other changes:
            #535  CMake: Make call to file(GENERATE [..]) work for CMake <3.19
            #541  Autotools|CMake: MinGW: Make run.sh(.in) work for Cygwin
                    and MSYS2 by not going through Wine on these platforms
       #527 #528  Address compiler warnings
       #533 #543  Version info bumped from 9:2:8 to 9:3:8;
                    see https://verbump.de/ for what these numbers do

        Infrastructure:
            #536  CI: Check for realistic minimum CMake version
       #529 #539  CI: Cover compilation with -m32
            #529  CI: Store coverage reports as artifacts for download
            #528  CI: Upgrade Clang from 11 to 13

        Special thanks to:
            An anonymous whitehat
            Christopher Degawa
            J. Peter Mugaas
            Tyson Smith
                 and
            GCC Farm Project
            Trend Micro Zero Day Initiative

Release 2.4.2 Sun December 19 2021
        Other changes:
       #509 #510  Link againgst libm for function "isnan"
       #513 #514  Include expat_config.h as early as possible
            #498  Autotools: Include files with release archives:
                    - buildconf.sh
                    - fuzz/*.c
       #507 #519  Autotools: Sync CMake templates
       #495 #524  CMake: MinGW: Fix pkg-config section "Libs" for
                    - non-release build types (e.g. -DCMAKE_BUILD_TYPE=Debug)
                    - multi-config CMake generators (e.g. Ninja Multi-Config)
       #502 #503  docs: Document that function XML_GetBuffer may return NULL
                    when asking for a buffer of 0 (zero) bytes size
       #522 #523  docs: Fix return value docs for both
                    XML_SetBillionLaughsAttackProtection* functions
       #525 #526  Version info bumped from 9:1:8 to 9:2:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Dong-hee Na
            Joergen Ibsen
            Kai Pastor

Release 2.4.1 Sun May 23 2021
        Bug fixes:
       #488 #490  Autotools: Fix installed header expat_config.h for multilib
                    systems; regression introduced in 2.4.0 by pull request #486

        Other changes:
       #491 #492  Version info bumped from 9:0:8 to 9:1:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Gentoo's QA check "multilib_check_headers"

Release 2.4.0 Sun May 23 2021
        Security fixes:
   #34 #466 #484  CVE-2013-0340/CWE-776 -- Protect against billion laughs attacks
                    (denial-of-service; flavors targeting CPU time or RAM or both,
                    leveraging general entities or parameter entities or both)
                    by tracking and limiting the input amplification factor
                    (<amplification> := (<direct> + <indirect>) / <direct>).
                    By conservative default, amplification up to a factor of 100.0
                    is tolerated and rejection only starts after 8 MiB of output bytes
                    (=<direct> + <indirect>) have been processed.
                    The fix adds the following to the API:
                    - A new error code XML_ERROR_AMPLIFICATION_LIMIT_BREACH to
                      signals this specific condition.
                    - Two new API functions ..
                      - XML_SetBillionLaughsAttackProtectionMaximumAmplification and
                      - XML_SetBillionLaughsAttackProtectionActivationThreshold
                      .. to further tighten billion laughs protection parameters
                      when desired.  Please see file "doc/reference.html" for details.
                      If you ever need to increase the defaults for non-attack XML
                      payload, please file a bug report with libexpat.
                    - Two new XML_FEATURE_* constants ..
                      - that can be queried using the XML_GetFeatureList function, and
                      - that are shown in "xmlwf -v" output.
                    - Two new environment variable switches ..
                      - EXPAT_ACCOUNTING_DEBUG=(0|1|2|3) and
                      - EXPAT_ENTITY_DEBUG=(0|1)
                      .. for runtime debugging of accounting and entity processing.
                      Specific behavior of these values may change in the future.
                    - Two new command line arguments "-a FACTOR" and "-b BYTES"
                      for xmlwf to further tighten billion laughs protection
                      parameters when desired.
                      If you ever need to increase the defaults for non-attack XML
                      payload, please file a bug report with libexpat.

        Bug fixes:
       #332 #470  For (non-default) compilation with -DEXPAT_MIN_SIZE=ON (CMake)
                    or CPPFLAGS=-DXML_MIN_SIZE (GNU Autotools): Fix segfault
                    for UTF-16 payloads containing CDATA sections.
       #485 #486  Autotools: Fix generated CMake files for non-64bit and
                    non-Linux platforms (e.g. macOS and MinGW in particular)
                    that were introduced with release 2.3.0

        Other changes:
       #468 #469  xmlwf: Improve help output and the xmlwf man page
            #463  xmlwf: Improve maintainability through some refactoring
            #477  xmlwf: Fix man page DocBook validity
       #458 #459  CMake: Support absolute paths for both CMAKE_INSTALL_LIBDIR
                    and CMAKE_INSTALL_INCLUDEDIR
       #471 #481  CMake: Add support for standard variable BUILD_SHARED_LIBS
            #457  Unexpose symbol _INTERNAL_trim_to_complete_utf8_characters
            #467  Resolve macro HAVE_EXPAT_CONFIG_H
            #472  Delete unused legacy helper file "conftools/PrintPath"
       #473 #483  Improve attribution
  #464 #465 #477  doc/reference.html: Fix XHTML validity
       #475 #478  doc/reference.html: Replace the 90s look by OK.css
            #479  Version info bumped from 8:0:7 to 9:0:8
                    due to addition of new symbols and error codes;
                    see https://verbump.de/ for what these numbers do

        Infrastructure:
            #456  CI: Enable periodic runs
            #457  CI: Start covering the list of exported symbols
            #474  CI: Isolate coverage task
       #476 #482  CI: Adapt to breaking changes in image "ubuntu-18.04"
            #477  CI: Cover well-formedness and DocBook/XHTML validity
                    of doc/reference.html and doc/xmlwf.xml

        Special thanks to:
            Dimitry Andric
            Eero Helenius
            Nick Wellnhofer
            Rhodri James
            Tomas Korbar
            Yury Gribov
                 and
            Clang LeakSan
            JetBrains
            OSS-Fuzz

Release 2.3.0 Thu March 25 2021
        Bug fixes:
            #438  When calling XML_ParseBuffer without a prior successful call to
                    XML_GetBuffer as a user, no longer trigger undefined behavior
                    (by adding an integer to a NULL pointer) but rather return
                    XML_STATUS_ERROR and set the error code to (new) code
                    XML_ERROR_NO_BUFFER. Found by UBSan (UndefinedBehaviorSanitizer)
                    of Clang 11 (but not Clang 9).
            #444  xmlwf: Exit status 2 was used for both:
                    - malformed input files (documented) and
                    - invalid command-line arguments (undocumented).
                    The case of invalid command-line arguments now
                    has its own exit status 4, resolving the ambiguity.

        Other changes:
            #439  xmlwf: Add argument -k to allow continuing after
                    non-fatal errors
            #439  xmlwf: Add section about exit status to the -h help output
  #422 #426 #447  Windows: Drop support for Visual Studio <=14.0/2015
            #434  Windows: CMake: Detect unsupported Visual Studio at
                    configure time (rather than at compile time)
       #382 #428  testrunner: Make verbose mode (argument "-v") report
                    about passed tests, and make default mode report about
                    failures, as well.
            #442  CMake: Call "enable_language(CXX)" prior to tinkering
                    with CMAKE_CXX_* variables
            #448  Document use of libexpat from a CMake-based project
            #451  Autotools: Install CMake files as generated by CMake 3.19.6
                    so that users with "find_package(expat [..] CONFIG [..])"
                    are served on distributions that are *not* using the CMake
                    build system inside for libexpat packaging
       #436 #437  Autotools: Drop obsolescent macro AC_HEADER_STDC
       #450 #452  Autotools: Resolve use of obsolete macro AC_CONFIG_HEADER
            #441  Address compiler warnings
            #443  Version info bumped from 7:12:6 to 8:0:7
                    due to addition of error code XML_ERROR_NO_BUFFER
                    (see https://verbump.de/ for what these numbers do)

        Infrastructure:
       #435 #446  Replace Travis CI by GitHub Actions

        Special thanks to:
            Alexander Richardson
            Oleksandr Popovych
            Thomas Beutlich
            Tim Bray
                 and
            Clang LeakSan, Clang 11 UBSan and the Clang team

Release 2.2.10 Sat October 3 2020
        Bug fixes:
  #390 #395 #398  Fix undefined behavior during parsing caused by
                    pointer arithmetic with NULL pointers
       #404 #405  Fix reading uninitialized variable during parsing
            #406  xmlwf: Add missing check for malloc NULL return

        Other changes:
            #396  Windows: Drop support for Visual Studio <=8.0/2005
            #409  Windows: Add missing file "Changes" to the installer
                    to fix compilation with CMake from installed sources
            #403  xmlwf: Document exit codes in xmlwf manpage and
                    exit with code 3 (rather than code 1) for output errors
                    when used with "-d DIRECTORY"
       #356 #359  MinGW: Provide declaration of rand_s for mingwrt <5.3.0
       #383 #392  Autotools: Use -Werror while configure tests the compiler
                    for supported compile flags to avoid false positives
  #383 #393 #394  Autotools: Improve handling of user (C|CPP|CXX|LD)FLAGS,
                    e.g. ensure that they have the last word over flags added
                    while running ./configure
            #360  CMake: Create libexpatw.{dll,so} and expatw.pc (with emphasis
                    on suffix "w") with -DEXPAT_CHAR_TYPE=(ushort|wchar_t)
            #360  CMake: Detect and deny unsupported build combinations
                    involving -DEXPAT_CHAR_TYPE=(ushort|wchar_t)
            #360  CMake: Install pre-compiled shipped xmlwf.1 manpage in case
                    of -DEXPAT_BUILD_DOCS=OFF
  #375 #380 #419  CMake: Fix use of Expat by means of add_subdirectory
       #407 #408  CMake: Keep expat target name constant at "expat"
                    (i.e. refrain from using the target name to control
                    build artifact filenames)
            #385  CMake: Fix compilation with -DEXPAT_SHARED_LIBS=OFF for
                    Windows
                  CMake: Expose man page compilation as target "xmlwf-manpage"
       #413 #414  CMake: Introduce option EXPAT_BUILD_PKGCONFIG
                    to control generation of pkg-config file "expat.pc"
            #424  CMake: Add minimalistic support for building binary packages
                    with CMake target "package"; based on CPack
            #366  CMake: Add option -DEXPAT_OSSFUZZ_BUILD=(ON|OFF) with
                    default OFF to build fuzzer code against OSS-Fuzz and
                    related environment variable LIB_FUZZING_ENGINE
            #354  Fix testsuite for -DEXPAT_DTD=OFF and -DEXPAT_NS=OFF, each
    #354 #355 ..
       #356 #412  Address compiler warnings
       #368 #369  Address pngcheck warnings with doc/*.png images
            #425  Version info bumped from 7:11:6 to 7:12:6

        Special thanks to:
            asavah
            Ben Wagner
            Bhargava Shastry
            Frank Landgraf
            Jeffrey Walton
            Joe Orton
            Kleber Tarcísio
            Ma Lin
            Maciej Sroczy#ski
            Mohammed Khajapasha
            Vadim Zeitlin
                 and
            Cppcheck 2.0 and the Cppcheck team

Release 2.2.9 Wed September 25 2019
        Other changes:
                  examples: Drop executable bits from elements.c
            #349  Windows: Change the name of the Windows DLLs from expat*.dll
                    to libexpat*.dll once more (regression from 2.2.8, first
                    fixed in 1.95.3, issue #61 on SourceForge today,
                    was issue #432456 back then); needs a fix due
                    case-insensitive file systems on Windows and the fact that
                    Perl's XML::Parser::Expat compiles into Expat.dll.
            #347  Windows: Only define _CRT_RAND_S if not defined
                  Version info bumped from 7:10:6 to 7:11:6

        Special thanks to:
            Ben Wagner
@
text
@d3 1
a3 1
#   Copyright 1992-2021 Free Software Foundation, Inc.
d5 1
a5 1
timestamp='2021-01-07'
d36 1
a36 1
# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
d53 1
a53 1
me=$(echo "$0" | sed -e 's,.*/,,')
d70 1
a70 1
Copyright 1992-2021 Free Software Foundation, Inc.
d92 1
a92 1
       echo "$me: invalid option $1$help" >&2
d97 1
a97 1
       echo "$1"
d113 112
a224 11
# Split fields of configuration type
# shellcheck disable=SC2162
IFS="-" read field1 field2 field3 field4 <<EOF
$1
EOF

# Separate into logical components for further validation
case $1 in
	*-*-*-*-*)
		echo Invalid configuration \`"$1"\': more than four components >&2
		exit 1
d226 2
a227 3
	*-*-*-*)
		basic_machine=$field1-$field2
		basic_os=$field3-$field4
d229 2
a230 21
	*-*-*)
		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
		# parts
		maybe_os=$field2-$field3
		case $maybe_os in
			nto-qnx* | linux-* | uclinux-uclibc* \
			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
			| storm-chaos* | os2-emx* | rtmk-nova*)
				basic_machine=$field1
				basic_os=$maybe_os
				;;
			android-linux)
				basic_machine=$field1-unknown
				basic_os=linux-android
				;;
			*)
				basic_machine=$field1-$field2
				basic_os=$field3
				;;
		esac
d232 2
a233 35
	*-*)
		# A lone config we happen to match not fitting any pattern
		case $field1-$field2 in
			decstation-3100)
				basic_machine=mips-dec
				basic_os=
				;;
			*-*)
				# Second component is usually, but not always the OS
				case $field2 in
					# Prevent following clause from handling this valid os
					sun*os*)
						basic_machine=$field1
						basic_os=$field2
						;;
					# Manufacturers
					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
					| convergent* | ncr* | news | 32* | 3600* | 3100* \
					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
					| ultra | tti* | harris | dolphin | highlevel | gould \
					| cbm | ns | masscomp | apple | axis | knuth | cray \
					| microblaze* | sim | cisco \
					| oki | wec | wrs | winbond)
						basic_machine=$field1-$field2
						basic_os=
						;;
					*)
						basic_machine=$field1
						basic_os=$field2
						;;
				esac
			;;
		esac
d235 3
a237 453
	*)
		# Convert single-component short-hands not valid as part of
		# multi-component configurations.
		case $field1 in
			386bsd)
				basic_machine=i386-pc
				basic_os=bsd
				;;
			a29khif)
				basic_machine=a29k-amd
				basic_os=udi
				;;
			adobe68k)
				basic_machine=m68010-adobe
				basic_os=scout
				;;
			alliant)
				basic_machine=fx80-alliant
				basic_os=
				;;
			altos | altos3068)
				basic_machine=m68k-altos
				basic_os=
				;;
			am29k)
				basic_machine=a29k-none
				basic_os=bsd
				;;
			amdahl)
				basic_machine=580-amdahl
				basic_os=sysv
				;;
			amiga)
				basic_machine=m68k-unknown
				basic_os=
				;;
			amigaos | amigados)
				basic_machine=m68k-unknown
				basic_os=amigaos
				;;
			amigaunix | amix)
				basic_machine=m68k-unknown
				basic_os=sysv4
				;;
			apollo68)
				basic_machine=m68k-apollo
				basic_os=sysv
				;;
			apollo68bsd)
				basic_machine=m68k-apollo
				basic_os=bsd
				;;
			aros)
				basic_machine=i386-pc
				basic_os=aros
				;;
			aux)
				basic_machine=m68k-apple
				basic_os=aux
				;;
			balance)
				basic_machine=ns32k-sequent
				basic_os=dynix
				;;
			blackfin)
				basic_machine=bfin-unknown
				basic_os=linux
				;;
			cegcc)
				basic_machine=arm-unknown
				basic_os=cegcc
				;;
			convex-c1)
				basic_machine=c1-convex
				basic_os=bsd
				;;
			convex-c2)
				basic_machine=c2-convex
				basic_os=bsd
				;;
			convex-c32)
				basic_machine=c32-convex
				basic_os=bsd
				;;
			convex-c34)
				basic_machine=c34-convex
				basic_os=bsd
				;;
			convex-c38)
				basic_machine=c38-convex
				basic_os=bsd
				;;
			cray)
				basic_machine=j90-cray
				basic_os=unicos
				;;
			crds | unos)
				basic_machine=m68k-crds
				basic_os=
				;;
			da30)
				basic_machine=m68k-da30
				basic_os=
				;;
			decstation | pmax | pmin | dec3100 | decstatn)
				basic_machine=mips-dec
				basic_os=
				;;
			delta88)
				basic_machine=m88k-motorola
				basic_os=sysv3
				;;
			dicos)
				basic_machine=i686-pc
				basic_os=dicos
				;;
			djgpp)
				basic_machine=i586-pc
				basic_os=msdosdjgpp
				;;
			ebmon29k)
				basic_machine=a29k-amd
				basic_os=ebmon
				;;
			es1800 | OSE68k | ose68k | ose | OSE)
				basic_machine=m68k-ericsson
				basic_os=ose
				;;
			gmicro)
				basic_machine=tron-gmicro
				basic_os=sysv
				;;
			go32)
				basic_machine=i386-pc
				basic_os=go32
				;;
			h8300hms)
				basic_machine=h8300-hitachi
				basic_os=hms
				;;
			h8300xray)
				basic_machine=h8300-hitachi
				basic_os=xray
				;;
			h8500hms)
				basic_machine=h8500-hitachi
				basic_os=hms
				;;
			harris)
				basic_machine=m88k-harris
				basic_os=sysv3
				;;
			hp300 | hp300hpux)
				basic_machine=m68k-hp
				basic_os=hpux
				;;
			hp300bsd)
				basic_machine=m68k-hp
				basic_os=bsd
				;;
			hppaosf)
				basic_machine=hppa1.1-hp
				basic_os=osf
				;;
			hppro)
				basic_machine=hppa1.1-hp
				basic_os=proelf
				;;
			i386mach)
				basic_machine=i386-mach
				basic_os=mach
				;;
			isi68 | isi)
				basic_machine=m68k-isi
				basic_os=sysv
				;;
			m68knommu)
				basic_machine=m68k-unknown
				basic_os=linux
				;;
			magnum | m3230)
				basic_machine=mips-mips
				basic_os=sysv
				;;
			merlin)
				basic_machine=ns32k-utek
				basic_os=sysv
				;;
			mingw64)
				basic_machine=x86_64-pc
				basic_os=mingw64
				;;
			mingw32)
				basic_machine=i686-pc
				basic_os=mingw32
				;;
			mingw32ce)
				basic_machine=arm-unknown
				basic_os=mingw32ce
				;;
			monitor)
				basic_machine=m68k-rom68k
				basic_os=coff
				;;
			morphos)
				basic_machine=powerpc-unknown
				basic_os=morphos
				;;
			moxiebox)
				basic_machine=moxie-unknown
				basic_os=moxiebox
				;;
			msdos)
				basic_machine=i386-pc
				basic_os=msdos
				;;
			msys)
				basic_machine=i686-pc
				basic_os=msys
				;;
			mvs)
				basic_machine=i370-ibm
				basic_os=mvs
				;;
			nacl)
				basic_machine=le32-unknown
				basic_os=nacl
				;;
			ncr3000)
				basic_machine=i486-ncr
				basic_os=sysv4
				;;
			netbsd386)
				basic_machine=i386-pc
				basic_os=netbsd
				;;
			netwinder)
				basic_machine=armv4l-rebel
				basic_os=linux
				;;
			news | news700 | news800 | news900)
				basic_machine=m68k-sony
				basic_os=newsos
				;;
			news1000)
				basic_machine=m68030-sony
				basic_os=newsos
				;;
			necv70)
				basic_machine=v70-nec
				basic_os=sysv
				;;
			nh3000)
				basic_machine=m68k-harris
				basic_os=cxux
				;;
			nh[45]000)
				basic_machine=m88k-harris
				basic_os=cxux
				;;
			nindy960)
				basic_machine=i960-intel
				basic_os=nindy
				;;
			mon960)
				basic_machine=i960-intel
				basic_os=mon960
				;;
			nonstopux)
				basic_machine=mips-compaq
				basic_os=nonstopux
				;;
			os400)
				basic_machine=powerpc-ibm
				basic_os=os400
				;;
			OSE68000 | ose68000)
				basic_machine=m68000-ericsson
				basic_os=ose
				;;
			os68k)
				basic_machine=m68k-none
				basic_os=os68k
				;;
			paragon)
				basic_machine=i860-intel
				basic_os=osf
				;;
			parisc)
				basic_machine=hppa-unknown
				basic_os=linux
				;;
			psp)
				basic_machine=mipsallegrexel-sony
				basic_os=psp
				;;
			pw32)
				basic_machine=i586-unknown
				basic_os=pw32
				;;
			rdos | rdos64)
				basic_machine=x86_64-pc
				basic_os=rdos
				;;
			rdos32)
				basic_machine=i386-pc
				basic_os=rdos
				;;
			rom68k)
				basic_machine=m68k-rom68k
				basic_os=coff
				;;
			sa29200)
				basic_machine=a29k-amd
				basic_os=udi
				;;
			sei)
				basic_machine=mips-sei
				basic_os=seiux
				;;
			sequent)
				basic_machine=i386-sequent
				basic_os=
				;;
			sps7)
				basic_machine=m68k-bull
				basic_os=sysv2
				;;
			st2000)
				basic_machine=m68k-tandem
				basic_os=
				;;
			stratus)
				basic_machine=i860-stratus
				basic_os=sysv4
				;;
			sun2)
				basic_machine=m68000-sun
				basic_os=
				;;
			sun2os3)
				basic_machine=m68000-sun
				basic_os=sunos3
				;;
			sun2os4)
				basic_machine=m68000-sun
				basic_os=sunos4
				;;
			sun3)
				basic_machine=m68k-sun
				basic_os=
				;;
			sun3os3)
				basic_machine=m68k-sun
				basic_os=sunos3
				;;
			sun3os4)
				basic_machine=m68k-sun
				basic_os=sunos4
				;;
			sun4)
				basic_machine=sparc-sun
				basic_os=
				;;
			sun4os3)
				basic_machine=sparc-sun
				basic_os=sunos3
				;;
			sun4os4)
				basic_machine=sparc-sun
				basic_os=sunos4
				;;
			sun4sol2)
				basic_machine=sparc-sun
				basic_os=solaris2
				;;
			sun386 | sun386i | roadrunner)
				basic_machine=i386-sun
				basic_os=
				;;
			sv1)
				basic_machine=sv1-cray
				basic_os=unicos
				;;
			symmetry)
				basic_machine=i386-sequent
				basic_os=dynix
				;;
			t3e)
				basic_machine=alphaev5-cray
				basic_os=unicos
				;;
			t90)
				basic_machine=t90-cray
				basic_os=unicos
				;;
			toad1)
				basic_machine=pdp10-xkl
				basic_os=tops20
				;;
			tpf)
				basic_machine=s390x-ibm
				basic_os=tpf
				;;
			udi29k)
				basic_machine=a29k-amd
				basic_os=udi
				;;
			ultra3)
				basic_machine=a29k-nyu
				basic_os=sym1
				;;
			v810 | necv810)
				basic_machine=v810-nec
				basic_os=none
				;;
			vaxv)
				basic_machine=vax-dec
				basic_os=sysv
				;;
			vms)
				basic_machine=vax-dec
				basic_os=vms
				;;
			vsta)
				basic_machine=i386-pc
				basic_os=vsta
				;;
			vxworks960)
				basic_machine=i960-wrs
				basic_os=vxworks
				;;
			vxworks68)
				basic_machine=m68k-wrs
				basic_os=vxworks
				;;
			vxworks29k)
				basic_machine=a29k-wrs
				basic_os=vxworks
				;;
			xbox)
				basic_machine=i686-pc
				basic_os=mingw32
				;;
			ymp)
				basic_machine=ymp-cray
				basic_os=unicos
				;;
			*)
				basic_machine=$1
				basic_os=
				;;
		esac
d241 1
a241 1
# Decode 1-component or ad-hoc basic machines
d243 92
a334 5
	# Here we handle the default manufacturer of certain CPU types.  It is in
	# some cases the only manufacturer, in others, it is the most popular.
	w89k)
		cpu=hppa1.1
		vendor=winbond
d336 1
a336 3
	op50n)
		cpu=hppa1.1
		vendor=oki
d338 2
a339 3
	op60c)
		cpu=hppa1.1
		vendor=oki
d341 3
a343 3
	ibm*)
		cpu=i370
		vendor=ibm
d345 3
a347 3
	orion105)
		cpu=clipper
		vendor=highlevel
d349 2
a350 3
	mac | mpw | mac-mpw)
		cpu=m68k
		vendor=apple
d352 3
a354 3
	pmac | pmac-mpw)
		cpu=powerpc
		vendor=apple
d357 100
d459 4
d464 1
a464 2
		cpu=m68000
		vendor=att
d467 74
a540 2
		cpu=we32k
		vendor=att
d543 70
a612 3
		cpu=powerpc
		vendor=ibm
		basic_os=cnk
d615 2
a616 3
		cpu=pdp10
		vendor=dec
		basic_os=tops10
d619 2
a620 3
		cpu=pdp10
		vendor=dec
		basic_os=tops20
d624 17
a640 2
		cpu=m68k
		vendor=motorola
d643 18
a660 3
		cpu=m68k
		vendor=bull
		basic_os=sysv3
d663 1
a663 2
		cpu=ns32k
		vendor=encore
d665 3
a667 4
	elxsi)
		cpu=elxsi
		vendor=elxsi
		basic_os=${basic_os:-bsd}
d670 1
a670 2
		cpu=i860
		vendor=alliant
d673 9
a681 2
		cpu=ns32k
		vendor=ns
d684 29
a712 3
		cpu=hppa1.1
		vendor=hitachi
		basic_os=hiuxwe2
d715 1
a715 2
		cpu=hppa1.0
		vendor=hp
d718 1
a718 2
		cpu=m68000
		vendor=hp
d721 1
a721 2
		cpu=m68k
		vendor=hp
d724 1
a724 2
		cpu=hppa1.0
		vendor=hp
d727 1
a727 2
		cpu=hppa1.1
		vendor=hp
d731 1
a731 2
		cpu=hppa1.1
		vendor=hp
d735 1
a735 2
		cpu=hppa1.1
		vendor=hp
d738 1
a738 2
		cpu=hppa1.1
		vendor=hp
d741 15
a755 2
		cpu=hppa1.0
		vendor=hp
d758 2
a759 3
		cpu=$(echo "$1" | sed -e 's/86.*/86/')
		vendor=pc
		basic_os=sysv32
d762 2
a763 3
		cpu=$(echo "$1" | sed -e 's/86.*/86/')
		vendor=pc
		basic_os=sysv4
d766 2
a767 3
		cpu=$(echo "$1" | sed -e 's/86.*/86/')
		vendor=pc
		basic_os=sysv
d770 10
a779 8
		cpu=$(echo "$1" | sed -e 's/86.*/86/')
		vendor=pc
		basic_os=solaris2
		;;
	j90 | j90-cray)
		cpu=j90
		vendor=cray
		basic_os=${basic_os:-unicos}
d782 3
a784 4
		cpu=mips
		vendor=sgi
		case $basic_os in
		    irix*)
d787 1
a787 1
			basic_os=irix4
d791 41
d833 1
a833 2
		cpu=m68000
		vendor=convergent
d835 6
a840 8
	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
		cpu=m68k
		vendor=atari
		basic_os=mint
		;;
	mipsEE* | ee)
		cpu=mips64r5900el
		vendor=scei
d842 1
a842 1
		    linux*)
d845 1
a845 1
			os=elf
d850 2
a851 3
		cpu=mipsel
		vendor=scei
		os=irx
d854 59
a912 3
		cpu=dvp
		vendor=scei
		os=elf
d915 6
a920 3
		cpu=mips
		vendor=sony
		basic_os=newsos
d923 3
a925 6
		cpu=m68k
		vendor=next
		case $basic_os in
		    openstep*)
		        ;;
		    nextstep*)
d927 2
a928 2
		    ns2*)
		      basic_os=nextstep2
d931 1
a931 1
		      basic_os=nextstep3
d935 20
d956 13
a968 2
		cpu=np1
		vendor=gould
d971 17
a987 3
		cpu=hppa1.1
		vendor=oki
		basic_os=proelf
d990 14
a1003 3
		cpu=hppa1.1
		vendor=hitachi
		basic_os=hiuxwe2
d1006 1
a1006 2
		cpu=sparc
		vendor=tti
d1009 10
a1018 2
		cpu=m68k
		vendor=tti
d1020 2
a1021 3
	pc532)
		cpu=ns32k
		vendor=pc532
d1023 11
a1033 3
	pn)
		cpu=pn
		vendor=gould
d1035 2
a1036 3
	power)
		cpu=power
		vendor=ibm
d1038 2
a1039 3
	ps2)
		cpu=i386
		vendor=ibm
d1041 2
a1042 3
	rm[46]00)
		cpu=mips
		vendor=siemens
d1044 2
a1045 3
	rtpc | rtpc-*)
		cpu=romp
		vendor=ibm
d1047 1
a1047 9
	sde)
		cpu=mipsisa32
		vendor=sde
		basic_os=${basic_os:-elf}
		;;
	simso-wrs)
		cpu=sparclite
		vendor=wrs
		basic_os=vxworks
d1049 1
a1049 3
	tower | tower-32)
		cpu=m68k
		vendor=ncr
d1051 2
a1052 3
	vpp*|vx|vx-*)
		cpu=f301
		vendor=fujitsu
d1054 2
a1055 3
	w65)
		cpu=w65
		vendor=wdc
d1057 2
a1058 4
	w89k-*)
		cpu=hppa1.1
		vendor=winbond
		basic_os=proelf
d1060 1
a1060 3
	none)
		cpu=none
		vendor=none
d1062 1
a1062 3
	leon|leon[3-9])
		cpu=sparc
		vendor=$basic_machine
d1064 2
a1065 3
	leon-*|leon[3-9]-*)
		cpu=sparc
		vendor=$(echo "$basic_machine" | sed 's/-.*//')
d1067 2
a1068 6

	*-*)
		# shellcheck disable=SC2162
		IFS="-" read cpu vendor <<EOF
$basic_machine
EOF
d1070 2
a1071 6
	# We use `pc' rather than `unknown'
	# because (1) that's what they normally are, and
	# (2) the word "unknown" tends to confuse beginning users.
	i*86 | x86_64)
		cpu=$basic_machine
		vendor=pc
d1073 15
a1087 5
	# These rules are duplicated from below for sake of the special case above;
	# i.e. things that normalized to x86 arches should also default to "pc"
	pc98)
		cpu=i386
		vendor=pc
d1089 2
a1090 3
	x64 | amd64)
		cpu=x86_64
		vendor=pc
d1092 2
a1093 4
	# Recognize the basic CPU types without company name.
	*)
		cpu=$basic_machine
		vendor=unknown
d1095 2
a1096 11
esac

unset -v basic_machine

# Decode basic machines in the full and proper CPU-Company form.
case $cpu-$vendor in
	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
	# some cases the only manufacturer, in others, it is the most popular.
	craynv-unknown)
		vendor=cray
		basic_os=${basic_os:-unicosmp}
d1098 2
a1099 3
	c90-unknown | c90-cray)
		vendor=cray
		basic_os=${Basic_os:-unicos}
d1101 3
a1103 2
	fx80-unknown)
		vendor=alliant
d1105 2
a1106 2
	romp-unknown)
		vendor=ibm
d1108 2
a1109 2
	mmix-unknown)
		vendor=knuth
d1111 3
a1113 2
	microblaze-unknown | microblazeel-unknown)
		vendor=xilinx
d1115 3
a1117 2
	rs6000-unknown)
		vendor=ibm
d1119 2
a1120 2
	vax-unknown)
		vendor=dec
d1122 3
a1124 2
	pdp11-unknown)
		vendor=dec
d1126 2
a1127 2
	we32k-unknown)
		vendor=att
d1129 2
a1130 2
	cydra-unknown)
		vendor=cydrome
d1132 3
a1134 2
	i370-ibm*)
		vendor=ibm
d1136 3
a1138 2
	orion-unknown)
		vendor=highlevel
d1140 2
a1141 3
	xps-unknown | xps100-unknown)
		cpu=xps100
		vendor=honeywell
d1143 2
a1144 6

	# Here we normalize CPU types with a missing or matching vendor
	dpx20-unknown | dpx20-bull)
		cpu=rs6000
		vendor=bull
		basic_os=${basic_os:-bosx}
d1146 3
a1148 4

	# Here we normalize CPU types irrespective of the vendor
	amd64-*)
		cpu=x86_64
d1150 2
a1151 3
	blackfin-*)
		cpu=bfin
		basic_os=linux
d1153 2
a1154 2
	c54x-*)
		cpu=tic54x
d1156 3
a1158 2
	c55x-*)
		cpu=tic55x
d1160 3
a1162 2
	c6x-*)
		cpu=tic6x
d1164 3
a1166 3
	e500v[12]-*)
		cpu=powerpc
		basic_os=${basic_os}"spe"
d1168 3
a1170 2
	mips3*-*)
		cpu=mips64
d1172 3
a1174 2
	ms1-*)
		cpu=mt
d1176 3
a1178 3
	m68knommu-*)
		cpu=m68k
		basic_os=linux
d1180 3
a1182 2
	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
		cpu=s12z
d1184 2
a1185 2
	openrisc-*)
		cpu=or32
d1187 2
a1188 3
	parisc-*)
		cpu=hppa
		basic_os=linux
d1190 2
a1191 2
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
		cpu=i586
d1193 3
a1195 2
	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
		cpu=i686
d1197 3
a1199 2
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
		cpu=i686
d1201 3
a1203 2
	pentium4-*)
		cpu=i786
d1205 3
a1207 2
	pc98-*)
		cpu=i386
d1209 3
a1211 2
	ppc-* | ppcbe-*)
		cpu=powerpc
d1213 2
a1214 2
	ppcle-* | powerpclittle-*)
		cpu=powerpcle
d1216 2
a1217 2
	ppc64-*)
		cpu=powerpc64
d1219 3
a1221 2
	ppc64le-* | powerpc64little-*)
		cpu=powerpc64le
d1223 2
a1224 2
	sb1-*)
		cpu=mipsisa64sb1
d1226 23
a1248 2
	sb1el-*)
		cpu=mipsisa64sb1el
d1250 2
a1251 2
	sh5e[lb]-*)
		cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/')
d1253 18
a1270 2
	spur-*)
		cpu=spur
d1272 3
a1274 2
	strongarm-* | thumb-*)
		cpu=arm
d1276 2
a1277 2
	tx39-*)
		cpu=mipstx39
d1279 3
a1281 2
	tx39el-*)
		cpu=mipstx39el
d1283 2
a1284 2
	x64-*)
		cpu=x86_64
d1287 1
a1287 1
		cpu=$(echo "$cpu" | sed 's/^xscale/arm/')
d1289 15
a1303 2
	arm64-*)
		cpu=aarch64
d1306 16
a1321 4
	# Recognize the canonical CPU Types that limit and/or modify the
	# company names they are paired with.
	cr16-*)
		basic_os=${basic_os:-elf}
d1323 2
a1324 3
	crisv32-* | etraxfs*-*)
		cpu=crisv32
		vendor=axis
d1326 2
a1327 3
	cris-* | etrax*-*)
		cpu=cris
		vendor=axis
d1329 3
a1331 2
	crx-*)
		basic_os=${basic_os:-elf}
d1333 11
a1343 3
	neo-tandem)
		cpu=neo
		vendor=tandem
d1345 2
a1346 3
	nse-tandem)
		cpu=nse
		vendor=tandem
d1348 2
a1349 3
	nsr-tandem)
		cpu=nsr
		vendor=tandem
d1351 2
a1352 3
	nsv-tandem)
		cpu=nsv
		vendor=tandem
d1354 2
a1355 3
	nsx-tandem)
		cpu=nsx
		vendor=tandem
d1357 2
a1358 3
	mipsallegrexel-sony)
		cpu=mipsallegrexel
		vendor=sony
d1360 2
a1361 2
	tile*-*)
		basic_os=${basic_os:-linux-gnu}
a1362 1

d1364 2
a1365 110
		# Recognize the canonical CPU types that are allowed with any
		# company name.
		case $cpu in
			1750a | 580 \
			| a29k \
			| aarch64 | aarch64_be \
			| abacus \
			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
			| alphapca5[67] | alpha64pca5[67] \
			| am33_2.0 \
			| amdgcn \
			| arc | arceb \
			| arm | arm[lb]e | arme[lb] | armv* \
			| avr | avr32 \
			| asmjs \
			| ba \
			| be32 | be64 \
			| bfin | bpf | bs2000 \
			| c[123]* | c30 | [cjt]90 | c4x \
			| c8051 | clipper | craynv | csky | cydra \
			| d10v | d30v | dlx | dsp16xx | dvp \
			| e2k | elxsi | epiphany \
			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
			| h8300 | h8500 \
			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
			| hexagon \
			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
			| ip2k | iq2000 \
			| k1om \
			| le32 | le64 \
			| lm32 \
			| loongarch32 | loongarch64 | loongarchx32 \
			| m32c | m32r | m32rle \
			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
			| m88110 | m88k | maxq | mb | mcore | mep | metag \
			| microblaze | microblazeel \
			| mips | mipsbe | mipseb | mipsel | mipsle \
			| mips16 \
			| mips64 | mips64eb | mips64el \
			| mips64octeon | mips64octeonel \
			| mips64orion | mips64orionel \
			| mips64r5900 | mips64r5900el \
			| mips64vr | mips64vrel \
			| mips64vr4100 | mips64vr4100el \
			| mips64vr4300 | mips64vr4300el \
			| mips64vr5000 | mips64vr5000el \
			| mips64vr5900 | mips64vr5900el \
			| mipsisa32 | mipsisa32el \
			| mipsisa32r2 | mipsisa32r2el \
			| mipsisa32r6 | mipsisa32r6el \
			| mipsisa64 | mipsisa64el \
			| mipsisa64r2 | mipsisa64r2el \
			| mipsisa64r6 | mipsisa64r6el \
			| mipsisa64sb1 | mipsisa64sb1el \
			| mipsisa64sr71k | mipsisa64sr71kel \
			| mipsr5900 | mipsr5900el \
			| mipstx39 | mipstx39el \
			| mmix \
			| mn10200 | mn10300 \
			| moxie \
			| mt \
			| msp430 \
			| nds32 | nds32le | nds32be \
			| nfp \
			| nios | nios2 | nios2eb | nios2el \
			| none | np1 | ns16k | ns32k | nvptx \
			| open8 \
			| or1k* \
			| or32 \
			| orion \
			| picochip \
			| pdp10 | pdp11 | pj | pjl | pn | power \
			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
			| pru \
			| pyramid \
			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
			| rl78 | romp | rs6000 | rx \
			| s390 | s390x \
			| score \
			| sh | shl \
			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
			| sparclite \
			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
			| spu \
			| tahoe \
			| thumbv7* \
			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
			| tron \
			| ubicom32 \
			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
			| vax \
			| visium \
			| w65 \
			| wasm32 | wasm64 \
			| we32k \
			| x86 | x86_64 | xc16x | xgate | xps100 \
			| xstormy16 | xtensa* \
			| ymp \
			| z8k | z80)
				;;

			*)
				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
				exit 1
				;;
		esac
d1370 3
a1372 3
case $vendor in
	digital*)
		vendor=dec
d1374 2
a1375 2
	commodore*)
		vendor=cbm
d1383 1
a1383 1
if test x$basic_os != x
a1384 39

# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
# set os.
case $basic_os in
	gnu/linux*)
		kernel=linux
		os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|')
		;;
	os2-emx)
		kernel=os2
		os=$(echo $basic_os | sed -e 's|os2-emx|emx|')
		;;
	nto-qnx*)
		kernel=nto
		os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|')
		;;
	*-*)
		# shellcheck disable=SC2162
		IFS="-" read kernel os <<EOF
$basic_os
EOF
		;;
	# Default OS when just kernel was specified
	nto*)
		kernel=nto
		os=$(echo $basic_os | sed -e 's|nto|qnx|')
		;;
	linux*)
		kernel=linux
		os=$(echo $basic_os | sed -e 's|linux|gnu|')
		;;
	*)
		kernel=
		os=$basic_os
		;;
esac

# Now, normalize the OS (knowing we just have one component, it's not a kernel,
# etc.)
d1388 3
a1390 3
	# solaris* is a basic system type, with this one exception.
	auroraux)
		os=auroraux
d1392 2
a1393 2
	bluegene*)
		os=cnk
d1395 2
a1396 2
	solaris1 | solaris1.*)
		os=$(echo $os | sed -e 's|solaris1|sunos4|')
d1398 2
a1399 2
	solaris)
		os=solaris2
d1401 2
a1402 2
	unixware*)
		os=sysv4.2uw
d1404 2
a1405 3
	# es1800 is here to avoid being matched by es* (a different OS)
	es1800*)
		os=ose
d1407 41
a1447 3
	# Some version numbers need modification
	chorusos*)
		os=chorusos
d1449 1
a1449 2
	isc)
		os=isc2.2
d1451 2
a1452 2
	sco6)
		os=sco5v6
d1454 3
a1456 2
	sco5)
		os=sco3.2v5
d1458 2
a1459 2
	sco4)
		os=sco3.2v4
d1461 2
a1462 2
	sco3.2.[4-9]*)
		os=$(echo $os | sed -e 's/sco3.2./sco3.2v/')
d1464 2
a1465 2
	sco*v* | scout)
		# Don't match below
d1467 2
a1468 2
	sco*)
		os=sco3.2v2
d1470 2
a1471 2
	psos*)
		os=psos
d1473 2
a1474 2
	qnx*)
		os=qnx
d1476 2
a1477 2
	hiux*)
		os=hiuxwe2
d1479 2
a1480 2
	lynx*178)
		os=lynxos178
d1482 2
a1483 2
	lynx*5)
		os=lynxos5
d1485 2
a1486 2
	lynxos*)
		# don't get caught up in next wildcard
d1488 2
a1489 2
	lynx*)
		os=lynxos
d1491 2
a1492 2
	mac[0-9]*)
		os=$(echo "$os" | sed -e 's|mac|macos|')
d1494 2
a1495 2
	opened*)
		os=openedition
d1497 2
a1498 2
	os400*)
		os=os400
d1500 2
a1501 2
	sunos5*)
		os=$(echo "$os" | sed -e 's|sunos5|solaris2|')
d1503 2
a1504 2
	sunos6*)
		os=$(echo "$os" | sed -e 's|sunos6|solaris3|')
d1506 2
a1507 2
	wince*)
		os=wince
d1509 2
a1510 2
	utek*)
		os=bsd
d1512 2
a1513 2
	dynix*)
		os=bsd
d1515 2
a1516 2
	acis*)
		os=aos
d1518 3
a1520 2
	atheos*)
		os=atheos
d1522 2
a1523 5
	syllable*)
		os=syllable
		;;
	386bsd)
		os=bsd
d1525 2
a1526 2
	ctix* | uts*)
		os=sysv
d1528 2
a1529 2
	nova*)
		os=rtmk-nova
d1531 2
a1532 2
	ns2)
		os=nextstep2
d1534 2
a1535 3
	# Preserve the version number of sinix5.
	sinix5.*)
		os=$(echo $os | sed -e 's|sinix|sysv|')
d1537 2
a1538 2
	sinix*)
		os=sysv4
d1540 2
a1541 2
	tpf*)
		os=tpf
d1543 2
a1544 2
	triton*)
		os=sysv3
d1546 2
a1547 2
	oss*)
		os=sysv3
d1549 2
a1550 2
	svr4*)
		os=sysv4
d1552 2
a1553 2
	svr3)
		os=sysv3
d1555 2
a1556 2
	sysvr4)
		os=sysv4
d1558 2
a1559 2
	ose*)
		os=ose
d1561 2
a1562 2
	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
		os=mint
d1564 2
a1565 2
	dicos*)
		os=dicos
d1567 1
a1567 1
	pikeos*)
d1571 1
a1571 1
		case $cpu in
d1573 1
a1573 1
			os=eabi
d1576 1
a1576 1
			os=elf
d1580 6
d1587 4
a1590 1
		# No normalization, but not necessarily accepted, that comes below.
a1592 1

d1605 1
a1605 2
kernel=
case $cpu-$vendor in
d1607 1
a1607 1
		os=elf
d1610 1
a1610 1
		os=elf
d1613 1
a1613 1
		os=riscix1.2
d1616 1
a1616 2
		kernel=linux
		os=gnu
d1619 1
a1619 1
		os=aout
d1622 1
a1622 1
		os=coff
d1625 1
a1625 4
		os=elf
		;;
	clipper-intergraph)
		os=clix
d1628 1
a1628 1
		os=elf
d1631 1
a1631 1
		os=coff
d1634 1
a1634 1
		os=coff
d1637 1
a1637 1
		os=coff
d1641 1
a1641 1
		os=tops20
d1644 1
a1644 1
		os=none
d1647 1
a1647 1
		os=ultrix4.2
d1650 1
a1650 1
		os=domain
d1653 1
a1653 1
		os=sunos4.0.2
d1656 1
a1656 1
		os=sunos3
d1659 1
a1659 1
		os=aout
d1662 1
a1662 1
		os=elf
d1665 1
a1665 1
		os=elf
d1668 1
a1668 1
		os=elf
d1671 1
a1671 1
		os=coff
d1674 1
a1674 1
		os=sysv3
d1677 1
a1677 1
		os=sunos4.1.1
d1680 1
a1680 1
		os=elf
d1683 4
a1686 1
		os=beos
d1689 1
a1689 1
		os=aix
d1692 1
a1692 1
		os=mmixware
d1695 1
a1695 1
		os=proelf
d1698 1
a1698 1
		os=proelf
d1701 1
a1701 1
		os=proelf
d1704 1
a1704 1
		os=hpux
d1707 1
a1707 1
		os=hiux
d1710 1
a1710 1
		os=sysv
d1713 1
a1713 1
		os=amigaos
d1716 1
a1716 1
		os=dgux
d1719 1
a1719 1
		os=sysv3
d1722 1
a1722 1
		os=rtu
d1725 1
a1725 1
		os=luna
d1728 1
a1728 1
		os=nextstep
d1731 1
a1731 1
		os=ptx
d1734 1
a1734 1
		os=unos
d1737 1
a1737 1
		os=genix
d1740 4
a1743 1
		os=mvs
d1746 1
a1746 1
		os=sysv
d1749 1
a1749 1
		os=bsd
d1752 1
a1752 1
		os=bsd
d1755 1
a1755 1
		os=irix
d1758 1
a1758 1
		os=sysv4
d1761 1
a1761 1
		os=rtu
d1764 1
a1764 1
		os=uxpv
d1767 1
a1767 1
		os=coff
d1770 1
a1770 1
		os=coff
d1773 1
a1773 1
		os=macos
d1776 1
a1776 4
		os=mint
		;;
	*-wrs)
		os=vxworks
d1779 1
a1779 1
		os=none
a1781 1

a1783 85
# Now, validate our (potentially fixed-up) OS.
case $os in
	# Sometimes we do "kernel-abi", so those need to count as OSes.
	musl* | newlib* | uclibc*)
		;;
	# Likewise for "kernel-libc"
	eabi* | gnueabi*)
		;;
	# Now accept the basic system types.
	# The portable systems comes first.
	# Each alternative MUST end in a * to match a version number.
	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
	     | hiux* | abug | nacl* | netware* | windows* \
	     | os9* | macos* | osx* | ios* \
	     | mpw* | magic* | mmixware* | mon960* | lnews* \
	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
	     | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
	     | chorusrdb* | cegcc* | glidix* \
	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
	     | midipix* | mingw32* | mingw64* | mint* \
	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
	     | interix* | uwin* | mks* | rhapsody* | darwin* \
	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
	     | storm-chaos* | tops10* | tenex* | tops20* | its* | irx* \
	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
		;;
	# This one is extra strict with allowed versions
	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
		# Don't forget version if it is 3.2v4 or newer.
		;;
	none)
		;;
	*)
		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
		exit 1
		;;
esac

# As a final step for OS-related things, validate the OS-kernel combination
# (given a valid OS), if there is a kernel.
case $kernel-$os in
	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
		;;
	uclinux-uclibc* )
		;;
	-dietlibc* | -newlib* | -musl* | -uclibc* )
		# These are just libc implementations, not actual OSes, and thus
		# require a kernel.
		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
		exit 1
		;;
	kfreebsd*-gnu* | kopensolaris*-gnu*)
		;;
	nto-qnx*)
		;;
	os2-emx)
		;;
	*-eabi* | *-gnueabi*)
		;;
	-*)
		# Blank kernel with real OS is always fine.
		;;
	*-*)
		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
		exit 1
		;;
esac

d1786 5
a1790 4
case $vendor in
	unknown)
		case $cpu-$os in
			*-riscix*)
d1793 1
a1793 1
			*-sunos*)
d1796 1
a1796 1
			*-cnk* | *-aix*)
d1799 1
a1799 1
			*-beos*)
d1802 1
a1802 1
			*-hpux*)
d1805 1
a1805 1
			*-mpeix*)
d1808 1
a1808 1
			*-hiux*)
d1811 1
a1811 1
			*-unos*)
d1814 1
a1814 1
			*-dgux*)
d1817 1
a1817 1
			*-luna*)
d1820 1
a1820 1
			*-genix*)
d1823 1
a1823 7
			*-clix*)
				vendor=intergraph
				;;
			*-mvs* | *-opened*)
				vendor=ibm
				;;
			*-os400*)
d1826 1
a1826 1
			s390-* | s390x-*)
d1829 1
a1829 1
			*-ptx*)
d1832 1
a1832 1
			*-tpf*)
d1835 1
a1835 1
			*-vxsim* | *-vxworks* | *-windiss*)
d1838 1
a1838 1
			*-aux*)
d1841 1
a1841 1
			*-hms*)
d1844 1
a1844 1
			*-mpw* | *-macos*)
d1847 1
a1847 1
			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
d1850 1
a1850 1
			*-vos*)
d1854 1
d1858 1
a1858 1
echo "$cpu-$vendor-${kernel:+$kernel-}$os"
d1862 1
a1862 1
# eval: (add-hook 'before-save-hook 'time-stamp)
@


1.1.1.8
log
@Import expat 2.7.0
@
text
@d3 1
a3 1
#   Copyright 1992-2022 Free Software Foundation, Inc.
d5 1
a5 3
# shellcheck disable=SC2006,SC2268 # see below for rationale

timestamp='2022-01-03'
d9 1
a9 1
# the Free Software Foundation, either version 3 of the License, or
d53 1
a53 8
# The "shellcheck disable" line above the timestamp inhibits complaints
# about features and limitations of the classic Bourne shell that were
# superseded or lifted in POSIX.  However, this script identifies a wide
# variety of pre-POSIX systems that do not have POSIX shells at all, and
# even some reasonably current systems (Solaris 10 as case-in-point) still
# have a pre-POSIX /bin/sh.

me=`echo "$0" | sed -e 's,.*/,,'`
d70 1
a70 1
Copyright 1992-2022 Free Software Foundation, Inc.
a114 1
saved_IFS=$IFS
a117 1
IFS=$saved_IFS
a165 4
					zephyr*)
						basic_machine=$field1-unknown
						basic_os=$field2
						;;
d772 1
a772 1
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
d777 1
a777 1
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
d782 1
a782 1
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
d787 1
a787 1
		cpu=`echo "$1" | sed -e 's/86.*/86/'`
d941 1
a941 1
		vendor=`echo "$basic_machine" | sed 's/-.*//'`
a945 1
		saved_IFS=$IFS
a948 1
		IFS=$saved_IFS
a1026 5
	armh-unknown | armh-alt)
		cpu=armv7l
		vendor=alt
		basic_os=${basic_os:-linux-gnueabihf}
		;;
d1108 1
a1108 1
		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
d1126 1
a1126 1
		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
d1128 1
a1128 1
	arm64-* | aarch64le-*)
d1189 1
a1189 1
			| arc | arceb | arc32 | arc64 \
a1227 2
			| mipsisa32r3 | mipsisa32r3el \
			| mipsisa32r5 | mipsisa32r5el \
a1230 2
			| mipsisa64r3 | mipsisa64r3el \
			| mipsisa64r5 | mipsisa64r5el \
d1307 1
a1307 1
# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
d1312 1
a1312 1
		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
d1316 1
a1316 1
		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
d1320 1
a1320 1
		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
a1323 1
		saved_IFS=$IFS
a1326 1
		IFS=$saved_IFS
d1331 1
a1331 1
		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
d1335 1
a1335 1
		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
d1356 1
a1356 1
		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
d1385 1
a1385 1
		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
d1415 1
a1415 1
		os=`echo "$os" | sed -e 's|mac|macos|'`
d1424 1
a1424 1
		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
d1427 1
a1427 1
		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
d1461 1
a1461 1
		os=`echo "$os" | sed -e 's|sinix|sysv|'`
d1707 2
a1708 2
	# Sometimes we do "kernel-libc", so those need to count as OSes.
	musl* | newlib* | relibc* | uclibc*)
d1710 1
a1710 1
	# Likewise for "kernel-abi"
a1712 3
	# VxWorks passes extra cpu info in the 4th filed.
	simlinux | simwindows | spe)
		;;
d1728 1
a1728 1
	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
d1733 1
a1733 1
	     | chorusrdb* | cegcc* | glidix* | serenity* \
d1746 1
a1746 2
	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
	     | fiwix* )
d1763 1
a1763 2
	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
		   | linux-musl* | linux-relibc* | linux-uclibc* )
d1767 1
a1767 1
	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
a1774 2
	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
		;;
@


1.1.1.2.2.1
log
@file config.sub was added on branch yamt-pagecache on 2012-04-17 00:04:41 +0000
@
text
@d1 1760
@


1.1.1.2.2.2
log
@sync with head
@
text
@a0 1760
#! /bin/sh
# Configuration validation subroutine script.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
#   2011 Free Software Foundation, Inc.

timestamp='2011-03-23'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine.  It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.


# Please send patches to <config-patches@@gnu.org>.  Submit a context
# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.

# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
# Each package is responsible for reporting which valid configurations
# it does not support.  The user should be able to distinguish
# a failure to support a valid configuration from a meaningless
# configuration.

# The goal of this file is to map all the various variations of a given
# machine specification into a single specification in the form:
#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or in some cases, the newer four-part form:
#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.

me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
       $0 [OPTION] ALIAS

Canonicalize a configuration name.

Operation modes:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit

Report bugs and patches to <config-patches@@gnu.org>."

version="\
GNU config.sub ($timestamp)

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

help="
Try \`$me --help' for more information."

# Parse command line
while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit ;;
    --version | -v )
       echo "$version" ; exit ;;
    --help | --h* | -h )
       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help"
       exit 1 ;;

    *local*)
       # First pass through any local machine types.
       echo $1
       exit ;;

    * )
       break ;;
  esac
done

case $# in
 0) echo "$me: missing argument$help" >&2
    exit 1;;
 1) ;;
 *) echo "$me: too many arguments$help" >&2
    exit 1;;
esac

# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  *)
    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    if [ $basic_machine != $1 ]
    then os=`echo $1 | sed 's/.*-/-/'`
    else os=; fi
    ;;
esac

### Let's recognize common machines as not being operating systems so
### that things like config.sub decstation-3100 work.  We also
### recognize some manufacturers as not being operating systems, so we
### can provide default operating systems below.
case $os in
	-sun*os*)
		# Prevent following clause from handling this invalid input.
		;;
	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
	-apple | -axis | -knuth | -cray | -microblaze)
		os=
		basic_machine=$1
		;;
	-bluegene*)
		os=-cnk
		;;
	-sim | -cisco | -oki | -wec | -winbond)
		os=
		basic_machine=$1
		;;
	-scout)
		;;
	-wrs)
		os=-vxworks
		basic_machine=$1
		;;
	-chorusos*)
		os=-chorusos
		basic_machine=$1
		;;
	-chorusrdb)
		os=-chorusrdb
		basic_machine=$1
		;;
	-hiux*)
		os=-hiuxwe2
		;;
	-sco6)
		os=-sco5v6
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5)
		os=-sco3.2v5
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco4)
		os=-sco3.2v4
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2.[4-9]*)
		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco3.2v[4-9]*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco5v6*)
		# Don't forget version if it is 3.2v4 or newer.
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-sco*)
		os=-sco3.2v2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-udk*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-isc)
		os=-isc2.2
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-clix*)
		basic_machine=clipper-intergraph
		;;
	-isc*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
		;;
	-lynx*)
		os=-lynxos
		;;
	-ptx*)
		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
		;;
	-windowsnt*)
		os=`echo $os | sed -e 's/windowsnt/winnt/'`
		;;
	-psos*)
		os=-psos
		;;
	-mint | -mint[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
esac

# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
	# Recognize the basic CPU types without company name.
	# Some are omitted here because they have special meanings below.
	1750a | 580 \
	| a29k \
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
	| am33_2.0 \
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
	| bfin \
	| c4x | clipper \
	| d10v | d30v | dlx | dsp16xx \
	| fido | fr30 | frv \
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
	| i370 | i860 | i960 | ia64 \
	| ip2k | iq2000 \
	| lm32 \
	| m32c | m32r | m32rle | m68000 | m68k | m88k \
	| maxq | mb | microblaze | mcore | mep | metag \
	| mips | mipsbe | mipseb | mipsel | mipsle \
	| mips16 \
	| mips64 | mips64el \
	| mips64octeon | mips64octeonel \
	| mips64orion | mips64orionel \
	| mips64r5900 | mips64r5900el \
	| mips64vr | mips64vrel \
	| mips64vr4100 | mips64vr4100el \
	| mips64vr4300 | mips64vr4300el \
	| mips64vr5000 | mips64vr5000el \
	| mips64vr5900 | mips64vr5900el \
	| mipsisa32 | mipsisa32el \
	| mipsisa32r2 | mipsisa32r2el \
	| mipsisa64 | mipsisa64el \
	| mipsisa64r2 | mipsisa64r2el \
	| mipsisa64sb1 | mipsisa64sb1el \
	| mipsisa64sr71k | mipsisa64sr71kel \
	| mipstx39 | mipstx39el \
	| mn10200 | mn10300 \
	| moxie \
	| mt \
	| msp430 \
	| nds32 | nds32le | nds32be \
	| nios | nios2 \
	| ns16k | ns32k \
	| open8 \
	| or32 \
	| pdp10 | pdp11 | pj | pjl \
	| powerpc | powerpc64 | powerpc64le | powerpcle \
	| pyramid \
	| rx \
	| score \
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
	| sh64 | sh64le \
	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
	| spu \
	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
	| ubicom32 \
	| v850 | v850e \
	| we32k \
	| x86 | xc16x | xstormy16 | xtensa \
	| z8k | z80)
		basic_machine=$basic_machine-unknown
		;;
	c54x)
		basic_machine=tic54x-unknown
		;;
	c55x)
		basic_machine=tic55x-unknown
		;;
	c6x)
		basic_machine=tic6x-unknown
		;;
	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
		# Motorola 68HC11/12.
		basic_machine=$basic_machine-unknown
		os=-none
		;;
	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
		;;
	ms1)
		basic_machine=mt-unknown
		;;

	strongarm | thumb | xscale)
		basic_machine=arm-unknown
		;;

	xscaleeb)
		basic_machine=armeb-unknown
		;;

	xscaleel)
		basic_machine=armel-unknown
		;;

	# We use `pc' rather than `unknown'
	# because (1) that's what they normally are, and
	# (2) the word "unknown" tends to confuse beginning users.
	i*86 | x86_64)
	  basic_machine=$basic_machine-pc
	  ;;
	# Object if more than one company name word.
	*-*-*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
	# Recognize the basic CPU types with company name.
	580-* \
	| a29k-* \
	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
	| avr-* | avr32-* \
	| bfin-* | bs2000-* \
	| c[123]* | c30-* | [cjt]90-* | c4x-* \
	| clipper-* | craynv-* | cydra-* \
	| d10v-* | d30v-* | dlx-* \
	| elxsi-* \
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
	| h8300-* | h8500-* \
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
	| i*86-* | i860-* | i960-* | ia64-* \
	| ip2k-* | iq2000-* \
	| lm32-* \
	| m32c-* | m32r-* | m32rle-* \
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
	| mips16-* \
	| mips64-* | mips64el-* \
	| mips64octeon-* | mips64octeonel-* \
	| mips64orion-* | mips64orionel-* \
	| mips64r5900-* | mips64r5900el-* \
	| mips64vr-* | mips64vrel-* \
	| mips64vr4100-* | mips64vr4100el-* \
	| mips64vr4300-* | mips64vr4300el-* \
	| mips64vr5000-* | mips64vr5000el-* \
	| mips64vr5900-* | mips64vr5900el-* \
	| mipsisa32-* | mipsisa32el-* \
	| mipsisa32r2-* | mipsisa32r2el-* \
	| mipsisa64-* | mipsisa64el-* \
	| mipsisa64r2-* | mipsisa64r2el-* \
	| mipsisa64sb1-* | mipsisa64sb1el-* \
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
	| mipstx39-* | mipstx39el-* \
	| mmix-* \
	| mt-* \
	| msp430-* \
	| nds32-* | nds32le-* | nds32be-* \
	| nios-* | nios2-* \
	| none-* | np1-* | ns16k-* | ns32k-* \
	| open8-* \
	| orion-* \
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
	| pyramid-* \
	| romp-* | rs6000-* | rx-* \
	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
	| sparclite-* \
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
	| tahoe-* \
	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
	| tile-* | tilegx-* \
	| tron-* \
	| ubicom32-* \
	| v850-* | v850e-* | vax-* \
	| we32k-* \
	| x86-* | x86_64-* | xc16x-* | xps100-* \
	| xstormy16-* | xtensa*-* \
	| ymp-* \
	| z8k-* | z80-*)
		;;
	# Recognize the basic CPU types without company name, with glob match.
	xtensa*)
		basic_machine=$basic_machine-unknown
		;;
	# Recognize the various machine names and aliases which stand
	# for a CPU type and a company and sometimes even an OS.
	386bsd)
		basic_machine=i386-unknown
		os=-bsd
		;;
	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
		basic_machine=m68000-att
		;;
	3b*)
		basic_machine=we32k-att
		;;
	a29khif)
		basic_machine=a29k-amd
		os=-udi
		;;
	abacus)
		basic_machine=abacus-unknown
		;;
	adobe68k)
		basic_machine=m68010-adobe
		os=-scout
		;;
	alliant | fx80)
		basic_machine=fx80-alliant
		;;
	altos | altos3068)
		basic_machine=m68k-altos
		;;
	am29k)
		basic_machine=a29k-none
		os=-bsd
		;;
	amd64)
		basic_machine=x86_64-pc
		;;
	amd64-*)
		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	amdahl)
		basic_machine=580-amdahl
		os=-sysv
		;;
	amiga | amiga-*)
		basic_machine=m68k-unknown
		;;
	amigaos | amigados)
		basic_machine=m68k-unknown
		os=-amigaos
		;;
	amigaunix | amix)
		basic_machine=m68k-unknown
		os=-sysv4
		;;
	apollo68)
		basic_machine=m68k-apollo
		os=-sysv
		;;
	apollo68bsd)
		basic_machine=m68k-apollo
		os=-bsd
		;;
	aros)
		basic_machine=i386-pc
		os=-aros
		;;
	aux)
		basic_machine=m68k-apple
		os=-aux
		;;
	balance)
		basic_machine=ns32k-sequent
		os=-dynix
		;;
	blackfin)
		basic_machine=bfin-unknown
		os=-linux
		;;
	blackfin-*)
		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
	bluegene*)
		basic_machine=powerpc-ibm
		os=-cnk
		;;
	c54x-*)
		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c55x-*)
		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c6x-*)
		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	c90)
		basic_machine=c90-cray
		os=-unicos
		;;
	cegcc)
		basic_machine=arm-unknown
		os=-cegcc
		;;
	convex-c1)
		basic_machine=c1-convex
		os=-bsd
		;;
	convex-c2)
		basic_machine=c2-convex
		os=-bsd
		;;
	convex-c32)
		basic_machine=c32-convex
		os=-bsd
		;;
	convex-c34)
		basic_machine=c34-convex
		os=-bsd
		;;
	convex-c38)
		basic_machine=c38-convex
		os=-bsd
		;;
	cray | j90)
		basic_machine=j90-cray
		os=-unicos
		;;
	craynv)
		basic_machine=craynv-cray
		os=-unicosmp
		;;
	cr16 | cr16-*)
		basic_machine=cr16-unknown
		os=-elf
		;;
	crds | unos)
		basic_machine=m68k-crds
		;;
	crisv32 | crisv32-* | etraxfs*)
		basic_machine=crisv32-axis
		;;
	cris | cris-* | etrax*)
		basic_machine=cris-axis
		;;
	crx)
		basic_machine=crx-unknown
		os=-elf
		;;
	da30 | da30-*)
		basic_machine=m68k-da30
		;;
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
		basic_machine=mips-dec
		;;
	decsystem10* | dec10*)
		basic_machine=pdp10-dec
		os=-tops10
		;;
	decsystem20* | dec20*)
		basic_machine=pdp10-dec
		os=-tops20
		;;
	delta | 3300 | motorola-3300 | motorola-delta \
	      | 3300-motorola | delta-motorola)
		basic_machine=m68k-motorola
		;;
	delta88)
		basic_machine=m88k-motorola
		os=-sysv3
		;;
	dicos)
		basic_machine=i686-pc
		os=-dicos
		;;
	djgpp)
		basic_machine=i586-pc
		os=-msdosdjgpp
		;;
	dpx20 | dpx20-*)
		basic_machine=rs6000-bull
		os=-bosx
		;;
	dpx2* | dpx2*-bull)
		basic_machine=m68k-bull
		os=-sysv3
		;;
	ebmon29k)
		basic_machine=a29k-amd
		os=-ebmon
		;;
	elxsi)
		basic_machine=elxsi-elxsi
		os=-bsd
		;;
	encore | umax | mmax)
		basic_machine=ns32k-encore
		;;
	es1800 | OSE68k | ose68k | ose | OSE)
		basic_machine=m68k-ericsson
		os=-ose
		;;
	fx2800)
		basic_machine=i860-alliant
		;;
	genix)
		basic_machine=ns32k-ns
		;;
	gmicro)
		basic_machine=tron-gmicro
		os=-sysv
		;;
	go32)
		basic_machine=i386-pc
		os=-go32
		;;
	h3050r* | hiux*)
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	h8300hms)
		basic_machine=h8300-hitachi
		os=-hms
		;;
	h8300xray)
		basic_machine=h8300-hitachi
		os=-xray
		;;
	h8500hms)
		basic_machine=h8500-hitachi
		os=-hms
		;;
	harris)
		basic_machine=m88k-harris
		os=-sysv3
		;;
	hp300-*)
		basic_machine=m68k-hp
		;;
	hp300bsd)
		basic_machine=m68k-hp
		os=-bsd
		;;
	hp300hpux)
		basic_machine=m68k-hp
		os=-hpux
		;;
	hp3k9[0-9][0-9] | hp9[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hp9k2[0-9][0-9] | hp9k31[0-9])
		basic_machine=m68000-hp
		;;
	hp9k3[2-9][0-9])
		basic_machine=m68k-hp
		;;
	hp9k6[0-9][0-9] | hp6[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hp9k7[0-79][0-9] | hp7[0-79][0-9])
		basic_machine=hppa1.1-hp
		;;
	hp9k78[0-9] | hp78[0-9])
		# FIXME: really hppa2.0-hp
		basic_machine=hppa1.1-hp
		;;
	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
		# FIXME: really hppa2.0-hp
		basic_machine=hppa1.1-hp
		;;
	hp9k8[0-9][13679] | hp8[0-9][13679])
		basic_machine=hppa1.1-hp
		;;
	hp9k8[0-9][0-9] | hp8[0-9][0-9])
		basic_machine=hppa1.0-hp
		;;
	hppa-next)
		os=-nextstep3
		;;
	hppaosf)
		basic_machine=hppa1.1-hp
		os=-osf
		;;
	hppro)
		basic_machine=hppa1.1-hp
		os=-proelf
		;;
	i370-ibm* | ibm*)
		basic_machine=i370-ibm
		;;
# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
	i*86v32)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv32
		;;
	i*86v4*)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv4
		;;
	i*86v)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-sysv
		;;
	i*86sol2)
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
		os=-solaris2
		;;
	i386mach)
		basic_machine=i386-mach
		os=-mach
		;;
	i386-vsta | vsta)
		basic_machine=i386-unknown
		os=-vsta
		;;
	iris | iris4d)
		basic_machine=mips-sgi
		case $os in
		    -irix*)
			;;
		    *)
			os=-irix4
			;;
		esac
		;;
	isi68 | isi)
		basic_machine=m68k-isi
		os=-sysv
		;;
	m68knommu)
		basic_machine=m68k-unknown
		os=-linux
		;;
	m68knommu-*)
		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
	m88k-omron*)
		basic_machine=m88k-omron
		;;
	magnum | m3230)
		basic_machine=mips-mips
		os=-sysv
		;;
	merlin)
		basic_machine=ns32k-utek
		os=-sysv
		;;
	microblaze)
		basic_machine=microblaze-xilinx
		;;
	mingw32)
		basic_machine=i386-pc
		os=-mingw32
		;;
	mingw32ce)
		basic_machine=arm-unknown
		os=-mingw32ce
		;;
	miniframe)
		basic_machine=m68000-convergent
		;;
	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
		basic_machine=m68k-atari
		os=-mint
		;;
	mips3*-*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
		;;
	mips3*)
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
		;;
	monitor)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	morphos)
		basic_machine=powerpc-unknown
		os=-morphos
		;;
	msdos)
		basic_machine=i386-pc
		os=-msdos
		;;
	ms1-*)
		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
		;;
	mvs)
		basic_machine=i370-ibm
		os=-mvs
		;;
	ncr3000)
		basic_machine=i486-ncr
		os=-sysv4
		;;
	netbsd386)
		basic_machine=i386-unknown
		os=-netbsd
		;;
	netwinder)
		basic_machine=armv4l-rebel
		os=-linux
		;;
	news | news700 | news800 | news900)
		basic_machine=m68k-sony
		os=-newsos
		;;
	news1000)
		basic_machine=m68030-sony
		os=-newsos
		;;
	news-3600 | risc-news)
		basic_machine=mips-sony
		os=-newsos
		;;
	necv70)
		basic_machine=v70-nec
		os=-sysv
		;;
	next | m*-next )
		basic_machine=m68k-next
		case $os in
		    -nextstep* )
			;;
		    -ns2*)
		      os=-nextstep2
			;;
		    *)
		      os=-nextstep3
			;;
		esac
		;;
	nh3000)
		basic_machine=m68k-harris
		os=-cxux
		;;
	nh[45]000)
		basic_machine=m88k-harris
		os=-cxux
		;;
	nindy960)
		basic_machine=i960-intel
		os=-nindy
		;;
	mon960)
		basic_machine=i960-intel
		os=-mon960
		;;
	nonstopux)
		basic_machine=mips-compaq
		os=-nonstopux
		;;
	np1)
		basic_machine=np1-gould
		;;
	neo-tandem)
		basic_machine=neo-tandem
		;;
	nse-tandem)
		basic_machine=nse-tandem
		;;
	nsr-tandem)
		basic_machine=nsr-tandem
		;;
	op50n-* | op60c-*)
		basic_machine=hppa1.1-oki
		os=-proelf
		;;
	openrisc | openrisc-*)
		basic_machine=or32-unknown
		;;
	os400)
		basic_machine=powerpc-ibm
		os=-os400
		;;
	OSE68000 | ose68000)
		basic_machine=m68000-ericsson
		os=-ose
		;;
	os68k)
		basic_machine=m68k-none
		os=-os68k
		;;
	pa-hitachi)
		basic_machine=hppa1.1-hitachi
		os=-hiuxwe2
		;;
	paragon)
		basic_machine=i860-intel
		os=-osf
		;;
	parisc)
		basic_machine=hppa-unknown
		os=-linux
		;;
	parisc-*)
		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
		os=-linux
		;;
	pbd)
		basic_machine=sparc-tti
		;;
	pbb)
		basic_machine=m68k-tti
		;;
	pc532 | pc532-*)
		basic_machine=ns32k-pc532
		;;
	pc98)
		basic_machine=i386-pc
		;;
	pc98-*)
		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentium | p5 | k5 | k6 | nexgen | viac3)
		basic_machine=i586-pc
		;;
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
		basic_machine=i686-pc
		;;
	pentiumii | pentium2 | pentiumiii | pentium3)
		basic_machine=i686-pc
		;;
	pentium4)
		basic_machine=i786-pc
		;;
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pentium4-*)
		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	pn)
		basic_machine=pn-gould
		;;
	power)	basic_machine=power-ibm
		;;
	ppc | ppcbe)	basic_machine=powerpc-unknown
		;;
	ppc-* | ppcbe-*)
		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppcle | powerpclittle | ppc-le | powerpc-little)
		basic_machine=powerpcle-unknown
		;;
	ppcle-* | powerpclittle-*)
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppc64)	basic_machine=powerpc64-unknown
		;;
	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
		basic_machine=powerpc64le-unknown
		;;
	ppc64le-* | powerpc64little-*)
		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	ps2)
		basic_machine=i386-ibm
		;;
	pw32)
		basic_machine=i586-unknown
		os=-pw32
		;;
	rdos)
		basic_machine=i386-pc
		os=-rdos
		;;
	rom68k)
		basic_machine=m68k-rom68k
		os=-coff
		;;
	rm[46]00)
		basic_machine=mips-siemens
		;;
	rtpc | rtpc-*)
		basic_machine=romp-ibm
		;;
	s390 | s390-*)
		basic_machine=s390-ibm
		;;
	s390x | s390x-*)
		basic_machine=s390x-ibm
		;;
	sa29200)
		basic_machine=a29k-amd
		os=-udi
		;;
	sb1)
		basic_machine=mipsisa64sb1-unknown
		;;
	sb1el)
		basic_machine=mipsisa64sb1el-unknown
		;;
	sde)
		basic_machine=mipsisa32-sde
		os=-elf
		;;
	sei)
		basic_machine=mips-sei
		os=-seiux
		;;
	sequent)
		basic_machine=i386-sequent
		;;
	sh)
		basic_machine=sh-hitachi
		os=-hms
		;;
	sh5el)
		basic_machine=sh5le-unknown
		;;
	sh64)
		basic_machine=sh64-unknown
		;;
	sparclite-wrs | simso-wrs)
		basic_machine=sparclite-wrs
		os=-vxworks
		;;
	sps7)
		basic_machine=m68k-bull
		os=-sysv2
		;;
	spur)
		basic_machine=spur-unknown
		;;
	st2000)
		basic_machine=m68k-tandem
		;;
	stratus)
		basic_machine=i860-stratus
		os=-sysv4
		;;
	strongarm-* | thumb-*)
		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
		;;
	sun2)
		basic_machine=m68000-sun
		;;
	sun2os3)
		basic_machine=m68000-sun
		os=-sunos3
		;;
	sun2os4)
		basic_machine=m68000-sun
		os=-sunos4
		;;
	sun3os3)
		basic_machine=m68k-sun
		os=-sunos3
		;;
	sun3os4)
		basic_machine=m68k-sun
		os=-sunos4
		;;
	sun4os3)
		basic_machine=sparc-sun
		os=-sunos3
		;;
	sun4os4)
		basic_machine=sparc-sun
		os=-sunos4
		;;
	sun4sol2)
		basic_machine=sparc-sun
		os=-solaris2
		;;
	sun3 | sun3-*)
		basic_machine=m68k-sun
		;;
	sun4)
		basic_machine=sparc-sun
		;;
	sun386 | sun386i | roadrunner)
		basic_machine=i386-sun
		;;
	sv1)
		basic_machine=sv1-cray
		os=-unicos
		;;
	symmetry)
		basic_machine=i386-sequent
		os=-dynix
		;;
	t3e)
		basic_machine=alphaev5-cray
		os=-unicos
		;;
	t90)
		basic_machine=t90-cray
		os=-unicos
		;;
	# This must be matched before tile*.
	tilegx*)
		basic_machine=tilegx-unknown
		os=-linux-gnu
		;;
	tile*)
		basic_machine=tile-unknown
		os=-linux-gnu
		;;
	tx39)
		basic_machine=mipstx39-unknown
		;;
	tx39el)
		basic_machine=mipstx39el-unknown
		;;
	toad1)
		basic_machine=pdp10-xkl
		os=-tops20
		;;
	tower | tower-32)
		basic_machine=m68k-ncr
		;;
	tpf)
		basic_machine=s390x-ibm
		os=-tpf
		;;
	udi29k)
		basic_machine=a29k-amd
		os=-udi
		;;
	ultra3)
		basic_machine=a29k-nyu
		os=-sym1
		;;
	v810 | necv810)
		basic_machine=v810-nec
		os=-none
		;;
	vaxv)
		basic_machine=vax-dec
		os=-sysv
		;;
	vms)
		basic_machine=vax-dec
		os=-vms
		;;
	vpp*|vx|vx-*)
		basic_machine=f301-fujitsu
		;;
	vxworks960)
		basic_machine=i960-wrs
		os=-vxworks
		;;
	vxworks68)
		basic_machine=m68k-wrs
		os=-vxworks
		;;
	vxworks29k)
		basic_machine=a29k-wrs
		os=-vxworks
		;;
	w65*)
		basic_machine=w65-wdc
		os=-none
		;;
	w89k-*)
		basic_machine=hppa1.1-winbond
		os=-proelf
		;;
	xbox)
		basic_machine=i686-pc
		os=-mingw32
		;;
	xps | xps100)
		basic_machine=xps100-honeywell
		;;
	xscale-* | xscalee[bl]-*)
		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
		;;
	ymp)
		basic_machine=ymp-cray
		os=-unicos
		;;
	z8k-*-coff)
		basic_machine=z8k-unknown
		os=-sim
		;;
	z80-*-coff)
		basic_machine=z80-unknown
		os=-sim
		;;
	none)
		basic_machine=none-none
		os=-none
		;;

# Here we handle the default manufacturer of certain CPU types.  It is in
# some cases the only manufacturer, in others, it is the most popular.
	w89k)
		basic_machine=hppa1.1-winbond
		;;
	op50n)
		basic_machine=hppa1.1-oki
		;;
	op60c)
		basic_machine=hppa1.1-oki
		;;
	romp)
		basic_machine=romp-ibm
		;;
	mmix)
		basic_machine=mmix-knuth
		;;
	rs6000)
		basic_machine=rs6000-ibm
		;;
	vax)
		basic_machine=vax-dec
		;;
	pdp10)
		# there are many clones, so DEC is not a safe bet
		basic_machine=pdp10-unknown
		;;
	pdp11)
		basic_machine=pdp11-dec
		;;
	we32k)
		basic_machine=we32k-att
		;;
	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
		basic_machine=sh-unknown
		;;
	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
		basic_machine=sparc-sun
		;;
	cydra)
		basic_machine=cydra-cydrome
		;;
	orion)
		basic_machine=orion-highlevel
		;;
	orion105)
		basic_machine=clipper-highlevel
		;;
	mac | mpw | mac-mpw)
		basic_machine=m68k-apple
		;;
	pmac | pmac-mpw)
		basic_machine=powerpc-apple
		;;
	*-unknown)
		# Make sure to match an already-canonicalized machine name.
		;;
	*)
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
		exit 1
		;;
esac

# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
	*-digital*)
		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
		;;
	*-commodore*)
		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
		;;
	*)
		;;
esac

# Decode manufacturer-specific aliases for certain operating systems.

if [ x"$os" != x"" ]
then
case $os in
	# First match some system type aliases
	# that might get confused with valid system types.
	# -solaris* is a basic system type, with this one exception.
	-auroraux)
		os=-auroraux
		;;
	-solaris1 | -solaris1.*)
		os=`echo $os | sed -e 's|solaris1|sunos4|'`
		;;
	-solaris)
		os=-solaris2
		;;
	-svr4*)
		os=-sysv4
		;;
	-unixware*)
		os=-sysv4.2uw
		;;
	-gnu/linux*)
		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
		;;
	# First accept the basic system types.
	# The portable systems comes first.
	# Each alternative MUST END IN A *, to match a version number.
	# -sysv* is not here because it comes later, after sysvr4.
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
	      | -sym* | -kopensolaris* \
	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
	      | -aos* | -aros* \
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
	      | -openbsd* | -solidbsd* \
	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
	      | -chorusos* | -chorusrdb* | -cegcc* \
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
	      | -mingw32* | -linux-gnu* | -linux-android* \
	      | -linux-newlib* | -linux-uclibc* \
	      | -uxpv* | -beos* | -mpeix* | -udk* \
	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
	# Remember, each alternative MUST END IN *, to match a version number.
		;;
	-qnx*)
		case $basic_machine in
		    x86-* | i*86-*)
			;;
		    *)
			os=-nto$os
			;;
		esac
		;;
	-nto-qnx*)
		;;
	-nto*)
		os=`echo $os | sed -e 's|nto|nto-qnx|'`
		;;
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
		;;
	-mac*)
		os=`echo $os | sed -e 's|mac|macos|'`
		;;
	-linux-dietlibc)
		os=-linux-dietlibc
		;;
	-linux*)
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
		;;
	-sunos5*)
		os=`echo $os | sed -e 's|sunos5|solaris2|'`
		;;
	-sunos6*)
		os=`echo $os | sed -e 's|sunos6|solaris3|'`
		;;
	-opened*)
		os=-openedition
		;;
	-os400*)
		os=-os400
		;;
	-wince*)
		os=-wince
		;;
	-osfrose*)
		os=-osfrose
		;;
	-osf*)
		os=-osf
		;;
	-utek*)
		os=-bsd
		;;
	-dynix*)
		os=-bsd
		;;
	-acis*)
		os=-aos
		;;
	-atheos*)
		os=-atheos
		;;
	-syllable*)
		os=-syllable
		;;
	-386bsd)
		os=-bsd
		;;
	-ctix* | -uts*)
		os=-sysv
		;;
	-nova*)
		os=-rtmk-nova
		;;
	-ns2 )
		os=-nextstep2
		;;
	-nsk*)
		os=-nsk
		;;
	# Preserve the version number of sinix5.
	-sinix5.*)
		os=`echo $os | sed -e 's|sinix|sysv|'`
		;;
	-sinix*)
		os=-sysv4
		;;
	-tpf*)
		os=-tpf
		;;
	-triton*)
		os=-sysv3
		;;
	-oss*)
		os=-sysv3
		;;
	-svr4)
		os=-sysv4
		;;
	-svr3)
		os=-sysv3
		;;
	-sysvr4)
		os=-sysv4
		;;
	# This must come after -sysvr4.
	-sysv*)
		;;
	-ose*)
		os=-ose
		;;
	-es1800*)
		os=-ose
		;;
	-xenix)
		os=-xenix
		;;
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
		os=-mint
		;;
	-aros*)
		os=-aros
		;;
	-kaos*)
		os=-kaos
		;;
	-zvmoe)
		os=-zvmoe
		;;
	-dicos*)
		os=-dicos
		;;
	-nacl*)
		;;
	-none)
		;;
	*)
		# Get rid of the `-' at the beginning of $os.
		os=`echo $os | sed 's/[^-]*-//'`
		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
		exit 1
		;;
esac
else

# Here we handle the default operating systems that come with various machines.
# The value should be what the vendor currently ships out the door with their
# machine or put another way, the most popular os provided with the machine.

# Note that if you're going to try to match "-MANUFACTURER" here (say,
# "-sun"), then you have to tell the case statement up towards the top
# that MANUFACTURER isn't an operating system.  Otherwise, code above
# will signal an error saying that MANUFACTURER isn't an operating
# system, and we'll never get to this point.

case $basic_machine in
	score-*)
		os=-elf
		;;
	spu-*)
		os=-elf
		;;
	*-acorn)
		os=-riscix1.2
		;;
	arm*-rebel)
		os=-linux
		;;
	arm*-semi)
		os=-aout
		;;
	c4x-* | tic4x-*)
		os=-coff
		;;
	tic54x-*)
		os=-coff
		;;
	tic55x-*)
		os=-coff
		;;
	tic6x-*)
		os=-coff
		;;
	# This must come before the *-dec entry.
	pdp10-*)
		os=-tops20
		;;
	pdp11-*)
		os=-none
		;;
	*-dec | vax-*)
		os=-ultrix4.2
		;;
	m68*-apollo)
		os=-domain
		;;
	i386-sun)
		os=-sunos4.0.2
		;;
	m68000-sun)
		os=-sunos3
		# This also exists in the configure program, but was not the
		# default.
		# os=-sunos4
		;;
	m68*-cisco)
		os=-aout
		;;
	mep-*)
		os=-elf
		;;
	mips*-cisco)
		os=-elf
		;;
	mips*-*)
		os=-elf
		;;
	or32-*)
		os=-coff
		;;
	*-tti)	# must be before sparc entry or we get the wrong os.
		os=-sysv3
		;;
	sparc-* | *-sun)
		os=-sunos4.1.1
		;;
	*-be)
		os=-beos
		;;
	*-haiku)
		os=-haiku
		;;
	*-ibm)
		os=-aix
		;;
	*-knuth)
		os=-mmixware
		;;
	*-wec)
		os=-proelf
		;;
	*-winbond)
		os=-proelf
		;;
	*-oki)
		os=-proelf
		;;
	*-hp)
		os=-hpux
		;;
	*-hitachi)
		os=-hiux
		;;
	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
		os=-sysv
		;;
	*-cbm)
		os=-amigaos
		;;
	*-dg)
		os=-dgux
		;;
	*-dolphin)
		os=-sysv3
		;;
	m68k-ccur)
		os=-rtu
		;;
	m88k-omron*)
		os=-luna
		;;
	*-next )
		os=-nextstep
		;;
	*-sequent)
		os=-ptx
		;;
	*-crds)
		os=-unos
		;;
	*-ns)
		os=-genix
		;;
	i370-*)
		os=-mvs
		;;
	*-next)
		os=-nextstep3
		;;
	*-gould)
		os=-sysv
		;;
	*-highlevel)
		os=-bsd
		;;
	*-encore)
		os=-bsd
		;;
	*-sgi)
		os=-irix
		;;
	*-siemens)
		os=-sysv4
		;;
	*-masscomp)
		os=-rtu
		;;
	f30[01]-fujitsu | f700-fujitsu)
		os=-uxpv
		;;
	*-rom68k)
		os=-coff
		;;
	*-*bug)
		os=-coff
		;;
	*-apple)
		os=-macos
		;;
	*-atari*)
		os=-mint
		;;
	*)
		os=-none
		;;
esac
fi

# Here we handle the case where we know the os, and the CPU type, but not the
# manufacturer.  We pick the logical manufacturer.
vendor=unknown
case $basic_machine in
	*-unknown)
		case $os in
			-riscix*)
				vendor=acorn
				;;
			-sunos*)
				vendor=sun
				;;
			-cnk*|-aix*)
				vendor=ibm
				;;
			-beos*)
				vendor=be
				;;
			-hpux*)
				vendor=hp
				;;
			-mpeix*)
				vendor=hp
				;;
			-hiux*)
				vendor=hitachi
				;;
			-unos*)
				vendor=crds
				;;
			-dgux*)
				vendor=dg
				;;
			-luna*)
				vendor=omron
				;;
			-genix*)
				vendor=ns
				;;
			-mvs* | -opened*)
				vendor=ibm
				;;
			-os400*)
				vendor=ibm
				;;
			-ptx*)
				vendor=sequent
				;;
			-tpf*)
				vendor=ibm
				;;
			-vxsim* | -vxworks* | -windiss*)
				vendor=wrs
				;;
			-aux*)
				vendor=apple
				;;
			-hms*)
				vendor=hitachi
				;;
			-mpw* | -macos*)
				vendor=apple
				;;
			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
				vendor=atari
				;;
			-vos*)
				vendor=stratus
				;;
		esac
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
		;;
esac

echo $basic_machine$os
exit

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:
@