OSDN > Pesquisar Software > graphicsmagick > SCM > hg > GM > Commit

graphicsmagick
Fork

GM: Commit

Main GraphicsMagick source repository

Commit MetaInfo

Revisão	59c8ee0db7b9ce7d66533350409d1f44076e35b5 (tree)
Hora	2021-07-19 04:35:54
Autor	Bob Friesenhahn <bfriesen@Grap...>
Commiter	Bob Friesenhahn

Mensagem de Log

Add support for using an external 'graphicsmagick_snapshot_copy' script to copy files for the 'snapshot' target.

Mudança Sumário

modified: ChangeLog (diff)
modified: Makefile.am (diff)
modified: Makefile.in (diff)
modified: config/config.guess (diff)
modified: config/config.sub (diff)
modified: configure (diff)
modified: configure.ac (diff)
modified: www/Changelog.html (diff)

Diff

diff -r dc28ec43d483 -r 59c8ee0db7b9 ChangeLog

--- a/ChangeLog Sun Jul 18 09:58:45 2021 -0500

+++ b/ChangeLog Sun Jul 18 14:35:54 2021 -0500

		@@ -1,5 +1,10 @@
1	1	2021-07-18 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
2	2
	3	+ * Makefile.am: Add support for using an external
	4	+ 'graphicsmagick_snapshot_copy' script to copy files for the
	5	+ 'snapshot' target. This provides local control over how files are
	6	+ copied and where they are copied to.
	7	+
3	8	* coders/msl.c (MSLStartElement): Use macros to simplify
4	9	validations and reduce repeated code fragments. Add validations
5	10	for image size and pixels present where applicable. Fixes

diff -r dc28ec43d483 -r 59c8ee0db7b9 Makefile.am

--- a/Makefile.am Sun Jul 18 09:58:45 2021 -0500

+++ b/Makefile.am Sun Jul 18 14:35:54 2021 -0500

		@@ -379,6 +379,21 @@
379	379	#
380	380	# Build a validated snapshot release and move to the snapshots directory.
381	381	#
	382	+
	383	+if HasGRAPHICSMAGICK_SNAPSHOT_COPY
	384	+
	385	+# Use a graphicsmagick_snapshot_copy script to copy snapshot files
	386	+# somewhere using some mechanism only known to itself.
	387	+#
	388	+# The arguments to the script are the original path names of the files to distribute.
	389	+snapshot: distcheck
	390	+ $(MAKE) $(DIST_ARCHIVE_SRPM)
	391	+ $(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
	392	+ $(GRAPHICSMAGICK_SNAPSHOT_COPY) $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) $(top_srcdir)/ChangeLog $(top_srcdir)/www/Changelog.html
	393	+
	394	+else
	395	+
	396	+# Use a hard-coded mechanism and destination path to copy snapshot files
382	397	SNAPSHOT_DIRECTORY=/ftp/pub/GraphicsMagick/snapshots
383	398	snapshot: distcheck
384	399	$(MAKE) $(DIST_ARCHIVE_SRPM)

		@@ -389,6 +404,8 @@
389	404	cp $(top_srcdir)/ChangeLog $(SNAPSHOT_DIRECTORY)/ChangeLog.txt
390	405	cp $(top_srcdir)/www/Changelog.html $(SNAPSHOT_DIRECTORY)/ChangeLog.html
391	406
	407	+endif # HasGRAPHICSMAGICK_SNAPSHOT_COPY
	408	+
392	409	COVERITY_EMAIL=bfriesen@simple.dallas.tx.us
393	410	COVERITY_TARBALL=GraphicsMagick.xz
394	411	COVERITY_VERSION=snapshot-@PACKAGE_CHANGE_DATE@

diff -r dc28ec43d483 -r 59c8ee0db7b9 Makefile.in

--- a/Makefile.in Sun Jul 18 09:58:45 2021 -0500

+++ b/Makefile.in Sun Jul 18 14:35:54 2021 -0500

		@@ -2436,6 +2436,7 @@
2436	2436	FT_CFLAGS = @FT_CFLAGS@
2437	2437	FT_LIBS = @FT_LIBS@
2438	2438	GMDelegate = @GMDelegate@
	2439	+GRAPHICSMAGICK_SNAPSHOT_COPY = @GRAPHICSMAGICK_SNAPSHOT_COPY@
2439	2440	GREP = @GREP@
2440	2441	GSCMYKDevice = @GSCMYKDevice@
2441	2442	GSColorAlphaDevice = @GSColorAlphaDevice@

		@@ -4855,10 +4856,8 @@
4855	4856	$(distdir).tar.xz $(distdir).tar.zst
4856	4857
4857	4858
4858		-#
4859		-# Build a validated snapshot release and move to the snapshots directory.
4860		-#
4861		-SNAPSHOT_DIRECTORY = /ftp/pub/GraphicsMagick/snapshots
	4859	+# Use a hard-coded mechanism and destination path to copy snapshot files
	4860	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@SNAPSHOT_DIRECTORY = /ftp/pub/GraphicsMagick/snapshots
4862	4861	COVERITY_EMAIL = bfriesen@simple.dallas.tx.us
4863	4862	COVERITY_TARBALL = GraphicsMagick.xz
4864	4863	COVERITY_VERSION = snapshot-@PACKAGE_CHANGE_DATE@

		@@ -11298,14 +11297,27 @@
11298	11297	dist-zstd: distdir
11299	11298	tardir=$(distdir) && $(am__tar) \| ZSTD_CLEVEL=$${ZSTD_CLEVEL-22} zstd --ultra -c >$(distdir).tar.zst
11300	11299	$(am__post_remove_distdir)
11301		-snapshot: distcheck
11302		- $(MAKE) $(DIST_ARCHIVE_SRPM)
11303		- $(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
11304		- $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-.tar.
11305		- $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z
11306		- mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) $(SNAPSHOT_DIRECTORY)/
11307		- cp $(top_srcdir)/ChangeLog $(SNAPSHOT_DIRECTORY)/ChangeLog.txt
11308		- cp $(top_srcdir)/www/Changelog.html $(SNAPSHOT_DIRECTORY)/ChangeLog.html
	11300	+
	11301	+#
	11302	+# Build a validated snapshot release and move to the snapshots directory.
	11303	+#
	11304	+
	11305	+# Use a graphicsmagick_snapshot_copy script to copy snapshot files
	11306	+# somewhere using some mechanism only known to itself.
	11307	+#
	11308	+# The arguments to the script are the original path names of the files to distribute.
	11309	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@snapshot: distcheck
	11310	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(MAKE) $(DIST_ARCHIVE_SRPM)
	11311	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
	11312	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(GRAPHICSMAGICK_SNAPSHOT_COPY) $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) $(top_srcdir)/ChangeLog $(top_srcdir)/www/Changelog.html
	11313	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@snapshot: distcheck
	11314	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(MAKE) $(DIST_ARCHIVE_SRPM)
	11315	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
	11316	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-.tar.
	11317	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z
	11318	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) $(SNAPSHOT_DIRECTORY)/
	11319	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ cp $(top_srcdir)/ChangeLog $(SNAPSHOT_DIRECTORY)/ChangeLog.txt
	11320	+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ cp $(top_srcdir)/www/Changelog.html $(SNAPSHOT_DIRECTORY)/ChangeLog.html
11309	11321	# New URL is https://brb.synopsys.com/?project=GraphicsMagick
11310	11322	coverity:
11311	11323	$(MAKE) clean

diff -r dc28ec43d483 -r 59c8ee0db7b9 config/config.guess

--- a/config/config.guess Sun Jul 18 09:58:45 2021 -0500

+++ b/config/config.guess Sun Jul 18 14:35:54 2021 -0500

		@@ -2,7 +2,9 @@
2	2	# Attempt to guess a canonical system name.
3	3	# Copyright 1992-2021 Free Software Foundation, Inc.
4	4
5		-timestamp='2021-01-01'
	5	+# shellcheck disable=SC2006,SC2268 # see below for rationale
	6	+
	7	+timestamp='2021-06-03'
6	8
7	9	# This file is free software; you can redistribute it and/or modify it
8	10	# under the terms of the GNU General Public License as published by

		@@ -32,7 +34,15 @@
32	34	# Please send patches to <config-patches@gnu.org>.
33	35
34	36
35		-me=$(echo "$0" \| sed -e 's,.*/,,')
	37	+# The "shellcheck disable" line above the timestamp inhibits complaints
	38	+# about features and limitations of the classic Bourne shell that were
	39	+# superseded or lifted in POSIX. However, this script identifies a wide
	40	+# variety of pre-POSIX systems that do not have POSIX shells at all, and
	41	+# even some reasonably current systems (Solaris 10 as case-in-point) still
	42	+# have a pre-POSIX /bin/sh.
	43	+
	44	+
	45	+me=`echo "$0" \| sed -e 's,.*/,,'`
36	46
37	47	usage="\
38	48	Usage: $0 [OPTION]

		@@ -84,6 +94,9 @@
84	94	exit 1
85	95	fi
86	96
	97	+# Just in case it came from the environment.
	98	+GUESS=
	99	+
87	100	# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
88	101	# compiler to aid in system detection is discouraged as it requires
89	102	# temporary files to be created and, as you can see below, it is a

		@@ -102,8 +115,8 @@
102	115	# prevent multiple calls if $tmp is already set
103	116	test "$tmp" && return 0
104	117	: "${TMPDIR=/tmp}"
105		- # shellcheck disable=SC2039
106		- { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } \|\|
	118	+ # shellcheck disable=SC2039,SC3028
	119	+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
107	120	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } \|\|
108	121	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
109	122	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }

		@@ -112,7 +125,7 @@
112	125	,,) echo "int x;" > "$dummy.c"
113	126	for driver in cc gcc c89 c99 ; do
114	127	if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
115		- CC_FOR_BUILD="$driver"
	128	+ CC_FOR_BUILD=$driver
116	129	break
117	130	fi
118	131	done

		@@ -131,12 +144,12 @@
131	144	PATH=$PATH:/.attbin ; export PATH
132	145	fi
133	146
134		-UNAME_MACHINE=$( (uname -m) 2>/dev/null) \|\| UNAME_MACHINE=unknown
135		-UNAME_RELEASE=$( (uname -r) 2>/dev/null) \|\| UNAME_RELEASE=unknown
136		-UNAME_SYSTEM=$( (uname -s) 2>/dev/null) \|\| UNAME_SYSTEM=unknown
137		-UNAME_VERSION=$( (uname -v) 2>/dev/null) \|\| UNAME_VERSION=unknown
	147	+UNAME_MACHINE=`(uname -m) 2>/dev/null` \|\| UNAME_MACHINE=unknown
	148	+UNAME_RELEASE=`(uname -r) 2>/dev/null` \|\| UNAME_RELEASE=unknown
	149	+UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
	150	+UNAME_VERSION=`(uname -v) 2>/dev/null` \|\| UNAME_VERSION=unknown
138	151
139		-case "$UNAME_SYSTEM" in
	152	+case $UNAME_SYSTEM in
140	153	Linux\|GNU\|GNU/*)
141	154	LIBC=unknown
142	155

		@@ -157,7 +170,8 @@
157	170	#endif
158	171	#endif
159	172	EOF
160		- eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g')"
	173	+ cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`
	174	+ eval "$cc_set_libc"
161	175
162	176	# Second heuristic to detect musl libc.
163	177	if [ "$LIBC" = unknown ] &&

		@@ -176,7 +190,7 @@
176	190
177	191	# Note: order is significant - the case branches are not exclusive.
178	192
179		-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
	193	+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
180	194	:NetBSD::*)
181	195	# NetBSD (nbsd) targets should (where applicable) match one or
182	196	# more of the tuples: --netbsdelf, --netbsdaout,

		@@ -188,12 +202,11 @@
188	202	#
189	203	# Note: NetBSD doesn't particularly care about the vendor
190	204	# portion of the name. We always set it to "unknown".
191		- sysctl="sysctl -n hw.machine_arch"
192		- UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null \|\| \
193		- "/sbin/$sysctl" 2>/dev/null \|\| \
194		- "/usr/sbin/$sysctl" 2>/dev/null \|\| \
195		- echo unknown))
196		- case "$UNAME_MACHINE_ARCH" in
	205	+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null \|\| \
	206	+ /sbin/sysctl -n hw.machine_arch 2>/dev/null \|\| \
	207	+ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null \|\| \
	208	+ echo unknown)`
	209	+ case $UNAME_MACHINE_ARCH in
197	210	aarch64eb) machine=aarch64_be-unknown ;;
198	211	armeb) machine=armeb-unknown ;;
199	212	arm*) machine=arm-unknown ;;

		@@ -201,15 +214,15 @@
201	214	sh3eb) machine=sh-unknown ;;
202	215	sh5el) machine=sh5le-unknown ;;
203	216	earmv*)
204		- arch=$(echo "$UNAME_MACHINE_ARCH" \| sed -e 's,^e$armv[0-9]$.*$,\1,')
205		- endian=$(echo "$UNAME_MACHINE_ARCH" \| sed -ne 's,^.*$eb$$,\1,p')
206		- machine="${arch}${endian}"-unknown
	217	+ arch=`echo "$UNAME_MACHINE_ARCH" \| sed -e 's,^e$armv[0-9]$.*$,\1,'`
	218	+ endian=`echo "$UNAME_MACHINE_ARCH" \| sed -ne 's,^.*$eb$$,\1,p'`
	219	+ machine=${arch}${endian}-unknown
207	220	;;
208		- *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
	221	+ *) machine=$UNAME_MACHINE_ARCH-unknown ;;
209	222	esac
210	223	# The Operating System including object format, if it has switched
211	224	# to ELF recently (or will in the future) and ABI.
212		- case "$UNAME_MACHINE_ARCH" in
	225	+ case $UNAME_MACHINE_ARCH in
213	226	earm*)
214	227	os=netbsdelf
215	228	;;

		@@ -230,10 +243,10 @@
230	243	;;
231	244	esac
232	245	# Determine ABI tags.
233		- case "$UNAME_MACHINE_ARCH" in
	246	+ case $UNAME_MACHINE_ARCH in
234	247	earm*)
235	248	expr='s/^earmv[0-9]/-eabi/;s/eb$//'
236		- abi=$(echo "$UNAME_MACHINE_ARCH" \| sed -e "$expr")
	249	+ abi=`echo "$UNAME_MACHINE_ARCH" \| sed -e "$expr"`
237	250	;;
238	251	esac
239	252	# The OS release

		@@ -241,76 +254,82 @@
241	254	# thus, need a distinct triplet. However, they do not need
242	255	# kernel version information, so it can be replaced with a
243	256	# suitable tag, in the style of linux-gnu.
244		- case "$UNAME_VERSION" in
	257	+ case $UNAME_VERSION in
245	258	Debian*)
246	259	release='-gnu'
247	260	;;
248	261	*)
249		- release=$(echo "$UNAME_RELEASE" \| sed -e 's/[-_].*//' \| cut -d. -f1,2)
	262	+ release=`echo "$UNAME_RELEASE" \| sed -e 's/[-_].*//' \| cut -d. -f1,2`
250	263	;;
251	264	esac
252	265	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
253	266	# contains redundant information, the shorter form:
254	267	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
255		- echo "$machine-${os}${release}${abi-}"
256		- exit ;;
	268	+ GUESS=$machine-${os}${release}${abi-}
	269	+ ;;
257	270	:Bitrig::*)
258		- UNAME_MACHINE_ARCH=$(arch \| sed 's/Bitrig.//')
259		- echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
260		- exit ;;
	271	+ UNAME_MACHINE_ARCH=`arch \| sed 's/Bitrig.//'`
	272	+ GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
	273	+ ;;
261	274	:OpenBSD::*)
262		- UNAME_MACHINE_ARCH=$(arch \| sed 's/OpenBSD.//')
263		- echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
264		- exit ;;
	275	+ UNAME_MACHINE_ARCH=`arch \| sed 's/OpenBSD.//'`
	276	+ GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
	277	+ ;;
	278	+ :SecBSD::*)
	279	+ UNAME_MACHINE_ARCH=`arch \| sed 's/SecBSD.//'`
	280	+ GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
	281	+ ;;
265	282	:LibertyBSD::*)
266		- UNAME_MACHINE_ARCH=$(arch \| sed 's/^.*BSD\.//')
267		- echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
268		- exit ;;
	283	+ UNAME_MACHINE_ARCH=`arch \| sed 's/^.*BSD\.//'`
	284	+ GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
	285	+ ;;
269	286	:MidnightBSD::*)
270		- echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
271		- exit ;;
	287	+ GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
	288	+ ;;
272	289	:ekkoBSD::*)
273		- echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
274		- exit ;;
	290	+ GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
	291	+ ;;
275	292	:SolidBSD::*)
276		- echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
277		- exit ;;
	293	+ GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
	294	+ ;;
278	295	:OS108::*)
279		- echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
280		- exit ;;
	296	+ GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
	297	+ ;;
281	298	macppc:MirBSD::)
282		- echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
283		- exit ;;
	299	+ GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
	300	+ ;;
284	301	:MirBSD::*)
285		- echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
286		- exit ;;
	302	+ GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
	303	+ ;;
287	304	:Sortix::*)
288		- echo "$UNAME_MACHINE"-unknown-sortix
289		- exit ;;
	305	+ GUESS=$UNAME_MACHINE-unknown-sortix
	306	+ ;;
290	307	:Twizzler::*)
291		- echo "$UNAME_MACHINE"-unknown-twizzler
292		- exit ;;
	308	+ GUESS=$UNAME_MACHINE-unknown-twizzler
	309	+ ;;
293	310	:Redox::*)
294		- echo "$UNAME_MACHINE"-unknown-redox
295		- exit ;;
	311	+ GUESS=$UNAME_MACHINE-unknown-redox
	312	+ ;;
296	313	mips:OSF1:.)
297		- echo mips-dec-osf1
298		- exit ;;
	314	+ GUESS=mips-dec-osf1
	315	+ ;;
299	316	alpha:OSF1::)
	317	+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
	318	+ trap '' 0
300	319	case $UNAME_RELEASE in
301	320	*4.0)
302		- UNAME_RELEASE=$(/usr/sbin/sizer -v \| awk '{print $3}')
	321	+ UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $3}'`
303	322	;;
304	323	5.)
305		- UNAME_RELEASE=$(/usr/sbin/sizer -v \| awk '{print $4}')
	324	+ UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $4}'`
306	325	;;
307	326	esac
308	327	# According to Compaq, /usr/sbin/psrinfo has been available on
309	328	# OSF/1 and Tru64 systems produced since 1995. I hope that
310	329	# covers most systems running today. This code pipes the CPU
311	330	# types through head -n 1, so we only detect the type of CPU 0.
312		- ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v \| sed -n -e 's/^ The alpha $.$ processor.$/\1/p' \| head -n 1)
313		- case "$ALPHA_CPU_TYPE" in
	331	+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v \| sed -n -e 's/^ The alpha $.$ processor.$/\1/p' \| head -n 1`
	332	+ case $ALPHA_CPU_TYPE in
314	333	"EV4 (21064)")
315	334	UNAME_MACHINE=alpha ;;
316	335	"EV4.5 (21064)")

		@@ -347,68 +366,69 @@
347	366	# A Tn.n version is a released field test version.
348	367	# A Xn.n version is an unreleased experimental baselevel.
349	368	# 1.2 uses "1.2" for uname -r.
350		- echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)"
351		- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
352		- exitcode=$?
353		- trap '' 0
354		- exit $exitcode ;;
	369	+ OSF_REL=`echo "$UNAME_RELEASE" \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
	370	+ GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
	371	+ ;;
355	372	Amiga:UNIX_System_V:4.0:)
356		- echo m68k-unknown-sysv4
357		- exit ;;
	373	+ GUESS=m68k-unknown-sysv4
	374	+ ;;
358	375	:[Aa]miga[Oo][Ss]::*)
359		- echo "$UNAME_MACHINE"-unknown-amigaos
360		- exit ;;
	376	+ GUESS=$UNAME_MACHINE-unknown-amigaos
	377	+ ;;
361	378	:[Mm]orph[Oo][Ss]::*)
362		- echo "$UNAME_MACHINE"-unknown-morphos
363		- exit ;;
	379	+ GUESS=$UNAME_MACHINE-unknown-morphos
	380	+ ;;
364	381	:OS/390::*)
365		- echo i370-ibm-openedition
366		- exit ;;
	382	+ GUESS=i370-ibm-openedition
	383	+ ;;
367	384	:z/VM::*)
368		- echo s390-ibm-zvmoe
369		- exit ;;
	385	+ GUESS=s390-ibm-zvmoe
	386	+ ;;
370	387	:OS400::*)
371		- echo powerpc-ibm-os400
372		- exit ;;
	388	+ GUESS=powerpc-ibm-os400
	389	+ ;;
373	390	arm:RISC:1.[012]:\|arm:riscix:1.[012]:*)
374		- echo arm-acorn-riscix"$UNAME_RELEASE"
375		- exit ;;
	391	+ GUESS=arm-acorn-riscix$UNAME_RELEASE
	392	+ ;;
376	393	arm:riscos::\|arm:RISCOS::)
377		- echo arm-unknown-riscos
378		- exit ;;
	394	+ GUESS=arm-unknown-riscos
	395	+ ;;
379	396	SR2?01:HI-UX/MPP:: \| SR8000:HI-UX/MPP::)
380		- echo hppa1.1-hitachi-hiuxmpp
381		- exit ;;
	397	+ GUESS=hppa1.1-hitachi-hiuxmpp
	398	+ ;;
382	399	Pyramid:OSx:: \| MIS:OSx:: \| MIS:SMP_DC-OSx::)
383	400	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
384		- if test "$( (/bin/universe) 2>/dev/null)" = att ; then
385		- echo pyramid-pyramid-sysv3
386		- else
387		- echo pyramid-pyramid-bsd
388		- fi
389		- exit ;;
	401	+ case `(/bin/universe) 2>/dev/null` in
	402	+ att) GUESS=pyramid-pyramid-sysv3 ;;
	403	+ *) GUESS=pyramid-pyramid-bsd ;;
	404	+ esac
	405	+ ;;
390	406	NILE::*:dcosx)
391		- echo pyramid-pyramid-svr4
392		- exit ;;
	407	+ GUESS=pyramid-pyramid-svr4
	408	+ ;;
393	409	DRS?6000:unix:4.0:6*)
394		- echo sparc-icl-nx6
395		- exit ;;
	410	+ GUESS=sparc-icl-nx6
	411	+ ;;
396	412	DRS?6000:UNIX_SV:4.2:7 \| DRS?6000:isis:4.2:7)
397		- case $(/usr/bin/uname -p) in
398		- sparc) echo sparc-icl-nx7; exit ;;
399		- esac ;;
	413	+ case `/usr/bin/uname -p` in
	414	+ sparc) GUESS=sparc-icl-nx7 ;;
	415	+ esac
	416	+ ;;
400	417	s390x:SunOS::)
401		- echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//')"
402		- exit ;;
	418	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	419	+ GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
	420	+ ;;
403	421	sun4H:SunOS:5.:)
404		- echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//')"
405		- exit ;;
	422	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	423	+ GUESS=sparc-hal-solaris2$SUN_REL
	424	+ ;;
406	425	sun4:SunOS:5.:* \| tadpole:SunOS:5.:*)
407		- echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//')"
408		- exit ;;
	426	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	427	+ GUESS=sparc-sun-solaris2$SUN_REL
	428	+ ;;
409	429	i86pc:AuroraUX:5.: \| i86xen:AuroraUX:5.:)
410		- echo i386-pc-auroraux"$UNAME_RELEASE"
411		- exit ;;
	430	+ GUESS=i386-pc-auroraux$UNAME_RELEASE
	431	+ ;;
412	432	i86pc:SunOS:5.: \| i86xen:SunOS:5.:)
413	433	set_cc_for_build
414	434	SUN_ARCH=i386

		@@ -423,41 +443,44 @@
423	443	SUN_ARCH=x86_64
424	444	fi
425	445	fi
426		- echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//')"
427		- exit ;;
	446	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	447	+ GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
	448	+ ;;
428	449	sun4:SunOS:6:*)
429	450	# According to config.sub, this is the proper way to canonicalize
430	451	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
431	452	# it's likely to be more like Solaris than SunOS4.
432		- echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//')"
433		- exit ;;
	453	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	454	+ GUESS=sparc-sun-solaris3$SUN_REL
	455	+ ;;
434	456	sun4:SunOS::*)
435		- case "$(/usr/bin/arch -k)" in
	457	+ case `/usr/bin/arch -k` in
436	458	Series\|S4)
437		- UNAME_RELEASE=$(uname -v)
	459	+ UNAME_RELEASE=`uname -v`
438	460	;;
439	461	esac
440	462	# Japanese Language versions have a version number like `4.1.3-JL'.
441		- echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"\|sed -e 's/-/_/')"
442		- exit ;;
	463	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/-/_/'`
	464	+ GUESS=sparc-sun-sunos$SUN_REL
	465	+ ;;
443	466	sun3:SunOS::*)
444		- echo m68k-sun-sunos"$UNAME_RELEASE"
445		- exit ;;
	467	+ GUESS=m68k-sun-sunos$UNAME_RELEASE
	468	+ ;;
446	469	sun::4.2BSD:*)
447		- UNAME_RELEASE=$( (sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null)
	470	+ UNAME_RELEASE=`(sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null`
448	471	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
449		- case "$(/bin/arch)" in
	472	+ case `/bin/arch` in
450	473	sun3)
451		- echo m68k-sun-sunos"$UNAME_RELEASE"
	474	+ GUESS=m68k-sun-sunos$UNAME_RELEASE
452	475	;;
453	476	sun4)
454		- echo sparc-sun-sunos"$UNAME_RELEASE"
	477	+ GUESS=sparc-sun-sunos$UNAME_RELEASE
455	478	;;
456	479	esac
457		- exit ;;
	480	+ ;;
458	481	aushp:SunOS::)
459		- echo sparc-auspex-sunos"$UNAME_RELEASE"
460		- exit ;;
	482	+ GUESS=sparc-auspex-sunos$UNAME_RELEASE
	483	+ ;;
461	484	# The situation for MiNT is a little confusing. The machine name
462	485	# can be virtually everything (everything which is not
463	486	# "atarist" or "atariste" at least should have a processor

		@@ -467,41 +490,41 @@
467	490	# MiNT. But MiNT is downward compatible to TOS, so this should
468	491	# be no problem.
469	492	atarist[e]:MiNT::* \| atarist[e]:mint::* \| atarist[e]:TOS::*)
470		- echo m68k-atari-mint"$UNAME_RELEASE"
471		- exit ;;
	493	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	494	+ ;;
472	495	atari:MiNT:: \| atari:mint:: \| atarist[e]:TOS::*)
473		- echo m68k-atari-mint"$UNAME_RELEASE"
474		- exit ;;
	496	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	497	+ ;;
475	498	falcon:MiNT::* \| falcon:mint::* \| falcon:TOS::*)
476		- echo m68k-atari-mint"$UNAME_RELEASE"
477		- exit ;;
	499	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	500	+ ;;
478	501	milan:MiNT:: \| milan:mint:: \| milan:TOS::*)
479		- echo m68k-milan-mint"$UNAME_RELEASE"
480		- exit ;;
	502	+ GUESS=m68k-milan-mint$UNAME_RELEASE
	503	+ ;;
481	504	hades:MiNT:: \| hades:mint:: \| hades:TOS::*)
482		- echo m68k-hades-mint"$UNAME_RELEASE"
483		- exit ;;
	505	+ GUESS=m68k-hades-mint$UNAME_RELEASE
	506	+ ;;
484	507	:MiNT:: \| :mint:: \| :TOS::)
485		- echo m68k-unknown-mint"$UNAME_RELEASE"
486		- exit ;;
	508	+ GUESS=m68k-unknown-mint$UNAME_RELEASE
	509	+ ;;
487	510	m68k:machten::)
488		- echo m68k-apple-machten"$UNAME_RELEASE"
489		- exit ;;
	511	+ GUESS=m68k-apple-machten$UNAME_RELEASE
	512	+ ;;
490	513	powerpc:machten::)
491		- echo powerpc-apple-machten"$UNAME_RELEASE"
492		- exit ;;
	514	+ GUESS=powerpc-apple-machten$UNAME_RELEASE
	515	+ ;;
493	516	RISC:Mach::*)
494		- echo mips-dec-mach_bsd4.3
495		- exit ;;
	517	+ GUESS=mips-dec-mach_bsd4.3
	518	+ ;;
496	519	RISC:ULTRIX::*)
497		- echo mips-dec-ultrix"$UNAME_RELEASE"
498		- exit ;;
	520	+ GUESS=mips-dec-ultrix$UNAME_RELEASE
	521	+ ;;
499	522	VAX:ULTRIX::)
500		- echo vax-dec-ultrix"$UNAME_RELEASE"
501		- exit ;;
	523	+ GUESS=vax-dec-ultrix$UNAME_RELEASE
	524	+ ;;
502	525	2020:CLIX:: \| 2430:CLIX::)
503		- echo clipper-intergraph-clix"$UNAME_RELEASE"
504		- exit ;;
	526	+ GUESS=clipper-intergraph-clix$UNAME_RELEASE
	527	+ ;;
505	528	mips:::UMIPS \| mips:::RISCos)
506	529	set_cc_for_build
507	530	sed 's/^ //' << EOF > "$dummy.c"

		@@ -526,78 +549,79 @@
526	549	}
527	550	EOF
528	551	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
529		- dummyarg=$(echo "$UNAME_RELEASE" \| sed -n 's/$[0-9]$./\1/p') &&
530		- SYSTEM_NAME=$("$dummy" "$dummyarg") &&
	552	+ dummyarg=`echo "$UNAME_RELEASE" \| sed -n 's/$[0-9]$./\1/p'` &&
	553	+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
531	554	{ echo "$SYSTEM_NAME"; exit; }
532		- echo mips-mips-riscos"$UNAME_RELEASE"
533		- exit ;;
	555	+ GUESS=mips-mips-riscos$UNAME_RELEASE
	556	+ ;;
534	557	Motorola:PowerMAX_OS::)
535		- echo powerpc-motorola-powermax
536		- exit ;;
	558	+ GUESS=powerpc-motorola-powermax
	559	+ ;;
537	560	Motorola::4.3:PL8-)
538		- echo powerpc-harris-powermax
539		- exit ;;
	561	+ GUESS=powerpc-harris-powermax
	562	+ ;;
540	563	Night_Hawk:::PowerMAX_OS \| Synergy:PowerMAX_OS::)
541		- echo powerpc-harris-powermax
542		- exit ;;
	564	+ GUESS=powerpc-harris-powermax
	565	+ ;;
543	566	Night_Hawk:Power_UNIX::)
544		- echo powerpc-harris-powerunix
545		- exit ;;
	567	+ GUESS=powerpc-harris-powerunix
	568	+ ;;
546	569	m88k:CX/UX:7:)
547		- echo m88k-harris-cxux7
548		- exit ;;
	570	+ GUESS=m88k-harris-cxux7
	571	+ ;;
549	572	m88k::4:R4*)
550		- echo m88k-motorola-sysv4
551		- exit ;;
	573	+ GUESS=m88k-motorola-sysv4
	574	+ ;;
552	575	m88k::3:R3*)
553		- echo m88k-motorola-sysv3
554		- exit ;;
	576	+ GUESS=m88k-motorola-sysv3
	577	+ ;;
555	578	AViiON:dgux::)
556	579	# DG/UX returns AViiON for all architectures
557		- UNAME_PROCESSOR=$(/usr/bin/uname -p)
	580	+ UNAME_PROCESSOR=`/usr/bin/uname -p`
558	581	if test "$UNAME_PROCESSOR" = mc88100 \|\| test "$UNAME_PROCESSOR" = mc88110
559	582	then
560	583	if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx \|\| \
561	584	test "$TARGET_BINARY_INTERFACE"x = x
562	585	then
563		- echo m88k-dg-dgux"$UNAME_RELEASE"
	586	+ GUESS=m88k-dg-dgux$UNAME_RELEASE
564	587	else
565		- echo m88k-dg-dguxbcs"$UNAME_RELEASE"
	588	+ GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
566	589	fi
567	590	else
568		- echo i586-dg-dgux"$UNAME_RELEASE"
	591	+ GUESS=i586-dg-dgux$UNAME_RELEASE
569	592	fi
570		- exit ;;
	593	+ ;;
571	594	M88:DolphinOS::*) # DolphinOS (SVR3)
572		- echo m88k-dolphin-sysv3
573		- exit ;;
	595	+ GUESS=m88k-dolphin-sysv3
	596	+ ;;
574	597	M88::R3:)
575	598	# Delta 88k system running SVR3
576		- echo m88k-motorola-sysv3
577		- exit ;;
	599	+ GUESS=m88k-motorola-sysv3
	600	+ ;;
578	601	XD88:::) # Tektronix XD88 system running UTekV (SVR3)
579		- echo m88k-tektronix-sysv3
580		- exit ;;
	602	+ GUESS=m88k-tektronix-sysv3
	603	+ ;;
581	604	Tek43[0-9][0-9]:UTek::) # Tektronix 4300 system running UTek (BSD)
582		- echo m68k-tektronix-bsd
583		- exit ;;
	605	+ GUESS=m68k-tektronix-bsd
	606	+ ;;
584	607	:IRIX::)
585		- echo mips-sgi-irix"$(echo "$UNAME_RELEASE"\|sed -e 's/-/_/g')"
586		- exit ;;
	608	+ IRIX_REL=`echo "$UNAME_RELEASE" \| sed -e 's/-/_/g'`
	609	+ GUESS=mips-sgi-irix$IRIX_REL
	610	+ ;;
587	611	????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
588		- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
589		- exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX '
	612	+ GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id
	613	+ ;; # Note that: echo "'`uname -s`'" gives 'AIX '
590	614	i86:AIX::*)
591		- echo i386-ibm-aix
592		- exit ;;
	615	+ GUESS=i386-ibm-aix
	616	+ ;;
593	617	ia64:AIX::)
594	618	if test -x /usr/bin/oslevel ; then
595		- IBM_REV=$(/usr/bin/oslevel)
	619	+ IBM_REV=`/usr/bin/oslevel`
596	620	else
597		- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
	621	+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
598	622	fi
599		- echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
600		- exit ;;
	623	+ GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
	624	+ ;;
601	625	*:AIX:2:3)
602	626	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
603	627	set_cc_for_build

		@@ -612,68 +636,68 @@
612	636	exit(0);
613	637	}
614	638	EOF
615		- if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy")
	639	+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
616	640	then
617		- echo "$SYSTEM_NAME"
	641	+ GUESS=$SYSTEM_NAME
618	642	else
619		- echo rs6000-ibm-aix3.2.5
	643	+ GUESS=rs6000-ibm-aix3.2.5
620	644	fi
621	645	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
622		- echo rs6000-ibm-aix3.2.4
	646	+ GUESS=rs6000-ibm-aix3.2.4
623	647	else
624		- echo rs6000-ibm-aix3.2
	648	+ GUESS=rs6000-ibm-aix3.2
625	649	fi
626		- exit ;;
	650	+ ;;
627	651	:AIX::[4567])
628		- IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }')
	652	+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }'`
629	653	if /usr/sbin/lsattr -El "$IBM_CPU_ID" \| grep ' POWER' >/dev/null 2>&1; then
630	654	IBM_ARCH=rs6000
631	655	else
632	656	IBM_ARCH=powerpc
633	657	fi
634	658	if test -x /usr/bin/lslpp ; then
635		- IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc \|
636		- awk -F: '{ print $3 }' \| sed s/[0-9]*$/0/)
	659	+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc \| \
	660	+ awk -F: '{ print $3 }' \| sed s/[0-9]*$/0/`
637	661	else
638		- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
	662	+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
639	663	fi
640		- echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
641		- exit ;;
	664	+ GUESS=$IBM_ARCH-ibm-aix$IBM_REV
	665	+ ;;
642	666	:AIX::*)
643		- echo rs6000-ibm-aix
644		- exit ;;
	667	+ GUESS=rs6000-ibm-aix
	668	+ ;;
645	669	ibmrt:4.4BSD:\|romp-ibm:4.4BSD:)
646		- echo romp-ibm-bsd4.4
647		- exit ;;
	670	+ GUESS=romp-ibm-bsd4.4
	671	+ ;;
648	672	ibmrt:BSD:\|romp-ibm:BSD:*) # covers RT/PC BSD and
649		- echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
650		- exit ;; # report: romp-ibm BSD 4.3
	673	+ GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to
	674	+ ;; # report: romp-ibm BSD 4.3
651	675	:BOSX::*)
652		- echo rs6000-bull-bosx
653		- exit ;;
	676	+ GUESS=rs6000-bull-bosx
	677	+ ;;
654	678	DPX/2?00:B.O.S.::)
655		- echo m68k-bull-sysv3
656		- exit ;;
	679	+ GUESS=m68k-bull-sysv3
	680	+ ;;
657	681	9000/[34]??:4.3bsd:1.:)
658		- echo m68k-hp-bsd
659		- exit ;;
	682	+ GUESS=m68k-hp-bsd
	683	+ ;;
660	684	hp300:4.4BSD:: \| 9000/[34]??:4.3bsd:2.:)
661		- echo m68k-hp-bsd4.4
662		- exit ;;
	685	+ GUESS=m68k-hp-bsd4.4
	686	+ ;;
663	687	9000/[34678]??:HP-UX::)
664		- HPUX_REV=$(echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//')
665		- case "$UNAME_MACHINE" in
	688	+ HPUX_REV=`echo "$UNAME_RELEASE" \| sed -e 's/[^.].[0B]//'`
	689	+ case $UNAME_MACHINE in
666	690	9000/31?) HP_ARCH=m68000 ;;
667	691	9000/[34]??) HP_ARCH=m68k ;;
668	692	9000/[678][0-9][0-9])
669	693	if test -x /usr/bin/getconf; then
670		- sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null)
671		- sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null)
672		- case "$sc_cpu_version" in
	694	+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
	695	+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
	696	+ case $sc_cpu_version in
673	697	523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
674	698	528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
675	699	532) # CPU_PA_RISC2_0
676		- case "$sc_kernel_bits" in
	700	+ case $sc_kernel_bits in
677	701	32) HP_ARCH=hppa2.0n ;;
678	702	64) HP_ARCH=hppa2.0w ;;
679	703	'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20

		@@ -715,7 +739,7 @@
715	739	exit (0);
716	740	}
717	741	EOF
718		- (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy")
	742	+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
719	743	test -z "$HP_ARCH" && HP_ARCH=hppa
720	744	fi ;;
721	745	esac

		@@ -740,12 +764,12 @@
740	764	HP_ARCH=hppa64
741	765	fi
742	766	fi
743		- echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
744		- exit ;;
	767	+ GUESS=$HP_ARCH-hp-hpux$HPUX_REV
	768	+ ;;
745	769	ia64:HP-UX::)
746		- HPUX_REV=$(echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//')
747		- echo ia64-hp-hpux"$HPUX_REV"
748		- exit ;;
	770	+ HPUX_REV=`echo "$UNAME_RELEASE" \| sed -e 's/[^.].[0B]//'`
	771	+ GUESS=ia64-hp-hpux$HPUX_REV
	772	+ ;;
749	773	3050:HI-UX::*)
750	774	set_cc_for_build
751	775	sed 's/^ //' << EOF > "$dummy.c"

		@@ -773,38 +797,38 @@
773	797	exit (0);
774	798	}
775	799	EOF
776		- $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") &&
	800	+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
777	801	{ echo "$SYSTEM_NAME"; exit; }
778		- echo unknown-hitachi-hiuxwe2
779		- exit ;;
	802	+ GUESS=unknown-hitachi-hiuxwe2
	803	+ ;;
780	804	9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd::)
781		- echo hppa1.1-hp-bsd
782		- exit ;;
	805	+ GUESS=hppa1.1-hp-bsd
	806	+ ;;
783	807	9000/8??:4.3bsd::)
784		- echo hppa1.0-hp-bsd
785		- exit ;;
	808	+ GUESS=hppa1.0-hp-bsd
	809	+ ;;
786	810	9??:MPE/iX:: \| 3000:MPE/iX::)
787		- echo hppa1.0-hp-mpeix
788		- exit ;;
	811	+ GUESS=hppa1.0-hp-mpeix
	812	+ ;;
789	813	hp7??:OSF1:: \| hp8?[79]:OSF1::)
790		- echo hppa1.1-hp-osf
791		- exit ;;
	814	+ GUESS=hppa1.1-hp-osf
	815	+ ;;
792	816	hp8??:OSF1::)
793		- echo hppa1.0-hp-osf
794		- exit ;;
	817	+ GUESS=hppa1.0-hp-osf
	818	+ ;;
795	819	i86:OSF1::*)
796	820	if test -x /usr/sbin/sysversion ; then
797		- echo "$UNAME_MACHINE"-unknown-osf1mk
	821	+ GUESS=$UNAME_MACHINE-unknown-osf1mk
798	822	else
799		- echo "$UNAME_MACHINE"-unknown-osf1
	823	+ GUESS=$UNAME_MACHINE-unknown-osf1
800	824	fi
801		- exit ;;
	825	+ ;;
802	826	parisc:Lites::)
803		- echo hppa1.1-hp-lites
804		- exit ;;
	827	+ GUESS=hppa1.1-hp-lites
	828	+ ;;
805	829	C1:ConvexOS::* \| convex:ConvexOS:C1:)
806		- echo c1-convex-bsd
807		- exit ;;
	830	+ GUESS=c1-convex-bsd
	831	+ ;;
808	832	C2:ConvexOS::* \| convex:ConvexOS:C2:)
809	833	if getsysinfo -f scalar_acc
810	834	then echo c32-convex-bsd

		@@ -812,17 +836,18 @@
812	836	fi
813	837	exit ;;
814	838	C34:ConvexOS::* \| convex:ConvexOS:C34:)
815		- echo c34-convex-bsd
816		- exit ;;
	839	+ GUESS=c34-convex-bsd
	840	+ ;;
817	841	C38:ConvexOS::* \| convex:ConvexOS:C38:)
818		- echo c38-convex-bsd
819		- exit ;;
	842	+ GUESS=c38-convex-bsd
	843	+ ;;
820	844	C4:ConvexOS::* \| convex:ConvexOS:C4:)
821		- echo c4-convex-bsd
822		- exit ;;
	845	+ GUESS=c4-convex-bsd
	846	+ ;;
823	847	CRAYY-MP:::)
824		- echo ymp-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
825		- exit ;;
	848	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	849	+ GUESS=ymp-cray-unicos$CRAY_REL
	850	+ ;;
826	851	CRAY[A-Z]90:::)
827	852	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
828	853	\| sed -e 's/CRAY.*$[A-Z]90$/\1/' \

		@@ -830,114 +855,126 @@
830	855	-e 's/\.[^.]*$/.X/'
831	856	exit ;;
832	857	CRAYTS:::)
833		- echo t90-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
834		- exit ;;
	858	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	859	+ GUESS=t90-cray-unicos$CRAY_REL
	860	+ ;;
835	861	CRAYT3E:::)
836		- echo alphaev5-cray-unicosmk"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
837		- exit ;;
	862	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	863	+ GUESS=alphaev5-cray-unicosmk$CRAY_REL
	864	+ ;;
838	865	CRAYSV1:::)
839		- echo sv1-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
840		- exit ;;
	866	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	867	+ GUESS=sv1-cray-unicos$CRAY_REL
	868	+ ;;
841	869	:UNICOS/mp::*)
842		- echo craynv-cray-unicosmp"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
843		- exit ;;
	870	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	871	+ GUESS=craynv-cray-unicosmp$CRAY_REL
	872	+ ;;
844	873	F30[01]:UNIX_System_V:: \| F700:UNIX_System_V::)
845		- FUJITSU_PROC=$(uname -m \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
846		- FUJITSU_SYS=$(uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///')
847		- FUJITSU_REL=$(echo "$UNAME_RELEASE" \| sed -e 's/ /_/')
848		- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
849		- exit ;;
	874	+ FUJITSU_PROC=`uname -m \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
	875	+ FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
	876	+ FUJITSU_REL=`echo "$UNAME_RELEASE" \| sed -e 's/ /_/'`
	877	+ GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
	878	+ ;;
850	879	5000:UNIX_System_V:4.:)
851		- FUJITSU_SYS=$(uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///')
852		- FUJITSU_REL=$(echo "$UNAME_RELEASE" \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/ /_/')
853		- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
854		- exit ;;
	880	+ FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
	881	+ FUJITSU_REL=`echo "$UNAME_RELEASE" \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/ /_/'`
	882	+ GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
	883	+ ;;
855	884	i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::*)
856		- echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
857		- exit ;;
	885	+ GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
	886	+ ;;
858	887	sparc:BSD/OS::*)
859		- echo sparc-unknown-bsdi"$UNAME_RELEASE"
860		- exit ;;
	888	+ GUESS=sparc-unknown-bsdi$UNAME_RELEASE
	889	+ ;;
861	890	:BSD/OS::*)
862		- echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
863		- exit ;;
	891	+ GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
	892	+ ;;
864	893	arm:FreeBSD::)
865		- UNAME_PROCESSOR=$(uname -p)
	894	+ UNAME_PROCESSOR=`uname -p`
866	895	set_cc_for_build
867	896	if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
868	897	\| grep -q __ARM_PCS_VFP
869	898	then
870		- echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//')"-gnueabi
	899	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	900	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
871	901	else
872		- echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//')"-gnueabihf
	902	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	903	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
873	904	fi
874		- exit ;;
	905	+ ;;
875	906	:FreeBSD::*)
876		- UNAME_PROCESSOR=$(/usr/bin/uname -p)
877		- case "$UNAME_PROCESSOR" in
	907	+ UNAME_PROCESSOR=`/usr/bin/uname -p`
	908	+ case $UNAME_PROCESSOR in
878	909	amd64)
879	910	UNAME_PROCESSOR=x86_64 ;;
880	911	i386)
881	912	UNAME_PROCESSOR=i586 ;;
882	913	esac
883		- echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//')"
884		- exit ;;
	914	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	915	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
	916	+ ;;
885	917	i:CYGWIN:*)
886		- echo "$UNAME_MACHINE"-pc-cygwin
887		- exit ;;
	918	+ GUESS=$UNAME_MACHINE-pc-cygwin
	919	+ ;;
888	920	:MINGW64:*)
889		- echo "$UNAME_MACHINE"-pc-mingw64
890		- exit ;;
	921	+ GUESS=$UNAME_MACHINE-pc-mingw64
	922	+ ;;
891	923	:MINGW:*)
892		- echo "$UNAME_MACHINE"-pc-mingw32
893		- exit ;;
	924	+ GUESS=$UNAME_MACHINE-pc-mingw32
	925	+ ;;
894	926	:MSYS:*)
895		- echo "$UNAME_MACHINE"-pc-msys
896		- exit ;;
	927	+ GUESS=$UNAME_MACHINE-pc-msys
	928	+ ;;
897	929	i:PW:*)
898		- echo "$UNAME_MACHINE"-pc-pw32
899		- exit ;;
	930	+ GUESS=$UNAME_MACHINE-pc-pw32
	931	+ ;;
900	932	:Interix:*)
901		- case "$UNAME_MACHINE" in
	933	+ case $UNAME_MACHINE in
902	934	x86)
903		- echo i586-pc-interix"$UNAME_RELEASE"
904		- exit ;;
	935	+ GUESS=i586-pc-interix$UNAME_RELEASE
	936	+ ;;
905	937	authenticamd \| genuineintel \| EM64T)
906		- echo x86_64-unknown-interix"$UNAME_RELEASE"
907		- exit ;;
	938	+ GUESS=x86_64-unknown-interix$UNAME_RELEASE
	939	+ ;;
908	940	IA64)
909		- echo ia64-unknown-interix"$UNAME_RELEASE"
910		- exit ;;
	941	+ GUESS=ia64-unknown-interix$UNAME_RELEASE
	942	+ ;;
911	943	esac ;;
912	944	i:UWIN:*)
913		- echo "$UNAME_MACHINE"-pc-uwin
914		- exit ;;
	945	+ GUESS=$UNAME_MACHINE-pc-uwin
	946	+ ;;
915	947	amd64:CYGWIN::* \| x86_64:CYGWIN::*)
916		- echo x86_64-pc-cygwin
917		- exit ;;
	948	+ GUESS=x86_64-pc-cygwin
	949	+ ;;
918	950	prep:SunOS:5.:*)
919		- echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//')"
920		- exit ;;
	951	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	952	+ GUESS=powerpcle-unknown-solaris2$SUN_REL
	953	+ ;;
921	954	:GNU::*)
922	955	# the GNU system
923		- echo "$(echo "$UNAME_MACHINE"\|sed -e 's,[-/].$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"\|sed -e 's,/.$,,')"
924		- exit ;;
	956	+ GNU_ARCH=`echo "$UNAME_MACHINE" \| sed -e 's,[-/].*$,,'`
	957	+ GNU_REL=`echo "$UNAME_RELEASE" \| sed -e 's,/.*$,,'`
	958	+ GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
	959	+ ;;
925	960	:GNU/::)
926	961	# other systems with GNU libc and userland
927		- echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" \| sed 's,^[^/]/,,' \| tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"\|sed -e 's/[-(].//')-$LIBC"
928		- exit ;;
	962	+ GNU_SYS=`echo "$UNAME_SYSTEM" \| sed 's,^[^/]*/,,' \| tr "[:upper:]" "[:lower:]"`
	963	+ GNU_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	964	+ GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
	965	+ ;;
929	966	:Minix::*)
930		- echo "$UNAME_MACHINE"-unknown-minix
931		- exit ;;
	967	+ GUESS=$UNAME_MACHINE-unknown-minix
	968	+ ;;
932	969	aarch64:Linux::)
933		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
934		- exit ;;
	970	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	971	+ ;;
935	972	aarch64_be:Linux::)
936	973	UNAME_MACHINE=aarch64_be
937		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
938		- exit ;;
	974	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	975	+ ;;
939	976	alpha:Linux::)
940		- case $(sed -n '/^cpu model/s/^.: $.$/\1/p' /proc/cpuinfo 2>/dev/null) in
	977	+ case `sed -n '/^cpu model/s/^.: $.$/\1/p' /proc/cpuinfo 2>/dev/null` in
941	978	EV5) UNAME_MACHINE=alphaev5 ;;
942	979	EV56) UNAME_MACHINE=alphaev56 ;;
943	980	PCA56) UNAME_MACHINE=alphapca56 ;;

		@@ -948,63 +985,63 @@
948	985	esac
949	986	objdump --private-headers /bin/sh \| grep -q ld.so.1
950	987	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
951		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
952		- exit ;;
953		- arc:Linux:: \| arceb:Linux::)
954		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
955		- exit ;;
	988	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	989	+ ;;
	990	+ arc:Linux:: \| arceb:Linux:: \| arc32:Linux:: \| arc64:Linux::)
	991	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	992	+ ;;
956	993	arm:Linux::*)
957	994	set_cc_for_build
958	995	if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \
959	996	\| grep -q __ARM_EABI__
960	997	then
961		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	998	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
962	999	else
963	1000	if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
964	1001	\| grep -q __ARM_PCS_VFP
965	1002	then
966		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
	1003	+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
967	1004	else
968		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
	1005	+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
969	1006	fi
970	1007	fi
971		- exit ;;
	1008	+ ;;
972	1009	avr32:Linux::*)
973		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
974		- exit ;;
	1010	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1011	+ ;;
975	1012	cris:Linux::)
976		- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
977		- exit ;;
	1013	+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
	1014	+ ;;
978	1015	crisv32:Linux::)
979		- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
980		- exit ;;
	1016	+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
	1017	+ ;;
981	1018	e2k:Linux::)
982		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
983		- exit ;;
	1019	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1020	+ ;;
984	1021	frv:Linux::)
985		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
986		- exit ;;
	1022	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1023	+ ;;
987	1024	hexagon:Linux::)
988		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
989		- exit ;;
	1025	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1026	+ ;;
990	1027	i86:Linux::*)
991		- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
992		- exit ;;
	1028	+ GUESS=$UNAME_MACHINE-pc-linux-$LIBC
	1029	+ ;;
993	1030	ia64:Linux::)
994		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
995		- exit ;;
	1031	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1032	+ ;;
996	1033	k1om:Linux::)
997		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
998		- exit ;;
	1034	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1035	+ ;;
999	1036	loongarch32:Linux:: \| loongarch64:Linux:: \| loongarchx32:Linux::)
1000		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1001		- exit ;;
	1037	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1038	+ ;;
1002	1039	m32r:Linux::*)
1003		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1004		- exit ;;
	1040	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1041	+ ;;
1005	1042	m68:Linux::*)
1006		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1007		- exit ;;
	1043	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1044	+ ;;
1008	1045	mips:Linux:: \| mips64:Linux::)
1009	1046	set_cc_for_build
1010	1047	IS_GLIBC=0

		@@ -1049,65 +1086,66 @@
1049	1086	#endif
1050	1087	#endif
1051	1088	EOF
1052		- eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^CPU\\|^MIPS_ENDIAN\\|^LIBCABI')"
	1089	+ cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^CPU\\|^MIPS_ENDIAN\\|^LIBCABI'`
	1090	+ eval "$cc_set_vars"
1053	1091	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
1054	1092	;;
1055	1093	mips64el:Linux::)
1056		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1057		- exit ;;
	1094	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1095	+ ;;
1058	1096	openrisc:Linux::*)
1059		- echo or1k-unknown-linux-"$LIBC"
1060		- exit ;;
	1097	+ GUESS=or1k-unknown-linux-$LIBC
	1098	+ ;;
1061	1099	or32:Linux:: \| or1k:Linux::*)
1062		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1063		- exit ;;
	1100	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1101	+ ;;
1064	1102	padre:Linux::)
1065		- echo sparc-unknown-linux-"$LIBC"
1066		- exit ;;
	1103	+ GUESS=sparc-unknown-linux-$LIBC
	1104	+ ;;
1067	1105	parisc64:Linux:: \| hppa64:Linux::)
1068		- echo hppa64-unknown-linux-"$LIBC"
1069		- exit ;;
	1106	+ GUESS=hppa64-unknown-linux-$LIBC
	1107	+ ;;
1070	1108	parisc:Linux:: \| hppa:Linux::)
1071	1109	# Look for CPU level
1072		- case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null \| cut -d' ' -f2) in
1073		- PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
1074		- PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
1075		- *) echo hppa-unknown-linux-"$LIBC" ;;
	1110	+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null \| cut -d' ' -f2` in
	1111	+ PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
	1112	+ PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
	1113	+ *) GUESS=hppa-unknown-linux-$LIBC ;;
1076	1114	esac
1077		- exit ;;
	1115	+ ;;
1078	1116	ppc64:Linux::)
1079		- echo powerpc64-unknown-linux-"$LIBC"
1080		- exit ;;
	1117	+ GUESS=powerpc64-unknown-linux-$LIBC
	1118	+ ;;
1081	1119	ppc:Linux::)
1082		- echo powerpc-unknown-linux-"$LIBC"
1083		- exit ;;
	1120	+ GUESS=powerpc-unknown-linux-$LIBC
	1121	+ ;;
1084	1122	ppc64le:Linux::)
1085		- echo powerpc64le-unknown-linux-"$LIBC"
1086		- exit ;;
	1123	+ GUESS=powerpc64le-unknown-linux-$LIBC
	1124	+ ;;
1087	1125	ppcle:Linux::)
1088		- echo powerpcle-unknown-linux-"$LIBC"
1089		- exit ;;
	1126	+ GUESS=powerpcle-unknown-linux-$LIBC
	1127	+ ;;
1090	1128	riscv32:Linux:: \| riscv32be:Linux:: \| riscv64:Linux:: \| riscv64be:Linux::)
1091		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1092		- exit ;;
	1129	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1130	+ ;;
1093	1131	s390:Linux:: \| s390x:Linux::)
1094		- echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
1095		- exit ;;
	1132	+ GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
	1133	+ ;;
1096	1134	sh64:Linux::*)
1097		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1098		- exit ;;
	1135	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1136	+ ;;
1099	1137	sh:Linux::*)
1100		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1101		- exit ;;
	1138	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1139	+ ;;
1102	1140	sparc:Linux:: \| sparc64:Linux::)
1103		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1104		- exit ;;
	1141	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1142	+ ;;
1105	1143	tile:Linux::*)
1106		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1107		- exit ;;
	1144	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1145	+ ;;
1108	1146	vax:Linux::)
1109		- echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1110		- exit ;;
	1147	+ GUESS=$UNAME_MACHINE-dec-linux-$LIBC
	1148	+ ;;
1111	1149	x86_64:Linux::)
1112	1150	set_cc_for_build
1113	1151	LIBCABI=$LIBC

		@@ -1116,71 +1154,71 @@
1116	1154	(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
1117	1155	grep IS_X32 >/dev/null
1118	1156	then
1119		- LIBCABI="$LIBC"x32
	1157	+ LIBCABI=${LIBC}x32
1120	1158	fi
1121	1159	fi
1122		- echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
1123		- exit ;;
	1160	+ GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
	1161	+ ;;
1124	1162	xtensa:Linux::*)
1125		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1126		- exit ;;
	1163	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1164	+ ;;
1127	1165	i86:DYNIX/ptx:4:*)
1128	1166	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1129	1167	# earlier versions are messed up and put the nodename in both
1130	1168	# sysname and nodename.
1131		- echo i386-sequent-sysv4
1132		- exit ;;
	1169	+ GUESS=i386-sequent-sysv4
	1170	+ ;;
1133	1171	i86:UNIX_SV:4.2MP:2.)
1134	1172	# Unixware is an offshoot of SVR4, but it has its own version
1135	1173	# number series starting with 2...
1136	1174	# I am not positive that other SVR4 systems won't match this,
1137	1175	# I just have to hope. -- rms.
1138	1176	# Use sysv4.2uw... so that sysv4* matches it.
1139		- echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
1140		- exit ;;
	1177	+ GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
	1178	+ ;;
1141	1179	i86:OS/2::*)
1142	1180	# If we were able to find `uname', then EMX Unix compatibility
1143	1181	# is probably installed.
1144		- echo "$UNAME_MACHINE"-pc-os2-emx
1145		- exit ;;
	1182	+ GUESS=$UNAME_MACHINE-pc-os2-emx
	1183	+ ;;
1146	1184	i86:XTS-300::STOP)
1147		- echo "$UNAME_MACHINE"-unknown-stop
1148		- exit ;;
	1185	+ GUESS=$UNAME_MACHINE-unknown-stop
	1186	+ ;;
1149	1187	i86:atheos::*)
1150		- echo "$UNAME_MACHINE"-unknown-atheos
1151		- exit ;;
	1188	+ GUESS=$UNAME_MACHINE-unknown-atheos
	1189	+ ;;
1152	1190	i86:syllable::*)
1153		- echo "$UNAME_MACHINE"-pc-syllable
1154		- exit ;;
	1191	+ GUESS=$UNAME_MACHINE-pc-syllable
	1192	+ ;;
1155	1193	i86:LynxOS:2.:* \| i86:LynxOS:3.[01]:* \| i86:LynxOS:4.[02]:*)
1156		- echo i386-unknown-lynxos"$UNAME_RELEASE"
1157		- exit ;;
	1194	+ GUESS=i386-unknown-lynxos$UNAME_RELEASE
	1195	+ ;;
1158	1196	i86:DOS::)
1159		- echo "$UNAME_MACHINE"-pc-msdosdjgpp
1160		- exit ;;
	1197	+ GUESS=$UNAME_MACHINE-pc-msdosdjgpp
	1198	+ ;;
1161	1199	i86::4.:)
1162		- UNAME_REL=$(echo "$UNAME_RELEASE" \| sed 's/\/MP$//')
	1200	+ UNAME_REL=`echo "$UNAME_RELEASE" \| sed 's/\/MP$//'`
1163	1201	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1164		- echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
	1202	+ GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
1165	1203	else
1166		- echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
	1204	+ GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
1167	1205	fi
1168		- exit ;;
	1206	+ ;;
1169	1207	i86::5:[678]*)
1170	1208	# UnixWare 7.x, OpenUNIX and OpenServer 6.
1171		- case $(/bin/uname -X \| grep "^Machine") in
	1209	+ case `/bin/uname -X \| grep "^Machine"` in
1172	1210	486) UNAME_MACHINE=i486 ;;
1173	1211	*Pentium) UNAME_MACHINE=i586 ;;
1174	1212	Pent\|*Celeron) UNAME_MACHINE=i686 ;;
1175	1213	esac
1176		- echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
1177		- exit ;;
	1214	+ GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	1215	+ ;;
1178	1216	i86::3.2:*)
1179	1217	if test -f /usr/options/cb.name; then
1180		- UNAME_REL=$(sed -n 's/.*Version //p' </usr/options/cb.name)
1181		- echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
	1218	+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
	1219	+ GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
1182	1220	elif /bin/uname -X 2>/dev/null >/dev/null ; then
1183		- UNAME_REL=$( (/bin/uname -X\|grep Release\|sed -e 's/.*= //'))
	1221	+ UNAME_REL=`(/bin/uname -X\|grep Release\|sed -e 's/.*= //')`
1184	1222	(/bin/uname -X\|grep i80486 >/dev/null) && UNAME_MACHINE=i486
1185	1223	(/bin/uname -X\|grep '^Machine.*Pentium' >/dev/null) \
1186	1224	&& UNAME_MACHINE=i586

		@@ -1188,11 +1226,11 @@
1188	1226	&& UNAME_MACHINE=i686
1189	1227	(/bin/uname -X\|grep '^Machine.*Pentium Pro' >/dev/null) \
1190	1228	&& UNAME_MACHINE=i686
1191		- echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
	1229	+ GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
1192	1230	else
1193		- echo "$UNAME_MACHINE"-pc-sysv32
	1231	+ GUESS=$UNAME_MACHINE-pc-sysv32
1194	1232	fi
1195		- exit ;;
	1233	+ ;;
1196	1234	pc:::*)
1197	1235	# Left here for compatibility:
1198	1236	# uname -m prints for DJGPP always 'pc', but it prints nothing about

		@@ -1200,37 +1238,37 @@
1200	1238	# Note: whatever this is, it MUST be the same as what config.sub
1201	1239	# prints for the "djgpp" host, or else GDB configure will decide that
1202	1240	# this is a cross-build.
1203		- echo i586-pc-msdosdjgpp
1204		- exit ;;
	1241	+ GUESS=i586-pc-msdosdjgpp
	1242	+ ;;
1205	1243	Intel:Mach:3:)
1206		- echo i386-pc-mach3
1207		- exit ;;
	1244	+ GUESS=i386-pc-mach3
	1245	+ ;;
1208	1246	paragon:::*)
1209		- echo i860-intel-osf1
1210		- exit ;;
	1247	+ GUESS=i860-intel-osf1
	1248	+ ;;
1211	1249	i860::4.:*) # i860-SVR4
1212	1250	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1213		- echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
	1251	+ GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4
1214	1252	else # Add other i860-SVR4 vendors below as they are discovered.
1215		- echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
	1253	+ GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4
1216	1254	fi
1217		- exit ;;
	1255	+ ;;
1218	1256	mini:CTIX:SYS5:*)
1219	1257	# "miniframe"
1220		- echo m68010-convergent-sysv
1221		- exit ;;
	1258	+ GUESS=m68010-convergent-sysv
	1259	+ ;;
1222	1260	mc68k:UNIX:SYSTEM5:3.51m)
1223		- echo m68k-convergent-sysv
1224		- exit ;;
	1261	+ GUESS=m68k-convergent-sysv
	1262	+ ;;
1225	1263	M680?0:D-NIX:5.3:*)
1226		- echo m68k-diab-dnix
1227		- exit ;;
	1264	+ GUESS=m68k-diab-dnix
	1265	+ ;;
1228	1266	M68::R3V[5678]:)
1229	1267	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1230	1268	3[345]??::4.0:3.0 \| 3[34]??A::4.0:3.0 \| 3[34]??,::4.0:3.0 \| 3[34]??/::4.0:3.0 \| 4400::4.0:3.0 \| 4850::4.0:3.0 \| SKA40::4.0:3.0 \| SDS2::4.0:3.0 \| SHG2::4.0:3.0 \| S7501:*:4.0:3.0)
1231	1269	OS_REL=''
1232	1270	test -r /etc/.relid \
1233		- && OS_REL=.$(sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid)
	1271	+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
1234	1272	/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
1235	1273	&& { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1236	1274	/bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \

		@@ -1241,7 +1279,7 @@
1241	1279	NCR::4.2:* \| MPRAS::4.2:*)
1242	1280	OS_REL='.3'
1243	1281	test -r /etc/.relid \
1244		- && OS_REL=.$(sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid)
	1282	+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
1245	1283	/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
1246	1284	&& { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1247	1285	/bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \

		@@ -1249,118 +1287,118 @@
1249	1287	/bin/uname -p 2>/dev/null \| /bin/grep pteron >/dev/null \
1250	1288	&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1251	1289	m68:LynxOS:2.:* \| m68:LynxOS:3.0:*)
1252		- echo m68k-unknown-lynxos"$UNAME_RELEASE"
1253		- exit ;;
	1290	+ GUESS=m68k-unknown-lynxos$UNAME_RELEASE
	1291	+ ;;
1254	1292	mc68030:UNIX_System_V:4.:)
1255		- echo m68k-atari-sysv4
1256		- exit ;;
	1293	+ GUESS=m68k-atari-sysv4
	1294	+ ;;
1257	1295	TSUNAMI:LynxOS:2.:)
1258		- echo sparc-unknown-lynxos"$UNAME_RELEASE"
1259		- exit ;;
	1296	+ GUESS=sparc-unknown-lynxos$UNAME_RELEASE
	1297	+ ;;
1260	1298	rs6000:LynxOS:2.:)
1261		- echo rs6000-unknown-lynxos"$UNAME_RELEASE"
1262		- exit ;;
	1299	+ GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
	1300	+ ;;
1263	1301	PowerPC:LynxOS:2.: \| PowerPC:LynxOS:3.[01]: \| PowerPC:LynxOS:4.[02]:)
1264		- echo powerpc-unknown-lynxos"$UNAME_RELEASE"
1265		- exit ;;
	1302	+ GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
	1303	+ ;;
1266	1304	SM[BE]S:UNIX_SV::)
1267		- echo mips-dde-sysv"$UNAME_RELEASE"
1268		- exit ;;
	1305	+ GUESS=mips-dde-sysv$UNAME_RELEASE
	1306	+ ;;
1269	1307	RM:ReliantUNIX-::)
1270		- echo mips-sni-sysv4
1271		- exit ;;
	1308	+ GUESS=mips-sni-sysv4
	1309	+ ;;
1272	1310	RM:SINIX-::)
1273		- echo mips-sni-sysv4
1274		- exit ;;
	1311	+ GUESS=mips-sni-sysv4
	1312	+ ;;
1275	1313	:SINIX-::)
1276	1314	if uname -p 2>/dev/null >/dev/null ; then
1277		- UNAME_MACHINE=$( (uname -p) 2>/dev/null)
1278		- echo "$UNAME_MACHINE"-sni-sysv4
	1315	+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
	1316	+ GUESS=$UNAME_MACHINE-sni-sysv4
1279	1317	else
1280		- echo ns32k-sni-sysv
	1318	+ GUESS=ns32k-sni-sysv
1281	1319	fi
1282		- exit ;;
	1320	+ ;;
1283	1321	PENTIUM::4.0:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1284	1322	# says <Richard.M.Bartel@ccMail.Census.GOV>
1285		- echo i586-unisys-sysv4
1286		- exit ;;
	1323	+ GUESS=i586-unisys-sysv4
	1324	+ ;;
1287	1325	:UNIX_System_V:4:FTX*)
1288	1326	# From Gerald Hewes <hewes@openmarket.com>.
1289	1327	# How about differentiating between stratus architectures? -djm
1290		- echo hppa1.1-stratus-sysv4
1291		- exit ;;
	1328	+ GUESS=hppa1.1-stratus-sysv4
	1329	+ ;;
1292	1330	:::FTX)
1293	1331	# From seanf@swdc.stratus.com.
1294		- echo i860-stratus-sysv4
1295		- exit ;;
	1332	+ GUESS=i860-stratus-sysv4
	1333	+ ;;
1296	1334	i86:VOS::*)
1297	1335	# From Paul.Green@stratus.com.
1298		- echo "$UNAME_MACHINE"-stratus-vos
1299		- exit ;;
	1336	+ GUESS=$UNAME_MACHINE-stratus-vos
	1337	+ ;;
1300	1338	:VOS::*)
1301	1339	# From Paul.Green@stratus.com.
1302		- echo hppa1.1-stratus-vos
1303		- exit ;;
	1340	+ GUESS=hppa1.1-stratus-vos
	1341	+ ;;
1304	1342	mc68:A/UX::*)
1305		- echo m68k-apple-aux"$UNAME_RELEASE"
1306		- exit ;;
	1343	+ GUESS=m68k-apple-aux$UNAME_RELEASE
	1344	+ ;;
1307	1345	news:NEWS-OS:6:*)
1308		- echo mips-sony-newsos6
1309		- exit ;;
	1346	+ GUESS=mips-sony-newsos6
	1347	+ ;;
1310	1348	R[34]000:System_V:: \| R4000:UNIX_SYSV:: \| R000:UNIX_SV::*)
1311	1349	if test -d /usr/nec; then
1312		- echo mips-nec-sysv"$UNAME_RELEASE"
	1350	+ GUESS=mips-nec-sysv$UNAME_RELEASE
1313	1351	else
1314		- echo mips-unknown-sysv"$UNAME_RELEASE"
	1352	+ GUESS=mips-unknown-sysv$UNAME_RELEASE
1315	1353	fi
1316		- exit ;;
	1354	+ ;;
1317	1355	BeBox:BeOS::) # BeOS running on hardware made by Be, PPC only.
1318		- echo powerpc-be-beos
1319		- exit ;;
	1356	+ GUESS=powerpc-be-beos
	1357	+ ;;
1320	1358	BeMac:BeOS::) # BeOS running on Mac or Mac clone, PPC only.
1321		- echo powerpc-apple-beos
1322		- exit ;;
	1359	+ GUESS=powerpc-apple-beos
	1360	+ ;;
1323	1361	BePC:BeOS::) # BeOS running on Intel PC compatible.
1324		- echo i586-pc-beos
1325		- exit ;;
	1362	+ GUESS=i586-pc-beos
	1363	+ ;;
1326	1364	BePC:Haiku::) # Haiku running on Intel PC compatible.
1327		- echo i586-pc-haiku
1328		- exit ;;
	1365	+ GUESS=i586-pc-haiku
	1366	+ ;;
1329	1367	x86_64:Haiku::)
1330		- echo x86_64-unknown-haiku
1331		- exit ;;
	1368	+ GUESS=x86_64-unknown-haiku
	1369	+ ;;
1332	1370	SX-4:SUPER-UX::)
1333		- echo sx4-nec-superux"$UNAME_RELEASE"
1334		- exit ;;
	1371	+ GUESS=sx4-nec-superux$UNAME_RELEASE
	1372	+ ;;
1335	1373	SX-5:SUPER-UX::)
1336		- echo sx5-nec-superux"$UNAME_RELEASE"
1337		- exit ;;
	1374	+ GUESS=sx5-nec-superux$UNAME_RELEASE
	1375	+ ;;
1338	1376	SX-6:SUPER-UX::)
1339		- echo sx6-nec-superux"$UNAME_RELEASE"
1340		- exit ;;
	1377	+ GUESS=sx6-nec-superux$UNAME_RELEASE
	1378	+ ;;
1341	1379	SX-7:SUPER-UX::)
1342		- echo sx7-nec-superux"$UNAME_RELEASE"
1343		- exit ;;
	1380	+ GUESS=sx7-nec-superux$UNAME_RELEASE
	1381	+ ;;
1344	1382	SX-8:SUPER-UX::)
1345		- echo sx8-nec-superux"$UNAME_RELEASE"
1346		- exit ;;
	1383	+ GUESS=sx8-nec-superux$UNAME_RELEASE
	1384	+ ;;
1347	1385	SX-8R:SUPER-UX::)
1348		- echo sx8r-nec-superux"$UNAME_RELEASE"
1349		- exit ;;
	1386	+ GUESS=sx8r-nec-superux$UNAME_RELEASE
	1387	+ ;;
1350	1388	SX-ACE:SUPER-UX::)
1351		- echo sxace-nec-superux"$UNAME_RELEASE"
1352		- exit ;;
	1389	+ GUESS=sxace-nec-superux$UNAME_RELEASE
	1390	+ ;;
1353	1391	Power:Rhapsody::*)
1354		- echo powerpc-apple-rhapsody"$UNAME_RELEASE"
1355		- exit ;;
	1392	+ GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
	1393	+ ;;
1356	1394	:Rhapsody::*)
1357		- echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
1358		- exit ;;
	1395	+ GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
	1396	+ ;;
1359	1397	arm64:Darwin::)
1360		- echo aarch64-apple-darwin"$UNAME_RELEASE"
1361		- exit ;;
	1398	+ GUESS=aarch64-apple-darwin$UNAME_RELEASE
	1399	+ ;;
1362	1400	:Darwin::*)
1363		- UNAME_PROCESSOR=$(uname -p)
	1401	+ UNAME_PROCESSOR=`uname -p`
1364	1402	case $UNAME_PROCESSOR in
1365	1403	unknown) UNAME_PROCESSOR=powerpc ;;
1366	1404	esac

		@@ -1394,109 +1432,116 @@
1394	1432	# uname -m returns i386 or x86_64
1395	1433	UNAME_PROCESSOR=$UNAME_MACHINE
1396	1434	fi
1397		- echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
1398		- exit ;;
	1435	+ GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
	1436	+ ;;
1399	1437	:procnto:: \| :QNX:[0123456789]:*)
1400		- UNAME_PROCESSOR=$(uname -p)
	1438	+ UNAME_PROCESSOR=`uname -p`
1401	1439	if test "$UNAME_PROCESSOR" = x86; then
1402	1440	UNAME_PROCESSOR=i386
1403	1441	UNAME_MACHINE=pc
1404	1442	fi
1405		- echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
1406		- exit ;;
	1443	+ GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
	1444	+ ;;
1407	1445	:QNX::4*)
1408		- echo i386-pc-qnx
1409		- exit ;;
	1446	+ GUESS=i386-pc-qnx
	1447	+ ;;
1410	1448	NEO-:NONSTOP_KERNEL::*)
1411		- echo neo-tandem-nsk"$UNAME_RELEASE"
1412		- exit ;;
	1449	+ GUESS=neo-tandem-nsk$UNAME_RELEASE
	1450	+ ;;
1413	1451	NSE-:NONSTOP_KERNEL::*)
1414		- echo nse-tandem-nsk"$UNAME_RELEASE"
1415		- exit ;;
	1452	+ GUESS=nse-tandem-nsk$UNAME_RELEASE
	1453	+ ;;
1416	1454	NSR-:NONSTOP_KERNEL::*)
1417		- echo nsr-tandem-nsk"$UNAME_RELEASE"
1418		- exit ;;
	1455	+ GUESS=nsr-tandem-nsk$UNAME_RELEASE
	1456	+ ;;
1419	1457	NSV-:NONSTOP_KERNEL::*)
1420		- echo nsv-tandem-nsk"$UNAME_RELEASE"
1421		- exit ;;
	1458	+ GUESS=nsv-tandem-nsk$UNAME_RELEASE
	1459	+ ;;
1422	1460	NSX-:NONSTOP_KERNEL::*)
1423		- echo nsx-tandem-nsk"$UNAME_RELEASE"
1424		- exit ;;
	1461	+ GUESS=nsx-tandem-nsk$UNAME_RELEASE
	1462	+ ;;
1425	1463	:NonStop-UX::*)
1426		- echo mips-compaq-nonstopux
1427		- exit ;;
	1464	+ GUESS=mips-compaq-nonstopux
	1465	+ ;;
1428	1466	BS2000:POSIX::*)
1429		- echo bs2000-siemens-sysv
1430		- exit ;;
	1467	+ GUESS=bs2000-siemens-sysv
	1468	+ ;;
1431	1469	DS/:UNIX_System_V::*)
1432		- echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
1433		- exit ;;
	1470	+ GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
	1471	+ ;;
1434	1472	:Plan9::*)
1435	1473	# "uname -m" is not consistent, so use $cputype instead. 386
1436	1474	# is converted to i386 for consistency with other x86
1437	1475	# operating systems.
1438		- # shellcheck disable=SC2154
1439		- if test "$cputype" = 386; then
	1476	+ if test "${cputype-}" = 386; then
1440	1477	UNAME_MACHINE=i386
1441		- else
1442		- UNAME_MACHINE="$cputype"
	1478	+ elif test "x${cputype-}" != x; then
	1479	+ UNAME_MACHINE=$cputype
1443	1480	fi
1444		- echo "$UNAME_MACHINE"-unknown-plan9
1445		- exit ;;
	1481	+ GUESS=$UNAME_MACHINE-unknown-plan9
	1482	+ ;;
1446	1483	:TOPS-10::*)
1447		- echo pdp10-unknown-tops10
1448		- exit ;;
	1484	+ GUESS=pdp10-unknown-tops10
	1485	+ ;;
1449	1486	:TENEX::*)
1450		- echo pdp10-unknown-tenex
1451		- exit ;;
	1487	+ GUESS=pdp10-unknown-tenex
	1488	+ ;;
1452	1489	KS10:TOPS-20:: \| KL10:TOPS-20:: \| TYPE4:TOPS-20::)
1453		- echo pdp10-dec-tops20
1454		- exit ;;
	1490	+ GUESS=pdp10-dec-tops20
	1491	+ ;;
1455	1492	XKL-1:TOPS-20:: \| TYPE5:TOPS-20::)
1456		- echo pdp10-xkl-tops20
1457		- exit ;;
	1493	+ GUESS=pdp10-xkl-tops20
	1494	+ ;;
1458	1495	:TOPS-20::*)
1459		- echo pdp10-unknown-tops20
1460		- exit ;;
	1496	+ GUESS=pdp10-unknown-tops20
	1497	+ ;;
1461	1498	:ITS::*)
1462		- echo pdp10-unknown-its
1463		- exit ;;
	1499	+ GUESS=pdp10-unknown-its
	1500	+ ;;
1464	1501	SEI:::SEIUX)
1465		- echo mips-sei-seiux"$UNAME_RELEASE"
1466		- exit ;;
	1502	+ GUESS=mips-sei-seiux$UNAME_RELEASE
	1503	+ ;;
1467	1504	:DragonFly::*)
1468		- echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//')"
1469		- exit ;;
	1505	+ DRAGONFLY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	1506	+ GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
	1507	+ ;;
1470	1508	:VMS::)
1471		- UNAME_MACHINE=$( (uname -p) 2>/dev/null)
1472		- case "$UNAME_MACHINE" in
1473		- A*) echo alpha-dec-vms ; exit ;;
1474		- I*) echo ia64-dec-vms ; exit ;;
1475		- V*) echo vax-dec-vms ; exit ;;
	1509	+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
	1510	+ case $UNAME_MACHINE in
	1511	+ A*) GUESS=alpha-dec-vms ;;
	1512	+ I*) GUESS=ia64-dec-vms ;;
	1513	+ V*) GUESS=vax-dec-vms ;;
1476	1514	esac ;;
1477	1515	:XENIX::SysV)
1478		- echo i386-pc-xenix
1479		- exit ;;
	1516	+ GUESS=i386-pc-xenix
	1517	+ ;;
1480	1518	i86:skyos::*)
1481		- echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" \| sed -e 's/ .*$//')"
1482		- exit ;;
	1519	+ SKYOS_REL=`echo "$UNAME_RELEASE" \| sed -e 's/ .*$//'`
	1520	+ GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
	1521	+ ;;
1483	1522	i86:rdos::*)
1484		- echo "$UNAME_MACHINE"-pc-rdos
1485		- exit ;;
1486		- i86:AROS::*)
1487		- echo "$UNAME_MACHINE"-pc-aros
1488		- exit ;;
	1523	+ GUESS=$UNAME_MACHINE-pc-rdos
	1524	+ ;;
	1525	+ :AROS::*)
	1526	+ GUESS=$UNAME_MACHINE-unknown-aros
	1527	+ ;;
1489	1528	x86_64:VMkernel::)
1490		- echo "$UNAME_MACHINE"-unknown-esx
1491		- exit ;;
	1529	+ GUESS=$UNAME_MACHINE-unknown-esx
	1530	+ ;;
1492	1531	amd64:Isilon\ OneFS::)
1493		- echo x86_64-unknown-onefs
1494		- exit ;;
	1532	+ GUESS=x86_64-unknown-onefs
	1533	+ ;;
1495	1534	:Unleashed::*)
1496		- echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
1497		- exit ;;
	1535	+ GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
	1536	+ ;;
1498	1537	esac
1499	1538
	1539	+# Do we have a guess based on uname results?
	1540	+if test "x$GUESS" != x; then
	1541	+ echo "$GUESS"
	1542	+ exit
	1543	+fi
	1544	+
1500	1545	# No uname command or uname output not recognized.
1501	1546	set_cc_for_build
1502	1547	cat > "$dummy.c" <<EOF

		@@ -1536,7 +1581,7 @@
1536	1581	#define __ARCHITECTURE__ "m68k"
1537	1582	#endif
1538	1583	int version;
1539		- version=$( (hostinfo \| sed -n 's/.NeXT Mach $[0-9]$.*/\1/p') 2>/dev/null);
	1584	+ version=`(hostinfo \| sed -n 's/.NeXT Mach $[0-9]$.*/\1/p') 2>/dev/null`;
1540	1585	if (version < 4)
1541	1586	printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1542	1587	else

		@@ -1628,7 +1673,7 @@
1628	1673	}
1629	1674	EOF
1630	1675
1631		-$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) &&
	1676	+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
1632	1677	{ echo "$SYSTEM_NAME"; exit; }
1633	1678
1634	1679	# Apollos put the system type in the environment.

		@@ -1636,7 +1681,7 @@
1636	1681
1637	1682	echo "$0: unable to guess system type" >&2
1638	1683
1639		-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
	1684	+case $UNAME_MACHINE:$UNAME_SYSTEM in
1640	1685	mips:Linux \| mips64:Linux)
1641	1686	# If we got here on MIPS GNU/Linux, output extra information.
1642	1687	cat >&2 <<EOF

		@@ -1658,9 +1703,11 @@
1658	1703	https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
1659	1704	EOF
1660	1705
1661		-year=$(echo $timestamp \| sed 's,-.*,,')
	1706	+our_year=`echo $timestamp \| sed 's,-.*,,'`
	1707	+thisyear=`date +%Y`
1662	1708	# shellcheck disable=SC2003
1663		-if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then
	1709	+script_age=`expr "$thisyear" - "$our_year"`
	1710	+if test "$script_age" -lt 3 ; then
1664	1711	cat >&2 <<EOF
1665	1712
1666	1713	If $0 has already been updated, send the following data and any

		@@ -1669,20 +1716,20 @@
1669	1716
1670	1717	config.guess timestamp = $timestamp
1671	1718
1672		-uname -m = $( (uname -m) 2>/dev/null \|\| echo unknown)
1673		-uname -r = $( (uname -r) 2>/dev/null \|\| echo unknown)
1674		-uname -s = $( (uname -s) 2>/dev/null \|\| echo unknown)
1675		-uname -v = $( (uname -v) 2>/dev/null \|\| echo unknown)
	1719	+uname -m = `(uname -m) 2>/dev/null \|\| echo unknown`
	1720	+uname -r = `(uname -r) 2>/dev/null \|\| echo unknown`
	1721	+uname -s = `(uname -s) 2>/dev/null \|\| echo unknown`
	1722	+uname -v = `(uname -v) 2>/dev/null \|\| echo unknown`
1676	1723
1677		-/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null)
1678		-/bin/uname -X = $( (/bin/uname -X) 2>/dev/null)
	1724	+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
	1725	+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
1679	1726
1680		-hostinfo = $( (hostinfo) 2>/dev/null)
1681		-/bin/universe = $( (/bin/universe) 2>/dev/null)
1682		-/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null)
1683		-/bin/arch = $( (/bin/arch) 2>/dev/null)
1684		-/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null)
1685		-/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null)
	1727	+hostinfo = `(hostinfo) 2>/dev/null`
	1728	+/bin/universe = `(/bin/universe) 2>/dev/null`
	1729	+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
	1730	+/bin/arch = `(/bin/arch) 2>/dev/null`
	1731	+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
	1732	+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1686	1733
1687	1734	UNAME_MACHINE = "$UNAME_MACHINE"
1688	1735	UNAME_RELEASE = "$UNAME_RELEASE"

diff -r dc28ec43d483 -r 59c8ee0db7b9 config/config.sub

--- a/config/config.sub Sun Jul 18 09:58:45 2021 -0500

+++ b/config/config.sub Sun Jul 18 14:35:54 2021 -0500

		@@ -2,7 +2,9 @@
2	2	# Configuration validation subroutine script.
3	3	# Copyright 1992-2021 Free Software Foundation, Inc.
4	4
5		-timestamp='2021-01-07'
	5	+# shellcheck disable=SC2006,SC2268 # see below for rationale
	6	+
	7	+timestamp='2021-07-03'
6	8
7	9	# This file is free software; you can redistribute it and/or modify it
8	10	# under the terms of the GNU General Public License as published by

		@@ -50,7 +52,14 @@
50	52	# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
51	53	# It is wrong to echo any other type of specification.
52	54
53		-me=$(echo "$0" \| sed -e 's,.*/,,')
	55	+# The "shellcheck disable" line above the timestamp inhibits complaints
	56	+# about features and limitations of the classic Bourne shell that were
	57	+# superseded or lifted in POSIX. However, this script identifies a wide
	58	+# variety of pre-POSIX systems that do not have POSIX shells at all, and
	59	+# even some reasonably current systems (Solaris 10 as case-in-point) still
	60	+# have a pre-POSIX /bin/sh.
	61	+
	62	+me=`echo "$0" \| sed -e 's,.*/,,'`
54	63
55	64	usage="\
56	65	Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS

		@@ -769,22 +778,22 @@
769	778	vendor=hp
770	779	;;
771	780	i*86v32)
772		- cpu=$(echo "$1" \| sed -e 's/86.*/86/')
	781	+ cpu=`echo "$1" \| sed -e 's/86.*/86/'`
773	782	vendor=pc
774	783	basic_os=sysv32
775	784	;;
776	785	i86v4)
777		- cpu=$(echo "$1" \| sed -e 's/86.*/86/')
	786	+ cpu=`echo "$1" \| sed -e 's/86.*/86/'`
778	787	vendor=pc
779	788	basic_os=sysv4
780	789	;;
781	790	i*86v)
782		- cpu=$(echo "$1" \| sed -e 's/86.*/86/')
	791	+ cpu=`echo "$1" \| sed -e 's/86.*/86/'`
783	792	vendor=pc
784	793	basic_os=sysv
785	794	;;
786	795	i*86sol2)
787		- cpu=$(echo "$1" \| sed -e 's/86.*/86/')
	796	+ cpu=`echo "$1" \| sed -e 's/86.*/86/'`
788	797	vendor=pc
789	798	basic_os=solaris2
790	799	;;

		@@ -917,7 +926,7 @@
917	926	;;
918	927	leon-\|leon[3-9]-)
919	928	cpu=sparc
920		- vendor=$(echo "$basic_machine" \| sed 's/-.*//')
	929	+ vendor=`echo "$basic_machine" \| sed 's/-.*//'`
921	930	;;
922	931
923	932	-)

		@@ -1084,7 +1093,7 @@
1084	1093	cpu=mipsisa64sb1el
1085	1094	;;
1086	1095	sh5e[lb]-*)
1087		- cpu=$(echo "$cpu" \| sed 's/^$sh.$e$.$$/\1\2e/')
	1096	+ cpu=`echo "$cpu" \| sed 's/^$sh.$e$.$$/\1\2e/'`
1088	1097	;;
1089	1098	spur-*)
1090	1099	cpu=spur

		@@ -1102,7 +1111,7 @@
1102	1111	cpu=x86_64
1103	1112	;;
1104	1113	xscale-* \| xscalee[bl]-*)
1105		- cpu=$(echo "$cpu" \| sed 's/^xscale/arm/')
	1114	+ cpu=`echo "$cpu" \| sed 's/^xscale/arm/'`
1106	1115	;;
1107	1116	arm64-*)
1108	1117	cpu=aarch64

		@@ -1165,7 +1174,7 @@
1165	1174	\| alphapca5[67] \| alpha64pca5[67] \
1166	1175	\| am33_2.0 \
1167	1176	\| amdgcn \
1168		- \| arc \| arceb \
	1177	+ \| arc \| arceb \| arc32 \| arc64 \
1169	1178	\| arm \| arm[lb]e \| arme[lb] \| armv* \
1170	1179	\| avr \| avr32 \
1171	1180	\| asmjs \

		@@ -1204,9 +1213,13 @@
1204	1213	\| mips64vr5900 \| mips64vr5900el \
1205	1214	\| mipsisa32 \| mipsisa32el \
1206	1215	\| mipsisa32r2 \| mipsisa32r2el \
	1216	+ \| mipsisa32r3 \| mipsisa32r3el \
	1217	+ \| mipsisa32r5 \| mipsisa32r5el \
1207	1218	\| mipsisa32r6 \| mipsisa32r6el \
1208	1219	\| mipsisa64 \| mipsisa64el \
1209	1220	\| mipsisa64r2 \| mipsisa64r2el \
	1221	+ \| mipsisa64r3 \| mipsisa64r3el \
	1222	+ \| mipsisa64r5 \| mipsisa64r5el \
1210	1223	\| mipsisa64r6 \| mipsisa64r6el \
1211	1224	\| mipsisa64sb1 \| mipsisa64sb1el \
1212	1225	\| mipsisa64sr71k \| mipsisa64sr71kel \

		@@ -1288,15 +1301,15 @@
1288	1301	case $basic_os in
1289	1302	gnu/linux*)
1290	1303	kernel=linux
1291		- os=$(echo $basic_os \| sed -e 's\|gnu/linux\|gnu\|')
	1304	+ os=`echo "$basic_os" \| sed -e 's\|gnu/linux\|gnu\|'`
1292	1305	;;
1293	1306	os2-emx)
1294	1307	kernel=os2
1295		- os=$(echo $basic_os \| sed -e 's\|os2-emx\|emx\|')
	1308	+ os=`echo "$basic_os" \| sed -e 's\|os2-emx\|emx\|'`
1296	1309	;;
1297	1310	nto-qnx*)
1298	1311	kernel=nto
1299		- os=$(echo $basic_os \| sed -e 's\|nto-qnx\|qnx\|')
	1312	+ os=`echo "$basic_os" \| sed -e 's\|nto-qnx\|qnx\|'`
1300	1313	;;
1301	1314	-)
1302	1315	# shellcheck disable=SC2162

		@@ -1307,11 +1320,11 @@
1307	1320	# Default OS when just kernel was specified
1308	1321	nto*)
1309	1322	kernel=nto
1310		- os=$(echo $basic_os \| sed -e 's\|nto\|qnx\|')
	1323	+ os=`echo "$basic_os" \| sed -e 's\|nto\|qnx\|'`
1311	1324	;;
1312	1325	linux*)
1313	1326	kernel=linux
1314		- os=$(echo $basic_os \| sed -e 's\|linux\|gnu\|')
	1327	+ os=`echo "$basic_os" \| sed -e 's\|linux\|gnu\|'`
1315	1328	;;
1316	1329	*)
1317	1330	kernel=

		@@ -1332,7 +1345,7 @@
1332	1345	os=cnk
1333	1346	;;
1334	1347	solaris1 \| solaris1.*)
1335		- os=$(echo $os \| sed -e 's\|solaris1\|sunos4\|')
	1348	+ os=`echo "$os" \| sed -e 's\|solaris1\|sunos4\|'`
1336	1349	;;
1337	1350	solaris)
1338	1351	os=solaris2

		@@ -1361,7 +1374,7 @@
1361	1374	os=sco3.2v4
1362	1375	;;
1363	1376	sco3.2.[4-9]*)
1364		- os=$(echo $os \| sed -e 's/sco3.2./sco3.2v/')
	1377	+ os=`echo "$os" \| sed -e 's/sco3.2./sco3.2v/'`
1365	1378	;;
1366	1379	scov \| scout)
1367	1380	# Don't match below

		@@ -1391,7 +1404,7 @@
1391	1404	os=lynxos
1392	1405	;;
1393	1406	mac[0-9]*)
1394		- os=$(echo "$os" \| sed -e 's\|mac\|macos\|')
	1407	+ os=`echo "$os" \| sed -e 's\|mac\|macos\|'`
1395	1408	;;
1396	1409	opened*)
1397	1410	os=openedition

		@@ -1400,10 +1413,10 @@
1400	1413	os=os400
1401	1414	;;
1402	1415	sunos5*)
1403		- os=$(echo "$os" \| sed -e 's\|sunos5\|solaris2\|')
	1416	+ os=`echo "$os" \| sed -e 's\|sunos5\|solaris2\|'`
1404	1417	;;
1405	1418	sunos6*)
1406		- os=$(echo "$os" \| sed -e 's\|sunos6\|solaris3\|')
	1419	+ os=`echo "$os" \| sed -e 's\|sunos6\|solaris3\|'`
1407	1420	;;
1408	1421	wince*)
1409	1422	os=wince

		@@ -1437,7 +1450,7 @@
1437	1450	;;
1438	1451	# Preserve the version number of sinix5.
1439	1452	sinix5.*)
1440		- os=$(echo $os \| sed -e 's\|sinix\|sysv\|')
	1453	+ os=`echo "$os" \| sed -e 's\|sinix\|sysv\|'`
1441	1454	;;
1442	1455	sinix*)
1443	1456	os=sysv4

		@@ -1683,12 +1696,15 @@
1683	1696
1684	1697	# Now, validate our (potentially fixed-up) OS.
1685	1698	case $os in
1686		- # Sometimes we do "kernel-abi", so those need to count as OSes.
	1699	+ # Sometimes we do "kernel-libc", so those need to count as OSes.
1687	1700	musl* \| newlib* \| uclibc*)
1688	1701	;;
1689		- # Likewise for "kernel-libc"
	1702	+ # Likewise for "kernel-abi"
1690	1703	eabi* \| gnueabi*)
1691	1704	;;
	1705	+ # VxWorks passes extra cpu info in the 4th filed.
	1706	+ simlinux \| simwindows \| spe)
	1707	+ ;;
1692	1708	# Now accept the basic system types.
1693	1709	# The portable systems comes first.
1694	1710	# Each alternative MUST end in a * to match a version number.

		@@ -1704,12 +1720,12 @@
1704	1720	\| nindy* \| vxsim* \| vxworks* \| ebmon* \| hms* \| mvs* \
1705	1721	\| clix* \| riscos* \| uniplus* \| iris* \| isc* \| rtu* \| xenix* \
1706	1722	\| mirbsd* \| netbsd* \| dicos* \| openedition* \| ose* \
1707		- \| bitrig* \| openbsd* \| solidbsd* \| libertybsd* \| os108* \
	1723	+ \| bitrig* \| openbsd* \| secbsd* \| solidbsd* \| libertybsd* \| os108* \
1708	1724	\| ekkobsd* \| freebsd* \| riscix* \| lynxos* \| os400* \
1709	1725	\| bosx* \| nextstep* \| cxux* \| aout* \| elf* \| oabi* \
1710	1726	\| ptx* \| coff* \| ecoff* \| winnt* \| domain* \| vsta* \
1711	1727	\| udi* \| lites* \| ieee* \| go32* \| aux* \| hcos* \
1712		- \| chorusrdb* \| cegcc* \| glidix* \
	1728	+ \| chorusrdb* \| cegcc* \| glidix* \| serenity* \
1713	1729	\| cygwin* \| msys* \| pe* \| moss* \| proelf* \| rtems* \
1714	1730	\| midipix* \| mingw32* \| mingw64* \| mint* \
1715	1731	\| uxpv* \| beos* \| mpeix* \| udk* \| moxiebox* \

		@@ -1751,6 +1767,8 @@
1751	1767	;;
1752	1768	kfreebsd-gnu \| kopensolaris-gnu)
1753	1769	;;
	1770	+ vxworks-simlinux \| vxworks-simwindows \| vxworks-spe)
	1771	+ ;;
1754	1772	nto-qnx*)
1755	1773	;;
1756	1774	os2-emx)

diff -r dc28ec43d483 -r 59c8ee0db7b9 configure

--- a/configure Sun Jul 18 09:58:45 2021 -0500

+++ b/configure Sun Jul 18 14:35:54 2021 -0500

		@@ -677,11 +677,14 @@
677	677	type_include_files
678	678	ghostscript_font_dir
679	679	windows_font_dir
	680	+HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE
	681	+HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE
680	682	HasTXT2HTML_FALSE
681	683	HasTXT2HTML_TRUE
682		-TXT2HTML
683	684	HasRST2HTML_FALSE
684	685	HasRST2HTML_TRUE
	686	+GRAPHICSMAGICK_SNAPSHOT_COPY
	687	+TXT2HTML
685	688	RST2HTML
686	689	HasPSDelegate_FALSE
687	690	HasPSDelegate_TRUE

		@@ -19137,6 +19140,9 @@
19137	19140	# Add configure option --enable-maintainer-mode which enables dependency
19138	19141	# checking and generation useful to package maintainers. This is made an
19139	19142	# option to avoid confusing end users.
	19143	+#
	19144	+# Defines shell/Automake variable 'MAINT' to '' when enabled or '#' when not
	19145	+# Also sets MAINTAINER_MODE_FALSE / MAINTAINER_MODE_TRUE with similar values.
19140	19146
19141	19147	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
19142	19148	$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }

		@@ -29051,8 +29057,10 @@
29051	29057	fi
29052	29058
29053	29059
29054		-# Test for optional rst2html.py utility and define automake conditional HasRST2HTML if found.
29055		-for ac_prog in rst2html.py rst2html
	29060	+# Tests for programs only used while in maintainer mode
	29061	+if test "$MAINT" == '' ; then
	29062	+ # Test for optional rst2html.py utility and define automake conditional HasRST2HTML if found.
	29063	+ for ac_prog in rst2html.py rst2html
29056	29064	do
29057	29065	# Extract the first word of "$ac_prog", so it can be a program name with args.
29058	29066	set dummy $ac_prog; ac_word=$2

		@@ -29095,17 +29103,8 @@
29095	29103	done
29096	29104
29097	29105
29098		- if test "x$RST2HTML" != 'x'; then
29099		- HasRST2HTML_TRUE=
29100		- HasRST2HTML_FALSE='#'
29101		-else
29102		- HasRST2HTML_TRUE='#'
29103		- HasRST2HTML_FALSE=
29104		-fi
29105		-
29106		-
29107		-# Test for optional txt2html utility and define automake conditional HasTXT2HTML if found.
29108		-for ac_prog in txt2html
	29106	+ # Test for optional txt2html utility and define automake conditional HasTXT2HTML if found.
	29107	+ for ac_prog in txt2html
29109	29108	do
29110	29109	# Extract the first word of "$ac_prog", so it can be a program name with args.
29111	29110	set dummy $ac_prog; ac_word=$2

		@@ -29151,7 +29150,72 @@
29151	29150	done
29152	29151
29153	29152
29154		- if test "$TXT2HTML" != 'x'; then
	29153	+ # Test for optional graphicsmagick_snapshot_copy program/script.
	29154	+ # If this script is found, it is used to copy files using the script-provided
	29155	+ # mechanism due to 'snapshot' target.
	29156	+ for ac_prog in graphicsmagick_snapshot_copy
	29157	+do
	29158	+ # Extract the first word of "$ac_prog", so it can be a program name with args.
	29159	+set dummy $ac_prog; ac_word=$2
	29160	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	29161	+$as_echo_n "checking for $ac_word... " >&6; }
	29162	+if ${ac_cv_path_GRAPHICSMAGICK_SNAPSHOT_COPY+:} false; then :
	29163	+ $as_echo_n "(cached) " >&6
	29164	+else
	29165	+ case $GRAPHICSMAGICK_SNAPSHOT_COPY in
	29166	+ [\\/]* \| ?:[\\/]*)
	29167	+ ac_cv_path_GRAPHICSMAGICK_SNAPSHOT_COPY="$GRAPHICSMAGICK_SNAPSHOT_COPY" # Let the user override the test with a path.
	29168	+ ;;
	29169	+ *)
	29170	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	29171	+for as_dir in $PATH
	29172	+do
	29173	+ IFS=$as_save_IFS
	29174	+ test -z "$as_dir" && as_dir=.
	29175	+ for ac_exec_ext in '' $ac_executable_extensions; do
	29176	+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
	29177	+ ac_cv_path_GRAPHICSMAGICK_SNAPSHOT_COPY="$as_dir/$ac_word$ac_exec_ext"
	29178	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	29179	+ break 2
	29180	+ fi
	29181	+done
	29182	+ done
	29183	+IFS=$as_save_IFS
	29184	+
	29185	+ ;;
	29186	+esac
	29187	+fi
	29188	+GRAPHICSMAGICK_SNAPSHOT_COPY=$ac_cv_path_GRAPHICSMAGICK_SNAPSHOT_COPY
	29189	+if test -n "$GRAPHICSMAGICK_SNAPSHOT_COPY"; then
	29190	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHICSMAGICK_SNAPSHOT_COPY" >&5
	29191	+$as_echo "$GRAPHICSMAGICK_SNAPSHOT_COPY" >&6; }
	29192	+else
	29193	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	29194	+$as_echo "no" >&6; }
	29195	+fi
	29196	+
	29197	+
	29198	+ test -n "$GRAPHICSMAGICK_SNAPSHOT_COPY" && break
	29199	+done
	29200	+
	29201	+else
	29202	+ RST2HTML=''
	29203	+ TXT2HTML=''
	29204	+ GRAPHICSMAGICK_SNAPSHOT_COPY=''
	29205	+fi
	29206	+
	29207	+
	29208	+ if test "x${RST2HTML}" != 'x'; then
	29209	+ HasRST2HTML_TRUE=
	29210	+ HasRST2HTML_FALSE='#'
	29211	+else
	29212	+ HasRST2HTML_TRUE='#'
	29213	+ HasRST2HTML_FALSE=
	29214	+fi
	29215	+
	29216	+
	29217	+
	29218	+ if test "x${TXT2HTML}" != 'x'; then
29155	29219	HasTXT2HTML_TRUE=
29156	29220	HasTXT2HTML_FALSE='#'
29157	29221	else

		@@ -29160,6 +29224,16 @@
29160	29224	fi
29161	29225
29162	29226
	29227	+
	29228	+ if test "x${GRAPHICSMAGICK_SNAPSHOT_COPY}" != 'x'; then
	29229	+ HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE=
	29230	+ HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE='#'
	29231	+else
	29232	+ HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE='#'
	29233	+ HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE=
	29234	+fi
	29235	+
	29236	+
29163	29237	#
29164	29238	# Test for font directories
29165	29239	#

		@@ -30446,6 +30520,10 @@
30446	30520	as_fn_error $? "conditional \"HasTXT2HTML\" was never defined.
30447	30521	Usually this means the macro was only invoked conditionally." "$LINENO" 5
30448	30522	fi
	30523	+if test -z "${HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE}" && test -z "${HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE}"; then
	30524	+ as_fn_error $? "conditional \"HasGRAPHICSMAGICK_SNAPSHOT_COPY\" was never defined.
	30525	+Usually this means the macro was only invoked conditionally." "$LINENO" 5
	30526	+fi
30449	30527	if test -z "${HAS_RPM_TRUE}" && test -z "${HAS_RPM_FALSE}"; then
30450	30528	as_fn_error $? "conditional \"HAS_RPM\" was never defined.
30451	30529	Usually this means the macro was only invoked conditionally." "$LINENO" 5

diff -r dc28ec43d483 -r 59c8ee0db7b9 configure.ac

--- a/configure.ac Sun Jul 18 09:58:45 2021 -0500

+++ b/configure.ac Sun Jul 18 14:35:54 2021 -0500

		@@ -491,6 +491,9 @@
491	491	# Add configure option --enable-maintainer-mode which enables dependency
492	492	# checking and generation useful to package maintainers. This is made an
493	493	# option to avoid confusing end users.
	494	+#
	495	+# Defines shell/Automake variable 'MAINT' to '' when enabled or '#' when not
	496	+# Also sets MAINTAINER_MODE_FALSE / MAINTAINER_MODE_TRUE with similar values.
494	497	AM_MAINTAINER_MODE
495	498
496	499	# Enable prof-based profiling support

		@@ -3038,15 +3041,32 @@
3038	3041	# Automake conditional to support test suite
3039	3042	AM_CONDITIONAL([HasPSDelegate],[test "$have_gs" = 'yes'])
3040	3043
3041		-# Test for optional rst2html.py utility and define automake conditional HasRST2HTML if found.
3042		-AC_CHECK_PROGS([RST2HTML],[rst2html.py rst2html])
	3044	+# Tests for programs only used while in maintainer mode
	3045	+if test "$MAINT" == '' ; then
	3046	+ # Test for optional rst2html.py utility and define automake conditional HasRST2HTML if found.
	3047	+ AC_CHECK_PROGS([RST2HTML],[rst2html.py rst2html])
	3048	+
	3049	+ # Test for optional txt2html utility and define automake conditional HasTXT2HTML if found.
	3050	+ AC_PATH_PROGS([TXT2HTML], [txt2html])
	3051	+
	3052	+ # Test for optional graphicsmagick_snapshot_copy program/script.
	3053	+ # If this script is found, it is used to copy files using the script-provided
	3054	+ # mechanism due to 'snapshot' target.
	3055	+ AC_PATH_PROGS([GRAPHICSMAGICK_SNAPSHOT_COPY], [graphicsmagick_snapshot_copy])
	3056	+else
	3057	+ RST2HTML=''
	3058	+ TXT2HTML=''
	3059	+ GRAPHICSMAGICK_SNAPSHOT_COPY=''
	3060	+fi
	3061	+
3043	3062	AC_SUBST([RST2HTML])
3044		-AM_CONDITIONAL([HasRST2HTML],[test "x$RST2HTML" != 'x'])
3045		-
3046		-# Test for optional txt2html utility and define automake conditional HasTXT2HTML if found.
3047		-AC_PATH_PROGS([TXT2HTML], [txt2html])
	3063	+AM_CONDITIONAL([HasRST2HTML],[test "x${RST2HTML}" != 'x'])
	3064	+
3048	3065	AC_SUBST([TXT2HTML])
3049		-AM_CONDITIONAL([HasTXT2HTML],[test "$TXT2HTML" != 'x'])
	3066	+AM_CONDITIONAL([HasTXT2HTML],[test "x${TXT2HTML}" != 'x'])
	3067	+
	3068	+AC_SUBST([GRAPHICSMAGICK_SNAPSHOT_COPY])
	3069	+AM_CONDITIONAL([HasGRAPHICSMAGICK_SNAPSHOT_COPY],[test "x${GRAPHICSMAGICK_SNAPSHOT_COPY}" != 'x'])
3050	3070
3051	3071	#
3052	3072	# Test for font directories

diff -r dc28ec43d483 -r 59c8ee0db7b9 www/Changelog.html

--- a/www/Changelog.html Sun Jul 18 09:58:45 2021 -0500

+++ b/www/Changelog.html Sun Jul 18 14:35:54 2021 -0500

		@@ -37,6 +37,10 @@
37	37
38	38	<p>2021-07-18 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p>
39	39	<blockquote>
	40	+<p>* Makefile.am: Add support for using an external
	41	+'graphicsmagick_snapshot_copy' script to copy files for the
	42	+'snapshot' target. This provides local control over how files are
	43	+copied and where they are copied to.</p>
40	44	<p>* coders/msl.c (MSLStartElement): Use macros to simplify
41	45	validations and reduce repeated code fragments. Add validations
42	46	for image size and pixels present where applicable. Fixes

Show on old repository browser