Merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
- Git
- lp:~3v1n0/ubuntu/+source/mutter
- ubuntu/bionic
- Merge into ubuntu/bionic
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) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+361810@code.launchpad.net |
This proposal has been superseded by a proposal from 2019-01-15.
Commit message
Description of the change
Unmerged commits
- 8af8618... by Marco Trevisan (Treviño)
-
debian/changelog: update as per upstream merge
- 94f59ad... by Marco Trevisan (Treviño)
-
debian/patches: refresh and delete already applied patches
- 292d231... by Marco Trevisan (Treviño)
-
Update upstream source from tag 'upstream/
3.28.3+ git20181011' Update to upstream version '3.28.3+
git20181011'
with Debian dir 79aebc90596e1ace3318e7019627b3 619df2fd05 - d651ed8... by Marco Trevisan (Treviño)
-
New upstream version 3.28.3+git20181011
- 1b78ca8... by Daniel van Vugt
-
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 f31cf0c3ef99b27
c0b2c0161fc9fc1 eb82778b2e) - 6a6d477... by Daniel van Vugt
-
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 d21478b0f0163b0
688abe065a7009b 33453d0d00) - 721de28... by Olivier Fourdan <email address hidden>
-
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 `MetaMoveResize
Flags` 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 fa495286a1037d6
10051ab49f0aa1e 8b20e38066) (cherry picked from commit 8eabfaaa8b9469c
5bdb1d8ca44b465 384e8eaa9d) - 00cd99c... by Jonas Ådahl
-
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 8ee14a7cb7e8f072d2731d59c7dc73 5f83a9bb0b) - 8ddbe9d... by Jonas Ådahl
-
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 ca5b27baf517f00354ff8811ba204f d90f1ddb38) - a22cb88... by Jonas Ådahl
-
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 64df6276881c5f42c6d2054d556d8c d391f7ee70)
Preview Diff
1 | diff --git a/Makefile.in b/Makefile.in | |||
2 | index 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 | 176 | $(top_srcdir)/build-aux/missing \ | 176 | $(top_srcdir)/build-aux/missing \ |
7 | 177 | $(top_srcdir)/src/meta/meta-version.h.in ABOUT-NLS COPYING \ | 177 | $(top_srcdir)/src/meta/meta-version.h.in ABOUT-NLS COPYING \ |
8 | 178 | NEWS build-aux/compile build-aux/config.guess \ | 178 | NEWS build-aux/compile build-aux/config.guess \ |
10 | 179 | build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ | 179 | build-aux/config.rpath build-aux/config.sub \ |
11 | 180 | build-aux/install-sh build-aux/ltmain.sh build-aux/missing | 180 | build-aux/install-sh build-aux/ltmain.sh build-aux/missing |
12 | 181 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 181 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
13 | 182 | distdir = $(PACKAGE)-$(VERSION) | 182 | distdir = $(PACKAGE)-$(VERSION) |
14 | @@ -398,6 +398,7 @@ pdfdir = @pdfdir@ | |||
15 | 398 | prefix = @prefix@ | 398 | prefix = @prefix@ |
16 | 399 | program_transform_name = @program_transform_name@ | 399 | program_transform_name = @program_transform_name@ |
17 | 400 | psdir = @psdir@ | 400 | psdir = @psdir@ |
18 | 401 | runstatedir = @runstatedir@ | ||
19 | 401 | sbindir = @sbindir@ | 402 | sbindir = @sbindir@ |
20 | 402 | sharedstatedir = @sharedstatedir@ | 403 | sharedstatedir = @sharedstatedir@ |
21 | 403 | srcdir = @srcdir@ | 404 | srcdir = @srcdir@ |
22 | diff --git a/build-aux/compile b/build-aux/compile | |||
23 | index de0005d..a85b723 100755 | |||
24 | --- a/build-aux/compile | |||
25 | +++ b/build-aux/compile | |||
26 | @@ -1,9 +1,9 @@ | |||
28 | 1 | #!/bin/sh | 1 | #! /bin/sh |
29 | 2 | # Wrapper for compilers which do not understand '-c -o'. | 2 | # Wrapper for compilers which do not understand '-c -o'. |
30 | 3 | 3 | ||
32 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2012-10-14.11; # UTC |
33 | 5 | 5 | ||
35 | 6 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 6 | # Copyright (C) 1999-2014 Free Software Foundation, Inc. |
36 | 7 | # Written by Tom Tromey <tromey@cygnus.com>. | 7 | # Written by Tom Tromey <tromey@cygnus.com>. |
37 | 8 | # | 8 | # |
38 | 9 | # This program is free software; you can redistribute it and/or modify | 9 | # This program is free software; you can redistribute it and/or modify |
39 | @@ -255,8 +255,7 @@ EOF | |||
40 | 255 | echo "compile $scriptversion" | 255 | echo "compile $scriptversion" |
41 | 256 | exit $? | 256 | exit $? |
42 | 257 | ;; | 257 | ;; |
45 | 258 | cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ | 258 | cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) |
44 | 259 | icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) | ||
46 | 260 | func_cl_wrapper "$@" # Doesn't return... | 259 | func_cl_wrapper "$@" # Doesn't return... |
47 | 261 | ;; | 260 | ;; |
48 | 262 | esac | 261 | esac |
49 | @@ -343,6 +342,6 @@ exit $ret | |||
50 | 343 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 342 | # eval: (add-hook 'write-file-hooks 'time-stamp) |
51 | 344 | # time-stamp-start: "scriptversion=" | 343 | # time-stamp-start: "scriptversion=" |
52 | 345 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 344 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
54 | 346 | # time-stamp-time-zone: "UTC0" | 345 | # time-stamp-time-zone: "UTC" |
55 | 347 | # time-stamp-end: "; # UTC" | 346 | # time-stamp-end: "; # UTC" |
56 | 348 | # End: | 347 | # End: |
57 | diff --git a/build-aux/config.guess b/build-aux/config.guess | |||
58 | index 717b228..f50dcdb 100755 | |||
59 | --- a/build-aux/config.guess | |||
60 | +++ b/build-aux/config.guess | |||
61 | @@ -1,8 +1,8 @@ | |||
63 | 1 | #!/bin/sh | 1 | #! /bin/sh |
64 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
66 | 3 | # Copyright 1992-2017 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
67 | 4 | 4 | ||
69 | 5 | timestamp='2017-08-08' | 5 | timestamp='2018-02-24' |
70 | 6 | 6 | ||
71 | 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
72 | 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
73 | @@ -15,7 +15,7 @@ timestamp='2017-08-08' | |||
74 | 15 | # General Public License for more details. | 15 | # General Public License for more details. |
75 | 16 | # | 16 | # |
76 | 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
78 | 18 | # along with this program; if not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program; if not, see <https://www.gnu.org/licenses/>. |
79 | 19 | # | 19 | # |
80 | 20 | # As a special exception to the GNU General Public License, if you | 20 | # As a special exception to the GNU General Public License, if you |
81 | 21 | # distribute this file as part of a program that contains a | 21 | # distribute this file as part of a program that contains a |
82 | @@ -27,7 +27,7 @@ timestamp='2017-08-08' | |||
83 | 27 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. | 27 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. |
84 | 28 | # | 28 | # |
85 | 29 | # You can get the latest version of this script from: | 29 | # You can get the latest version of this script from: |
87 | 30 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess | 30 | # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
88 | 31 | # | 31 | # |
89 | 32 | # Please send patches to <config-patches@gnu.org>. | 32 | # Please send patches to <config-patches@gnu.org>. |
90 | 33 | 33 | ||
91 | @@ -39,7 +39,7 @@ Usage: $0 [OPTION] | |||
92 | 39 | 39 | ||
93 | 40 | Output the configuration name of the system \`$me' is run on. | 40 | Output the configuration name of the system \`$me' is run on. |
94 | 41 | 41 | ||
96 | 42 | Operation modes: | 42 | Options: |
97 | 43 | -h, --help print this help, then exit | 43 | -h, --help print this help, then exit |
98 | 44 | -t, --time-stamp print date of last modification, then exit | 44 | -t, --time-stamp print date of last modification, then exit |
99 | 45 | -v, --version print version number, then exit | 45 | -v, --version print version number, then exit |
100 | @@ -50,7 +50,7 @@ version="\ | |||
101 | 50 | GNU config.guess ($timestamp) | 50 | GNU config.guess ($timestamp) |
102 | 51 | 51 | ||
103 | 52 | Originally written by Per Bothner. | 52 | Originally written by Per Bothner. |
105 | 53 | Copyright 1992-2017 Free Software Foundation, Inc. | 53 | Copyright 1992-2018 Free Software Foundation, Inc. |
106 | 54 | 54 | ||
107 | 55 | This is free software; see the source for copying conditions. There is NO | 55 | This is free software; see the source for copying conditions. There is NO |
108 | 56 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 56 | 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 | 107 | dummy=$tmp/dummy ; | 107 | dummy=$tmp/dummy ; |
111 | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
112 | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in |
114 | 110 | ,,) echo "int x;" > $dummy.c ; | 110 | ,,) echo "int x;" > "$dummy.c" ; |
115 | 111 | for c in cc gcc c89 c99 ; do | 111 | for c in cc gcc c89 c99 ; do |
117 | 112 | if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then | 112 | if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then |
118 | 113 | CC_FOR_BUILD="$c"; break ; | 113 | CC_FOR_BUILD="$c"; break ; |
119 | 114 | fi ; | 114 | fi ; |
120 | 115 | done ; | 115 | done ; |
121 | @@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown | |||
122 | 132 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown | 132 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
123 | 133 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | 133 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
124 | 134 | 134 | ||
126 | 135 | case "${UNAME_SYSTEM}" in | 135 | case "$UNAME_SYSTEM" in |
127 | 136 | Linux|GNU|GNU/*) | 136 | Linux|GNU|GNU/*) |
128 | 137 | # If the system lacks a compiler, then just pick glibc. | 137 | # If the system lacks a compiler, then just pick glibc. |
129 | 138 | # We could probably try harder. | 138 | # We could probably try harder. |
130 | 139 | LIBC=gnu | 139 | LIBC=gnu |
131 | 140 | 140 | ||
134 | 141 | eval $set_cc_for_build | 141 | eval "$set_cc_for_build" |
135 | 142 | cat <<-EOF > $dummy.c | 142 | cat <<-EOF > "$dummy.c" |
136 | 143 | #include <features.h> | 143 | #include <features.h> |
137 | 144 | #if defined(__UCLIBC__) | 144 | #if defined(__UCLIBC__) |
138 | 145 | LIBC=uclibc | 145 | LIBC=uclibc |
139 | @@ -149,13 +149,20 @@ Linux|GNU|GNU/*) | |||
140 | 149 | LIBC=gnu | 149 | LIBC=gnu |
141 | 150 | #endif | 150 | #endif |
142 | 151 | EOF | 151 | EOF |
144 | 152 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` | 152 | eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" |
145 | 153 | |||
146 | 154 | # If ldd exists, use it to detect musl libc. | ||
147 | 155 | if command -v ldd >/dev/null && \ | ||
148 | 156 | ldd --version 2>&1 | grep -q ^musl | ||
149 | 157 | then | ||
150 | 158 | LIBC=musl | ||
151 | 159 | fi | ||
152 | 153 | ;; | 160 | ;; |
153 | 154 | esac | 161 | esac |
154 | 155 | 162 | ||
155 | 156 | # Note: order is significant - the case branches are not exclusive. | 163 | # Note: order is significant - the case branches are not exclusive. |
156 | 157 | 164 | ||
158 | 158 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 165 | case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in |
159 | 159 | *:NetBSD:*:*) | 166 | *:NetBSD:*:*) |
160 | 160 | # NetBSD (nbsd) targets should (where applicable) match one or | 167 | # NetBSD (nbsd) targets should (where applicable) match one or |
161 | 161 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, | 168 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
162 | @@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
163 | 169 | # portion of the name. We always set it to "unknown". | 176 | # portion of the name. We always set it to "unknown". |
164 | 170 | sysctl="sysctl -n hw.machine_arch" | 177 | sysctl="sysctl -n hw.machine_arch" |
165 | 171 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ | 178 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ |
168 | 172 | /sbin/$sysctl 2>/dev/null || \ | 179 | "/sbin/$sysctl" 2>/dev/null || \ |
169 | 173 | /usr/sbin/$sysctl 2>/dev/null || \ | 180 | "/usr/sbin/$sysctl" 2>/dev/null || \ |
170 | 174 | echo unknown)` | 181 | echo unknown)` |
172 | 175 | case "${UNAME_MACHINE_ARCH}" in | 182 | case "$UNAME_MACHINE_ARCH" in |
173 | 176 | armeb) machine=armeb-unknown ;; | 183 | armeb) machine=armeb-unknown ;; |
174 | 177 | arm*) machine=arm-unknown ;; | 184 | arm*) machine=arm-unknown ;; |
175 | 178 | sh3el) machine=shl-unknown ;; | 185 | sh3el) machine=shl-unknown ;; |
176 | 179 | sh3eb) machine=sh-unknown ;; | 186 | sh3eb) machine=sh-unknown ;; |
177 | 180 | sh5el) machine=sh5le-unknown ;; | 187 | sh5el) machine=sh5le-unknown ;; |
178 | 181 | earmv*) | 188 | earmv*) |
182 | 182 | arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` | 189 | arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` |
183 | 183 | endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` | 190 | endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` |
184 | 184 | machine=${arch}${endian}-unknown | 191 | machine="${arch}${endian}"-unknown |
185 | 185 | ;; | 192 | ;; |
187 | 186 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; | 193 | *) machine="$UNAME_MACHINE_ARCH"-unknown ;; |
188 | 187 | esac | 194 | esac |
189 | 188 | # The Operating System including object format, if it has switched | 195 | # The Operating System including object format, if it has switched |
190 | 189 | # to ELF recently (or will in the future) and ABI. | 196 | # to ELF recently (or will in the future) and ABI. |
192 | 190 | case "${UNAME_MACHINE_ARCH}" in | 197 | case "$UNAME_MACHINE_ARCH" in |
193 | 191 | earm*) | 198 | earm*) |
194 | 192 | os=netbsdelf | 199 | os=netbsdelf |
195 | 193 | ;; | 200 | ;; |
196 | 194 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 201 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
198 | 195 | eval $set_cc_for_build | 202 | eval "$set_cc_for_build" |
199 | 196 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 203 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
200 | 197 | | grep -q __ELF__ | 204 | | grep -q __ELF__ |
201 | 198 | then | 205 | then |
202 | @@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
203 | 208 | ;; | 215 | ;; |
204 | 209 | esac | 216 | esac |
205 | 210 | # Determine ABI tags. | 217 | # Determine ABI tags. |
207 | 211 | case "${UNAME_MACHINE_ARCH}" in | 218 | case "$UNAME_MACHINE_ARCH" in |
208 | 212 | earm*) | 219 | earm*) |
209 | 213 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' | 220 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' |
211 | 214 | abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` | 221 | abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` |
212 | 215 | ;; | 222 | ;; |
213 | 216 | esac | 223 | esac |
214 | 217 | # The OS release | 224 | # The OS release |
215 | @@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
216 | 219 | # thus, need a distinct triplet. However, they do not need | 226 | # thus, need a distinct triplet. However, they do not need |
217 | 220 | # kernel version information, so it can be replaced with a | 227 | # kernel version information, so it can be replaced with a |
218 | 221 | # suitable tag, in the style of linux-gnu. | 228 | # suitable tag, in the style of linux-gnu. |
220 | 222 | case "${UNAME_VERSION}" in | 229 | case "$UNAME_VERSION" in |
221 | 223 | Debian*) | 230 | Debian*) |
222 | 224 | release='-gnu' | 231 | release='-gnu' |
223 | 225 | ;; | 232 | ;; |
224 | 226 | *) | 233 | *) |
226 | 227 | release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` | 234 | release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` |
227 | 228 | ;; | 235 | ;; |
228 | 229 | esac | 236 | esac |
229 | 230 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | 237 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
230 | 231 | # contains redundant information, the shorter form: | 238 | # contains redundant information, the shorter form: |
231 | 232 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | 239 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
233 | 233 | echo "${machine}-${os}${release}${abi}" | 240 | echo "$machine-${os}${release}${abi}" |
234 | 234 | exit ;; | 241 | exit ;; |
235 | 235 | *:Bitrig:*:*) | 242 | *:Bitrig:*:*) |
236 | 236 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` | 243 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
238 | 237 | echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} | 244 | echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" |
239 | 238 | exit ;; | 245 | exit ;; |
240 | 239 | *:OpenBSD:*:*) | 246 | *:OpenBSD:*:*) |
241 | 240 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` | 247 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
243 | 241 | echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} | 248 | echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" |
244 | 242 | exit ;; | 249 | exit ;; |
245 | 243 | *:LibertyBSD:*:*) | 250 | *:LibertyBSD:*:*) |
246 | 244 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` | 251 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` |
248 | 245 | echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} | 252 | echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" |
249 | 253 | exit ;; | ||
250 | 254 | *:MidnightBSD:*:*) | ||
251 | 255 | echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" | ||
252 | 246 | exit ;; | 256 | exit ;; |
253 | 247 | *:ekkoBSD:*:*) | 257 | *:ekkoBSD:*:*) |
255 | 248 | echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} | 258 | echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" |
256 | 249 | exit ;; | 259 | exit ;; |
257 | 250 | *:SolidBSD:*:*) | 260 | *:SolidBSD:*:*) |
259 | 251 | echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} | 261 | echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" |
260 | 252 | exit ;; | 262 | exit ;; |
261 | 253 | macppc:MirBSD:*:*) | 263 | macppc:MirBSD:*:*) |
263 | 254 | echo powerpc-unknown-mirbsd${UNAME_RELEASE} | 264 | echo powerpc-unknown-mirbsd"$UNAME_RELEASE" |
264 | 255 | exit ;; | 265 | exit ;; |
265 | 256 | *:MirBSD:*:*) | 266 | *:MirBSD:*:*) |
267 | 257 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} | 267 | echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" |
268 | 258 | exit ;; | 268 | exit ;; |
269 | 259 | *:Sortix:*:*) | 269 | *:Sortix:*:*) |
271 | 260 | echo ${UNAME_MACHINE}-unknown-sortix | 270 | echo "$UNAME_MACHINE"-unknown-sortix |
272 | 261 | exit ;; | 271 | exit ;; |
273 | 262 | *:Redox:*:*) | 272 | *:Redox:*:*) |
275 | 263 | echo ${UNAME_MACHINE}-unknown-redox | 273 | echo "$UNAME_MACHINE"-unknown-redox |
276 | 264 | exit ;; | 274 | exit ;; |
277 | 275 | mips:OSF1:*.*) | ||
278 | 276 | echo mips-dec-osf1 | ||
279 | 277 | exit ;; | ||
280 | 265 | alpha:OSF1:*:*) | 278 | alpha:OSF1:*:*) |
281 | 266 | case $UNAME_RELEASE in | 279 | case $UNAME_RELEASE in |
282 | 267 | *4.0) | 280 | *4.0) |
283 | @@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
284 | 313 | # A Tn.n version is a released field test version. | 326 | # A Tn.n version is a released field test version. |
285 | 314 | # A Xn.n version is an unreleased experimental baselevel. | 327 | # A Xn.n version is an unreleased experimental baselevel. |
286 | 315 | # 1.2 uses "1.2" for uname -r. | 328 | # 1.2 uses "1.2" for uname -r. |
288 | 316 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` | 329 | echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" |
289 | 317 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. | 330 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
290 | 318 | exitcode=$? | 331 | exitcode=$? |
291 | 319 | trap '' 0 | 332 | trap '' 0 |
292 | 320 | exit $exitcode ;; | 333 | exit $exitcode ;; |
293 | 321 | Alpha\ *:Windows_NT*:*) | ||
294 | 322 | # How do we know it's Interix rather than the generic POSIX subsystem? | ||
295 | 323 | # Should we change UNAME_MACHINE based on the output of uname instead | ||
296 | 324 | # of the specific Alpha model? | ||
297 | 325 | echo alpha-pc-interix | ||
298 | 326 | exit ;; | ||
299 | 327 | 21064:Windows_NT:50:3) | ||
300 | 328 | echo alpha-dec-winnt3.5 | ||
301 | 329 | exit ;; | ||
302 | 330 | Amiga*:UNIX_System_V:4.0:*) | 334 | Amiga*:UNIX_System_V:4.0:*) |
303 | 331 | echo m68k-unknown-sysv4 | 335 | echo m68k-unknown-sysv4 |
304 | 332 | exit ;; | 336 | exit ;; |
305 | 333 | *:[Aa]miga[Oo][Ss]:*:*) | 337 | *:[Aa]miga[Oo][Ss]:*:*) |
307 | 334 | echo ${UNAME_MACHINE}-unknown-amigaos | 338 | echo "$UNAME_MACHINE"-unknown-amigaos |
308 | 335 | exit ;; | 339 | exit ;; |
309 | 336 | *:[Mm]orph[Oo][Ss]:*:*) | 340 | *:[Mm]orph[Oo][Ss]:*:*) |
311 | 337 | echo ${UNAME_MACHINE}-unknown-morphos | 341 | echo "$UNAME_MACHINE"-unknown-morphos |
312 | 338 | exit ;; | 342 | exit ;; |
313 | 339 | *:OS/390:*:*) | 343 | *:OS/390:*:*) |
314 | 340 | echo i370-ibm-openedition | 344 | echo i370-ibm-openedition |
315 | @@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
316 | 346 | echo powerpc-ibm-os400 | 350 | echo powerpc-ibm-os400 |
317 | 347 | exit ;; | 351 | exit ;; |
318 | 348 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | 352 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
320 | 349 | echo arm-acorn-riscix${UNAME_RELEASE} | 353 | echo arm-acorn-riscix"$UNAME_RELEASE" |
321 | 350 | exit ;; | 354 | exit ;; |
322 | 351 | arm*:riscos:*:*|arm*:RISCOS:*:*) | 355 | arm*:riscos:*:*|arm*:RISCOS:*:*) |
323 | 352 | echo arm-unknown-riscos | 356 | echo arm-unknown-riscos |
324 | @@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
325 | 373 | sparc) echo sparc-icl-nx7; exit ;; | 377 | sparc) echo sparc-icl-nx7; exit ;; |
326 | 374 | esac ;; | 378 | esac ;; |
327 | 375 | s390x:SunOS:*:*) | 379 | s390x:SunOS:*:*) |
329 | 376 | echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 380 | echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
330 | 377 | exit ;; | 381 | exit ;; |
331 | 378 | sun4H:SunOS:5.*:*) | 382 | sun4H:SunOS:5.*:*) |
333 | 379 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 383 | echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
334 | 380 | exit ;; | 384 | exit ;; |
335 | 381 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 385 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
337 | 382 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 386 | echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
338 | 383 | exit ;; | 387 | exit ;; |
339 | 384 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) | 388 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
341 | 385 | echo i386-pc-auroraux${UNAME_RELEASE} | 389 | echo i386-pc-auroraux"$UNAME_RELEASE" |
342 | 386 | exit ;; | 390 | exit ;; |
343 | 387 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 391 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
345 | 388 | eval $set_cc_for_build | 392 | eval "$set_cc_for_build" |
346 | 389 | SUN_ARCH=i386 | 393 | SUN_ARCH=i386 |
347 | 390 | # If there is a compiler, see if it is configured for 64-bit objects. | 394 | # If there is a compiler, see if it is configured for 64-bit objects. |
348 | 391 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. | 395 | # 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 | 398 | SUN_ARCH=x86_64 | 402 | SUN_ARCH=x86_64 |
351 | 399 | fi | 403 | fi |
352 | 400 | fi | 404 | fi |
354 | 401 | echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 405 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
355 | 402 | exit ;; | 406 | exit ;; |
356 | 403 | sun4*:SunOS:6*:*) | 407 | sun4*:SunOS:6*:*) |
357 | 404 | # According to config.sub, this is the proper way to canonicalize | 408 | # According to config.sub, this is the proper way to canonicalize |
358 | 405 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but | 409 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
359 | 406 | # it's likely to be more like Solaris than SunOS4. | 410 | # it's likely to be more like Solaris than SunOS4. |
361 | 407 | echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 411 | echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
362 | 408 | exit ;; | 412 | exit ;; |
363 | 409 | sun4*:SunOS:*:*) | 413 | sun4*:SunOS:*:*) |
364 | 410 | case "`/usr/bin/arch -k`" in | 414 | case "`/usr/bin/arch -k`" in |
365 | @@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
366 | 413 | ;; | 417 | ;; |
367 | 414 | esac | 418 | esac |
368 | 415 | # Japanese Language versions have a version number like `4.1.3-JL'. | 419 | # Japanese Language versions have a version number like `4.1.3-JL'. |
370 | 416 | echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` | 420 | echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" |
371 | 417 | exit ;; | 421 | exit ;; |
372 | 418 | sun3*:SunOS:*:*) | 422 | sun3*:SunOS:*:*) |
374 | 419 | echo m68k-sun-sunos${UNAME_RELEASE} | 423 | echo m68k-sun-sunos"$UNAME_RELEASE" |
375 | 420 | exit ;; | 424 | exit ;; |
376 | 421 | sun*:*:4.2BSD:*) | 425 | sun*:*:4.2BSD:*) |
377 | 422 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` | 426 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
379 | 423 | test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 | 427 | test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 |
380 | 424 | case "`/bin/arch`" in | 428 | case "`/bin/arch`" in |
381 | 425 | sun3) | 429 | sun3) |
383 | 426 | echo m68k-sun-sunos${UNAME_RELEASE} | 430 | echo m68k-sun-sunos"$UNAME_RELEASE" |
384 | 427 | ;; | 431 | ;; |
385 | 428 | sun4) | 432 | sun4) |
387 | 429 | echo sparc-sun-sunos${UNAME_RELEASE} | 433 | echo sparc-sun-sunos"$UNAME_RELEASE" |
388 | 430 | ;; | 434 | ;; |
389 | 431 | esac | 435 | esac |
390 | 432 | exit ;; | 436 | exit ;; |
391 | 433 | aushp:SunOS:*:*) | 437 | aushp:SunOS:*:*) |
393 | 434 | echo sparc-auspex-sunos${UNAME_RELEASE} | 438 | echo sparc-auspex-sunos"$UNAME_RELEASE" |
394 | 435 | exit ;; | 439 | exit ;; |
395 | 436 | # The situation for MiNT is a little confusing. The machine name | 440 | # The situation for MiNT is a little confusing. The machine name |
396 | 437 | # can be virtually everything (everything which is not | 441 | # can be virtually everything (everything which is not |
397 | @@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
398 | 442 | # MiNT. But MiNT is downward compatible to TOS, so this should | 446 | # MiNT. But MiNT is downward compatible to TOS, so this should |
399 | 443 | # be no problem. | 447 | # be no problem. |
400 | 444 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) | 448 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
402 | 445 | echo m68k-atari-mint${UNAME_RELEASE} | 449 | echo m68k-atari-mint"$UNAME_RELEASE" |
403 | 446 | exit ;; | 450 | exit ;; |
404 | 447 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) | 451 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
406 | 448 | echo m68k-atari-mint${UNAME_RELEASE} | 452 | echo m68k-atari-mint"$UNAME_RELEASE" |
407 | 449 | exit ;; | 453 | exit ;; |
408 | 450 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) | 454 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
410 | 451 | echo m68k-atari-mint${UNAME_RELEASE} | 455 | echo m68k-atari-mint"$UNAME_RELEASE" |
411 | 452 | exit ;; | 456 | exit ;; |
412 | 453 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) | 457 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
414 | 454 | echo m68k-milan-mint${UNAME_RELEASE} | 458 | echo m68k-milan-mint"$UNAME_RELEASE" |
415 | 455 | exit ;; | 459 | exit ;; |
416 | 456 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) | 460 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
418 | 457 | echo m68k-hades-mint${UNAME_RELEASE} | 461 | echo m68k-hades-mint"$UNAME_RELEASE" |
419 | 458 | exit ;; | 462 | exit ;; |
420 | 459 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 463 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
422 | 460 | echo m68k-unknown-mint${UNAME_RELEASE} | 464 | echo m68k-unknown-mint"$UNAME_RELEASE" |
423 | 461 | exit ;; | 465 | exit ;; |
424 | 462 | m68k:machten:*:*) | 466 | m68k:machten:*:*) |
426 | 463 | echo m68k-apple-machten${UNAME_RELEASE} | 467 | echo m68k-apple-machten"$UNAME_RELEASE" |
427 | 464 | exit ;; | 468 | exit ;; |
428 | 465 | powerpc:machten:*:*) | 469 | powerpc:machten:*:*) |
430 | 466 | echo powerpc-apple-machten${UNAME_RELEASE} | 470 | echo powerpc-apple-machten"$UNAME_RELEASE" |
431 | 467 | exit ;; | 471 | exit ;; |
432 | 468 | RISC*:Mach:*:*) | 472 | RISC*:Mach:*:*) |
433 | 469 | echo mips-dec-mach_bsd4.3 | 473 | echo mips-dec-mach_bsd4.3 |
434 | 470 | exit ;; | 474 | exit ;; |
435 | 471 | RISC*:ULTRIX:*:*) | 475 | RISC*:ULTRIX:*:*) |
437 | 472 | echo mips-dec-ultrix${UNAME_RELEASE} | 476 | echo mips-dec-ultrix"$UNAME_RELEASE" |
438 | 473 | exit ;; | 477 | exit ;; |
439 | 474 | VAX*:ULTRIX*:*:*) | 478 | VAX*:ULTRIX*:*:*) |
441 | 475 | echo vax-dec-ultrix${UNAME_RELEASE} | 479 | echo vax-dec-ultrix"$UNAME_RELEASE" |
442 | 476 | exit ;; | 480 | exit ;; |
443 | 477 | 2020:CLIX:*:* | 2430:CLIX:*:*) | 481 | 2020:CLIX:*:* | 2430:CLIX:*:*) |
445 | 478 | echo clipper-intergraph-clix${UNAME_RELEASE} | 482 | echo clipper-intergraph-clix"$UNAME_RELEASE" |
446 | 479 | exit ;; | 483 | exit ;; |
447 | 480 | mips:*:*:UMIPS | mips:*:*:RISCos) | 484 | mips:*:*:UMIPS | mips:*:*:RISCos) |
450 | 481 | eval $set_cc_for_build | 485 | eval "$set_cc_for_build" |
451 | 482 | sed 's/^ //' << EOF >$dummy.c | 486 | sed 's/^ //' << EOF > "$dummy.c" |
452 | 483 | #ifdef __cplusplus | 487 | #ifdef __cplusplus |
453 | 484 | #include <stdio.h> /* for printf() prototype */ | 488 | #include <stdio.h> /* for printf() prototype */ |
454 | 485 | int main (int argc, char *argv[]) { | 489 | int main (int argc, char *argv[]) { |
455 | @@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
456 | 488 | #endif | 492 | #endif |
457 | 489 | #if defined (host_mips) && defined (MIPSEB) | 493 | #if defined (host_mips) && defined (MIPSEB) |
458 | 490 | #if defined (SYSTYPE_SYSV) | 494 | #if defined (SYSTYPE_SYSV) |
460 | 491 | printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); | 495 | printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); |
461 | 492 | #endif | 496 | #endif |
462 | 493 | #if defined (SYSTYPE_SVR4) | 497 | #if defined (SYSTYPE_SVR4) |
464 | 494 | printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); | 498 | printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); |
465 | 495 | #endif | 499 | #endif |
466 | 496 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) | 500 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) |
468 | 497 | printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); | 501 | printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); |
469 | 498 | #endif | 502 | #endif |
470 | 499 | #endif | 503 | #endif |
471 | 500 | exit (-1); | 504 | exit (-1); |
472 | 501 | } | 505 | } |
473 | 502 | EOF | 506 | EOF |
477 | 503 | $CC_FOR_BUILD -o $dummy $dummy.c && | 507 | $CC_FOR_BUILD -o "$dummy" "$dummy.c" && |
478 | 504 | dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && | 508 | dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && |
479 | 505 | SYSTEM_NAME=`$dummy $dummyarg` && | 509 | SYSTEM_NAME=`"$dummy" "$dummyarg"` && |
480 | 506 | { echo "$SYSTEM_NAME"; exit; } | 510 | { echo "$SYSTEM_NAME"; exit; } |
482 | 507 | echo mips-mips-riscos${UNAME_RELEASE} | 511 | echo mips-mips-riscos"$UNAME_RELEASE" |
483 | 508 | exit ;; | 512 | exit ;; |
484 | 509 | Motorola:PowerMAX_OS:*:*) | 513 | Motorola:PowerMAX_OS:*:*) |
485 | 510 | echo powerpc-motorola-powermax | 514 | echo powerpc-motorola-powermax |
486 | @@ -530,17 +534,17 @@ EOF | |||
487 | 530 | AViiON:dgux:*:*) | 534 | AViiON:dgux:*:*) |
488 | 531 | # DG/UX returns AViiON for all architectures | 535 | # DG/UX returns AViiON for all architectures |
489 | 532 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 536 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
491 | 533 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] | 537 | if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] |
492 | 534 | then | 538 | then |
495 | 535 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ | 539 | if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ |
496 | 536 | [ ${TARGET_BINARY_INTERFACE}x = x ] | 540 | [ "$TARGET_BINARY_INTERFACE"x = x ] |
497 | 537 | then | 541 | then |
499 | 538 | echo m88k-dg-dgux${UNAME_RELEASE} | 542 | echo m88k-dg-dgux"$UNAME_RELEASE" |
500 | 539 | else | 543 | else |
502 | 540 | echo m88k-dg-dguxbcs${UNAME_RELEASE} | 544 | echo m88k-dg-dguxbcs"$UNAME_RELEASE" |
503 | 541 | fi | 545 | fi |
504 | 542 | else | 546 | else |
506 | 543 | echo i586-dg-dgux${UNAME_RELEASE} | 547 | echo i586-dg-dgux"$UNAME_RELEASE" |
507 | 544 | fi | 548 | fi |
508 | 545 | exit ;; | 549 | exit ;; |
509 | 546 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) | 550 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
510 | @@ -557,7 +561,7 @@ EOF | |||
511 | 557 | echo m68k-tektronix-bsd | 561 | echo m68k-tektronix-bsd |
512 | 558 | exit ;; | 562 | exit ;; |
513 | 559 | *:IRIX*:*:*) | 563 | *:IRIX*:*:*) |
515 | 560 | echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` | 564 | echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" |
516 | 561 | exit ;; | 565 | exit ;; |
517 | 562 | ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. | 566 | ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
518 | 563 | echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id | 567 | echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
519 | @@ -569,14 +573,14 @@ EOF | |||
520 | 569 | if [ -x /usr/bin/oslevel ] ; then | 573 | if [ -x /usr/bin/oslevel ] ; then |
521 | 570 | IBM_REV=`/usr/bin/oslevel` | 574 | IBM_REV=`/usr/bin/oslevel` |
522 | 571 | else | 575 | else |
524 | 572 | IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} | 576 | IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" |
525 | 573 | fi | 577 | fi |
527 | 574 | echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} | 578 | echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" |
528 | 575 | exit ;; | 579 | exit ;; |
529 | 576 | *:AIX:2:3) | 580 | *:AIX:2:3) |
530 | 577 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then | 581 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
533 | 578 | eval $set_cc_for_build | 582 | eval "$set_cc_for_build" |
534 | 579 | sed 's/^ //' << EOF >$dummy.c | 583 | sed 's/^ //' << EOF > "$dummy.c" |
535 | 580 | #include <sys/systemcfg.h> | 584 | #include <sys/systemcfg.h> |
536 | 581 | 585 | ||
537 | 582 | main() | 586 | main() |
538 | @@ -587,7 +591,7 @@ EOF | |||
539 | 587 | exit(0); | 591 | exit(0); |
540 | 588 | } | 592 | } |
541 | 589 | EOF | 593 | EOF |
543 | 590 | if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` | 594 | if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` |
544 | 591 | then | 595 | then |
545 | 592 | echo "$SYSTEM_NAME" | 596 | echo "$SYSTEM_NAME" |
546 | 593 | else | 597 | else |
547 | @@ -601,7 +605,7 @@ EOF | |||
548 | 601 | exit ;; | 605 | exit ;; |
549 | 602 | *:AIX:*:[4567]) | 606 | *:AIX:*:[4567]) |
550 | 603 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 607 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
552 | 604 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 608 | if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then |
553 | 605 | IBM_ARCH=rs6000 | 609 | IBM_ARCH=rs6000 |
554 | 606 | else | 610 | else |
555 | 607 | IBM_ARCH=powerpc | 611 | IBM_ARCH=powerpc |
556 | @@ -610,18 +614,18 @@ EOF | |||
557 | 610 | IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | | 614 | IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | |
558 | 611 | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` | 615 | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` |
559 | 612 | else | 616 | else |
561 | 613 | IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} | 617 | IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" |
562 | 614 | fi | 618 | fi |
564 | 615 | echo ${IBM_ARCH}-ibm-aix${IBM_REV} | 619 | echo "$IBM_ARCH"-ibm-aix"$IBM_REV" |
565 | 616 | exit ;; | 620 | exit ;; |
566 | 617 | *:AIX:*:*) | 621 | *:AIX:*:*) |
567 | 618 | echo rs6000-ibm-aix | 622 | echo rs6000-ibm-aix |
568 | 619 | exit ;; | 623 | exit ;; |
570 | 620 | ibmrt:4.4BSD:*|romp-ibm:BSD:*) | 624 | ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) |
571 | 621 | echo romp-ibm-bsd4.4 | 625 | echo romp-ibm-bsd4.4 |
572 | 622 | exit ;; | 626 | exit ;; |
573 | 623 | ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and | 627 | ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
575 | 624 | echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to | 628 | echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to |
576 | 625 | exit ;; # report: romp-ibm BSD 4.3 | 629 | exit ;; # report: romp-ibm BSD 4.3 |
577 | 626 | *:BOSX:*:*) | 630 | *:BOSX:*:*) |
578 | 627 | echo rs6000-bull-bosx | 631 | echo rs6000-bull-bosx |
579 | @@ -636,28 +640,28 @@ EOF | |||
580 | 636 | echo m68k-hp-bsd4.4 | 640 | echo m68k-hp-bsd4.4 |
581 | 637 | exit ;; | 641 | exit ;; |
582 | 638 | 9000/[34678]??:HP-UX:*:*) | 642 | 9000/[34678]??:HP-UX:*:*) |
587 | 639 | HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` | 643 | HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` |
588 | 640 | case "${UNAME_MACHINE}" in | 644 | case "$UNAME_MACHINE" in |
589 | 641 | 9000/31? ) HP_ARCH=m68000 ;; | 645 | 9000/31?) HP_ARCH=m68000 ;; |
590 | 642 | 9000/[34]?? ) HP_ARCH=m68k ;; | 646 | 9000/[34]??) HP_ARCH=m68k ;; |
591 | 643 | 9000/[678][0-9][0-9]) | 647 | 9000/[678][0-9][0-9]) |
592 | 644 | if [ -x /usr/bin/getconf ]; then | 648 | if [ -x /usr/bin/getconf ]; then |
593 | 645 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 649 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
594 | 646 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | 650 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
596 | 647 | case "${sc_cpu_version}" in | 651 | case "$sc_cpu_version" in |
597 | 648 | 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 | 652 | 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 |
598 | 649 | 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 | 653 | 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 |
599 | 650 | 532) # CPU_PA_RISC2_0 | 654 | 532) # CPU_PA_RISC2_0 |
601 | 651 | case "${sc_kernel_bits}" in | 655 | case "$sc_kernel_bits" in |
602 | 652 | 32) HP_ARCH=hppa2.0n ;; | 656 | 32) HP_ARCH=hppa2.0n ;; |
603 | 653 | 64) HP_ARCH=hppa2.0w ;; | 657 | 64) HP_ARCH=hppa2.0w ;; |
604 | 654 | '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 | 658 | '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 |
605 | 655 | esac ;; | 659 | esac ;; |
606 | 656 | esac | 660 | esac |
607 | 657 | fi | 661 | fi |
611 | 658 | if [ "${HP_ARCH}" = "" ]; then | 662 | if [ "$HP_ARCH" = "" ]; then |
612 | 659 | eval $set_cc_for_build | 663 | eval "$set_cc_for_build" |
613 | 660 | sed 's/^ //' << EOF >$dummy.c | 664 | sed 's/^ //' << EOF > "$dummy.c" |
614 | 661 | 665 | ||
615 | 662 | #define _HPUX_SOURCE | 666 | #define _HPUX_SOURCE |
616 | 663 | #include <stdlib.h> | 667 | #include <stdlib.h> |
617 | @@ -690,13 +694,13 @@ EOF | |||
618 | 690 | exit (0); | 694 | exit (0); |
619 | 691 | } | 695 | } |
620 | 692 | EOF | 696 | EOF |
622 | 693 | (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | 697 | (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` |
623 | 694 | test -z "$HP_ARCH" && HP_ARCH=hppa | 698 | test -z "$HP_ARCH" && HP_ARCH=hppa |
624 | 695 | fi ;; | 699 | fi ;; |
625 | 696 | esac | 700 | esac |
627 | 697 | if [ ${HP_ARCH} = hppa2.0w ] | 701 | if [ "$HP_ARCH" = hppa2.0w ] |
628 | 698 | then | 702 | then |
630 | 699 | eval $set_cc_for_build | 703 | eval "$set_cc_for_build" |
631 | 700 | 704 | ||
632 | 701 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating | 705 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
633 | 702 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler | 706 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
634 | @@ -715,15 +719,15 @@ EOF | |||
635 | 715 | HP_ARCH=hppa64 | 719 | HP_ARCH=hppa64 |
636 | 716 | fi | 720 | fi |
637 | 717 | fi | 721 | fi |
639 | 718 | echo ${HP_ARCH}-hp-hpux${HPUX_REV} | 722 | echo "$HP_ARCH"-hp-hpux"$HPUX_REV" |
640 | 719 | exit ;; | 723 | exit ;; |
641 | 720 | ia64:HP-UX:*:*) | 724 | ia64:HP-UX:*:*) |
644 | 721 | HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` | 725 | HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` |
645 | 722 | echo ia64-hp-hpux${HPUX_REV} | 726 | echo ia64-hp-hpux"$HPUX_REV" |
646 | 723 | exit ;; | 727 | exit ;; |
647 | 724 | 3050*:HI-UX:*:*) | 728 | 3050*:HI-UX:*:*) |
650 | 725 | eval $set_cc_for_build | 729 | eval "$set_cc_for_build" |
651 | 726 | sed 's/^ //' << EOF >$dummy.c | 730 | sed 's/^ //' << EOF > "$dummy.c" |
652 | 727 | #include <unistd.h> | 731 | #include <unistd.h> |
653 | 728 | int | 732 | int |
654 | 729 | main () | 733 | main () |
655 | @@ -748,11 +752,11 @@ EOF | |||
656 | 748 | exit (0); | 752 | exit (0); |
657 | 749 | } | 753 | } |
658 | 750 | EOF | 754 | EOF |
660 | 751 | $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && | 755 | $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && |
661 | 752 | { echo "$SYSTEM_NAME"; exit; } | 756 | { echo "$SYSTEM_NAME"; exit; } |
662 | 753 | echo unknown-hitachi-hiuxwe2 | 757 | echo unknown-hitachi-hiuxwe2 |
663 | 754 | exit ;; | 758 | exit ;; |
665 | 755 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) | 759 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) |
666 | 756 | echo hppa1.1-hp-bsd | 760 | echo hppa1.1-hp-bsd |
667 | 757 | exit ;; | 761 | exit ;; |
668 | 758 | 9000/8??:4.3bsd:*:*) | 762 | 9000/8??:4.3bsd:*:*) |
669 | @@ -761,7 +765,7 @@ EOF | |||
670 | 761 | *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) | 765 | *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
671 | 762 | echo hppa1.0-hp-mpeix | 766 | echo hppa1.0-hp-mpeix |
672 | 763 | exit ;; | 767 | exit ;; |
674 | 764 | hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) | 768 | hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) |
675 | 765 | echo hppa1.1-hp-osf | 769 | echo hppa1.1-hp-osf |
676 | 766 | exit ;; | 770 | exit ;; |
677 | 767 | hp8??:OSF1:*:*) | 771 | hp8??:OSF1:*:*) |
678 | @@ -769,9 +773,9 @@ EOF | |||
679 | 769 | exit ;; | 773 | exit ;; |
680 | 770 | i*86:OSF1:*:*) | 774 | i*86:OSF1:*:*) |
681 | 771 | if [ -x /usr/sbin/sysversion ] ; then | 775 | if [ -x /usr/sbin/sysversion ] ; then |
683 | 772 | echo ${UNAME_MACHINE}-unknown-osf1mk | 776 | echo "$UNAME_MACHINE"-unknown-osf1mk |
684 | 773 | else | 777 | else |
686 | 774 | echo ${UNAME_MACHINE}-unknown-osf1 | 778 | echo "$UNAME_MACHINE"-unknown-osf1 |
687 | 775 | fi | 779 | fi |
688 | 776 | exit ;; | 780 | exit ;; |
689 | 777 | parisc*:Lites*:*:*) | 781 | parisc*:Lites*:*:*) |
690 | @@ -796,128 +800,109 @@ EOF | |||
691 | 796 | echo c4-convex-bsd | 800 | echo c4-convex-bsd |
692 | 797 | exit ;; | 801 | exit ;; |
693 | 798 | CRAY*Y-MP:*:*:*) | 802 | CRAY*Y-MP:*:*:*) |
695 | 799 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 803 | echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
696 | 800 | exit ;; | 804 | exit ;; |
697 | 801 | CRAY*[A-Z]90:*:*:*) | 805 | CRAY*[A-Z]90:*:*:*) |
699 | 802 | echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | 806 | echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ |
700 | 803 | | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ | 807 | | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
701 | 804 | -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ | 808 | -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
702 | 805 | -e 's/\.[^.]*$/.X/' | 809 | -e 's/\.[^.]*$/.X/' |
703 | 806 | exit ;; | 810 | exit ;; |
704 | 807 | CRAY*TS:*:*:*) | 811 | CRAY*TS:*:*:*) |
706 | 808 | echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 812 | echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
707 | 809 | exit ;; | 813 | exit ;; |
708 | 810 | CRAY*T3E:*:*:*) | 814 | CRAY*T3E:*:*:*) |
710 | 811 | echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 815 | echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
711 | 812 | exit ;; | 816 | exit ;; |
712 | 813 | CRAY*SV1:*:*:*) | 817 | CRAY*SV1:*:*:*) |
714 | 814 | echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 818 | echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
715 | 815 | exit ;; | 819 | exit ;; |
716 | 816 | *:UNICOS/mp:*:*) | 820 | *:UNICOS/mp:*:*) |
718 | 817 | echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 821 | echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
719 | 818 | exit ;; | 822 | exit ;; |
720 | 819 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | 823 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
721 | 820 | FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` | 824 | FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` |
722 | 821 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` | 825 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` |
724 | 822 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | 826 | FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` |
725 | 823 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 827 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
726 | 824 | exit ;; | 828 | exit ;; |
727 | 825 | 5000:UNIX_System_V:4.*:*) | 829 | 5000:UNIX_System_V:4.*:*) |
728 | 826 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` | 830 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` |
730 | 827 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` | 831 | FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` |
731 | 828 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 832 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
732 | 829 | exit ;; | 833 | exit ;; |
733 | 830 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | 834 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
735 | 831 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | 835 | echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" |
736 | 832 | exit ;; | 836 | exit ;; |
737 | 833 | sparc*:BSD/OS:*:*) | 837 | sparc*:BSD/OS:*:*) |
739 | 834 | echo sparc-unknown-bsdi${UNAME_RELEASE} | 838 | echo sparc-unknown-bsdi"$UNAME_RELEASE" |
740 | 835 | exit ;; | 839 | exit ;; |
741 | 836 | *:BSD/OS:*:*) | 840 | *:BSD/OS:*:*) |
743 | 837 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | 841 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" |
744 | 838 | exit ;; | 842 | exit ;; |
745 | 839 | *:FreeBSD:*:*) | 843 | *:FreeBSD:*:*) |
746 | 840 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 844 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
748 | 841 | case ${UNAME_PROCESSOR} in | 845 | case "$UNAME_PROCESSOR" in |
749 | 842 | amd64) | 846 | amd64) |
750 | 843 | UNAME_PROCESSOR=x86_64 ;; | 847 | UNAME_PROCESSOR=x86_64 ;; |
751 | 844 | i386) | 848 | i386) |
752 | 845 | UNAME_PROCESSOR=i586 ;; | 849 | UNAME_PROCESSOR=i586 ;; |
753 | 846 | esac | 850 | esac |
755 | 847 | echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 851 | echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" |
756 | 848 | exit ;; | 852 | exit ;; |
757 | 849 | i*:CYGWIN*:*) | 853 | i*:CYGWIN*:*) |
759 | 850 | echo ${UNAME_MACHINE}-pc-cygwin | 854 | echo "$UNAME_MACHINE"-pc-cygwin |
760 | 851 | exit ;; | 855 | exit ;; |
761 | 852 | *:MINGW64*:*) | 856 | *:MINGW64*:*) |
763 | 853 | echo ${UNAME_MACHINE}-pc-mingw64 | 857 | echo "$UNAME_MACHINE"-pc-mingw64 |
764 | 854 | exit ;; | 858 | exit ;; |
765 | 855 | *:MINGW*:*) | 859 | *:MINGW*:*) |
767 | 856 | echo ${UNAME_MACHINE}-pc-mingw32 | 860 | echo "$UNAME_MACHINE"-pc-mingw32 |
768 | 857 | exit ;; | 861 | exit ;; |
769 | 858 | *:MSYS*:*) | 862 | *:MSYS*:*) |
775 | 859 | echo ${UNAME_MACHINE}-pc-msys | 863 | echo "$UNAME_MACHINE"-pc-msys |
771 | 860 | exit ;; | ||
772 | 861 | i*:windows32*:*) | ||
773 | 862 | # uname -m includes "-pc" on this system. | ||
774 | 863 | echo ${UNAME_MACHINE}-mingw32 | ||
776 | 864 | exit ;; | 864 | exit ;; |
777 | 865 | i*:PW*:*) | 865 | i*:PW*:*) |
779 | 866 | echo ${UNAME_MACHINE}-pc-pw32 | 866 | echo "$UNAME_MACHINE"-pc-pw32 |
780 | 867 | exit ;; | 867 | exit ;; |
781 | 868 | *:Interix*:*) | 868 | *:Interix*:*) |
783 | 869 | case ${UNAME_MACHINE} in | 869 | case "$UNAME_MACHINE" in |
784 | 870 | x86) | 870 | x86) |
786 | 871 | echo i586-pc-interix${UNAME_RELEASE} | 871 | echo i586-pc-interix"$UNAME_RELEASE" |
787 | 872 | exit ;; | 872 | exit ;; |
788 | 873 | authenticamd | genuineintel | EM64T) | 873 | authenticamd | genuineintel | EM64T) |
790 | 874 | echo x86_64-unknown-interix${UNAME_RELEASE} | 874 | echo x86_64-unknown-interix"$UNAME_RELEASE" |
791 | 875 | exit ;; | 875 | exit ;; |
792 | 876 | IA64) | 876 | IA64) |
794 | 877 | echo ia64-unknown-interix${UNAME_RELEASE} | 877 | echo ia64-unknown-interix"$UNAME_RELEASE" |
795 | 878 | exit ;; | 878 | exit ;; |
796 | 879 | esac ;; | 879 | esac ;; |
797 | 880 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | ||
798 | 881 | echo i${UNAME_MACHINE}-pc-mks | ||
799 | 882 | exit ;; | ||
800 | 883 | 8664:Windows_NT:*) | ||
801 | 884 | echo x86_64-pc-mks | ||
802 | 885 | exit ;; | ||
803 | 886 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) | ||
804 | 887 | # How do we know it's Interix rather than the generic POSIX subsystem? | ||
805 | 888 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we | ||
806 | 889 | # UNAME_MACHINE based on the output of uname instead of i386? | ||
807 | 890 | echo i586-pc-interix | ||
808 | 891 | exit ;; | ||
809 | 892 | i*:UWIN*:*) | 880 | i*:UWIN*:*) |
811 | 893 | echo ${UNAME_MACHINE}-pc-uwin | 881 | echo "$UNAME_MACHINE"-pc-uwin |
812 | 894 | exit ;; | 882 | exit ;; |
813 | 895 | amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) | 883 | amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
814 | 896 | echo x86_64-unknown-cygwin | 884 | echo x86_64-unknown-cygwin |
815 | 897 | exit ;; | 885 | exit ;; |
816 | 898 | p*:CYGWIN*:*) | ||
817 | 899 | echo powerpcle-unknown-cygwin | ||
818 | 900 | exit ;; | ||
819 | 901 | prep*:SunOS:5.*:*) | 886 | prep*:SunOS:5.*:*) |
821 | 902 | echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 887 | echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
822 | 903 | exit ;; | 888 | exit ;; |
823 | 904 | *:GNU:*:*) | 889 | *:GNU:*:*) |
824 | 905 | # the GNU system | 890 | # the GNU system |
826 | 906 | echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` | 891 | echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" |
827 | 907 | exit ;; | 892 | exit ;; |
828 | 908 | *:GNU/*:*:*) | 893 | *:GNU/*:*:*) |
829 | 909 | # other systems with GNU libc and userland | 894 | # other systems with GNU libc and userland |
831 | 910 | echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} | 895 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" |
832 | 911 | exit ;; | 896 | exit ;; |
833 | 912 | i*86:Minix:*:*) | 897 | i*86:Minix:*:*) |
835 | 913 | echo ${UNAME_MACHINE}-pc-minix | 898 | echo "$UNAME_MACHINE"-pc-minix |
836 | 914 | exit ;; | 899 | exit ;; |
837 | 915 | aarch64:Linux:*:*) | 900 | aarch64:Linux:*:*) |
839 | 916 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 901 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
840 | 917 | exit ;; | 902 | exit ;; |
841 | 918 | aarch64_be:Linux:*:*) | 903 | aarch64_be:Linux:*:*) |
842 | 919 | UNAME_MACHINE=aarch64_be | 904 | UNAME_MACHINE=aarch64_be |
844 | 920 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 905 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
845 | 921 | exit ;; | 906 | exit ;; |
846 | 922 | alpha:Linux:*:*) | 907 | alpha:Linux:*:*) |
847 | 923 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 908 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
848 | @@ -931,63 +916,63 @@ EOF | |||
849 | 931 | esac | 916 | esac |
850 | 932 | objdump --private-headers /bin/sh | grep -q ld.so.1 | 917 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
851 | 933 | if test "$?" = 0 ; then LIBC=gnulibc1 ; fi | 918 | if test "$?" = 0 ; then LIBC=gnulibc1 ; fi |
853 | 934 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 919 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
854 | 935 | exit ;; | 920 | exit ;; |
855 | 936 | arc:Linux:*:* | arceb:Linux:*:*) | 921 | arc:Linux:*:* | arceb:Linux:*:*) |
857 | 937 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 922 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
858 | 938 | exit ;; | 923 | exit ;; |
859 | 939 | arm*:Linux:*:*) | 924 | arm*:Linux:*:*) |
861 | 940 | eval $set_cc_for_build | 925 | eval "$set_cc_for_build" |
862 | 941 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 926 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
863 | 942 | | grep -q __ARM_EABI__ | 927 | | grep -q __ARM_EABI__ |
864 | 943 | then | 928 | then |
866 | 944 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 929 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
867 | 945 | else | 930 | else |
868 | 946 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | 931 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
869 | 947 | | grep -q __ARM_PCS_VFP | 932 | | grep -q __ARM_PCS_VFP |
870 | 948 | then | 933 | then |
872 | 949 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi | 934 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi |
873 | 950 | else | 935 | else |
875 | 951 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf | 936 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf |
876 | 952 | fi | 937 | fi |
877 | 953 | fi | 938 | fi |
878 | 954 | exit ;; | 939 | exit ;; |
879 | 955 | avr32*:Linux:*:*) | 940 | avr32*:Linux:*:*) |
881 | 956 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 941 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
882 | 957 | exit ;; | 942 | exit ;; |
883 | 958 | cris:Linux:*:*) | 943 | cris:Linux:*:*) |
885 | 959 | echo ${UNAME_MACHINE}-axis-linux-${LIBC} | 944 | echo "$UNAME_MACHINE"-axis-linux-"$LIBC" |
886 | 960 | exit ;; | 945 | exit ;; |
887 | 961 | crisv32:Linux:*:*) | 946 | crisv32:Linux:*:*) |
889 | 962 | echo ${UNAME_MACHINE}-axis-linux-${LIBC} | 947 | echo "$UNAME_MACHINE"-axis-linux-"$LIBC" |
890 | 963 | exit ;; | 948 | exit ;; |
891 | 964 | e2k:Linux:*:*) | 949 | e2k:Linux:*:*) |
893 | 965 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 950 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
894 | 966 | exit ;; | 951 | exit ;; |
895 | 967 | frv:Linux:*:*) | 952 | frv:Linux:*:*) |
897 | 968 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 953 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
898 | 969 | exit ;; | 954 | exit ;; |
899 | 970 | hexagon:Linux:*:*) | 955 | hexagon:Linux:*:*) |
901 | 971 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 956 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
902 | 972 | exit ;; | 957 | exit ;; |
903 | 973 | i*86:Linux:*:*) | 958 | i*86:Linux:*:*) |
905 | 974 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} | 959 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" |
906 | 975 | exit ;; | 960 | exit ;; |
907 | 976 | ia64:Linux:*:*) | 961 | ia64:Linux:*:*) |
909 | 977 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 962 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
910 | 978 | exit ;; | 963 | exit ;; |
911 | 979 | k1om:Linux:*:*) | 964 | k1om:Linux:*:*) |
913 | 980 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 965 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
914 | 981 | exit ;; | 966 | exit ;; |
915 | 982 | m32r*:Linux:*:*) | 967 | m32r*:Linux:*:*) |
917 | 983 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 968 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
918 | 984 | exit ;; | 969 | exit ;; |
919 | 985 | m68*:Linux:*:*) | 970 | m68*:Linux:*:*) |
921 | 986 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 971 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
922 | 987 | exit ;; | 972 | exit ;; |
923 | 988 | mips:Linux:*:* | mips64:Linux:*:*) | 973 | mips:Linux:*:* | mips64:Linux:*:*) |
926 | 989 | eval $set_cc_for_build | 974 | eval "$set_cc_for_build" |
927 | 990 | sed 's/^ //' << EOF >$dummy.c | 975 | sed 's/^ //' << EOF > "$dummy.c" |
928 | 991 | #undef CPU | 976 | #undef CPU |
929 | 992 | #undef ${UNAME_MACHINE} | 977 | #undef ${UNAME_MACHINE} |
930 | 993 | #undef ${UNAME_MACHINE}el | 978 | #undef ${UNAME_MACHINE}el |
931 | @@ -1001,70 +986,74 @@ EOF | |||
932 | 1001 | #endif | 986 | #endif |
933 | 1002 | #endif | 987 | #endif |
934 | 1003 | EOF | 988 | EOF |
937 | 1004 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` | 989 | eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" |
938 | 1005 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | 990 | test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } |
939 | 1006 | ;; | 991 | ;; |
940 | 1007 | mips64el:Linux:*:*) | 992 | mips64el:Linux:*:*) |
942 | 1008 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 993 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
943 | 1009 | exit ;; | 994 | exit ;; |
944 | 1010 | openrisc*:Linux:*:*) | 995 | openrisc*:Linux:*:*) |
946 | 1011 | echo or1k-unknown-linux-${LIBC} | 996 | echo or1k-unknown-linux-"$LIBC" |
947 | 1012 | exit ;; | 997 | exit ;; |
948 | 1013 | or32:Linux:*:* | or1k*:Linux:*:*) | 998 | or32:Linux:*:* | or1k*:Linux:*:*) |
950 | 1014 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 999 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
951 | 1015 | exit ;; | 1000 | exit ;; |
952 | 1016 | padre:Linux:*:*) | 1001 | padre:Linux:*:*) |
954 | 1017 | echo sparc-unknown-linux-${LIBC} | 1002 | echo sparc-unknown-linux-"$LIBC" |
955 | 1018 | exit ;; | 1003 | exit ;; |
956 | 1019 | parisc64:Linux:*:* | hppa64:Linux:*:*) | 1004 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
958 | 1020 | echo hppa64-unknown-linux-${LIBC} | 1005 | echo hppa64-unknown-linux-"$LIBC" |
959 | 1021 | exit ;; | 1006 | exit ;; |
960 | 1022 | parisc:Linux:*:* | hppa:Linux:*:*) | 1007 | parisc:Linux:*:* | hppa:Linux:*:*) |
961 | 1023 | # Look for CPU level | 1008 | # Look for CPU level |
962 | 1024 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | 1009 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
966 | 1025 | PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; | 1010 | PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; |
967 | 1026 | PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; | 1011 | PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; |
968 | 1027 | *) echo hppa-unknown-linux-${LIBC} ;; | 1012 | *) echo hppa-unknown-linux-"$LIBC" ;; |
969 | 1028 | esac | 1013 | esac |
970 | 1029 | exit ;; | 1014 | exit ;; |
971 | 1030 | ppc64:Linux:*:*) | 1015 | ppc64:Linux:*:*) |
973 | 1031 | echo powerpc64-unknown-linux-${LIBC} | 1016 | echo powerpc64-unknown-linux-"$LIBC" |
974 | 1032 | exit ;; | 1017 | exit ;; |
975 | 1033 | ppc:Linux:*:*) | 1018 | ppc:Linux:*:*) |
977 | 1034 | echo powerpc-unknown-linux-${LIBC} | 1019 | echo powerpc-unknown-linux-"$LIBC" |
978 | 1035 | exit ;; | 1020 | exit ;; |
979 | 1036 | ppc64le:Linux:*:*) | 1021 | ppc64le:Linux:*:*) |
981 | 1037 | echo powerpc64le-unknown-linux-${LIBC} | 1022 | echo powerpc64le-unknown-linux-"$LIBC" |
982 | 1038 | exit ;; | 1023 | exit ;; |
983 | 1039 | ppcle:Linux:*:*) | 1024 | ppcle:Linux:*:*) |
985 | 1040 | echo powerpcle-unknown-linux-${LIBC} | 1025 | echo powerpcle-unknown-linux-"$LIBC" |
986 | 1041 | exit ;; | 1026 | exit ;; |
987 | 1042 | riscv32:Linux:*:* | riscv64:Linux:*:*) | 1027 | riscv32:Linux:*:* | riscv64:Linux:*:*) |
989 | 1043 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1028 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
990 | 1044 | exit ;; | 1029 | exit ;; |
991 | 1045 | s390:Linux:*:* | s390x:Linux:*:*) | 1030 | s390:Linux:*:* | s390x:Linux:*:*) |
993 | 1046 | echo ${UNAME_MACHINE}-ibm-linux-${LIBC} | 1031 | echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" |
994 | 1047 | exit ;; | 1032 | exit ;; |
995 | 1048 | sh64*:Linux:*:*) | 1033 | sh64*:Linux:*:*) |
997 | 1049 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1034 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
998 | 1050 | exit ;; | 1035 | exit ;; |
999 | 1051 | sh*:Linux:*:*) | 1036 | sh*:Linux:*:*) |
1001 | 1052 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1037 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1002 | 1053 | exit ;; | 1038 | exit ;; |
1003 | 1054 | sparc:Linux:*:* | sparc64:Linux:*:*) | 1039 | sparc:Linux:*:* | sparc64:Linux:*:*) |
1005 | 1055 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1040 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1006 | 1056 | exit ;; | 1041 | exit ;; |
1007 | 1057 | tile*:Linux:*:*) | 1042 | tile*:Linux:*:*) |
1009 | 1058 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1043 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1010 | 1059 | exit ;; | 1044 | exit ;; |
1011 | 1060 | vax:Linux:*:*) | 1045 | vax:Linux:*:*) |
1013 | 1061 | echo ${UNAME_MACHINE}-dec-linux-${LIBC} | 1046 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" |
1014 | 1062 | exit ;; | 1047 | exit ;; |
1015 | 1063 | x86_64:Linux:*:*) | 1048 | x86_64:Linux:*:*) |
1017 | 1064 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} | 1049 | if objdump -f /bin/sh | grep -q elf32-x86-64; then |
1018 | 1050 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 | ||
1019 | 1051 | else | ||
1020 | 1052 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" | ||
1021 | 1053 | fi | ||
1022 | 1065 | exit ;; | 1054 | exit ;; |
1023 | 1066 | xtensa*:Linux:*:*) | 1055 | xtensa*:Linux:*:*) |
1025 | 1067 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1056 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1026 | 1068 | exit ;; | 1057 | exit ;; |
1027 | 1069 | i*86:DYNIX/ptx:4*:*) | 1058 | i*86:DYNIX/ptx:4*:*) |
1028 | 1070 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 1059 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1029 | @@ -1078,34 +1067,34 @@ EOF | |||
1030 | 1078 | # I am not positive that other SVR4 systems won't match this, | 1067 | # I am not positive that other SVR4 systems won't match this, |
1031 | 1079 | # I just have to hope. -- rms. | 1068 | # I just have to hope. -- rms. |
1032 | 1080 | # Use sysv4.2uw... so that sysv4* matches it. | 1069 | # Use sysv4.2uw... so that sysv4* matches it. |
1034 | 1081 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | 1070 | echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" |
1035 | 1082 | exit ;; | 1071 | exit ;; |
1036 | 1083 | i*86:OS/2:*:*) | 1072 | i*86:OS/2:*:*) |
1037 | 1084 | # If we were able to find `uname', then EMX Unix compatibility | 1073 | # If we were able to find `uname', then EMX Unix compatibility |
1038 | 1085 | # is probably installed. | 1074 | # is probably installed. |
1040 | 1086 | echo ${UNAME_MACHINE}-pc-os2-emx | 1075 | echo "$UNAME_MACHINE"-pc-os2-emx |
1041 | 1087 | exit ;; | 1076 | exit ;; |
1042 | 1088 | i*86:XTS-300:*:STOP) | 1077 | i*86:XTS-300:*:STOP) |
1044 | 1089 | echo ${UNAME_MACHINE}-unknown-stop | 1078 | echo "$UNAME_MACHINE"-unknown-stop |
1045 | 1090 | exit ;; | 1079 | exit ;; |
1046 | 1091 | i*86:atheos:*:*) | 1080 | i*86:atheos:*:*) |
1048 | 1092 | echo ${UNAME_MACHINE}-unknown-atheos | 1081 | echo "$UNAME_MACHINE"-unknown-atheos |
1049 | 1093 | exit ;; | 1082 | exit ;; |
1050 | 1094 | i*86:syllable:*:*) | 1083 | i*86:syllable:*:*) |
1052 | 1095 | echo ${UNAME_MACHINE}-pc-syllable | 1084 | echo "$UNAME_MACHINE"-pc-syllable |
1053 | 1096 | exit ;; | 1085 | exit ;; |
1054 | 1097 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) | 1086 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
1056 | 1098 | echo i386-unknown-lynxos${UNAME_RELEASE} | 1087 | echo i386-unknown-lynxos"$UNAME_RELEASE" |
1057 | 1099 | exit ;; | 1088 | exit ;; |
1058 | 1100 | i*86:*DOS:*:*) | 1089 | i*86:*DOS:*:*) |
1060 | 1101 | echo ${UNAME_MACHINE}-pc-msdosdjgpp | 1090 | echo "$UNAME_MACHINE"-pc-msdosdjgpp |
1061 | 1102 | exit ;; | 1091 | exit ;; |
1064 | 1103 | i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) | 1092 | i*86:*:4.*:*) |
1065 | 1104 | UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` | 1093 | UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` |
1066 | 1105 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then | 1094 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
1068 | 1106 | echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} | 1095 | echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" |
1069 | 1107 | else | 1096 | else |
1071 | 1108 | echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} | 1097 | echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" |
1072 | 1109 | fi | 1098 | fi |
1073 | 1110 | exit ;; | 1099 | exit ;; |
1074 | 1111 | i*86:*:5:[678]*) | 1100 | i*86:*:5:[678]*) |
1075 | @@ -1115,12 +1104,12 @@ EOF | |||
1076 | 1115 | *Pentium) UNAME_MACHINE=i586 ;; | 1104 | *Pentium) UNAME_MACHINE=i586 ;; |
1077 | 1116 | *Pent*|*Celeron) UNAME_MACHINE=i686 ;; | 1105 | *Pent*|*Celeron) UNAME_MACHINE=i686 ;; |
1078 | 1117 | esac | 1106 | esac |
1080 | 1118 | echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} | 1107 | echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" |
1081 | 1119 | exit ;; | 1108 | exit ;; |
1082 | 1120 | i*86:*:3.2:*) | 1109 | i*86:*:3.2:*) |
1083 | 1121 | if test -f /usr/options/cb.name; then | 1110 | if test -f /usr/options/cb.name; then |
1084 | 1122 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` | 1111 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` |
1086 | 1123 | echo ${UNAME_MACHINE}-pc-isc$UNAME_REL | 1112 | echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" |
1087 | 1124 | elif /bin/uname -X 2>/dev/null >/dev/null ; then | 1113 | elif /bin/uname -X 2>/dev/null >/dev/null ; then |
1088 | 1125 | UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` | 1114 | UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` |
1089 | 1126 | (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 | 1115 | (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 |
1090 | @@ -1130,9 +1119,9 @@ EOF | |||
1091 | 1130 | && UNAME_MACHINE=i686 | 1119 | && UNAME_MACHINE=i686 |
1092 | 1131 | (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ | 1120 | (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ |
1093 | 1132 | && UNAME_MACHINE=i686 | 1121 | && UNAME_MACHINE=i686 |
1095 | 1133 | echo ${UNAME_MACHINE}-pc-sco$UNAME_REL | 1122 | echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" |
1096 | 1134 | else | 1123 | else |
1098 | 1135 | echo ${UNAME_MACHINE}-pc-sysv32 | 1124 | echo "$UNAME_MACHINE"-pc-sysv32 |
1099 | 1136 | fi | 1125 | fi |
1100 | 1137 | exit ;; | 1126 | exit ;; |
1101 | 1138 | pc:*:*:*) | 1127 | pc:*:*:*) |
1102 | @@ -1152,9 +1141,9 @@ EOF | |||
1103 | 1152 | exit ;; | 1141 | exit ;; |
1104 | 1153 | i860:*:4.*:*) # i860-SVR4 | 1142 | i860:*:4.*:*) # i860-SVR4 |
1105 | 1154 | if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then | 1143 | if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then |
1107 | 1155 | echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 | 1144 | echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 |
1108 | 1156 | else # Add other i860-SVR4 vendors below as they are discovered. | 1145 | else # Add other i860-SVR4 vendors below as they are discovered. |
1110 | 1157 | echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 | 1146 | echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 |
1111 | 1158 | fi | 1147 | fi |
1112 | 1159 | exit ;; | 1148 | exit ;; |
1113 | 1160 | mini*:CTIX:SYS*5:*) | 1149 | mini*:CTIX:SYS*5:*) |
1114 | @@ -1174,9 +1163,9 @@ EOF | |||
1115 | 1174 | test -r /etc/.relid \ | 1163 | test -r /etc/.relid \ |
1116 | 1175 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | 1164 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
1117 | 1176 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1165 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1119 | 1177 | && { echo i486-ncr-sysv4.3${OS_REL}; exit; } | 1166 | && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } |
1120 | 1178 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1167 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1122 | 1179 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1168 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; |
1123 | 1180 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1169 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1124 | 1181 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1170 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1125 | 1182 | && { echo i486-ncr-sysv4; exit; } ;; | 1171 | && { echo i486-ncr-sysv4; exit; } ;; |
1126 | @@ -1185,28 +1174,28 @@ EOF | |||
1127 | 1185 | test -r /etc/.relid \ | 1174 | test -r /etc/.relid \ |
1128 | 1186 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | 1175 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
1129 | 1187 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1176 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1131 | 1188 | && { echo i486-ncr-sysv4.3${OS_REL}; exit; } | 1177 | && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } |
1132 | 1189 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1178 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1134 | 1190 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } | 1179 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } |
1135 | 1191 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ | 1180 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ |
1137 | 1192 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1181 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; |
1138 | 1193 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) | 1182 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
1140 | 1194 | echo m68k-unknown-lynxos${UNAME_RELEASE} | 1183 | echo m68k-unknown-lynxos"$UNAME_RELEASE" |
1141 | 1195 | exit ;; | 1184 | exit ;; |
1142 | 1196 | mc68030:UNIX_System_V:4.*:*) | 1185 | mc68030:UNIX_System_V:4.*:*) |
1143 | 1197 | echo m68k-atari-sysv4 | 1186 | echo m68k-atari-sysv4 |
1144 | 1198 | exit ;; | 1187 | exit ;; |
1145 | 1199 | TSUNAMI:LynxOS:2.*:*) | 1188 | TSUNAMI:LynxOS:2.*:*) |
1147 | 1200 | echo sparc-unknown-lynxos${UNAME_RELEASE} | 1189 | echo sparc-unknown-lynxos"$UNAME_RELEASE" |
1148 | 1201 | exit ;; | 1190 | exit ;; |
1149 | 1202 | rs6000:LynxOS:2.*:*) | 1191 | rs6000:LynxOS:2.*:*) |
1151 | 1203 | echo rs6000-unknown-lynxos${UNAME_RELEASE} | 1192 | echo rs6000-unknown-lynxos"$UNAME_RELEASE" |
1152 | 1204 | exit ;; | 1193 | exit ;; |
1153 | 1205 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) | 1194 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
1155 | 1206 | echo powerpc-unknown-lynxos${UNAME_RELEASE} | 1195 | echo powerpc-unknown-lynxos"$UNAME_RELEASE" |
1156 | 1207 | exit ;; | 1196 | exit ;; |
1157 | 1208 | SM[BE]S:UNIX_SV:*:*) | 1197 | SM[BE]S:UNIX_SV:*:*) |
1159 | 1209 | echo mips-dde-sysv${UNAME_RELEASE} | 1198 | echo mips-dde-sysv"$UNAME_RELEASE" |
1160 | 1210 | exit ;; | 1199 | exit ;; |
1161 | 1211 | RM*:ReliantUNIX-*:*:*) | 1200 | RM*:ReliantUNIX-*:*:*) |
1162 | 1212 | echo mips-sni-sysv4 | 1201 | echo mips-sni-sysv4 |
1163 | @@ -1217,7 +1206,7 @@ EOF | |||
1164 | 1217 | *:SINIX-*:*:*) | 1206 | *:SINIX-*:*:*) |
1165 | 1218 | if uname -p 2>/dev/null >/dev/null ; then | 1207 | if uname -p 2>/dev/null >/dev/null ; then |
1166 | 1219 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1208 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1168 | 1220 | echo ${UNAME_MACHINE}-sni-sysv4 | 1209 | echo "$UNAME_MACHINE"-sni-sysv4 |
1169 | 1221 | else | 1210 | else |
1170 | 1222 | echo ns32k-sni-sysv | 1211 | echo ns32k-sni-sysv |
1171 | 1223 | fi | 1212 | fi |
1172 | @@ -1237,23 +1226,23 @@ EOF | |||
1173 | 1237 | exit ;; | 1226 | exit ;; |
1174 | 1238 | i*86:VOS:*:*) | 1227 | i*86:VOS:*:*) |
1175 | 1239 | # From Paul.Green@stratus.com. | 1228 | # From Paul.Green@stratus.com. |
1177 | 1240 | echo ${UNAME_MACHINE}-stratus-vos | 1229 | echo "$UNAME_MACHINE"-stratus-vos |
1178 | 1241 | exit ;; | 1230 | exit ;; |
1179 | 1242 | *:VOS:*:*) | 1231 | *:VOS:*:*) |
1180 | 1243 | # From Paul.Green@stratus.com. | 1232 | # From Paul.Green@stratus.com. |
1181 | 1244 | echo hppa1.1-stratus-vos | 1233 | echo hppa1.1-stratus-vos |
1182 | 1245 | exit ;; | 1234 | exit ;; |
1183 | 1246 | mc68*:A/UX:*:*) | 1235 | mc68*:A/UX:*:*) |
1185 | 1247 | echo m68k-apple-aux${UNAME_RELEASE} | 1236 | echo m68k-apple-aux"$UNAME_RELEASE" |
1186 | 1248 | exit ;; | 1237 | exit ;; |
1187 | 1249 | news*:NEWS-OS:6*:*) | 1238 | news*:NEWS-OS:6*:*) |
1188 | 1250 | echo mips-sony-newsos6 | 1239 | echo mips-sony-newsos6 |
1189 | 1251 | exit ;; | 1240 | exit ;; |
1190 | 1252 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) | 1241 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1191 | 1253 | if [ -d /usr/nec ]; then | 1242 | if [ -d /usr/nec ]; then |
1193 | 1254 | echo mips-nec-sysv${UNAME_RELEASE} | 1243 | echo mips-nec-sysv"$UNAME_RELEASE" |
1194 | 1255 | else | 1244 | else |
1196 | 1256 | echo mips-unknown-sysv${UNAME_RELEASE} | 1245 | echo mips-unknown-sysv"$UNAME_RELEASE" |
1197 | 1257 | fi | 1246 | fi |
1198 | 1258 | exit ;; | 1247 | exit ;; |
1199 | 1259 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. | 1248 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1200 | @@ -1272,39 +1261,39 @@ EOF | |||
1201 | 1272 | echo x86_64-unknown-haiku | 1261 | echo x86_64-unknown-haiku |
1202 | 1273 | exit ;; | 1262 | exit ;; |
1203 | 1274 | SX-4:SUPER-UX:*:*) | 1263 | SX-4:SUPER-UX:*:*) |
1205 | 1275 | echo sx4-nec-superux${UNAME_RELEASE} | 1264 | echo sx4-nec-superux"$UNAME_RELEASE" |
1206 | 1276 | exit ;; | 1265 | exit ;; |
1207 | 1277 | SX-5:SUPER-UX:*:*) | 1266 | SX-5:SUPER-UX:*:*) |
1209 | 1278 | echo sx5-nec-superux${UNAME_RELEASE} | 1267 | echo sx5-nec-superux"$UNAME_RELEASE" |
1210 | 1279 | exit ;; | 1268 | exit ;; |
1211 | 1280 | SX-6:SUPER-UX:*:*) | 1269 | SX-6:SUPER-UX:*:*) |
1213 | 1281 | echo sx6-nec-superux${UNAME_RELEASE} | 1270 | echo sx6-nec-superux"$UNAME_RELEASE" |
1214 | 1282 | exit ;; | 1271 | exit ;; |
1215 | 1283 | SX-7:SUPER-UX:*:*) | 1272 | SX-7:SUPER-UX:*:*) |
1217 | 1284 | echo sx7-nec-superux${UNAME_RELEASE} | 1273 | echo sx7-nec-superux"$UNAME_RELEASE" |
1218 | 1285 | exit ;; | 1274 | exit ;; |
1219 | 1286 | SX-8:SUPER-UX:*:*) | 1275 | SX-8:SUPER-UX:*:*) |
1221 | 1287 | echo sx8-nec-superux${UNAME_RELEASE} | 1276 | echo sx8-nec-superux"$UNAME_RELEASE" |
1222 | 1288 | exit ;; | 1277 | exit ;; |
1223 | 1289 | SX-8R:SUPER-UX:*:*) | 1278 | SX-8R:SUPER-UX:*:*) |
1225 | 1290 | echo sx8r-nec-superux${UNAME_RELEASE} | 1279 | echo sx8r-nec-superux"$UNAME_RELEASE" |
1226 | 1291 | exit ;; | 1280 | exit ;; |
1227 | 1292 | SX-ACE:SUPER-UX:*:*) | 1281 | SX-ACE:SUPER-UX:*:*) |
1229 | 1293 | echo sxace-nec-superux${UNAME_RELEASE} | 1282 | echo sxace-nec-superux"$UNAME_RELEASE" |
1230 | 1294 | exit ;; | 1283 | exit ;; |
1231 | 1295 | Power*:Rhapsody:*:*) | 1284 | Power*:Rhapsody:*:*) |
1233 | 1296 | echo powerpc-apple-rhapsody${UNAME_RELEASE} | 1285 | echo powerpc-apple-rhapsody"$UNAME_RELEASE" |
1234 | 1297 | exit ;; | 1286 | exit ;; |
1235 | 1298 | *:Rhapsody:*:*) | 1287 | *:Rhapsody:*:*) |
1237 | 1299 | echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} | 1288 | echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" |
1238 | 1300 | exit ;; | 1289 | exit ;; |
1239 | 1301 | *:Darwin:*:*) | 1290 | *:Darwin:*:*) |
1240 | 1302 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1291 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1242 | 1303 | eval $set_cc_for_build | 1292 | eval "$set_cc_for_build" |
1243 | 1304 | if test "$UNAME_PROCESSOR" = unknown ; then | 1293 | if test "$UNAME_PROCESSOR" = unknown ; then |
1244 | 1305 | UNAME_PROCESSOR=powerpc | 1294 | UNAME_PROCESSOR=powerpc |
1245 | 1306 | fi | 1295 | fi |
1247 | 1307 | if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then | 1296 | if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then |
1248 | 1308 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then | 1297 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then |
1249 | 1309 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ | 1298 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1250 | 1310 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ | 1299 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1251 | @@ -1332,7 +1321,7 @@ EOF | |||
1252 | 1332 | # that Apple uses in portable devices. | 1321 | # that Apple uses in portable devices. |
1253 | 1333 | UNAME_PROCESSOR=x86_64 | 1322 | UNAME_PROCESSOR=x86_64 |
1254 | 1334 | fi | 1323 | fi |
1256 | 1335 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | 1324 | echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" |
1257 | 1336 | exit ;; | 1325 | exit ;; |
1258 | 1337 | *:procnto*:*:* | *:QNX:[0123456789]*:*) | 1326 | *:procnto*:*:* | *:QNX:[0123456789]*:*) |
1259 | 1338 | UNAME_PROCESSOR=`uname -p` | 1327 | UNAME_PROCESSOR=`uname -p` |
1260 | @@ -1340,22 +1329,25 @@ EOF | |||
1261 | 1340 | UNAME_PROCESSOR=i386 | 1329 | UNAME_PROCESSOR=i386 |
1262 | 1341 | UNAME_MACHINE=pc | 1330 | UNAME_MACHINE=pc |
1263 | 1342 | fi | 1331 | fi |
1265 | 1343 | echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} | 1332 | echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" |
1266 | 1344 | exit ;; | 1333 | exit ;; |
1267 | 1345 | *:QNX:*:4*) | 1334 | *:QNX:*:4*) |
1268 | 1346 | echo i386-pc-qnx | 1335 | echo i386-pc-qnx |
1269 | 1347 | exit ;; | 1336 | exit ;; |
1270 | 1348 | NEO-*:NONSTOP_KERNEL:*:*) | 1337 | NEO-*:NONSTOP_KERNEL:*:*) |
1272 | 1349 | echo neo-tandem-nsk${UNAME_RELEASE} | 1338 | echo neo-tandem-nsk"$UNAME_RELEASE" |
1273 | 1350 | exit ;; | 1339 | exit ;; |
1274 | 1351 | NSE-*:NONSTOP_KERNEL:*:*) | 1340 | NSE-*:NONSTOP_KERNEL:*:*) |
1276 | 1352 | echo nse-tandem-nsk${UNAME_RELEASE} | 1341 | echo nse-tandem-nsk"$UNAME_RELEASE" |
1277 | 1353 | exit ;; | 1342 | exit ;; |
1278 | 1354 | NSR-*:NONSTOP_KERNEL:*:*) | 1343 | NSR-*:NONSTOP_KERNEL:*:*) |
1280 | 1355 | echo nsr-tandem-nsk${UNAME_RELEASE} | 1344 | echo nsr-tandem-nsk"$UNAME_RELEASE" |
1281 | 1345 | exit ;; | ||
1282 | 1346 | NSV-*:NONSTOP_KERNEL:*:*) | ||
1283 | 1347 | echo nsv-tandem-nsk"$UNAME_RELEASE" | ||
1284 | 1356 | exit ;; | 1348 | exit ;; |
1285 | 1357 | NSX-*:NONSTOP_KERNEL:*:*) | 1349 | NSX-*:NONSTOP_KERNEL:*:*) |
1287 | 1358 | echo nsx-tandem-nsk${UNAME_RELEASE} | 1350 | echo nsx-tandem-nsk"$UNAME_RELEASE" |
1288 | 1359 | exit ;; | 1351 | exit ;; |
1289 | 1360 | *:NonStop-UX:*:*) | 1352 | *:NonStop-UX:*:*) |
1290 | 1361 | echo mips-compaq-nonstopux | 1353 | echo mips-compaq-nonstopux |
1291 | @@ -1364,7 +1356,7 @@ EOF | |||
1292 | 1364 | echo bs2000-siemens-sysv | 1356 | echo bs2000-siemens-sysv |
1293 | 1365 | exit ;; | 1357 | exit ;; |
1294 | 1366 | DS/*:UNIX_System_V:*:*) | 1358 | DS/*:UNIX_System_V:*:*) |
1296 | 1367 | echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} | 1359 | echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" |
1297 | 1368 | exit ;; | 1360 | exit ;; |
1298 | 1369 | *:Plan9:*:*) | 1361 | *:Plan9:*:*) |
1299 | 1370 | # "uname -m" is not consistent, so use $cputype instead. 386 | 1362 | # "uname -m" is not consistent, so use $cputype instead. 386 |
1300 | @@ -1375,7 +1367,7 @@ EOF | |||
1301 | 1375 | else | 1367 | else |
1302 | 1376 | UNAME_MACHINE="$cputype" | 1368 | UNAME_MACHINE="$cputype" |
1303 | 1377 | fi | 1369 | fi |
1305 | 1378 | echo ${UNAME_MACHINE}-unknown-plan9 | 1370 | echo "$UNAME_MACHINE"-unknown-plan9 |
1306 | 1379 | exit ;; | 1371 | exit ;; |
1307 | 1380 | *:TOPS-10:*:*) | 1372 | *:TOPS-10:*:*) |
1308 | 1381 | echo pdp10-unknown-tops10 | 1373 | echo pdp10-unknown-tops10 |
1309 | @@ -1396,14 +1388,14 @@ EOF | |||
1310 | 1396 | echo pdp10-unknown-its | 1388 | echo pdp10-unknown-its |
1311 | 1397 | exit ;; | 1389 | exit ;; |
1312 | 1398 | SEI:*:*:SEIUX) | 1390 | SEI:*:*:SEIUX) |
1314 | 1399 | echo mips-sei-seiux${UNAME_RELEASE} | 1391 | echo mips-sei-seiux"$UNAME_RELEASE" |
1315 | 1400 | exit ;; | 1392 | exit ;; |
1316 | 1401 | *:DragonFly:*:*) | 1393 | *:DragonFly:*:*) |
1318 | 1402 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 1394 | echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" |
1319 | 1403 | exit ;; | 1395 | exit ;; |
1320 | 1404 | *:*VMS:*:*) | 1396 | *:*VMS:*:*) |
1321 | 1405 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1397 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1323 | 1406 | case "${UNAME_MACHINE}" in | 1398 | case "$UNAME_MACHINE" in |
1324 | 1407 | A*) echo alpha-dec-vms ; exit ;; | 1399 | A*) echo alpha-dec-vms ; exit ;; |
1325 | 1408 | I*) echo ia64-dec-vms ; exit ;; | 1400 | I*) echo ia64-dec-vms ; exit ;; |
1326 | 1409 | V*) echo vax-dec-vms ; exit ;; | 1401 | V*) echo vax-dec-vms ; exit ;; |
1327 | @@ -1412,32 +1404,44 @@ EOF | |||
1328 | 1412 | echo i386-pc-xenix | 1404 | echo i386-pc-xenix |
1329 | 1413 | exit ;; | 1405 | exit ;; |
1330 | 1414 | i*86:skyos:*:*) | 1406 | i*86:skyos:*:*) |
1332 | 1415 | echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` | 1407 | echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" |
1333 | 1416 | exit ;; | 1408 | exit ;; |
1334 | 1417 | i*86:rdos:*:*) | 1409 | i*86:rdos:*:*) |
1336 | 1418 | echo ${UNAME_MACHINE}-pc-rdos | 1410 | echo "$UNAME_MACHINE"-pc-rdos |
1337 | 1419 | exit ;; | 1411 | exit ;; |
1338 | 1420 | i*86:AROS:*:*) | 1412 | i*86:AROS:*:*) |
1340 | 1421 | echo ${UNAME_MACHINE}-pc-aros | 1413 | echo "$UNAME_MACHINE"-pc-aros |
1341 | 1422 | exit ;; | 1414 | exit ;; |
1342 | 1423 | x86_64:VMkernel:*:*) | 1415 | x86_64:VMkernel:*:*) |
1344 | 1424 | echo ${UNAME_MACHINE}-unknown-esx | 1416 | echo "$UNAME_MACHINE"-unknown-esx |
1345 | 1425 | exit ;; | 1417 | exit ;; |
1346 | 1426 | amd64:Isilon\ OneFS:*:*) | 1418 | amd64:Isilon\ OneFS:*:*) |
1347 | 1427 | echo x86_64-unknown-onefs | 1419 | echo x86_64-unknown-onefs |
1348 | 1428 | exit ;; | 1420 | exit ;; |
1349 | 1429 | esac | 1421 | esac |
1350 | 1430 | 1422 | ||
1351 | 1423 | echo "$0: unable to guess system type" >&2 | ||
1352 | 1424 | |||
1353 | 1425 | case "$UNAME_MACHINE:$UNAME_SYSTEM" in | ||
1354 | 1426 | mips:Linux | mips64:Linux) | ||
1355 | 1427 | # If we got here on MIPS GNU/Linux, output extra information. | ||
1356 | 1428 | cat >&2 <<EOF | ||
1357 | 1429 | |||
1358 | 1430 | NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize | ||
1359 | 1431 | the system type. Please install a C compiler and try again. | ||
1360 | 1432 | EOF | ||
1361 | 1433 | ;; | ||
1362 | 1434 | esac | ||
1363 | 1435 | |||
1364 | 1431 | cat >&2 <<EOF | 1436 | cat >&2 <<EOF |
1365 | 1432 | $0: unable to guess system type | ||
1366 | 1433 | 1437 | ||
1367 | 1434 | This script (version $timestamp), has failed to recognize the | 1438 | This script (version $timestamp), has failed to recognize the |
1368 | 1435 | operating system you are using. If your script is old, overwrite *all* | 1439 | operating system you are using. If your script is old, overwrite *all* |
1369 | 1436 | copies of config.guess and config.sub with the latest versions from: | 1440 | copies of config.guess and config.sub with the latest versions from: |
1370 | 1437 | 1441 | ||
1372 | 1438 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess | 1442 | https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
1373 | 1439 | and | 1443 | and |
1375 | 1440 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub | 1444 | https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
1376 | 1441 | 1445 | ||
1377 | 1442 | If $0 has already been updated, send the following data and any | 1446 | If $0 has already been updated, send the following data and any |
1378 | 1443 | information you think might be pertinent to config-patches@gnu.org to | 1447 | information you think might be pertinent to config-patches@gnu.org to |
1379 | @@ -1460,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null` | |||
1380 | 1460 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` | 1464 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` |
1381 | 1461 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` | 1465 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` |
1382 | 1462 | 1466 | ||
1387 | 1463 | UNAME_MACHINE = ${UNAME_MACHINE} | 1467 | UNAME_MACHINE = "$UNAME_MACHINE" |
1388 | 1464 | UNAME_RELEASE = ${UNAME_RELEASE} | 1468 | UNAME_RELEASE = "$UNAME_RELEASE" |
1389 | 1465 | UNAME_SYSTEM = ${UNAME_SYSTEM} | 1469 | UNAME_SYSTEM = "$UNAME_SYSTEM" |
1390 | 1466 | UNAME_VERSION = ${UNAME_VERSION} | 1470 | UNAME_VERSION = "$UNAME_VERSION" |
1391 | 1467 | EOF | 1471 | EOF |
1392 | 1468 | 1472 | ||
1393 | 1469 | exit 1 | 1473 | exit 1 |
1394 | 1470 | 1474 | ||
1395 | 1471 | # Local variables: | 1475 | # Local variables: |
1397 | 1472 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 1476 | # eval: (add-hook 'write-file-functions 'time-stamp) |
1398 | 1473 | # time-stamp-start: "timestamp='" | 1477 | # time-stamp-start: "timestamp='" |
1399 | 1474 | # time-stamp-format: "%:y-%02m-%02d" | 1478 | # time-stamp-format: "%:y-%02m-%02d" |
1400 | 1475 | # time-stamp-end: "'" | 1479 | # time-stamp-end: "'" |
1401 | diff --git a/build-aux/config.sub b/build-aux/config.sub | |||
1402 | index f4bafc1..1d8e98b 100755 | |||
1403 | --- a/build-aux/config.sub | |||
1404 | +++ b/build-aux/config.sub | |||
1405 | @@ -1,8 +1,8 @@ | |||
1407 | 1 | #!/bin/sh | 1 | #! /bin/sh |
1408 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
1410 | 3 | # Copyright 1992-2017 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
1411 | 4 | 4 | ||
1413 | 5 | timestamp='2017-04-02' | 5 | timestamp='2018-02-22' |
1414 | 6 | 6 | ||
1415 | 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
1416 | 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
1417 | @@ -15,7 +15,7 @@ timestamp='2017-04-02' | |||
1418 | 15 | # General Public License for more details. | 15 | # General Public License for more details. |
1419 | 16 | # | 16 | # |
1420 | 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
1422 | 18 | # along with this program; if not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program; if not, see <https://www.gnu.org/licenses/>. |
1423 | 19 | # | 19 | # |
1424 | 20 | # As a special exception to the GNU General Public License, if you | 20 | # As a special exception to the GNU General Public License, if you |
1425 | 21 | # distribute this file as part of a program that contains a | 21 | # distribute this file as part of a program that contains a |
1426 | @@ -33,7 +33,7 @@ timestamp='2017-04-02' | |||
1427 | 33 | # Otherwise, we print the canonical config type on stdout and succeed. | 33 | # Otherwise, we print the canonical config type on stdout and succeed. |
1428 | 34 | 34 | ||
1429 | 35 | # You can get the latest version of this script from: | 35 | # You can get the latest version of this script from: |
1431 | 36 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub | 36 | # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
1432 | 37 | 37 | ||
1433 | 38 | # This file is supposed to be the same for all GNU packages | 38 | # This file is supposed to be the same for all GNU packages |
1434 | 39 | # and recognize all the CPU types, system types and aliases | 39 | # and recognize all the CPU types, system types and aliases |
1435 | @@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS | |||
1436 | 57 | 57 | ||
1437 | 58 | Canonicalize a configuration name. | 58 | Canonicalize a configuration name. |
1438 | 59 | 59 | ||
1440 | 60 | Operation modes: | 60 | Options: |
1441 | 61 | -h, --help print this help, then exit | 61 | -h, --help print this help, then exit |
1442 | 62 | -t, --time-stamp print date of last modification, then exit | 62 | -t, --time-stamp print date of last modification, then exit |
1443 | 63 | -v, --version print version number, then exit | 63 | -v, --version print version number, then exit |
1444 | @@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." | |||
1445 | 67 | version="\ | 67 | version="\ |
1446 | 68 | GNU config.sub ($timestamp) | 68 | GNU config.sub ($timestamp) |
1447 | 69 | 69 | ||
1449 | 70 | Copyright 1992-2017 Free Software Foundation, Inc. | 70 | Copyright 1992-2018 Free Software Foundation, Inc. |
1450 | 71 | 71 | ||
1451 | 72 | This is free software; see the source for copying conditions. There is NO | 72 | This is free software; see the source for copying conditions. There is NO |
1452 | 73 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 73 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1453 | @@ -94,7 +94,7 @@ while test $# -gt 0 ; do | |||
1454 | 94 | 94 | ||
1455 | 95 | *local*) | 95 | *local*) |
1456 | 96 | # First pass through any local machine types. | 96 | # First pass through any local machine types. |
1458 | 97 | echo $1 | 97 | echo "$1" |
1459 | 98 | exit ;; | 98 | exit ;; |
1460 | 99 | 99 | ||
1461 | 100 | * ) | 100 | * ) |
1462 | @@ -112,7 +112,7 @@ esac | |||
1463 | 112 | 112 | ||
1464 | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). |
1465 | 114 | # Here we must recognize all the valid KERNEL-OS combinations. | 114 | # Here we must recognize all the valid KERNEL-OS combinations. |
1467 | 115 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 115 | maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1468 | 116 | case $maybe_os in | 116 | case $maybe_os in |
1469 | 117 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ | 117 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1470 | 118 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ | 118 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1471 | @@ -120,16 +120,16 @@ case $maybe_os in | |||
1472 | 120 | kopensolaris*-gnu* | cloudabi*-eabi* | \ | 120 | kopensolaris*-gnu* | cloudabi*-eabi* | \ |
1473 | 121 | storm-chaos* | os2-emx* | rtmk-nova*) | 121 | storm-chaos* | os2-emx* | rtmk-nova*) |
1474 | 122 | os=-$maybe_os | 122 | os=-$maybe_os |
1476 | 123 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 123 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
1477 | 124 | ;; | 124 | ;; |
1478 | 125 | android-linux) | 125 | android-linux) |
1479 | 126 | os=-linux-android | 126 | os=-linux-android |
1481 | 127 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | 127 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
1482 | 128 | ;; | 128 | ;; |
1483 | 129 | *) | 129 | *) |
1487 | 130 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` | 130 | basic_machine=`echo "$1" | sed 's/-[^-]*$//'` |
1488 | 131 | if [ $basic_machine != $1 ] | 131 | if [ "$basic_machine" != "$1" ] |
1489 | 132 | then os=`echo $1 | sed 's/.*-/-/'` | 132 | then os=`echo "$1" | sed 's/.*-/-/'` |
1490 | 133 | else os=; fi | 133 | else os=; fi |
1491 | 134 | ;; | 134 | ;; |
1492 | 135 | esac | 135 | esac |
1493 | @@ -178,44 +178,44 @@ case $os in | |||
1494 | 178 | ;; | 178 | ;; |
1495 | 179 | -sco6) | 179 | -sco6) |
1496 | 180 | os=-sco5v6 | 180 | os=-sco5v6 |
1498 | 181 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 181 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1499 | 182 | ;; | 182 | ;; |
1500 | 183 | -sco5) | 183 | -sco5) |
1501 | 184 | os=-sco3.2v5 | 184 | os=-sco3.2v5 |
1503 | 185 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 185 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1504 | 186 | ;; | 186 | ;; |
1505 | 187 | -sco4) | 187 | -sco4) |
1506 | 188 | os=-sco3.2v4 | 188 | os=-sco3.2v4 |
1508 | 189 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 189 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1509 | 190 | ;; | 190 | ;; |
1510 | 191 | -sco3.2.[4-9]*) | 191 | -sco3.2.[4-9]*) |
1511 | 192 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` | 192 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` |
1513 | 193 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 193 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1514 | 194 | ;; | 194 | ;; |
1515 | 195 | -sco3.2v[4-9]*) | 195 | -sco3.2v[4-9]*) |
1516 | 196 | # Don't forget version if it is 3.2v4 or newer. | 196 | # Don't forget version if it is 3.2v4 or newer. |
1518 | 197 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 197 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1519 | 198 | ;; | 198 | ;; |
1520 | 199 | -sco5v6*) | 199 | -sco5v6*) |
1521 | 200 | # Don't forget version if it is 3.2v4 or newer. | 200 | # Don't forget version if it is 3.2v4 or newer. |
1523 | 201 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 201 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1524 | 202 | ;; | 202 | ;; |
1525 | 203 | -sco*) | 203 | -sco*) |
1526 | 204 | os=-sco3.2v2 | 204 | os=-sco3.2v2 |
1528 | 205 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 205 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1529 | 206 | ;; | 206 | ;; |
1530 | 207 | -udk*) | 207 | -udk*) |
1532 | 208 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 208 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1533 | 209 | ;; | 209 | ;; |
1534 | 210 | -isc) | 210 | -isc) |
1535 | 211 | os=-isc2.2 | 211 | os=-isc2.2 |
1537 | 212 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 212 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1538 | 213 | ;; | 213 | ;; |
1539 | 214 | -clix*) | 214 | -clix*) |
1540 | 215 | basic_machine=clipper-intergraph | 215 | basic_machine=clipper-intergraph |
1541 | 216 | ;; | 216 | ;; |
1542 | 217 | -isc*) | 217 | -isc*) |
1544 | 218 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 218 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1545 | 219 | ;; | 219 | ;; |
1546 | 220 | -lynx*178) | 220 | -lynx*178) |
1547 | 221 | os=-lynxos178 | 221 | os=-lynxos178 |
1548 | @@ -227,10 +227,7 @@ case $os in | |||
1549 | 227 | os=-lynxos | 227 | os=-lynxos |
1550 | 228 | ;; | 228 | ;; |
1551 | 229 | -ptx*) | 229 | -ptx*) |
1556 | 230 | basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` | 230 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` |
1553 | 231 | ;; | ||
1554 | 232 | -windowsnt*) | ||
1555 | 233 | os=`echo $os | sed -e 's/windowsnt/winnt/'` | ||
1557 | 234 | ;; | 231 | ;; |
1558 | 235 | -psos*) | 232 | -psos*) |
1559 | 236 | os=-psos | 233 | os=-psos |
1560 | @@ -299,7 +296,7 @@ case $basic_machine in | |||
1561 | 299 | | nios | nios2 | nios2eb | nios2el \ | 296 | | nios | nios2 | nios2eb | nios2el \ |
1562 | 300 | | ns16k | ns32k \ | 297 | | ns16k | ns32k \ |
1563 | 301 | | open8 | or1k | or1knd | or32 \ | 298 | | open8 | or1k | or1knd | or32 \ |
1565 | 302 | | pdp10 | pdp11 | pj | pjl \ | 299 | | pdp10 | pj | pjl \ |
1566 | 303 | | powerpc | powerpc64 | powerpc64le | powerpcle \ | 300 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
1567 | 304 | | pru \ | 301 | | pru \ |
1568 | 305 | | pyramid \ | 302 | | pyramid \ |
1569 | @@ -316,7 +313,6 @@ case $basic_machine in | |||
1570 | 316 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | 313 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
1571 | 317 | | visium \ | 314 | | visium \ |
1572 | 318 | | wasm32 \ | 315 | | wasm32 \ |
1573 | 319 | | we32k \ | ||
1574 | 320 | | x86 | xc16x | xstormy16 | xtensa \ | 316 | | x86 | xc16x | xstormy16 | xtensa \ |
1575 | 321 | | z8k | z80) | 317 | | z8k | z80) |
1576 | 322 | basic_machine=$basic_machine-unknown | 318 | basic_machine=$basic_machine-unknown |
1577 | @@ -337,7 +333,7 @@ case $basic_machine in | |||
1578 | 337 | basic_machine=$basic_machine-unknown | 333 | basic_machine=$basic_machine-unknown |
1579 | 338 | os=-none | 334 | os=-none |
1580 | 339 | ;; | 335 | ;; |
1582 | 340 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) | 336 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) |
1583 | 341 | ;; | 337 | ;; |
1584 | 342 | ms1) | 338 | ms1) |
1585 | 343 | basic_machine=mt-unknown | 339 | basic_machine=mt-unknown |
1586 | @@ -366,7 +362,7 @@ case $basic_machine in | |||
1587 | 366 | ;; | 362 | ;; |
1588 | 367 | # Object if more than one company name word. | 363 | # Object if more than one company name word. |
1589 | 368 | *-*-*) | 364 | *-*-*) |
1591 | 369 | echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 | 365 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 |
1592 | 370 | exit 1 | 366 | exit 1 |
1593 | 371 | ;; | 367 | ;; |
1594 | 372 | # Recognize the basic CPU types with company name. | 368 | # Recognize the basic CPU types with company name. |
1595 | @@ -461,7 +457,7 @@ case $basic_machine in | |||
1596 | 461 | # Recognize the various machine names and aliases which stand | 457 | # Recognize the various machine names and aliases which stand |
1597 | 462 | # for a CPU type and a company and sometimes even an OS. | 458 | # for a CPU type and a company and sometimes even an OS. |
1598 | 463 | 386bsd) | 459 | 386bsd) |
1600 | 464 | basic_machine=i386-unknown | 460 | basic_machine=i386-pc |
1601 | 465 | os=-bsd | 461 | os=-bsd |
1602 | 466 | ;; | 462 | ;; |
1603 | 467 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) | 463 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) |
1604 | @@ -495,7 +491,7 @@ case $basic_machine in | |||
1605 | 495 | basic_machine=x86_64-pc | 491 | basic_machine=x86_64-pc |
1606 | 496 | ;; | 492 | ;; |
1607 | 497 | amd64-*) | 493 | amd64-*) |
1609 | 498 | basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` | 494 | basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1610 | 499 | ;; | 495 | ;; |
1611 | 500 | amdahl) | 496 | amdahl) |
1612 | 501 | basic_machine=580-amdahl | 497 | basic_machine=580-amdahl |
1613 | @@ -540,7 +536,7 @@ case $basic_machine in | |||
1614 | 540 | os=-linux | 536 | os=-linux |
1615 | 541 | ;; | 537 | ;; |
1616 | 542 | blackfin-*) | 538 | blackfin-*) |
1618 | 543 | basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` | 539 | basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1619 | 544 | os=-linux | 540 | os=-linux |
1620 | 545 | ;; | 541 | ;; |
1621 | 546 | bluegene*) | 542 | bluegene*) |
1622 | @@ -548,13 +544,13 @@ case $basic_machine in | |||
1623 | 548 | os=-cnk | 544 | os=-cnk |
1624 | 549 | ;; | 545 | ;; |
1625 | 550 | c54x-*) | 546 | c54x-*) |
1627 | 551 | basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` | 547 | basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1628 | 552 | ;; | 548 | ;; |
1629 | 553 | c55x-*) | 549 | c55x-*) |
1631 | 554 | basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` | 550 | basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1632 | 555 | ;; | 551 | ;; |
1633 | 556 | c6x-*) | 552 | c6x-*) |
1635 | 557 | basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` | 553 | basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1636 | 558 | ;; | 554 | ;; |
1637 | 559 | c90) | 555 | c90) |
1638 | 560 | basic_machine=c90-cray | 556 | basic_machine=c90-cray |
1639 | @@ -643,7 +639,7 @@ case $basic_machine in | |||
1640 | 643 | basic_machine=rs6000-bull | 639 | basic_machine=rs6000-bull |
1641 | 644 | os=-bosx | 640 | os=-bosx |
1642 | 645 | ;; | 641 | ;; |
1644 | 646 | dpx2* | dpx2*-bull) | 642 | dpx2*) |
1645 | 647 | basic_machine=m68k-bull | 643 | basic_machine=m68k-bull |
1646 | 648 | os=-sysv3 | 644 | os=-sysv3 |
1647 | 649 | ;; | 645 | ;; |
1648 | @@ -652,7 +648,7 @@ case $basic_machine in | |||
1649 | 652 | os=$os"spe" | 648 | os=$os"spe" |
1650 | 653 | ;; | 649 | ;; |
1651 | 654 | e500v[12]-*) | 650 | e500v[12]-*) |
1653 | 655 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 651 | basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1654 | 656 | os=$os"spe" | 652 | os=$os"spe" |
1655 | 657 | ;; | 653 | ;; |
1656 | 658 | ebmon29k) | 654 | ebmon29k) |
1657 | @@ -744,9 +740,6 @@ case $basic_machine in | |||
1658 | 744 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) | 740 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) |
1659 | 745 | basic_machine=hppa1.0-hp | 741 | basic_machine=hppa1.0-hp |
1660 | 746 | ;; | 742 | ;; |
1661 | 747 | hppa-next) | ||
1662 | 748 | os=-nextstep3 | ||
1663 | 749 | ;; | ||
1664 | 750 | hppaosf) | 743 | hppaosf) |
1665 | 751 | basic_machine=hppa1.1-hp | 744 | basic_machine=hppa1.1-hp |
1666 | 752 | os=-osf | 745 | os=-osf |
1667 | @@ -759,26 +752,26 @@ case $basic_machine in | |||
1668 | 759 | basic_machine=i370-ibm | 752 | basic_machine=i370-ibm |
1669 | 760 | ;; | 753 | ;; |
1670 | 761 | i*86v32) | 754 | i*86v32) |
1672 | 762 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 755 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
1673 | 763 | os=-sysv32 | 756 | os=-sysv32 |
1674 | 764 | ;; | 757 | ;; |
1675 | 765 | i*86v4*) | 758 | i*86v4*) |
1677 | 766 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 759 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
1678 | 767 | os=-sysv4 | 760 | os=-sysv4 |
1679 | 768 | ;; | 761 | ;; |
1680 | 769 | i*86v) | 762 | i*86v) |
1682 | 770 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 763 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
1683 | 771 | os=-sysv | 764 | os=-sysv |
1684 | 772 | ;; | 765 | ;; |
1685 | 773 | i*86sol2) | 766 | i*86sol2) |
1687 | 774 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 767 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
1688 | 775 | os=-solaris2 | 768 | os=-solaris2 |
1689 | 776 | ;; | 769 | ;; |
1690 | 777 | i386mach) | 770 | i386mach) |
1691 | 778 | basic_machine=i386-mach | 771 | basic_machine=i386-mach |
1692 | 779 | os=-mach | 772 | os=-mach |
1693 | 780 | ;; | 773 | ;; |
1695 | 781 | i386-vsta | vsta) | 774 | vsta) |
1696 | 782 | basic_machine=i386-unknown | 775 | basic_machine=i386-unknown |
1697 | 783 | os=-vsta | 776 | os=-vsta |
1698 | 784 | ;; | 777 | ;; |
1699 | @@ -797,19 +790,16 @@ case $basic_machine in | |||
1700 | 797 | os=-sysv | 790 | os=-sysv |
1701 | 798 | ;; | 791 | ;; |
1702 | 799 | leon-*|leon[3-9]-*) | 792 | leon-*|leon[3-9]-*) |
1704 | 800 | basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` | 793 | basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` |
1705 | 801 | ;; | 794 | ;; |
1706 | 802 | m68knommu) | 795 | m68knommu) |
1707 | 803 | basic_machine=m68k-unknown | 796 | basic_machine=m68k-unknown |
1708 | 804 | os=-linux | 797 | os=-linux |
1709 | 805 | ;; | 798 | ;; |
1710 | 806 | m68knommu-*) | 799 | m68knommu-*) |
1712 | 807 | basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` | 800 | basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1713 | 808 | os=-linux | 801 | os=-linux |
1714 | 809 | ;; | 802 | ;; |
1715 | 810 | m88k-omron*) | ||
1716 | 811 | basic_machine=m88k-omron | ||
1717 | 812 | ;; | ||
1718 | 813 | magnum | m3230) | 803 | magnum | m3230) |
1719 | 814 | basic_machine=mips-mips | 804 | basic_machine=mips-mips |
1720 | 815 | os=-sysv | 805 | os=-sysv |
1721 | @@ -841,10 +831,10 @@ case $basic_machine in | |||
1722 | 841 | os=-mint | 831 | os=-mint |
1723 | 842 | ;; | 832 | ;; |
1724 | 843 | mips3*-*) | 833 | mips3*-*) |
1726 | 844 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` | 834 | basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` |
1727 | 845 | ;; | 835 | ;; |
1728 | 846 | mips3*) | 836 | mips3*) |
1730 | 847 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown | 837 | basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown |
1731 | 848 | ;; | 838 | ;; |
1732 | 849 | monitor) | 839 | monitor) |
1733 | 850 | basic_machine=m68k-rom68k | 840 | basic_machine=m68k-rom68k |
1734 | @@ -863,7 +853,7 @@ case $basic_machine in | |||
1735 | 863 | os=-msdos | 853 | os=-msdos |
1736 | 864 | ;; | 854 | ;; |
1737 | 865 | ms1-*) | 855 | ms1-*) |
1739 | 866 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` | 856 | basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` |
1740 | 867 | ;; | 857 | ;; |
1741 | 868 | msys) | 858 | msys) |
1742 | 869 | basic_machine=i686-pc | 859 | basic_machine=i686-pc |
1743 | @@ -905,7 +895,7 @@ case $basic_machine in | |||
1744 | 905 | basic_machine=v70-nec | 895 | basic_machine=v70-nec |
1745 | 906 | os=-sysv | 896 | os=-sysv |
1746 | 907 | ;; | 897 | ;; |
1748 | 908 | next | m*-next ) | 898 | next | m*-next) |
1749 | 909 | basic_machine=m68k-next | 899 | basic_machine=m68k-next |
1750 | 910 | case $os in | 900 | case $os in |
1751 | 911 | -nextstep* ) | 901 | -nextstep* ) |
1752 | @@ -950,6 +940,9 @@ case $basic_machine in | |||
1753 | 950 | nsr-tandem) | 940 | nsr-tandem) |
1754 | 951 | basic_machine=nsr-tandem | 941 | basic_machine=nsr-tandem |
1755 | 952 | ;; | 942 | ;; |
1756 | 943 | nsv-tandem) | ||
1757 | 944 | basic_machine=nsv-tandem | ||
1758 | 945 | ;; | ||
1759 | 953 | nsx-tandem) | 946 | nsx-tandem) |
1760 | 954 | basic_machine=nsx-tandem | 947 | basic_machine=nsx-tandem |
1761 | 955 | ;; | 948 | ;; |
1762 | @@ -985,7 +978,7 @@ case $basic_machine in | |||
1763 | 985 | os=-linux | 978 | os=-linux |
1764 | 986 | ;; | 979 | ;; |
1765 | 987 | parisc-*) | 980 | parisc-*) |
1767 | 988 | basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` | 981 | basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1768 | 989 | os=-linux | 982 | os=-linux |
1769 | 990 | ;; | 983 | ;; |
1770 | 991 | pbd) | 984 | pbd) |
1771 | @@ -1001,7 +994,7 @@ case $basic_machine in | |||
1772 | 1001 | basic_machine=i386-pc | 994 | basic_machine=i386-pc |
1773 | 1002 | ;; | 995 | ;; |
1774 | 1003 | pc98-*) | 996 | pc98-*) |
1776 | 1004 | basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` | 997 | basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1777 | 1005 | ;; | 998 | ;; |
1778 | 1006 | pentium | p5 | k5 | k6 | nexgen | viac3) | 999 | pentium | p5 | k5 | k6 | nexgen | viac3) |
1779 | 1007 | basic_machine=i586-pc | 1000 | basic_machine=i586-pc |
1780 | @@ -1016,16 +1009,16 @@ case $basic_machine in | |||
1781 | 1016 | basic_machine=i786-pc | 1009 | basic_machine=i786-pc |
1782 | 1017 | ;; | 1010 | ;; |
1783 | 1018 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) | 1011 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) |
1785 | 1019 | basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` | 1012 | basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1786 | 1020 | ;; | 1013 | ;; |
1787 | 1021 | pentiumpro-* | p6-* | 6x86-* | athlon-*) | 1014 | pentiumpro-* | p6-* | 6x86-* | athlon-*) |
1789 | 1022 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` | 1015 | basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1790 | 1023 | ;; | 1016 | ;; |
1791 | 1024 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) | 1017 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) |
1793 | 1025 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` | 1018 | basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1794 | 1026 | ;; | 1019 | ;; |
1795 | 1027 | pentium4-*) | 1020 | pentium4-*) |
1797 | 1028 | basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` | 1021 | basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1798 | 1029 | ;; | 1022 | ;; |
1799 | 1030 | pn) | 1023 | pn) |
1800 | 1031 | basic_machine=pn-gould | 1024 | basic_machine=pn-gould |
1801 | @@ -1035,23 +1028,23 @@ case $basic_machine in | |||
1802 | 1035 | ppc | ppcbe) basic_machine=powerpc-unknown | 1028 | ppc | ppcbe) basic_machine=powerpc-unknown |
1803 | 1036 | ;; | 1029 | ;; |
1804 | 1037 | ppc-* | ppcbe-*) | 1030 | ppc-* | ppcbe-*) |
1806 | 1038 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 1031 | basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1807 | 1039 | ;; | 1032 | ;; |
1808 | 1040 | ppcle | powerpclittle) | 1033 | ppcle | powerpclittle) |
1809 | 1041 | basic_machine=powerpcle-unknown | 1034 | basic_machine=powerpcle-unknown |
1810 | 1042 | ;; | 1035 | ;; |
1811 | 1043 | ppcle-* | powerpclittle-*) | 1036 | ppcle-* | powerpclittle-*) |
1813 | 1044 | basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` | 1037 | basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1814 | 1045 | ;; | 1038 | ;; |
1815 | 1046 | ppc64) basic_machine=powerpc64-unknown | 1039 | ppc64) basic_machine=powerpc64-unknown |
1816 | 1047 | ;; | 1040 | ;; |
1818 | 1048 | ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` | 1041 | ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1819 | 1049 | ;; | 1042 | ;; |
1820 | 1050 | ppc64le | powerpc64little) | 1043 | ppc64le | powerpc64little) |
1821 | 1051 | basic_machine=powerpc64le-unknown | 1044 | basic_machine=powerpc64le-unknown |
1822 | 1052 | ;; | 1045 | ;; |
1823 | 1053 | ppc64le-* | powerpc64little-*) | 1046 | ppc64le-* | powerpc64little-*) |
1825 | 1054 | basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` | 1047 | basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1826 | 1055 | ;; | 1048 | ;; |
1827 | 1056 | ps2) | 1049 | ps2) |
1828 | 1057 | basic_machine=i386-ibm | 1050 | basic_machine=i386-ibm |
1829 | @@ -1105,17 +1098,10 @@ case $basic_machine in | |||
1830 | 1105 | sequent) | 1098 | sequent) |
1831 | 1106 | basic_machine=i386-sequent | 1099 | basic_machine=i386-sequent |
1832 | 1107 | ;; | 1100 | ;; |
1833 | 1108 | sh) | ||
1834 | 1109 | basic_machine=sh-hitachi | ||
1835 | 1110 | os=-hms | ||
1836 | 1111 | ;; | ||
1837 | 1112 | sh5el) | 1101 | sh5el) |
1838 | 1113 | basic_machine=sh5le-unknown | 1102 | basic_machine=sh5le-unknown |
1839 | 1114 | ;; | 1103 | ;; |
1844 | 1115 | sh64) | 1104 | simso-wrs) |
1841 | 1116 | basic_machine=sh64-unknown | ||
1842 | 1117 | ;; | ||
1843 | 1118 | sparclite-wrs | simso-wrs) | ||
1845 | 1119 | basic_machine=sparclite-wrs | 1105 | basic_machine=sparclite-wrs |
1846 | 1120 | os=-vxworks | 1106 | os=-vxworks |
1847 | 1121 | ;; | 1107 | ;; |
1848 | @@ -1134,7 +1120,7 @@ case $basic_machine in | |||
1849 | 1134 | os=-sysv4 | 1120 | os=-sysv4 |
1850 | 1135 | ;; | 1121 | ;; |
1851 | 1136 | strongarm-* | thumb-*) | 1122 | strongarm-* | thumb-*) |
1853 | 1137 | basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` | 1123 | basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
1854 | 1138 | ;; | 1124 | ;; |
1855 | 1139 | sun2) | 1125 | sun2) |
1856 | 1140 | basic_machine=m68000-sun | 1126 | basic_machine=m68000-sun |
1857 | @@ -1248,9 +1234,6 @@ case $basic_machine in | |||
1858 | 1248 | basic_machine=a29k-wrs | 1234 | basic_machine=a29k-wrs |
1859 | 1249 | os=-vxworks | 1235 | os=-vxworks |
1860 | 1250 | ;; | 1236 | ;; |
1861 | 1251 | wasm32) | ||
1862 | 1252 | basic_machine=wasm32-unknown | ||
1863 | 1253 | ;; | ||
1864 | 1254 | w65*) | 1237 | w65*) |
1865 | 1255 | basic_machine=w65-wdc | 1238 | basic_machine=w65-wdc |
1866 | 1256 | os=-none | 1239 | os=-none |
1867 | @@ -1259,6 +1242,9 @@ case $basic_machine in | |||
1868 | 1259 | basic_machine=hppa1.1-winbond | 1242 | basic_machine=hppa1.1-winbond |
1869 | 1260 | os=-proelf | 1243 | os=-proelf |
1870 | 1261 | ;; | 1244 | ;; |
1871 | 1245 | x64) | ||
1872 | 1246 | basic_machine=x86_64-pc | ||
1873 | 1247 | ;; | ||
1874 | 1262 | xbox) | 1248 | xbox) |
1875 | 1263 | basic_machine=i686-pc | 1249 | basic_machine=i686-pc |
1876 | 1264 | os=-mingw32 | 1250 | os=-mingw32 |
1877 | @@ -1267,20 +1253,12 @@ case $basic_machine in | |||
1878 | 1267 | basic_machine=xps100-honeywell | 1253 | basic_machine=xps100-honeywell |
1879 | 1268 | ;; | 1254 | ;; |
1880 | 1269 | xscale-* | xscalee[bl]-*) | 1255 | xscale-* | xscalee[bl]-*) |
1882 | 1270 | basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` | 1256 | basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` |
1883 | 1271 | ;; | 1257 | ;; |
1884 | 1272 | ymp) | 1258 | ymp) |
1885 | 1273 | basic_machine=ymp-cray | 1259 | basic_machine=ymp-cray |
1886 | 1274 | os=-unicos | 1260 | os=-unicos |
1887 | 1275 | ;; | 1261 | ;; |
1888 | 1276 | z8k-*-coff) | ||
1889 | 1277 | basic_machine=z8k-unknown | ||
1890 | 1278 | os=-sim | ||
1891 | 1279 | ;; | ||
1892 | 1280 | z80-*-coff) | ||
1893 | 1281 | basic_machine=z80-unknown | ||
1894 | 1282 | os=-sim | ||
1895 | 1283 | ;; | ||
1896 | 1284 | none) | 1262 | none) |
1897 | 1285 | basic_machine=none-none | 1263 | basic_machine=none-none |
1898 | 1286 | os=-none | 1264 | os=-none |
1899 | @@ -1309,10 +1287,6 @@ case $basic_machine in | |||
1900 | 1309 | vax) | 1287 | vax) |
1901 | 1310 | basic_machine=vax-dec | 1288 | basic_machine=vax-dec |
1902 | 1311 | ;; | 1289 | ;; |
1903 | 1312 | pdp10) | ||
1904 | 1313 | # there are many clones, so DEC is not a safe bet | ||
1905 | 1314 | basic_machine=pdp10-unknown | ||
1906 | 1315 | ;; | ||
1907 | 1316 | pdp11) | 1290 | pdp11) |
1908 | 1317 | basic_machine=pdp11-dec | 1291 | basic_machine=pdp11-dec |
1909 | 1318 | ;; | 1292 | ;; |
1910 | @@ -1322,9 +1296,6 @@ case $basic_machine in | |||
1911 | 1322 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) | 1296 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) |
1912 | 1323 | basic_machine=sh-unknown | 1297 | basic_machine=sh-unknown |
1913 | 1324 | ;; | 1298 | ;; |
1914 | 1325 | sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) | ||
1915 | 1326 | basic_machine=sparc-sun | ||
1916 | 1327 | ;; | ||
1917 | 1328 | cydra) | 1299 | cydra) |
1918 | 1329 | basic_machine=cydra-cydrome | 1300 | basic_machine=cydra-cydrome |
1919 | 1330 | ;; | 1301 | ;; |
1920 | @@ -1344,7 +1315,7 @@ case $basic_machine in | |||
1921 | 1344 | # Make sure to match an already-canonicalized machine name. | 1315 | # Make sure to match an already-canonicalized machine name. |
1922 | 1345 | ;; | 1316 | ;; |
1923 | 1346 | *) | 1317 | *) |
1925 | 1347 | echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 | 1318 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 |
1926 | 1348 | exit 1 | 1319 | exit 1 |
1927 | 1349 | ;; | 1320 | ;; |
1928 | 1350 | esac | 1321 | esac |
1929 | @@ -1352,10 +1323,10 @@ esac | |||
1930 | 1352 | # Here we canonicalize certain aliases for manufacturers. | 1323 | # Here we canonicalize certain aliases for manufacturers. |
1931 | 1353 | case $basic_machine in | 1324 | case $basic_machine in |
1932 | 1354 | *-digital*) | 1325 | *-digital*) |
1934 | 1355 | basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` | 1326 | basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` |
1935 | 1356 | ;; | 1327 | ;; |
1936 | 1357 | *-commodore*) | 1328 | *-commodore*) |
1938 | 1358 | basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` | 1329 | basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` |
1939 | 1359 | ;; | 1330 | ;; |
1940 | 1360 | *) | 1331 | *) |
1941 | 1361 | ;; | 1332 | ;; |
1942 | @@ -1366,8 +1337,8 @@ esac | |||
1943 | 1366 | if [ x"$os" != x"" ] | 1337 | if [ x"$os" != x"" ] |
1944 | 1367 | then | 1338 | then |
1945 | 1368 | case $os in | 1339 | case $os in |
1948 | 1369 | # First match some system type aliases | 1340 | # First match some system type aliases that might get confused |
1949 | 1370 | # that might get confused with valid system types. | 1341 | # with valid system types. |
1950 | 1371 | # -solaris* is a basic system type, with this one exception. | 1342 | # -solaris* is a basic system type, with this one exception. |
1951 | 1372 | -auroraux) | 1343 | -auroraux) |
1952 | 1373 | os=-auroraux | 1344 | os=-auroraux |
1953 | @@ -1378,18 +1349,19 @@ case $os in | |||
1954 | 1378 | -solaris) | 1349 | -solaris) |
1955 | 1379 | os=-solaris2 | 1350 | os=-solaris2 |
1956 | 1380 | ;; | 1351 | ;; |
1957 | 1381 | -svr4*) | ||
1958 | 1382 | os=-sysv4 | ||
1959 | 1383 | ;; | ||
1960 | 1384 | -unixware*) | 1352 | -unixware*) |
1961 | 1385 | os=-sysv4.2uw | 1353 | os=-sysv4.2uw |
1962 | 1386 | ;; | 1354 | ;; |
1963 | 1387 | -gnu/linux*) | 1355 | -gnu/linux*) |
1964 | 1388 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` | 1356 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` |
1965 | 1389 | ;; | 1357 | ;; |
1967 | 1390 | # First accept the basic system types. | 1358 | # es1800 is here to avoid being matched by es* (a different OS) |
1968 | 1359 | -es1800*) | ||
1969 | 1360 | os=-ose | ||
1970 | 1361 | ;; | ||
1971 | 1362 | # Now accept the basic system types. | ||
1972 | 1391 | # The portable systems comes first. | 1363 | # The portable systems comes first. |
1974 | 1392 | # Each alternative MUST END IN A *, to match a version number. | 1364 | # Each alternative MUST end in a * to match a version number. |
1975 | 1393 | # -sysv* is not here because it comes later, after sysvr4. | 1365 | # -sysv* is not here because it comes later, after sysvr4. |
1976 | 1394 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 1366 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
1977 | 1395 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | 1367 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
1978 | @@ -1399,7 +1371,7 @@ case $os in | |||
1979 | 1399 | | -aos* | -aros* | -cloudabi* | -sortix* \ | 1371 | | -aos* | -aros* | -cloudabi* | -sortix* \ |
1980 | 1400 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1372 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
1981 | 1401 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | 1373 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
1983 | 1402 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | 1374 | | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ |
1984 | 1403 | | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | 1375 | | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ |
1985 | 1404 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | 1376 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
1986 | 1405 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 1377 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
1987 | @@ -1410,14 +1382,15 @@ case $os in | |||
1988 | 1410 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | 1382 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
1989 | 1411 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | 1383 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
1990 | 1412 | | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | 1384 | | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
1992 | 1413 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1385 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ |
1993 | 1414 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1386 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1994 | 1415 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | 1387 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
1995 | 1416 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1388 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
1997 | 1417 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1389 | | -morphos* | -superux* | -rtmk* | -windiss* \ |
1998 | 1418 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1390 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
1999 | 1419 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ | 1391 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ |
2001 | 1420 | | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) | 1392 | | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ |
2002 | 1393 | | -midnightbsd*) | ||
2003 | 1421 | # Remember, each alternative MUST END IN *, to match a version number. | 1394 | # Remember, each alternative MUST END IN *, to match a version number. |
2004 | 1422 | ;; | 1395 | ;; |
2005 | 1423 | -qnx*) | 1396 | -qnx*) |
2006 | @@ -1434,12 +1407,12 @@ case $os in | |||
2007 | 1434 | -nto*) | 1407 | -nto*) |
2008 | 1435 | os=`echo $os | sed -e 's|nto|nto-qnx|'` | 1408 | os=`echo $os | sed -e 's|nto|nto-qnx|'` |
2009 | 1436 | ;; | 1409 | ;; |
2012 | 1437 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | 1410 | -sim | -xray | -os68k* | -v88r* \ |
2013 | 1438 | | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | 1411 | | -windows* | -osx | -abug | -netware* | -os9* \ |
2014 | 1439 | | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) | 1412 | | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) |
2015 | 1440 | ;; | 1413 | ;; |
2016 | 1441 | -mac*) | 1414 | -mac*) |
2018 | 1442 | os=`echo $os | sed -e 's|mac|macos|'` | 1415 | os=`echo "$os" | sed -e 's|mac|macos|'` |
2019 | 1443 | ;; | 1416 | ;; |
2020 | 1444 | -linux-dietlibc) | 1417 | -linux-dietlibc) |
2021 | 1445 | os=-linux-dietlibc | 1418 | os=-linux-dietlibc |
2022 | @@ -1448,10 +1421,10 @@ case $os in | |||
2023 | 1448 | os=`echo $os | sed -e 's|linux|linux-gnu|'` | 1421 | os=`echo $os | sed -e 's|linux|linux-gnu|'` |
2024 | 1449 | ;; | 1422 | ;; |
2025 | 1450 | -sunos5*) | 1423 | -sunos5*) |
2027 | 1451 | os=`echo $os | sed -e 's|sunos5|solaris2|'` | 1424 | os=`echo "$os" | sed -e 's|sunos5|solaris2|'` |
2028 | 1452 | ;; | 1425 | ;; |
2029 | 1453 | -sunos6*) | 1426 | -sunos6*) |
2031 | 1454 | os=`echo $os | sed -e 's|sunos6|solaris3|'` | 1427 | os=`echo "$os" | sed -e 's|sunos6|solaris3|'` |
2032 | 1455 | ;; | 1428 | ;; |
2033 | 1456 | -opened*) | 1429 | -opened*) |
2034 | 1457 | os=-openedition | 1430 | os=-openedition |
2035 | @@ -1462,12 +1435,6 @@ case $os in | |||
2036 | 1462 | -wince*) | 1435 | -wince*) |
2037 | 1463 | os=-wince | 1436 | os=-wince |
2038 | 1464 | ;; | 1437 | ;; |
2039 | 1465 | -osfrose*) | ||
2040 | 1466 | os=-osfrose | ||
2041 | 1467 | ;; | ||
2042 | 1468 | -osf*) | ||
2043 | 1469 | os=-osf | ||
2044 | 1470 | ;; | ||
2045 | 1471 | -utek*) | 1438 | -utek*) |
2046 | 1472 | os=-bsd | 1439 | os=-bsd |
2047 | 1473 | ;; | 1440 | ;; |
2048 | @@ -1492,7 +1459,7 @@ case $os in | |||
2049 | 1492 | -nova*) | 1459 | -nova*) |
2050 | 1493 | os=-rtmk-nova | 1460 | os=-rtmk-nova |
2051 | 1494 | ;; | 1461 | ;; |
2053 | 1495 | -ns2 ) | 1462 | -ns2) |
2054 | 1496 | os=-nextstep2 | 1463 | os=-nextstep2 |
2055 | 1497 | ;; | 1464 | ;; |
2056 | 1498 | -nsk*) | 1465 | -nsk*) |
2057 | @@ -1514,7 +1481,7 @@ case $os in | |||
2058 | 1514 | -oss*) | 1481 | -oss*) |
2059 | 1515 | os=-sysv3 | 1482 | os=-sysv3 |
2060 | 1516 | ;; | 1483 | ;; |
2062 | 1517 | -svr4) | 1484 | -svr4*) |
2063 | 1518 | os=-sysv4 | 1485 | os=-sysv4 |
2064 | 1519 | ;; | 1486 | ;; |
2065 | 1520 | -svr3) | 1487 | -svr3) |
2066 | @@ -1529,24 +1496,28 @@ case $os in | |||
2067 | 1529 | -ose*) | 1496 | -ose*) |
2068 | 1530 | os=-ose | 1497 | os=-ose |
2069 | 1531 | ;; | 1498 | ;; |
2070 | 1532 | -es1800*) | ||
2071 | 1533 | os=-ose | ||
2072 | 1534 | ;; | ||
2073 | 1535 | -xenix) | ||
2074 | 1536 | os=-xenix | ||
2075 | 1537 | ;; | ||
2076 | 1538 | -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | 1499 | -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) |
2077 | 1539 | os=-mint | 1500 | os=-mint |
2078 | 1540 | ;; | 1501 | ;; |
2079 | 1541 | -aros*) | ||
2080 | 1542 | os=-aros | ||
2081 | 1543 | ;; | ||
2082 | 1544 | -zvmoe) | 1502 | -zvmoe) |
2083 | 1545 | os=-zvmoe | 1503 | os=-zvmoe |
2084 | 1546 | ;; | 1504 | ;; |
2085 | 1547 | -dicos*) | 1505 | -dicos*) |
2086 | 1548 | os=-dicos | 1506 | os=-dicos |
2087 | 1549 | ;; | 1507 | ;; |
2088 | 1508 | -pikeos*) | ||
2089 | 1509 | # Until real need of OS specific support for | ||
2090 | 1510 | # particular features comes up, bare metal | ||
2091 | 1511 | # configurations are quite functional. | ||
2092 | 1512 | case $basic_machine in | ||
2093 | 1513 | arm*) | ||
2094 | 1514 | os=-eabi | ||
2095 | 1515 | ;; | ||
2096 | 1516 | *) | ||
2097 | 1517 | os=-elf | ||
2098 | 1518 | ;; | ||
2099 | 1519 | esac | ||
2100 | 1520 | ;; | ||
2101 | 1550 | -nacl*) | 1521 | -nacl*) |
2102 | 1551 | ;; | 1522 | ;; |
2103 | 1552 | -ios) | 1523 | -ios) |
2104 | @@ -1556,7 +1527,7 @@ case $os in | |||
2105 | 1556 | *) | 1527 | *) |
2106 | 1557 | # Get rid of the `-' at the beginning of $os. | 1528 | # Get rid of the `-' at the beginning of $os. |
2107 | 1558 | os=`echo $os | sed 's/[^-]*-//'` | 1529 | os=`echo $os | sed 's/[^-]*-//'` |
2109 | 1559 | echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 | 1530 | echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 |
2110 | 1560 | exit 1 | 1531 | exit 1 |
2111 | 1561 | ;; | 1532 | ;; |
2112 | 1562 | esac | 1533 | esac |
2113 | @@ -1652,9 +1623,6 @@ case $basic_machine in | |||
2114 | 1652 | *-be) | 1623 | *-be) |
2115 | 1653 | os=-beos | 1624 | os=-beos |
2116 | 1654 | ;; | 1625 | ;; |
2117 | 1655 | *-haiku) | ||
2118 | 1656 | os=-haiku | ||
2119 | 1657 | ;; | ||
2120 | 1658 | *-ibm) | 1626 | *-ibm) |
2121 | 1659 | os=-aix | 1627 | os=-aix |
2122 | 1660 | ;; | 1628 | ;; |
2123 | @@ -1694,7 +1662,7 @@ case $basic_machine in | |||
2124 | 1694 | m88k-omron*) | 1662 | m88k-omron*) |
2125 | 1695 | os=-luna | 1663 | os=-luna |
2126 | 1696 | ;; | 1664 | ;; |
2128 | 1697 | *-next ) | 1665 | *-next) |
2129 | 1698 | os=-nextstep | 1666 | os=-nextstep |
2130 | 1699 | ;; | 1667 | ;; |
2131 | 1700 | *-sequent) | 1668 | *-sequent) |
2132 | @@ -1709,9 +1677,6 @@ case $basic_machine in | |||
2133 | 1709 | i370-*) | 1677 | i370-*) |
2134 | 1710 | os=-mvs | 1678 | os=-mvs |
2135 | 1711 | ;; | 1679 | ;; |
2136 | 1712 | *-next) | ||
2137 | 1713 | os=-nextstep3 | ||
2138 | 1714 | ;; | ||
2139 | 1715 | *-gould) | 1680 | *-gould) |
2140 | 1716 | os=-sysv | 1681 | os=-sysv |
2141 | 1717 | ;; | 1682 | ;; |
2142 | @@ -1821,15 +1786,15 @@ case $basic_machine in | |||
2143 | 1821 | vendor=stratus | 1786 | vendor=stratus |
2144 | 1822 | ;; | 1787 | ;; |
2145 | 1823 | esac | 1788 | esac |
2147 | 1824 | basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` | 1789 | basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` |
2148 | 1825 | ;; | 1790 | ;; |
2149 | 1826 | esac | 1791 | esac |
2150 | 1827 | 1792 | ||
2152 | 1828 | echo $basic_machine$os | 1793 | echo "$basic_machine$os" |
2153 | 1829 | exit | 1794 | exit |
2154 | 1830 | 1795 | ||
2155 | 1831 | # Local variables: | 1796 | # Local variables: |
2157 | 1832 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 1797 | # eval: (add-hook 'write-file-functions 'time-stamp) |
2158 | 1833 | # time-stamp-start: "timestamp='" | 1798 | # time-stamp-start: "timestamp='" |
2159 | 1834 | # time-stamp-format: "%:y-%02m-%02d" | 1799 | # time-stamp-format: "%:y-%02m-%02d" |
2160 | 1835 | # time-stamp-end: "'" | 1800 | # time-stamp-end: "'" |
2161 | diff --git a/build-aux/depcomp b/build-aux/depcomp | |||
2162 | index 30379e2..b39f98f 100755 | |||
2163 | --- a/build-aux/depcomp | |||
2164 | +++ b/build-aux/depcomp | |||
2165 | @@ -1,4 +1,4 @@ | |||
2167 | 1 | #!/bin/sh | 1 | #! /bin/sh |
2168 | 2 | # depcomp - compile a program generating dependencies as side-effects | 2 | # depcomp - compile a program generating dependencies as side-effects |
2169 | 3 | 3 | ||
2170 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2016-01-11.22; # UTC |
2171 | diff --git a/build-aux/install-sh b/build-aux/install-sh | |||
2172 | index 0360b79..59990a1 100755 | |||
2173 | --- a/build-aux/install-sh | |||
2174 | +++ b/build-aux/install-sh | |||
2175 | @@ -1,7 +1,7 @@ | |||
2176 | 1 | #!/bin/sh | 1 | #!/bin/sh |
2177 | 2 | # install - install a program, script, or datafile | 2 | # install - install a program, script, or datafile |
2178 | 3 | 3 | ||
2180 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2014-09-12.12; # UTC |
2181 | 5 | 5 | ||
2182 | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
2183 | 7 | # later released in X11R6 (xc/config/util/install.sh) with the | 7 | # later released in X11R6 (xc/config/util/install.sh) with the |
2184 | @@ -324,34 +324,41 @@ do | |||
2185 | 324 | # is incompatible with FreeBSD 'install' when (umask & 300) != 0. | 324 | # is incompatible with FreeBSD 'install' when (umask & 300) != 0. |
2186 | 325 | ;; | 325 | ;; |
2187 | 326 | *) | 326 | *) |
2188 | 327 | # $RANDOM is not portable (e.g. dash); use it when possible to | ||
2189 | 328 | # lower collision chance | ||
2190 | 327 | tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ | 329 | tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ |
2192 | 328 | trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 | 330 | trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 |
2193 | 329 | 331 | ||
2194 | 332 | # As "mkdir -p" follows symlinks and we work in /tmp possibly; so | ||
2195 | 333 | # create the $tmpdir first (and fail if unsuccessful) to make sure | ||
2196 | 334 | # that nobody tries to guess the $tmpdir name. | ||
2197 | 330 | if (umask $mkdir_umask && | 335 | if (umask $mkdir_umask && |
2199 | 331 | exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 | 336 | $mkdirprog $mkdir_mode "$tmpdir" && |
2200 | 337 | exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 | ||
2201 | 332 | then | 338 | then |
2202 | 333 | if test -z "$dir_arg" || { | 339 | if test -z "$dir_arg" || { |
2203 | 334 | # Check for POSIX incompatibilities with -m. | 340 | # Check for POSIX incompatibilities with -m. |
2204 | 335 | # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or | 341 | # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or |
2205 | 336 | # other-writable bit of parent directory when it shouldn't. | 342 | # other-writable bit of parent directory when it shouldn't. |
2206 | 337 | # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. | 343 | # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. |
2208 | 338 | ls_ld_tmpdir=`ls -ld "$tmpdir"` | 344 | test_tmpdir="$tmpdir/a" |
2209 | 345 | ls_ld_tmpdir=`ls -ld "$test_tmpdir"` | ||
2210 | 339 | case $ls_ld_tmpdir in | 346 | case $ls_ld_tmpdir in |
2211 | 340 | d????-?r-*) different_mode=700;; | 347 | d????-?r-*) different_mode=700;; |
2212 | 341 | d????-?--*) different_mode=755;; | 348 | d????-?--*) different_mode=755;; |
2213 | 342 | *) false;; | 349 | *) false;; |
2214 | 343 | esac && | 350 | esac && |
2217 | 344 | $mkdirprog -m$different_mode -p -- "$tmpdir" && { | 351 | $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { |
2218 | 345 | ls_ld_tmpdir_1=`ls -ld "$tmpdir"` | 352 | ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` |
2219 | 346 | test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" | 353 | test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" |
2220 | 347 | } | 354 | } |
2221 | 348 | } | 355 | } |
2222 | 349 | then posix_mkdir=: | 356 | then posix_mkdir=: |
2223 | 350 | fi | 357 | fi |
2225 | 351 | rmdir "$tmpdir/d" "$tmpdir" | 358 | rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" |
2226 | 352 | else | 359 | else |
2227 | 353 | # Remove any dirs left behind by ancient mkdir implementations. | 360 | # Remove any dirs left behind by ancient mkdir implementations. |
2229 | 354 | rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null | 361 | rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null |
2230 | 355 | fi | 362 | fi |
2231 | 356 | trap '' 0;; | 363 | trap '' 0;; |
2232 | 357 | esac;; | 364 | esac;; |
2233 | @@ -496,6 +503,6 @@ done | |||
2234 | 496 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 503 | # eval: (add-hook 'write-file-hooks 'time-stamp) |
2235 | 497 | # time-stamp-start: "scriptversion=" | 504 | # time-stamp-start: "scriptversion=" |
2236 | 498 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 505 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
2238 | 499 | # time-stamp-time-zone: "UTC0" | 506 | # time-stamp-time-zone: "UTC" |
2239 | 500 | # time-stamp-end: "; # UTC" | 507 | # time-stamp-end: "; # UTC" |
2240 | 501 | # End: | 508 | # End: |
2241 | diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh | |||
2242 | index 30be9c8..a736cf9 100644 | |||
2243 | --- a/build-aux/ltmain.sh | |||
2244 | +++ b/build-aux/ltmain.sh | |||
2245 | @@ -31,7 +31,7 @@ | |||
2246 | 31 | 31 | ||
2247 | 32 | PROGRAM=libtool | 32 | PROGRAM=libtool |
2248 | 33 | PACKAGE=libtool | 33 | PACKAGE=libtool |
2250 | 34 | VERSION=2.4.6 | 34 | VERSION="2.4.6 Debian-2.4.6-2" |
2251 | 35 | package_revision=2.4.6 | 35 | package_revision=2.4.6 |
2252 | 36 | 36 | ||
2253 | 37 | 37 | ||
2254 | @@ -2068,12 +2068,12 @@ include the following information: | |||
2255 | 2068 | compiler: $LTCC | 2068 | compiler: $LTCC |
2256 | 2069 | compiler flags: $LTCFLAGS | 2069 | compiler flags: $LTCFLAGS |
2257 | 2070 | linker: $LD (gnu? $with_gnu_ld) | 2070 | linker: $LD (gnu? $with_gnu_ld) |
2259 | 2071 | version: $progname (GNU libtool) 2.4.6 | 2071 | version: $progname $scriptversion Debian-2.4.6-2 |
2260 | 2072 | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` | 2072 | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` |
2261 | 2073 | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` | 2073 | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` |
2262 | 2074 | 2074 | ||
2263 | 2075 | Report bugs to <bug-libtool@gnu.org>. | 2075 | Report bugs to <bug-libtool@gnu.org>. |
2265 | 2076 | GNU libtool home page: <http://www.gnu.org/software/libtool/>. | 2076 | GNU libtool home page: <http://www.gnu.org/s/libtool/>. |
2266 | 2077 | General help using GNU software: <http://www.gnu.org/gethelp/>." | 2077 | General help using GNU software: <http://www.gnu.org/gethelp/>." |
2267 | 2078 | exit 0 | 2078 | exit 0 |
2268 | 2079 | } | 2079 | } |
2269 | @@ -7274,10 +7274,11 @@ func_mode_link () | |||
2270 | 7274 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | 7274 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization |
2271 | 7275 | # -specs=* GCC specs files | 7275 | # -specs=* GCC specs files |
2272 | 7276 | # -stdlib=* select c++ std lib with clang | 7276 | # -stdlib=* select c++ std lib with clang |
2273 | 7277 | # -fsanitize=* Clang/GCC memory and address sanitizer | ||
2274 | 7277 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | 7278 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
2275 | 7278 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | 7279 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
2276 | 7279 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | 7280 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ |
2278 | 7280 | -specs=*) | 7281 | -specs=*|-fsanitize=*) |
2279 | 7281 | func_quote_for_eval "$arg" | 7282 | func_quote_for_eval "$arg" |
2280 | 7282 | arg=$func_quote_for_eval_result | 7283 | arg=$func_quote_for_eval_result |
2281 | 7283 | func_append compile_command " $arg" | 7284 | func_append compile_command " $arg" |
2282 | @@ -7570,7 +7571,10 @@ func_mode_link () | |||
2283 | 7570 | case $pass in | 7571 | case $pass in |
2284 | 7571 | dlopen) libs=$dlfiles ;; | 7572 | dlopen) libs=$dlfiles ;; |
2285 | 7572 | dlpreopen) libs=$dlprefiles ;; | 7573 | dlpreopen) libs=$dlprefiles ;; |
2287 | 7573 | link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; | 7574 | link) |
2288 | 7575 | libs="$deplibs %DEPLIBS%" | ||
2289 | 7576 | test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" | ||
2290 | 7577 | ;; | ||
2291 | 7574 | esac | 7578 | esac |
2292 | 7575 | fi | 7579 | fi |
2293 | 7576 | if test lib,dlpreopen = "$linkmode,$pass"; then | 7580 | if test lib,dlpreopen = "$linkmode,$pass"; then |
2294 | @@ -7889,19 +7893,19 @@ func_mode_link () | |||
2295 | 7889 | # It is a libtool convenience library, so add in its objects. | 7893 | # It is a libtool convenience library, so add in its objects. |
2296 | 7890 | func_append convenience " $ladir/$objdir/$old_library" | 7894 | func_append convenience " $ladir/$objdir/$old_library" |
2297 | 7891 | func_append old_convenience " $ladir/$objdir/$old_library" | 7895 | func_append old_convenience " $ladir/$objdir/$old_library" |
2298 | 7896 | tmp_libs= | ||
2299 | 7897 | for deplib in $dependency_libs; do | ||
2300 | 7898 | deplibs="$deplib $deplibs" | ||
2301 | 7899 | if $opt_preserve_dup_deps; then | ||
2302 | 7900 | case "$tmp_libs " in | ||
2303 | 7901 | *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
2304 | 7902 | esac | ||
2305 | 7903 | fi | ||
2306 | 7904 | func_append tmp_libs " $deplib" | ||
2307 | 7905 | done | ||
2308 | 7892 | elif test prog != "$linkmode" && test lib != "$linkmode"; then | 7906 | elif test prog != "$linkmode" && test lib != "$linkmode"; then |
2309 | 7893 | func_fatal_error "'$lib' is not a convenience library" | 7907 | func_fatal_error "'$lib' is not a convenience library" |
2310 | 7894 | fi | 7908 | fi |
2311 | 7895 | tmp_libs= | ||
2312 | 7896 | for deplib in $dependency_libs; do | ||
2313 | 7897 | deplibs="$deplib $deplibs" | ||
2314 | 7898 | if $opt_preserve_dup_deps; then | ||
2315 | 7899 | case "$tmp_libs " in | ||
2316 | 7900 | *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
2317 | 7901 | esac | ||
2318 | 7902 | fi | ||
2319 | 7903 | func_append tmp_libs " $deplib" | ||
2320 | 7904 | done | ||
2321 | 7905 | continue | 7909 | continue |
2322 | 7906 | fi # $pass = conv | 7910 | fi # $pass = conv |
2323 | 7907 | 7911 | ||
2324 | @@ -8825,6 +8829,9 @@ func_mode_link () | |||
2325 | 8825 | revision=$number_minor | 8829 | revision=$number_minor |
2326 | 8826 | lt_irix_increment=no | 8830 | lt_irix_increment=no |
2327 | 8827 | ;; | 8831 | ;; |
2328 | 8832 | *) | ||
2329 | 8833 | func_fatal_configuration "$modename: unknown library version type '$version_type'" | ||
2330 | 8834 | ;; | ||
2331 | 8828 | esac | 8835 | esac |
2332 | 8829 | ;; | 8836 | ;; |
2333 | 8830 | no) | 8837 | no) |
2334 | diff --git a/build-aux/missing b/build-aux/missing | |||
2335 | index b7e571e..f62bbae 100755 | |||
2336 | --- a/build-aux/missing | |||
2337 | +++ b/build-aux/missing | |||
2338 | @@ -1,9 +1,9 @@ | |||
2340 | 1 | #!/bin/sh | 1 | #! /bin/sh |
2341 | 2 | # Common wrapper for a few potentially missing GNU programs. | 2 | # Common wrapper for a few potentially missing GNU programs. |
2342 | 3 | 3 | ||
2344 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2013-10-28.13; # UTC |
2345 | 5 | 5 | ||
2347 | 6 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 6 | # Copyright (C) 1996-2014 Free Software Foundation, Inc. |
2348 | 7 | # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. | 7 | # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
2349 | 8 | 8 | ||
2350 | 9 | # This program is free software; you can redistribute it and/or modify | 9 | # This program is free software; you can redistribute it and/or modify |
2351 | @@ -210,6 +210,6 @@ exit $st | |||
2352 | 210 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 210 | # eval: (add-hook 'write-file-hooks 'time-stamp) |
2353 | 211 | # time-stamp-start: "scriptversion=" | 211 | # time-stamp-start: "scriptversion=" |
2354 | 212 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 212 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
2356 | 213 | # time-stamp-time-zone: "UTC0" | 213 | # time-stamp-time-zone: "UTC" |
2357 | 214 | # time-stamp-end: "; # UTC" | 214 | # time-stamp-end: "; # UTC" |
2358 | 215 | # End: | 215 | # End: |
2359 | diff --git a/clutter/Makefile.in b/clutter/Makefile.in | |||
2360 | index 0827a9c..828e1ca 100644 | |||
2361 | --- a/clutter/Makefile.in | |||
2362 | +++ b/clutter/Makefile.in | |||
2363 | @@ -394,6 +394,7 @@ pdfdir = @pdfdir@ | |||
2364 | 394 | prefix = @prefix@ | 394 | prefix = @prefix@ |
2365 | 395 | program_transform_name = @program_transform_name@ | 395 | program_transform_name = @program_transform_name@ |
2366 | 396 | psdir = @psdir@ | 396 | psdir = @psdir@ |
2367 | 397 | runstatedir = @runstatedir@ | ||
2368 | 397 | sbindir = @sbindir@ | 398 | sbindir = @sbindir@ |
2369 | 398 | sharedstatedir = @sharedstatedir@ | 399 | sharedstatedir = @sharedstatedir@ |
2370 | 399 | srcdir = @srcdir@ | 400 | srcdir = @srcdir@ |
2371 | diff --git a/clutter/aclocal.m4 b/clutter/aclocal.m4 | |||
2372 | index 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 | 20 | If you have problems, you may need to regenerate the build system entirely. | 20 | If you have problems, you may need to regenerate the build system entirely. |
2377 | 21 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | 21 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
2378 | 22 | 22 | ||
2381 | 23 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | 23 | # Configure paths for GLIB |
2382 | 24 | # serial 11 (pkg-config-0.29.1) | 24 | # Owen Taylor 1997-2001 |
2383 | 25 | |||
2384 | 26 | # Increment this whenever this file is changed. | ||
2385 | 27 | #serial 1 | ||
2386 | 28 | |||
2387 | 29 | dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | ||
2388 | 30 | dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, | ||
2389 | 31 | dnl gthread, or gio is specified in MODULES, pass to pkg-config | ||
2390 | 32 | dnl | ||
2391 | 33 | AC_DEFUN([AM_PATH_GLIB_2_0], | ||
2392 | 34 | [dnl | ||
2393 | 35 | dnl Get the cflags and libraries from pkg-config | ||
2394 | 36 | dnl | ||
2395 | 37 | AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], | ||
2396 | 38 | , enable_glibtest=yes) | ||
2397 | 39 | |||
2398 | 40 | pkg_config_args=glib-2.0 | ||
2399 | 41 | for module in . $4 | ||
2400 | 42 | do | ||
2401 | 43 | case "$module" in | ||
2402 | 44 | gmodule) | ||
2403 | 45 | pkg_config_args="$pkg_config_args gmodule-2.0" | ||
2404 | 46 | ;; | ||
2405 | 47 | gmodule-no-export) | ||
2406 | 48 | pkg_config_args="$pkg_config_args gmodule-no-export-2.0" | ||
2407 | 49 | ;; | ||
2408 | 50 | gobject) | ||
2409 | 51 | pkg_config_args="$pkg_config_args gobject-2.0" | ||
2410 | 52 | ;; | ||
2411 | 53 | gthread) | ||
2412 | 54 | pkg_config_args="$pkg_config_args gthread-2.0" | ||
2413 | 55 | ;; | ||
2414 | 56 | gio*) | ||
2415 | 57 | pkg_config_args="$pkg_config_args $module-2.0" | ||
2416 | 58 | ;; | ||
2417 | 59 | esac | ||
2418 | 60 | done | ||
2419 | 61 | |||
2420 | 62 | PKG_PROG_PKG_CONFIG([0.16]) | ||
2421 | 63 | |||
2422 | 64 | no_glib="" | ||
2423 | 65 | |||
2424 | 66 | if test "x$PKG_CONFIG" = x ; then | ||
2425 | 67 | no_glib=yes | ||
2426 | 68 | PKG_CONFIG=no | ||
2427 | 69 | fi | ||
2428 | 70 | |||
2429 | 71 | min_glib_version=ifelse([$1], ,2.0.0,$1) | ||
2430 | 72 | AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | ||
2431 | 73 | |||
2432 | 74 | if test x$PKG_CONFIG != xno ; then | ||
2433 | 75 | ## don't try to run the test against uninstalled libtool libs | ||
2434 | 76 | if $PKG_CONFIG --uninstalled $pkg_config_args; then | ||
2435 | 77 | echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" | ||
2436 | 78 | enable_glibtest=no | ||
2437 | 79 | fi | ||
2438 | 80 | |||
2439 | 81 | if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then | ||
2440 | 82 | : | ||
2441 | 83 | else | ||
2442 | 84 | no_glib=yes | ||
2443 | 85 | fi | ||
2444 | 86 | fi | ||
2445 | 87 | |||
2446 | 88 | if test x"$no_glib" = x ; then | ||
2447 | 89 | GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` | ||
2448 | 90 | GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` | ||
2449 | 91 | GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` | ||
2450 | 92 | GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` | ||
2451 | 93 | |||
2452 | 94 | GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` | ||
2453 | 95 | GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` | ||
2454 | 96 | glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
2455 | 97 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
2456 | 98 | glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
2457 | 99 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
2458 | 100 | glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
2459 | 101 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
2460 | 102 | if test "x$enable_glibtest" = "xyes" ; then | ||
2461 | 103 | ac_save_CFLAGS="$CFLAGS" | ||
2462 | 104 | ac_save_LIBS="$LIBS" | ||
2463 | 105 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
2464 | 106 | LIBS="$GLIB_LIBS $LIBS" | ||
2465 | 107 | dnl | ||
2466 | 108 | dnl Now check if the installed GLIB is sufficiently new. (Also sanity | ||
2467 | 109 | dnl checks the results of pkg-config to some extent) | ||
2468 | 110 | dnl | ||
2469 | 111 | rm -f conf.glibtest | ||
2470 | 112 | AC_TRY_RUN([ | ||
2471 | 113 | #include <glib.h> | ||
2472 | 114 | #include <stdio.h> | ||
2473 | 115 | #include <stdlib.h> | ||
2474 | 116 | |||
2475 | 117 | int | ||
2476 | 118 | main (void) | ||
2477 | 119 | { | ||
2478 | 120 | unsigned int major, minor, micro; | ||
2479 | 121 | |||
2480 | 122 | fclose (fopen ("conf.glibtest", "w")); | ||
2481 | 123 | |||
2482 | 124 | if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { | ||
2483 | 125 | printf("%s, bad version string\n", "$min_glib_version"); | ||
2484 | 126 | exit(1); | ||
2485 | 127 | } | ||
2486 | 128 | |||
2487 | 129 | if ((glib_major_version != $glib_config_major_version) || | ||
2488 | 130 | (glib_minor_version != $glib_config_minor_version) || | ||
2489 | 131 | (glib_micro_version != $glib_config_micro_version)) | ||
2490 | 132 | { | ||
2491 | 133 | printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", | ||
2492 | 134 | $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, | ||
2493 | 135 | glib_major_version, glib_minor_version, glib_micro_version); | ||
2494 | 136 | printf ("*** was found! If pkg-config was correct, then it is best\n"); | ||
2495 | 137 | printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); | ||
2496 | 138 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | ||
2497 | 139 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | ||
2498 | 140 | printf("*** required on your system.\n"); | ||
2499 | 141 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); | ||
2500 | 142 | printf("*** to point to the correct configuration files\n"); | ||
2501 | 143 | } | ||
2502 | 144 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || | ||
2503 | 145 | (glib_minor_version != GLIB_MINOR_VERSION) || | ||
2504 | 146 | (glib_micro_version != GLIB_MICRO_VERSION)) | ||
2505 | 147 | { | ||
2506 | 148 | printf("*** GLIB header files (version %d.%d.%d) do not match\n", | ||
2507 | 149 | GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | ||
2508 | 150 | printf("*** library (version %d.%d.%d)\n", | ||
2509 | 151 | glib_major_version, glib_minor_version, glib_micro_version); | ||
2510 | 152 | } | ||
2511 | 153 | else | ||
2512 | 154 | { | ||
2513 | 155 | if ((glib_major_version > major) || | ||
2514 | 156 | ((glib_major_version == major) && (glib_minor_version > minor)) || | ||
2515 | 157 | ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) | ||
2516 | 158 | { | ||
2517 | 159 | return 0; | ||
2518 | 160 | } | ||
2519 | 161 | else | ||
2520 | 162 | { | ||
2521 | 163 | printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", | ||
2522 | 164 | glib_major_version, glib_minor_version, glib_micro_version); | ||
2523 | 165 | printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", | ||
2524 | 166 | major, minor, micro); | ||
2525 | 167 | printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | ||
2526 | 168 | printf("***\n"); | ||
2527 | 169 | printf("*** If you have already installed a sufficiently new version, this error\n"); | ||
2528 | 170 | printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); | ||
2529 | 171 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | ||
2530 | 172 | printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); | ||
2531 | 173 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); | ||
2532 | 174 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | ||
2533 | 175 | printf("*** so that the correct libraries are found at run-time))\n"); | ||
2534 | 176 | } | ||
2535 | 177 | } | ||
2536 | 178 | return 1; | ||
2537 | 179 | } | ||
2538 | 180 | ],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
2539 | 181 | CFLAGS="$ac_save_CFLAGS" | ||
2540 | 182 | LIBS="$ac_save_LIBS" | ||
2541 | 183 | fi | ||
2542 | 184 | fi | ||
2543 | 185 | if test "x$no_glib" = x ; then | ||
2544 | 186 | AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) | ||
2545 | 187 | ifelse([$2], , :, [$2]) | ||
2546 | 188 | else | ||
2547 | 189 | AC_MSG_RESULT(no) | ||
2548 | 190 | if test "$PKG_CONFIG" = "no" ; then | ||
2549 | 191 | echo "*** A new enough version of pkg-config was not found." | ||
2550 | 192 | echo "*** See http://www.freedesktop.org/software/pkgconfig/" | ||
2551 | 193 | else | ||
2552 | 194 | if test -f conf.glibtest ; then | ||
2553 | 195 | : | ||
2554 | 196 | else | ||
2555 | 197 | echo "*** Could not run GLIB test program, checking why..." | ||
2556 | 198 | ac_save_CFLAGS="$CFLAGS" | ||
2557 | 199 | ac_save_LIBS="$LIBS" | ||
2558 | 200 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
2559 | 201 | LIBS="$LIBS $GLIB_LIBS" | ||
2560 | 202 | AC_TRY_LINK([ | ||
2561 | 203 | #include <glib.h> | ||
2562 | 204 | #include <stdio.h> | ||
2563 | 205 | ], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], | ||
2564 | 206 | [ echo "*** The test program compiled, but did not run. This usually means" | ||
2565 | 207 | echo "*** that the run-time linker is not finding GLIB or finding the wrong" | ||
2566 | 208 | echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" | ||
2567 | 209 | echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
2568 | 210 | echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
2569 | 211 | echo "*** is required on your system" | ||
2570 | 212 | echo "***" | ||
2571 | 213 | echo "*** If you have an old version installed, it is best to remove it, although" | ||
2572 | 214 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | ||
2573 | 215 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
2574 | 216 | echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) | ||
2575 | 217 | CFLAGS="$ac_save_CFLAGS" | ||
2576 | 218 | LIBS="$ac_save_LIBS" | ||
2577 | 219 | fi | ||
2578 | 220 | fi | ||
2579 | 221 | GLIB_CFLAGS="" | ||
2580 | 222 | GLIB_LIBS="" | ||
2581 | 223 | GLIB_GENMARSHAL="" | ||
2582 | 224 | GOBJECT_QUERY="" | ||
2583 | 225 | GLIB_MKENUMS="" | ||
2584 | 226 | GLIB_COMPILE_RESOURCES="" | ||
2585 | 227 | ifelse([$3], , :, [$3]) | ||
2586 | 228 | fi | ||
2587 | 229 | AC_SUBST(GLIB_CFLAGS) | ||
2588 | 230 | AC_SUBST(GLIB_LIBS) | ||
2589 | 231 | AC_SUBST(GLIB_GENMARSHAL) | ||
2590 | 232 | AC_SUBST(GOBJECT_QUERY) | ||
2591 | 233 | AC_SUBST(GLIB_MKENUMS) | ||
2592 | 234 | AC_SUBST(GLIB_COMPILE_RESOURCES) | ||
2593 | 235 | rm -f conf.glibtest | ||
2594 | 236 | ]) | ||
2595 | 25 | 237 | ||
2596 | 238 | dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
2597 | 239 | dnl serial 11 (pkg-config-0.29.1) | ||
2598 | 240 | dnl | ||
2599 | 26 | dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | 241 | dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
2600 | 27 | dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> | 242 | dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> |
2601 | 28 | dnl | 243 | dnl |
2602 | @@ -296,289 +511,6 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) | |||
2603 | 296 | AS_VAR_IF([$1], [""], [$5], [$4])dnl | 511 | AS_VAR_IF([$1], [""], [$5], [$4])dnl |
2604 | 297 | ])dnl PKG_CHECK_VAR | 512 | ])dnl PKG_CHECK_VAR |
2605 | 298 | 513 | ||
2606 | 299 | dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
2607 | 300 | dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], | ||
2608 | 301 | dnl [DESCRIPTION], [DEFAULT]) | ||
2609 | 302 | dnl ------------------------------------------ | ||
2610 | 303 | dnl | ||
2611 | 304 | dnl Prepare a "--with-" configure option using the lowercase | ||
2612 | 305 | dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and | ||
2613 | 306 | dnl PKG_CHECK_MODULES in a single macro. | ||
2614 | 307 | AC_DEFUN([PKG_WITH_MODULES], | ||
2615 | 308 | [ | ||
2616 | 309 | m4_pushdef([with_arg], m4_tolower([$1])) | ||
2617 | 310 | |||
2618 | 311 | m4_pushdef([description], | ||
2619 | 312 | [m4_default([$5], [build with ]with_arg[ support])]) | ||
2620 | 313 | |||
2621 | 314 | m4_pushdef([def_arg], [m4_default([$6], [auto])]) | ||
2622 | 315 | m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) | ||
2623 | 316 | m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) | ||
2624 | 317 | |||
2625 | 318 | m4_case(def_arg, | ||
2626 | 319 | [yes],[m4_pushdef([with_without], [--without-]with_arg)], | ||
2627 | 320 | [m4_pushdef([with_without],[--with-]with_arg)]) | ||
2628 | 321 | |||
2629 | 322 | AC_ARG_WITH(with_arg, | ||
2630 | 323 | AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, | ||
2631 | 324 | [AS_TR_SH([with_]with_arg)=def_arg]) | ||
2632 | 325 | |||
2633 | 326 | AS_CASE([$AS_TR_SH([with_]with_arg)], | ||
2634 | 327 | [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], | ||
2635 | 328 | [auto],[PKG_CHECK_MODULES([$1],[$2], | ||
2636 | 329 | [m4_n([def_action_if_found]) $3], | ||
2637 | 330 | [m4_n([def_action_if_not_found]) $4])]) | ||
2638 | 331 | |||
2639 | 332 | m4_popdef([with_arg]) | ||
2640 | 333 | m4_popdef([description]) | ||
2641 | 334 | m4_popdef([def_arg]) | ||
2642 | 335 | |||
2643 | 336 | ])dnl PKG_WITH_MODULES | ||
2644 | 337 | |||
2645 | 338 | dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
2646 | 339 | dnl [DESCRIPTION], [DEFAULT]) | ||
2647 | 340 | dnl ----------------------------------------------- | ||
2648 | 341 | dnl | ||
2649 | 342 | dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES | ||
2650 | 343 | dnl check._[VARIABLE-PREFIX] is exported as make variable. | ||
2651 | 344 | AC_DEFUN([PKG_HAVE_WITH_MODULES], | ||
2652 | 345 | [ | ||
2653 | 346 | PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) | ||
2654 | 347 | |||
2655 | 348 | AM_CONDITIONAL([HAVE_][$1], | ||
2656 | 349 | [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) | ||
2657 | 350 | ])dnl PKG_HAVE_WITH_MODULES | ||
2658 | 351 | |||
2659 | 352 | dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
2660 | 353 | dnl [DESCRIPTION], [DEFAULT]) | ||
2661 | 354 | dnl ------------------------------------------------------ | ||
2662 | 355 | dnl | ||
2663 | 356 | dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after | ||
2664 | 357 | dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make | ||
2665 | 358 | dnl and preprocessor variable. | ||
2666 | 359 | AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], | ||
2667 | 360 | [ | ||
2668 | 361 | PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) | ||
2669 | 362 | |||
2670 | 363 | AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], | ||
2671 | 364 | [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) | ||
2672 | 365 | ])dnl PKG_HAVE_DEFINE_WITH_MODULES | ||
2673 | 366 | |||
2674 | 367 | # Configure paths for GLIB | ||
2675 | 368 | # Owen Taylor 1997-2001 | ||
2676 | 369 | |||
2677 | 370 | # Increment this whenever this file is changed. | ||
2678 | 371 | #serial 1 | ||
2679 | 372 | |||
2680 | 373 | dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | ||
2681 | 374 | dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, | ||
2682 | 375 | dnl gthread, or gio is specified in MODULES, pass to pkg-config | ||
2683 | 376 | dnl | ||
2684 | 377 | AC_DEFUN([AM_PATH_GLIB_2_0], | ||
2685 | 378 | [dnl | ||
2686 | 379 | dnl Get the cflags and libraries from pkg-config | ||
2687 | 380 | dnl | ||
2688 | 381 | AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], | ||
2689 | 382 | , enable_glibtest=yes) | ||
2690 | 383 | |||
2691 | 384 | pkg_config_args=glib-2.0 | ||
2692 | 385 | for module in . $4 | ||
2693 | 386 | do | ||
2694 | 387 | case "$module" in | ||
2695 | 388 | gmodule) | ||
2696 | 389 | pkg_config_args="$pkg_config_args gmodule-2.0" | ||
2697 | 390 | ;; | ||
2698 | 391 | gmodule-no-export) | ||
2699 | 392 | pkg_config_args="$pkg_config_args gmodule-no-export-2.0" | ||
2700 | 393 | ;; | ||
2701 | 394 | gobject) | ||
2702 | 395 | pkg_config_args="$pkg_config_args gobject-2.0" | ||
2703 | 396 | ;; | ||
2704 | 397 | gthread) | ||
2705 | 398 | pkg_config_args="$pkg_config_args gthread-2.0" | ||
2706 | 399 | ;; | ||
2707 | 400 | gio*) | ||
2708 | 401 | pkg_config_args="$pkg_config_args $module-2.0" | ||
2709 | 402 | ;; | ||
2710 | 403 | esac | ||
2711 | 404 | done | ||
2712 | 405 | |||
2713 | 406 | PKG_PROG_PKG_CONFIG([0.16]) | ||
2714 | 407 | |||
2715 | 408 | no_glib="" | ||
2716 | 409 | |||
2717 | 410 | if test "x$PKG_CONFIG" = x ; then | ||
2718 | 411 | no_glib=yes | ||
2719 | 412 | PKG_CONFIG=no | ||
2720 | 413 | fi | ||
2721 | 414 | |||
2722 | 415 | min_glib_version=ifelse([$1], ,2.0.0,$1) | ||
2723 | 416 | AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | ||
2724 | 417 | |||
2725 | 418 | if test x$PKG_CONFIG != xno ; then | ||
2726 | 419 | ## don't try to run the test against uninstalled libtool libs | ||
2727 | 420 | if $PKG_CONFIG --uninstalled $pkg_config_args; then | ||
2728 | 421 | echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" | ||
2729 | 422 | enable_glibtest=no | ||
2730 | 423 | fi | ||
2731 | 424 | |||
2732 | 425 | if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then | ||
2733 | 426 | : | ||
2734 | 427 | else | ||
2735 | 428 | no_glib=yes | ||
2736 | 429 | fi | ||
2737 | 430 | fi | ||
2738 | 431 | |||
2739 | 432 | if test x"$no_glib" = x ; then | ||
2740 | 433 | GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` | ||
2741 | 434 | GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` | ||
2742 | 435 | GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` | ||
2743 | 436 | GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` | ||
2744 | 437 | |||
2745 | 438 | GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` | ||
2746 | 439 | GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` | ||
2747 | 440 | glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
2748 | 441 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
2749 | 442 | glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
2750 | 443 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
2751 | 444 | glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
2752 | 445 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
2753 | 446 | if test "x$enable_glibtest" = "xyes" ; then | ||
2754 | 447 | ac_save_CFLAGS="$CFLAGS" | ||
2755 | 448 | ac_save_LIBS="$LIBS" | ||
2756 | 449 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
2757 | 450 | LIBS="$GLIB_LIBS $LIBS" | ||
2758 | 451 | dnl | ||
2759 | 452 | dnl Now check if the installed GLIB is sufficiently new. (Also sanity | ||
2760 | 453 | dnl checks the results of pkg-config to some extent) | ||
2761 | 454 | dnl | ||
2762 | 455 | rm -f conf.glibtest | ||
2763 | 456 | AC_TRY_RUN([ | ||
2764 | 457 | #include <glib.h> | ||
2765 | 458 | #include <stdio.h> | ||
2766 | 459 | #include <stdlib.h> | ||
2767 | 460 | |||
2768 | 461 | int | ||
2769 | 462 | main (void) | ||
2770 | 463 | { | ||
2771 | 464 | unsigned int major, minor, micro; | ||
2772 | 465 | |||
2773 | 466 | fclose (fopen ("conf.glibtest", "w")); | ||
2774 | 467 | |||
2775 | 468 | if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { | ||
2776 | 469 | printf("%s, bad version string\n", "$min_glib_version"); | ||
2777 | 470 | exit(1); | ||
2778 | 471 | } | ||
2779 | 472 | |||
2780 | 473 | if ((glib_major_version != $glib_config_major_version) || | ||
2781 | 474 | (glib_minor_version != $glib_config_minor_version) || | ||
2782 | 475 | (glib_micro_version != $glib_config_micro_version)) | ||
2783 | 476 | { | ||
2784 | 477 | printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", | ||
2785 | 478 | $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, | ||
2786 | 479 | glib_major_version, glib_minor_version, glib_micro_version); | ||
2787 | 480 | printf ("*** was found! If pkg-config was correct, then it is best\n"); | ||
2788 | 481 | printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); | ||
2789 | 482 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | ||
2790 | 483 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | ||
2791 | 484 | printf("*** required on your system.\n"); | ||
2792 | 485 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); | ||
2793 | 486 | printf("*** to point to the correct configuration files\n"); | ||
2794 | 487 | } | ||
2795 | 488 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || | ||
2796 | 489 | (glib_minor_version != GLIB_MINOR_VERSION) || | ||
2797 | 490 | (glib_micro_version != GLIB_MICRO_VERSION)) | ||
2798 | 491 | { | ||
2799 | 492 | printf("*** GLIB header files (version %d.%d.%d) do not match\n", | ||
2800 | 493 | GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | ||
2801 | 494 | printf("*** library (version %d.%d.%d)\n", | ||
2802 | 495 | glib_major_version, glib_minor_version, glib_micro_version); | ||
2803 | 496 | } | ||
2804 | 497 | else | ||
2805 | 498 | { | ||
2806 | 499 | if ((glib_major_version > major) || | ||
2807 | 500 | ((glib_major_version == major) && (glib_minor_version > minor)) || | ||
2808 | 501 | ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) | ||
2809 | 502 | { | ||
2810 | 503 | return 0; | ||
2811 | 504 | } | ||
2812 | 505 | else | ||
2813 | 506 | { | ||
2814 | 507 | printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", | ||
2815 | 508 | glib_major_version, glib_minor_version, glib_micro_version); | ||
2816 | 509 | printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", | ||
2817 | 510 | major, minor, micro); | ||
2818 | 511 | printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | ||
2819 | 512 | printf("***\n"); | ||
2820 | 513 | printf("*** If you have already installed a sufficiently new version, this error\n"); | ||
2821 | 514 | printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); | ||
2822 | 515 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | ||
2823 | 516 | printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); | ||
2824 | 517 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); | ||
2825 | 518 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | ||
2826 | 519 | printf("*** so that the correct libraries are found at run-time))\n"); | ||
2827 | 520 | } | ||
2828 | 521 | } | ||
2829 | 522 | return 1; | ||
2830 | 523 | } | ||
2831 | 524 | ],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
2832 | 525 | CFLAGS="$ac_save_CFLAGS" | ||
2833 | 526 | LIBS="$ac_save_LIBS" | ||
2834 | 527 | fi | ||
2835 | 528 | fi | ||
2836 | 529 | if test "x$no_glib" = x ; then | ||
2837 | 530 | AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) | ||
2838 | 531 | ifelse([$2], , :, [$2]) | ||
2839 | 532 | else | ||
2840 | 533 | AC_MSG_RESULT(no) | ||
2841 | 534 | if test "$PKG_CONFIG" = "no" ; then | ||
2842 | 535 | echo "*** A new enough version of pkg-config was not found." | ||
2843 | 536 | echo "*** See http://www.freedesktop.org/software/pkgconfig/" | ||
2844 | 537 | else | ||
2845 | 538 | if test -f conf.glibtest ; then | ||
2846 | 539 | : | ||
2847 | 540 | else | ||
2848 | 541 | echo "*** Could not run GLIB test program, checking why..." | ||
2849 | 542 | ac_save_CFLAGS="$CFLAGS" | ||
2850 | 543 | ac_save_LIBS="$LIBS" | ||
2851 | 544 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
2852 | 545 | LIBS="$LIBS $GLIB_LIBS" | ||
2853 | 546 | AC_TRY_LINK([ | ||
2854 | 547 | #include <glib.h> | ||
2855 | 548 | #include <stdio.h> | ||
2856 | 549 | ], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], | ||
2857 | 550 | [ echo "*** The test program compiled, but did not run. This usually means" | ||
2858 | 551 | echo "*** that the run-time linker is not finding GLIB or finding the wrong" | ||
2859 | 552 | echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" | ||
2860 | 553 | echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
2861 | 554 | echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
2862 | 555 | echo "*** is required on your system" | ||
2863 | 556 | echo "***" | ||
2864 | 557 | echo "*** If you have an old version installed, it is best to remove it, although" | ||
2865 | 558 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | ||
2866 | 559 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
2867 | 560 | echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) | ||
2868 | 561 | CFLAGS="$ac_save_CFLAGS" | ||
2869 | 562 | LIBS="$ac_save_LIBS" | ||
2870 | 563 | fi | ||
2871 | 564 | fi | ||
2872 | 565 | GLIB_CFLAGS="" | ||
2873 | 566 | GLIB_LIBS="" | ||
2874 | 567 | GLIB_GENMARSHAL="" | ||
2875 | 568 | GOBJECT_QUERY="" | ||
2876 | 569 | GLIB_MKENUMS="" | ||
2877 | 570 | GLIB_COMPILE_RESOURCES="" | ||
2878 | 571 | ifelse([$3], , :, [$3]) | ||
2879 | 572 | fi | ||
2880 | 573 | AC_SUBST(GLIB_CFLAGS) | ||
2881 | 574 | AC_SUBST(GLIB_LIBS) | ||
2882 | 575 | AC_SUBST(GLIB_GENMARSHAL) | ||
2883 | 576 | AC_SUBST(GOBJECT_QUERY) | ||
2884 | 577 | AC_SUBST(GLIB_MKENUMS) | ||
2885 | 578 | AC_SUBST(GLIB_COMPILE_RESOURCES) | ||
2886 | 579 | rm -f conf.glibtest | ||
2887 | 580 | ]) | ||
2888 | 581 | |||
2889 | 582 | # Copyright (C) 2002-2017 Free Software Foundation, Inc. | 514 | # Copyright (C) 2002-2017 Free Software Foundation, Inc. |
2890 | 583 | # | 515 | # |
2891 | 584 | # This file is free software; the Free Software Foundation | 516 | # This file is free software; the Free Software Foundation |
2892 | diff --git a/clutter/build/Makefile.in b/clutter/build/Makefile.in | |||
2893 | index d7be1ec..2539c63 100644 | |||
2894 | --- a/clutter/build/Makefile.in | |||
2895 | +++ b/clutter/build/Makefile.in | |||
2896 | @@ -372,6 +372,7 @@ pdfdir = @pdfdir@ | |||
2897 | 372 | prefix = @prefix@ | 372 | prefix = @prefix@ |
2898 | 373 | program_transform_name = @program_transform_name@ | 373 | program_transform_name = @program_transform_name@ |
2899 | 374 | psdir = @psdir@ | 374 | psdir = @psdir@ |
2900 | 375 | runstatedir = @runstatedir@ | ||
2901 | 375 | sbindir = @sbindir@ | 376 | sbindir = @sbindir@ |
2902 | 376 | sharedstatedir = @sharedstatedir@ | 377 | sharedstatedir = @sharedstatedir@ |
2903 | 377 | srcdir = @srcdir@ | 378 | srcdir = @srcdir@ |
2904 | diff --git a/clutter/build/autotools/Makefile.in b/clutter/build/autotools/Makefile.in | |||
2905 | index 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 | 311 | prefix = @prefix@ | 311 | prefix = @prefix@ |
2910 | 312 | program_transform_name = @program_transform_name@ | 312 | program_transform_name = @program_transform_name@ |
2911 | 313 | psdir = @psdir@ | 313 | psdir = @psdir@ |
2912 | 314 | runstatedir = @runstatedir@ | ||
2913 | 314 | sbindir = @sbindir@ | 315 | sbindir = @sbindir@ |
2914 | 315 | sharedstatedir = @sharedstatedir@ | 316 | sharedstatedir = @sharedstatedir@ |
2915 | 316 | srcdir = @srcdir@ | 317 | srcdir = @srcdir@ |
2916 | diff --git a/clutter/build/autotools/libtool.m4 b/clutter/build/autotools/libtool.m4 | |||
2917 | index 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 | 728 | cat <<_LT_EOF >> "$cfgfile" | 728 | cat <<_LT_EOF >> "$cfgfile" |
2922 | 729 | #! $SHELL | 729 | #! $SHELL |
2923 | 730 | # Generated automatically by $as_me ($PACKAGE) $VERSION | 730 | # Generated automatically by $as_me ($PACKAGE) $VERSION |
2924 | 731 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: | ||
2925 | 732 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 731 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
2926 | 733 | 732 | ||
2927 | 734 | # Provide generalized library-building support services. | 733 | # Provide generalized library-building support services. |
2928 | @@ -2867,9 +2866,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
2929 | 2867 | # before this can be enabled. | 2866 | # before this can be enabled. |
2930 | 2868 | hardcode_into_libs=yes | 2867 | hardcode_into_libs=yes |
2931 | 2869 | 2868 | ||
2932 | 2870 | # Add ABI-specific directories to the system library path. | ||
2933 | 2871 | sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" | ||
2934 | 2872 | |||
2935 | 2873 | # Ideally, we could use ldconfig to report *all* directores which are | 2869 | # Ideally, we could use ldconfig to report *all* directores which are |
2936 | 2874 | # searched for libraries, however this is still not possible. Aside from not | 2870 | # searched for libraries, however this is still not possible. Aside from not |
2937 | 2875 | # being certain /sbin/ldconfig is available, command | 2871 | # being certain /sbin/ldconfig is available, command |
2938 | @@ -2878,7 +2874,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
2939 | 2878 | # appending ld.so.conf contents (and includes) to the search path. | 2874 | # appending ld.so.conf contents (and includes) to the search path. |
2940 | 2879 | if test -f /etc/ld.so.conf; then | 2875 | if test -f /etc/ld.so.conf; then |
2941 | 2880 | 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' ' '` | 2876 | 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' ' '` |
2943 | 2881 | sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" | 2877 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
2944 | 2882 | fi | 2878 | fi |
2945 | 2883 | 2879 | ||
2946 | 2884 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 2880 | # 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 | 2890 | dynamic_linker='GNU/Linux ld.so' | 2886 | dynamic_linker='GNU/Linux ld.so' |
2949 | 2891 | ;; | 2887 | ;; |
2950 | 2892 | 2888 | ||
2951 | 2889 | netbsdelf*-gnu) | ||
2952 | 2890 | version_type=linux | ||
2953 | 2891 | need_lib_prefix=no | ||
2954 | 2892 | need_version=no | ||
2955 | 2893 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
2956 | 2894 | soname_spec='${libname}${release}${shared_ext}$major' | ||
2957 | 2895 | shlibpath_var=LD_LIBRARY_PATH | ||
2958 | 2896 | shlibpath_overrides_runpath=no | ||
2959 | 2897 | hardcode_into_libs=yes | ||
2960 | 2898 | dynamic_linker='NetBSD ld.elf_so' | ||
2961 | 2899 | ;; | ||
2962 | 2900 | |||
2963 | 2893 | netbsd*) | 2901 | netbsd*) |
2964 | 2894 | version_type=sunos | 2902 | version_type=sunos |
2965 | 2895 | need_lib_prefix=no | 2903 | need_lib_prefix=no |
2966 | @@ -3549,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
2967 | 3549 | lt_cv_deplibs_check_method=pass_all | 3557 | lt_cv_deplibs_check_method=pass_all |
2968 | 3550 | ;; | 3558 | ;; |
2969 | 3551 | 3559 | ||
2971 | 3552 | netbsd*) | 3560 | netbsd* | netbsdelf*-gnu) |
2972 | 3553 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 3561 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
2973 | 3554 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | 3562 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
2974 | 3555 | else | 3563 | else |
2975 | @@ -4427,7 +4435,7 @@ m4_if([$1], [CXX], [ | |||
2976 | 4427 | ;; | 4435 | ;; |
2977 | 4428 | esac | 4436 | esac |
2978 | 4429 | ;; | 4437 | ;; |
2980 | 4430 | netbsd*) | 4438 | netbsd* | netbsdelf*-gnu) |
2981 | 4431 | ;; | 4439 | ;; |
2982 | 4432 | *qnx* | *nto*) | 4440 | *qnx* | *nto*) |
2983 | 4433 | # QNX uses GNU C++, but need to define -shared option too, otherwise | 4441 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
2984 | @@ -4939,6 +4947,9 @@ m4_if([$1], [CXX], [ | |||
2985 | 4939 | ;; | 4947 | ;; |
2986 | 4940 | esac | 4948 | esac |
2987 | 4941 | ;; | 4949 | ;; |
2988 | 4950 | linux* | k*bsd*-gnu | gnu*) | ||
2989 | 4951 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
2990 | 4952 | ;; | ||
2991 | 4942 | *) | 4953 | *) |
2992 | 4943 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4954 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
2993 | 4944 | ;; | 4955 | ;; |
2994 | @@ -5001,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
2995 | 5001 | openbsd* | bitrig*) | 5012 | openbsd* | bitrig*) |
2996 | 5002 | with_gnu_ld=no | 5013 | with_gnu_ld=no |
2997 | 5003 | ;; | 5014 | ;; |
2998 | 5015 | linux* | k*bsd*-gnu | gnu*) | ||
2999 | 5016 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
3000 | 5017 | ;; | ||
3001 | 5004 | esac | 5018 | esac |
3002 | 5005 | 5019 | ||
3003 | 5006 | _LT_TAGVAR(ld_shlibs, $1)=yes | 5020 | _LT_TAGVAR(ld_shlibs, $1)=yes |
3004 | @@ -5255,7 +5269,7 @@ _LT_EOF | |||
3005 | 5255 | fi | 5269 | fi |
3006 | 5256 | ;; | 5270 | ;; |
3007 | 5257 | 5271 | ||
3009 | 5258 | netbsd*) | 5272 | netbsd* | netbsdelf*-gnu) |
3010 | 5259 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 5273 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3011 | 5260 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 5274 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
3012 | 5261 | wlarc= | 5275 | wlarc= |
3013 | @@ -5776,6 +5790,7 @@ _LT_EOF | |||
3014 | 5776 | if test yes = "$lt_cv_irix_exported_symbol"; then | 5790 | if test yes = "$lt_cv_irix_exported_symbol"; then |
3015 | 5777 | _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' | 5791 | _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 | 5778 | fi | 5792 | fi |
3017 | 5793 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
3018 | 5779 | else | 5794 | else |
3019 | 5780 | _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' | 5795 | _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 | 5781 | _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' | 5796 | _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 | 5797 | esac | 5812 | esac |
3023 | 5798 | ;; | 5813 | ;; |
3024 | 5799 | 5814 | ||
3026 | 5800 | netbsd*) | 5815 | netbsd* | netbsdelf*-gnu) |
3027 | 5801 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 5816 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3028 | 5802 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 5817 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
3029 | 5803 | else | 5818 | else |
3030 | diff --git a/clutter/build/compile b/clutter/build/compile | |||
3031 | index de0005d..a85b723 100755 | |||
3032 | --- a/clutter/build/compile | |||
3033 | +++ b/clutter/build/compile | |||
3034 | @@ -1,9 +1,9 @@ | |||
3036 | 1 | #!/bin/sh | 1 | #! /bin/sh |
3037 | 2 | # Wrapper for compilers which do not understand '-c -o'. | 2 | # Wrapper for compilers which do not understand '-c -o'. |
3038 | 3 | 3 | ||
3040 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2012-10-14.11; # UTC |
3041 | 5 | 5 | ||
3043 | 6 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 6 | # Copyright (C) 1999-2014 Free Software Foundation, Inc. |
3044 | 7 | # Written by Tom Tromey <tromey@cygnus.com>. | 7 | # Written by Tom Tromey <tromey@cygnus.com>. |
3045 | 8 | # | 8 | # |
3046 | 9 | # This program is free software; you can redistribute it and/or modify | 9 | # This program is free software; you can redistribute it and/or modify |
3047 | @@ -255,8 +255,7 @@ EOF | |||
3048 | 255 | echo "compile $scriptversion" | 255 | echo "compile $scriptversion" |
3049 | 256 | exit $? | 256 | exit $? |
3050 | 257 | ;; | 257 | ;; |
3053 | 258 | cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ | 258 | cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) |
3052 | 259 | icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) | ||
3054 | 260 | func_cl_wrapper "$@" # Doesn't return... | 259 | func_cl_wrapper "$@" # Doesn't return... |
3055 | 261 | ;; | 260 | ;; |
3056 | 262 | esac | 261 | esac |
3057 | @@ -343,6 +342,6 @@ exit $ret | |||
3058 | 343 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 342 | # eval: (add-hook 'write-file-hooks 'time-stamp) |
3059 | 344 | # time-stamp-start: "scriptversion=" | 343 | # time-stamp-start: "scriptversion=" |
3060 | 345 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 344 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
3062 | 346 | # time-stamp-time-zone: "UTC0" | 345 | # time-stamp-time-zone: "UTC" |
3063 | 347 | # time-stamp-end: "; # UTC" | 346 | # time-stamp-end: "; # UTC" |
3064 | 348 | # End: | 347 | # End: |
3065 | diff --git a/clutter/build/config.guess b/clutter/build/config.guess | |||
3066 | index 717b228..f50dcdb 100755 | |||
3067 | --- a/clutter/build/config.guess | |||
3068 | +++ b/clutter/build/config.guess | |||
3069 | @@ -1,8 +1,8 @@ | |||
3071 | 1 | #!/bin/sh | 1 | #! /bin/sh |
3072 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
3074 | 3 | # Copyright 1992-2017 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
3075 | 4 | 4 | ||
3077 | 5 | timestamp='2017-08-08' | 5 | timestamp='2018-02-24' |
3078 | 6 | 6 | ||
3079 | 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
3080 | 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
3081 | @@ -15,7 +15,7 @@ timestamp='2017-08-08' | |||
3082 | 15 | # General Public License for more details. | 15 | # General Public License for more details. |
3083 | 16 | # | 16 | # |
3084 | 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
3086 | 18 | # along with this program; if not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program; if not, see <https://www.gnu.org/licenses/>. |
3087 | 19 | # | 19 | # |
3088 | 20 | # As a special exception to the GNU General Public License, if you | 20 | # As a special exception to the GNU General Public License, if you |
3089 | 21 | # distribute this file as part of a program that contains a | 21 | # distribute this file as part of a program that contains a |
3090 | @@ -27,7 +27,7 @@ timestamp='2017-08-08' | |||
3091 | 27 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. | 27 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. |
3092 | 28 | # | 28 | # |
3093 | 29 | # You can get the latest version of this script from: | 29 | # You can get the latest version of this script from: |
3095 | 30 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess | 30 | # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
3096 | 31 | # | 31 | # |
3097 | 32 | # Please send patches to <config-patches@gnu.org>. | 32 | # Please send patches to <config-patches@gnu.org>. |
3098 | 33 | 33 | ||
3099 | @@ -39,7 +39,7 @@ Usage: $0 [OPTION] | |||
3100 | 39 | 39 | ||
3101 | 40 | Output the configuration name of the system \`$me' is run on. | 40 | Output the configuration name of the system \`$me' is run on. |
3102 | 41 | 41 | ||
3104 | 42 | Operation modes: | 42 | Options: |
3105 | 43 | -h, --help print this help, then exit | 43 | -h, --help print this help, then exit |
3106 | 44 | -t, --time-stamp print date of last modification, then exit | 44 | -t, --time-stamp print date of last modification, then exit |
3107 | 45 | -v, --version print version number, then exit | 45 | -v, --version print version number, then exit |
3108 | @@ -50,7 +50,7 @@ version="\ | |||
3109 | 50 | GNU config.guess ($timestamp) | 50 | GNU config.guess ($timestamp) |
3110 | 51 | 51 | ||
3111 | 52 | Originally written by Per Bothner. | 52 | Originally written by Per Bothner. |
3113 | 53 | Copyright 1992-2017 Free Software Foundation, Inc. | 53 | Copyright 1992-2018 Free Software Foundation, Inc. |
3114 | 54 | 54 | ||
3115 | 55 | This is free software; see the source for copying conditions. There is NO | 55 | This is free software; see the source for copying conditions. There is NO |
3116 | 56 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 56 | 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 | 107 | dummy=$tmp/dummy ; | 107 | dummy=$tmp/dummy ; |
3119 | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
3120 | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in |
3122 | 110 | ,,) echo "int x;" > $dummy.c ; | 110 | ,,) echo "int x;" > "$dummy.c" ; |
3123 | 111 | for c in cc gcc c89 c99 ; do | 111 | for c in cc gcc c89 c99 ; do |
3125 | 112 | if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then | 112 | if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then |
3126 | 113 | CC_FOR_BUILD="$c"; break ; | 113 | CC_FOR_BUILD="$c"; break ; |
3127 | 114 | fi ; | 114 | fi ; |
3128 | 115 | done ; | 115 | done ; |
3129 | @@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown | |||
3130 | 132 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown | 132 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
3131 | 133 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | 133 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
3132 | 134 | 134 | ||
3134 | 135 | case "${UNAME_SYSTEM}" in | 135 | case "$UNAME_SYSTEM" in |
3135 | 136 | Linux|GNU|GNU/*) | 136 | Linux|GNU|GNU/*) |
3136 | 137 | # If the system lacks a compiler, then just pick glibc. | 137 | # If the system lacks a compiler, then just pick glibc. |
3137 | 138 | # We could probably try harder. | 138 | # We could probably try harder. |
3138 | 139 | LIBC=gnu | 139 | LIBC=gnu |
3139 | 140 | 140 | ||
3142 | 141 | eval $set_cc_for_build | 141 | eval "$set_cc_for_build" |
3143 | 142 | cat <<-EOF > $dummy.c | 142 | cat <<-EOF > "$dummy.c" |
3144 | 143 | #include <features.h> | 143 | #include <features.h> |
3145 | 144 | #if defined(__UCLIBC__) | 144 | #if defined(__UCLIBC__) |
3146 | 145 | LIBC=uclibc | 145 | LIBC=uclibc |
3147 | @@ -149,13 +149,20 @@ Linux|GNU|GNU/*) | |||
3148 | 149 | LIBC=gnu | 149 | LIBC=gnu |
3149 | 150 | #endif | 150 | #endif |
3150 | 151 | EOF | 151 | EOF |
3152 | 152 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` | 152 | eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" |
3153 | 153 | |||
3154 | 154 | # If ldd exists, use it to detect musl libc. | ||
3155 | 155 | if command -v ldd >/dev/null && \ | ||
3156 | 156 | ldd --version 2>&1 | grep -q ^musl | ||
3157 | 157 | then | ||
3158 | 158 | LIBC=musl | ||
3159 | 159 | fi | ||
3160 | 153 | ;; | 160 | ;; |
3161 | 154 | esac | 161 | esac |
3162 | 155 | 162 | ||
3163 | 156 | # Note: order is significant - the case branches are not exclusive. | 163 | # Note: order is significant - the case branches are not exclusive. |
3164 | 157 | 164 | ||
3166 | 158 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 165 | case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in |
3167 | 159 | *:NetBSD:*:*) | 166 | *:NetBSD:*:*) |
3168 | 160 | # NetBSD (nbsd) targets should (where applicable) match one or | 167 | # NetBSD (nbsd) targets should (where applicable) match one or |
3169 | 161 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, | 168 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
3170 | @@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3171 | 169 | # portion of the name. We always set it to "unknown". | 176 | # portion of the name. We always set it to "unknown". |
3172 | 170 | sysctl="sysctl -n hw.machine_arch" | 177 | sysctl="sysctl -n hw.machine_arch" |
3173 | 171 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ | 178 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ |
3176 | 172 | /sbin/$sysctl 2>/dev/null || \ | 179 | "/sbin/$sysctl" 2>/dev/null || \ |
3177 | 173 | /usr/sbin/$sysctl 2>/dev/null || \ | 180 | "/usr/sbin/$sysctl" 2>/dev/null || \ |
3178 | 174 | echo unknown)` | 181 | echo unknown)` |
3180 | 175 | case "${UNAME_MACHINE_ARCH}" in | 182 | case "$UNAME_MACHINE_ARCH" in |
3181 | 176 | armeb) machine=armeb-unknown ;; | 183 | armeb) machine=armeb-unknown ;; |
3182 | 177 | arm*) machine=arm-unknown ;; | 184 | arm*) machine=arm-unknown ;; |
3183 | 178 | sh3el) machine=shl-unknown ;; | 185 | sh3el) machine=shl-unknown ;; |
3184 | 179 | sh3eb) machine=sh-unknown ;; | 186 | sh3eb) machine=sh-unknown ;; |
3185 | 180 | sh5el) machine=sh5le-unknown ;; | 187 | sh5el) machine=sh5le-unknown ;; |
3186 | 181 | earmv*) | 188 | earmv*) |
3190 | 182 | arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` | 189 | arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` |
3191 | 183 | endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` | 190 | endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` |
3192 | 184 | machine=${arch}${endian}-unknown | 191 | machine="${arch}${endian}"-unknown |
3193 | 185 | ;; | 192 | ;; |
3195 | 186 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; | 193 | *) machine="$UNAME_MACHINE_ARCH"-unknown ;; |
3196 | 187 | esac | 194 | esac |
3197 | 188 | # The Operating System including object format, if it has switched | 195 | # The Operating System including object format, if it has switched |
3198 | 189 | # to ELF recently (or will in the future) and ABI. | 196 | # to ELF recently (or will in the future) and ABI. |
3200 | 190 | case "${UNAME_MACHINE_ARCH}" in | 197 | case "$UNAME_MACHINE_ARCH" in |
3201 | 191 | earm*) | 198 | earm*) |
3202 | 192 | os=netbsdelf | 199 | os=netbsdelf |
3203 | 193 | ;; | 200 | ;; |
3204 | 194 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 201 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
3206 | 195 | eval $set_cc_for_build | 202 | eval "$set_cc_for_build" |
3207 | 196 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 203 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
3208 | 197 | | grep -q __ELF__ | 204 | | grep -q __ELF__ |
3209 | 198 | then | 205 | then |
3210 | @@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3211 | 208 | ;; | 215 | ;; |
3212 | 209 | esac | 216 | esac |
3213 | 210 | # Determine ABI tags. | 217 | # Determine ABI tags. |
3215 | 211 | case "${UNAME_MACHINE_ARCH}" in | 218 | case "$UNAME_MACHINE_ARCH" in |
3216 | 212 | earm*) | 219 | earm*) |
3217 | 213 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' | 220 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' |
3219 | 214 | abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` | 221 | abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` |
3220 | 215 | ;; | 222 | ;; |
3221 | 216 | esac | 223 | esac |
3222 | 217 | # The OS release | 224 | # The OS release |
3223 | @@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3224 | 219 | # thus, need a distinct triplet. However, they do not need | 226 | # thus, need a distinct triplet. However, they do not need |
3225 | 220 | # kernel version information, so it can be replaced with a | 227 | # kernel version information, so it can be replaced with a |
3226 | 221 | # suitable tag, in the style of linux-gnu. | 228 | # suitable tag, in the style of linux-gnu. |
3228 | 222 | case "${UNAME_VERSION}" in | 229 | case "$UNAME_VERSION" in |
3229 | 223 | Debian*) | 230 | Debian*) |
3230 | 224 | release='-gnu' | 231 | release='-gnu' |
3231 | 225 | ;; | 232 | ;; |
3232 | 226 | *) | 233 | *) |
3234 | 227 | release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` | 234 | release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` |
3235 | 228 | ;; | 235 | ;; |
3236 | 229 | esac | 236 | esac |
3237 | 230 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | 237 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
3238 | 231 | # contains redundant information, the shorter form: | 238 | # contains redundant information, the shorter form: |
3239 | 232 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | 239 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
3241 | 233 | echo "${machine}-${os}${release}${abi}" | 240 | echo "$machine-${os}${release}${abi}" |
3242 | 234 | exit ;; | 241 | exit ;; |
3243 | 235 | *:Bitrig:*:*) | 242 | *:Bitrig:*:*) |
3244 | 236 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` | 243 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
3246 | 237 | echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} | 244 | echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" |
3247 | 238 | exit ;; | 245 | exit ;; |
3248 | 239 | *:OpenBSD:*:*) | 246 | *:OpenBSD:*:*) |
3249 | 240 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` | 247 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
3251 | 241 | echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} | 248 | echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" |
3252 | 242 | exit ;; | 249 | exit ;; |
3253 | 243 | *:LibertyBSD:*:*) | 250 | *:LibertyBSD:*:*) |
3254 | 244 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` | 251 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` |
3256 | 245 | echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} | 252 | echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" |
3257 | 253 | exit ;; | ||
3258 | 254 | *:MidnightBSD:*:*) | ||
3259 | 255 | echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" | ||
3260 | 246 | exit ;; | 256 | exit ;; |
3261 | 247 | *:ekkoBSD:*:*) | 257 | *:ekkoBSD:*:*) |
3263 | 248 | echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} | 258 | echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" |
3264 | 249 | exit ;; | 259 | exit ;; |
3265 | 250 | *:SolidBSD:*:*) | 260 | *:SolidBSD:*:*) |
3267 | 251 | echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} | 261 | echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" |
3268 | 252 | exit ;; | 262 | exit ;; |
3269 | 253 | macppc:MirBSD:*:*) | 263 | macppc:MirBSD:*:*) |
3271 | 254 | echo powerpc-unknown-mirbsd${UNAME_RELEASE} | 264 | echo powerpc-unknown-mirbsd"$UNAME_RELEASE" |
3272 | 255 | exit ;; | 265 | exit ;; |
3273 | 256 | *:MirBSD:*:*) | 266 | *:MirBSD:*:*) |
3275 | 257 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} | 267 | echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" |
3276 | 258 | exit ;; | 268 | exit ;; |
3277 | 259 | *:Sortix:*:*) | 269 | *:Sortix:*:*) |
3279 | 260 | echo ${UNAME_MACHINE}-unknown-sortix | 270 | echo "$UNAME_MACHINE"-unknown-sortix |
3280 | 261 | exit ;; | 271 | exit ;; |
3281 | 262 | *:Redox:*:*) | 272 | *:Redox:*:*) |
3283 | 263 | echo ${UNAME_MACHINE}-unknown-redox | 273 | echo "$UNAME_MACHINE"-unknown-redox |
3284 | 264 | exit ;; | 274 | exit ;; |
3285 | 275 | mips:OSF1:*.*) | ||
3286 | 276 | echo mips-dec-osf1 | ||
3287 | 277 | exit ;; | ||
3288 | 265 | alpha:OSF1:*:*) | 278 | alpha:OSF1:*:*) |
3289 | 266 | case $UNAME_RELEASE in | 279 | case $UNAME_RELEASE in |
3290 | 267 | *4.0) | 280 | *4.0) |
3291 | @@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3292 | 313 | # A Tn.n version is a released field test version. | 326 | # A Tn.n version is a released field test version. |
3293 | 314 | # A Xn.n version is an unreleased experimental baselevel. | 327 | # A Xn.n version is an unreleased experimental baselevel. |
3294 | 315 | # 1.2 uses "1.2" for uname -r. | 328 | # 1.2 uses "1.2" for uname -r. |
3296 | 316 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` | 329 | echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" |
3297 | 317 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. | 330 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
3298 | 318 | exitcode=$? | 331 | exitcode=$? |
3299 | 319 | trap '' 0 | 332 | trap '' 0 |
3300 | 320 | exit $exitcode ;; | 333 | exit $exitcode ;; |
3301 | 321 | Alpha\ *:Windows_NT*:*) | ||
3302 | 322 | # How do we know it's Interix rather than the generic POSIX subsystem? | ||
3303 | 323 | # Should we change UNAME_MACHINE based on the output of uname instead | ||
3304 | 324 | # of the specific Alpha model? | ||
3305 | 325 | echo alpha-pc-interix | ||
3306 | 326 | exit ;; | ||
3307 | 327 | 21064:Windows_NT:50:3) | ||
3308 | 328 | echo alpha-dec-winnt3.5 | ||
3309 | 329 | exit ;; | ||
3310 | 330 | Amiga*:UNIX_System_V:4.0:*) | 334 | Amiga*:UNIX_System_V:4.0:*) |
3311 | 331 | echo m68k-unknown-sysv4 | 335 | echo m68k-unknown-sysv4 |
3312 | 332 | exit ;; | 336 | exit ;; |
3313 | 333 | *:[Aa]miga[Oo][Ss]:*:*) | 337 | *:[Aa]miga[Oo][Ss]:*:*) |
3315 | 334 | echo ${UNAME_MACHINE}-unknown-amigaos | 338 | echo "$UNAME_MACHINE"-unknown-amigaos |
3316 | 335 | exit ;; | 339 | exit ;; |
3317 | 336 | *:[Mm]orph[Oo][Ss]:*:*) | 340 | *:[Mm]orph[Oo][Ss]:*:*) |
3319 | 337 | echo ${UNAME_MACHINE}-unknown-morphos | 341 | echo "$UNAME_MACHINE"-unknown-morphos |
3320 | 338 | exit ;; | 342 | exit ;; |
3321 | 339 | *:OS/390:*:*) | 343 | *:OS/390:*:*) |
3322 | 340 | echo i370-ibm-openedition | 344 | echo i370-ibm-openedition |
3323 | @@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3324 | 346 | echo powerpc-ibm-os400 | 350 | echo powerpc-ibm-os400 |
3325 | 347 | exit ;; | 351 | exit ;; |
3326 | 348 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | 352 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
3328 | 349 | echo arm-acorn-riscix${UNAME_RELEASE} | 353 | echo arm-acorn-riscix"$UNAME_RELEASE" |
3329 | 350 | exit ;; | 354 | exit ;; |
3330 | 351 | arm*:riscos:*:*|arm*:RISCOS:*:*) | 355 | arm*:riscos:*:*|arm*:RISCOS:*:*) |
3331 | 352 | echo arm-unknown-riscos | 356 | echo arm-unknown-riscos |
3332 | @@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3333 | 373 | sparc) echo sparc-icl-nx7; exit ;; | 377 | sparc) echo sparc-icl-nx7; exit ;; |
3334 | 374 | esac ;; | 378 | esac ;; |
3335 | 375 | s390x:SunOS:*:*) | 379 | s390x:SunOS:*:*) |
3337 | 376 | echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 380 | echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
3338 | 377 | exit ;; | 381 | exit ;; |
3339 | 378 | sun4H:SunOS:5.*:*) | 382 | sun4H:SunOS:5.*:*) |
3341 | 379 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 383 | echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
3342 | 380 | exit ;; | 384 | exit ;; |
3343 | 381 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 385 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
3345 | 382 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 386 | echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
3346 | 383 | exit ;; | 387 | exit ;; |
3347 | 384 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) | 388 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
3349 | 385 | echo i386-pc-auroraux${UNAME_RELEASE} | 389 | echo i386-pc-auroraux"$UNAME_RELEASE" |
3350 | 386 | exit ;; | 390 | exit ;; |
3351 | 387 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 391 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
3353 | 388 | eval $set_cc_for_build | 392 | eval "$set_cc_for_build" |
3354 | 389 | SUN_ARCH=i386 | 393 | SUN_ARCH=i386 |
3355 | 390 | # If there is a compiler, see if it is configured for 64-bit objects. | 394 | # If there is a compiler, see if it is configured for 64-bit objects. |
3356 | 391 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. | 395 | # 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 | 398 | SUN_ARCH=x86_64 | 402 | SUN_ARCH=x86_64 |
3359 | 399 | fi | 403 | fi |
3360 | 400 | fi | 404 | fi |
3362 | 401 | echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 405 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
3363 | 402 | exit ;; | 406 | exit ;; |
3364 | 403 | sun4*:SunOS:6*:*) | 407 | sun4*:SunOS:6*:*) |
3365 | 404 | # According to config.sub, this is the proper way to canonicalize | 408 | # According to config.sub, this is the proper way to canonicalize |
3366 | 405 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but | 409 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
3367 | 406 | # it's likely to be more like Solaris than SunOS4. | 410 | # it's likely to be more like Solaris than SunOS4. |
3369 | 407 | echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 411 | echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
3370 | 408 | exit ;; | 412 | exit ;; |
3371 | 409 | sun4*:SunOS:*:*) | 413 | sun4*:SunOS:*:*) |
3372 | 410 | case "`/usr/bin/arch -k`" in | 414 | case "`/usr/bin/arch -k`" in |
3373 | @@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3374 | 413 | ;; | 417 | ;; |
3375 | 414 | esac | 418 | esac |
3376 | 415 | # Japanese Language versions have a version number like `4.1.3-JL'. | 419 | # Japanese Language versions have a version number like `4.1.3-JL'. |
3378 | 416 | echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` | 420 | echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" |
3379 | 417 | exit ;; | 421 | exit ;; |
3380 | 418 | sun3*:SunOS:*:*) | 422 | sun3*:SunOS:*:*) |
3382 | 419 | echo m68k-sun-sunos${UNAME_RELEASE} | 423 | echo m68k-sun-sunos"$UNAME_RELEASE" |
3383 | 420 | exit ;; | 424 | exit ;; |
3384 | 421 | sun*:*:4.2BSD:*) | 425 | sun*:*:4.2BSD:*) |
3385 | 422 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` | 426 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
3387 | 423 | test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 | 427 | test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 |
3388 | 424 | case "`/bin/arch`" in | 428 | case "`/bin/arch`" in |
3389 | 425 | sun3) | 429 | sun3) |
3391 | 426 | echo m68k-sun-sunos${UNAME_RELEASE} | 430 | echo m68k-sun-sunos"$UNAME_RELEASE" |
3392 | 427 | ;; | 431 | ;; |
3393 | 428 | sun4) | 432 | sun4) |
3395 | 429 | echo sparc-sun-sunos${UNAME_RELEASE} | 433 | echo sparc-sun-sunos"$UNAME_RELEASE" |
3396 | 430 | ;; | 434 | ;; |
3397 | 431 | esac | 435 | esac |
3398 | 432 | exit ;; | 436 | exit ;; |
3399 | 433 | aushp:SunOS:*:*) | 437 | aushp:SunOS:*:*) |
3401 | 434 | echo sparc-auspex-sunos${UNAME_RELEASE} | 438 | echo sparc-auspex-sunos"$UNAME_RELEASE" |
3402 | 435 | exit ;; | 439 | exit ;; |
3403 | 436 | # The situation for MiNT is a little confusing. The machine name | 440 | # The situation for MiNT is a little confusing. The machine name |
3404 | 437 | # can be virtually everything (everything which is not | 441 | # can be virtually everything (everything which is not |
3405 | @@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3406 | 442 | # MiNT. But MiNT is downward compatible to TOS, so this should | 446 | # MiNT. But MiNT is downward compatible to TOS, so this should |
3407 | 443 | # be no problem. | 447 | # be no problem. |
3408 | 444 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) | 448 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
3410 | 445 | echo m68k-atari-mint${UNAME_RELEASE} | 449 | echo m68k-atari-mint"$UNAME_RELEASE" |
3411 | 446 | exit ;; | 450 | exit ;; |
3412 | 447 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) | 451 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
3414 | 448 | echo m68k-atari-mint${UNAME_RELEASE} | 452 | echo m68k-atari-mint"$UNAME_RELEASE" |
3415 | 449 | exit ;; | 453 | exit ;; |
3416 | 450 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) | 454 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
3418 | 451 | echo m68k-atari-mint${UNAME_RELEASE} | 455 | echo m68k-atari-mint"$UNAME_RELEASE" |
3419 | 452 | exit ;; | 456 | exit ;; |
3420 | 453 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) | 457 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
3422 | 454 | echo m68k-milan-mint${UNAME_RELEASE} | 458 | echo m68k-milan-mint"$UNAME_RELEASE" |
3423 | 455 | exit ;; | 459 | exit ;; |
3424 | 456 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) | 460 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
3426 | 457 | echo m68k-hades-mint${UNAME_RELEASE} | 461 | echo m68k-hades-mint"$UNAME_RELEASE" |
3427 | 458 | exit ;; | 462 | exit ;; |
3428 | 459 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 463 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
3430 | 460 | echo m68k-unknown-mint${UNAME_RELEASE} | 464 | echo m68k-unknown-mint"$UNAME_RELEASE" |
3431 | 461 | exit ;; | 465 | exit ;; |
3432 | 462 | m68k:machten:*:*) | 466 | m68k:machten:*:*) |
3434 | 463 | echo m68k-apple-machten${UNAME_RELEASE} | 467 | echo m68k-apple-machten"$UNAME_RELEASE" |
3435 | 464 | exit ;; | 468 | exit ;; |
3436 | 465 | powerpc:machten:*:*) | 469 | powerpc:machten:*:*) |
3438 | 466 | echo powerpc-apple-machten${UNAME_RELEASE} | 470 | echo powerpc-apple-machten"$UNAME_RELEASE" |
3439 | 467 | exit ;; | 471 | exit ;; |
3440 | 468 | RISC*:Mach:*:*) | 472 | RISC*:Mach:*:*) |
3441 | 469 | echo mips-dec-mach_bsd4.3 | 473 | echo mips-dec-mach_bsd4.3 |
3442 | 470 | exit ;; | 474 | exit ;; |
3443 | 471 | RISC*:ULTRIX:*:*) | 475 | RISC*:ULTRIX:*:*) |
3445 | 472 | echo mips-dec-ultrix${UNAME_RELEASE} | 476 | echo mips-dec-ultrix"$UNAME_RELEASE" |
3446 | 473 | exit ;; | 477 | exit ;; |
3447 | 474 | VAX*:ULTRIX*:*:*) | 478 | VAX*:ULTRIX*:*:*) |
3449 | 475 | echo vax-dec-ultrix${UNAME_RELEASE} | 479 | echo vax-dec-ultrix"$UNAME_RELEASE" |
3450 | 476 | exit ;; | 480 | exit ;; |
3451 | 477 | 2020:CLIX:*:* | 2430:CLIX:*:*) | 481 | 2020:CLIX:*:* | 2430:CLIX:*:*) |
3453 | 478 | echo clipper-intergraph-clix${UNAME_RELEASE} | 482 | echo clipper-intergraph-clix"$UNAME_RELEASE" |
3454 | 479 | exit ;; | 483 | exit ;; |
3455 | 480 | mips:*:*:UMIPS | mips:*:*:RISCos) | 484 | mips:*:*:UMIPS | mips:*:*:RISCos) |
3458 | 481 | eval $set_cc_for_build | 485 | eval "$set_cc_for_build" |
3459 | 482 | sed 's/^ //' << EOF >$dummy.c | 486 | sed 's/^ //' << EOF > "$dummy.c" |
3460 | 483 | #ifdef __cplusplus | 487 | #ifdef __cplusplus |
3461 | 484 | #include <stdio.h> /* for printf() prototype */ | 488 | #include <stdio.h> /* for printf() prototype */ |
3462 | 485 | int main (int argc, char *argv[]) { | 489 | int main (int argc, char *argv[]) { |
3463 | @@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
3464 | 488 | #endif | 492 | #endif |
3465 | 489 | #if defined (host_mips) && defined (MIPSEB) | 493 | #if defined (host_mips) && defined (MIPSEB) |
3466 | 490 | #if defined (SYSTYPE_SYSV) | 494 | #if defined (SYSTYPE_SYSV) |
3468 | 491 | printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); | 495 | printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); |
3469 | 492 | #endif | 496 | #endif |
3470 | 493 | #if defined (SYSTYPE_SVR4) | 497 | #if defined (SYSTYPE_SVR4) |
3472 | 494 | printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); | 498 | printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); |
3473 | 495 | #endif | 499 | #endif |
3474 | 496 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) | 500 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) |
3476 | 497 | printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); | 501 | printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); |
3477 | 498 | #endif | 502 | #endif |
3478 | 499 | #endif | 503 | #endif |
3479 | 500 | exit (-1); | 504 | exit (-1); |
3480 | 501 | } | 505 | } |
3481 | 502 | EOF | 506 | EOF |
3485 | 503 | $CC_FOR_BUILD -o $dummy $dummy.c && | 507 | $CC_FOR_BUILD -o "$dummy" "$dummy.c" && |
3486 | 504 | dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && | 508 | dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && |
3487 | 505 | SYSTEM_NAME=`$dummy $dummyarg` && | 509 | SYSTEM_NAME=`"$dummy" "$dummyarg"` && |
3488 | 506 | { echo "$SYSTEM_NAME"; exit; } | 510 | { echo "$SYSTEM_NAME"; exit; } |
3490 | 507 | echo mips-mips-riscos${UNAME_RELEASE} | 511 | echo mips-mips-riscos"$UNAME_RELEASE" |
3491 | 508 | exit ;; | 512 | exit ;; |
3492 | 509 | Motorola:PowerMAX_OS:*:*) | 513 | Motorola:PowerMAX_OS:*:*) |
3493 | 510 | echo powerpc-motorola-powermax | 514 | echo powerpc-motorola-powermax |
3494 | @@ -530,17 +534,17 @@ EOF | |||
3495 | 530 | AViiON:dgux:*:*) | 534 | AViiON:dgux:*:*) |
3496 | 531 | # DG/UX returns AViiON for all architectures | 535 | # DG/UX returns AViiON for all architectures |
3497 | 532 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 536 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
3499 | 533 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] | 537 | if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] |
3500 | 534 | then | 538 | then |
3503 | 535 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ | 539 | if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ |
3504 | 536 | [ ${TARGET_BINARY_INTERFACE}x = x ] | 540 | [ "$TARGET_BINARY_INTERFACE"x = x ] |
3505 | 537 | then | 541 | then |
3507 | 538 | echo m88k-dg-dgux${UNAME_RELEASE} | 542 | echo m88k-dg-dgux"$UNAME_RELEASE" |
3508 | 539 | else | 543 | else |
3510 | 540 | echo m88k-dg-dguxbcs${UNAME_RELEASE} | 544 | echo m88k-dg-dguxbcs"$UNAME_RELEASE" |
3511 | 541 | fi | 545 | fi |
3512 | 542 | else | 546 | else |
3514 | 543 | echo i586-dg-dgux${UNAME_RELEASE} | 547 | echo i586-dg-dgux"$UNAME_RELEASE" |
3515 | 544 | fi | 548 | fi |
3516 | 545 | exit ;; | 549 | exit ;; |
3517 | 546 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) | 550 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
3518 | @@ -557,7 +561,7 @@ EOF | |||
3519 | 557 | echo m68k-tektronix-bsd | 561 | echo m68k-tektronix-bsd |
3520 | 558 | exit ;; | 562 | exit ;; |
3521 | 559 | *:IRIX*:*:*) | 563 | *:IRIX*:*:*) |
3523 | 560 | echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` | 564 | echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" |
3524 | 561 | exit ;; | 565 | exit ;; |
3525 | 562 | ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. | 566 | ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
3526 | 563 | echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id | 567 | echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
3527 | @@ -569,14 +573,14 @@ EOF | |||
3528 | 569 | if [ -x /usr/bin/oslevel ] ; then | 573 | if [ -x /usr/bin/oslevel ] ; then |
3529 | 570 | IBM_REV=`/usr/bin/oslevel` | 574 | IBM_REV=`/usr/bin/oslevel` |
3530 | 571 | else | 575 | else |
3532 | 572 | IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} | 576 | IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" |
3533 | 573 | fi | 577 | fi |
3535 | 574 | echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} | 578 | echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" |
3536 | 575 | exit ;; | 579 | exit ;; |
3537 | 576 | *:AIX:2:3) | 580 | *:AIX:2:3) |
3538 | 577 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then | 581 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
3541 | 578 | eval $set_cc_for_build | 582 | eval "$set_cc_for_build" |
3542 | 579 | sed 's/^ //' << EOF >$dummy.c | 583 | sed 's/^ //' << EOF > "$dummy.c" |
3543 | 580 | #include <sys/systemcfg.h> | 584 | #include <sys/systemcfg.h> |
3544 | 581 | 585 | ||
3545 | 582 | main() | 586 | main() |
3546 | @@ -587,7 +591,7 @@ EOF | |||
3547 | 587 | exit(0); | 591 | exit(0); |
3548 | 588 | } | 592 | } |
3549 | 589 | EOF | 593 | EOF |
3551 | 590 | if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` | 594 | if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` |
3552 | 591 | then | 595 | then |
3553 | 592 | echo "$SYSTEM_NAME" | 596 | echo "$SYSTEM_NAME" |
3554 | 593 | else | 597 | else |
3555 | @@ -601,7 +605,7 @@ EOF | |||
3556 | 601 | exit ;; | 605 | exit ;; |
3557 | 602 | *:AIX:*:[4567]) | 606 | *:AIX:*:[4567]) |
3558 | 603 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 607 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
3560 | 604 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 608 | if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then |
3561 | 605 | IBM_ARCH=rs6000 | 609 | IBM_ARCH=rs6000 |
3562 | 606 | else | 610 | else |
3563 | 607 | IBM_ARCH=powerpc | 611 | IBM_ARCH=powerpc |
3564 | @@ -610,18 +614,18 @@ EOF | |||
3565 | 610 | IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | | 614 | IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | |
3566 | 611 | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` | 615 | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` |
3567 | 612 | else | 616 | else |
3569 | 613 | IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} | 617 | IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" |
3570 | 614 | fi | 618 | fi |
3572 | 615 | echo ${IBM_ARCH}-ibm-aix${IBM_REV} | 619 | echo "$IBM_ARCH"-ibm-aix"$IBM_REV" |
3573 | 616 | exit ;; | 620 | exit ;; |
3574 | 617 | *:AIX:*:*) | 621 | *:AIX:*:*) |
3575 | 618 | echo rs6000-ibm-aix | 622 | echo rs6000-ibm-aix |
3576 | 619 | exit ;; | 623 | exit ;; |
3578 | 620 | ibmrt:4.4BSD:*|romp-ibm:BSD:*) | 624 | ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) |
3579 | 621 | echo romp-ibm-bsd4.4 | 625 | echo romp-ibm-bsd4.4 |
3580 | 622 | exit ;; | 626 | exit ;; |
3581 | 623 | ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and | 627 | ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
3583 | 624 | echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to | 628 | echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to |
3584 | 625 | exit ;; # report: romp-ibm BSD 4.3 | 629 | exit ;; # report: romp-ibm BSD 4.3 |
3585 | 626 | *:BOSX:*:*) | 630 | *:BOSX:*:*) |
3586 | 627 | echo rs6000-bull-bosx | 631 | echo rs6000-bull-bosx |
3587 | @@ -636,28 +640,28 @@ EOF | |||
3588 | 636 | echo m68k-hp-bsd4.4 | 640 | echo m68k-hp-bsd4.4 |
3589 | 637 | exit ;; | 641 | exit ;; |
3590 | 638 | 9000/[34678]??:HP-UX:*:*) | 642 | 9000/[34678]??:HP-UX:*:*) |
3595 | 639 | HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` | 643 | HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` |
3596 | 640 | case "${UNAME_MACHINE}" in | 644 | case "$UNAME_MACHINE" in |
3597 | 641 | 9000/31? ) HP_ARCH=m68000 ;; | 645 | 9000/31?) HP_ARCH=m68000 ;; |
3598 | 642 | 9000/[34]?? ) HP_ARCH=m68k ;; | 646 | 9000/[34]??) HP_ARCH=m68k ;; |
3599 | 643 | 9000/[678][0-9][0-9]) | 647 | 9000/[678][0-9][0-9]) |
3600 | 644 | if [ -x /usr/bin/getconf ]; then | 648 | if [ -x /usr/bin/getconf ]; then |
3601 | 645 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 649 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
3602 | 646 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | 650 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3604 | 647 | case "${sc_cpu_version}" in | 651 | case "$sc_cpu_version" in |
3605 | 648 | 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 | 652 | 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 |
3606 | 649 | 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 | 653 | 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 |
3607 | 650 | 532) # CPU_PA_RISC2_0 | 654 | 532) # CPU_PA_RISC2_0 |
3609 | 651 | case "${sc_kernel_bits}" in | 655 | case "$sc_kernel_bits" in |
3610 | 652 | 32) HP_ARCH=hppa2.0n ;; | 656 | 32) HP_ARCH=hppa2.0n ;; |
3611 | 653 | 64) HP_ARCH=hppa2.0w ;; | 657 | 64) HP_ARCH=hppa2.0w ;; |
3612 | 654 | '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 | 658 | '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 |
3613 | 655 | esac ;; | 659 | esac ;; |
3614 | 656 | esac | 660 | esac |
3615 | 657 | fi | 661 | fi |
3619 | 658 | if [ "${HP_ARCH}" = "" ]; then | 662 | if [ "$HP_ARCH" = "" ]; then |
3620 | 659 | eval $set_cc_for_build | 663 | eval "$set_cc_for_build" |
3621 | 660 | sed 's/^ //' << EOF >$dummy.c | 664 | sed 's/^ //' << EOF > "$dummy.c" |
3622 | 661 | 665 | ||
3623 | 662 | #define _HPUX_SOURCE | 666 | #define _HPUX_SOURCE |
3624 | 663 | #include <stdlib.h> | 667 | #include <stdlib.h> |
3625 | @@ -690,13 +694,13 @@ EOF | |||
3626 | 690 | exit (0); | 694 | exit (0); |
3627 | 691 | } | 695 | } |
3628 | 692 | EOF | 696 | EOF |
3630 | 693 | (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | 697 | (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` |
3631 | 694 | test -z "$HP_ARCH" && HP_ARCH=hppa | 698 | test -z "$HP_ARCH" && HP_ARCH=hppa |
3632 | 695 | fi ;; | 699 | fi ;; |
3633 | 696 | esac | 700 | esac |
3635 | 697 | if [ ${HP_ARCH} = hppa2.0w ] | 701 | if [ "$HP_ARCH" = hppa2.0w ] |
3636 | 698 | then | 702 | then |
3638 | 699 | eval $set_cc_for_build | 703 | eval "$set_cc_for_build" |
3639 | 700 | 704 | ||
3640 | 701 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating | 705 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
3641 | 702 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler | 706 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
3642 | @@ -715,15 +719,15 @@ EOF | |||
3643 | 715 | HP_ARCH=hppa64 | 719 | HP_ARCH=hppa64 |
3644 | 716 | fi | 720 | fi |
3645 | 717 | fi | 721 | fi |
3647 | 718 | echo ${HP_ARCH}-hp-hpux${HPUX_REV} | 722 | echo "$HP_ARCH"-hp-hpux"$HPUX_REV" |
3648 | 719 | exit ;; | 723 | exit ;; |
3649 | 720 | ia64:HP-UX:*:*) | 724 | ia64:HP-UX:*:*) |
3652 | 721 | HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` | 725 | HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` |
3653 | 722 | echo ia64-hp-hpux${HPUX_REV} | 726 | echo ia64-hp-hpux"$HPUX_REV" |
3654 | 723 | exit ;; | 727 | exit ;; |
3655 | 724 | 3050*:HI-UX:*:*) | 728 | 3050*:HI-UX:*:*) |
3658 | 725 | eval $set_cc_for_build | 729 | eval "$set_cc_for_build" |
3659 | 726 | sed 's/^ //' << EOF >$dummy.c | 730 | sed 's/^ //' << EOF > "$dummy.c" |
3660 | 727 | #include <unistd.h> | 731 | #include <unistd.h> |
3661 | 728 | int | 732 | int |
3662 | 729 | main () | 733 | main () |
3663 | @@ -748,11 +752,11 @@ EOF | |||
3664 | 748 | exit (0); | 752 | exit (0); |
3665 | 749 | } | 753 | } |
3666 | 750 | EOF | 754 | EOF |
3668 | 751 | $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && | 755 | $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && |
3669 | 752 | { echo "$SYSTEM_NAME"; exit; } | 756 | { echo "$SYSTEM_NAME"; exit; } |
3670 | 753 | echo unknown-hitachi-hiuxwe2 | 757 | echo unknown-hitachi-hiuxwe2 |
3671 | 754 | exit ;; | 758 | exit ;; |
3673 | 755 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) | 759 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) |
3674 | 756 | echo hppa1.1-hp-bsd | 760 | echo hppa1.1-hp-bsd |
3675 | 757 | exit ;; | 761 | exit ;; |
3676 | 758 | 9000/8??:4.3bsd:*:*) | 762 | 9000/8??:4.3bsd:*:*) |
3677 | @@ -761,7 +765,7 @@ EOF | |||
3678 | 761 | *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) | 765 | *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
3679 | 762 | echo hppa1.0-hp-mpeix | 766 | echo hppa1.0-hp-mpeix |
3680 | 763 | exit ;; | 767 | exit ;; |
3682 | 764 | hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) | 768 | hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) |
3683 | 765 | echo hppa1.1-hp-osf | 769 | echo hppa1.1-hp-osf |
3684 | 766 | exit ;; | 770 | exit ;; |
3685 | 767 | hp8??:OSF1:*:*) | 771 | hp8??:OSF1:*:*) |
3686 | @@ -769,9 +773,9 @@ EOF | |||
3687 | 769 | exit ;; | 773 | exit ;; |
3688 | 770 | i*86:OSF1:*:*) | 774 | i*86:OSF1:*:*) |
3689 | 771 | if [ -x /usr/sbin/sysversion ] ; then | 775 | if [ -x /usr/sbin/sysversion ] ; then |
3691 | 772 | echo ${UNAME_MACHINE}-unknown-osf1mk | 776 | echo "$UNAME_MACHINE"-unknown-osf1mk |
3692 | 773 | else | 777 | else |
3694 | 774 | echo ${UNAME_MACHINE}-unknown-osf1 | 778 | echo "$UNAME_MACHINE"-unknown-osf1 |
3695 | 775 | fi | 779 | fi |
3696 | 776 | exit ;; | 780 | exit ;; |
3697 | 777 | parisc*:Lites*:*:*) | 781 | parisc*:Lites*:*:*) |
3698 | @@ -796,128 +800,109 @@ EOF | |||
3699 | 796 | echo c4-convex-bsd | 800 | echo c4-convex-bsd |
3700 | 797 | exit ;; | 801 | exit ;; |
3701 | 798 | CRAY*Y-MP:*:*:*) | 802 | CRAY*Y-MP:*:*:*) |
3703 | 799 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 803 | echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3704 | 800 | exit ;; | 804 | exit ;; |
3705 | 801 | CRAY*[A-Z]90:*:*:*) | 805 | CRAY*[A-Z]90:*:*:*) |
3707 | 802 | echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | 806 | echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ |
3708 | 803 | | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ | 807 | | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
3709 | 804 | -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ | 808 | -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
3710 | 805 | -e 's/\.[^.]*$/.X/' | 809 | -e 's/\.[^.]*$/.X/' |
3711 | 806 | exit ;; | 810 | exit ;; |
3712 | 807 | CRAY*TS:*:*:*) | 811 | CRAY*TS:*:*:*) |
3714 | 808 | echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 812 | echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3715 | 809 | exit ;; | 813 | exit ;; |
3716 | 810 | CRAY*T3E:*:*:*) | 814 | CRAY*T3E:*:*:*) |
3718 | 811 | echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 815 | echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3719 | 812 | exit ;; | 816 | exit ;; |
3720 | 813 | CRAY*SV1:*:*:*) | 817 | CRAY*SV1:*:*:*) |
3722 | 814 | echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 818 | echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3723 | 815 | exit ;; | 819 | exit ;; |
3724 | 816 | *:UNICOS/mp:*:*) | 820 | *:UNICOS/mp:*:*) |
3726 | 817 | echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 821 | echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3727 | 818 | exit ;; | 822 | exit ;; |
3728 | 819 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | 823 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
3729 | 820 | FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` | 824 | FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` |
3730 | 821 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` | 825 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` |
3732 | 822 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | 826 | FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` |
3733 | 823 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 827 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3734 | 824 | exit ;; | 828 | exit ;; |
3735 | 825 | 5000:UNIX_System_V:4.*:*) | 829 | 5000:UNIX_System_V:4.*:*) |
3736 | 826 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` | 830 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` |
3738 | 827 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` | 831 | FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` |
3739 | 828 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 832 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3740 | 829 | exit ;; | 833 | exit ;; |
3741 | 830 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | 834 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
3743 | 831 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | 835 | echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" |
3744 | 832 | exit ;; | 836 | exit ;; |
3745 | 833 | sparc*:BSD/OS:*:*) | 837 | sparc*:BSD/OS:*:*) |
3747 | 834 | echo sparc-unknown-bsdi${UNAME_RELEASE} | 838 | echo sparc-unknown-bsdi"$UNAME_RELEASE" |
3748 | 835 | exit ;; | 839 | exit ;; |
3749 | 836 | *:BSD/OS:*:*) | 840 | *:BSD/OS:*:*) |
3751 | 837 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | 841 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" |
3752 | 838 | exit ;; | 842 | exit ;; |
3753 | 839 | *:FreeBSD:*:*) | 843 | *:FreeBSD:*:*) |
3754 | 840 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 844 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
3756 | 841 | case ${UNAME_PROCESSOR} in | 845 | case "$UNAME_PROCESSOR" in |
3757 | 842 | amd64) | 846 | amd64) |
3758 | 843 | UNAME_PROCESSOR=x86_64 ;; | 847 | UNAME_PROCESSOR=x86_64 ;; |
3759 | 844 | i386) | 848 | i386) |
3760 | 845 | UNAME_PROCESSOR=i586 ;; | 849 | UNAME_PROCESSOR=i586 ;; |
3761 | 846 | esac | 850 | esac |
3763 | 847 | echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 851 | echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" |
3764 | 848 | exit ;; | 852 | exit ;; |
3765 | 849 | i*:CYGWIN*:*) | 853 | i*:CYGWIN*:*) |
3767 | 850 | echo ${UNAME_MACHINE}-pc-cygwin | 854 | echo "$UNAME_MACHINE"-pc-cygwin |
3768 | 851 | exit ;; | 855 | exit ;; |
3769 | 852 | *:MINGW64*:*) | 856 | *:MINGW64*:*) |
3771 | 853 | echo ${UNAME_MACHINE}-pc-mingw64 | 857 | echo "$UNAME_MACHINE"-pc-mingw64 |
3772 | 854 | exit ;; | 858 | exit ;; |
3773 | 855 | *:MINGW*:*) | 859 | *:MINGW*:*) |
3775 | 856 | echo ${UNAME_MACHINE}-pc-mingw32 | 860 | echo "$UNAME_MACHINE"-pc-mingw32 |
3776 | 857 | exit ;; | 861 | exit ;; |
3777 | 858 | *:MSYS*:*) | 862 | *:MSYS*:*) |
3783 | 859 | echo ${UNAME_MACHINE}-pc-msys | 863 | echo "$UNAME_MACHINE"-pc-msys |
3779 | 860 | exit ;; | ||
3780 | 861 | i*:windows32*:*) | ||
3781 | 862 | # uname -m includes "-pc" on this system. | ||
3782 | 863 | echo ${UNAME_MACHINE}-mingw32 | ||
3784 | 864 | exit ;; | 864 | exit ;; |
3785 | 865 | i*:PW*:*) | 865 | i*:PW*:*) |
3787 | 866 | echo ${UNAME_MACHINE}-pc-pw32 | 866 | echo "$UNAME_MACHINE"-pc-pw32 |
3788 | 867 | exit ;; | 867 | exit ;; |
3789 | 868 | *:Interix*:*) | 868 | *:Interix*:*) |
3791 | 869 | case ${UNAME_MACHINE} in | 869 | case "$UNAME_MACHINE" in |
3792 | 870 | x86) | 870 | x86) |
3794 | 871 | echo i586-pc-interix${UNAME_RELEASE} | 871 | echo i586-pc-interix"$UNAME_RELEASE" |
3795 | 872 | exit ;; | 872 | exit ;; |
3796 | 873 | authenticamd | genuineintel | EM64T) | 873 | authenticamd | genuineintel | EM64T) |
3798 | 874 | echo x86_64-unknown-interix${UNAME_RELEASE} | 874 | echo x86_64-unknown-interix"$UNAME_RELEASE" |
3799 | 875 | exit ;; | 875 | exit ;; |
3800 | 876 | IA64) | 876 | IA64) |
3802 | 877 | echo ia64-unknown-interix${UNAME_RELEASE} | 877 | echo ia64-unknown-interix"$UNAME_RELEASE" |
3803 | 878 | exit ;; | 878 | exit ;; |
3804 | 879 | esac ;; | 879 | esac ;; |
3805 | 880 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | ||
3806 | 881 | echo i${UNAME_MACHINE}-pc-mks | ||
3807 | 882 | exit ;; | ||
3808 | 883 | 8664:Windows_NT:*) | ||
3809 | 884 | echo x86_64-pc-mks | ||
3810 | 885 | exit ;; | ||
3811 | 886 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) | ||
3812 | 887 | # How do we know it's Interix rather than the generic POSIX subsystem? | ||
3813 | 888 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we | ||
3814 | 889 | # UNAME_MACHINE based on the output of uname instead of i386? | ||
3815 | 890 | echo i586-pc-interix | ||
3816 | 891 | exit ;; | ||
3817 | 892 | i*:UWIN*:*) | 880 | i*:UWIN*:*) |
3819 | 893 | echo ${UNAME_MACHINE}-pc-uwin | 881 | echo "$UNAME_MACHINE"-pc-uwin |
3820 | 894 | exit ;; | 882 | exit ;; |
3821 | 895 | amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) | 883 | amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
3822 | 896 | echo x86_64-unknown-cygwin | 884 | echo x86_64-unknown-cygwin |
3823 | 897 | exit ;; | 885 | exit ;; |
3824 | 898 | p*:CYGWIN*:*) | ||
3825 | 899 | echo powerpcle-unknown-cygwin | ||
3826 | 900 | exit ;; | ||
3827 | 901 | prep*:SunOS:5.*:*) | 886 | prep*:SunOS:5.*:*) |
3829 | 902 | echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 887 | echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
3830 | 903 | exit ;; | 888 | exit ;; |
3831 | 904 | *:GNU:*:*) | 889 | *:GNU:*:*) |
3832 | 905 | # the GNU system | 890 | # the GNU system |
3834 | 906 | echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` | 891 | echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" |
3835 | 907 | exit ;; | 892 | exit ;; |
3836 | 908 | *:GNU/*:*:*) | 893 | *:GNU/*:*:*) |
3837 | 909 | # other systems with GNU libc and userland | 894 | # other systems with GNU libc and userland |
3839 | 910 | echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} | 895 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" |
3840 | 911 | exit ;; | 896 | exit ;; |
3841 | 912 | i*86:Minix:*:*) | 897 | i*86:Minix:*:*) |
3843 | 913 | echo ${UNAME_MACHINE}-pc-minix | 898 | echo "$UNAME_MACHINE"-pc-minix |
3844 | 914 | exit ;; | 899 | exit ;; |
3845 | 915 | aarch64:Linux:*:*) | 900 | aarch64:Linux:*:*) |
3847 | 916 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 901 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3848 | 917 | exit ;; | 902 | exit ;; |
3849 | 918 | aarch64_be:Linux:*:*) | 903 | aarch64_be:Linux:*:*) |
3850 | 919 | UNAME_MACHINE=aarch64_be | 904 | UNAME_MACHINE=aarch64_be |
3852 | 920 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 905 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3853 | 921 | exit ;; | 906 | exit ;; |
3854 | 922 | alpha:Linux:*:*) | 907 | alpha:Linux:*:*) |
3855 | 923 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 908 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
3856 | @@ -931,63 +916,63 @@ EOF | |||
3857 | 931 | esac | 916 | esac |
3858 | 932 | objdump --private-headers /bin/sh | grep -q ld.so.1 | 917 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
3859 | 933 | if test "$?" = 0 ; then LIBC=gnulibc1 ; fi | 918 | if test "$?" = 0 ; then LIBC=gnulibc1 ; fi |
3861 | 934 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 919 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3862 | 935 | exit ;; | 920 | exit ;; |
3863 | 936 | arc:Linux:*:* | arceb:Linux:*:*) | 921 | arc:Linux:*:* | arceb:Linux:*:*) |
3865 | 937 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 922 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3866 | 938 | exit ;; | 923 | exit ;; |
3867 | 939 | arm*:Linux:*:*) | 924 | arm*:Linux:*:*) |
3869 | 940 | eval $set_cc_for_build | 925 | eval "$set_cc_for_build" |
3870 | 941 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 926 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
3871 | 942 | | grep -q __ARM_EABI__ | 927 | | grep -q __ARM_EABI__ |
3872 | 943 | then | 928 | then |
3874 | 944 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 929 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3875 | 945 | else | 930 | else |
3876 | 946 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | 931 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
3877 | 947 | | grep -q __ARM_PCS_VFP | 932 | | grep -q __ARM_PCS_VFP |
3878 | 948 | then | 933 | then |
3880 | 949 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi | 934 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi |
3881 | 950 | else | 935 | else |
3883 | 951 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf | 936 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf |
3884 | 952 | fi | 937 | fi |
3885 | 953 | fi | 938 | fi |
3886 | 954 | exit ;; | 939 | exit ;; |
3887 | 955 | avr32*:Linux:*:*) | 940 | avr32*:Linux:*:*) |
3889 | 956 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 941 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3890 | 957 | exit ;; | 942 | exit ;; |
3891 | 958 | cris:Linux:*:*) | 943 | cris:Linux:*:*) |
3893 | 959 | echo ${UNAME_MACHINE}-axis-linux-${LIBC} | 944 | echo "$UNAME_MACHINE"-axis-linux-"$LIBC" |
3894 | 960 | exit ;; | 945 | exit ;; |
3895 | 961 | crisv32:Linux:*:*) | 946 | crisv32:Linux:*:*) |
3897 | 962 | echo ${UNAME_MACHINE}-axis-linux-${LIBC} | 947 | echo "$UNAME_MACHINE"-axis-linux-"$LIBC" |
3898 | 963 | exit ;; | 948 | exit ;; |
3899 | 964 | e2k:Linux:*:*) | 949 | e2k:Linux:*:*) |
3901 | 965 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 950 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3902 | 966 | exit ;; | 951 | exit ;; |
3903 | 967 | frv:Linux:*:*) | 952 | frv:Linux:*:*) |
3905 | 968 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 953 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3906 | 969 | exit ;; | 954 | exit ;; |
3907 | 970 | hexagon:Linux:*:*) | 955 | hexagon:Linux:*:*) |
3909 | 971 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 956 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3910 | 972 | exit ;; | 957 | exit ;; |
3911 | 973 | i*86:Linux:*:*) | 958 | i*86:Linux:*:*) |
3913 | 974 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} | 959 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" |
3914 | 975 | exit ;; | 960 | exit ;; |
3915 | 976 | ia64:Linux:*:*) | 961 | ia64:Linux:*:*) |
3917 | 977 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 962 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3918 | 978 | exit ;; | 963 | exit ;; |
3919 | 979 | k1om:Linux:*:*) | 964 | k1om:Linux:*:*) |
3921 | 980 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 965 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3922 | 981 | exit ;; | 966 | exit ;; |
3923 | 982 | m32r*:Linux:*:*) | 967 | m32r*:Linux:*:*) |
3925 | 983 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 968 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3926 | 984 | exit ;; | 969 | exit ;; |
3927 | 985 | m68*:Linux:*:*) | 970 | m68*:Linux:*:*) |
3929 | 986 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 971 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3930 | 987 | exit ;; | 972 | exit ;; |
3931 | 988 | mips:Linux:*:* | mips64:Linux:*:*) | 973 | mips:Linux:*:* | mips64:Linux:*:*) |
3934 | 989 | eval $set_cc_for_build | 974 | eval "$set_cc_for_build" |
3935 | 990 | sed 's/^ //' << EOF >$dummy.c | 975 | sed 's/^ //' << EOF > "$dummy.c" |
3936 | 991 | #undef CPU | 976 | #undef CPU |
3937 | 992 | #undef ${UNAME_MACHINE} | 977 | #undef ${UNAME_MACHINE} |
3938 | 993 | #undef ${UNAME_MACHINE}el | 978 | #undef ${UNAME_MACHINE}el |
3939 | @@ -1001,70 +986,74 @@ EOF | |||
3940 | 1001 | #endif | 986 | #endif |
3941 | 1002 | #endif | 987 | #endif |
3942 | 1003 | EOF | 988 | EOF |
3945 | 1004 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` | 989 | eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" |
3946 | 1005 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | 990 | test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } |
3947 | 1006 | ;; | 991 | ;; |
3948 | 1007 | mips64el:Linux:*:*) | 992 | mips64el:Linux:*:*) |
3950 | 1008 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 993 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3951 | 1009 | exit ;; | 994 | exit ;; |
3952 | 1010 | openrisc*:Linux:*:*) | 995 | openrisc*:Linux:*:*) |
3954 | 1011 | echo or1k-unknown-linux-${LIBC} | 996 | echo or1k-unknown-linux-"$LIBC" |
3955 | 1012 | exit ;; | 997 | exit ;; |
3956 | 1013 | or32:Linux:*:* | or1k*:Linux:*:*) | 998 | or32:Linux:*:* | or1k*:Linux:*:*) |
3958 | 1014 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 999 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3959 | 1015 | exit ;; | 1000 | exit ;; |
3960 | 1016 | padre:Linux:*:*) | 1001 | padre:Linux:*:*) |
3962 | 1017 | echo sparc-unknown-linux-${LIBC} | 1002 | echo sparc-unknown-linux-"$LIBC" |
3963 | 1018 | exit ;; | 1003 | exit ;; |
3964 | 1019 | parisc64:Linux:*:* | hppa64:Linux:*:*) | 1004 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
3966 | 1020 | echo hppa64-unknown-linux-${LIBC} | 1005 | echo hppa64-unknown-linux-"$LIBC" |
3967 | 1021 | exit ;; | 1006 | exit ;; |
3968 | 1022 | parisc:Linux:*:* | hppa:Linux:*:*) | 1007 | parisc:Linux:*:* | hppa:Linux:*:*) |
3969 | 1023 | # Look for CPU level | 1008 | # Look for CPU level |
3970 | 1024 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | 1009 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
3974 | 1025 | PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; | 1010 | PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; |
3975 | 1026 | PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; | 1011 | PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; |
3976 | 1027 | *) echo hppa-unknown-linux-${LIBC} ;; | 1012 | *) echo hppa-unknown-linux-"$LIBC" ;; |
3977 | 1028 | esac | 1013 | esac |
3978 | 1029 | exit ;; | 1014 | exit ;; |
3979 | 1030 | ppc64:Linux:*:*) | 1015 | ppc64:Linux:*:*) |
3981 | 1031 | echo powerpc64-unknown-linux-${LIBC} | 1016 | echo powerpc64-unknown-linux-"$LIBC" |
3982 | 1032 | exit ;; | 1017 | exit ;; |
3983 | 1033 | ppc:Linux:*:*) | 1018 | ppc:Linux:*:*) |
3985 | 1034 | echo powerpc-unknown-linux-${LIBC} | 1019 | echo powerpc-unknown-linux-"$LIBC" |
3986 | 1035 | exit ;; | 1020 | exit ;; |
3987 | 1036 | ppc64le:Linux:*:*) | 1021 | ppc64le:Linux:*:*) |
3989 | 1037 | echo powerpc64le-unknown-linux-${LIBC} | 1022 | echo powerpc64le-unknown-linux-"$LIBC" |
3990 | 1038 | exit ;; | 1023 | exit ;; |
3991 | 1039 | ppcle:Linux:*:*) | 1024 | ppcle:Linux:*:*) |
3993 | 1040 | echo powerpcle-unknown-linux-${LIBC} | 1025 | echo powerpcle-unknown-linux-"$LIBC" |
3994 | 1041 | exit ;; | 1026 | exit ;; |
3995 | 1042 | riscv32:Linux:*:* | riscv64:Linux:*:*) | 1027 | riscv32:Linux:*:* | riscv64:Linux:*:*) |
3997 | 1043 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1028 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3998 | 1044 | exit ;; | 1029 | exit ;; |
3999 | 1045 | s390:Linux:*:* | s390x:Linux:*:*) | 1030 | s390:Linux:*:* | s390x:Linux:*:*) |
4001 | 1046 | echo ${UNAME_MACHINE}-ibm-linux-${LIBC} | 1031 | echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" |
4002 | 1047 | exit ;; | 1032 | exit ;; |
4003 | 1048 | sh64*:Linux:*:*) | 1033 | sh64*:Linux:*:*) |
4005 | 1049 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1034 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4006 | 1050 | exit ;; | 1035 | exit ;; |
4007 | 1051 | sh*:Linux:*:*) | 1036 | sh*:Linux:*:*) |
4009 | 1052 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1037 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4010 | 1053 | exit ;; | 1038 | exit ;; |
4011 | 1054 | sparc:Linux:*:* | sparc64:Linux:*:*) | 1039 | sparc:Linux:*:* | sparc64:Linux:*:*) |
4013 | 1055 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1040 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4014 | 1056 | exit ;; | 1041 | exit ;; |
4015 | 1057 | tile*:Linux:*:*) | 1042 | tile*:Linux:*:*) |
4017 | 1058 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1043 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4018 | 1059 | exit ;; | 1044 | exit ;; |
4019 | 1060 | vax:Linux:*:*) | 1045 | vax:Linux:*:*) |
4021 | 1061 | echo ${UNAME_MACHINE}-dec-linux-${LIBC} | 1046 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" |
4022 | 1062 | exit ;; | 1047 | exit ;; |
4023 | 1063 | x86_64:Linux:*:*) | 1048 | x86_64:Linux:*:*) |
4025 | 1064 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} | 1049 | if objdump -f /bin/sh | grep -q elf32-x86-64; then |
4026 | 1050 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 | ||
4027 | 1051 | else | ||
4028 | 1052 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" | ||
4029 | 1053 | fi | ||
4030 | 1065 | exit ;; | 1054 | exit ;; |
4031 | 1066 | xtensa*:Linux:*:*) | 1055 | xtensa*:Linux:*:*) |
4033 | 1067 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1056 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4034 | 1068 | exit ;; | 1057 | exit ;; |
4035 | 1069 | i*86:DYNIX/ptx:4*:*) | 1058 | i*86:DYNIX/ptx:4*:*) |
4036 | 1070 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 1059 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
4037 | @@ -1078,34 +1067,34 @@ EOF | |||
4038 | 1078 | # I am not positive that other SVR4 systems won't match this, | 1067 | # I am not positive that other SVR4 systems won't match this, |
4039 | 1079 | # I just have to hope. -- rms. | 1068 | # I just have to hope. -- rms. |
4040 | 1080 | # Use sysv4.2uw... so that sysv4* matches it. | 1069 | # Use sysv4.2uw... so that sysv4* matches it. |
4042 | 1081 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | 1070 | echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" |
4043 | 1082 | exit ;; | 1071 | exit ;; |
4044 | 1083 | i*86:OS/2:*:*) | 1072 | i*86:OS/2:*:*) |
4045 | 1084 | # If we were able to find `uname', then EMX Unix compatibility | 1073 | # If we were able to find `uname', then EMX Unix compatibility |
4046 | 1085 | # is probably installed. | 1074 | # is probably installed. |
4048 | 1086 | echo ${UNAME_MACHINE}-pc-os2-emx | 1075 | echo "$UNAME_MACHINE"-pc-os2-emx |
4049 | 1087 | exit ;; | 1076 | exit ;; |
4050 | 1088 | i*86:XTS-300:*:STOP) | 1077 | i*86:XTS-300:*:STOP) |
4052 | 1089 | echo ${UNAME_MACHINE}-unknown-stop | 1078 | echo "$UNAME_MACHINE"-unknown-stop |
4053 | 1090 | exit ;; | 1079 | exit ;; |
4054 | 1091 | i*86:atheos:*:*) | 1080 | i*86:atheos:*:*) |
4056 | 1092 | echo ${UNAME_MACHINE}-unknown-atheos | 1081 | echo "$UNAME_MACHINE"-unknown-atheos |
4057 | 1093 | exit ;; | 1082 | exit ;; |
4058 | 1094 | i*86:syllable:*:*) | 1083 | i*86:syllable:*:*) |
4060 | 1095 | echo ${UNAME_MACHINE}-pc-syllable | 1084 | echo "$UNAME_MACHINE"-pc-syllable |
4061 | 1096 | exit ;; | 1085 | exit ;; |
4062 | 1097 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) | 1086 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
4064 | 1098 | echo i386-unknown-lynxos${UNAME_RELEASE} | 1087 | echo i386-unknown-lynxos"$UNAME_RELEASE" |
4065 | 1099 | exit ;; | 1088 | exit ;; |
4066 | 1100 | i*86:*DOS:*:*) | 1089 | i*86:*DOS:*:*) |
4068 | 1101 | echo ${UNAME_MACHINE}-pc-msdosdjgpp | 1090 | echo "$UNAME_MACHINE"-pc-msdosdjgpp |
4069 | 1102 | exit ;; | 1091 | exit ;; |
4072 | 1103 | i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) | 1092 | i*86:*:4.*:*) |
4073 | 1104 | UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` | 1093 | UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` |
4074 | 1105 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then | 1094 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
4076 | 1106 | echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} | 1095 | echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" |
4077 | 1107 | else | 1096 | else |
4079 | 1108 | echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} | 1097 | echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" |
4080 | 1109 | fi | 1098 | fi |
4081 | 1110 | exit ;; | 1099 | exit ;; |
4082 | 1111 | i*86:*:5:[678]*) | 1100 | i*86:*:5:[678]*) |
4083 | @@ -1115,12 +1104,12 @@ EOF | |||
4084 | 1115 | *Pentium) UNAME_MACHINE=i586 ;; | 1104 | *Pentium) UNAME_MACHINE=i586 ;; |
4085 | 1116 | *Pent*|*Celeron) UNAME_MACHINE=i686 ;; | 1105 | *Pent*|*Celeron) UNAME_MACHINE=i686 ;; |
4086 | 1117 | esac | 1106 | esac |
4088 | 1118 | echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} | 1107 | echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" |
4089 | 1119 | exit ;; | 1108 | exit ;; |
4090 | 1120 | i*86:*:3.2:*) | 1109 | i*86:*:3.2:*) |
4091 | 1121 | if test -f /usr/options/cb.name; then | 1110 | if test -f /usr/options/cb.name; then |
4092 | 1122 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` | 1111 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` |
4094 | 1123 | echo ${UNAME_MACHINE}-pc-isc$UNAME_REL | 1112 | echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" |
4095 | 1124 | elif /bin/uname -X 2>/dev/null >/dev/null ; then | 1113 | elif /bin/uname -X 2>/dev/null >/dev/null ; then |
4096 | 1125 | UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` | 1114 | UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` |
4097 | 1126 | (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 | 1115 | (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 |
4098 | @@ -1130,9 +1119,9 @@ EOF | |||
4099 | 1130 | && UNAME_MACHINE=i686 | 1119 | && UNAME_MACHINE=i686 |
4100 | 1131 | (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ | 1120 | (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ |
4101 | 1132 | && UNAME_MACHINE=i686 | 1121 | && UNAME_MACHINE=i686 |
4103 | 1133 | echo ${UNAME_MACHINE}-pc-sco$UNAME_REL | 1122 | echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" |
4104 | 1134 | else | 1123 | else |
4106 | 1135 | echo ${UNAME_MACHINE}-pc-sysv32 | 1124 | echo "$UNAME_MACHINE"-pc-sysv32 |
4107 | 1136 | fi | 1125 | fi |
4108 | 1137 | exit ;; | 1126 | exit ;; |
4109 | 1138 | pc:*:*:*) | 1127 | pc:*:*:*) |
4110 | @@ -1152,9 +1141,9 @@ EOF | |||
4111 | 1152 | exit ;; | 1141 | exit ;; |
4112 | 1153 | i860:*:4.*:*) # i860-SVR4 | 1142 | i860:*:4.*:*) # i860-SVR4 |
4113 | 1154 | if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then | 1143 | if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then |
4115 | 1155 | echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 | 1144 | echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 |
4116 | 1156 | else # Add other i860-SVR4 vendors below as they are discovered. | 1145 | else # Add other i860-SVR4 vendors below as they are discovered. |
4118 | 1157 | echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 | 1146 | echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 |
4119 | 1158 | fi | 1147 | fi |
4120 | 1159 | exit ;; | 1148 | exit ;; |
4121 | 1160 | mini*:CTIX:SYS*5:*) | 1149 | mini*:CTIX:SYS*5:*) |
4122 | @@ -1174,9 +1163,9 @@ EOF | |||
4123 | 1174 | test -r /etc/.relid \ | 1163 | test -r /etc/.relid \ |
4124 | 1175 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | 1164 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
4125 | 1176 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1165 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4127 | 1177 | && { echo i486-ncr-sysv4.3${OS_REL}; exit; } | 1166 | && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } |
4128 | 1178 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1167 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
4130 | 1179 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1168 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; |
4131 | 1180 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1169 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
4132 | 1181 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1170 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4133 | 1182 | && { echo i486-ncr-sysv4; exit; } ;; | 1171 | && { echo i486-ncr-sysv4; exit; } ;; |
4134 | @@ -1185,28 +1174,28 @@ EOF | |||
4135 | 1185 | test -r /etc/.relid \ | 1174 | test -r /etc/.relid \ |
4136 | 1186 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | 1175 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
4137 | 1187 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1176 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4139 | 1188 | && { echo i486-ncr-sysv4.3${OS_REL}; exit; } | 1177 | && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } |
4140 | 1189 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1178 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
4142 | 1190 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } | 1179 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } |
4143 | 1191 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ | 1180 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ |
4145 | 1192 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1181 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; |
4146 | 1193 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) | 1182 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
4148 | 1194 | echo m68k-unknown-lynxos${UNAME_RELEASE} | 1183 | echo m68k-unknown-lynxos"$UNAME_RELEASE" |
4149 | 1195 | exit ;; | 1184 | exit ;; |
4150 | 1196 | mc68030:UNIX_System_V:4.*:*) | 1185 | mc68030:UNIX_System_V:4.*:*) |
4151 | 1197 | echo m68k-atari-sysv4 | 1186 | echo m68k-atari-sysv4 |
4152 | 1198 | exit ;; | 1187 | exit ;; |
4153 | 1199 | TSUNAMI:LynxOS:2.*:*) | 1188 | TSUNAMI:LynxOS:2.*:*) |
4155 | 1200 | echo sparc-unknown-lynxos${UNAME_RELEASE} | 1189 | echo sparc-unknown-lynxos"$UNAME_RELEASE" |
4156 | 1201 | exit ;; | 1190 | exit ;; |
4157 | 1202 | rs6000:LynxOS:2.*:*) | 1191 | rs6000:LynxOS:2.*:*) |
4159 | 1203 | echo rs6000-unknown-lynxos${UNAME_RELEASE} | 1192 | echo rs6000-unknown-lynxos"$UNAME_RELEASE" |
4160 | 1204 | exit ;; | 1193 | exit ;; |
4161 | 1205 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) | 1194 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
4163 | 1206 | echo powerpc-unknown-lynxos${UNAME_RELEASE} | 1195 | echo powerpc-unknown-lynxos"$UNAME_RELEASE" |
4164 | 1207 | exit ;; | 1196 | exit ;; |
4165 | 1208 | SM[BE]S:UNIX_SV:*:*) | 1197 | SM[BE]S:UNIX_SV:*:*) |
4167 | 1209 | echo mips-dde-sysv${UNAME_RELEASE} | 1198 | echo mips-dde-sysv"$UNAME_RELEASE" |
4168 | 1210 | exit ;; | 1199 | exit ;; |
4169 | 1211 | RM*:ReliantUNIX-*:*:*) | 1200 | RM*:ReliantUNIX-*:*:*) |
4170 | 1212 | echo mips-sni-sysv4 | 1201 | echo mips-sni-sysv4 |
4171 | @@ -1217,7 +1206,7 @@ EOF | |||
4172 | 1217 | *:SINIX-*:*:*) | 1206 | *:SINIX-*:*:*) |
4173 | 1218 | if uname -p 2>/dev/null >/dev/null ; then | 1207 | if uname -p 2>/dev/null >/dev/null ; then |
4174 | 1219 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1208 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
4176 | 1220 | echo ${UNAME_MACHINE}-sni-sysv4 | 1209 | echo "$UNAME_MACHINE"-sni-sysv4 |
4177 | 1221 | else | 1210 | else |
4178 | 1222 | echo ns32k-sni-sysv | 1211 | echo ns32k-sni-sysv |
4179 | 1223 | fi | 1212 | fi |
4180 | @@ -1237,23 +1226,23 @@ EOF | |||
4181 | 1237 | exit ;; | 1226 | exit ;; |
4182 | 1238 | i*86:VOS:*:*) | 1227 | i*86:VOS:*:*) |
4183 | 1239 | # From Paul.Green@stratus.com. | 1228 | # From Paul.Green@stratus.com. |
4185 | 1240 | echo ${UNAME_MACHINE}-stratus-vos | 1229 | echo "$UNAME_MACHINE"-stratus-vos |
4186 | 1241 | exit ;; | 1230 | exit ;; |
4187 | 1242 | *:VOS:*:*) | 1231 | *:VOS:*:*) |
4188 | 1243 | # From Paul.Green@stratus.com. | 1232 | # From Paul.Green@stratus.com. |
4189 | 1244 | echo hppa1.1-stratus-vos | 1233 | echo hppa1.1-stratus-vos |
4190 | 1245 | exit ;; | 1234 | exit ;; |
4191 | 1246 | mc68*:A/UX:*:*) | 1235 | mc68*:A/UX:*:*) |
4193 | 1247 | echo m68k-apple-aux${UNAME_RELEASE} | 1236 | echo m68k-apple-aux"$UNAME_RELEASE" |
4194 | 1248 | exit ;; | 1237 | exit ;; |
4195 | 1249 | news*:NEWS-OS:6*:*) | 1238 | news*:NEWS-OS:6*:*) |
4196 | 1250 | echo mips-sony-newsos6 | 1239 | echo mips-sony-newsos6 |
4197 | 1251 | exit ;; | 1240 | exit ;; |
4198 | 1252 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) | 1241 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
4199 | 1253 | if [ -d /usr/nec ]; then | 1242 | if [ -d /usr/nec ]; then |
4201 | 1254 | echo mips-nec-sysv${UNAME_RELEASE} | 1243 | echo mips-nec-sysv"$UNAME_RELEASE" |
4202 | 1255 | else | 1244 | else |
4204 | 1256 | echo mips-unknown-sysv${UNAME_RELEASE} | 1245 | echo mips-unknown-sysv"$UNAME_RELEASE" |
4205 | 1257 | fi | 1246 | fi |
4206 | 1258 | exit ;; | 1247 | exit ;; |
4207 | 1259 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. | 1248 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
4208 | @@ -1272,39 +1261,39 @@ EOF | |||
4209 | 1272 | echo x86_64-unknown-haiku | 1261 | echo x86_64-unknown-haiku |
4210 | 1273 | exit ;; | 1262 | exit ;; |
4211 | 1274 | SX-4:SUPER-UX:*:*) | 1263 | SX-4:SUPER-UX:*:*) |
4213 | 1275 | echo sx4-nec-superux${UNAME_RELEASE} | 1264 | echo sx4-nec-superux"$UNAME_RELEASE" |
4214 | 1276 | exit ;; | 1265 | exit ;; |
4215 | 1277 | SX-5:SUPER-UX:*:*) | 1266 | SX-5:SUPER-UX:*:*) |
4217 | 1278 | echo sx5-nec-superux${UNAME_RELEASE} | 1267 | echo sx5-nec-superux"$UNAME_RELEASE" |
4218 | 1279 | exit ;; | 1268 | exit ;; |
4219 | 1280 | SX-6:SUPER-UX:*:*) | 1269 | SX-6:SUPER-UX:*:*) |
4221 | 1281 | echo sx6-nec-superux${UNAME_RELEASE} | 1270 | echo sx6-nec-superux"$UNAME_RELEASE" |
4222 | 1282 | exit ;; | 1271 | exit ;; |
4223 | 1283 | SX-7:SUPER-UX:*:*) | 1272 | SX-7:SUPER-UX:*:*) |
4225 | 1284 | echo sx7-nec-superux${UNAME_RELEASE} | 1273 | echo sx7-nec-superux"$UNAME_RELEASE" |
4226 | 1285 | exit ;; | 1274 | exit ;; |
4227 | 1286 | SX-8:SUPER-UX:*:*) | 1275 | SX-8:SUPER-UX:*:*) |
4229 | 1287 | echo sx8-nec-superux${UNAME_RELEASE} | 1276 | echo sx8-nec-superux"$UNAME_RELEASE" |
4230 | 1288 | exit ;; | 1277 | exit ;; |
4231 | 1289 | SX-8R:SUPER-UX:*:*) | 1278 | SX-8R:SUPER-UX:*:*) |
4233 | 1290 | echo sx8r-nec-superux${UNAME_RELEASE} | 1279 | echo sx8r-nec-superux"$UNAME_RELEASE" |
4234 | 1291 | exit ;; | 1280 | exit ;; |
4235 | 1292 | SX-ACE:SUPER-UX:*:*) | 1281 | SX-ACE:SUPER-UX:*:*) |
4237 | 1293 | echo sxace-nec-superux${UNAME_RELEASE} | 1282 | echo sxace-nec-superux"$UNAME_RELEASE" |
4238 | 1294 | exit ;; | 1283 | exit ;; |
4239 | 1295 | Power*:Rhapsody:*:*) | 1284 | Power*:Rhapsody:*:*) |
4241 | 1296 | echo powerpc-apple-rhapsody${UNAME_RELEASE} | 1285 | echo powerpc-apple-rhapsody"$UNAME_RELEASE" |
4242 | 1297 | exit ;; | 1286 | exit ;; |
4243 | 1298 | *:Rhapsody:*:*) | 1287 | *:Rhapsody:*:*) |
4245 | 1299 | echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} | 1288 | echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" |
4246 | 1300 | exit ;; | 1289 | exit ;; |
4247 | 1301 | *:Darwin:*:*) | 1290 | *:Darwin:*:*) |
4248 | 1302 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1291 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
4250 | 1303 | eval $set_cc_for_build | 1292 | eval "$set_cc_for_build" |
4251 | 1304 | if test "$UNAME_PROCESSOR" = unknown ; then | 1293 | if test "$UNAME_PROCESSOR" = unknown ; then |
4252 | 1305 | UNAME_PROCESSOR=powerpc | 1294 | UNAME_PROCESSOR=powerpc |
4253 | 1306 | fi | 1295 | fi |
4255 | 1307 | if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then | 1296 | if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then |
4256 | 1308 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then | 1297 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then |
4257 | 1309 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ | 1298 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
4258 | 1310 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ | 1299 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ |
4259 | @@ -1332,7 +1321,7 @@ EOF | |||
4260 | 1332 | # that Apple uses in portable devices. | 1321 | # that Apple uses in portable devices. |
4261 | 1333 | UNAME_PROCESSOR=x86_64 | 1322 | UNAME_PROCESSOR=x86_64 |
4262 | 1334 | fi | 1323 | fi |
4264 | 1335 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | 1324 | echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" |
4265 | 1336 | exit ;; | 1325 | exit ;; |
4266 | 1337 | *:procnto*:*:* | *:QNX:[0123456789]*:*) | 1326 | *:procnto*:*:* | *:QNX:[0123456789]*:*) |
4267 | 1338 | UNAME_PROCESSOR=`uname -p` | 1327 | UNAME_PROCESSOR=`uname -p` |
4268 | @@ -1340,22 +1329,25 @@ EOF | |||
4269 | 1340 | UNAME_PROCESSOR=i386 | 1329 | UNAME_PROCESSOR=i386 |
4270 | 1341 | UNAME_MACHINE=pc | 1330 | UNAME_MACHINE=pc |
4271 | 1342 | fi | 1331 | fi |
4273 | 1343 | echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} | 1332 | echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" |
4274 | 1344 | exit ;; | 1333 | exit ;; |
4275 | 1345 | *:QNX:*:4*) | 1334 | *:QNX:*:4*) |
4276 | 1346 | echo i386-pc-qnx | 1335 | echo i386-pc-qnx |
4277 | 1347 | exit ;; | 1336 | exit ;; |
4278 | 1348 | NEO-*:NONSTOP_KERNEL:*:*) | 1337 | NEO-*:NONSTOP_KERNEL:*:*) |
4280 | 1349 | echo neo-tandem-nsk${UNAME_RELEASE} | 1338 | echo neo-tandem-nsk"$UNAME_RELEASE" |
4281 | 1350 | exit ;; | 1339 | exit ;; |
4282 | 1351 | NSE-*:NONSTOP_KERNEL:*:*) | 1340 | NSE-*:NONSTOP_KERNEL:*:*) |
4284 | 1352 | echo nse-tandem-nsk${UNAME_RELEASE} | 1341 | echo nse-tandem-nsk"$UNAME_RELEASE" |
4285 | 1353 | exit ;; | 1342 | exit ;; |
4286 | 1354 | NSR-*:NONSTOP_KERNEL:*:*) | 1343 | NSR-*:NONSTOP_KERNEL:*:*) |
4288 | 1355 | echo nsr-tandem-nsk${UNAME_RELEASE} | 1344 | echo nsr-tandem-nsk"$UNAME_RELEASE" |
4289 | 1345 | exit ;; | ||
4290 | 1346 | NSV-*:NONSTOP_KERNEL:*:*) | ||
4291 | 1347 | echo nsv-tandem-nsk"$UNAME_RELEASE" | ||
4292 | 1356 | exit ;; | 1348 | exit ;; |
4293 | 1357 | NSX-*:NONSTOP_KERNEL:*:*) | 1349 | NSX-*:NONSTOP_KERNEL:*:*) |
4295 | 1358 | echo nsx-tandem-nsk${UNAME_RELEASE} | 1350 | echo nsx-tandem-nsk"$UNAME_RELEASE" |
4296 | 1359 | exit ;; | 1351 | exit ;; |
4297 | 1360 | *:NonStop-UX:*:*) | 1352 | *:NonStop-UX:*:*) |
4298 | 1361 | echo mips-compaq-nonstopux | 1353 | echo mips-compaq-nonstopux |
4299 | @@ -1364,7 +1356,7 @@ EOF | |||
4300 | 1364 | echo bs2000-siemens-sysv | 1356 | echo bs2000-siemens-sysv |
4301 | 1365 | exit ;; | 1357 | exit ;; |
4302 | 1366 | DS/*:UNIX_System_V:*:*) | 1358 | DS/*:UNIX_System_V:*:*) |
4304 | 1367 | echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} | 1359 | echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" |
4305 | 1368 | exit ;; | 1360 | exit ;; |
4306 | 1369 | *:Plan9:*:*) | 1361 | *:Plan9:*:*) |
4307 | 1370 | # "uname -m" is not consistent, so use $cputype instead. 386 | 1362 | # "uname -m" is not consistent, so use $cputype instead. 386 |
4308 | @@ -1375,7 +1367,7 @@ EOF | |||
4309 | 1375 | else | 1367 | else |
4310 | 1376 | UNAME_MACHINE="$cputype" | 1368 | UNAME_MACHINE="$cputype" |
4311 | 1377 | fi | 1369 | fi |
4313 | 1378 | echo ${UNAME_MACHINE}-unknown-plan9 | 1370 | echo "$UNAME_MACHINE"-unknown-plan9 |
4314 | 1379 | exit ;; | 1371 | exit ;; |
4315 | 1380 | *:TOPS-10:*:*) | 1372 | *:TOPS-10:*:*) |
4316 | 1381 | echo pdp10-unknown-tops10 | 1373 | echo pdp10-unknown-tops10 |
4317 | @@ -1396,14 +1388,14 @@ EOF | |||
4318 | 1396 | echo pdp10-unknown-its | 1388 | echo pdp10-unknown-its |
4319 | 1397 | exit ;; | 1389 | exit ;; |
4320 | 1398 | SEI:*:*:SEIUX) | 1390 | SEI:*:*:SEIUX) |
4322 | 1399 | echo mips-sei-seiux${UNAME_RELEASE} | 1391 | echo mips-sei-seiux"$UNAME_RELEASE" |
4323 | 1400 | exit ;; | 1392 | exit ;; |
4324 | 1401 | *:DragonFly:*:*) | 1393 | *:DragonFly:*:*) |
4326 | 1402 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 1394 | echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" |
4327 | 1403 | exit ;; | 1395 | exit ;; |
4328 | 1404 | *:*VMS:*:*) | 1396 | *:*VMS:*:*) |
4329 | 1405 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1397 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
4331 | 1406 | case "${UNAME_MACHINE}" in | 1398 | case "$UNAME_MACHINE" in |
4332 | 1407 | A*) echo alpha-dec-vms ; exit ;; | 1399 | A*) echo alpha-dec-vms ; exit ;; |
4333 | 1408 | I*) echo ia64-dec-vms ; exit ;; | 1400 | I*) echo ia64-dec-vms ; exit ;; |
4334 | 1409 | V*) echo vax-dec-vms ; exit ;; | 1401 | V*) echo vax-dec-vms ; exit ;; |
4335 | @@ -1412,32 +1404,44 @@ EOF | |||
4336 | 1412 | echo i386-pc-xenix | 1404 | echo i386-pc-xenix |
4337 | 1413 | exit ;; | 1405 | exit ;; |
4338 | 1414 | i*86:skyos:*:*) | 1406 | i*86:skyos:*:*) |
4340 | 1415 | echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` | 1407 | echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" |
4341 | 1416 | exit ;; | 1408 | exit ;; |
4342 | 1417 | i*86:rdos:*:*) | 1409 | i*86:rdos:*:*) |
4344 | 1418 | echo ${UNAME_MACHINE}-pc-rdos | 1410 | echo "$UNAME_MACHINE"-pc-rdos |
4345 | 1419 | exit ;; | 1411 | exit ;; |
4346 | 1420 | i*86:AROS:*:*) | 1412 | i*86:AROS:*:*) |
4348 | 1421 | echo ${UNAME_MACHINE}-pc-aros | 1413 | echo "$UNAME_MACHINE"-pc-aros |
4349 | 1422 | exit ;; | 1414 | exit ;; |
4350 | 1423 | x86_64:VMkernel:*:*) | 1415 | x86_64:VMkernel:*:*) |
4352 | 1424 | echo ${UNAME_MACHINE}-unknown-esx | 1416 | echo "$UNAME_MACHINE"-unknown-esx |
4353 | 1425 | exit ;; | 1417 | exit ;; |
4354 | 1426 | amd64:Isilon\ OneFS:*:*) | 1418 | amd64:Isilon\ OneFS:*:*) |
4355 | 1427 | echo x86_64-unknown-onefs | 1419 | echo x86_64-unknown-onefs |
4356 | 1428 | exit ;; | 1420 | exit ;; |
4357 | 1429 | esac | 1421 | esac |
4358 | 1430 | 1422 | ||
4359 | 1423 | echo "$0: unable to guess system type" >&2 | ||
4360 | 1424 | |||
4361 | 1425 | case "$UNAME_MACHINE:$UNAME_SYSTEM" in | ||
4362 | 1426 | mips:Linux | mips64:Linux) | ||
4363 | 1427 | # If we got here on MIPS GNU/Linux, output extra information. | ||
4364 | 1428 | cat >&2 <<EOF | ||
4365 | 1429 | |||
4366 | 1430 | NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize | ||
4367 | 1431 | the system type. Please install a C compiler and try again. | ||
4368 | 1432 | EOF | ||
4369 | 1433 | ;; | ||
4370 | 1434 | esac | ||
4371 | 1435 | |||
4372 | 1431 | cat >&2 <<EOF | 1436 | cat >&2 <<EOF |
4373 | 1432 | $0: unable to guess system type | ||
4374 | 1433 | 1437 | ||
4375 | 1434 | This script (version $timestamp), has failed to recognize the | 1438 | This script (version $timestamp), has failed to recognize the |
4376 | 1435 | operating system you are using. If your script is old, overwrite *all* | 1439 | operating system you are using. If your script is old, overwrite *all* |
4377 | 1436 | copies of config.guess and config.sub with the latest versions from: | 1440 | copies of config.guess and config.sub with the latest versions from: |
4378 | 1437 | 1441 | ||
4380 | 1438 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess | 1442 | https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
4381 | 1439 | and | 1443 | and |
4383 | 1440 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub | 1444 | https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
4384 | 1441 | 1445 | ||
4385 | 1442 | If $0 has already been updated, send the following data and any | 1446 | If $0 has already been updated, send the following data and any |
4386 | 1443 | information you think might be pertinent to config-patches@gnu.org to | 1447 | information you think might be pertinent to config-patches@gnu.org to |
4387 | @@ -1460,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null` | |||
4388 | 1460 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` | 1464 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` |
4389 | 1461 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` | 1465 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` |
4390 | 1462 | 1466 | ||
4395 | 1463 | UNAME_MACHINE = ${UNAME_MACHINE} | 1467 | UNAME_MACHINE = "$UNAME_MACHINE" |
4396 | 1464 | UNAME_RELEASE = ${UNAME_RELEASE} | 1468 | UNAME_RELEASE = "$UNAME_RELEASE" |
4397 | 1465 | UNAME_SYSTEM = ${UNAME_SYSTEM} | 1469 | UNAME_SYSTEM = "$UNAME_SYSTEM" |
4398 | 1466 | UNAME_VERSION = ${UNAME_VERSION} | 1470 | UNAME_VERSION = "$UNAME_VERSION" |
4399 | 1467 | EOF | 1471 | EOF |
4400 | 1468 | 1472 | ||
4401 | 1469 | exit 1 | 1473 | exit 1 |
4402 | 1470 | 1474 | ||
4403 | 1471 | # Local variables: | 1475 | # Local variables: |
4405 | 1472 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 1476 | # eval: (add-hook 'write-file-functions 'time-stamp) |
4406 | 1473 | # time-stamp-start: "timestamp='" | 1477 | # time-stamp-start: "timestamp='" |
4407 | 1474 | # time-stamp-format: "%:y-%02m-%02d" | 1478 | # time-stamp-format: "%:y-%02m-%02d" |
4408 | 1475 | # time-stamp-end: "'" | 1479 | # time-stamp-end: "'" |
4409 | diff --git a/clutter/build/config.sub b/clutter/build/config.sub | |||
4410 | index f4bafc1..1d8e98b 100755 | |||
4411 | --- a/clutter/build/config.sub | |||
4412 | +++ b/clutter/build/config.sub | |||
4413 | @@ -1,8 +1,8 @@ | |||
4415 | 1 | #!/bin/sh | 1 | #! /bin/sh |
4416 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
4418 | 3 | # Copyright 1992-2017 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
4419 | 4 | 4 | ||
4421 | 5 | timestamp='2017-04-02' | 5 | timestamp='2018-02-22' |
4422 | 6 | 6 | ||
4423 | 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
4424 | 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
4425 | @@ -15,7 +15,7 @@ timestamp='2017-04-02' | |||
4426 | 15 | # General Public License for more details. | 15 | # General Public License for more details. |
4427 | 16 | # | 16 | # |
4428 | 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
4430 | 18 | # along with this program; if not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program; if not, see <https://www.gnu.org/licenses/>. |
4431 | 19 | # | 19 | # |
4432 | 20 | # As a special exception to the GNU General Public License, if you | 20 | # As a special exception to the GNU General Public License, if you |
4433 | 21 | # distribute this file as part of a program that contains a | 21 | # distribute this file as part of a program that contains a |
4434 | @@ -33,7 +33,7 @@ timestamp='2017-04-02' | |||
4435 | 33 | # Otherwise, we print the canonical config type on stdout and succeed. | 33 | # Otherwise, we print the canonical config type on stdout and succeed. |
4436 | 34 | 34 | ||
4437 | 35 | # You can get the latest version of this script from: | 35 | # You can get the latest version of this script from: |
4439 | 36 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub | 36 | # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
4440 | 37 | 37 | ||
4441 | 38 | # This file is supposed to be the same for all GNU packages | 38 | # This file is supposed to be the same for all GNU packages |
4442 | 39 | # and recognize all the CPU types, system types and aliases | 39 | # and recognize all the CPU types, system types and aliases |
4443 | @@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS | |||
4444 | 57 | 57 | ||
4445 | 58 | Canonicalize a configuration name. | 58 | Canonicalize a configuration name. |
4446 | 59 | 59 | ||
4448 | 60 | Operation modes: | 60 | Options: |
4449 | 61 | -h, --help print this help, then exit | 61 | -h, --help print this help, then exit |
4450 | 62 | -t, --time-stamp print date of last modification, then exit | 62 | -t, --time-stamp print date of last modification, then exit |
4451 | 63 | -v, --version print version number, then exit | 63 | -v, --version print version number, then exit |
4452 | @@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." | |||
4453 | 67 | version="\ | 67 | version="\ |
4454 | 68 | GNU config.sub ($timestamp) | 68 | GNU config.sub ($timestamp) |
4455 | 69 | 69 | ||
4457 | 70 | Copyright 1992-2017 Free Software Foundation, Inc. | 70 | Copyright 1992-2018 Free Software Foundation, Inc. |
4458 | 71 | 71 | ||
4459 | 72 | This is free software; see the source for copying conditions. There is NO | 72 | This is free software; see the source for copying conditions. There is NO |
4460 | 73 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 73 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4461 | @@ -94,7 +94,7 @@ while test $# -gt 0 ; do | |||
4462 | 94 | 94 | ||
4463 | 95 | *local*) | 95 | *local*) |
4464 | 96 | # First pass through any local machine types. | 96 | # First pass through any local machine types. |
4466 | 97 | echo $1 | 97 | echo "$1" |
4467 | 98 | exit ;; | 98 | exit ;; |
4468 | 99 | 99 | ||
4469 | 100 | * ) | 100 | * ) |
4470 | @@ -112,7 +112,7 @@ esac | |||
4471 | 112 | 112 | ||
4472 | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). |
4473 | 114 | # Here we must recognize all the valid KERNEL-OS combinations. | 114 | # Here we must recognize all the valid KERNEL-OS combinations. |
4475 | 115 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 115 | maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
4476 | 116 | case $maybe_os in | 116 | case $maybe_os in |
4477 | 117 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ | 117 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
4478 | 118 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ | 118 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
4479 | @@ -120,16 +120,16 @@ case $maybe_os in | |||
4480 | 120 | kopensolaris*-gnu* | cloudabi*-eabi* | \ | 120 | kopensolaris*-gnu* | cloudabi*-eabi* | \ |
4481 | 121 | storm-chaos* | os2-emx* | rtmk-nova*) | 121 | storm-chaos* | os2-emx* | rtmk-nova*) |
4482 | 122 | os=-$maybe_os | 122 | os=-$maybe_os |
4484 | 123 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 123 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
4485 | 124 | ;; | 124 | ;; |
4486 | 125 | android-linux) | 125 | android-linux) |
4487 | 126 | os=-linux-android | 126 | os=-linux-android |
4489 | 127 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | 127 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
4490 | 128 | ;; | 128 | ;; |
4491 | 129 | *) | 129 | *) |
4495 | 130 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` | 130 | basic_machine=`echo "$1" | sed 's/-[^-]*$//'` |
4496 | 131 | if [ $basic_machine != $1 ] | 131 | if [ "$basic_machine" != "$1" ] |
4497 | 132 | then os=`echo $1 | sed 's/.*-/-/'` | 132 | then os=`echo "$1" | sed 's/.*-/-/'` |
4498 | 133 | else os=; fi | 133 | else os=; fi |
4499 | 134 | ;; | 134 | ;; |
4500 | 135 | esac | 135 | esac |
4501 | @@ -178,44 +178,44 @@ case $os in | |||
4502 | 178 | ;; | 178 | ;; |
4503 | 179 | -sco6) | 179 | -sco6) |
4504 | 180 | os=-sco5v6 | 180 | os=-sco5v6 |
4506 | 181 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 181 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4507 | 182 | ;; | 182 | ;; |
4508 | 183 | -sco5) | 183 | -sco5) |
4509 | 184 | os=-sco3.2v5 | 184 | os=-sco3.2v5 |
4511 | 185 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 185 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4512 | 186 | ;; | 186 | ;; |
4513 | 187 | -sco4) | 187 | -sco4) |
4514 | 188 | os=-sco3.2v4 | 188 | os=-sco3.2v4 |
4516 | 189 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 189 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4517 | 190 | ;; | 190 | ;; |
4518 | 191 | -sco3.2.[4-9]*) | 191 | -sco3.2.[4-9]*) |
4519 | 192 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` | 192 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` |
4521 | 193 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 193 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4522 | 194 | ;; | 194 | ;; |
4523 | 195 | -sco3.2v[4-9]*) | 195 | -sco3.2v[4-9]*) |
4524 | 196 | # Don't forget version if it is 3.2v4 or newer. | 196 | # Don't forget version if it is 3.2v4 or newer. |
4526 | 197 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 197 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4527 | 198 | ;; | 198 | ;; |
4528 | 199 | -sco5v6*) | 199 | -sco5v6*) |
4529 | 200 | # Don't forget version if it is 3.2v4 or newer. | 200 | # Don't forget version if it is 3.2v4 or newer. |
4531 | 201 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 201 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4532 | 202 | ;; | 202 | ;; |
4533 | 203 | -sco*) | 203 | -sco*) |
4534 | 204 | os=-sco3.2v2 | 204 | os=-sco3.2v2 |
4536 | 205 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 205 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4537 | 206 | ;; | 206 | ;; |
4538 | 207 | -udk*) | 207 | -udk*) |
4540 | 208 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 208 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4541 | 209 | ;; | 209 | ;; |
4542 | 210 | -isc) | 210 | -isc) |
4543 | 211 | os=-isc2.2 | 211 | os=-isc2.2 |
4545 | 212 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 212 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4546 | 213 | ;; | 213 | ;; |
4547 | 214 | -clix*) | 214 | -clix*) |
4548 | 215 | basic_machine=clipper-intergraph | 215 | basic_machine=clipper-intergraph |
4549 | 216 | ;; | 216 | ;; |
4550 | 217 | -isc*) | 217 | -isc*) |
4552 | 218 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 218 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4553 | 219 | ;; | 219 | ;; |
4554 | 220 | -lynx*178) | 220 | -lynx*178) |
4555 | 221 | os=-lynxos178 | 221 | os=-lynxos178 |
4556 | @@ -227,10 +227,7 @@ case $os in | |||
4557 | 227 | os=-lynxos | 227 | os=-lynxos |
4558 | 228 | ;; | 228 | ;; |
4559 | 229 | -ptx*) | 229 | -ptx*) |
4564 | 230 | basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` | 230 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` |
4561 | 231 | ;; | ||
4562 | 232 | -windowsnt*) | ||
4563 | 233 | os=`echo $os | sed -e 's/windowsnt/winnt/'` | ||
4565 | 234 | ;; | 231 | ;; |
4566 | 235 | -psos*) | 232 | -psos*) |
4567 | 236 | os=-psos | 233 | os=-psos |
4568 | @@ -299,7 +296,7 @@ case $basic_machine in | |||
4569 | 299 | | nios | nios2 | nios2eb | nios2el \ | 296 | | nios | nios2 | nios2eb | nios2el \ |
4570 | 300 | | ns16k | ns32k \ | 297 | | ns16k | ns32k \ |
4571 | 301 | | open8 | or1k | or1knd | or32 \ | 298 | | open8 | or1k | or1knd | or32 \ |
4573 | 302 | | pdp10 | pdp11 | pj | pjl \ | 299 | | pdp10 | pj | pjl \ |
4574 | 303 | | powerpc | powerpc64 | powerpc64le | powerpcle \ | 300 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4575 | 304 | | pru \ | 301 | | pru \ |
4576 | 305 | | pyramid \ | 302 | | pyramid \ |
4577 | @@ -316,7 +313,6 @@ case $basic_machine in | |||
4578 | 316 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | 313 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
4579 | 317 | | visium \ | 314 | | visium \ |
4580 | 318 | | wasm32 \ | 315 | | wasm32 \ |
4581 | 319 | | we32k \ | ||
4582 | 320 | | x86 | xc16x | xstormy16 | xtensa \ | 316 | | x86 | xc16x | xstormy16 | xtensa \ |
4583 | 321 | | z8k | z80) | 317 | | z8k | z80) |
4584 | 322 | basic_machine=$basic_machine-unknown | 318 | basic_machine=$basic_machine-unknown |
4585 | @@ -337,7 +333,7 @@ case $basic_machine in | |||
4586 | 337 | basic_machine=$basic_machine-unknown | 333 | basic_machine=$basic_machine-unknown |
4587 | 338 | os=-none | 334 | os=-none |
4588 | 339 | ;; | 335 | ;; |
4590 | 340 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) | 336 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) |
4591 | 341 | ;; | 337 | ;; |
4592 | 342 | ms1) | 338 | ms1) |
4593 | 343 | basic_machine=mt-unknown | 339 | basic_machine=mt-unknown |
4594 | @@ -366,7 +362,7 @@ case $basic_machine in | |||
4595 | 366 | ;; | 362 | ;; |
4596 | 367 | # Object if more than one company name word. | 363 | # Object if more than one company name word. |
4597 | 368 | *-*-*) | 364 | *-*-*) |
4599 | 369 | echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 | 365 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 |
4600 | 370 | exit 1 | 366 | exit 1 |
4601 | 371 | ;; | 367 | ;; |
4602 | 372 | # Recognize the basic CPU types with company name. | 368 | # Recognize the basic CPU types with company name. |
4603 | @@ -461,7 +457,7 @@ case $basic_machine in | |||
4604 | 461 | # Recognize the various machine names and aliases which stand | 457 | # Recognize the various machine names and aliases which stand |
4605 | 462 | # for a CPU type and a company and sometimes even an OS. | 458 | # for a CPU type and a company and sometimes even an OS. |
4606 | 463 | 386bsd) | 459 | 386bsd) |
4608 | 464 | basic_machine=i386-unknown | 460 | basic_machine=i386-pc |
4609 | 465 | os=-bsd | 461 | os=-bsd |
4610 | 466 | ;; | 462 | ;; |
4611 | 467 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) | 463 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) |
4612 | @@ -495,7 +491,7 @@ case $basic_machine in | |||
4613 | 495 | basic_machine=x86_64-pc | 491 | basic_machine=x86_64-pc |
4614 | 496 | ;; | 492 | ;; |
4615 | 497 | amd64-*) | 493 | amd64-*) |
4617 | 498 | basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` | 494 | basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4618 | 499 | ;; | 495 | ;; |
4619 | 500 | amdahl) | 496 | amdahl) |
4620 | 501 | basic_machine=580-amdahl | 497 | basic_machine=580-amdahl |
4621 | @@ -540,7 +536,7 @@ case $basic_machine in | |||
4622 | 540 | os=-linux | 536 | os=-linux |
4623 | 541 | ;; | 537 | ;; |
4624 | 542 | blackfin-*) | 538 | blackfin-*) |
4626 | 543 | basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` | 539 | basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4627 | 544 | os=-linux | 540 | os=-linux |
4628 | 545 | ;; | 541 | ;; |
4629 | 546 | bluegene*) | 542 | bluegene*) |
4630 | @@ -548,13 +544,13 @@ case $basic_machine in | |||
4631 | 548 | os=-cnk | 544 | os=-cnk |
4632 | 549 | ;; | 545 | ;; |
4633 | 550 | c54x-*) | 546 | c54x-*) |
4635 | 551 | basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` | 547 | basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4636 | 552 | ;; | 548 | ;; |
4637 | 553 | c55x-*) | 549 | c55x-*) |
4639 | 554 | basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` | 550 | basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4640 | 555 | ;; | 551 | ;; |
4641 | 556 | c6x-*) | 552 | c6x-*) |
4643 | 557 | basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` | 553 | basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4644 | 558 | ;; | 554 | ;; |
4645 | 559 | c90) | 555 | c90) |
4646 | 560 | basic_machine=c90-cray | 556 | basic_machine=c90-cray |
4647 | @@ -643,7 +639,7 @@ case $basic_machine in | |||
4648 | 643 | basic_machine=rs6000-bull | 639 | basic_machine=rs6000-bull |
4649 | 644 | os=-bosx | 640 | os=-bosx |
4650 | 645 | ;; | 641 | ;; |
4652 | 646 | dpx2* | dpx2*-bull) | 642 | dpx2*) |
4653 | 647 | basic_machine=m68k-bull | 643 | basic_machine=m68k-bull |
4654 | 648 | os=-sysv3 | 644 | os=-sysv3 |
4655 | 649 | ;; | 645 | ;; |
4656 | @@ -652,7 +648,7 @@ case $basic_machine in | |||
4657 | 652 | os=$os"spe" | 648 | os=$os"spe" |
4658 | 653 | ;; | 649 | ;; |
4659 | 654 | e500v[12]-*) | 650 | e500v[12]-*) |
4661 | 655 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 651 | basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4662 | 656 | os=$os"spe" | 652 | os=$os"spe" |
4663 | 657 | ;; | 653 | ;; |
4664 | 658 | ebmon29k) | 654 | ebmon29k) |
4665 | @@ -744,9 +740,6 @@ case $basic_machine in | |||
4666 | 744 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) | 740 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) |
4667 | 745 | basic_machine=hppa1.0-hp | 741 | basic_machine=hppa1.0-hp |
4668 | 746 | ;; | 742 | ;; |
4669 | 747 | hppa-next) | ||
4670 | 748 | os=-nextstep3 | ||
4671 | 749 | ;; | ||
4672 | 750 | hppaosf) | 743 | hppaosf) |
4673 | 751 | basic_machine=hppa1.1-hp | 744 | basic_machine=hppa1.1-hp |
4674 | 752 | os=-osf | 745 | os=-osf |
4675 | @@ -759,26 +752,26 @@ case $basic_machine in | |||
4676 | 759 | basic_machine=i370-ibm | 752 | basic_machine=i370-ibm |
4677 | 760 | ;; | 753 | ;; |
4678 | 761 | i*86v32) | 754 | i*86v32) |
4680 | 762 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 755 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
4681 | 763 | os=-sysv32 | 756 | os=-sysv32 |
4682 | 764 | ;; | 757 | ;; |
4683 | 765 | i*86v4*) | 758 | i*86v4*) |
4685 | 766 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 759 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
4686 | 767 | os=-sysv4 | 760 | os=-sysv4 |
4687 | 768 | ;; | 761 | ;; |
4688 | 769 | i*86v) | 762 | i*86v) |
4690 | 770 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 763 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
4691 | 771 | os=-sysv | 764 | os=-sysv |
4692 | 772 | ;; | 765 | ;; |
4693 | 773 | i*86sol2) | 766 | i*86sol2) |
4695 | 774 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 767 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
4696 | 775 | os=-solaris2 | 768 | os=-solaris2 |
4697 | 776 | ;; | 769 | ;; |
4698 | 777 | i386mach) | 770 | i386mach) |
4699 | 778 | basic_machine=i386-mach | 771 | basic_machine=i386-mach |
4700 | 779 | os=-mach | 772 | os=-mach |
4701 | 780 | ;; | 773 | ;; |
4703 | 781 | i386-vsta | vsta) | 774 | vsta) |
4704 | 782 | basic_machine=i386-unknown | 775 | basic_machine=i386-unknown |
4705 | 783 | os=-vsta | 776 | os=-vsta |
4706 | 784 | ;; | 777 | ;; |
4707 | @@ -797,19 +790,16 @@ case $basic_machine in | |||
4708 | 797 | os=-sysv | 790 | os=-sysv |
4709 | 798 | ;; | 791 | ;; |
4710 | 799 | leon-*|leon[3-9]-*) | 792 | leon-*|leon[3-9]-*) |
4712 | 800 | basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` | 793 | basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` |
4713 | 801 | ;; | 794 | ;; |
4714 | 802 | m68knommu) | 795 | m68knommu) |
4715 | 803 | basic_machine=m68k-unknown | 796 | basic_machine=m68k-unknown |
4716 | 804 | os=-linux | 797 | os=-linux |
4717 | 805 | ;; | 798 | ;; |
4718 | 806 | m68knommu-*) | 799 | m68knommu-*) |
4720 | 807 | basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` | 800 | basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4721 | 808 | os=-linux | 801 | os=-linux |
4722 | 809 | ;; | 802 | ;; |
4723 | 810 | m88k-omron*) | ||
4724 | 811 | basic_machine=m88k-omron | ||
4725 | 812 | ;; | ||
4726 | 813 | magnum | m3230) | 803 | magnum | m3230) |
4727 | 814 | basic_machine=mips-mips | 804 | basic_machine=mips-mips |
4728 | 815 | os=-sysv | 805 | os=-sysv |
4729 | @@ -841,10 +831,10 @@ case $basic_machine in | |||
4730 | 841 | os=-mint | 831 | os=-mint |
4731 | 842 | ;; | 832 | ;; |
4732 | 843 | mips3*-*) | 833 | mips3*-*) |
4734 | 844 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` | 834 | basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` |
4735 | 845 | ;; | 835 | ;; |
4736 | 846 | mips3*) | 836 | mips3*) |
4738 | 847 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown | 837 | basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown |
4739 | 848 | ;; | 838 | ;; |
4740 | 849 | monitor) | 839 | monitor) |
4741 | 850 | basic_machine=m68k-rom68k | 840 | basic_machine=m68k-rom68k |
4742 | @@ -863,7 +853,7 @@ case $basic_machine in | |||
4743 | 863 | os=-msdos | 853 | os=-msdos |
4744 | 864 | ;; | 854 | ;; |
4745 | 865 | ms1-*) | 855 | ms1-*) |
4747 | 866 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` | 856 | basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` |
4748 | 867 | ;; | 857 | ;; |
4749 | 868 | msys) | 858 | msys) |
4750 | 869 | basic_machine=i686-pc | 859 | basic_machine=i686-pc |
4751 | @@ -905,7 +895,7 @@ case $basic_machine in | |||
4752 | 905 | basic_machine=v70-nec | 895 | basic_machine=v70-nec |
4753 | 906 | os=-sysv | 896 | os=-sysv |
4754 | 907 | ;; | 897 | ;; |
4756 | 908 | next | m*-next ) | 898 | next | m*-next) |
4757 | 909 | basic_machine=m68k-next | 899 | basic_machine=m68k-next |
4758 | 910 | case $os in | 900 | case $os in |
4759 | 911 | -nextstep* ) | 901 | -nextstep* ) |
4760 | @@ -950,6 +940,9 @@ case $basic_machine in | |||
4761 | 950 | nsr-tandem) | 940 | nsr-tandem) |
4762 | 951 | basic_machine=nsr-tandem | 941 | basic_machine=nsr-tandem |
4763 | 952 | ;; | 942 | ;; |
4764 | 943 | nsv-tandem) | ||
4765 | 944 | basic_machine=nsv-tandem | ||
4766 | 945 | ;; | ||
4767 | 953 | nsx-tandem) | 946 | nsx-tandem) |
4768 | 954 | basic_machine=nsx-tandem | 947 | basic_machine=nsx-tandem |
4769 | 955 | ;; | 948 | ;; |
4770 | @@ -985,7 +978,7 @@ case $basic_machine in | |||
4771 | 985 | os=-linux | 978 | os=-linux |
4772 | 986 | ;; | 979 | ;; |
4773 | 987 | parisc-*) | 980 | parisc-*) |
4775 | 988 | basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` | 981 | basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4776 | 989 | os=-linux | 982 | os=-linux |
4777 | 990 | ;; | 983 | ;; |
4778 | 991 | pbd) | 984 | pbd) |
4779 | @@ -1001,7 +994,7 @@ case $basic_machine in | |||
4780 | 1001 | basic_machine=i386-pc | 994 | basic_machine=i386-pc |
4781 | 1002 | ;; | 995 | ;; |
4782 | 1003 | pc98-*) | 996 | pc98-*) |
4784 | 1004 | basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` | 997 | basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4785 | 1005 | ;; | 998 | ;; |
4786 | 1006 | pentium | p5 | k5 | k6 | nexgen | viac3) | 999 | pentium | p5 | k5 | k6 | nexgen | viac3) |
4787 | 1007 | basic_machine=i586-pc | 1000 | basic_machine=i586-pc |
4788 | @@ -1016,16 +1009,16 @@ case $basic_machine in | |||
4789 | 1016 | basic_machine=i786-pc | 1009 | basic_machine=i786-pc |
4790 | 1017 | ;; | 1010 | ;; |
4791 | 1018 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) | 1011 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) |
4793 | 1019 | basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` | 1012 | basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4794 | 1020 | ;; | 1013 | ;; |
4795 | 1021 | pentiumpro-* | p6-* | 6x86-* | athlon-*) | 1014 | pentiumpro-* | p6-* | 6x86-* | athlon-*) |
4797 | 1022 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` | 1015 | basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4798 | 1023 | ;; | 1016 | ;; |
4799 | 1024 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) | 1017 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) |
4801 | 1025 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` | 1018 | basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4802 | 1026 | ;; | 1019 | ;; |
4803 | 1027 | pentium4-*) | 1020 | pentium4-*) |
4805 | 1028 | basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` | 1021 | basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4806 | 1029 | ;; | 1022 | ;; |
4807 | 1030 | pn) | 1023 | pn) |
4808 | 1031 | basic_machine=pn-gould | 1024 | basic_machine=pn-gould |
4809 | @@ -1035,23 +1028,23 @@ case $basic_machine in | |||
4810 | 1035 | ppc | ppcbe) basic_machine=powerpc-unknown | 1028 | ppc | ppcbe) basic_machine=powerpc-unknown |
4811 | 1036 | ;; | 1029 | ;; |
4812 | 1037 | ppc-* | ppcbe-*) | 1030 | ppc-* | ppcbe-*) |
4814 | 1038 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 1031 | basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4815 | 1039 | ;; | 1032 | ;; |
4816 | 1040 | ppcle | powerpclittle) | 1033 | ppcle | powerpclittle) |
4817 | 1041 | basic_machine=powerpcle-unknown | 1034 | basic_machine=powerpcle-unknown |
4818 | 1042 | ;; | 1035 | ;; |
4819 | 1043 | ppcle-* | powerpclittle-*) | 1036 | ppcle-* | powerpclittle-*) |
4821 | 1044 | basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` | 1037 | basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4822 | 1045 | ;; | 1038 | ;; |
4823 | 1046 | ppc64) basic_machine=powerpc64-unknown | 1039 | ppc64) basic_machine=powerpc64-unknown |
4824 | 1047 | ;; | 1040 | ;; |
4826 | 1048 | ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` | 1041 | ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4827 | 1049 | ;; | 1042 | ;; |
4828 | 1050 | ppc64le | powerpc64little) | 1043 | ppc64le | powerpc64little) |
4829 | 1051 | basic_machine=powerpc64le-unknown | 1044 | basic_machine=powerpc64le-unknown |
4830 | 1052 | ;; | 1045 | ;; |
4831 | 1053 | ppc64le-* | powerpc64little-*) | 1046 | ppc64le-* | powerpc64little-*) |
4833 | 1054 | basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` | 1047 | basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4834 | 1055 | ;; | 1048 | ;; |
4835 | 1056 | ps2) | 1049 | ps2) |
4836 | 1057 | basic_machine=i386-ibm | 1050 | basic_machine=i386-ibm |
4837 | @@ -1105,17 +1098,10 @@ case $basic_machine in | |||
4838 | 1105 | sequent) | 1098 | sequent) |
4839 | 1106 | basic_machine=i386-sequent | 1099 | basic_machine=i386-sequent |
4840 | 1107 | ;; | 1100 | ;; |
4841 | 1108 | sh) | ||
4842 | 1109 | basic_machine=sh-hitachi | ||
4843 | 1110 | os=-hms | ||
4844 | 1111 | ;; | ||
4845 | 1112 | sh5el) | 1101 | sh5el) |
4846 | 1113 | basic_machine=sh5le-unknown | 1102 | basic_machine=sh5le-unknown |
4847 | 1114 | ;; | 1103 | ;; |
4852 | 1115 | sh64) | 1104 | simso-wrs) |
4849 | 1116 | basic_machine=sh64-unknown | ||
4850 | 1117 | ;; | ||
4851 | 1118 | sparclite-wrs | simso-wrs) | ||
4853 | 1119 | basic_machine=sparclite-wrs | 1105 | basic_machine=sparclite-wrs |
4854 | 1120 | os=-vxworks | 1106 | os=-vxworks |
4855 | 1121 | ;; | 1107 | ;; |
4856 | @@ -1134,7 +1120,7 @@ case $basic_machine in | |||
4857 | 1134 | os=-sysv4 | 1120 | os=-sysv4 |
4858 | 1135 | ;; | 1121 | ;; |
4859 | 1136 | strongarm-* | thumb-*) | 1122 | strongarm-* | thumb-*) |
4861 | 1137 | basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` | 1123 | basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
4862 | 1138 | ;; | 1124 | ;; |
4863 | 1139 | sun2) | 1125 | sun2) |
4864 | 1140 | basic_machine=m68000-sun | 1126 | basic_machine=m68000-sun |
4865 | @@ -1248,9 +1234,6 @@ case $basic_machine in | |||
4866 | 1248 | basic_machine=a29k-wrs | 1234 | basic_machine=a29k-wrs |
4867 | 1249 | os=-vxworks | 1235 | os=-vxworks |
4868 | 1250 | ;; | 1236 | ;; |
4869 | 1251 | wasm32) | ||
4870 | 1252 | basic_machine=wasm32-unknown | ||
4871 | 1253 | ;; | ||
4872 | 1254 | w65*) | 1237 | w65*) |
4873 | 1255 | basic_machine=w65-wdc | 1238 | basic_machine=w65-wdc |
4874 | 1256 | os=-none | 1239 | os=-none |
4875 | @@ -1259,6 +1242,9 @@ case $basic_machine in | |||
4876 | 1259 | basic_machine=hppa1.1-winbond | 1242 | basic_machine=hppa1.1-winbond |
4877 | 1260 | os=-proelf | 1243 | os=-proelf |
4878 | 1261 | ;; | 1244 | ;; |
4879 | 1245 | x64) | ||
4880 | 1246 | basic_machine=x86_64-pc | ||
4881 | 1247 | ;; | ||
4882 | 1262 | xbox) | 1248 | xbox) |
4883 | 1263 | basic_machine=i686-pc | 1249 | basic_machine=i686-pc |
4884 | 1264 | os=-mingw32 | 1250 | os=-mingw32 |
4885 | @@ -1267,20 +1253,12 @@ case $basic_machine in | |||
4886 | 1267 | basic_machine=xps100-honeywell | 1253 | basic_machine=xps100-honeywell |
4887 | 1268 | ;; | 1254 | ;; |
4888 | 1269 | xscale-* | xscalee[bl]-*) | 1255 | xscale-* | xscalee[bl]-*) |
4890 | 1270 | basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` | 1256 | basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` |
4891 | 1271 | ;; | 1257 | ;; |
4892 | 1272 | ymp) | 1258 | ymp) |
4893 | 1273 | basic_machine=ymp-cray | 1259 | basic_machine=ymp-cray |
4894 | 1274 | os=-unicos | 1260 | os=-unicos |
4895 | 1275 | ;; | 1261 | ;; |
4896 | 1276 | z8k-*-coff) | ||
4897 | 1277 | basic_machine=z8k-unknown | ||
4898 | 1278 | os=-sim | ||
4899 | 1279 | ;; | ||
4900 | 1280 | z80-*-coff) | ||
4901 | 1281 | basic_machine=z80-unknown | ||
4902 | 1282 | os=-sim | ||
4903 | 1283 | ;; | ||
4904 | 1284 | none) | 1262 | none) |
4905 | 1285 | basic_machine=none-none | 1263 | basic_machine=none-none |
4906 | 1286 | os=-none | 1264 | os=-none |
4907 | @@ -1309,10 +1287,6 @@ case $basic_machine in | |||
4908 | 1309 | vax) | 1287 | vax) |
4909 | 1310 | basic_machine=vax-dec | 1288 | basic_machine=vax-dec |
4910 | 1311 | ;; | 1289 | ;; |
4911 | 1312 | pdp10) | ||
4912 | 1313 | # there are many clones, so DEC is not a safe bet | ||
4913 | 1314 | basic_machine=pdp10-unknown | ||
4914 | 1315 | ;; | ||
4915 | 1316 | pdp11) | 1290 | pdp11) |
4916 | 1317 | basic_machine=pdp11-dec | 1291 | basic_machine=pdp11-dec |
4917 | 1318 | ;; | 1292 | ;; |
4918 | @@ -1322,9 +1296,6 @@ case $basic_machine in | |||
4919 | 1322 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) | 1296 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) |
4920 | 1323 | basic_machine=sh-unknown | 1297 | basic_machine=sh-unknown |
4921 | 1324 | ;; | 1298 | ;; |
4922 | 1325 | sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) | ||
4923 | 1326 | basic_machine=sparc-sun | ||
4924 | 1327 | ;; | ||
4925 | 1328 | cydra) | 1299 | cydra) |
4926 | 1329 | basic_machine=cydra-cydrome | 1300 | basic_machine=cydra-cydrome |
4927 | 1330 | ;; | 1301 | ;; |
4928 | @@ -1344,7 +1315,7 @@ case $basic_machine in | |||
4929 | 1344 | # Make sure to match an already-canonicalized machine name. | 1315 | # Make sure to match an already-canonicalized machine name. |
4930 | 1345 | ;; | 1316 | ;; |
4931 | 1346 | *) | 1317 | *) |
4933 | 1347 | echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 | 1318 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 |
4934 | 1348 | exit 1 | 1319 | exit 1 |
4935 | 1349 | ;; | 1320 | ;; |
4936 | 1350 | esac | 1321 | esac |
4937 | @@ -1352,10 +1323,10 @@ esac | |||
4938 | 1352 | # Here we canonicalize certain aliases for manufacturers. | 1323 | # Here we canonicalize certain aliases for manufacturers. |
4939 | 1353 | case $basic_machine in | 1324 | case $basic_machine in |
4940 | 1354 | *-digital*) | 1325 | *-digital*) |
4942 | 1355 | basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` | 1326 | basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` |
4943 | 1356 | ;; | 1327 | ;; |
4944 | 1357 | *-commodore*) | 1328 | *-commodore*) |
4946 | 1358 | basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` | 1329 | basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` |
4947 | 1359 | ;; | 1330 | ;; |
4948 | 1360 | *) | 1331 | *) |
4949 | 1361 | ;; | 1332 | ;; |
4950 | @@ -1366,8 +1337,8 @@ esac | |||
4951 | 1366 | if [ x"$os" != x"" ] | 1337 | if [ x"$os" != x"" ] |
4952 | 1367 | then | 1338 | then |
4953 | 1368 | case $os in | 1339 | case $os in |
4956 | 1369 | # First match some system type aliases | 1340 | # First match some system type aliases that might get confused |
4957 | 1370 | # that might get confused with valid system types. | 1341 | # with valid system types. |
4958 | 1371 | # -solaris* is a basic system type, with this one exception. | 1342 | # -solaris* is a basic system type, with this one exception. |
4959 | 1372 | -auroraux) | 1343 | -auroraux) |
4960 | 1373 | os=-auroraux | 1344 | os=-auroraux |
4961 | @@ -1378,18 +1349,19 @@ case $os in | |||
4962 | 1378 | -solaris) | 1349 | -solaris) |
4963 | 1379 | os=-solaris2 | 1350 | os=-solaris2 |
4964 | 1380 | ;; | 1351 | ;; |
4965 | 1381 | -svr4*) | ||
4966 | 1382 | os=-sysv4 | ||
4967 | 1383 | ;; | ||
4968 | 1384 | -unixware*) | 1352 | -unixware*) |
4969 | 1385 | os=-sysv4.2uw | 1353 | os=-sysv4.2uw |
4970 | 1386 | ;; | 1354 | ;; |
4971 | 1387 | -gnu/linux*) | 1355 | -gnu/linux*) |
4972 | 1388 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` | 1356 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` |
4973 | 1389 | ;; | 1357 | ;; |
4975 | 1390 | # First accept the basic system types. | 1358 | # es1800 is here to avoid being matched by es* (a different OS) |
4976 | 1359 | -es1800*) | ||
4977 | 1360 | os=-ose | ||
4978 | 1361 | ;; | ||
4979 | 1362 | # Now accept the basic system types. | ||
4980 | 1391 | # The portable systems comes first. | 1363 | # The portable systems comes first. |
4982 | 1392 | # Each alternative MUST END IN A *, to match a version number. | 1364 | # Each alternative MUST end in a * to match a version number. |
4983 | 1393 | # -sysv* is not here because it comes later, after sysvr4. | 1365 | # -sysv* is not here because it comes later, after sysvr4. |
4984 | 1394 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 1366 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
4985 | 1395 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | 1367 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
4986 | @@ -1399,7 +1371,7 @@ case $os in | |||
4987 | 1399 | | -aos* | -aros* | -cloudabi* | -sortix* \ | 1371 | | -aos* | -aros* | -cloudabi* | -sortix* \ |
4988 | 1400 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1372 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
4989 | 1401 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | 1373 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
4991 | 1402 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | 1374 | | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ |
4992 | 1403 | | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | 1375 | | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ |
4993 | 1404 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | 1376 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
4994 | 1405 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 1377 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
4995 | @@ -1410,14 +1382,15 @@ case $os in | |||
4996 | 1410 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | 1382 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
4997 | 1411 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | 1383 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
4998 | 1412 | | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | 1384 | | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
5000 | 1413 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1385 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ |