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
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Merged at revision: | fab127ba1a1abec42166d87e22aa43024a458aff |
Proposed branch: | ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic |
Merge into: | ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic |
Diff against target: |
16247 lines (+5772/-5737) 75 files modified
Makefile.in (+1/-2) NEWS (+27/-0) build-aux/compile (+1/-1) build-aux/config.guess (+68/-62) build-aux/config.sub (+1223/-1234) build-aux/depcomp (+1/-1) build-aux/install-sh (+1/-1) build-aux/ltmain.sh (+73/-172) build-aux/missing (+1/-1) clutter/Makefile.in (+0/-1) clutter/aclocal.m4 (+286/-217) clutter/build/Makefile.in (+1/-2) clutter/build/autotools/Makefile.in (+0/-1) clutter/build/autotools/libtool.m4 (+16/-32) clutter/build/compile (+1/-1) clutter/build/config.guess (+68/-62) clutter/build/config.sub (+1223/-1234) clutter/build/depcomp (+1/-1) clutter/build/install-sh (+1/-1) clutter/build/ltmain.sh (+73/-172) clutter/build/missing (+1/-1) clutter/build/test-driver (+1/-1) clutter/clutter/Makefile.in (+0/-1) clutter/clutter/x11/clutter-keymap-x11.c (+187/-0) clutter/clutter/x11/clutter-keymap-x11.h (+5/-1) clutter/clutter/x11/clutter-virtual-input-device-x11.c (+14/-5) clutter/configure (+201/-50) clutter/examples/Makefile.in (+0/-1) clutter/tests/Makefile.in (+0/-1) clutter/tests/accessibility/Makefile.in (+0/-1) clutter/tests/conform/Makefile.in (+0/-1) clutter/tests/interactive/Makefile.in (+0/-1) clutter/tests/micro-bench/Makefile.in (+0/-1) clutter/tests/performance/Makefile.in (+0/-1) cogl/Makefile.in (+1/-2) cogl/aclocal.m4 (+286/-217) cogl/build/autotools/libtool.m4 (+16/-32) cogl/build/compile (+1/-1) cogl/build/config.guess (+68/-62) cogl/build/config.sub (+1223/-1234) cogl/build/depcomp (+1/-1) cogl/build/install-sh (+1/-1) cogl/build/ltmain.sh (+73/-172) cogl/build/missing (+1/-1) cogl/cogl-gles2/Makefile.in (+0/-1) cogl/cogl-pango/Makefile.in (+0/-1) cogl/cogl-path/Makefile.in (+0/-1) cogl/cogl/Makefile.in (+0/-1) cogl/configure (+213/-73) cogl/test-fixtures/Makefile.in (+0/-1) cogl/tests/Makefile.in (+0/-1) cogl/tests/conform/Makefile.in (+0/-1) cogl/tests/data/Makefile.in (+0/-1) cogl/tests/micro-perf/Makefile.in (+0/-1) cogl/tests/unit/Makefile.in (+0/-1) configure (+245/-67) configure.ac (+1/-1) data/Makefile.in (+0/-1) debian/changelog (+3/-4) debian/patches/series (+0/-2) debian/watch (+1/-1) dev/null (+0/-294) doc/Makefile.in (+0/-1) doc/man/Makefile.in (+0/-1) m4/glib-2.0.m4 (+17/-16) m4/gsettings.m4 (+8/-6) m4/libtool.m4 (+16/-32) m4/pkg.m4 (+71/-3) po/mutter.pot (+3/-227) src/Makefile.in (+0/-1) src/compositor/compositor-private.h (+3/-0) src/compositor/compositor.c (+33/-5) src/compositor/meta-shadow-factory.c (+12/-3) src/compositor/plugins/Makefile.in (+0/-1) src/wayland/meta-wayland-outputs.c (+0/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+367673@code.launchpad.net |
Commit message
Description of the change
Re-update the changelog as per upstream 3.28.4 version, not major changes a part from patches removal.
I didn't added a new changelog entry as still not SRU'ed, so if we beat release team...
--
I assume pristine-tar and upstream/3.28.x merged in salsa, otherwise get them from my lp repo
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/Makefile.in b/Makefile.in | |||
2 | index f738308..a9d77de 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 \ | 179 | build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ |
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,7 +398,6 @@ 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 | 402 | sbindir = @sbindir@ | 401 | sbindir = @sbindir@ |
20 | 403 | sharedstatedir = @sharedstatedir@ | 402 | sharedstatedir = @sharedstatedir@ |
21 | 404 | srcdir = @srcdir@ | 403 | srcdir = @srcdir@ |
22 | diff --git a/NEWS b/NEWS | |||
23 | index 92090cc..d7df9cb 100644 | |||
24 | --- a/NEWS | |||
25 | +++ b/NEWS | |||
26 | @@ -1,3 +1,30 @@ | |||
27 | 1 | 3.28.4 | ||
28 | 2 | ====== | ||
29 | 3 | * Don't expose resolutions that are below the minimum [Andrea; #793223] | ||
30 | 4 | * Fix lock up with some DRI drivers [Alex; #127] | ||
31 | 5 | * Improve grab-device clock updates on X11 [Jeff; !174] | ||
32 | 6 | * Prevent clients from modifying the shared keymap [Jonas; #784206] | ||
33 | 7 | * Fix screen rotation regression [Jonas; #216] | ||
34 | 8 | * Fix non-lowercase letters on virtual key devices [Carlos; gnome-shell#135] | ||
35 | 9 | * Send correct button codes from virtual evdev devices [Jonas; !190] | ||
36 | 10 | * Avoid crash when a cursor is not found [Sebastian; #254] | ||
37 | 11 | * Improve EGLstream support [Miguel; #2, #782575] | ||
38 | 12 | * Handle requests to unmanaged windows gracefully [Jonas; #240] | ||
39 | 13 | * Improve support for proprietary Nvidia driver [Jonas; #790316] | ||
40 | 14 | * Fix handling of non-UTF8 encodings [Florian; !227] | ||
41 | 15 | * Consider remapped keys when guessing keycode from keysym [Andrea; #443] | ||
42 | 16 | * Fix support of extended characters in on-screen keyboard [Andrea; #109] | ||
43 | 17 | * Various crash fixes [Jonas, Olivier, Florian, Marco; #70, #189, #15, | ||
44 | 18 | #130, #255, #194, #336, #576] | ||
45 | 19 | * Misc. bug fixes [Iain, Jonas, Sam, Carlos, Florian, Olivier, Marco; #223, | ||
46 | 20 | #192, #788834, #782344, !130, #134, #221, #306, #279, #331, !557] | ||
47 | 21 | |||
48 | 22 | Contributors: | ||
49 | 23 | Jonas Ådahl, Andrea Azzarone, Olivier Fourdan, Carlos Garnacho, | ||
50 | 24 | Sebastian Keller, Iain Lane, Alex Villacís Lasso, Florian Müllner, | ||
51 | 25 | Bastien Nocera, Aaron Plattner, Jeff Smith, Sam Spilsbury, | ||
52 | 26 | Marco Trevisan (Treviño), Miguel A. Vico, Daniel van Vugt | ||
53 | 27 | |||
54 | 1 | 3.28.3 | 28 | 3.28.3 |
55 | 2 | ====== | 29 | ====== |
56 | 3 | * Handle touch events on server-side titlebars [Carlos; #770185] | 30 | * Handle touch events on server-side titlebars [Carlos; #770185] |
57 | diff --git a/build-aux/compile b/build-aux/compile | |||
58 | index 99e5052..b89c278 100755 | |||
59 | --- a/build-aux/compile | |||
60 | +++ b/build-aux/compile | |||
61 | @@ -1,4 +1,4 @@ | |||
63 | 1 | #! /bin/sh | 1 | #!/usr/bin/sh |
64 | 2 | # Wrapper for compilers which do not understand '-c -o'. | 2 | # Wrapper for compilers which do not understand '-c -o'. |
65 | 3 | 3 | ||
66 | 4 | scriptversion=2018-03-07.03; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
67 | diff --git a/build-aux/config.guess b/build-aux/config.guess | |||
68 | index f50dcdb..b5d7a0f 100755 | |||
69 | --- a/build-aux/config.guess | |||
70 | +++ b/build-aux/config.guess | |||
71 | @@ -1,8 +1,8 @@ | |||
73 | 1 | #! /bin/sh | 1 | #!/usr/bin/sh |
74 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
75 | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
76 | 4 | 4 | ||
78 | 5 | timestamp='2018-02-24' | 5 | timestamp='2018-08-29' |
79 | 6 | 6 | ||
80 | 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 |
81 | 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 |
82 | @@ -84,8 +84,6 @@ if test $# != 0; then | |||
83 | 84 | exit 1 | 84 | exit 1 |
84 | 85 | fi | 85 | fi |
85 | 86 | 86 | ||
86 | 87 | trap 'exit 1' 1 2 15 | ||
87 | 88 | |||
88 | 89 | # CC_FOR_BUILD -- compiler used by this script. Note that the use of a | 87 | # CC_FOR_BUILD -- compiler used by this script. Note that the use of a |
89 | 90 | # compiler to aid in system detection is discouraged as it requires | 88 | # compiler to aid in system detection is discouraged as it requires |
90 | 91 | # temporary files to be created and, as you can see below, it is a | 89 | # temporary files to be created and, as you can see below, it is a |
91 | @@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15 | |||
92 | 96 | 94 | ||
93 | 97 | # Portable tmp directory creation inspired by the Autoconf team. | 95 | # Portable tmp directory creation inspired by the Autoconf team. |
94 | 98 | 96 | ||
119 | 99 | set_cc_for_build=' | 97 | tmp= |
120 | 100 | trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; | 98 | # shellcheck disable=SC2172 |
121 | 101 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; | 99 | trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 |
122 | 102 | : ${TMPDIR=/tmp} ; | 100 | trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 |
123 | 103 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || | 101 | |
124 | 104 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || | 102 | set_cc_for_build() { |
125 | 105 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || | 103 | : "${TMPDIR=/tmp}" |
126 | 106 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; | 104 | # shellcheck disable=SC2039 |
127 | 107 | dummy=$tmp/dummy ; | 105 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
128 | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | 106 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || |
129 | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in | 107 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || |
130 | 110 | ,,) echo "int x;" > "$dummy.c" ; | 108 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } |
131 | 111 | for c in cc gcc c89 c99 ; do | 109 | dummy=$tmp/dummy |
132 | 112 | if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then | 110 | case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in |
133 | 113 | CC_FOR_BUILD="$c"; break ; | 111 | ,,) echo "int x;" > "$dummy.c" |
134 | 114 | fi ; | 112 | for driver in cc gcc c89 c99 ; do |
135 | 115 | done ; | 113 | if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then |
136 | 116 | if test x"$CC_FOR_BUILD" = x ; then | 114 | CC_FOR_BUILD="$driver" |
137 | 117 | CC_FOR_BUILD=no_compiler_found ; | 115 | break |
138 | 118 | fi | 116 | fi |
139 | 119 | ;; | 117 | done |
140 | 120 | ,,*) CC_FOR_BUILD=$CC ;; | 118 | if test x"$CC_FOR_BUILD" = x ; then |
141 | 121 | ,*,*) CC_FOR_BUILD=$HOST_CC ;; | 119 | CC_FOR_BUILD=no_compiler_found |
142 | 122 | esac ; set_cc_for_build= ;' | 120 | fi |
143 | 121 | ;; | ||
144 | 122 | ,,*) CC_FOR_BUILD=$CC ;; | ||
145 | 123 | ,*,*) CC_FOR_BUILD=$HOST_CC ;; | ||
146 | 124 | esac | ||
147 | 125 | } | ||
148 | 123 | 126 | ||
149 | 124 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. | 127 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
150 | 125 | # (ghazi@noc.rutgers.edu 1994-08-24) | 128 | # (ghazi@noc.rutgers.edu 1994-08-24) |
152 | 126 | if (test -f /.attbin/uname) >/dev/null 2>&1 ; then | 129 | if test -f /.attbin/uname ; then |
153 | 127 | PATH=$PATH:/.attbin ; export PATH | 130 | PATH=$PATH:/.attbin ; export PATH |
154 | 128 | fi | 131 | fi |
155 | 129 | 132 | ||
156 | @@ -138,7 +141,7 @@ Linux|GNU|GNU/*) | |||
157 | 138 | # We could probably try harder. | 141 | # We could probably try harder. |
158 | 139 | LIBC=gnu | 142 | LIBC=gnu |
159 | 140 | 143 | ||
161 | 141 | eval "$set_cc_for_build" | 144 | set_cc_for_build |
162 | 142 | cat <<-EOF > "$dummy.c" | 145 | cat <<-EOF > "$dummy.c" |
163 | 143 | #include <features.h> | 146 | #include <features.h> |
164 | 144 | #if defined(__UCLIBC__) | 147 | #if defined(__UCLIBC__) |
165 | @@ -199,7 +202,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
166 | 199 | os=netbsdelf | 202 | os=netbsdelf |
167 | 200 | ;; | 203 | ;; |
168 | 201 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 204 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
170 | 202 | eval "$set_cc_for_build" | 205 | set_cc_for_build |
171 | 203 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 206 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
172 | 204 | | grep -q __ELF__ | 207 | | grep -q __ELF__ |
173 | 205 | then | 208 | then |
174 | @@ -237,7 +240,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
175 | 237 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | 240 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
176 | 238 | # contains redundant information, the shorter form: | 241 | # contains redundant information, the shorter form: |
177 | 239 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | 242 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
179 | 240 | echo "$machine-${os}${release}${abi}" | 243 | echo "$machine-${os}${release}${abi-}" |
180 | 241 | exit ;; | 244 | exit ;; |
181 | 242 | *:Bitrig:*:*) | 245 | *:Bitrig:*:*) |
182 | 243 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` | 246 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
183 | @@ -389,20 +392,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
184 | 389 | echo i386-pc-auroraux"$UNAME_RELEASE" | 392 | echo i386-pc-auroraux"$UNAME_RELEASE" |
185 | 390 | exit ;; | 393 | exit ;; |
186 | 391 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 394 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
201 | 392 | eval "$set_cc_for_build" | 395 | UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
202 | 393 | SUN_ARCH=i386 | 396 | case `isainfo -b` in |
203 | 394 | # If there is a compiler, see if it is configured for 64-bit objects. | 397 | 32) |
204 | 395 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. | 398 | echo i386-pc-solaris2"$UNAME_REL" |
205 | 396 | # This test works for both compilers. | 399 | ;; |
206 | 397 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then | 400 | 64) |
207 | 398 | if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ | 401 | echo x86_64-pc-solaris2"$UNAME_REL" |
208 | 399 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ | 402 | ;; |
209 | 400 | grep IS_64BIT_ARCH >/dev/null | 403 | esac |
196 | 401 | then | ||
197 | 402 | SUN_ARCH=x86_64 | ||
198 | 403 | fi | ||
199 | 404 | fi | ||
200 | 405 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" | ||
210 | 406 | exit ;; | 404 | exit ;; |
211 | 407 | sun4*:SunOS:6*:*) | 405 | sun4*:SunOS:6*:*) |
212 | 408 | # According to config.sub, this is the proper way to canonicalize | 406 | # According to config.sub, this is the proper way to canonicalize |
213 | @@ -482,7 +480,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
214 | 482 | echo clipper-intergraph-clix"$UNAME_RELEASE" | 480 | echo clipper-intergraph-clix"$UNAME_RELEASE" |
215 | 483 | exit ;; | 481 | exit ;; |
216 | 484 | mips:*:*:UMIPS | mips:*:*:RISCos) | 482 | mips:*:*:UMIPS | mips:*:*:RISCos) |
218 | 485 | eval "$set_cc_for_build" | 483 | set_cc_for_build |
219 | 486 | sed 's/^ //' << EOF > "$dummy.c" | 484 | sed 's/^ //' << EOF > "$dummy.c" |
220 | 487 | #ifdef __cplusplus | 485 | #ifdef __cplusplus |
221 | 488 | #include <stdio.h> /* for printf() prototype */ | 486 | #include <stdio.h> /* for printf() prototype */ |
222 | @@ -579,7 +577,7 @@ EOF | |||
223 | 579 | exit ;; | 577 | exit ;; |
224 | 580 | *:AIX:2:3) | 578 | *:AIX:2:3) |
225 | 581 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then | 579 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
227 | 582 | eval "$set_cc_for_build" | 580 | set_cc_for_build |
228 | 583 | sed 's/^ //' << EOF > "$dummy.c" | 581 | sed 's/^ //' << EOF > "$dummy.c" |
229 | 584 | #include <sys/systemcfg.h> | 582 | #include <sys/systemcfg.h> |
230 | 585 | 583 | ||
231 | @@ -660,7 +658,7 @@ EOF | |||
232 | 660 | esac | 658 | esac |
233 | 661 | fi | 659 | fi |
234 | 662 | if [ "$HP_ARCH" = "" ]; then | 660 | if [ "$HP_ARCH" = "" ]; then |
236 | 663 | eval "$set_cc_for_build" | 661 | set_cc_for_build |
237 | 664 | sed 's/^ //' << EOF > "$dummy.c" | 662 | sed 's/^ //' << EOF > "$dummy.c" |
238 | 665 | 663 | ||
239 | 666 | #define _HPUX_SOURCE | 664 | #define _HPUX_SOURCE |
240 | @@ -700,7 +698,7 @@ EOF | |||
241 | 700 | esac | 698 | esac |
242 | 701 | if [ "$HP_ARCH" = hppa2.0w ] | 699 | if [ "$HP_ARCH" = hppa2.0w ] |
243 | 702 | then | 700 | then |
245 | 703 | eval "$set_cc_for_build" | 701 | set_cc_for_build |
246 | 704 | 702 | ||
247 | 705 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating | 703 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
248 | 706 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler | 704 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
249 | @@ -726,7 +724,7 @@ EOF | |||
250 | 726 | echo ia64-hp-hpux"$HPUX_REV" | 724 | echo ia64-hp-hpux"$HPUX_REV" |
251 | 727 | exit ;; | 725 | exit ;; |
252 | 728 | 3050*:HI-UX:*:*) | 726 | 3050*:HI-UX:*:*) |
254 | 729 | eval "$set_cc_for_build" | 727 | set_cc_for_build |
255 | 730 | sed 's/^ //' << EOF > "$dummy.c" | 728 | sed 's/^ //' << EOF > "$dummy.c" |
256 | 731 | #include <unistd.h> | 729 | #include <unistd.h> |
257 | 732 | int | 730 | int |
258 | @@ -840,6 +838,17 @@ EOF | |||
259 | 840 | *:BSD/OS:*:*) | 838 | *:BSD/OS:*:*) |
260 | 841 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" | 839 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" |
261 | 842 | exit ;; | 840 | exit ;; |
262 | 841 | arm:FreeBSD:*:*) | ||
263 | 842 | UNAME_PROCESSOR=`uname -p` | ||
264 | 843 | set_cc_for_build | ||
265 | 844 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | ||
266 | 845 | | grep -q __ARM_PCS_VFP | ||
267 | 846 | then | ||
268 | 847 | echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi | ||
269 | 848 | else | ||
270 | 849 | echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf | ||
271 | 850 | fi | ||
272 | 851 | exit ;; | ||
273 | 843 | *:FreeBSD:*:*) | 852 | *:FreeBSD:*:*) |
274 | 844 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 853 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
275 | 845 | case "$UNAME_PROCESSOR" in | 854 | case "$UNAME_PROCESSOR" in |
276 | @@ -894,8 +903,8 @@ EOF | |||
277 | 894 | # other systems with GNU libc and userland | 903 | # other systems with GNU libc and userland |
278 | 895 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" | 904 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" |
279 | 896 | exit ;; | 905 | exit ;; |
282 | 897 | i*86:Minix:*:*) | 906 | *:Minix:*:*) |
283 | 898 | echo "$UNAME_MACHINE"-pc-minix | 907 | echo "$UNAME_MACHINE"-unknown-minix |
284 | 899 | exit ;; | 908 | exit ;; |
285 | 900 | aarch64:Linux:*:*) | 909 | aarch64:Linux:*:*) |
286 | 901 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 910 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
287 | @@ -922,7 +931,7 @@ EOF | |||
288 | 922 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 931 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
289 | 923 | exit ;; | 932 | exit ;; |
290 | 924 | arm*:Linux:*:*) | 933 | arm*:Linux:*:*) |
292 | 925 | eval "$set_cc_for_build" | 934 | set_cc_for_build |
293 | 926 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 935 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
294 | 927 | | grep -q __ARM_EABI__ | 936 | | grep -q __ARM_EABI__ |
295 | 928 | then | 937 | then |
296 | @@ -971,7 +980,7 @@ EOF | |||
297 | 971 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 980 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
298 | 972 | exit ;; | 981 | exit ;; |
299 | 973 | mips:Linux:*:* | mips64:Linux:*:*) | 982 | mips:Linux:*:* | mips64:Linux:*:*) |
301 | 974 | eval "$set_cc_for_build" | 983 | set_cc_for_build |
302 | 975 | sed 's/^ //' << EOF > "$dummy.c" | 984 | sed 's/^ //' << EOF > "$dummy.c" |
303 | 976 | #undef CPU | 985 | #undef CPU |
304 | 977 | #undef ${UNAME_MACHINE} | 986 | #undef ${UNAME_MACHINE} |
305 | @@ -1046,11 +1055,7 @@ EOF | |||
306 | 1046 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" | 1055 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" |
307 | 1047 | exit ;; | 1056 | exit ;; |
308 | 1048 | x86_64:Linux:*:*) | 1057 | x86_64:Linux:*:*) |
314 | 1049 | if objdump -f /bin/sh | grep -q elf32-x86-64; then | 1058 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" |
310 | 1050 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 | ||
311 | 1051 | else | ||
312 | 1052 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" | ||
313 | 1053 | fi | ||
315 | 1054 | exit ;; | 1059 | exit ;; |
316 | 1055 | xtensa*:Linux:*:*) | 1060 | xtensa*:Linux:*:*) |
317 | 1056 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 1061 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
318 | @@ -1289,7 +1294,7 @@ EOF | |||
319 | 1289 | exit ;; | 1294 | exit ;; |
320 | 1290 | *:Darwin:*:*) | 1295 | *:Darwin:*:*) |
321 | 1291 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1296 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
323 | 1292 | eval "$set_cc_for_build" | 1297 | set_cc_for_build |
324 | 1293 | if test "$UNAME_PROCESSOR" = unknown ; then | 1298 | if test "$UNAME_PROCESSOR" = unknown ; then |
325 | 1294 | UNAME_PROCESSOR=powerpc | 1299 | UNAME_PROCESSOR=powerpc |
326 | 1295 | fi | 1300 | fi |
327 | @@ -1362,6 +1367,7 @@ EOF | |||
328 | 1362 | # "uname -m" is not consistent, so use $cputype instead. 386 | 1367 | # "uname -m" is not consistent, so use $cputype instead. 386 |
329 | 1363 | # is converted to i386 for consistency with other x86 | 1368 | # is converted to i386 for consistency with other x86 |
330 | 1364 | # operating systems. | 1369 | # operating systems. |
331 | 1370 | # shellcheck disable=SC2154 | ||
332 | 1365 | if test "$cputype" = 386; then | 1371 | if test "$cputype" = 386; then |
333 | 1366 | UNAME_MACHINE=i386 | 1372 | UNAME_MACHINE=i386 |
334 | 1367 | else | 1373 | else |
335 | @@ -1473,7 +1479,7 @@ EOF | |||
336 | 1473 | exit 1 | 1479 | exit 1 |
337 | 1474 | 1480 | ||
338 | 1475 | # Local variables: | 1481 | # Local variables: |
340 | 1476 | # eval: (add-hook 'write-file-functions 'time-stamp) | 1482 | # eval: (add-hook 'before-save-hook 'time-stamp) |
341 | 1477 | # time-stamp-start: "timestamp='" | 1483 | # time-stamp-start: "timestamp='" |
342 | 1478 | # time-stamp-format: "%:y-%02m-%02d" | 1484 | # time-stamp-format: "%:y-%02m-%02d" |
343 | 1479 | # time-stamp-end: "'" | 1485 | # time-stamp-end: "'" |
344 | diff --git a/build-aux/config.sub b/build-aux/config.sub | |||
345 | index 1d8e98b..be4dc6e 100755 | |||
346 | --- a/build-aux/config.sub | |||
347 | +++ b/build-aux/config.sub | |||
348 | @@ -1,8 +1,8 @@ | |||
350 | 1 | #! /bin/sh | 1 | #!/usr/bin/sh |
351 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
352 | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
353 | 4 | 4 | ||
355 | 5 | timestamp='2018-02-22' | 5 | timestamp='2018-08-29' |
356 | 6 | 6 | ||
357 | 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 |
358 | 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 |
359 | @@ -110,1223 +110,1159 @@ case $# in | |||
360 | 110 | exit 1;; | 110 | exit 1;; |
361 | 111 | esac | 111 | esac |
362 | 112 | 112 | ||
386 | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). | 113 | # Split fields of configuration type |
387 | 114 | # Here we must recognize all the valid KERNEL-OS combinations. | 114 | IFS="-" read -r field1 field2 field3 field4 <<EOF |
388 | 115 | maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 115 | $1 |
389 | 116 | case $maybe_os in | 116 | EOF |
367 | 117 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ | ||
368 | 118 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ | ||
369 | 119 | knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ | ||
370 | 120 | kopensolaris*-gnu* | cloudabi*-eabi* | \ | ||
371 | 121 | storm-chaos* | os2-emx* | rtmk-nova*) | ||
372 | 122 | os=-$maybe_os | ||
373 | 123 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | ||
374 | 124 | ;; | ||
375 | 125 | android-linux) | ||
376 | 126 | os=-linux-android | ||
377 | 127 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | ||
378 | 128 | ;; | ||
379 | 129 | *) | ||
380 | 130 | basic_machine=`echo "$1" | sed 's/-[^-]*$//'` | ||
381 | 131 | if [ "$basic_machine" != "$1" ] | ||
382 | 132 | then os=`echo "$1" | sed 's/.*-/-/'` | ||
383 | 133 | else os=; fi | ||
384 | 134 | ;; | ||
385 | 135 | esac | ||
390 | 136 | 117 | ||
479 | 137 | ### Let's recognize common machines as not being operating systems so | 118 | # Separate into logical components for further validation |
480 | 138 | ### that things like config.sub decstation-3100 work. We also | 119 | case $1 in |
481 | 139 | ### recognize some manufacturers as not being operating systems, so we | 120 | *-*-*-*-*) |
482 | 140 | ### can provide default operating systems below. | 121 | echo Invalid configuration \`"$1"\': more than four components >&2 |
483 | 141 | case $os in | 122 | exit 1 |
396 | 142 | -sun*os*) | ||
397 | 143 | # Prevent following clause from handling this invalid input. | ||
398 | 144 | ;; | ||
399 | 145 | -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ | ||
400 | 146 | -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ | ||
401 | 147 | -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ | ||
402 | 148 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ | ||
403 | 149 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ | ||
404 | 150 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ | ||
405 | 151 | -apple | -axis | -knuth | -cray | -microblaze*) | ||
406 | 152 | os= | ||
407 | 153 | basic_machine=$1 | ||
408 | 154 | ;; | ||
409 | 155 | -bluegene*) | ||
410 | 156 | os=-cnk | ||
411 | 157 | ;; | ||
412 | 158 | -sim | -cisco | -oki | -wec | -winbond) | ||
413 | 159 | os= | ||
414 | 160 | basic_machine=$1 | ||
415 | 161 | ;; | ||
416 | 162 | -scout) | ||
417 | 163 | ;; | ||
418 | 164 | -wrs) | ||
419 | 165 | os=-vxworks | ||
420 | 166 | basic_machine=$1 | ||
421 | 167 | ;; | ||
422 | 168 | -chorusos*) | ||
423 | 169 | os=-chorusos | ||
424 | 170 | basic_machine=$1 | ||
425 | 171 | ;; | ||
426 | 172 | -chorusrdb) | ||
427 | 173 | os=-chorusrdb | ||
428 | 174 | basic_machine=$1 | ||
429 | 175 | ;; | ||
430 | 176 | -hiux*) | ||
431 | 177 | os=-hiuxwe2 | ||
432 | 178 | ;; | ||
433 | 179 | -sco6) | ||
434 | 180 | os=-sco5v6 | ||
435 | 181 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
436 | 182 | ;; | ||
437 | 183 | -sco5) | ||
438 | 184 | os=-sco3.2v5 | ||
439 | 185 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
440 | 186 | ;; | ||
441 | 187 | -sco4) | ||
442 | 188 | os=-sco3.2v4 | ||
443 | 189 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
444 | 190 | ;; | ||
445 | 191 | -sco3.2.[4-9]*) | ||
446 | 192 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` | ||
447 | 193 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
448 | 194 | ;; | ||
449 | 195 | -sco3.2v[4-9]*) | ||
450 | 196 | # Don't forget version if it is 3.2v4 or newer. | ||
451 | 197 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
452 | 198 | ;; | ||
453 | 199 | -sco5v6*) | ||
454 | 200 | # Don't forget version if it is 3.2v4 or newer. | ||
455 | 201 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
456 | 202 | ;; | ||
457 | 203 | -sco*) | ||
458 | 204 | os=-sco3.2v2 | ||
459 | 205 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
460 | 206 | ;; | ||
461 | 207 | -udk*) | ||
462 | 208 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
463 | 209 | ;; | ||
464 | 210 | -isc) | ||
465 | 211 | os=-isc2.2 | ||
466 | 212 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
467 | 213 | ;; | ||
468 | 214 | -clix*) | ||
469 | 215 | basic_machine=clipper-intergraph | ||
470 | 216 | ;; | ||
471 | 217 | -isc*) | ||
472 | 218 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
473 | 219 | ;; | ||
474 | 220 | -lynx*178) | ||
475 | 221 | os=-lynxos178 | ||
476 | 222 | ;; | ||
477 | 223 | -lynx*5) | ||
478 | 224 | os=-lynxos5 | ||
484 | 225 | ;; | 123 | ;; |
487 | 226 | -lynx*) | 124 | *-*-*-*) |
488 | 227 | os=-lynxos | 125 | basic_machine=$field1-$field2 |
489 | 126 | os=$field3-$field4 | ||
490 | 228 | ;; | 127 | ;; |
493 | 229 | -ptx*) | 128 | *-*-*) |
494 | 230 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` | 129 | # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two |
495 | 130 | # parts | ||
496 | 131 | maybe_os=$field2-$field3 | ||
497 | 132 | case $maybe_os in | ||
498 | 133 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ | ||
499 | 134 | | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ | ||
500 | 135 | | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | ||
501 | 136 | | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | ||
502 | 137 | | storm-chaos* | os2-emx* | rtmk-nova*) | ||
503 | 138 | basic_machine=$field1 | ||
504 | 139 | os=$maybe_os | ||
505 | 140 | ;; | ||
506 | 141 | android-linux) | ||
507 | 142 | basic_machine=$field1-unknown | ||
508 | 143 | os=linux-android | ||
509 | 144 | ;; | ||
510 | 145 | *) | ||
511 | 146 | basic_machine=$field1-$field2 | ||
512 | 147 | os=$field3 | ||
513 | 148 | ;; | ||
514 | 149 | esac | ||
515 | 231 | ;; | 150 | ;; |
518 | 232 | -psos*) | 151 | *-*) |
519 | 233 | os=-psos | 152 | # A lone config we happen to match not fitting any patern |
520 | 153 | case $field1-$field2 in | ||
521 | 154 | decstation-3100) | ||
522 | 155 | basic_machine=mips-dec | ||
523 | 156 | os= | ||
524 | 157 | ;; | ||
525 | 158 | *-*) | ||
526 | 159 | # Second component is usually, but not always the OS | ||
527 | 160 | case $field2 in | ||
528 | 161 | # Prevent following clause from handling this valid os | ||
529 | 162 | sun*os*) | ||
530 | 163 | basic_machine=$field1 | ||
531 | 164 | os=$field2 | ||
532 | 165 | ;; | ||
533 | 166 | # Manufacturers | ||
534 | 167 | dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ | ||
535 | 168 | | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ | ||
536 | 169 | | unicom* | ibm* | next | hp | isi* | apollo | altos* \ | ||
537 | 170 | | convergent* | ncr* | news | 32* | 3600* | 3100* \ | ||
538 | 171 | | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ | ||
539 | 172 | | ultra | tti* | harris | dolphin | highlevel | gould \ | ||
540 | 173 | | cbm | ns | masscomp | apple | axis | knuth | cray \ | ||
541 | 174 | | microblaze* | sim | cisco \ | ||
542 | 175 | | oki | wec | wrs | winbond) | ||
543 | 176 | basic_machine=$field1-$field2 | ||
544 | 177 | os= | ||
545 | 178 | ;; | ||
546 | 179 | *) | ||
547 | 180 | basic_machine=$field1 | ||
548 | 181 | os=$field2 | ||
549 | 182 | ;; | ||
550 | 183 | esac | ||
551 | 184 | ;; | ||
552 | 185 | esac | ||
553 | 234 | ;; | 186 | ;; |
557 | 235 | -mint | -mint[0-9]*) | 187 | *) |
558 | 236 | basic_machine=m68k-atari | 188 | # Convert single-component short-hands not valid as part of |
559 | 237 | os=-mint | 189 | # multi-component configurations. |
560 | 190 | case $field1 in | ||
561 | 191 | 386bsd) | ||
562 | 192 | basic_machine=i386-pc | ||
563 | 193 | os=bsd | ||
564 | 194 | ;; | ||
565 | 195 | a29khif) | ||
566 | 196 | basic_machine=a29k-amd | ||
567 | 197 | os=udi | ||
568 | 198 | ;; | ||
569 | 199 | adobe68k) | ||
570 | 200 | basic_machine=m68010-adobe | ||
571 | 201 | os=scout | ||
572 | 202 | ;; | ||
573 | 203 | alliant) | ||
574 | 204 | basic_machine=fx80-alliant | ||
575 | 205 | os= | ||
576 | 206 | ;; | ||
577 | 207 | altos | altos3068) | ||
578 | 208 | basic_machine=m68k-altos | ||
579 | 209 | os= | ||
580 | 210 | ;; | ||
581 | 211 | am29k) | ||
582 | 212 | basic_machine=a29k-none | ||
583 | 213 | os=bsd | ||
584 | 214 | ;; | ||
585 | 215 | amdahl) | ||
586 | 216 | basic_machine=580-amdahl | ||
587 | 217 | os=sysv | ||
588 | 218 | ;; | ||
589 | 219 | amiga) | ||
590 | 220 | basic_machine=m68k-unknown | ||
591 | 221 | os= | ||
592 | 222 | ;; | ||
593 | 223 | amigaos | amigados) | ||
594 | 224 | basic_machine=m68k-unknown | ||
595 | 225 | os=amigaos | ||
596 | 226 | ;; | ||
597 | 227 | amigaunix | amix) | ||
598 | 228 | basic_machine=m68k-unknown | ||
599 | 229 | os=sysv4 | ||
600 | 230 | ;; | ||
601 | 231 | apollo68) | ||
602 | 232 | basic_machine=m68k-apollo | ||
603 | 233 | os=sysv | ||
604 | 234 | ;; | ||
605 | 235 | apollo68bsd) | ||
606 | 236 | basic_machine=m68k-apollo | ||
607 | 237 | os=bsd | ||
608 | 238 | ;; | ||
609 | 239 | aros) | ||
610 | 240 | basic_machine=i386-pc | ||
611 | 241 | os=aros | ||
612 | 242 | ;; | ||
613 | 243 | aux) | ||
614 | 244 | basic_machine=m68k-apple | ||
615 | 245 | os=aux | ||
616 | 246 | ;; | ||
617 | 247 | balance) | ||
618 | 248 | basic_machine=ns32k-sequent | ||
619 | 249 | os=dynix | ||
620 | 250 | ;; | ||
621 | 251 | blackfin) | ||
622 | 252 | basic_machine=bfin-unknown | ||
623 | 253 | os=linux | ||
624 | 254 | ;; | ||
625 | 255 | cegcc) | ||
626 | 256 | basic_machine=arm-unknown | ||
627 | 257 | os=cegcc | ||
628 | 258 | ;; | ||
629 | 259 | convex-c1) | ||
630 | 260 | basic_machine=c1-convex | ||
631 | 261 | os=bsd | ||
632 | 262 | ;; | ||
633 | 263 | convex-c2) | ||
634 | 264 | basic_machine=c2-convex | ||
635 | 265 | os=bsd | ||
636 | 266 | ;; | ||
637 | 267 | convex-c32) | ||
638 | 268 | basic_machine=c32-convex | ||
639 | 269 | os=bsd | ||
640 | 270 | ;; | ||
641 | 271 | convex-c34) | ||
642 | 272 | basic_machine=c34-convex | ||
643 | 273 | os=bsd | ||
644 | 274 | ;; | ||
645 | 275 | convex-c38) | ||
646 | 276 | basic_machine=c38-convex | ||
647 | 277 | os=bsd | ||
648 | 278 | ;; | ||
649 | 279 | cray) | ||
650 | 280 | basic_machine=j90-cray | ||
651 | 281 | os=unicos | ||
652 | 282 | ;; | ||
653 | 283 | crds | unos) | ||
654 | 284 | basic_machine=m68k-crds | ||
655 | 285 | os= | ||
656 | 286 | ;; | ||
657 | 287 | da30) | ||
658 | 288 | basic_machine=m68k-da30 | ||
659 | 289 | os= | ||
660 | 290 | ;; | ||
661 | 291 | decstation | pmax | pmin | dec3100 | decstatn) | ||
662 | 292 | basic_machine=mips-dec | ||
663 | 293 | os= | ||
664 | 294 | ;; | ||
665 | 295 | delta88) | ||
666 | 296 | basic_machine=m88k-motorola | ||
667 | 297 | os=sysv3 | ||
668 | 298 | ;; | ||
669 | 299 | dicos) | ||
670 | 300 | basic_machine=i686-pc | ||
671 | 301 | os=dicos | ||
672 | 302 | ;; | ||
673 | 303 | djgpp) | ||
674 | 304 | basic_machine=i586-pc | ||
675 | 305 | os=msdosdjgpp | ||
676 | 306 | ;; | ||
677 | 307 | ebmon29k) | ||
678 | 308 | basic_machine=a29k-amd | ||
679 | 309 | os=ebmon | ||
680 | 310 | ;; | ||
681 | 311 | es1800 | OSE68k | ose68k | ose | OSE) | ||
682 | 312 | basic_machine=m68k-ericsson | ||
683 | 313 | os=ose | ||
684 | 314 | ;; | ||
685 | 315 | gmicro) | ||
686 | 316 | basic_machine=tron-gmicro | ||
687 | 317 | os=sysv | ||
688 | 318 | ;; | ||
689 | 319 | go32) | ||
690 | 320 | basic_machine=i386-pc | ||
691 | 321 | os=go32 | ||
692 | 322 | ;; | ||
693 | 323 | h8300hms) | ||
694 | 324 | basic_machine=h8300-hitachi | ||
695 | 325 | os=hms | ||
696 | 326 | ;; | ||
697 | 327 | h8300xray) | ||
698 | 328 | basic_machine=h8300-hitachi | ||
699 | 329 | os=xray | ||
700 | 330 | ;; | ||
701 | 331 | h8500hms) | ||
702 | 332 | basic_machine=h8500-hitachi | ||
703 | 333 | os=hms | ||
704 | 334 | ;; | ||
705 | 335 | harris) | ||
706 | 336 | basic_machine=m88k-harris | ||
707 | 337 | os=sysv3 | ||
708 | 338 | ;; | ||
709 | 339 | hp300) | ||
710 | 340 | basic_machine=m68k-hp | ||
711 | 341 | ;; | ||
712 | 342 | hp300bsd) | ||
713 | 343 | basic_machine=m68k-hp | ||
714 | 344 | os=bsd | ||
715 | 345 | ;; | ||
716 | 346 | hp300hpux) | ||
717 | 347 | basic_machine=m68k-hp | ||
718 | 348 | os=hpux | ||
719 | 349 | ;; | ||
720 | 350 | hppaosf) | ||
721 | 351 | basic_machine=hppa1.1-hp | ||
722 | 352 | os=osf | ||
723 | 353 | ;; | ||
724 | 354 | hppro) | ||
725 | 355 | basic_machine=hppa1.1-hp | ||
726 | 356 | os=proelf | ||
727 | 357 | ;; | ||
728 | 358 | i386mach) | ||
729 | 359 | basic_machine=i386-mach | ||
730 | 360 | os=mach | ||
731 | 361 | ;; | ||
732 | 362 | vsta) | ||
733 | 363 | basic_machine=i386-pc | ||
734 | 364 | os=vsta | ||
735 | 365 | ;; | ||
736 | 366 | isi68 | isi) | ||
737 | 367 | basic_machine=m68k-isi | ||
738 | 368 | os=sysv | ||
739 | 369 | ;; | ||
740 | 370 | m68knommu) | ||
741 | 371 | basic_machine=m68k-unknown | ||
742 | 372 | os=linux | ||
743 | 373 | ;; | ||
744 | 374 | magnum | m3230) | ||
745 | 375 | basic_machine=mips-mips | ||
746 | 376 | os=sysv | ||
747 | 377 | ;; | ||
748 | 378 | merlin) | ||
749 | 379 | basic_machine=ns32k-utek | ||
750 | 380 | os=sysv | ||
751 | 381 | ;; | ||
752 | 382 | mingw64) | ||
753 | 383 | basic_machine=x86_64-pc | ||
754 | 384 | os=mingw64 | ||
755 | 385 | ;; | ||
756 | 386 | mingw32) | ||
757 | 387 | basic_machine=i686-pc | ||
758 | 388 | os=mingw32 | ||
759 | 389 | ;; | ||
760 | 390 | mingw32ce) | ||
761 | 391 | basic_machine=arm-unknown | ||
762 | 392 | os=mingw32ce | ||
763 | 393 | ;; | ||
764 | 394 | monitor) | ||
765 | 395 | basic_machine=m68k-rom68k | ||
766 | 396 | os=coff | ||
767 | 397 | ;; | ||
768 | 398 | morphos) | ||
769 | 399 | basic_machine=powerpc-unknown | ||
770 | 400 | os=morphos | ||
771 | 401 | ;; | ||
772 | 402 | moxiebox) | ||
773 | 403 | basic_machine=moxie-unknown | ||
774 | 404 | os=moxiebox | ||
775 | 405 | ;; | ||
776 | 406 | msdos) | ||
777 | 407 | basic_machine=i386-pc | ||
778 | 408 | os=msdos | ||
779 | 409 | ;; | ||
780 | 410 | msys) | ||
781 | 411 | basic_machine=i686-pc | ||
782 | 412 | os=msys | ||
783 | 413 | ;; | ||
784 | 414 | mvs) | ||
785 | 415 | basic_machine=i370-ibm | ||
786 | 416 | os=mvs | ||
787 | 417 | ;; | ||
788 | 418 | nacl) | ||
789 | 419 | basic_machine=le32-unknown | ||
790 | 420 | os=nacl | ||
791 | 421 | ;; | ||
792 | 422 | ncr3000) | ||
793 | 423 | basic_machine=i486-ncr | ||
794 | 424 | os=sysv4 | ||
795 | 425 | ;; | ||
796 | 426 | netbsd386) | ||
797 | 427 | basic_machine=i386-pc | ||
798 | 428 | os=netbsd | ||
799 | 429 | ;; | ||
800 | 430 | netwinder) | ||
801 | 431 | basic_machine=armv4l-rebel | ||
802 | 432 | os=linux | ||
803 | 433 | ;; | ||
804 | 434 | news | news700 | news800 | news900) | ||
805 | 435 | basic_machine=m68k-sony | ||
806 | 436 | os=newsos | ||
807 | 437 | ;; | ||
808 | 438 | news1000) | ||
809 | 439 | basic_machine=m68030-sony | ||
810 | 440 | os=newsos | ||
811 | 441 | ;; | ||
812 | 442 | necv70) | ||
813 | 443 | basic_machine=v70-nec | ||
814 | 444 | os=sysv | ||
815 | 445 | ;; | ||
816 | 446 | nh3000) | ||
817 | 447 | basic_machine=m68k-harris | ||
818 | 448 | os=cxux | ||
819 | 449 | ;; | ||
820 | 450 | nh[45]000) | ||
821 | 451 | basic_machine=m88k-harris | ||
822 | 452 | os=cxux | ||
823 | 453 | ;; | ||
824 | 454 | nindy960) | ||
825 | 455 | basic_machine=i960-intel | ||
826 | 456 | os=nindy | ||
827 | 457 | ;; | ||
828 | 458 | mon960) | ||
829 | 459 | basic_machine=i960-intel | ||
830 | 460 | os=mon960 | ||
831 | 461 | ;; | ||
832 | 462 | nonstopux) | ||
833 | 463 | basic_machine=mips-compaq | ||
834 | 464 | os=nonstopux | ||
835 | 465 | ;; | ||
836 | 466 | os400) | ||
837 | 467 | basic_machine=powerpc-ibm | ||
838 | 468 | os=os400 | ||
839 | 469 | ;; | ||
840 | 470 | OSE68000 | ose68000) | ||
841 | 471 | basic_machine=m68000-ericsson | ||
842 | 472 | os=ose | ||
843 | 473 | ;; | ||
844 | 474 | os68k) | ||
845 | 475 | basic_machine=m68k-none | ||
846 | 476 | os=os68k | ||
847 | 477 | ;; | ||
848 | 478 | paragon) | ||
849 | 479 | basic_machine=i860-intel | ||
850 | 480 | os=osf | ||
851 | 481 | ;; | ||
852 | 482 | parisc) | ||
853 | 483 | basic_machine=hppa-unknown | ||
854 | 484 | os=linux | ||
855 | 485 | ;; | ||
856 | 486 | pw32) | ||
857 | 487 | basic_machine=i586-unknown | ||
858 | 488 | os=pw32 | ||
859 | 489 | ;; | ||
860 | 490 | rdos | rdos64) | ||
861 | 491 | basic_machine=x86_64-pc | ||
862 | 492 | os=rdos | ||
863 | 493 | ;; | ||
864 | 494 | rdos32) | ||
865 | 495 | basic_machine=i386-pc | ||
866 | 496 | os=rdos | ||
867 | 497 | ;; | ||
868 | 498 | rom68k) | ||
869 | 499 | basic_machine=m68k-rom68k | ||
870 | 500 | os=coff | ||
871 | 501 | ;; | ||
872 | 502 | sa29200) | ||
873 | 503 | basic_machine=a29k-amd | ||
874 | 504 | os=udi | ||
875 | 505 | ;; | ||
876 | 506 | sei) | ||
877 | 507 | basic_machine=mips-sei | ||
878 | 508 | os=seiux | ||
879 | 509 | ;; | ||
880 | 510 | sequent) | ||
881 | 511 | basic_machine=i386-sequent | ||
882 | 512 | os= | ||
883 | 513 | ;; | ||
884 | 514 | sps7) | ||
885 | 515 | basic_machine=m68k-bull | ||
886 | 516 | os=sysv2 | ||
887 | 517 | ;; | ||
888 | 518 | st2000) | ||
889 | 519 | basic_machine=m68k-tandem | ||
890 | 520 | os= | ||
891 | 521 | ;; | ||
892 | 522 | stratus) | ||
893 | 523 | basic_machine=i860-stratus | ||
894 | 524 | os=sysv4 | ||
895 | 525 | ;; | ||
896 | 526 | sun2) | ||
897 | 527 | basic_machine=m68000-sun | ||
898 | 528 | os= | ||
899 | 529 | ;; | ||
900 | 530 | sun2os3) | ||
901 | 531 | basic_machine=m68000-sun | ||
902 | 532 | os=sunos3 | ||
903 | 533 | ;; | ||
904 | 534 | sun2os4) | ||
905 | 535 | basic_machine=m68000-sun | ||
906 | 536 | os=sunos4 | ||
907 | 537 | ;; | ||
908 | 538 | sun3) | ||
909 | 539 | basic_machine=m68k-sun | ||
910 | 540 | os= | ||
911 | 541 | ;; | ||
912 | 542 | sun3os3) | ||
913 | 543 | basic_machine=m68k-sun | ||
914 | 544 | os=sunos3 | ||
915 | 545 | ;; | ||
916 | 546 | sun3os4) | ||
917 | 547 | basic_machine=m68k-sun | ||
918 | 548 | os=sunos4 | ||
919 | 549 | ;; | ||
920 | 550 | sun4) | ||
921 | 551 | basic_machine=sparc-sun | ||
922 | 552 | os= | ||
923 | 553 | ;; | ||
924 | 554 | sun4os3) | ||
925 | 555 | basic_machine=sparc-sun | ||
926 | 556 | os=sunos3 | ||
927 | 557 | ;; | ||
928 | 558 | sun4os4) | ||
929 | 559 | basic_machine=sparc-sun | ||
930 | 560 | os=sunos4 | ||
931 | 561 | ;; | ||
932 | 562 | sun4sol2) | ||
933 | 563 | basic_machine=sparc-sun | ||
934 | 564 | os=solaris2 | ||
935 | 565 | ;; | ||
936 | 566 | sun386 | sun386i | roadrunner) | ||
937 | 567 | basic_machine=i386-sun | ||
938 | 568 | os= | ||
939 | 569 | ;; | ||
940 | 570 | sv1) | ||
941 | 571 | basic_machine=sv1-cray | ||
942 | 572 | os=unicos | ||
943 | 573 | ;; | ||
944 | 574 | symmetry) | ||
945 | 575 | basic_machine=i386-sequent | ||
946 | 576 | os=dynix | ||
947 | 577 | ;; | ||
948 | 578 | t3e) | ||
949 | 579 | basic_machine=alphaev5-cray | ||
950 | 580 | os=unicos | ||
951 | 581 | ;; | ||
952 | 582 | t90) | ||
953 | 583 | basic_machine=t90-cray | ||
954 | 584 | os=unicos | ||
955 | 585 | ;; | ||
956 | 586 | toad1) | ||
957 | 587 | basic_machine=pdp10-xkl | ||
958 | 588 | os=tops20 | ||
959 | 589 | ;; | ||
960 | 590 | tpf) | ||
961 | 591 | basic_machine=s390x-ibm | ||
962 | 592 | os=tpf | ||
963 | 593 | ;; | ||
964 | 594 | udi29k) | ||
965 | 595 | basic_machine=a29k-amd | ||
966 | 596 | os=udi | ||
967 | 597 | ;; | ||
968 | 598 | ultra3) | ||
969 | 599 | basic_machine=a29k-nyu | ||
970 | 600 | os=sym1 | ||
971 | 601 | ;; | ||
972 | 602 | v810 | necv810) | ||
973 | 603 | basic_machine=v810-nec | ||
974 | 604 | os=none | ||
975 | 605 | ;; | ||
976 | 606 | vaxv) | ||
977 | 607 | basic_machine=vax-dec | ||
978 | 608 | os=sysv | ||
979 | 609 | ;; | ||
980 | 610 | vms) | ||
981 | 611 | basic_machine=vax-dec | ||
982 | 612 | os=vms | ||
983 | 613 | ;; | ||
984 | 614 | vxworks960) | ||
985 | 615 | basic_machine=i960-wrs | ||
986 | 616 | os=vxworks | ||
987 | 617 | ;; | ||
988 | 618 | vxworks68) | ||
989 | 619 | basic_machine=m68k-wrs | ||
990 | 620 | os=vxworks | ||
991 | 621 | ;; | ||
992 | 622 | vxworks29k) | ||
993 | 623 | basic_machine=a29k-wrs | ||
994 | 624 | os=vxworks | ||
995 | 625 | ;; | ||
996 | 626 | xbox) | ||
997 | 627 | basic_machine=i686-pc | ||
998 | 628 | os=mingw32 | ||
999 | 629 | ;; | ||
1000 | 630 | ymp) | ||
1001 | 631 | basic_machine=ymp-cray | ||
1002 | 632 | os=unicos | ||
1003 | 633 | ;; | ||
1004 | 634 | *) | ||
1005 | 635 | basic_machine=$1 | ||
1006 | 636 | os= | ||
1007 | 637 | ;; | ||
1008 | 638 | esac | ||
1009 | 238 | ;; | 639 | ;; |
1010 | 239 | esac | 640 | esac |
1011 | 240 | 641 | ||
1013 | 241 | # Decode aliases for certain CPU-COMPANY combinations. | 642 | # Decode 1-component or ad-hoc basic machines |
1014 | 242 | case $basic_machine in | 643 | case $basic_machine in |
1107 | 243 | # Recognize the basic CPU types without company name. | 644 | # Here we handle the default manufacturer of certain CPU types. It is in |
1108 | 244 | # Some are omitted here because they have special meanings below. | 645 | # some cases the only manufacturer, in others, it is the most popular. |
1109 | 245 | 1750a | 580 \ | 646 | w89k) |
1110 | 246 | | a29k \ | 647 | cpu=hppa1.1 |
1111 | 247 | | aarch64 | aarch64_be \ | 648 | vendor=winbond |
1020 | 248 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
1021 | 249 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
1022 | 250 | | am33_2.0 \ | ||
1023 | 251 | | arc | arceb \ | ||
1024 | 252 | | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | ||
1025 | 253 | | avr | avr32 \ | ||
1026 | 254 | | ba \ | ||
1027 | 255 | | be32 | be64 \ | ||
1028 | 256 | | bfin \ | ||
1029 | 257 | | c4x | c8051 | clipper \ | ||
1030 | 258 | | d10v | d30v | dlx | dsp16xx \ | ||
1031 | 259 | | e2k | epiphany \ | ||
1032 | 260 | | fido | fr30 | frv | ft32 \ | ||
1033 | 261 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | ||
1034 | 262 | | hexagon \ | ||
1035 | 263 | | i370 | i860 | i960 | ia16 | ia64 \ | ||
1036 | 264 | | ip2k | iq2000 \ | ||
1037 | 265 | | k1om \ | ||
1038 | 266 | | le32 | le64 \ | ||
1039 | 267 | | lm32 \ | ||
1040 | 268 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | ||
1041 | 269 | | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | ||
1042 | 270 | | mips | mipsbe | mipseb | mipsel | mipsle \ | ||
1043 | 271 | | mips16 \ | ||
1044 | 272 | | mips64 | mips64el \ | ||
1045 | 273 | | mips64octeon | mips64octeonel \ | ||
1046 | 274 | | mips64orion | mips64orionel \ | ||
1047 | 275 | | mips64r5900 | mips64r5900el \ | ||
1048 | 276 | | mips64vr | mips64vrel \ | ||
1049 | 277 | | mips64vr4100 | mips64vr4100el \ | ||
1050 | 278 | | mips64vr4300 | mips64vr4300el \ | ||
1051 | 279 | | mips64vr5000 | mips64vr5000el \ | ||
1052 | 280 | | mips64vr5900 | mips64vr5900el \ | ||
1053 | 281 | | mipsisa32 | mipsisa32el \ | ||
1054 | 282 | | mipsisa32r2 | mipsisa32r2el \ | ||
1055 | 283 | | mipsisa32r6 | mipsisa32r6el \ | ||
1056 | 284 | | mipsisa64 | mipsisa64el \ | ||
1057 | 285 | | mipsisa64r2 | mipsisa64r2el \ | ||
1058 | 286 | | mipsisa64r6 | mipsisa64r6el \ | ||
1059 | 287 | | mipsisa64sb1 | mipsisa64sb1el \ | ||
1060 | 288 | | mipsisa64sr71k | mipsisa64sr71kel \ | ||
1061 | 289 | | mipsr5900 | mipsr5900el \ | ||
1062 | 290 | | mipstx39 | mipstx39el \ | ||
1063 | 291 | | mn10200 | mn10300 \ | ||
1064 | 292 | | moxie \ | ||
1065 | 293 | | mt \ | ||
1066 | 294 | | msp430 \ | ||
1067 | 295 | | nds32 | nds32le | nds32be \ | ||
1068 | 296 | | nios | nios2 | nios2eb | nios2el \ | ||
1069 | 297 | | ns16k | ns32k \ | ||
1070 | 298 | | open8 | or1k | or1knd | or32 \ | ||
1071 | 299 | | pdp10 | pj | pjl \ | ||
1072 | 300 | | powerpc | powerpc64 | powerpc64le | powerpcle \ | ||
1073 | 301 | | pru \ | ||
1074 | 302 | | pyramid \ | ||
1075 | 303 | | riscv32 | riscv64 \ | ||
1076 | 304 | | rl78 | rx \ | ||
1077 | 305 | | score \ | ||
1078 | 306 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | ||
1079 | 307 | | sh64 | sh64le \ | ||
1080 | 308 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | ||
1081 | 309 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | ||
1082 | 310 | | spu \ | ||
1083 | 311 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ||
1084 | 312 | | ubicom32 \ | ||
1085 | 313 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | ||
1086 | 314 | | visium \ | ||
1087 | 315 | | wasm32 \ | ||
1088 | 316 | | x86 | xc16x | xstormy16 | xtensa \ | ||
1089 | 317 | | z8k | z80) | ||
1090 | 318 | basic_machine=$basic_machine-unknown | ||
1091 | 319 | ;; | ||
1092 | 320 | c54x) | ||
1093 | 321 | basic_machine=tic54x-unknown | ||
1094 | 322 | ;; | ||
1095 | 323 | c55x) | ||
1096 | 324 | basic_machine=tic55x-unknown | ||
1097 | 325 | ;; | ||
1098 | 326 | c6x) | ||
1099 | 327 | basic_machine=tic6x-unknown | ||
1100 | 328 | ;; | ||
1101 | 329 | leon|leon[3-9]) | ||
1102 | 330 | basic_machine=sparc-$basic_machine | ||
1103 | 331 | ;; | ||
1104 | 332 | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) | ||
1105 | 333 | basic_machine=$basic_machine-unknown | ||
1106 | 334 | os=-none | ||
1112 | 335 | ;; | 649 | ;; |
1114 | 336 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) | 650 | op50n) |
1115 | 651 | cpu=hppa1.1 | ||
1116 | 652 | vendor=oki | ||
1117 | 337 | ;; | 653 | ;; |
1120 | 338 | ms1) | 654 | op60c) |
1121 | 339 | basic_machine=mt-unknown | 655 | cpu=hppa1.1 |
1122 | 656 | vendor=oki | ||
1123 | 340 | ;; | 657 | ;; |
1127 | 341 | 658 | ibm*) | |
1128 | 342 | strongarm | thumb | xscale) | 659 | cpu=i370 |
1129 | 343 | basic_machine=arm-unknown | 660 | vendor=ibm |
1130 | 344 | ;; | 661 | ;; |
1134 | 345 | xgate) | 662 | orion105) |
1135 | 346 | basic_machine=$basic_machine-unknown | 663 | cpu=clipper |
1136 | 347 | os=-none | 664 | vendor=highlevel |
1137 | 348 | ;; | 665 | ;; |
1140 | 349 | xscaleeb) | 666 | mac | mpw | mac-mpw) |
1141 | 350 | basic_machine=armeb-unknown | 667 | cpu=m68k |
1142 | 668 | vendor=apple | ||
1143 | 351 | ;; | 669 | ;; |
1147 | 352 | 670 | pmac | pmac-mpw) | |
1148 | 353 | xscaleel) | 671 | cpu=powerpc |
1149 | 354 | basic_machine=armel-unknown | 672 | vendor=apple |
1150 | 355 | ;; | 673 | ;; |
1151 | 356 | 674 | ||
1152 | 357 | # We use `pc' rather than `unknown' | ||
1153 | 358 | # because (1) that's what they normally are, and | ||
1154 | 359 | # (2) the word "unknown" tends to confuse beginning users. | ||
1155 | 360 | i*86 | x86_64) | ||
1156 | 361 | basic_machine=$basic_machine-pc | ||
1157 | 362 | ;; | ||
1158 | 363 | # Object if more than one company name word. | ||
1159 | 364 | *-*-*) | ||
1160 | 365 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 | ||
1161 | 366 | exit 1 | ||
1162 | 367 | ;; | ||
1163 | 368 | # Recognize the basic CPU types with company name. | ||
1164 | 369 | 580-* \ | ||
1165 | 370 | | a29k-* \ | ||
1166 | 371 | | aarch64-* | aarch64_be-* \ | ||
1167 | 372 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
1168 | 373 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
1169 | 374 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | ||
1170 | 375 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | ||
1171 | 376 | | avr-* | avr32-* \ | ||
1172 | 377 | | ba-* \ | ||
1173 | 378 | | be32-* | be64-* \ | ||
1174 | 379 | | bfin-* | bs2000-* \ | ||
1175 | 380 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ | ||
1176 | 381 | | c8051-* | clipper-* | craynv-* | cydra-* \ | ||
1177 | 382 | | d10v-* | d30v-* | dlx-* \ | ||
1178 | 383 | | e2k-* | elxsi-* \ | ||
1179 | 384 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | ||
1180 | 385 | | h8300-* | h8500-* \ | ||
1181 | 386 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | ||
1182 | 387 | | hexagon-* \ | ||
1183 | 388 | | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ||
1184 | 389 | | ip2k-* | iq2000-* \ | ||
1185 | 390 | | k1om-* \ | ||
1186 | 391 | | le32-* | le64-* \ | ||
1187 | 392 | | lm32-* \ | ||
1188 | 393 | | m32c-* | m32r-* | m32rle-* \ | ||
1189 | 394 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | ||
1190 | 395 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | ||
1191 | 396 | | microblaze-* | microblazeel-* \ | ||
1192 | 397 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | ||
1193 | 398 | | mips16-* \ | ||
1194 | 399 | | mips64-* | mips64el-* \ | ||
1195 | 400 | | mips64octeon-* | mips64octeonel-* \ | ||
1196 | 401 | | mips64orion-* | mips64orionel-* \ | ||
1197 | 402 | | mips64r5900-* | mips64r5900el-* \ | ||
1198 | 403 | | mips64vr-* | mips64vrel-* \ | ||
1199 | 404 | | mips64vr4100-* | mips64vr4100el-* \ | ||
1200 | 405 | | mips64vr4300-* | mips64vr4300el-* \ | ||
1201 | 406 | | mips64vr5000-* | mips64vr5000el-* \ | ||
1202 | 407 | | mips64vr5900-* | mips64vr5900el-* \ | ||
1203 | 408 | | mipsisa32-* | mipsisa32el-* \ | ||
1204 | 409 | | mipsisa32r2-* | mipsisa32r2el-* \ | ||
1205 | 410 | | mipsisa32r6-* | mipsisa32r6el-* \ | ||
1206 | 411 | | mipsisa64-* | mipsisa64el-* \ | ||
1207 | 412 | | mipsisa64r2-* | mipsisa64r2el-* \ | ||
1208 | 413 | | mipsisa64r6-* | mipsisa64r6el-* \ | ||
1209 | 414 | | mipsisa64sb1-* | mipsisa64sb1el-* \ | ||
1210 | 415 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | ||
1211 | 416 | | mipsr5900-* | mipsr5900el-* \ | ||
1212 | 417 | | mipstx39-* | mipstx39el-* \ | ||
1213 | 418 | | mmix-* \ | ||
1214 | 419 | | mt-* \ | ||
1215 | 420 | | msp430-* \ | ||
1216 | 421 | | nds32-* | nds32le-* | nds32be-* \ | ||
1217 | 422 | | nios-* | nios2-* | nios2eb-* | nios2el-* \ | ||
1218 | 423 | | none-* | np1-* | ns16k-* | ns32k-* \ | ||
1219 | 424 | | open8-* \ | ||
1220 | 425 | | or1k*-* \ | ||
1221 | 426 | | orion-* \ | ||
1222 | 427 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | ||
1223 | 428 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | ||
1224 | 429 | | pru-* \ | ||
1225 | 430 | | pyramid-* \ | ||
1226 | 431 | | riscv32-* | riscv64-* \ | ||
1227 | 432 | | rl78-* | romp-* | rs6000-* | rx-* \ | ||
1228 | 433 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | ||
1229 | 434 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | ||
1230 | 435 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | ||
1231 | 436 | | sparclite-* \ | ||
1232 | 437 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | ||
1233 | 438 | | tahoe-* \ | ||
1234 | 439 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | ||
1235 | 440 | | tile*-* \ | ||
1236 | 441 | | tron-* \ | ||
1237 | 442 | | ubicom32-* \ | ||
1238 | 443 | | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | ||
1239 | 444 | | vax-* \ | ||
1240 | 445 | | visium-* \ | ||
1241 | 446 | | wasm32-* \ | ||
1242 | 447 | | we32k-* \ | ||
1243 | 448 | | x86-* | x86_64-* | xc16x-* | xps100-* \ | ||
1244 | 449 | | xstormy16-* | xtensa*-* \ | ||
1245 | 450 | | ymp-* \ | ||
1246 | 451 | | z8k-* | z80-*) | ||
1247 | 452 | ;; | ||
1248 | 453 | # Recognize the basic CPU types without company name, with glob match. | ||
1249 | 454 | xtensa*) | ||
1250 | 455 | basic_machine=$basic_machine-unknown | ||
1251 | 456 | ;; | ||
1252 | 457 | # Recognize the various machine names and aliases which stand | 675 | # Recognize the various machine names and aliases which stand |
1253 | 458 | # for a CPU type and a company and sometimes even an OS. | 676 | # for a CPU type and a company and sometimes even an OS. |
1254 | 459 | 386bsd) | ||
1255 | 460 | basic_machine=i386-pc | ||
1256 | 461 | os=-bsd | ||
1257 | 462 | ;; | ||
1258 | 463 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) | 677 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) |
1260 | 464 | basic_machine=m68000-att | 678 | cpu=m68000 |
1261 | 679 | vendor=att | ||
1262 | 465 | ;; | 680 | ;; |
1263 | 466 | 3b*) | 681 | 3b*) |
1338 | 467 | basic_machine=we32k-att | 682 | cpu=we32k |
1339 | 468 | ;; | 683 | vendor=att |
1266 | 469 | a29khif) | ||
1267 | 470 | basic_machine=a29k-amd | ||
1268 | 471 | os=-udi | ||
1269 | 472 | ;; | ||
1270 | 473 | abacus) | ||
1271 | 474 | basic_machine=abacus-unknown | ||
1272 | 475 | ;; | ||
1273 | 476 | adobe68k) | ||
1274 | 477 | basic_machine=m68010-adobe | ||
1275 | 478 | os=-scout | ||
1276 | 479 | ;; | ||
1277 | 480 | alliant | fx80) | ||
1278 | 481 | basic_machine=fx80-alliant | ||
1279 | 482 | ;; | ||
1280 | 483 | altos | altos3068) | ||
1281 | 484 | basic_machine=m68k-altos | ||
1282 | 485 | ;; | ||
1283 | 486 | am29k) | ||
1284 | 487 | basic_machine=a29k-none | ||
1285 | 488 | os=-bsd | ||
1286 | 489 | ;; | ||
1287 | 490 | amd64) | ||
1288 | 491 | basic_machine=x86_64-pc | ||
1289 | 492 | ;; | ||
1290 | 493 | amd64-*) | ||
1291 | 494 | basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1292 | 495 | ;; | ||
1293 | 496 | amdahl) | ||
1294 | 497 | basic_machine=580-amdahl | ||
1295 | 498 | os=-sysv | ||
1296 | 499 | ;; | ||
1297 | 500 | amiga | amiga-*) | ||
1298 | 501 | basic_machine=m68k-unknown | ||
1299 | 502 | ;; | ||
1300 | 503 | amigaos | amigados) | ||
1301 | 504 | basic_machine=m68k-unknown | ||
1302 | 505 | os=-amigaos | ||
1303 | 506 | ;; | ||
1304 | 507 | amigaunix | amix) | ||
1305 | 508 | basic_machine=m68k-unknown | ||
1306 | 509 | os=-sysv4 | ||
1307 | 510 | ;; | ||
1308 | 511 | apollo68) | ||
1309 | 512 | basic_machine=m68k-apollo | ||
1310 | 513 | os=-sysv | ||
1311 | 514 | ;; | ||
1312 | 515 | apollo68bsd) | ||
1313 | 516 | basic_machine=m68k-apollo | ||
1314 | 517 | os=-bsd | ||
1315 | 518 | ;; | ||
1316 | 519 | aros) | ||
1317 | 520 | basic_machine=i386-pc | ||
1318 | 521 | os=-aros | ||
1319 | 522 | ;; | ||
1320 | 523 | asmjs) | ||
1321 | 524 | basic_machine=asmjs-unknown | ||
1322 | 525 | ;; | ||
1323 | 526 | aux) | ||
1324 | 527 | basic_machine=m68k-apple | ||
1325 | 528 | os=-aux | ||
1326 | 529 | ;; | ||
1327 | 530 | balance) | ||
1328 | 531 | basic_machine=ns32k-sequent | ||
1329 | 532 | os=-dynix | ||
1330 | 533 | ;; | ||
1331 | 534 | blackfin) | ||
1332 | 535 | basic_machine=bfin-unknown | ||
1333 | 536 | os=-linux | ||
1334 | 537 | ;; | ||
1335 | 538 | blackfin-*) | ||
1336 | 539 | basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1337 | 540 | os=-linux | ||
1340 | 541 | ;; | 684 | ;; |
1341 | 542 | bluegene*) | 685 | bluegene*) |
1412 | 543 | basic_machine=powerpc-ibm | 686 | cpu=powerpc |
1413 | 544 | os=-cnk | 687 | vendor=ibm |
1414 | 545 | ;; | 688 | os=cnk |
1345 | 546 | c54x-*) | ||
1346 | 547 | basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1347 | 548 | ;; | ||
1348 | 549 | c55x-*) | ||
1349 | 550 | basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1350 | 551 | ;; | ||
1351 | 552 | c6x-*) | ||
1352 | 553 | basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1353 | 554 | ;; | ||
1354 | 555 | c90) | ||
1355 | 556 | basic_machine=c90-cray | ||
1356 | 557 | os=-unicos | ||
1357 | 558 | ;; | ||
1358 | 559 | cegcc) | ||
1359 | 560 | basic_machine=arm-unknown | ||
1360 | 561 | os=-cegcc | ||
1361 | 562 | ;; | ||
1362 | 563 | convex-c1) | ||
1363 | 564 | basic_machine=c1-convex | ||
1364 | 565 | os=-bsd | ||
1365 | 566 | ;; | ||
1366 | 567 | convex-c2) | ||
1367 | 568 | basic_machine=c2-convex | ||
1368 | 569 | os=-bsd | ||
1369 | 570 | ;; | ||
1370 | 571 | convex-c32) | ||
1371 | 572 | basic_machine=c32-convex | ||
1372 | 573 | os=-bsd | ||
1373 | 574 | ;; | ||
1374 | 575 | convex-c34) | ||
1375 | 576 | basic_machine=c34-convex | ||
1376 | 577 | os=-bsd | ||
1377 | 578 | ;; | ||
1378 | 579 | convex-c38) | ||
1379 | 580 | basic_machine=c38-convex | ||
1380 | 581 | os=-bsd | ||
1381 | 582 | ;; | ||
1382 | 583 | cray | j90) | ||
1383 | 584 | basic_machine=j90-cray | ||
1384 | 585 | os=-unicos | ||
1385 | 586 | ;; | ||
1386 | 587 | craynv) | ||
1387 | 588 | basic_machine=craynv-cray | ||
1388 | 589 | os=-unicosmp | ||
1389 | 590 | ;; | ||
1390 | 591 | cr16 | cr16-*) | ||
1391 | 592 | basic_machine=cr16-unknown | ||
1392 | 593 | os=-elf | ||
1393 | 594 | ;; | ||
1394 | 595 | crds | unos) | ||
1395 | 596 | basic_machine=m68k-crds | ||
1396 | 597 | ;; | ||
1397 | 598 | crisv32 | crisv32-* | etraxfs*) | ||
1398 | 599 | basic_machine=crisv32-axis | ||
1399 | 600 | ;; | ||
1400 | 601 | cris | cris-* | etrax*) | ||
1401 | 602 | basic_machine=cris-axis | ||
1402 | 603 | ;; | ||
1403 | 604 | crx) | ||
1404 | 605 | basic_machine=crx-unknown | ||
1405 | 606 | os=-elf | ||
1406 | 607 | ;; | ||
1407 | 608 | da30 | da30-*) | ||
1408 | 609 | basic_machine=m68k-da30 | ||
1409 | 610 | ;; | ||
1410 | 611 | decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) | ||
1411 | 612 | basic_machine=mips-dec | ||
1415 | 613 | ;; | 689 | ;; |
1416 | 614 | decsystem10* | dec10*) | 690 | decsystem10* | dec10*) |
1419 | 615 | basic_machine=pdp10-dec | 691 | cpu=pdp10 |
1420 | 616 | os=-tops10 | 692 | vendor=dec |
1421 | 693 | os=tops10 | ||
1422 | 617 | ;; | 694 | ;; |
1423 | 618 | decsystem20* | dec20*) | 695 | decsystem20* | dec20*) |
1426 | 619 | basic_machine=pdp10-dec | 696 | cpu=pdp10 |
1427 | 620 | os=-tops20 | 697 | vendor=dec |
1428 | 698 | os=tops20 | ||
1429 | 621 | ;; | 699 | ;; |
1430 | 622 | delta | 3300 | motorola-3300 | motorola-delta \ | 700 | delta | 3300 | motorola-3300 | motorola-delta \ |
1431 | 623 | | 3300-motorola | delta-motorola) | 701 | | 3300-motorola | delta-motorola) |
1449 | 624 | basic_machine=m68k-motorola | 702 | cpu=m68k |
1450 | 625 | ;; | 703 | vendor=motorola |
1434 | 626 | delta88) | ||
1435 | 627 | basic_machine=m88k-motorola | ||
1436 | 628 | os=-sysv3 | ||
1437 | 629 | ;; | ||
1438 | 630 | dicos) | ||
1439 | 631 | basic_machine=i686-pc | ||
1440 | 632 | os=-dicos | ||
1441 | 633 | ;; | ||
1442 | 634 | djgpp) | ||
1443 | 635 | basic_machine=i586-pc | ||
1444 | 636 | os=-msdosdjgpp | ||
1445 | 637 | ;; | ||
1446 | 638 | dpx20 | dpx20-*) | ||
1447 | 639 | basic_machine=rs6000-bull | ||
1448 | 640 | os=-bosx | ||
1451 | 641 | ;; | 704 | ;; |
1452 | 642 | dpx2*) | 705 | dpx2*) |
1471 | 643 | basic_machine=m68k-bull | 706 | cpu=m68k |
1472 | 644 | os=-sysv3 | 707 | vendor=bull |
1473 | 645 | ;; | 708 | os=sysv3 |
1456 | 646 | e500v[12]) | ||
1457 | 647 | basic_machine=powerpc-unknown | ||
1458 | 648 | os=$os"spe" | ||
1459 | 649 | ;; | ||
1460 | 650 | e500v[12]-*) | ||
1461 | 651 | basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1462 | 652 | os=$os"spe" | ||
1463 | 653 | ;; | ||
1464 | 654 | ebmon29k) | ||
1465 | 655 | basic_machine=a29k-amd | ||
1466 | 656 | os=-ebmon | ||
1467 | 657 | ;; | ||
1468 | 658 | elxsi) | ||
1469 | 659 | basic_machine=elxsi-elxsi | ||
1470 | 660 | os=-bsd | ||
1474 | 661 | ;; | 709 | ;; |
1475 | 662 | encore | umax | mmax) | 710 | encore | umax | mmax) |
1477 | 663 | basic_machine=ns32k-encore | 711 | cpu=ns32k |
1478 | 712 | vendor=encore | ||
1479 | 664 | ;; | 713 | ;; |
1483 | 665 | es1800 | OSE68k | ose68k | ose | OSE) | 714 | elxsi) |
1484 | 666 | basic_machine=m68k-ericsson | 715 | cpu=elxsi |
1485 | 667 | os=-ose | 716 | vendor=elxsi |
1486 | 717 | os=${os:-bsd} | ||
1487 | 668 | ;; | 718 | ;; |
1488 | 669 | fx2800) | 719 | fx2800) |
1490 | 670 | basic_machine=i860-alliant | 720 | cpu=i860 |
1491 | 721 | vendor=alliant | ||
1492 | 671 | ;; | 722 | ;; |
1493 | 672 | genix) | 723 | genix) |
1503 | 673 | basic_machine=ns32k-ns | 724 | cpu=ns32k |
1504 | 674 | ;; | 725 | vendor=ns |
1496 | 675 | gmicro) | ||
1497 | 676 | basic_machine=tron-gmicro | ||
1498 | 677 | os=-sysv | ||
1499 | 678 | ;; | ||
1500 | 679 | go32) | ||
1501 | 680 | basic_machine=i386-pc | ||
1502 | 681 | os=-go32 | ||
1505 | 682 | ;; | 726 | ;; |
1506 | 683 | h3050r* | hiux*) | 727 | h3050r* | hiux*) |
1536 | 684 | basic_machine=hppa1.1-hitachi | 728 | cpu=hppa1.1 |
1537 | 685 | os=-hiuxwe2 | 729 | vendor=hitachi |
1538 | 686 | ;; | 730 | os=hiuxwe2 |
1510 | 687 | h8300hms) | ||
1511 | 688 | basic_machine=h8300-hitachi | ||
1512 | 689 | os=-hms | ||
1513 | 690 | ;; | ||
1514 | 691 | h8300xray) | ||
1515 | 692 | basic_machine=h8300-hitachi | ||
1516 | 693 | os=-xray | ||
1517 | 694 | ;; | ||
1518 | 695 | h8500hms) | ||
1519 | 696 | basic_machine=h8500-hitachi | ||
1520 | 697 | os=-hms | ||
1521 | 698 | ;; | ||
1522 | 699 | harris) | ||
1523 | 700 | basic_machine=m88k-harris | ||
1524 | 701 | os=-sysv3 | ||
1525 | 702 | ;; | ||
1526 | 703 | hp300-*) | ||
1527 | 704 | basic_machine=m68k-hp | ||
1528 | 705 | ;; | ||
1529 | 706 | hp300bsd) | ||
1530 | 707 | basic_machine=m68k-hp | ||
1531 | 708 | os=-bsd | ||
1532 | 709 | ;; | ||
1533 | 710 | hp300hpux) | ||
1534 | 711 | basic_machine=m68k-hp | ||
1535 | 712 | os=-hpux | ||
1539 | 713 | ;; | 731 | ;; |
1540 | 714 | hp3k9[0-9][0-9] | hp9[0-9][0-9]) | 732 | hp3k9[0-9][0-9] | hp9[0-9][0-9]) |
1542 | 715 | basic_machine=hppa1.0-hp | 733 | cpu=hppa1.0 |
1543 | 734 | vendor=hp | ||
1544 | 716 | ;; | 735 | ;; |
1545 | 717 | hp9k2[0-9][0-9] | hp9k31[0-9]) | 736 | hp9k2[0-9][0-9] | hp9k31[0-9]) |
1547 | 718 | basic_machine=m68000-hp | 737 | cpu=m68000 |
1548 | 738 | vendor=hp | ||
1549 | 719 | ;; | 739 | ;; |
1550 | 720 | hp9k3[2-9][0-9]) | 740 | hp9k3[2-9][0-9]) |
1552 | 721 | basic_machine=m68k-hp | 741 | cpu=m68k |
1553 | 742 | vendor=hp | ||
1554 | 722 | ;; | 743 | ;; |
1555 | 723 | hp9k6[0-9][0-9] | hp6[0-9][0-9]) | 744 | hp9k6[0-9][0-9] | hp6[0-9][0-9]) |
1557 | 724 | basic_machine=hppa1.0-hp | 745 | cpu=hppa1.0 |
1558 | 746 | vendor=hp | ||
1559 | 725 | ;; | 747 | ;; |
1560 | 726 | hp9k7[0-79][0-9] | hp7[0-79][0-9]) | 748 | hp9k7[0-79][0-9] | hp7[0-79][0-9]) |
1562 | 727 | basic_machine=hppa1.1-hp | 749 | cpu=hppa1.1 |
1563 | 750 | vendor=hp | ||
1564 | 728 | ;; | 751 | ;; |
1565 | 729 | hp9k78[0-9] | hp78[0-9]) | 752 | hp9k78[0-9] | hp78[0-9]) |
1566 | 730 | # FIXME: really hppa2.0-hp | 753 | # FIXME: really hppa2.0-hp |
1568 | 731 | basic_machine=hppa1.1-hp | 754 | cpu=hppa1.1 |
1569 | 755 | vendor=hp | ||
1570 | 732 | ;; | 756 | ;; |
1571 | 733 | hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) | 757 | hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) |
1572 | 734 | # FIXME: really hppa2.0-hp | 758 | # FIXME: really hppa2.0-hp |
1574 | 735 | basic_machine=hppa1.1-hp | 759 | cpu=hppa1.1 |
1575 | 760 | vendor=hp | ||
1576 | 736 | ;; | 761 | ;; |
1577 | 737 | hp9k8[0-9][13679] | hp8[0-9][13679]) | 762 | hp9k8[0-9][13679] | hp8[0-9][13679]) |
1579 | 738 | basic_machine=hppa1.1-hp | 763 | cpu=hppa1.1 |
1580 | 764 | vendor=hp | ||
1581 | 739 | ;; | 765 | ;; |
1582 | 740 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) | 766 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) |
1595 | 741 | basic_machine=hppa1.0-hp | 767 | cpu=hppa1.0 |
1596 | 742 | ;; | 768 | vendor=hp |
1585 | 743 | hppaosf) | ||
1586 | 744 | basic_machine=hppa1.1-hp | ||
1587 | 745 | os=-osf | ||
1588 | 746 | ;; | ||
1589 | 747 | hppro) | ||
1590 | 748 | basic_machine=hppa1.1-hp | ||
1591 | 749 | os=-proelf | ||
1592 | 750 | ;; | ||
1593 | 751 | i370-ibm* | ibm*) | ||
1594 | 752 | basic_machine=i370-ibm | ||
1597 | 753 | ;; | 769 | ;; |
1598 | 754 | i*86v32) | 770 | i*86v32) |
1601 | 755 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` | 771 | cpu=`echo "$1" | sed -e 's/86.*/86/'` |
1602 | 756 | os=-sysv32 | 772 | vendor=pc |
1603 | 773 | os=sysv32 | ||
1604 | 757 | ;; | 774 | ;; |
1605 | 758 | i*86v4*) | 775 | i*86v4*) |
1608 | 759 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` | 776 | cpu=`echo "$1" | sed -e 's/86.*/86/'` |
1609 | 760 | os=-sysv4 | 777 | vendor=pc |
1610 | 778 | os=sysv4 | ||
1611 | 761 | ;; | 779 | ;; |
1612 | 762 | i*86v) | 780 | i*86v) |
1615 | 763 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` | 781 | cpu=`echo "$1" | sed -e 's/86.*/86/'` |
1616 | 764 | os=-sysv | 782 | vendor=pc |
1617 | 783 | os=sysv | ||
1618 | 765 | ;; | 784 | ;; |
1619 | 766 | i*86sol2) | 785 | i*86sol2) |
1622 | 767 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` | 786 | cpu=`echo "$1" | sed -e 's/86.*/86/'` |
1623 | 768 | os=-solaris2 | 787 | vendor=pc |
1624 | 788 | os=solaris2 | ||
1625 | 769 | ;; | 789 | ;; |
1633 | 770 | i386mach) | 790 | j90 | j90-cray) |
1634 | 771 | basic_machine=i386-mach | 791 | cpu=j90 |
1635 | 772 | os=-mach | 792 | vendor=cray |
1636 | 773 | ;; | 793 | os=${os:-unicos} |
1630 | 774 | vsta) | ||
1631 | 775 | basic_machine=i386-unknown | ||
1632 | 776 | os=-vsta | ||
1637 | 777 | ;; | 794 | ;; |
1638 | 778 | iris | iris4d) | 795 | iris | iris4d) |
1640 | 779 | basic_machine=mips-sgi | 796 | cpu=mips |
1641 | 797 | vendor=sgi | ||
1642 | 780 | case $os in | 798 | case $os in |
1644 | 781 | -irix*) | 799 | irix*) |
1645 | 782 | ;; | 800 | ;; |
1646 | 783 | *) | 801 | *) |
1648 | 784 | os=-irix4 | 802 | os=irix4 |
1649 | 785 | ;; | 803 | ;; |
1650 | 786 | esac | 804 | esac |
1651 | 787 | ;; | 805 | ;; |
1652 | 788 | isi68 | isi) | ||
1653 | 789 | basic_machine=m68k-isi | ||
1654 | 790 | os=-sysv | ||
1655 | 791 | ;; | ||
1656 | 792 | leon-*|leon[3-9]-*) | ||
1657 | 793 | basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` | ||
1658 | 794 | ;; | ||
1659 | 795 | m68knommu) | ||
1660 | 796 | basic_machine=m68k-unknown | ||
1661 | 797 | os=-linux | ||
1662 | 798 | ;; | ||
1663 | 799 | m68knommu-*) | ||
1664 | 800 | basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1665 | 801 | os=-linux | ||
1666 | 802 | ;; | ||
1667 | 803 | magnum | m3230) | ||
1668 | 804 | basic_machine=mips-mips | ||
1669 | 805 | os=-sysv | ||
1670 | 806 | ;; | ||
1671 | 807 | merlin) | ||
1672 | 808 | basic_machine=ns32k-utek | ||
1673 | 809 | os=-sysv | ||
1674 | 810 | ;; | ||
1675 | 811 | microblaze*) | ||
1676 | 812 | basic_machine=microblaze-xilinx | ||
1677 | 813 | ;; | ||
1678 | 814 | mingw64) | ||
1679 | 815 | basic_machine=x86_64-pc | ||
1680 | 816 | os=-mingw64 | ||
1681 | 817 | ;; | ||
1682 | 818 | mingw32) | ||
1683 | 819 | basic_machine=i686-pc | ||
1684 | 820 | os=-mingw32 | ||
1685 | 821 | ;; | ||
1686 | 822 | mingw32ce) | ||
1687 | 823 | basic_machine=arm-unknown | ||
1688 | 824 | os=-mingw32ce | ||
1689 | 825 | ;; | ||
1690 | 826 | miniframe) | 806 | miniframe) |
1733 | 827 | basic_machine=m68000-convergent | 807 | cpu=m68000 |
1734 | 828 | ;; | 808 | vendor=convergent |
1693 | 829 | *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) | ||
1694 | 830 | basic_machine=m68k-atari | ||
1695 | 831 | os=-mint | ||
1696 | 832 | ;; | ||
1697 | 833 | mips3*-*) | ||
1698 | 834 | basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` | ||
1699 | 835 | ;; | ||
1700 | 836 | mips3*) | ||
1701 | 837 | basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown | ||
1702 | 838 | ;; | ||
1703 | 839 | monitor) | ||
1704 | 840 | basic_machine=m68k-rom68k | ||
1705 | 841 | os=-coff | ||
1706 | 842 | ;; | ||
1707 | 843 | morphos) | ||
1708 | 844 | basic_machine=powerpc-unknown | ||
1709 | 845 | os=-morphos | ||
1710 | 846 | ;; | ||
1711 | 847 | moxiebox) | ||
1712 | 848 | basic_machine=moxie-unknown | ||
1713 | 849 | os=-moxiebox | ||
1714 | 850 | ;; | ||
1715 | 851 | msdos) | ||
1716 | 852 | basic_machine=i386-pc | ||
1717 | 853 | os=-msdos | ||
1718 | 854 | ;; | ||
1719 | 855 | ms1-*) | ||
1720 | 856 | basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` | ||
1721 | 857 | ;; | ||
1722 | 858 | msys) | ||
1723 | 859 | basic_machine=i686-pc | ||
1724 | 860 | os=-msys | ||
1725 | 861 | ;; | ||
1726 | 862 | mvs) | ||
1727 | 863 | basic_machine=i370-ibm | ||
1728 | 864 | os=-mvs | ||
1729 | 865 | ;; | ||
1730 | 866 | nacl) | ||
1731 | 867 | basic_machine=le32-unknown | ||
1732 | 868 | os=-nacl | ||
1735 | 869 | ;; | 809 | ;; |
1755 | 870 | ncr3000) | 810 | *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) |
1756 | 871 | basic_machine=i486-ncr | 811 | cpu=m68k |
1757 | 872 | os=-sysv4 | 812 | vendor=atari |
1758 | 873 | ;; | 813 | os=mint |
1740 | 874 | netbsd386) | ||
1741 | 875 | basic_machine=i386-unknown | ||
1742 | 876 | os=-netbsd | ||
1743 | 877 | ;; | ||
1744 | 878 | netwinder) | ||
1745 | 879 | basic_machine=armv4l-rebel | ||
1746 | 880 | os=-linux | ||
1747 | 881 | ;; | ||
1748 | 882 | news | news700 | news800 | news900) | ||
1749 | 883 | basic_machine=m68k-sony | ||
1750 | 884 | os=-newsos | ||
1751 | 885 | ;; | ||
1752 | 886 | news1000) | ||
1753 | 887 | basic_machine=m68030-sony | ||
1754 | 888 | os=-newsos | ||
1759 | 889 | ;; | 814 | ;; |
1760 | 890 | news-3600 | risc-news) | 815 | news-3600 | risc-news) |
1767 | 891 | basic_machine=mips-sony | 816 | cpu=mips |
1768 | 892 | os=-newsos | 817 | vendor=sony |
1769 | 893 | ;; | 818 | os=newsos |
1764 | 894 | necv70) | ||
1765 | 895 | basic_machine=v70-nec | ||
1766 | 896 | os=-sysv | ||
1770 | 897 | ;; | 819 | ;; |
1771 | 898 | next | m*-next) | 820 | next | m*-next) |
1773 | 899 | basic_machine=m68k-next | 821 | cpu=m68k |
1774 | 822 | vendor=next | ||
1775 | 900 | case $os in | 823 | case $os in |
1777 | 901 | -nextstep* ) | 824 | nextstep* ) |
1778 | 902 | ;; | 825 | ;; |
1781 | 903 | -ns2*) | 826 | ns2*) |
1782 | 904 | os=-nextstep2 | 827 | os=nextstep2 |
1783 | 905 | ;; | 828 | ;; |
1784 | 906 | *) | 829 | *) |
1786 | 907 | os=-nextstep3 | 830 | os=nextstep3 |
1787 | 908 | ;; | 831 | ;; |
1788 | 909 | esac | 832 | esac |
1789 | 910 | ;; | 833 | ;; |
1790 | 911 | nh3000) | ||
1791 | 912 | basic_machine=m68k-harris | ||
1792 | 913 | os=-cxux | ||
1793 | 914 | ;; | ||
1794 | 915 | nh[45]000) | ||
1795 | 916 | basic_machine=m88k-harris | ||
1796 | 917 | os=-cxux | ||
1797 | 918 | ;; | ||
1798 | 919 | nindy960) | ||
1799 | 920 | basic_machine=i960-intel | ||
1800 | 921 | os=-nindy | ||
1801 | 922 | ;; | ||
1802 | 923 | mon960) | ||
1803 | 924 | basic_machine=i960-intel | ||
1804 | 925 | os=-mon960 | ||
1805 | 926 | ;; | ||
1806 | 927 | nonstopux) | ||
1807 | 928 | basic_machine=mips-compaq | ||
1808 | 929 | os=-nonstopux | ||
1809 | 930 | ;; | ||
1810 | 931 | np1) | 834 | np1) |
1827 | 932 | basic_machine=np1-gould | 835 | cpu=np1 |
1828 | 933 | ;; | 836 | vendor=gould |
1813 | 934 | neo-tandem) | ||
1814 | 935 | basic_machine=neo-tandem | ||
1815 | 936 | ;; | ||
1816 | 937 | nse-tandem) | ||
1817 | 938 | basic_machine=nse-tandem | ||
1818 | 939 | ;; | ||
1819 | 940 | nsr-tandem) | ||
1820 | 941 | basic_machine=nsr-tandem | ||
1821 | 942 | ;; | ||
1822 | 943 | nsv-tandem) | ||
1823 | 944 | basic_machine=nsv-tandem | ||
1824 | 945 | ;; | ||
1825 | 946 | nsx-tandem) | ||
1826 | 947 | basic_machine=nsx-tandem | ||
1829 | 948 | ;; | 837 | ;; |
1830 | 949 | op50n-* | op60c-*) | 838 | op50n-* | op60c-*) |
1848 | 950 | basic_machine=hppa1.1-oki | 839 | cpu=hppa1.1 |
1849 | 951 | os=-proelf | 840 | vendor=oki |
1850 | 952 | ;; | 841 | os=proelf |
1834 | 953 | openrisc | openrisc-*) | ||
1835 | 954 | basic_machine=or32-unknown | ||
1836 | 955 | ;; | ||
1837 | 956 | os400) | ||
1838 | 957 | basic_machine=powerpc-ibm | ||
1839 | 958 | os=-os400 | ||
1840 | 959 | ;; | ||
1841 | 960 | OSE68000 | ose68000) | ||
1842 | 961 | basic_machine=m68000-ericsson | ||
1843 | 962 | os=-ose | ||
1844 | 963 | ;; | ||
1845 | 964 | os68k) | ||
1846 | 965 | basic_machine=m68k-none | ||
1847 | 966 | os=-os68k | ||
1851 | 967 | ;; | 842 | ;; |
1852 | 968 | pa-hitachi) | 843 | pa-hitachi) |
1867 | 969 | basic_machine=hppa1.1-hitachi | 844 | cpu=hppa1.1 |
1868 | 970 | os=-hiuxwe2 | 845 | vendor=hitachi |
1869 | 971 | ;; | 846 | os=hiuxwe2 |
1856 | 972 | paragon) | ||
1857 | 973 | basic_machine=i860-intel | ||
1858 | 974 | os=-osf | ||
1859 | 975 | ;; | ||
1860 | 976 | parisc) | ||
1861 | 977 | basic_machine=hppa-unknown | ||
1862 | 978 | os=-linux | ||
1863 | 979 | ;; | ||
1864 | 980 | parisc-*) | ||
1865 | 981 | basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1866 | 982 | os=-linux | ||
1870 | 983 | ;; | 847 | ;; |
1871 | 984 | pbd) | 848 | pbd) |
1873 | 985 | basic_machine=sparc-tti | 849 | cpu=sparc |
1874 | 850 | vendor=tti | ||
1875 | 986 | ;; | 851 | ;; |
1876 | 987 | pbb) | 852 | pbb) |
1905 | 988 | basic_machine=m68k-tti | 853 | cpu=m68k |
1906 | 989 | ;; | 854 | vendor=tti |
1879 | 990 | pc532 | pc532-*) | ||
1880 | 991 | basic_machine=ns32k-pc532 | ||
1881 | 992 | ;; | ||
1882 | 993 | pc98) | ||
1883 | 994 | basic_machine=i386-pc | ||
1884 | 995 | ;; | ||
1885 | 996 | pc98-*) | ||
1886 | 997 | basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1887 | 998 | ;; | ||
1888 | 999 | pentium | p5 | k5 | k6 | nexgen | viac3) | ||
1889 | 1000 | basic_machine=i586-pc | ||
1890 | 1001 | ;; | ||
1891 | 1002 | pentiumpro | p6 | 6x86 | athlon | athlon_*) | ||
1892 | 1003 | basic_machine=i686-pc | ||
1893 | 1004 | ;; | ||
1894 | 1005 | pentiumii | pentium2 | pentiumiii | pentium3) | ||
1895 | 1006 | basic_machine=i686-pc | ||
1896 | 1007 | ;; | ||
1897 | 1008 | pentium4) | ||
1898 | 1009 | basic_machine=i786-pc | ||
1899 | 1010 | ;; | ||
1900 | 1011 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) | ||
1901 | 1012 | basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1902 | 1013 | ;; | ||
1903 | 1014 | pentiumpro-* | p6-* | 6x86-* | athlon-*) | ||
1904 | 1015 | basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1907 | 1016 | ;; | 855 | ;; |
1913 | 1017 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) | 856 | pc532) |
1914 | 1018 | basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` | 857 | cpu=ns32k |
1915 | 1019 | ;; | 858 | vendor=pc532 |
1911 | 1020 | pentium4-*) | ||
1912 | 1021 | basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1916 | 1022 | ;; | 859 | ;; |
1917 | 1023 | pn) | 860 | pn) |
1926 | 1024 | basic_machine=pn-gould | 861 | cpu=pn |
1927 | 1025 | ;; | 862 | vendor=gould |
1920 | 1026 | power) basic_machine=power-ibm | ||
1921 | 1027 | ;; | ||
1922 | 1028 | ppc | ppcbe) basic_machine=powerpc-unknown | ||
1923 | 1029 | ;; | ||
1924 | 1030 | ppc-* | ppcbe-*) | ||
1925 | 1031 | basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` | ||
1928 | 1032 | ;; | 863 | ;; |
1931 | 1033 | ppcle | powerpclittle) | 864 | power) |
1932 | 1034 | basic_machine=powerpcle-unknown | 865 | cpu=power |
1933 | 866 | vendor=ibm | ||
1934 | 1035 | ;; | 867 | ;; |
1939 | 1036 | ppcle-* | powerpclittle-*) | 868 | ps2) |
1940 | 1037 | basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` | 869 | cpu=i386 |
1941 | 1038 | ;; | 870 | vendor=ibm |
1938 | 1039 | ppc64) basic_machine=powerpc64-unknown | ||
1942 | 1040 | ;; | 871 | ;; |
1944 | 1041 | ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` | 872 | rm[46]00) |
1945 | 873 | cpu=mips | ||
1946 | 874 | vendor=siemens | ||
1947 | 1042 | ;; | 875 | ;; |
1950 | 1043 | ppc64le | powerpc64little) | 876 | rtpc | rtpc-*) |
1951 | 1044 | basic_machine=powerpc64le-unknown | 877 | cpu=romp |
1952 | 878 | vendor=ibm | ||
1953 | 1045 | ;; | 879 | ;; |
1956 | 1046 | ppc64le-* | powerpc64little-*) | 880 | sde) |
1957 | 1047 | basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` | 881 | cpu=mipsisa32 |
1958 | 882 | vendor=sde | ||
1959 | 883 | os=${os:-elf} | ||
1960 | 1048 | ;; | 884 | ;; |
1963 | 1049 | ps2) | 885 | simso-wrs) |
1964 | 1050 | basic_machine=i386-ibm | 886 | cpu=sparclite |
1965 | 887 | vendor=wrs | ||
1966 | 888 | os=vxworks | ||
1967 | 1051 | ;; | 889 | ;; |
1971 | 1052 | pw32) | 890 | tower | tower-32) |
1972 | 1053 | basic_machine=i586-unknown | 891 | cpu=m68k |
1973 | 1054 | os=-pw32 | 892 | vendor=ncr |
1974 | 1055 | ;; | 893 | ;; |
1978 | 1056 | rdos | rdos64) | 894 | vpp*|vx|vx-*) |
1979 | 1057 | basic_machine=x86_64-pc | 895 | cpu=f301 |
1980 | 1058 | os=-rdos | 896 | vendor=fujitsu |
1981 | 1059 | ;; | 897 | ;; |
1985 | 1060 | rdos32) | 898 | w65) |
1986 | 1061 | basic_machine=i386-pc | 899 | cpu=w65 |
1987 | 1062 | os=-rdos | 900 | vendor=wdc |
1988 | 1063 | ;; | 901 | ;; |
1992 | 1064 | rom68k) | 902 | w89k-*) |
1993 | 1065 | basic_machine=m68k-rom68k | 903 | cpu=hppa1.1 |
1994 | 1066 | os=-coff | 904 | vendor=winbond |
1995 | 905 | os=proelf | ||
1996 | 1067 | ;; | 906 | ;; |
1999 | 1068 | rm[46]00) | 907 | none) |
2000 | 1069 | basic_machine=mips-siemens | 908 | cpu=none |
2001 | 909 | vendor=none | ||
2002 | 1070 | ;; | 910 | ;; |
2005 | 1071 | rtpc | rtpc-*) | 911 | leon|leon[3-9]) |
2006 | 1072 | basic_machine=romp-ibm | 912 | cpu=sparc |
2007 | 913 | vendor=$basic_machine | ||
2008 | 1073 | ;; | 914 | ;; |
2011 | 1074 | s390 | s390-*) | 915 | leon-*|leon[3-9]-*) |
2012 | 1075 | basic_machine=s390-ibm | 916 | cpu=sparc |
2013 | 917 | vendor=`echo "$basic_machine" | sed 's/-.*//'` | ||
2014 | 1076 | ;; | 918 | ;; |
2017 | 1077 | s390x | s390x-*) | 919 | |
2018 | 1078 | basic_machine=s390x-ibm | 920 | *-*) |
2019 | 921 | IFS="-" read -r cpu vendor <<EOF | ||
2020 | 922 | $basic_machine | ||
2021 | 923 | EOF | ||
2022 | 1079 | ;; | 924 | ;; |
2026 | 1080 | sa29200) | 925 | # We use `pc' rather than `unknown' |
2027 | 1081 | basic_machine=a29k-amd | 926 | # because (1) that's what they normally are, and |
2028 | 1082 | os=-udi | 927 | # (2) the word "unknown" tends to confuse beginning users. |
2029 | 928 | i*86 | x86_64) | ||
2030 | 929 | cpu=$basic_machine | ||
2031 | 930 | vendor=pc | ||
2032 | 1083 | ;; | 931 | ;; |
2035 | 1084 | sb1) | 932 | # These rules are duplicated from below for sake of the special case above; |
2036 | 1085 | basic_machine=mipsisa64sb1-unknown | 933 | # i.e. things that normalized to x86 arches should also default to "pc" |
2037 | 934 | pc98) | ||
2038 | 935 | cpu=i386 | ||
2039 | 936 | vendor=pc | ||
2040 | 1086 | ;; | 937 | ;; |
2043 | 1087 | sb1el) | 938 | x64 | amd64) |
2044 | 1088 | basic_machine=mipsisa64sb1el-unknown | 939 | cpu=x86_64 |
2045 | 940 | vendor=pc | ||
2046 | 1089 | ;; | 941 | ;; |
2050 | 1090 | sde) | 942 | # Recognize the basic CPU types without company name. |
2051 | 1091 | basic_machine=mipsisa32-sde | 943 | *) |
2052 | 1092 | os=-elf | 944 | cpu=$basic_machine |
2053 | 945 | vendor=unknown | ||
2054 | 1093 | ;; | 946 | ;; |
2058 | 1094 | sei) | 947 | esac |
2059 | 1095 | basic_machine=mips-sei | 948 | |
2060 | 1096 | os=-seiux | 949 | unset -v basic_machine |
2061 | 950 | |||
2062 | 951 | # Decode basic machines in the full and proper CPU-Company form. | ||
2063 | 952 | case $cpu-$vendor in | ||
2064 | 953 | # Here we handle the default manufacturer of certain CPU types in cannonical form. It is in | ||
2065 | 954 | # some cases the only manufacturer, in others, it is the most popular. | ||
2066 | 955 | craynv-unknown) | ||
2067 | 956 | vendor=cray | ||
2068 | 957 | os=${os:-unicosmp} | ||
2069 | 1097 | ;; | 958 | ;; |
2072 | 1098 | sequent) | 959 | c90-unknown | c90-cray) |
2073 | 1099 | basic_machine=i386-sequent | 960 | vendor=cray |
2074 | 961 | os=${os:-unicos} | ||
2075 | 1100 | ;; | 962 | ;; |
2078 | 1101 | sh5el) | 963 | fx80-unknown) |
2079 | 1102 | basic_machine=sh5le-unknown | 964 | vendor=alliant |
2080 | 1103 | ;; | 965 | ;; |
2084 | 1104 | simso-wrs) | 966 | romp-unknown) |
2085 | 1105 | basic_machine=sparclite-wrs | 967 | vendor=ibm |
2083 | 1106 | os=-vxworks | ||
2086 | 1107 | ;; | 968 | ;; |
2090 | 1108 | sps7) | 969 | mmix-unknown) |
2091 | 1109 | basic_machine=m68k-bull | 970 | vendor=knuth |
2089 | 1110 | os=-sysv2 | ||
2092 | 1111 | ;; | 971 | ;; |
2095 | 1112 | spur) | 972 | microblaze-unknown | microblazeel-unknown) |
2096 | 1113 | basic_machine=spur-unknown | 973 | vendor=xilinx |
2097 | 1114 | ;; | 974 | ;; |
2100 | 1115 | st2000) | 975 | rs6000-unknown) |
2101 | 1116 | basic_machine=m68k-tandem | 976 | vendor=ibm |
2102 | 1117 | ;; | 977 | ;; |
2106 | 1118 | stratus) | 978 | vax-unknown) |
2107 | 1119 | basic_machine=i860-stratus | 979 | vendor=dec |
2105 | 1120 | os=-sysv4 | ||
2108 | 1121 | ;; | 980 | ;; |
2111 | 1122 | strongarm-* | thumb-*) | 981 | pdp11-unknown) |
2112 | 1123 | basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` | 982 | vendor=dec |
2113 | 1124 | ;; | 983 | ;; |
2116 | 1125 | sun2) | 984 | we32k-unknown) |
2117 | 1126 | basic_machine=m68000-sun | 985 | vendor=att |
2118 | 1127 | ;; | 986 | ;; |
2122 | 1128 | sun2os3) | 987 | cydra-unknown) |
2123 | 1129 | basic_machine=m68000-sun | 988 | vendor=cydrome |
2121 | 1130 | os=-sunos3 | ||
2124 | 1131 | ;; | 989 | ;; |
2128 | 1132 | sun2os4) | 990 | i370-ibm*) |
2129 | 1133 | basic_machine=m68000-sun | 991 | vendor=ibm |
2127 | 1134 | os=-sunos4 | ||
2130 | 1135 | ;; | 992 | ;; |
2134 | 1136 | sun3os3) | 993 | orion-unknown) |
2135 | 1137 | basic_machine=m68k-sun | 994 | vendor=highlevel |
2133 | 1138 | os=-sunos3 | ||
2136 | 1139 | ;; | 995 | ;; |
2140 | 1140 | sun3os4) | 996 | xps-unknown | xps100-unknown) |
2141 | 1141 | basic_machine=m68k-sun | 997 | cpu=xps100 |
2142 | 1142 | os=-sunos4 | 998 | vendor=honeywell |
2143 | 1143 | ;; | 999 | ;; |
2147 | 1144 | sun4os3) | 1000 | |
2148 | 1145 | basic_machine=sparc-sun | 1001 | # Here we normalize CPU types with a missing or matching vendor |
2149 | 1146 | os=-sunos3 | 1002 | dpx20-unknown | dpx20-bull) |
2150 | 1003 | cpu=rs6000 | ||
2151 | 1004 | vendor=bull | ||
2152 | 1005 | os=${os:-bosx} | ||
2153 | 1147 | ;; | 1006 | ;; |
2157 | 1148 | sun4os4) | 1007 | |
2158 | 1149 | basic_machine=sparc-sun | 1008 | # Here we normalize CPU types irrespective of the vendor |
2159 | 1150 | os=-sunos4 | 1009 | amd64-*) |
2160 | 1010 | cpu=x86_64 | ||
2161 | 1151 | ;; | 1011 | ;; |
2165 | 1152 | sun4sol2) | 1012 | blackfin-*) |
2166 | 1153 | basic_machine=sparc-sun | 1013 | cpu=bfin |
2167 | 1154 | os=-solaris2 | 1014 | os=linux |
2168 | 1155 | ;; | 1015 | ;; |
2171 | 1156 | sun3 | sun3-*) | 1016 | c54x-*) |
2172 | 1157 | basic_machine=m68k-sun | 1017 | cpu=tic54x |
2173 | 1158 | ;; | 1018 | ;; |
2176 | 1159 | sun4) | 1019 | c55x-*) |
2177 | 1160 | basic_machine=sparc-sun | 1020 | cpu=tic55x |
2178 | 1161 | ;; | 1021 | ;; |
2181 | 1162 | sun386 | sun386i | roadrunner) | 1022 | c6x-*) |
2182 | 1163 | basic_machine=i386-sun | 1023 | cpu=tic6x |
2183 | 1164 | ;; | 1024 | ;; |
2187 | 1165 | sv1) | 1025 | e500v[12]-*) |
2188 | 1166 | basic_machine=sv1-cray | 1026 | cpu=powerpc |
2189 | 1167 | os=-unicos | 1027 | os=$os"spe" |
2190 | 1168 | ;; | 1028 | ;; |
2194 | 1169 | symmetry) | 1029 | mips3*-*) |
2195 | 1170 | basic_machine=i386-sequent | 1030 | cpu=mips64 |
2193 | 1171 | os=-dynix | ||
2196 | 1172 | ;; | 1031 | ;; |
2200 | 1173 | t3e) | 1032 | ms1-*) |
2201 | 1174 | basic_machine=alphaev5-cray | 1033 | cpu=mt |
2199 | 1175 | os=-unicos | ||
2202 | 1176 | ;; | 1034 | ;; |
2206 | 1177 | t90) | 1035 | m68knommu-*) |
2207 | 1178 | basic_machine=t90-cray | 1036 | cpu=m68k |
2208 | 1179 | os=-unicos | 1037 | os=linux |
2209 | 1180 | ;; | 1038 | ;; |
2213 | 1181 | tile*) | 1039 | m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) |
2214 | 1182 | basic_machine=$basic_machine-unknown | 1040 | cpu=s12z |
2212 | 1183 | os=-linux-gnu | ||
2215 | 1184 | ;; | 1041 | ;; |
2218 | 1185 | tx39) | 1042 | openrisc-*) |
2219 | 1186 | basic_machine=mipstx39-unknown | 1043 | cpu=or32 |
2220 | 1187 | ;; | 1044 | ;; |
2223 | 1188 | tx39el) | 1045 | parisc-*) |
2224 | 1189 | basic_machine=mipstx39el-unknown | 1046 | cpu=hppa |
2225 | 1047 | os=linux | ||
2226 | 1190 | ;; | 1048 | ;; |
2230 | 1191 | toad1) | 1049 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) |
2231 | 1192 | basic_machine=pdp10-xkl | 1050 | cpu=i586 |
2229 | 1193 | os=-tops20 | ||
2232 | 1194 | ;; | 1051 | ;; |
2235 | 1195 | tower | tower-32) | 1052 | pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) |
2236 | 1196 | basic_machine=m68k-ncr | 1053 | cpu=i686 |
2237 | 1197 | ;; | 1054 | ;; |
2241 | 1198 | tpf) | 1055 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) |
2242 | 1199 | basic_machine=s390x-ibm | 1056 | cpu=i686 |
2240 | 1200 | os=-tpf | ||
2243 | 1201 | ;; | 1057 | ;; |
2247 | 1202 | udi29k) | 1058 | pentium4-*) |
2248 | 1203 | basic_machine=a29k-amd | 1059 | cpu=i786 |
2246 | 1204 | os=-udi | ||
2249 | 1205 | ;; | 1060 | ;; |
2253 | 1206 | ultra3) | 1061 | pc98-*) |
2254 | 1207 | basic_machine=a29k-nyu | 1062 | cpu=i386 |
2252 | 1208 | os=-sym1 | ||
2255 | 1209 | ;; | 1063 | ;; |
2259 | 1210 | v810 | necv810) | 1064 | ppc-* | ppcbe-*) |
2260 | 1211 | basic_machine=v810-nec | 1065 | cpu=powerpc |
2258 | 1212 | os=-none | ||
2261 | 1213 | ;; | 1066 | ;; |
2265 | 1214 | vaxv) | 1067 | ppcle-* | powerpclittle-*) |
2266 | 1215 | basic_machine=vax-dec | 1068 | cpu=powerpcle |
2264 | 1216 | os=-sysv | ||
2267 | 1217 | ;; | 1069 | ;; |
2271 | 1218 | vms) | 1070 | ppc64-*) |
2272 | 1219 | basic_machine=vax-dec | 1071 | cpu=powerpc64 |
2270 | 1220 | os=-vms | ||
2273 | 1221 | ;; | 1072 | ;; |
2276 | 1222 | vpp*|vx|vx-*) | 1073 | ppc64le-* | powerpc64little-*) |
2277 | 1223 | basic_machine=f301-fujitsu | 1074 | cpu=powerpc64le |
2278 | 1224 | ;; | 1075 | ;; |
2282 | 1225 | vxworks960) | 1076 | sb1-*) |
2283 | 1226 | basic_machine=i960-wrs | 1077 | cpu=mipsisa64sb1 |
2281 | 1227 | os=-vxworks | ||
2284 | 1228 | ;; | 1078 | ;; |
2288 | 1229 | vxworks68) | 1079 | sb1el-*) |
2289 | 1230 | basic_machine=m68k-wrs | 1080 | cpu=mipsisa64sb1el |
2287 | 1231 | os=-vxworks | ||
2290 | 1232 | ;; | 1081 | ;; |
2294 | 1233 | vxworks29k) | 1082 | sh5e[lb]-*) |
2295 | 1234 | basic_machine=a29k-wrs | 1083 | cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` |
2293 | 1235 | os=-vxworks | ||
2296 | 1236 | ;; | 1084 | ;; |
2300 | 1237 | w65*) | 1085 | spur-*) |
2301 | 1238 | basic_machine=w65-wdc | 1086 | cpu=spur |
2299 | 1239 | os=-none | ||
2302 | 1240 | ;; | 1087 | ;; |
2306 | 1241 | w89k-*) | 1088 | strongarm-* | thumb-*) |
2307 | 1242 | basic_machine=hppa1.1-winbond | 1089 | cpu=arm |
2305 | 1243 | os=-proelf | ||
2308 | 1244 | ;; | 1090 | ;; |
2311 | 1245 | x64) | 1091 | tx39-*) |
2312 | 1246 | basic_machine=x86_64-pc | 1092 | cpu=mipstx39 |
2313 | 1247 | ;; | 1093 | ;; |
2317 | 1248 | xbox) | 1094 | tx39el-*) |
2318 | 1249 | basic_machine=i686-pc | 1095 | cpu=mipstx39el |
2316 | 1250 | os=-mingw32 | ||
2319 | 1251 | ;; | 1096 | ;; |
2322 | 1252 | xps | xps100) | 1097 | x64-*) |
2323 | 1253 | basic_machine=xps100-honeywell | 1098 | cpu=x86_64 |
2324 | 1254 | ;; | 1099 | ;; |
2325 | 1255 | xscale-* | xscalee[bl]-*) | 1100 | xscale-* | xscalee[bl]-*) |
2335 | 1256 | basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` | 1101 | cpu=`echo "$cpu" | sed 's/^xscale/arm/'` |
2327 | 1257 | ;; | ||
2328 | 1258 | ymp) | ||
2329 | 1259 | basic_machine=ymp-cray | ||
2330 | 1260 | os=-unicos | ||
2331 | 1261 | ;; | ||
2332 | 1262 | none) | ||
2333 | 1263 | basic_machine=none-none | ||
2334 | 1264 | os=-none | ||
2336 | 1265 | ;; | 1102 | ;; |
2337 | 1266 | 1103 | ||
2342 | 1267 | # Here we handle the default manufacturer of certain CPU types. It is in | 1104 | # Recognize the cannonical CPU Types that limit and/or modify the |
2343 | 1268 | # some cases the only manufacturer, in others, it is the most popular. | 1105 | # company names they are paired with. |
2344 | 1269 | w89k) | 1106 | cr16-*) |
2345 | 1270 | basic_machine=hppa1.1-winbond | 1107 | os=${os:-elf} |
2346 | 1271 | ;; | 1108 | ;; |
2355 | 1272 | op50n) | 1109 | crisv32-* | etraxfs*-*) |
2356 | 1273 | basic_machine=hppa1.1-oki | 1110 | cpu=crisv32 |
2357 | 1274 | ;; | 1111 | vendor=axis |
2350 | 1275 | op60c) | ||
2351 | 1276 | basic_machine=hppa1.1-oki | ||
2352 | 1277 | ;; | ||
2353 | 1278 | romp) | ||
2354 | 1279 | basic_machine=romp-ibm | ||
2358 | 1280 | ;; | 1112 | ;; |
2361 | 1281 | mmix) | 1113 | cris-* | etrax*-*) |
2362 | 1282 | basic_machine=mmix-knuth | 1114 | cpu=cris |
2363 | 1115 | vendor=axis | ||
2364 | 1283 | ;; | 1116 | ;; |
2367 | 1284 | rs6000) | 1117 | crx-*) |
2368 | 1285 | basic_machine=rs6000-ibm | 1118 | os=${os:-elf} |
2369 | 1286 | ;; | 1119 | ;; |
2378 | 1287 | vax) | 1120 | neo-tandem) |
2379 | 1288 | basic_machine=vax-dec | 1121 | cpu=neo |
2380 | 1289 | ;; | 1122 | vendor=tandem |
2373 | 1290 | pdp11) | ||
2374 | 1291 | basic_machine=pdp11-dec | ||
2375 | 1292 | ;; | ||
2376 | 1293 | we32k) | ||
2377 | 1294 | basic_machine=we32k-att | ||
2381 | 1295 | ;; | 1123 | ;; |
2384 | 1296 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) | 1124 | nse-tandem) |
2385 | 1297 | basic_machine=sh-unknown | 1125 | cpu=nse |
2386 | 1126 | vendor=tandem | ||
2387 | 1298 | ;; | 1127 | ;; |
2390 | 1299 | cydra) | 1128 | nsr-tandem) |
2391 | 1300 | basic_machine=cydra-cydrome | 1129 | cpu=nsr |
2392 | 1130 | vendor=tandem | ||
2393 | 1301 | ;; | 1131 | ;; |
2396 | 1302 | orion) | 1132 | nsv-tandem) |
2397 | 1303 | basic_machine=orion-highlevel | 1133 | cpu=nsv |
2398 | 1134 | vendor=tandem | ||
2399 | 1304 | ;; | 1135 | ;; |
2402 | 1305 | orion105) | 1136 | nsx-tandem) |
2403 | 1306 | basic_machine=clipper-highlevel | 1137 | cpu=nsx |
2404 | 1138 | vendor=tandem | ||
2405 | 1307 | ;; | 1139 | ;; |
2408 | 1308 | mac | mpw | mac-mpw) | 1140 | s390-*) |
2409 | 1309 | basic_machine=m68k-apple | 1141 | cpu=s390 |
2410 | 1142 | vendor=ibm | ||
2411 | 1310 | ;; | 1143 | ;; |
2414 | 1311 | pmac | pmac-mpw) | 1144 | s390x-*) |
2415 | 1312 | basic_machine=powerpc-apple | 1145 | cpu=s390x |
2416 | 1146 | vendor=ibm | ||
2417 | 1313 | ;; | 1147 | ;; |
2420 | 1314 | *-unknown) | 1148 | tile*-*) |
2421 | 1315 | # Make sure to match an already-canonicalized machine name. | 1149 | os=${os:-linux-gnu} |
2422 | 1316 | ;; | 1150 | ;; |
2423 | 1151 | |||
2424 | 1317 | *) | 1152 | *) |
2427 | 1318 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 | 1153 | # Recognize the cannonical CPU types that are allowed with any |
2428 | 1319 | exit 1 | 1154 | # company name. |
2429 | 1155 | case $cpu in | ||
2430 | 1156 | 1750a | 580 \ | ||
2431 | 1157 | | a29k \ | ||
2432 | 1158 | | aarch64 | aarch64_be \ | ||
2433 | 1159 | | abacus \ | ||
2434 | 1160 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ | ||
2435 | 1161 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ | ||
2436 | 1162 | | alphapca5[67] | alpha64pca5[67] \ | ||
2437 | 1163 | | am33_2.0 \ | ||
2438 | 1164 | | arc | arceb \ | ||
2439 | 1165 | | arm | arm[lb]e | arme[lb] | armv* \ | ||
2440 | 1166 | | avr | avr32 \ | ||
2441 | 1167 | | asmjs \ | ||
2442 | 1168 | | ba \ | ||
2443 | 1169 | | be32 | be64 \ | ||
2444 | 1170 | | bfin | bs2000 \ | ||
2445 | 1171 | | c[123]* | c30 | [cjt]90 | c4x \ | ||
2446 | 1172 | | c8051 | clipper | craynv | csky | cydra \ | ||
2447 | 1173 | | d10v | d30v | dlx | dsp16xx \ | ||
2448 | 1174 | | e2k | elxsi | epiphany \ | ||
2449 | 1175 | | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ | ||
2450 | 1176 | | h8300 | h8500 \ | ||
2451 | 1177 | | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | ||
2452 | 1178 | | hexagon \ | ||
2453 | 1179 | | i370 | i*86 | i860 | i960 | ia16 | ia64 \ | ||
2454 | 1180 | | ip2k | iq2000 \ | ||
2455 | 1181 | | k1om \ | ||
2456 | 1182 | | le32 | le64 \ | ||
2457 | 1183 | | lm32 \ | ||
2458 | 1184 | | m32c | m32r | m32rle \ | ||
2459 | 1185 | | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \ | ||
2460 | 1186 | | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \ | ||
2461 | 1187 | | m88110 | m88k | maxq | mb | mcore | mep | metag \ | ||
2462 | 1188 | | microblaze | microblazeel \ | ||
2463 | 1189 | | mips | mipsbe | mipseb | mipsel | mipsle \ | ||
2464 | 1190 | | mips16 \ | ||
2465 | 1191 | | mips64 | mips64el \ | ||
2466 | 1192 | | mips64octeon | mips64octeonel \ | ||
2467 | 1193 | | mips64orion | mips64orionel \ | ||
2468 | 1194 | | mips64r5900 | mips64r5900el \ | ||
2469 | 1195 | | mips64vr | mips64vrel \ | ||
2470 | 1196 | | mips64vr4100 | mips64vr4100el \ | ||
2471 | 1197 | | mips64vr4300 | mips64vr4300el \ | ||
2472 | 1198 | | mips64vr5000 | mips64vr5000el \ | ||
2473 | 1199 | | mips64vr5900 | mips64vr5900el \ | ||
2474 | 1200 | | mipsisa32 | mipsisa32el \ | ||
2475 | 1201 | | mipsisa32r2 | mipsisa32r2el \ | ||
2476 | 1202 | | mipsisa32r6 | mipsisa32r6el \ | ||
2477 | 1203 | | mipsisa64 | mipsisa64el \ | ||
2478 | 1204 | | mipsisa64r2 | mipsisa64r2el \ | ||
2479 | 1205 | | mipsisa64r6 | mipsisa64r6el \ | ||
2480 | 1206 | | mipsisa64sb1 | mipsisa64sb1el \ | ||
2481 | 1207 | | mipsisa64sr71k | mipsisa64sr71kel \ | ||
2482 | 1208 | | mipsr5900 | mipsr5900el \ | ||
2483 | 1209 | | mipstx39 | mipstx39el \ | ||
2484 | 1210 | | mmix \ | ||
2485 | 1211 | | mn10200 | mn10300 \ | ||
2486 | 1212 | | moxie \ | ||
2487 | 1213 | | mt \ | ||
2488 | 1214 | | msp430 \ | ||
2489 | 1215 | | nds32 | nds32le | nds32be \ | ||
2490 | 1216 | | nfp \ | ||
2491 | 1217 | | nios | nios2 | nios2eb | nios2el \ | ||
2492 | 1218 | | none | np1 | ns16k | ns32k \ | ||
2493 | 1219 | | open8 \ | ||
2494 | 1220 | | or1k* \ | ||
2495 | 1221 | | or32 \ | ||
2496 | 1222 | | orion \ | ||
2497 | 1223 | | pdp10 | pdp11 | pj | pjl | pn | power \ | ||
2498 | 1224 | | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ | ||
2499 | 1225 | | pru \ | ||
2500 | 1226 | | pyramid \ | ||
2501 | 1227 | | riscv | riscv32 | riscv64 \ | ||
2502 | 1228 | | rl78 | romp | rs6000 | rx \ | ||
2503 | 1229 | | score \ | ||
2504 | 1230 | | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ | ||
2505 | 1231 | | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ | ||
2506 | 1232 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ | ||
2507 | 1233 | | sparclite \ | ||
2508 | 1234 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ | ||
2509 | 1235 | | spu \ | ||
2510 | 1236 | | tahoe \ | ||
2511 | 1237 | | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ | ||
2512 | 1238 | | tron \ | ||
2513 | 1239 | | ubicom32 \ | ||
2514 | 1240 | | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ | ||
2515 | 1241 | | vax \ | ||
2516 | 1242 | | visium \ | ||
2517 | 1243 | | wasm32 \ | ||
2518 | 1244 | | we32k \ | ||
2519 | 1245 | | x86 | x86_64 | xc16x | xgate | xps100 \ | ||
2520 | 1246 | | xstormy16 | xtensa* \ | ||
2521 | 1247 | | ymp \ | ||
2522 | 1248 | | z8k | z80) | ||
2523 | 1249 | ;; | ||
2524 | 1250 | |||
2525 | 1251 | *) | ||
2526 | 1252 | echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 | ||
2527 | 1253 | exit 1 | ||
2528 | 1254 | ;; | ||
2529 | 1255 | esac | ||
2530 | 1320 | ;; | 1256 | ;; |
2531 | 1321 | esac | 1257 | esac |
2532 | 1322 | 1258 | ||
2533 | 1323 | # Here we canonicalize certain aliases for manufacturers. | 1259 | # Here we canonicalize certain aliases for manufacturers. |
2537 | 1324 | case $basic_machine in | 1260 | case $vendor in |
2538 | 1325 | *-digital*) | 1261 | digital*) |
2539 | 1326 | basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` | 1262 | vendor=dec |
2540 | 1327 | ;; | 1263 | ;; |
2543 | 1328 | *-commodore*) | 1264 | commodore*) |
2544 | 1329 | basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` | 1265 | vendor=cbm |
2545 | 1330 | ;; | 1266 | ;; |
2546 | 1331 | *) | 1267 | *) |
2547 | 1332 | ;; | 1268 | ;; |
2548 | @@ -1334,199 +1270,245 @@ esac | |||
2549 | 1334 | 1270 | ||
2550 | 1335 | # Decode manufacturer-specific aliases for certain operating systems. | 1271 | # Decode manufacturer-specific aliases for certain operating systems. |
2551 | 1336 | 1272 | ||
2553 | 1337 | if [ x"$os" != x"" ] | 1273 | if [ x$os != x ] |
2554 | 1338 | then | 1274 | then |
2555 | 1339 | case $os in | 1275 | case $os in |
2556 | 1340 | # First match some system type aliases that might get confused | 1276 | # First match some system type aliases that might get confused |
2557 | 1341 | # with valid system types. | 1277 | # with valid system types. |
2561 | 1342 | # -solaris* is a basic system type, with this one exception. | 1278 | # solaris* is a basic system type, with this one exception. |
2562 | 1343 | -auroraux) | 1279 | auroraux) |
2563 | 1344 | os=-auroraux | 1280 | os=auroraux |
2564 | 1345 | ;; | 1281 | ;; |
2566 | 1346 | -solaris1 | -solaris1.*) | 1282 | bluegene*) |
2567 | 1283 | os=cnk | ||
2568 | 1284 | ;; | ||
2569 | 1285 | solaris1 | solaris1.*) | ||
2570 | 1347 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1286 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
2571 | 1348 | ;; | 1287 | ;; |
2574 | 1349 | -solaris) | 1288 | solaris) |
2575 | 1350 | os=-solaris2 | 1289 | os=solaris2 |
2576 | 1351 | ;; | 1290 | ;; |
2579 | 1352 | -unixware*) | 1291 | unixware*) |
2580 | 1353 | os=-sysv4.2uw | 1292 | os=sysv4.2uw |
2581 | 1354 | ;; | 1293 | ;; |
2583 | 1355 | -gnu/linux*) | 1294 | gnu/linux*) |
2584 | 1356 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` | 1295 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` |
2585 | 1357 | ;; | 1296 | ;; |
2586 | 1358 | # es1800 is here to avoid being matched by es* (a different OS) | 1297 | # es1800 is here to avoid being matched by es* (a different OS) |
2589 | 1359 | -es1800*) | 1298 | es1800*) |
2590 | 1360 | os=-ose | 1299 | os=ose |
2591 | 1300 | ;; | ||
2592 | 1301 | # Some version numbers need modification | ||
2593 | 1302 | chorusos*) | ||
2594 | 1303 | os=chorusos | ||
2595 | 1304 | ;; | ||
2596 | 1305 | isc) | ||
2597 | 1306 | os=isc2.2 | ||
2598 | 1307 | ;; | ||
2599 | 1308 | sco6) | ||
2600 | 1309 | os=sco5v6 | ||
2601 | 1310 | ;; | ||
2602 | 1311 | sco5) | ||
2603 | 1312 | os=sco3.2v5 | ||
2604 | 1313 | ;; | ||
2605 | 1314 | sco4) | ||
2606 | 1315 | os=sco3.2v4 | ||
2607 | 1316 | ;; | ||
2608 | 1317 | sco3.2.[4-9]*) | ||
2609 | 1318 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` | ||
2610 | 1319 | ;; | ||
2611 | 1320 | sco3.2v[4-9]* | sco5v6*) | ||
2612 | 1321 | # Don't forget version if it is 3.2v4 or newer. | ||
2613 | 1322 | ;; | ||
2614 | 1323 | scout) | ||
2615 | 1324 | # Don't match below | ||
2616 | 1325 | ;; | ||
2617 | 1326 | sco*) | ||
2618 | 1327 | os=sco3.2v2 | ||
2619 | 1328 | ;; | ||
2620 | 1329 | psos*) | ||
2621 | 1330 | os=psos | ||
2622 | 1361 | ;; | 1331 | ;; |
2623 | 1362 | # Now accept the basic system types. | 1332 | # Now accept the basic system types. |
2624 | 1363 | # The portable systems comes first. | 1333 | # The portable systems comes first. |
2625 | 1364 | # Each alternative MUST end in a * to match a version number. | 1334 | # Each alternative MUST end in a * to match a version number. |
2655 | 1365 | # -sysv* is not here because it comes later, after sysvr4. | 1335 | # sysv* is not here because it comes later, after sysvr4. |
2656 | 1366 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 1336 | gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ |
2657 | 1367 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | 1337 | | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ |
2658 | 1368 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | 1338 | | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ |
2659 | 1369 | | -sym* | -kopensolaris* | -plan9* \ | 1339 | | sym* | kopensolaris* | plan9* \ |
2660 | 1370 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | 1340 | | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ |
2661 | 1371 | | -aos* | -aros* | -cloudabi* | -sortix* \ | 1341 | | aos* | aros* | cloudabi* | sortix* \ |
2662 | 1372 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1342 | | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ |
2663 | 1373 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | 1343 | | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ |
2664 | 1374 | | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ | 1344 | | knetbsd* | mirbsd* | netbsd* \ |
2665 | 1375 | | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | 1345 | | bitrig* | openbsd* | solidbsd* | libertybsd* \ |
2666 | 1376 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | 1346 | | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ |
2667 | 1377 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 1347 | | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ |
2668 | 1378 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | 1348 | | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ |
2669 | 1379 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1349 | | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ |
2670 | 1380 | | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | 1350 | | chorusrdb* | cegcc* | glidix* \ |
2671 | 1381 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1351 | | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ |
2672 | 1382 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | 1352 | | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ |
2673 | 1383 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | 1353 | | linux-newlib* | linux-musl* | linux-uclibc* \ |
2674 | 1384 | | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | 1354 | | uxpv* | beos* | mpeix* | udk* | moxiebox* \ |
2675 | 1385 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | 1355 | | interix* | uwin* | mks* | rhapsody* | darwin* \ |
2676 | 1386 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1356 | | openstep* | oskit* | conix* | pw32* | nonstopux* \ |
2677 | 1387 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | 1357 | | storm-chaos* | tops10* | tenex* | tops20* | its* \ |
2678 | 1388 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1358 | | os2* | vos* | palmos* | uclinux* | nucleus* \ |
2679 | 1389 | | -morphos* | -superux* | -rtmk* | -windiss* \ | 1359 | | morphos* | superux* | rtmk* | windiss* \ |
2680 | 1390 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1360 | | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ |
2681 | 1391 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ | 1361 | | skyos* | haiku* | rdos* | toppers* | drops* | es* \ |
2682 | 1392 | | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ | 1362 | | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ |
2683 | 1393 | | -midnightbsd*) | 1363 | | midnightbsd*) |
2684 | 1394 | # Remember, each alternative MUST END IN *, to match a version number. | 1364 | # Remember, each alternative MUST END IN *, to match a version number. |
2685 | 1395 | ;; | 1365 | ;; |
2689 | 1396 | -qnx*) | 1366 | qnx*) |
2690 | 1397 | case $basic_machine in | 1367 | case $cpu in |
2691 | 1398 | x86-* | i*86-*) | 1368 | x86 | i*86) |
2692 | 1399 | ;; | 1369 | ;; |
2693 | 1400 | *) | 1370 | *) |
2695 | 1401 | os=-nto$os | 1371 | os=nto-$os |
2696 | 1402 | ;; | 1372 | ;; |
2697 | 1403 | esac | 1373 | esac |
2698 | 1404 | ;; | 1374 | ;; |
2700 | 1405 | -nto-qnx*) | 1375 | hiux*) |
2701 | 1376 | os=hiuxwe2 | ||
2702 | 1377 | ;; | ||
2703 | 1378 | nto-qnx*) | ||
2704 | 1406 | ;; | 1379 | ;; |
2706 | 1407 | -nto*) | 1380 | nto*) |
2707 | 1408 | os=`echo $os | sed -e 's|nto|nto-qnx|'` | 1381 | os=`echo $os | sed -e 's|nto|nto-qnx|'` |
2708 | 1409 | ;; | 1382 | ;; |
2712 | 1410 | -sim | -xray | -os68k* | -v88r* \ | 1383 | sim | xray | os68k* | v88r* \ |
2713 | 1411 | | -windows* | -osx | -abug | -netware* | -os9* \ | 1384 | | windows* | osx | abug | netware* | os9* \ |
2714 | 1412 | | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) | 1385 | | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) |
2715 | 1386 | ;; | ||
2716 | 1387 | linux-dietlibc) | ||
2717 | 1388 | os=linux-dietlibc | ||
2718 | 1389 | ;; | ||
2719 | 1390 | linux*) | ||
2720 | 1391 | os=`echo $os | sed -e 's|linux|linux-gnu|'` | ||
2721 | 1392 | ;; | ||
2722 | 1393 | lynx*178) | ||
2723 | 1394 | os=lynxos178 | ||
2724 | 1413 | ;; | 1395 | ;; |
2726 | 1414 | -mac*) | 1396 | lynx*5) |
2727 | 1397 | os=lynxos5 | ||
2728 | 1398 | ;; | ||
2729 | 1399 | lynx*) | ||
2730 | 1400 | os=lynxos | ||
2731 | 1401 | ;; | ||
2732 | 1402 | mac*) | ||
2733 | 1415 | os=`echo "$os" | sed -e 's|mac|macos|'` | 1403 | os=`echo "$os" | sed -e 's|mac|macos|'` |
2734 | 1416 | ;; | 1404 | ;; |
2737 | 1417 | -linux-dietlibc) | 1405 | opened*) |
2738 | 1418 | os=-linux-dietlibc | 1406 | os=openedition |
2739 | 1419 | ;; | 1407 | ;; |
2742 | 1420 | -linux*) | 1408 | os400*) |
2743 | 1421 | os=`echo $os | sed -e 's|linux|linux-gnu|'` | 1409 | os=os400 |
2744 | 1422 | ;; | 1410 | ;; |
2746 | 1423 | -sunos5*) | 1411 | sunos5*) |
2747 | 1424 | os=`echo "$os" | sed -e 's|sunos5|solaris2|'` | 1412 | os=`echo "$os" | sed -e 's|sunos5|solaris2|'` |
2748 | 1425 | ;; | 1413 | ;; |
2750 | 1426 | -sunos6*) | 1414 | sunos6*) |
2751 | 1427 | os=`echo "$os" | sed -e 's|sunos6|solaris3|'` | 1415 | os=`echo "$os" | sed -e 's|sunos6|solaris3|'` |
2752 | 1428 | ;; | 1416 | ;; |
2758 | 1429 | -opened*) | 1417 | wince*) |
2759 | 1430 | os=-openedition | 1418 | os=wince |
2755 | 1431 | ;; | ||
2756 | 1432 | -os400*) | ||
2757 | 1433 | os=-os400 | ||
2760 | 1434 | ;; | 1419 | ;; |
2763 | 1435 | -wince*) | 1420 | utek*) |
2764 | 1436 | os=-wince | 1421 | os=bsd |
2765 | 1437 | ;; | 1422 | ;; |
2768 | 1438 | -utek*) | 1423 | dynix*) |
2769 | 1439 | os=-bsd | 1424 | os=bsd |
2770 | 1440 | ;; | 1425 | ;; |
2773 | 1441 | -dynix*) | 1426 | acis*) |
2774 | 1442 | os=-bsd | 1427 | os=aos |
2775 | 1443 | ;; | 1428 | ;; |
2778 | 1444 | -acis*) | 1429 | atheos*) |
2779 | 1445 | os=-aos | 1430 | os=atheos |
2780 | 1446 | ;; | 1431 | ;; |
2783 | 1447 | -atheos*) | 1432 | syllable*) |
2784 | 1448 | os=-atheos | 1433 | os=syllable |
2785 | 1449 | ;; | 1434 | ;; |
2791 | 1450 | -syllable*) | 1435 | 386bsd) |
2792 | 1451 | os=-syllable | 1436 | os=bsd |
2788 | 1452 | ;; | ||
2789 | 1453 | -386bsd) | ||
2790 | 1454 | os=-bsd | ||
2793 | 1455 | ;; | 1437 | ;; |
2796 | 1456 | -ctix* | -uts*) | 1438 | ctix* | uts*) |
2797 | 1457 | os=-sysv | 1439 | os=sysv |
2798 | 1458 | ;; | 1440 | ;; |
2801 | 1459 | -nova*) | 1441 | nova*) |
2802 | 1460 | os=-rtmk-nova | 1442 | os=rtmk-nova |
2803 | 1461 | ;; | 1443 | ;; |
2806 | 1462 | -ns2) | 1444 | ns2) |
2807 | 1463 | os=-nextstep2 | 1445 | os=nextstep2 |
2808 | 1464 | ;; | 1446 | ;; |
2811 | 1465 | -nsk*) | 1447 | nsk*) |
2812 | 1466 | os=-nsk | 1448 | os=nsk |
2813 | 1467 | ;; | 1449 | ;; |
2814 | 1468 | # Preserve the version number of sinix5. | 1450 | # Preserve the version number of sinix5. |
2816 | 1469 | -sinix5.*) | 1451 | sinix5.*) |
2817 | 1470 | os=`echo $os | sed -e 's|sinix|sysv|'` | 1452 | os=`echo $os | sed -e 's|sinix|sysv|'` |
2818 | 1471 | ;; | 1453 | ;; |
2821 | 1472 | -sinix*) | 1454 | sinix*) |
2822 | 1473 | os=-sysv4 | 1455 | os=sysv4 |
2823 | 1474 | ;; | 1456 | ;; |
2826 | 1475 | -tpf*) | 1457 | tpf*) |
2827 | 1476 | os=-tpf | 1458 | os=tpf |
2828 | 1477 | ;; | 1459 | ;; |
2831 | 1478 | -triton*) | 1460 | triton*) |
2832 | 1479 | os=-sysv3 | 1461 | os=sysv3 |
2833 | 1480 | ;; | 1462 | ;; |
2836 | 1481 | -oss*) | 1463 | oss*) |
2837 | 1482 | os=-sysv3 | 1464 | os=sysv3 |
2838 | 1483 | ;; | 1465 | ;; |
2841 | 1484 | -svr4*) | 1466 | svr4*) |
2842 | 1485 | os=-sysv4 | 1467 | os=sysv4 |
2843 | 1486 | ;; | 1468 | ;; |
2846 | 1487 | -svr3) | 1469 | svr3) |
2847 | 1488 | os=-sysv3 | 1470 | os=sysv3 |
2848 | 1489 | ;; | 1471 | ;; |
2851 | 1490 | -sysvr4) | 1472 | sysvr4) |
2852 | 1491 | os=-sysv4 | 1473 | os=sysv4 |
2853 | 1492 | ;; | 1474 | ;; |
2856 | 1493 | # This must come after -sysvr4. | 1475 | # This must come after sysvr4. |
2857 | 1494 | -sysv*) | 1476 | sysv*) |
2858 | 1495 | ;; | 1477 | ;; |
2861 | 1496 | -ose*) | 1478 | ose*) |
2862 | 1497 | os=-ose | 1479 | os=ose |
2863 | 1498 | ;; | 1480 | ;; |
2866 | 1499 | -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | 1481 | *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) |
2867 | 1500 | os=-mint | 1482 | os=mint |
2868 | 1501 | ;; | 1483 | ;; |
2871 | 1502 | -zvmoe) | 1484 | zvmoe) |
2872 | 1503 | os=-zvmoe | 1485 | os=zvmoe |
2873 | 1504 | ;; | 1486 | ;; |
2876 | 1505 | -dicos*) | 1487 | dicos*) |
2877 | 1506 | os=-dicos | 1488 | os=dicos |
2878 | 1507 | ;; | 1489 | ;; |
2880 | 1508 | -pikeos*) | 1490 | pikeos*) |
2881 | 1509 | # Until real need of OS specific support for | 1491 | # Until real need of OS specific support for |
2882 | 1510 | # particular features comes up, bare metal | 1492 | # particular features comes up, bare metal |
2883 | 1511 | # configurations are quite functional. | 1493 | # configurations are quite functional. |
2885 | 1512 | case $basic_machine in | 1494 | case $cpu in |
2886 | 1513 | arm*) | 1495 | arm*) |
2888 | 1514 | os=-eabi | 1496 | os=eabi |
2889 | 1515 | ;; | 1497 | ;; |
2890 | 1516 | *) | 1498 | *) |
2892 | 1517 | os=-elf | 1499 | os=elf |
2893 | 1518 | ;; | 1500 | ;; |
2894 | 1519 | esac | 1501 | esac |
2895 | 1520 | ;; | 1502 | ;; |
2897 | 1521 | -nacl*) | 1503 | nacl*) |
2898 | 1522 | ;; | 1504 | ;; |
2900 | 1523 | -ios) | 1505 | ios) |
2901 | 1524 | ;; | 1506 | ;; |
2903 | 1525 | -none) | 1507 | none) |
2904 | 1508 | ;; | ||
2905 | 1509 | *-eabi) | ||
2906 | 1526 | ;; | 1510 | ;; |
2907 | 1527 | *) | 1511 | *) |
2908 | 1528 | # Get rid of the `-' at the beginning of $os. | ||
2909 | 1529 | os=`echo $os | sed 's/[^-]*-//'` | ||
2910 | 1530 | echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 | 1512 | echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 |
2911 | 1531 | exit 1 | 1513 | exit 1 |
2912 | 1532 | ;; | 1514 | ;; |
2913 | @@ -1543,258 +1525,265 @@ else | |||
2914 | 1543 | # will signal an error saying that MANUFACTURER isn't an operating | 1525 | # will signal an error saying that MANUFACTURER isn't an operating |
2915 | 1544 | # system, and we'll never get to this point. | 1526 | # system, and we'll never get to this point. |
2916 | 1545 | 1527 | ||
2918 | 1546 | case $basic_machine in | 1528 | case $cpu-$vendor in |
2919 | 1547 | score-*) | 1529 | score-*) |
2921 | 1548 | os=-elf | 1530 | os=elf |
2922 | 1549 | ;; | 1531 | ;; |
2923 | 1550 | spu-*) | 1532 | spu-*) |
2925 | 1551 | os=-elf | 1533 | os=elf |
2926 | 1552 | ;; | 1534 | ;; |
2927 | 1553 | *-acorn) | 1535 | *-acorn) |
2929 | 1554 | os=-riscix1.2 | 1536 | os=riscix1.2 |
2930 | 1555 | ;; | 1537 | ;; |
2931 | 1556 | arm*-rebel) | 1538 | arm*-rebel) |
2933 | 1557 | os=-linux | 1539 | os=linux |
2934 | 1558 | ;; | 1540 | ;; |
2935 | 1559 | arm*-semi) | 1541 | arm*-semi) |
2937 | 1560 | os=-aout | 1542 | os=aout |
2938 | 1561 | ;; | 1543 | ;; |
2939 | 1562 | c4x-* | tic4x-*) | 1544 | c4x-* | tic4x-*) |
2941 | 1563 | os=-coff | 1545 | os=coff |
2942 | 1564 | ;; | 1546 | ;; |
2943 | 1565 | c8051-*) | 1547 | c8051-*) |
2945 | 1566 | os=-elf | 1548 | os=elf |
2946 | 1549 | ;; | ||
2947 | 1550 | clipper-intergraph) | ||
2948 | 1551 | os=clix | ||
2949 | 1567 | ;; | 1552 | ;; |
2950 | 1568 | hexagon-*) | 1553 | hexagon-*) |
2952 | 1569 | os=-elf | 1554 | os=elf |
2953 | 1570 | ;; | 1555 | ;; |
2954 | 1571 | tic54x-*) | 1556 | tic54x-*) |
2956 | 1572 | os=-coff | 1557 | os=coff |
2957 | 1573 | ;; | 1558 | ;; |
2958 | 1574 | tic55x-*) | 1559 | tic55x-*) |
2960 | 1575 | os=-coff | 1560 | os=coff |
2961 | 1576 | ;; | 1561 | ;; |
2962 | 1577 | tic6x-*) | 1562 | tic6x-*) |
2964 | 1578 | os=-coff | 1563 | os=coff |
2965 | 1579 | ;; | 1564 | ;; |
2966 | 1580 | # This must come before the *-dec entry. | 1565 | # This must come before the *-dec entry. |
2967 | 1581 | pdp10-*) | 1566 | pdp10-*) |
2969 | 1582 | os=-tops20 | 1567 | os=tops20 |
2970 | 1583 | ;; | 1568 | ;; |
2971 | 1584 | pdp11-*) | 1569 | pdp11-*) |
2973 | 1585 | os=-none | 1570 | os=none |
2974 | 1586 | ;; | 1571 | ;; |
2975 | 1587 | *-dec | vax-*) | 1572 | *-dec | vax-*) |
2977 | 1588 | os=-ultrix4.2 | 1573 | os=ultrix4.2 |
2978 | 1589 | ;; | 1574 | ;; |
2979 | 1590 | m68*-apollo) | 1575 | m68*-apollo) |
2981 | 1591 | os=-domain | 1576 | os=domain |
2982 | 1592 | ;; | 1577 | ;; |
2983 | 1593 | i386-sun) | 1578 | i386-sun) |
2985 | 1594 | os=-sunos4.0.2 | 1579 | os=sunos4.0.2 |
2986 | 1595 | ;; | 1580 | ;; |
2987 | 1596 | m68000-sun) | 1581 | m68000-sun) |
2989 | 1597 | os=-sunos3 | 1582 | os=sunos3 |
2990 | 1598 | ;; | 1583 | ;; |
2991 | 1599 | m68*-cisco) | 1584 | m68*-cisco) |
2993 | 1600 | os=-aout | 1585 | os=aout |
2994 | 1601 | ;; | 1586 | ;; |
2995 | 1602 | mep-*) | 1587 | mep-*) |
2997 | 1603 | os=-elf | 1588 | os=elf |
2998 | 1604 | ;; | 1589 | ;; |
2999 | 1605 | mips*-cisco) | 1590 | mips*-cisco) |
3001 | 1606 | os=-elf | 1591 | os=elf |
3002 | 1607 | ;; | 1592 | ;; |
3003 | 1608 | mips*-*) | 1593 | mips*-*) |
3005 | 1609 | os=-elf | 1594 | os=elf |
3006 | 1610 | ;; | 1595 | ;; |
3007 | 1611 | or32-*) | 1596 | or32-*) |
3009 | 1612 | os=-coff | 1597 | os=coff |
3010 | 1613 | ;; | 1598 | ;; |
3011 | 1614 | *-tti) # must be before sparc entry or we get the wrong os. | 1599 | *-tti) # must be before sparc entry or we get the wrong os. |
3013 | 1615 | os=-sysv3 | 1600 | os=sysv3 |
3014 | 1616 | ;; | 1601 | ;; |
3015 | 1617 | sparc-* | *-sun) | 1602 | sparc-* | *-sun) |
3017 | 1618 | os=-sunos4.1.1 | 1603 | os=sunos4.1.1 |
3018 | 1619 | ;; | 1604 | ;; |
3019 | 1620 | pru-*) | 1605 | pru-*) |
3021 | 1621 | os=-elf | 1606 | os=elf |
3022 | 1622 | ;; | 1607 | ;; |
3023 | 1623 | *-be) | 1608 | *-be) |
3025 | 1624 | os=-beos | 1609 | os=beos |
3026 | 1625 | ;; | 1610 | ;; |
3027 | 1626 | *-ibm) | 1611 | *-ibm) |
3029 | 1627 | os=-aix | 1612 | os=aix |
3030 | 1628 | ;; | 1613 | ;; |
3031 | 1629 | *-knuth) | 1614 | *-knuth) |
3033 | 1630 | os=-mmixware | 1615 | os=mmixware |
3034 | 1631 | ;; | 1616 | ;; |
3035 | 1632 | *-wec) | 1617 | *-wec) |
3037 | 1633 | os=-proelf | 1618 | os=proelf |
3038 | 1634 | ;; | 1619 | ;; |
3039 | 1635 | *-winbond) | 1620 | *-winbond) |
3041 | 1636 | os=-proelf | 1621 | os=proelf |
3042 | 1637 | ;; | 1622 | ;; |
3043 | 1638 | *-oki) | 1623 | *-oki) |
3045 | 1639 | os=-proelf | 1624 | os=proelf |
3046 | 1640 | ;; | 1625 | ;; |
3047 | 1641 | *-hp) | 1626 | *-hp) |
3049 | 1642 | os=-hpux | 1627 | os=hpux |
3050 | 1643 | ;; | 1628 | ;; |
3051 | 1644 | *-hitachi) | 1629 | *-hitachi) |
3053 | 1645 | os=-hiux | 1630 | os=hiux |
3054 | 1646 | ;; | 1631 | ;; |
3055 | 1647 | i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) | 1632 | i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) |
3057 | 1648 | os=-sysv | 1633 | os=sysv |
3058 | 1649 | ;; | 1634 | ;; |
3059 | 1650 | *-cbm) | 1635 | *-cbm) |
3061 | 1651 | os=-amigaos | 1636 | os=amigaos |
3062 | 1652 | ;; | 1637 | ;; |
3063 | 1653 | *-dg) | 1638 | *-dg) |
3065 | 1654 | os=-dgux | 1639 | os=dgux |
3066 | 1655 | ;; | 1640 | ;; |
3067 | 1656 | *-dolphin) | 1641 | *-dolphin) |
3069 | 1657 | os=-sysv3 | 1642 | os=sysv3 |
3070 | 1658 | ;; | 1643 | ;; |
3071 | 1659 | m68k-ccur) | 1644 | m68k-ccur) |
3073 | 1660 | os=-rtu | 1645 | os=rtu |
3074 | 1661 | ;; | 1646 | ;; |
3075 | 1662 | m88k-omron*) | 1647 | m88k-omron*) |
3077 | 1663 | os=-luna | 1648 | os=luna |
3078 | 1664 | ;; | 1649 | ;; |
3079 | 1665 | *-next) | 1650 | *-next) |
3081 | 1666 | os=-nextstep | 1651 | os=nextstep |
3082 | 1667 | ;; | 1652 | ;; |
3083 | 1668 | *-sequent) | 1653 | *-sequent) |
3085 | 1669 | os=-ptx | 1654 | os=ptx |
3086 | 1670 | ;; | 1655 | ;; |
3087 | 1671 | *-crds) | 1656 | *-crds) |
3089 | 1672 | os=-unos | 1657 | os=unos |
3090 | 1673 | ;; | 1658 | ;; |
3091 | 1674 | *-ns) | 1659 | *-ns) |
3093 | 1675 | os=-genix | 1660 | os=genix |
3094 | 1676 | ;; | 1661 | ;; |
3095 | 1677 | i370-*) | 1662 | i370-*) |
3097 | 1678 | os=-mvs | 1663 | os=mvs |
3098 | 1679 | ;; | 1664 | ;; |
3099 | 1680 | *-gould) | 1665 | *-gould) |
3101 | 1681 | os=-sysv | 1666 | os=sysv |
3102 | 1682 | ;; | 1667 | ;; |
3103 | 1683 | *-highlevel) | 1668 | *-highlevel) |
3105 | 1684 | os=-bsd | 1669 | os=bsd |
3106 | 1685 | ;; | 1670 | ;; |
3107 | 1686 | *-encore) | 1671 | *-encore) |
3109 | 1687 | os=-bsd | 1672 | os=bsd |
3110 | 1688 | ;; | 1673 | ;; |
3111 | 1689 | *-sgi) | 1674 | *-sgi) |
3113 | 1690 | os=-irix | 1675 | os=irix |
3114 | 1691 | ;; | 1676 | ;; |
3115 | 1692 | *-siemens) | 1677 | *-siemens) |
3117 | 1693 | os=-sysv4 | 1678 | os=sysv4 |
3118 | 1694 | ;; | 1679 | ;; |
3119 | 1695 | *-masscomp) | 1680 | *-masscomp) |
3121 | 1696 | os=-rtu | 1681 | os=rtu |
3122 | 1697 | ;; | 1682 | ;; |
3123 | 1698 | f30[01]-fujitsu | f700-fujitsu) | 1683 | f30[01]-fujitsu | f700-fujitsu) |
3125 | 1699 | os=-uxpv | 1684 | os=uxpv |
3126 | 1700 | ;; | 1685 | ;; |
3127 | 1701 | *-rom68k) | 1686 | *-rom68k) |
3129 | 1702 | os=-coff | 1687 | os=coff |
3130 | 1703 | ;; | 1688 | ;; |
3131 | 1704 | *-*bug) | 1689 | *-*bug) |
3133 | 1705 | os=-coff | 1690 | os=coff |
3134 | 1706 | ;; | 1691 | ;; |
3135 | 1707 | *-apple) | 1692 | *-apple) |
3137 | 1708 | os=-macos | 1693 | os=macos |
3138 | 1709 | ;; | 1694 | ;; |
3139 | 1710 | *-atari*) | 1695 | *-atari*) |
3141 | 1711 | os=-mint | 1696 | os=mint |
3142 | 1697 | ;; | ||
3143 | 1698 | *-wrs) | ||
3144 | 1699 | os=vxworks | ||
3145 | 1712 | ;; | 1700 | ;; |
3146 | 1713 | *) | 1701 | *) |
3148 | 1714 | os=-none | 1702 | os=none |
3149 | 1715 | ;; | 1703 | ;; |
3150 | 1716 | esac | 1704 | esac |
3151 | 1717 | fi | 1705 | fi |
3152 | 1718 | 1706 | ||
3153 | 1719 | # Here we handle the case where we know the os, and the CPU type, but not the | 1707 | # Here we handle the case where we know the os, and the CPU type, but not the |
3154 | 1720 | # manufacturer. We pick the logical manufacturer. | 1708 | # manufacturer. We pick the logical manufacturer. |
3158 | 1721 | vendor=unknown | 1709 | case $vendor in |
3159 | 1722 | case $basic_machine in | 1710 | unknown) |
3157 | 1723 | *-unknown) | ||
3160 | 1724 | case $os in | 1711 | case $os in |
3162 | 1725 | -riscix*) | 1712 | riscix*) |
3163 | 1726 | vendor=acorn | 1713 | vendor=acorn |
3164 | 1727 | ;; | 1714 | ;; |
3166 | 1728 | -sunos*) | 1715 | sunos*) |
3167 | 1729 | vendor=sun | 1716 | vendor=sun |
3168 | 1730 | ;; | 1717 | ;; |
3170 | 1731 | -cnk*|-aix*) | 1718 | cnk*|-aix*) |
3171 | 1732 | vendor=ibm | 1719 | vendor=ibm |
3172 | 1733 | ;; | 1720 | ;; |
3174 | 1734 | -beos*) | 1721 | beos*) |
3175 | 1735 | vendor=be | 1722 | vendor=be |
3176 | 1736 | ;; | 1723 | ;; |
3178 | 1737 | -hpux*) | 1724 | hpux*) |
3179 | 1738 | vendor=hp | 1725 | vendor=hp |
3180 | 1739 | ;; | 1726 | ;; |
3182 | 1740 | -mpeix*) | 1727 | mpeix*) |
3183 | 1741 | vendor=hp | 1728 | vendor=hp |
3184 | 1742 | ;; | 1729 | ;; |
3186 | 1743 | -hiux*) | 1730 | hiux*) |
3187 | 1744 | vendor=hitachi | 1731 | vendor=hitachi |
3188 | 1745 | ;; | 1732 | ;; |
3190 | 1746 | -unos*) | 1733 | unos*) |
3191 | 1747 | vendor=crds | 1734 | vendor=crds |
3192 | 1748 | ;; | 1735 | ;; |
3194 | 1749 | -dgux*) | 1736 | dgux*) |
3195 | 1750 | vendor=dg | 1737 | vendor=dg |
3196 | 1751 | ;; | 1738 | ;; |
3198 | 1752 | -luna*) | 1739 | luna*) |
3199 | 1753 | vendor=omron | 1740 | vendor=omron |
3200 | 1754 | ;; | 1741 | ;; |
3202 | 1755 | -genix*) | 1742 | genix*) |
3203 | 1756 | vendor=ns | 1743 | vendor=ns |
3204 | 1757 | ;; | 1744 | ;; |
3206 | 1758 | -mvs* | -opened*) | 1745 | clix*) |
3207 | 1746 | vendor=intergraph | ||
3208 | 1747 | ;; | ||
3209 | 1748 | mvs* | opened*) | ||
3210 | 1759 | vendor=ibm | 1749 | vendor=ibm |
3211 | 1760 | ;; | 1750 | ;; |
3213 | 1761 | -os400*) | 1751 | os400*) |
3214 | 1762 | vendor=ibm | 1752 | vendor=ibm |
3215 | 1763 | ;; | 1753 | ;; |
3217 | 1764 | -ptx*) | 1754 | ptx*) |
3218 | 1765 | vendor=sequent | 1755 | vendor=sequent |
3219 | 1766 | ;; | 1756 | ;; |
3221 | 1767 | -tpf*) | 1757 | tpf*) |
3222 | 1768 | vendor=ibm | 1758 | vendor=ibm |
3223 | 1769 | ;; | 1759 | ;; |
3225 | 1770 | -vxsim* | -vxworks* | -windiss*) | 1760 | vxsim* | vxworks* | windiss*) |
3226 | 1771 | vendor=wrs | 1761 | vendor=wrs |
3227 | 1772 | ;; | 1762 | ;; |
3229 | 1773 | -aux*) | 1763 | aux*) |
3230 | 1774 | vendor=apple | 1764 | vendor=apple |
3231 | 1775 | ;; | 1765 | ;; |
3233 | 1776 | -hms*) | 1766 | hms*) |
3234 | 1777 | vendor=hitachi | 1767 | vendor=hitachi |
3235 | 1778 | ;; | 1768 | ;; |
3237 | 1779 | -mpw* | -macos*) | 1769 | mpw* | macos*) |
3238 | 1780 | vendor=apple | 1770 | vendor=apple |
3239 | 1781 | ;; | 1771 | ;; |
3241 | 1782 | -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | 1772 | *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) |
3242 | 1783 | vendor=atari | 1773 | vendor=atari |
3243 | 1784 | ;; | 1774 | ;; |
3245 | 1785 | -vos*) | 1775 | vos*) |
3246 | 1786 | vendor=stratus | 1776 | vendor=stratus |
3247 | 1787 | ;; | 1777 | ;; |
3248 | 1788 | esac | 1778 | esac |
3249 | 1789 | basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` | ||
3250 | 1790 | ;; | 1779 | ;; |
3251 | 1791 | esac | 1780 | esac |
3252 | 1792 | 1781 | ||
3254 | 1793 | echo "$basic_machine$os" | 1782 | echo "$cpu-$vendor-$os" |
3255 | 1794 | exit | 1783 | exit |
3256 | 1795 | 1784 | ||
3257 | 1796 | # Local variables: | 1785 | # Local variables: |
3259 | 1797 | # eval: (add-hook 'write-file-functions 'time-stamp) | 1786 | # eval: (add-hook 'before-save-hook 'time-stamp) |
3260 | 1798 | # time-stamp-start: "timestamp='" | 1787 | # time-stamp-start: "timestamp='" |
3261 | 1799 | # time-stamp-format: "%:y-%02m-%02d" | 1788 | # time-stamp-format: "%:y-%02m-%02d" |
3262 | 1800 | # time-stamp-end: "'" | 1789 | # time-stamp-end: "'" |
3263 | diff --git a/build-aux/depcomp b/build-aux/depcomp | |||
3264 | index 65cbf70..4e0ae31 100755 | |||
3265 | --- a/build-aux/depcomp | |||
3266 | +++ b/build-aux/depcomp | |||
3267 | @@ -1,4 +1,4 @@ | |||
3269 | 1 | #! /bin/sh | 1 | #!/usr/bin/sh |
3270 | 2 | # depcomp - compile a program generating dependencies as side-effects | 2 | # depcomp - compile a program generating dependencies as side-effects |
3271 | 3 | 3 | ||
3272 | 4 | scriptversion=2018-03-07.03; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
3273 | diff --git a/build-aux/install-sh b/build-aux/install-sh | |||
3274 | index 8175c64..defb86a 100755 | |||
3275 | --- a/build-aux/install-sh | |||
3276 | +++ b/build-aux/install-sh | |||
3277 | @@ -1,4 +1,4 @@ | |||
3279 | 1 | #!/bin/sh | 1 | #!/usr/bin/sh |
3280 | 2 | # install - install a program, script, or datafile | 2 | # install - install a program, script, or datafile |
3281 | 3 | 3 | ||
3282 | 4 | scriptversion=2018-03-11.20; # UTC | 4 | scriptversion=2018-03-11.20; # UTC |
3283 | diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh | |||
3284 | index 617dde4..7f3523d 100644 | |||
3285 | --- a/build-aux/ltmain.sh | |||
3286 | +++ b/build-aux/ltmain.sh | |||
3287 | @@ -31,7 +31,7 @@ | |||
3288 | 31 | 31 | ||
3289 | 32 | PROGRAM=libtool | 32 | PROGRAM=libtool |
3290 | 33 | PACKAGE=libtool | 33 | PACKAGE=libtool |
3292 | 34 | VERSION="2.4.6 Debian-2.4.6-8" | 34 | VERSION=2.4.6 |
3293 | 35 | package_revision=2.4.6 | 35 | package_revision=2.4.6 |
3294 | 36 | 36 | ||
3295 | 37 | 37 | ||
3296 | @@ -1370,7 +1370,7 @@ func_lt_ver () | |||
3297 | 1370 | #! /bin/sh | 1370 | #! /bin/sh |
3298 | 1371 | 1371 | ||
3299 | 1372 | # Set a version string for this script. | 1372 | # Set a version string for this script. |
3301 | 1373 | scriptversion=2015-10-07.11; # UTC | 1373 | scriptversion=2014-01-07.03; # UTC |
3302 | 1374 | 1374 | ||
3303 | 1375 | # A portable, pluggable option parser for Bourne shell. | 1375 | # A portable, pluggable option parser for Bourne shell. |
3304 | 1376 | # Written by Gary V. Vaughan, 2010 | 1376 | # Written by Gary V. Vaughan, 2010 |
3305 | @@ -1530,8 +1530,6 @@ func_run_hooks () | |||
3306 | 1530 | { | 1530 | { |
3307 | 1531 | $debug_cmd | 1531 | $debug_cmd |
3308 | 1532 | 1532 | ||
3309 | 1533 | _G_rc_run_hooks=false | ||
3310 | 1534 | |||
3311 | 1535 | case " $hookable_fns " in | 1533 | case " $hookable_fns " in |
3312 | 1536 | *" $1 "*) ;; | 1534 | *" $1 "*) ;; |
3313 | 1537 | *) func_fatal_error "'$1' does not support hook funcions.n" ;; | 1535 | *) func_fatal_error "'$1' does not support hook funcions.n" ;; |
3314 | @@ -1540,16 +1538,16 @@ func_run_hooks () | |||
3315 | 1540 | eval _G_hook_fns=\$$1_hooks; shift | 1538 | eval _G_hook_fns=\$$1_hooks; shift |
3316 | 1541 | 1539 | ||
3317 | 1542 | for _G_hook in $_G_hook_fns; do | 1540 | for _G_hook in $_G_hook_fns; do |
3325 | 1543 | if eval $_G_hook '"$@"'; then | 1541 | eval $_G_hook '"$@"' |
3326 | 1544 | # store returned options list back into positional | 1542 | |
3327 | 1545 | # parameters for next 'cmd' execution. | 1543 | # store returned options list back into positional |
3328 | 1546 | eval _G_hook_result=\$${_G_hook}_result | 1544 | # parameters for next 'cmd' execution. |
3329 | 1547 | eval set dummy "$_G_hook_result"; shift | 1545 | eval _G_hook_result=\$${_G_hook}_result |
3330 | 1548 | _G_rc_run_hooks=: | 1546 | eval set dummy "$_G_hook_result"; shift |
3324 | 1549 | fi | ||
3331 | 1550 | done | 1547 | done |
3332 | 1551 | 1548 | ||
3334 | 1552 | $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result | 1549 | func_quote_for_eval ${1+"$@"} |
3335 | 1550 | func_run_hooks_result=$func_quote_for_eval_result | ||
3336 | 1553 | } | 1551 | } |
3337 | 1554 | 1552 | ||
3338 | 1555 | 1553 | ||
3339 | @@ -1559,16 +1557,10 @@ func_run_hooks () | |||
3340 | 1559 | ## --------------- ## | 1557 | ## --------------- ## |
3341 | 1560 | 1558 | ||
3342 | 1561 | # In order to add your own option parsing hooks, you must accept the | 1559 | # In order to add your own option parsing hooks, you must accept the |
3345 | 1562 | # full positional parameter list in your hook function, you may remove/edit | 1560 | # full positional parameter list in your hook function, remove any |
3346 | 1563 | # any options that you action, and then pass back the remaining unprocessed | 1561 | # options that you action, and then pass back the remaining unprocessed |
3347 | 1564 | # options in '<hooked_function_name>_result', escaped suitably for | 1562 | # options in '<hooked_function_name>_result', escaped suitably for |
3355 | 1565 | # 'eval'. In this case you also must return $EXIT_SUCCESS to let the | 1563 | # 'eval'. Like this: |
3349 | 1566 | # hook's caller know that it should pay attention to | ||
3350 | 1567 | # '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that | ||
3351 | 1568 | # arguments are left untouched by the hook and therefore caller will ignore the | ||
3352 | 1569 | # result variable. | ||
3353 | 1570 | # | ||
3354 | 1571 | # Like this: | ||
3356 | 1572 | # | 1564 | # |
3357 | 1573 | # my_options_prep () | 1565 | # my_options_prep () |
3358 | 1574 | # { | 1566 | # { |
3359 | @@ -1578,11 +1570,9 @@ func_run_hooks () | |||
3360 | 1578 | # usage_message=$usage_message' | 1570 | # usage_message=$usage_message' |
3361 | 1579 | # -s, --silent don'\''t print informational messages | 1571 | # -s, --silent don'\''t print informational messages |
3362 | 1580 | # ' | 1572 | # ' |
3368 | 1581 | # # No change in '$@' (ignored completely by this hook). There is | 1573 | # |
3369 | 1582 | # # no need to do the equivalent (but slower) action: | 1574 | # func_quote_for_eval ${1+"$@"} |
3370 | 1583 | # # func_quote_for_eval ${1+"$@"} | 1575 | # my_options_prep_result=$func_quote_for_eval_result |
3366 | 1584 | # # my_options_prep_result=$func_quote_for_eval_result | ||
3367 | 1585 | # false | ||
3371 | 1586 | # } | 1576 | # } |
3372 | 1587 | # func_add_hook func_options_prep my_options_prep | 1577 | # func_add_hook func_options_prep my_options_prep |
3373 | 1588 | # | 1578 | # |
3374 | @@ -1591,37 +1581,25 @@ func_run_hooks () | |||
3375 | 1591 | # { | 1581 | # { |
3376 | 1592 | # $debug_cmd | 1582 | # $debug_cmd |
3377 | 1593 | # | 1583 | # |
3378 | 1594 | # args_changed=false | ||
3379 | 1595 | # | ||
3380 | 1596 | # # Note that for efficiency, we parse as many options as we can | 1584 | # # Note that for efficiency, we parse as many options as we can |
3381 | 1597 | # # recognise in a loop before passing the remainder back to the | 1585 | # # recognise in a loop before passing the remainder back to the |
3382 | 1598 | # # caller on the first unrecognised argument we encounter. | 1586 | # # caller on the first unrecognised argument we encounter. |
3383 | 1599 | # while test $# -gt 0; do | 1587 | # while test $# -gt 0; do |
3384 | 1600 | # opt=$1; shift | 1588 | # opt=$1; shift |
3385 | 1601 | # case $opt in | 1589 | # case $opt in |
3389 | 1602 | # --silent|-s) opt_silent=: | 1590 | # --silent|-s) opt_silent=: ;; |
3387 | 1603 | # args_changed=: | ||
3388 | 1604 | # ;; | ||
3390 | 1605 | # # Separate non-argument short options: | 1591 | # # Separate non-argument short options: |
3391 | 1606 | # -s*) func_split_short_opt "$_G_opt" | 1592 | # -s*) func_split_short_opt "$_G_opt" |
3392 | 1607 | # set dummy "$func_split_short_opt_name" \ | 1593 | # set dummy "$func_split_short_opt_name" \ |
3393 | 1608 | # "-$func_split_short_opt_arg" ${1+"$@"} | 1594 | # "-$func_split_short_opt_arg" ${1+"$@"} |
3394 | 1609 | # shift | 1595 | # shift |
3395 | 1610 | # args_changed=: | ||
3396 | 1611 | # ;; | 1596 | # ;; |
3401 | 1612 | # *) # Make sure the first unrecognised option "$_G_opt" | 1597 | # *) set dummy "$_G_opt" "$*"; shift; break ;; |
3398 | 1613 | # # is added back to "$@", we could need that later | ||
3399 | 1614 | # # if $args_changed is true. | ||
3400 | 1615 | # set dummy "$_G_opt" ${1+"$@"}; shift; break ;; | ||
3402 | 1616 | # esac | 1598 | # esac |
3403 | 1617 | # done | 1599 | # done |
3404 | 1618 | # | 1600 | # |
3411 | 1619 | # if $args_changed; then | 1601 | # func_quote_for_eval ${1+"$@"} |
3412 | 1620 | # func_quote_for_eval ${1+"$@"} | 1602 | # my_silent_option_result=$func_quote_for_eval_result |
3407 | 1621 | # my_silent_option_result=$func_quote_for_eval_result | ||
3408 | 1622 | # fi | ||
3409 | 1623 | # | ||
3410 | 1624 | # $args_changed | ||
3413 | 1625 | # } | 1603 | # } |
3414 | 1626 | # func_add_hook func_parse_options my_silent_option | 1604 | # func_add_hook func_parse_options my_silent_option |
3415 | 1627 | # | 1605 | # |
3416 | @@ -1633,32 +1611,16 @@ func_run_hooks () | |||
3417 | 1633 | # $opt_silent && $opt_verbose && func_fatal_help "\ | 1611 | # $opt_silent && $opt_verbose && func_fatal_help "\ |
3418 | 1634 | # '--silent' and '--verbose' options are mutually exclusive." | 1612 | # '--silent' and '--verbose' options are mutually exclusive." |
3419 | 1635 | # | 1613 | # |
3421 | 1636 | # false | 1614 | # func_quote_for_eval ${1+"$@"} |
3422 | 1615 | # my_option_validation_result=$func_quote_for_eval_result | ||
3423 | 1637 | # } | 1616 | # } |
3424 | 1638 | # func_add_hook func_validate_options my_option_validation | 1617 | # func_add_hook func_validate_options my_option_validation |
3425 | 1639 | # | 1618 | # |
3427 | 1640 | # You'll also need to manually amend $usage_message to reflect the extra | 1619 | # You'll alse need to manually amend $usage_message to reflect the extra |
3428 | 1641 | # options you parse. It's preferable to append if you can, so that | 1620 | # options you parse. It's preferable to append if you can, so that |
3429 | 1642 | # multiple option parsing hooks can be added safely. | 1621 | # multiple option parsing hooks can be added safely. |
3430 | 1643 | 1622 | ||
3431 | 1644 | 1623 | ||
3432 | 1645 | # func_options_finish [ARG]... | ||
3433 | 1646 | # ---------------------------- | ||
3434 | 1647 | # Finishing the option parse loop (call 'func_options' hooks ATM). | ||
3435 | 1648 | func_options_finish () | ||
3436 | 1649 | { | ||
3437 | 1650 | $debug_cmd | ||
3438 | 1651 | |||
3439 | 1652 | _G_func_options_finish_exit=false | ||
3440 | 1653 | if func_run_hooks func_options ${1+"$@"}; then | ||
3441 | 1654 | func_options_finish_result=$func_run_hooks_result | ||
3442 | 1655 | _G_func_options_finish_exit=: | ||
3443 | 1656 | fi | ||
3444 | 1657 | |||
3445 | 1658 | $_G_func_options_finish_exit | ||
3446 | 1659 | } | ||
3447 | 1660 | |||
3448 | 1661 | |||
3449 | 1662 | # func_options [ARG]... | 1624 | # func_options [ARG]... |
3450 | 1663 | # --------------------- | 1625 | # --------------------- |
3451 | 1664 | # All the functions called inside func_options are hookable. See the | 1626 | # All the functions called inside func_options are hookable. See the |
3452 | @@ -1668,28 +1630,17 @@ func_options () | |||
3453 | 1668 | { | 1630 | { |
3454 | 1669 | $debug_cmd | 1631 | $debug_cmd |
3455 | 1670 | 1632 | ||
3466 | 1671 | _G_rc_options=false | 1633 | func_options_prep ${1+"$@"} |
3467 | 1672 | 1634 | eval func_parse_options \ | |
3468 | 1673 | for my_func in options_prep parse_options validate_options options_finish | 1635 | ${func_options_prep_result+"$func_options_prep_result"} |
3469 | 1674 | do | 1636 | eval func_validate_options \ |
3470 | 1675 | if eval func_$my_func '${1+"$@"}'; then | 1637 | ${func_parse_options_result+"$func_parse_options_result"} |
3461 | 1676 | eval _G_res_var='$'"func_${my_func}_result" | ||
3462 | 1677 | eval set dummy "$_G_res_var" ; shift | ||
3463 | 1678 | _G_rc_options=: | ||
3464 | 1679 | fi | ||
3465 | 1680 | done | ||
3471 | 1681 | 1638 | ||
3481 | 1682 | # Save modified positional parameters for caller. As a top-level | 1639 | eval func_run_hooks func_options \ |
3482 | 1683 | # options-parser function we always need to set the 'func_options_result' | 1640 | ${func_validate_options_result+"$func_validate_options_result"} |
3474 | 1684 | # variable (regardless the $_G_rc_options value). | ||
3475 | 1685 | if $_G_rc_options; then | ||
3476 | 1686 | func_options_result=$_G_res_var | ||
3477 | 1687 | else | ||
3478 | 1688 | func_quote_for_eval ${1+"$@"} | ||
3479 | 1689 | func_options_result=$func_quote_for_eval_result | ||
3480 | 1690 | fi | ||
3483 | 1691 | 1641 | ||
3485 | 1692 | $_G_rc_options | 1642 | # save modified positional parameters for caller |
3486 | 1643 | func_options_result=$func_run_hooks_result | ||
3487 | 1693 | } | 1644 | } |
3488 | 1694 | 1645 | ||
3489 | 1695 | 1646 | ||
3490 | @@ -1698,9 +1649,9 @@ func_options () | |||
3491 | 1698 | # All initialisations required before starting the option parse loop. | 1649 | # All initialisations required before starting the option parse loop. |
3492 | 1699 | # Note that when calling hook functions, we pass through the list of | 1650 | # Note that when calling hook functions, we pass through the list of |
3493 | 1700 | # positional parameters. If a hook function modifies that list, and | 1651 | # positional parameters. If a hook function modifies that list, and |
3495 | 1701 | # needs to propagate that back to rest of this script, then the complete | 1652 | # needs to propogate that back to rest of this script, then the complete |
3496 | 1702 | # modified list must be put in 'func_run_hooks_result' before | 1653 | # modified list must be put in 'func_run_hooks_result' before |
3498 | 1703 | # returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). | 1654 | # returning. |
3499 | 1704 | func_hookable func_options_prep | 1655 | func_hookable func_options_prep |
3500 | 1705 | func_options_prep () | 1656 | func_options_prep () |
3501 | 1706 | { | 1657 | { |
3502 | @@ -1710,14 +1661,10 @@ func_options_prep () | |||
3503 | 1710 | opt_verbose=false | 1661 | opt_verbose=false |
3504 | 1711 | opt_warning_types= | 1662 | opt_warning_types= |
3505 | 1712 | 1663 | ||
3512 | 1713 | _G_rc_options_prep=false | 1664 | func_run_hooks func_options_prep ${1+"$@"} |
3507 | 1714 | if func_run_hooks func_options_prep ${1+"$@"}; then | ||
3508 | 1715 | _G_rc_options_prep=: | ||
3509 | 1716 | # save modified positional parameters for caller | ||
3510 | 1717 | func_options_prep_result=$func_run_hooks_result | ||
3511 | 1718 | fi | ||
3513 | 1719 | 1665 | ||
3515 | 1720 | $_G_rc_options_prep | 1666 | # save modified positional parameters for caller |
3516 | 1667 | func_options_prep_result=$func_run_hooks_result | ||
3517 | 1721 | } | 1668 | } |
3518 | 1722 | 1669 | ||
3519 | 1723 | 1670 | ||
3520 | @@ -1731,20 +1678,18 @@ func_parse_options () | |||
3521 | 1731 | 1678 | ||
3522 | 1732 | func_parse_options_result= | 1679 | func_parse_options_result= |
3523 | 1733 | 1680 | ||
3524 | 1734 | _G_rc_parse_options=false | ||
3525 | 1735 | # this just eases exit handling | 1681 | # this just eases exit handling |
3526 | 1736 | while test $# -gt 0; do | 1682 | while test $# -gt 0; do |
3527 | 1737 | # Defer to hook functions for initial option parsing, so they | 1683 | # Defer to hook functions for initial option parsing, so they |
3528 | 1738 | # get priority in the event of reusing an option name. | 1684 | # get priority in the event of reusing an option name. |
3533 | 1739 | if func_run_hooks func_parse_options ${1+"$@"}; then | 1685 | func_run_hooks func_parse_options ${1+"$@"} |
3534 | 1740 | eval set dummy "$func_run_hooks_result"; shift | 1686 | |
3535 | 1741 | _G_rc_parse_options=: | 1687 | # Adjust func_parse_options positional parameters to match |
3536 | 1742 | fi | 1688 | eval set dummy "$func_run_hooks_result"; shift |
3537 | 1743 | 1689 | ||
3538 | 1744 | # Break out of the loop if we already parsed every option. | 1690 | # Break out of the loop if we already parsed every option. |
3539 | 1745 | test $# -gt 0 || break | 1691 | test $# -gt 0 || break |
3540 | 1746 | 1692 | ||
3541 | 1747 | _G_match_parse_options=: | ||
3542 | 1748 | _G_opt=$1 | 1693 | _G_opt=$1 |
3543 | 1749 | shift | 1694 | shift |
3544 | 1750 | case $_G_opt in | 1695 | case $_G_opt in |
3545 | @@ -1759,10 +1704,7 @@ func_parse_options () | |||
3546 | 1759 | ;; | 1704 | ;; |
3547 | 1760 | 1705 | ||
3548 | 1761 | --warnings|--warning|-W) | 1706 | --warnings|--warning|-W) |
3553 | 1762 | if test $# = 0 && func_missing_arg $_G_opt; then | 1707 | test $# = 0 && func_missing_arg $_G_opt && break |
3550 | 1763 | _G_rc_parse_options=: | ||
3551 | 1764 | break | ||
3552 | 1765 | fi | ||
3554 | 1766 | case " $warning_categories $1" in | 1708 | case " $warning_categories $1" in |
3555 | 1767 | *" $1 "*) | 1709 | *" $1 "*) |
3556 | 1768 | # trailing space prevents matching last $1 above | 1710 | # trailing space prevents matching last $1 above |
3557 | @@ -1815,25 +1757,15 @@ func_parse_options () | |||
3558 | 1815 | shift | 1757 | shift |
3559 | 1816 | ;; | 1758 | ;; |
3560 | 1817 | 1759 | ||
3562 | 1818 | --) _G_rc_parse_options=: ; break ;; | 1760 | --) break ;; |
3563 | 1819 | -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; | 1761 | -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; |
3568 | 1820 | *) set dummy "$_G_opt" ${1+"$@"}; shift | 1762 | *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; |
3565 | 1821 | _G_match_parse_options=false | ||
3566 | 1822 | break | ||
3567 | 1823 | ;; | ||
3569 | 1824 | esac | 1763 | esac |
3570 | 1825 | |||
3571 | 1826 | $_G_match_parse_options && _G_rc_parse_options=: | ||
3572 | 1827 | done | 1764 | done |
3573 | 1828 | 1765 | ||
3582 | 1829 | 1766 | # save modified positional parameters for caller | |
3583 | 1830 | if $_G_rc_parse_options; then | 1767 | func_quote_for_eval ${1+"$@"} |
3584 | 1831 | # save modified positional parameters for caller | 1768 | func_parse_options_result=$func_quote_for_eval_result |
3577 | 1832 | func_quote_for_eval ${1+"$@"} | ||
3578 | 1833 | func_parse_options_result=$func_quote_for_eval_result | ||
3579 | 1834 | fi | ||
3580 | 1835 | |||
3581 | 1836 | $_G_rc_parse_options | ||
3585 | 1837 | } | 1769 | } |
3586 | 1838 | 1770 | ||
3587 | 1839 | 1771 | ||
3588 | @@ -1846,21 +1778,16 @@ func_validate_options () | |||
3589 | 1846 | { | 1778 | { |
3590 | 1847 | $debug_cmd | 1779 | $debug_cmd |
3591 | 1848 | 1780 | ||
3592 | 1849 | _G_rc_validate_options=false | ||
3593 | 1850 | |||
3594 | 1851 | # Display all warnings if -W was not given. | 1781 | # Display all warnings if -W was not given. |
3595 | 1852 | test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" | 1782 | test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" |
3596 | 1853 | 1783 | ||
3602 | 1854 | if func_run_hooks func_validate_options ${1+"$@"}; then | 1784 | func_run_hooks func_validate_options ${1+"$@"} |
3598 | 1855 | # save modified positional parameters for caller | ||
3599 | 1856 | func_validate_options_result=$func_run_hooks_result | ||
3600 | 1857 | _G_rc_validate_options=: | ||
3601 | 1858 | fi | ||
3603 | 1859 | 1785 | ||
3604 | 1860 | # Bail if the options were screwed! | 1786 | # Bail if the options were screwed! |
3605 | 1861 | $exit_cmd $EXIT_FAILURE | 1787 | $exit_cmd $EXIT_FAILURE |
3606 | 1862 | 1788 | ||
3608 | 1863 | $_G_rc_validate_options | 1789 | # save modified positional parameters for caller |
3609 | 1790 | func_validate_options_result=$func_run_hooks_result | ||
3610 | 1864 | } | 1791 | } |
3611 | 1865 | 1792 | ||
3612 | 1866 | 1793 | ||
3613 | @@ -2141,12 +2068,12 @@ include the following information: | |||
3614 | 2141 | compiler: $LTCC | 2068 | compiler: $LTCC |
3615 | 2142 | compiler flags: $LTCFLAGS | 2069 | compiler flags: $LTCFLAGS |
3616 | 2143 | linker: $LD (gnu? $with_gnu_ld) | 2070 | linker: $LD (gnu? $with_gnu_ld) |
3618 | 2144 | version: $progname $scriptversion Debian-2.4.6-8 | 2071 | version: $progname (GNU libtool) 2.4.6 |
3619 | 2145 | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` | 2072 | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` |
3620 | 2146 | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` | 2073 | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` |
3621 | 2147 | 2074 | ||
3622 | 2148 | Report bugs to <bug-libtool@gnu.org>. | 2075 | Report bugs to <bug-libtool@gnu.org>. |
3624 | 2149 | GNU libtool home page: <http://www.gnu.org/s/libtool/>. | 2076 | GNU libtool home page: <http://www.gnu.org/software/libtool/>. |
3625 | 2150 | General help using GNU software: <http://www.gnu.org/gethelp/>." | 2077 | General help using GNU software: <http://www.gnu.org/gethelp/>." |
3626 | 2151 | exit 0 | 2078 | exit 0 |
3627 | 2152 | } | 2079 | } |
3628 | @@ -2197,7 +2124,7 @@ fi | |||
3629 | 2197 | # a configuration failure hint, and exit. | 2124 | # a configuration failure hint, and exit. |
3630 | 2198 | func_fatal_configuration () | 2125 | func_fatal_configuration () |
3631 | 2199 | { | 2126 | { |
3633 | 2200 | func__fatal_error ${1+"$@"} \ | 2127 | func_fatal_error ${1+"$@"} \ |
3634 | 2201 | "See the $PACKAGE documentation for more information." \ | 2128 | "See the $PACKAGE documentation for more information." \ |
3635 | 2202 | "Fatal configuration error." | 2129 | "Fatal configuration error." |
3636 | 2203 | } | 2130 | } |
3637 | @@ -2343,8 +2270,6 @@ libtool_options_prep () | |||
3638 | 2343 | nonopt= | 2270 | nonopt= |
3639 | 2344 | preserve_args= | 2271 | preserve_args= |
3640 | 2345 | 2272 | ||
3641 | 2346 | _G_rc_lt_options_prep=: | ||
3642 | 2347 | |||
3643 | 2348 | # Shorthand for --mode=foo, only valid as the first argument | 2273 | # Shorthand for --mode=foo, only valid as the first argument |
3644 | 2349 | case $1 in | 2274 | case $1 in |
3645 | 2350 | clean|clea|cle|cl) | 2275 | clean|clea|cle|cl) |
3646 | @@ -2368,18 +2293,11 @@ libtool_options_prep () | |||
3647 | 2368 | uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) | 2293 | uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
3648 | 2369 | shift; set dummy --mode uninstall ${1+"$@"}; shift | 2294 | shift; set dummy --mode uninstall ${1+"$@"}; shift |
3649 | 2370 | ;; | 2295 | ;; |
3650 | 2371 | *) | ||
3651 | 2372 | _G_rc_lt_options_prep=false | ||
3652 | 2373 | ;; | ||
3653 | 2374 | esac | 2296 | esac |
3654 | 2375 | 2297 | ||
3662 | 2376 | if $_G_rc_lt_options_prep; then | 2298 | # Pass back the list of options. |
3663 | 2377 | # Pass back the list of options. | 2299 | func_quote_for_eval ${1+"$@"} |
3664 | 2378 | func_quote_for_eval ${1+"$@"} | 2300 | libtool_options_prep_result=$func_quote_for_eval_result |
3658 | 2379 | libtool_options_prep_result=$func_quote_for_eval_result | ||
3659 | 2380 | fi | ||
3660 | 2381 | |||
3661 | 2382 | $_G_rc_lt_options_prep | ||
3665 | 2383 | } | 2301 | } |
3666 | 2384 | func_add_hook func_options_prep libtool_options_prep | 2302 | func_add_hook func_options_prep libtool_options_prep |
3667 | 2385 | 2303 | ||
3668 | @@ -2391,12 +2309,9 @@ libtool_parse_options () | |||
3669 | 2391 | { | 2309 | { |
3670 | 2392 | $debug_cmd | 2310 | $debug_cmd |
3671 | 2393 | 2311 | ||
3672 | 2394 | _G_rc_lt_parse_options=false | ||
3673 | 2395 | |||
3674 | 2396 | # Perform our own loop to consume as many options as possible in | 2312 | # Perform our own loop to consume as many options as possible in |
3675 | 2397 | # each iteration. | 2313 | # each iteration. |
3676 | 2398 | while test $# -gt 0; do | 2314 | while test $# -gt 0; do |
3677 | 2399 | _G_match_lt_parse_options=: | ||
3678 | 2400 | _G_opt=$1 | 2315 | _G_opt=$1 |
3679 | 2401 | shift | 2316 | shift |
3680 | 2402 | case $_G_opt in | 2317 | case $_G_opt in |
3681 | @@ -2471,22 +2386,15 @@ libtool_parse_options () | |||
3682 | 2471 | func_append preserve_args " $_G_opt" | 2386 | func_append preserve_args " $_G_opt" |
3683 | 2472 | ;; | 2387 | ;; |
3684 | 2473 | 2388 | ||
3690 | 2474 | # An option not handled by this hook function: | 2389 | # An option not handled by this hook function: |
3691 | 2475 | *) set dummy "$_G_opt" ${1+"$@"} ; shift | 2390 | *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; |
3687 | 2476 | _G_match_lt_parse_options=false | ||
3688 | 2477 | break | ||
3689 | 2478 | ;; | ||
3692 | 2479 | esac | 2391 | esac |
3693 | 2480 | $_G_match_lt_parse_options && _G_rc_lt_parse_options=: | ||
3694 | 2481 | done | 2392 | done |
3695 | 2482 | 2393 | ||
3696 | 2483 | if $_G_rc_lt_parse_options; then | ||
3697 | 2484 | # save modified positional parameters for caller | ||
3698 | 2485 | func_quote_for_eval ${1+"$@"} | ||
3699 | 2486 | libtool_parse_options_result=$func_quote_for_eval_result | ||
3700 | 2487 | fi | ||
3701 | 2488 | 2394 | ||
3703 | 2489 | $_G_rc_lt_parse_options | 2395 | # save modified positional parameters for caller |
3704 | 2396 | func_quote_for_eval ${1+"$@"} | ||
3705 | 2397 | libtool_parse_options_result=$func_quote_for_eval_result | ||
3706 | 2490 | } | 2398 | } |
3707 | 2491 | func_add_hook func_parse_options libtool_parse_options | 2399 | func_add_hook func_parse_options libtool_parse_options |
3708 | 2492 | 2400 | ||
3709 | @@ -7366,11 +7274,10 @@ func_mode_link () | |||
3710 | 7366 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | 7274 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization |
3711 | 7367 | # -specs=* GCC specs files | 7275 | # -specs=* GCC specs files |
3712 | 7368 | # -stdlib=* select c++ std lib with clang | 7276 | # -stdlib=* select c++ std lib with clang |
3713 | 7369 | # -fsanitize=* Clang/GCC memory and address sanitizer | ||
3714 | 7370 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | 7277 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
3715 | 7371 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | 7278 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
3716 | 7372 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | 7279 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ |
3718 | 7373 | -specs=*|-fsanitize=*) | 7280 | -specs=*) |
3719 | 7374 | func_quote_for_eval "$arg" | 7281 | func_quote_for_eval "$arg" |
3720 | 7375 | arg=$func_quote_for_eval_result | 7282 | arg=$func_quote_for_eval_result |
3721 | 7376 | func_append compile_command " $arg" | 7283 | func_append compile_command " $arg" |
3722 | @@ -7663,10 +7570,7 @@ func_mode_link () | |||
3723 | 7663 | case $pass in | 7570 | case $pass in |
3724 | 7664 | dlopen) libs=$dlfiles ;; | 7571 | dlopen) libs=$dlfiles ;; |
3725 | 7665 | dlpreopen) libs=$dlprefiles ;; | 7572 | dlpreopen) libs=$dlprefiles ;; |
3730 | 7666 | link) | 7573 | link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; |
3727 | 7667 | libs="$deplibs %DEPLIBS%" | ||
3728 | 7668 | test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" | ||
3729 | 7669 | ;; | ||
3731 | 7670 | esac | 7574 | esac |
3732 | 7671 | fi | 7575 | fi |
3733 | 7672 | if test lib,dlpreopen = "$linkmode,$pass"; then | 7576 | if test lib,dlpreopen = "$linkmode,$pass"; then |
3734 | @@ -7985,19 +7889,19 @@ func_mode_link () | |||
3735 | 7985 | # It is a libtool convenience library, so add in its objects. | 7889 | # It is a libtool convenience library, so add in its objects. |
3736 | 7986 | func_append convenience " $ladir/$objdir/$old_library" | 7890 | func_append convenience " $ladir/$objdir/$old_library" |
3737 | 7987 | func_append old_convenience " $ladir/$objdir/$old_library" | 7891 | func_append old_convenience " $ladir/$objdir/$old_library" |
3738 | 7988 | tmp_libs= | ||
3739 | 7989 | for deplib in $dependency_libs; do | ||
3740 | 7990 | deplibs="$deplib $deplibs" | ||
3741 | 7991 | if $opt_preserve_dup_deps; then | ||
3742 | 7992 | case "$tmp_libs " in | ||
3743 | 7993 | *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
3744 | 7994 | esac | ||
3745 | 7995 | fi | ||
3746 | 7996 | func_append tmp_libs " $deplib" | ||
3747 | 7997 | done | ||
3748 | 7998 | elif test prog != "$linkmode" && test lib != "$linkmode"; then | 7892 | elif test prog != "$linkmode" && test lib != "$linkmode"; then |
3749 | 7999 | func_fatal_error "'$lib' is not a convenience library" | 7893 | func_fatal_error "'$lib' is not a convenience library" |
3750 | 8000 | fi | 7894 | fi |
3751 | 7895 | tmp_libs= | ||
3752 | 7896 | for deplib in $dependency_libs; do | ||
3753 | 7897 | deplibs="$deplib $deplibs" | ||
3754 | 7898 | if $opt_preserve_dup_deps; then | ||
3755 | 7899 | case "$tmp_libs " in | ||
3756 | 7900 | *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
3757 | 7901 | esac | ||
3758 | 7902 | fi | ||
3759 | 7903 | func_append tmp_libs " $deplib" | ||
3760 | 7904 | done | ||
3761 | 8001 | continue | 7905 | continue |
3762 | 8002 | fi # $pass = conv | 7906 | fi # $pass = conv |
3763 | 8003 | 7907 | ||
3764 | @@ -8921,9 +8825,6 @@ func_mode_link () | |||
3765 | 8921 | revision=$number_minor | 8825 | revision=$number_minor |
3766 | 8922 | lt_irix_increment=no | 8826 | lt_irix_increment=no |
3767 | 8923 | ;; | 8827 | ;; |
3768 | 8924 | *) | ||
3769 | 8925 | func_fatal_configuration "$modename: unknown library version type '$version_type'" | ||
3770 | 8926 | ;; | ||
3771 | 8927 | esac | 8828 | esac |
3772 | 8928 | ;; | 8829 | ;; |
3773 | 8929 | no) | 8830 | no) |
3774 | diff --git a/build-aux/missing b/build-aux/missing | |||
3775 | index 625aeb1..ab658ed 100755 | |||
3776 | --- a/build-aux/missing | |||
3777 | +++ b/build-aux/missing | |||
3778 | @@ -1,4 +1,4 @@ | |||
3780 | 1 | #! /bin/sh | 1 | #!/usr/bin/sh |
3781 | 2 | # Common wrapper for a few potentially missing GNU programs. | 2 | # Common wrapper for a few potentially missing GNU programs. |
3782 | 3 | 3 | ||
3783 | 4 | scriptversion=2018-03-07.03; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
3784 | diff --git a/clutter/Makefile.in b/clutter/Makefile.in | |||
3785 | index fd88e85..274f598 100644 | |||
3786 | --- a/clutter/Makefile.in | |||
3787 | +++ b/clutter/Makefile.in | |||
3788 | @@ -394,7 +394,6 @@ pdfdir = @pdfdir@ | |||
3789 | 394 | prefix = @prefix@ | 394 | prefix = @prefix@ |
3790 | 395 | program_transform_name = @program_transform_name@ | 395 | program_transform_name = @program_transform_name@ |
3791 | 396 | psdir = @psdir@ | 396 | psdir = @psdir@ |
3792 | 397 | runstatedir = @runstatedir@ | ||
3793 | 398 | sbindir = @sbindir@ | 397 | sbindir = @sbindir@ |
3794 | 399 | sharedstatedir = @sharedstatedir@ | 398 | sharedstatedir = @sharedstatedir@ |
3795 | 400 | srcdir = @srcdir@ | 399 | srcdir = @srcdir@ |
3796 | diff --git a/clutter/aclocal.m4 b/clutter/aclocal.m4 | |||
3797 | index 24c7061..4721d8f 100644 | |||
3798 | --- a/clutter/aclocal.m4 | |||
3799 | +++ b/clutter/aclocal.m4 | |||
3800 | @@ -20,224 +20,9 @@ You have another version of autoconf. It may work, but is not guaranteed to. | |||
3801 | 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. |
3802 | 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'.])]) |
3803 | 22 | 22 | ||
4018 | 23 | # Configure paths for GLIB | 23 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
4019 | 24 | # Owen Taylor 1997-2001 | 24 | # serial 11 (pkg-config-0.29.1) |
3806 | 25 | |||
3807 | 26 | # Increment this whenever this file is changed. | ||
3808 | 27 | #serial 1 | ||
3809 | 28 | |||
3810 | 29 | dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | ||
3811 | 30 | dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, | ||
3812 | 31 | dnl gthread, or gio is specified in MODULES, pass to pkg-config | ||
3813 | 32 | dnl | ||
3814 | 33 | AC_DEFUN([AM_PATH_GLIB_2_0], | ||
3815 | 34 | [dnl | ||
3816 | 35 | dnl Get the cflags and libraries from pkg-config | ||
3817 | 36 | dnl | ||
3818 | 37 | AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], | ||
3819 | 38 | , enable_glibtest=yes) | ||
3820 | 39 | |||
3821 | 40 | pkg_config_args=glib-2.0 | ||
3822 | 41 | for module in . $4 | ||
3823 | 42 | do | ||
3824 | 43 | case "$module" in | ||
3825 | 44 | gmodule) | ||
3826 | 45 | pkg_config_args="$pkg_config_args gmodule-2.0" | ||
3827 | 46 | ;; | ||
3828 | 47 | gmodule-no-export) | ||
3829 | 48 | pkg_config_args="$pkg_config_args gmodule-no-export-2.0" | ||
3830 | 49 | ;; | ||
3831 | 50 | gobject) | ||
3832 | 51 | pkg_config_args="$pkg_config_args gobject-2.0" | ||
3833 | 52 | ;; | ||
3834 | 53 | gthread) | ||
3835 | 54 | pkg_config_args="$pkg_config_args gthread-2.0" | ||
3836 | 55 | ;; | ||
3837 | 56 | gio*) | ||
3838 | 57 | pkg_config_args="$pkg_config_args $module-2.0" | ||
3839 | 58 | ;; | ||
3840 | 59 | esac | ||
3841 | 60 | done | ||
3842 | 61 | |||
3843 | 62 | PKG_PROG_PKG_CONFIG([0.16]) | ||
3844 | 63 | |||
3845 | 64 | no_glib="" | ||
3846 | 65 | |||
3847 | 66 | if test "x$PKG_CONFIG" = x ; then | ||
3848 | 67 | no_glib=yes | ||
3849 | 68 | PKG_CONFIG=no | ||
3850 | 69 | fi | ||
3851 | 70 | |||
3852 | 71 | min_glib_version=ifelse([$1], ,2.0.0,$1) | ||
3853 | 72 | AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | ||
3854 | 73 | |||
3855 | 74 | if test x$PKG_CONFIG != xno ; then | ||
3856 | 75 | ## don't try to run the test against uninstalled libtool libs | ||
3857 | 76 | if $PKG_CONFIG --uninstalled $pkg_config_args; then | ||
3858 | 77 | echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" | ||
3859 | 78 | enable_glibtest=no | ||
3860 | 79 | fi | ||
3861 | 80 | |||
3862 | 81 | if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then | ||
3863 | 82 | : | ||
3864 | 83 | else | ||
3865 | 84 | no_glib=yes | ||
3866 | 85 | fi | ||
3867 | 86 | fi | ||
3868 | 87 | |||
3869 | 88 | if test x"$no_glib" = x ; then | ||
3870 | 89 | GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` | ||
3871 | 90 | GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` | ||
3872 | 91 | GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` | ||
3873 | 92 | GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` | ||
3874 | 93 | |||
3875 | 94 | GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` | ||
3876 | 95 | GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` | ||
3877 | 96 | glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3878 | 97 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
3879 | 98 | glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3880 | 99 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
3881 | 100 | glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3882 | 101 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
3883 | 102 | if test "x$enable_glibtest" = "xyes" ; then | ||
3884 | 103 | ac_save_CFLAGS="$CFLAGS" | ||
3885 | 104 | ac_save_LIBS="$LIBS" | ||
3886 | 105 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
3887 | 106 | LIBS="$GLIB_LIBS $LIBS" | ||
3888 | 107 | dnl | ||
3889 | 108 | dnl Now check if the installed GLIB is sufficiently new. (Also sanity | ||
3890 | 109 | dnl checks the results of pkg-config to some extent) | ||
3891 | 110 | dnl | ||
3892 | 111 | rm -f conf.glibtest | ||
3893 | 112 | AC_TRY_RUN([ | ||
3894 | 113 | #include <glib.h> | ||
3895 | 114 | #include <stdio.h> | ||
3896 | 115 | #include <stdlib.h> | ||
3897 | 116 | |||
3898 | 117 | int | ||
3899 | 118 | main (void) | ||
3900 | 119 | { | ||
3901 | 120 | unsigned int major, minor, micro; | ||
3902 | 121 | |||
3903 | 122 | fclose (fopen ("conf.glibtest", "w")); | ||
3904 | 123 | |||
3905 | 124 | if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { | ||
3906 | 125 | printf("%s, bad version string\n", "$min_glib_version"); | ||
3907 | 126 | exit(1); | ||
3908 | 127 | } | ||
3909 | 128 | |||
3910 | 129 | if ((glib_major_version != $glib_config_major_version) || | ||
3911 | 130 | (glib_minor_version != $glib_config_minor_version) || | ||
3912 | 131 | (glib_micro_version != $glib_config_micro_version)) | ||
3913 | 132 | { | ||
3914 | 133 | printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", | ||
3915 | 134 | $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, | ||
3916 | 135 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3917 | 136 | printf ("*** was found! If pkg-config was correct, then it is best\n"); | ||
3918 | 137 | printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); | ||
3919 | 138 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | ||
3920 | 139 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | ||
3921 | 140 | printf("*** required on your system.\n"); | ||
3922 | 141 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); | ||
3923 | 142 | printf("*** to point to the correct configuration files\n"); | ||
3924 | 143 | } | ||
3925 | 144 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || | ||
3926 | 145 | (glib_minor_version != GLIB_MINOR_VERSION) || | ||
3927 | 146 | (glib_micro_version != GLIB_MICRO_VERSION)) | ||
3928 | 147 | { | ||
3929 | 148 | printf("*** GLIB header files (version %d.%d.%d) do not match\n", | ||
3930 | 149 | GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | ||
3931 | 150 | printf("*** library (version %d.%d.%d)\n", | ||
3932 | 151 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3933 | 152 | } | ||
3934 | 153 | else | ||
3935 | 154 | { | ||
3936 | 155 | if ((glib_major_version > major) || | ||
3937 | 156 | ((glib_major_version == major) && (glib_minor_version > minor)) || | ||
3938 | 157 | ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) | ||
3939 | 158 | { | ||
3940 | 159 | return 0; | ||
3941 | 160 | } | ||
3942 | 161 | else | ||
3943 | 162 | { | ||
3944 | 163 | printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", | ||
3945 | 164 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3946 | 165 | printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", | ||
3947 | 166 | major, minor, micro); | ||
3948 | 167 | printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | ||
3949 | 168 | printf("***\n"); | ||
3950 | 169 | printf("*** If you have already installed a sufficiently new version, this error\n"); | ||
3951 | 170 | printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); | ||
3952 | 171 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | ||
3953 | 172 | printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); | ||
3954 | 173 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); | ||
3955 | 174 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | ||
3956 | 175 | printf("*** so that the correct libraries are found at run-time))\n"); | ||
3957 | 176 | } | ||
3958 | 177 | } | ||
3959 | 178 | return 1; | ||
3960 | 179 | } | ||
3961 | 180 | ],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
3962 | 181 | CFLAGS="$ac_save_CFLAGS" | ||
3963 | 182 | LIBS="$ac_save_LIBS" | ||
3964 | 183 | fi | ||
3965 | 184 | fi | ||
3966 | 185 | if test "x$no_glib" = x ; then | ||
3967 | 186 | AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) | ||
3968 | 187 | ifelse([$2], , :, [$2]) | ||
3969 | 188 | else | ||
3970 | 189 | AC_MSG_RESULT(no) | ||
3971 | 190 | if test "$PKG_CONFIG" = "no" ; then | ||
3972 | 191 | echo "*** A new enough version of pkg-config was not found." | ||
3973 | 192 | echo "*** See http://www.freedesktop.org/software/pkgconfig/" | ||
3974 | 193 | else | ||
3975 | 194 | if test -f conf.glibtest ; then | ||
3976 | 195 | : | ||
3977 | 196 | else | ||
3978 | 197 | echo "*** Could not run GLIB test program, checking why..." | ||
3979 | 198 | ac_save_CFLAGS="$CFLAGS" | ||
3980 | 199 | ac_save_LIBS="$LIBS" | ||
3981 | 200 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
3982 | 201 | LIBS="$LIBS $GLIB_LIBS" | ||
3983 | 202 | AC_TRY_LINK([ | ||
3984 | 203 | #include <glib.h> | ||
3985 | 204 | #include <stdio.h> | ||
3986 | 205 | ], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], | ||
3987 | 206 | [ echo "*** The test program compiled, but did not run. This usually means" | ||
3988 | 207 | echo "*** that the run-time linker is not finding GLIB or finding the wrong" | ||
3989 | 208 | echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" | ||
3990 | 209 | echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
3991 | 210 | echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
3992 | 211 | echo "*** is required on your system" | ||
3993 | 212 | echo "***" | ||
3994 | 213 | echo "*** If you have an old version installed, it is best to remove it, although" | ||
3995 | 214 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | ||
3996 | 215 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
3997 | 216 | echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) | ||
3998 | 217 | CFLAGS="$ac_save_CFLAGS" | ||
3999 | 218 | LIBS="$ac_save_LIBS" | ||
4000 | 219 | fi | ||
4001 | 220 | fi | ||
4002 | 221 | GLIB_CFLAGS="" | ||
4003 | 222 | GLIB_LIBS="" | ||
4004 | 223 | GLIB_GENMARSHAL="" | ||
4005 | 224 | GOBJECT_QUERY="" | ||
4006 | 225 | GLIB_MKENUMS="" | ||
4007 | 226 | GLIB_COMPILE_RESOURCES="" | ||
4008 | 227 | ifelse([$3], , :, [$3]) | ||
4009 | 228 | fi | ||
4010 | 229 | AC_SUBST(GLIB_CFLAGS) | ||
4011 | 230 | AC_SUBST(GLIB_LIBS) | ||
4012 | 231 | AC_SUBST(GLIB_GENMARSHAL) | ||
4013 | 232 | AC_SUBST(GOBJECT_QUERY) | ||
4014 | 233 | AC_SUBST(GLIB_MKENUMS) | ||
4015 | 234 | AC_SUBST(GLIB_COMPILE_RESOURCES) | ||
4016 | 235 | rm -f conf.glibtest | ||
4017 | 236 | ]) | ||
4020 | 237 | 25 | ||
4021 | 238 | dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
4022 | 239 | dnl serial 11 (pkg-config-0.29.1) | ||
4023 | 240 | dnl | ||
4024 | 241 | dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | 26 | dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
4025 | 242 | dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> | 27 | dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> |
4026 | 243 | dnl | 28 | dnl |
4027 | @@ -511,6 +296,290 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) | |||
4028 | 511 | AS_VAR_IF([$1], [""], [$5], [$4])dnl | 296 | AS_VAR_IF([$1], [""], [$5], [$4])dnl |
4029 | 512 | ])dnl PKG_CHECK_VAR | 297 | ])dnl PKG_CHECK_VAR |
4030 | 513 | 298 | ||
4031 | 299 | dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
4032 | 300 | dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], | ||
4033 | 301 | dnl [DESCRIPTION], [DEFAULT]) | ||
4034 | 302 | dnl ------------------------------------------ | ||
4035 | 303 | dnl | ||
4036 | 304 | dnl Prepare a "--with-" configure option using the lowercase | ||
4037 | 305 | dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and | ||
4038 | 306 | dnl PKG_CHECK_MODULES in a single macro. | ||
4039 | 307 | AC_DEFUN([PKG_WITH_MODULES], | ||
4040 | 308 | [ | ||
4041 | 309 | m4_pushdef([with_arg], m4_tolower([$1])) | ||
4042 | 310 | |||
4043 | 311 | m4_pushdef([description], | ||
4044 | 312 | [m4_default([$5], [build with ]with_arg[ support])]) | ||
4045 | 313 | |||
4046 | 314 | m4_pushdef([def_arg], [m4_default([$6], [auto])]) | ||
4047 | 315 | m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) | ||
4048 | 316 | m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) | ||
4049 | 317 | |||
4050 | 318 | m4_case(def_arg, | ||
4051 | 319 | [yes],[m4_pushdef([with_without], [--without-]with_arg)], | ||
4052 | 320 | [m4_pushdef([with_without],[--with-]with_arg)]) | ||
4053 | 321 | |||
4054 | 322 | AC_ARG_WITH(with_arg, | ||
4055 | 323 | AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, | ||
4056 | 324 | [AS_TR_SH([with_]with_arg)=def_arg]) | ||
4057 | 325 | |||
4058 | 326 | AS_CASE([$AS_TR_SH([with_]with_arg)], | ||
4059 | 327 | [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], | ||
4060 | 328 | [auto],[PKG_CHECK_MODULES([$1],[$2], | ||
4061 | 329 | [m4_n([def_action_if_found]) $3], | ||
4062 | 330 | [m4_n([def_action_if_not_found]) $4])]) | ||
4063 | 331 | |||
4064 | 332 | m4_popdef([with_arg]) | ||
4065 | 333 | m4_popdef([description]) | ||
4066 | 334 | m4_popdef([def_arg]) | ||
4067 | 335 | |||
4068 | 336 | ])dnl PKG_WITH_MODULES | ||
4069 | 337 | |||
4070 | 338 | dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
4071 | 339 | dnl [DESCRIPTION], [DEFAULT]) | ||
4072 | 340 | dnl ----------------------------------------------- | ||
4073 | 341 | dnl | ||
4074 | 342 | dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES | ||
4075 | 343 | dnl check._[VARIABLE-PREFIX] is exported as make variable. | ||
4076 | 344 | AC_DEFUN([PKG_HAVE_WITH_MODULES], | ||
4077 | 345 | [ | ||
4078 | 346 | PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) | ||
4079 | 347 | |||
4080 | 348 | AM_CONDITIONAL([HAVE_][$1], | ||
4081 | 349 | [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) | ||
4082 | 350 | ])dnl PKG_HAVE_WITH_MODULES | ||
4083 | 351 | |||
4084 | 352 | dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
4085 | 353 | dnl [DESCRIPTION], [DEFAULT]) | ||
4086 | 354 | dnl ------------------------------------------------------ | ||
4087 | 355 | dnl | ||
4088 | 356 | dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after | ||
4089 | 357 | dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make | ||
4090 | 358 | dnl and preprocessor variable. | ||
4091 | 359 | AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], | ||
4092 | 360 | [ | ||
4093 | 361 | PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) | ||
4094 | 362 | |||
4095 | 363 | AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], | ||
4096 | 364 | [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) | ||
4097 | 365 | ])dnl PKG_HAVE_DEFINE_WITH_MODULES | ||
4098 | 366 | |||
4099 | 367 | # Configure paths for GLIB | ||
4100 | 368 | # Owen Taylor 1997-2001 | ||
4101 | 369 | |||
4102 | 370 | # Increment this whenever this file is changed. | ||
4103 | 371 | #serial 3 | ||
4104 | 372 | |||
4105 | 373 | dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | ||
4106 | 374 | dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, | ||
4107 | 375 | dnl gthread, or gio is specified in MODULES, pass to pkg-config | ||
4108 | 376 | dnl | ||
4109 | 377 | AC_DEFUN([AM_PATH_GLIB_2_0], | ||
4110 | 378 | [dnl | ||
4111 | 379 | dnl Get the cflags and libraries from pkg-config | ||
4112 | 380 | dnl | ||
4113 | 381 | |||
4114 | 382 | dnl We can't use PKG_PREREQ because that needs 0.29. | ||
4115 | 383 | m4_ifndef([PKG_PROG_PKG_CONFIG], | ||
4116 | 384 | [pkg.m4 version 0.28 or later is required]) | ||
4117 | 385 | |||
4118 | 386 | AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], | ||
4119 | 387 | , enable_glibtest=yes) | ||
4120 | 388 | |||
4121 | 389 | min_glib_version=ifelse([$1], [], [2.0.0], [$1]) | ||
4122 | 390 | pkg_config_args="glib-2.0 >= $min_glib_version" | ||
4123 | 391 | for module in . $4 | ||
4124 | 392 | do | ||
4125 | 393 | case "$module" in | ||
4126 | 394 | gmodule) | ||
4127 | 395 | pkg_config_args="$pkg_config_args gmodule-2.0" | ||
4128 | 396 | ;; | ||
4129 | 397 | gmodule-no-export) | ||
4130 | 398 | pkg_config_args="$pkg_config_args gmodule-no-export-2.0" | ||
4131 | 399 | ;; | ||
4132 | 400 | gobject) | ||
4133 | 401 | pkg_config_args="$pkg_config_args gobject-2.0" | ||
4134 | 402 | ;; | ||
4135 | 403 | gthread) | ||
4136 | 404 | pkg_config_args="$pkg_config_args gthread-2.0" | ||
4137 | 405 | ;; | ||
4138 | 406 | gio*) | ||
4139 | 407 | pkg_config_args="$pkg_config_args $module-2.0" | ||
4140 | 408 | ;; | ||
4141 | 409 | esac | ||
4142 | 410 | done | ||
4143 | 411 | |||
4144 | 412 | PKG_PROG_PKG_CONFIG([0.16]) | ||
4145 | 413 | |||
4146 | 414 | no_glib="" | ||
4147 | 415 | |||
4148 | 416 | if test "x$PKG_CONFIG" = x ; then | ||
4149 | 417 | no_glib=yes | ||
4150 | 418 | PKG_CONFIG=no | ||
4151 | 419 | fi | ||
4152 | 420 | |||
4153 | 421 | dnl For GLIB_CFLAGS and GLIB_LIBS | ||
4154 | 422 | PKG_CHECK_MODULES([GLIB], [$pkg_config_args], [:], [:]) | ||
4155 | 423 | |||
4156 | 424 | dnl For the tools | ||
4157 | 425 | PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal]) | ||
4158 | 426 | PKG_CHECK_VAR([GOBJECT_QUERY], [glib-2.0], [gobject_query]) | ||
4159 | 427 | PKG_CHECK_VAR([GLIB_MKENUMS], [glib-2.0], [glib_mkenums]) | ||
4160 | 428 | PKG_CHECK_VAR([GLIB_COMPILE_RESOURCES], [gio-2.0], [glib_compile_resources]) | ||
4161 | 429 | |||
4162 | 430 | AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | ||
4163 | 431 | |||
4164 | 432 | if test x$PKG_CONFIG != xno ; then | ||
4165 | 433 | ## don't try to run the test against uninstalled libtool libs | ||
4166 | 434 | if $PKG_CONFIG --uninstalled $pkg_config_args; then | ||
4167 | 435 | echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" | ||
4168 | 436 | enable_glibtest=no | ||
4169 | 437 | fi | ||
4170 | 438 | |||
4171 | 439 | if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then | ||
4172 | 440 | : | ||
4173 | 441 | else | ||
4174 | 442 | no_glib=yes | ||
4175 | 443 | fi | ||
4176 | 444 | fi | ||
4177 | 445 | |||
4178 | 446 | if test x"$no_glib" = x ; then | ||
4179 | 447 | glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
4180 | 448 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
4181 | 449 | glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
4182 | 450 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
4183 | 451 | glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
4184 | 452 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
4185 | 453 | if test "x$enable_glibtest" = "xyes" ; then | ||
4186 | 454 | ac_save_CFLAGS="$CFLAGS" | ||
4187 | 455 | ac_save_LIBS="$LIBS" | ||
4188 | 456 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
4189 | 457 | LIBS="$GLIB_LIBS $LIBS" | ||
4190 | 458 | dnl | ||
4191 | 459 | dnl Now check if the installed GLIB is sufficiently new. (Also sanity | ||
4192 | 460 | dnl checks the results of pkg-config to some extent) | ||
4193 | 461 | dnl | ||
4194 | 462 | rm -f conf.glibtest | ||
4195 | 463 | AC_TRY_RUN([ | ||
4196 | 464 | #include <glib.h> | ||
4197 | 465 | #include <stdio.h> | ||
4198 | 466 | #include <stdlib.h> | ||
4199 | 467 | |||
4200 | 468 | int | ||
4201 | 469 | main (void) | ||
4202 | 470 | { | ||
4203 | 471 | unsigned int major, minor, micro; | ||
4204 | 472 | |||
4205 | 473 | fclose (fopen ("conf.glibtest", "w")); | ||
4206 | 474 | |||
4207 | 475 | if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { | ||
4208 | 476 | printf("%s, bad version string\n", "$min_glib_version"); | ||
4209 | 477 | exit(1); | ||
4210 | 478 | } | ||
4211 | 479 | |||
4212 | 480 | if ((glib_major_version != $glib_config_major_version) || | ||
4213 | 481 | (glib_minor_version != $glib_config_minor_version) || | ||
4214 | 482 | (glib_micro_version != $glib_config_micro_version)) | ||
4215 | 483 | { | ||
4216 | 484 | printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", | ||
4217 | 485 | $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, | ||
4218 | 486 | glib_major_version, glib_minor_version, glib_micro_version); | ||
4219 | 487 | printf ("*** was found! If pkg-config was correct, then it is best\n"); | ||
4220 | 488 | printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); | ||
4221 | 489 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | ||
4222 | 490 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | ||
4223 | 491 | printf("*** required on your system.\n"); | ||
4224 | 492 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); | ||
4225 | 493 | printf("*** to point to the correct configuration files\n"); | ||
4226 | 494 | } | ||
4227 | 495 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || | ||
4228 | 496 | (glib_minor_version != GLIB_MINOR_VERSION) || | ||
4229 | 497 | (glib_micro_version != GLIB_MICRO_VERSION)) | ||
4230 | 498 | { | ||
4231 | 499 | printf("*** GLIB header files (version %d.%d.%d) do not match\n", | ||
4232 | 500 | GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | ||
4233 | 501 | printf("*** library (version %d.%d.%d)\n", | ||
4234 | 502 | glib_major_version, glib_minor_version, glib_micro_version); | ||
4235 | 503 | } | ||
4236 | 504 | else | ||
4237 | 505 | { | ||
4238 | 506 | if ((glib_major_version > major) || | ||
4239 | 507 | ((glib_major_version == major) && (glib_minor_version > minor)) || | ||
4240 | 508 | ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) | ||
4241 | 509 | { | ||
4242 | 510 | return 0; | ||
4243 | 511 | } | ||
4244 | 512 | else | ||
4245 | 513 | { | ||
4246 | 514 | printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", | ||
4247 | 515 | glib_major_version, glib_minor_version, glib_micro_version); | ||
4248 | 516 | printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", | ||
4249 | 517 | major, minor, micro); | ||
4250 | 518 | printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | ||
4251 | 519 | printf("***\n"); | ||
4252 | 520 | printf("*** If you have already installed a sufficiently new version, this error\n"); | ||
4253 | 521 | printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); | ||
4254 | 522 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | ||
4255 | 523 | printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); | ||
4256 | 524 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); | ||
4257 | 525 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | ||
4258 | 526 | printf("*** so that the correct libraries are found at run-time))\n"); | ||
4259 | 527 | } | ||
4260 | 528 | } | ||
4261 | 529 | return 1; | ||
4262 | 530 | } | ||
4263 | 531 | ],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
4264 | 532 | CFLAGS="$ac_save_CFLAGS" | ||
4265 | 533 | LIBS="$ac_save_LIBS" | ||
4266 | 534 | fi | ||
4267 | 535 | fi | ||
4268 | 536 | if test "x$no_glib" = x ; then | ||
4269 | 537 | AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) | ||
4270 | 538 | ifelse([$2], , :, [$2]) | ||
4271 | 539 | else | ||
4272 | 540 | AC_MSG_RESULT(no) | ||
4273 | 541 | if test "$PKG_CONFIG" = "no" ; then | ||
4274 | 542 | echo "*** A new enough version of pkg-config was not found." | ||
4275 | 543 | echo "*** See http://www.freedesktop.org/software/pkgconfig/" | ||
4276 | 544 | else | ||
4277 | 545 | if test -f conf.glibtest ; then | ||
4278 | 546 | : | ||
4279 | 547 | else | ||
4280 | 548 | echo "*** Could not run GLIB test program, checking why..." | ||
4281 | 549 | ac_save_CFLAGS="$CFLAGS" | ||
4282 | 550 | ac_save_LIBS="$LIBS" | ||
4283 | 551 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
4284 | 552 | LIBS="$LIBS $GLIB_LIBS" | ||
4285 | 553 | AC_TRY_LINK([ | ||
4286 | 554 | #include <glib.h> | ||
4287 | 555 | #include <stdio.h> | ||
4288 | 556 | ], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], | ||
4289 | 557 | [ echo "*** The test program compiled, but did not run. This usually means" | ||
4290 | 558 | echo "*** that the run-time linker is not finding GLIB or finding the wrong" | ||
4291 | 559 | echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" | ||
4292 | 560 | echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
4293 | 561 | echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
4294 | 562 | echo "*** is required on your system" | ||
4295 | 563 | echo "***" | ||
4296 | 564 | echo "*** If you have an old version installed, it is best to remove it, although" | ||
4297 | 565 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | ||
4298 | 566 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
4299 | 567 | echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) | ||
4300 | 568 | CFLAGS="$ac_save_CFLAGS" | ||
4301 | 569 | LIBS="$ac_save_LIBS" | ||
4302 | 570 | fi | ||
4303 | 571 | fi | ||
4304 | 572 | GLIB_CFLAGS="" | ||
4305 | 573 | GLIB_LIBS="" | ||
4306 | 574 | GLIB_GENMARSHAL="" | ||
4307 | 575 | GOBJECT_QUERY="" | ||
4308 | 576 | GLIB_MKENUMS="" | ||
4309 | 577 | GLIB_COMPILE_RESOURCES="" | ||
4310 | 578 | ifelse([$3], , :, [$3]) | ||
4311 | 579 | fi | ||
4312 | 580 | rm -f conf.glibtest | ||
4313 | 581 | ]) | ||
4314 | 582 | |||
4315 | 514 | # Copyright (C) 2002-2018 Free Software Foundation, Inc. | 583 | # Copyright (C) 2002-2018 Free Software Foundation, Inc. |
4316 | 515 | # | 584 | # |
4317 | 516 | # This file is free software; the Free Software Foundation | 585 | # This file is free software; the Free Software Foundation |
4318 | diff --git a/clutter/build/Makefile.in b/clutter/build/Makefile.in | |||
4319 | index 7fbab51..ffafc25 100644 | |||
4320 | --- a/clutter/build/Makefile.in | |||
4321 | +++ b/clutter/build/Makefile.in | |||
4322 | @@ -162,7 +162,7 @@ ETAGS = etags | |||
4323 | 162 | CTAGS = ctags | 162 | CTAGS = ctags |
4324 | 163 | DIST_SUBDIRS = $(SUBDIRS) | 163 | DIST_SUBDIRS = $(SUBDIRS) |
4325 | 164 | am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \ | 164 | am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \ |
4327 | 165 | config.sub install-sh ltmain.sh missing | 165 | config.sub depcomp install-sh ltmain.sh missing |
4328 | 166 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 166 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4329 | 167 | am__relativize = \ | 167 | am__relativize = \ |
4330 | 168 | dir0=`pwd`; \ | 168 | dir0=`pwd`; \ |
4331 | @@ -372,7 +372,6 @@ pdfdir = @pdfdir@ | |||
4332 | 372 | prefix = @prefix@ | 372 | prefix = @prefix@ |
4333 | 373 | program_transform_name = @program_transform_name@ | 373 | program_transform_name = @program_transform_name@ |
4334 | 374 | psdir = @psdir@ | 374 | psdir = @psdir@ |
4335 | 375 | runstatedir = @runstatedir@ | ||
4336 | 376 | sbindir = @sbindir@ | 375 | sbindir = @sbindir@ |
4337 | 377 | sharedstatedir = @sharedstatedir@ | 376 | sharedstatedir = @sharedstatedir@ |
4338 | 378 | srcdir = @srcdir@ | 377 | srcdir = @srcdir@ |
4339 | diff --git a/clutter/build/autotools/Makefile.in b/clutter/build/autotools/Makefile.in | |||
4340 | index 489ce7a..25c4a75 100644 | |||
4341 | --- a/clutter/build/autotools/Makefile.in | |||
4342 | +++ b/clutter/build/autotools/Makefile.in | |||
4343 | @@ -311,7 +311,6 @@ pdfdir = @pdfdir@ | |||
4344 | 311 | prefix = @prefix@ | 311 | prefix = @prefix@ |
4345 | 312 | program_transform_name = @program_transform_name@ | 312 | program_transform_name = @program_transform_name@ |
4346 | 313 | psdir = @psdir@ | 313 | psdir = @psdir@ |
4347 | 314 | runstatedir = @runstatedir@ | ||
4348 | 315 | sbindir = @sbindir@ | 314 | sbindir = @sbindir@ |
4349 | 316 | sharedstatedir = @sharedstatedir@ | 315 | sharedstatedir = @sharedstatedir@ |
4350 | 317 | srcdir = @srcdir@ | 316 | srcdir = @srcdir@ |
4351 | diff --git a/clutter/build/autotools/libtool.m4 b/clutter/build/autotools/libtool.m4 | |||
4352 | index c81e669..a644432 100644 | |||
4353 | --- a/clutter/build/autotools/libtool.m4 | |||
4354 | +++ b/clutter/build/autotools/libtool.m4 | |||
4355 | @@ -728,6 +728,7 @@ _LT_CONFIG_SAVE_COMMANDS([ | |||
4356 | 728 | cat <<_LT_EOF >> "$cfgfile" | 728 | cat <<_LT_EOF >> "$cfgfile" |
4357 | 729 | #! $SHELL | 729 | #! $SHELL |
4358 | 730 | # Generated automatically by $as_me ($PACKAGE) $VERSION | 730 | # Generated automatically by $as_me ($PACKAGE) $VERSION |
4359 | 731 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: | ||
4360 | 731 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 732 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
4361 | 732 | 733 | ||
4362 | 733 | # Provide generalized library-building support services. | 734 | # Provide generalized library-building support services. |
4363 | @@ -2866,6 +2867,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
4364 | 2866 | # before this can be enabled. | 2867 | # before this can be enabled. |
4365 | 2867 | hardcode_into_libs=yes | 2868 | hardcode_into_libs=yes |
4366 | 2868 | 2869 | ||
4367 | 2870 | # Add ABI-specific directories to the system library path. | ||
4368 | 2871 | sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" | ||
4369 | 2872 | |||
4370 | 2869 | # Ideally, we could use ldconfig to report *all* directores which are | 2873 | # Ideally, we could use ldconfig to report *all* directores which are |
4371 | 2870 | # searched for libraries, however this is still not possible. Aside from not | 2874 | # searched for libraries, however this is still not possible. Aside from not |
4372 | 2871 | # being certain /sbin/ldconfig is available, command | 2875 | # being certain /sbin/ldconfig is available, command |
4373 | @@ -2874,7 +2878,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
4374 | 2874 | # appending ld.so.conf contents (and includes) to the search path. | 2878 | # appending ld.so.conf contents (and includes) to the search path. |
4375 | 2875 | if test -f /etc/ld.so.conf; then | 2879 | if test -f /etc/ld.so.conf; then |
4376 | 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' ' '` | 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' ' '` |
4378 | 2877 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 2881 | sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" |
4379 | 2878 | fi | 2882 | fi |
4380 | 2879 | 2883 | ||
4381 | 2880 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 2884 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
4382 | @@ -2886,18 +2890,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
4383 | 2886 | dynamic_linker='GNU/Linux ld.so' | 2890 | dynamic_linker='GNU/Linux ld.so' |
4384 | 2887 | ;; | 2891 | ;; |
4385 | 2888 | 2892 | ||
4386 | 2889 | netbsdelf*-gnu) | ||
4387 | 2890 | version_type=linux | ||
4388 | 2891 | need_lib_prefix=no | ||
4389 | 2892 | need_version=no | ||
4390 | 2893 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
4391 | 2894 | soname_spec='${libname}${release}${shared_ext}$major' | ||
4392 | 2895 | shlibpath_var=LD_LIBRARY_PATH | ||
4393 | 2896 | shlibpath_overrides_runpath=no | ||
4394 | 2897 | hardcode_into_libs=yes | ||
4395 | 2898 | dynamic_linker='NetBSD ld.elf_so' | ||
4396 | 2899 | ;; | ||
4397 | 2900 | |||
4398 | 2901 | netbsd*) | 2893 | netbsd*) |
4399 | 2902 | version_type=sunos | 2894 | version_type=sunos |
4400 | 2903 | need_lib_prefix=no | 2895 | need_lib_prefix=no |
4401 | @@ -3557,7 +3549,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
4402 | 3557 | lt_cv_deplibs_check_method=pass_all | 3549 | lt_cv_deplibs_check_method=pass_all |
4403 | 3558 | ;; | 3550 | ;; |
4404 | 3559 | 3551 | ||
4406 | 3560 | netbsd* | netbsdelf*-gnu) | 3552 | netbsd*) |
4407 | 3561 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 3553 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
4408 | 3562 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | 3554 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
4409 | 3563 | else | 3555 | else |
4410 | @@ -4063,8 +4055,7 @@ _LT_EOF | |||
4411 | 4063 | if AC_TRY_EVAL(ac_compile); then | 4055 | if AC_TRY_EVAL(ac_compile); then |
4412 | 4064 | # Now try to grab the symbols. | 4056 | # Now try to grab the symbols. |
4413 | 4065 | nlist=conftest.nm | 4057 | nlist=conftest.nm |
4416 | 4066 | $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD | 4058 | if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
4415 | 4067 | if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then | ||
4417 | 4068 | # Try sorting and uniquifying the output. | 4059 | # Try sorting and uniquifying the output. |
4418 | 4069 | if sort "$nlist" | uniq > "$nlist"T; then | 4060 | if sort "$nlist" | uniq > "$nlist"T; then |
4419 | 4070 | mv -f "$nlist"T "$nlist" | 4061 | mv -f "$nlist"T "$nlist" |
4420 | @@ -4436,7 +4427,7 @@ m4_if([$1], [CXX], [ | |||
4421 | 4436 | ;; | 4427 | ;; |
4422 | 4437 | esac | 4428 | esac |
4423 | 4438 | ;; | 4429 | ;; |
4425 | 4439 | netbsd* | netbsdelf*-gnu) | 4430 | netbsd*) |
4426 | 4440 | ;; | 4431 | ;; |
4427 | 4441 | *qnx* | *nto*) | 4432 | *qnx* | *nto*) |
4428 | 4442 | # QNX uses GNU C++, but need to define -shared option too, otherwise | 4433 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
4429 | @@ -4948,9 +4939,6 @@ m4_if([$1], [CXX], [ | |||
4430 | 4948 | ;; | 4939 | ;; |
4431 | 4949 | esac | 4940 | esac |
4432 | 4950 | ;; | 4941 | ;; |
4433 | 4951 | linux* | k*bsd*-gnu | gnu*) | ||
4434 | 4952 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4435 | 4953 | ;; | ||
4436 | 4954 | *) | 4942 | *) |
4437 | 4955 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4943 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
4438 | 4956 | ;; | 4944 | ;; |
4439 | @@ -5013,9 +5001,6 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4440 | 5013 | openbsd* | bitrig*) | 5001 | openbsd* | bitrig*) |
4441 | 5014 | with_gnu_ld=no | 5002 | with_gnu_ld=no |
4442 | 5015 | ;; | 5003 | ;; |
4443 | 5016 | linux* | k*bsd*-gnu | gnu*) | ||
4444 | 5017 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4445 | 5018 | ;; | ||
4446 | 5019 | esac | 5004 | esac |
4447 | 5020 | 5005 | ||
4448 | 5021 | _LT_TAGVAR(ld_shlibs, $1)=yes | 5006 | _LT_TAGVAR(ld_shlibs, $1)=yes |
4449 | @@ -5270,7 +5255,7 @@ _LT_EOF | |||
4450 | 5270 | fi | 5255 | fi |
4451 | 5271 | ;; | 5256 | ;; |
4452 | 5272 | 5257 | ||
4454 | 5273 | netbsd* | netbsdelf*-gnu) | 5258 | netbsd*) |
4455 | 5274 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 5259 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4456 | 5275 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 5260 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4457 | 5276 | wlarc= | 5261 | wlarc= |
4458 | @@ -5791,7 +5776,6 @@ _LT_EOF | |||
4459 | 5791 | if test yes = "$lt_cv_irix_exported_symbol"; then | 5776 | if test yes = "$lt_cv_irix_exported_symbol"; then |
4460 | 5792 | _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' | 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' |
4461 | 5793 | fi | 5778 | fi |
4462 | 5794 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4463 | 5795 | else | 5779 | else |
4464 | 5796 | _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' | 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' |
4465 | 5797 | _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' | 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' |
4466 | @@ -5813,7 +5797,7 @@ _LT_EOF | |||
4467 | 5813 | esac | 5797 | esac |
4468 | 5814 | ;; | 5798 | ;; |
4469 | 5815 | 5799 | ||
4471 | 5816 | netbsd* | netbsdelf*-gnu) | 5800 | netbsd*) |
4472 | 5817 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 5801 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4473 | 5818 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 5802 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
4474 | 5819 | else | 5803 | else |
4475 | @@ -6439,7 +6423,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4476 | 6439 | # Commands to make compiler produce verbose output that lists | 6423 | # Commands to make compiler produce verbose output that lists |
4477 | 6440 | # what "hidden" libraries, object files and flags are used when | 6424 | # what "hidden" libraries, object files and flags are used when |
4478 | 6441 | # linking a shared library. | 6425 | # linking a shared library. |
4480 | 6442 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' | 6426 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4481 | 6443 | 6427 | ||
4482 | 6444 | else | 6428 | else |
4483 | 6445 | GXX=no | 6429 | GXX=no |
4484 | @@ -6814,7 +6798,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4485 | 6814 | # explicitly linking system object files so we need to strip them | 6798 | # explicitly linking system object files so we need to strip them |
4486 | 6815 | # from the output so that they don't get included in the library | 6799 | # from the output so that they don't get included in the library |
4487 | 6816 | # dependencies. | 6800 | # dependencies. |
4489 | 6817 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | 6801 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4490 | 6818 | ;; | 6802 | ;; |
4491 | 6819 | *) | 6803 | *) |
4492 | 6820 | if test yes = "$GXX"; then | 6804 | if test yes = "$GXX"; then |
4493 | @@ -6879,7 +6863,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4494 | 6879 | # explicitly linking system object files so we need to strip them | 6863 | # explicitly linking system object files so we need to strip them |
4495 | 6880 | # from the output so that they don't get included in the library | 6864 | # from the output so that they don't get included in the library |
4496 | 6881 | # dependencies. | 6865 | # dependencies. |
4498 | 6882 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | 6866 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4499 | 6883 | ;; | 6867 | ;; |
4500 | 6884 | *) | 6868 | *) |
4501 | 6885 | if test yes = "$GXX"; then | 6869 | if test yes = "$GXX"; then |
4502 | @@ -7218,7 +7202,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4503 | 7218 | # Commands to make compiler produce verbose output that lists | 7202 | # Commands to make compiler produce verbose output that lists |
4504 | 7219 | # what "hidden" libraries, object files and flags are used when | 7203 | # what "hidden" libraries, object files and flags are used when |
4505 | 7220 | # linking a shared library. | 7204 | # linking a shared library. |
4507 | 7221 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' | 7205 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4508 | 7222 | 7206 | ||
4509 | 7223 | else | 7207 | else |
4510 | 7224 | # FIXME: insert proper C++ library support | 7208 | # FIXME: insert proper C++ library support |
4511 | @@ -7302,7 +7286,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4512 | 7302 | # Commands to make compiler produce verbose output that lists | 7286 | # Commands to make compiler produce verbose output that lists |
4513 | 7303 | # what "hidden" libraries, object files and flags are used when | 7287 | # what "hidden" libraries, object files and flags are used when |
4514 | 7304 | # linking a shared library. | 7288 | # linking a shared library. |
4516 | 7305 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' | 7289 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4517 | 7306 | else | 7290 | else |
4518 | 7307 | # g++ 2.7 appears to require '-G' NOT '-shared' on this | 7291 | # g++ 2.7 appears to require '-G' NOT '-shared' on this |
4519 | 7308 | # platform. | 7292 | # platform. |
4520 | @@ -7313,7 +7297,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4521 | 7313 | # Commands to make compiler produce verbose output that lists | 7297 | # Commands to make compiler produce verbose output that lists |
4522 | 7314 | # what "hidden" libraries, object files and flags are used when | 7298 | # what "hidden" libraries, object files and flags are used when |
4523 | 7315 | # linking a shared library. | 7299 | # linking a shared library. |
4525 | 7316 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' | 7300 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4526 | 7317 | fi | 7301 | fi |
4527 | 7318 | 7302 | ||
4528 | 7319 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' | 7303 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' |
4529 | diff --git a/clutter/build/compile b/clutter/build/compile | |||
4530 | index 99e5052..b89c278 100755 | |||
4531 | --- a/clutter/build/compile | |||
4532 | +++ b/clutter/build/compile | |||
4533 | @@ -1,4 +1,4 @@ | |||
4535 | 1 | #! /bin/sh | 1 | #!/usr/bin/sh |
4536 | 2 | # Wrapper for compilers which do not understand '-c -o'. | 2 | # Wrapper for compilers which do not understand '-c -o'. |
4537 | 3 | 3 | ||
4538 | 4 | scriptversion=2018-03-07.03; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
4539 | diff --git a/clutter/build/config.guess b/clutter/build/config.guess | |||
4540 | index f50dcdb..b5d7a0f 100755 | |||
4541 | --- a/clutter/build/config.guess | |||
4542 | +++ b/clutter/build/config.guess | |||
4543 | @@ -1,8 +1,8 @@ | |||
4545 | 1 | #! /bin/sh | 1 | #!/usr/bin/sh |
4546 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
4547 | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
4548 | 4 | 4 | ||
4550 | 5 | timestamp='2018-02-24' | 5 | timestamp='2018-08-29' |
4551 | 6 | 6 | ||
4552 | 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 |
4553 | 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 |
4554 | @@ -84,8 +84,6 @@ if test $# != 0; then | |||
4555 | 84 | exit 1 | 84 | exit 1 |
4556 | 85 | fi | 85 | fi |
4557 | 86 | 86 | ||
4558 | 87 | trap 'exit 1' 1 2 15 | ||
4559 | 88 | |||
4560 | 89 | # CC_FOR_BUILD -- compiler used by this script. Note that the use of a | 87 | # CC_FOR_BUILD -- compiler used by this script. Note that the use of a |
4561 | 90 | # compiler to aid in system detection is discouraged as it requires | 88 | # compiler to aid in system detection is discouraged as it requires |
4562 | 91 | # temporary files to be created and, as you can see below, it is a | 89 | # temporary files to be created and, as you can see below, it is a |
4563 | @@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15 | |||
4564 | 96 | 94 | ||
4565 | 97 | # Portable tmp directory creation inspired by the Autoconf team. | 95 | # Portable tmp directory creation inspired by the Autoconf team. |
4566 | 98 | 96 | ||
4591 | 99 | set_cc_for_build=' | 97 | tmp= |
4592 | 100 | trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; | 98 | # shellcheck disable=SC2172 |
4593 | 101 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; | 99 | trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 |
4594 | 102 | : ${TMPDIR=/tmp} ; | 100 | trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 |
4595 | 103 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || | 101 | |
4596 | 104 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || | 102 | set_cc_for_build() { |
4597 | 105 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || | 103 | : "${TMPDIR=/tmp}" |
4598 | 106 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; | 104 | # shellcheck disable=SC2039 |
4599 | 107 | dummy=$tmp/dummy ; | 105 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
4600 | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | 106 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || |
4601 | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in | 107 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || |
4602 | 110 | ,,) echo "int x;" > "$dummy.c" ; | 108 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } |
4603 | 111 | for c in cc gcc c89 c99 ; do | 109 | dummy=$tmp/dummy |
4604 | 112 | if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then | 110 | case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in |
4605 | 113 | CC_FOR_BUILD="$c"; break ; | 111 | ,,) echo "int x;" > "$dummy.c" |
4606 | 114 | fi ; | 112 | for driver in cc gcc c89 c99 ; do |
4607 | 115 | done ; | 113 | if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then |
4608 | 116 | if test x"$CC_FOR_BUILD" = x ; then | 114 | CC_FOR_BUILD="$driver" |
4609 | 117 | CC_FOR_BUILD=no_compiler_found ; | 115 | break |
4610 | 118 | fi | 116 | fi |
4611 | 119 | ;; | 117 | done |
4612 | 120 | ,,*) CC_FOR_BUILD=$CC ;; | 118 | if test x"$CC_FOR_BUILD" = x ; then |
4613 | 121 | ,*,*) CC_FOR_BUILD=$HOST_CC ;; | 119 | CC_FOR_BUILD=no_compiler_found |
4614 | 122 | esac ; set_cc_for_build= ;' | 120 | fi |
4615 | 121 | ;; | ||
4616 | 122 | ,,*) CC_FOR_BUILD=$CC ;; | ||
4617 | 123 | ,*,*) CC_FOR_BUILD=$HOST_CC ;; | ||
4618 | 124 | esac | ||
4619 | 125 | } | ||
4620 | 123 | 126 | ||
4621 | 124 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. | 127 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
4622 | 125 | # (ghazi@noc.rutgers.edu 1994-08-24) | 128 | # (ghazi@noc.rutgers.edu 1994-08-24) |
4624 | 126 | if (test -f /.attbin/uname) >/dev/null 2>&1 ; then | 129 | if test -f /.attbin/uname ; then |
4625 | 127 | PATH=$PATH:/.attbin ; export PATH | 130 | PATH=$PATH:/.attbin ; export PATH |
4626 | 128 | fi | 131 | fi |
4627 | 129 | 132 | ||
4628 | @@ -138,7 +141,7 @@ Linux|GNU|GNU/*) | |||
4629 | 138 | # We could probably try harder. | 141 | # We could probably try harder. |
4630 | 139 | LIBC=gnu | 142 | LIBC=gnu |
4631 | 140 | 143 | ||
4633 | 141 | eval "$set_cc_for_build" | 144 | set_cc_for_build |
4634 | 142 | cat <<-EOF > "$dummy.c" | 145 | cat <<-EOF > "$dummy.c" |
4635 | 143 | #include <features.h> | 146 | #include <features.h> |
4636 | 144 | #if defined(__UCLIBC__) | 147 | #if defined(__UCLIBC__) |
4637 | @@ -199,7 +202,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
4638 | 199 | os=netbsdelf | 202 | os=netbsdelf |
4639 | 200 | ;; | 203 | ;; |
4640 | 201 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 204 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
4642 | 202 | eval "$set_cc_for_build" | 205 | set_cc_for_build |
4643 | 203 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 206 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
4644 | 204 | | grep -q __ELF__ | 207 | | grep -q __ELF__ |
4645 | 205 | then | 208 | then |
4646 | @@ -237,7 +240,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
4647 | 237 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | 240 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
4648 | 238 | # contains redundant information, the shorter form: | 241 | # contains redundant information, the shorter form: |
4649 | 239 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | 242 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
4651 | 240 | echo "$machine-${os}${release}${abi}" | 243 | echo "$machine-${os}${release}${abi-}" |
4652 | 241 | exit ;; | 244 | exit ;; |
4653 | 242 | *:Bitrig:*:*) | 245 | *:Bitrig:*:*) |
4654 | 243 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` | 246 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
4655 | @@ -389,20 +392,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
4656 | 389 | echo i386-pc-auroraux"$UNAME_RELEASE" | 392 | echo i386-pc-auroraux"$UNAME_RELEASE" |
4657 | 390 | exit ;; | 393 | exit ;; |
4658 | 391 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 394 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
4673 | 392 | eval "$set_cc_for_build" | 395 | UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
4674 | 393 | SUN_ARCH=i386 | 396 | case `isainfo -b` in |
4675 | 394 | # If there is a compiler, see if it is configured for 64-bit objects. | 397 | 32) |
4676 | 395 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. | 398 | echo i386-pc-solaris2"$UNAME_REL" |
4677 | 396 | # This test works for both compilers. | 399 | ;; |
4678 | 397 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then | 400 | 64) |
4679 | 398 | if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ | 401 | echo x86_64-pc-solaris2"$UNAME_REL" |
4680 | 399 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ | 402 | ;; |
4681 | 400 | grep IS_64BIT_ARCH >/dev/null | 403 | esac |
4668 | 401 | then | ||
4669 | 402 | SUN_ARCH=x86_64 | ||
4670 | 403 | fi | ||
4671 | 404 | fi | ||
4672 | 405 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" | ||
4682 | 406 | exit ;; | 404 | exit ;; |
4683 | 407 | sun4*:SunOS:6*:*) | 405 | sun4*:SunOS:6*:*) |
4684 | 408 | # According to config.sub, this is the proper way to canonicalize | 406 | # According to config.sub, this is the proper way to canonicalize |
4685 | @@ -482,7 +480,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
4686 | 482 | echo clipper-intergraph-clix"$UNAME_RELEASE" | 480 | echo clipper-intergraph-clix"$UNAME_RELEASE" |
4687 | 483 | exit ;; | 481 | exit ;; |
4688 | 484 | mips:*:*:UMIPS | mips:*:*:RISCos) | 482 | mips:*:*:UMIPS | mips:*:*:RISCos) |
4690 | 485 | eval "$set_cc_for_build" | 483 | set_cc_for_build |
4691 | 486 | sed 's/^ //' << EOF > "$dummy.c" | 484 | sed 's/^ //' << EOF > "$dummy.c" |
4692 | 487 | #ifdef __cplusplus | 485 | #ifdef __cplusplus |
4693 | 488 | #include <stdio.h> /* for printf() prototype */ | 486 | #include <stdio.h> /* for printf() prototype */ |
4694 | @@ -579,7 +577,7 @@ EOF | |||
4695 | 579 | exit ;; | 577 | exit ;; |
4696 | 580 | *:AIX:2:3) | 578 | *:AIX:2:3) |
4697 | 581 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then | 579 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
4699 | 582 | eval "$set_cc_for_build" | 580 | set_cc_for_build |
4700 | 583 | sed 's/^ //' << EOF > "$dummy.c" | 581 | sed 's/^ //' << EOF > "$dummy.c" |
4701 | 584 | #include <sys/systemcfg.h> | 582 | #include <sys/systemcfg.h> |
4702 | 585 | 583 | ||
4703 | @@ -660,7 +658,7 @@ EOF | |||
4704 | 660 | esac | 658 | esac |
4705 | 661 | fi | 659 | fi |
4706 | 662 | if [ "$HP_ARCH" = "" ]; then | 660 | if [ "$HP_ARCH" = "" ]; then |
4708 | 663 | eval "$set_cc_for_build" | 661 | set_cc_for_build |
4709 | 664 | sed 's/^ //' << EOF > "$dummy.c" | 662 | sed 's/^ //' << EOF > "$dummy.c" |
4710 | 665 | 663 | ||
4711 | 666 | #define _HPUX_SOURCE | 664 | #define _HPUX_SOURCE |
4712 | @@ -700,7 +698,7 @@ EOF | |||
4713 | 700 | esac | 698 | esac |
4714 | 701 | if [ "$HP_ARCH" = hppa2.0w ] | 699 | if [ "$HP_ARCH" = hppa2.0w ] |
4715 | 702 | then | 700 | then |
4717 | 703 | eval "$set_cc_for_build" | 701 | set_cc_for_build |
4718 | 704 | 702 | ||
4719 | 705 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating | 703 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
4720 | 706 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler | 704 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
4721 | @@ -726,7 +724,7 @@ EOF | |||
4722 | 726 | echo ia64-hp-hpux"$HPUX_REV" | 724 | echo ia64-hp-hpux"$HPUX_REV" |
4723 | 727 | exit ;; | 725 | exit ;; |
4724 | 728 | 3050*:HI-UX:*:*) | 726 | 3050*:HI-UX:*:*) |
4726 | 729 | eval "$set_cc_for_build" | 727 | set_cc_for_build |
4727 | 730 | sed 's/^ //' << EOF > "$dummy.c" | 728 | sed 's/^ //' << EOF > "$dummy.c" |
4728 | 731 | #include <unistd.h> | 729 | #include <unistd.h> |
4729 | 732 | int | 730 | int |
4730 | @@ -840,6 +838,17 @@ EOF | |||
4731 | 840 | *:BSD/OS:*:*) | 838 | *:BSD/OS:*:*) |
4732 | 841 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" | 839 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" |
4733 | 842 | exit ;; | 840 | exit ;; |
4734 | 841 | arm:FreeBSD:*:*) | ||
4735 | 842 | UNAME_PROCESSOR=`uname -p` | ||
4736 | 843 | set_cc_for_build | ||
4737 | 844 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | ||
4738 | 845 | | grep -q __ARM_PCS_VFP | ||
4739 | 846 | then | ||
4740 | 847 | echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi | ||
4741 | 848 | else | ||
4742 | 849 | echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf | ||
4743 | 850 | fi | ||
4744 | 851 | exit ;; | ||
4745 | 843 | *:FreeBSD:*:*) | 852 | *:FreeBSD:*:*) |
4746 | 844 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 853 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
4747 | 845 | case "$UNAME_PROCESSOR" in | 854 | case "$UNAME_PROCESSOR" in |
4748 | @@ -894,8 +903,8 @@ EOF | |||
4749 | 894 | # other systems with GNU libc and userland | 903 | # other systems with GNU libc and userland |
4750 | 895 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" | 904 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" |
4751 | 896 | exit ;; | 905 | exit ;; |
4754 | 897 | i*86:Minix:*:*) | 906 | *:Minix:*:*) |
4755 | 898 | echo "$UNAME_MACHINE"-pc-minix | 907 | echo "$UNAME_MACHINE"-unknown-minix |
4756 | 899 | exit ;; | 908 | exit ;; |
4757 | 900 | aarch64:Linux:*:*) | 909 | aarch64:Linux:*:*) |
4758 | 901 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 910 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4759 | @@ -922,7 +931,7 @@ EOF | |||
4760 | 922 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 931 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4761 | 923 | exit ;; | 932 | exit ;; |
4762 | 924 | arm*:Linux:*:*) | 933 | arm*:Linux:*:*) |
4764 | 925 | eval "$set_cc_for_build" | 934 | set_cc_for_build |
4765 | 926 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 935 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
4766 | 927 | | grep -q __ARM_EABI__ | 936 | | grep -q __ARM_EABI__ |
4767 | 928 | then | 937 | then |
4768 | @@ -971,7 +980,7 @@ EOF | |||
4769 | 971 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 980 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4770 | 972 | exit ;; | 981 | exit ;; |
4771 | 973 | mips:Linux:*:* | mips64:Linux:*:*) | 982 | mips:Linux:*:* | mips64:Linux:*:*) |
4773 | 974 | eval "$set_cc_for_build" | 983 | set_cc_for_build |
4774 | 975 | sed 's/^ //' << EOF > "$dummy.c" | 984 | sed 's/^ //' << EOF > "$dummy.c" |
4775 | 976 | #undef CPU | 985 | #undef CPU |
4776 | 977 | #undef ${UNAME_MACHINE} | 986 | #undef ${UNAME_MACHINE} |
4777 | @@ -1046,11 +1055,7 @@ EOF | |||
4778 | 1046 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" | 1055 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" |
4779 | 1047 | exit ;; | 1056 | exit ;; |
4780 | 1048 | x86_64:Linux:*:*) | 1057 | x86_64:Linux:*:*) |
4786 | 1049 | if objdump -f /bin/sh | grep -q elf32-x86-64; then | 1058 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" |
4782 | 1050 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 | ||
4783 | 1051 | else | ||
4784 | 1052 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" | ||
4785 | 1053 | fi | ||
4787 | 1054 | exit ;; | 1059 | exit ;; |
4788 | 1055 | xtensa*:Linux:*:*) | 1060 | xtensa*:Linux:*:*) |
4789 | 1056 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 1061 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
4790 | @@ -1289,7 +1294,7 @@ EOF | |||
4791 | 1289 | exit ;; | 1294 | exit ;; |
4792 | 1290 | *:Darwin:*:*) | 1295 | *:Darwin:*:*) |
4793 | 1291 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1296 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
4795 | 1292 | eval "$set_cc_for_build" | 1297 | set_cc_for_build |
4796 | 1293 | if test "$UNAME_PROCESSOR" = unknown ; then | 1298 | if test "$UNAME_PROCESSOR" = unknown ; then |
4797 | 1294 | UNAME_PROCESSOR=powerpc | 1299 | UNAME_PROCESSOR=powerpc |
4798 | 1295 | fi | 1300 | fi |
4799 | @@ -1362,6 +1367,7 @@ EOF | |||
4800 | 1362 | # "uname -m" is not consistent, so use $cputype instead. 386 | 1367 | # "uname -m" is not consistent, so use $cputype instead. 386 |
4801 | 1363 | # is converted to i386 for consistency with other x86 | 1368 | # is converted to i386 for consistency with other x86 |
4802 | 1364 | # operating systems. | 1369 | # operating systems. |
4803 | 1370 | # shellcheck disable=SC2154 | ||
4804 | 1365 | if test "$cputype" = 386; then | 1371 | if test "$cputype" = 386; then |
4805 | 1366 | UNAME_MACHINE=i386 | 1372 | UNAME_MACHINE=i386 |
4806 | 1367 | else | 1373 | else |
4807 | @@ -1473,7 +1479,7 @@ EOF | |||
4808 | 1473 | exit 1 | 1479 | exit 1 |
4809 | 1474 | 1480 | ||
4810 | 1475 | # Local variables: | 1481 | # Local variables: |
4812 | 1476 | # eval: (add-hook 'write-file-functions 'time-stamp) | 1482 | # eval: (add-hook 'before-save-hook 'time-stamp) |
4813 | 1477 | # time-stamp-start: "timestamp='" | 1483 | # time-stamp-start: "timestamp='" |
4814 | 1478 | # time-stamp-format: "%:y-%02m-%02d" | 1484 | # time-stamp-format: "%:y-%02m-%02d" |
4815 | 1479 | # time-stamp-end: "'" | 1485 | # time-stamp-end: "'" |
4816 | diff --git a/clutter/build/config.sub b/clutter/build/config.sub | |||
4817 | index 1d8e98b..be4dc6e 100755 | |||
4818 | --- a/clutter/build/config.sub | |||
4819 | +++ b/clutter/build/config.sub | |||
4820 | @@ -1,8 +1,8 @@ | |||
4822 | 1 | #! /bin/sh | 1 | #!/usr/bin/sh |
4823 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
4824 | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
4825 | 4 | 4 | ||
4827 | 5 | timestamp='2018-02-22' | 5 | timestamp='2018-08-29' |
4828 | 6 | 6 | ||
4829 | 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 |
4830 | 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 |
4831 | @@ -110,1223 +110,1159 @@ case $# in | |||
4832 | 110 | exit 1;; | 110 | exit 1;; |
4833 | 111 | esac | 111 | esac |
4834 | 112 | 112 | ||
4858 | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). | 113 | # Split fields of configuration type |
4859 | 114 | # Here we must recognize all the valid KERNEL-OS combinations. | 114 | IFS="-" read -r field1 field2 field3 field4 <<EOF |
4860 | 115 | maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 115 | $1 |
4861 | 116 | case $maybe_os in | 116 | EOF |
4839 | 117 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ | ||
4840 | 118 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ | ||
4841 | 119 | knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ | ||
4842 | 120 | kopensolaris*-gnu* | cloudabi*-eabi* | \ | ||
4843 | 121 | storm-chaos* | os2-emx* | rtmk-nova*) | ||
4844 | 122 | os=-$maybe_os | ||
4845 | 123 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | ||
4846 | 124 | ;; | ||
4847 | 125 | android-linux) | ||
4848 | 126 | os=-linux-android | ||
4849 | 127 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | ||
4850 | 128 | ;; | ||
4851 | 129 | *) | ||
4852 | 130 | basic_machine=`echo "$1" | sed 's/-[^-]*$//'` | ||
4853 | 131 | if [ "$basic_machine" != "$1" ] | ||
4854 | 132 | then os=`echo "$1" | sed 's/.*-/-/'` | ||
4855 | 133 | else os=; fi | ||
4856 | 134 | ;; | ||
4857 | 135 | esac | ||
4862 | 136 | 117 | ||
4951 | 137 | ### Let's recognize common machines as not being operating systems so | 118 | # Separate into logical components for further validation |
4952 | 138 | ### that things like config.sub decstation-3100 work. We also | 119 | case $1 in |
4953 | 139 | ### recognize some manufacturers as not being operating systems, so we | 120 | *-*-*-*-*) |
4954 | 140 | ### can provide default operating systems below. | 121 | echo Invalid configuration \`"$1"\': more than four components >&2 |
4955 | 141 | case $os in | 122 | exit 1 |
4868 | 142 | -sun*os*) | ||
4869 | 143 | # Prevent following clause from handling this invalid input. | ||
4870 | 144 | ;; | ||
4871 | 145 | -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ | ||
4872 | 146 | -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ | ||
4873 | 147 | -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ | ||
4874 | 148 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ | ||
4875 | 149 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ | ||
4876 | 150 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ | ||
4877 | 151 | -apple | -axis | -knuth | -cray | -microblaze*) | ||
4878 | 152 | os= | ||
4879 | 153 | basic_machine=$1 | ||
4880 | 154 | ;; | ||
4881 | 155 | -bluegene*) | ||
4882 | 156 | os=-cnk | ||
4883 | 157 | ;; | ||
4884 | 158 | -sim | -cisco | -oki | -wec | -winbond) | ||
4885 | 159 | os= | ||
4886 | 160 | basic_machine=$1 | ||
4887 | 161 | ;; | ||
4888 | 162 | -scout) | ||
4889 | 163 | ;; | ||
4890 | 164 | -wrs) | ||
4891 | 165 | os=-vxworks | ||
4892 | 166 | basic_machine=$1 | ||
4893 | 167 | ;; | ||
4894 | 168 | -chorusos*) | ||
4895 | 169 | os=-chorusos | ||
4896 | 170 | basic_machine=$1 | ||
4897 | 171 | ;; | ||
4898 | 172 | -chorusrdb) | ||
4899 | 173 | os=-chorusrdb | ||
4900 | 174 | basic_machine=$1 | ||
4901 | 175 | ;; | ||
4902 | 176 | -hiux*) | ||
4903 | 177 | os=-hiuxwe2 | ||
4904 | 178 | ;; | ||
4905 | 179 | -sco6) | ||
4906 | 180 | os=-sco5v6 | ||
4907 | 181 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4908 | 182 | ;; | ||
4909 | 183 | -sco5) | ||
4910 | 184 | os=-sco3.2v5 | ||
4911 | 185 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4912 | 186 | ;; | ||
4913 | 187 | -sco4) | ||
4914 | 188 | os=-sco3.2v4 | ||
4915 | 189 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4916 | 190 | ;; | ||
4917 | 191 | -sco3.2.[4-9]*) | ||
4918 | 192 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` | ||
4919 | 193 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4920 | 194 | ;; | ||
4921 | 195 | -sco3.2v[4-9]*) | ||
4922 | 196 | # Don't forget version if it is 3.2v4 or newer. | ||
4923 | 197 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4924 | 198 | ;; | ||
4925 | 199 | -sco5v6*) | ||
4926 | 200 | # Don't forget version if it is 3.2v4 or newer. | ||
4927 | 201 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4928 | 202 | ;; | ||
4929 | 203 | -sco*) | ||
4930 | 204 | os=-sco3.2v2 | ||
4931 | 205 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4932 | 206 | ;; | ||
4933 | 207 | -udk*) | ||
4934 | 208 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4935 | 209 | ;; | ||
4936 | 210 | -isc) | ||
4937 | 211 | os=-isc2.2 | ||
4938 | 212 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4939 | 213 | ;; | ||
4940 | 214 | -clix*) | ||
4941 | 215 | basic_machine=clipper-intergraph | ||
4942 | 216 | ;; | ||
4943 | 217 | -isc*) | ||
4944 | 218 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` | ||
4945 | 219 | ;; | ||
4946 | 220 | -lynx*178) | ||
4947 | 221 | os=-lynxos178 | ||
4948 | 222 | ;; | ||
4949 | 223 | -lynx*5) | ||
4950 | 224 | os=-lynxos5 | ||
4956 | 225 | ;; | 123 | ;; |
4959 | 226 | -lynx*) | 124 | *-*-*-*) |
4960 | 227 | os=-lynxos | 125 | basic_machine=$field1-$field2 |
4961 | 126 | os=$field3-$field4 | ||
4962 | 228 | ;; | 127 | ;; |
4965 | 229 | -ptx*) | 128 | *-*-*) |
4966 | 230 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` | 129 | # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two |
4967 | 130 | # parts | ||
4968 | 131 | maybe_os=$field2-$field3 | ||
4969 | 132 | case $maybe_os in | ||
4970 | 133 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ | ||
4971 | 134 | | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ | ||
4972 | 135 | | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | ||
4973 | 136 | | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | ||
4974 | 137 | | storm-chaos* | os2-emx* | rtmk-nova*) | ||
4975 | 138 | basic_machine=$field1 | ||
4976 | 139 | os=$maybe_os | ||
4977 | 140 | ;; | ||
4978 | 141 | android-linux) | ||
4979 | 142 | basic_machine=$field1-unknown | ||
4980 | 143 | os=linux-android | ||
4981 | 144 | ;; | ||
4982 | 145 | *) | ||
4983 | 146 | basic_machine=$field1-$field2 | ||
4984 | 147 | os=$field3 | ||
4985 | 148 | ;; | ||
4986 | 149 | esac | ||
4987 | 231 | ;; | 150 | ;; |
4990 | 232 | -psos*) | 151 | *-*) |
4991 | 233 | os=-psos | 152 | # A lone config we happen to match not fitting any patern |
4992 | 153 | case $field1-$field2 in | ||
4993 | 154 | decstation-3100) | ||
4994 | 155 | basic_machine=mips-dec | ||
4995 | 156 | os= | ||
4996 | 157 | ;; | ||
4997 | 158 | *-*) | ||
4998 | 159 | # Second component is usually, but not always the OS | ||
4999 | 160 | case $field2 in | ||
5000 | 161 | # Prevent following clause from handling this valid os |
The diff has been truncated for viewing.