Merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic

Proposed by Marco Trevisan (Treviño) on 2019-01-15
Status: Superseded
Proposed branch: ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic
Merge into: ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Diff against target: 14231 lines (+3177/-2746)
114 files modified
Makefile.in (+2/-1)
build-aux/compile (+5/-6)
build-aux/config.guess (+282/-278)
build-aux/config.sub (+107/-142)
build-aux/depcomp (+1/-1)
build-aux/install-sh (+16/-9)
build-aux/ltmain.sh (+22/-15)
build-aux/missing (+4/-4)
clutter/Makefile.in (+1/-0)
clutter/aclocal.m4 (+217/-285)
clutter/build/Makefile.in (+1/-0)
clutter/build/autotools/Makefile.in (+1/-0)
clutter/build/autotools/libtool.m4 (+24/-9)
clutter/build/compile (+5/-6)
clutter/build/config.guess (+282/-278)
clutter/build/config.sub (+107/-142)
clutter/build/depcomp (+1/-1)
clutter/build/install-sh (+16/-9)
clutter/build/ltmain.sh (+22/-15)
clutter/build/missing (+4/-4)
clutter/build/test-driver (+4/-4)
clutter/clutter/Makefile.in (+1/-0)
clutter/clutter/cally/cally-util.c (+2/-0)
clutter/clutter/clutter-actor.c (+83/-11)
clutter/clutter/clutter-effect-private.h (+1/-0)
clutter/clutter/clutter-effect.c (+8/-0)
clutter/clutter/clutter-offscreen-effect.c (+6/-3)
clutter/clutter/clutter-text.c (+2/-8)
clutter/clutter/evdev/clutter-virtual-input-device-evdev.c (+29/-6)
clutter/clutter/x11/clutter-keymap-x11.c (+177/-1)
clutter/clutter/x11/clutter-keymap-x11.h (+8/-0)
clutter/clutter/x11/clutter-virtual-input-device-x11.c (+19/-3)
clutter/configure (+33/-9)
clutter/examples/Makefile.in (+1/-0)
clutter/tests/Makefile.in (+1/-0)
clutter/tests/accessibility/Makefile.in (+1/-0)
clutter/tests/conform/Makefile.in (+1/-0)
clutter/tests/interactive/Makefile.in (+1/-0)
clutter/tests/micro-bench/Makefile.in (+1/-0)
clutter/tests/performance/Makefile.in (+1/-0)
cogl/Makefile.in (+1/-0)
cogl/aclocal.m4 (+217/-285)
cogl/build/autotools/libtool.m4 (+24/-9)
cogl/build/compile (+5/-6)
cogl/build/config.guess (+282/-278)
cogl/build/config.sub (+107/-142)
cogl/build/depcomp (+1/-1)
cogl/build/install-sh (+16/-9)
cogl/build/ltmain.sh (+22/-15)
cogl/build/missing (+4/-4)
cogl/cogl-gles2/Makefile.in (+1/-0)
cogl/cogl-pango/Makefile.in (+1/-0)
cogl/cogl-path/Makefile.in (+1/-0)
cogl/cogl/Makefile.in (+1/-0)
cogl/cogl/deprecated/cogl-auto-texture.c (+1/-0)
cogl/configure (+50/-15)
cogl/test-fixtures/Makefile.in (+1/-0)
cogl/tests/Makefile.in (+1/-0)
cogl/tests/conform/Makefile.in (+1/-0)
cogl/tests/data/Makefile.in (+1/-0)
cogl/tests/micro-perf/Makefile.in (+1/-0)
cogl/tests/unit/Makefile.in (+1/-0)
configure (+33/-9)
data/Makefile.in (+1/-0)
debian/changelog (+18/-0)
debian/patches/bgo768531_workaround-startup-notifications.patch (+2/-2)
debian/patches/series (+0/-10)
dev/null (+0/-44)
doc/Makefile.in (+1/-0)
doc/man/Makefile.in (+1/-0)
m4/libtool.m4 (+24/-9)
m4/pkg.m4 (+3/-71)
po/mutter.pot (+46/-275)
src/Makefile-tests.am (+1/-0)
src/Makefile.in (+3/-0)
src/backends/meta-idle-monitor.c (+7/-3)
src/backends/meta-monitor-manager-private.h (+1/-0)
src/backends/meta-monitor-manager.c (+17/-3)
src/backends/meta-monitor.c (+33/-8)
src/backends/meta-monitor.h (+2/-0)
src/backends/native/meta-gpu-kms.c (+81/-19)
src/backends/native/meta-gpu-kms.h (+9/-0)
src/backends/native/meta-monitor-manager-kms.c (+20/-0)
src/backends/native/meta-renderer-native.c (+77/-25)
src/backends/x11/meta-backend-x11.c (+3/-2)
src/backends/x11/nested/meta-renderer-x11-nested.c (+6/-2)
src/compositor/compositor.c (+4/-0)
src/compositor/meta-shaped-texture.c (+83/-42)
src/compositor/meta-surface-actor.c (+8/-0)
src/compositor/plugins/Makefile.in (+1/-0)
src/core/delete.c (+3/-0)
src/core/frame.c (+12/-0)
src/core/screen.c (+3/-1)
src/core/window-private.h (+15/-4)
src/core/window.c (+49/-13)
src/tests/stacking/closed-transient.metatest (+19/-0)
src/wayland/meta-wayland-actor-surface.c (+8/-4)
src/wayland/meta-wayland-actor-surface.h (+3/-0)
src/wayland/meta-wayland-buffer.c (+16/-21)
src/wayland/meta-wayland-buffer.h (+2/-0)
src/wayland/meta-wayland-dma-buf.c (+1/-0)
src/wayland/meta-wayland-gtk-shell.c (+19/-10)
src/wayland/meta-wayland-keyboard.c (+56/-82)
src/wayland/meta-wayland-keyboard.h (+1/-2)
src/wayland/meta-wayland-legacy-xdg-shell.c (+87/-15)
src/wayland/meta-wayland-outputs.c (+34/-21)
src/wayland/meta-wayland-shell-surface.c (+1/-1)
src/wayland/meta-wayland-surface.c (+14/-7)
src/wayland/meta-wayland-surface.h (+3/-0)
src/wayland/meta-wayland-xdg-shell.c (+81/-14)
src/wayland/meta-window-wayland.c (+9/-3)
src/wayland/meta-xwayland-grab-keyboard.c (+7/-7)
src/x11/events.c (+6/-0)
src/x11/window-x11.c (+3/-3)
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2019-01-15 Pending
Review via email: mp+361810@code.launchpad.net

This proposal has been superseded by a proposal from 2019-01-15.

To post a comment you must log in.

Unmerged commits

8af8618... by Marco Trevisan (Treviño) on 2019-01-15

debian/changelog: update as per upstream merge

94f59ad... by Marco Trevisan (Treviño) on 2019-01-15

debian/patches: refresh and delete already applied patches

292d231... by Marco Trevisan (Treviño) on 2019-01-15

Update upstream source from tag 'upstream/3.28.3+git20181011'

Update to upstream version '3.28.3+git20181011'
with Debian dir 79aebc90596e1ace3318e7019627b3619df2fd05

d651ed8... by Marco Trevisan (Treviño) on 2019-01-15

New upstream version 3.28.3+git20181011

1b78ca8... by Daniel van Vugt on 2018-10-11

clutter-offscreen-effect: Disable if no texture

If texture allocation fails (e.g. on an old GPU with size limit 2048)
then `update_fbo` would return `FALSE` but leaves `priv->offscreen`
as non-NULL. So the next paint will try to use the offscreen with a
`NULL` texture and crashes. The solution is simply to ensure that
`priv->offscreen` is NULL if there is no `priv->texture`, so the default
(non-offscreen) paint path gets used instead.

Bug reported and fix provided by Gert van de Kraats.

https://launchpad.net/bugs/1795774

(cherry picked from commit f31cf0c3ef99b27c0b2c0161fc9fc1eb82778b2e)

6a6d477... by Daniel van Vugt on 2018-10-11

cogl-auto-texture: Avoid a double-free crash

If texture allocation fails (e.g. on an old GPU with size limit 2048)
then `cogl_texture_new_with_size` was trying to use the same CoglError
twice. The second time was after it had already been freed.

Bug reported and fix provided by Gert van de Kraats.

https://launchpad.net/bugs/1790525

(cherry picked from commit d21478b0f0163b0688abe065a7009b33453d0d00)

721de28... by Olivier Fourdan <email address hidden> on 2018-11-06

window: Really force update monitor on hot plugs

Commit 8d3e05305 ("window: Force update monitor on hot plugs") added the
flag `META_WINDOW_UPDATE_MONITOR_FLAGS_FORCE` passed to
`update_monitor()` from `update_for_monitors_changed()`.

However, `update_for_monitors_changed()` may choose to call another code
path to `move_between_rects()` and `meta_window_move_resize_internal()`
eventually.

As `meta_window_move_resize_internal()` does not use the "force" flag,
we may still end up in case where the window->monitor is left unchanged.

To avoid that problem, add a new `MetaMoveResizeFlags` that
`update_for_monitors_changed()` can use to force the monitor update from
`meta_window_move_resize_internal()`.

Fixes: 8d3e05305 ("window: Force update monitor on hot plugs")
Closes: https://gitlab.gnome.org/GNOME/mutter/issues/189

(cherry picked from commit fa495286a1037d610051ab49f0aa1e8b20e38066)

(cherry picked from commit 8eabfaaa8b9469c5bdb1d8ca44b465384e8eaa9d)

00cd99c... by Jonas Ådahl on 2017-11-14

renderer/native: Also wrap flip closures for EGLStreams

When using the EGLStream backend, the MetaRendererNative passed a
GClosure to KMS when using EGLStreams, but KMS flip callback event
handler in meta-gpu-kms.c expected a closure wrapped in a closure
container, meaning it'd instead crash when using EGLStreams. Make the
flip handler get what it expects also when using EGLStreams by wrapping
the flip closure in the container before handing it over to EGL.

https://bugzilla.gnome.org/show_bug.cgi?id=790316
(cherry picked from commit 8ee14a7cb7e8f072d2731d59c7dc735f83a9bb0b)

8ddbe9d... by Jonas Ådahl on 2018-07-25

wayland/gtk-shell: Handle requests after toplevel was unmanaged

As with xdg-toplevel, a gtk-surface can be unmanaged by the compositor
without the client knowing about it, meaning the client may still send
updates and make requests. Handle this gracefully by ignoring them. The
client needs to reset all the state anyway, if it wants to remap the
same surface.

https://gitlab.gnome.org/GNOME/mutter/issues/240
(cherry picked from commit ca5b27baf517f00354ff8811ba204fd90f1ddb38)

a22cb88... by Jonas Ådahl on 2018-07-25

wayland/legacy-xdg-shell: Handle requests after toplevel was unmanaged

As with xdg-toplevel proper, a legacy xdg-toplevel can be unmanaged by
the compositor without the client knowing about it, meaning the client
may still send updates and make requests. Handle this gracefully by
ignoring them. The client needs to reassign the surface the legacy
xdg-toplevel role again, if it wants to remap the same surface, meaning
all state would be reset anyway.

Closes: https://gitlab.gnome.org/GNOME/mutter/issues/240
(cherry picked from commit 64df6276881c5f42c6d2054d556d8cd391f7ee70)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile.in b/Makefile.in
2index 8569c31..371e0d8 100644
3--- a/Makefile.in
4+++ b/Makefile.in
5@@ -176,7 +176,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
6 $(top_srcdir)/build-aux/missing \
7 $(top_srcdir)/src/meta/meta-version.h.in ABOUT-NLS COPYING \
8 NEWS build-aux/compile build-aux/config.guess \
9- build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
10+ build-aux/config.rpath build-aux/config.sub \
11 build-aux/install-sh build-aux/ltmain.sh build-aux/missing
12 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13 distdir = $(PACKAGE)-$(VERSION)
14@@ -398,6 +398,7 @@ pdfdir = @pdfdir@
15 prefix = @prefix@
16 program_transform_name = @program_transform_name@
17 psdir = @psdir@
18+runstatedir = @runstatedir@
19 sbindir = @sbindir@
20 sharedstatedir = @sharedstatedir@
21 srcdir = @srcdir@
22diff --git a/build-aux/compile b/build-aux/compile
23index de0005d..a85b723 100755
24--- a/build-aux/compile
25+++ b/build-aux/compile
26@@ -1,9 +1,9 @@
27-#!/bin/sh
28+#! /bin/sh
29 # Wrapper for compilers which do not understand '-c -o'.
30
31-scriptversion=2016-01-11.22; # UTC
32+scriptversion=2012-10-14.11; # UTC
33
34-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
35+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
36 # Written by Tom Tromey <tromey@cygnus.com>.
37 #
38 # This program is free software; you can redistribute it and/or modify
39@@ -255,8 +255,7 @@ EOF
40 echo "compile $scriptversion"
41 exit $?
42 ;;
43- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
44- icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
45+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
46 func_cl_wrapper "$@" # Doesn't return...
47 ;;
48 esac
49@@ -343,6 +342,6 @@ exit $ret
50 # eval: (add-hook 'write-file-hooks 'time-stamp)
51 # time-stamp-start: "scriptversion="
52 # time-stamp-format: "%:y-%02m-%02d.%02H"
53-# time-stamp-time-zone: "UTC0"
54+# time-stamp-time-zone: "UTC"
55 # time-stamp-end: "; # UTC"
56 # End:
57diff --git a/build-aux/config.guess b/build-aux/config.guess
58index 717b228..f50dcdb 100755
59--- a/build-aux/config.guess
60+++ b/build-aux/config.guess
61@@ -1,8 +1,8 @@
62-#!/bin/sh
63+#! /bin/sh
64 # Attempt to guess a canonical system name.
65-# Copyright 1992-2017 Free Software Foundation, Inc.
66+# Copyright 1992-2018 Free Software Foundation, Inc.
67
68-timestamp='2017-08-08'
69+timestamp='2018-02-24'
70
71 # This file is free software; you can redistribute it and/or modify it
72 # under the terms of the GNU General Public License as published by
73@@ -15,7 +15,7 @@ timestamp='2017-08-08'
74 # General Public License for more details.
75 #
76 # You should have received a copy of the GNU General Public License
77-# along with this program; if not, see <http://www.gnu.org/licenses/>.
78+# along with this program; if not, see <https://www.gnu.org/licenses/>.
79 #
80 # As a special exception to the GNU General Public License, if you
81 # distribute this file as part of a program that contains a
82@@ -27,7 +27,7 @@ timestamp='2017-08-08'
83 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
84 #
85 # You can get the latest version of this script from:
86-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
87+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
88 #
89 # Please send patches to <config-patches@gnu.org>.
90
91@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
92
93 Output the configuration name of the system \`$me' is run on.
94
95-Operation modes:
96+Options:
97 -h, --help print this help, then exit
98 -t, --time-stamp print date of last modification, then exit
99 -v, --version print version number, then exit
100@@ -50,7 +50,7 @@ version="\
101 GNU config.guess ($timestamp)
102
103 Originally written by Per Bothner.
104-Copyright 1992-2017 Free Software Foundation, Inc.
105+Copyright 1992-2018 Free Software Foundation, Inc.
106
107 This is free software; see the source for copying conditions. There is NO
108 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
109@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
110 dummy=$tmp/dummy ;
111 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
112 case $CC_FOR_BUILD,$HOST_CC,$CC in
113- ,,) echo "int x;" > $dummy.c ;
114+ ,,) echo "int x;" > "$dummy.c" ;
115 for c in cc gcc c89 c99 ; do
116- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
117+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
118 CC_FOR_BUILD="$c"; break ;
119 fi ;
120 done ;
121@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
122 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
123 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
124
125-case "${UNAME_SYSTEM}" in
126+case "$UNAME_SYSTEM" in
127 Linux|GNU|GNU/*)
128 # If the system lacks a compiler, then just pick glibc.
129 # We could probably try harder.
130 LIBC=gnu
131
132- eval $set_cc_for_build
133- cat <<-EOF > $dummy.c
134+ eval "$set_cc_for_build"
135+ cat <<-EOF > "$dummy.c"
136 #include <features.h>
137 #if defined(__UCLIBC__)
138 LIBC=uclibc
139@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
140 LIBC=gnu
141 #endif
142 EOF
143- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
144+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
145+
146+ # If ldd exists, use it to detect musl libc.
147+ if command -v ldd >/dev/null && \
148+ ldd --version 2>&1 | grep -q ^musl
149+ then
150+ LIBC=musl
151+ fi
152 ;;
153 esac
154
155 # Note: order is significant - the case branches are not exclusive.
156
157-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
158+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
159 *:NetBSD:*:*)
160 # NetBSD (nbsd) targets should (where applicable) match one or
161 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
162@@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
163 # portion of the name. We always set it to "unknown".
164 sysctl="sysctl -n hw.machine_arch"
165 UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
166- /sbin/$sysctl 2>/dev/null || \
167- /usr/sbin/$sysctl 2>/dev/null || \
168+ "/sbin/$sysctl" 2>/dev/null || \
169+ "/usr/sbin/$sysctl" 2>/dev/null || \
170 echo unknown)`
171- case "${UNAME_MACHINE_ARCH}" in
172+ case "$UNAME_MACHINE_ARCH" in
173 armeb) machine=armeb-unknown ;;
174 arm*) machine=arm-unknown ;;
175 sh3el) machine=shl-unknown ;;
176 sh3eb) machine=sh-unknown ;;
177 sh5el) machine=sh5le-unknown ;;
178 earmv*)
179- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
180- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
181- machine=${arch}${endian}-unknown
182+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
183+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
184+ machine="${arch}${endian}"-unknown
185 ;;
186- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
187+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
188 esac
189 # The Operating System including object format, if it has switched
190 # to ELF recently (or will in the future) and ABI.
191- case "${UNAME_MACHINE_ARCH}" in
192+ case "$UNAME_MACHINE_ARCH" in
193 earm*)
194 os=netbsdelf
195 ;;
196 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
197- eval $set_cc_for_build
198+ eval "$set_cc_for_build"
199 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
200 | grep -q __ELF__
201 then
202@@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
203 ;;
204 esac
205 # Determine ABI tags.
206- case "${UNAME_MACHINE_ARCH}" in
207+ case "$UNAME_MACHINE_ARCH" in
208 earm*)
209 expr='s/^earmv[0-9]/-eabi/;s/eb$//'
210- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
211+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
212 ;;
213 esac
214 # The OS release
215@@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
216 # thus, need a distinct triplet. However, they do not need
217 # kernel version information, so it can be replaced with a
218 # suitable tag, in the style of linux-gnu.
219- case "${UNAME_VERSION}" in
220+ case "$UNAME_VERSION" in
221 Debian*)
222 release='-gnu'
223 ;;
224 *)
225- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
226+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
227 ;;
228 esac
229 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
230 # contains redundant information, the shorter form:
231 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
232- echo "${machine}-${os}${release}${abi}"
233+ echo "$machine-${os}${release}${abi}"
234 exit ;;
235 *:Bitrig:*:*)
236 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
237- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
238+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
239 exit ;;
240 *:OpenBSD:*:*)
241 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
242- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
243+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
244 exit ;;
245 *:LibertyBSD:*:*)
246 UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
247- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
248+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
249+ exit ;;
250+ *:MidnightBSD:*:*)
251+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
252 exit ;;
253 *:ekkoBSD:*:*)
254- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
255+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
256 exit ;;
257 *:SolidBSD:*:*)
258- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
259+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
260 exit ;;
261 macppc:MirBSD:*:*)
262- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
263+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
264 exit ;;
265 *:MirBSD:*:*)
266- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
267+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
268 exit ;;
269 *:Sortix:*:*)
270- echo ${UNAME_MACHINE}-unknown-sortix
271+ echo "$UNAME_MACHINE"-unknown-sortix
272 exit ;;
273 *:Redox:*:*)
274- echo ${UNAME_MACHINE}-unknown-redox
275+ echo "$UNAME_MACHINE"-unknown-redox
276 exit ;;
277+ mips:OSF1:*.*)
278+ echo mips-dec-osf1
279+ exit ;;
280 alpha:OSF1:*:*)
281 case $UNAME_RELEASE in
282 *4.0)
283@@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
284 # A Tn.n version is a released field test version.
285 # A Xn.n version is an unreleased experimental baselevel.
286 # 1.2 uses "1.2" for uname -r.
287- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
288+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
289 # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
290 exitcode=$?
291 trap '' 0
292 exit $exitcode ;;
293- Alpha\ *:Windows_NT*:*)
294- # How do we know it's Interix rather than the generic POSIX subsystem?
295- # Should we change UNAME_MACHINE based on the output of uname instead
296- # of the specific Alpha model?
297- echo alpha-pc-interix
298- exit ;;
299- 21064:Windows_NT:50:3)
300- echo alpha-dec-winnt3.5
301- exit ;;
302 Amiga*:UNIX_System_V:4.0:*)
303 echo m68k-unknown-sysv4
304 exit ;;
305 *:[Aa]miga[Oo][Ss]:*:*)
306- echo ${UNAME_MACHINE}-unknown-amigaos
307+ echo "$UNAME_MACHINE"-unknown-amigaos
308 exit ;;
309 *:[Mm]orph[Oo][Ss]:*:*)
310- echo ${UNAME_MACHINE}-unknown-morphos
311+ echo "$UNAME_MACHINE"-unknown-morphos
312 exit ;;
313 *:OS/390:*:*)
314 echo i370-ibm-openedition
315@@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
316 echo powerpc-ibm-os400
317 exit ;;
318 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
319- echo arm-acorn-riscix${UNAME_RELEASE}
320+ echo arm-acorn-riscix"$UNAME_RELEASE"
321 exit ;;
322 arm*:riscos:*:*|arm*:RISCOS:*:*)
323 echo arm-unknown-riscos
324@@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
325 sparc) echo sparc-icl-nx7; exit ;;
326 esac ;;
327 s390x:SunOS:*:*)
328- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
329+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
330 exit ;;
331 sun4H:SunOS:5.*:*)
332- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
333+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
334 exit ;;
335 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
336- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
337+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
338 exit ;;
339 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
340- echo i386-pc-auroraux${UNAME_RELEASE}
341+ echo i386-pc-auroraux"$UNAME_RELEASE"
342 exit ;;
343 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
344- eval $set_cc_for_build
345+ eval "$set_cc_for_build"
346 SUN_ARCH=i386
347 # If there is a compiler, see if it is configured for 64-bit objects.
348 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
349@@ -398,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
350 SUN_ARCH=x86_64
351 fi
352 fi
353- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
354+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
355 exit ;;
356 sun4*:SunOS:6*:*)
357 # According to config.sub, this is the proper way to canonicalize
358 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
359 # it's likely to be more like Solaris than SunOS4.
360- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
361+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
362 exit ;;
363 sun4*:SunOS:*:*)
364 case "`/usr/bin/arch -k`" in
365@@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
366 ;;
367 esac
368 # Japanese Language versions have a version number like `4.1.3-JL'.
369- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
370+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
371 exit ;;
372 sun3*:SunOS:*:*)
373- echo m68k-sun-sunos${UNAME_RELEASE}
374+ echo m68k-sun-sunos"$UNAME_RELEASE"
375 exit ;;
376 sun*:*:4.2BSD:*)
377 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
378- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
379+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
380 case "`/bin/arch`" in
381 sun3)
382- echo m68k-sun-sunos${UNAME_RELEASE}
383+ echo m68k-sun-sunos"$UNAME_RELEASE"
384 ;;
385 sun4)
386- echo sparc-sun-sunos${UNAME_RELEASE}
387+ echo sparc-sun-sunos"$UNAME_RELEASE"
388 ;;
389 esac
390 exit ;;
391 aushp:SunOS:*:*)
392- echo sparc-auspex-sunos${UNAME_RELEASE}
393+ echo sparc-auspex-sunos"$UNAME_RELEASE"
394 exit ;;
395 # The situation for MiNT is a little confusing. The machine name
396 # can be virtually everything (everything which is not
397@@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
398 # MiNT. But MiNT is downward compatible to TOS, so this should
399 # be no problem.
400 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
401- echo m68k-atari-mint${UNAME_RELEASE}
402+ echo m68k-atari-mint"$UNAME_RELEASE"
403 exit ;;
404 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
405- echo m68k-atari-mint${UNAME_RELEASE}
406+ echo m68k-atari-mint"$UNAME_RELEASE"
407 exit ;;
408 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
409- echo m68k-atari-mint${UNAME_RELEASE}
410+ echo m68k-atari-mint"$UNAME_RELEASE"
411 exit ;;
412 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
413- echo m68k-milan-mint${UNAME_RELEASE}
414+ echo m68k-milan-mint"$UNAME_RELEASE"
415 exit ;;
416 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
417- echo m68k-hades-mint${UNAME_RELEASE}
418+ echo m68k-hades-mint"$UNAME_RELEASE"
419 exit ;;
420 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
421- echo m68k-unknown-mint${UNAME_RELEASE}
422+ echo m68k-unknown-mint"$UNAME_RELEASE"
423 exit ;;
424 m68k:machten:*:*)
425- echo m68k-apple-machten${UNAME_RELEASE}
426+ echo m68k-apple-machten"$UNAME_RELEASE"
427 exit ;;
428 powerpc:machten:*:*)
429- echo powerpc-apple-machten${UNAME_RELEASE}
430+ echo powerpc-apple-machten"$UNAME_RELEASE"
431 exit ;;
432 RISC*:Mach:*:*)
433 echo mips-dec-mach_bsd4.3
434 exit ;;
435 RISC*:ULTRIX:*:*)
436- echo mips-dec-ultrix${UNAME_RELEASE}
437+ echo mips-dec-ultrix"$UNAME_RELEASE"
438 exit ;;
439 VAX*:ULTRIX*:*:*)
440- echo vax-dec-ultrix${UNAME_RELEASE}
441+ echo vax-dec-ultrix"$UNAME_RELEASE"
442 exit ;;
443 2020:CLIX:*:* | 2430:CLIX:*:*)
444- echo clipper-intergraph-clix${UNAME_RELEASE}
445+ echo clipper-intergraph-clix"$UNAME_RELEASE"
446 exit ;;
447 mips:*:*:UMIPS | mips:*:*:RISCos)
448- eval $set_cc_for_build
449- sed 's/^ //' << EOF >$dummy.c
450+ eval "$set_cc_for_build"
451+ sed 's/^ //' << EOF > "$dummy.c"
452 #ifdef __cplusplus
453 #include <stdio.h> /* for printf() prototype */
454 int main (int argc, char *argv[]) {
455@@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
456 #endif
457 #if defined (host_mips) && defined (MIPSEB)
458 #if defined (SYSTYPE_SYSV)
459- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
460+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
461 #endif
462 #if defined (SYSTYPE_SVR4)
463- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
464+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
465 #endif
466 #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
467- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
468+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
469 #endif
470 #endif
471 exit (-1);
472 }
473 EOF
474- $CC_FOR_BUILD -o $dummy $dummy.c &&
475- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
476- SYSTEM_NAME=`$dummy $dummyarg` &&
477+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
478+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
479+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
480 { echo "$SYSTEM_NAME"; exit; }
481- echo mips-mips-riscos${UNAME_RELEASE}
482+ echo mips-mips-riscos"$UNAME_RELEASE"
483 exit ;;
484 Motorola:PowerMAX_OS:*:*)
485 echo powerpc-motorola-powermax
486@@ -530,17 +534,17 @@ EOF
487 AViiON:dgux:*:*)
488 # DG/UX returns AViiON for all architectures
489 UNAME_PROCESSOR=`/usr/bin/uname -p`
490- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
491+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
492 then
493- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
494- [ ${TARGET_BINARY_INTERFACE}x = x ]
495+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
496+ [ "$TARGET_BINARY_INTERFACE"x = x ]
497 then
498- echo m88k-dg-dgux${UNAME_RELEASE}
499+ echo m88k-dg-dgux"$UNAME_RELEASE"
500 else
501- echo m88k-dg-dguxbcs${UNAME_RELEASE}
502+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
503 fi
504 else
505- echo i586-dg-dgux${UNAME_RELEASE}
506+ echo i586-dg-dgux"$UNAME_RELEASE"
507 fi
508 exit ;;
509 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
510@@ -557,7 +561,7 @@ EOF
511 echo m68k-tektronix-bsd
512 exit ;;
513 *:IRIX*:*:*)
514- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
515+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
516 exit ;;
517 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
518 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
519@@ -569,14 +573,14 @@ EOF
520 if [ -x /usr/bin/oslevel ] ; then
521 IBM_REV=`/usr/bin/oslevel`
522 else
523- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
524+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
525 fi
526- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
527+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
528 exit ;;
529 *:AIX:2:3)
530 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
531- eval $set_cc_for_build
532- sed 's/^ //' << EOF >$dummy.c
533+ eval "$set_cc_for_build"
534+ sed 's/^ //' << EOF > "$dummy.c"
535 #include <sys/systemcfg.h>
536
537 main()
538@@ -587,7 +591,7 @@ EOF
539 exit(0);
540 }
541 EOF
542- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
543+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
544 then
545 echo "$SYSTEM_NAME"
546 else
547@@ -601,7 +605,7 @@ EOF
548 exit ;;
549 *:AIX:*:[4567])
550 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
551- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
552+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
553 IBM_ARCH=rs6000
554 else
555 IBM_ARCH=powerpc
556@@ -610,18 +614,18 @@ EOF
557 IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
558 awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
559 else
560- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
561+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
562 fi
563- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
564+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
565 exit ;;
566 *:AIX:*:*)
567 echo rs6000-ibm-aix
568 exit ;;
569- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
570+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
571 echo romp-ibm-bsd4.4
572 exit ;;
573 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
574- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
575+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
576 exit ;; # report: romp-ibm BSD 4.3
577 *:BOSX:*:*)
578 echo rs6000-bull-bosx
579@@ -636,28 +640,28 @@ EOF
580 echo m68k-hp-bsd4.4
581 exit ;;
582 9000/[34678]??:HP-UX:*:*)
583- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
584- case "${UNAME_MACHINE}" in
585- 9000/31? ) HP_ARCH=m68000 ;;
586- 9000/[34]?? ) HP_ARCH=m68k ;;
587+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
588+ case "$UNAME_MACHINE" in
589+ 9000/31?) HP_ARCH=m68000 ;;
590+ 9000/[34]??) HP_ARCH=m68k ;;
591 9000/[678][0-9][0-9])
592 if [ -x /usr/bin/getconf ]; then
593 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
594 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
595- case "${sc_cpu_version}" in
596+ case "$sc_cpu_version" in
597 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
598 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
599 532) # CPU_PA_RISC2_0
600- case "${sc_kernel_bits}" in
601+ case "$sc_kernel_bits" in
602 32) HP_ARCH=hppa2.0n ;;
603 64) HP_ARCH=hppa2.0w ;;
604 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
605 esac ;;
606 esac
607 fi
608- if [ "${HP_ARCH}" = "" ]; then
609- eval $set_cc_for_build
610- sed 's/^ //' << EOF >$dummy.c
611+ if [ "$HP_ARCH" = "" ]; then
612+ eval "$set_cc_for_build"
613+ sed 's/^ //' << EOF > "$dummy.c"
614
615 #define _HPUX_SOURCE
616 #include <stdlib.h>
617@@ -690,13 +694,13 @@ EOF
618 exit (0);
619 }
620 EOF
621- (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
622+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
623 test -z "$HP_ARCH" && HP_ARCH=hppa
624 fi ;;
625 esac
626- if [ ${HP_ARCH} = hppa2.0w ]
627+ if [ "$HP_ARCH" = hppa2.0w ]
628 then
629- eval $set_cc_for_build
630+ eval "$set_cc_for_build"
631
632 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
633 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
634@@ -715,15 +719,15 @@ EOF
635 HP_ARCH=hppa64
636 fi
637 fi
638- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
639+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
640 exit ;;
641 ia64:HP-UX:*:*)
642- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
643- echo ia64-hp-hpux${HPUX_REV}
644+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
645+ echo ia64-hp-hpux"$HPUX_REV"
646 exit ;;
647 3050*:HI-UX:*:*)
648- eval $set_cc_for_build
649- sed 's/^ //' << EOF >$dummy.c
650+ eval "$set_cc_for_build"
651+ sed 's/^ //' << EOF > "$dummy.c"
652 #include <unistd.h>
653 int
654 main ()
655@@ -748,11 +752,11 @@ EOF
656 exit (0);
657 }
658 EOF
659- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
660+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
661 { echo "$SYSTEM_NAME"; exit; }
662 echo unknown-hitachi-hiuxwe2
663 exit ;;
664- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
665+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
666 echo hppa1.1-hp-bsd
667 exit ;;
668 9000/8??:4.3bsd:*:*)
669@@ -761,7 +765,7 @@ EOF
670 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
671 echo hppa1.0-hp-mpeix
672 exit ;;
673- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
674+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
675 echo hppa1.1-hp-osf
676 exit ;;
677 hp8??:OSF1:*:*)
678@@ -769,9 +773,9 @@ EOF
679 exit ;;
680 i*86:OSF1:*:*)
681 if [ -x /usr/sbin/sysversion ] ; then
682- echo ${UNAME_MACHINE}-unknown-osf1mk
683+ echo "$UNAME_MACHINE"-unknown-osf1mk
684 else
685- echo ${UNAME_MACHINE}-unknown-osf1
686+ echo "$UNAME_MACHINE"-unknown-osf1
687 fi
688 exit ;;
689 parisc*:Lites*:*:*)
690@@ -796,128 +800,109 @@ EOF
691 echo c4-convex-bsd
692 exit ;;
693 CRAY*Y-MP:*:*:*)
694- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
695+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
696 exit ;;
697 CRAY*[A-Z]90:*:*:*)
698- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
699+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
700 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
701 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
702 -e 's/\.[^.]*$/.X/'
703 exit ;;
704 CRAY*TS:*:*:*)
705- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
706+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
707 exit ;;
708 CRAY*T3E:*:*:*)
709- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
710+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
711 exit ;;
712 CRAY*SV1:*:*:*)
713- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
714+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
715 exit ;;
716 *:UNICOS/mp:*:*)
717- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
718+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
719 exit ;;
720 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
721 FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
722 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
723- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
724+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
725 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
726 exit ;;
727 5000:UNIX_System_V:4.*:*)
728 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
729- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
730+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
731 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
732 exit ;;
733 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
734- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
735+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
736 exit ;;
737 sparc*:BSD/OS:*:*)
738- echo sparc-unknown-bsdi${UNAME_RELEASE}
739+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
740 exit ;;
741 *:BSD/OS:*:*)
742- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
743+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
744 exit ;;
745 *:FreeBSD:*:*)
746 UNAME_PROCESSOR=`/usr/bin/uname -p`
747- case ${UNAME_PROCESSOR} in
748+ case "$UNAME_PROCESSOR" in
749 amd64)
750 UNAME_PROCESSOR=x86_64 ;;
751 i386)
752 UNAME_PROCESSOR=i586 ;;
753 esac
754- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
755+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
756 exit ;;
757 i*:CYGWIN*:*)
758- echo ${UNAME_MACHINE}-pc-cygwin
759+ echo "$UNAME_MACHINE"-pc-cygwin
760 exit ;;
761 *:MINGW64*:*)
762- echo ${UNAME_MACHINE}-pc-mingw64
763+ echo "$UNAME_MACHINE"-pc-mingw64
764 exit ;;
765 *:MINGW*:*)
766- echo ${UNAME_MACHINE}-pc-mingw32
767+ echo "$UNAME_MACHINE"-pc-mingw32
768 exit ;;
769 *:MSYS*:*)
770- echo ${UNAME_MACHINE}-pc-msys
771- exit ;;
772- i*:windows32*:*)
773- # uname -m includes "-pc" on this system.
774- echo ${UNAME_MACHINE}-mingw32
775+ echo "$UNAME_MACHINE"-pc-msys
776 exit ;;
777 i*:PW*:*)
778- echo ${UNAME_MACHINE}-pc-pw32
779+ echo "$UNAME_MACHINE"-pc-pw32
780 exit ;;
781 *:Interix*:*)
782- case ${UNAME_MACHINE} in
783+ case "$UNAME_MACHINE" in
784 x86)
785- echo i586-pc-interix${UNAME_RELEASE}
786+ echo i586-pc-interix"$UNAME_RELEASE"
787 exit ;;
788 authenticamd | genuineintel | EM64T)
789- echo x86_64-unknown-interix${UNAME_RELEASE}
790+ echo x86_64-unknown-interix"$UNAME_RELEASE"
791 exit ;;
792 IA64)
793- echo ia64-unknown-interix${UNAME_RELEASE}
794+ echo ia64-unknown-interix"$UNAME_RELEASE"
795 exit ;;
796 esac ;;
797- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
798- echo i${UNAME_MACHINE}-pc-mks
799- exit ;;
800- 8664:Windows_NT:*)
801- echo x86_64-pc-mks
802- exit ;;
803- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
804- # How do we know it's Interix rather than the generic POSIX subsystem?
805- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
806- # UNAME_MACHINE based on the output of uname instead of i386?
807- echo i586-pc-interix
808- exit ;;
809 i*:UWIN*:*)
810- echo ${UNAME_MACHINE}-pc-uwin
811+ echo "$UNAME_MACHINE"-pc-uwin
812 exit ;;
813 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
814 echo x86_64-unknown-cygwin
815 exit ;;
816- p*:CYGWIN*:*)
817- echo powerpcle-unknown-cygwin
818- exit ;;
819 prep*:SunOS:5.*:*)
820- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
821+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
822 exit ;;
823 *:GNU:*:*)
824 # the GNU system
825- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
826+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
827 exit ;;
828 *:GNU/*:*:*)
829 # other systems with GNU libc and userland
830- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
831+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
832 exit ;;
833 i*86:Minix:*:*)
834- echo ${UNAME_MACHINE}-pc-minix
835+ echo "$UNAME_MACHINE"-pc-minix
836 exit ;;
837 aarch64:Linux:*:*)
838- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
839+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
840 exit ;;
841 aarch64_be:Linux:*:*)
842 UNAME_MACHINE=aarch64_be
843- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
844+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
845 exit ;;
846 alpha:Linux:*:*)
847 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
848@@ -931,63 +916,63 @@ EOF
849 esac
850 objdump --private-headers /bin/sh | grep -q ld.so.1
851 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
852- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
853+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
854 exit ;;
855 arc:Linux:*:* | arceb:Linux:*:*)
856- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
857+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
858 exit ;;
859 arm*:Linux:*:*)
860- eval $set_cc_for_build
861+ eval "$set_cc_for_build"
862 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
863 | grep -q __ARM_EABI__
864 then
865- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
866+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
867 else
868 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
869 | grep -q __ARM_PCS_VFP
870 then
871- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
872+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
873 else
874- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
875+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
876 fi
877 fi
878 exit ;;
879 avr32*:Linux:*:*)
880- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
881+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
882 exit ;;
883 cris:Linux:*:*)
884- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
885+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
886 exit ;;
887 crisv32:Linux:*:*)
888- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
889+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
890 exit ;;
891 e2k:Linux:*:*)
892- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
893+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
894 exit ;;
895 frv:Linux:*:*)
896- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
897+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
898 exit ;;
899 hexagon:Linux:*:*)
900- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
901+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
902 exit ;;
903 i*86:Linux:*:*)
904- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
905+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
906 exit ;;
907 ia64:Linux:*:*)
908- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
909+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
910 exit ;;
911 k1om:Linux:*:*)
912- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
913+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
914 exit ;;
915 m32r*:Linux:*:*)
916- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
917+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
918 exit ;;
919 m68*:Linux:*:*)
920- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
921+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
922 exit ;;
923 mips:Linux:*:* | mips64:Linux:*:*)
924- eval $set_cc_for_build
925- sed 's/^ //' << EOF >$dummy.c
926+ eval "$set_cc_for_build"
927+ sed 's/^ //' << EOF > "$dummy.c"
928 #undef CPU
929 #undef ${UNAME_MACHINE}
930 #undef ${UNAME_MACHINE}el
931@@ -1001,70 +986,74 @@ EOF
932 #endif
933 #endif
934 EOF
935- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
936- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
937+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
938+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
939 ;;
940 mips64el:Linux:*:*)
941- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
942+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
943 exit ;;
944 openrisc*:Linux:*:*)
945- echo or1k-unknown-linux-${LIBC}
946+ echo or1k-unknown-linux-"$LIBC"
947 exit ;;
948 or32:Linux:*:* | or1k*:Linux:*:*)
949- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
950+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
951 exit ;;
952 padre:Linux:*:*)
953- echo sparc-unknown-linux-${LIBC}
954+ echo sparc-unknown-linux-"$LIBC"
955 exit ;;
956 parisc64:Linux:*:* | hppa64:Linux:*:*)
957- echo hppa64-unknown-linux-${LIBC}
958+ echo hppa64-unknown-linux-"$LIBC"
959 exit ;;
960 parisc:Linux:*:* | hppa:Linux:*:*)
961 # Look for CPU level
962 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
963- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
964- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
965- *) echo hppa-unknown-linux-${LIBC} ;;
966+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
967+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
968+ *) echo hppa-unknown-linux-"$LIBC" ;;
969 esac
970 exit ;;
971 ppc64:Linux:*:*)
972- echo powerpc64-unknown-linux-${LIBC}
973+ echo powerpc64-unknown-linux-"$LIBC"
974 exit ;;
975 ppc:Linux:*:*)
976- echo powerpc-unknown-linux-${LIBC}
977+ echo powerpc-unknown-linux-"$LIBC"
978 exit ;;
979 ppc64le:Linux:*:*)
980- echo powerpc64le-unknown-linux-${LIBC}
981+ echo powerpc64le-unknown-linux-"$LIBC"
982 exit ;;
983 ppcle:Linux:*:*)
984- echo powerpcle-unknown-linux-${LIBC}
985+ echo powerpcle-unknown-linux-"$LIBC"
986 exit ;;
987 riscv32:Linux:*:* | riscv64:Linux:*:*)
988- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
989+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
990 exit ;;
991 s390:Linux:*:* | s390x:Linux:*:*)
992- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
993+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
994 exit ;;
995 sh64*:Linux:*:*)
996- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
997+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
998 exit ;;
999 sh*:Linux:*:*)
1000- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1001+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1002 exit ;;
1003 sparc:Linux:*:* | sparc64:Linux:*:*)
1004- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1005+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1006 exit ;;
1007 tile*:Linux:*:*)
1008- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1009+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1010 exit ;;
1011 vax:Linux:*:*)
1012- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
1013+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1014 exit ;;
1015 x86_64:Linux:*:*)
1016- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
1017+ if objdump -f /bin/sh | grep -q elf32-x86-64; then
1018+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
1019+ else
1020+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1021+ fi
1022 exit ;;
1023 xtensa*:Linux:*:*)
1024- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1025+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1026 exit ;;
1027 i*86:DYNIX/ptx:4*:*)
1028 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1029@@ -1078,34 +1067,34 @@ EOF
1030 # I am not positive that other SVR4 systems won't match this,
1031 # I just have to hope. -- rms.
1032 # Use sysv4.2uw... so that sysv4* matches it.
1033- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1034+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
1035 exit ;;
1036 i*86:OS/2:*:*)
1037 # If we were able to find `uname', then EMX Unix compatibility
1038 # is probably installed.
1039- echo ${UNAME_MACHINE}-pc-os2-emx
1040+ echo "$UNAME_MACHINE"-pc-os2-emx
1041 exit ;;
1042 i*86:XTS-300:*:STOP)
1043- echo ${UNAME_MACHINE}-unknown-stop
1044+ echo "$UNAME_MACHINE"-unknown-stop
1045 exit ;;
1046 i*86:atheos:*:*)
1047- echo ${UNAME_MACHINE}-unknown-atheos
1048+ echo "$UNAME_MACHINE"-unknown-atheos
1049 exit ;;
1050 i*86:syllable:*:*)
1051- echo ${UNAME_MACHINE}-pc-syllable
1052+ echo "$UNAME_MACHINE"-pc-syllable
1053 exit ;;
1054 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1055- echo i386-unknown-lynxos${UNAME_RELEASE}
1056+ echo i386-unknown-lynxos"$UNAME_RELEASE"
1057 exit ;;
1058 i*86:*DOS:*:*)
1059- echo ${UNAME_MACHINE}-pc-msdosdjgpp
1060+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
1061 exit ;;
1062- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1063- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1064+ i*86:*:4.*:*)
1065+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
1066 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1067- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
1068+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
1069 else
1070- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1071+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
1072 fi
1073 exit ;;
1074 i*86:*:5:[678]*)
1075@@ -1115,12 +1104,12 @@ EOF
1076 *Pentium) UNAME_MACHINE=i586 ;;
1077 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1078 esac
1079- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1080+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
1081 exit ;;
1082 i*86:*:3.2:*)
1083 if test -f /usr/options/cb.name; then
1084 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1085- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1086+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
1087 elif /bin/uname -X 2>/dev/null >/dev/null ; then
1088 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
1089 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
1090@@ -1130,9 +1119,9 @@ EOF
1091 && UNAME_MACHINE=i686
1092 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1093 && UNAME_MACHINE=i686
1094- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1095+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
1096 else
1097- echo ${UNAME_MACHINE}-pc-sysv32
1098+ echo "$UNAME_MACHINE"-pc-sysv32
1099 fi
1100 exit ;;
1101 pc:*:*:*)
1102@@ -1152,9 +1141,9 @@ EOF
1103 exit ;;
1104 i860:*:4.*:*) # i860-SVR4
1105 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1106- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1107+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
1108 else # Add other i860-SVR4 vendors below as they are discovered.
1109- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
1110+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
1111 fi
1112 exit ;;
1113 mini*:CTIX:SYS*5:*)
1114@@ -1174,9 +1163,9 @@ EOF
1115 test -r /etc/.relid \
1116 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1117 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1118- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1119+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1120 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1121- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1122+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1123 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1124 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1125 && { echo i486-ncr-sysv4; exit; } ;;
1126@@ -1185,28 +1174,28 @@ EOF
1127 test -r /etc/.relid \
1128 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1129 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1130- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1131+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1132 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1133- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1134+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
1135 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1136- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1137+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1138 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1139- echo m68k-unknown-lynxos${UNAME_RELEASE}
1140+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
1141 exit ;;
1142 mc68030:UNIX_System_V:4.*:*)
1143 echo m68k-atari-sysv4
1144 exit ;;
1145 TSUNAMI:LynxOS:2.*:*)
1146- echo sparc-unknown-lynxos${UNAME_RELEASE}
1147+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
1148 exit ;;
1149 rs6000:LynxOS:2.*:*)
1150- echo rs6000-unknown-lynxos${UNAME_RELEASE}
1151+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
1152 exit ;;
1153 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1154- echo powerpc-unknown-lynxos${UNAME_RELEASE}
1155+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
1156 exit ;;
1157 SM[BE]S:UNIX_SV:*:*)
1158- echo mips-dde-sysv${UNAME_RELEASE}
1159+ echo mips-dde-sysv"$UNAME_RELEASE"
1160 exit ;;
1161 RM*:ReliantUNIX-*:*:*)
1162 echo mips-sni-sysv4
1163@@ -1217,7 +1206,7 @@ EOF
1164 *:SINIX-*:*:*)
1165 if uname -p 2>/dev/null >/dev/null ; then
1166 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1167- echo ${UNAME_MACHINE}-sni-sysv4
1168+ echo "$UNAME_MACHINE"-sni-sysv4
1169 else
1170 echo ns32k-sni-sysv
1171 fi
1172@@ -1237,23 +1226,23 @@ EOF
1173 exit ;;
1174 i*86:VOS:*:*)
1175 # From Paul.Green@stratus.com.
1176- echo ${UNAME_MACHINE}-stratus-vos
1177+ echo "$UNAME_MACHINE"-stratus-vos
1178 exit ;;
1179 *:VOS:*:*)
1180 # From Paul.Green@stratus.com.
1181 echo hppa1.1-stratus-vos
1182 exit ;;
1183 mc68*:A/UX:*:*)
1184- echo m68k-apple-aux${UNAME_RELEASE}
1185+ echo m68k-apple-aux"$UNAME_RELEASE"
1186 exit ;;
1187 news*:NEWS-OS:6*:*)
1188 echo mips-sony-newsos6
1189 exit ;;
1190 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1191 if [ -d /usr/nec ]; then
1192- echo mips-nec-sysv${UNAME_RELEASE}
1193+ echo mips-nec-sysv"$UNAME_RELEASE"
1194 else
1195- echo mips-unknown-sysv${UNAME_RELEASE}
1196+ echo mips-unknown-sysv"$UNAME_RELEASE"
1197 fi
1198 exit ;;
1199 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1200@@ -1272,39 +1261,39 @@ EOF
1201 echo x86_64-unknown-haiku
1202 exit ;;
1203 SX-4:SUPER-UX:*:*)
1204- echo sx4-nec-superux${UNAME_RELEASE}
1205+ echo sx4-nec-superux"$UNAME_RELEASE"
1206 exit ;;
1207 SX-5:SUPER-UX:*:*)
1208- echo sx5-nec-superux${UNAME_RELEASE}
1209+ echo sx5-nec-superux"$UNAME_RELEASE"
1210 exit ;;
1211 SX-6:SUPER-UX:*:*)
1212- echo sx6-nec-superux${UNAME_RELEASE}
1213+ echo sx6-nec-superux"$UNAME_RELEASE"
1214 exit ;;
1215 SX-7:SUPER-UX:*:*)
1216- echo sx7-nec-superux${UNAME_RELEASE}
1217+ echo sx7-nec-superux"$UNAME_RELEASE"
1218 exit ;;
1219 SX-8:SUPER-UX:*:*)
1220- echo sx8-nec-superux${UNAME_RELEASE}
1221+ echo sx8-nec-superux"$UNAME_RELEASE"
1222 exit ;;
1223 SX-8R:SUPER-UX:*:*)
1224- echo sx8r-nec-superux${UNAME_RELEASE}
1225+ echo sx8r-nec-superux"$UNAME_RELEASE"
1226 exit ;;
1227 SX-ACE:SUPER-UX:*:*)
1228- echo sxace-nec-superux${UNAME_RELEASE}
1229+ echo sxace-nec-superux"$UNAME_RELEASE"
1230 exit ;;
1231 Power*:Rhapsody:*:*)
1232- echo powerpc-apple-rhapsody${UNAME_RELEASE}
1233+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
1234 exit ;;
1235 *:Rhapsody:*:*)
1236- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1237+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
1238 exit ;;
1239 *:Darwin:*:*)
1240 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1241- eval $set_cc_for_build
1242+ eval "$set_cc_for_build"
1243 if test "$UNAME_PROCESSOR" = unknown ; then
1244 UNAME_PROCESSOR=powerpc
1245 fi
1246- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1247+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
1248 if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1249 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1250 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1251@@ -1332,7 +1321,7 @@ EOF
1252 # that Apple uses in portable devices.
1253 UNAME_PROCESSOR=x86_64
1254 fi
1255- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1256+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
1257 exit ;;
1258 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1259 UNAME_PROCESSOR=`uname -p`
1260@@ -1340,22 +1329,25 @@ EOF
1261 UNAME_PROCESSOR=i386
1262 UNAME_MACHINE=pc
1263 fi
1264- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1265+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
1266 exit ;;
1267 *:QNX:*:4*)
1268 echo i386-pc-qnx
1269 exit ;;
1270 NEO-*:NONSTOP_KERNEL:*:*)
1271- echo neo-tandem-nsk${UNAME_RELEASE}
1272+ echo neo-tandem-nsk"$UNAME_RELEASE"
1273 exit ;;
1274 NSE-*:NONSTOP_KERNEL:*:*)
1275- echo nse-tandem-nsk${UNAME_RELEASE}
1276+ echo nse-tandem-nsk"$UNAME_RELEASE"
1277 exit ;;
1278 NSR-*:NONSTOP_KERNEL:*:*)
1279- echo nsr-tandem-nsk${UNAME_RELEASE}
1280+ echo nsr-tandem-nsk"$UNAME_RELEASE"
1281+ exit ;;
1282+ NSV-*:NONSTOP_KERNEL:*:*)
1283+ echo nsv-tandem-nsk"$UNAME_RELEASE"
1284 exit ;;
1285 NSX-*:NONSTOP_KERNEL:*:*)
1286- echo nsx-tandem-nsk${UNAME_RELEASE}
1287+ echo nsx-tandem-nsk"$UNAME_RELEASE"
1288 exit ;;
1289 *:NonStop-UX:*:*)
1290 echo mips-compaq-nonstopux
1291@@ -1364,7 +1356,7 @@ EOF
1292 echo bs2000-siemens-sysv
1293 exit ;;
1294 DS/*:UNIX_System_V:*:*)
1295- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1296+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
1297 exit ;;
1298 *:Plan9:*:*)
1299 # "uname -m" is not consistent, so use $cputype instead. 386
1300@@ -1375,7 +1367,7 @@ EOF
1301 else
1302 UNAME_MACHINE="$cputype"
1303 fi
1304- echo ${UNAME_MACHINE}-unknown-plan9
1305+ echo "$UNAME_MACHINE"-unknown-plan9
1306 exit ;;
1307 *:TOPS-10:*:*)
1308 echo pdp10-unknown-tops10
1309@@ -1396,14 +1388,14 @@ EOF
1310 echo pdp10-unknown-its
1311 exit ;;
1312 SEI:*:*:SEIUX)
1313- echo mips-sei-seiux${UNAME_RELEASE}
1314+ echo mips-sei-seiux"$UNAME_RELEASE"
1315 exit ;;
1316 *:DragonFly:*:*)
1317- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1318+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
1319 exit ;;
1320 *:*VMS:*:*)
1321 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1322- case "${UNAME_MACHINE}" in
1323+ case "$UNAME_MACHINE" in
1324 A*) echo alpha-dec-vms ; exit ;;
1325 I*) echo ia64-dec-vms ; exit ;;
1326 V*) echo vax-dec-vms ; exit ;;
1327@@ -1412,32 +1404,44 @@ EOF
1328 echo i386-pc-xenix
1329 exit ;;
1330 i*86:skyos:*:*)
1331- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
1332+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
1333 exit ;;
1334 i*86:rdos:*:*)
1335- echo ${UNAME_MACHINE}-pc-rdos
1336+ echo "$UNAME_MACHINE"-pc-rdos
1337 exit ;;
1338 i*86:AROS:*:*)
1339- echo ${UNAME_MACHINE}-pc-aros
1340+ echo "$UNAME_MACHINE"-pc-aros
1341 exit ;;
1342 x86_64:VMkernel:*:*)
1343- echo ${UNAME_MACHINE}-unknown-esx
1344+ echo "$UNAME_MACHINE"-unknown-esx
1345 exit ;;
1346 amd64:Isilon\ OneFS:*:*)
1347 echo x86_64-unknown-onefs
1348 exit ;;
1349 esac
1350
1351+echo "$0: unable to guess system type" >&2
1352+
1353+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
1354+ mips:Linux | mips64:Linux)
1355+ # If we got here on MIPS GNU/Linux, output extra information.
1356+ cat >&2 <<EOF
1357+
1358+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
1359+the system type. Please install a C compiler and try again.
1360+EOF
1361+ ;;
1362+esac
1363+
1364 cat >&2 <<EOF
1365-$0: unable to guess system type
1366
1367 This script (version $timestamp), has failed to recognize the
1368 operating system you are using. If your script is old, overwrite *all*
1369 copies of config.guess and config.sub with the latest versions from:
1370
1371- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1372+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1373 and
1374- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1375+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1376
1377 If $0 has already been updated, send the following data and any
1378 information you think might be pertinent to config-patches@gnu.org to
1379@@ -1460,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
1380 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
1381 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1382
1383-UNAME_MACHINE = ${UNAME_MACHINE}
1384-UNAME_RELEASE = ${UNAME_RELEASE}
1385-UNAME_SYSTEM = ${UNAME_SYSTEM}
1386-UNAME_VERSION = ${UNAME_VERSION}
1387+UNAME_MACHINE = "$UNAME_MACHINE"
1388+UNAME_RELEASE = "$UNAME_RELEASE"
1389+UNAME_SYSTEM = "$UNAME_SYSTEM"
1390+UNAME_VERSION = "$UNAME_VERSION"
1391 EOF
1392
1393 exit 1
1394
1395 # Local variables:
1396-# eval: (add-hook 'write-file-hooks 'time-stamp)
1397+# eval: (add-hook 'write-file-functions 'time-stamp)
1398 # time-stamp-start: "timestamp='"
1399 # time-stamp-format: "%:y-%02m-%02d"
1400 # time-stamp-end: "'"
1401diff --git a/build-aux/config.sub b/build-aux/config.sub
1402index f4bafc1..1d8e98b 100755
1403--- a/build-aux/config.sub
1404+++ b/build-aux/config.sub
1405@@ -1,8 +1,8 @@
1406-#!/bin/sh
1407+#! /bin/sh
1408 # Configuration validation subroutine script.
1409-# Copyright 1992-2017 Free Software Foundation, Inc.
1410+# Copyright 1992-2018 Free Software Foundation, Inc.
1411
1412-timestamp='2017-04-02'
1413+timestamp='2018-02-22'
1414
1415 # This file is free software; you can redistribute it and/or modify it
1416 # under the terms of the GNU General Public License as published by
1417@@ -15,7 +15,7 @@ timestamp='2017-04-02'
1418 # General Public License for more details.
1419 #
1420 # You should have received a copy of the GNU General Public License
1421-# along with this program; if not, see <http://www.gnu.org/licenses/>.
1422+# along with this program; if not, see <https://www.gnu.org/licenses/>.
1423 #
1424 # As a special exception to the GNU General Public License, if you
1425 # distribute this file as part of a program that contains a
1426@@ -33,7 +33,7 @@ timestamp='2017-04-02'
1427 # Otherwise, we print the canonical config type on stdout and succeed.
1428
1429 # You can get the latest version of this script from:
1430-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1431+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1432
1433 # This file is supposed to be the same for all GNU packages
1434 # and recognize all the CPU types, system types and aliases
1435@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
1436
1437 Canonicalize a configuration name.
1438
1439-Operation modes:
1440+Options:
1441 -h, --help print this help, then exit
1442 -t, --time-stamp print date of last modification, then exit
1443 -v, --version print version number, then exit
1444@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
1445 version="\
1446 GNU config.sub ($timestamp)
1447
1448-Copyright 1992-2017 Free Software Foundation, Inc.
1449+Copyright 1992-2018 Free Software Foundation, Inc.
1450
1451 This is free software; see the source for copying conditions. There is NO
1452 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1453@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
1454
1455 *local*)
1456 # First pass through any local machine types.
1457- echo $1
1458+ echo "$1"
1459 exit ;;
1460
1461 * )
1462@@ -112,7 +112,7 @@ esac
1463
1464 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
1465 # Here we must recognize all the valid KERNEL-OS combinations.
1466-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1467+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1468 case $maybe_os in
1469 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
1470 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
1471@@ -120,16 +120,16 @@ case $maybe_os in
1472 kopensolaris*-gnu* | cloudabi*-eabi* | \
1473 storm-chaos* | os2-emx* | rtmk-nova*)
1474 os=-$maybe_os
1475- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1476+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1477 ;;
1478 android-linux)
1479 os=-linux-android
1480- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
1481+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
1482 ;;
1483 *)
1484- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
1485- if [ $basic_machine != $1 ]
1486- then os=`echo $1 | sed 's/.*-/-/'`
1487+ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
1488+ if [ "$basic_machine" != "$1" ]
1489+ then os=`echo "$1" | sed 's/.*-/-/'`
1490 else os=; fi
1491 ;;
1492 esac
1493@@ -178,44 +178,44 @@ case $os in
1494 ;;
1495 -sco6)
1496 os=-sco5v6
1497- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1498+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1499 ;;
1500 -sco5)
1501 os=-sco3.2v5
1502- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1503+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1504 ;;
1505 -sco4)
1506 os=-sco3.2v4
1507- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1508+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1509 ;;
1510 -sco3.2.[4-9]*)
1511 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
1512- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1513+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1514 ;;
1515 -sco3.2v[4-9]*)
1516 # Don't forget version if it is 3.2v4 or newer.
1517- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1518+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1519 ;;
1520 -sco5v6*)
1521 # Don't forget version if it is 3.2v4 or newer.
1522- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1523+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1524 ;;
1525 -sco*)
1526 os=-sco3.2v2
1527- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1528+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1529 ;;
1530 -udk*)
1531- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1532+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1533 ;;
1534 -isc)
1535 os=-isc2.2
1536- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1537+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1538 ;;
1539 -clix*)
1540 basic_machine=clipper-intergraph
1541 ;;
1542 -isc*)
1543- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1544+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1545 ;;
1546 -lynx*178)
1547 os=-lynxos178
1548@@ -227,10 +227,7 @@ case $os in
1549 os=-lynxos
1550 ;;
1551 -ptx*)
1552- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
1553- ;;
1554- -windowsnt*)
1555- os=`echo $os | sed -e 's/windowsnt/winnt/'`
1556+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
1557 ;;
1558 -psos*)
1559 os=-psos
1560@@ -299,7 +296,7 @@ case $basic_machine in
1561 | nios | nios2 | nios2eb | nios2el \
1562 | ns16k | ns32k \
1563 | open8 | or1k | or1knd | or32 \
1564- | pdp10 | pdp11 | pj | pjl \
1565+ | pdp10 | pj | pjl \
1566 | powerpc | powerpc64 | powerpc64le | powerpcle \
1567 | pru \
1568 | pyramid \
1569@@ -316,7 +313,6 @@ case $basic_machine in
1570 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
1571 | visium \
1572 | wasm32 \
1573- | we32k \
1574 | x86 | xc16x | xstormy16 | xtensa \
1575 | z8k | z80)
1576 basic_machine=$basic_machine-unknown
1577@@ -337,7 +333,7 @@ case $basic_machine in
1578 basic_machine=$basic_machine-unknown
1579 os=-none
1580 ;;
1581- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
1582+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
1583 ;;
1584 ms1)
1585 basic_machine=mt-unknown
1586@@ -366,7 +362,7 @@ case $basic_machine in
1587 ;;
1588 # Object if more than one company name word.
1589 *-*-*)
1590- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1591+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
1592 exit 1
1593 ;;
1594 # Recognize the basic CPU types with company name.
1595@@ -461,7 +457,7 @@ case $basic_machine in
1596 # Recognize the various machine names and aliases which stand
1597 # for a CPU type and a company and sometimes even an OS.
1598 386bsd)
1599- basic_machine=i386-unknown
1600+ basic_machine=i386-pc
1601 os=-bsd
1602 ;;
1603 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
1604@@ -495,7 +491,7 @@ case $basic_machine in
1605 basic_machine=x86_64-pc
1606 ;;
1607 amd64-*)
1608- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
1609+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1610 ;;
1611 amdahl)
1612 basic_machine=580-amdahl
1613@@ -540,7 +536,7 @@ case $basic_machine in
1614 os=-linux
1615 ;;
1616 blackfin-*)
1617- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
1618+ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1619 os=-linux
1620 ;;
1621 bluegene*)
1622@@ -548,13 +544,13 @@ case $basic_machine in
1623 os=-cnk
1624 ;;
1625 c54x-*)
1626- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
1627+ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1628 ;;
1629 c55x-*)
1630- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
1631+ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1632 ;;
1633 c6x-*)
1634- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
1635+ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1636 ;;
1637 c90)
1638 basic_machine=c90-cray
1639@@ -643,7 +639,7 @@ case $basic_machine in
1640 basic_machine=rs6000-bull
1641 os=-bosx
1642 ;;
1643- dpx2* | dpx2*-bull)
1644+ dpx2*)
1645 basic_machine=m68k-bull
1646 os=-sysv3
1647 ;;
1648@@ -652,7 +648,7 @@ case $basic_machine in
1649 os=$os"spe"
1650 ;;
1651 e500v[12]-*)
1652- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1653+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1654 os=$os"spe"
1655 ;;
1656 ebmon29k)
1657@@ -744,9 +740,6 @@ case $basic_machine in
1658 hp9k8[0-9][0-9] | hp8[0-9][0-9])
1659 basic_machine=hppa1.0-hp
1660 ;;
1661- hppa-next)
1662- os=-nextstep3
1663- ;;
1664 hppaosf)
1665 basic_machine=hppa1.1-hp
1666 os=-osf
1667@@ -759,26 +752,26 @@ case $basic_machine in
1668 basic_machine=i370-ibm
1669 ;;
1670 i*86v32)
1671- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1672+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
1673 os=-sysv32
1674 ;;
1675 i*86v4*)
1676- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1677+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
1678 os=-sysv4
1679 ;;
1680 i*86v)
1681- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1682+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
1683 os=-sysv
1684 ;;
1685 i*86sol2)
1686- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
1687+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
1688 os=-solaris2
1689 ;;
1690 i386mach)
1691 basic_machine=i386-mach
1692 os=-mach
1693 ;;
1694- i386-vsta | vsta)
1695+ vsta)
1696 basic_machine=i386-unknown
1697 os=-vsta
1698 ;;
1699@@ -797,19 +790,16 @@ case $basic_machine in
1700 os=-sysv
1701 ;;
1702 leon-*|leon[3-9]-*)
1703- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
1704+ basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
1705 ;;
1706 m68knommu)
1707 basic_machine=m68k-unknown
1708 os=-linux
1709 ;;
1710 m68knommu-*)
1711- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
1712+ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1713 os=-linux
1714 ;;
1715- m88k-omron*)
1716- basic_machine=m88k-omron
1717- ;;
1718 magnum | m3230)
1719 basic_machine=mips-mips
1720 os=-sysv
1721@@ -841,10 +831,10 @@ case $basic_machine in
1722 os=-mint
1723 ;;
1724 mips3*-*)
1725- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
1726+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
1727 ;;
1728 mips3*)
1729- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
1730+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
1731 ;;
1732 monitor)
1733 basic_machine=m68k-rom68k
1734@@ -863,7 +853,7 @@ case $basic_machine in
1735 os=-msdos
1736 ;;
1737 ms1-*)
1738- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
1739+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
1740 ;;
1741 msys)
1742 basic_machine=i686-pc
1743@@ -905,7 +895,7 @@ case $basic_machine in
1744 basic_machine=v70-nec
1745 os=-sysv
1746 ;;
1747- next | m*-next )
1748+ next | m*-next)
1749 basic_machine=m68k-next
1750 case $os in
1751 -nextstep* )
1752@@ -950,6 +940,9 @@ case $basic_machine in
1753 nsr-tandem)
1754 basic_machine=nsr-tandem
1755 ;;
1756+ nsv-tandem)
1757+ basic_machine=nsv-tandem
1758+ ;;
1759 nsx-tandem)
1760 basic_machine=nsx-tandem
1761 ;;
1762@@ -985,7 +978,7 @@ case $basic_machine in
1763 os=-linux
1764 ;;
1765 parisc-*)
1766- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
1767+ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1768 os=-linux
1769 ;;
1770 pbd)
1771@@ -1001,7 +994,7 @@ case $basic_machine in
1772 basic_machine=i386-pc
1773 ;;
1774 pc98-*)
1775- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
1776+ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1777 ;;
1778 pentium | p5 | k5 | k6 | nexgen | viac3)
1779 basic_machine=i586-pc
1780@@ -1016,16 +1009,16 @@ case $basic_machine in
1781 basic_machine=i786-pc
1782 ;;
1783 pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
1784- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
1785+ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1786 ;;
1787 pentiumpro-* | p6-* | 6x86-* | athlon-*)
1788- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
1789+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1790 ;;
1791 pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
1792- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
1793+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1794 ;;
1795 pentium4-*)
1796- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
1797+ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1798 ;;
1799 pn)
1800 basic_machine=pn-gould
1801@@ -1035,23 +1028,23 @@ case $basic_machine in
1802 ppc | ppcbe) basic_machine=powerpc-unknown
1803 ;;
1804 ppc-* | ppcbe-*)
1805- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1806+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1807 ;;
1808 ppcle | powerpclittle)
1809 basic_machine=powerpcle-unknown
1810 ;;
1811 ppcle-* | powerpclittle-*)
1812- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
1813+ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1814 ;;
1815 ppc64) basic_machine=powerpc64-unknown
1816 ;;
1817- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1818+ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1819 ;;
1820 ppc64le | powerpc64little)
1821 basic_machine=powerpc64le-unknown
1822 ;;
1823 ppc64le-* | powerpc64little-*)
1824- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
1825+ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1826 ;;
1827 ps2)
1828 basic_machine=i386-ibm
1829@@ -1105,17 +1098,10 @@ case $basic_machine in
1830 sequent)
1831 basic_machine=i386-sequent
1832 ;;
1833- sh)
1834- basic_machine=sh-hitachi
1835- os=-hms
1836- ;;
1837 sh5el)
1838 basic_machine=sh5le-unknown
1839 ;;
1840- sh64)
1841- basic_machine=sh64-unknown
1842- ;;
1843- sparclite-wrs | simso-wrs)
1844+ simso-wrs)
1845 basic_machine=sparclite-wrs
1846 os=-vxworks
1847 ;;
1848@@ -1134,7 +1120,7 @@ case $basic_machine in
1849 os=-sysv4
1850 ;;
1851 strongarm-* | thumb-*)
1852- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1853+ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1854 ;;
1855 sun2)
1856 basic_machine=m68000-sun
1857@@ -1248,9 +1234,6 @@ case $basic_machine in
1858 basic_machine=a29k-wrs
1859 os=-vxworks
1860 ;;
1861- wasm32)
1862- basic_machine=wasm32-unknown
1863- ;;
1864 w65*)
1865 basic_machine=w65-wdc
1866 os=-none
1867@@ -1259,6 +1242,9 @@ case $basic_machine in
1868 basic_machine=hppa1.1-winbond
1869 os=-proelf
1870 ;;
1871+ x64)
1872+ basic_machine=x86_64-pc
1873+ ;;
1874 xbox)
1875 basic_machine=i686-pc
1876 os=-mingw32
1877@@ -1267,20 +1253,12 @@ case $basic_machine in
1878 basic_machine=xps100-honeywell
1879 ;;
1880 xscale-* | xscalee[bl]-*)
1881- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1882+ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
1883 ;;
1884 ymp)
1885 basic_machine=ymp-cray
1886 os=-unicos
1887 ;;
1888- z8k-*-coff)
1889- basic_machine=z8k-unknown
1890- os=-sim
1891- ;;
1892- z80-*-coff)
1893- basic_machine=z80-unknown
1894- os=-sim
1895- ;;
1896 none)
1897 basic_machine=none-none
1898 os=-none
1899@@ -1309,10 +1287,6 @@ case $basic_machine in
1900 vax)
1901 basic_machine=vax-dec
1902 ;;
1903- pdp10)
1904- # there are many clones, so DEC is not a safe bet
1905- basic_machine=pdp10-unknown
1906- ;;
1907 pdp11)
1908 basic_machine=pdp11-dec
1909 ;;
1910@@ -1322,9 +1296,6 @@ case $basic_machine in
1911 sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1912 basic_machine=sh-unknown
1913 ;;
1914- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1915- basic_machine=sparc-sun
1916- ;;
1917 cydra)
1918 basic_machine=cydra-cydrome
1919 ;;
1920@@ -1344,7 +1315,7 @@ case $basic_machine in
1921 # Make sure to match an already-canonicalized machine name.
1922 ;;
1923 *)
1924- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1925+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
1926 exit 1
1927 ;;
1928 esac
1929@@ -1352,10 +1323,10 @@ esac
1930 # Here we canonicalize certain aliases for manufacturers.
1931 case $basic_machine in
1932 *-digital*)
1933- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
1934+ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
1935 ;;
1936 *-commodore*)
1937- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
1938+ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
1939 ;;
1940 *)
1941 ;;
1942@@ -1366,8 +1337,8 @@ esac
1943 if [ x"$os" != x"" ]
1944 then
1945 case $os in
1946- # First match some system type aliases
1947- # that might get confused with valid system types.
1948+ # First match some system type aliases that might get confused
1949+ # with valid system types.
1950 # -solaris* is a basic system type, with this one exception.
1951 -auroraux)
1952 os=-auroraux
1953@@ -1378,18 +1349,19 @@ case $os in
1954 -solaris)
1955 os=-solaris2
1956 ;;
1957- -svr4*)
1958- os=-sysv4
1959- ;;
1960 -unixware*)
1961 os=-sysv4.2uw
1962 ;;
1963 -gnu/linux*)
1964 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1965 ;;
1966- # First accept the basic system types.
1967+ # es1800 is here to avoid being matched by es* (a different OS)
1968+ -es1800*)
1969+ os=-ose
1970+ ;;
1971+ # Now accept the basic system types.
1972 # The portable systems comes first.
1973- # Each alternative MUST END IN A *, to match a version number.
1974+ # Each alternative MUST end in a * to match a version number.
1975 # -sysv* is not here because it comes later, after sysvr4.
1976 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1977 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1978@@ -1399,7 +1371,7 @@ case $os in
1979 | -aos* | -aros* | -cloudabi* | -sortix* \
1980 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1981 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1982- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1983+ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
1984 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
1985 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1986 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1987@@ -1410,14 +1382,15 @@ case $os in
1988 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1989 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1990 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1991- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1992+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
1993 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1994 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1995 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1996- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1997+ | -morphos* | -superux* | -rtmk* | -windiss* \
1998 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1999 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
2000- | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
2001+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
2002+ | -midnightbsd*)
2003 # Remember, each alternative MUST END IN *, to match a version number.
2004 ;;
2005 -qnx*)
2006@@ -1434,12 +1407,12 @@ case $os in
2007 -nto*)
2008 os=`echo $os | sed -e 's|nto|nto-qnx|'`
2009 ;;
2010- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
2011- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
2012+ -sim | -xray | -os68k* | -v88r* \
2013+ | -windows* | -osx | -abug | -netware* | -os9* \
2014 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
2015 ;;
2016 -mac*)
2017- os=`echo $os | sed -e 's|mac|macos|'`
2018+ os=`echo "$os" | sed -e 's|mac|macos|'`
2019 ;;
2020 -linux-dietlibc)
2021 os=-linux-dietlibc
2022@@ -1448,10 +1421,10 @@ case $os in
2023 os=`echo $os | sed -e 's|linux|linux-gnu|'`
2024 ;;
2025 -sunos5*)
2026- os=`echo $os | sed -e 's|sunos5|solaris2|'`
2027+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
2028 ;;
2029 -sunos6*)
2030- os=`echo $os | sed -e 's|sunos6|solaris3|'`
2031+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
2032 ;;
2033 -opened*)
2034 os=-openedition
2035@@ -1462,12 +1435,6 @@ case $os in
2036 -wince*)
2037 os=-wince
2038 ;;
2039- -osfrose*)
2040- os=-osfrose
2041- ;;
2042- -osf*)
2043- os=-osf
2044- ;;
2045 -utek*)
2046 os=-bsd
2047 ;;
2048@@ -1492,7 +1459,7 @@ case $os in
2049 -nova*)
2050 os=-rtmk-nova
2051 ;;
2052- -ns2 )
2053+ -ns2)
2054 os=-nextstep2
2055 ;;
2056 -nsk*)
2057@@ -1514,7 +1481,7 @@ case $os in
2058 -oss*)
2059 os=-sysv3
2060 ;;
2061- -svr4)
2062+ -svr4*)
2063 os=-sysv4
2064 ;;
2065 -svr3)
2066@@ -1529,24 +1496,28 @@ case $os in
2067 -ose*)
2068 os=-ose
2069 ;;
2070- -es1800*)
2071- os=-ose
2072- ;;
2073- -xenix)
2074- os=-xenix
2075- ;;
2076 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
2077 os=-mint
2078 ;;
2079- -aros*)
2080- os=-aros
2081- ;;
2082 -zvmoe)
2083 os=-zvmoe
2084 ;;
2085 -dicos*)
2086 os=-dicos
2087 ;;
2088+ -pikeos*)
2089+ # Until real need of OS specific support for
2090+ # particular features comes up, bare metal
2091+ # configurations are quite functional.
2092+ case $basic_machine in
2093+ arm*)
2094+ os=-eabi
2095+ ;;
2096+ *)
2097+ os=-elf
2098+ ;;
2099+ esac
2100+ ;;
2101 -nacl*)
2102 ;;
2103 -ios)
2104@@ -1556,7 +1527,7 @@ case $os in
2105 *)
2106 # Get rid of the `-' at the beginning of $os.
2107 os=`echo $os | sed 's/[^-]*-//'`
2108- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
2109+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
2110 exit 1
2111 ;;
2112 esac
2113@@ -1652,9 +1623,6 @@ case $basic_machine in
2114 *-be)
2115 os=-beos
2116 ;;
2117- *-haiku)
2118- os=-haiku
2119- ;;
2120 *-ibm)
2121 os=-aix
2122 ;;
2123@@ -1694,7 +1662,7 @@ case $basic_machine in
2124 m88k-omron*)
2125 os=-luna
2126 ;;
2127- *-next )
2128+ *-next)
2129 os=-nextstep
2130 ;;
2131 *-sequent)
2132@@ -1709,9 +1677,6 @@ case $basic_machine in
2133 i370-*)
2134 os=-mvs
2135 ;;
2136- *-next)
2137- os=-nextstep3
2138- ;;
2139 *-gould)
2140 os=-sysv
2141 ;;
2142@@ -1821,15 +1786,15 @@ case $basic_machine in
2143 vendor=stratus
2144 ;;
2145 esac
2146- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
2147+ basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
2148 ;;
2149 esac
2150
2151-echo $basic_machine$os
2152+echo "$basic_machine$os"
2153 exit
2154
2155 # Local variables:
2156-# eval: (add-hook 'write-file-hooks 'time-stamp)
2157+# eval: (add-hook 'write-file-functions 'time-stamp)
2158 # time-stamp-start: "timestamp='"
2159 # time-stamp-format: "%:y-%02m-%02d"
2160 # time-stamp-end: "'"
2161diff --git a/build-aux/depcomp b/build-aux/depcomp
2162index 30379e2..b39f98f 100755
2163--- a/build-aux/depcomp
2164+++ b/build-aux/depcomp
2165@@ -1,4 +1,4 @@
2166-#!/bin/sh
2167+#! /bin/sh
2168 # depcomp - compile a program generating dependencies as side-effects
2169
2170 scriptversion=2016-01-11.22; # UTC
2171diff --git a/build-aux/install-sh b/build-aux/install-sh
2172index 0360b79..59990a1 100755
2173--- a/build-aux/install-sh
2174+++ b/build-aux/install-sh
2175@@ -1,7 +1,7 @@
2176 #!/bin/sh
2177 # install - install a program, script, or datafile
2178
2179-scriptversion=2016-01-11.22; # UTC
2180+scriptversion=2014-09-12.12; # UTC
2181
2182 # This originates from X11R5 (mit/util/scripts/install.sh), which was
2183 # later released in X11R6 (xc/config/util/install.sh) with the
2184@@ -324,34 +324,41 @@ do
2185 # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
2186 ;;
2187 *)
2188+ # $RANDOM is not portable (e.g. dash); use it when possible to
2189+ # lower collision chance
2190 tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
2191- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
2192+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
2193
2194+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
2195+ # create the $tmpdir first (and fail if unsuccessful) to make sure
2196+ # that nobody tries to guess the $tmpdir name.
2197 if (umask $mkdir_umask &&
2198- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
2199+ $mkdirprog $mkdir_mode "$tmpdir" &&
2200+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
2201 then
2202 if test -z "$dir_arg" || {
2203 # Check for POSIX incompatibilities with -m.
2204 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
2205 # other-writable bit of parent directory when it shouldn't.
2206 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
2207- ls_ld_tmpdir=`ls -ld "$tmpdir"`
2208+ test_tmpdir="$tmpdir/a"
2209+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
2210 case $ls_ld_tmpdir in
2211 d????-?r-*) different_mode=700;;
2212 d????-?--*) different_mode=755;;
2213 *) false;;
2214 esac &&
2215- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
2216- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
2217+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
2218+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
2219 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
2220 }
2221 }
2222 then posix_mkdir=:
2223 fi
2224- rmdir "$tmpdir/d" "$tmpdir"
2225+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
2226 else
2227 # Remove any dirs left behind by ancient mkdir implementations.
2228- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
2229+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
2230 fi
2231 trap '' 0;;
2232 esac;;
2233@@ -496,6 +503,6 @@ done
2234 # eval: (add-hook 'write-file-hooks 'time-stamp)
2235 # time-stamp-start: "scriptversion="
2236 # time-stamp-format: "%:y-%02m-%02d.%02H"
2237-# time-stamp-time-zone: "UTC0"
2238+# time-stamp-time-zone: "UTC"
2239 # time-stamp-end: "; # UTC"
2240 # End:
2241diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
2242index 30be9c8..a736cf9 100644
2243--- a/build-aux/ltmain.sh
2244+++ b/build-aux/ltmain.sh
2245@@ -31,7 +31,7 @@
2246
2247 PROGRAM=libtool
2248 PACKAGE=libtool
2249-VERSION=2.4.6
2250+VERSION="2.4.6 Debian-2.4.6-2"
2251 package_revision=2.4.6
2252
2253
2254@@ -2068,12 +2068,12 @@ include the following information:
2255 compiler: $LTCC
2256 compiler flags: $LTCFLAGS
2257 linker: $LD (gnu? $with_gnu_ld)
2258- version: $progname (GNU libtool) 2.4.6
2259+ version: $progname $scriptversion Debian-2.4.6-2
2260 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
2261 autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
2262
2263 Report bugs to <bug-libtool@gnu.org>.
2264-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
2265+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
2266 General help using GNU software: <http://www.gnu.org/gethelp/>."
2267 exit 0
2268 }
2269@@ -7274,10 +7274,11 @@ func_mode_link ()
2270 # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
2271 # -specs=* GCC specs files
2272 # -stdlib=* select c++ std lib with clang
2273+ # -fsanitize=* Clang/GCC memory and address sanitizer
2274 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
2275 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
2276 -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
2277- -specs=*)
2278+ -specs=*|-fsanitize=*)
2279 func_quote_for_eval "$arg"
2280 arg=$func_quote_for_eval_result
2281 func_append compile_command " $arg"
2282@@ -7570,7 +7571,10 @@ func_mode_link ()
2283 case $pass in
2284 dlopen) libs=$dlfiles ;;
2285 dlpreopen) libs=$dlprefiles ;;
2286- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
2287+ link)
2288+ libs="$deplibs %DEPLIBS%"
2289+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
2290+ ;;
2291 esac
2292 fi
2293 if test lib,dlpreopen = "$linkmode,$pass"; then
2294@@ -7889,19 +7893,19 @@ func_mode_link ()
2295 # It is a libtool convenience library, so add in its objects.
2296 func_append convenience " $ladir/$objdir/$old_library"
2297 func_append old_convenience " $ladir/$objdir/$old_library"
2298+ tmp_libs=
2299+ for deplib in $dependency_libs; do
2300+ deplibs="$deplib $deplibs"
2301+ if $opt_preserve_dup_deps; then
2302+ case "$tmp_libs " in
2303+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
2304+ esac
2305+ fi
2306+ func_append tmp_libs " $deplib"
2307+ done
2308 elif test prog != "$linkmode" && test lib != "$linkmode"; then
2309 func_fatal_error "'$lib' is not a convenience library"
2310 fi
2311- tmp_libs=
2312- for deplib in $dependency_libs; do
2313- deplibs="$deplib $deplibs"
2314- if $opt_preserve_dup_deps; then
2315- case "$tmp_libs " in
2316- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
2317- esac
2318- fi
2319- func_append tmp_libs " $deplib"
2320- done
2321 continue
2322 fi # $pass = conv
2323
2324@@ -8825,6 +8829,9 @@ func_mode_link ()
2325 revision=$number_minor
2326 lt_irix_increment=no
2327 ;;
2328+ *)
2329+ func_fatal_configuration "$modename: unknown library version type '$version_type'"
2330+ ;;
2331 esac
2332 ;;
2333 no)
2334diff --git a/build-aux/missing b/build-aux/missing
2335index b7e571e..f62bbae 100755
2336--- a/build-aux/missing
2337+++ b/build-aux/missing
2338@@ -1,9 +1,9 @@
2339-#!/bin/sh
2340+#! /bin/sh
2341 # Common wrapper for a few potentially missing GNU programs.
2342
2343-scriptversion=2016-01-11.22; # UTC
2344+scriptversion=2013-10-28.13; # UTC
2345
2346-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
2347+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
2348 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
2349
2350 # This program is free software; you can redistribute it and/or modify
2351@@ -210,6 +210,6 @@ exit $st
2352 # eval: (add-hook 'write-file-hooks 'time-stamp)
2353 # time-stamp-start: "scriptversion="
2354 # time-stamp-format: "%:y-%02m-%02d.%02H"
2355-# time-stamp-time-zone: "UTC0"
2356+# time-stamp-time-zone: "UTC"
2357 # time-stamp-end: "; # UTC"
2358 # End:
2359diff --git a/clutter/Makefile.in b/clutter/Makefile.in
2360index 0827a9c..828e1ca 100644
2361--- a/clutter/Makefile.in
2362+++ b/clutter/Makefile.in
2363@@ -394,6 +394,7 @@ pdfdir = @pdfdir@
2364 prefix = @prefix@
2365 program_transform_name = @program_transform_name@
2366 psdir = @psdir@
2367+runstatedir = @runstatedir@
2368 sbindir = @sbindir@
2369 sharedstatedir = @sharedstatedir@
2370 srcdir = @srcdir@
2371diff --git a/clutter/aclocal.m4 b/clutter/aclocal.m4
2372index 56e90b0..3d31422 100644
2373--- a/clutter/aclocal.m4
2374+++ b/clutter/aclocal.m4
2375@@ -20,9 +20,224 @@ You have another version of autoconf. It may work, but is not guaranteed to.
2376 If you have problems, you may need to regenerate the build system entirely.
2377 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2378
2379-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2380-# serial 11 (pkg-config-0.29.1)
2381+# Configure paths for GLIB
2382+# Owen Taylor 1997-2001
2383+
2384+# Increment this whenever this file is changed.
2385+#serial 1
2386+
2387+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
2388+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
2389+dnl gthread, or gio is specified in MODULES, pass to pkg-config
2390+dnl
2391+AC_DEFUN([AM_PATH_GLIB_2_0],
2392+[dnl
2393+dnl Get the cflags and libraries from pkg-config
2394+dnl
2395+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
2396+ , enable_glibtest=yes)
2397+
2398+ pkg_config_args=glib-2.0
2399+ for module in . $4
2400+ do
2401+ case "$module" in
2402+ gmodule)
2403+ pkg_config_args="$pkg_config_args gmodule-2.0"
2404+ ;;
2405+ gmodule-no-export)
2406+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
2407+ ;;
2408+ gobject)
2409+ pkg_config_args="$pkg_config_args gobject-2.0"
2410+ ;;
2411+ gthread)
2412+ pkg_config_args="$pkg_config_args gthread-2.0"
2413+ ;;
2414+ gio*)
2415+ pkg_config_args="$pkg_config_args $module-2.0"
2416+ ;;
2417+ esac
2418+ done
2419+
2420+ PKG_PROG_PKG_CONFIG([0.16])
2421+
2422+ no_glib=""
2423+
2424+ if test "x$PKG_CONFIG" = x ; then
2425+ no_glib=yes
2426+ PKG_CONFIG=no
2427+ fi
2428+
2429+ min_glib_version=ifelse([$1], ,2.0.0,$1)
2430+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
2431+
2432+ if test x$PKG_CONFIG != xno ; then
2433+ ## don't try to run the test against uninstalled libtool libs
2434+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
2435+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
2436+ enable_glibtest=no
2437+ fi
2438+
2439+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
2440+ :
2441+ else
2442+ no_glib=yes
2443+ fi
2444+ fi
2445+
2446+ if test x"$no_glib" = x ; then
2447+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
2448+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
2449+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
2450+ GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
2451+
2452+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
2453+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
2454+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
2455+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
2456+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
2457+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
2458+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
2459+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
2460+ if test "x$enable_glibtest" = "xyes" ; then
2461+ ac_save_CFLAGS="$CFLAGS"
2462+ ac_save_LIBS="$LIBS"
2463+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
2464+ LIBS="$GLIB_LIBS $LIBS"
2465+dnl
2466+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
2467+dnl checks the results of pkg-config to some extent)
2468+dnl
2469+ rm -f conf.glibtest
2470+ AC_TRY_RUN([
2471+#include <glib.h>
2472+#include <stdio.h>
2473+#include <stdlib.h>
2474+
2475+int
2476+main (void)
2477+{
2478+ unsigned int major, minor, micro;
2479+
2480+ fclose (fopen ("conf.glibtest", "w"));
2481+
2482+ if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
2483+ printf("%s, bad version string\n", "$min_glib_version");
2484+ exit(1);
2485+ }
2486+
2487+ if ((glib_major_version != $glib_config_major_version) ||
2488+ (glib_minor_version != $glib_config_minor_version) ||
2489+ (glib_micro_version != $glib_config_micro_version))
2490+ {
2491+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
2492+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
2493+ glib_major_version, glib_minor_version, glib_micro_version);
2494+ printf ("*** was found! If pkg-config was correct, then it is best\n");
2495+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
2496+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
2497+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
2498+ printf("*** required on your system.\n");
2499+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
2500+ printf("*** to point to the correct configuration files\n");
2501+ }
2502+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
2503+ (glib_minor_version != GLIB_MINOR_VERSION) ||
2504+ (glib_micro_version != GLIB_MICRO_VERSION))
2505+ {
2506+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
2507+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
2508+ printf("*** library (version %d.%d.%d)\n",
2509+ glib_major_version, glib_minor_version, glib_micro_version);
2510+ }
2511+ else
2512+ {
2513+ if ((glib_major_version > major) ||
2514+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
2515+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
2516+ {
2517+ return 0;
2518+ }
2519+ else
2520+ {
2521+ printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
2522+ glib_major_version, glib_minor_version, glib_micro_version);
2523+ printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
2524+ major, minor, micro);
2525+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
2526+ printf("***\n");
2527+ printf("*** If you have already installed a sufficiently new version, this error\n");
2528+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
2529+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
2530+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
2531+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
2532+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
2533+ printf("*** so that the correct libraries are found at run-time))\n");
2534+ }
2535+ }
2536+ return 1;
2537+}
2538+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
2539+ CFLAGS="$ac_save_CFLAGS"
2540+ LIBS="$ac_save_LIBS"
2541+ fi
2542+ fi
2543+ if test "x$no_glib" = x ; then
2544+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
2545+ ifelse([$2], , :, [$2])
2546+ else
2547+ AC_MSG_RESULT(no)
2548+ if test "$PKG_CONFIG" = "no" ; then
2549+ echo "*** A new enough version of pkg-config was not found."
2550+ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
2551+ else
2552+ if test -f conf.glibtest ; then
2553+ :
2554+ else
2555+ echo "*** Could not run GLIB test program, checking why..."
2556+ ac_save_CFLAGS="$CFLAGS"
2557+ ac_save_LIBS="$LIBS"
2558+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
2559+ LIBS="$LIBS $GLIB_LIBS"
2560+ AC_TRY_LINK([
2561+#include <glib.h>
2562+#include <stdio.h>
2563+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
2564+ [ echo "*** The test program compiled, but did not run. This usually means"
2565+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
2566+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
2567+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
2568+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
2569+ echo "*** is required on your system"
2570+ echo "***"
2571+ echo "*** If you have an old version installed, it is best to remove it, although"
2572+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
2573+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
2574+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
2575+ CFLAGS="$ac_save_CFLAGS"
2576+ LIBS="$ac_save_LIBS"
2577+ fi
2578+ fi
2579+ GLIB_CFLAGS=""
2580+ GLIB_LIBS=""
2581+ GLIB_GENMARSHAL=""
2582+ GOBJECT_QUERY=""
2583+ GLIB_MKENUMS=""
2584+ GLIB_COMPILE_RESOURCES=""
2585+ ifelse([$3], , :, [$3])
2586+ fi
2587+ AC_SUBST(GLIB_CFLAGS)
2588+ AC_SUBST(GLIB_LIBS)
2589+ AC_SUBST(GLIB_GENMARSHAL)
2590+ AC_SUBST(GOBJECT_QUERY)
2591+ AC_SUBST(GLIB_MKENUMS)
2592+ AC_SUBST(GLIB_COMPILE_RESOURCES)
2593+ rm -f conf.glibtest
2594+])
2595
2596+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2597+dnl serial 11 (pkg-config-0.29.1)
2598+dnl
2599 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
2600 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
2601 dnl
2602@@ -296,289 +511,6 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
2603 AS_VAR_IF([$1], [""], [$5], [$4])dnl
2604 ])dnl PKG_CHECK_VAR
2605
2606-dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
2607-dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
2608-dnl [DESCRIPTION], [DEFAULT])
2609-dnl ------------------------------------------
2610-dnl
2611-dnl Prepare a "--with-" configure option using the lowercase
2612-dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
2613-dnl PKG_CHECK_MODULES in a single macro.
2614-AC_DEFUN([PKG_WITH_MODULES],
2615-[
2616-m4_pushdef([with_arg], m4_tolower([$1]))
2617-
2618-m4_pushdef([description],
2619- [m4_default([$5], [build with ]with_arg[ support])])
2620-
2621-m4_pushdef([def_arg], [m4_default([$6], [auto])])
2622-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
2623-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
2624-
2625-m4_case(def_arg,
2626- [yes],[m4_pushdef([with_without], [--without-]with_arg)],
2627- [m4_pushdef([with_without],[--with-]with_arg)])
2628-
2629-AC_ARG_WITH(with_arg,
2630- AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
2631- [AS_TR_SH([with_]with_arg)=def_arg])
2632-
2633-AS_CASE([$AS_TR_SH([with_]with_arg)],
2634- [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
2635- [auto],[PKG_CHECK_MODULES([$1],[$2],
2636- [m4_n([def_action_if_found]) $3],
2637- [m4_n([def_action_if_not_found]) $4])])
2638-
2639-m4_popdef([with_arg])
2640-m4_popdef([description])
2641-m4_popdef([def_arg])
2642-
2643-])dnl PKG_WITH_MODULES
2644-
2645-dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
2646-dnl [DESCRIPTION], [DEFAULT])
2647-dnl -----------------------------------------------
2648-dnl
2649-dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
2650-dnl check._[VARIABLE-PREFIX] is exported as make variable.
2651-AC_DEFUN([PKG_HAVE_WITH_MODULES],
2652-[
2653-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
2654-
2655-AM_CONDITIONAL([HAVE_][$1],
2656- [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
2657-])dnl PKG_HAVE_WITH_MODULES
2658-
2659-dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
2660-dnl [DESCRIPTION], [DEFAULT])
2661-dnl ------------------------------------------------------
2662-dnl
2663-dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
2664-dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
2665-dnl and preprocessor variable.
2666-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
2667-[
2668-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
2669-
2670-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
2671- [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
2672-])dnl PKG_HAVE_DEFINE_WITH_MODULES
2673-
2674-# Configure paths for GLIB
2675-# Owen Taylor 1997-2001
2676-
2677-# Increment this whenever this file is changed.
2678-#serial 1
2679-
2680-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
2681-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
2682-dnl gthread, or gio is specified in MODULES, pass to pkg-config
2683-dnl
2684-AC_DEFUN([AM_PATH_GLIB_2_0],
2685-[dnl
2686-dnl Get the cflags and libraries from pkg-config
2687-dnl
2688-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
2689- , enable_glibtest=yes)
2690-
2691- pkg_config_args=glib-2.0
2692- for module in . $4
2693- do
2694- case "$module" in
2695- gmodule)
2696- pkg_config_args="$pkg_config_args gmodule-2.0"
2697- ;;
2698- gmodule-no-export)
2699- pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
2700- ;;
2701- gobject)
2702- pkg_config_args="$pkg_config_args gobject-2.0"
2703- ;;
2704- gthread)
2705- pkg_config_args="$pkg_config_args gthread-2.0"
2706- ;;
2707- gio*)
2708- pkg_config_args="$pkg_config_args $module-2.0"
2709- ;;
2710- esac
2711- done
2712-
2713- PKG_PROG_PKG_CONFIG([0.16])
2714-
2715- no_glib=""
2716-
2717- if test "x$PKG_CONFIG" = x ; then
2718- no_glib=yes
2719- PKG_CONFIG=no
2720- fi
2721-
2722- min_glib_version=ifelse([$1], ,2.0.0,$1)
2723- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
2724-
2725- if test x$PKG_CONFIG != xno ; then
2726- ## don't try to run the test against uninstalled libtool libs
2727- if $PKG_CONFIG --uninstalled $pkg_config_args; then
2728- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
2729- enable_glibtest=no
2730- fi
2731-
2732- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
2733- :
2734- else
2735- no_glib=yes
2736- fi
2737- fi
2738-
2739- if test x"$no_glib" = x ; then
2740- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
2741- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
2742- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
2743- GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
2744-
2745- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
2746- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
2747- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
2748- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
2749- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
2750- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
2751- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
2752- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
2753- if test "x$enable_glibtest" = "xyes" ; then
2754- ac_save_CFLAGS="$CFLAGS"
2755- ac_save_LIBS="$LIBS"
2756- CFLAGS="$CFLAGS $GLIB_CFLAGS"
2757- LIBS="$GLIB_LIBS $LIBS"
2758-dnl
2759-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
2760-dnl checks the results of pkg-config to some extent)
2761-dnl
2762- rm -f conf.glibtest
2763- AC_TRY_RUN([
2764-#include <glib.h>
2765-#include <stdio.h>
2766-#include <stdlib.h>
2767-
2768-int
2769-main (void)
2770-{
2771- unsigned int major, minor, micro;
2772-
2773- fclose (fopen ("conf.glibtest", "w"));
2774-
2775- if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
2776- printf("%s, bad version string\n", "$min_glib_version");
2777- exit(1);
2778- }
2779-
2780- if ((glib_major_version != $glib_config_major_version) ||
2781- (glib_minor_version != $glib_config_minor_version) ||
2782- (glib_micro_version != $glib_config_micro_version))
2783- {
2784- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
2785- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
2786- glib_major_version, glib_minor_version, glib_micro_version);
2787- printf ("*** was found! If pkg-config was correct, then it is best\n");
2788- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
2789- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
2790- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
2791- printf("*** required on your system.\n");
2792- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
2793- printf("*** to point to the correct configuration files\n");
2794- }
2795- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
2796- (glib_minor_version != GLIB_MINOR_VERSION) ||
2797- (glib_micro_version != GLIB_MICRO_VERSION))
2798- {
2799- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
2800- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
2801- printf("*** library (version %d.%d.%d)\n",
2802- glib_major_version, glib_minor_version, glib_micro_version);
2803- }
2804- else
2805- {
2806- if ((glib_major_version > major) ||
2807- ((glib_major_version == major) && (glib_minor_version > minor)) ||
2808- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
2809- {
2810- return 0;
2811- }
2812- else
2813- {
2814- printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
2815- glib_major_version, glib_minor_version, glib_micro_version);
2816- printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
2817- major, minor, micro);
2818- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
2819- printf("***\n");
2820- printf("*** If you have already installed a sufficiently new version, this error\n");
2821- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
2822- printf("*** being found. The easiest way to fix this is to remove the old version\n");
2823- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
2824- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
2825- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
2826- printf("*** so that the correct libraries are found at run-time))\n");
2827- }
2828- }
2829- return 1;
2830-}
2831-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
2832- CFLAGS="$ac_save_CFLAGS"
2833- LIBS="$ac_save_LIBS"
2834- fi
2835- fi
2836- if test "x$no_glib" = x ; then
2837- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
2838- ifelse([$2], , :, [$2])
2839- else
2840- AC_MSG_RESULT(no)
2841- if test "$PKG_CONFIG" = "no" ; then
2842- echo "*** A new enough version of pkg-config was not found."
2843- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
2844- else
2845- if test -f conf.glibtest ; then
2846- :
2847- else
2848- echo "*** Could not run GLIB test program, checking why..."
2849- ac_save_CFLAGS="$CFLAGS"
2850- ac_save_LIBS="$LIBS"
2851- CFLAGS="$CFLAGS $GLIB_CFLAGS"
2852- LIBS="$LIBS $GLIB_LIBS"
2853- AC_TRY_LINK([
2854-#include <glib.h>
2855-#include <stdio.h>
2856-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
2857- [ echo "*** The test program compiled, but did not run. This usually means"
2858- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
2859- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
2860- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
2861- echo "*** to the installed location Also, make sure you have run ldconfig if that"
2862- echo "*** is required on your system"
2863- echo "***"
2864- echo "*** If you have an old version installed, it is best to remove it, although"
2865- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
2866- [ echo "*** The test program failed to compile or link. See the file config.log for the"
2867- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
2868- CFLAGS="$ac_save_CFLAGS"
2869- LIBS="$ac_save_LIBS"
2870- fi
2871- fi
2872- GLIB_CFLAGS=""
2873- GLIB_LIBS=""
2874- GLIB_GENMARSHAL=""
2875- GOBJECT_QUERY=""
2876- GLIB_MKENUMS=""
2877- GLIB_COMPILE_RESOURCES=""
2878- ifelse([$3], , :, [$3])
2879- fi
2880- AC_SUBST(GLIB_CFLAGS)
2881- AC_SUBST(GLIB_LIBS)
2882- AC_SUBST(GLIB_GENMARSHAL)
2883- AC_SUBST(GOBJECT_QUERY)
2884- AC_SUBST(GLIB_MKENUMS)
2885- AC_SUBST(GLIB_COMPILE_RESOURCES)
2886- rm -f conf.glibtest
2887-])
2888-
2889 # Copyright (C) 2002-2017 Free Software Foundation, Inc.
2890 #
2891 # This file is free software; the Free Software Foundation
2892diff --git a/clutter/build/Makefile.in b/clutter/build/Makefile.in
2893index d7be1ec..2539c63 100644
2894--- a/clutter/build/Makefile.in
2895+++ b/clutter/build/Makefile.in
2896@@ -372,6 +372,7 @@ pdfdir = @pdfdir@
2897 prefix = @prefix@
2898 program_transform_name = @program_transform_name@
2899 psdir = @psdir@
2900+runstatedir = @runstatedir@
2901 sbindir = @sbindir@
2902 sharedstatedir = @sharedstatedir@
2903 srcdir = @srcdir@
2904diff --git a/clutter/build/autotools/Makefile.in b/clutter/build/autotools/Makefile.in
2905index 098b030..dd6aaba 100644
2906--- a/clutter/build/autotools/Makefile.in
2907+++ b/clutter/build/autotools/Makefile.in
2908@@ -311,6 +311,7 @@ pdfdir = @pdfdir@
2909 prefix = @prefix@
2910 program_transform_name = @program_transform_name@
2911 psdir = @psdir@
2912+runstatedir = @runstatedir@
2913 sbindir = @sbindir@
2914 sharedstatedir = @sharedstatedir@
2915 srcdir = @srcdir@
2916diff --git a/clutter/build/autotools/libtool.m4 b/clutter/build/autotools/libtool.m4
2917index a644432..ee80844 100644
2918--- a/clutter/build/autotools/libtool.m4
2919+++ b/clutter/build/autotools/libtool.m4
2920@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
2921 cat <<_LT_EOF >> "$cfgfile"
2922 #! $SHELL
2923 # Generated automatically by $as_me ($PACKAGE) $VERSION
2924-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
2925 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
2926
2927 # Provide generalized library-building support services.
2928@@ -2867,9 +2866,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2929 # before this can be enabled.
2930 hardcode_into_libs=yes
2931
2932- # Add ABI-specific directories to the system library path.
2933- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
2934-
2935 # Ideally, we could use ldconfig to report *all* directores which are
2936 # searched for libraries, however this is still not possible. Aside from not
2937 # being certain /sbin/ldconfig is available, command
2938@@ -2878,7 +2874,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2939 # appending ld.so.conf contents (and includes) to the search path.
2940 if test -f /etc/ld.so.conf; then
2941 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
2942- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
2943+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
2944 fi
2945
2946 # We used to test for /lib/ld.so.1 and disable shared libraries on
2947@@ -2890,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2948 dynamic_linker='GNU/Linux ld.so'
2949 ;;
2950
2951+netbsdelf*-gnu)
2952+ version_type=linux
2953+ need_lib_prefix=no
2954+ need_version=no
2955+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2956+ soname_spec='${libname}${release}${shared_ext}$major'
2957+ shlibpath_var=LD_LIBRARY_PATH
2958+ shlibpath_overrides_runpath=no
2959+ hardcode_into_libs=yes
2960+ dynamic_linker='NetBSD ld.elf_so'
2961+ ;;
2962+
2963 netbsd*)
2964 version_type=sunos
2965 need_lib_prefix=no
2966@@ -3549,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2967 lt_cv_deplibs_check_method=pass_all
2968 ;;
2969
2970-netbsd*)
2971+netbsd* | netbsdelf*-gnu)
2972 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
2973 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
2974 else
2975@@ -4427,7 +4435,7 @@ m4_if([$1], [CXX], [
2976 ;;
2977 esac
2978 ;;
2979- netbsd*)
2980+ netbsd* | netbsdelf*-gnu)
2981 ;;
2982 *qnx* | *nto*)
2983 # QNX uses GNU C++, but need to define -shared option too, otherwise
2984@@ -4939,6 +4947,9 @@ m4_if([$1], [CXX], [
2985 ;;
2986 esac
2987 ;;
2988+ linux* | k*bsd*-gnu | gnu*)
2989+ _LT_TAGVAR(link_all_deplibs, $1)=no
2990+ ;;
2991 *)
2992 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
2993 ;;
2994@@ -5001,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
2995 openbsd* | bitrig*)
2996 with_gnu_ld=no
2997 ;;
2998+ linux* | k*bsd*-gnu | gnu*)
2999+ _LT_TAGVAR(link_all_deplibs, $1)=no
3000+ ;;
3001 esac
3002
3003 _LT_TAGVAR(ld_shlibs, $1)=yes
3004@@ -5255,7 +5269,7 @@ _LT_EOF
3005 fi
3006 ;;
3007
3008- netbsd*)
3009+ netbsd* | netbsdelf*-gnu)
3010 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
3011 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
3012 wlarc=
3013@@ -5776,6 +5790,7 @@ _LT_EOF
3014 if test yes = "$lt_cv_irix_exported_symbol"; then
3015 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
3016 fi
3017+ _LT_TAGVAR(link_all_deplibs, $1)=no
3018 else
3019 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
3020 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
3021@@ -5797,7 +5812,7 @@ _LT_EOF
3022 esac
3023 ;;
3024
3025- netbsd*)
3026+ netbsd* | netbsdelf*-gnu)
3027 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
3028 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
3029 else
3030diff --git a/clutter/build/compile b/clutter/build/compile
3031index de0005d..a85b723 100755
3032--- a/clutter/build/compile
3033+++ b/clutter/build/compile
3034@@ -1,9 +1,9 @@
3035-#!/bin/sh
3036+#! /bin/sh
3037 # Wrapper for compilers which do not understand '-c -o'.
3038
3039-scriptversion=2016-01-11.22; # UTC
3040+scriptversion=2012-10-14.11; # UTC
3041
3042-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
3043+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
3044 # Written by Tom Tromey <tromey@cygnus.com>.
3045 #
3046 # This program is free software; you can redistribute it and/or modify
3047@@ -255,8 +255,7 @@ EOF
3048 echo "compile $scriptversion"
3049 exit $?
3050 ;;
3051- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
3052- icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
3053+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
3054 func_cl_wrapper "$@" # Doesn't return...
3055 ;;
3056 esac
3057@@ -343,6 +342,6 @@ exit $ret
3058 # eval: (add-hook 'write-file-hooks 'time-stamp)
3059 # time-stamp-start: "scriptversion="
3060 # time-stamp-format: "%:y-%02m-%02d.%02H"
3061-# time-stamp-time-zone: "UTC0"
3062+# time-stamp-time-zone: "UTC"
3063 # time-stamp-end: "; # UTC"
3064 # End:
3065diff --git a/clutter/build/config.guess b/clutter/build/config.guess
3066index 717b228..f50dcdb 100755
3067--- a/clutter/build/config.guess
3068+++ b/clutter/build/config.guess
3069@@ -1,8 +1,8 @@
3070-#!/bin/sh
3071+#! /bin/sh
3072 # Attempt to guess a canonical system name.
3073-# Copyright 1992-2017 Free Software Foundation, Inc.
3074+# Copyright 1992-2018 Free Software Foundation, Inc.
3075
3076-timestamp='2017-08-08'
3077+timestamp='2018-02-24'
3078
3079 # This file is free software; you can redistribute it and/or modify it
3080 # under the terms of the GNU General Public License as published by
3081@@ -15,7 +15,7 @@ timestamp='2017-08-08'
3082 # General Public License for more details.
3083 #
3084 # You should have received a copy of the GNU General Public License
3085-# along with this program; if not, see <http://www.gnu.org/licenses/>.
3086+# along with this program; if not, see <https://www.gnu.org/licenses/>.
3087 #
3088 # As a special exception to the GNU General Public License, if you
3089 # distribute this file as part of a program that contains a
3090@@ -27,7 +27,7 @@ timestamp='2017-08-08'
3091 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
3092 #
3093 # You can get the latest version of this script from:
3094-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
3095+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
3096 #
3097 # Please send patches to <config-patches@gnu.org>.
3098
3099@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
3100
3101 Output the configuration name of the system \`$me' is run on.
3102
3103-Operation modes:
3104+Options:
3105 -h, --help print this help, then exit
3106 -t, --time-stamp print date of last modification, then exit
3107 -v, --version print version number, then exit
3108@@ -50,7 +50,7 @@ version="\
3109 GNU config.guess ($timestamp)
3110
3111 Originally written by Per Bothner.
3112-Copyright 1992-2017 Free Software Foundation, Inc.
3113+Copyright 1992-2018 Free Software Foundation, Inc.
3114
3115 This is free software; see the source for copying conditions. There is NO
3116 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
3117@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
3118 dummy=$tmp/dummy ;
3119 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
3120 case $CC_FOR_BUILD,$HOST_CC,$CC in
3121- ,,) echo "int x;" > $dummy.c ;
3122+ ,,) echo "int x;" > "$dummy.c" ;
3123 for c in cc gcc c89 c99 ; do
3124- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
3125+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
3126 CC_FOR_BUILD="$c"; break ;
3127 fi ;
3128 done ;
3129@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
3130 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
3131 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
3132
3133-case "${UNAME_SYSTEM}" in
3134+case "$UNAME_SYSTEM" in
3135 Linux|GNU|GNU/*)
3136 # If the system lacks a compiler, then just pick glibc.
3137 # We could probably try harder.
3138 LIBC=gnu
3139
3140- eval $set_cc_for_build
3141- cat <<-EOF > $dummy.c
3142+ eval "$set_cc_for_build"
3143+ cat <<-EOF > "$dummy.c"
3144 #include <features.h>
3145 #if defined(__UCLIBC__)
3146 LIBC=uclibc
3147@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
3148 LIBC=gnu
3149 #endif
3150 EOF
3151- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
3152+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
3153+
3154+ # If ldd exists, use it to detect musl libc.
3155+ if command -v ldd >/dev/null && \
3156+ ldd --version 2>&1 | grep -q ^musl
3157+ then
3158+ LIBC=musl
3159+ fi
3160 ;;
3161 esac
3162
3163 # Note: order is significant - the case branches are not exclusive.
3164
3165-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3166+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
3167 *:NetBSD:*:*)
3168 # NetBSD (nbsd) targets should (where applicable) match one or
3169 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
3170@@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3171 # portion of the name. We always set it to "unknown".
3172 sysctl="sysctl -n hw.machine_arch"
3173 UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
3174- /sbin/$sysctl 2>/dev/null || \
3175- /usr/sbin/$sysctl 2>/dev/null || \
3176+ "/sbin/$sysctl" 2>/dev/null || \
3177+ "/usr/sbin/$sysctl" 2>/dev/null || \
3178 echo unknown)`
3179- case "${UNAME_MACHINE_ARCH}" in
3180+ case "$UNAME_MACHINE_ARCH" in
3181 armeb) machine=armeb-unknown ;;
3182 arm*) machine=arm-unknown ;;
3183 sh3el) machine=shl-unknown ;;
3184 sh3eb) machine=sh-unknown ;;
3185 sh5el) machine=sh5le-unknown ;;
3186 earmv*)
3187- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
3188- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
3189- machine=${arch}${endian}-unknown
3190+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
3191+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
3192+ machine="${arch}${endian}"-unknown
3193 ;;
3194- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
3195+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
3196 esac
3197 # The Operating System including object format, if it has switched
3198 # to ELF recently (or will in the future) and ABI.
3199- case "${UNAME_MACHINE_ARCH}" in
3200+ case "$UNAME_MACHINE_ARCH" in
3201 earm*)
3202 os=netbsdelf
3203 ;;
3204 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
3205- eval $set_cc_for_build
3206+ eval "$set_cc_for_build"
3207 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
3208 | grep -q __ELF__
3209 then
3210@@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3211 ;;
3212 esac
3213 # Determine ABI tags.
3214- case "${UNAME_MACHINE_ARCH}" in
3215+ case "$UNAME_MACHINE_ARCH" in
3216 earm*)
3217 expr='s/^earmv[0-9]/-eabi/;s/eb$//'
3218- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
3219+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
3220 ;;
3221 esac
3222 # The OS release
3223@@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3224 # thus, need a distinct triplet. However, they do not need
3225 # kernel version information, so it can be replaced with a
3226 # suitable tag, in the style of linux-gnu.
3227- case "${UNAME_VERSION}" in
3228+ case "$UNAME_VERSION" in
3229 Debian*)
3230 release='-gnu'
3231 ;;
3232 *)
3233- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
3234+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
3235 ;;
3236 esac
3237 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
3238 # contains redundant information, the shorter form:
3239 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
3240- echo "${machine}-${os}${release}${abi}"
3241+ echo "$machine-${os}${release}${abi}"
3242 exit ;;
3243 *:Bitrig:*:*)
3244 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
3245- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
3246+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
3247 exit ;;
3248 *:OpenBSD:*:*)
3249 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
3250- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
3251+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
3252 exit ;;
3253 *:LibertyBSD:*:*)
3254 UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
3255- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
3256+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
3257+ exit ;;
3258+ *:MidnightBSD:*:*)
3259+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
3260 exit ;;
3261 *:ekkoBSD:*:*)
3262- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
3263+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
3264 exit ;;
3265 *:SolidBSD:*:*)
3266- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
3267+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
3268 exit ;;
3269 macppc:MirBSD:*:*)
3270- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
3271+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
3272 exit ;;
3273 *:MirBSD:*:*)
3274- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
3275+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
3276 exit ;;
3277 *:Sortix:*:*)
3278- echo ${UNAME_MACHINE}-unknown-sortix
3279+ echo "$UNAME_MACHINE"-unknown-sortix
3280 exit ;;
3281 *:Redox:*:*)
3282- echo ${UNAME_MACHINE}-unknown-redox
3283+ echo "$UNAME_MACHINE"-unknown-redox
3284 exit ;;
3285+ mips:OSF1:*.*)
3286+ echo mips-dec-osf1
3287+ exit ;;
3288 alpha:OSF1:*:*)
3289 case $UNAME_RELEASE in
3290 *4.0)
3291@@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3292 # A Tn.n version is a released field test version.
3293 # A Xn.n version is an unreleased experimental baselevel.
3294 # 1.2 uses "1.2" for uname -r.
3295- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
3296+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
3297 # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
3298 exitcode=$?
3299 trap '' 0
3300 exit $exitcode ;;
3301- Alpha\ *:Windows_NT*:*)
3302- # How do we know it's Interix rather than the generic POSIX subsystem?
3303- # Should we change UNAME_MACHINE based on the output of uname instead
3304- # of the specific Alpha model?
3305- echo alpha-pc-interix
3306- exit ;;
3307- 21064:Windows_NT:50:3)
3308- echo alpha-dec-winnt3.5
3309- exit ;;
3310 Amiga*:UNIX_System_V:4.0:*)
3311 echo m68k-unknown-sysv4
3312 exit ;;
3313 *:[Aa]miga[Oo][Ss]:*:*)
3314- echo ${UNAME_MACHINE}-unknown-amigaos
3315+ echo "$UNAME_MACHINE"-unknown-amigaos
3316 exit ;;
3317 *:[Mm]orph[Oo][Ss]:*:*)
3318- echo ${UNAME_MACHINE}-unknown-morphos
3319+ echo "$UNAME_MACHINE"-unknown-morphos
3320 exit ;;
3321 *:OS/390:*:*)
3322 echo i370-ibm-openedition
3323@@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3324 echo powerpc-ibm-os400
3325 exit ;;
3326 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
3327- echo arm-acorn-riscix${UNAME_RELEASE}
3328+ echo arm-acorn-riscix"$UNAME_RELEASE"
3329 exit ;;
3330 arm*:riscos:*:*|arm*:RISCOS:*:*)
3331 echo arm-unknown-riscos
3332@@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3333 sparc) echo sparc-icl-nx7; exit ;;
3334 esac ;;
3335 s390x:SunOS:*:*)
3336- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3337+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
3338 exit ;;
3339 sun4H:SunOS:5.*:*)
3340- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3341+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
3342 exit ;;
3343 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
3344- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3345+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
3346 exit ;;
3347 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
3348- echo i386-pc-auroraux${UNAME_RELEASE}
3349+ echo i386-pc-auroraux"$UNAME_RELEASE"
3350 exit ;;
3351 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
3352- eval $set_cc_for_build
3353+ eval "$set_cc_for_build"
3354 SUN_ARCH=i386
3355 # If there is a compiler, see if it is configured for 64-bit objects.
3356 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
3357@@ -398,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3358 SUN_ARCH=x86_64
3359 fi
3360 fi
3361- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3362+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
3363 exit ;;
3364 sun4*:SunOS:6*:*)
3365 # According to config.sub, this is the proper way to canonicalize
3366 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
3367 # it's likely to be more like Solaris than SunOS4.
3368- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3369+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
3370 exit ;;
3371 sun4*:SunOS:*:*)
3372 case "`/usr/bin/arch -k`" in
3373@@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3374 ;;
3375 esac
3376 # Japanese Language versions have a version number like `4.1.3-JL'.
3377- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
3378+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
3379 exit ;;
3380 sun3*:SunOS:*:*)
3381- echo m68k-sun-sunos${UNAME_RELEASE}
3382+ echo m68k-sun-sunos"$UNAME_RELEASE"
3383 exit ;;
3384 sun*:*:4.2BSD:*)
3385 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
3386- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
3387+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
3388 case "`/bin/arch`" in
3389 sun3)
3390- echo m68k-sun-sunos${UNAME_RELEASE}
3391+ echo m68k-sun-sunos"$UNAME_RELEASE"
3392 ;;
3393 sun4)
3394- echo sparc-sun-sunos${UNAME_RELEASE}
3395+ echo sparc-sun-sunos"$UNAME_RELEASE"
3396 ;;
3397 esac
3398 exit ;;
3399 aushp:SunOS:*:*)
3400- echo sparc-auspex-sunos${UNAME_RELEASE}
3401+ echo sparc-auspex-sunos"$UNAME_RELEASE"
3402 exit ;;
3403 # The situation for MiNT is a little confusing. The machine name
3404 # can be virtually everything (everything which is not
3405@@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3406 # MiNT. But MiNT is downward compatible to TOS, so this should
3407 # be no problem.
3408 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
3409- echo m68k-atari-mint${UNAME_RELEASE}
3410+ echo m68k-atari-mint"$UNAME_RELEASE"
3411 exit ;;
3412 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
3413- echo m68k-atari-mint${UNAME_RELEASE}
3414+ echo m68k-atari-mint"$UNAME_RELEASE"
3415 exit ;;
3416 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
3417- echo m68k-atari-mint${UNAME_RELEASE}
3418+ echo m68k-atari-mint"$UNAME_RELEASE"
3419 exit ;;
3420 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
3421- echo m68k-milan-mint${UNAME_RELEASE}
3422+ echo m68k-milan-mint"$UNAME_RELEASE"
3423 exit ;;
3424 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
3425- echo m68k-hades-mint${UNAME_RELEASE}
3426+ echo m68k-hades-mint"$UNAME_RELEASE"
3427 exit ;;
3428 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
3429- echo m68k-unknown-mint${UNAME_RELEASE}
3430+ echo m68k-unknown-mint"$UNAME_RELEASE"
3431 exit ;;
3432 m68k:machten:*:*)
3433- echo m68k-apple-machten${UNAME_RELEASE}
3434+ echo m68k-apple-machten"$UNAME_RELEASE"
3435 exit ;;
3436 powerpc:machten:*:*)
3437- echo powerpc-apple-machten${UNAME_RELEASE}
3438+ echo powerpc-apple-machten"$UNAME_RELEASE"
3439 exit ;;
3440 RISC*:Mach:*:*)
3441 echo mips-dec-mach_bsd4.3
3442 exit ;;
3443 RISC*:ULTRIX:*:*)
3444- echo mips-dec-ultrix${UNAME_RELEASE}
3445+ echo mips-dec-ultrix"$UNAME_RELEASE"
3446 exit ;;
3447 VAX*:ULTRIX*:*:*)
3448- echo vax-dec-ultrix${UNAME_RELEASE}
3449+ echo vax-dec-ultrix"$UNAME_RELEASE"
3450 exit ;;
3451 2020:CLIX:*:* | 2430:CLIX:*:*)
3452- echo clipper-intergraph-clix${UNAME_RELEASE}
3453+ echo clipper-intergraph-clix"$UNAME_RELEASE"
3454 exit ;;
3455 mips:*:*:UMIPS | mips:*:*:RISCos)
3456- eval $set_cc_for_build
3457- sed 's/^ //' << EOF >$dummy.c
3458+ eval "$set_cc_for_build"
3459+ sed 's/^ //' << EOF > "$dummy.c"
3460 #ifdef __cplusplus
3461 #include <stdio.h> /* for printf() prototype */
3462 int main (int argc, char *argv[]) {
3463@@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
3464 #endif
3465 #if defined (host_mips) && defined (MIPSEB)
3466 #if defined (SYSTYPE_SYSV)
3467- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
3468+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
3469 #endif
3470 #if defined (SYSTYPE_SVR4)
3471- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
3472+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
3473 #endif
3474 #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
3475- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
3476+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
3477 #endif
3478 #endif
3479 exit (-1);
3480 }
3481 EOF
3482- $CC_FOR_BUILD -o $dummy $dummy.c &&
3483- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
3484- SYSTEM_NAME=`$dummy $dummyarg` &&
3485+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
3486+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
3487+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
3488 { echo "$SYSTEM_NAME"; exit; }
3489- echo mips-mips-riscos${UNAME_RELEASE}
3490+ echo mips-mips-riscos"$UNAME_RELEASE"
3491 exit ;;
3492 Motorola:PowerMAX_OS:*:*)
3493 echo powerpc-motorola-powermax
3494@@ -530,17 +534,17 @@ EOF
3495 AViiON:dgux:*:*)
3496 # DG/UX returns AViiON for all architectures
3497 UNAME_PROCESSOR=`/usr/bin/uname -p`
3498- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
3499+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
3500 then
3501- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
3502- [ ${TARGET_BINARY_INTERFACE}x = x ]
3503+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
3504+ [ "$TARGET_BINARY_INTERFACE"x = x ]
3505 then
3506- echo m88k-dg-dgux${UNAME_RELEASE}
3507+ echo m88k-dg-dgux"$UNAME_RELEASE"
3508 else
3509- echo m88k-dg-dguxbcs${UNAME_RELEASE}
3510+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
3511 fi
3512 else
3513- echo i586-dg-dgux${UNAME_RELEASE}
3514+ echo i586-dg-dgux"$UNAME_RELEASE"
3515 fi
3516 exit ;;
3517 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
3518@@ -557,7 +561,7 @@ EOF
3519 echo m68k-tektronix-bsd
3520 exit ;;
3521 *:IRIX*:*:*)
3522- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
3523+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
3524 exit ;;
3525 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
3526 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
3527@@ -569,14 +573,14 @@ EOF
3528 if [ -x /usr/bin/oslevel ] ; then
3529 IBM_REV=`/usr/bin/oslevel`
3530 else
3531- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
3532+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
3533 fi
3534- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
3535+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
3536 exit ;;
3537 *:AIX:2:3)
3538 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
3539- eval $set_cc_for_build
3540- sed 's/^ //' << EOF >$dummy.c
3541+ eval "$set_cc_for_build"
3542+ sed 's/^ //' << EOF > "$dummy.c"
3543 #include <sys/systemcfg.h>
3544
3545 main()
3546@@ -587,7 +591,7 @@ EOF
3547 exit(0);
3548 }
3549 EOF
3550- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
3551+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
3552 then
3553 echo "$SYSTEM_NAME"
3554 else
3555@@ -601,7 +605,7 @@ EOF
3556 exit ;;
3557 *:AIX:*:[4567])
3558 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
3559- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
3560+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
3561 IBM_ARCH=rs6000
3562 else
3563 IBM_ARCH=powerpc
3564@@ -610,18 +614,18 @@ EOF
3565 IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
3566 awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
3567 else
3568- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
3569+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
3570 fi
3571- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
3572+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
3573 exit ;;
3574 *:AIX:*:*)
3575 echo rs6000-ibm-aix
3576 exit ;;
3577- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
3578+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
3579 echo romp-ibm-bsd4.4
3580 exit ;;
3581 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
3582- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
3583+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
3584 exit ;; # report: romp-ibm BSD 4.3
3585 *:BOSX:*:*)
3586 echo rs6000-bull-bosx
3587@@ -636,28 +640,28 @@ EOF
3588 echo m68k-hp-bsd4.4
3589 exit ;;
3590 9000/[34678]??:HP-UX:*:*)
3591- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
3592- case "${UNAME_MACHINE}" in
3593- 9000/31? ) HP_ARCH=m68000 ;;
3594- 9000/[34]?? ) HP_ARCH=m68k ;;
3595+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
3596+ case "$UNAME_MACHINE" in
3597+ 9000/31?) HP_ARCH=m68000 ;;
3598+ 9000/[34]??) HP_ARCH=m68k ;;
3599 9000/[678][0-9][0-9])
3600 if [ -x /usr/bin/getconf ]; then
3601 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
3602 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
3603- case "${sc_cpu_version}" in
3604+ case "$sc_cpu_version" in
3605 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
3606 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
3607 532) # CPU_PA_RISC2_0
3608- case "${sc_kernel_bits}" in
3609+ case "$sc_kernel_bits" in
3610 32) HP_ARCH=hppa2.0n ;;
3611 64) HP_ARCH=hppa2.0w ;;
3612 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
3613 esac ;;
3614 esac
3615 fi
3616- if [ "${HP_ARCH}" = "" ]; then
3617- eval $set_cc_for_build
3618- sed 's/^ //' << EOF >$dummy.c
3619+ if [ "$HP_ARCH" = "" ]; then
3620+ eval "$set_cc_for_build"
3621+ sed 's/^ //' << EOF > "$dummy.c"
3622
3623 #define _HPUX_SOURCE
3624 #include <stdlib.h>
3625@@ -690,13 +694,13 @@ EOF
3626 exit (0);
3627 }
3628 EOF
3629- (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
3630+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
3631 test -z "$HP_ARCH" && HP_ARCH=hppa
3632 fi ;;
3633 esac
3634- if [ ${HP_ARCH} = hppa2.0w ]
3635+ if [ "$HP_ARCH" = hppa2.0w ]
3636 then
3637- eval $set_cc_for_build
3638+ eval "$set_cc_for_build"
3639
3640 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
3641 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
3642@@ -715,15 +719,15 @@ EOF
3643 HP_ARCH=hppa64
3644 fi
3645 fi
3646- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
3647+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
3648 exit ;;
3649 ia64:HP-UX:*:*)
3650- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
3651- echo ia64-hp-hpux${HPUX_REV}
3652+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
3653+ echo ia64-hp-hpux"$HPUX_REV"
3654 exit ;;
3655 3050*:HI-UX:*:*)
3656- eval $set_cc_for_build
3657- sed 's/^ //' << EOF >$dummy.c
3658+ eval "$set_cc_for_build"
3659+ sed 's/^ //' << EOF > "$dummy.c"
3660 #include <unistd.h>
3661 int
3662 main ()
3663@@ -748,11 +752,11 @@ EOF
3664 exit (0);
3665 }
3666 EOF
3667- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
3668+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
3669 { echo "$SYSTEM_NAME"; exit; }
3670 echo unknown-hitachi-hiuxwe2
3671 exit ;;
3672- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
3673+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
3674 echo hppa1.1-hp-bsd
3675 exit ;;
3676 9000/8??:4.3bsd:*:*)
3677@@ -761,7 +765,7 @@ EOF
3678 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
3679 echo hppa1.0-hp-mpeix
3680 exit ;;
3681- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
3682+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
3683 echo hppa1.1-hp-osf
3684 exit ;;
3685 hp8??:OSF1:*:*)
3686@@ -769,9 +773,9 @@ EOF
3687 exit ;;
3688 i*86:OSF1:*:*)
3689 if [ -x /usr/sbin/sysversion ] ; then
3690- echo ${UNAME_MACHINE}-unknown-osf1mk
3691+ echo "$UNAME_MACHINE"-unknown-osf1mk
3692 else
3693- echo ${UNAME_MACHINE}-unknown-osf1
3694+ echo "$UNAME_MACHINE"-unknown-osf1
3695 fi
3696 exit ;;
3697 parisc*:Lites*:*:*)
3698@@ -796,128 +800,109 @@ EOF
3699 echo c4-convex-bsd
3700 exit ;;
3701 CRAY*Y-MP:*:*:*)
3702- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3703+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3704 exit ;;
3705 CRAY*[A-Z]90:*:*:*)
3706- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
3707+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
3708 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
3709 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
3710 -e 's/\.[^.]*$/.X/'
3711 exit ;;
3712 CRAY*TS:*:*:*)
3713- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3714+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3715 exit ;;
3716 CRAY*T3E:*:*:*)
3717- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3718+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3719 exit ;;
3720 CRAY*SV1:*:*:*)
3721- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3722+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3723 exit ;;
3724 *:UNICOS/mp:*:*)
3725- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3726+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3727 exit ;;
3728 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
3729 FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
3730 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
3731- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
3732+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
3733 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
3734 exit ;;
3735 5000:UNIX_System_V:4.*:*)
3736 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
3737- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
3738+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
3739 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
3740 exit ;;
3741 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
3742- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
3743+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
3744 exit ;;
3745 sparc*:BSD/OS:*:*)
3746- echo sparc-unknown-bsdi${UNAME_RELEASE}
3747+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
3748 exit ;;
3749 *:BSD/OS:*:*)
3750- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
3751+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
3752 exit ;;
3753 *:FreeBSD:*:*)
3754 UNAME_PROCESSOR=`/usr/bin/uname -p`
3755- case ${UNAME_PROCESSOR} in
3756+ case "$UNAME_PROCESSOR" in
3757 amd64)
3758 UNAME_PROCESSOR=x86_64 ;;
3759 i386)
3760 UNAME_PROCESSOR=i586 ;;
3761 esac
3762- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
3763+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
3764 exit ;;
3765 i*:CYGWIN*:*)
3766- echo ${UNAME_MACHINE}-pc-cygwin
3767+ echo "$UNAME_MACHINE"-pc-cygwin
3768 exit ;;
3769 *:MINGW64*:*)
3770- echo ${UNAME_MACHINE}-pc-mingw64
3771+ echo "$UNAME_MACHINE"-pc-mingw64
3772 exit ;;
3773 *:MINGW*:*)
3774- echo ${UNAME_MACHINE}-pc-mingw32
3775+ echo "$UNAME_MACHINE"-pc-mingw32
3776 exit ;;
3777 *:MSYS*:*)
3778- echo ${UNAME_MACHINE}-pc-msys
3779- exit ;;
3780- i*:windows32*:*)
3781- # uname -m includes "-pc" on this system.
3782- echo ${UNAME_MACHINE}-mingw32
3783+ echo "$UNAME_MACHINE"-pc-msys
3784 exit ;;
3785 i*:PW*:*)
3786- echo ${UNAME_MACHINE}-pc-pw32
3787+ echo "$UNAME_MACHINE"-pc-pw32
3788 exit ;;
3789 *:Interix*:*)
3790- case ${UNAME_MACHINE} in
3791+ case "$UNAME_MACHINE" in
3792 x86)
3793- echo i586-pc-interix${UNAME_RELEASE}
3794+ echo i586-pc-interix"$UNAME_RELEASE"
3795 exit ;;
3796 authenticamd | genuineintel | EM64T)
3797- echo x86_64-unknown-interix${UNAME_RELEASE}
3798+ echo x86_64-unknown-interix"$UNAME_RELEASE"
3799 exit ;;
3800 IA64)
3801- echo ia64-unknown-interix${UNAME_RELEASE}
3802+ echo ia64-unknown-interix"$UNAME_RELEASE"
3803 exit ;;
3804 esac ;;
3805- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
3806- echo i${UNAME_MACHINE}-pc-mks
3807- exit ;;
3808- 8664:Windows_NT:*)
3809- echo x86_64-pc-mks
3810- exit ;;
3811- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
3812- # How do we know it's Interix rather than the generic POSIX subsystem?
3813- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
3814- # UNAME_MACHINE based on the output of uname instead of i386?
3815- echo i586-pc-interix
3816- exit ;;
3817 i*:UWIN*:*)
3818- echo ${UNAME_MACHINE}-pc-uwin
3819+ echo "$UNAME_MACHINE"-pc-uwin
3820 exit ;;
3821 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
3822 echo x86_64-unknown-cygwin
3823 exit ;;
3824- p*:CYGWIN*:*)
3825- echo powerpcle-unknown-cygwin
3826- exit ;;
3827 prep*:SunOS:5.*:*)
3828- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3829+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
3830 exit ;;
3831 *:GNU:*:*)
3832 # the GNU system
3833- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
3834+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
3835 exit ;;
3836 *:GNU/*:*:*)
3837 # other systems with GNU libc and userland
3838- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
3839+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
3840 exit ;;
3841 i*86:Minix:*:*)
3842- echo ${UNAME_MACHINE}-pc-minix
3843+ echo "$UNAME_MACHINE"-pc-minix
3844 exit ;;
3845 aarch64:Linux:*:*)
3846- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3847+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3848 exit ;;
3849 aarch64_be:Linux:*:*)
3850 UNAME_MACHINE=aarch64_be
3851- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3852+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3853 exit ;;
3854 alpha:Linux:*:*)
3855 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
3856@@ -931,63 +916,63 @@ EOF
3857 esac
3858 objdump --private-headers /bin/sh | grep -q ld.so.1
3859 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
3860- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3861+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3862 exit ;;
3863 arc:Linux:*:* | arceb:Linux:*:*)
3864- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3865+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3866 exit ;;
3867 arm*:Linux:*:*)
3868- eval $set_cc_for_build
3869+ eval "$set_cc_for_build"
3870 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
3871 | grep -q __ARM_EABI__
3872 then
3873- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3874+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3875 else
3876 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
3877 | grep -q __ARM_PCS_VFP
3878 then
3879- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
3880+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
3881 else
3882- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
3883+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
3884 fi
3885 fi
3886 exit ;;
3887 avr32*:Linux:*:*)
3888- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3889+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3890 exit ;;
3891 cris:Linux:*:*)
3892- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
3893+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
3894 exit ;;
3895 crisv32:Linux:*:*)
3896- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
3897+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
3898 exit ;;
3899 e2k:Linux:*:*)
3900- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3901+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3902 exit ;;
3903 frv:Linux:*:*)
3904- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3905+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3906 exit ;;
3907 hexagon:Linux:*:*)
3908- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3909+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3910 exit ;;
3911 i*86:Linux:*:*)
3912- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
3913+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
3914 exit ;;
3915 ia64:Linux:*:*)
3916- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3917+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3918 exit ;;
3919 k1om:Linux:*:*)
3920- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3921+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3922 exit ;;
3923 m32r*:Linux:*:*)
3924- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3925+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3926 exit ;;
3927 m68*:Linux:*:*)
3928- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3929+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3930 exit ;;
3931 mips:Linux:*:* | mips64:Linux:*:*)
3932- eval $set_cc_for_build
3933- sed 's/^ //' << EOF >$dummy.c
3934+ eval "$set_cc_for_build"
3935+ sed 's/^ //' << EOF > "$dummy.c"
3936 #undef CPU
3937 #undef ${UNAME_MACHINE}
3938 #undef ${UNAME_MACHINE}el
3939@@ -1001,70 +986,74 @@ EOF
3940 #endif
3941 #endif
3942 EOF
3943- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
3944- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
3945+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
3946+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
3947 ;;
3948 mips64el:Linux:*:*)
3949- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3950+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3951 exit ;;
3952 openrisc*:Linux:*:*)
3953- echo or1k-unknown-linux-${LIBC}
3954+ echo or1k-unknown-linux-"$LIBC"
3955 exit ;;
3956 or32:Linux:*:* | or1k*:Linux:*:*)
3957- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3958+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3959 exit ;;
3960 padre:Linux:*:*)
3961- echo sparc-unknown-linux-${LIBC}
3962+ echo sparc-unknown-linux-"$LIBC"
3963 exit ;;
3964 parisc64:Linux:*:* | hppa64:Linux:*:*)
3965- echo hppa64-unknown-linux-${LIBC}
3966+ echo hppa64-unknown-linux-"$LIBC"
3967 exit ;;
3968 parisc:Linux:*:* | hppa:Linux:*:*)
3969 # Look for CPU level
3970 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
3971- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
3972- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
3973- *) echo hppa-unknown-linux-${LIBC} ;;
3974+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
3975+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
3976+ *) echo hppa-unknown-linux-"$LIBC" ;;
3977 esac
3978 exit ;;
3979 ppc64:Linux:*:*)
3980- echo powerpc64-unknown-linux-${LIBC}
3981+ echo powerpc64-unknown-linux-"$LIBC"
3982 exit ;;
3983 ppc:Linux:*:*)
3984- echo powerpc-unknown-linux-${LIBC}
3985+ echo powerpc-unknown-linux-"$LIBC"
3986 exit ;;
3987 ppc64le:Linux:*:*)
3988- echo powerpc64le-unknown-linux-${LIBC}
3989+ echo powerpc64le-unknown-linux-"$LIBC"
3990 exit ;;
3991 ppcle:Linux:*:*)
3992- echo powerpcle-unknown-linux-${LIBC}
3993+ echo powerpcle-unknown-linux-"$LIBC"
3994 exit ;;
3995 riscv32:Linux:*:* | riscv64:Linux:*:*)
3996- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
3997+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3998 exit ;;
3999 s390:Linux:*:* | s390x:Linux:*:*)
4000- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
4001+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
4002 exit ;;
4003 sh64*:Linux:*:*)
4004- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4005+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
4006 exit ;;
4007 sh*:Linux:*:*)
4008- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4009+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
4010 exit ;;
4011 sparc:Linux:*:* | sparc64:Linux:*:*)
4012- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4013+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
4014 exit ;;
4015 tile*:Linux:*:*)
4016- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4017+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
4018 exit ;;
4019 vax:Linux:*:*)
4020- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
4021+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
4022 exit ;;
4023 x86_64:Linux:*:*)
4024- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
4025+ if objdump -f /bin/sh | grep -q elf32-x86-64; then
4026+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
4027+ else
4028+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
4029+ fi
4030 exit ;;
4031 xtensa*:Linux:*:*)
4032- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4033+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
4034 exit ;;
4035 i*86:DYNIX/ptx:4*:*)
4036 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
4037@@ -1078,34 +1067,34 @@ EOF
4038 # I am not positive that other SVR4 systems won't match this,
4039 # I just have to hope. -- rms.
4040 # Use sysv4.2uw... so that sysv4* matches it.
4041- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
4042+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
4043 exit ;;
4044 i*86:OS/2:*:*)
4045 # If we were able to find `uname', then EMX Unix compatibility
4046 # is probably installed.
4047- echo ${UNAME_MACHINE}-pc-os2-emx
4048+ echo "$UNAME_MACHINE"-pc-os2-emx
4049 exit ;;
4050 i*86:XTS-300:*:STOP)
4051- echo ${UNAME_MACHINE}-unknown-stop
4052+ echo "$UNAME_MACHINE"-unknown-stop
4053 exit ;;
4054 i*86:atheos:*:*)
4055- echo ${UNAME_MACHINE}-unknown-atheos
4056+ echo "$UNAME_MACHINE"-unknown-atheos
4057 exit ;;
4058 i*86:syllable:*:*)
4059- echo ${UNAME_MACHINE}-pc-syllable
4060+ echo "$UNAME_MACHINE"-pc-syllable
4061 exit ;;
4062 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
4063- echo i386-unknown-lynxos${UNAME_RELEASE}
4064+ echo i386-unknown-lynxos"$UNAME_RELEASE"
4065 exit ;;
4066 i*86:*DOS:*:*)
4067- echo ${UNAME_MACHINE}-pc-msdosdjgpp
4068+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
4069 exit ;;
4070- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
4071- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
4072+ i*86:*:4.*:*)
4073+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
4074 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
4075- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
4076+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
4077 else
4078- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
4079+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
4080 fi
4081 exit ;;
4082 i*86:*:5:[678]*)
4083@@ -1115,12 +1104,12 @@ EOF
4084 *Pentium) UNAME_MACHINE=i586 ;;
4085 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
4086 esac
4087- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
4088+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
4089 exit ;;
4090 i*86:*:3.2:*)
4091 if test -f /usr/options/cb.name; then
4092 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
4093- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
4094+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
4095 elif /bin/uname -X 2>/dev/null >/dev/null ; then
4096 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
4097 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
4098@@ -1130,9 +1119,9 @@ EOF
4099 && UNAME_MACHINE=i686
4100 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
4101 && UNAME_MACHINE=i686
4102- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
4103+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
4104 else
4105- echo ${UNAME_MACHINE}-pc-sysv32
4106+ echo "$UNAME_MACHINE"-pc-sysv32
4107 fi
4108 exit ;;
4109 pc:*:*:*)
4110@@ -1152,9 +1141,9 @@ EOF
4111 exit ;;
4112 i860:*:4.*:*) # i860-SVR4
4113 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
4114- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
4115+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
4116 else # Add other i860-SVR4 vendors below as they are discovered.
4117- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
4118+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
4119 fi
4120 exit ;;
4121 mini*:CTIX:SYS*5:*)
4122@@ -1174,9 +1163,9 @@ EOF
4123 test -r /etc/.relid \
4124 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
4125 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
4126- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
4127+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
4128 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
4129- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
4130+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
4131 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
4132 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
4133 && { echo i486-ncr-sysv4; exit; } ;;
4134@@ -1185,28 +1174,28 @@ EOF
4135 test -r /etc/.relid \
4136 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
4137 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
4138- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
4139+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
4140 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
4141- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
4142+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
4143 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
4144- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
4145+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
4146 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
4147- echo m68k-unknown-lynxos${UNAME_RELEASE}
4148+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
4149 exit ;;
4150 mc68030:UNIX_System_V:4.*:*)
4151 echo m68k-atari-sysv4
4152 exit ;;
4153 TSUNAMI:LynxOS:2.*:*)
4154- echo sparc-unknown-lynxos${UNAME_RELEASE}
4155+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
4156 exit ;;
4157 rs6000:LynxOS:2.*:*)
4158- echo rs6000-unknown-lynxos${UNAME_RELEASE}
4159+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
4160 exit ;;
4161 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
4162- echo powerpc-unknown-lynxos${UNAME_RELEASE}
4163+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
4164 exit ;;
4165 SM[BE]S:UNIX_SV:*:*)
4166- echo mips-dde-sysv${UNAME_RELEASE}
4167+ echo mips-dde-sysv"$UNAME_RELEASE"
4168 exit ;;
4169 RM*:ReliantUNIX-*:*:*)
4170 echo mips-sni-sysv4
4171@@ -1217,7 +1206,7 @@ EOF
4172 *:SINIX-*:*:*)
4173 if uname -p 2>/dev/null >/dev/null ; then
4174 UNAME_MACHINE=`(uname -p) 2>/dev/null`
4175- echo ${UNAME_MACHINE}-sni-sysv4
4176+ echo "$UNAME_MACHINE"-sni-sysv4
4177 else
4178 echo ns32k-sni-sysv
4179 fi
4180@@ -1237,23 +1226,23 @@ EOF
4181 exit ;;
4182 i*86:VOS:*:*)
4183 # From Paul.Green@stratus.com.
4184- echo ${UNAME_MACHINE}-stratus-vos
4185+ echo "$UNAME_MACHINE"-stratus-vos
4186 exit ;;
4187 *:VOS:*:*)
4188 # From Paul.Green@stratus.com.
4189 echo hppa1.1-stratus-vos
4190 exit ;;
4191 mc68*:A/UX:*:*)
4192- echo m68k-apple-aux${UNAME_RELEASE}
4193+ echo m68k-apple-aux"$UNAME_RELEASE"
4194 exit ;;
4195 news*:NEWS-OS:6*:*)
4196 echo mips-sony-newsos6
4197 exit ;;
4198 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
4199 if [ -d /usr/nec ]; then
4200- echo mips-nec-sysv${UNAME_RELEASE}
4201+ echo mips-nec-sysv"$UNAME_RELEASE"
4202 else
4203- echo mips-unknown-sysv${UNAME_RELEASE}
4204+ echo mips-unknown-sysv"$UNAME_RELEASE"
4205 fi
4206 exit ;;
4207 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
4208@@ -1272,39 +1261,39 @@ EOF
4209 echo x86_64-unknown-haiku
4210 exit ;;
4211 SX-4:SUPER-UX:*:*)
4212- echo sx4-nec-superux${UNAME_RELEASE}
4213+ echo sx4-nec-superux"$UNAME_RELEASE"
4214 exit ;;
4215 SX-5:SUPER-UX:*:*)
4216- echo sx5-nec-superux${UNAME_RELEASE}
4217+ echo sx5-nec-superux"$UNAME_RELEASE"
4218 exit ;;
4219 SX-6:SUPER-UX:*:*)
4220- echo sx6-nec-superux${UNAME_RELEASE}
4221+ echo sx6-nec-superux"$UNAME_RELEASE"
4222 exit ;;
4223 SX-7:SUPER-UX:*:*)
4224- echo sx7-nec-superux${UNAME_RELEASE}
4225+ echo sx7-nec-superux"$UNAME_RELEASE"
4226 exit ;;
4227 SX-8:SUPER-UX:*:*)
4228- echo sx8-nec-superux${UNAME_RELEASE}
4229+ echo sx8-nec-superux"$UNAME_RELEASE"
4230 exit ;;
4231 SX-8R:SUPER-UX:*:*)
4232- echo sx8r-nec-superux${UNAME_RELEASE}
4233+ echo sx8r-nec-superux"$UNAME_RELEASE"
4234 exit ;;
4235 SX-ACE:SUPER-UX:*:*)
4236- echo sxace-nec-superux${UNAME_RELEASE}
4237+ echo sxace-nec-superux"$UNAME_RELEASE"
4238 exit ;;
4239 Power*:Rhapsody:*:*)
4240- echo powerpc-apple-rhapsody${UNAME_RELEASE}
4241+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
4242 exit ;;
4243 *:Rhapsody:*:*)
4244- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
4245+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
4246 exit ;;
4247 *:Darwin:*:*)
4248 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
4249- eval $set_cc_for_build
4250+ eval "$set_cc_for_build"
4251 if test "$UNAME_PROCESSOR" = unknown ; then
4252 UNAME_PROCESSOR=powerpc
4253 fi
4254- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
4255+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
4256 if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
4257 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
4258 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
4259@@ -1332,7 +1321,7 @@ EOF
4260 # that Apple uses in portable devices.
4261 UNAME_PROCESSOR=x86_64
4262 fi
4263- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
4264+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
4265 exit ;;
4266 *:procnto*:*:* | *:QNX:[0123456789]*:*)
4267 UNAME_PROCESSOR=`uname -p`
4268@@ -1340,22 +1329,25 @@ EOF
4269 UNAME_PROCESSOR=i386
4270 UNAME_MACHINE=pc
4271 fi
4272- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
4273+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
4274 exit ;;
4275 *:QNX:*:4*)
4276 echo i386-pc-qnx
4277 exit ;;
4278 NEO-*:NONSTOP_KERNEL:*:*)
4279- echo neo-tandem-nsk${UNAME_RELEASE}
4280+ echo neo-tandem-nsk"$UNAME_RELEASE"
4281 exit ;;
4282 NSE-*:NONSTOP_KERNEL:*:*)
4283- echo nse-tandem-nsk${UNAME_RELEASE}
4284+ echo nse-tandem-nsk"$UNAME_RELEASE"
4285 exit ;;
4286 NSR-*:NONSTOP_KERNEL:*:*)
4287- echo nsr-tandem-nsk${UNAME_RELEASE}
4288+ echo nsr-tandem-nsk"$UNAME_RELEASE"
4289+ exit ;;
4290+ NSV-*:NONSTOP_KERNEL:*:*)
4291+ echo nsv-tandem-nsk"$UNAME_RELEASE"
4292 exit ;;
4293 NSX-*:NONSTOP_KERNEL:*:*)
4294- echo nsx-tandem-nsk${UNAME_RELEASE}
4295+ echo nsx-tandem-nsk"$UNAME_RELEASE"
4296 exit ;;
4297 *:NonStop-UX:*:*)
4298 echo mips-compaq-nonstopux
4299@@ -1364,7 +1356,7 @@ EOF
4300 echo bs2000-siemens-sysv
4301 exit ;;
4302 DS/*:UNIX_System_V:*:*)
4303- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
4304+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
4305 exit ;;
4306 *:Plan9:*:*)
4307 # "uname -m" is not consistent, so use $cputype instead. 386
4308@@ -1375,7 +1367,7 @@ EOF
4309 else
4310 UNAME_MACHINE="$cputype"
4311 fi
4312- echo ${UNAME_MACHINE}-unknown-plan9
4313+ echo "$UNAME_MACHINE"-unknown-plan9
4314 exit ;;
4315 *:TOPS-10:*:*)
4316 echo pdp10-unknown-tops10
4317@@ -1396,14 +1388,14 @@ EOF
4318 echo pdp10-unknown-its
4319 exit ;;
4320 SEI:*:*:SEIUX)
4321- echo mips-sei-seiux${UNAME_RELEASE}
4322+ echo mips-sei-seiux"$UNAME_RELEASE"
4323 exit ;;
4324 *:DragonFly:*:*)
4325- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
4326+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
4327 exit ;;
4328 *:*VMS:*:*)
4329 UNAME_MACHINE=`(uname -p) 2>/dev/null`
4330- case "${UNAME_MACHINE}" in
4331+ case "$UNAME_MACHINE" in
4332 A*) echo alpha-dec-vms ; exit ;;
4333 I*) echo ia64-dec-vms ; exit ;;
4334 V*) echo vax-dec-vms ; exit ;;
4335@@ -1412,32 +1404,44 @@ EOF
4336 echo i386-pc-xenix
4337 exit ;;
4338 i*86:skyos:*:*)
4339- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
4340+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
4341 exit ;;
4342 i*86:rdos:*:*)
4343- echo ${UNAME_MACHINE}-pc-rdos
4344+ echo "$UNAME_MACHINE"-pc-rdos
4345 exit ;;
4346 i*86:AROS:*:*)
4347- echo ${UNAME_MACHINE}-pc-aros
4348+ echo "$UNAME_MACHINE"-pc-aros
4349 exit ;;
4350 x86_64:VMkernel:*:*)
4351- echo ${UNAME_MACHINE}-unknown-esx
4352+ echo "$UNAME_MACHINE"-unknown-esx
4353 exit ;;
4354 amd64:Isilon\ OneFS:*:*)
4355 echo x86_64-unknown-onefs
4356 exit ;;
4357 esac
4358
4359+echo "$0: unable to guess system type" >&2
4360+
4361+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
4362+ mips:Linux | mips64:Linux)
4363+ # If we got here on MIPS GNU/Linux, output extra information.
4364+ cat >&2 <<EOF
4365+
4366+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
4367+the system type. Please install a C compiler and try again.
4368+EOF
4369+ ;;
4370+esac
4371+
4372 cat >&2 <<EOF
4373-$0: unable to guess system type
4374
4375 This script (version $timestamp), has failed to recognize the
4376 operating system you are using. If your script is old, overwrite *all*
4377 copies of config.guess and config.sub with the latest versions from:
4378
4379- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
4380+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
4381 and
4382- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
4383+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
4384
4385 If $0 has already been updated, send the following data and any
4386 information you think might be pertinent to config-patches@gnu.org to
4387@@ -1460,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
4388 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
4389 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
4390
4391-UNAME_MACHINE = ${UNAME_MACHINE}
4392-UNAME_RELEASE = ${UNAME_RELEASE}
4393-UNAME_SYSTEM = ${UNAME_SYSTEM}
4394-UNAME_VERSION = ${UNAME_VERSION}
4395+UNAME_MACHINE = "$UNAME_MACHINE"
4396+UNAME_RELEASE = "$UNAME_RELEASE"
4397+UNAME_SYSTEM = "$UNAME_SYSTEM"
4398+UNAME_VERSION = "$UNAME_VERSION"
4399 EOF
4400
4401 exit 1
4402
4403 # Local variables:
4404-# eval: (add-hook 'write-file-hooks 'time-stamp)
4405+# eval: (add-hook 'write-file-functions 'time-stamp)
4406 # time-stamp-start: "timestamp='"
4407 # time-stamp-format: "%:y-%02m-%02d"
4408 # time-stamp-end: "'"
4409diff --git a/clutter/build/config.sub b/clutter/build/config.sub
4410index f4bafc1..1d8e98b 100755
4411--- a/clutter/build/config.sub
4412+++ b/clutter/build/config.sub
4413@@ -1,8 +1,8 @@
4414-#!/bin/sh
4415+#! /bin/sh
4416 # Configuration validation subroutine script.
4417-# Copyright 1992-2017 Free Software Foundation, Inc.
4418+# Copyright 1992-2018 Free Software Foundation, Inc.
4419
4420-timestamp='2017-04-02'
4421+timestamp='2018-02-22'
4422
4423 # This file is free software; you can redistribute it and/or modify it
4424 # under the terms of the GNU General Public License as published by
4425@@ -15,7 +15,7 @@ timestamp='2017-04-02'
4426 # General Public License for more details.
4427 #
4428 # You should have received a copy of the GNU General Public License
4429-# along with this program; if not, see <http://www.gnu.org/licenses/>.
4430+# along with this program; if not, see <https://www.gnu.org/licenses/>.
4431 #
4432 # As a special exception to the GNU General Public License, if you
4433 # distribute this file as part of a program that contains a
4434@@ -33,7 +33,7 @@ timestamp='2017-04-02'
4435 # Otherwise, we print the canonical config type on stdout and succeed.
4436
4437 # You can get the latest version of this script from:
4438-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
4439+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
4440
4441 # This file is supposed to be the same for all GNU packages
4442 # and recognize all the CPU types, system types and aliases
4443@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
4444
4445 Canonicalize a configuration name.
4446
4447-Operation modes:
4448+Options:
4449 -h, --help print this help, then exit
4450 -t, --time-stamp print date of last modification, then exit
4451 -v, --version print version number, then exit
4452@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
4453 version="\
4454 GNU config.sub ($timestamp)
4455
4456-Copyright 1992-2017 Free Software Foundation, Inc.
4457+Copyright 1992-2018 Free Software Foundation, Inc.
4458
4459 This is free software; see the source for copying conditions. There is NO
4460 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
4461@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
4462
4463 *local*)
4464 # First pass through any local machine types.
4465- echo $1
4466+ echo "$1"
4467 exit ;;
4468
4469 * )
4470@@ -112,7 +112,7 @@ esac
4471
4472 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
4473 # Here we must recognize all the valid KERNEL-OS combinations.
4474-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
4475+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
4476 case $maybe_os in
4477 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
4478 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
4479@@ -120,16 +120,16 @@ case $maybe_os in
4480 kopensolaris*-gnu* | cloudabi*-eabi* | \
4481 storm-chaos* | os2-emx* | rtmk-nova*)
4482 os=-$maybe_os
4483- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
4484+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
4485 ;;
4486 android-linux)
4487 os=-linux-android
4488- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
4489+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
4490 ;;
4491 *)
4492- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
4493- if [ $basic_machine != $1 ]
4494- then os=`echo $1 | sed 's/.*-/-/'`
4495+ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
4496+ if [ "$basic_machine" != "$1" ]
4497+ then os=`echo "$1" | sed 's/.*-/-/'`
4498 else os=; fi
4499 ;;
4500 esac
4501@@ -178,44 +178,44 @@ case $os in
4502 ;;
4503 -sco6)
4504 os=-sco5v6
4505- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4506+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4507 ;;
4508 -sco5)
4509 os=-sco3.2v5
4510- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4511+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4512 ;;
4513 -sco4)
4514 os=-sco3.2v4
4515- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4516+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4517 ;;
4518 -sco3.2.[4-9]*)
4519 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
4520- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4521+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4522 ;;
4523 -sco3.2v[4-9]*)
4524 # Don't forget version if it is 3.2v4 or newer.
4525- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4526+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4527 ;;
4528 -sco5v6*)
4529 # Don't forget version if it is 3.2v4 or newer.
4530- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4531+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4532 ;;
4533 -sco*)
4534 os=-sco3.2v2
4535- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4536+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4537 ;;
4538 -udk*)
4539- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4540+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4541 ;;
4542 -isc)
4543 os=-isc2.2
4544- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4545+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4546 ;;
4547 -clix*)
4548 basic_machine=clipper-intergraph
4549 ;;
4550 -isc*)
4551- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4552+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
4553 ;;
4554 -lynx*178)
4555 os=-lynxos178
4556@@ -227,10 +227,7 @@ case $os in
4557 os=-lynxos
4558 ;;
4559 -ptx*)
4560- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
4561- ;;
4562- -windowsnt*)
4563- os=`echo $os | sed -e 's/windowsnt/winnt/'`
4564+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
4565 ;;
4566 -psos*)
4567 os=-psos
4568@@ -299,7 +296,7 @@ case $basic_machine in
4569 | nios | nios2 | nios2eb | nios2el \
4570 | ns16k | ns32k \
4571 | open8 | or1k | or1knd | or32 \
4572- | pdp10 | pdp11 | pj | pjl \
4573+ | pdp10 | pj | pjl \
4574 | powerpc | powerpc64 | powerpc64le | powerpcle \
4575 | pru \
4576 | pyramid \
4577@@ -316,7 +313,6 @@ case $basic_machine in
4578 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
4579 | visium \
4580 | wasm32 \
4581- | we32k \
4582 | x86 | xc16x | xstormy16 | xtensa \
4583 | z8k | z80)
4584 basic_machine=$basic_machine-unknown
4585@@ -337,7 +333,7 @@ case $basic_machine in
4586 basic_machine=$basic_machine-unknown
4587 os=-none
4588 ;;
4589- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
4590+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
4591 ;;
4592 ms1)
4593 basic_machine=mt-unknown
4594@@ -366,7 +362,7 @@ case $basic_machine in
4595 ;;
4596 # Object if more than one company name word.
4597 *-*-*)
4598- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
4599+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
4600 exit 1
4601 ;;
4602 # Recognize the basic CPU types with company name.
4603@@ -461,7 +457,7 @@ case $basic_machine in
4604 # Recognize the various machine names and aliases which stand
4605 # for a CPU type and a company and sometimes even an OS.
4606 386bsd)
4607- basic_machine=i386-unknown
4608+ basic_machine=i386-pc
4609 os=-bsd
4610 ;;
4611 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
4612@@ -495,7 +491,7 @@ case $basic_machine in
4613 basic_machine=x86_64-pc
4614 ;;
4615 amd64-*)
4616- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
4617+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4618 ;;
4619 amdahl)
4620 basic_machine=580-amdahl
4621@@ -540,7 +536,7 @@ case $basic_machine in
4622 os=-linux
4623 ;;
4624 blackfin-*)
4625- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
4626+ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4627 os=-linux
4628 ;;
4629 bluegene*)
4630@@ -548,13 +544,13 @@ case $basic_machine in
4631 os=-cnk
4632 ;;
4633 c54x-*)
4634- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
4635+ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4636 ;;
4637 c55x-*)
4638- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
4639+ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4640 ;;
4641 c6x-*)
4642- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
4643+ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4644 ;;
4645 c90)
4646 basic_machine=c90-cray
4647@@ -643,7 +639,7 @@ case $basic_machine in
4648 basic_machine=rs6000-bull
4649 os=-bosx
4650 ;;
4651- dpx2* | dpx2*-bull)
4652+ dpx2*)
4653 basic_machine=m68k-bull
4654 os=-sysv3
4655 ;;
4656@@ -652,7 +648,7 @@ case $basic_machine in
4657 os=$os"spe"
4658 ;;
4659 e500v[12]-*)
4660- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
4661+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4662 os=$os"spe"
4663 ;;
4664 ebmon29k)
4665@@ -744,9 +740,6 @@ case $basic_machine in
4666 hp9k8[0-9][0-9] | hp8[0-9][0-9])
4667 basic_machine=hppa1.0-hp
4668 ;;
4669- hppa-next)
4670- os=-nextstep3
4671- ;;
4672 hppaosf)
4673 basic_machine=hppa1.1-hp
4674 os=-osf
4675@@ -759,26 +752,26 @@ case $basic_machine in
4676 basic_machine=i370-ibm
4677 ;;
4678 i*86v32)
4679- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
4680+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
4681 os=-sysv32
4682 ;;
4683 i*86v4*)
4684- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
4685+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
4686 os=-sysv4
4687 ;;
4688 i*86v)
4689- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
4690+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
4691 os=-sysv
4692 ;;
4693 i*86sol2)
4694- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
4695+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
4696 os=-solaris2
4697 ;;
4698 i386mach)
4699 basic_machine=i386-mach
4700 os=-mach
4701 ;;
4702- i386-vsta | vsta)
4703+ vsta)
4704 basic_machine=i386-unknown
4705 os=-vsta
4706 ;;
4707@@ -797,19 +790,16 @@ case $basic_machine in
4708 os=-sysv
4709 ;;
4710 leon-*|leon[3-9]-*)
4711- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
4712+ basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
4713 ;;
4714 m68knommu)
4715 basic_machine=m68k-unknown
4716 os=-linux
4717 ;;
4718 m68knommu-*)
4719- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
4720+ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4721 os=-linux
4722 ;;
4723- m88k-omron*)
4724- basic_machine=m88k-omron
4725- ;;
4726 magnum | m3230)
4727 basic_machine=mips-mips
4728 os=-sysv
4729@@ -841,10 +831,10 @@ case $basic_machine in
4730 os=-mint
4731 ;;
4732 mips3*-*)
4733- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
4734+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
4735 ;;
4736 mips3*)
4737- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
4738+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
4739 ;;
4740 monitor)
4741 basic_machine=m68k-rom68k
4742@@ -863,7 +853,7 @@ case $basic_machine in
4743 os=-msdos
4744 ;;
4745 ms1-*)
4746- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
4747+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
4748 ;;
4749 msys)
4750 basic_machine=i686-pc
4751@@ -905,7 +895,7 @@ case $basic_machine in
4752 basic_machine=v70-nec
4753 os=-sysv
4754 ;;
4755- next | m*-next )
4756+ next | m*-next)
4757 basic_machine=m68k-next
4758 case $os in
4759 -nextstep* )
4760@@ -950,6 +940,9 @@ case $basic_machine in
4761 nsr-tandem)
4762 basic_machine=nsr-tandem
4763 ;;
4764+ nsv-tandem)
4765+ basic_machine=nsv-tandem
4766+ ;;
4767 nsx-tandem)
4768 basic_machine=nsx-tandem
4769 ;;
4770@@ -985,7 +978,7 @@ case $basic_machine in
4771 os=-linux
4772 ;;
4773 parisc-*)
4774- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
4775+ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4776 os=-linux
4777 ;;
4778 pbd)
4779@@ -1001,7 +994,7 @@ case $basic_machine in
4780 basic_machine=i386-pc
4781 ;;
4782 pc98-*)
4783- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
4784+ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4785 ;;
4786 pentium | p5 | k5 | k6 | nexgen | viac3)
4787 basic_machine=i586-pc
4788@@ -1016,16 +1009,16 @@ case $basic_machine in
4789 basic_machine=i786-pc
4790 ;;
4791 pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
4792- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
4793+ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4794 ;;
4795 pentiumpro-* | p6-* | 6x86-* | athlon-*)
4796- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
4797+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4798 ;;
4799 pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
4800- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
4801+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4802 ;;
4803 pentium4-*)
4804- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
4805+ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4806 ;;
4807 pn)
4808 basic_machine=pn-gould
4809@@ -1035,23 +1028,23 @@ case $basic_machine in
4810 ppc | ppcbe) basic_machine=powerpc-unknown
4811 ;;
4812 ppc-* | ppcbe-*)
4813- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
4814+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4815 ;;
4816 ppcle | powerpclittle)
4817 basic_machine=powerpcle-unknown
4818 ;;
4819 ppcle-* | powerpclittle-*)
4820- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
4821+ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4822 ;;
4823 ppc64) basic_machine=powerpc64-unknown
4824 ;;
4825- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
4826+ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4827 ;;
4828 ppc64le | powerpc64little)
4829 basic_machine=powerpc64le-unknown
4830 ;;
4831 ppc64le-* | powerpc64little-*)
4832- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
4833+ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4834 ;;
4835 ps2)
4836 basic_machine=i386-ibm
4837@@ -1105,17 +1098,10 @@ case $basic_machine in
4838 sequent)
4839 basic_machine=i386-sequent
4840 ;;
4841- sh)
4842- basic_machine=sh-hitachi
4843- os=-hms
4844- ;;
4845 sh5el)
4846 basic_machine=sh5le-unknown
4847 ;;
4848- sh64)
4849- basic_machine=sh64-unknown
4850- ;;
4851- sparclite-wrs | simso-wrs)
4852+ simso-wrs)
4853 basic_machine=sparclite-wrs
4854 os=-vxworks
4855 ;;
4856@@ -1134,7 +1120,7 @@ case $basic_machine in
4857 os=-sysv4
4858 ;;
4859 strongarm-* | thumb-*)
4860- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
4861+ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
4862 ;;
4863 sun2)
4864 basic_machine=m68000-sun
4865@@ -1248,9 +1234,6 @@ case $basic_machine in
4866 basic_machine=a29k-wrs
4867 os=-vxworks
4868 ;;
4869- wasm32)
4870- basic_machine=wasm32-unknown
4871- ;;
4872 w65*)
4873 basic_machine=w65-wdc
4874 os=-none
4875@@ -1259,6 +1242,9 @@ case $basic_machine in
4876 basic_machine=hppa1.1-winbond
4877 os=-proelf
4878 ;;
4879+ x64)
4880+ basic_machine=x86_64-pc
4881+ ;;
4882 xbox)
4883 basic_machine=i686-pc
4884 os=-mingw32
4885@@ -1267,20 +1253,12 @@ case $basic_machine in
4886 basic_machine=xps100-honeywell
4887 ;;
4888 xscale-* | xscalee[bl]-*)
4889- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
4890+ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
4891 ;;
4892 ymp)
4893 basic_machine=ymp-cray
4894 os=-unicos
4895 ;;
4896- z8k-*-coff)
4897- basic_machine=z8k-unknown
4898- os=-sim
4899- ;;
4900- z80-*-coff)
4901- basic_machine=z80-unknown
4902- os=-sim
4903- ;;
4904 none)
4905 basic_machine=none-none
4906 os=-none
4907@@ -1309,10 +1287,6 @@ case $basic_machine in
4908 vax)
4909 basic_machine=vax-dec
4910 ;;
4911- pdp10)
4912- # there are many clones, so DEC is not a safe bet
4913- basic_machine=pdp10-unknown
4914- ;;
4915 pdp11)
4916 basic_machine=pdp11-dec
4917 ;;
4918@@ -1322,9 +1296,6 @@ case $basic_machine in
4919 sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
4920 basic_machine=sh-unknown
4921 ;;
4922- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
4923- basic_machine=sparc-sun
4924- ;;
4925 cydra)
4926 basic_machine=cydra-cydrome
4927 ;;
4928@@ -1344,7 +1315,7 @@ case $basic_machine in
4929 # Make sure to match an already-canonicalized machine name.
4930 ;;
4931 *)
4932- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
4933+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
4934 exit 1
4935 ;;
4936 esac
4937@@ -1352,10 +1323,10 @@ esac
4938 # Here we canonicalize certain aliases for manufacturers.
4939 case $basic_machine in
4940 *-digital*)
4941- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
4942+ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
4943 ;;
4944 *-commodore*)
4945- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
4946+ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
4947 ;;
4948 *)
4949 ;;
4950@@ -1366,8 +1337,8 @@ esac
4951 if [ x"$os" != x"" ]
4952 then
4953 case $os in
4954- # First match some system type aliases
4955- # that might get confused with valid system types.
4956+ # First match some system type aliases that might get confused
4957+ # with valid system types.
4958 # -solaris* is a basic system type, with this one exception.
4959 -auroraux)
4960 os=-auroraux
4961@@ -1378,18 +1349,19 @@ case $os in
4962 -solaris)
4963 os=-solaris2
4964 ;;
4965- -svr4*)
4966- os=-sysv4
4967- ;;
4968 -unixware*)
4969 os=-sysv4.2uw
4970 ;;
4971 -gnu/linux*)
4972 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
4973 ;;
4974- # First accept the basic system types.
4975+ # es1800 is here to avoid being matched by es* (a different OS)
4976+ -es1800*)
4977+ os=-ose
4978+ ;;
4979+ # Now accept the basic system types.
4980 # The portable systems comes first.
4981- # Each alternative MUST END IN A *, to match a version number.
4982+ # Each alternative MUST end in a * to match a version number.
4983 # -sysv* is not here because it comes later, after sysvr4.
4984 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
4985 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
4986@@ -1399,7 +1371,7 @@ case $os in
4987 | -aos* | -aros* | -cloudabi* | -sortix* \
4988 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
4989 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
4990- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
4991+ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
4992 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
4993 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
4994 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
4995@@ -1410,14 +1382,15 @@ case $os in
4996 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
4997 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
4998 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
4999- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
5000+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches