Merge ~paelzer/ubuntu/+source/libseccomp:fix-ftbfs-1849785-focal into ubuntu/+source/libseccomp:debian/sid
- Git
- lp:~paelzer/ubuntu/+source/libseccomp
- fix-ftbfs-1849785-focal
- Merge into debian/sid
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | ~paelzer/ubuntu/+source/libseccomp:fix-ftbfs-1849785-focal | ||||
Merge into: | ubuntu/+source/libseccomp:debian/sid | ||||
Diff against target: |
11229 lines (+7153/-0) (has conflicts) 50 files modified
CHANGELOG (+14/-0) CREDITS (+9/-0) Makefile.am (+4/-0) Makefile.in (+4/-0) README.md (+4/-0) SECURITY.md (+45/-0) build-aux/config.guess (+122/-0) build-aux/config.sub (+1654/-0) build-aux/ltmain.sh (+554/-0) configure (+159/-0) configure.ac (+9/-0) debian/changelog (+15/-0) debian/control (+5/-0) debian/patches/series (+4/-0) debian/patches/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch (+47/-0) debian/rules (+10/-0) include/Makefile.am (+4/-0) include/Makefile.in (+4/-0) include/seccomp-syscalls.h (+2292/-0) include/seccomp.h (+16/-0) include/seccomp.h.in (+12/-0) m4/libtool.m4 (+115/-0) m4/ltoptions.m4 (+4/-0) m4/ltsugar.m4 (+4/-0) m4/ltversion.m4 (+16/-0) m4/lt~obsolete.m4 (+4/-0) src/arch-aarch64-syscalls.c (+106/-0) src/arch-arm-syscalls.c (+106/-0) src/arch-mips-syscalls.c (+115/-0) src/arch-mips64-syscalls.c (+98/-0) src/arch-mips64n32-syscalls.c (+98/-0) src/arch-parisc-syscalls.c (+99/-0) src/arch-ppc-syscalls.c (+115/-0) src/arch-ppc64-syscalls.c (+115/-0) src/arch-s390-syscalls.c (+120/-0) src/arch-s390.c (+171/-0) src/arch-s390x-syscalls.c (+120/-0) src/arch-s390x.c (+172/-0) src/arch-x32-syscalls.c (+98/-0) src/arch-x86-syscalls.c (+175/-0) src/arch-x86.c (+174/-0) src/arch-x86_64-syscalls.c (+98/-0) src/db.c (+4/-0) src/python/Makefile.am (+9/-0) src/python/Makefile.in (+9/-0) src/python/seccomp.pyx (+5/-0) tools/Makefile.am (+3/-0) tools/Makefile.in (+4/-0) tools/check-syntax (+4/-0) tools/scmp_bpf_sim.c (+5/-0) Conflict in CHANGELOG Conflict in CREDITS Conflict in Makefile.am Conflict in Makefile.in Conflict in README.md Conflict in build-aux/config.guess Conflict in build-aux/config.sub Conflict in build-aux/ltmain.sh Conflict in configure Conflict in configure.ac Conflict in debian/changelog Conflict in debian/control Conflict in debian/patches/series Conflict in debian/rules Conflict in include/Makefile.am Conflict in include/Makefile.in Conflict in include/seccomp.h Conflict in include/seccomp.h.in Conflict in m4/libtool.m4 Conflict in m4/ltoptions.m4 Conflict in m4/ltsugar.m4 Conflict in m4/ltversion.m4 Conflict in m4/lt~obsolete.m4 Conflict in src/arch-aarch64-syscalls.c Conflict in src/arch-arm-syscalls.c Conflict in src/arch-mips-syscalls.c Conflict in src/arch-mips64-syscalls.c Conflict in src/arch-mips64n32-syscalls.c Conflict in src/arch-parisc-syscalls.c Conflict in src/arch-ppc-syscalls.c Conflict in src/arch-ppc64-syscalls.c Conflict in src/arch-s390-syscalls.c Conflict in src/arch-s390.c Conflict in src/arch-s390x-syscalls.c Conflict in src/arch-s390x.c Conflict in src/arch-x32-syscalls.c Conflict in src/arch-x86-syscalls.c Conflict in src/arch-x86.c Conflict in src/arch-x86_64-syscalls.c Conflict in src/db.c Conflict in src/python/Makefile.am Conflict in src/python/Makefile.in Conflict in src/python/seccomp.pyx Conflict in tools/Makefile.am Conflict in tools/Makefile.in Conflict in tools/check-syntax Conflict in tools/scmp_bpf_sim.c |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Canonical Server packageset reviewers | Pending | ||
Canonical Server | Pending | ||
git-ubuntu developers | Pending | ||
Review via email: mp+375205@code.launchpad.net |
This proposal has been superseded by a proposal from 2019-11-12.
Commit message
Description of the change
Christian Ehrhardt (paelzer) wrote : | # |
- 1af91f9... by Christian Ehrhardt
-
New upstream version 2.4.2
- 8449cbb... by Christian Ehrhardt
-
debian/changelog: New upstream release 2.4.2 (LP: #1849785)
Signed-off-by: Christian Ehrhardt <email address hidden>
- 01624a7... by Christian Ehrhardt
-
drop d/p/python_
install_ dir.patch (now upstream) Signed-off-by: Christian Ehrhardt <email address hidden>
- 37d1514... by Christian Ehrhardt
-
d/rules: python 3.8 includes lack the m modifier (https:/
/wiki.debian. org/Python/ Python3. 8) Signed-off-by: Christian Ehrhardt <email address hidden>
- 4c863f2... by Christian Ehrhardt
-
update-maintainer
Signed-off-by: Christian Ehrhardt <email address hidden>
Christian Ehrhardt (paelzer) wrote : | # |
Interim Report:
- Fixed to get new upstream 2.4.2 (fixing old kernel header issue)
- Then Fixed to support python 3.8 which changed imports.
- ATM remaining is an arm breakage around __NR_open being missing.
- 56e3b9d... by Christian Ehrhardt
-
d/p/tests-
rely-on- __SNR_xxx- instead- of-__NR_ xxx-for- sysc.patch: fix build time test on arm64 Signed-off-by: Christian Ehrhardt <email address hidden>
Christian Ehrhardt (paelzer) wrote : | # |
The above commit fixed the arm64 build time test
Christian Ehrhardt (paelzer) wrote : | # |
FYI Debian MP to get it in there as well:
=> https:/
Hopefully they like my MP there and we can soon sync this again.
We might even consider waiting a few days to not do the extra found of uploading this just to sync it.
But a timely review would be nice still to be ready to upload as-needed.
Unmerged commits
- 4c863f2... by Christian Ehrhardt
-
update-maintainer
Signed-off-by: Christian Ehrhardt <email address hidden>
- 8449cbb... by Christian Ehrhardt
-
debian/changelog: New upstream release 2.4.2 (LP: #1849785)
Signed-off-by: Christian Ehrhardt <email address hidden>
- 56e3b9d... by Christian Ehrhardt
-
d/p/tests-
rely-on- __SNR_xxx- instead- of-__NR_ xxx-for- sysc.patch: fix build time test on arm64 Signed-off-by: Christian Ehrhardt <email address hidden>
- 37d1514... by Christian Ehrhardt
-
d/rules: python 3.8 includes lack the m modifier (https:/
/wiki.debian. org/Python/ Python3. 8) Signed-off-by: Christian Ehrhardt <email address hidden>
- 01624a7... by Christian Ehrhardt
-
drop d/p/python_
install_ dir.patch (now upstream) Signed-off-by: Christian Ehrhardt <email address hidden>
- 1af91f9... by Christian Ehrhardt
-
New upstream version 2.4.2
- 72a1ca2... by Felix Geyer
-
Release to unstable.
- e169c18... by Felix Geyer
-
Set Rules-Requires-
Root: no. - 197edee... by Felix Geyer
-
Remove build-dependency on valgrind for mipsel and x32 as it's broken on those archs.
- 2d61f3d... by Felix Geyer
-
Release to unstable.
Preview Diff
1 | diff --git a/CHANGELOG b/CHANGELOG | |||
2 | index a65bc5b..e1a732c 100644 | |||
3 | --- a/CHANGELOG | |||
4 | +++ b/CHANGELOG | |||
5 | @@ -2,6 +2,20 @@ libseccomp: Releases | |||
6 | 2 | =============================================================================== | 2 | =============================================================================== |
7 | 3 | https://github.com/seccomp/libseccomp | 3 | https://github.com/seccomp/libseccomp |
8 | 4 | 4 | ||
9 | 5 | <<<<<<< CHANGELOG | ||
10 | 6 | ======= | ||
11 | 7 | * Version 2.4.2 - November 7, 2019 | ||
12 | 8 | - Update the syscall table for Linux v5.4-rc4 | ||
13 | 9 | - Stop defining __NR_x values for syscalls that don't exist. Libseccomp | ||
14 | 10 | now uses __SNR_x internally | ||
15 | 11 | - Update the Cython language level to "3str" | ||
16 | 12 | - Add support for io-uring related system calls | ||
17 | 13 | - Clarify the maintainer documentation and release process | ||
18 | 14 | - Fix python module name issue introduced in the v2.4.0 release. The module | ||
19 | 15 | is now named "seccomp" as it was previously | ||
20 | 16 | - Deliver the SECURITY.md file in releases | ||
21 | 17 | |||
22 | 18 | >>>>>>> CHANGELOG | ||
23 | 5 | * Version 2.4.1 - April 17, 2019 | 19 | * Version 2.4.1 - April 17, 2019 |
24 | 6 | - Fix a BPF generation bug where the optimizer mistakenly identified duplicate | 20 | - Fix a BPF generation bug where the optimizer mistakenly identified duplicate |
25 | 7 | BPF code blocks | 21 | BPF code blocks |
26 | diff --git a/CREDITS b/CREDITS | |||
27 | index 2be42d9..fc6e203 100644 | |||
28 | --- a/CREDITS | |||
29 | +++ b/CREDITS | |||
30 | @@ -13,6 +13,10 @@ David Drysdale <drysdale@google.com> | |||
31 | 13 | Eduardo Otubo <otubo@linux.vnet.ibm.com> | 13 | Eduardo Otubo <otubo@linux.vnet.ibm.com> |
32 | 14 | Eric Paris <eparis@redhat.com> | 14 | Eric Paris <eparis@redhat.com> |
33 | 15 | Felix Abecassis <fabecassis@nvidia.com> | 15 | Felix Abecassis <fabecassis@nvidia.com> |
34 | 16 | <<<<<<< CREDITS | ||
35 | 17 | ======= | ||
36 | 18 | Felix Geyer <debfx@fobos.de> | ||
37 | 19 | >>>>>>> CREDITS | ||
38 | 16 | Heiko Carstens <heiko.carstens@de.ibm.com> | 20 | Heiko Carstens <heiko.carstens@de.ibm.com> |
39 | 17 | Helge Deller <deller@gmx.de> | 21 | Helge Deller <deller@gmx.de> |
40 | 18 | Jake Edge <jake@lwn.net> | 22 | Jake Edge <jake@lwn.net> |
41 | @@ -35,6 +39,11 @@ Mike Frysinger <vapier@gentoo.org> | |||
42 | 35 | Mike Strosaker <strosake@linux.vnet.ibm.com> | 39 | Mike Strosaker <strosake@linux.vnet.ibm.com> |
43 | 36 | Paul Moore <paul@paul-moore.com> | 40 | Paul Moore <paul@paul-moore.com> |
44 | 37 | Serge Hallyn <serge.hallyn@ubuntu.com> | 41 | Serge Hallyn <serge.hallyn@ubuntu.com> |
45 | 42 | <<<<<<< CREDITS | ||
46 | 43 | ======= | ||
47 | 44 | Stéphane Graber <stgraber@ubuntu.com> | ||
48 | 45 | Stephen Coleman <omegacoleman@gmail.com> | ||
49 | 46 | >>>>>>> CREDITS | ||
50 | 38 | Thiago Marcos P. Santos <thiago.santos@intel.com> | 47 | Thiago Marcos P. Santos <thiago.santos@intel.com> |
51 | 39 | Tobias Klauser <tklauser@distanz.ch> | 48 | Tobias Klauser <tklauser@distanz.ch> |
52 | 40 | Tom Hromatka <tom.hromatka@oracle.com> | 49 | Tom Hromatka <tom.hromatka@oracle.com> |
53 | diff --git a/Makefile.am b/Makefile.am | |||
54 | index b69cec5..dbc974d 100644 | |||
55 | --- a/Makefile.am | |||
56 | +++ b/Makefile.am | |||
57 | @@ -24,7 +24,11 @@ pkgconf_DATA = libseccomp.pc | |||
58 | 24 | 24 | ||
59 | 25 | EXTRA_DIST = \ | 25 | EXTRA_DIST = \ |
60 | 26 | CHANGELOG CREDITS LICENSE \ | 26 | CHANGELOG CREDITS LICENSE \ |
61 | 27 | <<<<<<< Makefile.am | ||
62 | 27 | README.md CONTRIBUTING.md RELEASE_PROCESS.md | 28 | README.md CONTRIBUTING.md RELEASE_PROCESS.md |
63 | 29 | ======= | ||
64 | 30 | README.md CONTRIBUTING.md SECURITY.md | ||
65 | 31 | >>>>>>> Makefile.am | ||
66 | 28 | 32 | ||
67 | 29 | # support silent builds | 33 | # support silent builds |
68 | 30 | AM_MAKEFLAGS_0 = --quiet --no-print-directory | 34 | AM_MAKEFLAGS_0 = --quiet --no-print-directory |
69 | diff --git a/Makefile.in b/Makefile.in | |||
70 | index a9b4f40..b462964 100644 | |||
71 | --- a/Makefile.in | |||
72 | +++ b/Makefile.in | |||
73 | @@ -407,7 +407,11 @@ pkgconfdir = ${libdir}/pkgconfig | |||
74 | 407 | pkgconf_DATA = libseccomp.pc | 407 | pkgconf_DATA = libseccomp.pc |
75 | 408 | EXTRA_DIST = \ | 408 | EXTRA_DIST = \ |
76 | 409 | CHANGELOG CREDITS LICENSE \ | 409 | CHANGELOG CREDITS LICENSE \ |
77 | 410 | <<<<<<< Makefile.in | ||
78 | 410 | README.md CONTRIBUTING.md RELEASE_PROCESS.md | 411 | README.md CONTRIBUTING.md RELEASE_PROCESS.md |
79 | 412 | ======= | ||
80 | 413 | README.md CONTRIBUTING.md SECURITY.md | ||
81 | 414 | >>>>>>> Makefile.in | ||
82 | 411 | 415 | ||
83 | 412 | 416 | ||
84 | 413 | # support silent builds | 417 | # support silent builds |
85 | diff --git a/README.md b/README.md | |||
86 | index cf67e47..953d315 100644 | |||
87 | --- a/README.md | |||
88 | +++ b/README.md | |||
89 | @@ -110,4 +110,8 @@ these tools are installed by default. | |||
90 | 110 | 110 | ||
91 | 111 | Problems with the libseccomp library can be reported using the GitHub issue | 111 | Problems with the libseccomp library can be reported using the GitHub issue |
92 | 112 | tracking system or the mailing list. Those who wish to privately report | 112 | tracking system or the mailing list. Those who wish to privately report |
93 | 113 | <<<<<<< README.md | ||
94 | 113 | potential vulnerabilities can send mail to paul@paul-moore.com. | 114 | potential vulnerabilities can send mail to paul@paul-moore.com. |
95 | 115 | ======= | ||
96 | 116 | potential vulnerabilities should follow the directions in SECURITY.md. | ||
97 | 117 | >>>>>>> README.md | ||
98 | diff --git a/SECURITY.md b/SECURITY.md | |||
99 | 114 | new file mode 100644 | 118 | new file mode 100644 |
100 | index 0000000..3a173cc | |||
101 | --- /dev/null | |||
102 | +++ b/SECURITY.md | |||
103 | @@ -0,0 +1,45 @@ | |||
104 | 1 | The libseccomp Security Vulnerability Handling Process | ||
105 | 2 | =============================================================================== | ||
106 | 3 | https://github.com/seccomp/libseccomp | ||
107 | 4 | |||
108 | 5 | This document document attempts to describe the processes through which | ||
109 | 6 | sensitive security relevant bugs can be responsibly disclosed to the libseccomp | ||
110 | 7 | project and how the project maintainers should handle these reports. Just like | ||
111 | 8 | the other libseccomp process documents, this document should be treated as a | ||
112 | 9 | guiding document and not a hard, unyielding set of regulations; the bug | ||
113 | 10 | reporters and project maintainers are encouraged to work together to address | ||
114 | 11 | the issues as best they can, in a manner which works best for all parties | ||
115 | 12 | involved. | ||
116 | 13 | |||
117 | 14 | ### Reporting Problems | ||
118 | 15 | |||
119 | 16 | Problems with the libseccomp library that are not suitable for immediate public | ||
120 | 17 | disclosure should be emailed to the current libseccomp maintainers, the list is | ||
121 | 18 | below. We typically request at most a 90 day time period to address the issue | ||
122 | 19 | before it is made public, but we will make every effort to address the issue as | ||
123 | 20 | quickly as possible and shorten the disclosure window. | ||
124 | 21 | |||
125 | 22 | * Paul Moore, paul@paul-moore.com | ||
126 | 23 | * Tom Hromatka, tom.hromatka@oracle.com | ||
127 | 24 | |||
128 | 25 | ### Resolving Sensitive Security Issues | ||
129 | 26 | |||
130 | 27 | Upon disclosure of a bug, the maintainers should work together to investigate | ||
131 | 28 | the problem and decide on a solution. In order to prevent an early disclosure | ||
132 | 29 | of the problem, those working on the solution should do so privately and | ||
133 | 30 | outside of the traditional libseccomp development practices. One possible | ||
134 | 31 | solution to this is to leverage the GitHub "Security" functionality to create a | ||
135 | 32 | private development fork that can be shared among the maintainers, and | ||
136 | 33 | optionally the reporter. A placeholder GitHub issue may be created, but | ||
137 | 34 | details should remain extremely limited until such time as the problem has been | ||
138 | 35 | fixed and responsibly disclosed. If a CVE, or other tag, has been assigned to | ||
139 | 36 | the problem, the GitHub issue title should include the vulnerability tag once | ||
140 | 37 | the problem has been disclosed. | ||
141 | 38 | |||
142 | 39 | ### Public Disclosure | ||
143 | 40 | |||
144 | 41 | Whenever possible, responsible reporting and patching practices should be | ||
145 | 42 | followed, including notification to the linux-distros and oss-security mailing | ||
146 | 43 | lists. | ||
147 | 44 | |||
148 | 45 | * https://oss-security.openwall.org/wiki/mailing-lists/distros | ||
149 | diff --git a/build-aux/config.guess b/build-aux/config.guess | |||
150 | index 256083a..e686b38 100755 | |||
151 | --- a/build-aux/config.guess | |||
152 | +++ b/build-aux/config.guess | |||
153 | @@ -2,7 +2,11 @@ | |||
154 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
155 | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
156 | 4 | 4 | ||
157 | 5 | <<<<<<< build-aux/config.guess | ||
158 | 5 | timestamp='2018-03-08' | 6 | timestamp='2018-03-08' |
159 | 7 | ======= | ||
160 | 8 | timestamp='2018-08-29' | ||
161 | 9 | >>>>>>> build-aux/config.guess | ||
162 | 6 | 10 | ||
163 | 7 | # This file is free software; you can redistribute it and/or modify it | 11 | # This file is free software; you can redistribute it and/or modify it |
164 | 8 | # under the terms of the GNU General Public License as published by | 12 | # under the terms of the GNU General Public License as published by |
165 | @@ -84,8 +88,11 @@ if test $# != 0; then | |||
166 | 84 | exit 1 | 88 | exit 1 |
167 | 85 | fi | 89 | fi |
168 | 86 | 90 | ||
169 | 91 | <<<<<<< build-aux/config.guess | ||
170 | 87 | trap 'exit 1' 1 2 15 | 92 | trap 'exit 1' 1 2 15 |
171 | 88 | 93 | ||
172 | 94 | ======= | ||
173 | 95 | >>>>>>> build-aux/config.guess | ||
174 | 89 | # CC_FOR_BUILD -- compiler used by this script. Note that the use of a | 96 | # CC_FOR_BUILD -- compiler used by this script. Note that the use of a |
175 | 90 | # compiler to aid in system detection is discouraged as it requires | 97 | # compiler to aid in system detection is discouraged as it requires |
176 | 91 | # temporary files to be created and, as you can see below, it is a | 98 | # temporary files to be created and, as you can see below, it is a |
177 | @@ -96,6 +103,7 @@ trap 'exit 1' 1 2 15 | |||
178 | 96 | 103 | ||
179 | 97 | # Portable tmp directory creation inspired by the Autoconf team. | 104 | # Portable tmp directory creation inspired by the Autoconf team. |
180 | 98 | 105 | ||
181 | 106 | <<<<<<< build-aux/config.guess | ||
182 | 99 | set_cc_for_build=' | 107 | set_cc_for_build=' |
183 | 100 | trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; | 108 | trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; |
184 | 101 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; | 109 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
185 | @@ -124,6 +132,41 @@ esac ; set_cc_for_build= ;' | |||
186 | 124 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. | 132 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
187 | 125 | # (ghazi@noc.rutgers.edu 1994-08-24) | 133 | # (ghazi@noc.rutgers.edu 1994-08-24) |
188 | 126 | if (test -f /.attbin/uname) >/dev/null 2>&1 ; then | 134 | if (test -f /.attbin/uname) >/dev/null 2>&1 ; then |
189 | 135 | ======= | ||
190 | 136 | tmp= | ||
191 | 137 | # shellcheck disable=SC2172 | ||
192 | 138 | trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 | ||
193 | 139 | trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 | ||
194 | 140 | |||
195 | 141 | set_cc_for_build() { | ||
196 | 142 | : "${TMPDIR=/tmp}" | ||
197 | 143 | # shellcheck disable=SC2039 | ||
198 | 144 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || | ||
199 | 145 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || | ||
200 | 146 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || | ||
201 | 147 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } | ||
202 | 148 | dummy=$tmp/dummy | ||
203 | 149 | case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in | ||
204 | 150 | ,,) echo "int x;" > "$dummy.c" | ||
205 | 151 | for driver in cc gcc c89 c99 ; do | ||
206 | 152 | if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then | ||
207 | 153 | CC_FOR_BUILD="$driver" | ||
208 | 154 | break | ||
209 | 155 | fi | ||
210 | 156 | done | ||
211 | 157 | if test x"$CC_FOR_BUILD" = x ; then | ||
212 | 158 | CC_FOR_BUILD=no_compiler_found | ||
213 | 159 | fi | ||
214 | 160 | ;; | ||
215 | 161 | ,,*) CC_FOR_BUILD=$CC ;; | ||
216 | 162 | ,*,*) CC_FOR_BUILD=$HOST_CC ;; | ||
217 | 163 | esac | ||
218 | 164 | } | ||
219 | 165 | |||
220 | 166 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. | ||
221 | 167 | # (ghazi@noc.rutgers.edu 1994-08-24) | ||
222 | 168 | if test -f /.attbin/uname ; then | ||
223 | 169 | >>>>>>> build-aux/config.guess | ||
224 | 127 | PATH=$PATH:/.attbin ; export PATH | 170 | PATH=$PATH:/.attbin ; export PATH |
225 | 128 | fi | 171 | fi |
226 | 129 | 172 | ||
227 | @@ -138,7 +181,11 @@ Linux|GNU|GNU/*) | |||
228 | 138 | # We could probably try harder. | 181 | # We could probably try harder. |
229 | 139 | LIBC=gnu | 182 | LIBC=gnu |
230 | 140 | 183 | ||
231 | 184 | <<<<<<< build-aux/config.guess | ||
232 | 141 | eval "$set_cc_for_build" | 185 | eval "$set_cc_for_build" |
233 | 186 | ======= | ||
234 | 187 | set_cc_for_build | ||
235 | 188 | >>>>>>> build-aux/config.guess | ||
236 | 142 | cat <<-EOF > "$dummy.c" | 189 | cat <<-EOF > "$dummy.c" |
237 | 143 | #include <features.h> | 190 | #include <features.h> |
238 | 144 | #if defined(__UCLIBC__) | 191 | #if defined(__UCLIBC__) |
239 | @@ -199,7 +246,11 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
240 | 199 | os=netbsdelf | 246 | os=netbsdelf |
241 | 200 | ;; | 247 | ;; |
242 | 201 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 248 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
243 | 249 | <<<<<<< build-aux/config.guess | ||
244 | 202 | eval "$set_cc_for_build" | 250 | eval "$set_cc_for_build" |
245 | 251 | ======= | ||
246 | 252 | set_cc_for_build | ||
247 | 253 | >>>>>>> build-aux/config.guess | ||
248 | 203 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 254 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
249 | 204 | | grep -q __ELF__ | 255 | | grep -q __ELF__ |
250 | 205 | then | 256 | then |
251 | @@ -237,7 +288,11 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
252 | 237 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | 288 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
253 | 238 | # contains redundant information, the shorter form: | 289 | # contains redundant information, the shorter form: |
254 | 239 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | 290 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
255 | 291 | <<<<<<< build-aux/config.guess | ||
256 | 240 | echo "$machine-${os}${release}${abi}" | 292 | echo "$machine-${os}${release}${abi}" |
257 | 293 | ======= | ||
258 | 294 | echo "$machine-${os}${release}${abi-}" | ||
259 | 295 | >>>>>>> build-aux/config.guess | ||
260 | 241 | exit ;; | 296 | exit ;; |
261 | 242 | *:Bitrig:*:*) | 297 | *:Bitrig:*:*) |
262 | 243 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` | 298 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
263 | @@ -389,6 +444,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
264 | 389 | echo i386-pc-auroraux"$UNAME_RELEASE" | 444 | echo i386-pc-auroraux"$UNAME_RELEASE" |
265 | 390 | exit ;; | 445 | exit ;; |
266 | 391 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 446 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
267 | 447 | <<<<<<< build-aux/config.guess | ||
268 | 392 | eval "$set_cc_for_build" | 448 | eval "$set_cc_for_build" |
269 | 393 | SUN_ARCH=i386 | 449 | SUN_ARCH=i386 |
270 | 394 | # If there is a compiler, see if it is configured for 64-bit objects. | 450 | # If there is a compiler, see if it is configured for 64-bit objects. |
271 | @@ -403,6 +459,17 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
272 | 403 | fi | 459 | fi |
273 | 404 | fi | 460 | fi |
274 | 405 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" | 461 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
275 | 462 | ======= | ||
276 | 463 | UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" | ||
277 | 464 | case `isainfo -b` in | ||
278 | 465 | 32) | ||
279 | 466 | echo i386-pc-solaris2"$UNAME_REL" | ||
280 | 467 | ;; | ||
281 | 468 | 64) | ||
282 | 469 | echo x86_64-pc-solaris2"$UNAME_REL" | ||
283 | 470 | ;; | ||
284 | 471 | esac | ||
285 | 472 | >>>>>>> build-aux/config.guess | ||
286 | 406 | exit ;; | 473 | exit ;; |
287 | 407 | sun4*:SunOS:6*:*) | 474 | sun4*:SunOS:6*:*) |
288 | 408 | # According to config.sub, this is the proper way to canonicalize | 475 | # According to config.sub, this is the proper way to canonicalize |
289 | @@ -482,7 +549,11 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in | |||
290 | 482 | echo clipper-intergraph-clix"$UNAME_RELEASE" | 549 | echo clipper-intergraph-clix"$UNAME_RELEASE" |
291 | 483 | exit ;; | 550 | exit ;; |
292 | 484 | mips:*:*:UMIPS | mips:*:*:RISCos) | 551 | mips:*:*:UMIPS | mips:*:*:RISCos) |
293 | 552 | <<<<<<< build-aux/config.guess | ||
294 | 485 | eval "$set_cc_for_build" | 553 | eval "$set_cc_for_build" |
295 | 554 | ======= | ||
296 | 555 | set_cc_for_build | ||
297 | 556 | >>>>>>> build-aux/config.guess | ||
298 | 486 | sed 's/^ //' << EOF > "$dummy.c" | 557 | sed 's/^ //' << EOF > "$dummy.c" |
299 | 487 | #ifdef __cplusplus | 558 | #ifdef __cplusplus |
300 | 488 | #include <stdio.h> /* for printf() prototype */ | 559 | #include <stdio.h> /* for printf() prototype */ |
301 | @@ -579,7 +650,11 @@ EOF | |||
302 | 579 | exit ;; | 650 | exit ;; |
303 | 580 | *:AIX:2:3) | 651 | *:AIX:2:3) |
304 | 581 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then | 652 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
305 | 653 | <<<<<<< build-aux/config.guess | ||
306 | 582 | eval "$set_cc_for_build" | 654 | eval "$set_cc_for_build" |
307 | 655 | ======= | ||
308 | 656 | set_cc_for_build | ||
309 | 657 | >>>>>>> build-aux/config.guess | ||
310 | 583 | sed 's/^ //' << EOF > "$dummy.c" | 658 | sed 's/^ //' << EOF > "$dummy.c" |
311 | 584 | #include <sys/systemcfg.h> | 659 | #include <sys/systemcfg.h> |
312 | 585 | 660 | ||
313 | @@ -660,7 +735,11 @@ EOF | |||
314 | 660 | esac | 735 | esac |
315 | 661 | fi | 736 | fi |
316 | 662 | if [ "$HP_ARCH" = "" ]; then | 737 | if [ "$HP_ARCH" = "" ]; then |
317 | 738 | <<<<<<< build-aux/config.guess | ||
318 | 663 | eval "$set_cc_for_build" | 739 | eval "$set_cc_for_build" |
319 | 740 | ======= | ||
320 | 741 | set_cc_for_build | ||
321 | 742 | >>>>>>> build-aux/config.guess | ||
322 | 664 | sed 's/^ //' << EOF > "$dummy.c" | 743 | sed 's/^ //' << EOF > "$dummy.c" |
323 | 665 | 744 | ||
324 | 666 | #define _HPUX_SOURCE | 745 | #define _HPUX_SOURCE |
325 | @@ -700,7 +779,11 @@ EOF | |||
326 | 700 | esac | 779 | esac |
327 | 701 | if [ "$HP_ARCH" = hppa2.0w ] | 780 | if [ "$HP_ARCH" = hppa2.0w ] |
328 | 702 | then | 781 | then |
329 | 782 | <<<<<<< build-aux/config.guess | ||
330 | 703 | eval "$set_cc_for_build" | 783 | eval "$set_cc_for_build" |
331 | 784 | ======= | ||
332 | 785 | set_cc_for_build | ||
333 | 786 | >>>>>>> build-aux/config.guess | ||
334 | 704 | 787 | ||
335 | 705 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating | 788 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
336 | 706 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler | 789 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
337 | @@ -726,7 +809,11 @@ EOF | |||
338 | 726 | echo ia64-hp-hpux"$HPUX_REV" | 809 | echo ia64-hp-hpux"$HPUX_REV" |
339 | 727 | exit ;; | 810 | exit ;; |
340 | 728 | 3050*:HI-UX:*:*) | 811 | 3050*:HI-UX:*:*) |
341 | 812 | <<<<<<< build-aux/config.guess | ||
342 | 729 | eval "$set_cc_for_build" | 813 | eval "$set_cc_for_build" |
343 | 814 | ======= | ||
344 | 815 | set_cc_for_build | ||
345 | 816 | >>>>>>> build-aux/config.guess | ||
346 | 730 | sed 's/^ //' << EOF > "$dummy.c" | 817 | sed 's/^ //' << EOF > "$dummy.c" |
347 | 731 | #include <unistd.h> | 818 | #include <unistd.h> |
348 | 732 | int | 819 | int |
349 | @@ -840,6 +927,20 @@ EOF | |||
350 | 840 | *:BSD/OS:*:*) | 927 | *:BSD/OS:*:*) |
351 | 841 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" | 928 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" |
352 | 842 | exit ;; | 929 | exit ;; |
353 | 930 | <<<<<<< build-aux/config.guess | ||
354 | 931 | ======= | ||
355 | 932 | arm:FreeBSD:*:*) | ||
356 | 933 | UNAME_PROCESSOR=`uname -p` | ||
357 | 934 | set_cc_for_build | ||
358 | 935 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | ||
359 | 936 | | grep -q __ARM_PCS_VFP | ||
360 | 937 | then | ||
361 | 938 | echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi | ||
362 | 939 | else | ||
363 | 940 | echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf | ||
364 | 941 | fi | ||
365 | 942 | exit ;; | ||
366 | 943 | >>>>>>> build-aux/config.guess | ||
367 | 843 | *:FreeBSD:*:*) | 944 | *:FreeBSD:*:*) |
368 | 844 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 945 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
369 | 845 | case "$UNAME_PROCESSOR" in | 946 | case "$UNAME_PROCESSOR" in |
370 | @@ -894,8 +995,13 @@ EOF | |||
371 | 894 | # other systems with GNU libc and userland | 995 | # other systems with GNU libc and userland |
372 | 895 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" | 996 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" |
373 | 896 | exit ;; | 997 | exit ;; |
374 | 998 | <<<<<<< build-aux/config.guess | ||
375 | 897 | i*86:Minix:*:*) | 999 | i*86:Minix:*:*) |
376 | 898 | echo "$UNAME_MACHINE"-pc-minix | 1000 | echo "$UNAME_MACHINE"-pc-minix |
377 | 1001 | ======= | ||
378 | 1002 | *:Minix:*:*) | ||
379 | 1003 | echo "$UNAME_MACHINE"-unknown-minix | ||
380 | 1004 | >>>>>>> build-aux/config.guess | ||
381 | 899 | exit ;; | 1005 | exit ;; |
382 | 900 | aarch64:Linux:*:*) | 1006 | aarch64:Linux:*:*) |
383 | 901 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 1007 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
384 | @@ -922,7 +1028,11 @@ EOF | |||
385 | 922 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 1028 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
386 | 923 | exit ;; | 1029 | exit ;; |
387 | 924 | arm*:Linux:*:*) | 1030 | arm*:Linux:*:*) |
388 | 1031 | <<<<<<< build-aux/config.guess | ||
389 | 925 | eval "$set_cc_for_build" | 1032 | eval "$set_cc_for_build" |
390 | 1033 | ======= | ||
391 | 1034 | set_cc_for_build | ||
392 | 1035 | >>>>>>> build-aux/config.guess | ||
393 | 926 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 1036 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
394 | 927 | | grep -q __ARM_EABI__ | 1037 | | grep -q __ARM_EABI__ |
395 | 928 | then | 1038 | then |
396 | @@ -971,7 +1081,11 @@ EOF | |||
397 | 971 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 1081 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
398 | 972 | exit ;; | 1082 | exit ;; |
399 | 973 | mips:Linux:*:* | mips64:Linux:*:*) | 1083 | mips:Linux:*:* | mips64:Linux:*:*) |
400 | 1084 | <<<<<<< build-aux/config.guess | ||
401 | 974 | eval "$set_cc_for_build" | 1085 | eval "$set_cc_for_build" |
402 | 1086 | ======= | ||
403 | 1087 | set_cc_for_build | ||
404 | 1088 | >>>>>>> build-aux/config.guess | ||
405 | 975 | sed 's/^ //' << EOF > "$dummy.c" | 1089 | sed 's/^ //' << EOF > "$dummy.c" |
406 | 976 | #undef CPU | 1090 | #undef CPU |
407 | 977 | #undef ${UNAME_MACHINE} | 1091 | #undef ${UNAME_MACHINE} |
408 | @@ -1285,7 +1399,11 @@ EOF | |||
409 | 1285 | exit ;; | 1399 | exit ;; |
410 | 1286 | *:Darwin:*:*) | 1400 | *:Darwin:*:*) |
411 | 1287 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1401 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
412 | 1402 | <<<<<<< build-aux/config.guess | ||
413 | 1288 | eval "$set_cc_for_build" | 1403 | eval "$set_cc_for_build" |
414 | 1404 | ======= | ||
415 | 1405 | set_cc_for_build | ||
416 | 1406 | >>>>>>> build-aux/config.guess | ||
417 | 1289 | if test "$UNAME_PROCESSOR" = unknown ; then | 1407 | if test "$UNAME_PROCESSOR" = unknown ; then |
418 | 1290 | UNAME_PROCESSOR=powerpc | 1408 | UNAME_PROCESSOR=powerpc |
419 | 1291 | fi | 1409 | fi |
420 | @@ -1358,6 +1476,10 @@ EOF | |||
421 | 1358 | # "uname -m" is not consistent, so use $cputype instead. 386 | 1476 | # "uname -m" is not consistent, so use $cputype instead. 386 |
422 | 1359 | # is converted to i386 for consistency with other x86 | 1477 | # is converted to i386 for consistency with other x86 |
423 | 1360 | # operating systems. | 1478 | # operating systems. |
424 | 1479 | <<<<<<< build-aux/config.guess | ||
425 | 1480 | ======= | ||
426 | 1481 | # shellcheck disable=SC2154 | ||
427 | 1482 | >>>>>>> build-aux/config.guess | ||
428 | 1361 | if test "$cputype" = 386; then | 1483 | if test "$cputype" = 386; then |
429 | 1362 | UNAME_MACHINE=i386 | 1484 | UNAME_MACHINE=i386 |
430 | 1363 | else | 1485 | else |
431 | diff --git a/build-aux/config.sub b/build-aux/config.sub | |||
432 | index 9ccf09a..d712ba5 100755 | |||
433 | --- a/build-aux/config.sub | |||
434 | +++ b/build-aux/config.sub | |||
435 | @@ -2,7 +2,11 @@ | |||
436 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
437 | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
438 | 4 | 4 | ||
439 | 5 | <<<<<<< build-aux/config.sub | ||
440 | 5 | timestamp='2018-03-08' | 6 | timestamp='2018-03-08' |
441 | 7 | ======= | ||
442 | 8 | timestamp='2018-08-29' | ||
443 | 9 | >>>>>>> build-aux/config.sub | ||
444 | 6 | 10 | ||
445 | 7 | # This file is free software; you can redistribute it and/or modify it | 11 | # This file is free software; you can redistribute it and/or modify it |
446 | 8 | # under the terms of the GNU General Public License as published by | 12 | # under the terms of the GNU General Public License as published by |
447 | @@ -110,6 +114,7 @@ case $# in | |||
448 | 110 | exit 1;; | 114 | exit 1;; |
449 | 111 | esac | 115 | esac |
450 | 112 | 116 | ||
451 | 117 | <<<<<<< build-aux/config.sub | ||
452 | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). | 118 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). |
453 | 114 | # Here we must recognize all the valid KERNEL-OS combinations. | 119 | # Here we must recognize all the valid KERNEL-OS combinations. |
454 | 115 | maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 120 | maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
455 | @@ -1317,16 +1322,1170 @@ case $basic_machine in | |||
456 | 1317 | *) | 1322 | *) |
457 | 1318 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 | 1323 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 |
458 | 1319 | exit 1 | 1324 | exit 1 |
459 | 1325 | ======= | ||
460 | 1326 | # Split fields of configuration type | ||
461 | 1327 | IFS="-" read -r field1 field2 field3 field4 <<EOF | ||
462 | 1328 | $1 | ||
463 | 1329 | EOF | ||
464 | 1330 | |||
465 | 1331 | # Separate into logical components for further validation | ||
466 | 1332 | case $1 in | ||
467 | 1333 | *-*-*-*-*) | ||
468 | 1334 | echo Invalid configuration \`"$1"\': more than four components >&2 | ||
469 | 1335 | exit 1 | ||
470 | 1336 | ;; | ||
471 | 1337 | *-*-*-*) | ||
472 | 1338 | basic_machine=$field1-$field2 | ||
473 | 1339 | os=$field3-$field4 | ||
474 | 1340 | ;; | ||
475 | 1341 | *-*-*) | ||
476 | 1342 | # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two | ||
477 | 1343 | # parts | ||
478 | 1344 | maybe_os=$field2-$field3 | ||
479 | 1345 | case $maybe_os in | ||
480 | 1346 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ | ||
481 | 1347 | | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ | ||
482 | 1348 | | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | ||
483 | 1349 | | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | ||
484 | 1350 | | storm-chaos* | os2-emx* | rtmk-nova*) | ||
485 | 1351 | basic_machine=$field1 | ||
486 | 1352 | os=$maybe_os | ||
487 | 1353 | ;; | ||
488 | 1354 | android-linux) | ||
489 | 1355 | basic_machine=$field1-unknown | ||
490 | 1356 | os=linux-android | ||
491 | 1357 | ;; | ||
492 | 1358 | *) | ||
493 | 1359 | basic_machine=$field1-$field2 | ||
494 | 1360 | os=$field3 | ||
495 | 1361 | ;; | ||
496 | 1362 | esac | ||
497 | 1363 | ;; | ||
498 | 1364 | *-*) | ||
499 | 1365 | # A lone config we happen to match not fitting any patern | ||
500 | 1366 | case $field1-$field2 in | ||
501 | 1367 | decstation-3100) | ||
502 | 1368 | basic_machine=mips-dec | ||
503 | 1369 | os= | ||
504 | 1370 | ;; | ||
505 | 1371 | *-*) | ||
506 | 1372 | # Second component is usually, but not always the OS | ||
507 | 1373 | case $field2 in | ||
508 | 1374 | # Prevent following clause from handling this valid os | ||
509 | 1375 | sun*os*) | ||
510 | 1376 | basic_machine=$field1 | ||
511 | 1377 | os=$field2 | ||
512 | 1378 | ;; | ||
513 | 1379 | # Manufacturers | ||
514 | 1380 | dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ | ||
515 | 1381 | | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ | ||
516 | 1382 | | unicom* | ibm* | next | hp | isi* | apollo | altos* \ | ||
517 | 1383 | | convergent* | ncr* | news | 32* | 3600* | 3100* \ | ||
518 | 1384 | | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ | ||
519 | 1385 | | ultra | tti* | harris | dolphin | highlevel | gould \ | ||
520 | 1386 | | cbm | ns | masscomp | apple | axis | knuth | cray \ | ||
521 | 1387 | | microblaze* | sim | cisco \ | ||
522 | 1388 | | oki | wec | wrs | winbond) | ||
523 | 1389 | basic_machine=$field1-$field2 | ||
524 | 1390 | os= | ||
525 | 1391 | ;; | ||
526 | 1392 | *) | ||
527 | 1393 | basic_machine=$field1 | ||
528 | 1394 | os=$field2 | ||
529 | 1395 | ;; | ||
530 | 1396 | esac | ||
531 | 1397 | ;; | ||
532 | 1398 | esac | ||
533 | 1399 | ;; | ||
534 | 1400 | *) | ||
535 | 1401 | # Convert single-component short-hands not valid as part of | ||
536 | 1402 | # multi-component configurations. | ||
537 | 1403 | case $field1 in | ||
538 | 1404 | 386bsd) | ||
539 | 1405 | basic_machine=i386-pc | ||
540 | 1406 | os=bsd | ||
541 | 1407 | ;; | ||
542 | 1408 | a29khif) | ||
543 | 1409 | basic_machine=a29k-amd | ||
544 | 1410 | os=udi | ||
545 | 1411 | ;; | ||
546 | 1412 | adobe68k) | ||
547 | 1413 | basic_machine=m68010-adobe | ||
548 | 1414 | os=scout | ||
549 | 1415 | ;; | ||
550 | 1416 | alliant) | ||
551 | 1417 | basic_machine=fx80-alliant | ||
552 | 1418 | os= | ||
553 | 1419 | ;; | ||
554 | 1420 | altos | altos3068) | ||
555 | 1421 | basic_machine=m68k-altos | ||
556 | 1422 | os= | ||
557 | 1423 | ;; | ||
558 | 1424 | am29k) | ||
559 | 1425 | basic_machine=a29k-none | ||
560 | 1426 | os=bsd | ||
561 | 1427 | ;; | ||
562 | 1428 | amdahl) | ||
563 | 1429 | basic_machine=580-amdahl | ||
564 | 1430 | os=sysv | ||
565 | 1431 | ;; | ||
566 | 1432 | amiga) | ||
567 | 1433 | basic_machine=m68k-unknown | ||
568 | 1434 | os= | ||
569 | 1435 | ;; | ||
570 | 1436 | amigaos | amigados) | ||
571 | 1437 | basic_machine=m68k-unknown | ||
572 | 1438 | os=amigaos | ||
573 | 1439 | ;; | ||
574 | 1440 | amigaunix | amix) | ||
575 | 1441 | basic_machine=m68k-unknown | ||
576 | 1442 | os=sysv4 | ||
577 | 1443 | ;; | ||
578 | 1444 | apollo68) | ||
579 | 1445 | basic_machine=m68k-apollo | ||
580 | 1446 | os=sysv | ||
581 | 1447 | ;; | ||
582 | 1448 | apollo68bsd) | ||
583 | 1449 | basic_machine=m68k-apollo | ||
584 | 1450 | os=bsd | ||
585 | 1451 | ;; | ||
586 | 1452 | aros) | ||
587 | 1453 | basic_machine=i386-pc | ||
588 | 1454 | os=aros | ||
589 | 1455 | ;; | ||
590 | 1456 | aux) | ||
591 | 1457 | basic_machine=m68k-apple | ||
592 | 1458 | os=aux | ||
593 | 1459 | ;; | ||
594 | 1460 | balance) | ||
595 | 1461 | basic_machine=ns32k-sequent | ||
596 | 1462 | os=dynix | ||
597 | 1463 | ;; | ||
598 | 1464 | blackfin) | ||
599 | 1465 | basic_machine=bfin-unknown | ||
600 | 1466 | os=linux | ||
601 | 1467 | ;; | ||
602 | 1468 | cegcc) | ||
603 | 1469 | basic_machine=arm-unknown | ||
604 | 1470 | os=cegcc | ||
605 | 1471 | ;; | ||
606 | 1472 | convex-c1) | ||
607 | 1473 | basic_machine=c1-convex | ||
608 | 1474 | os=bsd | ||
609 | 1475 | ;; | ||
610 | 1476 | convex-c2) | ||
611 | 1477 | basic_machine=c2-convex | ||
612 | 1478 | os=bsd | ||
613 | 1479 | ;; | ||
614 | 1480 | convex-c32) | ||
615 | 1481 | basic_machine=c32-convex | ||
616 | 1482 | os=bsd | ||
617 | 1483 | ;; | ||
618 | 1484 | convex-c34) | ||
619 | 1485 | basic_machine=c34-convex | ||
620 | 1486 | os=bsd | ||
621 | 1487 | ;; | ||
622 | 1488 | convex-c38) | ||
623 | 1489 | basic_machine=c38-convex | ||
624 | 1490 | os=bsd | ||
625 | 1491 | ;; | ||
626 | 1492 | cray) | ||
627 | 1493 | basic_machine=j90-cray | ||
628 | 1494 | os=unicos | ||
629 | 1495 | ;; | ||
630 | 1496 | crds | unos) | ||
631 | 1497 | basic_machine=m68k-crds | ||
632 | 1498 | os= | ||
633 | 1499 | ;; | ||
634 | 1500 | da30) | ||
635 | 1501 | basic_machine=m68k-da30 | ||
636 | 1502 | os= | ||
637 | 1503 | ;; | ||
638 | 1504 | decstation | pmax | pmin | dec3100 | decstatn) | ||
639 | 1505 | basic_machine=mips-dec | ||
640 | 1506 | os= | ||
641 | 1507 | ;; | ||
642 | 1508 | delta88) | ||
643 | 1509 | basic_machine=m88k-motorola | ||
644 | 1510 | os=sysv3 | ||
645 | 1511 | ;; | ||
646 | 1512 | dicos) | ||
647 | 1513 | basic_machine=i686-pc | ||
648 | 1514 | os=dicos | ||
649 | 1515 | ;; | ||
650 | 1516 | djgpp) | ||
651 | 1517 | basic_machine=i586-pc | ||
652 | 1518 | os=msdosdjgpp | ||
653 | 1519 | ;; | ||
654 | 1520 | ebmon29k) | ||
655 | 1521 | basic_machine=a29k-amd | ||
656 | 1522 | os=ebmon | ||
657 | 1523 | ;; | ||
658 | 1524 | es1800 | OSE68k | ose68k | ose | OSE) | ||
659 | 1525 | basic_machine=m68k-ericsson | ||
660 | 1526 | os=ose | ||
661 | 1527 | ;; | ||
662 | 1528 | gmicro) | ||
663 | 1529 | basic_machine=tron-gmicro | ||
664 | 1530 | os=sysv | ||
665 | 1531 | ;; | ||
666 | 1532 | go32) | ||
667 | 1533 | basic_machine=i386-pc | ||
668 | 1534 | os=go32 | ||
669 | 1535 | ;; | ||
670 | 1536 | h8300hms) | ||
671 | 1537 | basic_machine=h8300-hitachi | ||
672 | 1538 | os=hms | ||
673 | 1539 | ;; | ||
674 | 1540 | h8300xray) | ||
675 | 1541 | basic_machine=h8300-hitachi | ||
676 | 1542 | os=xray | ||
677 | 1543 | ;; | ||
678 | 1544 | h8500hms) | ||
679 | 1545 | basic_machine=h8500-hitachi | ||
680 | 1546 | os=hms | ||
681 | 1547 | ;; | ||
682 | 1548 | harris) | ||
683 | 1549 | basic_machine=m88k-harris | ||
684 | 1550 | os=sysv3 | ||
685 | 1551 | ;; | ||
686 | 1552 | hp300) | ||
687 | 1553 | basic_machine=m68k-hp | ||
688 | 1554 | ;; | ||
689 | 1555 | hp300bsd) | ||
690 | 1556 | basic_machine=m68k-hp | ||
691 | 1557 | os=bsd | ||
692 | 1558 | ;; | ||
693 | 1559 | hp300hpux) | ||
694 | 1560 | basic_machine=m68k-hp | ||
695 | 1561 | os=hpux | ||
696 | 1562 | ;; | ||
697 | 1563 | hppaosf) | ||
698 | 1564 | basic_machine=hppa1.1-hp | ||
699 | 1565 | os=osf | ||
700 | 1566 | ;; | ||
701 | 1567 | hppro) | ||
702 | 1568 | basic_machine=hppa1.1-hp | ||
703 | 1569 | os=proelf | ||
704 | 1570 | ;; | ||
705 | 1571 | i386mach) | ||
706 | 1572 | basic_machine=i386-mach | ||
707 | 1573 | os=mach | ||
708 | 1574 | ;; | ||
709 | 1575 | vsta) | ||
710 | 1576 | basic_machine=i386-pc | ||
711 | 1577 | os=vsta | ||
712 | 1578 | ;; | ||
713 | 1579 | isi68 | isi) | ||
714 | 1580 | basic_machine=m68k-isi | ||
715 | 1581 | os=sysv | ||
716 | 1582 | ;; | ||
717 | 1583 | m68knommu) | ||
718 | 1584 | basic_machine=m68k-unknown | ||
719 | 1585 | os=linux | ||
720 | 1586 | ;; | ||
721 | 1587 | magnum | m3230) | ||
722 | 1588 | basic_machine=mips-mips | ||
723 | 1589 | os=sysv | ||
724 | 1590 | ;; | ||
725 | 1591 | merlin) | ||
726 | 1592 | basic_machine=ns32k-utek | ||
727 | 1593 | os=sysv | ||
728 | 1594 | ;; | ||
729 | 1595 | mingw64) | ||
730 | 1596 | basic_machine=x86_64-pc | ||
731 | 1597 | os=mingw64 | ||
732 | 1598 | ;; | ||
733 | 1599 | mingw32) | ||
734 | 1600 | basic_machine=i686-pc | ||
735 | 1601 | os=mingw32 | ||
736 | 1602 | ;; | ||
737 | 1603 | mingw32ce) | ||
738 | 1604 | basic_machine=arm-unknown | ||
739 | 1605 | os=mingw32ce | ||
740 | 1606 | ;; | ||
741 | 1607 | monitor) | ||
742 | 1608 | basic_machine=m68k-rom68k | ||
743 | 1609 | os=coff | ||
744 | 1610 | ;; | ||
745 | 1611 | morphos) | ||
746 | 1612 | basic_machine=powerpc-unknown | ||
747 | 1613 | os=morphos | ||
748 | 1614 | ;; | ||
749 | 1615 | moxiebox) | ||
750 | 1616 | basic_machine=moxie-unknown | ||
751 | 1617 | os=moxiebox | ||
752 | 1618 | ;; | ||
753 | 1619 | msdos) | ||
754 | 1620 | basic_machine=i386-pc | ||
755 | 1621 | os=msdos | ||
756 | 1622 | ;; | ||
757 | 1623 | msys) | ||
758 | 1624 | basic_machine=i686-pc | ||
759 | 1625 | os=msys | ||
760 | 1626 | ;; | ||
761 | 1627 | mvs) | ||
762 | 1628 | basic_machine=i370-ibm | ||
763 | 1629 | os=mvs | ||
764 | 1630 | ;; | ||
765 | 1631 | nacl) | ||
766 | 1632 | basic_machine=le32-unknown | ||
767 | 1633 | os=nacl | ||
768 | 1634 | ;; | ||
769 | 1635 | ncr3000) | ||
770 | 1636 | basic_machine=i486-ncr | ||
771 | 1637 | os=sysv4 | ||
772 | 1638 | ;; | ||
773 | 1639 | netbsd386) | ||
774 | 1640 | basic_machine=i386-pc | ||
775 | 1641 | os=netbsd | ||
776 | 1642 | ;; | ||
777 | 1643 | netwinder) | ||
778 | 1644 | basic_machine=armv4l-rebel | ||
779 | 1645 | os=linux | ||
780 | 1646 | ;; | ||
781 | 1647 | news | news700 | news800 | news900) | ||
782 | 1648 | basic_machine=m68k-sony | ||
783 | 1649 | os=newsos | ||
784 | 1650 | ;; | ||
785 | 1651 | news1000) | ||
786 | 1652 | basic_machine=m68030-sony | ||
787 | 1653 | os=newsos | ||
788 | 1654 | ;; | ||
789 | 1655 | necv70) | ||
790 | 1656 | basic_machine=v70-nec | ||
791 | 1657 | os=sysv | ||
792 | 1658 | ;; | ||
793 | 1659 | nh3000) | ||
794 | 1660 | basic_machine=m68k-harris | ||
795 | 1661 | os=cxux | ||
796 | 1662 | ;; | ||
797 | 1663 | nh[45]000) | ||
798 | 1664 | basic_machine=m88k-harris | ||
799 | 1665 | os=cxux | ||
800 | 1666 | ;; | ||
801 | 1667 | nindy960) | ||
802 | 1668 | basic_machine=i960-intel | ||
803 | 1669 | os=nindy | ||
804 | 1670 | ;; | ||
805 | 1671 | mon960) | ||
806 | 1672 | basic_machine=i960-intel | ||
807 | 1673 | os=mon960 | ||
808 | 1674 | ;; | ||
809 | 1675 | nonstopux) | ||
810 | 1676 | basic_machine=mips-compaq | ||
811 | 1677 | os=nonstopux | ||
812 | 1678 | ;; | ||
813 | 1679 | os400) | ||
814 | 1680 | basic_machine=powerpc-ibm | ||
815 | 1681 | os=os400 | ||
816 | 1682 | ;; | ||
817 | 1683 | OSE68000 | ose68000) | ||
818 | 1684 | basic_machine=m68000-ericsson | ||
819 | 1685 | os=ose | ||
820 | 1686 | ;; | ||
821 | 1687 | os68k) | ||
822 | 1688 | basic_machine=m68k-none | ||
823 | 1689 | os=os68k | ||
824 | 1690 | ;; | ||
825 | 1691 | paragon) | ||
826 | 1692 | basic_machine=i860-intel | ||
827 | 1693 | os=osf | ||
828 | 1694 | ;; | ||
829 | 1695 | parisc) | ||
830 | 1696 | basic_machine=hppa-unknown | ||
831 | 1697 | os=linux | ||
832 | 1698 | ;; | ||
833 | 1699 | pw32) | ||
834 | 1700 | basic_machine=i586-unknown | ||
835 | 1701 | os=pw32 | ||
836 | 1702 | ;; | ||
837 | 1703 | rdos | rdos64) | ||
838 | 1704 | basic_machine=x86_64-pc | ||
839 | 1705 | os=rdos | ||
840 | 1706 | ;; | ||
841 | 1707 | rdos32) | ||
842 | 1708 | basic_machine=i386-pc | ||
843 | 1709 | os=rdos | ||
844 | 1710 | ;; | ||
845 | 1711 | rom68k) | ||
846 | 1712 | basic_machine=m68k-rom68k | ||
847 | 1713 | os=coff | ||
848 | 1714 | ;; | ||
849 | 1715 | sa29200) | ||
850 | 1716 | basic_machine=a29k-amd | ||
851 | 1717 | os=udi | ||
852 | 1718 | ;; | ||
853 | 1719 | sei) | ||
854 | 1720 | basic_machine=mips-sei | ||
855 | 1721 | os=seiux | ||
856 | 1722 | ;; | ||
857 | 1723 | sequent) | ||
858 | 1724 | basic_machine=i386-sequent | ||
859 | 1725 | os= | ||
860 | 1726 | ;; | ||
861 | 1727 | sps7) | ||
862 | 1728 | basic_machine=m68k-bull | ||
863 | 1729 | os=sysv2 | ||
864 | 1730 | ;; | ||
865 | 1731 | st2000) | ||
866 | 1732 | basic_machine=m68k-tandem | ||
867 | 1733 | os= | ||
868 | 1734 | ;; | ||
869 | 1735 | stratus) | ||
870 | 1736 | basic_machine=i860-stratus | ||
871 | 1737 | os=sysv4 | ||
872 | 1738 | ;; | ||
873 | 1739 | sun2) | ||
874 | 1740 | basic_machine=m68000-sun | ||
875 | 1741 | os= | ||
876 | 1742 | ;; | ||
877 | 1743 | sun2os3) | ||
878 | 1744 | basic_machine=m68000-sun | ||
879 | 1745 | os=sunos3 | ||
880 | 1746 | ;; | ||
881 | 1747 | sun2os4) | ||
882 | 1748 | basic_machine=m68000-sun | ||
883 | 1749 | os=sunos4 | ||
884 | 1750 | ;; | ||
885 | 1751 | sun3) | ||
886 | 1752 | basic_machine=m68k-sun | ||
887 | 1753 | os= | ||
888 | 1754 | ;; | ||
889 | 1755 | sun3os3) | ||
890 | 1756 | basic_machine=m68k-sun | ||
891 | 1757 | os=sunos3 | ||
892 | 1758 | ;; | ||
893 | 1759 | sun3os4) | ||
894 | 1760 | basic_machine=m68k-sun | ||
895 | 1761 | os=sunos4 | ||
896 | 1762 | ;; | ||
897 | 1763 | sun4) | ||
898 | 1764 | basic_machine=sparc-sun | ||
899 | 1765 | os= | ||
900 | 1766 | ;; | ||
901 | 1767 | sun4os3) | ||
902 | 1768 | basic_machine=sparc-sun | ||
903 | 1769 | os=sunos3 | ||
904 | 1770 | ;; | ||
905 | 1771 | sun4os4) | ||
906 | 1772 | basic_machine=sparc-sun | ||
907 | 1773 | os=sunos4 | ||
908 | 1774 | ;; | ||
909 | 1775 | sun4sol2) | ||
910 | 1776 | basic_machine=sparc-sun | ||
911 | 1777 | os=solaris2 | ||
912 | 1778 | ;; | ||
913 | 1779 | sun386 | sun386i | roadrunner) | ||
914 | 1780 | basic_machine=i386-sun | ||
915 | 1781 | os= | ||
916 | 1782 | ;; | ||
917 | 1783 | sv1) | ||
918 | 1784 | basic_machine=sv1-cray | ||
919 | 1785 | os=unicos | ||
920 | 1786 | ;; | ||
921 | 1787 | symmetry) | ||
922 | 1788 | basic_machine=i386-sequent | ||
923 | 1789 | os=dynix | ||
924 | 1790 | ;; | ||
925 | 1791 | t3e) | ||
926 | 1792 | basic_machine=alphaev5-cray | ||
927 | 1793 | os=unicos | ||
928 | 1794 | ;; | ||
929 | 1795 | t90) | ||
930 | 1796 | basic_machine=t90-cray | ||
931 | 1797 | os=unicos | ||
932 | 1798 | ;; | ||
933 | 1799 | toad1) | ||
934 | 1800 | basic_machine=pdp10-xkl | ||
935 | 1801 | os=tops20 | ||
936 | 1802 | ;; | ||
937 | 1803 | tpf) | ||
938 | 1804 | basic_machine=s390x-ibm | ||
939 | 1805 | os=tpf | ||
940 | 1806 | ;; | ||
941 | 1807 | udi29k) | ||
942 | 1808 | basic_machine=a29k-amd | ||
943 | 1809 | os=udi | ||
944 | 1810 | ;; | ||
945 | 1811 | ultra3) | ||
946 | 1812 | basic_machine=a29k-nyu | ||
947 | 1813 | os=sym1 | ||
948 | 1814 | ;; | ||
949 | 1815 | v810 | necv810) | ||
950 | 1816 | basic_machine=v810-nec | ||
951 | 1817 | os=none | ||
952 | 1818 | ;; | ||
953 | 1819 | vaxv) | ||
954 | 1820 | basic_machine=vax-dec | ||
955 | 1821 | os=sysv | ||
956 | 1822 | ;; | ||
957 | 1823 | vms) | ||
958 | 1824 | basic_machine=vax-dec | ||
959 | 1825 | os=vms | ||
960 | 1826 | ;; | ||
961 | 1827 | vxworks960) | ||
962 | 1828 | basic_machine=i960-wrs | ||
963 | 1829 | os=vxworks | ||
964 | 1830 | ;; | ||
965 | 1831 | vxworks68) | ||
966 | 1832 | basic_machine=m68k-wrs | ||
967 | 1833 | os=vxworks | ||
968 | 1834 | ;; | ||
969 | 1835 | vxworks29k) | ||
970 | 1836 | basic_machine=a29k-wrs | ||
971 | 1837 | os=vxworks | ||
972 | 1838 | ;; | ||
973 | 1839 | xbox) | ||
974 | 1840 | basic_machine=i686-pc | ||
975 | 1841 | os=mingw32 | ||
976 | 1842 | ;; | ||
977 | 1843 | ymp) | ||
978 | 1844 | basic_machine=ymp-cray | ||
979 | 1845 | os=unicos | ||
980 | 1846 | ;; | ||
981 | 1847 | *) | ||
982 | 1848 | basic_machine=$1 | ||
983 | 1849 | os= | ||
984 | 1850 | ;; | ||
985 | 1851 | esac | ||
986 | 1852 | ;; | ||
987 | 1853 | esac | ||
988 | 1854 | |||
989 | 1855 | # Decode 1-component or ad-hoc basic machines | ||
990 | 1856 | case $basic_machine in | ||
991 | 1857 | # Here we handle the default manufacturer of certain CPU types. It is in | ||
992 | 1858 | # some cases the only manufacturer, in others, it is the most popular. | ||
993 | 1859 | w89k) | ||
994 | 1860 | cpu=hppa1.1 | ||
995 | 1861 | vendor=winbond | ||
996 | 1862 | ;; | ||
997 | 1863 | op50n) | ||
998 | 1864 | cpu=hppa1.1 | ||
999 | 1865 | vendor=oki | ||
1000 | 1866 | ;; | ||
1001 | 1867 | op60c) | ||
1002 | 1868 | cpu=hppa1.1 | ||
1003 | 1869 | vendor=oki | ||
1004 | 1870 | ;; | ||
1005 | 1871 | ibm*) | ||
1006 | 1872 | cpu=i370 | ||
1007 | 1873 | vendor=ibm | ||
1008 | 1874 | ;; | ||
1009 | 1875 | orion105) | ||
1010 | 1876 | cpu=clipper | ||
1011 | 1877 | vendor=highlevel | ||
1012 | 1878 | ;; | ||
1013 | 1879 | mac | mpw | mac-mpw) | ||
1014 | 1880 | cpu=m68k | ||
1015 | 1881 | vendor=apple | ||
1016 | 1882 | ;; | ||
1017 | 1883 | pmac | pmac-mpw) | ||
1018 | 1884 | cpu=powerpc | ||
1019 | 1885 | vendor=apple | ||
1020 | 1886 | ;; | ||
1021 | 1887 | |||
1022 | 1888 | # Recognize the various machine names and aliases which stand | ||
1023 | 1889 | # for a CPU type and a company and sometimes even an OS. | ||
1024 | 1890 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) | ||
1025 | 1891 | cpu=m68000 | ||
1026 | 1892 | vendor=att | ||
1027 | 1893 | ;; | ||
1028 | 1894 | 3b*) | ||
1029 | 1895 | cpu=we32k | ||
1030 | 1896 | vendor=att | ||
1031 | 1897 | ;; | ||
1032 | 1898 | bluegene*) | ||
1033 | 1899 | cpu=powerpc | ||
1034 | 1900 | vendor=ibm | ||
1035 | 1901 | os=cnk | ||
1036 | 1902 | ;; | ||
1037 | 1903 | decsystem10* | dec10*) | ||
1038 | 1904 | cpu=pdp10 | ||
1039 | 1905 | vendor=dec | ||
1040 | 1906 | os=tops10 | ||
1041 | 1907 | ;; | ||
1042 | 1908 | decsystem20* | dec20*) | ||
1043 | 1909 | cpu=pdp10 | ||
1044 | 1910 | vendor=dec | ||
1045 | 1911 | os=tops20 | ||
1046 | 1912 | ;; | ||
1047 | 1913 | delta | 3300 | motorola-3300 | motorola-delta \ | ||
1048 | 1914 | | 3300-motorola | delta-motorola) | ||
1049 | 1915 | cpu=m68k | ||
1050 | 1916 | vendor=motorola | ||
1051 | 1917 | ;; | ||
1052 | 1918 | dpx2*) | ||
1053 | 1919 | cpu=m68k | ||
1054 | 1920 | vendor=bull | ||
1055 | 1921 | os=sysv3 | ||
1056 | 1922 | ;; | ||
1057 | 1923 | encore | umax | mmax) | ||
1058 | 1924 | cpu=ns32k | ||
1059 | 1925 | vendor=encore | ||
1060 | 1926 | ;; | ||
1061 | 1927 | elxsi) | ||
1062 | 1928 | cpu=elxsi | ||
1063 | 1929 | vendor=elxsi | ||
1064 | 1930 | os=${os:-bsd} | ||
1065 | 1931 | ;; | ||
1066 | 1932 | fx2800) | ||
1067 | 1933 | cpu=i860 | ||
1068 | 1934 | vendor=alliant | ||
1069 | 1935 | ;; | ||
1070 | 1936 | genix) | ||
1071 | 1937 | cpu=ns32k | ||
1072 | 1938 | vendor=ns | ||
1073 | 1939 | ;; | ||
1074 | 1940 | h3050r* | hiux*) | ||
1075 | 1941 | cpu=hppa1.1 | ||
1076 | 1942 | vendor=hitachi | ||
1077 | 1943 | os=hiuxwe2 | ||
1078 | 1944 | ;; | ||
1079 | 1945 | hp3k9[0-9][0-9] | hp9[0-9][0-9]) | ||
1080 | 1946 | cpu=hppa1.0 | ||
1081 | 1947 | vendor=hp | ||
1082 | 1948 | ;; | ||
1083 | 1949 | hp9k2[0-9][0-9] | hp9k31[0-9]) | ||
1084 | 1950 | cpu=m68000 | ||
1085 | 1951 | vendor=hp | ||
1086 | 1952 | ;; | ||
1087 | 1953 | hp9k3[2-9][0-9]) | ||
1088 | 1954 | cpu=m68k | ||
1089 | 1955 | vendor=hp | ||
1090 | 1956 | ;; | ||
1091 | 1957 | hp9k6[0-9][0-9] | hp6[0-9][0-9]) | ||
1092 | 1958 | cpu=hppa1.0 | ||
1093 | 1959 | vendor=hp | ||
1094 | 1960 | ;; | ||
1095 | 1961 | hp9k7[0-79][0-9] | hp7[0-79][0-9]) | ||
1096 | 1962 | cpu=hppa1.1 | ||
1097 | 1963 | vendor=hp | ||
1098 | 1964 | ;; | ||
1099 | 1965 | hp9k78[0-9] | hp78[0-9]) | ||
1100 | 1966 | # FIXME: really hppa2.0-hp | ||
1101 | 1967 | cpu=hppa1.1 | ||
1102 | 1968 | vendor=hp | ||
1103 | 1969 | ;; | ||
1104 | 1970 | hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) | ||
1105 | 1971 | # FIXME: really hppa2.0-hp | ||
1106 | 1972 | cpu=hppa1.1 | ||
1107 | 1973 | vendor=hp | ||
1108 | 1974 | ;; | ||
1109 | 1975 | hp9k8[0-9][13679] | hp8[0-9][13679]) | ||
1110 | 1976 | cpu=hppa1.1 | ||
1111 | 1977 | vendor=hp | ||
1112 | 1978 | ;; | ||
1113 | 1979 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) | ||
1114 | 1980 | cpu=hppa1.0 | ||
1115 | 1981 | vendor=hp | ||
1116 | 1982 | ;; | ||
1117 | 1983 | i*86v32) | ||
1118 | 1984 | cpu=`echo "$1" | sed -e 's/86.*/86/'` | ||
1119 | 1985 | vendor=pc | ||
1120 | 1986 | os=sysv32 | ||
1121 | 1987 | ;; | ||
1122 | 1988 | i*86v4*) | ||
1123 | 1989 | cpu=`echo "$1" | sed -e 's/86.*/86/'` | ||
1124 | 1990 | vendor=pc | ||
1125 | 1991 | os=sysv4 | ||
1126 | 1992 | ;; | ||
1127 | 1993 | i*86v) | ||
1128 | 1994 | cpu=`echo "$1" | sed -e 's/86.*/86/'` | ||
1129 | 1995 | vendor=pc | ||
1130 | 1996 | os=sysv | ||
1131 | 1997 | ;; | ||
1132 | 1998 | i*86sol2) | ||
1133 | 1999 | cpu=`echo "$1" | sed -e 's/86.*/86/'` | ||
1134 | 2000 | vendor=pc | ||
1135 | 2001 | os=solaris2 | ||
1136 | 2002 | ;; | ||
1137 | 2003 | j90 | j90-cray) | ||
1138 | 2004 | cpu=j90 | ||
1139 | 2005 | vendor=cray | ||
1140 | 2006 | os=${os:-unicos} | ||
1141 | 2007 | ;; | ||
1142 | 2008 | iris | iris4d) | ||
1143 | 2009 | cpu=mips | ||
1144 | 2010 | vendor=sgi | ||
1145 | 2011 | case $os in | ||
1146 | 2012 | irix*) | ||
1147 | 2013 | ;; | ||
1148 | 2014 | *) | ||
1149 | 2015 | os=irix4 | ||
1150 | 2016 | ;; | ||
1151 | 2017 | esac | ||
1152 | 2018 | ;; | ||
1153 | 2019 | miniframe) | ||
1154 | 2020 | cpu=m68000 | ||
1155 | 2021 | vendor=convergent | ||
1156 | 2022 | ;; | ||
1157 | 2023 | *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) | ||
1158 | 2024 | cpu=m68k | ||
1159 | 2025 | vendor=atari | ||
1160 | 2026 | os=mint | ||
1161 | 2027 | ;; | ||
1162 | 2028 | news-3600 | risc-news) | ||
1163 | 2029 | cpu=mips | ||
1164 | 2030 | vendor=sony | ||
1165 | 2031 | os=newsos | ||
1166 | 2032 | ;; | ||
1167 | 2033 | next | m*-next) | ||
1168 | 2034 | cpu=m68k | ||
1169 | 2035 | vendor=next | ||
1170 | 2036 | case $os in | ||
1171 | 2037 | nextstep* ) | ||
1172 | 2038 | ;; | ||
1173 | 2039 | ns2*) | ||
1174 | 2040 | os=nextstep2 | ||
1175 | 2041 | ;; | ||
1176 | 2042 | *) | ||
1177 | 2043 | os=nextstep3 | ||
1178 | 2044 | ;; | ||
1179 | 2045 | esac | ||
1180 | 2046 | ;; | ||
1181 | 2047 | np1) | ||
1182 | 2048 | cpu=np1 | ||
1183 | 2049 | vendor=gould | ||
1184 | 2050 | ;; | ||
1185 | 2051 | op50n-* | op60c-*) | ||
1186 | 2052 | cpu=hppa1.1 | ||
1187 | 2053 | vendor=oki | ||
1188 | 2054 | os=proelf | ||
1189 | 2055 | ;; | ||
1190 | 2056 | pa-hitachi) | ||
1191 | 2057 | cpu=hppa1.1 | ||
1192 | 2058 | vendor=hitachi | ||
1193 | 2059 | os=hiuxwe2 | ||
1194 | 2060 | ;; | ||
1195 | 2061 | pbd) | ||
1196 | 2062 | cpu=sparc | ||
1197 | 2063 | vendor=tti | ||
1198 | 2064 | ;; | ||
1199 | 2065 | pbb) | ||
1200 | 2066 | cpu=m68k | ||
1201 | 2067 | vendor=tti | ||
1202 | 2068 | ;; | ||
1203 | 2069 | pc532) | ||
1204 | 2070 | cpu=ns32k | ||
1205 | 2071 | vendor=pc532 | ||
1206 | 2072 | ;; | ||
1207 | 2073 | pn) | ||
1208 | 2074 | cpu=pn | ||
1209 | 2075 | vendor=gould | ||
1210 | 2076 | ;; | ||
1211 | 2077 | power) | ||
1212 | 2078 | cpu=power | ||
1213 | 2079 | vendor=ibm | ||
1214 | 2080 | ;; | ||
1215 | 2081 | ps2) | ||
1216 | 2082 | cpu=i386 | ||
1217 | 2083 | vendor=ibm | ||
1218 | 2084 | ;; | ||
1219 | 2085 | rm[46]00) | ||
1220 | 2086 | cpu=mips | ||
1221 | 2087 | vendor=siemens | ||
1222 | 2088 | ;; | ||
1223 | 2089 | rtpc | rtpc-*) | ||
1224 | 2090 | cpu=romp | ||
1225 | 2091 | vendor=ibm | ||
1226 | 2092 | ;; | ||
1227 | 2093 | sde) | ||
1228 | 2094 | cpu=mipsisa32 | ||
1229 | 2095 | vendor=sde | ||
1230 | 2096 | os=${os:-elf} | ||
1231 | 2097 | ;; | ||
1232 | 2098 | simso-wrs) | ||
1233 | 2099 | cpu=sparclite | ||
1234 | 2100 | vendor=wrs | ||
1235 | 2101 | os=vxworks | ||
1236 | 2102 | ;; | ||
1237 | 2103 | tower | tower-32) | ||
1238 | 2104 | cpu=m68k | ||
1239 | 2105 | vendor=ncr | ||
1240 | 2106 | ;; | ||
1241 | 2107 | vpp*|vx|vx-*) | ||
1242 | 2108 | cpu=f301 | ||
1243 | 2109 | vendor=fujitsu | ||
1244 | 2110 | ;; | ||
1245 | 2111 | w65) | ||
1246 | 2112 | cpu=w65 | ||
1247 | 2113 | vendor=wdc | ||
1248 | 2114 | ;; | ||
1249 | 2115 | w89k-*) | ||
1250 | 2116 | cpu=hppa1.1 | ||
1251 | 2117 | vendor=winbond | ||
1252 | 2118 | os=proelf | ||
1253 | 2119 | ;; | ||
1254 | 2120 | none) | ||
1255 | 2121 | cpu=none | ||
1256 | 2122 | vendor=none | ||
1257 | 2123 | ;; | ||
1258 | 2124 | leon|leon[3-9]) | ||
1259 | 2125 | cpu=sparc | ||
1260 | 2126 | vendor=$basic_machine | ||
1261 | 2127 | ;; | ||
1262 | 2128 | leon-*|leon[3-9]-*) | ||
1263 | 2129 | cpu=sparc | ||
1264 | 2130 | vendor=`echo "$basic_machine" | sed 's/-.*//'` | ||
1265 | 2131 | ;; | ||
1266 | 2132 | |||
1267 | 2133 | *-*) | ||
1268 | 2134 | IFS="-" read -r cpu vendor <<EOF | ||
1269 | 2135 | $basic_machine | ||
1270 | 2136 | EOF | ||
1271 | 2137 | ;; | ||
1272 | 2138 | # We use `pc' rather than `unknown' | ||
1273 | 2139 | # because (1) that's what they normally are, and | ||
1274 | 2140 | # (2) the word "unknown" tends to confuse beginning users. | ||
1275 | 2141 | i*86 | x86_64) | ||
1276 | 2142 | cpu=$basic_machine | ||
1277 | 2143 | vendor=pc | ||
1278 | 2144 | ;; | ||
1279 | 2145 | # These rules are duplicated from below for sake of the special case above; | ||
1280 | 2146 | # i.e. things that normalized to x86 arches should also default to "pc" | ||
1281 | 2147 | pc98) | ||
1282 | 2148 | cpu=i386 | ||
1283 | 2149 | vendor=pc | ||
1284 | 2150 | ;; | ||
1285 | 2151 | x64 | amd64) | ||
1286 | 2152 | cpu=x86_64 | ||
1287 | 2153 | vendor=pc | ||
1288 | 2154 | ;; | ||
1289 | 2155 | # Recognize the basic CPU types without company name. | ||
1290 | 2156 | *) | ||
1291 | 2157 | cpu=$basic_machine | ||
1292 | 2158 | vendor=unknown | ||
1293 | 2159 | ;; | ||
1294 | 2160 | esac | ||
1295 | 2161 | |||
1296 | 2162 | unset -v basic_machine | ||
1297 | 2163 | |||
1298 | 2164 | # Decode basic machines in the full and proper CPU-Company form. | ||
1299 | 2165 | case $cpu-$vendor in | ||
1300 | 2166 | # Here we handle the default manufacturer of certain CPU types in cannonical form. It is in | ||
1301 | 2167 | # some cases the only manufacturer, in others, it is the most popular. | ||
1302 | 2168 | craynv-unknown) | ||
1303 | 2169 | vendor=cray | ||
1304 | 2170 | os=${os:-unicosmp} | ||
1305 | 2171 | ;; | ||
1306 | 2172 | c90-unknown | c90-cray) | ||
1307 | 2173 | vendor=cray | ||
1308 | 2174 | os=${os:-unicos} | ||
1309 | 2175 | ;; | ||
1310 | 2176 | fx80-unknown) | ||
1311 | 2177 | vendor=alliant | ||
1312 | 2178 | ;; | ||
1313 | 2179 | romp-unknown) | ||
1314 | 2180 | vendor=ibm | ||
1315 | 2181 | ;; | ||
1316 | 2182 | mmix-unknown) | ||
1317 | 2183 | vendor=knuth | ||
1318 | 2184 | ;; | ||
1319 | 2185 | microblaze-unknown | microblazeel-unknown) | ||
1320 | 2186 | vendor=xilinx | ||
1321 | 2187 | ;; | ||
1322 | 2188 | rs6000-unknown) | ||
1323 | 2189 | vendor=ibm | ||
1324 | 2190 | ;; | ||
1325 | 2191 | vax-unknown) | ||
1326 | 2192 | vendor=dec | ||
1327 | 2193 | ;; | ||
1328 | 2194 | pdp11-unknown) | ||
1329 | 2195 | vendor=dec | ||
1330 | 2196 | ;; | ||
1331 | 2197 | we32k-unknown) | ||
1332 | 2198 | vendor=att | ||
1333 | 2199 | ;; | ||
1334 | 2200 | cydra-unknown) | ||
1335 | 2201 | vendor=cydrome | ||
1336 | 2202 | ;; | ||
1337 | 2203 | i370-ibm*) | ||
1338 | 2204 | vendor=ibm | ||
1339 | 2205 | ;; | ||
1340 | 2206 | orion-unknown) | ||
1341 | 2207 | vendor=highlevel | ||
1342 | 2208 | ;; | ||
1343 | 2209 | xps-unknown | xps100-unknown) | ||
1344 | 2210 | cpu=xps100 | ||
1345 | 2211 | vendor=honeywell | ||
1346 | 2212 | ;; | ||
1347 | 2213 | |||
1348 | 2214 | # Here we normalize CPU types with a missing or matching vendor | ||
1349 | 2215 | dpx20-unknown | dpx20-bull) | ||
1350 | 2216 | cpu=rs6000 | ||
1351 | 2217 | vendor=bull | ||
1352 | 2218 | os=${os:-bosx} | ||
1353 | 2219 | ;; | ||
1354 | 2220 | |||
1355 | 2221 | # Here we normalize CPU types irrespective of the vendor | ||
1356 | 2222 | amd64-*) | ||
1357 | 2223 | cpu=x86_64 | ||
1358 | 2224 | ;; | ||
1359 | 2225 | blackfin-*) | ||
1360 | 2226 | cpu=bfin | ||
1361 | 2227 | os=linux | ||
1362 | 2228 | ;; | ||
1363 | 2229 | c54x-*) | ||
1364 | 2230 | cpu=tic54x | ||
1365 | 2231 | ;; | ||
1366 | 2232 | c55x-*) | ||
1367 | 2233 | cpu=tic55x | ||
1368 | 2234 | ;; | ||
1369 | 2235 | c6x-*) | ||
1370 | 2236 | cpu=tic6x | ||
1371 | 2237 | ;; | ||
1372 | 2238 | e500v[12]-*) | ||
1373 | 2239 | cpu=powerpc | ||
1374 | 2240 | os=$os"spe" | ||
1375 | 2241 | ;; | ||
1376 | 2242 | mips3*-*) | ||
1377 | 2243 | cpu=mips64 | ||
1378 | 2244 | ;; | ||
1379 | 2245 | ms1-*) | ||
1380 | 2246 | cpu=mt | ||
1381 | 2247 | ;; | ||
1382 | 2248 | m68knommu-*) | ||
1383 | 2249 | cpu=m68k | ||
1384 | 2250 | os=linux | ||
1385 | 2251 | ;; | ||
1386 | 2252 | m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) | ||
1387 | 2253 | cpu=s12z | ||
1388 | 2254 | ;; | ||
1389 | 2255 | openrisc-*) | ||
1390 | 2256 | cpu=or32 | ||
1391 | 2257 | ;; | ||
1392 | 2258 | parisc-*) | ||
1393 | 2259 | cpu=hppa | ||
1394 | 2260 | os=linux | ||
1395 | 2261 | ;; | ||
1396 | 2262 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) | ||
1397 | 2263 | cpu=i586 | ||
1398 | 2264 | ;; | ||
1399 | 2265 | pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) | ||
1400 | 2266 | cpu=i686 | ||
1401 | 2267 | ;; | ||
1402 | 2268 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) | ||
1403 | 2269 | cpu=i686 | ||
1404 | 2270 | ;; | ||
1405 | 2271 | pentium4-*) | ||
1406 | 2272 | cpu=i786 | ||
1407 | 2273 | ;; | ||
1408 | 2274 | pc98-*) | ||
1409 | 2275 | cpu=i386 | ||
1410 | 2276 | ;; | ||
1411 | 2277 | ppc-* | ppcbe-*) | ||
1412 | 2278 | cpu=powerpc | ||
1413 | 2279 | ;; | ||
1414 | 2280 | ppcle-* | powerpclittle-*) | ||
1415 | 2281 | cpu=powerpcle | ||
1416 | 2282 | ;; | ||
1417 | 2283 | ppc64-*) | ||
1418 | 2284 | cpu=powerpc64 | ||
1419 | 2285 | ;; | ||
1420 | 2286 | ppc64le-* | powerpc64little-*) | ||
1421 | 2287 | cpu=powerpc64le | ||
1422 | 2288 | ;; | ||
1423 | 2289 | sb1-*) | ||
1424 | 2290 | cpu=mipsisa64sb1 | ||
1425 | 2291 | ;; | ||
1426 | 2292 | sb1el-*) | ||
1427 | 2293 | cpu=mipsisa64sb1el | ||
1428 | 2294 | ;; | ||
1429 | 2295 | sh5e[lb]-*) | ||
1430 | 2296 | cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` | ||
1431 | 2297 | ;; | ||
1432 | 2298 | spur-*) | ||
1433 | 2299 | cpu=spur | ||
1434 | 2300 | ;; | ||
1435 | 2301 | strongarm-* | thumb-*) | ||
1436 | 2302 | cpu=arm | ||
1437 | 2303 | ;; | ||
1438 | 2304 | tx39-*) | ||
1439 | 2305 | cpu=mipstx39 | ||
1440 | 2306 | ;; | ||
1441 | 2307 | tx39el-*) | ||
1442 | 2308 | cpu=mipstx39el | ||
1443 | 2309 | ;; | ||
1444 | 2310 | x64-*) | ||
1445 | 2311 | cpu=x86_64 | ||
1446 | 2312 | ;; | ||
1447 | 2313 | xscale-* | xscalee[bl]-*) | ||
1448 | 2314 | cpu=`echo "$cpu" | sed 's/^xscale/arm/'` | ||
1449 | 2315 | ;; | ||
1450 | 2316 | |||
1451 | 2317 | # Recognize the cannonical CPU Types that limit and/or modify the | ||
1452 | 2318 | # company names they are paired with. | ||
1453 | 2319 | cr16-*) | ||
1454 | 2320 | os=${os:-elf} | ||
1455 | 2321 | ;; | ||
1456 | 2322 | crisv32-* | etraxfs*-*) | ||
1457 | 2323 | cpu=crisv32 | ||
1458 | 2324 | vendor=axis | ||
1459 | 2325 | ;; | ||
1460 | 2326 | cris-* | etrax*-*) | ||
1461 | 2327 | cpu=cris | ||
1462 | 2328 | vendor=axis | ||
1463 | 2329 | ;; | ||
1464 | 2330 | crx-*) | ||
1465 | 2331 | os=${os:-elf} | ||
1466 | 2332 | ;; | ||
1467 | 2333 | neo-tandem) | ||
1468 | 2334 | cpu=neo | ||
1469 | 2335 | vendor=tandem | ||
1470 | 2336 | ;; | ||
1471 | 2337 | nse-tandem) | ||
1472 | 2338 | cpu=nse | ||
1473 | 2339 | vendor=tandem | ||
1474 | 2340 | ;; | ||
1475 | 2341 | nsr-tandem) | ||
1476 | 2342 | cpu=nsr | ||
1477 | 2343 | vendor=tandem | ||
1478 | 2344 | ;; | ||
1479 | 2345 | nsv-tandem) | ||
1480 | 2346 | cpu=nsv | ||
1481 | 2347 | vendor=tandem | ||
1482 | 2348 | ;; | ||
1483 | 2349 | nsx-tandem) | ||
1484 | 2350 | cpu=nsx | ||
1485 | 2351 | vendor=tandem | ||
1486 | 2352 | ;; | ||
1487 | 2353 | s390-*) | ||
1488 | 2354 | cpu=s390 | ||
1489 | 2355 | vendor=ibm | ||
1490 | 2356 | ;; | ||
1491 | 2357 | s390x-*) | ||
1492 | 2358 | cpu=s390x | ||
1493 | 2359 | vendor=ibm | ||
1494 | 2360 | ;; | ||
1495 | 2361 | tile*-*) | ||
1496 | 2362 | os=${os:-linux-gnu} | ||
1497 | 2363 | ;; | ||
1498 | 2364 | |||
1499 | 2365 | *) | ||
1500 | 2366 | # Recognize the cannonical CPU types that are allowed with any | ||
1501 | 2367 | # company name. | ||
1502 | 2368 | case $cpu in | ||
1503 | 2369 | 1750a | 580 \ | ||
1504 | 2370 | | a29k \ | ||
1505 | 2371 | | aarch64 | aarch64_be \ | ||
1506 | 2372 | | abacus \ | ||
1507 | 2373 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ | ||
1508 | 2374 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ | ||
1509 | 2375 | | alphapca5[67] | alpha64pca5[67] \ | ||
1510 | 2376 | | am33_2.0 \ | ||
1511 | 2377 | | arc | arceb \ | ||
1512 | 2378 | | arm | arm[lb]e | arme[lb] | armv* \ | ||
1513 | 2379 | | avr | avr32 \ | ||
1514 | 2380 | | asmjs \ | ||
1515 | 2381 | | ba \ | ||
1516 | 2382 | | be32 | be64 \ | ||
1517 | 2383 | | bfin | bs2000 \ | ||
1518 | 2384 | | c[123]* | c30 | [cjt]90 | c4x \ | ||
1519 | 2385 | | c8051 | clipper | craynv | csky | cydra \ | ||
1520 | 2386 | | d10v | d30v | dlx | dsp16xx \ | ||
1521 | 2387 | | e2k | elxsi | epiphany \ | ||
1522 | 2388 | | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ | ||
1523 | 2389 | | h8300 | h8500 \ | ||
1524 | 2390 | | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | ||
1525 | 2391 | | hexagon \ | ||
1526 | 2392 | | i370 | i*86 | i860 | i960 | ia16 | ia64 \ | ||
1527 | 2393 | | ip2k | iq2000 \ | ||
1528 | 2394 | | k1om \ | ||
1529 | 2395 | | le32 | le64 \ | ||
1530 | 2396 | | lm32 \ | ||
1531 | 2397 | | m32c | m32r | m32rle \ | ||
1532 | 2398 | | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \ | ||
1533 | 2399 | | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \ | ||
1534 | 2400 | | m88110 | m88k | maxq | mb | mcore | mep | metag \ | ||
1535 | 2401 | | microblaze | microblazeel \ | ||
1536 | 2402 | | mips | mipsbe | mipseb | mipsel | mipsle \ | ||
1537 | 2403 | | mips16 \ | ||
1538 | 2404 | | mips64 | mips64el \ | ||
1539 | 2405 | | mips64octeon | mips64octeonel \ | ||
1540 | 2406 | | mips64orion | mips64orionel \ | ||
1541 | 2407 | | mips64r5900 | mips64r5900el \ | ||
1542 | 2408 | | mips64vr | mips64vrel \ | ||
1543 | 2409 | | mips64vr4100 | mips64vr4100el \ | ||
1544 | 2410 | | mips64vr4300 | mips64vr4300el \ | ||
1545 | 2411 | | mips64vr5000 | mips64vr5000el \ | ||
1546 | 2412 | | mips64vr5900 | mips64vr5900el \ | ||
1547 | 2413 | | mipsisa32 | mipsisa32el \ | ||
1548 | 2414 | | mipsisa32r2 | mipsisa32r2el \ | ||
1549 | 2415 | | mipsisa32r6 | mipsisa32r6el \ | ||
1550 | 2416 | | mipsisa64 | mipsisa64el \ | ||
1551 | 2417 | | mipsisa64r2 | mipsisa64r2el \ | ||
1552 | 2418 | | mipsisa64r6 | mipsisa64r6el \ | ||
1553 | 2419 | | mipsisa64sb1 | mipsisa64sb1el \ | ||
1554 | 2420 | | mipsisa64sr71k | mipsisa64sr71kel \ | ||
1555 | 2421 | | mipsr5900 | mipsr5900el \ | ||
1556 | 2422 | | mipstx39 | mipstx39el \ | ||
1557 | 2423 | | mmix \ | ||
1558 | 2424 | | mn10200 | mn10300 \ | ||
1559 | 2425 | | moxie \ | ||
1560 | 2426 | | mt \ | ||
1561 | 2427 | | msp430 \ | ||
1562 | 2428 | | nds32 | nds32le | nds32be \ | ||
1563 | 2429 | | nfp \ | ||
1564 | 2430 | | nios | nios2 | nios2eb | nios2el \ | ||
1565 | 2431 | | none | np1 | ns16k | ns32k \ | ||
1566 | 2432 | | open8 \ | ||
1567 | 2433 | | or1k* \ | ||
1568 | 2434 | | or32 \ | ||
1569 | 2435 | | orion \ | ||
1570 | 2436 | | pdp10 | pdp11 | pj | pjl | pn | power \ | ||
1571 | 2437 | | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ | ||
1572 | 2438 | | pru \ | ||
1573 | 2439 | | pyramid \ | ||
1574 | 2440 | | riscv | riscv32 | riscv64 \ | ||
1575 | 2441 | | rl78 | romp | rs6000 | rx \ | ||
1576 | 2442 | | score \ | ||
1577 | 2443 | | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ | ||
1578 | 2444 | | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ | ||
1579 | 2445 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ | ||
1580 | 2446 | | sparclite \ | ||
1581 | 2447 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ | ||
1582 | 2448 | | spu \ | ||
1583 | 2449 | | tahoe \ | ||
1584 | 2450 | | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ | ||
1585 | 2451 | | tron \ | ||
1586 | 2452 | | ubicom32 \ | ||
1587 | 2453 | | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ | ||
1588 | 2454 | | vax \ | ||
1589 | 2455 | | visium \ | ||
1590 | 2456 | | wasm32 \ | ||
1591 | 2457 | | we32k \ | ||
1592 | 2458 | | x86 | x86_64 | xc16x | xgate | xps100 \ | ||
1593 | 2459 | | xstormy16 | xtensa* \ | ||
1594 | 2460 | | ymp \ | ||
1595 | 2461 | | z8k | z80) | ||
1596 | 2462 | ;; | ||
1597 | 2463 | |||
1598 | 2464 | *) | ||
1599 | 2465 | echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 | ||
1600 | 2466 | exit 1 | ||
1601 | 2467 | ;; | ||
1602 | 2468 | esac | ||
1603 | 2469 | >>>>>>> build-aux/config.sub | ||
1604 | 1320 | ;; | 2470 | ;; |
1605 | 1321 | esac | 2471 | esac |
1606 | 1322 | 2472 | ||
1607 | 1323 | # Here we canonicalize certain aliases for manufacturers. | 2473 | # Here we canonicalize certain aliases for manufacturers. |
1608 | 2474 | <<<<<<< build-aux/config.sub | ||
1609 | 1324 | case $basic_machine in | 2475 | case $basic_machine in |
1610 | 1325 | *-digital*) | 2476 | *-digital*) |
1611 | 1326 | basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` | 2477 | basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` |
1612 | 1327 | ;; | 2478 | ;; |
1613 | 1328 | *-commodore*) | 2479 | *-commodore*) |
1614 | 1329 | basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` | 2480 | basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` |
1615 | 2481 | ======= | ||
1616 | 2482 | case $vendor in | ||
1617 | 2483 | digital*) | ||
1618 | 2484 | vendor=dec | ||
1619 | 2485 | ;; | ||
1620 | 2486 | commodore*) | ||
1621 | 2487 | vendor=cbm | ||
1622 | 2488 | >>>>>>> build-aux/config.sub | ||
1623 | 1330 | ;; | 2489 | ;; |
1624 | 1331 | *) | 2490 | *) |
1625 | 1332 | ;; | 2491 | ;; |
1626 | @@ -1334,11 +2493,16 @@ esac | |||
1627 | 1334 | 2493 | ||
1628 | 1335 | # Decode manufacturer-specific aliases for certain operating systems. | 2494 | # Decode manufacturer-specific aliases for certain operating systems. |
1629 | 1336 | 2495 | ||
1630 | 2496 | <<<<<<< build-aux/config.sub | ||
1631 | 1337 | if [ x"$os" != x"" ] | 2497 | if [ x"$os" != x"" ] |
1632 | 2498 | ======= | ||
1633 | 2499 | if [ x$os != x ] | ||
1634 | 2500 | >>>>>>> build-aux/config.sub | ||
1635 | 1338 | then | 2501 | then |
1636 | 1339 | case $os in | 2502 | case $os in |
1637 | 1340 | # First match some system type aliases that might get confused | 2503 | # First match some system type aliases that might get confused |
1638 | 1341 | # with valid system types. | 2504 | # with valid system types. |
1639 | 2505 | <<<<<<< build-aux/config.sub | ||
1640 | 1342 | # -solaris* is a basic system type, with this one exception. | 2506 | # -solaris* is a basic system type, with this one exception. |
1641 | 1343 | -auroraux) | 2507 | -auroraux) |
1642 | 1344 | os=-auroraux | 2508 | os=-auroraux |
1643 | @@ -1358,10 +2522,66 @@ case $os in | |||
1644 | 1358 | # es1800 is here to avoid being matched by es* (a different OS) | 2522 | # es1800 is here to avoid being matched by es* (a different OS) |
1645 | 1359 | -es1800*) | 2523 | -es1800*) |
1646 | 1360 | os=-ose | 2524 | os=-ose |
1647 | 2525 | ======= | ||
1648 | 2526 | # solaris* is a basic system type, with this one exception. | ||
1649 | 2527 | auroraux) | ||
1650 | 2528 | os=auroraux | ||
1651 | 2529 | ;; | ||
1652 | 2530 | bluegene*) | ||
1653 | 2531 | os=cnk | ||
1654 | 2532 | ;; | ||
1655 | 2533 | solaris1 | solaris1.*) | ||
1656 | 2534 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | ||
1657 | 2535 | ;; | ||
1658 | 2536 | solaris) | ||
1659 | 2537 | os=solaris2 | ||
1660 | 2538 | ;; | ||
1661 | 2539 | unixware*) | ||
1662 | 2540 | os=sysv4.2uw | ||
1663 | 2541 | ;; | ||
1664 | 2542 | gnu/linux*) | ||
1665 | 2543 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` | ||
1666 | 2544 | ;; | ||
1667 | 2545 | # es1800 is here to avoid being matched by es* (a different OS) | ||
1668 | 2546 | es1800*) | ||
1669 | 2547 | os=ose | ||
1670 | 2548 | ;; | ||
1671 | 2549 | # Some version numbers need modification | ||
1672 | 2550 | chorusos*) | ||
1673 | 2551 | os=chorusos | ||
1674 | 2552 | ;; | ||
1675 | 2553 | isc) | ||
1676 | 2554 | os=isc2.2 | ||
1677 | 2555 | ;; | ||
1678 | 2556 | sco6) | ||
1679 | 2557 | os=sco5v6 | ||
1680 | 2558 | ;; | ||
1681 | 2559 | sco5) | ||
1682 | 2560 | os=sco3.2v5 | ||
1683 | 2561 | ;; | ||
1684 | 2562 | sco4) | ||
1685 | 2563 | os=sco3.2v4 | ||
1686 | 2564 | ;; | ||
1687 | 2565 | sco3.2.[4-9]*) | ||
1688 | 2566 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` | ||
1689 | 2567 | ;; | ||
1690 | 2568 | sco3.2v[4-9]* | sco5v6*) | ||
1691 | 2569 | # Don't forget version if it is 3.2v4 or newer. | ||
1692 | 2570 | ;; | ||
1693 | 2571 | scout) | ||
1694 | 2572 | # Don't match below | ||
1695 | 2573 | ;; | ||
1696 | 2574 | sco*) | ||
1697 | 2575 | os=sco3.2v2 | ||
1698 | 2576 | ;; | ||
1699 | 2577 | psos*) | ||
1700 | 2578 | os=psos | ||
1701 | 2579 | >>>>>>> build-aux/config.sub | ||
1702 | 1361 | ;; | 2580 | ;; |
1703 | 1362 | # Now accept the basic system types. | 2581 | # Now accept the basic system types. |
1704 | 1363 | # The portable systems comes first. | 2582 | # The portable systems comes first. |
1705 | 1364 | # Each alternative MUST end in a * to match a version number. | 2583 | # Each alternative MUST end in a * to match a version number. |
1706 | 2584 | <<<<<<< build-aux/config.sub | ||
1707 | 1365 | # -sysv* is not here because it comes later, after sysvr4. | 2585 | # -sysv* is not here because it comes later, after sysvr4. |
1708 | 1366 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 2586 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
1709 | 1367 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | 2587 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
1710 | @@ -1527,6 +2747,185 @@ case $os in | |||
1711 | 1527 | *) | 2747 | *) |
1712 | 1528 | # Get rid of the `-' at the beginning of $os. | 2748 | # Get rid of the `-' at the beginning of $os. |
1713 | 1529 | os=`echo $os | sed 's/[^-]*-//'` | 2749 | os=`echo $os | sed 's/[^-]*-//'` |
1714 | 2750 | ======= | ||
1715 | 2751 | # sysv* is not here because it comes later, after sysvr4. | ||
1716 | 2752 | gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ | ||
1717 | 2753 | | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ | ||
1718 | 2754 | | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ | ||
1719 | 2755 | | sym* | kopensolaris* | plan9* \ | ||
1720 | 2756 | | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ | ||
1721 | 2757 | | aos* | aros* | cloudabi* | sortix* \ | ||
1722 | 2758 | | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ | ||
1723 | 2759 | | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ | ||
1724 | 2760 | | knetbsd* | mirbsd* | netbsd* \ | ||
1725 | 2761 | | bitrig* | openbsd* | solidbsd* | libertybsd* \ | ||
1726 | 2762 | | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ | ||
1727 | 2763 | | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ | ||
1728 | 2764 | | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ | ||
1729 | 2765 | | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ | ||
1730 | 2766 | | chorusrdb* | cegcc* | glidix* \ | ||
1731 | 2767 | | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ | ||
1732 | 2768 | | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ | ||
1733 | 2769 | | linux-newlib* | linux-musl* | linux-uclibc* \ | ||
1734 | 2770 | | uxpv* | beos* | mpeix* | udk* | moxiebox* \ | ||
1735 | 2771 | | interix* | uwin* | mks* | rhapsody* | darwin* \ | ||
1736 | 2772 | | openstep* | oskit* | conix* | pw32* | nonstopux* \ | ||
1737 | 2773 | | storm-chaos* | tops10* | tenex* | tops20* | its* \ | ||
1738 | 2774 | | os2* | vos* | palmos* | uclinux* | nucleus* \ | ||
1739 | 2775 | | morphos* | superux* | rtmk* | windiss* \ | ||
1740 | 2776 | | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ | ||
1741 | 2777 | | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | ||
1742 | 2778 | | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | ||
1743 | 2779 | | midnightbsd*) | ||
1744 | 2780 | # Remember, each alternative MUST END IN *, to match a version number. | ||
1745 | 2781 | ;; | ||
1746 | 2782 | qnx*) | ||
1747 | 2783 | case $cpu in | ||
1748 | 2784 | x86 | i*86) | ||
1749 | 2785 | ;; | ||
1750 | 2786 | *) | ||
1751 | 2787 | os=nto-$os | ||
1752 | 2788 | ;; | ||
1753 | 2789 | esac | ||
1754 | 2790 | ;; | ||
1755 | 2791 | hiux*) | ||
1756 | 2792 | os=hiuxwe2 | ||
1757 | 2793 | ;; | ||
1758 | 2794 | nto-qnx*) | ||
1759 | 2795 | ;; | ||
1760 | 2796 | nto*) | ||
1761 | 2797 | os=`echo $os | sed -e 's|nto|nto-qnx|'` | ||
1762 | 2798 | ;; | ||
1763 | 2799 | sim | xray | os68k* | v88r* \ | ||
1764 | 2800 | | windows* | osx | abug | netware* | os9* \ | ||
1765 | 2801 | | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) | ||
1766 | 2802 | ;; | ||
1767 | 2803 | linux-dietlibc) | ||
1768 | 2804 | os=linux-dietlibc | ||
1769 | 2805 | ;; | ||
1770 | 2806 | linux*) | ||
1771 | 2807 | os=`echo $os | sed -e 's|linux|linux-gnu|'` | ||
1772 | 2808 | ;; | ||
1773 | 2809 | lynx*178) | ||
1774 | 2810 | os=lynxos178 | ||
1775 | 2811 | ;; | ||
1776 | 2812 | lynx*5) | ||
1777 | 2813 | os=lynxos5 | ||
1778 | 2814 | ;; | ||
1779 | 2815 | lynx*) | ||
1780 | 2816 | os=lynxos | ||
1781 | 2817 | ;; | ||
1782 | 2818 | mac*) | ||
1783 | 2819 | os=`echo "$os" | sed -e 's|mac|macos|'` | ||
1784 | 2820 | ;; | ||
1785 | 2821 | opened*) | ||
1786 | 2822 | os=openedition | ||
1787 | 2823 | ;; | ||
1788 | 2824 | os400*) | ||
1789 | 2825 | os=os400 | ||
1790 | 2826 | ;; | ||
1791 | 2827 | sunos5*) | ||
1792 | 2828 | os=`echo "$os" | sed -e 's|sunos5|solaris2|'` | ||
1793 | 2829 | ;; | ||
1794 | 2830 | sunos6*) | ||
1795 | 2831 | os=`echo "$os" | sed -e 's|sunos6|solaris3|'` | ||
1796 | 2832 | ;; | ||
1797 | 2833 | wince*) | ||
1798 | 2834 | os=wince | ||
1799 | 2835 | ;; | ||
1800 | 2836 | utek*) | ||
1801 | 2837 | os=bsd | ||
1802 | 2838 | ;; | ||
1803 | 2839 | dynix*) | ||
1804 | 2840 | os=bsd | ||
1805 | 2841 | ;; | ||
1806 | 2842 | acis*) | ||
1807 | 2843 | os=aos | ||
1808 | 2844 | ;; | ||
1809 | 2845 | atheos*) | ||
1810 | 2846 | os=atheos | ||
1811 | 2847 | ;; | ||
1812 | 2848 | syllable*) | ||
1813 | 2849 | os=syllable | ||
1814 | 2850 | ;; | ||
1815 | 2851 | 386bsd) | ||
1816 | 2852 | os=bsd | ||
1817 | 2853 | ;; | ||
1818 | 2854 | ctix* | uts*) | ||
1819 | 2855 | os=sysv | ||
1820 | 2856 | ;; | ||
1821 | 2857 | nova*) | ||
1822 | 2858 | os=rtmk-nova | ||
1823 | 2859 | ;; | ||
1824 | 2860 | ns2) | ||
1825 | 2861 | os=nextstep2 | ||
1826 | 2862 | ;; | ||
1827 | 2863 | nsk*) | ||
1828 | 2864 | os=nsk | ||
1829 | 2865 | ;; | ||
1830 | 2866 | # Preserve the version number of sinix5. | ||
1831 | 2867 | sinix5.*) | ||
1832 | 2868 | os=`echo $os | sed -e 's|sinix|sysv|'` | ||
1833 | 2869 | ;; | ||
1834 | 2870 | sinix*) | ||
1835 | 2871 | os=sysv4 | ||
1836 | 2872 | ;; | ||
1837 | 2873 | tpf*) | ||
1838 | 2874 | os=tpf | ||
1839 | 2875 | ;; | ||
1840 | 2876 | triton*) | ||
1841 | 2877 | os=sysv3 | ||
1842 | 2878 | ;; | ||
1843 | 2879 | oss*) | ||
1844 | 2880 | os=sysv3 | ||
1845 | 2881 | ;; | ||
1846 | 2882 | svr4*) | ||
1847 | 2883 | os=sysv4 | ||
1848 | 2884 | ;; | ||
1849 | 2885 | svr3) | ||
1850 | 2886 | os=sysv3 | ||
1851 | 2887 | ;; | ||
1852 | 2888 | sysvr4) | ||
1853 | 2889 | os=sysv4 | ||
1854 | 2890 | ;; | ||
1855 | 2891 | # This must come after sysvr4. | ||
1856 | 2892 | sysv*) | ||
1857 | 2893 | ;; | ||
1858 | 2894 | ose*) | ||
1859 | 2895 | os=ose | ||
1860 | 2896 | ;; | ||
1861 | 2897 | *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) | ||
1862 | 2898 | os=mint | ||
1863 | 2899 | ;; | ||
1864 | 2900 | zvmoe) | ||
1865 | 2901 | os=zvmoe | ||
1866 | 2902 | ;; | ||
1867 | 2903 | dicos*) | ||
1868 | 2904 | os=dicos | ||
1869 | 2905 | ;; | ||
1870 | 2906 | pikeos*) | ||
1871 | 2907 | # Until real need of OS specific support for | ||
1872 | 2908 | # particular features comes up, bare metal | ||
1873 | 2909 | # configurations are quite functional. | ||
1874 | 2910 | case $cpu in | ||
1875 | 2911 | arm*) | ||
1876 | 2912 | os=eabi | ||
1877 | 2913 | ;; | ||
1878 | 2914 | *) | ||
1879 | 2915 | os=elf | ||
1880 | 2916 | ;; | ||
1881 | 2917 | esac | ||
1882 | 2918 | ;; | ||
1883 | 2919 | nacl*) | ||
1884 | 2920 | ;; | ||
1885 | 2921 | ios) | ||
1886 | 2922 | ;; | ||
1887 | 2923 | none) | ||
1888 | 2924 | ;; | ||
1889 | 2925 | *-eabi) | ||
1890 | 2926 | ;; | ||
1891 | 2927 | *) | ||
1892 | 2928 | >>>>>>> build-aux/config.sub | ||
1893 | 1530 | echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 | 2929 | echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 |
1894 | 1531 | exit 1 | 2930 | exit 1 |
1895 | 1532 | ;; | 2931 | ;; |
1896 | @@ -1543,6 +2942,7 @@ else | |||
1897 | 1543 | # will signal an error saying that MANUFACTURER isn't an operating | 2942 | # will signal an error saying that MANUFACTURER isn't an operating |
1898 | 1544 | # system, and we'll never get to this point. | 2943 | # system, and we'll never get to this point. |
1899 | 1545 | 2944 | ||
1900 | 2945 | <<<<<<< build-aux/config.sub | ||
1901 | 1546 | case $basic_machine in | 2946 | case $basic_machine in |
1902 | 1547 | score-*) | 2947 | score-*) |
1903 | 1548 | os=-elf | 2948 | os=-elf |
1904 | @@ -1712,12 +3112,190 @@ case $basic_machine in | |||
1905 | 1712 | ;; | 3112 | ;; |
1906 | 1713 | *) | 3113 | *) |
1907 | 1714 | os=-none | 3114 | os=-none |
1908 | 3115 | ======= | ||
1909 | 3116 | case $cpu-$vendor in | ||
1910 | 3117 | score-*) | ||
1911 | 3118 | os=elf | ||
1912 | 3119 | ;; | ||
1913 | 3120 | spu-*) | ||
1914 | 3121 | os=elf | ||
1915 | 3122 | ;; | ||
1916 | 3123 | *-acorn) | ||
1917 | 3124 | os=riscix1.2 | ||
1918 | 3125 | ;; | ||
1919 | 3126 | arm*-rebel) | ||
1920 | 3127 | os=linux | ||
1921 | 3128 | ;; | ||
1922 | 3129 | arm*-semi) | ||
1923 | 3130 | os=aout | ||
1924 | 3131 | ;; | ||
1925 | 3132 | c4x-* | tic4x-*) | ||
1926 | 3133 | os=coff | ||
1927 | 3134 | ;; | ||
1928 | 3135 | c8051-*) | ||
1929 | 3136 | os=elf | ||
1930 | 3137 | ;; | ||
1931 | 3138 | clipper-intergraph) | ||
1932 | 3139 | os=clix | ||
1933 | 3140 | ;; | ||
1934 | 3141 | hexagon-*) | ||
1935 | 3142 | os=elf | ||
1936 | 3143 | ;; | ||
1937 | 3144 | tic54x-*) | ||
1938 | 3145 | os=coff | ||
1939 | 3146 | ;; | ||
1940 | 3147 | tic55x-*) | ||
1941 | 3148 | os=coff | ||
1942 | 3149 | ;; | ||
1943 | 3150 | tic6x-*) | ||
1944 | 3151 | os=coff | ||
1945 | 3152 | ;; | ||
1946 | 3153 | # This must come before the *-dec entry. | ||
1947 | 3154 | pdp10-*) | ||
1948 | 3155 | os=tops20 | ||
1949 | 3156 | ;; | ||
1950 | 3157 | pdp11-*) | ||
1951 | 3158 | os=none | ||
1952 | 3159 | ;; | ||
1953 | 3160 | *-dec | vax-*) | ||
1954 | 3161 | os=ultrix4.2 | ||
1955 | 3162 | ;; | ||
1956 | 3163 | m68*-apollo) | ||
1957 | 3164 | os=domain | ||
1958 | 3165 | ;; | ||
1959 | 3166 | i386-sun) | ||
1960 | 3167 | os=sunos4.0.2 | ||
1961 | 3168 | ;; | ||
1962 | 3169 | m68000-sun) | ||
1963 | 3170 | os=sunos3 | ||
1964 | 3171 | ;; | ||
1965 | 3172 | m68*-cisco) | ||
1966 | 3173 | os=aout | ||
1967 | 3174 | ;; | ||
1968 | 3175 | mep-*) | ||
1969 | 3176 | os=elf | ||
1970 | 3177 | ;; | ||
1971 | 3178 | mips*-cisco) | ||
1972 | 3179 | os=elf | ||
1973 | 3180 | ;; | ||
1974 | 3181 | mips*-*) | ||
1975 | 3182 | os=elf | ||
1976 | 3183 | ;; | ||
1977 | 3184 | or32-*) | ||
1978 | 3185 | os=coff | ||
1979 | 3186 | ;; | ||
1980 | 3187 | *-tti) # must be before sparc entry or we get the wrong os. | ||
1981 | 3188 | os=sysv3 | ||
1982 | 3189 | ;; | ||
1983 | 3190 | sparc-* | *-sun) | ||
1984 | 3191 | os=sunos4.1.1 | ||
1985 | 3192 | ;; | ||
1986 | 3193 | pru-*) | ||
1987 | 3194 | os=elf | ||
1988 | 3195 | ;; | ||
1989 | 3196 | *-be) | ||
1990 | 3197 | os=beos | ||
1991 | 3198 | ;; | ||
1992 | 3199 | *-ibm) | ||
1993 | 3200 | os=aix | ||
1994 | 3201 | ;; | ||
1995 | 3202 | *-knuth) | ||
1996 | 3203 | os=mmixware | ||
1997 | 3204 | ;; | ||
1998 | 3205 | *-wec) | ||
1999 | 3206 | os=proelf | ||
2000 | 3207 | ;; | ||
2001 | 3208 | *-winbond) | ||
2002 | 3209 | os=proelf | ||
2003 | 3210 | ;; | ||
2004 | 3211 | *-oki) | ||
2005 | 3212 | os=proelf | ||
2006 | 3213 | ;; | ||
2007 | 3214 | *-hp) | ||
2008 | 3215 | os=hpux | ||
2009 | 3216 | ;; | ||
2010 | 3217 | *-hitachi) | ||
2011 | 3218 | os=hiux | ||
2012 | 3219 | ;; | ||
2013 | 3220 | i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) | ||
2014 | 3221 | os=sysv | ||
2015 | 3222 | ;; | ||
2016 | 3223 | *-cbm) | ||
2017 | 3224 | os=amigaos | ||
2018 | 3225 | ;; | ||
2019 | 3226 | *-dg) | ||
2020 | 3227 | os=dgux | ||
2021 | 3228 | ;; | ||
2022 | 3229 | *-dolphin) | ||
2023 | 3230 | os=sysv3 | ||
2024 | 3231 | ;; | ||
2025 | 3232 | m68k-ccur) | ||
2026 | 3233 | os=rtu | ||
2027 | 3234 | ;; | ||
2028 | 3235 | m88k-omron*) | ||
2029 | 3236 | os=luna | ||
2030 | 3237 | ;; | ||
2031 | 3238 | *-next) | ||
2032 | 3239 | os=nextstep | ||
2033 | 3240 | ;; | ||
2034 | 3241 | *-sequent) | ||
2035 | 3242 | os=ptx | ||
2036 | 3243 | ;; | ||
2037 | 3244 | *-crds) | ||
2038 | 3245 | os=unos | ||
2039 | 3246 | ;; | ||
2040 | 3247 | *-ns) | ||
2041 | 3248 | os=genix | ||
2042 | 3249 | ;; | ||
2043 | 3250 | i370-*) | ||
2044 | 3251 | os=mvs | ||
2045 | 3252 | ;; | ||
2046 | 3253 | *-gould) | ||
2047 | 3254 | os=sysv | ||
2048 | 3255 | ;; | ||
2049 | 3256 | *-highlevel) | ||
2050 | 3257 | os=bsd | ||
2051 | 3258 | ;; | ||
2052 | 3259 | *-encore) | ||
2053 | 3260 | os=bsd | ||
2054 | 3261 | ;; | ||
2055 | 3262 | *-sgi) | ||
2056 | 3263 | os=irix | ||
2057 | 3264 | ;; | ||
2058 | 3265 | *-siemens) | ||
2059 | 3266 | os=sysv4 | ||
2060 | 3267 | ;; | ||
2061 | 3268 | *-masscomp) | ||
2062 | 3269 | os=rtu | ||
2063 | 3270 | ;; | ||
2064 | 3271 | f30[01]-fujitsu | f700-fujitsu) | ||
2065 | 3272 | os=uxpv | ||
2066 | 3273 | ;; | ||
2067 | 3274 | *-rom68k) | ||
2068 | 3275 | os=coff | ||
2069 | 3276 | ;; | ||
2070 | 3277 | *-*bug) | ||
2071 | 3278 | os=coff | ||
2072 | 3279 | ;; | ||
2073 | 3280 | *-apple) | ||
2074 | 3281 | os=macos | ||
2075 | 3282 | ;; | ||
2076 | 3283 | *-atari*) | ||
2077 | 3284 | os=mint | ||
2078 | 3285 | ;; | ||
2079 | 3286 | *-wrs) | ||
2080 | 3287 | os=vxworks | ||
2081 | 3288 | ;; | ||
2082 | 3289 | *) | ||
2083 | 3290 | os=none | ||
2084 | 3291 | >>>>>>> build-aux/config.sub | ||
2085 | 1715 | ;; | 3292 | ;; |
2086 | 1716 | esac | 3293 | esac |
2087 | 1717 | fi | 3294 | fi |
2088 | 1718 | 3295 | ||
2089 | 1719 | # Here we handle the case where we know the os, and the CPU type, but not the | 3296 | # Here we handle the case where we know the os, and the CPU type, but not the |
2090 | 1720 | # manufacturer. We pick the logical manufacturer. | 3297 | # manufacturer. We pick the logical manufacturer. |
2091 | 3298 | <<<<<<< build-aux/config.sub | ||
2092 | 1721 | vendor=unknown | 3299 | vendor=unknown |
2093 | 1722 | case $basic_machine in | 3300 | case $basic_machine in |
2094 | 1723 | *-unknown) | 3301 | *-unknown) |
2095 | @@ -1791,6 +3369,82 @@ case $basic_machine in | |||
2096 | 1791 | esac | 3369 | esac |
2097 | 1792 | 3370 | ||
2098 | 1793 | echo "$basic_machine$os" | 3371 | echo "$basic_machine$os" |
2099 | 3372 | ======= | ||
2100 | 3373 | case $vendor in | ||
2101 | 3374 | unknown) | ||
2102 | 3375 | case $os in | ||
2103 | 3376 | riscix*) | ||
2104 | 3377 | vendor=acorn | ||
2105 | 3378 | ;; | ||
2106 | 3379 | sunos*) | ||
2107 | 3380 | vendor=sun | ||
2108 | 3381 | ;; | ||
2109 | 3382 | cnk*|-aix*) | ||
2110 | 3383 | vendor=ibm | ||
2111 | 3384 | ;; | ||
2112 | 3385 | beos*) | ||
2113 | 3386 | vendor=be | ||
2114 | 3387 | ;; | ||
2115 | 3388 | hpux*) | ||
2116 | 3389 | vendor=hp | ||
2117 | 3390 | ;; | ||
2118 | 3391 | mpeix*) | ||
2119 | 3392 | vendor=hp | ||
2120 | 3393 | ;; | ||
2121 | 3394 | hiux*) | ||
2122 | 3395 | vendor=hitachi | ||
2123 | 3396 | ;; | ||
2124 | 3397 | unos*) | ||
2125 | 3398 | vendor=crds | ||
2126 | 3399 | ;; | ||
2127 | 3400 | dgux*) | ||
2128 | 3401 | vendor=dg | ||
2129 | 3402 | ;; | ||
2130 | 3403 | luna*) | ||
2131 | 3404 | vendor=omron | ||
2132 | 3405 | ;; | ||
2133 | 3406 | genix*) | ||
2134 | 3407 | vendor=ns | ||
2135 | 3408 | ;; | ||
2136 | 3409 | clix*) | ||
2137 | 3410 | vendor=intergraph | ||
2138 | 3411 | ;; | ||
2139 | 3412 | mvs* | opened*) | ||
2140 | 3413 | vendor=ibm | ||
2141 | 3414 | ;; | ||
2142 | 3415 | os400*) | ||
2143 | 3416 | vendor=ibm | ||
2144 | 3417 | ;; | ||
2145 | 3418 | ptx*) | ||
2146 | 3419 | vendor=sequent | ||
2147 | 3420 | ;; | ||
2148 | 3421 | tpf*) | ||
2149 | 3422 | vendor=ibm | ||
2150 | 3423 | ;; | ||
2151 | 3424 | vxsim* | vxworks* | windiss*) | ||
2152 | 3425 | vendor=wrs | ||
2153 | 3426 | ;; | ||
2154 | 3427 | aux*) | ||
2155 | 3428 | vendor=apple | ||
2156 | 3429 | ;; | ||
2157 | 3430 | hms*) | ||
2158 | 3431 | vendor=hitachi | ||
2159 | 3432 | ;; | ||
2160 | 3433 | mpw* | macos*) | ||
2161 | 3434 | vendor=apple | ||
2162 | 3435 | ;; | ||
2163 | 3436 | *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) | ||
2164 | 3437 | vendor=atari | ||
2165 | 3438 | ;; | ||
2166 | 3439 | vos*) | ||
2167 | 3440 | vendor=stratus | ||
2168 | 3441 | ;; | ||
2169 | 3442 | esac | ||
2170 | 3443 | ;; | ||
2171 | 3444 | esac | ||
2172 | 3445 | |||
2173 | 3446 | echo "$cpu-$vendor-$os" | ||
2174 | 3447 | >>>>>>> build-aux/config.sub | ||
2175 | 1794 | exit | 3448 | exit |
2176 | 1795 | 3449 | ||
2177 | 1796 | # Local variables: | 3450 | # Local variables: |
2178 | diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh | |||
2179 | index d3ab94d..ffe298c 100644 | |||
2180 | --- a/build-aux/ltmain.sh | |||
2181 | +++ b/build-aux/ltmain.sh | |||
2182 | @@ -1,5 +1,6 @@ | |||
2183 | 1 | #! /bin/sh | 1 | #! /bin/sh |
2184 | 2 | ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in | 2 | ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in |
2185 | 3 | <<<<<<< build-aux/ltmain.sh | ||
2186 | 3 | ## by inline-source v2018-07-24.06 | 4 | ## by inline-source v2018-07-24.06 |
2187 | 4 | 5 | ||
2188 | 5 | # libtool (GNU libtool) 2.4.6.42-b88ce | 6 | # libtool (GNU libtool) 2.4.6.42-b88ce |
2189 | @@ -7,6 +8,15 @@ | |||
2190 | 7 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | 8 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
2191 | 8 | 9 | ||
2192 | 9 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. | 10 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
2193 | 11 | ======= | ||
2194 | 12 | ## by inline-source v2014-01-03.01 | ||
2195 | 13 | |||
2196 | 14 | # libtool (GNU libtool) 2.4.6 | ||
2197 | 15 | # Provide generalized library-building support services. | ||
2198 | 16 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | ||
2199 | 17 | |||
2200 | 18 | # Copyright (C) 1996-2015 Free Software Foundation, Inc. | ||
2201 | 19 | >>>>>>> build-aux/ltmain.sh | ||
2202 | 10 | # This is free software; see the source for copying conditions. There is NO | 20 | # This is free software; see the source for copying conditions. There is NO |
2203 | 11 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 21 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
2204 | 12 | 22 | ||
2205 | @@ -31,8 +41,13 @@ | |||
2206 | 31 | 41 | ||
2207 | 32 | PROGRAM=libtool | 42 | PROGRAM=libtool |
2208 | 33 | PACKAGE=libtool | 43 | PACKAGE=libtool |
2209 | 44 | <<<<<<< build-aux/ltmain.sh | ||
2210 | 34 | VERSION=2.4.6.42-b88ce | 45 | VERSION=2.4.6.42-b88ce |
2211 | 35 | package_revision=2.4.6.42 | 46 | package_revision=2.4.6.42 |
2212 | 47 | ======= | ||
2213 | 48 | VERSION=2.4.6 | ||
2214 | 49 | package_revision=2.4.6 | ||
2215 | 50 | >>>>>>> build-aux/ltmain.sh | ||
2216 | 36 | 51 | ||
2217 | 37 | 52 | ||
2218 | 38 | ## ------ ## | 53 | ## ------ ## |
2219 | @@ -64,11 +79,16 @@ package_revision=2.4.6.42 | |||
2220 | 64 | # libraries, which are installed to $pkgauxdir. | 79 | # libraries, which are installed to $pkgauxdir. |
2221 | 65 | 80 | ||
2222 | 66 | # Set a version string for this script. | 81 | # Set a version string for this script. |
2223 | 82 | <<<<<<< build-aux/ltmain.sh | ||
2224 | 67 | scriptversion=2018-07-24.06; # UTC | 83 | scriptversion=2018-07-24.06; # UTC |
2225 | 84 | ======= | ||
2226 | 85 | scriptversion=2015-01-20.17; # UTC | ||
2227 | 86 | >>>>>>> build-aux/ltmain.sh | ||
2228 | 68 | 87 | ||
2229 | 69 | # General shell script boiler plate, and helper functions. | 88 | # General shell script boiler plate, and helper functions. |
2230 | 70 | # Written by Gary V. Vaughan, 2004 | 89 | # Written by Gary V. Vaughan, 2004 |
2231 | 71 | 90 | ||
2232 | 91 | <<<<<<< build-aux/ltmain.sh | ||
2233 | 72 | # This is free software. There is NO warranty; not even for | 92 | # This is free software. There is NO warranty; not even for |
2234 | 73 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 93 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
2235 | 74 | # | 94 | # |
2236 | @@ -83,6 +103,31 @@ scriptversion=2018-07-24.06; # UTC | |||
2237 | 83 | 103 | ||
2238 | 84 | # Please report bugs or propose patches to: | 104 | # Please report bugs or propose patches to: |
2239 | 85 | # <https://github.com/gnulib-modules/bootstrap/issues> | 105 | # <https://github.com/gnulib-modules/bootstrap/issues> |
2240 | 106 | ======= | ||
2241 | 107 | # Copyright (C) 2004-2015 Free Software Foundation, Inc. | ||
2242 | 108 | # This is free software; see the source for copying conditions. There is NO | ||
2243 | 109 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
2244 | 110 | |||
2245 | 111 | # This program is free software; you can redistribute it and/or modify | ||
2246 | 112 | # it under the terms of the GNU General Public License as published by | ||
2247 | 113 | # the Free Software Foundation; either version 3 of the License, or | ||
2248 | 114 | # (at your option) any later version. | ||
2249 | 115 | |||
2250 | 116 | # As a special exception to the GNU General Public License, if you distribute | ||
2251 | 117 | # this file as part of a program or library that is built using GNU Libtool, | ||
2252 | 118 | # you may include this file under the same distribution terms that you use | ||
2253 | 119 | # for the rest of that program. | ||
2254 | 120 | |||
2255 | 121 | # This program is distributed in the hope that it will be useful, | ||
2256 | 122 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2257 | 123 | # MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU | ||
2258 | 124 | # General Public License for more details. | ||
2259 | 125 | |||
2260 | 126 | # You should have received a copy of the GNU General Public License | ||
2261 | 127 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2262 | 128 | |||
2263 | 129 | # Please report bugs or propose patches to gary@gnu.org. | ||
2264 | 130 | >>>>>>> build-aux/ltmain.sh | ||
2265 | 86 | 131 | ||
2266 | 87 | 132 | ||
2267 | 88 | ## ------ ## | 133 | ## ------ ## |
2268 | @@ -131,6 +176,12 @@ do | |||
2269 | 131 | fi" | 176 | fi" |
2270 | 132 | done | 177 | done |
2271 | 133 | 178 | ||
2272 | 179 | <<<<<<< build-aux/ltmain.sh | ||
2273 | 180 | ======= | ||
2274 | 181 | # CDPATH. | ||
2275 | 182 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
2276 | 183 | |||
2277 | 184 | >>>>>>> build-aux/ltmain.sh | ||
2278 | 134 | # Make sure IFS has a sensible default | 185 | # Make sure IFS has a sensible default |
2279 | 135 | sp=' ' | 186 | sp=' ' |
2280 | 136 | nl=' | 187 | nl=' |
2281 | @@ -147,6 +198,7 @@ if test "${PATH_SEPARATOR+set}" != set; then | |||
2282 | 147 | fi | 198 | fi |
2283 | 148 | 199 | ||
2284 | 149 | 200 | ||
2285 | 201 | <<<<<<< build-aux/ltmain.sh | ||
2286 | 150 | # func_unset VAR | 202 | # func_unset VAR |
2287 | 151 | # -------------- | 203 | # -------------- |
2288 | 152 | # Portably unset VAR. | 204 | # Portably unset VAR. |
2289 | @@ -167,6 +219,8 @@ func_unset CDPATH | |||
2290 | 167 | # Make sure ${,E,F}GREP behave sanely. | 219 | # Make sure ${,E,F}GREP behave sanely. |
2291 | 168 | func_unset GREP_OPTIONS | 220 | func_unset GREP_OPTIONS |
2292 | 169 | 221 | ||
2293 | 222 | ======= | ||
2294 | 223 | >>>>>>> build-aux/ltmain.sh | ||
2295 | 170 | 224 | ||
2296 | 171 | ## ------------------------- ## | 225 | ## ------------------------- ## |
2297 | 172 | ## Locate command utilities. ## | 226 | ## Locate command utilities. ## |
2298 | @@ -267,7 +321,11 @@ test -z "$SED" && { | |||
2299 | 267 | rm -f conftest.in conftest.tmp conftest.nl conftest.out | 321 | rm -f conftest.in conftest.tmp conftest.nl conftest.out |
2300 | 268 | } | 322 | } |
2301 | 269 | 323 | ||
2302 | 324 | <<<<<<< build-aux/ltmain.sh | ||
2303 | 270 | func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" | 325 | func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" |
2304 | 326 | ======= | ||
2305 | 327 | func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin | ||
2306 | 328 | >>>>>>> build-aux/ltmain.sh | ||
2307 | 271 | rm -f conftest.sed | 329 | rm -f conftest.sed |
2308 | 272 | SED=$func_path_progs_result | 330 | SED=$func_path_progs_result |
2309 | 273 | } | 331 | } |
2310 | @@ -303,7 +361,11 @@ test -z "$GREP" && { | |||
2311 | 303 | rm -f conftest.in conftest.tmp conftest.nl conftest.out | 361 | rm -f conftest.in conftest.tmp conftest.nl conftest.out |
2312 | 304 | } | 362 | } |
2313 | 305 | 363 | ||
2314 | 364 | <<<<<<< build-aux/ltmain.sh | ||
2315 | 306 | func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" | 365 | func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" |
2316 | 366 | ======= | ||
2317 | 367 | func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin | ||
2318 | 368 | >>>>>>> build-aux/ltmain.sh | ||
2319 | 307 | GREP=$func_path_progs_result | 369 | GREP=$func_path_progs_result |
2320 | 308 | } | 370 | } |
2321 | 309 | 371 | ||
2322 | @@ -588,16 +650,26 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then | |||
2323 | 588 | { | 650 | { |
2324 | 589 | $debug_cmd | 651 | $debug_cmd |
2325 | 590 | 652 | ||
2326 | 653 | <<<<<<< build-aux/ltmain.sh | ||
2327 | 591 | func_quote_arg pretty "$2" | 654 | func_quote_arg pretty "$2" |
2328 | 592 | eval "$1+=\\ \$func_quote_arg_result" | 655 | eval "$1+=\\ \$func_quote_arg_result" |
2329 | 656 | ======= | ||
2330 | 657 | func_quote_for_eval "$2" | ||
2331 | 658 | eval "$1+=\\ \$func_quote_for_eval_result" | ||
2332 | 659 | >>>>>>> build-aux/ltmain.sh | ||
2333 | 593 | }' | 660 | }' |
2334 | 594 | else | 661 | else |
2335 | 595 | func_append_quoted () | 662 | func_append_quoted () |
2336 | 596 | { | 663 | { |
2337 | 597 | $debug_cmd | 664 | $debug_cmd |
2338 | 598 | 665 | ||
2339 | 666 | <<<<<<< build-aux/ltmain.sh | ||
2340 | 599 | func_quote_arg pretty "$2" | 667 | func_quote_arg pretty "$2" |
2341 | 600 | eval "$1=\$$1\\ \$func_quote_arg_result" | 668 | eval "$1=\$$1\\ \$func_quote_arg_result" |
2342 | 669 | ======= | ||
2343 | 670 | func_quote_for_eval "$2" | ||
2344 | 671 | eval "$1=\$$1\\ \$func_quote_for_eval_result" | ||
2345 | 672 | >>>>>>> build-aux/ltmain.sh | ||
2346 | 601 | } | 673 | } |
2347 | 602 | fi | 674 | fi |
2348 | 603 | 675 | ||
2349 | @@ -1099,6 +1171,7 @@ func_relative_path () | |||
2350 | 1099 | } | 1171 | } |
2351 | 1100 | 1172 | ||
2352 | 1101 | 1173 | ||
2353 | 1174 | <<<<<<< build-aux/ltmain.sh | ||
2354 | 1102 | # func_quote_portable EVAL ARG | 1175 | # func_quote_portable EVAL ARG |
2355 | 1103 | # ---------------------------- | 1176 | # ---------------------------- |
2356 | 1104 | # Internal function to portably implement func_quote_arg. Note that we still | 1177 | # Internal function to portably implement func_quote_arg. Note that we still |
2357 | @@ -1292,6 +1365,87 @@ func_quote () | |||
2358 | 1292 | fi | 1365 | fi |
2359 | 1293 | shift | 1366 | shift |
2360 | 1294 | done | 1367 | done |
2361 | 1368 | ======= | ||
2362 | 1369 | # func_quote_for_eval ARG... | ||
2363 | 1370 | # -------------------------- | ||
2364 | 1371 | # Aesthetically quote ARGs to be evaled later. | ||
2365 | 1372 | # This function returns two values: | ||
2366 | 1373 | # i) func_quote_for_eval_result | ||
2367 | 1374 | # double-quoted, suitable for a subsequent eval | ||
2368 | 1375 | # ii) func_quote_for_eval_unquoted_result | ||
2369 | 1376 | # has all characters that are still active within double | ||
2370 | 1377 | # quotes backslashified. | ||
2371 | 1378 | func_quote_for_eval () | ||
2372 | 1379 | { | ||
2373 | 1380 | $debug_cmd | ||
2374 | 1381 | |||
2375 | 1382 | func_quote_for_eval_unquoted_result= | ||
2376 | 1383 | func_quote_for_eval_result= | ||
2377 | 1384 | while test 0 -lt $#; do | ||
2378 | 1385 | case $1 in | ||
2379 | 1386 | *[\\\`\"\$]*) | ||
2380 | 1387 | _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; | ||
2381 | 1388 | *) | ||
2382 | 1389 | _G_unquoted_arg=$1 ;; | ||
2383 | 1390 | esac | ||
2384 | 1391 | if test -n "$func_quote_for_eval_unquoted_result"; then | ||
2385 | 1392 | func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" | ||
2386 | 1393 | else | ||
2387 | 1394 | func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" | ||
2388 | 1395 | fi | ||
2389 | 1396 | |||
2390 | 1397 | case $_G_unquoted_arg in | ||
2391 | 1398 | # Double-quote args containing shell metacharacters to delay | ||
2392 | 1399 | # word splitting, command substitution and variable expansion | ||
2393 | 1400 | # for a subsequent eval. | ||
2394 | 1401 | # Many Bourne shells cannot handle close brackets correctly | ||
2395 | 1402 | # in scan sets, so we specify it separately. | ||
2396 | 1403 | *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") | ||
2397 | 1404 | _G_quoted_arg=\"$_G_unquoted_arg\" | ||
2398 | 1405 | ;; | ||
2399 | 1406 | *) | ||
2400 | 1407 | _G_quoted_arg=$_G_unquoted_arg | ||
2401 | 1408 | ;; | ||
2402 | 1409 | esac | ||
2403 | 1410 | |||
2404 | 1411 | if test -n "$func_quote_for_eval_result"; then | ||
2405 | 1412 | func_append func_quote_for_eval_result " $_G_quoted_arg" | ||
2406 | 1413 | else | ||
2407 | 1414 | func_append func_quote_for_eval_result "$_G_quoted_arg" | ||
2408 | 1415 | fi | ||
2409 | 1416 | shift | ||
2410 | 1417 | done | ||
2411 | 1418 | } | ||
2412 | 1419 | |||
2413 | 1420 | |||
2414 | 1421 | # func_quote_for_expand ARG | ||
2415 | 1422 | # ------------------------- | ||
2416 | 1423 | # Aesthetically quote ARG to be evaled later; same as above, | ||
2417 | 1424 | # but do not quote variable references. | ||
2418 | 1425 | func_quote_for_expand () | ||
2419 | 1426 | { | ||
2420 | 1427 | $debug_cmd | ||
2421 | 1428 | |||
2422 | 1429 | case $1 in | ||
2423 | 1430 | *[\\\`\"]*) | ||
2424 | 1431 | _G_arg=`$ECHO "$1" | $SED \ | ||
2425 | 1432 | -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; | ||
2426 | 1433 | *) | ||
2427 | 1434 | _G_arg=$1 ;; | ||
2428 | 1435 | esac | ||
2429 | 1436 | |||
2430 | 1437 | case $_G_arg in | ||
2431 | 1438 | # Double-quote args containing shell metacharacters to delay | ||
2432 | 1439 | # word splitting and command substitution for a subsequent eval. | ||
2433 | 1440 | # Many Bourne shells cannot handle close brackets correctly | ||
2434 | 1441 | # in scan sets, so we specify it separately. | ||
2435 | 1442 | *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") | ||
2436 | 1443 | _G_arg=\"$_G_arg\" | ||
2437 | 1444 | ;; | ||
2438 | 1445 | esac | ||
2439 | 1446 | |||
2440 | 1447 | func_quote_for_expand_result=$_G_arg | ||
2441 | 1448 | >>>>>>> build-aux/ltmain.sh | ||
2442 | 1295 | } | 1449 | } |
2443 | 1296 | 1450 | ||
2444 | 1297 | 1451 | ||
2445 | @@ -1337,8 +1491,13 @@ func_show_eval () | |||
2446 | 1337 | _G_cmd=$1 | 1491 | _G_cmd=$1 |
2447 | 1338 | _G_fail_exp=${2-':'} | 1492 | _G_fail_exp=${2-':'} |
2448 | 1339 | 1493 | ||
2449 | 1494 | <<<<<<< build-aux/ltmain.sh | ||
2450 | 1340 | func_quote_arg pretty,expand "$_G_cmd" | 1495 | func_quote_arg pretty,expand "$_G_cmd" |
2451 | 1341 | eval "func_notquiet $func_quote_arg_result" | 1496 | eval "func_notquiet $func_quote_arg_result" |
2452 | 1497 | ======= | ||
2453 | 1498 | func_quote_for_expand "$_G_cmd" | ||
2454 | 1499 | eval "func_notquiet $func_quote_for_expand_result" | ||
2455 | 1500 | >>>>>>> build-aux/ltmain.sh | ||
2456 | 1342 | 1501 | ||
2457 | 1343 | $opt_dry_run || { | 1502 | $opt_dry_run || { |
2458 | 1344 | eval "$_G_cmd" | 1503 | eval "$_G_cmd" |
2459 | @@ -1363,8 +1522,13 @@ func_show_eval_locale () | |||
2460 | 1363 | _G_fail_exp=${2-':'} | 1522 | _G_fail_exp=${2-':'} |
2461 | 1364 | 1523 | ||
2462 | 1365 | $opt_quiet || { | 1524 | $opt_quiet || { |
2463 | 1525 | <<<<<<< build-aux/ltmain.sh | ||
2464 | 1366 | func_quote_arg expand,pretty "$_G_cmd" | 1526 | func_quote_arg expand,pretty "$_G_cmd" |
2465 | 1367 | eval "func_echo $func_quote_arg_result" | 1527 | eval "func_echo $func_quote_arg_result" |
2466 | 1528 | ======= | ||
2467 | 1529 | func_quote_for_expand "$_G_cmd" | ||
2468 | 1530 | eval "func_echo $func_quote_for_expand_result" | ||
2469 | 1531 | >>>>>>> build-aux/ltmain.sh | ||
2470 | 1368 | } | 1532 | } |
2471 | 1369 | 1533 | ||
2472 | 1370 | $opt_dry_run || { | 1534 | $opt_dry_run || { |
2473 | @@ -1491,6 +1655,7 @@ func_lt_ver () | |||
2474 | 1491 | # End: | 1655 | # End: |
2475 | 1492 | #! /bin/sh | 1656 | #! /bin/sh |
2476 | 1493 | 1657 | ||
2477 | 1658 | <<<<<<< build-aux/ltmain.sh | ||
2478 | 1494 | # A portable, pluggable option parser for Bourne shell. | 1659 | # A portable, pluggable option parser for Bourne shell. |
2479 | 1495 | # Written by Gary V. Vaughan, 2010 | 1660 | # Written by Gary V. Vaughan, 2010 |
2480 | 1496 | 1661 | ||
2481 | @@ -1511,6 +1676,32 @@ func_lt_ver () | |||
2482 | 1511 | 1676 | ||
2483 | 1512 | # Set a version string for this script. | 1677 | # Set a version string for this script. |
2484 | 1513 | scriptversion=2018-07-24.06; # UTC | 1678 | scriptversion=2018-07-24.06; # UTC |
2485 | 1679 | ======= | ||
2486 | 1680 | # Set a version string for this script. | ||
2487 | 1681 | scriptversion=2014-01-07.03; # UTC | ||
2488 | 1682 | |||
2489 | 1683 | # A portable, pluggable option parser for Bourne shell. | ||
2490 | 1684 | # Written by Gary V. Vaughan, 2010 | ||
2491 | 1685 | |||
2492 | 1686 | # Copyright (C) 2010-2015 Free Software Foundation, Inc. | ||
2493 | 1687 | # This is free software; see the source for copying conditions. There is NO | ||
2494 | 1688 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
2495 | 1689 | |||
2496 | 1690 | # This program is free software: you can redistribute it and/or modify | ||
2497 | 1691 | # it under the terms of the GNU General Public License as published by | ||
2498 | 1692 | # the Free Software Foundation, either version 3 of the License, or | ||
2499 | 1693 | # (at your option) any later version. | ||
2500 | 1694 | |||
2501 | 1695 | # This program is distributed in the hope that it will be useful, | ||
2502 | 1696 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2503 | 1697 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2504 | 1698 | # GNU General Public License for more details. | ||
2505 | 1699 | |||
2506 | 1700 | # You should have received a copy of the GNU General Public License | ||
2507 | 1701 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2508 | 1702 | |||
2509 | 1703 | # Please report bugs or propose patches to gary@gnu.org. | ||
2510 | 1704 | >>>>>>> build-aux/ltmain.sh | ||
2511 | 1514 | 1705 | ||
2512 | 1515 | 1706 | ||
2513 | 1516 | ## ------ ## | 1707 | ## ------ ## |
2514 | @@ -1533,7 +1724,11 @@ scriptversion=2018-07-24.06; # UTC | |||
2515 | 1533 | # | 1724 | # |
2516 | 1534 | # In order for the '--version' option to work, you will need to have a | 1725 | # In order for the '--version' option to work, you will need to have a |
2517 | 1535 | # suitably formatted comment like the one at the top of this file | 1726 | # suitably formatted comment like the one at the top of this file |
2518 | 1727 | <<<<<<< build-aux/ltmain.sh | ||
2519 | 1536 | # starting with '# Written by ' and ending with '# Copyright'. | 1728 | # starting with '# Written by ' and ending with '# Copyright'. |
2520 | 1729 | ======= | ||
2521 | 1730 | # starting with '# Written by ' and ending with '# warranty; '. | ||
2522 | 1731 | >>>>>>> build-aux/ltmain.sh | ||
2523 | 1537 | # | 1732 | # |
2524 | 1538 | # For '-h' and '--help' to work, you will also need a one line | 1733 | # For '-h' and '--help' to work, you will also need a one line |
2525 | 1539 | # description of your script's purpose in a comment directly above the | 1734 | # description of your script's purpose in a comment directly above the |
2526 | @@ -1545,7 +1740,11 @@ scriptversion=2018-07-24.06; # UTC | |||
2527 | 1545 | # to display verbose messages only when your user has specified | 1740 | # to display verbose messages only when your user has specified |
2528 | 1546 | # '--verbose'. | 1741 | # '--verbose'. |
2529 | 1547 | # | 1742 | # |
2530 | 1743 | <<<<<<< build-aux/ltmain.sh | ||
2531 | 1548 | # After sourcing this file, you can plug in processing for additional | 1744 | # After sourcing this file, you can plug in processing for additional |
2532 | 1745 | ======= | ||
2533 | 1746 | # After sourcing this file, you can plug processing for additional | ||
2534 | 1747 | >>>>>>> build-aux/ltmain.sh | ||
2535 | 1549 | # options by amending the variables from the 'Configuration' section | 1748 | # options by amending the variables from the 'Configuration' section |
2536 | 1550 | # below, and following the instructions in the 'Option parsing' | 1749 | # below, and following the instructions in the 'Option parsing' |
2537 | 1551 | # section further down. | 1750 | # section further down. |
2538 | @@ -1594,8 +1793,13 @@ fatal_help="Try '\$progname --help' for more information." | |||
2539 | 1594 | ## ------------------------- ## | 1793 | ## ------------------------- ## |
2540 | 1595 | 1794 | ||
2541 | 1596 | # This section contains functions for adding, removing, and running hooks | 1795 | # This section contains functions for adding, removing, and running hooks |
2542 | 1796 | <<<<<<< build-aux/ltmain.sh | ||
2543 | 1597 | # in the main code. A hook is just a list of function names that can be | 1797 | # in the main code. A hook is just a list of function names that can be |
2544 | 1598 | # run in order later on. | 1798 | # run in order later on. |
2545 | 1799 | ======= | ||
2546 | 1800 | # to the main code. A hook is just a named list of of function, that can | ||
2547 | 1801 | # be run in order later on. | ||
2548 | 1802 | >>>>>>> build-aux/ltmain.sh | ||
2549 | 1599 | 1803 | ||
2550 | 1600 | # func_hookable FUNC_NAME | 1804 | # func_hookable FUNC_NAME |
2551 | 1601 | # ----------------------- | 1805 | # ----------------------- |
2552 | @@ -1628,8 +1832,12 @@ func_add_hook () | |||
2553 | 1628 | 1832 | ||
2554 | 1629 | # func_remove_hook FUNC_NAME HOOK_FUNC | 1833 | # func_remove_hook FUNC_NAME HOOK_FUNC |
2555 | 1630 | # ------------------------------------ | 1834 | # ------------------------------------ |
2556 | 1835 | <<<<<<< build-aux/ltmain.sh | ||
2557 | 1631 | # Remove HOOK_FUNC from the list of hook functions to be called by | 1836 | # Remove HOOK_FUNC from the list of hook functions to be called by |
2558 | 1632 | # FUNC_NAME. | 1837 | # FUNC_NAME. |
2559 | 1838 | ======= | ||
2560 | 1839 | # Remove HOOK_FUNC from the list of functions called by FUNC_NAME. | ||
2561 | 1840 | >>>>>>> build-aux/ltmain.sh | ||
2562 | 1633 | func_remove_hook () | 1841 | func_remove_hook () |
2563 | 1634 | { | 1842 | { |
2564 | 1635 | $debug_cmd | 1843 | $debug_cmd |
2565 | @@ -1638,6 +1846,7 @@ func_remove_hook () | |||
2566 | 1638 | } | 1846 | } |
2567 | 1639 | 1847 | ||
2568 | 1640 | 1848 | ||
2569 | 1849 | <<<<<<< build-aux/ltmain.sh | ||
2570 | 1641 | # func_propagate_result FUNC_NAME_A FUNC_NAME_B | 1850 | # func_propagate_result FUNC_NAME_A FUNC_NAME_B |
2571 | 1642 | # --------------------------------------------- | 1851 | # --------------------------------------------- |
2572 | 1643 | # If the *_result variable of FUNC_NAME_A _is set_, assign its value to | 1852 | # If the *_result variable of FUNC_NAME_A _is set_, assign its value to |
2573 | @@ -1660,6 +1869,12 @@ func_propagate_result () | |||
2574 | 1660 | # --------------------------------- | 1869 | # --------------------------------- |
2575 | 1661 | # Run all hook functions registered to FUNC_NAME. | 1870 | # Run all hook functions registered to FUNC_NAME. |
2576 | 1662 | # It's assumed that the list of hook functions contains nothing more | 1871 | # It's assumed that the list of hook functions contains nothing more |
2577 | 1872 | ======= | ||
2578 | 1873 | # func_run_hooks FUNC_NAME [ARG]... | ||
2579 | 1874 | # --------------------------------- | ||
2580 | 1875 | # Run all hook functions registered to FUNC_NAME. | ||
2581 | 1876 | # It is assumed that the list of hook functions contains nothing more | ||
2582 | 1877 | >>>>>>> build-aux/ltmain.sh | ||
2583 | 1663 | # than a whitespace-delimited list of legal shell function names, and | 1878 | # than a whitespace-delimited list of legal shell function names, and |
2584 | 1664 | # no effort is wasted trying to catch shell meta-characters or preserve | 1879 | # no effort is wasted trying to catch shell meta-characters or preserve |
2585 | 1665 | # whitespace. | 1880 | # whitespace. |
2586 | @@ -1669,12 +1884,17 @@ func_run_hooks () | |||
2587 | 1669 | 1884 | ||
2588 | 1670 | case " $hookable_fns " in | 1885 | case " $hookable_fns " in |
2589 | 1671 | *" $1 "*) ;; | 1886 | *" $1 "*) ;; |
2590 | 1887 | <<<<<<< build-aux/ltmain.sh | ||
2591 | 1672 | *) func_fatal_error "'$1' does not support hook functions." ;; | 1888 | *) func_fatal_error "'$1' does not support hook functions." ;; |
2592 | 1889 | ======= | ||
2593 | 1890 | *) func_fatal_error "'$1' does not support hook funcions.n" ;; | ||
2594 | 1891 | >>>>>>> build-aux/ltmain.sh | ||
2595 | 1673 | esac | 1892 | esac |
2596 | 1674 | 1893 | ||
2597 | 1675 | eval _G_hook_fns=\$$1_hooks; shift | 1894 | eval _G_hook_fns=\$$1_hooks; shift |
2598 | 1676 | 1895 | ||
2599 | 1677 | for _G_hook in $_G_hook_fns; do | 1896 | for _G_hook in $_G_hook_fns; do |
2600 | 1897 | <<<<<<< build-aux/ltmain.sh | ||
2601 | 1678 | func_unset "${_G_hook}_result" | 1898 | func_unset "${_G_hook}_result" |
2602 | 1679 | eval $_G_hook '${1+"$@"}' | 1899 | eval $_G_hook '${1+"$@"}' |
2603 | 1680 | func_propagate_result $_G_hook func_run_hooks | 1900 | func_propagate_result $_G_hook func_run_hooks |
2604 | @@ -1682,6 +1902,18 @@ func_run_hooks () | |||
2605 | 1682 | eval set dummy "$func_run_hooks_result"; shift | 1902 | eval set dummy "$func_run_hooks_result"; shift |
2606 | 1683 | fi | 1903 | fi |
2607 | 1684 | done | 1904 | done |
2608 | 1905 | ======= | ||
2609 | 1906 | eval $_G_hook '"$@"' | ||
2610 | 1907 | |||
2611 | 1908 | # store returned options list back into positional | ||
2612 | 1909 | # parameters for next 'cmd' execution. | ||
2613 | 1910 | eval _G_hook_result=\$${_G_hook}_result | ||
2614 | 1911 | eval set dummy "$_G_hook_result"; shift | ||
2615 | 1912 | done | ||
2616 | 1913 | |||
2617 | 1914 | func_quote_for_eval ${1+"$@"} | ||
2618 | 1915 | func_run_hooks_result=$func_quote_for_eval_result | ||
2619 | 1916 | >>>>>>> build-aux/ltmain.sh | ||
2620 | 1685 | } | 1917 | } |
2621 | 1686 | 1918 | ||
2622 | 1687 | 1919 | ||
2623 | @@ -1691,6 +1923,7 @@ func_run_hooks () | |||
2624 | 1691 | ## --------------- ## | 1923 | ## --------------- ## |
2625 | 1692 | 1924 | ||
2626 | 1693 | # In order to add your own option parsing hooks, you must accept the | 1925 | # In order to add your own option parsing hooks, you must accept the |
2627 | 1926 | <<<<<<< build-aux/ltmain.sh | ||
2628 | 1694 | # full positional parameter list from your hook function. You may remove | 1927 | # full positional parameter list from your hook function. You may remove |
2629 | 1695 | # or edit any options that you action, and then pass back the remaining | 1928 | # or edit any options that you action, and then pass back the remaining |
2630 | 1696 | # unprocessed options in '<hooked_function_name>_result', escaped | 1929 | # unprocessed options in '<hooked_function_name>_result', escaped |
2631 | @@ -1703,6 +1936,12 @@ func_run_hooks () | |||
2632 | 1703 | # machines). | 1936 | # machines). |
2633 | 1704 | # | 1937 | # |
2634 | 1705 | # Like this: | 1938 | # Like this: |
2635 | 1939 | ======= | ||
2636 | 1940 | # full positional parameter list in your hook function, remove any | ||
2637 | 1941 | # options that you action, and then pass back the remaining unprocessed | ||
2638 | 1942 | # options in '<hooked_function_name>_result', escaped suitably for | ||
2639 | 1943 | # 'eval'. Like this: | ||
2640 | 1944 | >>>>>>> build-aux/ltmain.sh | ||
2641 | 1706 | # | 1945 | # |
2642 | 1707 | # my_options_prep () | 1946 | # my_options_prep () |
2643 | 1708 | # { | 1947 | # { |
2644 | @@ -1712,8 +1951,14 @@ func_run_hooks () | |||
2645 | 1712 | # usage_message=$usage_message' | 1951 | # usage_message=$usage_message' |
2646 | 1713 | # -s, --silent don'\''t print informational messages | 1952 | # -s, --silent don'\''t print informational messages |
2647 | 1714 | # ' | 1953 | # ' |
2648 | 1954 | <<<<<<< build-aux/ltmain.sh | ||
2649 | 1715 | # # No change in '$@' (ignored completely by this hook). Leave | 1955 | # # No change in '$@' (ignored completely by this hook). Leave |
2650 | 1716 | # # my_options_prep_result variable intact. | 1956 | # # my_options_prep_result variable intact. |
2651 | 1957 | ======= | ||
2652 | 1958 | # | ||
2653 | 1959 | # func_quote_for_eval ${1+"$@"} | ||
2654 | 1960 | # my_options_prep_result=$func_quote_for_eval_result | ||
2655 | 1961 | >>>>>>> build-aux/ltmain.sh | ||
2656 | 1717 | # } | 1962 | # } |
2657 | 1718 | # func_add_hook func_options_prep my_options_prep | 1963 | # func_add_hook func_options_prep my_options_prep |
2658 | 1719 | # | 1964 | # |
2659 | @@ -1722,22 +1967,31 @@ func_run_hooks () | |||
2660 | 1722 | # { | 1967 | # { |
2661 | 1723 | # $debug_cmd | 1968 | # $debug_cmd |
2662 | 1724 | # | 1969 | # |
2663 | 1970 | <<<<<<< build-aux/ltmain.sh | ||
2664 | 1725 | # args_changed=false | 1971 | # args_changed=false |
2665 | 1726 | # | 1972 | # |
2666 | 1727 | # # Note that, for efficiency, we parse as many options as we can | 1973 | # # Note that, for efficiency, we parse as many options as we can |
2667 | 1974 | ======= | ||
2668 | 1975 | # # Note that for efficiency, we parse as many options as we can | ||
2669 | 1976 | >>>>>>> build-aux/ltmain.sh | ||
2670 | 1728 | # # recognise in a loop before passing the remainder back to the | 1977 | # # recognise in a loop before passing the remainder back to the |
2671 | 1729 | # # caller on the first unrecognised argument we encounter. | 1978 | # # caller on the first unrecognised argument we encounter. |
2672 | 1730 | # while test $# -gt 0; do | 1979 | # while test $# -gt 0; do |
2673 | 1731 | # opt=$1; shift | 1980 | # opt=$1; shift |
2674 | 1732 | # case $opt in | 1981 | # case $opt in |
2675 | 1982 | <<<<<<< build-aux/ltmain.sh | ||
2676 | 1733 | # --silent|-s) opt_silent=: | 1983 | # --silent|-s) opt_silent=: |
2677 | 1734 | # args_changed=: | 1984 | # args_changed=: |
2678 | 1735 | # ;; | 1985 | # ;; |
2679 | 1986 | ======= | ||
2680 | 1987 | # --silent|-s) opt_silent=: ;; | ||
2681 | 1988 | >>>>>>> build-aux/ltmain.sh | ||
2682 | 1736 | # # Separate non-argument short options: | 1989 | # # Separate non-argument short options: |
2683 | 1737 | # -s*) func_split_short_opt "$_G_opt" | 1990 | # -s*) func_split_short_opt "$_G_opt" |
2684 | 1738 | # set dummy "$func_split_short_opt_name" \ | 1991 | # set dummy "$func_split_short_opt_name" \ |
2685 | 1739 | # "-$func_split_short_opt_arg" ${1+"$@"} | 1992 | # "-$func_split_short_opt_arg" ${1+"$@"} |
2686 | 1740 | # shift | 1993 | # shift |
2687 | 1994 | <<<<<<< build-aux/ltmain.sh | ||
2688 | 1741 | # args_changed=: | 1995 | # args_changed=: |
2689 | 1742 | # ;; | 1996 | # ;; |
2690 | 1743 | # *) # Make sure the first unrecognised option "$_G_opt" | 1997 | # *) # Make sure the first unrecognised option "$_G_opt" |
2691 | @@ -1752,6 +2006,15 @@ func_run_hooks () | |||
2692 | 1752 | # func_quote eval ${1+"$@"} | 2006 | # func_quote eval ${1+"$@"} |
2693 | 1753 | # my_silent_option_result=$func_quote_result | 2007 | # my_silent_option_result=$func_quote_result |
2694 | 1754 | # fi | 2008 | # fi |
2695 | 2009 | ======= | ||
2696 | 2010 | # ;; | ||
2697 | 2011 | # *) set dummy "$_G_opt" "$*"; shift; break ;; | ||
2698 | 2012 | # esac | ||
2699 | 2013 | # done | ||
2700 | 2014 | # | ||
2701 | 2015 | # func_quote_for_eval ${1+"$@"} | ||
2702 | 2016 | # my_silent_option_result=$func_quote_for_eval_result | ||
2703 | 2017 | >>>>>>> build-aux/ltmain.sh | ||
2704 | 1755 | # } | 2018 | # } |
2705 | 1756 | # func_add_hook func_parse_options my_silent_option | 2019 | # func_add_hook func_parse_options my_silent_option |
2706 | 1757 | # | 2020 | # |
2707 | @@ -1762,14 +2025,25 @@ func_run_hooks () | |||
2708 | 1762 | # | 2025 | # |
2709 | 1763 | # $opt_silent && $opt_verbose && func_fatal_help "\ | 2026 | # $opt_silent && $opt_verbose && func_fatal_help "\ |
2710 | 1764 | # '--silent' and '--verbose' options are mutually exclusive." | 2027 | # '--silent' and '--verbose' options are mutually exclusive." |
2711 | 2028 | <<<<<<< build-aux/ltmain.sh | ||
2712 | 1765 | # } | 2029 | # } |
2713 | 1766 | # func_add_hook func_validate_options my_option_validation | 2030 | # func_add_hook func_validate_options my_option_validation |
2714 | 1767 | # | 2031 | # |
2715 | 1768 | # You'll also need to manually amend $usage_message to reflect the extra | 2032 | # You'll also need to manually amend $usage_message to reflect the extra |
2716 | 2033 | ======= | ||
2717 | 2034 | # | ||
2718 | 2035 | # func_quote_for_eval ${1+"$@"} | ||
2719 | 2036 | # my_option_validation_result=$func_quote_for_eval_result | ||
2720 | 2037 | # } | ||
2721 | 2038 | # func_add_hook func_validate_options my_option_validation | ||
2722 | 2039 | # | ||
2723 | 2040 | # You'll alse need to manually amend $usage_message to reflect the extra | ||
2724 | 2041 | >>>>>>> build-aux/ltmain.sh | ||
2725 | 1769 | # options you parse. It's preferable to append if you can, so that | 2042 | # options you parse. It's preferable to append if you can, so that |
2726 | 1770 | # multiple option parsing hooks can be added safely. | 2043 | # multiple option parsing hooks can be added safely. |
2727 | 1771 | 2044 | ||
2728 | 1772 | 2045 | ||
2729 | 2046 | <<<<<<< build-aux/ltmain.sh | ||
2730 | 1773 | # func_options_finish [ARG]... | 2047 | # func_options_finish [ARG]... |
2731 | 1774 | # ---------------------------- | 2048 | # ---------------------------- |
2732 | 1775 | # Finishing the option parse loop (call 'func_options' hooks ATM). | 2049 | # Finishing the option parse loop (call 'func_options' hooks ATM). |
2733 | @@ -1782,6 +2056,8 @@ func_options_finish () | |||
2734 | 1782 | } | 2056 | } |
2735 | 1783 | 2057 | ||
2736 | 1784 | 2058 | ||
2737 | 2059 | ======= | ||
2738 | 2060 | >>>>>>> build-aux/ltmain.sh | ||
2739 | 1785 | # func_options [ARG]... | 2061 | # func_options [ARG]... |
2740 | 1786 | # --------------------- | 2062 | # --------------------- |
2741 | 1787 | # All the functions called inside func_options are hookable. See the | 2063 | # All the functions called inside func_options are hookable. See the |
2742 | @@ -1791,6 +2067,7 @@ func_options () | |||
2743 | 1791 | { | 2067 | { |
2744 | 1792 | $debug_cmd | 2068 | $debug_cmd |
2745 | 1793 | 2069 | ||
2746 | 2070 | <<<<<<< build-aux/ltmain.sh | ||
2747 | 1794 | _G_options_quoted=false | 2071 | _G_options_quoted=false |
2748 | 1795 | 2072 | ||
2749 | 1796 | for my_func in options_prep parse_options validate_options options_finish | 2073 | for my_func in options_prep parse_options validate_options options_finish |
2750 | @@ -1812,6 +2089,19 @@ func_options () | |||
2751 | 1812 | func_quote eval ${1+"$@"} | 2089 | func_quote eval ${1+"$@"} |
2752 | 1813 | func_options_result=$func_quote_result | 2090 | func_options_result=$func_quote_result |
2753 | 1814 | } | 2091 | } |
2754 | 2092 | ======= | ||
2755 | 2093 | func_options_prep ${1+"$@"} | ||
2756 | 2094 | eval func_parse_options \ | ||
2757 | 2095 | ${func_options_prep_result+"$func_options_prep_result"} | ||
2758 | 2096 | eval func_validate_options \ | ||
2759 | 2097 | ${func_parse_options_result+"$func_parse_options_result"} | ||
2760 | 2098 | |||
2761 | 2099 | eval func_run_hooks func_options \ | ||
2762 | 2100 | ${func_validate_options_result+"$func_validate_options_result"} | ||
2763 | 2101 | |||
2764 | 2102 | # save modified positional parameters for caller | ||
2765 | 2103 | func_options_result=$func_run_hooks_result | ||
2766 | 2104 | >>>>>>> build-aux/ltmain.sh | ||
2767 | 1815 | } | 2105 | } |
2768 | 1816 | 2106 | ||
2769 | 1817 | 2107 | ||
2770 | @@ -1820,8 +2110,14 @@ func_options () | |||
2771 | 1820 | # All initialisations required before starting the option parse loop. | 2110 | # All initialisations required before starting the option parse loop. |
2772 | 1821 | # Note that when calling hook functions, we pass through the list of | 2111 | # Note that when calling hook functions, we pass through the list of |
2773 | 1822 | # positional parameters. If a hook function modifies that list, and | 2112 | # positional parameters. If a hook function modifies that list, and |
2774 | 2113 | <<<<<<< build-aux/ltmain.sh | ||
2775 | 1823 | # needs to propagate that back to rest of this script, then the complete | 2114 | # needs to propagate that back to rest of this script, then the complete |
2776 | 1824 | # modified list must be put in 'func_run_hooks_result' before returning. | 2115 | # modified list must be put in 'func_run_hooks_result' before returning. |
2777 | 2116 | ======= | ||
2778 | 2117 | # needs to propogate that back to rest of this script, then the complete | ||
2779 | 2118 | # modified list must be put in 'func_run_hooks_result' before | ||
2780 | 2119 | # returning. | ||
2781 | 2120 | >>>>>>> build-aux/ltmain.sh | ||
2782 | 1825 | func_hookable func_options_prep | 2121 | func_hookable func_options_prep |
2783 | 1826 | func_options_prep () | 2122 | func_options_prep () |
2784 | 1827 | { | 2123 | { |
2785 | @@ -1832,7 +2128,13 @@ func_options_prep () | |||
2786 | 1832 | opt_warning_types= | 2128 | opt_warning_types= |
2787 | 1833 | 2129 | ||
2788 | 1834 | func_run_hooks func_options_prep ${1+"$@"} | 2130 | func_run_hooks func_options_prep ${1+"$@"} |
2789 | 2131 | <<<<<<< build-aux/ltmain.sh | ||
2790 | 1835 | func_propagate_result func_run_hooks func_options_prep | 2132 | func_propagate_result func_run_hooks func_options_prep |
2791 | 2133 | ======= | ||
2792 | 2134 | |||
2793 | 2135 | # save modified positional parameters for caller | ||
2794 | 2136 | func_options_prep_result=$func_run_hooks_result | ||
2795 | 2137 | >>>>>>> build-aux/ltmain.sh | ||
2796 | 1836 | } | 2138 | } |
2797 | 1837 | 2139 | ||
2798 | 1838 | 2140 | ||
2799 | @@ -1844,12 +2146,18 @@ func_parse_options () | |||
2800 | 1844 | { | 2146 | { |
2801 | 1845 | $debug_cmd | 2147 | $debug_cmd |
2802 | 1846 | 2148 | ||
2803 | 2149 | <<<<<<< build-aux/ltmain.sh | ||
2804 | 1847 | _G_parse_options_requote=false | 2150 | _G_parse_options_requote=false |
2805 | 2151 | ======= | ||
2806 | 2152 | func_parse_options_result= | ||
2807 | 2153 | |||
2808 | 2154 | >>>>>>> build-aux/ltmain.sh | ||
2809 | 1848 | # this just eases exit handling | 2155 | # this just eases exit handling |
2810 | 1849 | while test $# -gt 0; do | 2156 | while test $# -gt 0; do |
2811 | 1850 | # Defer to hook functions for initial option parsing, so they | 2157 | # Defer to hook functions for initial option parsing, so they |
2812 | 1851 | # get priority in the event of reusing an option name. | 2158 | # get priority in the event of reusing an option name. |
2813 | 1852 | func_run_hooks func_parse_options ${1+"$@"} | 2159 | func_run_hooks func_parse_options ${1+"$@"} |
2814 | 2160 | <<<<<<< build-aux/ltmain.sh | ||
2815 | 1853 | func_propagate_result func_run_hooks func_parse_options | 2161 | func_propagate_result func_run_hooks func_parse_options |
2816 | 1854 | if $func_propagate_result_result; then | 2162 | if $func_propagate_result_result; then |
2817 | 1855 | eval set dummy "$func_parse_options_result"; shift | 2163 | eval set dummy "$func_parse_options_result"; shift |
2818 | @@ -1858,18 +2166,30 @@ func_parse_options () | |||
2819 | 1858 | # this if-branch). No need to quote it again. | 2166 | # this if-branch). No need to quote it again. |
2820 | 1859 | _G_parse_options_requote=false | 2167 | _G_parse_options_requote=false |
2821 | 1860 | fi | 2168 | fi |
2822 | 2169 | ======= | ||
2823 | 2170 | |||
2824 | 2171 | # Adjust func_parse_options positional parameters to match | ||
2825 | 2172 | eval set dummy "$func_run_hooks_result"; shift | ||
2826 | 2173 | >>>>>>> build-aux/ltmain.sh | ||
2827 | 1861 | 2174 | ||
2828 | 1862 | # Break out of the loop if we already parsed every option. | 2175 | # Break out of the loop if we already parsed every option. |
2829 | 1863 | test $# -gt 0 || break | 2176 | test $# -gt 0 || break |
2830 | 1864 | 2177 | ||
2831 | 2178 | <<<<<<< build-aux/ltmain.sh | ||
2832 | 1865 | # We expect that one of the options parsed in this function matches | 2179 | # We expect that one of the options parsed in this function matches |
2833 | 1866 | # and thus we remove _G_opt from "$@" and need to re-quote. | 2180 | # and thus we remove _G_opt from "$@" and need to re-quote. |
2834 | 1867 | _G_match_parse_options=: | 2181 | _G_match_parse_options=: |
2835 | 2182 | ======= | ||
2836 | 2183 | >>>>>>> build-aux/ltmain.sh | ||
2837 | 1868 | _G_opt=$1 | 2184 | _G_opt=$1 |
2838 | 1869 | shift | 2185 | shift |
2839 | 1870 | case $_G_opt in | 2186 | case $_G_opt in |
2840 | 1871 | --debug|-x) debug_cmd='set -x' | 2187 | --debug|-x) debug_cmd='set -x' |
2841 | 2188 | <<<<<<< build-aux/ltmain.sh | ||
2842 | 1872 | func_echo "enabling shell trace mode" >&2 | 2189 | func_echo "enabling shell trace mode" >&2 |
2843 | 2190 | ======= | ||
2844 | 2191 | func_echo "enabling shell trace mode" | ||
2845 | 2192 | >>>>>>> build-aux/ltmain.sh | ||
2846 | 1873 | $debug_cmd | 2193 | $debug_cmd |
2847 | 1874 | ;; | 2194 | ;; |
2848 | 1875 | 2195 | ||
2849 | @@ -1879,10 +2199,14 @@ func_parse_options () | |||
2850 | 1879 | ;; | 2199 | ;; |
2851 | 1880 | 2200 | ||
2852 | 1881 | --warnings|--warning|-W) | 2201 | --warnings|--warning|-W) |
2853 | 2202 | <<<<<<< build-aux/ltmain.sh | ||
2854 | 1882 | if test $# = 0 && func_missing_arg $_G_opt; then | 2203 | if test $# = 0 && func_missing_arg $_G_opt; then |
2855 | 1883 | _G_parse_options_requote=: | 2204 | _G_parse_options_requote=: |
2856 | 1884 | break | 2205 | break |
2857 | 1885 | fi | 2206 | fi |
2858 | 2207 | ======= | ||
2859 | 2208 | test $# = 0 && func_missing_arg $_G_opt && break | ||
2860 | 2209 | >>>>>>> build-aux/ltmain.sh | ||
2861 | 1886 | case " $warning_categories $1" in | 2210 | case " $warning_categories $1" in |
2862 | 1887 | *" $1 "*) | 2211 | *" $1 "*) |
2863 | 1888 | # trailing space prevents matching last $1 above | 2212 | # trailing space prevents matching last $1 above |
2864 | @@ -1935,6 +2259,7 @@ func_parse_options () | |||
2865 | 1935 | shift | 2259 | shift |
2866 | 1936 | ;; | 2260 | ;; |
2867 | 1937 | 2261 | ||
2868 | 2262 | <<<<<<< build-aux/ltmain.sh | ||
2869 | 1938 | --) _G_parse_options_requote=: ; break ;; | 2263 | --) _G_parse_options_requote=: ; break ;; |
2870 | 1939 | -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; | 2264 | -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; |
2871 | 1940 | *) set dummy "$_G_opt" ${1+"$@"}; shift | 2265 | *) set dummy "$_G_opt" ${1+"$@"}; shift |
2872 | @@ -1953,6 +2278,17 @@ func_parse_options () | |||
2873 | 1953 | func_quote eval ${1+"$@"} | 2278 | func_quote eval ${1+"$@"} |
2874 | 1954 | func_parse_options_result=$func_quote_result | 2279 | func_parse_options_result=$func_quote_result |
2875 | 1955 | fi | 2280 | fi |
2876 | 2281 | ======= | ||
2877 | 2282 | --) break ;; | ||
2878 | 2283 | -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; | ||
2879 | 2284 | *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; | ||
2880 | 2285 | esac | ||
2881 | 2286 | done | ||
2882 | 2287 | |||
2883 | 2288 | # save modified positional parameters for caller | ||
2884 | 2289 | func_quote_for_eval ${1+"$@"} | ||
2885 | 2290 | func_parse_options_result=$func_quote_for_eval_result | ||
2886 | 2291 | >>>>>>> build-aux/ltmain.sh | ||
2887 | 1956 | } | 2292 | } |
2888 | 1957 | 2293 | ||
2889 | 1958 | 2294 | ||
2890 | @@ -1969,10 +2305,19 @@ func_validate_options () | |||
2891 | 1969 | test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" | 2305 | test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" |
2892 | 1970 | 2306 | ||
2893 | 1971 | func_run_hooks func_validate_options ${1+"$@"} | 2307 | func_run_hooks func_validate_options ${1+"$@"} |
2894 | 2308 | <<<<<<< build-aux/ltmain.sh | ||
2895 | 1972 | func_propagate_result func_run_hooks func_validate_options | 2309 | func_propagate_result func_run_hooks func_validate_options |
2896 | 1973 | 2310 | ||
2897 | 1974 | # Bail if the options were screwed! | 2311 | # Bail if the options were screwed! |
2898 | 1975 | $exit_cmd $EXIT_FAILURE | 2312 | $exit_cmd $EXIT_FAILURE |
2899 | 2313 | ======= | ||
2900 | 2314 | |||
2901 | 2315 | # Bail if the options were screwed! | ||
2902 | 2316 | $exit_cmd $EXIT_FAILURE | ||
2903 | 2317 | |||
2904 | 2318 | # save modified positional parameters for caller | ||
2905 | 2319 | func_validate_options_result=$func_run_hooks_result | ||
2906 | 2320 | >>>>>>> build-aux/ltmain.sh | ||
2907 | 1976 | } | 2321 | } |
2908 | 1977 | 2322 | ||
2909 | 1978 | 2323 | ||
2910 | @@ -2028,8 +2373,13 @@ func_missing_arg () | |||
2911 | 2028 | 2373 | ||
2912 | 2029 | # func_split_equals STRING | 2374 | # func_split_equals STRING |
2913 | 2030 | # ------------------------ | 2375 | # ------------------------ |
2914 | 2376 | <<<<<<< build-aux/ltmain.sh | ||
2915 | 2031 | # Set func_split_equals_lhs and func_split_equals_rhs shell variables | 2377 | # Set func_split_equals_lhs and func_split_equals_rhs shell variables |
2916 | 2032 | # after splitting STRING at the '=' sign. | 2378 | # after splitting STRING at the '=' sign. |
2917 | 2379 | ======= | ||
2918 | 2380 | # Set func_split_equals_lhs and func_split_equals_rhs shell variables after | ||
2919 | 2381 | # splitting STRING at the '=' sign. | ||
2920 | 2382 | >>>>>>> build-aux/ltmain.sh | ||
2921 | 2033 | test -z "$_G_HAVE_XSI_OPS" \ | 2383 | test -z "$_G_HAVE_XSI_OPS" \ |
2922 | 2034 | && (eval 'x=a/b/c; | 2384 | && (eval 'x=a/b/c; |
2923 | 2035 | test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ | 2385 | test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ |
2924 | @@ -2044,9 +2394,14 @@ then | |||
2925 | 2044 | 2394 | ||
2926 | 2045 | func_split_equals_lhs=${1%%=*} | 2395 | func_split_equals_lhs=${1%%=*} |
2927 | 2046 | func_split_equals_rhs=${1#*=} | 2396 | func_split_equals_rhs=${1#*=} |
2928 | 2397 | <<<<<<< build-aux/ltmain.sh | ||
2929 | 2047 | if test "x$func_split_equals_lhs" = "x$1"; then | 2398 | if test "x$func_split_equals_lhs" = "x$1"; then |
2930 | 2048 | func_split_equals_rhs= | 2399 | func_split_equals_rhs= |
2931 | 2049 | fi | 2400 | fi |
2932 | 2401 | ======= | ||
2933 | 2402 | test "x$func_split_equals_lhs" = "x$1" \ | ||
2934 | 2403 | && func_split_equals_rhs= | ||
2935 | 2404 | >>>>>>> build-aux/ltmain.sh | ||
2936 | 2050 | }' | 2405 | }' |
2937 | 2051 | else | 2406 | else |
2938 | 2052 | # ...otherwise fall back to using expr, which is often a shell builtin. | 2407 | # ...otherwise fall back to using expr, which is often a shell builtin. |
2939 | @@ -2124,6 +2479,7 @@ func_usage_message () | |||
2940 | 2124 | # func_version | 2479 | # func_version |
2941 | 2125 | # ------------ | 2480 | # ------------ |
2942 | 2126 | # Echo version message to standard output and exit. | 2481 | # Echo version message to standard output and exit. |
2943 | 2482 | <<<<<<< build-aux/ltmain.sh | ||
2944 | 2127 | # The version message is extracted from the calling file's header | 2483 | # The version message is extracted from the calling file's header |
2945 | 2128 | # comments, with leading '# ' stripped: | 2484 | # comments, with leading '# ' stripped: |
2946 | 2129 | # 1. First display the progname and version | 2485 | # 1. First display the progname and version |
2947 | @@ -2133,12 +2489,15 @@ func_usage_message () | |||
2948 | 2133 | # 4. Immediately followed by any lines between the previous matches, | 2489 | # 4. Immediately followed by any lines between the previous matches, |
2949 | 2134 | # except lines preceding the intervening completely blank line. | 2490 | # except lines preceding the intervening completely blank line. |
2950 | 2135 | # For example, see the header comments of this file. | 2491 | # For example, see the header comments of this file. |
2951 | 2492 | ======= | ||
2952 | 2493 | >>>>>>> build-aux/ltmain.sh | ||
2953 | 2136 | func_version () | 2494 | func_version () |
2954 | 2137 | { | 2495 | { |
2955 | 2138 | $debug_cmd | 2496 | $debug_cmd |
2956 | 2139 | 2497 | ||
2957 | 2140 | printf '%s\n' "$progname $scriptversion" | 2498 | printf '%s\n' "$progname $scriptversion" |
2958 | 2141 | $SED -n ' | 2499 | $SED -n ' |
2959 | 2500 | <<<<<<< build-aux/ltmain.sh | ||
2960 | 2142 | /^# Written by /!b | 2501 | /^# Written by /!b |
2961 | 2143 | s|^# ||; p; n | 2502 | s|^# ||; p; n |
2962 | 2144 | 2503 | ||
2963 | @@ -2162,6 +2521,27 @@ func_version () | |||
2964 | 2162 | G | 2521 | G |
2965 | 2163 | s|\(\n\)\n*|\1|g | 2522 | s|\(\n\)\n*|\1|g |
2966 | 2164 | p; q' < "$progpath" | 2523 | p; q' < "$progpath" |
2967 | 2524 | ======= | ||
2968 | 2525 | /(C)/!b go | ||
2969 | 2526 | :more | ||
2970 | 2527 | /\./!{ | ||
2971 | 2528 | N | ||
2972 | 2529 | s|\n# | | | ||
2973 | 2530 | b more | ||
2974 | 2531 | } | ||
2975 | 2532 | :go | ||
2976 | 2533 | /^# Written by /,/# warranty; / { | ||
2977 | 2534 | s|^# || | ||
2978 | 2535 | s|^# *$|| | ||
2979 | 2536 | s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| | ||
2980 | 2537 | p | ||
2981 | 2538 | } | ||
2982 | 2539 | /^# Written by / { | ||
2983 | 2540 | s|^# || | ||
2984 | 2541 | p | ||
2985 | 2542 | } | ||
2986 | 2543 | /^warranty; /q' < "$progpath" | ||
2987 | 2544 | >>>>>>> build-aux/ltmain.sh | ||
2988 | 2165 | 2545 | ||
2989 | 2166 | exit $? | 2546 | exit $? |
2990 | 2167 | } | 2547 | } |
2991 | @@ -2171,12 +2551,20 @@ func_version () | |||
2992 | 2171 | # mode: shell-script | 2551 | # mode: shell-script |
2993 | 2172 | # sh-indentation: 2 | 2552 | # sh-indentation: 2 |
2994 | 2173 | # eval: (add-hook 'before-save-hook 'time-stamp) | 2553 | # eval: (add-hook 'before-save-hook 'time-stamp) |
2995 | 2554 | <<<<<<< build-aux/ltmain.sh | ||
2996 | 2174 | # time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" | 2555 | # time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" |
2997 | 2556 | ======= | ||
2998 | 2557 | # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" | ||
2999 | 2558 | >>>>>>> build-aux/ltmain.sh | ||
3000 | 2175 | # time-stamp-time-zone: "UTC" | 2559 | # time-stamp-time-zone: "UTC" |
3001 | 2176 | # End: | 2560 | # End: |
3002 | 2177 | 2561 | ||
3003 | 2178 | # Set a version string. | 2562 | # Set a version string. |
3004 | 2563 | <<<<<<< build-aux/ltmain.sh | ||
3005 | 2179 | scriptversion='(GNU libtool) 2.4.6.42-b88ce' | 2564 | scriptversion='(GNU libtool) 2.4.6.42-b88ce' |
3006 | 2565 | ======= | ||
3007 | 2566 | scriptversion='(GNU libtool) 2.4.6' | ||
3008 | 2567 | >>>>>>> build-aux/ltmain.sh | ||
3009 | 2180 | 2568 | ||
3010 | 2181 | 2569 | ||
3011 | 2182 | # func_echo ARG... | 2570 | # func_echo ARG... |
3012 | @@ -2267,12 +2655,20 @@ include the following information: | |||
3013 | 2267 | compiler: $LTCC | 2655 | compiler: $LTCC |
3014 | 2268 | compiler flags: $LTCFLAGS | 2656 | compiler flags: $LTCFLAGS |
3015 | 2269 | linker: $LD (gnu? $with_gnu_ld) | 2657 | linker: $LD (gnu? $with_gnu_ld) |
3016 | 2658 | <<<<<<< build-aux/ltmain.sh | ||
3017 | 2270 | version: $progname (GNU libtool) 2.4.6.42-b88ce | 2659 | version: $progname (GNU libtool) 2.4.6.42-b88ce |
3018 | 2660 | ======= | ||
3019 | 2661 | version: $progname (GNU libtool) 2.4.6 | ||
3020 | 2662 | >>>>>>> build-aux/ltmain.sh | ||
3021 | 2271 | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` | 2663 | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` |
3022 | 2272 | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` | 2664 | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` |
3023 | 2273 | 2665 | ||
3024 | 2274 | Report bugs to <bug-libtool@gnu.org>. | 2666 | Report bugs to <bug-libtool@gnu.org>. |
3025 | 2667 | <<<<<<< build-aux/ltmain.sh | ||
3026 | 2275 | GNU libtool home page: <http://www.gnu.org/s/libtool/>. | 2668 | GNU libtool home page: <http://www.gnu.org/s/libtool/>. |
3027 | 2669 | ======= | ||
3028 | 2670 | GNU libtool home page: <http://www.gnu.org/software/libtool/>. | ||
3029 | 2671 | >>>>>>> build-aux/ltmain.sh | ||
3030 | 2276 | General help using GNU software: <http://www.gnu.org/gethelp/>." | 2672 | General help using GNU software: <http://www.gnu.org/gethelp/>." |
3031 | 2277 | exit 0 | 2673 | exit 0 |
3032 | 2278 | } | 2674 | } |
3033 | @@ -2469,8 +2865,11 @@ libtool_options_prep () | |||
3034 | 2469 | nonopt= | 2865 | nonopt= |
3035 | 2470 | preserve_args= | 2866 | preserve_args= |
3036 | 2471 | 2867 | ||
3037 | 2868 | <<<<<<< build-aux/ltmain.sh | ||
3038 | 2472 | _G_rc_lt_options_prep=: | 2869 | _G_rc_lt_options_prep=: |
3039 | 2473 | 2870 | ||
3040 | 2871 | ======= | ||
3041 | 2872 | >>>>>>> build-aux/ltmain.sh | ||
3042 | 2474 | # Shorthand for --mode=foo, only valid as the first argument | 2873 | # Shorthand for --mode=foo, only valid as the first argument |
3043 | 2475 | case $1 in | 2874 | case $1 in |
3044 | 2476 | clean|clea|cle|cl) | 2875 | clean|clea|cle|cl) |
3045 | @@ -2494,6 +2893,7 @@ libtool_options_prep () | |||
3046 | 2494 | uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) | 2893 | uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
3047 | 2495 | shift; set dummy --mode uninstall ${1+"$@"}; shift | 2894 | shift; set dummy --mode uninstall ${1+"$@"}; shift |
3048 | 2496 | ;; | 2895 | ;; |
3049 | 2896 | <<<<<<< build-aux/ltmain.sh | ||
3050 | 2497 | *) | 2897 | *) |
3051 | 2498 | _G_rc_lt_options_prep=false | 2898 | _G_rc_lt_options_prep=false |
3052 | 2499 | ;; | 2899 | ;; |
3053 | @@ -2504,6 +2904,13 @@ libtool_options_prep () | |||
3054 | 2504 | func_quote eval ${1+"$@"} | 2904 | func_quote eval ${1+"$@"} |
3055 | 2505 | libtool_options_prep_result=$func_quote_result | 2905 | libtool_options_prep_result=$func_quote_result |
3056 | 2506 | fi | 2906 | fi |
3057 | 2907 | ======= | ||
3058 | 2908 | esac | ||
3059 | 2909 | |||
3060 | 2910 | # Pass back the list of options. | ||
3061 | 2911 | func_quote_for_eval ${1+"$@"} | ||
3062 | 2912 | libtool_options_prep_result=$func_quote_for_eval_result | ||
3063 | 2913 | >>>>>>> build-aux/ltmain.sh | ||
3064 | 2507 | } | 2914 | } |
3065 | 2508 | func_add_hook func_options_prep libtool_options_prep | 2915 | func_add_hook func_options_prep libtool_options_prep |
3066 | 2509 | 2916 | ||
3067 | @@ -2515,12 +2922,18 @@ libtool_parse_options () | |||
3068 | 2515 | { | 2922 | { |
3069 | 2516 | $debug_cmd | 2923 | $debug_cmd |
3070 | 2517 | 2924 | ||
3071 | 2925 | <<<<<<< build-aux/ltmain.sh | ||
3072 | 2518 | _G_rc_lt_parse_options=false | 2926 | _G_rc_lt_parse_options=false |
3073 | 2519 | 2927 | ||
3074 | 2520 | # Perform our own loop to consume as many options as possible in | 2928 | # Perform our own loop to consume as many options as possible in |
3075 | 2521 | # each iteration. | 2929 | # each iteration. |
3076 | 2522 | while test $# -gt 0; do | 2930 | while test $# -gt 0; do |
3077 | 2523 | _G_match_lt_parse_options=: | 2931 | _G_match_lt_parse_options=: |
3078 | 2932 | ======= | ||
3079 | 2933 | # Perform our own loop to consume as many options as possible in | ||
3080 | 2934 | # each iteration. | ||
3081 | 2935 | while test $# -gt 0; do | ||
3082 | 2936 | >>>>>>> build-aux/ltmain.sh | ||
3083 | 2524 | _G_opt=$1 | 2937 | _G_opt=$1 |
3084 | 2525 | shift | 2938 | shift |
3085 | 2526 | case $_G_opt in | 2939 | case $_G_opt in |
3086 | @@ -2595,6 +3008,7 @@ libtool_parse_options () | |||
3087 | 2595 | func_append preserve_args " $_G_opt" | 3008 | func_append preserve_args " $_G_opt" |
3088 | 2596 | ;; | 3009 | ;; |
3089 | 2597 | 3010 | ||
3090 | 3011 | <<<<<<< build-aux/ltmain.sh | ||
3091 | 2598 | # An option not handled by this hook function: | 3012 | # An option not handled by this hook function: |
3092 | 2599 | *) set dummy "$_G_opt" ${1+"$@"} ; shift | 3013 | *) set dummy "$_G_opt" ${1+"$@"} ; shift |
3093 | 2600 | _G_match_lt_parse_options=false | 3014 | _G_match_lt_parse_options=false |
3094 | @@ -2609,6 +3023,17 @@ libtool_parse_options () | |||
3095 | 2609 | func_quote eval ${1+"$@"} | 3023 | func_quote eval ${1+"$@"} |
3096 | 2610 | libtool_parse_options_result=$func_quote_result | 3024 | libtool_parse_options_result=$func_quote_result |
3097 | 2611 | fi | 3025 | fi |
3098 | 3026 | ======= | ||
3099 | 3027 | # An option not handled by this hook function: | ||
3100 | 3028 | *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; | ||
3101 | 3029 | esac | ||
3102 | 3030 | done | ||
3103 | 3031 | |||
3104 | 3032 | |||
3105 | 3033 | # save modified positional parameters for caller | ||
3106 | 3034 | func_quote_for_eval ${1+"$@"} | ||
3107 | 3035 | libtool_parse_options_result=$func_quote_for_eval_result | ||
3108 | 3036 | >>>>>>> build-aux/ltmain.sh | ||
3109 | 2612 | } | 3037 | } |
3110 | 2613 | func_add_hook func_parse_options libtool_parse_options | 3038 | func_add_hook func_parse_options libtool_parse_options |
3111 | 2614 | 3039 | ||
3112 | @@ -2665,8 +3090,13 @@ libtool_validate_options () | |||
3113 | 2665 | } | 3090 | } |
3114 | 2666 | 3091 | ||
3115 | 2667 | # Pass back the unparsed argument list | 3092 | # Pass back the unparsed argument list |
3116 | 3093 | <<<<<<< build-aux/ltmain.sh | ||
3117 | 2668 | func_quote eval ${1+"$@"} | 3094 | func_quote eval ${1+"$@"} |
3118 | 2669 | libtool_validate_options_result=$func_quote_result | 3095 | libtool_validate_options_result=$func_quote_result |
3119 | 3096 | ======= | ||
3120 | 3097 | func_quote_for_eval ${1+"$@"} | ||
3121 | 3098 | libtool_validate_options_result=$func_quote_for_eval_result | ||
3122 | 3099 | >>>>>>> build-aux/ltmain.sh | ||
3123 | 2670 | } | 3100 | } |
3124 | 2671 | func_add_hook func_validate_options libtool_validate_options | 3101 | func_add_hook func_validate_options libtool_validate_options |
3125 | 2672 | 3102 | ||
3126 | @@ -3632,8 +4062,13 @@ func_mode_compile () | |||
3127 | 3632 | esac | 4062 | esac |
3128 | 3633 | done | 4063 | done |
3129 | 3634 | 4064 | ||
3130 | 4065 | <<<<<<< build-aux/ltmain.sh | ||
3131 | 3635 | func_quote_arg pretty "$libobj" | 4066 | func_quote_arg pretty "$libobj" |
3132 | 3636 | test "X$libobj" != "X$func_quote_arg_result" \ | 4067 | test "X$libobj" != "X$func_quote_arg_result" \ |
3133 | 4068 | ======= | ||
3134 | 4069 | func_quote_for_eval "$libobj" | ||
3135 | 4070 | test "X$libobj" != "X$func_quote_for_eval_result" \ | ||
3136 | 4071 | >>>>>>> build-aux/ltmain.sh | ||
3137 | 3637 | && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ | 4072 | && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ |
3138 | 3638 | && func_warning "libobj name '$libobj' may not contain shell special characters." | 4073 | && func_warning "libobj name '$libobj' may not contain shell special characters." |
3139 | 3639 | func_dirname_and_basename "$obj" "/" "" | 4074 | func_dirname_and_basename "$obj" "/" "" |
3140 | @@ -3706,8 +4141,13 @@ compiler." | |||
3141 | 3706 | 4141 | ||
3142 | 3707 | func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 | 4142 | func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 |
3143 | 3708 | srcfile=$func_to_tool_file_result | 4143 | srcfile=$func_to_tool_file_result |
3144 | 4144 | <<<<<<< build-aux/ltmain.sh | ||
3145 | 3709 | func_quote_arg pretty "$srcfile" | 4145 | func_quote_arg pretty "$srcfile" |
3146 | 3710 | qsrcfile=$func_quote_arg_result | 4146 | qsrcfile=$func_quote_arg_result |
3147 | 4147 | ======= | ||
3148 | 4148 | func_quote_for_eval "$srcfile" | ||
3149 | 4149 | qsrcfile=$func_quote_for_eval_result | ||
3150 | 4150 | >>>>>>> build-aux/ltmain.sh | ||
3151 | 3711 | 4151 | ||
3152 | 3712 | # Only build a PIC object if we are building libtool libraries. | 4152 | # Only build a PIC object if we are building libtool libraries. |
3153 | 3713 | if test yes = "$build_libtool_libs"; then | 4153 | if test yes = "$build_libtool_libs"; then |
3154 | @@ -4310,8 +4750,13 @@ func_mode_install () | |||
3155 | 4310 | case $nonopt in *shtool*) :;; *) false;; esac | 4750 | case $nonopt in *shtool*) :;; *) false;; esac |
3156 | 4311 | then | 4751 | then |
3157 | 4312 | # Aesthetically quote it. | 4752 | # Aesthetically quote it. |
3158 | 4753 | <<<<<<< build-aux/ltmain.sh | ||
3159 | 4313 | func_quote_arg pretty "$nonopt" | 4754 | func_quote_arg pretty "$nonopt" |
3160 | 4314 | install_prog="$func_quote_arg_result " | 4755 | install_prog="$func_quote_arg_result " |
3161 | 4756 | ======= | ||
3162 | 4757 | func_quote_for_eval "$nonopt" | ||
3163 | 4758 | install_prog="$func_quote_for_eval_result " | ||
3164 | 4759 | >>>>>>> build-aux/ltmain.sh | ||
3165 | 4315 | arg=$1 | 4760 | arg=$1 |
3166 | 4316 | shift | 4761 | shift |
3167 | 4317 | else | 4762 | else |
3168 | @@ -4321,8 +4766,13 @@ func_mode_install () | |||
3169 | 4321 | 4766 | ||
3170 | 4322 | # The real first argument should be the name of the installation program. | 4767 | # The real first argument should be the name of the installation program. |
3171 | 4323 | # Aesthetically quote it. | 4768 | # Aesthetically quote it. |
3172 | 4769 | <<<<<<< build-aux/ltmain.sh | ||
3173 | 4324 | func_quote_arg pretty "$arg" | 4770 | func_quote_arg pretty "$arg" |
3174 | 4325 | func_append install_prog "$func_quote_arg_result" | 4771 | func_append install_prog "$func_quote_arg_result" |
3175 | 4772 | ======= | ||
3176 | 4773 | func_quote_for_eval "$arg" | ||
3177 | 4774 | func_append install_prog "$func_quote_for_eval_result" | ||
3178 | 4775 | >>>>>>> build-aux/ltmain.sh | ||
3179 | 4326 | install_shared_prog=$install_prog | 4776 | install_shared_prog=$install_prog |
3180 | 4327 | case " $install_prog " in | 4777 | case " $install_prog " in |
3181 | 4328 | *[\\\ /]cp\ *) install_cp=: ;; | 4778 | *[\\\ /]cp\ *) install_cp=: ;; |
3182 | @@ -4379,12 +4829,21 @@ func_mode_install () | |||
3183 | 4379 | esac | 4829 | esac |
3184 | 4380 | 4830 | ||
3185 | 4381 | # Aesthetically quote the argument. | 4831 | # Aesthetically quote the argument. |
3186 | 4832 | <<<<<<< build-aux/ltmain.sh | ||
3187 | 4382 | func_quote_arg pretty "$arg" | 4833 | func_quote_arg pretty "$arg" |
3188 | 4383 | func_append install_prog " $func_quote_arg_result" | 4834 | func_append install_prog " $func_quote_arg_result" |
3189 | 4384 | if test -n "$arg2"; then | 4835 | if test -n "$arg2"; then |
3190 | 4385 | func_quote_arg pretty "$arg2" | 4836 | func_quote_arg pretty "$arg2" |
3191 | 4386 | fi | 4837 | fi |
3192 | 4387 | func_append install_shared_prog " $func_quote_arg_result" | 4838 | func_append install_shared_prog " $func_quote_arg_result" |
3193 | 4839 | ======= | ||
3194 | 4840 | func_quote_for_eval "$arg" | ||
3195 | 4841 | func_append install_prog " $func_quote_for_eval_result" | ||
3196 | 4842 | if test -n "$arg2"; then | ||
3197 | 4843 | func_quote_for_eval "$arg2" | ||
3198 | 4844 | fi | ||
3199 | 4845 | func_append install_shared_prog " $func_quote_for_eval_result" | ||
3200 | 4846 | >>>>>>> build-aux/ltmain.sh | ||
3201 | 4388 | done | 4847 | done |
3202 | 4389 | 4848 | ||
3203 | 4390 | test -z "$install_prog" && \ | 4849 | test -z "$install_prog" && \ |
3204 | @@ -4395,8 +4854,13 @@ func_mode_install () | |||
3205 | 4395 | 4854 | ||
3206 | 4396 | if test -n "$install_override_mode" && $no_mode; then | 4855 | if test -n "$install_override_mode" && $no_mode; then |
3207 | 4397 | if $install_cp; then :; else | 4856 | if $install_cp; then :; else |
3208 | 4857 | <<<<<<< build-aux/ltmain.sh | ||
3209 | 4398 | func_quote_arg pretty "$install_override_mode" | 4858 | func_quote_arg pretty "$install_override_mode" |
3210 | 4399 | func_append install_shared_prog " -m $func_quote_arg_result" | 4859 | func_append install_shared_prog " -m $func_quote_arg_result" |
3211 | 4860 | ======= | ||
3212 | 4861 | func_quote_for_eval "$install_override_mode" | ||
3213 | 4862 | func_append install_shared_prog " -m $func_quote_for_eval_result" | ||
3214 | 4863 | >>>>>>> build-aux/ltmain.sh | ||
3215 | 4400 | fi | 4864 | fi |
3216 | 4401 | fi | 4865 | fi |
3217 | 4402 | 4866 | ||
3218 | @@ -4692,8 +5156,13 @@ func_mode_install () | |||
3219 | 4692 | relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` | 5156 | relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` |
3220 | 4693 | 5157 | ||
3221 | 4694 | $opt_quiet || { | 5158 | $opt_quiet || { |
3222 | 5159 | <<<<<<< build-aux/ltmain.sh | ||
3223 | 4695 | func_quote_arg expand,pretty "$relink_command" | 5160 | func_quote_arg expand,pretty "$relink_command" |
3224 | 4696 | eval "func_echo $func_quote_arg_result" | 5161 | eval "func_echo $func_quote_arg_result" |
3225 | 5162 | ======= | ||
3226 | 5163 | func_quote_for_expand "$relink_command" | ||
3227 | 5164 | eval "func_echo $func_quote_for_expand_result" | ||
3228 | 5165 | >>>>>>> build-aux/ltmain.sh | ||
3229 | 4697 | } | 5166 | } |
3230 | 4698 | if eval "$relink_command"; then : | 5167 | if eval "$relink_command"; then : |
3231 | 4699 | else | 5168 | else |
3232 | @@ -5472,8 +5941,12 @@ else | |||
3233 | 5472 | if test \"\$libtool_execute_magic\" != \"$magic\"; then | 5941 | if test \"\$libtool_execute_magic\" != \"$magic\"; then |
3234 | 5473 | file=\"\$0\"" | 5942 | file=\"\$0\"" |
3235 | 5474 | 5943 | ||
3236 | 5944 | <<<<<<< build-aux/ltmain.sh | ||
3237 | 5475 | func_quote_arg pretty "$ECHO" | 5945 | func_quote_arg pretty "$ECHO" |
3238 | 5476 | qECHO=$func_quote_arg_result | 5946 | qECHO=$func_quote_arg_result |
3239 | 5947 | ======= | ||
3240 | 5948 | qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` | ||
3241 | 5949 | >>>>>>> build-aux/ltmain.sh | ||
3242 | 5477 | $ECHO "\ | 5950 | $ECHO "\ |
3243 | 5478 | 5951 | ||
3244 | 5479 | # A function that is used when there is no print builtin or printf. | 5952 | # A function that is used when there is no print builtin or printf. |
3245 | @@ -5483,7 +5956,11 @@ func_fallback_echo () | |||
3246 | 5483 | \$1 | 5956 | \$1 |
3247 | 5484 | _LTECHO_EOF' | 5957 | _LTECHO_EOF' |
3248 | 5485 | } | 5958 | } |
3249 | 5959 | <<<<<<< build-aux/ltmain.sh | ||
3250 | 5486 | ECHO=$qECHO | 5960 | ECHO=$qECHO |
3251 | 5961 | ======= | ||
3252 | 5962 | ECHO=\"$qECHO\" | ||
3253 | 5963 | >>>>>>> build-aux/ltmain.sh | ||
3254 | 5487 | fi | 5964 | fi |
3255 | 5488 | 5965 | ||
3256 | 5489 | # Very basic option parsing. These options are (a) specific to | 5966 | # Very basic option parsing. These options are (a) specific to |
3257 | @@ -6826,9 +7303,15 @@ func_mode_link () | |||
3258 | 6826 | while test "$#" -gt 0; do | 7303 | while test "$#" -gt 0; do |
3259 | 6827 | arg=$1 | 7304 | arg=$1 |
3260 | 6828 | shift | 7305 | shift |
3261 | 7306 | <<<<<<< build-aux/ltmain.sh | ||
3262 | 6829 | func_quote_arg pretty,unquoted "$arg" | 7307 | func_quote_arg pretty,unquoted "$arg" |
3263 | 6830 | qarg=$func_quote_arg_unquoted_result | 7308 | qarg=$func_quote_arg_unquoted_result |
3264 | 6831 | func_append libtool_args " $func_quote_arg_result" | 7309 | func_append libtool_args " $func_quote_arg_result" |
3265 | 7310 | ======= | ||
3266 | 7311 | func_quote_for_eval "$arg" | ||
3267 | 7312 | qarg=$func_quote_for_eval_unquoted_result | ||
3268 | 7313 | func_append libtool_args " $func_quote_for_eval_result" | ||
3269 | 7314 | >>>>>>> build-aux/ltmain.sh | ||
3270 | 6832 | 7315 | ||
3271 | 6833 | # If the previous option needs an argument, assign it. | 7316 | # If the previous option needs an argument, assign it. |
3272 | 6834 | if test -n "$prev"; then | 7317 | if test -n "$prev"; then |
3273 | @@ -7426,9 +7909,15 @@ func_mode_link () | |||
3274 | 7426 | save_ifs=$IFS; IFS=, | 7909 | save_ifs=$IFS; IFS=, |
3275 | 7427 | for flag in $args; do | 7910 | for flag in $args; do |
3276 | 7428 | IFS=$save_ifs | 7911 | IFS=$save_ifs |
3277 | 7912 | <<<<<<< build-aux/ltmain.sh | ||
3278 | 7429 | func_quote_arg pretty "$flag" | 7913 | func_quote_arg pretty "$flag" |
3279 | 7430 | func_append arg " $func_quote_arg_result" | 7914 | func_append arg " $func_quote_arg_result" |
3280 | 7431 | func_append compiler_flags " $func_quote_arg_result" | 7915 | func_append compiler_flags " $func_quote_arg_result" |
3281 | 7916 | ======= | ||
3282 | 7917 | func_quote_for_eval "$flag" | ||
3283 | 7918 | func_append arg " $func_quote_for_eval_result" | ||
3284 | 7919 | func_append compiler_flags " $func_quote_for_eval_result" | ||
3285 | 7920 | >>>>>>> build-aux/ltmain.sh | ||
3286 | 7432 | done | 7921 | done |
3287 | 7433 | IFS=$save_ifs | 7922 | IFS=$save_ifs |
3288 | 7434 | func_stripname ' ' '' "$arg" | 7923 | func_stripname ' ' '' "$arg" |
3289 | @@ -7442,10 +7931,17 @@ func_mode_link () | |||
3290 | 7442 | save_ifs=$IFS; IFS=, | 7931 | save_ifs=$IFS; IFS=, |
3291 | 7443 | for flag in $args; do | 7932 | for flag in $args; do |
3292 | 7444 | IFS=$save_ifs | 7933 | IFS=$save_ifs |
3293 | 7934 | <<<<<<< build-aux/ltmain.sh | ||
3294 | 7445 | func_quote_arg pretty "$flag" | 7935 | func_quote_arg pretty "$flag" |
3295 | 7446 | func_append arg " $wl$func_quote_arg_result" | 7936 | func_append arg " $wl$func_quote_arg_result" |
3296 | 7447 | func_append compiler_flags " $wl$func_quote_arg_result" | 7937 | func_append compiler_flags " $wl$func_quote_arg_result" |
3297 | 7448 | func_append linker_flags " $func_quote_arg_result" | 7938 | func_append linker_flags " $func_quote_arg_result" |
3298 | 7939 | ======= | ||
3299 | 7940 | func_quote_for_eval "$flag" | ||
3300 | 7941 | func_append arg " $wl$func_quote_for_eval_result" | ||
3301 | 7942 | func_append compiler_flags " $wl$func_quote_for_eval_result" | ||
3302 | 7943 | func_append linker_flags " $func_quote_for_eval_result" | ||
3303 | 7944 | >>>>>>> build-aux/ltmain.sh | ||
3304 | 7449 | done | 7945 | done |
3305 | 7450 | IFS=$save_ifs | 7946 | IFS=$save_ifs |
3306 | 7451 | func_stripname ' ' '' "$arg" | 7947 | func_stripname ' ' '' "$arg" |
3307 | @@ -7469,8 +7965,13 @@ func_mode_link () | |||
3308 | 7469 | 7965 | ||
3309 | 7470 | # -msg_* for osf cc | 7966 | # -msg_* for osf cc |
3310 | 7471 | -msg_*) | 7967 | -msg_*) |
3311 | 7968 | <<<<<<< build-aux/ltmain.sh | ||
3312 | 7472 | func_quote_arg pretty "$arg" | 7969 | func_quote_arg pretty "$arg" |
3313 | 7473 | arg=$func_quote_arg_result | 7970 | arg=$func_quote_arg_result |
3314 | 7971 | ======= | ||
3315 | 7972 | func_quote_for_eval "$arg" | ||
3316 | 7973 | arg=$func_quote_for_eval_result | ||
3317 | 7974 | >>>>>>> build-aux/ltmain.sh | ||
3318 | 7474 | ;; | 7975 | ;; |
3319 | 7475 | 7976 | ||
3320 | 7476 | # Flags to be passed through unchanged, with rationale: | 7977 | # Flags to be passed through unchanged, with rationale: |
3321 | @@ -7489,6 +7990,7 @@ func_mode_link () | |||
3322 | 7489 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | 7990 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization |
3323 | 7490 | # -specs=* GCC specs files | 7991 | # -specs=* GCC specs files |
3324 | 7491 | # -stdlib=* select c++ std lib with clang | 7992 | # -stdlib=* select c++ std lib with clang |
3325 | 7993 | <<<<<<< build-aux/ltmain.sh | ||
3326 | 7492 | # -fsanitize=* Clang/GCC memory and address sanitizer | 7994 | # -fsanitize=* Clang/GCC memory and address sanitizer |
3327 | 7493 | # -fuse-ld=* Linker select flags for GCC | 7995 | # -fuse-ld=* Linker select flags for GCC |
3328 | 7494 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | 7996 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
3329 | @@ -7497,6 +7999,14 @@ func_mode_link () | |||
3330 | 7497 | -specs=*|-fsanitize=*|-fuse-ld=*) | 7999 | -specs=*|-fsanitize=*|-fuse-ld=*) |
3331 | 7498 | func_quote_arg pretty "$arg" | 8000 | func_quote_arg pretty "$arg" |
3332 | 7499 | arg=$func_quote_arg_result | 8001 | arg=$func_quote_arg_result |
3333 | 8002 | ======= | ||
3334 | 8003 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | ||
3335 | 8004 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | ||
3336 | 8005 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | ||
3337 | 8006 | -specs=*) | ||
3338 | 8007 | func_quote_for_eval "$arg" | ||
3339 | 8008 | arg=$func_quote_for_eval_result | ||
3340 | 8009 | >>>>>>> build-aux/ltmain.sh | ||
3341 | 7500 | func_append compile_command " $arg" | 8010 | func_append compile_command " $arg" |
3342 | 7501 | func_append finalize_command " $arg" | 8011 | func_append finalize_command " $arg" |
3343 | 7502 | func_append compiler_flags " $arg" | 8012 | func_append compiler_flags " $arg" |
3344 | @@ -7517,15 +8027,25 @@ func_mode_link () | |||
3345 | 7517 | continue | 8027 | continue |
3346 | 7518 | else | 8028 | else |
3347 | 7519 | # Otherwise treat like 'Some other compiler flag' below | 8029 | # Otherwise treat like 'Some other compiler flag' below |
3348 | 8030 | <<<<<<< build-aux/ltmain.sh | ||
3349 | 7520 | func_quote_arg pretty "$arg" | 8031 | func_quote_arg pretty "$arg" |
3350 | 7521 | arg=$func_quote_arg_result | 8032 | arg=$func_quote_arg_result |
3351 | 8033 | ======= | ||
3352 | 8034 | func_quote_for_eval "$arg" | ||
3353 | 8035 | arg=$func_quote_for_eval_result | ||
3354 | 8036 | >>>>>>> build-aux/ltmain.sh | ||
3355 | 7522 | fi | 8037 | fi |
3356 | 7523 | ;; | 8038 | ;; |
3357 | 7524 | 8039 | ||
3358 | 7525 | # Some other compiler flag. | 8040 | # Some other compiler flag. |
3359 | 7526 | -* | +*) | 8041 | -* | +*) |
3360 | 8042 | <<<<<<< build-aux/ltmain.sh | ||
3361 | 7527 | func_quote_arg pretty "$arg" | 8043 | func_quote_arg pretty "$arg" |
3362 | 7528 | arg=$func_quote_arg_result | 8044 | arg=$func_quote_arg_result |
3363 | 8045 | ======= | ||
3364 | 8046 | func_quote_for_eval "$arg" | ||
3365 | 8047 | arg=$func_quote_for_eval_result | ||
3366 | 8048 | >>>>>>> build-aux/ltmain.sh | ||
3367 | 7529 | ;; | 8049 | ;; |
3368 | 7530 | 8050 | ||
3369 | 7531 | *.$objext) | 8051 | *.$objext) |
3370 | @@ -7645,8 +8165,13 @@ func_mode_link () | |||
3371 | 7645 | *) | 8165 | *) |
3372 | 7646 | # Unknown arguments in both finalize_command and compile_command need | 8166 | # Unknown arguments in both finalize_command and compile_command need |
3373 | 7647 | # to be aesthetically quoted because they are evaled later. | 8167 | # to be aesthetically quoted because they are evaled later. |
3374 | 8168 | <<<<<<< build-aux/ltmain.sh | ||
3375 | 7648 | func_quote_arg pretty "$arg" | 8169 | func_quote_arg pretty "$arg" |
3376 | 7649 | arg=$func_quote_arg_result | 8170 | arg=$func_quote_arg_result |
3377 | 8171 | ======= | ||
3378 | 8172 | func_quote_for_eval "$arg" | ||
3379 | 8173 | arg=$func_quote_for_eval_result | ||
3380 | 8174 | >>>>>>> build-aux/ltmain.sh | ||
3381 | 7650 | ;; | 8175 | ;; |
3382 | 7651 | esac # arg | 8176 | esac # arg |
3383 | 7652 | 8177 | ||
3384 | @@ -10152,8 +10677,13 @@ EOF | |||
3385 | 10152 | for cmd in $concat_cmds; do | 10677 | for cmd in $concat_cmds; do |
3386 | 10153 | IFS=$save_ifs | 10678 | IFS=$save_ifs |
3387 | 10154 | $opt_quiet || { | 10679 | $opt_quiet || { |
3388 | 10680 | <<<<<<< build-aux/ltmain.sh | ||
3389 | 10155 | func_quote_arg expand,pretty "$cmd" | 10681 | func_quote_arg expand,pretty "$cmd" |
3390 | 10156 | eval "func_echo $func_quote_arg_result" | 10682 | eval "func_echo $func_quote_arg_result" |
3391 | 10683 | ======= | ||
3392 | 10684 | func_quote_for_expand "$cmd" | ||
3393 | 10685 | eval "func_echo $func_quote_for_expand_result" | ||
3394 | 10686 | >>>>>>> build-aux/ltmain.sh | ||
3395 | 10157 | } | 10687 | } |
3396 | 10158 | $opt_dry_run || eval "$cmd" || { | 10688 | $opt_dry_run || eval "$cmd" || { |
3397 | 10159 | lt_exit=$? | 10689 | lt_exit=$? |
3398 | @@ -10246,8 +10776,13 @@ EOF | |||
3399 | 10246 | eval cmd=\"$cmd\" | 10776 | eval cmd=\"$cmd\" |
3400 | 10247 | IFS=$save_ifs | 10777 | IFS=$save_ifs |
3401 | 10248 | $opt_quiet || { | 10778 | $opt_quiet || { |
3402 | 10779 | <<<<<<< build-aux/ltmain.sh | ||
3403 | 10249 | func_quote_arg expand,pretty "$cmd" | 10780 | func_quote_arg expand,pretty "$cmd" |
3404 | 10250 | eval "func_echo $func_quote_arg_result" | 10781 | eval "func_echo $func_quote_arg_result" |
3405 | 10782 | ======= | ||
3406 | 10783 | func_quote_for_expand "$cmd" | ||
3407 | 10784 | eval "func_echo $func_quote_for_expand_result" | ||
3408 | 10785 | >>>>>>> build-aux/ltmain.sh | ||
3409 | 10251 | } | 10786 | } |
3410 | 10252 | $opt_dry_run || eval "$cmd" || { | 10787 | $opt_dry_run || eval "$cmd" || { |
3411 | 10253 | lt_exit=$? | 10788 | lt_exit=$? |
3412 | @@ -10721,6 +11256,7 @@ EOF | |||
3413 | 10721 | elif eval var_value=\$$var; test -z "$var_value"; then | 11256 | elif eval var_value=\$$var; test -z "$var_value"; then |
3414 | 10722 | relink_command="$var=; export $var; $relink_command" | 11257 | relink_command="$var=; export $var; $relink_command" |
3415 | 10723 | else | 11258 | else |
3416 | 11259 | <<<<<<< build-aux/ltmain.sh | ||
3417 | 10724 | func_quote_arg pretty "$var_value" | 11260 | func_quote_arg pretty "$var_value" |
3418 | 10725 | relink_command="$var=$func_quote_arg_result; export $var; $relink_command" | 11261 | relink_command="$var=$func_quote_arg_result; export $var; $relink_command" |
3419 | 10726 | fi | 11262 | fi |
3420 | @@ -10728,6 +11264,14 @@ EOF | |||
3421 | 10728 | func_quote eval cd "`pwd`" | 11264 | func_quote eval cd "`pwd`" |
3422 | 10729 | func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" | 11265 | func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" |
3423 | 10730 | relink_command=$func_quote_arg_unquoted_result | 11266 | relink_command=$func_quote_arg_unquoted_result |
3424 | 11267 | ======= | ||
3425 | 11268 | func_quote_for_eval "$var_value" | ||
3426 | 11269 | relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" | ||
3427 | 11270 | fi | ||
3428 | 11271 | done | ||
3429 | 11272 | relink_command="(cd `pwd`; $relink_command)" | ||
3430 | 11273 | relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` | ||
3431 | 11274 | >>>>>>> build-aux/ltmain.sh | ||
3432 | 10731 | fi | 11275 | fi |
3433 | 10732 | 11276 | ||
3434 | 10733 | # Only actually do things if not in dry run mode. | 11277 | # Only actually do things if not in dry run mode. |
3435 | @@ -10967,6 +11511,7 @@ EOF | |||
3436 | 10967 | elif eval var_value=\$$var; test -z "$var_value"; then | 11511 | elif eval var_value=\$$var; test -z "$var_value"; then |
3437 | 10968 | relink_command="$var=; export $var; $relink_command" | 11512 | relink_command="$var=; export $var; $relink_command" |
3438 | 10969 | else | 11513 | else |
3439 | 11514 | <<<<<<< build-aux/ltmain.sh | ||
3440 | 10970 | func_quote_arg pretty,unquoted "$var_value" | 11515 | func_quote_arg pretty,unquoted "$var_value" |
3441 | 10971 | relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" | 11516 | relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" |
3442 | 10972 | fi | 11517 | fi |
3443 | @@ -10976,6 +11521,15 @@ EOF | |||
3444 | 10976 | relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" | 11521 | relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" |
3445 | 10977 | func_quote_arg pretty,unquoted "$relink_command" | 11522 | func_quote_arg pretty,unquoted "$relink_command" |
3446 | 10978 | relink_command=$func_quote_arg_unquoted_result | 11523 | relink_command=$func_quote_arg_unquoted_result |
3447 | 11524 | ======= | ||
3448 | 11525 | func_quote_for_eval "$var_value" | ||
3449 | 11526 | relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" | ||
3450 | 11527 | fi | ||
3451 | 11528 | done | ||
3452 | 11529 | # Quote the link command for shipping. | ||
3453 | 11530 | relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" | ||
3454 | 11531 | relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` | ||
3455 | 11532 | >>>>>>> build-aux/ltmain.sh | ||
3456 | 10979 | if test yes = "$hardcode_automatic"; then | 11533 | if test yes = "$hardcode_automatic"; then |
3457 | 10980 | relink_command= | 11534 | relink_command= |
3458 | 10981 | fi | 11535 | fi |
3459 | diff --git a/configure b/configure | |||
3460 | index a0d6128..87e8811 100755 | |||
3461 | --- a/configure | |||
3462 | +++ b/configure | |||
3463 | @@ -1,6 +1,10 @@ | |||
3464 | 1 | #! /bin/sh | 1 | #! /bin/sh |
3465 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
3466 | 3 | <<<<<<< configure | ||
3467 | 3 | # Generated by GNU Autoconf 2.69 for libseccomp 2.4.1. | 4 | # Generated by GNU Autoconf 2.69 for libseccomp 2.4.1. |
3468 | 5 | ======= | ||
3469 | 6 | # Generated by GNU Autoconf 2.69 for libseccomp 2.4.2. | ||
3470 | 7 | >>>>>>> configure | ||
3471 | 4 | # | 8 | # |
3472 | 5 | # | 9 | # |
3473 | 6 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. | 10 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
3474 | @@ -587,8 +591,13 @@ MAKEFLAGS= | |||
3475 | 587 | # Identity of this package. | 591 | # Identity of this package. |
3476 | 588 | PACKAGE_NAME='libseccomp' | 592 | PACKAGE_NAME='libseccomp' |
3477 | 589 | PACKAGE_TARNAME='libseccomp' | 593 | PACKAGE_TARNAME='libseccomp' |
3478 | 594 | <<<<<<< configure | ||
3479 | 590 | PACKAGE_VERSION='2.4.1' | 595 | PACKAGE_VERSION='2.4.1' |
3480 | 591 | PACKAGE_STRING='libseccomp 2.4.1' | 596 | PACKAGE_STRING='libseccomp 2.4.1' |
3481 | 597 | ======= | ||
3482 | 598 | PACKAGE_VERSION='2.4.2' | ||
3483 | 599 | PACKAGE_STRING='libseccomp 2.4.2' | ||
3484 | 600 | >>>>>>> configure | ||
3485 | 592 | PACKAGE_BUGREPORT='' | 601 | PACKAGE_BUGREPORT='' |
3486 | 593 | PACKAGE_URL='' | 602 | PACKAGE_URL='' |
3487 | 594 | 603 | ||
3488 | @@ -1347,7 +1356,11 @@ if test "$ac_init_help" = "long"; then | |||
3489 | 1347 | # Omit some internal or obsolete options to make the list less imposing. | 1356 | # Omit some internal or obsolete options to make the list less imposing. |
3490 | 1348 | # This message is too long to be a string in the A/UX 3.1 sh. | 1357 | # This message is too long to be a string in the A/UX 3.1 sh. |
3491 | 1349 | cat <<_ACEOF | 1358 | cat <<_ACEOF |
3492 | 1359 | <<<<<<< configure | ||
3493 | 1350 | \`configure' configures libseccomp 2.4.1 to adapt to many kinds of systems. | 1360 | \`configure' configures libseccomp 2.4.1 to adapt to many kinds of systems. |
3494 | 1361 | ======= | ||
3495 | 1362 | \`configure' configures libseccomp 2.4.2 to adapt to many kinds of systems. | ||
3496 | 1363 | >>>>>>> configure | ||
3497 | 1351 | 1364 | ||
3498 | 1352 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1365 | Usage: $0 [OPTION]... [VAR=VALUE]... |
3499 | 1353 | 1366 | ||
3500 | @@ -1417,7 +1430,11 @@ fi | |||
3501 | 1417 | 1430 | ||
3502 | 1418 | if test -n "$ac_init_help"; then | 1431 | if test -n "$ac_init_help"; then |
3503 | 1419 | case $ac_init_help in | 1432 | case $ac_init_help in |
3504 | 1433 | <<<<<<< configure | ||
3505 | 1420 | short | recursive ) echo "Configuration of libseccomp 2.4.1:";; | 1434 | short | recursive ) echo "Configuration of libseccomp 2.4.1:";; |
3506 | 1435 | ======= | ||
3507 | 1436 | short | recursive ) echo "Configuration of libseccomp 2.4.2:";; | ||
3508 | 1437 | >>>>>>> configure | ||
3509 | 1421 | esac | 1438 | esac |
3510 | 1422 | cat <<\_ACEOF | 1439 | cat <<\_ACEOF |
3511 | 1423 | 1440 | ||
3512 | @@ -1531,7 +1548,11 @@ fi | |||
3513 | 1531 | test -n "$ac_init_help" && exit $ac_status | 1548 | test -n "$ac_init_help" && exit $ac_status |
3514 | 1532 | if $ac_init_version; then | 1549 | if $ac_init_version; then |
3515 | 1533 | cat <<\_ACEOF | 1550 | cat <<\_ACEOF |
3516 | 1551 | <<<<<<< configure | ||
3517 | 1534 | libseccomp configure 2.4.1 | 1552 | libseccomp configure 2.4.1 |
3518 | 1553 | ======= | ||
3519 | 1554 | libseccomp configure 2.4.2 | ||
3520 | 1555 | >>>>>>> configure | ||
3521 | 1535 | generated by GNU Autoconf 2.69 | 1556 | generated by GNU Autoconf 2.69 |
3522 | 1536 | 1557 | ||
3523 | 1537 | Copyright (C) 2012 Free Software Foundation, Inc. | 1558 | Copyright (C) 2012 Free Software Foundation, Inc. |
3524 | @@ -1809,7 +1830,11 @@ cat >config.log <<_ACEOF | |||
3525 | 1809 | This file contains any messages produced by compilers while | 1830 | This file contains any messages produced by compilers while |
3526 | 1810 | running configure, to aid debugging if configure makes a mistake. | 1831 | running configure, to aid debugging if configure makes a mistake. |
3527 | 1811 | 1832 | ||
3528 | 1833 | <<<<<<< configure | ||
3529 | 1812 | It was created by libseccomp $as_me 2.4.1, which was | 1834 | It was created by libseccomp $as_me 2.4.1, which was |
3530 | 1835 | ======= | ||
3531 | 1836 | It was created by libseccomp $as_me 2.4.2, which was | ||
3532 | 1837 | >>>>>>> configure | ||
3533 | 1813 | generated by GNU Autoconf 2.69. Invocation command line was | 1838 | generated by GNU Autoconf 2.69. Invocation command line was |
3534 | 1814 | 1839 | ||
3535 | 1815 | $ $0 $@ | 1840 | $ $0 $@ |
3536 | @@ -2679,7 +2704,11 @@ fi | |||
3537 | 2679 | 2704 | ||
3538 | 2680 | # Define the identity of the package. | 2705 | # Define the identity of the package. |
3539 | 2681 | PACKAGE='libseccomp' | 2706 | PACKAGE='libseccomp' |
3540 | 2707 | <<<<<<< configure | ||
3541 | 2682 | VERSION='2.4.1' | 2708 | VERSION='2.4.1' |
3542 | 2709 | ======= | ||
3543 | 2710 | VERSION='2.4.2' | ||
3544 | 2711 | >>>>>>> configure | ||
3545 | 2683 | 2712 | ||
3546 | 2684 | 2713 | ||
3547 | 2685 | cat >>confdefs.h <<_ACEOF | 2714 | cat >>confdefs.h <<_ACEOF |
3548 | @@ -4079,8 +4108,13 @@ esac | |||
3549 | 4079 | 4108 | ||
3550 | 4080 | 4109 | ||
3551 | 4081 | 4110 | ||
3552 | 4111 | <<<<<<< configure | ||
3553 | 4082 | macro_version='2.4.6.42-b88ce' | 4112 | macro_version='2.4.6.42-b88ce' |
3554 | 4083 | macro_revision='2.4.6.42' | 4113 | macro_revision='2.4.6.42' |
3555 | 4114 | ======= | ||
3556 | 4115 | macro_version='2.4.6' | ||
3557 | 4116 | macro_revision='2.4.6' | ||
3558 | 4117 | >>>>>>> configure | ||
3559 | 4084 | 4118 | ||
3560 | 4085 | 4119 | ||
3561 | 4086 | 4120 | ||
3562 | @@ -5742,12 +5776,17 @@ esac | |||
3563 | 5742 | fi | 5776 | fi |
3564 | 5743 | 5777 | ||
3565 | 5744 | : ${AR=ar} | 5778 | : ${AR=ar} |
3566 | 5779 | <<<<<<< configure | ||
3567 | 5780 | ======= | ||
3568 | 5781 | : ${AR_FLAGS=cru} | ||
3569 | 5782 | >>>>>>> configure | ||
3570 | 5745 | 5783 | ||
3571 | 5746 | 5784 | ||
3572 | 5747 | 5785 | ||
3573 | 5748 | 5786 | ||
3574 | 5749 | 5787 | ||
3575 | 5750 | 5788 | ||
3576 | 5789 | <<<<<<< configure | ||
3577 | 5751 | # Use ARFLAGS variable as AR's operation code to sync the variable naming with | 5790 | # Use ARFLAGS variable as AR's operation code to sync the variable naming with |
3578 | 5752 | # Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have | 5791 | # Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have |
3579 | 5753 | # higher priority because thats what people were doing historically (setting | 5792 | # higher priority because thats what people were doing historically (setting |
3580 | @@ -5765,6 +5804,8 @@ lt_ar_flags=$AR_FLAGS | |||
3581 | 5765 | # Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override | 5804 | # Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override |
3582 | 5766 | # by AR_FLAGS because that was never working and AR_FLAGS is about to die. | 5805 | # by AR_FLAGS because that was never working and AR_FLAGS is about to die. |
3583 | 5767 | 5806 | ||
3584 | 5807 | ======= | ||
3585 | 5808 | >>>>>>> configure | ||
3586 | 5768 | 5809 | ||
3587 | 5769 | 5810 | ||
3588 | 5770 | 5811 | ||
3589 | @@ -6213,7 +6254,11 @@ for ac_symprfx in "" "_"; do | |||
3590 | 6213 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then | 6254 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
3591 | 6214 | # Fake it for dumpbin and say T for any non-static function, | 6255 | # Fake it for dumpbin and say T for any non-static function, |
3592 | 6215 | # D for any global variable and I for any imported variable. | 6256 | # D for any global variable and I for any imported variable. |
3593 | 6257 | <<<<<<< configure | ||
3594 | 6216 | # Also find C++ and __fastcall symbols from MSVC++ or ICC, | 6258 | # Also find C++ and __fastcall symbols from MSVC++ or ICC, |
3595 | 6259 | ======= | ||
3596 | 6260 | # Also find C++ and __fastcall symbols from MSVC++, | ||
3597 | 6261 | >>>>>>> configure | ||
3598 | 6217 | # which start with @ or ?. | 6262 | # which start with @ or ?. |
3599 | 6218 | lt_cv_sys_global_symbol_pipe="$AWK '"\ | 6263 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
3600 | 6219 | " {last_section=section; section=\$ 3};"\ | 6264 | " {last_section=section; section=\$ 3};"\ |
3601 | @@ -7482,8 +7527,13 @@ int forced_loaded() { return 2;} | |||
3602 | 7482 | _LT_EOF | 7527 | _LT_EOF |
3603 | 7483 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 | 7528 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 |
3604 | 7484 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 7529 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
3605 | 7530 | <<<<<<< configure | ||
3606 | 7485 | echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 | 7531 | echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 |
3607 | 7486 | $AR $AR_FLAGS libconftest.a conftest.o 2>&5 | 7532 | $AR $AR_FLAGS libconftest.a conftest.o 2>&5 |
3608 | 7533 | ======= | ||
3609 | 7534 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
3610 | 7535 | $AR cru libconftest.a conftest.o 2>&5 | ||
3611 | 7536 | >>>>>>> configure | ||
3612 | 7487 | echo "$RANLIB libconftest.a" >&5 | 7537 | echo "$RANLIB libconftest.a" >&5 |
3613 | 7488 | $RANLIB libconftest.a 2>&5 | 7538 | $RANLIB libconftest.a 2>&5 |
3614 | 7489 | cat > conftest.c << _LT_EOF | 7539 | cat > conftest.c << _LT_EOF |
3615 | @@ -8144,8 +8194,13 @@ esac | |||
3616 | 8144 | ofile=libtool | 8194 | ofile=libtool |
3617 | 8145 | can_build_shared=yes | 8195 | can_build_shared=yes |
3618 | 8146 | 8196 | ||
3619 | 8197 | <<<<<<< configure | ||
3620 | 8147 | # All known linkers require a '.a' archive for static linking (except MSVC and | 8198 | # All known linkers require a '.a' archive for static linking (except MSVC and |
3621 | 8148 | # ICC, which need '.lib'). | 8199 | # ICC, which need '.lib'). |
3622 | 8200 | ======= | ||
3623 | 8201 | # All known linkers require a '.a' archive for static linking (except MSVC, | ||
3624 | 8202 | # which needs '.lib'). | ||
3625 | 8203 | >>>>>>> configure | ||
3626 | 8149 | libext=a | 8204 | libext=a |
3627 | 8150 | 8205 | ||
3628 | 8151 | with_gnu_ld=$lt_cv_prog_gnu_ld | 8206 | with_gnu_ld=$lt_cv_prog_gnu_ld |
3629 | @@ -9072,15 +9127,25 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | |||
3630 | 9072 | 9127 | ||
3631 | 9073 | case $host_os in | 9128 | case $host_os in |
3632 | 9074 | cygwin* | mingw* | pw32* | cegcc*) | 9129 | cygwin* | mingw* | pw32* | cegcc*) |
3633 | 9130 | <<<<<<< configure | ||
3634 | 9075 | # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time | 9131 | # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time |
3635 | 9076 | # When not using gcc, we currently assume that we are using | 9132 | # When not using gcc, we currently assume that we are using |
3636 | 9077 | # Microsoft Visual C++ or Intel C++ Compiler. | 9133 | # Microsoft Visual C++ or Intel C++ Compiler. |
3637 | 9134 | ======= | ||
3638 | 9135 | # FIXME: the MSVC++ port hasn't been tested in a loooong time | ||
3639 | 9136 | # When not using gcc, we currently assume that we are using | ||
3640 | 9137 | # Microsoft Visual C++. | ||
3641 | 9138 | >>>>>>> configure | ||
3642 | 9078 | if test yes != "$GCC"; then | 9139 | if test yes != "$GCC"; then |
3643 | 9079 | with_gnu_ld=no | 9140 | with_gnu_ld=no |
3644 | 9080 | fi | 9141 | fi |
3645 | 9081 | ;; | 9142 | ;; |
3646 | 9082 | interix*) | 9143 | interix*) |
3647 | 9144 | <<<<<<< configure | ||
3648 | 9083 | # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) | 9145 | # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) |
3649 | 9146 | ======= | ||
3650 | 9147 | # we just hope/assume this is gcc and not c89 (= MSVC++) | ||
3651 | 9148 | >>>>>>> configure | ||
3652 | 9084 | with_gnu_ld=yes | 9149 | with_gnu_ld=yes |
3653 | 9085 | ;; | 9150 | ;; |
3654 | 9086 | openbsd* | bitrig*) | 9151 | openbsd* | bitrig*) |
3655 | @@ -9244,7 +9309,10 @@ _LT_EOF | |||
3656 | 9244 | emximp -o $lib $output_objdir/$libname.def' | 9309 | emximp -o $lib $output_objdir/$libname.def' |
3657 | 9245 | old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' | 9310 | old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' |
3658 | 9246 | enable_shared_with_static_runtimes=yes | 9311 | enable_shared_with_static_runtimes=yes |
3659 | 9312 | <<<<<<< configure | ||
3660 | 9247 | file_list_spec='@' | 9313 | file_list_spec='@' |
3661 | 9314 | ======= | ||
3662 | 9315 | >>>>>>> configure | ||
3663 | 9248 | ;; | 9316 | ;; |
3664 | 9249 | 9317 | ||
3665 | 9250 | interix[3-9]*) | 9318 | interix[3-9]*) |
3666 | @@ -9462,7 +9530,11 @@ _LT_EOF | |||
3667 | 9462 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 9530 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3668 | 9463 | export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' | 9531 | export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
3669 | 9464 | else | 9532 | else |
3670 | 9533 | <<<<<<< configure | ||
3671 | 9465 | export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' | 9534 | export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
3672 | 9535 | ======= | ||
3673 | 9536 | export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' | ||
3674 | 9537 | >>>>>>> configure | ||
3675 | 9466 | fi | 9538 | fi |
3676 | 9467 | aix_use_runtimelinking=no | 9539 | aix_use_runtimelinking=no |
3677 | 9468 | 9540 | ||
3678 | @@ -9729,12 +9801,21 @@ fi | |||
3679 | 9729 | 9801 | ||
3680 | 9730 | cygwin* | mingw* | pw32* | cegcc*) | 9802 | cygwin* | mingw* | pw32* | cegcc*) |
3681 | 9731 | # When not using gcc, we currently assume that we are using | 9803 | # When not using gcc, we currently assume that we are using |
3682 | 9804 | <<<<<<< configure | ||
3683 | 9732 | # Microsoft Visual C++ or Intel C++ Compiler. | 9805 | # Microsoft Visual C++ or Intel C++ Compiler. |
3684 | 9733 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 9806 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3685 | 9734 | # no search path for DLLs. | 9807 | # no search path for DLLs. |
3686 | 9735 | case $cc_basename in | 9808 | case $cc_basename in |
3687 | 9736 | cl* | icl*) | 9809 | cl* | icl*) |
3688 | 9737 | # Native MSVC or ICC | 9810 | # Native MSVC or ICC |
3689 | 9811 | ======= | ||
3690 | 9812 | # Microsoft Visual C++. | ||
3691 | 9813 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
3692 | 9814 | # no search path for DLLs. | ||
3693 | 9815 | case $cc_basename in | ||
3694 | 9816 | cl*) | ||
3695 | 9817 | # Native MSVC | ||
3696 | 9818 | >>>>>>> configure | ||
3697 | 9738 | hardcode_libdir_flag_spec=' ' | 9819 | hardcode_libdir_flag_spec=' ' |
3698 | 9739 | allow_undefined_flag=unsupported | 9820 | allow_undefined_flag=unsupported |
3699 | 9740 | always_export_symbols=yes | 9821 | always_export_symbols=yes |
3700 | @@ -9775,7 +9856,11 @@ fi | |||
3701 | 9775 | fi' | 9856 | fi' |
3702 | 9776 | ;; | 9857 | ;; |
3703 | 9777 | *) | 9858 | *) |
3704 | 9859 | <<<<<<< configure | ||
3705 | 9778 | # Assume MSVC and ICC wrapper | 9860 | # Assume MSVC and ICC wrapper |
3706 | 9861 | ======= | ||
3707 | 9862 | # Assume MSVC wrapper | ||
3708 | 9863 | >>>>>>> configure | ||
3709 | 9779 | hardcode_libdir_flag_spec=' ' | 9864 | hardcode_libdir_flag_spec=' ' |
3710 | 9780 | allow_undefined_flag=unsupported | 9865 | allow_undefined_flag=unsupported |
3711 | 9781 | # Tell ltmain to make .lib files, not .a files. | 9866 | # Tell ltmain to make .lib files, not .a files. |
3712 | @@ -10099,7 +10184,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } | |||
3713 | 10099 | emximp -o $lib $output_objdir/$libname.def' | 10184 | emximp -o $lib $output_objdir/$libname.def' |
3714 | 10100 | old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' | 10185 | old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' |
3715 | 10101 | enable_shared_with_static_runtimes=yes | 10186 | enable_shared_with_static_runtimes=yes |
3716 | 10187 | <<<<<<< configure | ||
3717 | 10102 | file_list_spec='@' | 10188 | file_list_spec='@' |
3718 | 10189 | ======= | ||
3719 | 10190 | >>>>>>> configure | ||
3720 | 10103 | ;; | 10191 | ;; |
3721 | 10104 | 10192 | ||
3722 | 10105 | osf3*) | 10193 | osf3*) |
3723 | @@ -10807,8 +10895,13 @@ cygwin* | mingw* | pw32* | cegcc*) | |||
3724 | 10807 | dynamic_linker='Win32 ld.exe' | 10895 | dynamic_linker='Win32 ld.exe' |
3725 | 10808 | ;; | 10896 | ;; |
3726 | 10809 | 10897 | ||
3727 | 10898 | <<<<<<< configure | ||
3728 | 10810 | *,cl* | *,icl*) | 10899 | *,cl* | *,icl*) |
3729 | 10811 | # Native MSVC or ICC | 10900 | # Native MSVC or ICC |
3730 | 10901 | ======= | ||
3731 | 10902 | *,cl*) | ||
3732 | 10903 | # Native MSVC | ||
3733 | 10904 | >>>>>>> configure | ||
3734 | 10812 | libname_spec='$name' | 10905 | libname_spec='$name' |
3735 | 10813 | soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' | 10906 | soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' |
3736 | 10814 | library_names_spec='$libname.dll.lib' | 10907 | library_names_spec='$libname.dll.lib' |
3737 | @@ -10864,7 +10957,11 @@ cygwin* | mingw* | pw32* | cegcc*) | |||
3738 | 10864 | ;; | 10957 | ;; |
3739 | 10865 | 10958 | ||
3740 | 10866 | *) | 10959 | *) |
3741 | 10960 | <<<<<<< configure | ||
3742 | 10867 | # Assume MSVC and ICC wrapper | 10961 | # Assume MSVC and ICC wrapper |
3743 | 10962 | ======= | ||
3744 | 10963 | # Assume MSVC wrapper | ||
3745 | 10964 | >>>>>>> configure | ||
3746 | 10868 | library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' | 10965 | library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' |
3747 | 10869 | dynamic_linker='Win32 ld.exe' | 10966 | dynamic_linker='Win32 ld.exe' |
3748 | 10870 | ;; | 10967 | ;; |
3749 | @@ -11128,6 +11225,12 @@ fi | |||
3750 | 11128 | # before this can be enabled. | 11225 | # before this can be enabled. |
3751 | 11129 | hardcode_into_libs=yes | 11226 | hardcode_into_libs=yes |
3752 | 11130 | 11227 | ||
3753 | 11228 | <<<<<<< configure | ||
3754 | 11229 | ======= | ||
3755 | 11230 | # Add ABI-specific directories to the system library path. | ||
3756 | 11231 | sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" | ||
3757 | 11232 | |||
3758 | 11233 | >>>>>>> configure | ||
3759 | 11131 | # Ideally, we could use ldconfig to report *all* directores which are | 11234 | # Ideally, we could use ldconfig to report *all* directores which are |
3760 | 11132 | # searched for libraries, however this is still not possible. Aside from not | 11235 | # searched for libraries, however this is still not possible. Aside from not |
3761 | 11133 | # being certain /sbin/ldconfig is available, command | 11236 | # being certain /sbin/ldconfig is available, command |
3762 | @@ -11136,7 +11239,11 @@ fi | |||
3763 | 11136 | # appending ld.so.conf contents (and includes) to the search path. | 11239 | # appending ld.so.conf contents (and includes) to the search path. |
3764 | 11137 | if test -f /etc/ld.so.conf; then | 11240 | if test -f /etc/ld.so.conf; then |
3765 | 11138 | 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' ' '` | 11241 | 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' ' '` |
3766 | 11242 | <<<<<<< configure | ||
3767 | 11139 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 11243 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
3768 | 11244 | ======= | ||
3769 | 11245 | sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" | ||
3770 | 11246 | >>>>>>> configure | ||
3771 | 11140 | fi | 11247 | fi |
3772 | 11141 | 11248 | ||
3773 | 11142 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 11249 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
3774 | @@ -12043,6 +12150,7 @@ striplib= | |||
3775 | 12043 | old_striplib= | 12150 | old_striplib= |
3776 | 12044 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 | 12151 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 |
3777 | 12045 | $as_echo_n "checking whether stripping libraries is possible... " >&6; } | 12152 | $as_echo_n "checking whether stripping libraries is possible... " >&6; } |
3778 | 12153 | <<<<<<< configure | ||
3779 | 12046 | if test -z "$STRIP"; then | 12154 | if test -z "$STRIP"; then |
3780 | 12047 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 12155 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3781 | 12048 | $as_echo "no" >&6; } | 12156 | $as_echo "no" >&6; } |
3782 | @@ -12056,10 +12164,23 @@ $as_echo "yes" >&6; } | |||
3783 | 12056 | case $host_os in | 12164 | case $host_os in |
3784 | 12057 | darwin*) | 12165 | darwin*) |
3785 | 12058 | # FIXME - insert some real tests, host_os isn't really good enough | 12166 | # FIXME - insert some real tests, host_os isn't really good enough |
3786 | 12167 | ======= | ||
3787 | 12168 | if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then | ||
3788 | 12169 | test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | ||
3789 | 12170 | test -z "$striplib" && striplib="$STRIP --strip-unneeded" | ||
3790 | 12171 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3791 | 12172 | $as_echo "yes" >&6; } | ||
3792 | 12173 | else | ||
3793 | 12174 | # FIXME - insert some real tests, host_os isn't really good enough | ||
3794 | 12175 | case $host_os in | ||
3795 | 12176 | darwin*) | ||
3796 | 12177 | if test -n "$STRIP"; then | ||
3797 | 12178 | >>>>>>> configure | ||
3798 | 12059 | striplib="$STRIP -x" | 12179 | striplib="$STRIP -x" |
3799 | 12060 | old_striplib="$STRIP -S" | 12180 | old_striplib="$STRIP -S" |
3800 | 12061 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 12181 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3801 | 12062 | $as_echo "yes" >&6; } | 12182 | $as_echo "yes" >&6; } |
3802 | 12183 | <<<<<<< configure | ||
3803 | 12063 | ;; | 12184 | ;; |
3804 | 12064 | freebsd*) | 12185 | freebsd*) |
3805 | 12065 | if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then | 12186 | if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then |
3806 | @@ -12078,6 +12199,18 @@ $as_echo "no" >&6; } | |||
3807 | 12078 | ;; | 12199 | ;; |
3808 | 12079 | esac | 12200 | esac |
3809 | 12080 | fi | 12201 | fi |
3810 | 12202 | ======= | ||
3811 | 12203 | else | ||
3812 | 12204 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3813 | 12205 | $as_echo "no" >&6; } | ||
3814 | 12206 | fi | ||
3815 | 12207 | ;; | ||
3816 | 12208 | *) | ||
3817 | 12209 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3818 | 12210 | $as_echo "no" >&6; } | ||
3819 | 12211 | ;; | ||
3820 | 12212 | esac | ||
3821 | 12213 | >>>>>>> configure | ||
3822 | 12081 | fi | 12214 | fi |
3823 | 12082 | 12215 | ||
3824 | 12083 | 12216 | ||
3825 | @@ -12301,9 +12434,15 @@ fi | |||
3826 | 12301 | if test "$enable_python" = yes; then : | 12434 | if test "$enable_python" = yes; then : |
3827 | 12302 | 12435 | ||
3828 | 12303 | # cython version check | 12436 | # cython version check |
3829 | 12437 | <<<<<<< configure | ||
3830 | 12304 | if test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 16; then : | 12438 | if test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 16; then : |
3831 | 12305 | 12439 | ||
3832 | 12306 | as_fn_error $? "python bindings require cython 0.16 or higher" "$LINENO" 5 | 12440 | as_fn_error $? "python bindings require cython 0.16 or higher" "$LINENO" 5 |
3833 | 12441 | ======= | ||
3834 | 12442 | if test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 29; then : | ||
3835 | 12443 | |||
3836 | 12444 | as_fn_error $? "python bindings require cython 0.29 or higher" "$LINENO" 5 | ||
3837 | 12445 | >>>>>>> configure | ||
3838 | 12307 | 12446 | ||
3839 | 12308 | fi | 12447 | fi |
3840 | 12309 | 12448 | ||
3841 | @@ -13495,7 +13634,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
3842 | 13495 | # report actual input values of CONFIG_FILES etc. instead of their | 13634 | # report actual input values of CONFIG_FILES etc. instead of their |
3843 | 13496 | # values after options handling. | 13635 | # values after options handling. |
3844 | 13497 | ac_log=" | 13636 | ac_log=" |
3845 | 13637 | <<<<<<< configure | ||
3846 | 13498 | This file was extended by libseccomp $as_me 2.4.1, which was | 13638 | This file was extended by libseccomp $as_me 2.4.1, which was |
3847 | 13639 | ======= | ||
3848 | 13640 | This file was extended by libseccomp $as_me 2.4.2, which was | ||
3849 | 13641 | >>>>>>> configure | ||
3850 | 13499 | generated by GNU Autoconf 2.69. Invocation command line was | 13642 | generated by GNU Autoconf 2.69. Invocation command line was |
3851 | 13500 | 13643 | ||
3852 | 13501 | CONFIG_FILES = $CONFIG_FILES | 13644 | CONFIG_FILES = $CONFIG_FILES |
3853 | @@ -13561,7 +13704,11 @@ _ACEOF | |||
3854 | 13561 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 13704 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
3855 | 13562 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 13705 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
3856 | 13563 | ac_cs_version="\\ | 13706 | ac_cs_version="\\ |
3857 | 13707 | <<<<<<< configure | ||
3858 | 13564 | libseccomp config.status 2.4.1 | 13708 | libseccomp config.status 2.4.1 |
3859 | 13709 | ======= | ||
3860 | 13710 | libseccomp config.status 2.4.2 | ||
3861 | 13711 | >>>>>>> configure | ||
3862 | 13565 | configured by $0, generated by GNU Autoconf 2.69, | 13712 | configured by $0, generated by GNU Autoconf 2.69, |
3863 | 13566 | with options \\"\$ac_cs_config\\" | 13713 | with options \\"\$ac_cs_config\\" |
3864 | 13567 | 13714 | ||
3865 | @@ -13732,7 +13879,10 @@ want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | |||
3866 | 13732 | DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | 13879 | DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
3867 | 13733 | sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | 13880 | sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
3868 | 13734 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | 13881 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
3869 | 13882 | <<<<<<< configure | ||
3870 | 13735 | lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' | 13883 | lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' |
3871 | 13884 | ======= | ||
3872 | 13885 | >>>>>>> configure | ||
3873 | 13736 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | 13886 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
3874 | 13737 | archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | 13887 | archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
3875 | 13738 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 13888 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
3876 | @@ -13861,6 +14011,10 @@ want_nocaseglob \ | |||
3877 | 13861 | DLLTOOL \ | 14011 | DLLTOOL \ |
3878 | 13862 | sharedlib_from_linklib_cmd \ | 14012 | sharedlib_from_linklib_cmd \ |
3879 | 13863 | AR \ | 14013 | AR \ |
3880 | 14014 | <<<<<<< configure | ||
3881 | 14015 | ======= | ||
3882 | 14016 | AR_FLAGS \ | ||
3883 | 14017 | >>>>>>> configure | ||
3884 | 13864 | archiver_list_spec \ | 14018 | archiver_list_spec \ |
3885 | 13865 | STRIP \ | 14019 | STRIP \ |
3886 | 13866 | RANLIB \ | 14020 | RANLIB \ |
3887 | @@ -14833,11 +14987,16 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | |||
3888 | 14833 | # The archiver. | 14987 | # The archiver. |
3889 | 14834 | AR=$lt_AR | 14988 | AR=$lt_AR |
3890 | 14835 | 14989 | ||
3891 | 14990 | <<<<<<< configure | ||
3892 | 14836 | # Flags to create an archive (by configure). | 14991 | # Flags to create an archive (by configure). |
3893 | 14837 | lt_ar_flags=$lt_ar_flags | 14992 | lt_ar_flags=$lt_ar_flags |
3894 | 14838 | 14993 | ||
3895 | 14839 | # Flags to create an archive. | 14994 | # Flags to create an archive. |
3896 | 14840 | AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} | 14995 | AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} |
3897 | 14996 | ======= | ||
3898 | 14997 | # Flags to create an archive. | ||
3899 | 14998 | AR_FLAGS=$lt_AR_FLAGS | ||
3900 | 14999 | >>>>>>> configure | ||
3901 | 14841 | 15000 | ||
3902 | 14842 | # How to feed a file listing to the archiver. | 15001 | # How to feed a file listing to the archiver. |
3903 | 14843 | archiver_list_spec=$lt_archiver_list_spec | 15002 | archiver_list_spec=$lt_archiver_list_spec |
3904 | diff --git a/configure.ac b/configure.ac | |||
3905 | index 05d34a5..d4fd1cf 100644 | |||
3906 | --- a/configure.ac | |||
3907 | +++ b/configure.ac | |||
3908 | @@ -19,7 +19,11 @@ dnl # | |||
3909 | 19 | dnl #### | 19 | dnl #### |
3910 | 20 | dnl libseccomp defines | 20 | dnl libseccomp defines |
3911 | 21 | dnl #### | 21 | dnl #### |
3912 | 22 | <<<<<<< configure.ac | ||
3913 | 22 | AC_INIT([libseccomp], [2.4.1]) | 23 | AC_INIT([libseccomp], [2.4.1]) |
3914 | 24 | ======= | ||
3915 | 25 | AC_INIT([libseccomp], [2.4.2]) | ||
3916 | 26 | >>>>>>> configure.ac | ||
3917 | 23 | 27 | ||
3918 | 24 | dnl #### | 28 | dnl #### |
3919 | 25 | dnl autoconf configuration | 29 | dnl autoconf configuration |
3920 | @@ -109,8 +113,13 @@ AC_ARG_ENABLE([python], | |||
3921 | 109 | [build the python bindings, requires cython])]) | 113 | [build the python bindings, requires cython])]) |
3922 | 110 | AS_IF([test "$enable_python" = yes], [ | 114 | AS_IF([test "$enable_python" = yes], [ |
3923 | 111 | # cython version check | 115 | # cython version check |
3924 | 116 | <<<<<<< configure.ac | ||
3925 | 112 | AS_IF([test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 16], [ | 117 | AS_IF([test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 16], [ |
3926 | 113 | AC_MSG_ERROR([python bindings require cython 0.16 or higher]) | 118 | AC_MSG_ERROR([python bindings require cython 0.16 or higher]) |
3927 | 119 | ======= | ||
3928 | 120 | AS_IF([test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 29], [ | ||
3929 | 121 | AC_MSG_ERROR([python bindings require cython 0.29 or higher]) | ||
3930 | 122 | >>>>>>> configure.ac | ||
3931 | 114 | ]) | 123 | ]) |
3932 | 115 | AM_PATH_PYTHON | 124 | AM_PATH_PYTHON |
3933 | 116 | ]) | 125 | ]) |
3934 | diff --git a/debian/changelog b/debian/changelog | |||
3935 | index d6cc9b4..05e3b6d 100644 | |||
3936 | --- a/debian/changelog | |||
3937 | +++ b/debian/changelog | |||
3938 | @@ -1,3 +1,18 @@ | |||
3939 | 1 | <<<<<<< debian/changelog | ||
3940 | 2 | ======= | ||
3941 | 3 | libseccomp (2.4.2-0ubuntu1) focal; urgency=medium | ||
3942 | 4 | |||
3943 | 5 | * New upstream release 2.4.2 for compatibility with newer kernels and | ||
3944 | 6 | and FTBFS (LP: #1849785). | ||
3945 | 7 | - drop d/p/python_install_dir.patch (now upstream) | ||
3946 | 8 | - d/rules: adapt to python 3.8 lacking the m modifier on includes | ||
3947 | 9 | see https://wiki.debian.org/Python/Python3.8 | ||
3948 | 10 | - d/p/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch: fix | ||
3949 | 11 | build time test on arm64 | ||
3950 | 12 | |||
3951 | 13 | -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 11 Nov 2019 11:31:26 +0100 | ||
3952 | 14 | |||
3953 | 15 | >>>>>>> debian/changelog | ||
3954 | 1 | libseccomp (2.4.1-2) unstable; urgency=medium | 16 | libseccomp (2.4.1-2) unstable; urgency=medium |
3955 | 2 | 17 | ||
3956 | 3 | * Remove build-dependency on valgrind for mipsel and x32 as it's broken | 18 | * Remove build-dependency on valgrind for mipsel and x32 as it's broken |
3957 | diff --git a/debian/control b/debian/control | |||
3958 | index 5515592..2afe09c 100644 | |||
3959 | --- a/debian/control | |||
3960 | +++ b/debian/control | |||
3961 | @@ -1,7 +1,12 @@ | |||
3962 | 1 | Source: libseccomp | 1 | Source: libseccomp |
3963 | 2 | Section: libs | 2 | Section: libs |
3964 | 3 | Priority: optional | 3 | Priority: optional |
3965 | 4 | <<<<<<< debian/control | ||
3966 | 4 | Maintainer: Kees Cook <kees@debian.org> | 5 | Maintainer: Kees Cook <kees@debian.org> |
3967 | 6 | ======= | ||
3968 | 7 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | ||
3969 | 8 | XSBC-Original-Maintainer: Kees Cook <kees@debian.org> | ||
3970 | 9 | >>>>>>> debian/control | ||
3971 | 5 | Uploaders: Luca Bruno <lucab@debian.org>, Felix Geyer <fgeyer@debian.org> | 10 | Uploaders: Luca Bruno <lucab@debian.org>, Felix Geyer <fgeyer@debian.org> |
3972 | 6 | Build-Depends: debhelper-compat (= 12), | 11 | Build-Depends: debhelper-compat (= 12), |
3973 | 7 | linux-libc-dev, | 12 | linux-libc-dev, |
3974 | diff --git a/debian/patches/series b/debian/patches/series | |||
3975 | index 05d7297..fa08aca 100644 | |||
3976 | --- a/debian/patches/series | |||
3977 | +++ b/debian/patches/series | |||
3978 | @@ -1 +1,5 @@ | |||
3979 | 1 | <<<<<<< debian/patches/series | ||
3980 | 1 | python_install_dir.patch | 2 | python_install_dir.patch |
3981 | 3 | ======= | ||
3982 | 4 | tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch | ||
3983 | 5 | >>>>>>> debian/patches/series | ||
3984 | diff --git a/debian/patches/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch b/debian/patches/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch | |||
3985 | 2 | new file mode 100644 | 6 | new file mode 100644 |
3986 | index 0000000..82c9360 | |||
3987 | --- /dev/null | |||
3988 | +++ b/debian/patches/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch | |||
3989 | @@ -0,0 +1,47 @@ | |||
3990 | 1 | From 35803ceb43c453762a3ab5177c5f8d5dbb813478 Mon Sep 17 00:00:00 2001 | ||
3991 | 2 | From: Paul Moore <paul@paul-moore.com> | ||
3992 | 3 | Date: Tue, 5 Nov 2019 15:11:11 -0500 | ||
3993 | 4 | Subject: [PATCH] tests: rely on __SNR_xxx instead of __NR_xxx for syscalls | ||
3994 | 5 | |||
3995 | 6 | We recently changed how libseccomp handles syscall numbers that are | ||
3996 | 7 | not defined natively, but we missed test #15. | ||
3997 | 8 | |||
3998 | 9 | Signed-off-by: Paul Moore <paul@paul-moore.com> | ||
3999 | 10 | |||
4000 | 11 | Note: Tagged for v2.5, but needed to build 2.4.2 with newer kernels on arm | ||
4001 | 12 | This is part of PR: https://github.com/seccomp/libseccomp/pull/182 | ||
4002 | 13 | Upstream Bug: https://github.com/seccomp/libseccomp/issues/184 | ||
4003 | 14 | Origin: upstream, https://github.com/pcmoore/misc-libseccomp/commit/35803ceb43c453762a3ab5177c5f8d5dbb813478 | ||
4004 | 15 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/1849785 | ||
4005 | 16 | Last-Update: 2019-11-12 | ||
4006 | 17 | |||
4007 | 18 | --- | ||
4008 | 19 | tests/15-basic-resolver.c | 6 +++--- | ||
4009 | 20 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
4010 | 21 | |||
4011 | 22 | diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c | ||
4012 | 23 | index 6badef1..0c1eefe 100644 | ||
4013 | 24 | --- a/tests/15-basic-resolver.c | ||
4014 | 25 | +++ b/tests/15-basic-resolver.c | ||
4015 | 26 | @@ -55,15 +55,15 @@ int main(int argc, char *argv[]) | ||
4016 | 27 | unsigned int arch; | ||
4017 | 28 | char *name = NULL; | ||
4018 | 29 | |||
4019 | 30 | - if (seccomp_syscall_resolve_name("open") != __NR_open) | ||
4020 | 31 | + if (seccomp_syscall_resolve_name("open") != __SNR_open) | ||
4021 | 32 | goto fail; | ||
4022 | 33 | - if (seccomp_syscall_resolve_name("read") != __NR_read) | ||
4023 | 34 | + if (seccomp_syscall_resolve_name("read") != __SNR_read) | ||
4024 | 35 | goto fail; | ||
4025 | 36 | if (seccomp_syscall_resolve_name("INVALID") != __NR_SCMP_ERROR) | ||
4026 | 37 | goto fail; | ||
4027 | 38 | |||
4028 | 39 | rc = seccomp_syscall_resolve_name_rewrite(SCMP_ARCH_NATIVE, "openat"); | ||
4029 | 40 | - if (rc != __NR_openat) | ||
4030 | 41 | + if (rc != __SNR_openat) | ||
4031 | 42 | goto fail; | ||
4032 | 43 | |||
4033 | 44 | while ((arch = arch_list[iter++]) != -1) { | ||
4034 | 45 | -- | ||
4035 | 46 | 2.24.0 | ||
4036 | 47 | |||
4037 | diff --git a/debian/rules b/debian/rules | |||
4038 | index ee252c9..da915cc 100755 | |||
4039 | --- a/debian/rules | |||
4040 | +++ b/debian/rules | |||
4041 | @@ -25,8 +25,18 @@ override_dh_auto_build: | |||
4042 | 25 | 25 | ||
4043 | 26 | override_dh_auto_install: | 26 | override_dh_auto_install: |
4044 | 27 | dh_auto_install | 27 | dh_auto_install |
4045 | 28 | <<<<<<< debian/rules | ||
4046 | 28 | set -e; export _PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata_m_${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}'; \ | 29 | set -e; export _PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata_m_${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}'; \ |
4047 | 29 | for pyver in `py3versions -s`; do \ | 30 | for pyver in `py3versions -s`; do \ |
4048 | 31 | ======= | ||
4049 | 32 | for pyver in `py3versions -s`; do \ | ||
4050 | 33 | set -e; \ | ||
4051 | 34 | if python -c "pyver='$$pyver'; exit(0 if float(pyver[6:]) >= 3.8 else 1)"; then \ | ||
4052 | 35 | export _PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata__${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}'; \ | ||
4053 | 36 | else \ | ||
4054 | 37 | export _PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata_m_${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}'; \ | ||
4055 | 38 | fi; \ | ||
4056 | 39 | >>>>>>> debian/rules | ||
4057 | 30 | dh_auto_configure -- --enable-python PYTHON=$$pyver; \ | 40 | dh_auto_configure -- --enable-python PYTHON=$$pyver; \ |
4058 | 31 | dh_auto_install --sourcedirectory=src/python -- PYTHON=$$pyver; \ | 41 | dh_auto_install --sourcedirectory=src/python -- PYTHON=$$pyver; \ |
4059 | 32 | done | 42 | done |
4060 | diff --git a/include/Makefile.am b/include/Makefile.am | |||
4061 | index ba3723f..aecccda 100644 | |||
4062 | --- a/include/Makefile.am | |||
4063 | +++ b/include/Makefile.am | |||
4064 | @@ -16,4 +16,8 @@ | |||
4065 | 16 | # along with this library; if not, see <http://www.gnu.org/licenses>. | 16 | # along with this library; if not, see <http://www.gnu.org/licenses>. |
4066 | 17 | # | 17 | # |
4067 | 18 | 18 | ||
4068 | 19 | <<<<<<< include/Makefile.am | ||
4069 | 19 | include_HEADERS = seccomp.h | 20 | include_HEADERS = seccomp.h |
4070 | 21 | ======= | ||
4071 | 22 | include_HEADERS = seccomp.h seccomp-syscalls.h | ||
4072 | 23 | >>>>>>> include/Makefile.am | ||
4073 | diff --git a/include/Makefile.in b/include/Makefile.in | |||
4074 | index b9c38dc..06dffe9 100644 | |||
4075 | --- a/include/Makefile.in | |||
4076 | +++ b/include/Makefile.in | |||
4077 | @@ -330,7 +330,11 @@ target_alias = @target_alias@ | |||
4078 | 330 | top_build_prefix = @top_build_prefix@ | 330 | top_build_prefix = @top_build_prefix@ |
4079 | 331 | top_builddir = @top_builddir@ | 331 | top_builddir = @top_builddir@ |
4080 | 332 | top_srcdir = @top_srcdir@ | 332 | top_srcdir = @top_srcdir@ |
4081 | 333 | <<<<<<< include/Makefile.in | ||
4082 | 333 | include_HEADERS = seccomp.h | 334 | include_HEADERS = seccomp.h |
4083 | 335 | ======= | ||
4084 | 336 | include_HEADERS = seccomp.h seccomp-syscalls.h | ||
4085 | 337 | >>>>>>> include/Makefile.in | ||
4086 | 334 | all: all-am | 338 | all: all-am |
4087 | 335 | 339 | ||
4088 | 336 | .SUFFIXES: | 340 | .SUFFIXES: |
4089 | diff --git a/include/seccomp-syscalls.h b/include/seccomp-syscalls.h | |||
4090 | 337 | new file mode 100644 | 341 | new file mode 100644 |
4091 | index 0000000..6457592 | |||
4092 | --- /dev/null | |||
4093 | +++ b/include/seccomp-syscalls.h | |||
4094 | @@ -0,0 +1,2292 @@ | |||
4095 | 1 | /** | ||
4096 | 2 | * Seccomp Library | ||
4097 | 3 | * | ||
4098 | 4 | * Copyright (c) 2019 Cisco Systems <pmoore2@cisco.com> | ||
4099 | 5 | * Author: Paul Moore <paul@paul-moore.com> | ||
4100 | 6 | */ | ||
4101 | 7 | |||
4102 | 8 | /* | ||
4103 | 9 | * This library is free software; you can redistribute it and/or modify it | ||
4104 | 10 | * under the terms of version 2.1 of the GNU Lesser General Public License as | ||
4105 | 11 | * published by the Free Software Foundation. | ||
4106 | 12 | * | ||
4107 | 13 | * This library is distributed in the hope that it will be useful, but WITHOUT | ||
4108 | 14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
4109 | 15 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License | ||
4110 | 16 | * for more details. | ||
4111 | 17 | * | ||
4112 | 18 | * You should have received a copy of the GNU Lesser General Public License | ||
4113 | 19 | * along with this library; if not, see <http://www.gnu.org/licenses>. | ||
4114 | 20 | */ | ||
4115 | 21 | |||
4116 | 22 | #ifndef _SECCOMP_H | ||
4117 | 23 | #error "do not include seccomp-syscalls.h directly, use seccomp.h instead" | ||
4118 | 24 | #endif | ||
4119 | 25 | |||
4120 | 26 | /* | ||
4121 | 27 | * psuedo syscall definitions | ||
4122 | 28 | */ | ||
4123 | 29 | |||
4124 | 30 | /* socket syscalls */ | ||
4125 | 31 | |||
4126 | 32 | #define __PNR_socket -101 | ||
4127 | 33 | #define __PNR_bind -102 | ||
4128 | 34 | #define __PNR_connect -103 | ||
4129 | 35 | #define __PNR_listen -104 | ||
4130 | 36 | #define __PNR_accept -105 | ||
4131 | 37 | #define __PNR_getsockname -106 | ||
4132 | 38 | #define __PNR_getpeername -107 | ||
4133 | 39 | #define __PNR_socketpair -108 | ||
4134 | 40 | #define __PNR_send -109 | ||
4135 | 41 | #define __PNR_recv -110 | ||
4136 | 42 | #define __PNR_sendto -111 | ||
4137 | 43 | #define __PNR_recvfrom -112 | ||
4138 | 44 | #define __PNR_shutdown -113 | ||
4139 | 45 | #define __PNR_setsockopt -114 | ||
4140 | 46 | #define __PNR_getsockopt -115 | ||
4141 | 47 | #define __PNR_sendmsg -116 | ||
4142 | 48 | #define __PNR_recvmsg -117 | ||
4143 | 49 | #define __PNR_accept4 -118 | ||
4144 | 50 | #define __PNR_recvmmsg -119 | ||
4145 | 51 | #define __PNR_sendmmsg -120 | ||
4146 | 52 | |||
4147 | 53 | /* ipc syscalls */ | ||
4148 | 54 | |||
4149 | 55 | #define __PNR_semop -201 | ||
4150 | 56 | #define __PNR_semget -202 | ||
4151 | 57 | #define __PNR_semctl -203 | ||
4152 | 58 | #define __PNR_semtimedop -204 | ||
4153 | 59 | #define __PNR_msgsnd -211 | ||
4154 | 60 | #define __PNR_msgrcv -212 | ||
4155 | 61 | #define __PNR_msgget -213 | ||
4156 | 62 | #define __PNR_msgctl -214 | ||
4157 | 63 | #define __PNR_shmat -221 | ||
4158 | 64 | #define __PNR_shmdt -222 | ||
4159 | 65 | #define __PNR_shmget -223 | ||
4160 | 66 | #define __PNR_shmctl -224 | ||
4161 | 67 | |||
4162 | 68 | /* single syscalls */ | ||
4163 | 69 | |||
4164 | 70 | #define __PNR_arch_prctl -10001 | ||
4165 | 71 | #define __PNR_bdflush -10002 | ||
4166 | 72 | #define __PNR_break -10003 | ||
4167 | 73 | #define __PNR_chown32 -10004 | ||
4168 | 74 | #define __PNR_epoll_ctl_old -10005 | ||
4169 | 75 | #define __PNR_epoll_wait_old -10006 | ||
4170 | 76 | #define __PNR_fadvise64_64 -10007 | ||
4171 | 77 | #define __PNR_fchown32 -10008 | ||
4172 | 78 | #define __PNR_fcntl64 -10009 | ||
4173 | 79 | #define __PNR_fstat64 -10010 | ||
4174 | 80 | #define __PNR_fstatat64 -10011 | ||
4175 | 81 | #define __PNR_fstatfs64 -10012 | ||
4176 | 82 | #define __PNR_ftime -10013 | ||
4177 | 83 | #define __PNR_ftruncate64 -10014 | ||
4178 | 84 | #define __PNR_getegid32 -10015 | ||
4179 | 85 | #define __PNR_geteuid32 -10016 | ||
4180 | 86 | #define __PNR_getgid32 -10017 | ||
4181 | 87 | #define __PNR_getgroups32 -10018 | ||
4182 | 88 | #define __PNR_getresgid32 -10019 | ||
4183 | 89 | #define __PNR_getresuid32 -10020 | ||
4184 | 90 | #define __PNR_getuid32 -10021 | ||
4185 | 91 | #define __PNR_gtty -10022 | ||
4186 | 92 | #define __PNR_idle -10023 | ||
4187 | 93 | #define __PNR_ipc -10024 | ||
4188 | 94 | #define __PNR_lchown32 -10025 | ||
4189 | 95 | #define __PNR__llseek -10026 | ||
4190 | 96 | #define __PNR_lock -10027 | ||
4191 | 97 | #define __PNR_lstat64 -10028 | ||
4192 | 98 | #define __PNR_mmap2 -10029 | ||
4193 | 99 | #define __PNR_mpx -10030 | ||
4194 | 100 | #define __PNR_newfstatat -10031 | ||
4195 | 101 | #define __PNR__newselect -10032 | ||
4196 | 102 | #define __PNR_nice -10033 | ||
4197 | 103 | #define __PNR_oldfstat -10034 | ||
4198 | 104 | #define __PNR_oldlstat -10035 | ||
4199 | 105 | #define __PNR_oldolduname -10036 | ||
4200 | 106 | #define __PNR_oldstat -10037 | ||
4201 | 107 | #define __PNR_olduname -10038 | ||
4202 | 108 | #define __PNR_prof -10039 | ||
4203 | 109 | #define __PNR_profil -10040 | ||
4204 | 110 | #define __PNR_readdir -10041 | ||
4205 | 111 | #define __PNR_security -10042 | ||
4206 | 112 | #define __PNR_sendfile64 -10043 | ||
4207 | 113 | #define __PNR_setfsgid32 -10044 | ||
4208 | 114 | #define __PNR_setfsuid32 -10045 | ||
4209 | 115 | #define __PNR_setgid32 -10046 | ||
4210 | 116 | #define __PNR_setgroups32 -10047 | ||
4211 | 117 | #define __PNR_setregid32 -10048 | ||
4212 | 118 | #define __PNR_setresgid32 -10049 | ||
4213 | 119 | #define __PNR_setresuid32 -10050 | ||
4214 | 120 | #define __PNR_setreuid32 -10051 | ||
4215 | 121 | #define __PNR_setuid32 -10052 | ||
4216 | 122 | #define __PNR_sgetmask -10053 | ||
4217 | 123 | #define __PNR_sigaction -10054 | ||
4218 | 124 | #define __PNR_signal -10055 | ||
4219 | 125 | #define __PNR_sigpending -10056 | ||
4220 | 126 | #define __PNR_sigprocmask -10057 | ||
4221 | 127 | #define __PNR_sigreturn -10058 | ||
4222 | 128 | #define __PNR_sigsuspend -10059 | ||
4223 | 129 | #define __PNR_socketcall -10060 | ||
4224 | 130 | #define __PNR_ssetmask -10061 | ||
4225 | 131 | #define __PNR_stat64 -10062 | ||
4226 | 132 | #define __PNR_statfs64 -10063 | ||
4227 | 133 | #define __PNR_stime -10064 | ||
4228 | 134 | #define __PNR_stty -10065 | ||
4229 | 135 | #define __PNR_truncate64 -10066 | ||
4230 | 136 | #define __PNR_tuxcall -10067 | ||
4231 | 137 | #define __PNR_ugetrlimit -10068 | ||
4232 | 138 | #define __PNR_ulimit -10069 | ||
4233 | 139 | #define __PNR_umount -10070 | ||
4234 | 140 | #define __PNR_vm86 -10071 | ||
4235 | 141 | #define __PNR_vm86old -10072 | ||
4236 | 142 | #define __PNR_waitpid -10073 | ||
4237 | 143 | #define __PNR_create_module -10074 | ||
4238 | 144 | #define __PNR_get_kernel_syms -10075 | ||
4239 | 145 | #define __PNR_get_thread_area -10076 | ||
4240 | 146 | #define __PNR_nfsservctl -10077 | ||
4241 | 147 | #define __PNR_query_module -10078 | ||
4242 | 148 | #define __PNR_set_thread_area -10079 | ||
4243 | 149 | #define __PNR__sysctl -10080 | ||
4244 | 150 | #define __PNR_uselib -10081 | ||
4245 | 151 | #define __PNR_vserver -10082 | ||
4246 | 152 | #define __PNR_arm_fadvise64_64 -10083 | ||
4247 | 153 | #define __PNR_arm_sync_file_range -10084 | ||
4248 | 154 | #define __PNR_pciconfig_iobase -10086 | ||
4249 | 155 | #define __PNR_pciconfig_read -10087 | ||
4250 | 156 | #define __PNR_pciconfig_write -10088 | ||
4251 | 157 | #define __PNR_sync_file_range2 -10089 | ||
4252 | 158 | #define __PNR_syscall -10090 | ||
4253 | 159 | #define __PNR_afs_syscall -10091 | ||
4254 | 160 | #define __PNR_fadvise64 -10092 | ||
4255 | 161 | #define __PNR_getpmsg -10093 | ||
4256 | 162 | #define __PNR_ioperm -10094 | ||
4257 | 163 | #define __PNR_iopl -10095 | ||
4258 | 164 | #define __PNR_migrate_pages -10097 | ||
4259 | 165 | #define __PNR_modify_ldt -10098 | ||
4260 | 166 | #define __PNR_putpmsg -10099 | ||
4261 | 167 | #define __PNR_sync_file_range -10100 | ||
4262 | 168 | #define __PNR_select -10101 | ||
4263 | 169 | #define __PNR_vfork -10102 | ||
4264 | 170 | #define __PNR_cachectl -10103 | ||
4265 | 171 | #define __PNR_cacheflush -10104 | ||
4266 | 172 | #define __PNR_sysmips -10106 | ||
4267 | 173 | #define __PNR_timerfd -10107 | ||
4268 | 174 | #define __PNR_time -10108 | ||
4269 | 175 | #define __PNR_getrandom -10109 | ||
4270 | 176 | #define __PNR_memfd_create -10110 | ||
4271 | 177 | #define __PNR_kexec_file_load -10111 | ||
4272 | 178 | #define __PNR_sysfs -10145 | ||
4273 | 179 | #define __PNR_oldwait4 -10146 | ||
4274 | 180 | #define __PNR_access -10147 | ||
4275 | 181 | #define __PNR_alarm -10148 | ||
4276 | 182 | #define __PNR_chmod -10149 | ||
4277 | 183 | #define __PNR_chown -10150 | ||
4278 | 184 | #define __PNR_creat -10151 | ||
4279 | 185 | #define __PNR_dup2 -10152 | ||
4280 | 186 | #define __PNR_epoll_create -10153 | ||
4281 | 187 | #define __PNR_epoll_wait -10154 | ||
4282 | 188 | #define __PNR_eventfd -10155 | ||
4283 | 189 | #define __PNR_fork -10156 | ||
4284 | 190 | #define __PNR_futimesat -10157 | ||
4285 | 191 | #define __PNR_getdents -10158 | ||
4286 | 192 | #define __PNR_getpgrp -10159 | ||
4287 | 193 | #define __PNR_inotify_init -10160 | ||
4288 | 194 | #define __PNR_lchown -10161 | ||
4289 | 195 | #define __PNR_link -10162 | ||
4290 | 196 | #define __PNR_lstat -10163 | ||
4291 | 197 | #define __PNR_mkdir -10164 | ||
4292 | 198 | #define __PNR_mknod -10165 | ||
4293 | 199 | #define __PNR_open -10166 | ||
4294 | 200 | #define __PNR_pause -10167 | ||
4295 | 201 | #define __PNR_pipe -10168 | ||
4296 | 202 | #define __PNR_poll -10169 | ||
4297 | 203 | #define __PNR_readlink -10170 | ||
4298 | 204 | #define __PNR_rename -10171 | ||
4299 | 205 | #define __PNR_rmdir -10172 | ||
4300 | 206 | #define __PNR_signalfd -10173 | ||
4301 | 207 | #define __PNR_stat -10174 | ||
4302 | 208 | #define __PNR_symlink -10175 | ||
4303 | 209 | #define __PNR_unlink -10176 | ||
4304 | 210 | #define __PNR_ustat -10177 | ||
4305 | 211 | #define __PNR_utime -10178 | ||
4306 | 212 | #define __PNR_utimes -10179 | ||
4307 | 213 | #define __PNR_getrlimit -10180 | ||
4308 | 214 | #define __PNR_mmap -10181 | ||
4309 | 215 | #define __PNR_breakpoint -10182 | ||
4310 | 216 | #define __PNR_set_tls -10183 | ||
4311 | 217 | #define __PNR_usr26 -10184 | ||
4312 | 218 | #define __PNR_usr32 -10185 | ||
4313 | 219 | #define __PNR_multiplexer -10186 | ||
4314 | 220 | #define __PNR_rtas -10187 | ||
4315 | 221 | #define __PNR_spu_create -10188 | ||
4316 | 222 | #define __PNR_spu_run -10189 | ||
4317 | 223 | #define __PNR_swapcontext -10190 | ||
4318 | 224 | #define __PNR_sys_debug_setcontext -10191 | ||
4319 | 225 | #define __PNR_switch_endian -10191 | ||
4320 | 226 | #define __PNR_get_mempolicy -10192 | ||
4321 | 227 | #define __PNR_move_pages -10193 | ||
4322 | 228 | #define __PNR_mbind -10194 | ||
4323 | 229 | #define __PNR_set_mempolicy -10195 | ||
4324 | 230 | #define __PNR_s390_runtime_instr -10196 | ||
4325 | 231 | #define __PNR_s390_pci_mmio_read -10197 | ||
4326 | 232 | #define __PNR_s390_pci_mmio_write -10198 | ||
4327 | 233 | #define __PNR_membarrier -10199 | ||
4328 | 234 | #define __PNR_userfaultfd -10200 | ||
4329 | 235 | #define __PNR_pkey_mprotect -10201 | ||
4330 | 236 | #define __PNR_pkey_alloc -10202 | ||
4331 | 237 | #define __PNR_pkey_free -10203 | ||
4332 | 238 | #define __PNR_get_tls -10204 | ||
4333 | 239 | #define __PNR_s390_guarded_storage -10205 | ||
4334 | 240 | #define __PNR_s390_sthyi -10206 | ||
4335 | 241 | #define __PNR_subpage_prot -10207 | ||
4336 | 242 | #define __PNR_statx -10208 | ||
4337 | 243 | #define __PNR_io_pgetevents -10209 | ||
4338 | 244 | #define __PNR_rseq -10210 | ||
4339 | 245 | #define __PNR_setrlimit -10211 | ||
4340 | 246 | #define __PNR_clock_adjtime64 -10212 | ||
4341 | 247 | #define __PNR_clock_getres_time64 -10213 | ||
4342 | 248 | #define __PNR_clock_gettime64 -10214 | ||
4343 | 249 | #define __PNR_clock_nanosleep_time64 -10215 | ||
4344 | 250 | #define __PNR_clock_settime64 -10216 | ||
4345 | 251 | #define __PNR_clone3 -10217 | ||
4346 | 252 | #define __PNR_fsconfig -10218 | ||
4347 | 253 | #define __PNR_fsmount -10219 | ||
4348 | 254 | #define __PNR_fsopen -10220 | ||
4349 | 255 | #define __PNR_fspick -10221 | ||
4350 | 256 | #define __PNR_futex_time64 -10222 | ||
4351 | 257 | #define __PNR_io_pgetevents_time64 -10223 | ||
4352 | 258 | #define __PNR_move_mount -10224 | ||
4353 | 259 | #define __PNR_mq_timedreceive_time64 -10225 | ||
4354 | 260 | #define __PNR_mq_timedsend_time64 -10226 | ||
4355 | 261 | #define __PNR_open_tree -10227 | ||
4356 | 262 | #define __PNR_pidfd_open -10228 | ||
4357 | 263 | #define __PNR_pidfd_send_signal -10229 | ||
4358 | 264 | #define __PNR_ppoll_time64 -10230 | ||
4359 | 265 | #define __PNR_pselect6_time64 -10231 | ||
4360 | 266 | #define __PNR_recvmmsg_time64 -10232 | ||
4361 | 267 | #define __PNR_rt_sigtimedwait_time64 -10233 | ||
4362 | 268 | #define __PNR_sched_rr_get_interval_time64 -10234 | ||
4363 | 269 | #define __PNR_semtimedop_time64 -10235 | ||
4364 | 270 | #define __PNR_timer_gettime64 -10236 | ||
4365 | 271 | #define __PNR_timer_settime64 -10237 | ||
4366 | 272 | #define __PNR_timerfd_gettime64 -10238 | ||
4367 | 273 | #define __PNR_timerfd_settime64 -10239 | ||
4368 | 274 | #define __PNR_utimensat_time64 -10240 | ||
4369 | 275 | |||
4370 | 276 | /* | ||
4371 | 277 | * libseccomp syscall definitions | ||
4372 | 278 | */ | ||
4373 | 279 | |||
4374 | 280 | #ifdef __NR__llseek | ||
4375 | 281 | #define __SNR__llseek __NR__llseek | ||
4376 | 282 | #else | ||
4377 | 283 | #define __SNR__llseek __PNR__llseek | ||
4378 | 284 | #endif | ||
4379 | 285 | |||
4380 | 286 | #ifdef __NR__newselect | ||
4381 | 287 | #define __SNR__newselect __NR__newselect | ||
4382 | 288 | #else | ||
4383 | 289 | #define __SNR__newselect __PNR__newselect | ||
4384 | 290 | #endif | ||
4385 | 291 | |||
4386 | 292 | #ifdef __NR__sysctl | ||
4387 | 293 | #define __SNR__sysctl __NR__sysctl | ||
4388 | 294 | #else | ||
4389 | 295 | #define __SNR__sysctl __PNR__sysctl | ||
4390 | 296 | #endif | ||
4391 | 297 | |||
4392 | 298 | #ifdef __NR_accept | ||
4393 | 299 | #define __SNR_accept __NR_accept | ||
4394 | 300 | #else | ||
4395 | 301 | #define __SNR_accept __PNR_accept | ||
4396 | 302 | #endif | ||
4397 | 303 | |||
4398 | 304 | #ifdef __NR_accept4 | ||
4399 | 305 | #define __SNR_accept4 __NR_accept4 | ||
4400 | 306 | #else | ||
4401 | 307 | #define __SNR_accept4 __PNR_accept4 | ||
4402 | 308 | #endif | ||
4403 | 309 | |||
4404 | 310 | #ifdef __NR_access | ||
4405 | 311 | #define __SNR_access __NR_access | ||
4406 | 312 | #else | ||
4407 | 313 | #define __SNR_access __PNR_access | ||
4408 | 314 | #endif | ||
4409 | 315 | |||
4410 | 316 | #define __SNR_acct __NR_acct | ||
4411 | 317 | |||
4412 | 318 | #define __SNR_add_key __NR_add_key | ||
4413 | 319 | |||
4414 | 320 | #define __SNR_adjtimex __NR_adjtimex | ||
4415 | 321 | |||
4416 | 322 | #ifdef __NR_afs_syscall | ||
4417 | 323 | #define __SNR_afs_syscall __NR_afs_syscall | ||
4418 | 324 | #else | ||
4419 | 325 | #define __SNR_afs_syscall __PNR_afs_syscall | ||
4420 | 326 | #endif | ||
4421 | 327 | |||
4422 | 328 | #ifdef __NR_alarm | ||
4423 | 329 | #define __SNR_alarm __NR_alarm | ||
4424 | 330 | #else | ||
4425 | 331 | #define __SNR_alarm __PNR_alarm | ||
4426 | 332 | #endif | ||
4427 | 333 | |||
4428 | 334 | #ifdef __NR_arm_fadvise64_64 | ||
4429 | 335 | #define __SNR_arm_fadvise64_64 __NR_arm_fadvise64_64 | ||
4430 | 336 | #else | ||
4431 | 337 | #define __SNR_arm_fadvise64_64 __PNR_arm_fadvise64_64 | ||
4432 | 338 | #endif | ||
4433 | 339 | |||
4434 | 340 | #ifdef __NR_arm_sync_file_range | ||
4435 | 341 | #define __SNR_arm_sync_file_range __NR_arm_sync_file_range | ||
4436 | 342 | #else | ||
4437 | 343 | #define __SNR_arm_sync_file_range __PNR_arm_sync_file_range | ||
4438 | 344 | #endif | ||
4439 | 345 | |||
4440 | 346 | #ifdef __NR_arch_prctl | ||
4441 | 347 | #define __SNR_arch_prctl __NR_arch_prctl | ||
4442 | 348 | #else | ||
4443 | 349 | #define __SNR_arch_prctl __PNR_arch_prctl | ||
4444 | 350 | #endif | ||
4445 | 351 | |||
4446 | 352 | #ifdef __NR_bdflush | ||
4447 | 353 | #define __SNR_bdflush __NR_bdflush | ||
4448 | 354 | #else | ||
4449 | 355 | #define __SNR_bdflush __PNR_bdflush | ||
4450 | 356 | #endif | ||
4451 | 357 | |||
4452 | 358 | #ifdef __NR_bind | ||
4453 | 359 | #define __SNR_bind __NR_bind | ||
4454 | 360 | #else | ||
4455 | 361 | #define __SNR_bind __PNR_bind | ||
4456 | 362 | #endif | ||
4457 | 363 | |||
4458 | 364 | #define __SNR_bpf __NR_bpf | ||
4459 | 365 | |||
4460 | 366 | #ifdef __NR_break | ||
4461 | 367 | #define __SNR_break __NR_break | ||
4462 | 368 | #else | ||
4463 | 369 | #define __SNR_break __PNR_break | ||
4464 | 370 | #endif | ||
4465 | 371 | |||
4466 | 372 | #ifdef __NR_breakpoint | ||
4467 | 373 | #ifdef __ARM_NR_breakpoint | ||
4468 | 374 | #define __SNR_breakpoint __ARM_NR_breakpoint | ||
4469 | 375 | #else | ||
4470 | 376 | #define __SNR_breakpoint __NR_breakpoint | ||
4471 | 377 | #endif | ||
4472 | 378 | #else | ||
4473 | 379 | #define __SNR_breakpoint __PNR_breakpoint | ||
4474 | 380 | #endif | ||
4475 | 381 | |||
4476 | 382 | #define __SNR_brk __NR_brk | ||
4477 | 383 | |||
4478 | 384 | #ifdef __NR_cachectl | ||
4479 | 385 | #define __SNR_cachectl __NR_cachectl | ||
4480 | 386 | #else | ||
4481 | 387 | #define __SNR_cachectl __PNR_cachectl | ||
4482 | 388 | #endif | ||
4483 | 389 | |||
4484 | 390 | #ifdef __NR_cacheflush | ||
4485 | 391 | #ifdef __ARM_NR_cacheflush | ||
4486 | 392 | #define __SNR_cacheflush __ARM_NR_cacheflush | ||
4487 | 393 | #else | ||
4488 | 394 | #define __SNR_cacheflush __NR_cacheflush | ||
4489 | 395 | #endif | ||
4490 | 396 | #else | ||
4491 | 397 | #define __SNR_cacheflush __PNR_cacheflush | ||
4492 | 398 | #endif | ||
4493 | 399 | |||
4494 | 400 | #define __SNR_capget __NR_capget | ||
4495 | 401 | |||
4496 | 402 | #define __SNR_capset __NR_capset | ||
4497 | 403 | |||
4498 | 404 | #define __SNR_chdir __NR_chdir | ||
4499 | 405 | |||
4500 | 406 | #ifdef __NR_chmod | ||
4501 | 407 | #define __SNR_chmod __NR_chmod | ||
4502 | 408 | #else | ||
4503 | 409 | #define __SNR_chmod __PNR_chmod | ||
4504 | 410 | #endif | ||
4505 | 411 | |||
4506 | 412 | #ifdef __NR_chown | ||
4507 | 413 | #define __SNR_chown __NR_chown | ||
4508 | 414 | #else | ||
4509 | 415 | #define __SNR_chown __PNR_chown | ||
4510 | 416 | #endif | ||
4511 | 417 | |||
4512 | 418 | #ifdef __NR_chown32 | ||
4513 | 419 | #define __SNR_chown32 __NR_chown32 | ||
4514 | 420 | #else | ||
4515 | 421 | #define __SNR_chown32 __PNR_chown32 | ||
4516 | 422 | #endif | ||
4517 | 423 | |||
4518 | 424 | #define __SNR_chroot __NR_chroot | ||
4519 | 425 | |||
4520 | 426 | #define __SNR_clock_adjtime __NR_clock_adjtime | ||
4521 | 427 | |||
4522 | 428 | #ifdef __NR_clock_adjtime64 | ||
4523 | 429 | #define __SNR_clock_adjtime64 __NR_clock_adjtime64 | ||
4524 | 430 | #else | ||
4525 | 431 | #define __SNR_clock_adjtime64 __PNR_clock_adjtime64 | ||
4526 | 432 | #endif | ||
4527 | 433 | |||
4528 | 434 | #define __SNR_clock_getres __NR_clock_getres | ||
4529 | 435 | |||
4530 | 436 | #ifdef __NR_clock_getres_time64 | ||
4531 | 437 | #define __SNR_clock_getres_time64 __NR_clock_getres_time64 | ||
4532 | 438 | #else | ||
4533 | 439 | #define __SNR_clock_getres_time64 __PNR_clock_getres_time64 | ||
4534 | 440 | #endif | ||
4535 | 441 | |||
4536 | 442 | #define __SNR_clock_gettime __NR_clock_gettime | ||
4537 | 443 | |||
4538 | 444 | #ifdef __NR_clock_gettime64 | ||
4539 | 445 | #define __SNR_clock_gettime64 __NR_clock_gettime64 | ||
4540 | 446 | #else | ||
4541 | 447 | #define __SNR_clock_gettime64 __PNR_clock_gettime64 | ||
4542 | 448 | #endif | ||
4543 | 449 | |||
4544 | 450 | #define __SNR_clock_nanosleep __NR_clock_nanosleep | ||
4545 | 451 | |||
4546 | 452 | #ifdef __NR_clock_nanosleep_time64 | ||
4547 | 453 | #define __SNR_clock_nanosleep_time64 __NR_clock_nanosleep_time64 | ||
4548 | 454 | #else | ||
4549 | 455 | #define __SNR_clock_nanosleep_time64 __PNR_clock_nanosleep_time64 | ||
4550 | 456 | #endif | ||
4551 | 457 | |||
4552 | 458 | #define __SNR_clock_settime __NR_clock_settime | ||
4553 | 459 | |||
4554 | 460 | #ifdef __NR_clock_settime64 | ||
4555 | 461 | #define __SNR_clock_settime64 __NR_clock_settime64 | ||
4556 | 462 | #else | ||
4557 | 463 | #define __SNR_clock_settime64 __PNR_clock_settime64 | ||
4558 | 464 | #endif | ||
4559 | 465 | |||
4560 | 466 | #define __SNR_clone __NR_clone | ||
4561 | 467 | |||
4562 | 468 | #ifdef __NR_clone3 | ||
4563 | 469 | #define __SNR_clone3 __NR_clone3 | ||
4564 | 470 | #else | ||
4565 | 471 | #define __SNR_clone3 __PNR_clone3 | ||
4566 | 472 | #endif | ||
4567 | 473 | |||
4568 | 474 | #define __SNR_close __NR_close | ||
4569 | 475 | |||
4570 | 476 | #ifdef __NR_connect | ||
4571 | 477 | #define __SNR_connect __NR_connect | ||
4572 | 478 | #else | ||
4573 | 479 | #define __SNR_connect __PNR_connect | ||
4574 | 480 | #endif | ||
4575 | 481 | |||
4576 | 482 | #define __SNR_copy_file_range __NR_copy_file_range | ||
4577 | 483 | |||
4578 | 484 | #ifdef __NR_creat | ||
4579 | 485 | #define __SNR_creat __NR_creat | ||
4580 | 486 | #else | ||
4581 | 487 | #define __SNR_creat __PNR_creat | ||
4582 | 488 | #endif | ||
4583 | 489 | |||
4584 | 490 | #ifdef __NR_create_module | ||
4585 | 491 | #define __SNR_create_module __NR_create_module | ||
4586 | 492 | #else | ||
4587 | 493 | #define __SNR_create_module __PNR_create_module | ||
4588 | 494 | #endif | ||
4589 | 495 | |||
4590 | 496 | #define __SNR_delete_module __NR_delete_module | ||
4591 | 497 | |||
4592 | 498 | #ifdef __NR_dup | ||
4593 | 499 | #define __SNR_dup __NR_dup | ||
4594 | 500 | #else | ||
4595 | 501 | #define __SNR_dup __PNR_dup | ||
4596 | 502 | #endif | ||
4597 | 503 | |||
4598 | 504 | #ifdef __NR_dup2 | ||
4599 | 505 | #define __SNR_dup2 __NR_dup2 | ||
4600 | 506 | #else | ||
4601 | 507 | #define __SNR_dup2 __PNR_dup2 | ||
4602 | 508 | #endif | ||
4603 | 509 | |||
4604 | 510 | #define __SNR_dup3 __NR_dup3 | ||
4605 | 511 | |||
4606 | 512 | #ifdef __NR_epoll_create | ||
4607 | 513 | #define __SNR_epoll_create __NR_epoll_create | ||
4608 | 514 | #else | ||
4609 | 515 | #define __SNR_epoll_create __PNR_epoll_create | ||
4610 | 516 | #endif | ||
4611 | 517 | |||
4612 | 518 | #define __SNR_epoll_create1 __NR_epoll_create1 | ||
4613 | 519 | |||
4614 | 520 | #ifdef __NR_epoll_ctl | ||
4615 | 521 | #define __SNR_epoll_ctl __NR_epoll_ctl | ||
4616 | 522 | #else | ||
4617 | 523 | #define __SNR_epoll_ctl __PNR_epoll_ctl | ||
4618 | 524 | #endif | ||
4619 | 525 | |||
4620 | 526 | #ifdef __NR_epoll_ctl_old | ||
4621 | 527 | #define __SNR_epoll_ctl_old __NR_epoll_ctl_old | ||
4622 | 528 | #else | ||
4623 | 529 | #define __SNR_epoll_ctl_old __PNR_epoll_ctl_old | ||
4624 | 530 | #endif | ||
4625 | 531 | |||
4626 | 532 | #define __SNR_epoll_pwait __NR_epoll_pwait | ||
4627 | 533 | |||
4628 | 534 | #ifdef __NR_epoll_wait | ||
4629 | 535 | #define __SNR_epoll_wait __NR_epoll_wait | ||
4630 | 536 | #else | ||
4631 | 537 | #define __SNR_epoll_wait __PNR_epoll_wait | ||
4632 | 538 | #endif | ||
4633 | 539 | |||
4634 | 540 | #ifdef __NR_epoll_wait_old | ||
4635 | 541 | #define __SNR_epoll_wait_old __NR_epoll_wait_old | ||
4636 | 542 | #else | ||
4637 | 543 | #define __SNR_epoll_wait_old __PNR_epoll_wait_old | ||
4638 | 544 | #endif | ||
4639 | 545 | |||
4640 | 546 | #ifdef __NR_eventfd | ||
4641 | 547 | #define __SNR_eventfd __NR_eventfd | ||
4642 | 548 | #else | ||
4643 | 549 | #define __SNR_eventfd __PNR_eventfd | ||
4644 | 550 | #endif | ||
4645 | 551 | |||
4646 | 552 | #define __SNR_eventfd2 __NR_eventfd2 | ||
4647 | 553 | |||
4648 | 554 | #define __SNR_execve __NR_execve | ||
4649 | 555 | |||
4650 | 556 | #define __SNR_execveat __NR_execveat | ||
4651 | 557 | |||
4652 | 558 | #define __SNR_exit __NR_exit | ||
4653 | 559 | |||
4654 | 560 | #define __SNR_exit_group __NR_exit_group | ||
4655 | 561 | |||
4656 | 562 | #define __SNR_faccessat __NR_faccessat | ||
4657 | 563 | |||
4658 | 564 | #ifdef __NR_fadvise64 | ||
4659 | 565 | #define __SNR_fadvise64 __NR_fadvise64 | ||
4660 | 566 | #else | ||
4661 | 567 | #define __SNR_fadvise64 __PNR_fadvise64 | ||
4662 | 568 | #endif | ||
4663 | 569 | |||
4664 | 570 | #ifdef __NR_fadvise64_64 | ||
4665 | 571 | #define __SNR_fadvise64_64 __NR_fadvise64_64 | ||
4666 | 572 | #else | ||
4667 | 573 | #define __SNR_fadvise64_64 __PNR_fadvise64_64 | ||
4668 | 574 | #endif | ||
4669 | 575 | |||
4670 | 576 | #define __SNR_fallocate __NR_fallocate | ||
4671 | 577 | |||
4672 | 578 | #define __SNR_fanotify_init __NR_fanotify_init | ||
4673 | 579 | |||
4674 | 580 | #define __SNR_fanotify_mark __NR_fanotify_mark | ||
4675 | 581 | |||
4676 | 582 | #define __SNR_fchdir __NR_fchdir | ||
4677 | 583 | |||
4678 | 584 | #define __SNR_fchmod __NR_fchmod | ||
4679 | 585 | |||
4680 | 586 | #define __SNR_fchmodat __NR_fchmodat | ||
4681 | 587 | |||
4682 | 588 | #ifdef __NR_fchown | ||
4683 | 589 | #define __SNR_fchown __NR_fchown | ||
4684 | 590 | #else | ||
4685 | 591 | #define __SNR_fchown __PNR_fchown | ||
4686 | 592 | #endif | ||
4687 | 593 | |||
4688 | 594 | #ifdef __NR_fchown32 | ||
4689 | 595 | #define __SNR_fchown32 __NR_fchown32 | ||
4690 | 596 | #else | ||
4691 | 597 | #define __SNR_fchown32 __PNR_fchown32 | ||
4692 | 598 | #endif | ||
4693 | 599 | |||
4694 | 600 | #define __SNR_fchownat __NR_fchownat | ||
4695 | 601 | |||
4696 | 602 | #ifdef __NR_fcntl | ||
4697 | 603 | #define __SNR_fcntl __NR_fcntl | ||
4698 | 604 | #else | ||
4699 | 605 | #define __SNR_fcntl __PNR_fcntl | ||
4700 | 606 | #endif | ||
4701 | 607 | |||
4702 | 608 | #ifdef __NR_fcntl64 | ||
4703 | 609 | #define __SNR_fcntl64 __NR_fcntl64 | ||
4704 | 610 | #else | ||
4705 | 611 | #define __SNR_fcntl64 __PNR_fcntl64 | ||
4706 | 612 | #endif | ||
4707 | 613 | |||
4708 | 614 | #define __SNR_fdatasync __NR_fdatasync | ||
4709 | 615 | |||
4710 | 616 | #define __SNR_fgetxattr __NR_fgetxattr | ||
4711 | 617 | |||
4712 | 618 | #define __SNR_finit_module __NR_finit_module | ||
4713 | 619 | |||
4714 | 620 | #define __SNR_flistxattr __NR_flistxattr | ||
4715 | 621 | |||
4716 | 622 | #define __SNR_flock __NR_flock | ||
4717 | 623 | |||
4718 | 624 | #ifdef __NR_fork | ||
4719 | 625 | #define __SNR_fork __NR_fork | ||
4720 | 626 | #else | ||
4721 | 627 | #define __SNR_fork __PNR_fork | ||
4722 | 628 | #endif | ||
4723 | 629 | |||
4724 | 630 | #define __SNR_fremovexattr __NR_fremovexattr | ||
4725 | 631 | |||
4726 | 632 | #ifdef __NR_fsconfig | ||
4727 | 633 | #define __SNR_fsconfig __NR_fsconfig | ||
4728 | 634 | #else | ||
4729 | 635 | #define __SNR_fsconfig __PNR_fsconfig | ||
4730 | 636 | #endif | ||
4731 | 637 | |||
4732 | 638 | #define __SNR_fsetxattr __NR_fsetxattr | ||
4733 | 639 | |||
4734 | 640 | #ifdef __NR_fsmount | ||
4735 | 641 | #define __SNR_fsmount __NR_fsmount | ||
4736 | 642 | #else | ||
4737 | 643 | #define __SNR_fsmount __PNR_fsmount | ||
4738 | 644 | #endif | ||
4739 | 645 | |||
4740 | 646 | #ifdef __NR_fsopen | ||
4741 | 647 | #define __SNR_fsopen __NR_fsopen | ||
4742 | 648 | #else | ||
4743 | 649 | #define __SNR_fsopen __PNR_fsopen | ||
4744 | 650 | #endif | ||
4745 | 651 | |||
4746 | 652 | #ifdef __NR_fspick | ||
4747 | 653 | #define __SNR_fspick __NR_fspick | ||
4748 | 654 | #else | ||
4749 | 655 | #define __SNR_fspick __PNR_fspick | ||
4750 | 656 | #endif | ||
4751 | 657 | |||
4752 | 658 | #ifdef __NR_fstat | ||
4753 | 659 | #define __SNR_fstat __NR_fstat | ||
4754 | 660 | #else | ||
4755 | 661 | #define __SNR_fstat __PNR_fstat | ||
4756 | 662 | #endif | ||
4757 | 663 | |||
4758 | 664 | #ifdef __NR_fstat64 | ||
4759 | 665 | #define __SNR_fstat64 __NR_fstat64 | ||
4760 | 666 | #else | ||
4761 | 667 | #define __SNR_fstat64 __PNR_fstat64 | ||
4762 | 668 | #endif | ||
4763 | 669 | |||
4764 | 670 | #ifdef __NR_fstatat64 | ||
4765 | 671 | #define __SNR_fstatat64 __NR_fstatat64 | ||
4766 | 672 | #else | ||
4767 | 673 | #define __SNR_fstatat64 __PNR_fstatat64 | ||
4768 | 674 | #endif | ||
4769 | 675 | |||
4770 | 676 | #ifdef __NR_fstatfs | ||
4771 | 677 | #define __SNR_fstatfs __NR_fstatfs | ||
4772 | 678 | #else | ||
4773 | 679 | #define __SNR_fstatfs __PNR_fstatfs | ||
4774 | 680 | #endif | ||
4775 | 681 | |||
4776 | 682 | #ifdef __NR_fstatfs64 | ||
4777 | 683 | #define __SNR_fstatfs64 __NR_fstatfs64 | ||
4778 | 684 | #else | ||
4779 | 685 | #define __SNR_fstatfs64 __PNR_fstatfs64 | ||
4780 | 686 | #endif | ||
4781 | 687 | |||
4782 | 688 | #define __SNR_fsync __NR_fsync | ||
4783 | 689 | |||
4784 | 690 | #ifdef __NR_ftime | ||
4785 | 691 | #define __SNR_ftime __NR_ftime | ||
4786 | 692 | #else | ||
4787 | 693 | #define __SNR_ftime __PNR_ftime | ||
4788 | 694 | #endif | ||
4789 | 695 | |||
4790 | 696 | #ifdef __NR_ftruncate | ||
4791 | 697 | #define __SNR_ftruncate __NR_ftruncate | ||
4792 | 698 | #else | ||
4793 | 699 | #define __SNR_ftruncate __PNR_ftruncate | ||
4794 | 700 | #endif | ||
4795 | 701 | |||
4796 | 702 | #ifdef __NR_ftruncate64 | ||
4797 | 703 | #define __SNR_ftruncate64 __NR_ftruncate64 | ||
4798 | 704 | #else | ||
4799 | 705 | #define __SNR_ftruncate64 __PNR_ftruncate64 | ||
4800 | 706 | #endif | ||
4801 | 707 | |||
4802 | 708 | #define __SNR_futex __NR_futex | ||
4803 | 709 | |||
4804 | 710 | #ifdef __NR_futex_time64 | ||
4805 | 711 | #define __SNR_futex_time64 __NR_futex_time64 | ||
4806 | 712 | #else | ||
4807 | 713 | #define __SNR_futex_time64 __PNR_futex_time64 | ||
4808 | 714 | #endif | ||
4809 | 715 | |||
4810 | 716 | #ifdef __NR_futimesat | ||
4811 | 717 | #define __SNR_futimesat __NR_futimesat | ||
4812 | 718 | #else | ||
4813 | 719 | #define __SNR_futimesat __PNR_futimesat | ||
4814 | 720 | #endif | ||
4815 | 721 | |||
4816 | 722 | #ifdef __NR_get_kernel_syms | ||
4817 | 723 | #define __SNR_get_kernel_syms __NR_get_kernel_syms | ||
4818 | 724 | #else | ||
4819 | 725 | #define __SNR_get_kernel_syms __PNR_get_kernel_syms | ||
4820 | 726 | #endif | ||
4821 | 727 | |||
4822 | 728 | #ifdef __NR_get_mempolicy | ||
4823 | 729 | #define __SNR_get_mempolicy __NR_get_mempolicy | ||
4824 | 730 | #else | ||
4825 | 731 | #define __SNR_get_mempolicy __PNR_get_mempolicy | ||
4826 | 732 | #endif | ||
4827 | 733 | |||
4828 | 734 | #define __SNR_get_robust_list __NR_get_robust_list | ||
4829 | 735 | |||
4830 | 736 | #ifdef __NR_get_thread_area | ||
4831 | 737 | #define __SNR_get_thread_area __NR_get_thread_area | ||
4832 | 738 | #else | ||
4833 | 739 | #define __SNR_get_thread_area __PNR_get_thread_area | ||
4834 | 740 | #endif | ||
4835 | 741 | |||
4836 | 742 | #ifdef __NR_get_tls | ||
4837 | 743 | #ifdef __ARM_NR_get_tls | ||
4838 | 744 | #define __SNR_get_tls __ARM_NR_get_tls | ||
4839 | 745 | #else | ||
4840 | 746 | #define __SNR_get_tls __NR_get_tls | ||
4841 | 747 | #endif | ||
4842 | 748 | #else | ||
4843 | 749 | #define __SNR_get_tls __PNR_get_tls | ||
4844 | 750 | #endif | ||
4845 | 751 | |||
4846 | 752 | #define __SNR_getcpu __NR_getcpu | ||
4847 | 753 | |||
4848 | 754 | #define __SNR_getcwd __NR_getcwd | ||
4849 | 755 | |||
4850 | 756 | #ifdef __NR_getdents | ||
4851 | 757 | #define __SNR_getdents __NR_getdents | ||
4852 | 758 | #else | ||
4853 | 759 | #define __SNR_getdents __PNR_getdents | ||
4854 | 760 | #endif | ||
4855 | 761 | |||
4856 | 762 | #define __SNR_getdents64 __NR_getdents64 | ||
4857 | 763 | |||
4858 | 764 | #ifdef __NR_getegid | ||
4859 | 765 | #define __SNR_getegid __NR_getegid | ||
4860 | 766 | #else | ||
4861 | 767 | #define __SNR_getegid __PNR_getegid | ||
4862 | 768 | #endif | ||
4863 | 769 | |||
4864 | 770 | #ifdef __NR_getegid32 | ||
4865 | 771 | #define __SNR_getegid32 __NR_getegid32 | ||
4866 | 772 | #else | ||
4867 | 773 | #define __SNR_getegid32 __PNR_getegid32 | ||
4868 | 774 | #endif | ||
4869 | 775 | |||
4870 | 776 | #ifdef __NR_geteuid | ||
4871 | 777 | #define __SNR_geteuid __NR_geteuid | ||
4872 | 778 | #else | ||
4873 | 779 | #define __SNR_geteuid __PNR_geteuid | ||
4874 | 780 | #endif | ||
4875 | 781 | |||
4876 | 782 | #ifdef __NR_geteuid32 | ||
4877 | 783 | #define __SNR_geteuid32 __NR_geteuid32 | ||
4878 | 784 | #else | ||
4879 | 785 | #define __SNR_geteuid32 __PNR_geteuid32 | ||
4880 | 786 | #endif | ||
4881 | 787 | |||
4882 | 788 | #ifdef __NR_getgid | ||
4883 | 789 | #define __SNR_getgid __NR_getgid | ||
4884 | 790 | #else | ||
4885 | 791 | #define __SNR_getgid __PNR_getgid | ||
4886 | 792 | #endif | ||
4887 | 793 | |||
4888 | 794 | #ifdef __NR_getgid32 | ||
4889 | 795 | #define __SNR_getgid32 __NR_getgid32 | ||
4890 | 796 | #else | ||
4891 | 797 | #define __SNR_getgid32 __PNR_getgid32 | ||
4892 | 798 | #endif | ||
4893 | 799 | |||
4894 | 800 | #ifdef __NR_getgroups | ||
4895 | 801 | #define __SNR_getgroups __NR_getgroups | ||
4896 | 802 | #else | ||
4897 | 803 | #define __SNR_getgroups __PNR_getgroups | ||
4898 | 804 | #endif | ||
4899 | 805 | |||
4900 | 806 | #ifdef __NR_getgroups32 | ||
4901 | 807 | #define __SNR_getgroups32 __NR_getgroups32 | ||
4902 | 808 | #else | ||
4903 | 809 | #define __SNR_getgroups32 __PNR_getgroups32 | ||
4904 | 810 | #endif | ||
4905 | 811 | |||
4906 | 812 | #define __SNR_getitimer __NR_getitimer | ||
4907 | 813 | |||
4908 | 814 | #ifdef __NR_getpeername | ||
4909 | 815 | #define __SNR_getpeername __NR_getpeername | ||
4910 | 816 | #else | ||
4911 | 817 | #define __SNR_getpeername __PNR_getpeername | ||
4912 | 818 | #endif | ||
4913 | 819 | |||
4914 | 820 | #define __SNR_getpgid __NR_getpgid | ||
4915 | 821 | |||
4916 | 822 | #ifdef __NR_getpgrp | ||
4917 | 823 | #define __SNR_getpgrp __NR_getpgrp | ||
4918 | 824 | #else | ||
4919 | 825 | #define __SNR_getpgrp __PNR_getpgrp | ||
4920 | 826 | #endif | ||
4921 | 827 | |||
4922 | 828 | #define __SNR_getpid __NR_getpid | ||
4923 | 829 | |||
4924 | 830 | #ifdef __NR_getpmsg | ||
4925 | 831 | #define __SNR_getpmsg __NR_getpmsg | ||
4926 | 832 | #else | ||
4927 | 833 | #define __SNR_getpmsg __PNR_getpmsg | ||
4928 | 834 | #endif | ||
4929 | 835 | |||
4930 | 836 | #define __SNR_getppid __NR_getppid | ||
4931 | 837 | |||
4932 | 838 | #define __SNR_getpriority __NR_getpriority | ||
4933 | 839 | |||
4934 | 840 | #ifdef __NR_getrandom | ||
4935 | 841 | #define __SNR_getrandom __NR_getrandom | ||
4936 | 842 | #else | ||
4937 | 843 | #define __SNR_getrandom __PNR_getrandom | ||
4938 | 844 | #endif | ||
4939 | 845 | |||
4940 | 846 | #ifdef __NR_getresgid | ||
4941 | 847 | #define __SNR_getresgid __NR_getresgid | ||
4942 | 848 | #else | ||
4943 | 849 | #define __SNR_getresgid __PNR_getresgid | ||
4944 | 850 | #endif | ||
4945 | 851 | |||
4946 | 852 | #ifdef __NR_getresgid32 | ||
4947 | 853 | #define __SNR_getresgid32 __NR_getresgid32 | ||
4948 | 854 | #else | ||
4949 | 855 | #define __SNR_getresgid32 __PNR_getresgid32 | ||
4950 | 856 | #endif | ||
4951 | 857 | |||
4952 | 858 | #ifdef __NR_getresuid | ||
4953 | 859 | #define __SNR_getresuid __NR_getresuid | ||
4954 | 860 | #else | ||
4955 | 861 | #define __SNR_getresuid __PNR_getresuid | ||
4956 | 862 | #endif | ||
4957 | 863 | |||
4958 | 864 | #ifdef __NR_getresuid32 | ||
4959 | 865 | #define __SNR_getresuid32 __NR_getresuid32 | ||
4960 | 866 | #else | ||
4961 | 867 | #define __SNR_getresuid32 __PNR_getresuid32 | ||
4962 | 868 | #endif | ||
4963 | 869 | |||
4964 | 870 | #ifdef __NR_getrlimit | ||
4965 | 871 | #define __SNR_getrlimit __NR_getrlimit | ||
4966 | 872 | #else | ||
4967 | 873 | #define __SNR_getrlimit __PNR_getrlimit | ||
4968 | 874 | #endif | ||
4969 | 875 | |||
4970 | 876 | #define __SNR_getrusage __NR_getrusage | ||
4971 | 877 | |||
4972 | 878 | #define __SNR_getsid __NR_getsid | ||
4973 | 879 | |||
4974 | 880 | #ifdef __NR_getsockname | ||
4975 | 881 | #define __SNR_getsockname __NR_getsockname | ||
4976 | 882 | #else | ||
4977 | 883 | #define __SNR_getsockname __PNR_getsockname | ||
4978 | 884 | #endif | ||
4979 | 885 | |||
4980 | 886 | #ifdef __NR_getsockopt | ||
4981 | 887 | #define __SNR_getsockopt __NR_getsockopt | ||
4982 | 888 | #else | ||
4983 | 889 | #define __SNR_getsockopt __PNR_getsockopt | ||
4984 | 890 | #endif | ||
4985 | 891 | |||
4986 | 892 | #define __SNR_gettid __NR_gettid | ||
4987 | 893 | |||
4988 | 894 | #define __SNR_gettimeofday __NR_gettimeofday | ||
4989 | 895 | |||
4990 | 896 | #ifdef __NR_getuid | ||
4991 | 897 | #define __SNR_getuid __NR_getuid | ||
4992 | 898 | #else | ||
4993 | 899 | #define __SNR_getuid __PNR_getuid | ||
4994 | 900 | #endif | ||
4995 | 901 | |||
4996 | 902 | #ifdef __NR_getuid32 | ||
4997 | 903 | #define __SNR_getuid32 __NR_getuid32 | ||
4998 | 904 | #else | ||
4999 | 905 | #define __SNR_getuid32 __PNR_getuid32 | ||
5000 | 906 | #endif |
This is a bit odd in git-ubuntu.
As part of the python transition this was already made a sync [1] in Focal (by I guess doko).
But due to that being FTBFS it never entered proposed so far. 19.10.3.
Due to that git-ubuntu is on 2.4.1-2 while rmadison and co report 2.4.1-0ubuntu0.
Build test PPA is at: https:/ /launchpad. net/~paelzer/ +archive/ ubuntu/ bug-1849785- libseccomp- ftbfs
[1]: https:/ /launchpad. net/ubuntu/ +source/ libseccomp/ 2.4.1-2