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