summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-02-10 10:37:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-16 09:46:28 +0000
commit6957ff06a0ab978f73221766541c9541b9f7d1dd (patch)
tree08194d403a20d2b0ae4d6a23f59e088b97eac65c /meta/recipes-devtools/binutils
parent1239b8e3e28516dd97df4f51d6c2f6d71eda1d46 (diff)
downloadpoky-6957ff06a0ab978f73221766541c9541b9f7d1dd.tar.gz
binutils: Upgrade to 2.38 release
Release Notes are here [1] [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00009.html (From OE-Core rev: 77a1038828e638518dceda969da0817aa13eb5d3) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.37.inc39
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.38.inc35
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.38.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.37.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-testsuite_2.38.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.37.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.38.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.37.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.38.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch2001
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch12
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-elf-Discard-input-.note.gnu.build-id-sections.patch215
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch16
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch (renamed from meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch)8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch (renamed from meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch)8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch (renamed from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch)6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-warn-for-uses-of-system-directories-when-cross-linki.patch (renamed from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch)48
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch (renamed from meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch)7
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-Use-libtool-2.4.patch (renamed from meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch)3714
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch (renamed from meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch)2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-sync-with-OE-libtool-changes.patch (renamed from meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch)2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Check-for-clang-before-checking-gcc-version.patch (renamed from meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch)8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch234
-rw-r--r--meta/recipes-devtools/binutils/binutils/161e87d12167b1e36193385485c1f6ce92f74f02.patch247
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.38.bb (renamed from meta/recipes-devtools/binutils/binutils_2.37.bb)0
23 files changed, 3006 insertions, 3600 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc b/meta/recipes-devtools/binutils/binutils-2.37.inc
deleted file mode 100644
index bc6eef0fbb..0000000000
--- a/meta/recipes-devtools/binutils/binutils-2.37.inc
+++ /dev/null
@@ -1,39 +0,0 @@
1LIC_FILES_CHKSUM="\
2 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
3 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\
4 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\
5 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6\
6 file://gas/COPYING;md5=d32239bcb673463ab874e80d47fae504\
7 file://include/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
8 file://include/COPYING3;md5=d32239bcb673463ab874e80d47fae504\
9 file://libiberty/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7\
10 file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
11 "
12
13# When upgrading to 2.37, please make sure there is no trailing .0, so
14# that upstream version check can work correctly.
15PV = "2.37"
16CVE_VERSION = "2.37"
17SRCBRANCH ?= "binutils-2_37-branch"
18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20
21SRCREV ?= "87d4632d36323091e731eb07b8aa65f90293da66"
22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git"
23SRC_URI = "\
24 ${BINUTILS_GIT_URI} \
25 file://0005-Point-scripts-location-to-libdir.patch \
26 file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
27 file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
28 file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \
29 file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
30 file://0013-Use-libtool-2.4.patch \
31 file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
32 file://0015-sync-with-OE-libtool-changes.patch \
33 file://0016-Check-for-clang-before-checking-gcc-version.patch \
34 file://0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch \
35 file://0001-elf-Discard-input-.note.gnu.build-id-sections.patch \
36 file://0001-CVE-2021-42574.patch \
37 file://161e87d12167b1e36193385485c1f6ce92f74f02.patch \
38"
39S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils-2.38.inc b/meta/recipes-devtools/binutils/binutils-2.38.inc
new file mode 100644
index 0000000000..6d4415048a
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.38.inc
@@ -0,0 +1,35 @@
1LIC_FILES_CHKSUM="\
2 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
3 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\
4 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\
5 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6\
6 file://gas/COPYING;md5=d32239bcb673463ab874e80d47fae504\
7 file://include/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
8 file://include/COPYING3;md5=d32239bcb673463ab874e80d47fae504\
9 file://libiberty/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7\
10 file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
11 "
12
13# When upgrading to 2.39, please make sure there is no trailing .0, so
14# that upstream version check can work correctly.
15PV = "2.38"
16CVE_VERSION = "2.38"
17SRCBRANCH ?= "binutils-2_38-branch"
18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20
21SRCREV ?= "a96f7ba94b69b588bf524624ff2410b31420c957"
22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git"
23SRC_URI = "\
24 ${BINUTILS_GIT_URI} \
25 file://0004-Point-scripts-location-to-libdir.patch \
26 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
27 file://0006-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
28 file://0007-warn-for-uses-of-system-directories-when-cross-linki.patch \
29 file://0008-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
30 file://0009-Use-libtool-2.4.patch \
31 file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
32 file://0011-sync-with-OE-libtool-changes.patch \
33 file://0012-Check-for-clang-before-checking-gcc-version.patch \
34"
35S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.37.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.38.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.37.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.38.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.37.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.38.bb
index ca99e91130..ca99e91130 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.37.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.38.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.37.bb b/meta/recipes-devtools/binutils/binutils-cross_2.38.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.37.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.38.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.38.bb
index 5bd036fd46..5bd036fd46 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.38.bb
diff --git a/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch b/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch
deleted file mode 100644
index 0622ae389e..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch
+++ /dev/null
@@ -1,2001 +0,0 @@
1From b3aa80b45c4f46029efeb204bb9f2d2c4278a0e5 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Tue, 9 Nov 2021 13:25:42 +0000
4Subject: [PATCH] Add --unicode option to control how unicode characters are
5 handled by display tools.
6
7 * nm.c: Add --unicode option to control how unicode characters are
8 handled.
9 * objdump.c: Likewise.
10 * readelf.c: Likewise.
11 * strings.c: Likewise.
12 * binutils.texi: Document the new feature.
13 * NEWS: Document the new feature.
14 * testsuite/binutils-all/unicode.exp: New file.
15 * testsuite/binutils-all/nm.hex.unicode
16 * testsuite/binutils-all/strings.escape.unicode
17 * testsuite/binutils-all/objdump.highlight.unicode
18 * testsuite/binutils-all/readelf.invalid.unicode
19
20CVE: CVE-2021-42574
21Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=b3aa80b45c4f46029efeb204bb9f2d2c4278a0e5]
22
23RP: Added tweak uint -> unsigned int partial backport of
24https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=795588aec4f894206863c938bd6d716895886009
25
26Signed-off-by: pgowda <pgowda.cve@gmail.com>
27---
28 binutils/ChangeLog | 15 +
29 binutils/NEWS | 9 +
30 binutils/doc/binutils.texi | 78 ++++
31 binutils/nm.c | 228 ++++++++++-
32 binutils/objdump.c | 235 ++++++++++--
33 binutils/readelf.c | 190 +++++++++-
34 binutils/strings.c | 757 ++++++++++++++++++++++++++++++++++---
35 7 files changed, 1409 insertions(+), 103 deletions(-)
36
37diff --git a/binutils/ChangeLog b/binutils/ChangeLog
38--- a/binutils/ChangeLog 2021-12-19 19:00:27.038540406 -0800
39+++ b/binutils/ChangeLog 2021-12-19 19:28:42.733565078 -0800
40@@ -1,3 +1,18 @@
41+2021-11-09 Nick Clifton <nickc@redhat.com>
42+
43+ * nm.c: Add --unicode option to control how unicode characters are
44+ handled.
45+ * objdump.c: Likewise.
46+ * readelf.c: Likewise.
47+ * strings.c: Likewise.
48+ * binutils.texi: Document the new feature.
49+ * NEWS: Document the new feature.
50+ * testsuite/binutils-all/unicode.exp: New file.
51+ * testsuite/binutils-all/nm.hex.unicode
52+ * testsuite/binutils-all/strings.escape.unicode
53+ * testsuite/binutils-all/objdump.highlight.unicode
54+ * testsuite/binutils-all/readelf.invalid.unicode
55+
56 2021-07-16 Nick Clifton <nickc@redhat.com>
57
58 * po/sv.po: Updated Swedish translation.
59diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
60--- a/binutils/doc/binutils.texi 2021-12-19 19:00:27.042540338 -0800
61+++ b/binutils/doc/binutils.texi 2021-12-19 19:27:56.526354667 -0800
62@@ -812,6 +812,7 @@ nm [@option{-A}|@option{-o}|@option{--pr
63 [@option{-s}|@option{--print-armap}]
64 [@option{-t} @var{radix}|@option{--radix=}@var{radix}]
65 [@option{-u}|@option{--undefined-only}]
66+ [@option{-U} @var{method}] [@option{--unicode=}@var{method}]
67 [@option{-V}|@option{--version}]
68 [@option{-X 32_64}]
69 [@option{--defined-only}]
70@@ -1132,6 +1133,21 @@ Use @var{radix} as the radix for printin
71 @cindex undefined symbols
72 Display only undefined symbols (those external to each object file).
73
74+@item -U @var{[d|i|l|e|x|h]}
75+@itemx --unicode=@var{[default|invalid|locale|escape|hex|highlight]}
76+Controls the display of UTF-8 encoded mulibyte characters in strings.
77+The default (@option{--unicode=default}) is to give them no special
78+treatment. The @option{--unicode=locale} option displays the sequence
79+in the current locale, which may or may not support them. The options
80+@option{--unicode=hex} and @option{--unicode=invalid} display them as
81+hex byte sequences enclosed by either angle brackets or curly braces.
82+
83+The @option{--unicode=escape} option displays them as escape sequences
84+(@var{\uxxxx}) and the @option{--unicode=highlight} option displays
85+them as escape sequences highlighted in red (if supported by the
86+output device). The colouring is intended to draw attention to the
87+presence of unicode sequences where they might not be expected.
88+
89 @item -V
90 @itemx --version
91 Show the version number of @command{nm} and exit.
92@@ -2247,6 +2263,7 @@ objdump [@option{-a}|@option{--archive-h
93 [@option{--prefix-strip=}@var{level}]
94 [@option{--insn-width=}@var{width}]
95 [@option{--visualize-jumps[=color|=extended-color|=off]}
96+ [@option{-U} @var{method}] [@option{--unicode=}@var{method}]
97 [@option{-V}|@option{--version}]
98 [@option{-H}|@option{--help}]
99 @var{objfile}@dots{}
100@@ -2921,6 +2938,21 @@ When displaying symbols include those wh
101 special in some way and which would not normally be of interest to the
102 user.
103
104+@item -U @var{[d|i|l|e|x|h]}
105+@itemx --unicode=@var{[default|invalid|locale|escape|hex|highlight]}
106+Controls the display of UTF-8 encoded mulibyte characters in strings.
107+The default (@option{--unicode=default}) is to give them no special
108+treatment. The @option{--unicode=locale} option displays the sequence
109+in the current locale, which may or may not support them. The options
110+@option{--unicode=hex} and @option{--unicode=invalid} display them as
111+hex byte sequences enclosed by either angle brackets or curly braces.
112+
113+The @option{--unicode=escape} option displays them as escape sequences
114+(@var{\uxxxx}) and the @option{--unicode=highlight} option displays
115+them as escape sequences highlighted in red (if supported by the
116+output device). The colouring is intended to draw attention to the
117+presence of unicode sequences where they might not be expected.
118+
119 @item -V
120 @itemx --version
121 Print the version number of @command{objdump} and exit.
122@@ -3197,6 +3229,7 @@ strings [@option{-afovV}] [@option{-}@va
123 [@option{-n} @var{min-len}] [@option{--bytes=}@var{min-len}]
124 [@option{-t} @var{radix}] [@option{--radix=}@var{radix}]
125 [@option{-e} @var{encoding}] [@option{--encoding=}@var{encoding}]
126+ [@option{-U} @var{method}] [@option{--unicode=}@var{method}]
127 [@option{-}] [@option{--all}] [@option{--print-file-name}]
128 [@option{-T} @var{bfdname}] [@option{--target=}@var{bfdname}]
129 [@option{-w}] [@option{--include-all-whitespace}]
130@@ -3288,6 +3321,28 @@ single-8-bit-byte characters, @samp{b} =
131 littleendian. Useful for finding wide character strings. (@samp{l}
132 and @samp{b} apply to, for example, Unicode UTF-16/UCS-2 encodings).
133
134+@item -U @var{[d|i|l|e|x|h]}
135+@itemx --unicode=@var{[default|invalid|locale|escape|hex|highlight]}
136+Controls the display of UTF-8 encoded mulibyte characters in strings.
137+The default (@option{--unicode=default}) is to give them no special
138+treatment, and instead rely upon the setting of the
139+@option{--encoding} option. The other values for this option
140+automatically enable @option{--encoding=S}.
141+
142+The @option{--unicode=invalid} option treats them as non-graphic
143+characters and hence not part of a valid string. All the remaining
144+options treat them as valid string characters.
145+
146+The @option{--unicode=locale} option displays them in the current
147+locale, which may or may not support UTF-8 encoding. The
148+@option{--unicode=hex} option displays them as hex byte sequences
149+enclosed between @var{<>} characters. The @option{--unicode=escape}
150+option displays them as escape sequences (@var{\uxxxx}) and the
151+@option{--unicode=highlight} option displays them as escape sequences
152+highlighted in red (if supported by the output device). The colouring
153+is intended to draw attention to the presence of unicode sequences
154+where they might not be expected.
155+
156 @item -T @var{bfdname}
157 @itemx --target=@var{bfdname}
158 @cindex object code format
159@@ -4796,6 +4851,7 @@ readelf [@option{-a}|@option{--all}]
160 [@option{--demangle@var{=style}}|@option{--no-demangle}]
161 [@option{--quiet}]
162 [@option{--recurse-limit}|@option{--no-recurse-limit}]
163+ [@option{-U} @var{method}|@option{--unicode=}@var{method}]
164 [@option{-n}|@option{--notes}]
165 [@option{-r}|@option{--relocs}]
166 [@option{-u}|@option{--unwind}]
167@@ -4962,6 +5018,28 @@ necessary in order to demangle truly com
168 that if the recursion limit is disabled then stack exhaustion is
169 possible and any bug reports about such an event will be rejected.
170
171+@item -U @var{[d|i|l|e|x|h]}
172+@itemx --unicode=[default|invalid|locale|escape|hex|highlight]
173+Controls the display of non-ASCII characters in identifier names.
174+The default (@option{--unicode=locale} or @option{--unicode=default}) is
175+to treat them as multibyte characters and display them in the current
176+locale. All other versions of this option treat the bytes as UTF-8
177+encoded values and attempt to interpret them. If they cannot be
178+interpreted or if the @option{--unicode=invalid} option is used then
179+they are displayed as a sequence of hex bytes, encloses in curly
180+parethesis characters.
181+
182+Using the @option{--unicode=escape} option will display the characters
183+as as unicode escape sequences (@var{\uxxxx}). Using the
184+@option{--unicode=hex} will display the characters as hex byte
185+sequences enclosed between angle brackets.
186+
187+Using the @option{--unicode=highlight} will display the characters as
188+unicode escape sequences but it will also highlighted them in red,
189+assuming that colouring is supported by the output device. The
190+colouring is intended to draw attention to the presence of unicode
191+sequences when they might not be expected.
192+
193 @item -e
194 @itemx --headers
195 Display all the headers in the file. Equivalent to @option{-h -l -S}.
196diff --git a/binutils/NEWS b/binutils/NEWS
197--- a/binutils/NEWS 2021-12-19 19:00:27.038540406 -0800
198+++ b/binutils/NEWS 2021-12-19 19:30:04.764162972 -0800
199@@ -1,5 +1,14 @@
200 -*- text -*-
201
202+* Tools which display symbols or strings (readelf, strings, nm, objdump)
203+ have a new command line option which controls how unicode characters are
204+ handled. By default they are treated as normal for the tool. Using
205+ --unicode=locale will display them according to the current locale.
206+ Using --unicode=hex will display them as hex byte values, whilst
207+ --unicode=escape will display them as escape sequences. In addition
208+ using --unicode=highlight will display them as unicode escape sequences
209+ highlighted in red (if supported by the output device).
210+
211 Changes in 2.37:
212
213 * The readelf tool has a new command line option which can be used to specify
214diff --git a/binutils/nm.c b/binutils/nm.c
215--- a/binutils/nm.c 2021-12-19 19:00:27.046540270 -0800
216+++ b/binutils/nm.c 2021-12-19 19:36:34.797491555 -0800
217@@ -38,6 +38,11 @@
218 #include "bucomm.h"
219 #include "plugin-api.h"
220 #include "plugin.h"
221+#include "safe-ctype.h"
222+
223+#ifndef streq
224+#define streq(a,b) (strcmp ((a),(b)) == 0)
225+#endif
226
227 /* When sorting by size, we use this structure to hold the size and a
228 pointer to the minisymbol. */
229@@ -216,6 +221,18 @@ static const char *plugin_target = NULL;
230 static bfd *lineno_cache_bfd;
231 static bfd *lineno_cache_rel_bfd;
232
233+typedef enum unicode_display_type
234+{
235+ unicode_default = 0,
236+ unicode_locale,
237+ unicode_escape,
238+ unicode_hex,
239+ unicode_highlight,
240+ unicode_invalid
241+} unicode_display_type;
242+
243+static unicode_display_type unicode_display = unicode_default;
244+
245 enum long_option_values
246 {
247 OPTION_TARGET = 200,
248@@ -260,6 +277,7 @@ static struct option long_options[] =
249 {"target", required_argument, 0, OPTION_TARGET},
250 {"defined-only", no_argument, &defined_only, 1},
251 {"undefined-only", no_argument, &undefined_only, 1},
252+ {"unicode", required_argument, NULL, 'U'},
253 {"version", no_argument, &show_version, 1},
254 {"with-symbol-versions", no_argument, &with_symbol_versions, 1},
255 {"without-symbol-versions", no_argument, &with_symbol_versions, 0},
256@@ -313,6 +331,8 @@ usage (FILE *stream, int status)
257 -t, --radix=RADIX Use RADIX for printing symbol values\n\
258 --target=BFDNAME Specify the target object format as BFDNAME\n\
259 -u, --undefined-only Display only undefined symbols\n\
260+ -U {d|s|i|x|e|h} Specify how to treat UTF-8 encoded unicode characters\n\
261+ --unicode={default|show|invalid|hex|escape|highlight}\n\
262 --with-symbol-versions Display version strings after symbol names\n\
263 -X 32_64 (ignored)\n\
264 @FILE Read options from FILE\n\
265@@ -432,6 +452,187 @@ get_coff_symbol_type (const struct inter
266 return bufp;
267 }
268
269+/* Convert a potential UTF-8 encoded sequence in IN into characters in OUT.
270+ The conversion format is controlled by the unicode_display variable.
271+ Returns the number of characters added to OUT.
272+ Returns the number of bytes consumed from IN in CONSUMED.
273+ Always consumes at least one byte and displays at least one character. */
274+
275+static unsigned int
276+display_utf8 (const unsigned char * in, char * out, unsigned int * consumed)
277+{
278+ char * orig_out = out;
279+ unsigned int nchars = 0;
280+ unsigned int j;
281+
282+ if (unicode_display == unicode_default)
283+ goto invalid;
284+
285+ if (in[0] < 0xc0)
286+ goto invalid;
287+
288+ if ((in[1] & 0xc0) != 0x80)
289+ goto invalid;
290+
291+ if ((in[0] & 0x20) == 0)
292+ {
293+ nchars = 2;
294+ goto valid;
295+ }
296+
297+ if ((in[2] & 0xc0) != 0x80)
298+ goto invalid;
299+
300+ if ((in[0] & 0x10) == 0)
301+ {
302+ nchars = 3;
303+ goto valid;
304+ }
305+
306+ if ((in[3] & 0xc0) != 0x80)
307+ goto invalid;
308+
309+ nchars = 4;
310+
311+ valid:
312+ switch (unicode_display)
313+ {
314+ case unicode_locale:
315+ /* Copy the bytes into the output buffer as is. */
316+ memcpy (out, in, nchars);
317+ out += nchars;
318+ break;
319+
320+ case unicode_invalid:
321+ case unicode_hex:
322+ out += sprintf (out, "%c", unicode_display == unicode_hex ? '<' : '{');
323+ out += sprintf (out, "0x");
324+ for (j = 0; j < nchars; j++)
325+ out += sprintf (out, "%02x", in [j]);
326+ out += sprintf (out, "%c", unicode_display == unicode_hex ? '>' : '}');
327+ break;
328+
329+ case unicode_highlight:
330+ if (isatty (1))
331+ out += sprintf (out, "\x1B[31;47m"); /* Red. */
332+ /* Fall through. */
333+ case unicode_escape:
334+ switch (nchars)
335+ {
336+ case 2:
337+ out += sprintf (out, "\\u%02x%02x",
338+ ((in[0] & 0x1c) >> 2),
339+ ((in[0] & 0x03) << 6) | (in[1] & 0x3f));
340+ break;
341+
342+ case 3:
343+ out += sprintf (out, "\\u%02x%02x",
344+ ((in[0] & 0x0f) << 4) | ((in[1] & 0x3c) >> 2),
345+ ((in[1] & 0x03) << 6) | ((in[2] & 0x3f)));
346+ break;
347+
348+ case 4:
349+ out += sprintf (out, "\\u%02x%02x%02x",
350+ ((in[0] & 0x07) << 6) | ((in[1] & 0x3c) >> 2),
351+ ((in[1] & 0x03) << 6) | ((in[2] & 0x3c) >> 2),
352+ ((in[2] & 0x03) << 6) | ((in[3] & 0x3f)));
353+ break;
354+ default:
355+ /* URG. */
356+ break;
357+ }
358+
359+ if (unicode_display == unicode_highlight && isatty (1))
360+ out += sprintf (out, "\033[0m"); /* Default colour. */
361+ break;
362+
363+ default:
364+ /* URG */
365+ break;
366+ }
367+
368+ * consumed = nchars;
369+ return out - orig_out;
370+
371+ invalid:
372+ /* Not a valid UTF-8 sequence. */
373+ *out = *in;
374+ * consumed = 1;
375+ return 1;
376+}
377+
378+/* Convert any UTF-8 encoded characters in NAME into the form specified by
379+ unicode_display. Also converts control characters. Returns a static
380+ buffer if conversion was necessary.
381+ Code stolen from objdump.c:sanitize_string(). */
382+
383+static const char *
384+convert_utf8 (const char * in)
385+{
386+ static char * buffer = NULL;
387+ static size_t buffer_len = 0;
388+ const char * original = in;
389+ char * out;
390+
391+ /* Paranoia. */
392+ if (in == NULL)
393+ return "";
394+
395+ /* See if any conversion is necessary.
396+ In the majority of cases it will not be needed. */
397+ do
398+ {
399+ unsigned char c = *in++;
400+
401+ if (c == 0)
402+ return original;
403+
404+ if (ISCNTRL (c))
405+ break;
406+
407+ if (unicode_display != unicode_default && c >= 0xc0)
408+ break;
409+ }
410+ while (1);
411+
412+ /* Copy the input, translating as needed. */
413+ in = original;
414+ if (buffer_len < (strlen (in) * 9))
415+ {
416+ free ((void *) buffer);
417+ buffer_len = strlen (in) * 9;
418+ buffer = xmalloc (buffer_len + 1);
419+ }
420+
421+ out = buffer;
422+ do
423+ {
424+ unsigned char c = *in++;
425+
426+ if (c == 0)
427+ break;
428+
429+ if (ISCNTRL (c))
430+ {
431+ *out++ = '^';
432+ *out++ = c + 0x40;
433+ }
434+ else if (unicode_display != unicode_default && c >= 0xc0)
435+ {
436+ unsigned int num_consumed;
437+
438+ out += display_utf8 ((const unsigned char *)(in - 1), out, & num_consumed);
439+ in += num_consumed - 1;
440+ }
441+ else
442+ *out++ = c;
443+ }
444+ while (1);
445+
446+ *out = 0;
447+ return buffer;
448+}
449+
450 /* Print symbol name NAME, read from ABFD, with printf format FORM,
451 demangling it if requested. */
452
453@@ -444,6 +645,7 @@ print_symname (const char *form, struct
454
455 if (name == NULL)
456 name = info->sinfo->name;
457+
458 if (!with_symbol_versions
459 && bfd_get_flavour (abfd) == bfd_target_elf_flavour)
460 {
461@@ -451,6 +653,7 @@ print_symname (const char *form, struct
462 if (atver)
463 *atver = 0;
464 }
465+
466 if (do_demangle && *name)
467 {
468 alloc = bfd_demangle (abfd, name, demangle_flags);
469@@ -458,6 +661,11 @@ print_symname (const char *form, struct
470 name = alloc;
471 }
472
473+ if (unicode_display != unicode_default)
474+ {
475+ name = convert_utf8 (name);
476+ }
477+
478 if (info != NULL && info->elfinfo && with_symbol_versions)
479 {
480 const char *version_string;
481@@ -1807,7 +2015,7 @@ main (int argc, char **argv)
482 fatal (_("fatal error: libbfd ABI mismatch"));
483 set_default_bfd_target ();
484
485- while ((c = getopt_long (argc, argv, "aABCDef:gHhjJlnopPrSst:uvVvX:",
486+ while ((c = getopt_long (argc, argv, "aABCDef:gHhjJlnopPrSst:uU:vVvX:",
487 long_options, (int *) 0)) != EOF)
488 {
489 switch (c)
490@@ -1900,6 +2108,24 @@ main (int argc, char **argv)
491 case 'u':
492 undefined_only = 1;
493 break;
494+
495+ case 'U':
496+ if (streq (optarg, "default") || streq (optarg, "d"))
497+ unicode_display = unicode_default;
498+ else if (streq (optarg, "locale") || streq (optarg, "l"))
499+ unicode_display = unicode_locale;
500+ else if (streq (optarg, "escape") || streq (optarg, "e"))
501+ unicode_display = unicode_escape;
502+ else if (streq (optarg, "invalid") || streq (optarg, "i"))
503+ unicode_display = unicode_invalid;
504+ else if (streq (optarg, "hex") || streq (optarg, "x"))
505+ unicode_display = unicode_hex;
506+ else if (streq (optarg, "highlight") || streq (optarg, "h"))
507+ unicode_display = unicode_highlight;
508+ else
509+ fatal (_("invalid argument to -U/--unicode: %s"), optarg);
510+ break;
511+
512 case 'V':
513 show_version = 1;
514 break;
515diff --git a/binutils/objdump.c b/binutils/objdump.c
516--- a/binutils/objdump.c 2021-12-19 19:00:27.046540270 -0800
517+++ b/binutils/objdump.c 2021-12-19 19:43:09.438736729 -0800
518@@ -204,6 +204,18 @@ static const struct objdump_private_desc
519
520 /* The list of detected jumps inside a function. */
521 static struct jump_info *detected_jumps = NULL;
522+
523+typedef enum unicode_display_type
524+{
525+ unicode_default = 0,
526+ unicode_locale,
527+ unicode_escape,
528+ unicode_hex,
529+ unicode_highlight,
530+ unicode_invalid
531+} unicode_display_type;
532+
533+static unicode_display_type unicode_display = unicode_default;
534
535 static void usage (FILE *, int) ATTRIBUTE_NORETURN;
536 static void
537@@ -330,6 +342,9 @@ usage (FILE *stream, int status)
538 fprintf (stream, _("\
539 -w, --wide Format output for more than 80 columns\n"));
540 fprintf (stream, _("\
541+ -U[d|l|i|x|e|h] Controls the display of UTF-8 unicode characters\n\
542+ --unicode=[default|locale|invalid|hex|escape|highlight]\n"));
543+ fprintf (stream, _("\
544 -z, --disassemble-zeroes Do not skip blocks of zeroes when disassembling\n"));
545 fprintf (stream, _("\
546 --start-address=ADDR Only process data whose address is >= ADDR\n"));
547@@ -420,17 +435,23 @@ static struct option long_options[]=
548 {
549 {"adjust-vma", required_argument, NULL, OPTION_ADJUST_VMA},
550 {"all-headers", no_argument, NULL, 'x'},
551- {"private-headers", no_argument, NULL, 'p'},
552- {"private", required_argument, NULL, 'P'},
553 {"architecture", required_argument, NULL, 'm'},
554 {"archive-headers", no_argument, NULL, 'a'},
555+#ifdef ENABLE_LIBCTF
556+ {"ctf", required_argument, NULL, OPTION_CTF},
557+ {"ctf-parent", required_argument, NULL, OPTION_CTF_PARENT},
558+#endif
559 {"debugging", no_argument, NULL, 'g'},
560 {"debugging-tags", no_argument, NULL, 'e'},
561 {"demangle", optional_argument, NULL, 'C'},
562 {"disassemble", optional_argument, NULL, 'd'},
563 {"disassemble-all", no_argument, NULL, 'D'},
564- {"disassembler-options", required_argument, NULL, 'M'},
565 {"disassemble-zeroes", no_argument, NULL, 'z'},
566+ {"disassembler-options", required_argument, NULL, 'M'},
567+ {"dwarf", optional_argument, NULL, OPTION_DWARF},
568+ {"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK},
569+ {"dwarf-depth", required_argument, 0, OPTION_DWARF_DEPTH},
570+ {"dwarf-start", required_argument, 0, OPTION_DWARF_START},
571 {"dynamic-reloc", no_argument, NULL, 'R'},
572 {"dynamic-syms", no_argument, NULL, 'T'},
573 {"endian", required_argument, NULL, OPTION_ENDIAN},
574@@ -440,16 +461,23 @@ static struct option long_options[]=
575 {"full-contents", no_argument, NULL, 's'},
576 {"headers", no_argument, NULL, 'h'},
577 {"help", no_argument, NULL, 'H'},
578+ {"include", required_argument, NULL, 'I'},
579 {"info", no_argument, NULL, 'i'},
580+ {"inlines", no_argument, 0, OPTION_INLINES},
581+ {"insn-width", required_argument, NULL, OPTION_INSN_WIDTH},
582 {"line-numbers", no_argument, NULL, 'l'},
583- {"no-show-raw-insn", no_argument, &show_raw_insn, -1},
584 {"no-addresses", no_argument, &no_addresses, 1},
585- {"process-links", no_argument, &process_links, true},
586+ {"no-recurse-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
587+ {"no-recursion-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
588+ {"no-show-raw-insn", no_argument, &show_raw_insn, -1},
589+ {"prefix", required_argument, NULL, OPTION_PREFIX},
590 {"prefix-addresses", no_argument, &prefix_addresses, 1},
591+ {"prefix-strip", required_argument, NULL, OPTION_PREFIX_STRIP},
592+ {"private", required_argument, NULL, 'P'},
593+ {"private-headers", no_argument, NULL, 'p'},
594+ {"process-links", no_argument, &process_links, true},
595 {"recurse-limit", no_argument, NULL, OPTION_RECURSE_LIMIT},
596 {"recursion-limit", no_argument, NULL, OPTION_RECURSE_LIMIT},
597- {"no-recurse-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
598- {"no-recursion-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
599 {"reloc", no_argument, NULL, 'r'},
600 {"section", required_argument, NULL, 'j'},
601 {"section-headers", no_argument, NULL, 'h'},
602@@ -457,28 +485,16 @@ static struct option long_options[]=
603 {"source", no_argument, NULL, 'S'},
604 {"source-comment", optional_argument, NULL, OPTION_SOURCE_COMMENT},
605 {"special-syms", no_argument, &dump_special_syms, 1},
606- {"include", required_argument, NULL, 'I'},
607- {"dwarf", optional_argument, NULL, OPTION_DWARF},
608-#ifdef ENABLE_LIBCTF
609- {"ctf", required_argument, NULL, OPTION_CTF},
610- {"ctf-parent", required_argument, NULL, OPTION_CTF_PARENT},
611-#endif
612 {"stabs", no_argument, NULL, 'G'},
613 {"start-address", required_argument, NULL, OPTION_START_ADDRESS},
614 {"stop-address", required_argument, NULL, OPTION_STOP_ADDRESS},
615 {"syms", no_argument, NULL, 't'},
616 {"target", required_argument, NULL, 'b'},
617+ {"unicode", required_argument, NULL, 'U'},
618 {"version", no_argument, NULL, 'V'},
619- {"wide", no_argument, NULL, 'w'},
620- {"prefix", required_argument, NULL, OPTION_PREFIX},
621- {"prefix-strip", required_argument, NULL, OPTION_PREFIX_STRIP},
622- {"insn-width", required_argument, NULL, OPTION_INSN_WIDTH},
623- {"dwarf-depth", required_argument, 0, OPTION_DWARF_DEPTH},
624- {"dwarf-start", required_argument, 0, OPTION_DWARF_START},
625- {"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK},
626- {"inlines", no_argument, 0, OPTION_INLINES},
627 {"visualize-jumps", optional_argument, 0, OPTION_VISUALIZE_JUMPS},
628- {0, no_argument, 0, 0}
629+ {"wide", no_argument, NULL, 'w'},
630+ {NULL, no_argument, NULL, 0}
631 };
632
633 static void
634@@ -488,9 +504,121 @@ nonfatal (const char *msg)
635 exit_status = 1;
636 }
637
638+/* Convert a potential UTF-8 encoded sequence in IN into characters in OUT.
639+ The conversion format is controlled by the unicode_display variable.
640+ Returns the number of characters added to OUT.
641+ Returns the number of bytes consumed from IN in CONSUMED.
642+ Always consumes at least one byte and displays at least one character. */
643+
644+static unsigned int
645+display_utf8 (const unsigned char * in, char * out, unsigned int * consumed)
646+{
647+ char * orig_out = out;
648+ unsigned int nchars = 0;
649+ unsigned int j;
650+
651+ if (unicode_display == unicode_default)
652+ goto invalid;
653+
654+ if (in[0] < 0xc0)
655+ goto invalid;
656+
657+ if ((in[1] & 0xc0) != 0x80)
658+ goto invalid;
659+
660+ if ((in[0] & 0x20) == 0)
661+ {
662+ nchars = 2;
663+ goto valid;
664+ }
665+
666+ if ((in[2] & 0xc0) != 0x80)
667+ goto invalid;
668+
669+ if ((in[0] & 0x10) == 0)
670+ {
671+ nchars = 3;
672+ goto valid;
673+ }
674+
675+ if ((in[3] & 0xc0) != 0x80)
676+ goto invalid;
677+
678+ nchars = 4;
679+
680+ valid:
681+ switch (unicode_display)
682+ {
683+ case unicode_locale:
684+ /* Copy the bytes into the output buffer as is. */
685+ memcpy (out, in, nchars);
686+ out += nchars;
687+ break;
688+
689+ case unicode_invalid:
690+ case unicode_hex:
691+ out += sprintf (out, "%c", unicode_display == unicode_hex ? '<' : '{');
692+ out += sprintf (out, "0x");
693+ for (j = 0; j < nchars; j++)
694+ out += sprintf (out, "%02x", in [j]);
695+ out += sprintf (out, "%c", unicode_display == unicode_hex ? '>' : '}');
696+ break;
697+
698+ case unicode_highlight:
699+ if (isatty (1))
700+ out += sprintf (out, "\x1B[31;47m"); /* Red. */
701+ /* Fall through. */
702+ case unicode_escape:
703+ switch (nchars)
704+ {
705+ case 2:
706+ out += sprintf (out, "\\u%02x%02x",
707+ ((in[0] & 0x1c) >> 2),
708+ ((in[0] & 0x03) << 6) | (in[1] & 0x3f));
709+ break;
710+
711+ case 3:
712+ out += sprintf (out, "\\u%02x%02x",
713+ ((in[0] & 0x0f) << 4) | ((in[1] & 0x3c) >> 2),
714+ ((in[1] & 0x03) << 6) | ((in[2] & 0x3f)));
715+ break;
716+
717+ case 4:
718+ out += sprintf (out, "\\u%02x%02x%02x",
719+ ((in[0] & 0x07) << 6) | ((in[1] & 0x3c) >> 2),
720+ ((in[1] & 0x03) << 6) | ((in[2] & 0x3c) >> 2),
721+ ((in[2] & 0x03) << 6) | ((in[3] & 0x3f)));
722+ break;
723+ default:
724+ /* URG. */
725+ break;
726+ }
727+
728+ if (unicode_display == unicode_highlight && isatty (1))
729+ out += sprintf (out, "\033[0m"); /* Default colour. */
730+ break;
731+
732+ default:
733+ /* URG */
734+ break;
735+ }
736+
737+ * consumed = nchars;
738+ return out - orig_out;
739+
740+ invalid:
741+ /* Not a valid UTF-8 sequence. */
742+ *out = *in;
743+ * consumed = 1;
744+ return 1;
745+}
746+
747 /* Returns a version of IN with any control characters
748 replaced by escape sequences. Uses a static buffer
749- if necessary. */
750+ if necessary.
751+
752+ If unicode display is enabled, then also handles the
753+ conversion of unicode characters. */
754
755 static const char *
756 sanitize_string (const char * in)
757@@ -508,40 +636,50 @@ sanitize_string (const char * in)
758 of cases it will not be needed. */
759 do
760 {
761- char c = *in++;
762+ unsigned char c = *in++;
763
764 if (c == 0)
765 return original;
766
767 if (ISCNTRL (c))
768 break;
769+
770+ if (unicode_display != unicode_default && c >= 0xc0)
771+ break;
772 }
773 while (1);
774
775 /* Copy the input, translating as needed. */
776 in = original;
777- if (buffer_len < (strlen (in) * 2))
778+ if (buffer_len < (strlen (in) * 9))
779 {
780 free ((void *) buffer);
781- buffer_len = strlen (in) * 2;
782+ buffer_len = strlen (in) * 9;
783 buffer = xmalloc (buffer_len + 1);
784 }
785
786 out = buffer;
787 do
788 {
789- char c = *in++;
790+ unsigned char c = *in++;
791
792 if (c == 0)
793 break;
794
795- if (!ISCNTRL (c))
796- *out++ = c;
797- else
798+ if (ISCNTRL (c))
799 {
800 *out++ = '^';
801 *out++ = c + 0x40;
802 }
803+ else if (unicode_display != unicode_default && c >= 0xc0)
804+ {
805+ unsigned int num_consumed;
806+
807+ out += display_utf8 ((const unsigned char *)(in - 1), out, & num_consumed);
808+ in += num_consumed - 1;
809+ }
810+ else
811+ *out++ = c;
812 }
813 while (1);
814
815@@ -4529,6 +4667,24 @@ dump_symbols (bfd *abfd ATTRIBUTE_UNUSED
816 free (alloc);
817 }
818 }
819+ else if (unicode_display != unicode_default
820+ && name != NULL && *name != '\0')
821+ {
822+ const char * sanitized_name;
823+
824+ /* If we want to sanitize the name, we do it here, and
825+ temporarily clobber it while calling bfd_print_symbol.
826+ FIXME: This is a gross hack. */
827+ sanitized_name = sanitize_string (name);
828+ if (sanitized_name != name)
829+ (*current)->name = sanitized_name;
830+ else
831+ sanitized_name = NULL;
832+ bfd_print_symbol (cur_bfd, stdout, *current,
833+ bfd_print_symbol_all);
834+ if (sanitized_name != NULL)
835+ (*current)->name = name;
836+ }
837 else
838 bfd_print_symbol (cur_bfd, stdout, *current,
839 bfd_print_symbol_all);
840@@ -5212,7 +5368,7 @@ main (int argc, char **argv)
841 set_default_bfd_target ();
842
843 while ((c = getopt_long (argc, argv,
844- "pP:ib:m:M:VvCdDlfFaHhrRtTxsSI:j:wE:zgeGW::",
845+ "CDE:FGHI:LM:P:RSTU:VW::ab:defghij:lm:prstvwxz",
846 long_options, (int *) 0))
847 != EOF)
848 {
849@@ -5495,6 +5651,23 @@ main (int argc, char **argv)
850 seenflag = true;
851 break;
852
853+ case 'U':
854+ if (streq (optarg, "default") || streq (optarg, "d"))
855+ unicode_display = unicode_default;
856+ else if (streq (optarg, "locale") || streq (optarg, "l"))
857+ unicode_display = unicode_locale;
858+ else if (streq (optarg, "escape") || streq (optarg, "e"))
859+ unicode_display = unicode_escape;
860+ else if (streq (optarg, "invalid") || streq (optarg, "i"))
861+ unicode_display = unicode_invalid;
862+ else if (streq (optarg, "hex") || streq (optarg, "x"))
863+ unicode_display = unicode_hex;
864+ else if (streq (optarg, "highlight") || streq (optarg, "h"))
865+ unicode_display = unicode_highlight;
866+ else
867+ fatal (_("invalid argument to -U/--unicode: %s"), optarg);
868+ break;
869+
870 case 'H':
871 usage (stdout, 0);
872 /* No need to set seenflag or to break - usage() does not return. */
873diff --git a/binutils/readelf.c b/binutils/readelf.c
874--- a/binutils/readelf.c 2021-12-19 19:00:27.058540065 -0800
875+++ b/binutils/readelf.c 2021-12-19 19:27:56.538354462 -0800
876@@ -328,6 +328,19 @@ typedef enum print_mode
877 }
878 print_mode;
879
880+typedef enum unicode_display_type
881+{
882+ unicode_default = 0,
883+ unicode_locale,
884+ unicode_escape,
885+ unicode_hex,
886+ unicode_highlight,
887+ unicode_invalid
888+} unicode_display_type;
889+
890+static unicode_display_type unicode_display = unicode_default;
891+
892+
893 /* Versioned symbol info. */
894 enum versioned_symbol_info
895 {
896@@ -632,11 +645,18 @@ print_symbol (signed int width, const ch
897 if (c == 0)
898 break;
899
900- /* Do not print control characters directly as they can affect terminal
901- settings. Such characters usually appear in the names generated
902- by the assembler for local labels. */
903- if (ISCNTRL (c))
904+ if (ISPRINT (c))
905+ {
906+ putchar (c);
907+ width_remaining --;
908+ num_printed ++;
909+ }
910+ else if (ISCNTRL (c))
911 {
912+ /* Do not print control characters directly as they can affect terminal
913+ settings. Such characters usually appear in the names generated
914+ by the assembler for local labels. */
915+
916 if (width_remaining < 2)
917 break;
918
919@@ -644,11 +664,137 @@ print_symbol (signed int width, const ch
920 width_remaining -= 2;
921 num_printed += 2;
922 }
923- else if (ISPRINT (c))
924+ else if (c == 0x7f)
925 {
926- putchar (c);
927- width_remaining --;
928- num_printed ++;
929+ if (width_remaining < 5)
930+ break;
931+ printf ("<DEL>");
932+ width_remaining -= 5;
933+ num_printed += 5;
934+ }
935+ else if (unicode_display != unicode_locale
936+ && unicode_display != unicode_default)
937+ {
938+ /* Display unicode characters as something else. */
939+ unsigned char bytes[4];
940+ bool is_utf8;
941+ unsigned int nbytes;
942+
943+ bytes[0] = c;
944+
945+ if (bytes[0] < 0xc0)
946+ {
947+ nbytes = 1;
948+ is_utf8 = false;
949+ }
950+ else
951+ {
952+ bytes[1] = *symbol++;
953+
954+ if ((bytes[1] & 0xc0) != 0x80)
955+ {
956+ is_utf8 = false;
957+ /* Do not consume this character. It may only
958+ be the first byte in the sequence that was
959+ corrupt. */
960+ --symbol;
961+ nbytes = 1;
962+ }
963+ else if ((bytes[0] & 0x20) == 0)
964+ {
965+ is_utf8 = true;
966+ nbytes = 2;
967+ }
968+ else
969+ {
970+ bytes[2] = *symbol++;
971+
972+ if ((bytes[2] & 0xc0) != 0x80)
973+ {
974+ is_utf8 = false;
975+ symbol -= 2;
976+ nbytes = 1;
977+ }
978+ else if ((bytes[0] & 0x10) == 0)
979+ {
980+ is_utf8 = true;
981+ nbytes = 3;
982+ }
983+ else
984+ {
985+ bytes[3] = *symbol++;
986+
987+ nbytes = 4;
988+
989+ if ((bytes[3] & 0xc0) != 0x80)
990+ {
991+ is_utf8 = false;
992+ symbol -= 3;
993+ nbytes = 1;
994+ }
995+ else
996+ is_utf8 = true;
997+ }
998+ }
999+ }
1000+
1001+ if (unicode_display == unicode_invalid)
1002+ is_utf8 = false;
1003+
1004+ if (unicode_display == unicode_hex || ! is_utf8)
1005+ {
1006+ unsigned int i;
1007+
1008+ if (width_remaining < (nbytes * 2) + 2)
1009+ break;
1010+
1011+ putchar (is_utf8 ? '<' : '{');
1012+ printf ("0x");
1013+ for (i = 0; i < nbytes; i++)
1014+ printf ("%02x", bytes[i]);
1015+ putchar (is_utf8 ? '>' : '}');
1016+ }
1017+ else
1018+ {
1019+ if (unicode_display == unicode_highlight && isatty (1))
1020+ printf ("\x1B[31;47m"); /* Red. */
1021+
1022+ switch (nbytes)
1023+ {
1024+ case 2:
1025+ if (width_remaining < 6)
1026+ break;
1027+ printf ("\\u%02x%02x",
1028+ (bytes[0] & 0x1c) >> 2,
1029+ ((bytes[0] & 0x03) << 6) | (bytes[1] & 0x3f));
1030+ break;
1031+ case 3:
1032+ if (width_remaining < 6)
1033+ break;
1034+ printf ("\\u%02x%02x",
1035+ ((bytes[0] & 0x0f) << 4) | ((bytes[1] & 0x3c) >> 2),
1036+ ((bytes[1] & 0x03) << 6) | (bytes[2] & 0x3f));
1037+ break;
1038+ case 4:
1039+ if (width_remaining < 8)
1040+ break;
1041+ printf ("\\u%02x%02x%02x",
1042+ ((bytes[0] & 0x07) << 6) | ((bytes[1] & 0x3c) >> 2),
1043+ ((bytes[1] & 0x03) << 6) | ((bytes[2] & 0x3c) >> 2),
1044+ ((bytes[2] & 0x03) << 6) | (bytes[3] & 0x3f));
1045+
1046+ break;
1047+ default:
1048+ /* URG. */
1049+ break;
1050+ }
1051+
1052+ if (unicode_display == unicode_highlight && isatty (1))
1053+ printf ("\033[0m"); /* Default colour. */
1054+ }
1055+
1056+ if (bytes[nbytes - 1] == 0)
1057+ break;
1058 }
1059 else
1060 {
1061@@ -4668,6 +4814,7 @@ static struct option options[] =
1062 {"syms", no_argument, 0, 's'},
1063 {"silent-truncation",no_argument, 0, 'T'},
1064 {"section-details", no_argument, 0, 't'},
1065+ {"unicode", required_argument, NULL, 'U'},
1066 {"unwind", no_argument, 0, 'u'},
1067 {"version-info", no_argument, 0, 'V'},
1068 {"version", no_argument, 0, 'v'},
1069@@ -4744,6 +4891,12 @@ usage (FILE * stream)
1070 fprintf (stream, _("\
1071 --no-recurse-limit Disable a demangling recursion limit\n"));
1072 fprintf (stream, _("\
1073+ -U[dlexhi] --unicode=[default|locale|escape|hex|highlight|invalid]\n\
1074+ Display unicode characters as determined by the current locale\n\
1075+ (default), escape sequences, \"<hex sequences>\", highlighted\n\
1076+ escape sequences, or treat them as invalid and display as\n\
1077+ \"{hex sequences}\"\n"));
1078+ fprintf (stream, _("\
1079 -n --notes Display the core notes (if present)\n"));
1080 fprintf (stream, _("\
1081 -r --relocs Display the relocations (if present)\n"));
1082@@ -4928,7 +5081,7 @@ parse_args (struct dump_data *dumpdata,
1083 usage (stderr);
1084
1085 while ((c = getopt_long
1086- (argc, argv, "ACDHILNPR:STVWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF)
1087+ (argc, argv, "ACDHILNPR:STU:VWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF)
1088 {
1089 switch (c)
1090 {
1091@@ -5130,6 +5283,25 @@ parse_args (struct dump_data *dumpdata,
1092 /* Ignored for backward compatibility. */
1093 break;
1094
1095+ case 'U':
1096+ if (optarg == NULL)
1097+ error (_("Missing arg to -U/--unicode")); /* Can this happen ? */
1098+ else if (streq (optarg, "default") || streq (optarg, "d"))
1099+ unicode_display = unicode_default;
1100+ else if (streq (optarg, "locale") || streq (optarg, "l"))
1101+ unicode_display = unicode_locale;
1102+ else if (streq (optarg, "escape") || streq (optarg, "e"))
1103+ unicode_display = unicode_escape;
1104+ else if (streq (optarg, "invalid") || streq (optarg, "i"))
1105+ unicode_display = unicode_invalid;
1106+ else if (streq (optarg, "hex") || streq (optarg, "x"))
1107+ unicode_display = unicode_hex;
1108+ else if (streq (optarg, "highlight") || streq (optarg, "h"))
1109+ unicode_display = unicode_highlight;
1110+ else
1111+ error (_("invalid argument to -U/--unicode: %s"), optarg);
1112+ break;
1113+
1114 case OPTION_SYM_BASE:
1115 sym_base = 0;
1116 if (optarg != NULL)
1117diff --git a/binutils/strings.c b/binutils/strings.c
1118--- a/binutils/strings.c 2021-12-19 19:00:27.058540065 -0800
1119+++ b/binutils/strings.c 2021-12-19 19:48:26.205313218 -0800
1120@@ -55,6 +55,19 @@
1121 -T {bfdname}
1122 Specify a non-default object file format.
1123
1124+ --unicode={default|locale|invalid|hex|escape|highlight}
1125+ -u {d|l|i|x|e|h}
1126+ Determine how to handle UTF-8 unicode characters. The default
1127+ is no special treatment. All other versions of this option
1128+ only apply if the encoding is valid and enabling the option
1129+ implies --encoding=S.
1130+ The 'locale' option displays the characters according to the
1131+ current locale. The 'invalid' option treats them as
1132+ non-string characters. The 'hex' option displays them as hex
1133+ byte sequences. The 'escape' option displays them as escape
1134+ sequences and the 'highlight' option displays them as
1135+ coloured escape sequences.
1136+
1137 --output-separator=sep_string
1138 -s sep_string String used to separate parsed strings in output.
1139 Default is newline.
1140@@ -76,6 +89,22 @@
1141 #include "safe-ctype.h"
1142 #include "bucomm.h"
1143
1144+#ifndef streq
1145+#define streq(a,b) (strcmp ((a),(b)) == 0)
1146+#endif
1147+
1148+typedef enum unicode_display_type
1149+{
1150+ unicode_default = 0,
1151+ unicode_locale,
1152+ unicode_escape,
1153+ unicode_hex,
1154+ unicode_highlight,
1155+ unicode_invalid
1156+} unicode_display_type;
1157+
1158+static unicode_display_type unicode_display = unicode_default;
1159+
1160 #define STRING_ISGRAPHIC(c) \
1161 ( (c) >= 0 \
1162 && (c) <= 255 \
1163@@ -94,7 +123,7 @@ extern int errno;
1164 static int address_radix;
1165
1166 /* Minimum length of sequence of graphic chars to trigger output. */
1167-static int string_min;
1168+static unsigned int string_min;
1169
1170 /* Whether or not we include all whitespace as a graphic char. */
1171 static bool include_all_whitespace;
1172@@ -121,21 +150,22 @@ static char *output_separator;
1173 static struct option long_options[] =
1174 {
1175 {"all", no_argument, NULL, 'a'},
1176+ {"bytes", required_argument, NULL, 'n'},
1177 {"data", no_argument, NULL, 'd'},
1178+ {"encoding", required_argument, NULL, 'e'},
1179+ {"help", no_argument, NULL, 'h'},
1180+ {"include-all-whitespace", no_argument, NULL, 'w'},
1181+ {"output-separator", required_argument, NULL, 's'},
1182 {"print-file-name", no_argument, NULL, 'f'},
1183- {"bytes", required_argument, NULL, 'n'},
1184 {"radix", required_argument, NULL, 't'},
1185- {"include-all-whitespace", no_argument, NULL, 'w'},
1186- {"encoding", required_argument, NULL, 'e'},
1187 {"target", required_argument, NULL, 'T'},
1188- {"output-separator", required_argument, NULL, 's'},
1189- {"help", no_argument, NULL, 'h'},
1190+ {"unicode", required_argument, NULL, 'U'},
1191 {"version", no_argument, NULL, 'v'},
1192 {NULL, 0, NULL, 0}
1193 };
1194
1195 static bool strings_file (char *);
1196-static void print_strings (const char *, FILE *, file_ptr, int, int, char *);
1197+static void print_strings (const char *, FILE *, file_ptr, int, char *);
1198 static void usage (FILE *, int) ATTRIBUTE_NORETURN;
1199
1200 int main (int, char **);
1201@@ -171,7 +201,7 @@ main (int argc, char **argv)
1202 encoding = 's';
1203 output_separator = NULL;
1204
1205- while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:s:Vv0123456789",
1206+ while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:s:U:Vv0123456789",
1207 long_options, (int *) 0)) != EOF)
1208 {
1209 switch (optc)
1210@@ -244,6 +274,23 @@ main (int argc, char **argv)
1211 output_separator = optarg;
1212 break;
1213
1214+ case 'U':
1215+ if (streq (optarg, "default") || streq (optarg, "d"))
1216+ unicode_display = unicode_default;
1217+ else if (streq (optarg, "locale") || streq (optarg, "l"))
1218+ unicode_display = unicode_locale;
1219+ else if (streq (optarg, "escape") || streq (optarg, "e"))
1220+ unicode_display = unicode_escape;
1221+ else if (streq (optarg, "invalid") || streq (optarg, "i"))
1222+ unicode_display = unicode_invalid;
1223+ else if (streq (optarg, "hex") || streq (optarg, "x"))
1224+ unicode_display = unicode_hex;
1225+ else if (streq (optarg, "highlight") || streq (optarg, "h"))
1226+ unicode_display = unicode_highlight;
1227+ else
1228+ fatal (_("invalid argument to -U/--unicode: %s"), optarg);
1229+ break;
1230+
1231 case 'V':
1232 case 'v':
1233 print_version ("strings");
1234@@ -258,6 +305,9 @@ main (int argc, char **argv)
1235 }
1236 }
1237
1238+ if (unicode_display != unicode_default)
1239+ encoding = 'S';
1240+
1241 if (numeric_opt != 0)
1242 {
1243 string_min = (int) strtoul (argv[numeric_opt - 1] + 1, &s, 0);
1244@@ -293,14 +343,14 @@ main (int argc, char **argv)
1245 {
1246 datasection_only = false;
1247 SET_BINARY (fileno (stdin));
1248- print_strings ("{standard input}", stdin, 0, 0, 0, (char *) NULL);
1249+ print_strings ("{standard input}", stdin, 0, 0, (char *) NULL);
1250 files_given = true;
1251 }
1252 else
1253 {
1254 for (; optind < argc; ++optind)
1255 {
1256- if (strcmp (argv[optind], "-") == 0)
1257+ if (streq (argv[optind], "-"))
1258 datasection_only = false;
1259 else
1260 {
1261@@ -342,7 +392,7 @@ strings_a_section (bfd *abfd, asection *
1262 }
1263
1264 *got_a_section = true;
1265- print_strings (filename, NULL, sect->filepos, 0, sectsize, (char *) mem);
1266+ print_strings (filename, NULL, sect->filepos, sectsize, (char *) mem);
1267 free (mem);
1268 }
1269
1270@@ -427,7 +477,7 @@ strings_file (char *file)
1271 return false;
1272 }
1273
1274- print_strings (file, stream, (file_ptr) 0, 0, 0, (char *) 0);
1275+ print_strings (file, stream, (file_ptr) 0, 0, (char *) NULL);
1276
1277 if (fclose (stream) == EOF)
1278 {
1279@@ -551,6 +601,626 @@ unget_part_char (long c, file_ptr *addre
1280 }
1281 }
1282 }
1283+
1284+static void
1285+print_filename_and_address (const char * filename, file_ptr address)
1286+{
1287+ if (print_filenames)
1288+ printf ("%s: ", filename);
1289+
1290+ if (! print_addresses)
1291+ return;
1292+
1293+ switch (address_radix)
1294+ {
1295+ case 8:
1296+ if (sizeof (address) > sizeof (long))
1297+ {
1298+#ifndef __MSVCRT__
1299+ printf ("%7llo ", (unsigned long long) address);
1300+#else
1301+ printf ("%7I64o ", (unsigned long long) address);
1302+#endif
1303+ }
1304+ else
1305+ printf ("%7lo ", (unsigned long) address);
1306+ break;
1307+
1308+ case 10:
1309+ if (sizeof (address) > sizeof (long))
1310+ {
1311+#ifndef __MSVCRT__
1312+ printf ("%7llu ", (unsigned long long) address);
1313+#else
1314+ printf ("%7I64d ", (unsigned long long) address);
1315+#endif
1316+ }
1317+ else
1318+ printf ("%7ld ", (long) address);
1319+ break;
1320+
1321+ case 16:
1322+ if (sizeof (address) > sizeof (long))
1323+ {
1324+#ifndef __MSVCRT__
1325+ printf ("%7llx ", (unsigned long long) address);
1326+#else
1327+ printf ("%7I64x ", (unsigned long long) address);
1328+#endif
1329+ }
1330+ else
1331+ printf ("%7lx ", (unsigned long) address);
1332+ break;
1333+ }
1334+}
1335+
1336+/* Return non-zero if the bytes starting at BUFFER form a valid UTF-8 encoding.
1337+ If the encoding is valid then returns the number of bytes it uses. */
1338+
1339+static unsigned int
1340+is_valid_utf8 (const unsigned char * buffer, unsigned long buflen)
1341+{
1342+ if (buffer[0] < 0xc0)
1343+ return 0;
1344+
1345+ if (buflen < 2)
1346+ return 0;
1347+
1348+ if ((buffer[1] & 0xc0) != 0x80)
1349+ return 0;
1350+
1351+ if ((buffer[0] & 0x20) == 0)
1352+ return 2;
1353+
1354+ if (buflen < 3)
1355+ return 0;
1356+
1357+ if ((buffer[2] & 0xc0) != 0x80)
1358+ return 0;
1359+
1360+ if ((buffer[0] & 0x10) == 0)
1361+ return 3;
1362+
1363+ if (buflen < 4)
1364+ return 0;
1365+
1366+ if ((buffer[3] & 0xc0) != 0x80)
1367+ return 0;
1368+
1369+ return 4;
1370+}
1371+
1372+/* Display a UTF-8 encoded character in BUFFER according to the setting
1373+ of unicode_display. The character is known to be valid.
1374+ Returns the number of bytes consumed. */
1375+
1376+static unsigned int
1377+display_utf8_char (const unsigned char * buffer)
1378+{
1379+ unsigned int j;
1380+ unsigned int utf8_len;
1381+
1382+ switch (buffer[0] & 0x30)
1383+ {
1384+ case 0x00:
1385+ case 0x10:
1386+ utf8_len = 2;
1387+ break;
1388+ case 0x20:
1389+ utf8_len = 3;
1390+ break;
1391+ default:
1392+ utf8_len = 4;
1393+ }
1394+
1395+ switch (unicode_display)
1396+ {
1397+ default:
1398+ fprintf (stderr, "ICE: unexpected unicode display type\n");
1399+ break;
1400+
1401+ case unicode_escape:
1402+ case unicode_highlight:
1403+ if (unicode_display == unicode_highlight && isatty (1))
1404+ printf ("\x1B[31;47m"); /* Red. */
1405+
1406+ switch (utf8_len)
1407+ {
1408+ case 2:
1409+ printf ("\\u%02x%02x",
1410+ ((buffer[0] & 0x1c) >> 2),
1411+ ((buffer[0] & 0x03) << 6) | (buffer[1] & 0x3f));
1412+ break;
1413+
1414+ case 3:
1415+ printf ("\\u%02x%02x",
1416+ ((buffer[0] & 0x0f) << 4) | ((buffer[1] & 0x3c) >> 2),
1417+ ((buffer[1] & 0x03) << 6) | ((buffer[2] & 0x3f)));
1418+ break;
1419+
1420+ case 4:
1421+ printf ("\\u%02x%02x%02x",
1422+ ((buffer[0] & 0x07) << 6) | ((buffer[1] & 0x3c) >> 2),
1423+ ((buffer[1] & 0x03) << 6) | ((buffer[2] & 0x3c) >> 2),
1424+ ((buffer[2] & 0x03) << 6) | ((buffer[3] & 0x3f)));
1425+ break;
1426+ default:
1427+ /* URG. */
1428+ break;
1429+ }
1430+
1431+ if (unicode_display == unicode_highlight && isatty (1))
1432+ printf ("\033[0m"); /* Default colour. */
1433+ break;
1434+
1435+ case unicode_hex:
1436+ putchar ('<');
1437+ printf ("0x");
1438+ for (j = 0; j < utf8_len; j++)
1439+ printf ("%02x", buffer [j]);
1440+ putchar ('>');
1441+ break;
1442+
1443+ case unicode_locale:
1444+ printf ("%.1s", buffer);
1445+ break;
1446+ }
1447+
1448+ return utf8_len;
1449+}
1450+
1451+/* Display strings in BUFFER. Treat any UTF-8 encoded characters encountered
1452+ according to the setting of the unicode_display variable. The buffer
1453+ contains BUFLEN bytes.
1454+
1455+ Display the characters as if they started at ADDRESS and are contained in
1456+ FILENAME. */
1457+
1458+static void
1459+print_unicode_buffer (const char * filename,
1460+ file_ptr address,
1461+ const unsigned char * buffer,
1462+ unsigned long buflen)
1463+{
1464+ /* Paranoia checks... */
1465+ if (filename == NULL
1466+ || buffer == NULL
1467+ || unicode_display == unicode_default
1468+ || encoding != 'S'
1469+ || encoding_bytes != 1)
1470+ {
1471+ fprintf (stderr, "ICE: bad arguments to print_unicode_buffer\n");
1472+ return;
1473+ }
1474+
1475+ if (buflen == 0)
1476+ return;
1477+
1478+ /* We must only display strings that are at least string_min *characters*
1479+ long. So we scan the buffer in two stages. First we locate the start
1480+ of a potential string. Then we walk along it until we have found
1481+ string_min characters. Then we go back to the start point and start
1482+ displaying characters according to the unicode_display setting. */
1483+
1484+ unsigned long start_point = 0;
1485+ unsigned long i = 0;
1486+ unsigned int char_len = 1;
1487+ unsigned int num_found = 0;
1488+
1489+ for (i = 0; i < buflen; i += char_len)
1490+ {
1491+ int c = buffer[i];
1492+
1493+ char_len = 1;
1494+
1495+ /* Find the first potential character of a string. */
1496+ if (! STRING_ISGRAPHIC (c))
1497+ {
1498+ num_found = 0;
1499+ continue;
1500+ }
1501+
1502+ if (c > 126)
1503+ {
1504+ if (c < 0xc0)
1505+ {
1506+ num_found = 0;
1507+ continue;
1508+ }
1509+
1510+ if ((char_len = is_valid_utf8 (buffer + i, buflen - i)) == 0)
1511+ {
1512+ char_len = 1;
1513+ num_found = 0;
1514+ continue;
1515+ }
1516+
1517+ if (unicode_display == unicode_invalid)
1518+ {
1519+ /* We have found a valid UTF-8 character, but we treat it as non-graphic. */
1520+ num_found = 0;
1521+ continue;
1522+ }
1523+ }
1524+
1525+ if (num_found == 0)
1526+ /* We have found a potential starting point for a string. */
1527+ start_point = i;
1528+
1529+ ++ num_found;
1530+
1531+ if (num_found >= string_min)
1532+ break;
1533+ }
1534+
1535+ if (num_found < string_min)
1536+ return;
1537+
1538+ print_filename_and_address (filename, address + start_point);
1539+
1540+ /* We have found string_min characters. Display them and any
1541+ more that follow. */
1542+ for (i = start_point; i < buflen; i += char_len)
1543+ {
1544+ int c = buffer[i];
1545+
1546+ char_len = 1;
1547+
1548+ if (! STRING_ISGRAPHIC (c))
1549+ break;
1550+ else if (c < 127)
1551+ putchar (c);
1552+ else if (! is_valid_utf8 (buffer + i, buflen - i))
1553+ break;
1554+ else if (unicode_display == unicode_invalid)
1555+ break;
1556+ else
1557+ char_len = display_utf8_char (buffer + i);
1558+ }
1559+
1560+ if (output_separator)
1561+ fputs (output_separator, stdout);
1562+ else
1563+ putchar ('\n');
1564+
1565+ /* FIXME: Using tail recursion here is lazy programming... */
1566+ print_unicode_buffer (filename, address + i, buffer + i, buflen - i);
1567+}
1568+
1569+static int
1570+get_unicode_byte (FILE * stream,
1571+ unsigned char * putback,
1572+ unsigned int * num_putback,
1573+ unsigned int * num_read)
1574+{
1575+ if (* num_putback > 0)
1576+ {
1577+ * num_putback = * num_putback - 1;
1578+ return putback [* num_putback];
1579+ }
1580+
1581+ * num_read = * num_read + 1;
1582+
1583+#if defined(HAVE_GETC_UNLOCKED) && HAVE_DECL_GETC_UNLOCKED
1584+ return getc_unlocked (stream);
1585+#else
1586+ return getc (stream);
1587+#endif
1588+}
1589+
1590+/* Helper function for print_unicode_stream. */
1591+
1592+static void
1593+print_unicode_stream_body (const char * filename,
1594+ file_ptr address,
1595+ FILE * stream,
1596+ unsigned char * putback_buf,
1597+ unsigned int num_putback,
1598+ unsigned char * print_buf)
1599+{
1600+ /* It would be nice if we could just read the stream into a buffer
1601+ and then process if with print_unicode_buffer. But the input
1602+ might be huge or it might time-locked (eg stdin). So instead
1603+ we go one byte at a time... */
1604+
1605+ file_ptr start_point = 0;
1606+ unsigned int num_read = 0;
1607+ unsigned int num_chars = 0;
1608+ unsigned int num_print = 0;
1609+ int c = 0;
1610+
1611+ /* Find a series of string_min characters. Put them into print_buf. */
1612+ do
1613+ {
1614+ if (num_chars >= string_min)
1615+ break;
1616+
1617+ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read);
1618+ if (c == EOF)
1619+ break;
1620+
1621+ if (! STRING_ISGRAPHIC (c))
1622+ {
1623+ num_chars = num_print = 0;
1624+ continue;
1625+ }
1626+
1627+ if (num_chars == 0)
1628+ start_point = num_read - 1;
1629+
1630+ if (c < 127)
1631+ {
1632+ print_buf[num_print] = c;
1633+ num_chars ++;
1634+ num_print ++;
1635+ continue;
1636+ }
1637+
1638+ if (c < 0xc0)
1639+ {
1640+ num_chars = num_print = 0;
1641+ continue;
1642+ }
1643+
1644+ /* We *might* have a UTF-8 sequence. Time to start peeking. */
1645+ char utf8[4];
1646+
1647+ utf8[0] = c;
1648+ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read);
1649+ if (c == EOF)
1650+ break;
1651+ utf8[1] = c;
1652+
1653+ if ((utf8[1] & 0xc0) != 0x80)
1654+ {
1655+ /* Invalid UTF-8. */
1656+ putback_buf[num_putback++] = utf8[1];
1657+ num_chars = num_print = 0;
1658+ continue;
1659+ }
1660+ else if ((utf8[0] & 0x20) == 0)
1661+ {
1662+ /* A valid 2-byte UTF-8 encoding. */
1663+ if (unicode_display == unicode_invalid)
1664+ {
1665+ putback_buf[num_putback++] = utf8[1];
1666+ num_chars = num_print = 0;
1667+ }
1668+ else
1669+ {
1670+ print_buf[num_print ++] = utf8[0];
1671+ print_buf[num_print ++] = utf8[1];
1672+ num_chars ++;
1673+ }
1674+ continue;
1675+ }
1676+
1677+ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read);
1678+ if (c == EOF)
1679+ break;
1680+ utf8[2] = c;
1681+
1682+ if ((utf8[2] & 0xc0) != 0x80)
1683+ {
1684+ /* Invalid UTF-8. */
1685+ putback_buf[num_putback++] = utf8[2];
1686+ putback_buf[num_putback++] = utf8[1];
1687+ num_chars = num_print = 0;
1688+ continue;
1689+ }
1690+ else if ((utf8[0] & 0x10) == 0)
1691+ {
1692+ /* A valid 3-byte UTF-8 encoding. */
1693+ if (unicode_display == unicode_invalid)
1694+ {
1695+ putback_buf[num_putback++] = utf8[2];
1696+ putback_buf[num_putback++] = utf8[1];
1697+ num_chars = num_print = 0;
1698+ }
1699+ else
1700+ {
1701+ print_buf[num_print ++] = utf8[0];
1702+ print_buf[num_print ++] = utf8[1];
1703+ print_buf[num_print ++] = utf8[2];
1704+ num_chars ++;
1705+ }
1706+ continue;
1707+ }
1708+
1709+ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read);
1710+ if (c == EOF)
1711+ break;
1712+ utf8[3] = c;
1713+
1714+ if ((utf8[3] & 0xc0) != 0x80)
1715+ {
1716+ /* Invalid UTF-8. */
1717+ putback_buf[num_putback++] = utf8[3];
1718+ putback_buf[num_putback++] = utf8[2];
1719+ putback_buf[num_putback++] = utf8[1];
1720+ num_chars = num_print = 0;
1721+ }
1722+ /* We have a valid 4-byte UTF-8 encoding. */
1723+ else if (unicode_display == unicode_invalid)
1724+ {
1725+ putback_buf[num_putback++] = utf8[3];
1726+ putback_buf[num_putback++] = utf8[1];
1727+ putback_buf[num_putback++] = utf8[2];
1728+ num_chars = num_print = 0;
1729+ }
1730+ else
1731+ {
1732+ print_buf[num_print ++] = utf8[0];
1733+ print_buf[num_print ++] = utf8[1];
1734+ print_buf[num_print ++] = utf8[2];
1735+ print_buf[num_print ++] = utf8[3];
1736+ num_chars ++;
1737+ }
1738+ }
1739+ while (1);
1740+
1741+ if (num_chars >= string_min)
1742+ {
1743+ /* We know that we have string_min valid characters in print_buf,
1744+ and there may be more to come in the stream. Start displaying
1745+ them. */
1746+
1747+ print_filename_and_address (filename, address + start_point);
1748+
1749+ unsigned int i;
1750+ for (i = 0; i < num_print;)
1751+ {
1752+ if (print_buf[i] < 127)
1753+ putchar (print_buf[i++]);
1754+ else
1755+ i += display_utf8_char (print_buf + i);
1756+ }
1757+
1758+ /* OK so now we have to start read unchecked bytes. */
1759+
1760+ /* Find a series of string_min characters. Put them into print_buf. */
1761+ do
1762+ {
1763+ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read);
1764+ if (c == EOF)
1765+ break;
1766+
1767+ if (! STRING_ISGRAPHIC (c))
1768+ break;
1769+
1770+ if (c < 127)
1771+ {
1772+ putchar (c);
1773+ continue;
1774+ }
1775+
1776+ if (c < 0xc0)
1777+ break;
1778+
1779+ /* We *might* have a UTF-8 sequence. Time to start peeking. */
1780+ unsigned char utf8[4];
1781+
1782+ utf8[0] = c;
1783+ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read);
1784+ if (c == EOF)
1785+ break;
1786+ utf8[1] = c;
1787+
1788+ if ((utf8[1] & 0xc0) != 0x80)
1789+ {
1790+ /* Invalid UTF-8. */
1791+ putback_buf[num_putback++] = utf8[1];
1792+ break;
1793+ }
1794+ else if ((utf8[0] & 0x20) == 0)
1795+ {
1796+ /* Valid 2-byte UTF-8. */
1797+ if (unicode_display == unicode_invalid)
1798+ {
1799+ putback_buf[num_putback++] = utf8[1];
1800+ break;
1801+ }
1802+ else
1803+ {
1804+ (void) display_utf8_char (utf8);
1805+ continue;
1806+ }
1807+ }
1808+
1809+ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read);
1810+ if (c == EOF)
1811+ break;
1812+ utf8[2] = c;
1813+
1814+ if ((utf8[2] & 0xc0) != 0x80)
1815+ {
1816+ /* Invalid UTF-8. */
1817+ putback_buf[num_putback++] = utf8[2];
1818+ putback_buf[num_putback++] = utf8[1];
1819+ break;
1820+ }
1821+ else if ((utf8[0] & 0x10) == 0)
1822+ {
1823+ /* Valid 3-byte UTF-8. */
1824+ if (unicode_display == unicode_invalid)
1825+ {
1826+ putback_buf[num_putback++] = utf8[2];
1827+ putback_buf[num_putback++] = utf8[1];
1828+ break;
1829+ }
1830+ else
1831+ {
1832+ (void) display_utf8_char (utf8);
1833+ continue;
1834+ }
1835+ }
1836+
1837+ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read);
1838+ if (c == EOF)
1839+ break;
1840+ utf8[3] = c;
1841+
1842+ if ((utf8[3] & 0xc0) != 0x80)
1843+ {
1844+ /* Invalid UTF-8. */
1845+ putback_buf[num_putback++] = utf8[3];
1846+ putback_buf[num_putback++] = utf8[2];
1847+ putback_buf[num_putback++] = utf8[1];
1848+ break;
1849+ }
1850+ else if (unicode_display == unicode_invalid)
1851+ {
1852+ putback_buf[num_putback++] = utf8[3];
1853+ putback_buf[num_putback++] = utf8[2];
1854+ putback_buf[num_putback++] = utf8[1];
1855+ break;
1856+ }
1857+ else
1858+ /* A valid 4-byte UTF-8 encoding. */
1859+ (void) display_utf8_char (utf8);
1860+ }
1861+ while (1);
1862+
1863+ if (output_separator)
1864+ fputs (output_separator, stdout);
1865+ else
1866+ putchar ('\n');
1867+ }
1868+
1869+ if (c != EOF)
1870+ /* FIXME: Using tail recursion here is lazy, but it works. */
1871+ print_unicode_stream_body (filename, address + num_read, stream, putback_buf, num_putback, print_buf);
1872+}
1873+
1874+/* Display strings read in from STREAM. Treat any UTF-8 encoded characters
1875+ encountered according to the setting of the unicode_display variable.
1876+ The stream is positioned at ADDRESS and is attached to FILENAME. */
1877+
1878+static void
1879+print_unicode_stream (const char * filename,
1880+ file_ptr address,
1881+ FILE * stream)
1882+{
1883+ /* Paranoia checks... */
1884+ if (filename == NULL
1885+ || stream == NULL
1886+ || unicode_display == unicode_default
1887+ || encoding != 'S'
1888+ || encoding_bytes != 1)
1889+ {
1890+ fprintf (stderr, "ICE: bad arguments to print_unicode_stream\n");
1891+ return;
1892+ }
1893+
1894+ /* Allocate space for string_min 4-byte utf-8 characters. */
1895+ unsigned char * print_buf = xmalloc ((4 * string_min) + 1);
1896+ /* We should never have to put back more than 4 bytes. */
1897+ unsigned char putback_buf[5];
1898+ unsigned int num_putback = 0;
1899+
1900+ print_unicode_stream_body (filename, address, stream, putback_buf, num_putback, print_buf);
1901+ free (print_buf);
1902+}
1903
1904 /* Find the strings in file FILENAME, read from STREAM.
1905 Assume that STREAM is positioned so that the next byte read
1906@@ -566,20 +1236,29 @@ unget_part_char (long c, file_ptr *addre
1907
1908 static void
1909 print_strings (const char *filename, FILE *stream, file_ptr address,
1910- int stop_point, int magiccount, char *magic)
1911+ int magiccount, char *magic)
1912 {
1913+ if (unicode_display != unicode_default)
1914+ {
1915+ if (magic != NULL)
1916+ print_unicode_buffer (filename, address,
1917+ (const unsigned char *) magic, magiccount);
1918+
1919+ if (stream != NULL)
1920+ print_unicode_stream (filename, address, stream);
1921+ return;
1922+ }
1923+
1924 char *buf = (char *) xmalloc (sizeof (char) * (string_min + 1));
1925
1926 while (1)
1927 {
1928 file_ptr start;
1929- int i;
1930+ unsigned int i;
1931 long c;
1932
1933 /* See if the next `string_min' chars are all graphic chars. */
1934 tryline:
1935- if (stop_point && address >= stop_point)
1936- break;
1937 start = address;
1938 for (i = 0; i < string_min; i++)
1939 {
1940@@ -601,51 +1280,7 @@ print_strings (const char *filename, FIL
1941
1942 /* We found a run of `string_min' graphic characters. Print up
1943 to the next non-graphic character. */
1944-
1945- if (print_filenames)
1946- printf ("%s: ", filename);
1947- if (print_addresses)
1948- switch (address_radix)
1949- {
1950- case 8:
1951- if (sizeof (start) > sizeof (long))
1952- {
1953-#ifndef __MSVCRT__
1954- printf ("%7llo ", (unsigned long long) start);
1955-#else
1956- printf ("%7I64o ", (unsigned long long) start);
1957-#endif
1958- }
1959- else
1960- printf ("%7lo ", (unsigned long) start);
1961- break;
1962-
1963- case 10:
1964- if (sizeof (start) > sizeof (long))
1965- {
1966-#ifndef __MSVCRT__
1967- printf ("%7llu ", (unsigned long long) start);
1968-#else
1969- printf ("%7I64d ", (unsigned long long) start);
1970-#endif
1971- }
1972- else
1973- printf ("%7ld ", (long) start);
1974- break;
1975-
1976- case 16:
1977- if (sizeof (start) > sizeof (long))
1978- {
1979-#ifndef __MSVCRT__
1980- printf ("%7llx ", (unsigned long long) start);
1981-#else
1982- printf ("%7I64x ", (unsigned long long) start);
1983-#endif
1984- }
1985- else
1986- printf ("%7lx ", (unsigned long) start);
1987- break;
1988- }
1989+ print_filename_and_address (filename, start);
1990
1991 buf[i] = '\0';
1992 fputs (buf, stdout);
1993@@ -697,6 +1332,8 @@ usage (FILE *stream, int status)
1994 -T --target=<BFDNAME> Specify the binary file format\n\
1995 -e --encoding={s,S,b,l,B,L} Select character size and endianness:\n\
1996 s = 7-bit, S = 8-bit, {b,l} = 16-bit, {B,L} = 32-bit\n\
1997+ --unicode={default|show|invalid|hex|escape|highlight}\n\
1998+ -u {d|s|i|x|e|h} Specify how to treat UTF-8 encoded unicode characters\n\
1999 -s --output-separator=<string> String used to separate strings in output.\n\
2000 @<file> Read options from <file>\n\
2001 -h --help Display this information\n\
diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
index 53e30a0aaa..719928be79 100644
--- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
+++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
@@ -1,4 +1,4 @@
1From 257ad1ce148417e1cefe2332d8acc5c8216c2522 Mon Sep 17 00:00:00 2001 1From 07bb7fbdacaf9cd6a1a252ffbc98f4e05e305d50 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:58:54 +0000 3Date: Mon, 2 Mar 2015 01:58:54 +0000
4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
@@ -21,10 +21,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
21 3 files changed, 6 insertions(+), 3 deletions(-) 21 3 files changed, 6 insertions(+), 3 deletions(-)
22 22
23diff --git a/gold/layout.cc b/gold/layout.cc 23diff --git a/gold/layout.cc b/gold/layout.cc
24index a27cb071c75..32b52890b39 100644 24index 3efe8d98ae9..9cc389664a6 100644
25--- a/gold/layout.cc 25--- a/gold/layout.cc
26+++ b/gold/layout.cc 26+++ b/gold/layout.cc
27@@ -5032,7 +5032,7 @@ Layout::create_interp(const Target* target) 27@@ -5033,7 +5033,7 @@ Layout::create_interp(const Target* target)
28 gold_assert(interp != NULL); 28 gold_assert(interp != NULL);
29 } 29 }
30 30
@@ -34,7 +34,7 @@ index a27cb071c75..32b52890b39 100644
34 Output_section_data* odata = new Output_data_const(interp, len, 1); 34 Output_section_data* odata = new Output_data_const(interp, len, 1);
35 35
36diff --git a/ld/genscripts.sh b/ld/genscripts.sh 36diff --git a/ld/genscripts.sh b/ld/genscripts.sh
37index 088417ef2d5..46a2db7005c 100755 37index 278f212bdad..0c52ebee4d0 100755
38--- a/ld/genscripts.sh 38--- a/ld/genscripts.sh
39+++ b/ld/genscripts.sh 39+++ b/ld/genscripts.sh
40@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" 40@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
@@ -59,10 +59,10 @@ index 088417ef2d5..46a2db7005c 100755
59 DATA_ALIGNMENT=${DATA_ALIGNMENT_} 59 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
60 RELOCATING=" " 60 RELOCATING=" "
61diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc 61diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
62index 29a8f0781d5..75e46f4adaf 100644 62index bf2268bb0ad..b1811ef130f 100644
63--- a/ld/scripttempl/elf.sc 63--- a/ld/scripttempl/elf.sc
64+++ b/ld/scripttempl/elf.sc 64+++ b/ld/scripttempl/elf.sc
65@@ -147,8 +147,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then 65@@ -148,8 +148,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
66 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" 66 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
67 fi 67 fi
68 fi 68 fi
diff --git a/meta/recipes-devtools/binutils/binutils/0001-elf-Discard-input-.note.gnu.build-id-sections.patch b/meta/recipes-devtools/binutils/binutils/0001-elf-Discard-input-.note.gnu.build-id-sections.patch
deleted file mode 100644
index c93af4e46f..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0001-elf-Discard-input-.note.gnu.build-id-sections.patch
+++ /dev/null
@@ -1,215 +0,0 @@
1From b2e18d3ea300f7491705b6e86a7cc3d6366e3b1f Mon Sep 17 00:00:00 2001
2From: "H.J. Lu" <hjl.tools@gmail.com>
3Date: Tue, 30 Nov 2021 20:40:38 -0800
4Subject: [PATCH] elf: Discard input .note.gnu.build-id sections
5
61. Discard input .note.gnu.build-id sections.
72. Clear the build ID field before writing.
83. Use bfd_make_section_anyway_with_flags to create the output
9.note.gnu.build-id section.
10
11 PR ld/28639
12 * ldelf.c (ldelf_after_open): Discard input .note.gnu.build-id
13 sections, excluding the first one.
14 (write_build_id): Clear the build ID field before writing.
15 (ldelf_setup_build_id): Use bfd_make_section_anyway_with_flags
16 to create the output .note.gnu.build-id section.
17 * testsuite/ld-elf/build-id.exp: New file.
18 * testsuite/ld-elf/pr28639a.rd: Likewise.
19 * testsuite/ld-elf/pr28639b.rd: Likewise.
20 * testsuite/ld-elf/pr28639c.rd: Likewise.
21 * testsuite/ld-elf/pr28639d.rd: Likewise.
22
23Upstream-Status: Backport
24
25Reference to upstream patch:
26[https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1f1d0f8888a6c944e612b416a2a6e11abcf5199f]
27---
28 ld/ldelf.c | 15 ++++++-
29 ld/testsuite/ld-elf/build-id.exp | 77 ++++++++++++++++++++++++++++++++
30 ld/testsuite/ld-elf/pr28639a.rd | 6 +++
31 ld/testsuite/ld-elf/pr28639b.rd | 6 +++
32 ld/testsuite/ld-elf/pr28639c.rd | 10 +++++
33 ld/testsuite/ld-elf/pr28639d.rd | 4 ++
34 6 files changed, 117 insertions(+), 1 deletion(-)
35 create mode 100644 ld/testsuite/ld-elf/build-id.exp
36 create mode 100644 ld/testsuite/ld-elf/pr28639a.rd
37 create mode 100644 ld/testsuite/ld-elf/pr28639b.rd
38 create mode 100644 ld/testsuite/ld-elf/pr28639c.rd
39 create mode 100644 ld/testsuite/ld-elf/pr28639d.rd
40
41diff --git a/ld/ldelf.c b/ld/ldelf.c
42index 21e655bb55c..8501d98b48f 100644
43--- a/ld/ldelf.c
44+++ b/ld/ldelf.c
45@@ -1043,6 +1043,15 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
46 /* Do not allow executable files to be used as inputs to the link. */
47 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
48 {
49+ /* Discard input .note.gnu.build-id sections. */
50+ s = bfd_get_section_by_name (abfd, ".note.gnu.build-id");
51+ while (s != NULL)
52+ {
53+ if (s != elf_tdata (link_info.output_bfd)->o->build_id.sec)
54+ s->flags |= SEC_EXCLUDE;
55+ s = bfd_get_next_section_by_name (NULL, s);
56+ }
57+
58 if (abfd->xvec->flavour == bfd_target_elf_flavour
59 && !bfd_input_just_syms (abfd)
60 && elf_tdata (abfd) != NULL
61@@ -1387,6 +1396,9 @@ write_build_id (bfd *abfd)
62 id_bits = contents + size;
63 size = asec->size - size;
64
65+ /* Clear the build ID field. */
66+ memset (id_bits, 0, size);
67+
68 bfd_h_put_32 (abfd, sizeof "GNU", &e_note->namesz);
69 bfd_h_put_32 (abfd, size, &e_note->descsz);
70 bfd_h_put_32 (abfd, NT_GNU_BUILD_ID, &e_note->type);
71@@ -1418,7 +1430,8 @@ ldelf_setup_build_id (bfd *ibfd)
72
73 flags = (SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY
74 | SEC_LINKER_CREATED | SEC_READONLY | SEC_DATA);
75- s = bfd_make_section_with_flags (ibfd, ".note.gnu.build-id", flags);
76+ s = bfd_make_section_anyway_with_flags (ibfd, ".note.gnu.build-id",
77+ flags);
78 if (s != NULL && bfd_set_section_alignment (s, 2))
79 {
80 struct elf_obj_tdata *t = elf_tdata (link_info.output_bfd);
81diff --git a/ld/testsuite/ld-elf/build-id.exp b/ld/testsuite/ld-elf/build-id.exp
82new file mode 100644
83index 00000000000..19c22a75c4d
84--- /dev/null
85+++ b/ld/testsuite/ld-elf/build-id.exp
86@@ -0,0 +1,77 @@
87+# Expect script for --build-id tests.
88+# Copyright (C) 2021 Free Software Foundation, Inc.
89+#
90+# This file is part of the GNU Binutils.
91+#
92+# This program is free software; you can redistribute it and/or modify
93+# it under the terms of the GNU General Public License as published by
94+# the Free Software Foundation; either version 3 of the License, or
95+# (at your option) any later version.
96+#
97+# This program is distributed in the hope that it will be useful,
98+# but WITHOUT ANY WARRANTY; without even the implied warranty of
99+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
100+# GNU General Public License for more details.
101+#
102+# You should have received a copy of the GNU General Public License
103+# along with this program; if not, write to the Free Software
104+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
105+# MA 02110-1301, USA.
106+#
107+
108+# Exclude non-ELF targets.
109+
110+if ![is_elf_format] {
111+ return
112+}
113+
114+if { [istarget frv-*-*] || [istarget lm32-*-*] } {
115+ return
116+}
117+
118+if { !([istarget *-*-linux*]
119+ || [istarget arm*-*-uclinuxfdpiceabi]
120+ || [istarget *-*-nacl*]
121+ || [istarget *-*-gnu*]) } then {
122+ return
123+}
124+
125+run_ld_link_tests [list \
126+ [list \
127+ "pr28639a.o" \
128+ "-r --build-id=md5" \
129+ "" \
130+ "" \
131+ {start.s} \
132+ {{readelf {--notes} pr28639a.rd}} \
133+ "pr28639a.o" \
134+ ] \
135+ [list \
136+ "pr28639a.o" \
137+ "-r --build-id" \
138+ "" \
139+ "" \
140+ {dummy.s} \
141+ {{readelf {--notes} pr28639b.rd}} \
142+ "pr28639b.o" \
143+ ] \
144+ [list \
145+ "pr28639a" \
146+ "--build-id tmpdir/pr28639a.o tmpdir/pr28639b.o" \
147+ "" \
148+ "" \
149+ {dummy.s} \
150+ {{readelf {--notes} pr28639b.rd} \
151+ {readelf {--notes} pr28639c.rd}} \
152+ "pr28639a" \
153+ ] \
154+ [list \
155+ "pr28639b" \
156+ "--build-id=none tmpdir/pr28639a.o tmpdir/pr28639b.o" \
157+ "" \
158+ "" \
159+ {dummy.s} \
160+ {{readelf {--notes} pr28639d.rd}} \
161+ "pr28639b" \
162+ ] \
163+]
164diff --git a/ld/testsuite/ld-elf/pr28639a.rd b/ld/testsuite/ld-elf/pr28639a.rd
165new file mode 100644
166index 00000000000..e85087064d0
167--- /dev/null
168+++ b/ld/testsuite/ld-elf/pr28639a.rd
169@@ -0,0 +1,6 @@
170+#...
171+Displaying notes found in: \.note\.gnu\.build-id
172+ Owner Data size Description
173+ GNU 0x00000010 NT_GNU_BUILD_ID \(unique build ID bitstring\)
174+ Build ID: [0-9a-f]+
175+#pass
176diff --git a/ld/testsuite/ld-elf/pr28639b.rd b/ld/testsuite/ld-elf/pr28639b.rd
177new file mode 100644
178index 00000000000..04dcb04bec2
179--- /dev/null
180+++ b/ld/testsuite/ld-elf/pr28639b.rd
181@@ -0,0 +1,6 @@
182+#...
183+Displaying notes found in: \.note\.gnu\.build-id
184+ Owner Data size Description
185+ GNU 0x00000014 NT_GNU_BUILD_ID \(unique build ID bitstring\)
186+ Build ID: [0-9a-f]+
187+#pass
188diff --git a/ld/testsuite/ld-elf/pr28639c.rd b/ld/testsuite/ld-elf/pr28639c.rd
189new file mode 100644
190index 00000000000..64221e5fa51
191--- /dev/null
192+++ b/ld/testsuite/ld-elf/pr28639c.rd
193@@ -0,0 +1,10 @@
194+#failif
195+#...
196+Displaying notes found in: \.note\.gnu\.build-id
197+ Owner Data size Description
198+ GNU 0x[0-9a-f]+ NT_GNU_BUILD_ID \(unique build ID bitstring\)
199+ Build ID: [0-9a-f]+
200+ Owner Data size Description
201+ GNU 0x[0-9a-f]+ NT_GNU_BUILD_ID \(unique build ID bitstring\)
202+ Build ID: [0-9a-f]+
203+#...
204diff --git a/ld/testsuite/ld-elf/pr28639d.rd b/ld/testsuite/ld-elf/pr28639d.rd
205new file mode 100644
206index 00000000000..897c8493efa
207--- /dev/null
208+++ b/ld/testsuite/ld-elf/pr28639d.rd
209@@ -0,0 +1,4 @@
210+#failif
211+#...
212+Displaying notes found in: \.note\.gnu\.build-id
213+#...
214--
215
diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
index a6ca41374a..a3f7d62898 100644
--- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
+++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
@@ -1,4 +1,4 @@
1From 6e93d0328f499569db7ce6396f94f304ce340df8 Mon Sep 17 00:00:00 2001 1From f820ab7ea7e94d4df548be3388163ff2efb2ea96 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:37:05 -0800 3Date: Mon, 6 Mar 2017 23:37:05 -0800
4Subject: [PATCH] binutils-cross: Do not generate linker script directories 4Subject: [PATCH] binutils-cross: Do not generate linker script directories
@@ -22,7 +22,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 1 file changed, 25 deletions(-) 22 1 file changed, 25 deletions(-)
23 23
24diff --git a/ld/genscripts.sh b/ld/genscripts.sh 24diff --git a/ld/genscripts.sh b/ld/genscripts.sh
25index 46a2db7005c..4bb7c33f560 100755 25index 0c52ebee4d0..1acbe66bd2e 100755
26--- a/ld/genscripts.sh 26--- a/ld/genscripts.sh
27+++ b/ld/genscripts.sh 27+++ b/ld/genscripts.sh
28@@ -235,31 +235,6 @@ append_to_lib_path() 28@@ -235,31 +235,6 @@ append_to_lib_path()
diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
index 3c4f706f2d..59a97c13c7 100644
--- a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
+++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
@@ -1,4 +1,4 @@
1From d49016d3faf684319bf3ac37450558920d70be03 Mon Sep 17 00:00:00 2001 1From b2ccd25828b40310caeb094c0413e3a30a4dc0a5 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 19 Feb 2020 09:51:16 -0800 3Date: Wed, 19 Feb 2020 09:51:16 -0800
4Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK 4Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
29 5 files changed, 7 insertions(+), 3 deletions(-) 29 5 files changed, 7 insertions(+), 3 deletions(-)
30 30
31diff --git a/ld/Makefile.am b/ld/Makefile.am 31diff --git a/ld/Makefile.am b/ld/Makefile.am
32index f8e99325361..fd196541f59 100644 32index b55a873d927..61db131fb0d 100644
33--- a/ld/Makefile.am 33--- a/ld/Makefile.am
34+++ b/ld/Makefile.am 34+++ b/ld/Makefile.am
35@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ 35@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@
@@ -43,10 +43,10 @@ index f8e99325361..fd196541f59 100644
43 NO_WERROR = @NO_WERROR@ 43 NO_WERROR = @NO_WERROR@
44 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 44 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
45diff --git a/ld/Makefile.in b/ld/Makefile.in 45diff --git a/ld/Makefile.in b/ld/Makefile.in
46index ef2e99e08da..cb8f5bfb70e 100644 46index 61e93eeaf1e..860eb21a785 100644
47--- a/ld/Makefile.in 47--- a/ld/Makefile.in
48+++ b/ld/Makefile.in 48+++ b/ld/Makefile.in
49@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz 49@@ -556,7 +556,8 @@ ZLIB = @zlibdir@ -lz
50 ZLIBINC = @zlibinc@ 50 ZLIBINC = @zlibinc@
51 ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ 51 ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \
52 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ 52 -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
@@ -57,10 +57,10 @@ index ef2e99e08da..cb8f5bfb70e 100644
57 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 57 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
58 58
59diff --git a/ld/ldelf.c b/ld/ldelf.c 59diff --git a/ld/ldelf.c b/ld/ldelf.c
60index 21e655bb55c..d1615003ede 100644 60index 121c25d948f..34cbc60e5e9 100644
61--- a/ld/ldelf.c 61--- a/ld/ldelf.c
62+++ b/ld/ldelf.c 62+++ b/ld/ldelf.c
63@@ -911,7 +911,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, 63@@ -930,7 +930,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
64 64
65 info.path = NULL; 65 info.path = NULL;
66 info.len = info.alloc = 0; 66 info.len = info.alloc = 0;
@@ -70,7 +70,7 @@ index 21e655bb55c..d1615003ede 100644
70 if (!ldelf_parse_ld_so_conf (&info, tmppath)) 70 if (!ldelf_parse_ld_so_conf (&info, tmppath))
71 { 71 {
72diff --git a/ld/ldmain.c b/ld/ldmain.c 72diff --git a/ld/ldmain.c b/ld/ldmain.c
73index 42660eb9a3c..5a4a4d5da3d 100644 73index ea72b14a301..1ae90a77749 100644
74--- a/ld/ldmain.c 74--- a/ld/ldmain.c
75+++ b/ld/ldmain.c 75+++ b/ld/ldmain.c
76@@ -70,6 +70,7 @@ char *program_name; 76@@ -70,6 +70,7 @@ char *program_name;
@@ -82,7 +82,7 @@ index 42660eb9a3c..5a4a4d5da3d 100644
82 /* The canonical representation of ld_sysroot. */ 82 /* The canonical representation of ld_sysroot. */
83 char *ld_canon_sysroot; 83 char *ld_canon_sysroot;
84diff --git a/ld/ldmain.h b/ld/ldmain.h 84diff --git a/ld/ldmain.h b/ld/ldmain.h
85index 39d08a6c378..4c3519e7970 100644 85index f6d05a02f59..e60292cd522 100644
86--- a/ld/ldmain.h 86--- a/ld/ldmain.h
87+++ b/ld/ldmain.h 87+++ b/ld/ldmain.h
88@@ -23,6 +23,7 @@ 88@@ -23,6 +23,7 @@
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
index 7cd4a99d33..8f323eb0c5 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch
+++ b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
@@ -1,4 +1,4 @@
1From 1a9fcaae50e63b993019bd4dc00219e43421efdc Mon Sep 17 00:00:00 2001 1From 7a7b777cdfded080aab1021fa6bcdb20345f5cfd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000 3Date: Mon, 2 Mar 2015 01:09:58 +0000
4Subject: [PATCH] Point scripts location to libdir 4Subject: [PATCH] Point scripts location to libdir
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/ld/Makefile.am b/ld/Makefile.am 14diff --git a/ld/Makefile.am b/ld/Makefile.am
15index fd196541f59..d94fa7e64e1 100644 15index 61db131fb0d..5b5ee64d121 100644
16--- a/ld/Makefile.am 16--- a/ld/Makefile.am
17+++ b/ld/Makefile.am 17+++ b/ld/Makefile.am
18@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 18@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
@@ -25,10 +25,10 @@ index fd196541f59..d94fa7e64e1 100644
25 EMUL = @EMUL@ 25 EMUL = @EMUL@
26 EMULATION_OFILES = @EMULATION_OFILES@ 26 EMULATION_OFILES = @EMULATION_OFILES@
27diff --git a/ld/Makefile.in b/ld/Makefile.in 27diff --git a/ld/Makefile.in b/ld/Makefile.in
28index cb8f5bfb70e..9a58879c5ca 100644 28index 860eb21a785..d719747919c 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -564,7 +564,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
32 # We put the scripts in the directory $(scriptdir)/ldscripts. 32 # We put the scripts in the directory $(scriptdir)/ldscripts.
33 # We can't put the scripts in $(datadir) because the SEARCH_DIR 33 # We can't put the scripts in $(datadir) because the SEARCH_DIR
34 # directives need to be different for native and cross linkers. 34 # directives need to be different for native and cross linkers.
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index d6b04fdae4..997774020e 100644
--- a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,4 +1,4 @@
1From 29517900352336708495d41902b5b7e8cc9a401a Mon Sep 17 00:00:00 2001 1From edddb1f294d667eac94649ba0665fe464990ed18 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:27:17 +0000 3Date: Mon, 2 Mar 2015 01:27:17 +0000
4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty 4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 4 insertions(+) 14 1 file changed, 4 insertions(+)
15 15
16diff --git a/ld/ldelf.c b/ld/ldelf.c 16diff --git a/ld/ldelf.c b/ld/ldelf.c
17index d1615003ede..6a894285b11 100644 17index 34cbc60e5e9..b1965a9e96f 100644
18--- a/ld/ldelf.c 18--- a/ld/ldelf.c
19+++ b/ld/ldelf.c 19+++ b/ld/ldelf.c
20@@ -1250,6 +1250,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, 20@@ -1277,6 +1277,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
21 && command_line.rpath == NULL) 21 && command_line.rpath == NULL)
22 { 22 {
23 path = (const char *) getenv ("LD_RUN_PATH"); 23 path = (const char *) getenv ("LD_RUN_PATH");
@@ -26,7 +26,7 @@ index d1615003ede..6a894285b11 100644
26 if (path 26 if (path
27 && ldelf_search_needed (path, &n, force, 27 && ldelf_search_needed (path, &n, force,
28 is_linux, elfsize)) 28 is_linux, elfsize))
29@@ -1610,6 +1612,8 @@ ldelf_before_allocation (char *audit, char *depaudit, 29@@ -1636,6 +1638,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
30 rpath = command_line.rpath; 30 rpath = command_line.rpath;
31 if (rpath == NULL) 31 if (rpath == NULL)
32 rpath = (const char *) getenv ("LD_RUN_PATH"); 32 rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0006-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index 39cef70bcd..507d0b1b2d 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -1,4 +1,4 @@
1From 37581c8ce9d98a1183706e12a2c9a73f7f40462d Mon Sep 17 00:00:00 2001 1From fc9e8b99969bb32a4b009eab763bade6c554ef73 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:39:01 +0000 3Date: Mon, 2 Mar 2015 01:39:01 +0000
4Subject: [PATCH] don't let the distro compiler point to the wrong installation 4Subject: [PATCH] don't let the distro compiler point to the wrong installation
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 2 insertions(+), 1 deletion(-) 17 1 file changed, 2 insertions(+), 1 deletion(-)
18 18
19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in 19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
20index 4f1213b983b..2ba18b75cac 100644 20index abef3c4601b..880c8826482 100644
21--- a/libiberty/Makefile.in 21--- a/libiberty/Makefile.in
22+++ b/libiberty/Makefile.in 22+++ b/libiberty/Makefile.in
23@@ -367,7 +367,8 @@ install-strip: install 23@@ -385,7 +385,8 @@ install-strip: install
24 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the 24 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
25 # default multilib, so we have to take CFLAGS into account as well, 25 # default multilib, so we have to take CFLAGS into account as well,
26 # since it will be passed the multilib flags. 26 # since it will be passed the multilib flags.
diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0007-warn-for-uses-of-system-directories-when-cross-linki.patch
index c724dfd7a7..547bfcac68 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,4 +1,4 @@
1From 99e1565b9d2b929d4ee4e9da6f63766b22b23fc3 Mon Sep 17 00:00:00 2001 1From 9fb1bafb20371d82b674778d2a8b5c9444fed417 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Jan 2016 06:31:09 +0000 3Date: Fri, 15 Jan 2016 06:31:09 +0000
4Subject: [PATCH] warn for uses of system directories when cross linking 4Subject: [PATCH] warn for uses of system directories when cross linking
@@ -58,10 +58,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
58 ld/ld.texi | 12 ++++++++++++ 58 ld/ld.texi | 12 ++++++++++++
59 ld/ldfile.c | 17 +++++++++++++++++ 59 ld/ldfile.c | 17 +++++++++++++++++
60 ld/ldlex.h | 2 ++ 60 ld/ldlex.h | 2 ++
61 ld/ldmain.c | 2 ++ 61 ld/ldmain.c | 6 ++++--
62 ld/lexsup.c | 16 ++++++++++++++++ 62 ld/lexsup.c | 16 ++++++++++++++++
63 9 files changed, 86 insertions(+) 63 9 files changed, 88 insertions(+), 2 deletions(-)
64 64
65diff --git a/ld/config.in b/ld/config.in
66index 26d55a00d47..ffad464783c 100644
65--- a/ld/config.in 67--- a/ld/config.in
66+++ b/ld/config.in 68+++ b/ld/config.in
67@@ -43,6 +43,9 @@ 69@@ -43,6 +43,9 @@
@@ -74,9 +76,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
74 /* Additional extension a shared object might have. */ 76 /* Additional extension a shared object might have. */
75 #undef EXTRA_SHLIB_EXTENSION 77 #undef EXTRA_SHLIB_EXTENSION
76 78
79diff --git a/ld/configure b/ld/configure
80index 26150d62898..1f9ec8ec580 100755
77--- a/ld/configure 81--- a/ld/configure
78+++ b/ld/configure 82+++ b/ld/configure
79@@ -829,6 +829,7 @@ with_lib_path 83@@ -831,6 +831,7 @@ with_lib_path
80 enable_targets 84 enable_targets
81 enable_64_bit_bfd 85 enable_64_bit_bfd
82 with_sysroot 86 with_sysroot
@@ -84,7 +88,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
84 enable_gold 88 enable_gold
85 enable_got 89 enable_got
86 enable_compressed_debug_sections 90 enable_compressed_debug_sections
87@@ -1498,6 +1499,8 @@ Optional Features: 91@@ -1500,6 +1501,8 @@ Optional Features:
88 --enable-checking enable run-time checks 92 --enable-checking enable run-time checks
89 --enable-targets alternative target configurations 93 --enable-targets alternative target configurations
90 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) 94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
@@ -93,7 +97,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
93 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 97 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
94 --enable-got=<type> GOT handling scheme (target, single, negative, 98 --enable-got=<type> GOT handling scheme (target, single, negative,
95 multigot) 99 multigot)
96@@ -15215,6 +15218,19 @@ fi 100@@ -15312,6 +15315,19 @@ fi
97 101
98 102
99 103
@@ -113,9 +117,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
113 # Check whether --enable-gold was given. 117 # Check whether --enable-gold was given.
114 if test "${enable_gold+set}" = set; then : 118 if test "${enable_gold+set}" = set; then :
115 enableval=$enable_gold; case "${enableval}" in 119 enableval=$enable_gold; case "${enableval}" in
120diff --git a/ld/configure.ac b/ld/configure.ac
121index 7f4cff079b7..57d1abff870 100644
116--- a/ld/configure.ac 122--- a/ld/configure.ac
117+++ b/ld/configure.ac 123+++ b/ld/configure.ac
118@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) 124@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot)
119 AC_SUBST(TARGET_SYSTEM_ROOT) 125 AC_SUBST(TARGET_SYSTEM_ROOT)
120 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) 126 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
121 127
@@ -132,6 +138,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
132 dnl Use --enable-gold to decide if this linker should be the default. 138 dnl Use --enable-gold to decide if this linker should be the default.
133 dnl "install_as_default" is set to false if gold is the default linker. 139 dnl "install_as_default" is set to false if gold is the default linker.
134 dnl "installed_linker" is the installed BFD linker name. 140 dnl "installed_linker" is the installed BFD linker name.
141diff --git a/ld/ld.h b/ld/ld.h
142index f3086bf30de..db5064243c7 100644
135--- a/ld/ld.h 143--- a/ld/ld.h
136+++ b/ld/ld.h 144+++ b/ld/ld.h
137@@ -162,6 +162,14 @@ typedef struct 145@@ -162,6 +162,14 @@ typedef struct
@@ -149,9 +157,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
149 /* Big or little endian as set on command line. */ 157 /* Big or little endian as set on command line. */
150 enum endian_enum endian; 158 enum endian_enum endian;
151 159
160diff --git a/ld/ld.texi b/ld/ld.texi
161index fc75e9b3625..dca697d626e 100644
152--- a/ld/ld.texi 162--- a/ld/ld.texi
153+++ b/ld/ld.texi 163+++ b/ld/ld.texi
154@@ -2863,6 +2863,18 @@ string identifying the original linked f 164@@ -2892,6 +2892,18 @@ string identifying the original linked file does not change.
155 165
156 Passing @code{none} for @var{style} disables the setting from any 166 Passing @code{none} for @var{style} disables the setting from any
157 @code{--build-id} options earlier on the command line. 167 @code{--build-id} options earlier on the command line.
@@ -170,9 +180,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
170 @end table 180 @end table
171 181
172 @c man end 182 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index 731ae5f7aed..dd8f03fd960 100644
173--- a/ld/ldfile.c 185--- a/ld/ldfile.c
174+++ b/ld/ldfile.c 186+++ b/ld/ldfile.c
175@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *nam 187@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline)
176 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); 188 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
177 else 189 else
178 new_dirs->name = xstrdup (name); 190 new_dirs->name = xstrdup (name);
@@ -196,9 +208,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
196 } 208 }
197 209
198 /* Try to open a BFD for a lang_input_statement. */ 210 /* Try to open a BFD for a lang_input_statement. */
211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index bc58fea73cc..a1595589197 100644
199--- a/ld/ldlex.h 213--- a/ld/ldlex.h
200+++ b/ld/ldlex.h 214+++ b/ld/ldlex.h
201@@ -163,6 +163,8 @@ enum option_values 215@@ -164,6 +164,8 @@ enum option_values
202 OPTION_CTF_VARIABLES, 216 OPTION_CTF_VARIABLES,
203 OPTION_NO_CTF_VARIABLES, 217 OPTION_NO_CTF_VARIABLES,
204 OPTION_CTF_SHARE_TYPES, 218 OPTION_CTF_SHARE_TYPES,
@@ -207,9 +221,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
207 }; 221 };
208 222
209 /* The initial parser states. */ 223 /* The initial parser states. */
224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index 1ae90a77749..f40750fd816 100644
210--- a/ld/ldmain.c 226--- a/ld/ldmain.c
211+++ b/ld/ldmain.c 227+++ b/ld/ldmain.c
212@@ -321,6 +321,8 @@ main (int argc, char **argv) 228@@ -322,6 +322,8 @@ main (int argc, char **argv)
213 command_line.warn_mismatch = true; 229 command_line.warn_mismatch = true;
214 command_line.warn_search_mismatch = true; 230 command_line.warn_search_mismatch = true;
215 command_line.check_section_addresses = -1; 231 command_line.check_section_addresses = -1;
@@ -218,7 +234,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
218 234
219 /* We initialize DEMANGLING based on the environment variable 235 /* We initialize DEMANGLING based on the environment variable
220 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the 236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
221@@ -1444,7 +1446,7 @@ undefined_symbol (struct bfd_link_info * 237@@ -1447,7 +1449,7 @@ undefined_symbol (struct bfd_link_info *info,
222 argv[1] = "undefined-symbol"; 238 argv[1] = "undefined-symbol";
223 argv[2] = (char *) name; 239 argv[2] = (char *) name;
224 argv[3] = NULL; 240 argv[3] = NULL;
@@ -227,7 +243,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
227 if (verbose) 243 if (verbose)
228 einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"), 244 einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"),
229 argv[0], argv[1], argv[2]); 245 argv[0], argv[1], argv[2]);
230@@ -1465,7 +1467,7 @@ undefined_symbol (struct bfd_link_info * 246@@ -1468,7 +1470,7 @@ undefined_symbol (struct bfd_link_info *info,
231 carry on to issue the normal error message. */ 247 carry on to issue the normal error message. */
232 } 248 }
233 #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */ 249 #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */
@@ -236,9 +252,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
236 if (section != NULL) 252 if (section != NULL)
237 { 253 {
238 if (error_count < MAX_ERRORS_IN_A_ROW) 254 if (error_count < MAX_ERRORS_IN_A_ROW)
255diff --git a/ld/lexsup.c b/ld/lexsup.c
256index 5acc47ed5a0..d03c6136ccf 100644
239--- a/ld/lexsup.c 257--- a/ld/lexsup.c
240+++ b/ld/lexsup.c 258+++ b/ld/lexsup.c
241@@ -595,6 +595,14 @@ static const struct ld_option ld_options 259@@ -600,6 +600,14 @@ static const struct ld_option ld_options[] =
242 " <method> is: share-unconflicted (default),\n" 260 " <method> is: share-unconflicted (default),\n"
243 " share-duplicated"), 261 " share-duplicated"),
244 TWO_DASHES }, 262 TWO_DASHES },
@@ -253,7 +271,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
253 }; 271 };
254 272
255 #define OPTION_COUNT ARRAY_SIZE (ld_options) 273 #define OPTION_COUNT ARRAY_SIZE (ld_options)
256@@ -1686,6 +1694,14 @@ parse_args (unsigned argc, char **argv) 274@@ -1702,6 +1710,14 @@ parse_args (unsigned argc, char **argv)
257 config.print_map_discarded = true; 275 config.print_map_discarded = true;
258 break; 276 break;
259 277
diff --git a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0008-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
index a271f55ea1..648bdc13d2 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
@@ -1,4 +1,4 @@
1From b77c5a67d4ac2513d0b4bab5e4dd1c33b339689b Mon Sep 17 00:00:00 2001 1From 00ae1ee97ad3ad0624798b28c6bab94a19b3ef39 Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com> 2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500 3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
@@ -7,15 +7,14 @@ The wait mnemonic for ppc targets is incorrectly assembled into 0x7c00003c due
7to duplicated address definition with waitasec instruction. The issue causes 7to duplicated address definition with waitasec instruction. The issue causes
8kernel boot calltrace for ppc targets when wait instruction is executed. 8kernel boot calltrace for ppc targets when wait instruction is executed.
9 9
10Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
11
12Upstream-Status: Pending 10Upstream-Status: Pending
11Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
13--- 12---
14 opcodes/ppc-opc.c | 4 +--- 13 opcodes/ppc-opc.c | 4 +---
15 1 file changed, 1 insertion(+), 3 deletions(-) 14 1 file changed, 1 insertion(+), 3 deletions(-)
16 15
17diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c 16diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
18index 13d8b6c3c07..cd979f9c80c 100644 17index a424dd924de..406d5b60917 100644
19--- a/opcodes/ppc-opc.c 18--- a/opcodes/ppc-opc.c
20+++ b/opcodes/ppc-opc.c 19+++ b/opcodes/ppc-opc.c
21@@ -6378,8 +6378,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 20@@ -6378,8 +6378,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0009-Use-libtool-2.4.patch
index 8f87cfdb77..9f0209e274 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-Use-libtool-2.4.patch
@@ -1,4 +1,4 @@
1From fd34d57c9e2a0bff1283a6707062ed4a42476b10 Mon Sep 17 00:00:00 2001 1From 9a0dea4d2f1f0f2c71f519e6195ef9cfacd9fda9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:04:07 +0000 3Date: Sun, 14 Feb 2016 17:04:07 +0000
4Subject: [PATCH] Use libtool 2.4 4Subject: [PATCH] Use libtool 2.4
@@ -9,27 +9,28 @@ Upstream-Status: Pending
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 11---
12 bfd/configure | 1340 +++++++++++++++----- 12 bfd/configure | 1333 +++++++++++++-----
13 bfd/configure.ac | 2 +- 13 bfd/configure.ac | 2 +-
14 binutils/configure | 1338 +++++++++++++++----- 14 binutils/configure | 1331 +++++++++++++-----
15 gas/configure | 1338 +++++++++++++++----- 15 gas/configure | 1331 +++++++++++++-----
16 gprof/configure | 1338 +++++++++++++++----- 16 gprof/configure | 1331 +++++++++++++-----
17 ld/configure | 1713 +++++++++++++++++++------- 17 ld/configure | 1704 +++++++++++++++++------
18 libctf/configure | 1337 +++++++++++++++----- 18 libbacktrace/configure | 1534 +++++++++++++++------
19 libtool.m4 | 1100 +++++++++++------ 19 libctf/configure | 1330 +++++++++++++-----
20 ltmain.sh | 2925 +++++++++++++++++++++++++++++--------------- 20 libtool.m4 | 1093 ++++++++++-----
21 ltoptions.m4 | 2 +- 21 ltmain.sh | 2925 +++++++++++++++++++++++++++-------------
22 ltversion.m4 | 12 +- 22 ltoptions.m4 | 2 +-
23 lt~obsolete.m4 | 2 +- 23 ltversion.m4 | 12 +-
24 opcodes/configure | 1338 +++++++++++++++----- 24 lt~obsolete.m4 | 2 +-
25 zlib/configure | 1338 +++++++++++++++----- 25 opcodes/configure | 1331 +++++++++++++-----
26 14 files changed, 10995 insertions(+), 4128 deletions(-) 26 zlib/configure | 1331 +++++++++++++-----
27 15 files changed, 12067 insertions(+), 4525 deletions(-)
27 28
28diff --git a/bfd/configure b/bfd/configure 29diff --git a/bfd/configure b/bfd/configure
29index daa51244369..79d0c4b4623 100755 30index b23c9eebfd7..fb25d046cd2 100755
30--- a/bfd/configure 31--- a/bfd/configure
31+++ b/bfd/configure 32+++ b/bfd/configure
32@@ -705,6 +705,9 @@ OTOOL 33@@ -707,6 +707,9 @@ OTOOL
33 LIPO 34 LIPO
34 NMEDIT 35 NMEDIT
35 DSYMUTIL 36 DSYMUTIL
@@ -39,7 +40,7 @@ index daa51244369..79d0c4b4623 100755
39 OBJDUMP 40 OBJDUMP
40 LN_S 41 LN_S
41 NM 42 NM
42@@ -823,6 +826,7 @@ enable_static 43@@ -825,6 +828,7 @@ enable_static
43 with_pic 44 with_pic
44 enable_fast_install 45 enable_fast_install
45 with_gnu_ld 46 with_gnu_ld
@@ -47,7 +48,7 @@ index daa51244369..79d0c4b4623 100755
47 enable_libtool_lock 48 enable_libtool_lock
48 enable_plugins 49 enable_plugins
49 enable_largefile 50 enable_largefile
50@@ -1507,6 +1511,8 @@ Optional Packages: 51@@ -1509,6 +1513,8 @@ Optional Packages:
51 --with-pic try to use only PIC/non-PIC objects [default=use 52 --with-pic try to use only PIC/non-PIC objects [default=use
52 both] 53 both]
53 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 54 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -56,7 +57,7 @@ index daa51244369..79d0c4b4623 100755
56 --with-mmap try using mmap for BFD input files if available 57 --with-mmap try using mmap for BFD input files if available
57 --with-separate-debug-dir=DIR 58 --with-separate-debug-dir=DIR
58 Look for global separate debug info in DIR 59 Look for global separate debug info in DIR
59@@ -4988,8 +4994,8 @@ esac 60@@ -5029,8 +5035,8 @@ esac
60 61
61 62
62 63
@@ -67,7 +68,7 @@ index daa51244369..79d0c4b4623 100755
67 68
68 69
69 70
70@@ -5029,7 +5035,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 71@@ -5070,7 +5076,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 72 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
72 $as_echo_n "checking how to print strings... " >&6; } 73 $as_echo_n "checking how to print strings... " >&6; }
73 # Test print first, because it will be a builtin if present. 74 # Test print first, because it will be a builtin if present.
@@ -76,7 +77,7 @@ index daa51244369..79d0c4b4623 100755
76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 77 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
77 ECHO='print -r --' 78 ECHO='print -r --'
78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 79 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
79@@ -5715,8 +5721,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 80@@ -5757,8 +5763,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
80 # Try some XSI features 81 # Try some XSI features
81 xsi_shell=no 82 xsi_shell=no
82 ( _lt_dummy="a/b/c" 83 ( _lt_dummy="a/b/c"
@@ -87,7 +88,7 @@ index daa51244369..79d0c4b4623 100755
87 && eval 'test $(( 1 + 1 )) -eq 2 \ 88 && eval 'test $(( 1 + 1 )) -eq 2 \
88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 89 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
89 && xsi_shell=yes 90 && xsi_shell=yes
90@@ -5765,6 +5771,80 @@ esac 91@@ -5807,6 +5813,80 @@ esac
91 92
92 93
93 94
@@ -168,7 +169,7 @@ index daa51244369..79d0c4b4623 100755
168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 169 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
169 $as_echo_n "checking for $LD option to reload object files... " >&6; } 170 $as_echo_n "checking for $LD option to reload object files... " >&6; }
170 if ${lt_cv_ld_reload_flag+:} false; then : 171 if ${lt_cv_ld_reload_flag+:} false; then :
171@@ -5781,6 +5861,11 @@ case $reload_flag in 172@@ -5823,6 +5903,11 @@ case $reload_flag in
172 esac 173 esac
173 reload_cmds='$LD$reload_flag -o $output$reload_objs' 174 reload_cmds='$LD$reload_flag -o $output$reload_objs'
174 case $host_os in 175 case $host_os in
@@ -180,7 +181,7 @@ index daa51244369..79d0c4b4623 100755
180 darwin*) 181 darwin*)
181 if test "$GCC" = yes; then 182 if test "$GCC" = yes; then
182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 183 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
183@@ -5949,7 +6034,8 @@ mingw* | pw32*) 184@@ -5991,7 +6076,8 @@ mingw* | pw32*)
184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 185 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
185 lt_cv_file_magic_cmd='func_win32_libid' 186 lt_cv_file_magic_cmd='func_win32_libid'
186 else 187 else
@@ -190,7 +191,7 @@ index daa51244369..79d0c4b4623 100755
190 lt_cv_file_magic_cmd='$OBJDUMP -f' 191 lt_cv_file_magic_cmd='$OBJDUMP -f'
191 fi 192 fi
192 ;; 193 ;;
193@@ -6103,6 +6189,21 @@ esac 194@@ -6145,6 +6231,21 @@ esac
194 fi 195 fi
195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 196 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
196 $as_echo "$lt_cv_deplibs_check_method" >&6; } 197 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -212,7 +213,7 @@ index daa51244369..79d0c4b4623 100755
212 file_magic_cmd=$lt_cv_file_magic_cmd 213 file_magic_cmd=$lt_cv_file_magic_cmd
213 deplibs_check_method=$lt_cv_deplibs_check_method 214 deplibs_check_method=$lt_cv_deplibs_check_method
214 test -z "$deplibs_check_method" && deplibs_check_method=unknown 215 test -z "$deplibs_check_method" && deplibs_check_method=unknown
215@@ -6118,6 +6219,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 216@@ -6160,6 +6261,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
216 217
217 218
218 219
@@ -370,7 +371,7 @@ index daa51244369..79d0c4b4623 100755
370 plugin_option= 371 plugin_option=
371 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 372 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
372 for plugin in $plugin_names; do 373 for plugin in $plugin_names; do
373@@ -6132,8 +6384,10 @@ for plugin in $plugin_names; do 374@@ -6174,8 +6426,10 @@ for plugin in $plugin_names; do
374 done 375 done
375 376
376 if test -n "$ac_tool_prefix"; then 377 if test -n "$ac_tool_prefix"; then
@@ -383,7 +384,7 @@ index daa51244369..79d0c4b4623 100755
383 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 384 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
384 $as_echo_n "checking for $ac_word... " >&6; } 385 $as_echo_n "checking for $ac_word... " >&6; }
385 if ${ac_cv_prog_AR+:} false; then : 386 if ${ac_cv_prog_AR+:} false; then :
386@@ -6149,7 +6403,7 @@ do 387@@ -6191,7 +6445,7 @@ do
387 test -z "$as_dir" && as_dir=. 388 test -z "$as_dir" && as_dir=.
388 for ac_exec_ext in '' $ac_executable_extensions; do 389 for ac_exec_ext in '' $ac_executable_extensions; do
389 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 390 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -392,7 +393,7 @@ index daa51244369..79d0c4b4623 100755
392 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 393 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
393 break 2 394 break 2
394 fi 395 fi
395@@ -6169,11 +6423,15 @@ $as_echo "no" >&6; } 396@@ -6211,11 +6465,15 @@ $as_echo "no" >&6; }
396 fi 397 fi
397 398
398 399
@@ -411,7 +412,7 @@ index daa51244369..79d0c4b4623 100755
411 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 412 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
412 $as_echo_n "checking for $ac_word... " >&6; } 413 $as_echo_n "checking for $ac_word... " >&6; }
413 if ${ac_cv_prog_ac_ct_AR+:} false; then : 414 if ${ac_cv_prog_ac_ct_AR+:} false; then :
414@@ -6189,7 +6447,7 @@ do 415@@ -6231,7 +6489,7 @@ do
415 test -z "$as_dir" && as_dir=. 416 test -z "$as_dir" && as_dir=.
416 for ac_exec_ext in '' $ac_executable_extensions; do 417 for ac_exec_ext in '' $ac_executable_extensions; do
417 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 418 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -420,7 +421,7 @@ index daa51244369..79d0c4b4623 100755
420 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 421 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
421 break 2 422 break 2
422 fi 423 fi
423@@ -6208,6 +6466,10 @@ else 424@@ -6250,6 +6508,10 @@ else
424 $as_echo "no" >&6; } 425 $as_echo "no" >&6; }
425 fi 426 fi
426 427
@@ -431,7 +432,7 @@ index daa51244369..79d0c4b4623 100755
431 if test "x$ac_ct_AR" = x; then 432 if test "x$ac_ct_AR" = x; then
432 AR="false" 433 AR="false"
433 else 434 else
434@@ -6219,25 +6481,20 @@ ac_tool_warned=yes ;; 435@@ -6261,25 +6523,20 @@ ac_tool_warned=yes ;;
435 esac 436 esac
436 AR=$ac_ct_AR 437 AR=$ac_ct_AR
437 fi 438 fi
@@ -467,7 +468,7 @@ index daa51244369..79d0c4b4623 100755
467 468
468 469
469 470
470@@ -6248,6 +6505,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 471@@ -6290,6 +6547,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
471 472
472 473
473 474
@@ -531,7 +532,7 @@ index daa51244369..79d0c4b4623 100755
531 532
532 if test -n "$ac_tool_prefix"; then 533 if test -n "$ac_tool_prefix"; then
533 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 534 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
534@@ -6588,8 +6902,8 @@ esac 535@@ -6630,8 +6944,8 @@ esac
535 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 536 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
536 537
537 # Transform an extracted symbol line into symbol name and symbol address 538 # Transform an extracted symbol line into symbol name and symbol address
@@ -542,7 +543,7 @@ index daa51244369..79d0c4b4623 100755
542 543
543 # Handle CRLF in mingw tool chain 544 # Handle CRLF in mingw tool chain
544 opt_cr= 545 opt_cr=
545@@ -6625,6 +6939,7 @@ for ac_symprfx in "" "_"; do 546@@ -6667,6 +6981,7 @@ for ac_symprfx in "" "_"; do
546 else 547 else
547 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 548 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
548 fi 549 fi
@@ -550,7 +551,7 @@ index daa51244369..79d0c4b4623 100755
550 551
551 # Check to see that the pipe works correctly. 552 # Check to see that the pipe works correctly.
552 pipe_works=no 553 pipe_works=no
553@@ -6666,6 +6981,18 @@ _LT_EOF 554@@ -6708,6 +7023,18 @@ _LT_EOF
554 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 555 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
555 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 556 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
556 cat <<_LT_EOF > conftest.$ac_ext 557 cat <<_LT_EOF > conftest.$ac_ext
@@ -569,7 +570,7 @@ index daa51244369..79d0c4b4623 100755
569 #ifdef __cplusplus 570 #ifdef __cplusplus
570 extern "C" { 571 extern "C" {
571 #endif 572 #endif
572@@ -6677,7 +7004,7 @@ _LT_EOF 573@@ -6719,7 +7046,7 @@ _LT_EOF
573 cat <<_LT_EOF >> conftest.$ac_ext 574 cat <<_LT_EOF >> conftest.$ac_ext
574 575
575 /* The mapping between symbol names and symbols. */ 576 /* The mapping between symbol names and symbols. */
@@ -578,7 +579,7 @@ index daa51244369..79d0c4b4623 100755
578 const char *name; 579 const char *name;
579 void *address; 580 void *address;
580 } 581 }
581@@ -6703,8 +7030,8 @@ static const void *lt_preloaded_setup() { 582@@ -6745,8 +7072,8 @@ static const void *lt_preloaded_setup() {
582 _LT_EOF 583 _LT_EOF
583 # Now try linking the two files. 584 # Now try linking the two files.
584 mv conftest.$ac_objext conftstm.$ac_objext 585 mv conftest.$ac_objext conftstm.$ac_objext
@@ -589,7 +590,7 @@ index daa51244369..79d0c4b4623 100755
589 LIBS="conftstm.$ac_objext" 590 LIBS="conftstm.$ac_objext"
590 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 591 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
591 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 592 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
592@@ -6714,8 +7041,8 @@ _LT_EOF 593@@ -6756,8 +7083,8 @@ _LT_EOF
593 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 594 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
594 pipe_works=yes 595 pipe_works=yes
595 fi 596 fi
@@ -600,7 +601,7 @@ index daa51244369..79d0c4b4623 100755
600 else 601 else
601 echo "cannot find nm_test_func in $nlist" >&5 602 echo "cannot find nm_test_func in $nlist" >&5
602 fi 603 fi
603@@ -6752,6 +7079,14 @@ else 604@@ -6794,6 +7121,14 @@ else
604 $as_echo "ok" >&6; } 605 $as_echo "ok" >&6; }
605 fi 606 fi
606 607
@@ -615,7 +616,7 @@ index daa51244369..79d0c4b4623 100755
615 616
616 617
617 618
618@@ -6770,6 +7105,47 @@ fi 619@@ -6812,6 +7147,47 @@ fi
619 620
620 621
621 622
@@ -663,7 +664,7 @@ index daa51244369..79d0c4b4623 100755
663 664
664 665
665 666
666@@ -6979,6 +7355,123 @@ esac 667@@ -7021,6 +7397,123 @@ esac
667 668
668 need_locks="$enable_libtool_lock" 669 need_locks="$enable_libtool_lock"
669 670
@@ -787,7 +788,7 @@ index daa51244369..79d0c4b4623 100755
787 788
788 case $host_os in 789 case $host_os in
789 rhapsody* | darwin*) 790 rhapsody* | darwin*)
790@@ -7542,6 +8035,8 @@ _LT_EOF 791@@ -7584,6 +8077,8 @@ _LT_EOF
791 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 792 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
792 echo "$AR cru libconftest.a conftest.o" >&5 793 echo "$AR cru libconftest.a conftest.o" >&5
793 $AR cru libconftest.a conftest.o 2>&5 794 $AR cru libconftest.a conftest.o 2>&5
@@ -796,7 +797,7 @@ index daa51244369..79d0c4b4623 100755
796 cat > conftest.c << _LT_EOF 797 cat > conftest.c << _LT_EOF
797 int main() { return 0;} 798 int main() { return 0;}
798 _LT_EOF 799 _LT_EOF
799@@ -8093,8 +8589,6 @@ fi 800@@ -8135,8 +8630,6 @@ fi
800 lt_prog_compiler_pic= 801 lt_prog_compiler_pic=
801 lt_prog_compiler_static= 802 lt_prog_compiler_static=
802 803
@@ -805,7 +806,7 @@ index daa51244369..79d0c4b4623 100755
805 806
806 if test "$GCC" = yes; then 807 if test "$GCC" = yes; then
807 lt_prog_compiler_wl='-Wl,' 808 lt_prog_compiler_wl='-Wl,'
808@@ -8260,6 +8754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 809@@ -8302,6 +8795,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
809 lt_prog_compiler_pic='--shared' 810 lt_prog_compiler_pic='--shared'
810 lt_prog_compiler_static='--static' 811 lt_prog_compiler_static='--static'
811 ;; 812 ;;
@@ -818,7 +819,7 @@ index daa51244369..79d0c4b4623 100755
818 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 819 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
819 # Portland Group compilers (*not* the Pentium gcc compiler, 820 # Portland Group compilers (*not* the Pentium gcc compiler,
820 # which looks to be a dead project) 821 # which looks to be a dead project)
821@@ -8322,7 +8822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 822@@ -8364,7 +8863,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
822 lt_prog_compiler_pic='-KPIC' 823 lt_prog_compiler_pic='-KPIC'
823 lt_prog_compiler_static='-Bstatic' 824 lt_prog_compiler_static='-Bstatic'
824 case $cc_basename in 825 case $cc_basename in
@@ -827,7 +828,7 @@ index daa51244369..79d0c4b4623 100755
827 lt_prog_compiler_wl='-Qoption ld ';; 828 lt_prog_compiler_wl='-Qoption ld ';;
828 *) 829 *)
829 lt_prog_compiler_wl='-Wl,';; 830 lt_prog_compiler_wl='-Wl,';;
830@@ -8379,13 +8879,17 @@ case $host_os in 831@@ -8421,13 +8920,17 @@ case $host_os in
831 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 832 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
832 ;; 833 ;;
833 esac 834 esac
@@ -851,7 +852,7 @@ index daa51244369..79d0c4b4623 100755
851 852
852 # 853 #
853 # Check to make sure the PIC flag actually works. 854 # Check to make sure the PIC flag actually works.
854@@ -8446,6 +8950,11 @@ fi 855@@ -8488,6 +8991,11 @@ fi
855 856
856 857
857 858
@@ -863,7 +864,7 @@ index daa51244369..79d0c4b4623 100755
863 # 864 #
864 # Check to make sure the static flag actually works. 865 # Check to make sure the static flag actually works.
865 # 866 #
866@@ -8796,7 +9305,8 @@ _LT_EOF 867@@ -8838,7 +9346,8 @@ _LT_EOF
867 allow_undefined_flag=unsupported 868 allow_undefined_flag=unsupported
868 always_export_symbols=no 869 always_export_symbols=no
869 enable_shared_with_static_runtimes=yes 870 enable_shared_with_static_runtimes=yes
@@ -873,7 +874,7 @@ index daa51244369..79d0c4b4623 100755
873 874
874 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 875 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
875 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 876 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
876@@ -8895,12 +9405,12 @@ _LT_EOF 877@@ -8937,12 +9446,12 @@ _LT_EOF
877 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 878 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
878 hardcode_libdir_flag_spec= 879 hardcode_libdir_flag_spec=
879 hardcode_libdir_flag_spec_ld='-rpath $libdir' 880 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -888,7 +889,7 @@ index daa51244369..79d0c4b4623 100755
888 fi 889 fi
889 ;; 890 ;;
890 esac 891 esac
891@@ -8914,8 +9424,8 @@ _LT_EOF 892@@ -8956,8 +9465,8 @@ _LT_EOF
892 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 893 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
893 wlarc= 894 wlarc=
894 else 895 else
@@ -899,7 +900,7 @@ index daa51244369..79d0c4b4623 100755
899 fi 900 fi
900 ;; 901 ;;
901 902
902@@ -8933,8 +9443,8 @@ _LT_EOF 903@@ -8975,8 +9484,8 @@ _LT_EOF
903 904
904 _LT_EOF 905 _LT_EOF
905 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 906 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -910,7 +911,7 @@ index daa51244369..79d0c4b4623 100755
910 else 911 else
911 ld_shlibs=no 912 ld_shlibs=no
912 fi 913 fi
913@@ -8980,8 +9490,8 @@ _LT_EOF 914@@ -9022,8 +9531,8 @@ _LT_EOF
914 915
915 *) 916 *)
916 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 917 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -921,7 +922,7 @@ index daa51244369..79d0c4b4623 100755
921 else 922 else
922 ld_shlibs=no 923 ld_shlibs=no
923 fi 924 fi
924@@ -9111,7 +9621,13 @@ _LT_EOF 925@@ -9153,7 +9662,13 @@ _LT_EOF
925 allow_undefined_flag='-berok' 926 allow_undefined_flag='-berok'
926 # Determine the default libpath from the value encoded in an 927 # Determine the default libpath from the value encoded in an
927 # empty executable. 928 # empty executable.
@@ -936,7 +937,7 @@ index daa51244369..79d0c4b4623 100755
936 /* end confdefs.h. */ 937 /* end confdefs.h. */
937 938
938 int 939 int
939@@ -9124,22 +9640,29 @@ main () 940@@ -9166,22 +9681,29 @@ main ()
940 _ACEOF 941 _ACEOF
941 if ac_fn_c_try_link "$LINENO"; then : 942 if ac_fn_c_try_link "$LINENO"; then :
942 943
@@ -979,7 +980,7 @@ index daa51244369..79d0c4b4623 100755
979 980
980 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 981 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
981 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 982 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
982@@ -9151,7 +9674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 983@@ -9193,7 +9715,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
983 else 984 else
984 # Determine the default libpath from the value encoded in an 985 # Determine the default libpath from the value encoded in an
985 # empty executable. 986 # empty executable.
@@ -994,7 +995,7 @@ index daa51244369..79d0c4b4623 100755
994 /* end confdefs.h. */ 995 /* end confdefs.h. */
995 996
996 int 997 int
997@@ -9164,22 +9693,29 @@ main () 998@@ -9206,22 +9734,29 @@ main ()
998 _ACEOF 999 _ACEOF
999 if ac_fn_c_try_link "$LINENO"; then : 1000 if ac_fn_c_try_link "$LINENO"; then :
1000 1001
@@ -1037,7 +1038,7 @@ index daa51244369..79d0c4b4623 100755
1037 1038
1038 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1039 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1039 # Warning - without using the other run time loading flags, 1040 # Warning - without using the other run time loading flags,
1040@@ -9224,20 +9760,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1041@@ -9266,20 +9801,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1041 # Microsoft Visual C++. 1042 # Microsoft Visual C++.
1042 # hardcode_libdir_flag_spec is actually meaningless, as there is 1043 # hardcode_libdir_flag_spec is actually meaningless, as there is
1043 # no search path for DLLs. 1044 # no search path for DLLs.
@@ -1115,7 +1116,7 @@ index daa51244369..79d0c4b4623 100755
1115 ;; 1116 ;;
1116 1117
1117 darwin* | rhapsody*) 1118 darwin* | rhapsody*)
1118@@ -9298,7 +9877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1119@@ -9340,7 +9918,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1119 1120
1120 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1121 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1121 freebsd* | dragonfly*) 1122 freebsd* | dragonfly*)
@@ -1124,7 +1125,7 @@ index daa51244369..79d0c4b4623 100755
1124 hardcode_libdir_flag_spec='-R$libdir' 1125 hardcode_libdir_flag_spec='-R$libdir'
1125 hardcode_direct=yes 1126 hardcode_direct=yes
1126 hardcode_shlibpath_var=no 1127 hardcode_shlibpath_var=no
1127@@ -9306,7 +9885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1128@@ -9348,7 +9926,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1128 1129
1129 hpux9*) 1130 hpux9*)
1130 if test "$GCC" = yes; then 1131 if test "$GCC" = yes; then
@@ -1133,7 +1134,7 @@ index daa51244369..79d0c4b4623 100755
1133 else 1134 else
1134 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 1135 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1135 fi 1136 fi
1136@@ -9322,7 +9901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1137@@ -9364,7 +9942,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1137 1138
1138 hpux10*) 1139 hpux10*)
1139 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1140 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1142,7 +1143,7 @@ index daa51244369..79d0c4b4623 100755
1142 else 1143 else
1143 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1144 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1144 fi 1145 fi
1145@@ -9346,10 +9925,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1146@@ -9388,10 +9966,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1146 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1147 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1147 ;; 1148 ;;
1148 ia64*) 1149 ia64*)
@@ -1155,7 +1156,7 @@ index daa51244369..79d0c4b4623 100755
1155 ;; 1156 ;;
1156 esac 1157 esac
1157 else 1158 else
1158@@ -9428,23 +10007,36 @@ fi 1159@@ -9470,23 +10048,36 @@ fi
1159 1160
1160 irix5* | irix6* | nonstopux*) 1161 irix5* | irix6* | nonstopux*)
1161 if test "$GCC" = yes; then 1162 if test "$GCC" = yes; then
@@ -1200,7 +1201,7 @@ index daa51244369..79d0c4b4623 100755
1200 else 1201 else
1201 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 1202 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1202 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 1203 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
1203@@ -9529,7 +10121,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1204@@ -9571,7 +10162,7 @@ rm -f core conftest.err conftest.$ac_objext \
1204 osf4* | osf5*) # as osf3* with the addition of -msym flag 1205 osf4* | osf5*) # as osf3* with the addition of -msym flag
1205 if test "$GCC" = yes; then 1206 if test "$GCC" = yes; then
1206 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1207 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1209,7 +1210,7 @@ index daa51244369..79d0c4b4623 100755
1209 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1210 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1210 else 1211 else
1211 allow_undefined_flag=' -expect_unresolved \*' 1212 allow_undefined_flag=' -expect_unresolved \*'
1212@@ -9548,9 +10140,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1213@@ -9590,9 +10181,9 @@ rm -f core conftest.err conftest.$ac_objext \
1213 no_undefined_flag=' -z defs' 1214 no_undefined_flag=' -z defs'
1214 if test "$GCC" = yes; then 1215 if test "$GCC" = yes; then
1215 wlarc='${wl}' 1216 wlarc='${wl}'
@@ -1221,7 +1222,7 @@ index daa51244369..79d0c4b4623 100755
1221 else 1222 else
1222 case `$CC -V 2>&1` in 1223 case `$CC -V 2>&1` in
1223 *"Compilers 5.0"*) 1224 *"Compilers 5.0"*)
1224@@ -10126,8 +10718,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1225@@ -10168,8 +10759,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1225 need_version=no 1226 need_version=no
1226 need_lib_prefix=no 1227 need_lib_prefix=no
1227 1228
@@ -1233,7 +1234,7 @@ index daa51244369..79d0c4b4623 100755
1233 library_names_spec='$libname.dll.a' 1234 library_names_spec='$libname.dll.a'
1234 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1235 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1235 postinstall_cmds='base_file=`basename \${file}`~ 1236 postinstall_cmds='base_file=`basename \${file}`~
1236@@ -10160,13 +10753,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1237@@ -10202,13 +10794,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1237 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1238 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1238 ;; 1239 ;;
1239 esac 1240 esac
@@ -1306,25 +1307,16 @@ index daa51244369..79d0c4b4623 100755
1306 # FIXME: first we should search . and the directory the executable is in 1307 # FIXME: first we should search . and the directory the executable is in
1307 shlibpath_var=PATH 1308 shlibpath_var=PATH
1308 ;; 1309 ;;
1309@@ -10248,7 +10899,7 @@ haiku*) 1310@@ -11086,7 +11736,7 @@ else
1310 soname_spec='${libname}${release}${shared_ext}$major'
1311 shlibpath_var=LIBRARY_PATH
1312 shlibpath_overrides_runpath=yes
1313- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
1314+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1315 hardcode_into_libs=yes
1316 ;;
1317
1318@@ -11044,7 +11695,7 @@ else
1319 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1311 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1320 lt_status=$lt_dlunknown 1312 lt_status=$lt_dlunknown
1321 cat > conftest.$ac_ext <<_LT_EOF 1313 cat > conftest.$ac_ext <<_LT_EOF
1322-#line 11047 "configure" 1314-#line 11089 "configure"
1323+#line $LINENO "configure" 1315+#line $LINENO "configure"
1324 #include "confdefs.h" 1316 #include "confdefs.h"
1325 1317
1326 #if HAVE_DLFCN_H 1318 #if HAVE_DLFCN_H
1327@@ -11088,10 +11739,10 @@ else 1319@@ -11130,10 +11780,10 @@ else
1328 /* When -fvisbility=hidden is used, assume the code has been annotated 1320 /* When -fvisbility=hidden is used, assume the code has been annotated
1329 correspondingly for the symbols needed. */ 1321 correspondingly for the symbols needed. */
1330 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1322 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1337,16 +1329,16 @@ index daa51244369..79d0c4b4623 100755
1337 int main () 1329 int main ()
1338 { 1330 {
1339 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1331 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1340@@ -11150,7 +11801,7 @@ else 1332@@ -11192,7 +11842,7 @@ else
1341 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1333 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1342 lt_status=$lt_dlunknown 1334 lt_status=$lt_dlunknown
1343 cat > conftest.$ac_ext <<_LT_EOF 1335 cat > conftest.$ac_ext <<_LT_EOF
1344-#line 11153 "configure" 1336-#line 11195 "configure"
1345+#line $LINENO "configure" 1337+#line $LINENO "configure"
1346 #include "confdefs.h" 1338 #include "confdefs.h"
1347 1339
1348 #if HAVE_DLFCN_H 1340 #if HAVE_DLFCN_H
1349@@ -11194,10 +11845,10 @@ else 1341@@ -11236,10 +11886,10 @@ else
1350 /* When -fvisbility=hidden is used, assume the code has been annotated 1342 /* When -fvisbility=hidden is used, assume the code has been annotated
1351 correspondingly for the symbols needed. */ 1343 correspondingly for the symbols needed. */
1352 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1344 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1359,7 +1351,7 @@ index daa51244369..79d0c4b4623 100755
1359 int main () 1351 int main ()
1360 { 1352 {
1361 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1353 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1362@@ -13114,7 +13765,7 @@ SHARED_LDFLAGS= 1354@@ -13224,7 +13874,7 @@ SHARED_LDFLAGS=
1363 if test "$enable_shared" = "yes"; then 1355 if test "$enable_shared" = "yes"; then
1364 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1356 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1365 if test -n "$x"; then 1357 if test -n "$x"; then
@@ -1368,7 +1360,7 @@ index daa51244369..79d0c4b4623 100755
1368 fi 1360 fi
1369 fi 1361 fi
1370 1362
1371@@ -15762,13 +16413,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1363@@ -15879,13 +16529,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1372 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1364 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1373 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1365 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1374 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1366 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1389,7 +1381,7 @@ index daa51244369..79d0c4b4623 100755
1389 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1381 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1390 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1382 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1391 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1383 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1392@@ -15783,14 +16441,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1384@@ -15900,14 +16557,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1393 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1385 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1394 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1386 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1395 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 1387 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -1408,7 +1400,7 @@ index daa51244369..79d0c4b4623 100755
1408 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1400 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1409 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1401 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1410 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1402 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1411@@ -15823,12 +16484,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1403@@ -15940,12 +16600,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1412 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1404 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1413 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1405 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1414 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1406 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1422,7 +1414,7 @@ index daa51244369..79d0c4b4623 100755
1422 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1414 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1423 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1415 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1424 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1416 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1425@@ -15883,8 +16544,13 @@ reload_flag \ 1417@@ -16000,8 +16660,13 @@ reload_flag \
1426 OBJDUMP \ 1418 OBJDUMP \
1427 deplibs_check_method \ 1419 deplibs_check_method \
1428 file_magic_cmd \ 1420 file_magic_cmd \
@@ -1436,7 +1428,7 @@ index daa51244369..79d0c4b4623 100755
1436 STRIP \ 1428 STRIP \
1437 RANLIB \ 1429 RANLIB \
1438 CC \ 1430 CC \
1439@@ -15894,12 +16560,14 @@ lt_cv_sys_global_symbol_pipe \ 1431@@ -16011,12 +16676,14 @@ lt_cv_sys_global_symbol_pipe \
1440 lt_cv_sys_global_symbol_to_cdecl \ 1432 lt_cv_sys_global_symbol_to_cdecl \
1441 lt_cv_sys_global_symbol_to_c_name_address \ 1433 lt_cv_sys_global_symbol_to_c_name_address \
1442 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1434 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1452,7 +1444,7 @@ index daa51244369..79d0c4b4623 100755
1452 DSYMUTIL \ 1444 DSYMUTIL \
1453 NMEDIT \ 1445 NMEDIT \
1454 LIPO \ 1446 LIPO \
1455@@ -15915,7 +16583,6 @@ no_undefined_flag \ 1447@@ -16032,7 +16699,6 @@ no_undefined_flag \
1456 hardcode_libdir_flag_spec \ 1448 hardcode_libdir_flag_spec \
1457 hardcode_libdir_flag_spec_ld \ 1449 hardcode_libdir_flag_spec_ld \
1458 hardcode_libdir_separator \ 1450 hardcode_libdir_separator \
@@ -1460,7 +1452,7 @@ index daa51244369..79d0c4b4623 100755
1460 exclude_expsyms \ 1452 exclude_expsyms \
1461 include_expsyms \ 1453 include_expsyms \
1462 file_list_spec \ 1454 file_list_spec \
1463@@ -15951,6 +16618,7 @@ module_cmds \ 1455@@ -16068,6 +16734,7 @@ module_cmds \
1464 module_expsym_cmds \ 1456 module_expsym_cmds \
1465 export_symbols_cmds \ 1457 export_symbols_cmds \
1466 prelink_cmds \ 1458 prelink_cmds \
@@ -1468,7 +1460,7 @@ index daa51244369..79d0c4b4623 100755
1468 postinstall_cmds \ 1460 postinstall_cmds \
1469 postuninstall_cmds \ 1461 postuninstall_cmds \
1470 finish_cmds \ 1462 finish_cmds \
1471@@ -16720,7 +17388,8 @@ $as_echo X"$file" | 1463@@ -16837,7 +17504,8 @@ $as_echo X"$file" |
1472 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1464 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1473 # 1465 #
1474 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1466 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1478,7 +1470,7 @@ index daa51244369..79d0c4b4623 100755
1478 # Written by Gordon Matzigkeit, 1996 1470 # Written by Gordon Matzigkeit, 1996
1479 # 1471 #
1480 # This file is part of GNU Libtool. 1472 # This file is part of GNU Libtool.
1481@@ -16823,19 +17492,42 @@ SP2NL=$lt_lt_SP2NL 1473@@ -16940,19 +17608,42 @@ SP2NL=$lt_lt_SP2NL
1482 # turn newlines into spaces. 1474 # turn newlines into spaces.
1483 NL2SP=$lt_lt_NL2SP 1475 NL2SP=$lt_lt_NL2SP
1484 1476
@@ -1522,7 +1514,7 @@ index daa51244369..79d0c4b4623 100755
1522 # A symbol stripping program. 1514 # A symbol stripping program.
1523 STRIP=$lt_STRIP 1515 STRIP=$lt_STRIP
1524 1516
1525@@ -16865,6 +17557,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1517@@ -16982,6 +17673,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1526 # Transform the output of nm in a C name address pair when lib prefix is needed. 1518 # Transform the output of nm in a C name address pair when lib prefix is needed.
1527 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1519 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1528 1520
@@ -1535,7 +1527,7 @@ index daa51244369..79d0c4b4623 100755
1535 # The name of the directory that contains temporary libtool files. 1527 # The name of the directory that contains temporary libtool files.
1536 objdir=$objdir 1528 objdir=$objdir
1537 1529
1538@@ -16874,6 +17572,9 @@ MAGIC_CMD=$MAGIC_CMD 1530@@ -16991,6 +17688,9 @@ MAGIC_CMD=$MAGIC_CMD
1539 # Must we lock files when doing compilation? 1531 # Must we lock files when doing compilation?
1540 need_locks=$lt_need_locks 1532 need_locks=$lt_need_locks
1541 1533
@@ -1545,7 +1537,7 @@ index daa51244369..79d0c4b4623 100755
1545 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1537 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1546 DSYMUTIL=$lt_DSYMUTIL 1538 DSYMUTIL=$lt_DSYMUTIL
1547 1539
1548@@ -16988,12 +17689,12 @@ with_gcc=$GCC 1540@@ -17105,12 +17805,12 @@ with_gcc=$GCC
1549 # Compiler flag to turn off builtin functions. 1541 # Compiler flag to turn off builtin functions.
1550 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1542 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1551 1543
@@ -1561,7 +1553,7 @@ index daa51244369..79d0c4b4623 100755
1561 # Compiler flag to prevent dynamic linking. 1553 # Compiler flag to prevent dynamic linking.
1562 link_static_flag=$lt_lt_prog_compiler_static 1554 link_static_flag=$lt_lt_prog_compiler_static
1563 1555
1564@@ -17080,9 +17781,6 @@ inherit_rpath=$inherit_rpath 1556@@ -17197,9 +17897,6 @@ inherit_rpath=$inherit_rpath
1565 # Whether libtool must link a program against all its dependency libraries. 1557 # Whether libtool must link a program against all its dependency libraries.
1566 link_all_deplibs=$link_all_deplibs 1558 link_all_deplibs=$link_all_deplibs
1567 1559
@@ -1571,7 +1563,7 @@ index daa51244369..79d0c4b4623 100755
1571 # Set to "yes" if exported symbols are required. 1563 # Set to "yes" if exported symbols are required.
1572 always_export_symbols=$always_export_symbols 1564 always_export_symbols=$always_export_symbols
1573 1565
1574@@ -17098,6 +17796,9 @@ include_expsyms=$lt_include_expsyms 1566@@ -17215,6 +17912,9 @@ include_expsyms=$lt_include_expsyms
1575 # Commands necessary for linking programs (against libraries) with templates. 1567 # Commands necessary for linking programs (against libraries) with templates.
1576 prelink_cmds=$lt_prelink_cmds 1568 prelink_cmds=$lt_prelink_cmds
1577 1569
@@ -1581,7 +1573,7 @@ index daa51244369..79d0c4b4623 100755
1581 # Specify filename containing input files. 1573 # Specify filename containing input files.
1582 file_list_spec=$lt_file_list_spec 1574 file_list_spec=$lt_file_list_spec
1583 1575
1584@@ -17130,210 +17831,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1576@@ -17247,210 +17947,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1585 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1577 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1586 # text mode, it properly converts lines to CR/LF. This bash problem 1578 # text mode, it properly converts lines to CR/LF. This bash problem
1587 # is reportedly fixed, but why not run on old versions too? 1579 # is reportedly fixed, but why not run on old versions too?
@@ -1956,10 +1948,10 @@ index daa51244369..79d0c4b4623 100755
1956 chmod +x "$ofile" 1948 chmod +x "$ofile"
1957 1949
1958diff --git a/bfd/configure.ac b/bfd/configure.ac 1950diff --git a/bfd/configure.ac b/bfd/configure.ac
1959index 07a75ed1626..288374c504c 100644 1951index a9078965c40..22b5b7ea567 100644
1960--- a/bfd/configure.ac 1952--- a/bfd/configure.ac
1961+++ b/bfd/configure.ac 1953+++ b/bfd/configure.ac
1962@@ -304,7 +304,7 @@ changequote(,)dnl 1954@@ -303,7 +303,7 @@ changequote(,)dnl
1963 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1955 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1964 changequote([,])dnl 1956 changequote([,])dnl
1965 if test -n "$x"; then 1957 if test -n "$x"; then
@@ -1969,7 +1961,7 @@ index 07a75ed1626..288374c504c 100644
1969 fi 1961 fi
1970 1962
1971diff --git a/binutils/configure b/binutils/configure 1963diff --git a/binutils/configure b/binutils/configure
1972index bf6461dab1e..8e6f6d30b4d 100755 1964index 8cde216cb1f..15f3f4eb874 100755
1973--- a/binutils/configure 1965--- a/binutils/configure
1974+++ b/binutils/configure 1966+++ b/binutils/configure
1975@@ -696,8 +696,11 @@ OTOOL 1967@@ -696,8 +696,11 @@ OTOOL
@@ -2001,7 +1993,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2001 --with-debuginfod Enable debuginfo lookups with debuginfod 1993 --with-debuginfod Enable debuginfo lookups with debuginfod
2002 (auto/yes/no) 1994 (auto/yes/no)
2003 --with-system-zlib use installed libz 1995 --with-system-zlib use installed libz
2004@@ -4844,8 +4850,8 @@ esac 1996@@ -4883,8 +4889,8 @@ esac
2005 1997
2006 1998
2007 1999
@@ -2012,7 +2004,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2012 2004
2013 2005
2014 2006
2015@@ -4885,7 +4891,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2007@@ -4924,7 +4930,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2016 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2008 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2017 $as_echo_n "checking how to print strings... " >&6; } 2009 $as_echo_n "checking how to print strings... " >&6; }
2018 # Test print first, because it will be a builtin if present. 2010 # Test print first, because it will be a builtin if present.
@@ -2021,7 +2013,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2021 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2013 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2022 ECHO='print -r --' 2014 ECHO='print -r --'
2023 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2015 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2024@@ -5571,8 +5577,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2016@@ -5611,8 +5617,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2025 # Try some XSI features 2017 # Try some XSI features
2026 xsi_shell=no 2018 xsi_shell=no
2027 ( _lt_dummy="a/b/c" 2019 ( _lt_dummy="a/b/c"
@@ -2032,7 +2024,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2032 && eval 'test $(( 1 + 1 )) -eq 2 \ 2024 && eval 'test $(( 1 + 1 )) -eq 2 \
2033 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2025 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2034 && xsi_shell=yes 2026 && xsi_shell=yes
2035@@ -5621,6 +5627,80 @@ esac 2027@@ -5661,6 +5667,80 @@ esac
2036 2028
2037 2029
2038 2030
@@ -2113,7 +2105,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2113 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2105 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2114 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2106 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2115 if ${lt_cv_ld_reload_flag+:} false; then : 2107 if ${lt_cv_ld_reload_flag+:} false; then :
2116@@ -5637,6 +5717,11 @@ case $reload_flag in 2108@@ -5677,6 +5757,11 @@ case $reload_flag in
2117 esac 2109 esac
2118 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2110 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2119 case $host_os in 2111 case $host_os in
@@ -2125,7 +2117,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2125 darwin*) 2117 darwin*)
2126 if test "$GCC" = yes; then 2118 if test "$GCC" = yes; then
2127 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2119 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2128@@ -5805,7 +5890,8 @@ mingw* | pw32*) 2120@@ -5845,7 +5930,8 @@ mingw* | pw32*)
2129 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2121 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2130 lt_cv_file_magic_cmd='func_win32_libid' 2122 lt_cv_file_magic_cmd='func_win32_libid'
2131 else 2123 else
@@ -2135,7 +2127,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2135 lt_cv_file_magic_cmd='$OBJDUMP -f' 2127 lt_cv_file_magic_cmd='$OBJDUMP -f'
2136 fi 2128 fi
2137 ;; 2129 ;;
2138@@ -5959,6 +6045,21 @@ esac 2130@@ -5999,6 +6085,21 @@ esac
2139 fi 2131 fi
2140 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2132 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2141 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2133 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2157,7 +2149,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2157 file_magic_cmd=$lt_cv_file_magic_cmd 2149 file_magic_cmd=$lt_cv_file_magic_cmd
2158 deplibs_check_method=$lt_cv_deplibs_check_method 2150 deplibs_check_method=$lt_cv_deplibs_check_method
2159 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2151 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2160@@ -5974,6 +6075,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2152@@ -6014,6 +6115,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2161 2153
2162 2154
2163 2155
@@ -2315,7 +2307,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2315 plugin_option= 2307 plugin_option=
2316 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 2308 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
2317 for plugin in $plugin_names; do 2309 for plugin in $plugin_names; do
2318@@ -5988,8 +6240,10 @@ for plugin in $plugin_names; do 2310@@ -6028,8 +6280,10 @@ for plugin in $plugin_names; do
2319 done 2311 done
2320 2312
2321 if test -n "$ac_tool_prefix"; then 2313 if test -n "$ac_tool_prefix"; then
@@ -2328,7 +2320,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2328 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2320 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2329 $as_echo_n "checking for $ac_word... " >&6; } 2321 $as_echo_n "checking for $ac_word... " >&6; }
2330 if ${ac_cv_prog_AR+:} false; then : 2322 if ${ac_cv_prog_AR+:} false; then :
2331@@ -6005,7 +6259,7 @@ do 2323@@ -6045,7 +6299,7 @@ do
2332 test -z "$as_dir" && as_dir=. 2324 test -z "$as_dir" && as_dir=.
2333 for ac_exec_ext in '' $ac_executable_extensions; do 2325 for ac_exec_ext in '' $ac_executable_extensions; do
2334 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2326 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2337,7 +2329,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2337 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2329 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2338 break 2 2330 break 2
2339 fi 2331 fi
2340@@ -6025,11 +6279,15 @@ $as_echo "no" >&6; } 2332@@ -6065,11 +6319,15 @@ $as_echo "no" >&6; }
2341 fi 2333 fi
2342 2334
2343 2335
@@ -2356,7 +2348,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2356 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2348 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2357 $as_echo_n "checking for $ac_word... " >&6; } 2349 $as_echo_n "checking for $ac_word... " >&6; }
2358 if ${ac_cv_prog_ac_ct_AR+:} false; then : 2350 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2359@@ -6045,7 +6303,7 @@ do 2351@@ -6085,7 +6343,7 @@ do
2360 test -z "$as_dir" && as_dir=. 2352 test -z "$as_dir" && as_dir=.
2361 for ac_exec_ext in '' $ac_executable_extensions; do 2353 for ac_exec_ext in '' $ac_executable_extensions; do
2362 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2354 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2365,7 +2357,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2365 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2357 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2366 break 2 2358 break 2
2367 fi 2359 fi
2368@@ -6064,6 +6322,10 @@ else 2360@@ -6104,6 +6362,10 @@ else
2369 $as_echo "no" >&6; } 2361 $as_echo "no" >&6; }
2370 fi 2362 fi
2371 2363
@@ -2376,7 +2368,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2376 if test "x$ac_ct_AR" = x; then 2368 if test "x$ac_ct_AR" = x; then
2377 AR="false" 2369 AR="false"
2378 else 2370 else
2379@@ -6075,29 +6337,81 @@ ac_tool_warned=yes ;; 2371@@ -6115,29 +6377,81 @@ ac_tool_warned=yes ;;
2380 esac 2372 esac
2381 AR=$ac_ct_AR 2373 AR=$ac_ct_AR
2382 fi 2374 fi
@@ -2473,7 +2465,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2473 2465
2474 2466
2475 2467
2476@@ -6444,8 +6758,8 @@ esac 2468@@ -6484,8 +6798,8 @@ esac
2477 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2469 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2478 2470
2479 # Transform an extracted symbol line into symbol name and symbol address 2471 # Transform an extracted symbol line into symbol name and symbol address
@@ -2484,7 +2476,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2484 2476
2485 # Handle CRLF in mingw tool chain 2477 # Handle CRLF in mingw tool chain
2486 opt_cr= 2478 opt_cr=
2487@@ -6481,6 +6795,7 @@ for ac_symprfx in "" "_"; do 2479@@ -6521,6 +6835,7 @@ for ac_symprfx in "" "_"; do
2488 else 2480 else
2489 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2481 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2490 fi 2482 fi
@@ -2492,7 +2484,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2492 2484
2493 # Check to see that the pipe works correctly. 2485 # Check to see that the pipe works correctly.
2494 pipe_works=no 2486 pipe_works=no
2495@@ -6522,6 +6837,18 @@ _LT_EOF 2487@@ -6562,6 +6877,18 @@ _LT_EOF
2496 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2488 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2497 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2489 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2498 cat <<_LT_EOF > conftest.$ac_ext 2490 cat <<_LT_EOF > conftest.$ac_ext
@@ -2511,7 +2503,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2511 #ifdef __cplusplus 2503 #ifdef __cplusplus
2512 extern "C" { 2504 extern "C" {
2513 #endif 2505 #endif
2514@@ -6533,7 +6860,7 @@ _LT_EOF 2506@@ -6573,7 +6900,7 @@ _LT_EOF
2515 cat <<_LT_EOF >> conftest.$ac_ext 2507 cat <<_LT_EOF >> conftest.$ac_ext
2516 2508
2517 /* The mapping between symbol names and symbols. */ 2509 /* The mapping between symbol names and symbols. */
@@ -2520,7 +2512,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2520 const char *name; 2512 const char *name;
2521 void *address; 2513 void *address;
2522 } 2514 }
2523@@ -6559,8 +6886,8 @@ static const void *lt_preloaded_setup() { 2515@@ -6599,8 +6926,8 @@ static const void *lt_preloaded_setup() {
2524 _LT_EOF 2516 _LT_EOF
2525 # Now try linking the two files. 2517 # Now try linking the two files.
2526 mv conftest.$ac_objext conftstm.$ac_objext 2518 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2531,7 +2523,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2531 LIBS="conftstm.$ac_objext" 2523 LIBS="conftstm.$ac_objext"
2532 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2524 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2533 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2525 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2534@@ -6570,8 +6897,8 @@ _LT_EOF 2526@@ -6610,8 +6937,8 @@ _LT_EOF
2535 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2527 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2536 pipe_works=yes 2528 pipe_works=yes
2537 fi 2529 fi
@@ -2542,7 +2534,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2542 else 2534 else
2543 echo "cannot find nm_test_func in $nlist" >&5 2535 echo "cannot find nm_test_func in $nlist" >&5
2544 fi 2536 fi
2545@@ -6608,6 +6935,19 @@ else 2537@@ -6648,6 +6975,19 @@ else
2546 $as_echo "ok" >&6; } 2538 $as_echo "ok" >&6; }
2547 fi 2539 fi
2548 2540
@@ -2562,7 +2554,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2562 2554
2563 2555
2564 2556
2565@@ -6624,6 +6964,42 @@ fi 2557@@ -6664,6 +7004,42 @@ fi
2566 2558
2567 2559
2568 2560
@@ -2605,7 +2597,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2605 2597
2606 2598
2607 2599
2608@@ -6835,6 +7211,123 @@ esac 2600@@ -6875,6 +7251,123 @@ esac
2609 2601
2610 need_locks="$enable_libtool_lock" 2602 need_locks="$enable_libtool_lock"
2611 2603
@@ -2729,7 +2721,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2729 2721
2730 case $host_os in 2722 case $host_os in
2731 rhapsody* | darwin*) 2723 rhapsody* | darwin*)
2732@@ -7398,6 +7891,8 @@ _LT_EOF 2724@@ -7438,6 +7931,8 @@ _LT_EOF
2733 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2725 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2734 echo "$AR cru libconftest.a conftest.o" >&5 2726 echo "$AR cru libconftest.a conftest.o" >&5
2735 $AR cru libconftest.a conftest.o 2>&5 2727 $AR cru libconftest.a conftest.o 2>&5
@@ -2738,7 +2730,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2738 cat > conftest.c << _LT_EOF 2730 cat > conftest.c << _LT_EOF
2739 int main() { return 0;} 2731 int main() { return 0;}
2740 _LT_EOF 2732 _LT_EOF
2741@@ -7980,8 +8476,6 @@ fi 2733@@ -8020,8 +8515,6 @@ fi
2742 lt_prog_compiler_pic= 2734 lt_prog_compiler_pic=
2743 lt_prog_compiler_static= 2735 lt_prog_compiler_static=
2744 2736
@@ -2747,7 +2739,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2747 2739
2748 if test "$GCC" = yes; then 2740 if test "$GCC" = yes; then
2749 lt_prog_compiler_wl='-Wl,' 2741 lt_prog_compiler_wl='-Wl,'
2750@@ -8147,6 +8641,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2742@@ -8187,6 +8680,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2751 lt_prog_compiler_pic='--shared' 2743 lt_prog_compiler_pic='--shared'
2752 lt_prog_compiler_static='--static' 2744 lt_prog_compiler_static='--static'
2753 ;; 2745 ;;
@@ -2760,7 +2752,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2760 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2752 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2761 # Portland Group compilers (*not* the Pentium gcc compiler, 2753 # Portland Group compilers (*not* the Pentium gcc compiler,
2762 # which looks to be a dead project) 2754 # which looks to be a dead project)
2763@@ -8209,7 +8709,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2755@@ -8249,7 +8748,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2764 lt_prog_compiler_pic='-KPIC' 2756 lt_prog_compiler_pic='-KPIC'
2765 lt_prog_compiler_static='-Bstatic' 2757 lt_prog_compiler_static='-Bstatic'
2766 case $cc_basename in 2758 case $cc_basename in
@@ -2769,7 +2761,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2769 lt_prog_compiler_wl='-Qoption ld ';; 2761 lt_prog_compiler_wl='-Qoption ld ';;
2770 *) 2762 *)
2771 lt_prog_compiler_wl='-Wl,';; 2763 lt_prog_compiler_wl='-Wl,';;
2772@@ -8266,13 +8766,17 @@ case $host_os in 2764@@ -8306,13 +8805,17 @@ case $host_os in
2773 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2765 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2774 ;; 2766 ;;
2775 esac 2767 esac
@@ -2793,7 +2785,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2793 2785
2794 # 2786 #
2795 # Check to make sure the PIC flag actually works. 2787 # Check to make sure the PIC flag actually works.
2796@@ -8333,6 +8837,11 @@ fi 2788@@ -8373,6 +8876,11 @@ fi
2797 2789
2798 2790
2799 2791
@@ -2805,7 +2797,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2805 # 2797 #
2806 # Check to make sure the static flag actually works. 2798 # Check to make sure the static flag actually works.
2807 # 2799 #
2808@@ -8683,7 +9192,8 @@ _LT_EOF 2800@@ -8723,7 +9231,8 @@ _LT_EOF
2809 allow_undefined_flag=unsupported 2801 allow_undefined_flag=unsupported
2810 always_export_symbols=no 2802 always_export_symbols=no
2811 enable_shared_with_static_runtimes=yes 2803 enable_shared_with_static_runtimes=yes
@@ -2815,7 +2807,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2815 2807
2816 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2808 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2817 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2809 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2818@@ -8782,12 +9292,12 @@ _LT_EOF 2810@@ -8822,12 +9331,12 @@ _LT_EOF
2819 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2811 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2820 hardcode_libdir_flag_spec= 2812 hardcode_libdir_flag_spec=
2821 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2813 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2830,7 +2822,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2830 fi 2822 fi
2831 ;; 2823 ;;
2832 esac 2824 esac
2833@@ -8801,8 +9311,8 @@ _LT_EOF 2825@@ -8841,8 +9350,8 @@ _LT_EOF
2834 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2826 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2835 wlarc= 2827 wlarc=
2836 else 2828 else
@@ -2841,7 +2833,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2841 fi 2833 fi
2842 ;; 2834 ;;
2843 2835
2844@@ -8820,8 +9330,8 @@ _LT_EOF 2836@@ -8860,8 +9369,8 @@ _LT_EOF
2845 2837
2846 _LT_EOF 2838 _LT_EOF
2847 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2839 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2852,7 +2844,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2852 else 2844 else
2853 ld_shlibs=no 2845 ld_shlibs=no
2854 fi 2846 fi
2855@@ -8867,8 +9377,8 @@ _LT_EOF 2847@@ -8907,8 +9416,8 @@ _LT_EOF
2856 2848
2857 *) 2849 *)
2858 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2850 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2863,7 +2855,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2863 else 2855 else
2864 ld_shlibs=no 2856 ld_shlibs=no
2865 fi 2857 fi
2866@@ -8998,7 +9508,13 @@ _LT_EOF 2858@@ -9038,7 +9547,13 @@ _LT_EOF
2867 allow_undefined_flag='-berok' 2859 allow_undefined_flag='-berok'
2868 # Determine the default libpath from the value encoded in an 2860 # Determine the default libpath from the value encoded in an
2869 # empty executable. 2861 # empty executable.
@@ -2878,7 +2870,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2878 /* end confdefs.h. */ 2870 /* end confdefs.h. */
2879 2871
2880 int 2872 int
2881@@ -9011,22 +9527,29 @@ main () 2873@@ -9051,22 +9566,29 @@ main ()
2882 _ACEOF 2874 _ACEOF
2883 if ac_fn_c_try_link "$LINENO"; then : 2875 if ac_fn_c_try_link "$LINENO"; then :
2884 2876
@@ -2921,7 +2913,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2921 2913
2922 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2914 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2923 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 2915 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2924@@ -9038,7 +9561,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2916@@ -9078,7 +9600,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2925 else 2917 else
2926 # Determine the default libpath from the value encoded in an 2918 # Determine the default libpath from the value encoded in an
2927 # empty executable. 2919 # empty executable.
@@ -2936,7 +2928,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2936 /* end confdefs.h. */ 2928 /* end confdefs.h. */
2937 2929
2938 int 2930 int
2939@@ -9051,22 +9580,29 @@ main () 2931@@ -9091,22 +9619,29 @@ main ()
2940 _ACEOF 2932 _ACEOF
2941 if ac_fn_c_try_link "$LINENO"; then : 2933 if ac_fn_c_try_link "$LINENO"; then :
2942 2934
@@ -2979,7 +2971,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
2979 2971
2980 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2972 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2981 # Warning - without using the other run time loading flags, 2973 # Warning - without using the other run time loading flags,
2982@@ -9111,20 +9647,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2974@@ -9151,20 +9686,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2983 # Microsoft Visual C++. 2975 # Microsoft Visual C++.
2984 # hardcode_libdir_flag_spec is actually meaningless, as there is 2976 # hardcode_libdir_flag_spec is actually meaningless, as there is
2985 # no search path for DLLs. 2977 # no search path for DLLs.
@@ -3057,7 +3049,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3057 ;; 3049 ;;
3058 3050
3059 darwin* | rhapsody*) 3051 darwin* | rhapsody*)
3060@@ -9185,7 +9764,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3052@@ -9225,7 +9803,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3061 3053
3062 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3054 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3063 freebsd* | dragonfly*) 3055 freebsd* | dragonfly*)
@@ -3066,7 +3058,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3066 hardcode_libdir_flag_spec='-R$libdir' 3058 hardcode_libdir_flag_spec='-R$libdir'
3067 hardcode_direct=yes 3059 hardcode_direct=yes
3068 hardcode_shlibpath_var=no 3060 hardcode_shlibpath_var=no
3069@@ -9193,7 +9772,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3061@@ -9233,7 +9811,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3070 3062
3071 hpux9*) 3063 hpux9*)
3072 if test "$GCC" = yes; then 3064 if test "$GCC" = yes; then
@@ -3075,7 +3067,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3075 else 3067 else
3076 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 3068 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
3077 fi 3069 fi
3078@@ -9209,7 +9788,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3070@@ -9249,7 +9827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3079 3071
3080 hpux10*) 3072 hpux10*)
3081 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3073 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3084,7 +3076,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3084 else 3076 else
3085 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3077 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3086 fi 3078 fi
3087@@ -9233,10 +9812,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3079@@ -9273,10 +9851,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3088 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3080 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3089 ;; 3081 ;;
3090 ia64*) 3082 ia64*)
@@ -3097,7 +3089,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3097 ;; 3089 ;;
3098 esac 3090 esac
3099 else 3091 else
3100@@ -9315,23 +9894,36 @@ fi 3092@@ -9355,23 +9933,36 @@ fi
3101 3093
3102 irix5* | irix6* | nonstopux*) 3094 irix5* | irix6* | nonstopux*)
3103 if test "$GCC" = yes; then 3095 if test "$GCC" = yes; then
@@ -3142,7 +3134,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3142 else 3134 else
3143 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 3135 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
3144 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 3136 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
3145@@ -9416,7 +10008,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3137@@ -9456,7 +10047,7 @@ rm -f core conftest.err conftest.$ac_objext \
3146 osf4* | osf5*) # as osf3* with the addition of -msym flag 3138 osf4* | osf5*) # as osf3* with the addition of -msym flag
3147 if test "$GCC" = yes; then 3139 if test "$GCC" = yes; then
3148 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3140 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3151,7 +3143,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3151 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3143 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3152 else 3144 else
3153 allow_undefined_flag=' -expect_unresolved \*' 3145 allow_undefined_flag=' -expect_unresolved \*'
3154@@ -9435,9 +10027,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3146@@ -9475,9 +10066,9 @@ rm -f core conftest.err conftest.$ac_objext \
3155 no_undefined_flag=' -z defs' 3147 no_undefined_flag=' -z defs'
3156 if test "$GCC" = yes; then 3148 if test "$GCC" = yes; then
3157 wlarc='${wl}' 3149 wlarc='${wl}'
@@ -3163,7 +3155,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3163 else 3155 else
3164 case `$CC -V 2>&1` in 3156 case `$CC -V 2>&1` in
3165 *"Compilers 5.0"*) 3157 *"Compilers 5.0"*)
3166@@ -10013,8 +10605,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3158@@ -10053,8 +10644,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3167 need_version=no 3159 need_version=no
3168 need_lib_prefix=no 3160 need_lib_prefix=no
3169 3161
@@ -3175,7 +3167,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3175 library_names_spec='$libname.dll.a' 3167 library_names_spec='$libname.dll.a'
3176 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3168 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3177 postinstall_cmds='base_file=`basename \${file}`~ 3169 postinstall_cmds='base_file=`basename \${file}`~
3178@@ -10047,13 +10640,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3170@@ -10087,13 +10679,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3179 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3171 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3180 ;; 3172 ;;
3181 esac 3173 esac
@@ -3248,25 +3240,16 @@ index bf6461dab1e..8e6f6d30b4d 100755
3248 # FIXME: first we should search . and the directory the executable is in 3240 # FIXME: first we should search . and the directory the executable is in
3249 shlibpath_var=PATH 3241 shlibpath_var=PATH
3250 ;; 3242 ;;
3251@@ -10135,7 +10786,7 @@ haiku*) 3243@@ -10971,7 +11621,7 @@ else
3252 soname_spec='${libname}${release}${shared_ext}$major'
3253 shlibpath_var=LIBRARY_PATH
3254 shlibpath_overrides_runpath=yes
3255- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
3256+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
3257 hardcode_into_libs=yes
3258 ;;
3259
3260@@ -10931,7 +11582,7 @@ else
3261 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3244 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3262 lt_status=$lt_dlunknown 3245 lt_status=$lt_dlunknown
3263 cat > conftest.$ac_ext <<_LT_EOF 3246 cat > conftest.$ac_ext <<_LT_EOF
3264-#line 10934 "configure" 3247-#line 10974 "configure"
3265+#line $LINENO "configure" 3248+#line $LINENO "configure"
3266 #include "confdefs.h" 3249 #include "confdefs.h"
3267 3250
3268 #if HAVE_DLFCN_H 3251 #if HAVE_DLFCN_H
3269@@ -10975,10 +11626,10 @@ else 3252@@ -11015,10 +11665,10 @@ else
3270 /* When -fvisbility=hidden is used, assume the code has been annotated 3253 /* When -fvisbility=hidden is used, assume the code has been annotated
3271 correspondingly for the symbols needed. */ 3254 correspondingly for the symbols needed. */
3272 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3255 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3279,16 +3262,16 @@ index bf6461dab1e..8e6f6d30b4d 100755
3279 int main () 3262 int main ()
3280 { 3263 {
3281 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3264 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3282@@ -11037,7 +11688,7 @@ else 3265@@ -11077,7 +11727,7 @@ else
3283 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3266 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3284 lt_status=$lt_dlunknown 3267 lt_status=$lt_dlunknown
3285 cat > conftest.$ac_ext <<_LT_EOF 3268 cat > conftest.$ac_ext <<_LT_EOF
3286-#line 11040 "configure" 3269-#line 11080 "configure"
3287+#line $LINENO "configure" 3270+#line $LINENO "configure"
3288 #include "confdefs.h" 3271 #include "confdefs.h"
3289 3272
3290 #if HAVE_DLFCN_H 3273 #if HAVE_DLFCN_H
3291@@ -11081,10 +11732,10 @@ else 3274@@ -11121,10 +11771,10 @@ else
3292 /* When -fvisbility=hidden is used, assume the code has been annotated 3275 /* When -fvisbility=hidden is used, assume the code has been annotated
3293 correspondingly for the symbols needed. */ 3276 correspondingly for the symbols needed. */
3294 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3277 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3301,7 +3284,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3301 int main () 3284 int main ()
3302 { 3285 {
3303 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3286 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3304@@ -15455,13 +16106,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3287@@ -15505,13 +16155,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3305 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3288 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3306 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3289 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3307 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3290 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3322,7 +3305,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3322 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3305 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3323 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3306 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3324 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3307 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3325@@ -15476,14 +16134,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3308@@ -15526,14 +16183,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3326 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3309 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3327 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3310 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3328 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 3311 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -3341,7 +3324,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3341 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3324 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3342 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3325 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3343 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3326 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3344@@ -15516,12 +16177,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3327@@ -15566,12 +16226,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3345 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3328 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3346 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3329 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3347 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3330 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3355,7 +3338,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3355 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3338 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3356 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3339 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3357 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3340 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3358@@ -15576,8 +16237,13 @@ reload_flag \ 3341@@ -15626,8 +16286,13 @@ reload_flag \
3359 OBJDUMP \ 3342 OBJDUMP \
3360 deplibs_check_method \ 3343 deplibs_check_method \
3361 file_magic_cmd \ 3344 file_magic_cmd \
@@ -3369,7 +3352,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3369 STRIP \ 3352 STRIP \
3370 RANLIB \ 3353 RANLIB \
3371 CC \ 3354 CC \
3372@@ -15587,12 +16253,14 @@ lt_cv_sys_global_symbol_pipe \ 3355@@ -15637,12 +16302,14 @@ lt_cv_sys_global_symbol_pipe \
3373 lt_cv_sys_global_symbol_to_cdecl \ 3356 lt_cv_sys_global_symbol_to_cdecl \
3374 lt_cv_sys_global_symbol_to_c_name_address \ 3357 lt_cv_sys_global_symbol_to_c_name_address \
3375 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3358 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3385,7 +3368,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3385 DSYMUTIL \ 3368 DSYMUTIL \
3386 NMEDIT \ 3369 NMEDIT \
3387 LIPO \ 3370 LIPO \
3388@@ -15608,7 +16276,6 @@ no_undefined_flag \ 3371@@ -15658,7 +16325,6 @@ no_undefined_flag \
3389 hardcode_libdir_flag_spec \ 3372 hardcode_libdir_flag_spec \
3390 hardcode_libdir_flag_spec_ld \ 3373 hardcode_libdir_flag_spec_ld \
3391 hardcode_libdir_separator \ 3374 hardcode_libdir_separator \
@@ -3393,7 +3376,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3393 exclude_expsyms \ 3376 exclude_expsyms \
3394 include_expsyms \ 3377 include_expsyms \
3395 file_list_spec \ 3378 file_list_spec \
3396@@ -15644,6 +16311,7 @@ module_cmds \ 3379@@ -15694,6 +16360,7 @@ module_cmds \
3397 module_expsym_cmds \ 3380 module_expsym_cmds \
3398 export_symbols_cmds \ 3381 export_symbols_cmds \
3399 prelink_cmds \ 3382 prelink_cmds \
@@ -3401,7 +3384,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3401 postinstall_cmds \ 3384 postinstall_cmds \
3402 postuninstall_cmds \ 3385 postuninstall_cmds \
3403 finish_cmds \ 3386 finish_cmds \
3404@@ -16410,7 +17078,8 @@ $as_echo X"$file" | 3387@@ -16459,7 +17126,8 @@ $as_echo X"$file" |
3405 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3388 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3406 # 3389 #
3407 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3390 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3411,7 +3394,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3411 # Written by Gordon Matzigkeit, 1996 3394 # Written by Gordon Matzigkeit, 1996
3412 # 3395 #
3413 # This file is part of GNU Libtool. 3396 # This file is part of GNU Libtool.
3414@@ -16513,19 +17182,42 @@ SP2NL=$lt_lt_SP2NL 3397@@ -16562,19 +17230,42 @@ SP2NL=$lt_lt_SP2NL
3415 # turn newlines into spaces. 3398 # turn newlines into spaces.
3416 NL2SP=$lt_lt_NL2SP 3399 NL2SP=$lt_lt_NL2SP
3417 3400
@@ -3455,7 +3438,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3455 # A symbol stripping program. 3438 # A symbol stripping program.
3456 STRIP=$lt_STRIP 3439 STRIP=$lt_STRIP
3457 3440
3458@@ -16555,6 +17247,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3441@@ -16604,6 +17295,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3459 # Transform the output of nm in a C name address pair when lib prefix is needed. 3442 # Transform the output of nm in a C name address pair when lib prefix is needed.
3460 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3443 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3461 3444
@@ -3468,7 +3451,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3468 # The name of the directory that contains temporary libtool files. 3451 # The name of the directory that contains temporary libtool files.
3469 objdir=$objdir 3452 objdir=$objdir
3470 3453
3471@@ -16564,6 +17262,9 @@ MAGIC_CMD=$MAGIC_CMD 3454@@ -16613,6 +17310,9 @@ MAGIC_CMD=$MAGIC_CMD
3472 # Must we lock files when doing compilation? 3455 # Must we lock files when doing compilation?
3473 need_locks=$lt_need_locks 3456 need_locks=$lt_need_locks
3474 3457
@@ -3478,7 +3461,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3478 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3461 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3479 DSYMUTIL=$lt_DSYMUTIL 3462 DSYMUTIL=$lt_DSYMUTIL
3480 3463
3481@@ -16678,12 +17379,12 @@ with_gcc=$GCC 3464@@ -16727,12 +17427,12 @@ with_gcc=$GCC
3482 # Compiler flag to turn off builtin functions. 3465 # Compiler flag to turn off builtin functions.
3483 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3466 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3484 3467
@@ -3494,7 +3477,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3494 # Compiler flag to prevent dynamic linking. 3477 # Compiler flag to prevent dynamic linking.
3495 link_static_flag=$lt_lt_prog_compiler_static 3478 link_static_flag=$lt_lt_prog_compiler_static
3496 3479
3497@@ -16770,9 +17471,6 @@ inherit_rpath=$inherit_rpath 3480@@ -16819,9 +17519,6 @@ inherit_rpath=$inherit_rpath
3498 # Whether libtool must link a program against all its dependency libraries. 3481 # Whether libtool must link a program against all its dependency libraries.
3499 link_all_deplibs=$link_all_deplibs 3482 link_all_deplibs=$link_all_deplibs
3500 3483
@@ -3504,7 +3487,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3504 # Set to "yes" if exported symbols are required. 3487 # Set to "yes" if exported symbols are required.
3505 always_export_symbols=$always_export_symbols 3488 always_export_symbols=$always_export_symbols
3506 3489
3507@@ -16788,6 +17486,9 @@ include_expsyms=$lt_include_expsyms 3490@@ -16837,6 +17534,9 @@ include_expsyms=$lt_include_expsyms
3508 # Commands necessary for linking programs (against libraries) with templates. 3491 # Commands necessary for linking programs (against libraries) with templates.
3509 prelink_cmds=$lt_prelink_cmds 3492 prelink_cmds=$lt_prelink_cmds
3510 3493
@@ -3514,7 +3497,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3514 # Specify filename containing input files. 3497 # Specify filename containing input files.
3515 file_list_spec=$lt_file_list_spec 3498 file_list_spec=$lt_file_list_spec
3516 3499
3517@@ -16820,210 +17521,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3500@@ -16869,210 +17569,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3518 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3501 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3519 # text mode, it properly converts lines to CR/LF. This bash problem 3502 # text mode, it properly converts lines to CR/LF. This bash problem
3520 # is reportedly fixed, but why not run on old versions too? 3503 # is reportedly fixed, but why not run on old versions too?
@@ -3889,7 +3872,7 @@ index bf6461dab1e..8e6f6d30b4d 100755
3889 chmod +x "$ofile" 3872 chmod +x "$ofile"
3890 3873
3891diff --git a/gas/configure b/gas/configure 3874diff --git a/gas/configure b/gas/configure
3892index 789d1b38b33..7ac563a13ad 100755 3875index dc6a6682aa4..10364bd81da 100755
3893--- a/gas/configure 3876--- a/gas/configure
3894+++ b/gas/configure 3877+++ b/gas/configure
3895@@ -681,8 +681,11 @@ OTOOL 3878@@ -681,8 +681,11 @@ OTOOL
@@ -3921,7 +3904,7 @@ index 789d1b38b33..7ac563a13ad 100755
3921 --with-cpu=CPU default cpu variant is CPU (currently only supported 3904 --with-cpu=CPU default cpu variant is CPU (currently only supported
3922 on ARC) 3905 on ARC)
3923 --with-system-zlib use installed libz 3906 --with-system-zlib use installed libz
3924@@ -4569,8 +4575,8 @@ esac 3907@@ -4608,8 +4614,8 @@ esac
3925 3908
3926 3909
3927 3910
@@ -3932,7 +3915,7 @@ index 789d1b38b33..7ac563a13ad 100755
3932 3915
3933 3916
3934 3917
3935@@ -4610,7 +4616,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 3918@@ -4649,7 +4655,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3936 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3919 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3937 $as_echo_n "checking how to print strings... " >&6; } 3920 $as_echo_n "checking how to print strings... " >&6; }
3938 # Test print first, because it will be a builtin if present. 3921 # Test print first, because it will be a builtin if present.
@@ -3941,7 +3924,7 @@ index 789d1b38b33..7ac563a13ad 100755
3941 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3924 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3942 ECHO='print -r --' 3925 ECHO='print -r --'
3943 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3926 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3944@@ -5296,8 +5302,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 3927@@ -5336,8 +5342,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3945 # Try some XSI features 3928 # Try some XSI features
3946 xsi_shell=no 3929 xsi_shell=no
3947 ( _lt_dummy="a/b/c" 3930 ( _lt_dummy="a/b/c"
@@ -3952,7 +3935,7 @@ index 789d1b38b33..7ac563a13ad 100755
3952 && eval 'test $(( 1 + 1 )) -eq 2 \ 3935 && eval 'test $(( 1 + 1 )) -eq 2 \
3953 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3936 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3954 && xsi_shell=yes 3937 && xsi_shell=yes
3955@@ -5346,6 +5352,80 @@ esac 3938@@ -5386,6 +5392,80 @@ esac
3956 3939
3957 3940
3958 3941
@@ -4033,7 +4016,7 @@ index 789d1b38b33..7ac563a13ad 100755
4033 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4016 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4034 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4017 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4035 if ${lt_cv_ld_reload_flag+:} false; then : 4018 if ${lt_cv_ld_reload_flag+:} false; then :
4036@@ -5362,6 +5442,11 @@ case $reload_flag in 4019@@ -5402,6 +5482,11 @@ case $reload_flag in
4037 esac 4020 esac
4038 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4021 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4039 case $host_os in 4022 case $host_os in
@@ -4045,7 +4028,7 @@ index 789d1b38b33..7ac563a13ad 100755
4045 darwin*) 4028 darwin*)
4046 if test "$GCC" = yes; then 4029 if test "$GCC" = yes; then
4047 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4030 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4048@@ -5530,7 +5615,8 @@ mingw* | pw32*) 4031@@ -5570,7 +5655,8 @@ mingw* | pw32*)
4049 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4032 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4050 lt_cv_file_magic_cmd='func_win32_libid' 4033 lt_cv_file_magic_cmd='func_win32_libid'
4051 else 4034 else
@@ -4055,7 +4038,7 @@ index 789d1b38b33..7ac563a13ad 100755
4055 lt_cv_file_magic_cmd='$OBJDUMP -f' 4038 lt_cv_file_magic_cmd='$OBJDUMP -f'
4056 fi 4039 fi
4057 ;; 4040 ;;
4058@@ -5684,6 +5770,21 @@ esac 4041@@ -5724,6 +5810,21 @@ esac
4059 fi 4042 fi
4060 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4043 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4061 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4044 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4077,7 +4060,7 @@ index 789d1b38b33..7ac563a13ad 100755
4077 file_magic_cmd=$lt_cv_file_magic_cmd 4060 file_magic_cmd=$lt_cv_file_magic_cmd
4078 deplibs_check_method=$lt_cv_deplibs_check_method 4061 deplibs_check_method=$lt_cv_deplibs_check_method
4079 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4062 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4080@@ -5699,6 +5800,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4063@@ -5739,6 +5840,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4081 4064
4082 4065
4083 4066
@@ -4235,7 +4218,7 @@ index 789d1b38b33..7ac563a13ad 100755
4235 plugin_option= 4218 plugin_option=
4236 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 4219 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
4237 for plugin in $plugin_names; do 4220 for plugin in $plugin_names; do
4238@@ -5713,8 +5965,10 @@ for plugin in $plugin_names; do 4221@@ -5753,8 +6005,10 @@ for plugin in $plugin_names; do
4239 done 4222 done
4240 4223
4241 if test -n "$ac_tool_prefix"; then 4224 if test -n "$ac_tool_prefix"; then
@@ -4248,7 +4231,7 @@ index 789d1b38b33..7ac563a13ad 100755
4248 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4231 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4249 $as_echo_n "checking for $ac_word... " >&6; } 4232 $as_echo_n "checking for $ac_word... " >&6; }
4250 if ${ac_cv_prog_AR+:} false; then : 4233 if ${ac_cv_prog_AR+:} false; then :
4251@@ -5730,7 +5984,7 @@ do 4234@@ -5770,7 +6024,7 @@ do
4252 test -z "$as_dir" && as_dir=. 4235 test -z "$as_dir" && as_dir=.
4253 for ac_exec_ext in '' $ac_executable_extensions; do 4236 for ac_exec_ext in '' $ac_executable_extensions; do
4254 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4237 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4257,7 +4240,7 @@ index 789d1b38b33..7ac563a13ad 100755
4257 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4240 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4258 break 2 4241 break 2
4259 fi 4242 fi
4260@@ -5750,11 +6004,15 @@ $as_echo "no" >&6; } 4243@@ -5790,11 +6044,15 @@ $as_echo "no" >&6; }
4261 fi 4244 fi
4262 4245
4263 4246
@@ -4276,7 +4259,7 @@ index 789d1b38b33..7ac563a13ad 100755
4276 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4259 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4277 $as_echo_n "checking for $ac_word... " >&6; } 4260 $as_echo_n "checking for $ac_word... " >&6; }
4278 if ${ac_cv_prog_ac_ct_AR+:} false; then : 4261 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4279@@ -5770,7 +6028,7 @@ do 4262@@ -5810,7 +6068,7 @@ do
4280 test -z "$as_dir" && as_dir=. 4263 test -z "$as_dir" && as_dir=.
4281 for ac_exec_ext in '' $ac_executable_extensions; do 4264 for ac_exec_ext in '' $ac_executable_extensions; do
4282 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4265 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4285,7 +4268,7 @@ index 789d1b38b33..7ac563a13ad 100755
4285 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4268 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4286 break 2 4269 break 2
4287 fi 4270 fi
4288@@ -5789,6 +6047,10 @@ else 4271@@ -5829,6 +6087,10 @@ else
4289 $as_echo "no" >&6; } 4272 $as_echo "no" >&6; }
4290 fi 4273 fi
4291 4274
@@ -4296,7 +4279,7 @@ index 789d1b38b33..7ac563a13ad 100755
4296 if test "x$ac_ct_AR" = x; then 4279 if test "x$ac_ct_AR" = x; then
4297 AR="false" 4280 AR="false"
4298 else 4281 else
4299@@ -5800,29 +6062,81 @@ ac_tool_warned=yes ;; 4282@@ -5840,29 +6102,81 @@ ac_tool_warned=yes ;;
4300 esac 4283 esac
4301 AR=$ac_ct_AR 4284 AR=$ac_ct_AR
4302 fi 4285 fi
@@ -4393,7 +4376,7 @@ index 789d1b38b33..7ac563a13ad 100755
4393 4376
4394 4377
4395 4378
4396@@ -6169,8 +6483,8 @@ esac 4379@@ -6209,8 +6523,8 @@ esac
4397 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4380 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4398 4381
4399 # Transform an extracted symbol line into symbol name and symbol address 4382 # Transform an extracted symbol line into symbol name and symbol address
@@ -4404,7 +4387,7 @@ index 789d1b38b33..7ac563a13ad 100755
4404 4387
4405 # Handle CRLF in mingw tool chain 4388 # Handle CRLF in mingw tool chain
4406 opt_cr= 4389 opt_cr=
4407@@ -6206,6 +6520,7 @@ for ac_symprfx in "" "_"; do 4390@@ -6246,6 +6560,7 @@ for ac_symprfx in "" "_"; do
4408 else 4391 else
4409 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4392 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4410 fi 4393 fi
@@ -4412,7 +4395,7 @@ index 789d1b38b33..7ac563a13ad 100755
4412 4395
4413 # Check to see that the pipe works correctly. 4396 # Check to see that the pipe works correctly.
4414 pipe_works=no 4397 pipe_works=no
4415@@ -6247,6 +6562,18 @@ _LT_EOF 4398@@ -6287,6 +6602,18 @@ _LT_EOF
4416 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4399 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4417 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4400 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4418 cat <<_LT_EOF > conftest.$ac_ext 4401 cat <<_LT_EOF > conftest.$ac_ext
@@ -4431,7 +4414,7 @@ index 789d1b38b33..7ac563a13ad 100755
4431 #ifdef __cplusplus 4414 #ifdef __cplusplus
4432 extern "C" { 4415 extern "C" {
4433 #endif 4416 #endif
4434@@ -6258,7 +6585,7 @@ _LT_EOF 4417@@ -6298,7 +6625,7 @@ _LT_EOF
4435 cat <<_LT_EOF >> conftest.$ac_ext 4418 cat <<_LT_EOF >> conftest.$ac_ext
4436 4419
4437 /* The mapping between symbol names and symbols. */ 4420 /* The mapping between symbol names and symbols. */
@@ -4440,7 +4423,7 @@ index 789d1b38b33..7ac563a13ad 100755
4440 const char *name; 4423 const char *name;
4441 void *address; 4424 void *address;
4442 } 4425 }
4443@@ -6284,8 +6611,8 @@ static const void *lt_preloaded_setup() { 4426@@ -6324,8 +6651,8 @@ static const void *lt_preloaded_setup() {
4444 _LT_EOF 4427 _LT_EOF
4445 # Now try linking the two files. 4428 # Now try linking the two files.
4446 mv conftest.$ac_objext conftstm.$ac_objext 4429 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4451,7 +4434,7 @@ index 789d1b38b33..7ac563a13ad 100755
4451 LIBS="conftstm.$ac_objext" 4434 LIBS="conftstm.$ac_objext"
4452 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4435 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4453 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4436 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4454@@ -6295,8 +6622,8 @@ _LT_EOF 4437@@ -6335,8 +6662,8 @@ _LT_EOF
4455 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4438 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4456 pipe_works=yes 4439 pipe_works=yes
4457 fi 4440 fi
@@ -4462,7 +4445,7 @@ index 789d1b38b33..7ac563a13ad 100755
4462 else 4445 else
4463 echo "cannot find nm_test_func in $nlist" >&5 4446 echo "cannot find nm_test_func in $nlist" >&5
4464 fi 4447 fi
4465@@ -6333,6 +6660,19 @@ else 4448@@ -6373,6 +6700,19 @@ else
4466 $as_echo "ok" >&6; } 4449 $as_echo "ok" >&6; }
4467 fi 4450 fi
4468 4451
@@ -4482,7 +4465,7 @@ index 789d1b38b33..7ac563a13ad 100755
4482 4465
4483 4466
4484 4467
4485@@ -6349,6 +6689,42 @@ fi 4468@@ -6389,6 +6729,42 @@ fi
4486 4469
4487 4470
4488 4471
@@ -4525,7 +4508,7 @@ index 789d1b38b33..7ac563a13ad 100755
4525 4508
4526 4509
4527 4510
4528@@ -6560,6 +6936,123 @@ esac 4511@@ -6600,6 +6976,123 @@ esac
4529 4512
4530 need_locks="$enable_libtool_lock" 4513 need_locks="$enable_libtool_lock"
4531 4514
@@ -4649,7 +4632,7 @@ index 789d1b38b33..7ac563a13ad 100755
4649 4632
4650 case $host_os in 4633 case $host_os in
4651 rhapsody* | darwin*) 4634 rhapsody* | darwin*)
4652@@ -7123,6 +7616,8 @@ _LT_EOF 4635@@ -7163,6 +7656,8 @@ _LT_EOF
4653 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4636 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4654 echo "$AR cru libconftest.a conftest.o" >&5 4637 echo "$AR cru libconftest.a conftest.o" >&5
4655 $AR cru libconftest.a conftest.o 2>&5 4638 $AR cru libconftest.a conftest.o 2>&5
@@ -4658,7 +4641,7 @@ index 789d1b38b33..7ac563a13ad 100755
4658 cat > conftest.c << _LT_EOF 4641 cat > conftest.c << _LT_EOF
4659 int main() { return 0;} 4642 int main() { return 0;}
4660 _LT_EOF 4643 _LT_EOF
4661@@ -7705,8 +8201,6 @@ fi 4644@@ -7745,8 +8240,6 @@ fi
4662 lt_prog_compiler_pic= 4645 lt_prog_compiler_pic=
4663 lt_prog_compiler_static= 4646 lt_prog_compiler_static=
4664 4647
@@ -4667,7 +4650,7 @@ index 789d1b38b33..7ac563a13ad 100755
4667 4650
4668 if test "$GCC" = yes; then 4651 if test "$GCC" = yes; then
4669 lt_prog_compiler_wl='-Wl,' 4652 lt_prog_compiler_wl='-Wl,'
4670@@ -7872,6 +8366,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4653@@ -7912,6 +8405,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4671 lt_prog_compiler_pic='--shared' 4654 lt_prog_compiler_pic='--shared'
4672 lt_prog_compiler_static='--static' 4655 lt_prog_compiler_static='--static'
4673 ;; 4656 ;;
@@ -4680,7 +4663,7 @@ index 789d1b38b33..7ac563a13ad 100755
4680 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4663 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4681 # Portland Group compilers (*not* the Pentium gcc compiler, 4664 # Portland Group compilers (*not* the Pentium gcc compiler,
4682 # which looks to be a dead project) 4665 # which looks to be a dead project)
4683@@ -7934,7 +8434,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4666@@ -7974,7 +8473,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4684 lt_prog_compiler_pic='-KPIC' 4667 lt_prog_compiler_pic='-KPIC'
4685 lt_prog_compiler_static='-Bstatic' 4668 lt_prog_compiler_static='-Bstatic'
4686 case $cc_basename in 4669 case $cc_basename in
@@ -4689,7 +4672,7 @@ index 789d1b38b33..7ac563a13ad 100755
4689 lt_prog_compiler_wl='-Qoption ld ';; 4672 lt_prog_compiler_wl='-Qoption ld ';;
4690 *) 4673 *)
4691 lt_prog_compiler_wl='-Wl,';; 4674 lt_prog_compiler_wl='-Wl,';;
4692@@ -7991,13 +8491,17 @@ case $host_os in 4675@@ -8031,13 +8530,17 @@ case $host_os in
4693 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4676 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4694 ;; 4677 ;;
4695 esac 4678 esac
@@ -4713,7 +4696,7 @@ index 789d1b38b33..7ac563a13ad 100755
4713 4696
4714 # 4697 #
4715 # Check to make sure the PIC flag actually works. 4698 # Check to make sure the PIC flag actually works.
4716@@ -8058,6 +8562,11 @@ fi 4699@@ -8098,6 +8601,11 @@ fi
4717 4700
4718 4701
4719 4702
@@ -4725,7 +4708,7 @@ index 789d1b38b33..7ac563a13ad 100755
4725 # 4708 #
4726 # Check to make sure the static flag actually works. 4709 # Check to make sure the static flag actually works.
4727 # 4710 #
4728@@ -8408,7 +8917,8 @@ _LT_EOF 4711@@ -8448,7 +8956,8 @@ _LT_EOF
4729 allow_undefined_flag=unsupported 4712 allow_undefined_flag=unsupported
4730 always_export_symbols=no 4713 always_export_symbols=no
4731 enable_shared_with_static_runtimes=yes 4714 enable_shared_with_static_runtimes=yes
@@ -4735,7 +4718,7 @@ index 789d1b38b33..7ac563a13ad 100755
4735 4718
4736 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4719 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4737 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4720 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4738@@ -8507,12 +9017,12 @@ _LT_EOF 4721@@ -8547,12 +9056,12 @@ _LT_EOF
4739 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4722 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4740 hardcode_libdir_flag_spec= 4723 hardcode_libdir_flag_spec=
4741 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4724 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4750,7 +4733,7 @@ index 789d1b38b33..7ac563a13ad 100755
4750 fi 4733 fi
4751 ;; 4734 ;;
4752 esac 4735 esac
4753@@ -8526,8 +9036,8 @@ _LT_EOF 4736@@ -8566,8 +9075,8 @@ _LT_EOF
4754 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4737 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4755 wlarc= 4738 wlarc=
4756 else 4739 else
@@ -4761,7 +4744,7 @@ index 789d1b38b33..7ac563a13ad 100755
4761 fi 4744 fi
4762 ;; 4745 ;;
4763 4746
4764@@ -8545,8 +9055,8 @@ _LT_EOF 4747@@ -8585,8 +9094,8 @@ _LT_EOF
4765 4748
4766 _LT_EOF 4749 _LT_EOF
4767 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4750 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4772,7 +4755,7 @@ index 789d1b38b33..7ac563a13ad 100755
4772 else 4755 else
4773 ld_shlibs=no 4756 ld_shlibs=no
4774 fi 4757 fi
4775@@ -8592,8 +9102,8 @@ _LT_EOF 4758@@ -8632,8 +9141,8 @@ _LT_EOF
4776 4759
4777 *) 4760 *)
4778 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4761 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4783,7 +4766,7 @@ index 789d1b38b33..7ac563a13ad 100755
4783 else 4766 else
4784 ld_shlibs=no 4767 ld_shlibs=no
4785 fi 4768 fi
4786@@ -8723,7 +9233,13 @@ _LT_EOF 4769@@ -8763,7 +9272,13 @@ _LT_EOF
4787 allow_undefined_flag='-berok' 4770 allow_undefined_flag='-berok'
4788 # Determine the default libpath from the value encoded in an 4771 # Determine the default libpath from the value encoded in an
4789 # empty executable. 4772 # empty executable.
@@ -4798,7 +4781,7 @@ index 789d1b38b33..7ac563a13ad 100755
4798 /* end confdefs.h. */ 4781 /* end confdefs.h. */
4799 4782
4800 int 4783 int
4801@@ -8736,22 +9252,29 @@ main () 4784@@ -8776,22 +9291,29 @@ main ()
4802 _ACEOF 4785 _ACEOF
4803 if ac_fn_c_try_link "$LINENO"; then : 4786 if ac_fn_c_try_link "$LINENO"; then :
4804 4787
@@ -4841,7 +4824,7 @@ index 789d1b38b33..7ac563a13ad 100755
4841 4824
4842 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4825 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4843 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 4826 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4844@@ -8763,7 +9286,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4827@@ -8803,7 +9325,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4845 else 4828 else
4846 # Determine the default libpath from the value encoded in an 4829 # Determine the default libpath from the value encoded in an
4847 # empty executable. 4830 # empty executable.
@@ -4856,7 +4839,7 @@ index 789d1b38b33..7ac563a13ad 100755
4856 /* end confdefs.h. */ 4839 /* end confdefs.h. */
4857 4840
4858 int 4841 int
4859@@ -8776,22 +9305,29 @@ main () 4842@@ -8816,22 +9344,29 @@ main ()
4860 _ACEOF 4843 _ACEOF
4861 if ac_fn_c_try_link "$LINENO"; then : 4844 if ac_fn_c_try_link "$LINENO"; then :
4862 4845
@@ -4899,7 +4882,7 @@ index 789d1b38b33..7ac563a13ad 100755
4899 4882
4900 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4883 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4901 # Warning - without using the other run time loading flags, 4884 # Warning - without using the other run time loading flags,
4902@@ -8836,20 +9372,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4885@@ -8876,20 +9411,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4903 # Microsoft Visual C++. 4886 # Microsoft Visual C++.
4904 # hardcode_libdir_flag_spec is actually meaningless, as there is 4887 # hardcode_libdir_flag_spec is actually meaningless, as there is
4905 # no search path for DLLs. 4888 # no search path for DLLs.
@@ -4977,7 +4960,7 @@ index 789d1b38b33..7ac563a13ad 100755
4977 ;; 4960 ;;
4978 4961
4979 darwin* | rhapsody*) 4962 darwin* | rhapsody*)
4980@@ -8910,7 +9489,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4963@@ -8950,7 +9528,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4981 4964
4982 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4965 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4983 freebsd* | dragonfly*) 4966 freebsd* | dragonfly*)
@@ -4986,7 +4969,7 @@ index 789d1b38b33..7ac563a13ad 100755
4986 hardcode_libdir_flag_spec='-R$libdir' 4969 hardcode_libdir_flag_spec='-R$libdir'
4987 hardcode_direct=yes 4970 hardcode_direct=yes
4988 hardcode_shlibpath_var=no 4971 hardcode_shlibpath_var=no
4989@@ -8918,7 +9497,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4972@@ -8958,7 +9536,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4990 4973
4991 hpux9*) 4974 hpux9*)
4992 if test "$GCC" = yes; then 4975 if test "$GCC" = yes; then
@@ -4995,7 +4978,7 @@ index 789d1b38b33..7ac563a13ad 100755
4995 else 4978 else
4996 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 4979 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
4997 fi 4980 fi
4998@@ -8934,7 +9513,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4981@@ -8974,7 +9552,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4999 4982
5000 hpux10*) 4983 hpux10*)
5001 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4984 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -5004,7 +4987,7 @@ index 789d1b38b33..7ac563a13ad 100755
5004 else 4987 else
5005 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 4988 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
5006 fi 4989 fi
5007@@ -8958,10 +9537,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4990@@ -8998,10 +9576,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5008 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4991 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5009 ;; 4992 ;;
5010 ia64*) 4993 ia64*)
@@ -5017,7 +5000,7 @@ index 789d1b38b33..7ac563a13ad 100755
5017 ;; 5000 ;;
5018 esac 5001 esac
5019 else 5002 else
5020@@ -9040,23 +9619,36 @@ fi 5003@@ -9080,23 +9658,36 @@ fi
5021 5004
5022 irix5* | irix6* | nonstopux*) 5005 irix5* | irix6* | nonstopux*)
5023 if test "$GCC" = yes; then 5006 if test "$GCC" = yes; then
@@ -5062,7 +5045,7 @@ index 789d1b38b33..7ac563a13ad 100755
5062 else 5045 else
5063 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 5046 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
5064 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 5047 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
5065@@ -9141,7 +9733,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5048@@ -9181,7 +9772,7 @@ rm -f core conftest.err conftest.$ac_objext \
5066 osf4* | osf5*) # as osf3* with the addition of -msym flag 5049 osf4* | osf5*) # as osf3* with the addition of -msym flag
5067 if test "$GCC" = yes; then 5050 if test "$GCC" = yes; then
5068 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5051 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5071,7 +5054,7 @@ index 789d1b38b33..7ac563a13ad 100755
5071 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5054 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5072 else 5055 else
5073 allow_undefined_flag=' -expect_unresolved \*' 5056 allow_undefined_flag=' -expect_unresolved \*'
5074@@ -9160,9 +9752,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5057@@ -9200,9 +9791,9 @@ rm -f core conftest.err conftest.$ac_objext \
5075 no_undefined_flag=' -z defs' 5058 no_undefined_flag=' -z defs'
5076 if test "$GCC" = yes; then 5059 if test "$GCC" = yes; then
5077 wlarc='${wl}' 5060 wlarc='${wl}'
@@ -5083,7 +5066,7 @@ index 789d1b38b33..7ac563a13ad 100755
5083 else 5066 else
5084 case `$CC -V 2>&1` in 5067 case `$CC -V 2>&1` in
5085 *"Compilers 5.0"*) 5068 *"Compilers 5.0"*)
5086@@ -9738,8 +10330,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5069@@ -9778,8 +10369,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5087 need_version=no 5070 need_version=no
5088 need_lib_prefix=no 5071 need_lib_prefix=no
5089 5072
@@ -5095,7 +5078,7 @@ index 789d1b38b33..7ac563a13ad 100755
5095 library_names_spec='$libname.dll.a' 5078 library_names_spec='$libname.dll.a'
5096 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5079 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5097 postinstall_cmds='base_file=`basename \${file}`~ 5080 postinstall_cmds='base_file=`basename \${file}`~
5098@@ -9772,13 +10365,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5081@@ -9812,13 +10404,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5099 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5082 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5100 ;; 5083 ;;
5101 esac 5084 esac
@@ -5168,25 +5151,16 @@ index 789d1b38b33..7ac563a13ad 100755
5168 # FIXME: first we should search . and the directory the executable is in 5151 # FIXME: first we should search . and the directory the executable is in
5169 shlibpath_var=PATH 5152 shlibpath_var=PATH
5170 ;; 5153 ;;
5171@@ -9860,7 +10511,7 @@ haiku*) 5154@@ -10696,7 +11346,7 @@ else
5172 soname_spec='${libname}${release}${shared_ext}$major'
5173 shlibpath_var=LIBRARY_PATH
5174 shlibpath_overrides_runpath=yes
5175- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
5176+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
5177 hardcode_into_libs=yes
5178 ;;
5179
5180@@ -10656,7 +11307,7 @@ else
5181 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5155 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5182 lt_status=$lt_dlunknown 5156 lt_status=$lt_dlunknown
5183 cat > conftest.$ac_ext <<_LT_EOF 5157 cat > conftest.$ac_ext <<_LT_EOF
5184-#line 10659 "configure" 5158-#line 10699 "configure"
5185+#line $LINENO "configure" 5159+#line $LINENO "configure"
5186 #include "confdefs.h" 5160 #include "confdefs.h"
5187 5161
5188 #if HAVE_DLFCN_H 5162 #if HAVE_DLFCN_H
5189@@ -10700,10 +11351,10 @@ else 5163@@ -10740,10 +11390,10 @@ else
5190 /* When -fvisbility=hidden is used, assume the code has been annotated 5164 /* When -fvisbility=hidden is used, assume the code has been annotated
5191 correspondingly for the symbols needed. */ 5165 correspondingly for the symbols needed. */
5192 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5166 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5199,16 +5173,16 @@ index 789d1b38b33..7ac563a13ad 100755
5199 int main () 5173 int main ()
5200 { 5174 {
5201 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5175 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5202@@ -10762,7 +11413,7 @@ else 5176@@ -10802,7 +11452,7 @@ else
5203 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5177 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5204 lt_status=$lt_dlunknown 5178 lt_status=$lt_dlunknown
5205 cat > conftest.$ac_ext <<_LT_EOF 5179 cat > conftest.$ac_ext <<_LT_EOF
5206-#line 10765 "configure" 5180-#line 10805 "configure"
5207+#line $LINENO "configure" 5181+#line $LINENO "configure"
5208 #include "confdefs.h" 5182 #include "confdefs.h"
5209 5183
5210 #if HAVE_DLFCN_H 5184 #if HAVE_DLFCN_H
5211@@ -10806,10 +11457,10 @@ else 5185@@ -10846,10 +11496,10 @@ else
5212 /* When -fvisbility=hidden is used, assume the code has been annotated 5186 /* When -fvisbility=hidden is used, assume the code has been annotated
5213 correspondingly for the symbols needed. */ 5187 correspondingly for the symbols needed. */
5214 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5188 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5221,7 +5195,7 @@ index 789d1b38b33..7ac563a13ad 100755
5221 int main () 5195 int main ()
5222 { 5196 {
5223 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5197 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5224@@ -14785,13 +15436,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5198@@ -14832,13 +15482,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5225 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5199 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5226 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5200 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5227 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5201 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5242,7 +5216,7 @@ index 789d1b38b33..7ac563a13ad 100755
5242 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5216 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5243 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5217 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5244 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5218 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5245@@ -14806,14 +15464,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5219@@ -14853,14 +15510,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5246 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5220 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5247 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5221 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5248 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 5222 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -5261,7 +5235,7 @@ index 789d1b38b33..7ac563a13ad 100755
5261 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5235 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5262 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5236 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5263 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5237 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5264@@ -14846,12 +15507,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5238@@ -14893,12 +15553,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5265 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5239 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5266 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5240 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5267 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5241 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5275,7 +5249,7 @@ index 789d1b38b33..7ac563a13ad 100755
5275 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5249 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5276 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5250 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5277 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5251 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5278@@ -14906,8 +15567,13 @@ reload_flag \ 5252@@ -14953,8 +15613,13 @@ reload_flag \
5279 OBJDUMP \ 5253 OBJDUMP \
5280 deplibs_check_method \ 5254 deplibs_check_method \
5281 file_magic_cmd \ 5255 file_magic_cmd \
@@ -5289,7 +5263,7 @@ index 789d1b38b33..7ac563a13ad 100755
5289 STRIP \ 5263 STRIP \
5290 RANLIB \ 5264 RANLIB \
5291 CC \ 5265 CC \
5292@@ -14917,12 +15583,14 @@ lt_cv_sys_global_symbol_pipe \ 5266@@ -14964,12 +15629,14 @@ lt_cv_sys_global_symbol_pipe \
5293 lt_cv_sys_global_symbol_to_cdecl \ 5267 lt_cv_sys_global_symbol_to_cdecl \
5294 lt_cv_sys_global_symbol_to_c_name_address \ 5268 lt_cv_sys_global_symbol_to_c_name_address \
5295 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5269 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5305,7 +5279,7 @@ index 789d1b38b33..7ac563a13ad 100755
5305 DSYMUTIL \ 5279 DSYMUTIL \
5306 NMEDIT \ 5280 NMEDIT \
5307 LIPO \ 5281 LIPO \
5308@@ -14938,7 +15606,6 @@ no_undefined_flag \ 5282@@ -14985,7 +15652,6 @@ no_undefined_flag \
5309 hardcode_libdir_flag_spec \ 5283 hardcode_libdir_flag_spec \
5310 hardcode_libdir_flag_spec_ld \ 5284 hardcode_libdir_flag_spec_ld \
5311 hardcode_libdir_separator \ 5285 hardcode_libdir_separator \
@@ -5313,7 +5287,7 @@ index 789d1b38b33..7ac563a13ad 100755
5313 exclude_expsyms \ 5287 exclude_expsyms \
5314 include_expsyms \ 5288 include_expsyms \
5315 file_list_spec \ 5289 file_list_spec \
5316@@ -14974,6 +15641,7 @@ module_cmds \ 5290@@ -15021,6 +15687,7 @@ module_cmds \
5317 module_expsym_cmds \ 5291 module_expsym_cmds \
5318 export_symbols_cmds \ 5292 export_symbols_cmds \
5319 prelink_cmds \ 5293 prelink_cmds \
@@ -5321,7 +5295,7 @@ index 789d1b38b33..7ac563a13ad 100755
5321 postinstall_cmds \ 5295 postinstall_cmds \
5322 postuninstall_cmds \ 5296 postuninstall_cmds \
5323 finish_cmds \ 5297 finish_cmds \
5324@@ -15747,7 +16415,8 @@ $as_echo X"$file" | 5298@@ -15793,7 +16460,8 @@ $as_echo X"$file" |
5325 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5299 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5326 # 5300 #
5327 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5301 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5331,7 +5305,7 @@ index 789d1b38b33..7ac563a13ad 100755
5331 # Written by Gordon Matzigkeit, 1996 5305 # Written by Gordon Matzigkeit, 1996
5332 # 5306 #
5333 # This file is part of GNU Libtool. 5307 # This file is part of GNU Libtool.
5334@@ -15850,19 +16519,42 @@ SP2NL=$lt_lt_SP2NL 5308@@ -15896,19 +16564,42 @@ SP2NL=$lt_lt_SP2NL
5335 # turn newlines into spaces. 5309 # turn newlines into spaces.
5336 NL2SP=$lt_lt_NL2SP 5310 NL2SP=$lt_lt_NL2SP
5337 5311
@@ -5375,7 +5349,7 @@ index 789d1b38b33..7ac563a13ad 100755
5375 # A symbol stripping program. 5349 # A symbol stripping program.
5376 STRIP=$lt_STRIP 5350 STRIP=$lt_STRIP
5377 5351
5378@@ -15892,6 +16584,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5352@@ -15938,6 +16629,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5379 # Transform the output of nm in a C name address pair when lib prefix is needed. 5353 # Transform the output of nm in a C name address pair when lib prefix is needed.
5380 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5354 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5381 5355
@@ -5388,7 +5362,7 @@ index 789d1b38b33..7ac563a13ad 100755
5388 # The name of the directory that contains temporary libtool files. 5362 # The name of the directory that contains temporary libtool files.
5389 objdir=$objdir 5363 objdir=$objdir
5390 5364
5391@@ -15901,6 +16599,9 @@ MAGIC_CMD=$MAGIC_CMD 5365@@ -15947,6 +16644,9 @@ MAGIC_CMD=$MAGIC_CMD
5392 # Must we lock files when doing compilation? 5366 # Must we lock files when doing compilation?
5393 need_locks=$lt_need_locks 5367 need_locks=$lt_need_locks
5394 5368
@@ -5398,7 +5372,7 @@ index 789d1b38b33..7ac563a13ad 100755
5398 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5372 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5399 DSYMUTIL=$lt_DSYMUTIL 5373 DSYMUTIL=$lt_DSYMUTIL
5400 5374
5401@@ -16015,12 +16716,12 @@ with_gcc=$GCC 5375@@ -16061,12 +16761,12 @@ with_gcc=$GCC
5402 # Compiler flag to turn off builtin functions. 5376 # Compiler flag to turn off builtin functions.
5403 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5377 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5404 5378
@@ -5414,7 +5388,7 @@ index 789d1b38b33..7ac563a13ad 100755
5414 # Compiler flag to prevent dynamic linking. 5388 # Compiler flag to prevent dynamic linking.
5415 link_static_flag=$lt_lt_prog_compiler_static 5389 link_static_flag=$lt_lt_prog_compiler_static
5416 5390
5417@@ -16107,9 +16808,6 @@ inherit_rpath=$inherit_rpath 5391@@ -16153,9 +16853,6 @@ inherit_rpath=$inherit_rpath
5418 # Whether libtool must link a program against all its dependency libraries. 5392 # Whether libtool must link a program against all its dependency libraries.
5419 link_all_deplibs=$link_all_deplibs 5393 link_all_deplibs=$link_all_deplibs
5420 5394
@@ -5424,7 +5398,7 @@ index 789d1b38b33..7ac563a13ad 100755
5424 # Set to "yes" if exported symbols are required. 5398 # Set to "yes" if exported symbols are required.
5425 always_export_symbols=$always_export_symbols 5399 always_export_symbols=$always_export_symbols
5426 5400
5427@@ -16125,6 +16823,9 @@ include_expsyms=$lt_include_expsyms 5401@@ -16171,6 +16868,9 @@ include_expsyms=$lt_include_expsyms
5428 # Commands necessary for linking programs (against libraries) with templates. 5402 # Commands necessary for linking programs (against libraries) with templates.
5429 prelink_cmds=$lt_prelink_cmds 5403 prelink_cmds=$lt_prelink_cmds
5430 5404
@@ -5434,7 +5408,7 @@ index 789d1b38b33..7ac563a13ad 100755
5434 # Specify filename containing input files. 5408 # Specify filename containing input files.
5435 file_list_spec=$lt_file_list_spec 5409 file_list_spec=$lt_file_list_spec
5436 5410
5437@@ -16157,210 +16858,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5411@@ -16203,210 +16903,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5438 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5412 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5439 # text mode, it properly converts lines to CR/LF. This bash problem 5413 # text mode, it properly converts lines to CR/LF. This bash problem
5440 # is reportedly fixed, but why not run on old versions too? 5414 # is reportedly fixed, but why not run on old versions too?
@@ -5809,7 +5783,7 @@ index 789d1b38b33..7ac563a13ad 100755
5809 chmod +x "$ofile" 5783 chmod +x "$ofile"
5810 5784
5811diff --git a/gprof/configure b/gprof/configure 5785diff --git a/gprof/configure b/gprof/configure
5812index 5703bba4462..e1ac86ec797 100755 5786index a7f788f0411..e7703613024 100755
5813--- a/gprof/configure 5787--- a/gprof/configure
5814+++ b/gprof/configure 5788+++ b/gprof/configure
5815@@ -663,8 +663,11 @@ OTOOL 5789@@ -663,8 +663,11 @@ OTOOL
@@ -5841,7 +5815,7 @@ index 5703bba4462..e1ac86ec797 100755
5841 5815
5842 Some influential environment variables: 5816 Some influential environment variables:
5843 CC C compiler command 5817 CC C compiler command
5844@@ -4471,8 +4477,8 @@ esac 5818@@ -4510,8 +4516,8 @@ esac
5845 5819
5846 5820
5847 5821
@@ -5852,7 +5826,7 @@ index 5703bba4462..e1ac86ec797 100755
5852 5826
5853 5827
5854 5828
5855@@ -4512,7 +4518,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5829@@ -4551,7 +4557,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5856 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5830 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5857 $as_echo_n "checking how to print strings... " >&6; } 5831 $as_echo_n "checking how to print strings... " >&6; }
5858 # Test print first, because it will be a builtin if present. 5832 # Test print first, because it will be a builtin if present.
@@ -5861,7 +5835,7 @@ index 5703bba4462..e1ac86ec797 100755
5861 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5835 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5862 ECHO='print -r --' 5836 ECHO='print -r --'
5863 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5837 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5864@@ -5198,8 +5204,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5838@@ -5238,8 +5244,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5865 # Try some XSI features 5839 # Try some XSI features
5866 xsi_shell=no 5840 xsi_shell=no
5867 ( _lt_dummy="a/b/c" 5841 ( _lt_dummy="a/b/c"
@@ -5872,7 +5846,7 @@ index 5703bba4462..e1ac86ec797 100755
5872 && eval 'test $(( 1 + 1 )) -eq 2 \ 5846 && eval 'test $(( 1 + 1 )) -eq 2 \
5873 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5847 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5874 && xsi_shell=yes 5848 && xsi_shell=yes
5875@@ -5248,6 +5254,80 @@ esac 5849@@ -5288,6 +5294,80 @@ esac
5876 5850
5877 5851
5878 5852
@@ -5953,7 +5927,7 @@ index 5703bba4462..e1ac86ec797 100755
5953 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 5927 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5954 $as_echo_n "checking for $LD option to reload object files... " >&6; } 5928 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5955 if ${lt_cv_ld_reload_flag+:} false; then : 5929 if ${lt_cv_ld_reload_flag+:} false; then :
5956@@ -5264,6 +5344,11 @@ case $reload_flag in 5930@@ -5304,6 +5384,11 @@ case $reload_flag in
5957 esac 5931 esac
5958 reload_cmds='$LD$reload_flag -o $output$reload_objs' 5932 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5959 case $host_os in 5933 case $host_os in
@@ -5965,7 +5939,7 @@ index 5703bba4462..e1ac86ec797 100755
5965 darwin*) 5939 darwin*)
5966 if test "$GCC" = yes; then 5940 if test "$GCC" = yes; then
5967 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 5941 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5968@@ -5432,7 +5517,8 @@ mingw* | pw32*) 5942@@ -5472,7 +5557,8 @@ mingw* | pw32*)
5969 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 5943 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5970 lt_cv_file_magic_cmd='func_win32_libid' 5944 lt_cv_file_magic_cmd='func_win32_libid'
5971 else 5945 else
@@ -5975,7 +5949,7 @@ index 5703bba4462..e1ac86ec797 100755
5975 lt_cv_file_magic_cmd='$OBJDUMP -f' 5949 lt_cv_file_magic_cmd='$OBJDUMP -f'
5976 fi 5950 fi
5977 ;; 5951 ;;
5978@@ -5586,6 +5672,21 @@ esac 5952@@ -5626,6 +5712,21 @@ esac
5979 fi 5953 fi
5980 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5954 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5981 $as_echo "$lt_cv_deplibs_check_method" >&6; } 5955 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -5997,7 +5971,7 @@ index 5703bba4462..e1ac86ec797 100755
5997 file_magic_cmd=$lt_cv_file_magic_cmd 5971 file_magic_cmd=$lt_cv_file_magic_cmd
5998 deplibs_check_method=$lt_cv_deplibs_check_method 5972 deplibs_check_method=$lt_cv_deplibs_check_method
5999 test -z "$deplibs_check_method" && deplibs_check_method=unknown 5973 test -z "$deplibs_check_method" && deplibs_check_method=unknown
6000@@ -5601,6 +5702,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 5974@@ -5641,6 +5742,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
6001 5975
6002 5976
6003 5977
@@ -6155,7 +6129,7 @@ index 5703bba4462..e1ac86ec797 100755
6155 plugin_option= 6129 plugin_option=
6156 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 6130 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
6157 for plugin in $plugin_names; do 6131 for plugin in $plugin_names; do
6158@@ -5615,8 +5867,10 @@ for plugin in $plugin_names; do 6132@@ -5655,8 +5907,10 @@ for plugin in $plugin_names; do
6159 done 6133 done
6160 6134
6161 if test -n "$ac_tool_prefix"; then 6135 if test -n "$ac_tool_prefix"; then
@@ -6168,7 +6142,7 @@ index 5703bba4462..e1ac86ec797 100755
6168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6142 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6169 $as_echo_n "checking for $ac_word... " >&6; } 6143 $as_echo_n "checking for $ac_word... " >&6; }
6170 if ${ac_cv_prog_AR+:} false; then : 6144 if ${ac_cv_prog_AR+:} false; then :
6171@@ -5632,7 +5886,7 @@ do 6145@@ -5672,7 +5926,7 @@ do
6172 test -z "$as_dir" && as_dir=. 6146 test -z "$as_dir" && as_dir=.
6173 for ac_exec_ext in '' $ac_executable_extensions; do 6147 for ac_exec_ext in '' $ac_executable_extensions; do
6174 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6148 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6177,7 +6151,7 @@ index 5703bba4462..e1ac86ec797 100755
6177 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6151 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6178 break 2 6152 break 2
6179 fi 6153 fi
6180@@ -5652,11 +5906,15 @@ $as_echo "no" >&6; } 6154@@ -5692,11 +5946,15 @@ $as_echo "no" >&6; }
6181 fi 6155 fi
6182 6156
6183 6157
@@ -6196,7 +6170,7 @@ index 5703bba4462..e1ac86ec797 100755
6196 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6170 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6197 $as_echo_n "checking for $ac_word... " >&6; } 6171 $as_echo_n "checking for $ac_word... " >&6; }
6198 if ${ac_cv_prog_ac_ct_AR+:} false; then : 6172 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6199@@ -5672,7 +5930,7 @@ do 6173@@ -5712,7 +5970,7 @@ do
6200 test -z "$as_dir" && as_dir=. 6174 test -z "$as_dir" && as_dir=.
6201 for ac_exec_ext in '' $ac_executable_extensions; do 6175 for ac_exec_ext in '' $ac_executable_extensions; do
6202 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6176 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6205,7 +6179,7 @@ index 5703bba4462..e1ac86ec797 100755
6205 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6179 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6206 break 2 6180 break 2
6207 fi 6181 fi
6208@@ -5691,6 +5949,10 @@ else 6182@@ -5731,6 +5989,10 @@ else
6209 $as_echo "no" >&6; } 6183 $as_echo "no" >&6; }
6210 fi 6184 fi
6211 6185
@@ -6216,7 +6190,7 @@ index 5703bba4462..e1ac86ec797 100755
6216 if test "x$ac_ct_AR" = x; then 6190 if test "x$ac_ct_AR" = x; then
6217 AR="false" 6191 AR="false"
6218 else 6192 else
6219@@ -5702,25 +5964,19 @@ ac_tool_warned=yes ;; 6193@@ -5742,25 +6004,19 @@ ac_tool_warned=yes ;;
6220 esac 6194 esac
6221 AR=$ac_ct_AR 6195 AR=$ac_ct_AR
6222 fi 6196 fi
@@ -6251,7 +6225,7 @@ index 5703bba4462..e1ac86ec797 100755
6251 6225
6252 6226
6253 6227
6254@@ -5732,6 +5988,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 6228@@ -5772,6 +6028,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6255 6229
6256 6230
6257 6231
@@ -6316,7 +6290,7 @@ index 5703bba4462..e1ac86ec797 100755
6316 if test -n "$ac_tool_prefix"; then 6290 if test -n "$ac_tool_prefix"; then
6317 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 6291 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6318 set dummy ${ac_tool_prefix}strip; ac_word=$2 6292 set dummy ${ac_tool_prefix}strip; ac_word=$2
6319@@ -6071,8 +6385,8 @@ esac 6293@@ -6111,8 +6425,8 @@ esac
6320 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6294 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6321 6295
6322 # Transform an extracted symbol line into symbol name and symbol address 6296 # Transform an extracted symbol line into symbol name and symbol address
@@ -6327,7 +6301,7 @@ index 5703bba4462..e1ac86ec797 100755
6327 6301
6328 # Handle CRLF in mingw tool chain 6302 # Handle CRLF in mingw tool chain
6329 opt_cr= 6303 opt_cr=
6330@@ -6108,6 +6422,7 @@ for ac_symprfx in "" "_"; do 6304@@ -6148,6 +6462,7 @@ for ac_symprfx in "" "_"; do
6331 else 6305 else
6332 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6306 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6333 fi 6307 fi
@@ -6335,7 +6309,7 @@ index 5703bba4462..e1ac86ec797 100755
6335 6309
6336 # Check to see that the pipe works correctly. 6310 # Check to see that the pipe works correctly.
6337 pipe_works=no 6311 pipe_works=no
6338@@ -6149,6 +6464,18 @@ _LT_EOF 6312@@ -6189,6 +6504,18 @@ _LT_EOF
6339 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6313 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6340 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6314 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6341 cat <<_LT_EOF > conftest.$ac_ext 6315 cat <<_LT_EOF > conftest.$ac_ext
@@ -6354,7 +6328,7 @@ index 5703bba4462..e1ac86ec797 100755
6354 #ifdef __cplusplus 6328 #ifdef __cplusplus
6355 extern "C" { 6329 extern "C" {
6356 #endif 6330 #endif
6357@@ -6160,7 +6487,7 @@ _LT_EOF 6331@@ -6200,7 +6527,7 @@ _LT_EOF
6358 cat <<_LT_EOF >> conftest.$ac_ext 6332 cat <<_LT_EOF >> conftest.$ac_ext
6359 6333
6360 /* The mapping between symbol names and symbols. */ 6334 /* The mapping between symbol names and symbols. */
@@ -6363,7 +6337,7 @@ index 5703bba4462..e1ac86ec797 100755
6363 const char *name; 6337 const char *name;
6364 void *address; 6338 void *address;
6365 } 6339 }
6366@@ -6186,8 +6513,8 @@ static const void *lt_preloaded_setup() { 6340@@ -6226,8 +6553,8 @@ static const void *lt_preloaded_setup() {
6367 _LT_EOF 6341 _LT_EOF
6368 # Now try linking the two files. 6342 # Now try linking the two files.
6369 mv conftest.$ac_objext conftstm.$ac_objext 6343 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6374,7 +6348,7 @@ index 5703bba4462..e1ac86ec797 100755
6374 LIBS="conftstm.$ac_objext" 6348 LIBS="conftstm.$ac_objext"
6375 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6349 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6376 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6350 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6377@@ -6197,8 +6524,8 @@ _LT_EOF 6351@@ -6237,8 +6564,8 @@ _LT_EOF
6378 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6352 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6379 pipe_works=yes 6353 pipe_works=yes
6380 fi 6354 fi
@@ -6385,7 +6359,7 @@ index 5703bba4462..e1ac86ec797 100755
6385 else 6359 else
6386 echo "cannot find nm_test_func in $nlist" >&5 6360 echo "cannot find nm_test_func in $nlist" >&5
6387 fi 6361 fi
6388@@ -6235,6 +6562,18 @@ else 6362@@ -6275,6 +6602,18 @@ else
6389 $as_echo "ok" >&6; } 6363 $as_echo "ok" >&6; }
6390 fi 6364 fi
6391 6365
@@ -6404,7 +6378,7 @@ index 5703bba4462..e1ac86ec797 100755
6404 6378
6405 6379
6406 6380
6407@@ -6251,6 +6590,43 @@ fi 6381@@ -6291,6 +6630,43 @@ fi
6408 6382
6409 6383
6410 6384
@@ -6448,7 +6422,7 @@ index 5703bba4462..e1ac86ec797 100755
6448 6422
6449 6423
6450 6424
6451@@ -6462,6 +6838,123 @@ esac 6425@@ -6502,6 +6878,123 @@ esac
6452 6426
6453 need_locks="$enable_libtool_lock" 6427 need_locks="$enable_libtool_lock"
6454 6428
@@ -6572,7 +6546,7 @@ index 5703bba4462..e1ac86ec797 100755
6572 6546
6573 case $host_os in 6547 case $host_os in
6574 rhapsody* | darwin*) 6548 rhapsody* | darwin*)
6575@@ -7025,6 +7518,8 @@ _LT_EOF 6549@@ -7065,6 +7558,8 @@ _LT_EOF
6576 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6550 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6577 echo "$AR cru libconftest.a conftest.o" >&5 6551 echo "$AR cru libconftest.a conftest.o" >&5
6578 $AR cru libconftest.a conftest.o 2>&5 6552 $AR cru libconftest.a conftest.o 2>&5
@@ -6581,7 +6555,7 @@ index 5703bba4462..e1ac86ec797 100755
6581 cat > conftest.c << _LT_EOF 6555 cat > conftest.c << _LT_EOF
6582 int main() { return 0;} 6556 int main() { return 0;}
6583 _LT_EOF 6557 _LT_EOF
6584@@ -7607,8 +8103,6 @@ fi 6558@@ -7647,8 +8142,6 @@ fi
6585 lt_prog_compiler_pic= 6559 lt_prog_compiler_pic=
6586 lt_prog_compiler_static= 6560 lt_prog_compiler_static=
6587 6561
@@ -6590,7 +6564,7 @@ index 5703bba4462..e1ac86ec797 100755
6590 6564
6591 if test "$GCC" = yes; then 6565 if test "$GCC" = yes; then
6592 lt_prog_compiler_wl='-Wl,' 6566 lt_prog_compiler_wl='-Wl,'
6593@@ -7774,6 +8268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6567@@ -7814,6 +8307,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6594 lt_prog_compiler_pic='--shared' 6568 lt_prog_compiler_pic='--shared'
6595 lt_prog_compiler_static='--static' 6569 lt_prog_compiler_static='--static'
6596 ;; 6570 ;;
@@ -6603,7 +6577,7 @@ index 5703bba4462..e1ac86ec797 100755
6603 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6577 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6604 # Portland Group compilers (*not* the Pentium gcc compiler, 6578 # Portland Group compilers (*not* the Pentium gcc compiler,
6605 # which looks to be a dead project) 6579 # which looks to be a dead project)
6606@@ -7836,7 +8336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6580@@ -7876,7 +8375,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6607 lt_prog_compiler_pic='-KPIC' 6581 lt_prog_compiler_pic='-KPIC'
6608 lt_prog_compiler_static='-Bstatic' 6582 lt_prog_compiler_static='-Bstatic'
6609 case $cc_basename in 6583 case $cc_basename in
@@ -6612,7 +6586,7 @@ index 5703bba4462..e1ac86ec797 100755
6612 lt_prog_compiler_wl='-Qoption ld ';; 6586 lt_prog_compiler_wl='-Qoption ld ';;
6613 *) 6587 *)
6614 lt_prog_compiler_wl='-Wl,';; 6588 lt_prog_compiler_wl='-Wl,';;
6615@@ -7893,13 +8393,17 @@ case $host_os in 6589@@ -7933,13 +8432,17 @@ case $host_os in
6616 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6590 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6617 ;; 6591 ;;
6618 esac 6592 esac
@@ -6636,7 +6610,7 @@ index 5703bba4462..e1ac86ec797 100755
6636 6610
6637 # 6611 #
6638 # Check to make sure the PIC flag actually works. 6612 # Check to make sure the PIC flag actually works.
6639@@ -7960,6 +8464,11 @@ fi 6613@@ -8000,6 +8503,11 @@ fi
6640 6614
6641 6615
6642 6616
@@ -6648,7 +6622,7 @@ index 5703bba4462..e1ac86ec797 100755
6648 # 6622 #
6649 # Check to make sure the static flag actually works. 6623 # Check to make sure the static flag actually works.
6650 # 6624 #
6651@@ -8310,7 +8819,8 @@ _LT_EOF 6625@@ -8350,7 +8858,8 @@ _LT_EOF
6652 allow_undefined_flag=unsupported 6626 allow_undefined_flag=unsupported
6653 always_export_symbols=no 6627 always_export_symbols=no
6654 enable_shared_with_static_runtimes=yes 6628 enable_shared_with_static_runtimes=yes
@@ -6658,7 +6632,7 @@ index 5703bba4462..e1ac86ec797 100755
6658 6632
6659 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6633 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6660 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6634 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6661@@ -8409,12 +8919,12 @@ _LT_EOF 6635@@ -8449,12 +8958,12 @@ _LT_EOF
6662 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6636 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6663 hardcode_libdir_flag_spec= 6637 hardcode_libdir_flag_spec=
6664 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6638 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -6673,7 +6647,7 @@ index 5703bba4462..e1ac86ec797 100755
6673 fi 6647 fi
6674 ;; 6648 ;;
6675 esac 6649 esac
6676@@ -8428,8 +8938,8 @@ _LT_EOF 6650@@ -8468,8 +8977,8 @@ _LT_EOF
6677 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6651 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6678 wlarc= 6652 wlarc=
6679 else 6653 else
@@ -6684,7 +6658,7 @@ index 5703bba4462..e1ac86ec797 100755
6684 fi 6658 fi
6685 ;; 6659 ;;
6686 6660
6687@@ -8447,8 +8957,8 @@ _LT_EOF 6661@@ -8487,8 +8996,8 @@ _LT_EOF
6688 6662
6689 _LT_EOF 6663 _LT_EOF
6690 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6664 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6695,7 +6669,7 @@ index 5703bba4462..e1ac86ec797 100755
6695 else 6669 else
6696 ld_shlibs=no 6670 ld_shlibs=no
6697 fi 6671 fi
6698@@ -8494,8 +9004,8 @@ _LT_EOF 6672@@ -8534,8 +9043,8 @@ _LT_EOF
6699 6673
6700 *) 6674 *)
6701 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6675 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6706,7 +6680,7 @@ index 5703bba4462..e1ac86ec797 100755
6706 else 6680 else
6707 ld_shlibs=no 6681 ld_shlibs=no
6708 fi 6682 fi
6709@@ -8625,7 +9135,13 @@ _LT_EOF 6683@@ -8665,7 +9174,13 @@ _LT_EOF
6710 allow_undefined_flag='-berok' 6684 allow_undefined_flag='-berok'
6711 # Determine the default libpath from the value encoded in an 6685 # Determine the default libpath from the value encoded in an
6712 # empty executable. 6686 # empty executable.
@@ -6721,7 +6695,7 @@ index 5703bba4462..e1ac86ec797 100755
6721 /* end confdefs.h. */ 6695 /* end confdefs.h. */
6722 6696
6723 int 6697 int
6724@@ -8638,22 +9154,29 @@ main () 6698@@ -8678,22 +9193,29 @@ main ()
6725 _ACEOF 6699 _ACEOF
6726 if ac_fn_c_try_link "$LINENO"; then : 6700 if ac_fn_c_try_link "$LINENO"; then :
6727 6701
@@ -6764,7 +6738,7 @@ index 5703bba4462..e1ac86ec797 100755
6764 6738
6765 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6739 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6766 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 6740 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
6767@@ -8665,7 +9188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6741@@ -8705,7 +9227,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6768 else 6742 else
6769 # Determine the default libpath from the value encoded in an 6743 # Determine the default libpath from the value encoded in an
6770 # empty executable. 6744 # empty executable.
@@ -6779,7 +6753,7 @@ index 5703bba4462..e1ac86ec797 100755
6779 /* end confdefs.h. */ 6753 /* end confdefs.h. */
6780 6754
6781 int 6755 int
6782@@ -8678,22 +9207,29 @@ main () 6756@@ -8718,22 +9246,29 @@ main ()
6783 _ACEOF 6757 _ACEOF
6784 if ac_fn_c_try_link "$LINENO"; then : 6758 if ac_fn_c_try_link "$LINENO"; then :
6785 6759
@@ -6822,7 +6796,7 @@ index 5703bba4462..e1ac86ec797 100755
6822 6796
6823 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6797 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6824 # Warning - without using the other run time loading flags, 6798 # Warning - without using the other run time loading flags,
6825@@ -8738,20 +9274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6799@@ -8778,20 +9313,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6826 # Microsoft Visual C++. 6800 # Microsoft Visual C++.
6827 # hardcode_libdir_flag_spec is actually meaningless, as there is 6801 # hardcode_libdir_flag_spec is actually meaningless, as there is
6828 # no search path for DLLs. 6802 # no search path for DLLs.
@@ -6900,7 +6874,7 @@ index 5703bba4462..e1ac86ec797 100755
6900 ;; 6874 ;;
6901 6875
6902 darwin* | rhapsody*) 6876 darwin* | rhapsody*)
6903@@ -8812,7 +9391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6877@@ -8852,7 +9430,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6904 6878
6905 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 6879 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6906 freebsd* | dragonfly*) 6880 freebsd* | dragonfly*)
@@ -6909,7 +6883,7 @@ index 5703bba4462..e1ac86ec797 100755
6909 hardcode_libdir_flag_spec='-R$libdir' 6883 hardcode_libdir_flag_spec='-R$libdir'
6910 hardcode_direct=yes 6884 hardcode_direct=yes
6911 hardcode_shlibpath_var=no 6885 hardcode_shlibpath_var=no
6912@@ -8820,7 +9399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6886@@ -8860,7 +9438,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6913 6887
6914 hpux9*) 6888 hpux9*)
6915 if test "$GCC" = yes; then 6889 if test "$GCC" = yes; then
@@ -6918,7 +6892,7 @@ index 5703bba4462..e1ac86ec797 100755
6918 else 6892 else
6919 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 6893 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
6920 fi 6894 fi
6921@@ -8836,7 +9415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6895@@ -8876,7 +9454,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6922 6896
6923 hpux10*) 6897 hpux10*)
6924 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 6898 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -6927,7 +6901,7 @@ index 5703bba4462..e1ac86ec797 100755
6927 else 6901 else
6928 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 6902 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6929 fi 6903 fi
6930@@ -8860,10 +9439,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6904@@ -8900,10 +9478,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6931 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6905 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6932 ;; 6906 ;;
6933 ia64*) 6907 ia64*)
@@ -6940,7 +6914,7 @@ index 5703bba4462..e1ac86ec797 100755
6940 ;; 6914 ;;
6941 esac 6915 esac
6942 else 6916 else
6943@@ -8942,23 +9521,36 @@ fi 6917@@ -8982,23 +9560,36 @@ fi
6944 6918
6945 irix5* | irix6* | nonstopux*) 6919 irix5* | irix6* | nonstopux*)
6946 if test "$GCC" = yes; then 6920 if test "$GCC" = yes; then
@@ -6985,7 +6959,7 @@ index 5703bba4462..e1ac86ec797 100755
6985 else 6959 else
6986 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 6960 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
6987 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 6961 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
6988@@ -9043,7 +9635,7 @@ rm -f core conftest.err conftest.$ac_objext \ 6962@@ -9083,7 +9674,7 @@ rm -f core conftest.err conftest.$ac_objext \
6989 osf4* | osf5*) # as osf3* with the addition of -msym flag 6963 osf4* | osf5*) # as osf3* with the addition of -msym flag
6990 if test "$GCC" = yes; then 6964 if test "$GCC" = yes; then
6991 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 6965 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6994,7 +6968,7 @@ index 5703bba4462..e1ac86ec797 100755
6994 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 6968 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6995 else 6969 else
6996 allow_undefined_flag=' -expect_unresolved \*' 6970 allow_undefined_flag=' -expect_unresolved \*'
6997@@ -9062,9 +9654,9 @@ rm -f core conftest.err conftest.$ac_objext \ 6971@@ -9102,9 +9693,9 @@ rm -f core conftest.err conftest.$ac_objext \
6998 no_undefined_flag=' -z defs' 6972 no_undefined_flag=' -z defs'
6999 if test "$GCC" = yes; then 6973 if test "$GCC" = yes; then
7000 wlarc='${wl}' 6974 wlarc='${wl}'
@@ -7006,7 +6980,7 @@ index 5703bba4462..e1ac86ec797 100755
7006 else 6980 else
7007 case `$CC -V 2>&1` in 6981 case `$CC -V 2>&1` in
7008 *"Compilers 5.0"*) 6982 *"Compilers 5.0"*)
7009@@ -9640,8 +10232,9 @@ cygwin* | mingw* | pw32* | cegcc*) 6983@@ -9680,8 +10271,9 @@ cygwin* | mingw* | pw32* | cegcc*)
7010 need_version=no 6984 need_version=no
7011 need_lib_prefix=no 6985 need_lib_prefix=no
7012 6986
@@ -7018,7 +6992,7 @@ index 5703bba4462..e1ac86ec797 100755
7018 library_names_spec='$libname.dll.a' 6992 library_names_spec='$libname.dll.a'
7019 # DLL is installed to $(libdir)/../bin by postinstall_cmds 6993 # DLL is installed to $(libdir)/../bin by postinstall_cmds
7020 postinstall_cmds='base_file=`basename \${file}`~ 6994 postinstall_cmds='base_file=`basename \${file}`~
7021@@ -9674,13 +10267,71 @@ cygwin* | mingw* | pw32* | cegcc*) 6995@@ -9714,13 +10306,71 @@ cygwin* | mingw* | pw32* | cegcc*)
7022 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 6996 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7023 ;; 6997 ;;
7024 esac 6998 esac
@@ -7091,25 +7065,16 @@ index 5703bba4462..e1ac86ec797 100755
7091 # FIXME: first we should search . and the directory the executable is in 7065 # FIXME: first we should search . and the directory the executable is in
7092 shlibpath_var=PATH 7066 shlibpath_var=PATH
7093 ;; 7067 ;;
7094@@ -9762,7 +10413,7 @@ haiku*) 7068@@ -10598,7 +11248,7 @@ else
7095 soname_spec='${libname}${release}${shared_ext}$major'
7096 shlibpath_var=LIBRARY_PATH
7097 shlibpath_overrides_runpath=yes
7098- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
7099+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
7100 hardcode_into_libs=yes
7101 ;;
7102
7103@@ -10558,7 +11209,7 @@ else
7104 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7069 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7105 lt_status=$lt_dlunknown 7070 lt_status=$lt_dlunknown
7106 cat > conftest.$ac_ext <<_LT_EOF 7071 cat > conftest.$ac_ext <<_LT_EOF
7107-#line 10561 "configure" 7072-#line 10601 "configure"
7108+#line $LINENO "configure" 7073+#line $LINENO "configure"
7109 #include "confdefs.h" 7074 #include "confdefs.h"
7110 7075
7111 #if HAVE_DLFCN_H 7076 #if HAVE_DLFCN_H
7112@@ -10602,10 +11253,10 @@ else 7077@@ -10642,10 +11292,10 @@ else
7113 /* When -fvisbility=hidden is used, assume the code has been annotated 7078 /* When -fvisbility=hidden is used, assume the code has been annotated
7114 correspondingly for the symbols needed. */ 7079 correspondingly for the symbols needed. */
7115 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7080 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7122,16 +7087,16 @@ index 5703bba4462..e1ac86ec797 100755
7122 int main () 7087 int main ()
7123 { 7088 {
7124 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7089 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7125@@ -10664,7 +11315,7 @@ else 7090@@ -10704,7 +11354,7 @@ else
7126 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7091 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7127 lt_status=$lt_dlunknown 7092 lt_status=$lt_dlunknown
7128 cat > conftest.$ac_ext <<_LT_EOF 7093 cat > conftest.$ac_ext <<_LT_EOF
7129-#line 10667 "configure" 7094-#line 10707 "configure"
7130+#line $LINENO "configure" 7095+#line $LINENO "configure"
7131 #include "confdefs.h" 7096 #include "confdefs.h"
7132 7097
7133 #if HAVE_DLFCN_H 7098 #if HAVE_DLFCN_H
7134@@ -10708,10 +11359,10 @@ else 7099@@ -10748,10 +11398,10 @@ else
7135 /* When -fvisbility=hidden is used, assume the code has been annotated 7100 /* When -fvisbility=hidden is used, assume the code has been annotated
7136 correspondingly for the symbols needed. */ 7101 correspondingly for the symbols needed. */
7137 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7102 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7144,7 +7109,7 @@ index 5703bba4462..e1ac86ec797 100755
7144 int main () 7109 int main ()
7145 { 7110 {
7146 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7111 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7147@@ -12731,13 +13382,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7112@@ -12771,13 +13421,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7148 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7113 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7149 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7114 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7150 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7115 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7165,7 +7130,7 @@ index 5703bba4462..e1ac86ec797 100755
7165 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7130 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7166 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7131 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7167 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7132 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7168@@ -12752,14 +13410,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7133@@ -12792,14 +13449,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7169 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7134 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7170 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7135 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7171 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 7136 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -7184,7 +7149,7 @@ index 5703bba4462..e1ac86ec797 100755
7184 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7149 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7185 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7150 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7186 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7151 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7187@@ -12792,12 +13453,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7152@@ -12832,12 +13492,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7188 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7153 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7189 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7154 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7190 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7155 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7198,7 +7163,7 @@ index 5703bba4462..e1ac86ec797 100755
7198 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7163 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7199 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7164 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7200 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7165 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7201@@ -12852,8 +13513,13 @@ reload_flag \ 7166@@ -12892,8 +13552,13 @@ reload_flag \
7202 OBJDUMP \ 7167 OBJDUMP \
7203 deplibs_check_method \ 7168 deplibs_check_method \
7204 file_magic_cmd \ 7169 file_magic_cmd \
@@ -7212,7 +7177,7 @@ index 5703bba4462..e1ac86ec797 100755
7212 STRIP \ 7177 STRIP \
7213 RANLIB \ 7178 RANLIB \
7214 CC \ 7179 CC \
7215@@ -12863,12 +13529,14 @@ lt_cv_sys_global_symbol_pipe \ 7180@@ -12903,12 +13568,14 @@ lt_cv_sys_global_symbol_pipe \
7216 lt_cv_sys_global_symbol_to_cdecl \ 7181 lt_cv_sys_global_symbol_to_cdecl \
7217 lt_cv_sys_global_symbol_to_c_name_address \ 7182 lt_cv_sys_global_symbol_to_c_name_address \
7218 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7183 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7228,7 +7193,7 @@ index 5703bba4462..e1ac86ec797 100755
7228 DSYMUTIL \ 7193 DSYMUTIL \
7229 NMEDIT \ 7194 NMEDIT \
7230 LIPO \ 7195 LIPO \
7231@@ -12884,7 +13552,6 @@ no_undefined_flag \ 7196@@ -12924,7 +13591,6 @@ no_undefined_flag \
7232 hardcode_libdir_flag_spec \ 7197 hardcode_libdir_flag_spec \
7233 hardcode_libdir_flag_spec_ld \ 7198 hardcode_libdir_flag_spec_ld \
7234 hardcode_libdir_separator \ 7199 hardcode_libdir_separator \
@@ -7236,7 +7201,7 @@ index 5703bba4462..e1ac86ec797 100755
7236 exclude_expsyms \ 7201 exclude_expsyms \
7237 include_expsyms \ 7202 include_expsyms \
7238 file_list_spec \ 7203 file_list_spec \
7239@@ -12920,6 +13587,7 @@ module_cmds \ 7204@@ -12960,6 +13626,7 @@ module_cmds \
7240 module_expsym_cmds \ 7205 module_expsym_cmds \
7241 export_symbols_cmds \ 7206 export_symbols_cmds \
7242 prelink_cmds \ 7207 prelink_cmds \
@@ -7244,7 +7209,7 @@ index 5703bba4462..e1ac86ec797 100755
7244 postinstall_cmds \ 7209 postinstall_cmds \
7245 postuninstall_cmds \ 7210 postuninstall_cmds \
7246 finish_cmds \ 7211 finish_cmds \
7247@@ -13685,7 +14353,8 @@ $as_echo X"$file" | 7212@@ -13725,7 +14392,8 @@ $as_echo X"$file" |
7248 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7213 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7249 # 7214 #
7250 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7215 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7254,7 +7219,7 @@ index 5703bba4462..e1ac86ec797 100755
7254 # Written by Gordon Matzigkeit, 1996 7219 # Written by Gordon Matzigkeit, 1996
7255 # 7220 #
7256 # This file is part of GNU Libtool. 7221 # This file is part of GNU Libtool.
7257@@ -13788,19 +14457,42 @@ SP2NL=$lt_lt_SP2NL 7222@@ -13828,19 +14496,42 @@ SP2NL=$lt_lt_SP2NL
7258 # turn newlines into spaces. 7223 # turn newlines into spaces.
7259 NL2SP=$lt_lt_NL2SP 7224 NL2SP=$lt_lt_NL2SP
7260 7225
@@ -7298,7 +7263,7 @@ index 5703bba4462..e1ac86ec797 100755
7298 # A symbol stripping program. 7263 # A symbol stripping program.
7299 STRIP=$lt_STRIP 7264 STRIP=$lt_STRIP
7300 7265
7301@@ -13830,6 +14522,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7266@@ -13870,6 +14561,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7302 # Transform the output of nm in a C name address pair when lib prefix is needed. 7267 # Transform the output of nm in a C name address pair when lib prefix is needed.
7303 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7268 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7304 7269
@@ -7311,7 +7276,7 @@ index 5703bba4462..e1ac86ec797 100755
7311 # The name of the directory that contains temporary libtool files. 7276 # The name of the directory that contains temporary libtool files.
7312 objdir=$objdir 7277 objdir=$objdir
7313 7278
7314@@ -13839,6 +14537,9 @@ MAGIC_CMD=$MAGIC_CMD 7279@@ -13879,6 +14576,9 @@ MAGIC_CMD=$MAGIC_CMD
7315 # Must we lock files when doing compilation? 7280 # Must we lock files when doing compilation?
7316 need_locks=$lt_need_locks 7281 need_locks=$lt_need_locks
7317 7282
@@ -7321,7 +7286,7 @@ index 5703bba4462..e1ac86ec797 100755
7321 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7286 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7322 DSYMUTIL=$lt_DSYMUTIL 7287 DSYMUTIL=$lt_DSYMUTIL
7323 7288
7324@@ -13953,12 +14654,12 @@ with_gcc=$GCC 7289@@ -13993,12 +14693,12 @@ with_gcc=$GCC
7325 # Compiler flag to turn off builtin functions. 7290 # Compiler flag to turn off builtin functions.
7326 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7291 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7327 7292
@@ -7337,7 +7302,7 @@ index 5703bba4462..e1ac86ec797 100755
7337 # Compiler flag to prevent dynamic linking. 7302 # Compiler flag to prevent dynamic linking.
7338 link_static_flag=$lt_lt_prog_compiler_static 7303 link_static_flag=$lt_lt_prog_compiler_static
7339 7304
7340@@ -14045,9 +14746,6 @@ inherit_rpath=$inherit_rpath 7305@@ -14085,9 +14785,6 @@ inherit_rpath=$inherit_rpath
7341 # Whether libtool must link a program against all its dependency libraries. 7306 # Whether libtool must link a program against all its dependency libraries.
7342 link_all_deplibs=$link_all_deplibs 7307 link_all_deplibs=$link_all_deplibs
7343 7308
@@ -7347,7 +7312,7 @@ index 5703bba4462..e1ac86ec797 100755
7347 # Set to "yes" if exported symbols are required. 7312 # Set to "yes" if exported symbols are required.
7348 always_export_symbols=$always_export_symbols 7313 always_export_symbols=$always_export_symbols
7349 7314
7350@@ -14063,6 +14761,9 @@ include_expsyms=$lt_include_expsyms 7315@@ -14103,6 +14800,9 @@ include_expsyms=$lt_include_expsyms
7351 # Commands necessary for linking programs (against libraries) with templates. 7316 # Commands necessary for linking programs (against libraries) with templates.
7352 prelink_cmds=$lt_prelink_cmds 7317 prelink_cmds=$lt_prelink_cmds
7353 7318
@@ -7357,7 +7322,7 @@ index 5703bba4462..e1ac86ec797 100755
7357 # Specify filename containing input files. 7322 # Specify filename containing input files.
7358 file_list_spec=$lt_file_list_spec 7323 file_list_spec=$lt_file_list_spec
7359 7324
7360@@ -14095,210 +14796,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7325@@ -14135,210 +14835,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7361 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7326 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7362 # text mode, it properly converts lines to CR/LF. This bash problem 7327 # text mode, it properly converts lines to CR/LF. This bash problem
7363 # is reportedly fixed, but why not run on old versions too? 7328 # is reportedly fixed, but why not run on old versions too?
@@ -7732,10 +7697,10 @@ index 5703bba4462..e1ac86ec797 100755
7732 chmod +x "$ofile" 7697 chmod +x "$ofile"
7733 7698
7734diff --git a/ld/configure b/ld/configure 7699diff --git a/ld/configure b/ld/configure
7735index 2aeb3317b65..5ef46d31558 100755 7700index 1f9ec8ec580..4a35108ce7c 100755
7736--- a/ld/configure 7701--- a/ld/configure
7737+++ b/ld/configure 7702+++ b/ld/configure
7738@@ -693,8 +693,11 @@ OTOOL 7703@@ -695,8 +695,11 @@ OTOOL
7739 LIPO 7704 LIPO
7740 NMEDIT 7705 NMEDIT
7741 DSYMUTIL 7706 DSYMUTIL
@@ -7747,7 +7712,7 @@ index 2aeb3317b65..5ef46d31558 100755
7747 OBJDUMP 7712 OBJDUMP
7748 LN_S 7713 LN_S
7749 NM 7714 NM
7750@@ -821,6 +824,7 @@ enable_static 7715@@ -823,6 +826,7 @@ enable_static
7751 with_pic 7716 with_pic
7752 enable_fast_install 7717 enable_fast_install
7753 with_gnu_ld 7718 with_gnu_ld
@@ -7755,7 +7720,7 @@ index 2aeb3317b65..5ef46d31558 100755
7755 enable_libtool_lock 7720 enable_libtool_lock
7756 enable_plugins 7721 enable_plugins
7757 enable_largefile 7722 enable_largefile
7758@@ -1528,6 +1532,8 @@ Optional Packages: 7723@@ -1530,6 +1534,8 @@ Optional Packages:
7759 --with-pic try to use only PIC/non-PIC objects [default=use 7724 --with-pic try to use only PIC/non-PIC objects [default=use
7760 both] 7725 both]
7761 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7726 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7764,7 +7729,7 @@ index 2aeb3317b65..5ef46d31558 100755
7764 --with-lib-path=dir1:dir2... set default LIB_PATH 7729 --with-lib-path=dir1:dir2... set default LIB_PATH
7765 --with-sysroot=DIR Search for usr/lib et al within DIR. 7730 --with-sysroot=DIR Search for usr/lib et al within DIR.
7766 --with-system-zlib use installed libz 7731 --with-system-zlib use installed libz
7767@@ -5327,8 +5333,8 @@ esac 7732@@ -5368,8 +5374,8 @@ esac
7768 7733
7769 7734
7770 7735
@@ -7775,7 +7740,7 @@ index 2aeb3317b65..5ef46d31558 100755
7775 7740
7776 7741
7777 7742
7778@@ -5368,7 +5374,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7743@@ -5409,7 +5415,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7779 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7780 $as_echo_n "checking how to print strings... " >&6; } 7745 $as_echo_n "checking how to print strings... " >&6; }
7781 # Test print first, because it will be a builtin if present. 7746 # Test print first, because it will be a builtin if present.
@@ -7784,7 +7749,7 @@ index 2aeb3317b65..5ef46d31558 100755
7784 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7749 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7785 ECHO='print -r --' 7750 ECHO='print -r --'
7786 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7751 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7787@@ -6054,8 +6060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7752@@ -6096,8 +6102,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7788 # Try some XSI features 7753 # Try some XSI features
7789 xsi_shell=no 7754 xsi_shell=no
7790 ( _lt_dummy="a/b/c" 7755 ( _lt_dummy="a/b/c"
@@ -7795,7 +7760,7 @@ index 2aeb3317b65..5ef46d31558 100755
7795 && eval 'test $(( 1 + 1 )) -eq 2 \ 7760 && eval 'test $(( 1 + 1 )) -eq 2 \
7796 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7761 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7797 && xsi_shell=yes 7762 && xsi_shell=yes
7798@@ -6104,6 +6110,80 @@ esac 7763@@ -6146,6 +6152,80 @@ esac
7799 7764
7800 7765
7801 7766
@@ -7876,7 +7841,7 @@ index 2aeb3317b65..5ef46d31558 100755
7876 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7877 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7842 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7878 if ${lt_cv_ld_reload_flag+:} false; then : 7843 if ${lt_cv_ld_reload_flag+:} false; then :
7879@@ -6120,6 +6200,11 @@ case $reload_flag in 7844@@ -6162,6 +6242,11 @@ case $reload_flag in
7880 esac 7845 esac
7881 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7846 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7882 case $host_os in 7847 case $host_os in
@@ -7888,7 +7853,7 @@ index 2aeb3317b65..5ef46d31558 100755
7888 darwin*) 7853 darwin*)
7889 if test "$GCC" = yes; then 7854 if test "$GCC" = yes; then
7890 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7855 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7891@@ -6288,7 +6373,8 @@ mingw* | pw32*) 7856@@ -6330,7 +6415,8 @@ mingw* | pw32*)
7892 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7857 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7893 lt_cv_file_magic_cmd='func_win32_libid' 7858 lt_cv_file_magic_cmd='func_win32_libid'
7894 else 7859 else
@@ -7898,7 +7863,7 @@ index 2aeb3317b65..5ef46d31558 100755
7898 lt_cv_file_magic_cmd='$OBJDUMP -f' 7863 lt_cv_file_magic_cmd='$OBJDUMP -f'
7899 fi 7864 fi
7900 ;; 7865 ;;
7901@@ -6442,6 +6528,21 @@ esac 7866@@ -6484,6 +6570,21 @@ esac
7902 fi 7867 fi
7903 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7868 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7904 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7869 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7920,7 +7885,7 @@ index 2aeb3317b65..5ef46d31558 100755
7920 file_magic_cmd=$lt_cv_file_magic_cmd 7885 file_magic_cmd=$lt_cv_file_magic_cmd
7921 deplibs_check_method=$lt_cv_deplibs_check_method 7886 deplibs_check_method=$lt_cv_deplibs_check_method
7922 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7887 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7923@@ -6457,6 +6558,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7888@@ -6499,6 +6600,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7924 7889
7925 7890
7926 7891
@@ -8078,7 +8043,7 @@ index 2aeb3317b65..5ef46d31558 100755
8078 plugin_option= 8043 plugin_option=
8079 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 8044 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
8080 for plugin in $plugin_names; do 8045 for plugin in $plugin_names; do
8081@@ -6471,8 +6723,10 @@ for plugin in $plugin_names; do 8046@@ -6513,8 +6765,10 @@ for plugin in $plugin_names; do
8082 done 8047 done
8083 8048
8084 if test -n "$ac_tool_prefix"; then 8049 if test -n "$ac_tool_prefix"; then
@@ -8091,7 +8056,7 @@ index 2aeb3317b65..5ef46d31558 100755
8091 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8056 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8092 $as_echo_n "checking for $ac_word... " >&6; } 8057 $as_echo_n "checking for $ac_word... " >&6; }
8093 if ${ac_cv_prog_AR+:} false; then : 8058 if ${ac_cv_prog_AR+:} false; then :
8094@@ -6488,7 +6742,7 @@ do 8059@@ -6530,7 +6784,7 @@ do
8095 test -z "$as_dir" && as_dir=. 8060 test -z "$as_dir" && as_dir=.
8096 for ac_exec_ext in '' $ac_executable_extensions; do 8061 for ac_exec_ext in '' $ac_executable_extensions; do
8097 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8062 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8100,7 +8065,7 @@ index 2aeb3317b65..5ef46d31558 100755
8100 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8065 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8101 break 2 8066 break 2
8102 fi 8067 fi
8103@@ -6508,11 +6762,15 @@ $as_echo "no" >&6; } 8068@@ -6550,11 +6804,15 @@ $as_echo "no" >&6; }
8104 fi 8069 fi
8105 8070
8106 8071
@@ -8119,7 +8084,7 @@ index 2aeb3317b65..5ef46d31558 100755
8119 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8120 $as_echo_n "checking for $ac_word... " >&6; } 8085 $as_echo_n "checking for $ac_word... " >&6; }
8121 if ${ac_cv_prog_ac_ct_AR+:} false; then : 8086 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8122@@ -6528,7 +6786,7 @@ do 8087@@ -6570,7 +6828,7 @@ do
8123 test -z "$as_dir" && as_dir=. 8088 test -z "$as_dir" && as_dir=.
8124 for ac_exec_ext in '' $ac_executable_extensions; do 8089 for ac_exec_ext in '' $ac_executable_extensions; do
8125 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8090 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8128,7 +8093,7 @@ index 2aeb3317b65..5ef46d31558 100755
8128 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8093 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8129 break 2 8094 break 2
8130 fi 8095 fi
8131@@ -6547,6 +6805,10 @@ else 8096@@ -6589,6 +6847,10 @@ else
8132 $as_echo "no" >&6; } 8097 $as_echo "no" >&6; }
8133 fi 8098 fi
8134 8099
@@ -8139,7 +8104,7 @@ index 2aeb3317b65..5ef46d31558 100755
8139 if test "x$ac_ct_AR" = x; then 8104 if test "x$ac_ct_AR" = x; then
8140 AR="false" 8105 AR="false"
8141 else 8106 else
8142@@ -6558,25 +6820,19 @@ ac_tool_warned=yes ;; 8107@@ -6600,25 +6862,19 @@ ac_tool_warned=yes ;;
8143 esac 8108 esac
8144 AR=$ac_ct_AR 8109 AR=$ac_ct_AR
8145 fi 8110 fi
@@ -8174,7 +8139,7 @@ index 2aeb3317b65..5ef46d31558 100755
8174 8139
8175 8140
8176 8141
8177@@ -6588,6 +6844,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8142@@ -6630,6 +6886,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8178 8143
8179 8144
8180 8145
@@ -8239,7 +8204,7 @@ index 2aeb3317b65..5ef46d31558 100755
8239 if test -n "$ac_tool_prefix"; then 8204 if test -n "$ac_tool_prefix"; then
8240 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 8205 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8241 set dummy ${ac_tool_prefix}strip; ac_word=$2 8206 set dummy ${ac_tool_prefix}strip; ac_word=$2
8242@@ -6927,8 +7241,8 @@ esac 8207@@ -6969,8 +7283,8 @@ esac
8243 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8208 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8244 8209
8245 # Transform an extracted symbol line into symbol name and symbol address 8210 # Transform an extracted symbol line into symbol name and symbol address
@@ -8250,7 +8215,7 @@ index 2aeb3317b65..5ef46d31558 100755
8250 8215
8251 # Handle CRLF in mingw tool chain 8216 # Handle CRLF in mingw tool chain
8252 opt_cr= 8217 opt_cr=
8253@@ -6964,6 +7278,7 @@ for ac_symprfx in "" "_"; do 8218@@ -7006,6 +7320,7 @@ for ac_symprfx in "" "_"; do
8254 else 8219 else
8255 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8220 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8256 fi 8221 fi
@@ -8258,7 +8223,7 @@ index 2aeb3317b65..5ef46d31558 100755
8258 8223
8259 # Check to see that the pipe works correctly. 8224 # Check to see that the pipe works correctly.
8260 pipe_works=no 8225 pipe_works=no
8261@@ -7005,6 +7320,18 @@ _LT_EOF 8226@@ -7047,6 +7362,18 @@ _LT_EOF
8262 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8227 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8263 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8228 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8264 cat <<_LT_EOF > conftest.$ac_ext 8229 cat <<_LT_EOF > conftest.$ac_ext
@@ -8277,7 +8242,7 @@ index 2aeb3317b65..5ef46d31558 100755
8277 #ifdef __cplusplus 8242 #ifdef __cplusplus
8278 extern "C" { 8243 extern "C" {
8279 #endif 8244 #endif
8280@@ -7016,7 +7343,7 @@ _LT_EOF 8245@@ -7058,7 +7385,7 @@ _LT_EOF
8281 cat <<_LT_EOF >> conftest.$ac_ext 8246 cat <<_LT_EOF >> conftest.$ac_ext
8282 8247
8283 /* The mapping between symbol names and symbols. */ 8248 /* The mapping between symbol names and symbols. */
@@ -8286,7 +8251,7 @@ index 2aeb3317b65..5ef46d31558 100755
8286 const char *name; 8251 const char *name;
8287 void *address; 8252 void *address;
8288 } 8253 }
8289@@ -7042,8 +7369,8 @@ static const void *lt_preloaded_setup() { 8254@@ -7084,8 +7411,8 @@ static const void *lt_preloaded_setup() {
8290 _LT_EOF 8255 _LT_EOF
8291 # Now try linking the two files. 8256 # Now try linking the two files.
8292 mv conftest.$ac_objext conftstm.$ac_objext 8257 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8297,7 +8262,7 @@ index 2aeb3317b65..5ef46d31558 100755
8297 LIBS="conftstm.$ac_objext" 8262 LIBS="conftstm.$ac_objext"
8298 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8263 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8299 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8264 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8300@@ -7053,8 +7380,8 @@ _LT_EOF 8265@@ -7095,8 +7422,8 @@ _LT_EOF
8301 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8266 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8302 pipe_works=yes 8267 pipe_works=yes
8303 fi 8268 fi
@@ -8308,7 +8273,7 @@ index 2aeb3317b65..5ef46d31558 100755
8308 else 8273 else
8309 echo "cannot find nm_test_func in $nlist" >&5 8274 echo "cannot find nm_test_func in $nlist" >&5
8310 fi 8275 fi
8311@@ -7091,6 +7418,17 @@ else 8276@@ -7133,6 +7460,17 @@ else
8312 $as_echo "ok" >&6; } 8277 $as_echo "ok" >&6; }
8313 fi 8278 fi
8314 8279
@@ -8326,7 +8291,7 @@ index 2aeb3317b65..5ef46d31558 100755
8326 8291
8327 8292
8328 8293
8329@@ -7107,6 +7445,44 @@ fi 8294@@ -7149,6 +7487,44 @@ fi
8330 8295
8331 8296
8332 8297
@@ -8371,7 +8336,7 @@ index 2aeb3317b65..5ef46d31558 100755
8371 8336
8372 8337
8373 8338
8374@@ -7318,6 +7694,123 @@ esac 8339@@ -7360,6 +7736,123 @@ esac
8375 8340
8376 need_locks="$enable_libtool_lock" 8341 need_locks="$enable_libtool_lock"
8377 8342
@@ -8495,7 +8460,7 @@ index 2aeb3317b65..5ef46d31558 100755
8495 8460
8496 case $host_os in 8461 case $host_os in
8497 rhapsody* | darwin*) 8462 rhapsody* | darwin*)
8498@@ -7881,6 +8374,8 @@ _LT_EOF 8463@@ -7923,6 +8416,8 @@ _LT_EOF
8499 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8464 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8500 echo "$AR cru libconftest.a conftest.o" >&5 8465 echo "$AR cru libconftest.a conftest.o" >&5
8501 $AR cru libconftest.a conftest.o 2>&5 8466 $AR cru libconftest.a conftest.o 2>&5
@@ -8504,7 +8469,7 @@ index 2aeb3317b65..5ef46d31558 100755
8504 cat > conftest.c << _LT_EOF 8469 cat > conftest.c << _LT_EOF
8505 int main() { return 0;} 8470 int main() { return 0;}
8506 _LT_EOF 8471 _LT_EOF
8507@@ -7949,6 +8444,16 @@ done 8472@@ -7991,6 +8486,16 @@ done
8508 8473
8509 8474
8510 8475
@@ -8521,7 +8486,7 @@ index 2aeb3317b65..5ef46d31558 100755
8521 8486
8522 8487
8523 # Set options 8488 # Set options
8524@@ -8464,8 +8970,6 @@ fi 8489@@ -8506,8 +9011,6 @@ fi
8525 lt_prog_compiler_pic= 8490 lt_prog_compiler_pic=
8526 lt_prog_compiler_static= 8491 lt_prog_compiler_static=
8527 8492
@@ -8530,7 +8495,7 @@ index 2aeb3317b65..5ef46d31558 100755
8530 8495
8531 if test "$GCC" = yes; then 8496 if test "$GCC" = yes; then
8532 lt_prog_compiler_wl='-Wl,' 8497 lt_prog_compiler_wl='-Wl,'
8533@@ -8631,6 +9135,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8498@@ -8673,6 +9176,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8534 lt_prog_compiler_pic='--shared' 8499 lt_prog_compiler_pic='--shared'
8535 lt_prog_compiler_static='--static' 8500 lt_prog_compiler_static='--static'
8536 ;; 8501 ;;
@@ -8543,7 +8508,7 @@ index 2aeb3317b65..5ef46d31558 100755
8543 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8508 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8544 # Portland Group compilers (*not* the Pentium gcc compiler, 8509 # Portland Group compilers (*not* the Pentium gcc compiler,
8545 # which looks to be a dead project) 8510 # which looks to be a dead project)
8546@@ -8693,7 +9203,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8511@@ -8735,7 +9244,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8547 lt_prog_compiler_pic='-KPIC' 8512 lt_prog_compiler_pic='-KPIC'
8548 lt_prog_compiler_static='-Bstatic' 8513 lt_prog_compiler_static='-Bstatic'
8549 case $cc_basename in 8514 case $cc_basename in
@@ -8552,7 +8517,7 @@ index 2aeb3317b65..5ef46d31558 100755
8552 lt_prog_compiler_wl='-Qoption ld ';; 8517 lt_prog_compiler_wl='-Qoption ld ';;
8553 *) 8518 *)
8554 lt_prog_compiler_wl='-Wl,';; 8519 lt_prog_compiler_wl='-Wl,';;
8555@@ -8750,13 +9260,17 @@ case $host_os in 8520@@ -8792,13 +9301,17 @@ case $host_os in
8556 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8521 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8557 ;; 8522 ;;
8558 esac 8523 esac
@@ -8576,7 +8541,7 @@ index 2aeb3317b65..5ef46d31558 100755
8576 8541
8577 # 8542 #
8578 # Check to make sure the PIC flag actually works. 8543 # Check to make sure the PIC flag actually works.
8579@@ -8817,6 +9331,11 @@ fi 8544@@ -8859,6 +9372,11 @@ fi
8580 8545
8581 8546
8582 8547
@@ -8588,7 +8553,7 @@ index 2aeb3317b65..5ef46d31558 100755
8588 # 8553 #
8589 # Check to make sure the static flag actually works. 8554 # Check to make sure the static flag actually works.
8590 # 8555 #
8591@@ -9167,7 +9686,8 @@ _LT_EOF 8556@@ -9209,7 +9727,8 @@ _LT_EOF
8592 allow_undefined_flag=unsupported 8557 allow_undefined_flag=unsupported
8593 always_export_symbols=no 8558 always_export_symbols=no
8594 enable_shared_with_static_runtimes=yes 8559 enable_shared_with_static_runtimes=yes
@@ -8598,7 +8563,7 @@ index 2aeb3317b65..5ef46d31558 100755
8598 8563
8599 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8564 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8600 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8565 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8601@@ -9266,12 +9786,12 @@ _LT_EOF 8566@@ -9308,12 +9827,12 @@ _LT_EOF
8602 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8567 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8603 hardcode_libdir_flag_spec= 8568 hardcode_libdir_flag_spec=
8604 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8569 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8613,7 +8578,7 @@ index 2aeb3317b65..5ef46d31558 100755
8613 fi 8578 fi
8614 ;; 8579 ;;
8615 esac 8580 esac
8616@@ -9285,8 +9805,8 @@ _LT_EOF 8581@@ -9327,8 +9846,8 @@ _LT_EOF
8617 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8582 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8618 wlarc= 8583 wlarc=
8619 else 8584 else
@@ -8624,7 +8589,7 @@ index 2aeb3317b65..5ef46d31558 100755
8624 fi 8589 fi
8625 ;; 8590 ;;
8626 8591
8627@@ -9304,8 +9824,8 @@ _LT_EOF 8592@@ -9346,8 +9865,8 @@ _LT_EOF
8628 8593
8629 _LT_EOF 8594 _LT_EOF
8630 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8595 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8635,7 +8600,7 @@ index 2aeb3317b65..5ef46d31558 100755
8635 else 8600 else
8636 ld_shlibs=no 8601 ld_shlibs=no
8637 fi 8602 fi
8638@@ -9351,8 +9871,8 @@ _LT_EOF 8603@@ -9393,8 +9912,8 @@ _LT_EOF
8639 8604
8640 *) 8605 *)
8641 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8606 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8646,7 +8611,7 @@ index 2aeb3317b65..5ef46d31558 100755
8646 else 8611 else
8647 ld_shlibs=no 8612 ld_shlibs=no
8648 fi 8613 fi
8649@@ -9482,7 +10002,13 @@ _LT_EOF 8614@@ -9524,7 +10043,13 @@ _LT_EOF
8650 allow_undefined_flag='-berok' 8615 allow_undefined_flag='-berok'
8651 # Determine the default libpath from the value encoded in an 8616 # Determine the default libpath from the value encoded in an
8652 # empty executable. 8617 # empty executable.
@@ -8661,7 +8626,7 @@ index 2aeb3317b65..5ef46d31558 100755
8661 /* end confdefs.h. */ 8626 /* end confdefs.h. */
8662 8627
8663 int 8628 int
8664@@ -9495,22 +10021,29 @@ main () 8629@@ -9537,22 +10062,29 @@ main ()
8665 _ACEOF 8630 _ACEOF
8666 if ac_fn_c_try_link "$LINENO"; then : 8631 if ac_fn_c_try_link "$LINENO"; then :
8667 8632
@@ -8704,7 +8669,7 @@ index 2aeb3317b65..5ef46d31558 100755
8704 8669
8705 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8670 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8706 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 8671 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
8707@@ -9522,7 +10055,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8672@@ -9564,7 +10096,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8708 else 8673 else
8709 # Determine the default libpath from the value encoded in an 8674 # Determine the default libpath from the value encoded in an
8710 # empty executable. 8675 # empty executable.
@@ -8719,7 +8684,7 @@ index 2aeb3317b65..5ef46d31558 100755
8719 /* end confdefs.h. */ 8684 /* end confdefs.h. */
8720 8685
8721 int 8686 int
8722@@ -9535,22 +10074,29 @@ main () 8687@@ -9577,22 +10115,29 @@ main ()
8723 _ACEOF 8688 _ACEOF
8724 if ac_fn_c_try_link "$LINENO"; then : 8689 if ac_fn_c_try_link "$LINENO"; then :
8725 8690
@@ -8762,7 +8727,7 @@ index 2aeb3317b65..5ef46d31558 100755
8762 8727
8763 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8728 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8764 # Warning - without using the other run time loading flags, 8729 # Warning - without using the other run time loading flags,
8765@@ -9594,21 +10140,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8730@@ -9636,21 +10181,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8766 # When not using gcc, we currently assume that we are using 8731 # When not using gcc, we currently assume that we are using
8767 # Microsoft Visual C++. 8732 # Microsoft Visual C++.
8768 # hardcode_libdir_flag_spec is actually meaningless, as there is 8733 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8842,7 +8807,7 @@ index 2aeb3317b65..5ef46d31558 100755
8842 ;; 8807 ;;
8843 8808
8844 darwin* | rhapsody*) 8809 darwin* | rhapsody*)
8845@@ -9669,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8810@@ -9711,7 +10299,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8846 8811
8847 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8812 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8848 freebsd* | dragonfly*) 8813 freebsd* | dragonfly*)
@@ -8851,7 +8816,7 @@ index 2aeb3317b65..5ef46d31558 100755
8851 hardcode_libdir_flag_spec='-R$libdir' 8816 hardcode_libdir_flag_spec='-R$libdir'
8852 hardcode_direct=yes 8817 hardcode_direct=yes
8853 hardcode_shlibpath_var=no 8818 hardcode_shlibpath_var=no
8854@@ -9677,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8819@@ -9719,7 +10307,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8855 8820
8856 hpux9*) 8821 hpux9*)
8857 if test "$GCC" = yes; then 8822 if test "$GCC" = yes; then
@@ -8860,7 +8825,7 @@ index 2aeb3317b65..5ef46d31558 100755
8860 else 8825 else
8861 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 8826 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8862 fi 8827 fi
8863@@ -9693,7 +10282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8828@@ -9735,7 +10323,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8864 8829
8865 hpux10*) 8830 hpux10*)
8866 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8831 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8869,7 +8834,7 @@ index 2aeb3317b65..5ef46d31558 100755
8869 else 8834 else
8870 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8835 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8871 fi 8836 fi
8872@@ -9717,10 +10306,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8837@@ -9759,10 +10347,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8873 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8838 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8874 ;; 8839 ;;
8875 ia64*) 8840 ia64*)
@@ -8882,7 +8847,7 @@ index 2aeb3317b65..5ef46d31558 100755
8882 ;; 8847 ;;
8883 esac 8848 esac
8884 else 8849 else
8885@@ -9799,23 +10388,36 @@ fi 8850@@ -9841,23 +10429,36 @@ fi
8886 8851
8887 irix5* | irix6* | nonstopux*) 8852 irix5* | irix6* | nonstopux*)
8888 if test "$GCC" = yes; then 8853 if test "$GCC" = yes; then
@@ -8927,7 +8892,7 @@ index 2aeb3317b65..5ef46d31558 100755
8927 else 8892 else
8928 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 8893 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
8929 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 8894 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
8930@@ -9900,7 +10502,7 @@ rm -f core conftest.err conftest.$ac_objext \ 8895@@ -9942,7 +10543,7 @@ rm -f core conftest.err conftest.$ac_objext \
8931 osf4* | osf5*) # as osf3* with the addition of -msym flag 8896 osf4* | osf5*) # as osf3* with the addition of -msym flag
8932 if test "$GCC" = yes; then 8897 if test "$GCC" = yes; then
8933 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8898 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8936,7 +8901,7 @@ index 2aeb3317b65..5ef46d31558 100755
8936 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8901 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8937 else 8902 else
8938 allow_undefined_flag=' -expect_unresolved \*' 8903 allow_undefined_flag=' -expect_unresolved \*'
8939@@ -9919,9 +10521,9 @@ rm -f core conftest.err conftest.$ac_objext \ 8904@@ -9961,9 +10562,9 @@ rm -f core conftest.err conftest.$ac_objext \
8940 no_undefined_flag=' -z defs' 8905 no_undefined_flag=' -z defs'
8941 if test "$GCC" = yes; then 8906 if test "$GCC" = yes; then
8942 wlarc='${wl}' 8907 wlarc='${wl}'
@@ -8948,7 +8913,7 @@ index 2aeb3317b65..5ef46d31558 100755
8948 else 8913 else
8949 case `$CC -V 2>&1` in 8914 case `$CC -V 2>&1` in
8950 *"Compilers 5.0"*) 8915 *"Compilers 5.0"*)
8951@@ -10497,8 +11099,9 @@ cygwin* | mingw* | pw32* | cegcc*) 8916@@ -10539,8 +11140,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8952 need_version=no 8917 need_version=no
8953 need_lib_prefix=no 8918 need_lib_prefix=no
8954 8919
@@ -8960,7 +8925,7 @@ index 2aeb3317b65..5ef46d31558 100755
8960 library_names_spec='$libname.dll.a' 8925 library_names_spec='$libname.dll.a'
8961 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8926 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8962 postinstall_cmds='base_file=`basename \${file}`~ 8927 postinstall_cmds='base_file=`basename \${file}`~
8963@@ -10531,13 +11134,71 @@ cygwin* | mingw* | pw32* | cegcc*) 8928@@ -10573,13 +11175,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8964 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8929 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8965 ;; 8930 ;;
8966 esac 8931 esac
@@ -9033,25 +8998,16 @@ index 2aeb3317b65..5ef46d31558 100755
9033 # FIXME: first we should search . and the directory the executable is in 8998 # FIXME: first we should search . and the directory the executable is in
9034 shlibpath_var=PATH 8999 shlibpath_var=PATH
9035 ;; 9000 ;;
9036@@ -10619,7 +11280,7 @@ haiku*) 9001@@ -11457,7 +12117,7 @@ else
9037 soname_spec='${libname}${release}${shared_ext}$major'
9038 shlibpath_var=LIBRARY_PATH
9039 shlibpath_overrides_runpath=yes
9040- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9041+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9042 hardcode_into_libs=yes
9043 ;;
9044
9045@@ -11415,7 +12076,7 @@ else
9046 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9002 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9047 lt_status=$lt_dlunknown 9003 lt_status=$lt_dlunknown
9048 cat > conftest.$ac_ext <<_LT_EOF 9004 cat > conftest.$ac_ext <<_LT_EOF
9049-#line 11415 "configure" 9005-#line 11457 "configure"
9050+#line $LINENO "configure" 9006+#line $LINENO "configure"
9051 #include "confdefs.h" 9007 #include "confdefs.h"
9052 9008
9053 #if HAVE_DLFCN_H 9009 #if HAVE_DLFCN_H
9054@@ -11459,10 +12120,10 @@ else 9010@@ -11501,10 +12161,10 @@ else
9055 /* When -fvisbility=hidden is used, assume the code has been annotated 9011 /* When -fvisbility=hidden is used, assume the code has been annotated
9056 correspondingly for the symbols needed. */ 9012 correspondingly for the symbols needed. */
9057 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9013 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9064,16 +9020,16 @@ index 2aeb3317b65..5ef46d31558 100755
9064 int main () 9020 int main ()
9065 { 9021 {
9066 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9022 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9067@@ -11521,7 +12182,7 @@ else 9023@@ -11563,7 +12223,7 @@ else
9068 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9024 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9069 lt_status=$lt_dlunknown 9025 lt_status=$lt_dlunknown
9070 cat > conftest.$ac_ext <<_LT_EOF 9026 cat > conftest.$ac_ext <<_LT_EOF
9071-#line 11521 "configure" 9027-#line 11563 "configure"
9072+#line $LINENO "configure" 9028+#line $LINENO "configure"
9073 #include "confdefs.h" 9029 #include "confdefs.h"
9074 9030
9075 #if HAVE_DLFCN_H 9031 #if HAVE_DLFCN_H
9076@@ -11565,10 +12226,10 @@ else 9032@@ -11607,10 +12267,10 @@ else
9077 /* When -fvisbility=hidden is used, assume the code has been annotated 9033 /* When -fvisbility=hidden is used, assume the code has been annotated
9078 correspondingly for the symbols needed. */ 9034 correspondingly for the symbols needed. */
9079 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9035 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9086,7 +9042,7 @@ index 2aeb3317b65..5ef46d31558 100755
9086 int main () 9042 int main ()
9087 { 9043 {
9088 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9044 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9089@@ -11960,6 +12621,7 @@ $RM -r conftest* 9045@@ -12002,6 +12662,7 @@ $RM -r conftest*
9090 9046
9091 # Allow CC to be a program name with arguments. 9047 # Allow CC to be a program name with arguments.
9092 lt_save_CC=$CC 9048 lt_save_CC=$CC
@@ -9094,7 +9050,7 @@ index 2aeb3317b65..5ef46d31558 100755
9094 lt_save_LD=$LD 9050 lt_save_LD=$LD
9095 lt_save_GCC=$GCC 9051 lt_save_GCC=$GCC
9096 GCC=$GXX 9052 GCC=$GXX
9097@@ -11977,6 +12639,7 @@ $RM -r conftest* 9053@@ -12019,6 +12680,7 @@ $RM -r conftest*
9098 fi 9054 fi
9099 test -z "${LDCXX+set}" || LD=$LDCXX 9055 test -z "${LDCXX+set}" || LD=$LDCXX
9100 CC=${CXX-"c++"} 9056 CC=${CXX-"c++"}
@@ -9102,7 +9058,7 @@ index 2aeb3317b65..5ef46d31558 100755
9102 compiler=$CC 9058 compiler=$CC
9103 compiler_CXX=$CC 9059 compiler_CXX=$CC
9104 for cc_temp in $compiler""; do 9060 for cc_temp in $compiler""; do
9105@@ -12259,7 +12922,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9061@@ -12301,7 +12963,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9106 allow_undefined_flag_CXX='-berok' 9062 allow_undefined_flag_CXX='-berok'
9107 # Determine the default libpath from the value encoded in an empty 9063 # Determine the default libpath from the value encoded in an empty
9108 # executable. 9064 # executable.
@@ -9117,7 +9073,7 @@ index 2aeb3317b65..5ef46d31558 100755
9117 /* end confdefs.h. */ 9073 /* end confdefs.h. */
9118 9074
9119 int 9075 int
9120@@ -12272,22 +12941,29 @@ main () 9076@@ -12314,22 +12982,29 @@ main ()
9121 _ACEOF 9077 _ACEOF
9122 if ac_fn_cxx_try_link "$LINENO"; then : 9078 if ac_fn_cxx_try_link "$LINENO"; then :
9123 9079
@@ -9160,7 +9116,7 @@ index 2aeb3317b65..5ef46d31558 100755
9160 9116
9161 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9117 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9162 9118
9163@@ -12300,7 +12976,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9119@@ -12342,7 +13017,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9164 else 9120 else
9165 # Determine the default libpath from the value encoded in an 9121 # Determine the default libpath from the value encoded in an
9166 # empty executable. 9122 # empty executable.
@@ -9175,7 +9131,7 @@ index 2aeb3317b65..5ef46d31558 100755
9175 /* end confdefs.h. */ 9131 /* end confdefs.h. */
9176 9132
9177 int 9133 int
9178@@ -12313,22 +12995,29 @@ main () 9134@@ -12355,22 +13036,29 @@ main ()
9179 _ACEOF 9135 _ACEOF
9180 if ac_fn_cxx_try_link "$LINENO"; then : 9136 if ac_fn_cxx_try_link "$LINENO"; then :
9181 9137
@@ -9218,7 +9174,7 @@ index 2aeb3317b65..5ef46d31558 100755
9218 9174
9219 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9175 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9220 # Warning - without using the other run time loading flags, 9176 # Warning - without using the other run time loading flags,
9221@@ -12371,29 +13060,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9177@@ -12413,29 +13101,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9222 ;; 9178 ;;
9223 9179
9224 cygwin* | mingw* | pw32* | cegcc*) 9180 cygwin* | mingw* | pw32* | cegcc*)
@@ -9317,7 +9273,7 @@ index 2aeb3317b65..5ef46d31558 100755
9317 darwin* | rhapsody*) 9273 darwin* | rhapsody*)
9318 9274
9319 9275
9320@@ -12499,7 +13234,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9276@@ -12541,7 +13275,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9321 ;; 9277 ;;
9322 *) 9278 *)
9323 if test "$GXX" = yes; then 9279 if test "$GXX" = yes; then
@@ -9326,7 +9282,7 @@ index 2aeb3317b65..5ef46d31558 100755
9326 else 9282 else
9327 # FIXME: insert proper C++ library support 9283 # FIXME: insert proper C++ library support
9328 ld_shlibs_CXX=no 9284 ld_shlibs_CXX=no
9329@@ -12570,10 +13305,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9285@@ -12612,10 +13346,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9330 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9286 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9331 ;; 9287 ;;
9332 ia64*) 9288 ia64*)
@@ -9339,7 +9295,7 @@ index 2aeb3317b65..5ef46d31558 100755
9339 ;; 9295 ;;
9340 esac 9296 esac
9341 fi 9297 fi
9342@@ -12614,9 +13349,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9298@@ -12656,9 +13390,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9343 *) 9299 *)
9344 if test "$GXX" = yes; then 9300 if test "$GXX" = yes; then
9345 if test "$with_gnu_ld" = no; then 9301 if test "$with_gnu_ld" = no; then
@@ -9351,7 +9307,7 @@ index 2aeb3317b65..5ef46d31558 100755
9351 fi 9307 fi
9352 fi 9308 fi
9353 link_all_deplibs_CXX=yes 9309 link_all_deplibs_CXX=yes
9354@@ -12686,20 +13421,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9310@@ -12728,20 +13462,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9355 prelink_cmds_CXX='tpldir=Template.dir~ 9311 prelink_cmds_CXX='tpldir=Template.dir~
9356 rm -rf $tpldir~ 9312 rm -rf $tpldir~
9357 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9313 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9376,7 +9332,7 @@ index 2aeb3317b65..5ef46d31558 100755
9376 ;; 9332 ;;
9377 *) # Version 6 and above use weak symbols 9333 *) # Version 6 and above use weak symbols
9378 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9334 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9379@@ -12894,7 +13629,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9335@@ -12936,7 +13670,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9380 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 9336 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9381 ;; 9337 ;;
9382 *) 9338 *)
@@ -9385,7 +9341,7 @@ index 2aeb3317b65..5ef46d31558 100755
9385 ;; 9341 ;;
9386 esac 9342 esac
9387 9343
9388@@ -12940,7 +13675,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9344@@ -12982,7 +13716,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9389 9345
9390 solaris*) 9346 solaris*)
9391 case $cc_basename in 9347 case $cc_basename in
@@ -9394,7 +9350,7 @@ index 2aeb3317b65..5ef46d31558 100755
9394 # Sun C++ 4.2, 5.x and Centerline C++ 9350 # Sun C++ 4.2, 5.x and Centerline C++
9395 archive_cmds_need_lc_CXX=yes 9351 archive_cmds_need_lc_CXX=yes
9396 no_undefined_flag_CXX=' -zdefs' 9352 no_undefined_flag_CXX=' -zdefs'
9397@@ -12981,9 +13716,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9353@@ -13023,9 +13757,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9398 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9354 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9399 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9355 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9400 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9356 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9406,7 +9362,7 @@ index 2aeb3317b65..5ef46d31558 100755
9406 9362
9407 # Commands to make compiler produce verbose output that lists 9363 # Commands to make compiler produce verbose output that lists
9408 # what "hidden" libraries, object files and flags are used when 9364 # what "hidden" libraries, object files and flags are used when
9409@@ -13118,6 +13853,13 @@ private: 9365@@ -13160,6 +13894,13 @@ private:
9410 }; 9366 };
9411 _LT_EOF 9367 _LT_EOF
9412 9368
@@ -9420,7 +9376,7 @@ index 2aeb3317b65..5ef46d31558 100755
9420 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9376 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9421 (eval $ac_compile) 2>&5 9377 (eval $ac_compile) 2>&5
9422 ac_status=$? 9378 ac_status=$?
9423@@ -13131,7 +13873,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9379@@ -13173,7 +13914,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9424 pre_test_object_deps_done=no 9380 pre_test_object_deps_done=no
9425 9381
9426 for p in `eval "$output_verbose_link_cmd"`; do 9382 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9429,7 +9385,7 @@ index 2aeb3317b65..5ef46d31558 100755
9429 9385
9430 -L* | -R* | -l*) 9386 -L* | -R* | -l*)
9431 # Some compilers place space between "-{L,R}" and the path. 9387 # Some compilers place space between "-{L,R}" and the path.
9432@@ -13140,13 +13882,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9388@@ -13182,13 +13923,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9433 test $p = "-R"; then 9389 test $p = "-R"; then
9434 prev=$p 9390 prev=$p
9435 continue 9391 continue
@@ -9456,7 +9412,7 @@ index 2aeb3317b65..5ef46d31558 100755
9456 # Internal compiler library paths should come after those 9412 # Internal compiler library paths should come after those
9457 # provided the user. The postdeps already come after the 9413 # provided the user. The postdeps already come after the
9458 # user supplied libs so there is no need to process them. 9414 # user supplied libs so there is no need to process them.
9459@@ -13166,8 +13917,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9415@@ -13208,8 +13958,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9460 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9416 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9461 fi 9417 fi
9462 fi 9418 fi
@@ -9467,7 +9423,7 @@ index 2aeb3317b65..5ef46d31558 100755
9467 *.$objext) 9423 *.$objext)
9468 # This assumes that the test object file only shows up 9424 # This assumes that the test object file only shows up
9469 # once in the compiler output. 9425 # once in the compiler output.
9470@@ -13203,6 +13956,7 @@ else 9426@@ -13245,6 +13997,7 @@ else
9471 fi 9427 fi
9472 9428
9473 $RM -f confest.$objext 9429 $RM -f confest.$objext
@@ -9475,7 +9431,7 @@ index 2aeb3317b65..5ef46d31558 100755
9475 9431
9476 # PORTME: override above test on systems where it is broken 9432 # PORTME: override above test on systems where it is broken
9477 case $host_os in 9433 case $host_os in
9478@@ -13238,7 +13992,7 @@ linux*) 9434@@ -13280,7 +14033,7 @@ linux*)
9479 9435
9480 solaris*) 9436 solaris*)
9481 case $cc_basename in 9437 case $cc_basename in
@@ -9484,7 +9440,7 @@ index 2aeb3317b65..5ef46d31558 100755
9484 # The more standards-conforming stlport4 library is 9440 # The more standards-conforming stlport4 library is
9485 # incompatible with the Cstd library. Avoid specifying 9441 # incompatible with the Cstd library. Avoid specifying
9486 # it if it's in CXXFLAGS. Ignore libCrun as 9442 # it if it's in CXXFLAGS. Ignore libCrun as
9487@@ -13303,8 +14057,6 @@ fi 9443@@ -13345,8 +14098,6 @@ fi
9488 lt_prog_compiler_pic_CXX= 9444 lt_prog_compiler_pic_CXX=
9489 lt_prog_compiler_static_CXX= 9445 lt_prog_compiler_static_CXX=
9490 9446
@@ -9493,7 +9449,7 @@ index 2aeb3317b65..5ef46d31558 100755
9493 9449
9494 # C++ specific cases for pic, static, wl, etc. 9450 # C++ specific cases for pic, static, wl, etc.
9495 if test "$GXX" = yes; then 9451 if test "$GXX" = yes; then
9496@@ -13409,6 +14161,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9452@@ -13451,6 +14202,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9497 ;; 9453 ;;
9498 esac 9454 esac
9499 ;; 9455 ;;
@@ -9505,7 +9461,7 @@ index 2aeb3317b65..5ef46d31558 100755
9505 dgux*) 9461 dgux*)
9506 case $cc_basename in 9462 case $cc_basename in
9507 ec++*) 9463 ec++*)
9508@@ -13561,7 +14318,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9464@@ -13603,7 +14359,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9509 ;; 9465 ;;
9510 solaris*) 9466 solaris*)
9511 case $cc_basename in 9467 case $cc_basename in
@@ -9514,7 +9470,7 @@ index 2aeb3317b65..5ef46d31558 100755
9514 # Sun C++ 4.2, 5.x and Centerline C++ 9470 # Sun C++ 4.2, 5.x and Centerline C++
9515 lt_prog_compiler_pic_CXX='-KPIC' 9471 lt_prog_compiler_pic_CXX='-KPIC'
9516 lt_prog_compiler_static_CXX='-Bstatic' 9472 lt_prog_compiler_static_CXX='-Bstatic'
9517@@ -13626,10 +14383,17 @@ case $host_os in 9473@@ -13668,10 +14424,17 @@ case $host_os in
9518 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9474 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9519 ;; 9475 ;;
9520 esac 9476 esac
@@ -9535,7 +9491,7 @@ index 2aeb3317b65..5ef46d31558 100755
9535 9491
9536 # 9492 #
9537 # Check to make sure the PIC flag actually works. 9493 # Check to make sure the PIC flag actually works.
9538@@ -13687,6 +14451,8 @@ fi 9494@@ -13729,6 +14492,8 @@ fi
9539 9495
9540 9496
9541 9497
@@ -9544,7 +9500,7 @@ index 2aeb3317b65..5ef46d31558 100755
9544 # 9500 #
9545 # Check to make sure the static flag actually works. 9501 # Check to make sure the static flag actually works.
9546 # 9502 #
9547@@ -13864,6 +14630,7 @@ fi 9503@@ -13906,6 +14671,7 @@ fi
9548 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9504 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9549 9505
9550 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9506 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9552,7 +9508,7 @@ index 2aeb3317b65..5ef46d31558 100755
9552 case $host_os in 9508 case $host_os in
9553 aix[4-9]*) 9509 aix[4-9]*)
9554 # If we're using GNU nm, then we don't want the "-C" option. 9510 # If we're using GNU nm, then we don't want the "-C" option.
9555@@ -13878,15 +14645,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9511@@ -13920,15 +14686,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9556 ;; 9512 ;;
9557 pw32*) 9513 pw32*)
9558 export_symbols_cmds_CXX="$ltdll_cmds" 9514 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9578,7 +9534,7 @@ index 2aeb3317b65..5ef46d31558 100755
9578 9534
9579 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9535 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9580 $as_echo "$ld_shlibs_CXX" >&6; } 9536 $as_echo "$ld_shlibs_CXX" >&6; }
9581@@ -14149,8 +14921,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9537@@ -14191,8 +14962,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9582 need_version=no 9538 need_version=no
9583 need_lib_prefix=no 9539 need_lib_prefix=no
9584 9540
@@ -9590,7 +9546,7 @@ index 2aeb3317b65..5ef46d31558 100755
9590 library_names_spec='$libname.dll.a' 9546 library_names_spec='$libname.dll.a'
9591 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9547 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9592 postinstall_cmds='base_file=`basename \${file}`~ 9548 postinstall_cmds='base_file=`basename \${file}`~
9593@@ -14182,13 +14955,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9549@@ -14224,13 +14996,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9594 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9550 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9595 ;; 9551 ;;
9596 esac 9552 esac
@@ -9663,16 +9619,7 @@ index 2aeb3317b65..5ef46d31558 100755
9663 # FIXME: first we should search . and the directory the executable is in 9619 # FIXME: first we should search . and the directory the executable is in
9664 shlibpath_var=PATH 9620 shlibpath_var=PATH
9665 ;; 9621 ;;
9666@@ -14269,7 +15100,7 @@ haiku*) 9622@@ -14770,6 +15600,7 @@ fi
9667 soname_spec='${libname}${release}${shared_ext}$major'
9668 shlibpath_var=LIBRARY_PATH
9669 shlibpath_overrides_runpath=yes
9670- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9671+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9672 hardcode_into_libs=yes
9673 ;;
9674
9675@@ -14728,6 +15559,7 @@ fi
9676 fi # test -n "$compiler" 9623 fi # test -n "$compiler"
9677 9624
9678 CC=$lt_save_CC 9625 CC=$lt_save_CC
@@ -9680,7 +9627,7 @@ index 2aeb3317b65..5ef46d31558 100755
9680 LDCXX=$LD 9627 LDCXX=$LD
9681 LD=$lt_save_LD 9628 LD=$lt_save_LD
9682 GCC=$lt_save_GCC 9629 GCC=$lt_save_GCC
9683@@ -17770,13 +18602,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9630@@ -17830,13 +18661,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9684 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9631 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9685 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9632 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9686 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9633 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9701,7 +9648,7 @@ index 2aeb3317b65..5ef46d31558 100755
9701 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9648 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9702 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9649 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9703 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9650 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9704@@ -17791,14 +18630,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9651@@ -17851,14 +18689,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9705 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9652 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9706 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9653 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9707 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 9654 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -9720,7 +9667,7 @@ index 2aeb3317b65..5ef46d31558 100755
9720 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9667 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9721 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9668 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9722 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9669 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9723@@ -17831,12 +18673,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9670@@ -17891,12 +18732,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9724 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9671 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9725 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9672 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9726 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9673 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9734,7 +9681,7 @@ index 2aeb3317b65..5ef46d31558 100755
9734 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9681 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9735 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9682 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9736 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9683 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9737@@ -17875,8 +18717,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9684@@ -17935,8 +18776,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9738 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9685 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9739 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9686 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9740 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9687 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9744,7 +9691,7 @@ index 2aeb3317b65..5ef46d31558 100755
9744 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9691 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9745 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9692 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9746 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9693 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9747@@ -17903,12 +18745,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9694@@ -17963,12 +18804,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9748 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9695 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9749 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9696 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9750 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9697 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9758,7 +9705,7 @@ index 2aeb3317b65..5ef46d31558 100755
9758 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9705 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9759 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9706 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9760 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9707 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9761@@ -17946,8 +18788,13 @@ reload_flag \ 9708@@ -18006,8 +18847,13 @@ reload_flag \
9762 OBJDUMP \ 9709 OBJDUMP \
9763 deplibs_check_method \ 9710 deplibs_check_method \
9764 file_magic_cmd \ 9711 file_magic_cmd \
@@ -9772,7 +9719,7 @@ index 2aeb3317b65..5ef46d31558 100755
9772 STRIP \ 9719 STRIP \
9773 RANLIB \ 9720 RANLIB \
9774 CC \ 9721 CC \
9775@@ -17957,12 +18804,14 @@ lt_cv_sys_global_symbol_pipe \ 9722@@ -18017,12 +18863,14 @@ lt_cv_sys_global_symbol_pipe \
9776 lt_cv_sys_global_symbol_to_cdecl \ 9723 lt_cv_sys_global_symbol_to_cdecl \
9777 lt_cv_sys_global_symbol_to_c_name_address \ 9724 lt_cv_sys_global_symbol_to_c_name_address \
9778 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9725 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9788,7 +9735,7 @@ index 2aeb3317b65..5ef46d31558 100755
9788 DSYMUTIL \ 9735 DSYMUTIL \
9789 NMEDIT \ 9736 NMEDIT \
9790 LIPO \ 9737 LIPO \
9791@@ -17978,7 +18827,6 @@ no_undefined_flag \ 9738@@ -18038,7 +18886,6 @@ no_undefined_flag \
9792 hardcode_libdir_flag_spec \ 9739 hardcode_libdir_flag_spec \
9793 hardcode_libdir_flag_spec_ld \ 9740 hardcode_libdir_flag_spec_ld \
9794 hardcode_libdir_separator \ 9741 hardcode_libdir_separator \
@@ -9796,7 +9743,7 @@ index 2aeb3317b65..5ef46d31558 100755
9796 exclude_expsyms \ 9743 exclude_expsyms \
9797 include_expsyms \ 9744 include_expsyms \
9798 file_list_spec \ 9745 file_list_spec \
9799@@ -18000,8 +18848,8 @@ LD_CXX \ 9746@@ -18060,8 +18907,8 @@ LD_CXX \
9800 reload_flag_CXX \ 9747 reload_flag_CXX \
9801 compiler_CXX \ 9748 compiler_CXX \
9802 lt_prog_compiler_no_builtin_flag_CXX \ 9749 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9806,7 +9753,7 @@ index 2aeb3317b65..5ef46d31558 100755
9806 lt_prog_compiler_static_CXX \ 9753 lt_prog_compiler_static_CXX \
9807 lt_cv_prog_compiler_c_o_CXX \ 9754 lt_cv_prog_compiler_c_o_CXX \
9808 export_dynamic_flag_spec_CXX \ 9755 export_dynamic_flag_spec_CXX \
9809@@ -18013,7 +18861,6 @@ no_undefined_flag_CXX \ 9756@@ -18073,7 +18920,6 @@ no_undefined_flag_CXX \
9810 hardcode_libdir_flag_spec_CXX \ 9757 hardcode_libdir_flag_spec_CXX \
9811 hardcode_libdir_flag_spec_ld_CXX \ 9758 hardcode_libdir_flag_spec_ld_CXX \
9812 hardcode_libdir_separator_CXX \ 9759 hardcode_libdir_separator_CXX \
@@ -9814,7 +9761,7 @@ index 2aeb3317b65..5ef46d31558 100755
9814 exclude_expsyms_CXX \ 9761 exclude_expsyms_CXX \
9815 include_expsyms_CXX \ 9762 include_expsyms_CXX \
9816 file_list_spec_CXX \ 9763 file_list_spec_CXX \
9817@@ -18047,6 +18894,7 @@ module_cmds \ 9764@@ -18107,6 +18953,7 @@ module_cmds \
9818 module_expsym_cmds \ 9765 module_expsym_cmds \
9819 export_symbols_cmds \ 9766 export_symbols_cmds \
9820 prelink_cmds \ 9767 prelink_cmds \
@@ -9822,7 +9769,7 @@ index 2aeb3317b65..5ef46d31558 100755
9822 postinstall_cmds \ 9769 postinstall_cmds \
9823 postuninstall_cmds \ 9770 postuninstall_cmds \
9824 finish_cmds \ 9771 finish_cmds \
9825@@ -18061,7 +18909,8 @@ archive_expsym_cmds_CXX \ 9772@@ -18121,7 +18968,8 @@ archive_expsym_cmds_CXX \
9826 module_cmds_CXX \ 9773 module_cmds_CXX \
9827 module_expsym_cmds_CXX \ 9774 module_expsym_cmds_CXX \
9828 export_symbols_cmds_CXX \ 9775 export_symbols_cmds_CXX \
@@ -9832,7 +9779,7 @@ index 2aeb3317b65..5ef46d31558 100755
9832 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9779 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9833 *[\\\\\\\`\\"\\\$]*) 9780 *[\\\\\\\`\\"\\\$]*)
9834 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9781 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9835@@ -18826,7 +19675,8 @@ $as_echo X"$file" | 9782@@ -18886,7 +19734,8 @@ $as_echo X"$file" |
9836 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9783 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9837 # 9784 #
9838 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9785 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9842,7 +9789,7 @@ index 2aeb3317b65..5ef46d31558 100755
9842 # Written by Gordon Matzigkeit, 1996 9789 # Written by Gordon Matzigkeit, 1996
9843 # 9790 #
9844 # This file is part of GNU Libtool. 9791 # This file is part of GNU Libtool.
9845@@ -18929,19 +19779,42 @@ SP2NL=$lt_lt_SP2NL 9792@@ -18989,19 +19838,42 @@ SP2NL=$lt_lt_SP2NL
9846 # turn newlines into spaces. 9793 # turn newlines into spaces.
9847 NL2SP=$lt_lt_NL2SP 9794 NL2SP=$lt_lt_NL2SP
9848 9795
@@ -9886,7 +9833,7 @@ index 2aeb3317b65..5ef46d31558 100755
9886 # A symbol stripping program. 9833 # A symbol stripping program.
9887 STRIP=$lt_STRIP 9834 STRIP=$lt_STRIP
9888 9835
9889@@ -18971,6 +19844,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9836@@ -19031,6 +19903,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9890 # Transform the output of nm in a C name address pair when lib prefix is needed. 9837 # Transform the output of nm in a C name address pair when lib prefix is needed.
9891 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9838 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9892 9839
@@ -9899,7 +9846,7 @@ index 2aeb3317b65..5ef46d31558 100755
9899 # The name of the directory that contains temporary libtool files. 9846 # The name of the directory that contains temporary libtool files.
9900 objdir=$objdir 9847 objdir=$objdir
9901 9848
9902@@ -18980,6 +19859,9 @@ MAGIC_CMD=$MAGIC_CMD 9849@@ -19040,6 +19918,9 @@ MAGIC_CMD=$MAGIC_CMD
9903 # Must we lock files when doing compilation? 9850 # Must we lock files when doing compilation?
9904 need_locks=$lt_need_locks 9851 need_locks=$lt_need_locks
9905 9852
@@ -9909,7 +9856,7 @@ index 2aeb3317b65..5ef46d31558 100755
9909 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9856 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9910 DSYMUTIL=$lt_DSYMUTIL 9857 DSYMUTIL=$lt_DSYMUTIL
9911 9858
9912@@ -19094,12 +19976,12 @@ with_gcc=$GCC 9859@@ -19154,12 +20035,12 @@ with_gcc=$GCC
9913 # Compiler flag to turn off builtin functions. 9860 # Compiler flag to turn off builtin functions.
9914 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9861 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9915 9862
@@ -9925,7 +9872,7 @@ index 2aeb3317b65..5ef46d31558 100755
9925 # Compiler flag to prevent dynamic linking. 9872 # Compiler flag to prevent dynamic linking.
9926 link_static_flag=$lt_lt_prog_compiler_static 9873 link_static_flag=$lt_lt_prog_compiler_static
9927 9874
9928@@ -19186,9 +20068,6 @@ inherit_rpath=$inherit_rpath 9875@@ -19246,9 +20127,6 @@ inherit_rpath=$inherit_rpath
9929 # Whether libtool must link a program against all its dependency libraries. 9876 # Whether libtool must link a program against all its dependency libraries.
9930 link_all_deplibs=$link_all_deplibs 9877 link_all_deplibs=$link_all_deplibs
9931 9878
@@ -9935,7 +9882,7 @@ index 2aeb3317b65..5ef46d31558 100755
9935 # Set to "yes" if exported symbols are required. 9882 # Set to "yes" if exported symbols are required.
9936 always_export_symbols=$always_export_symbols 9883 always_export_symbols=$always_export_symbols
9937 9884
9938@@ -19204,6 +20083,9 @@ include_expsyms=$lt_include_expsyms 9885@@ -19264,6 +20142,9 @@ include_expsyms=$lt_include_expsyms
9939 # Commands necessary for linking programs (against libraries) with templates. 9886 # Commands necessary for linking programs (against libraries) with templates.
9940 prelink_cmds=$lt_prelink_cmds 9887 prelink_cmds=$lt_prelink_cmds
9941 9888
@@ -9945,7 +9892,7 @@ index 2aeb3317b65..5ef46d31558 100755
9945 # Specify filename containing input files. 9892 # Specify filename containing input files.
9946 file_list_spec=$lt_file_list_spec 9893 file_list_spec=$lt_file_list_spec
9947 9894
9948@@ -19250,210 +20132,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 9895@@ -19310,210 +20191,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9949 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9896 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9950 # text mode, it properly converts lines to CR/LF. This bash problem 9897 # text mode, it properly converts lines to CR/LF. This bash problem
9951 # is reportedly fixed, but why not run on old versions too? 9898 # is reportedly fixed, but why not run on old versions too?
@@ -10319,7 +10266,7 @@ index 2aeb3317b65..5ef46d31558 100755
10319 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10266 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10320 chmod +x "$ofile" 10267 chmod +x "$ofile"
10321 10268
10322@@ -19481,12 +20322,12 @@ with_gcc=$GCC_CXX 10269@@ -19541,12 +20381,12 @@ with_gcc=$GCC_CXX
10323 # Compiler flag to turn off builtin functions. 10270 # Compiler flag to turn off builtin functions.
10324 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10271 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10325 10272
@@ -10335,7 +10282,7 @@ index 2aeb3317b65..5ef46d31558 100755
10335 # Compiler flag to prevent dynamic linking. 10282 # Compiler flag to prevent dynamic linking.
10336 link_static_flag=$lt_lt_prog_compiler_static_CXX 10283 link_static_flag=$lt_lt_prog_compiler_static_CXX
10337 10284
10338@@ -19573,9 +20414,6 @@ inherit_rpath=$inherit_rpath_CXX 10285@@ -19633,9 +20473,6 @@ inherit_rpath=$inherit_rpath_CXX
10339 # Whether libtool must link a program against all its dependency libraries. 10286 # Whether libtool must link a program against all its dependency libraries.
10340 link_all_deplibs=$link_all_deplibs_CXX 10287 link_all_deplibs=$link_all_deplibs_CXX
10341 10288
@@ -10345,7 +10292,7 @@ index 2aeb3317b65..5ef46d31558 100755
10345 # Set to "yes" if exported symbols are required. 10292 # Set to "yes" if exported symbols are required.
10346 always_export_symbols=$always_export_symbols_CXX 10293 always_export_symbols=$always_export_symbols_CXX
10347 10294
10348@@ -19591,6 +20429,9 @@ include_expsyms=$lt_include_expsyms_CXX 10295@@ -19651,6 +20488,9 @@ include_expsyms=$lt_include_expsyms_CXX
10349 # Commands necessary for linking programs (against libraries) with templates. 10296 # Commands necessary for linking programs (against libraries) with templates.
10350 prelink_cmds=$lt_prelink_cmds_CXX 10297 prelink_cmds=$lt_prelink_cmds_CXX
10351 10298
@@ -10355,11 +10302,2190 @@ index 2aeb3317b65..5ef46d31558 100755
10355 # Specify filename containing input files. 10302 # Specify filename containing input files.
10356 file_list_spec=$lt_file_list_spec_CXX 10303 file_list_spec=$lt_file_list_spec_CXX
10357 10304
10305diff --git a/libbacktrace/configure b/libbacktrace/configure
10306index a2f33c0f35d..90667680701 100755
10307--- a/libbacktrace/configure
10308+++ b/libbacktrace/configure
10309@@ -680,7 +680,10 @@ OTOOL
10310 LIPO
10311 NMEDIT
10312 DSYMUTIL
10313+MANIFEST_TOOL
10314+ac_ct_AR
10315 AR
10316+DLLTOOL
10317 OBJDUMP
10318 LN_S
10319 NM
10320@@ -798,6 +801,7 @@ enable_static
10321 with_pic
10322 enable_fast_install
10323 with_gnu_ld
10324+with_libtool_sysroot
10325 enable_libtool_lock
10326 enable_largefile
10327 enable_cet
10328@@ -1458,6 +1462,8 @@ Optional Packages:
10329 --with-pic try to use only PIC/non-PIC objects [default=use
10330 both]
10331 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
10332+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
10333+ (or the compiler's sysroot if not specified).
10334 --with-system-libunwind use installed libunwind
10335
10336 Some influential environment variables:
10337@@ -5446,8 +5452,8 @@ esac
10338
10339
10340
10341-macro_version='2.2.7a'
10342-macro_revision='1.3134'
10343+macro_version='2.4'
10344+macro_revision='1.3293'
10345
10346
10347
10348@@ -5487,7 +5493,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10349 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
10350 $as_echo_n "checking how to print strings... " >&6; }
10351 # Test print first, because it will be a builtin if present.
10352-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10353+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10354 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10355 ECHO='print -r --'
10356 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10357@@ -5818,48 +5824,49 @@ if ${lt_cv_path_NM+:} false; then :
10358 $as_echo_n "(cached) " >&6
10359 else
10360 if test -n "$NM"; then
10361- # Let the user override the test.
10362- lt_cv_path_NM="$NM"
10363-else
10364- lt_nm_to_check="${ac_tool_prefix}nm"
10365- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
10366- lt_nm_to_check="$lt_nm_to_check nm"
10367- fi
10368- for lt_tmp_nm in $lt_nm_to_check; do
10369- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
10370- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
10371- IFS="$lt_save_ifs"
10372- test -z "$ac_dir" && ac_dir=.
10373- tmp_nm="$ac_dir/$lt_tmp_nm"
10374- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
10375- # Check to see if the nm accepts a BSD-compat flag.
10376- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
10377- # nm: unknown option "B" ignored
10378- # Tru64's nm complains that /dev/null is an invalid object file
10379- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
10380- */dev/null* | *'Invalid file or object type'*)
10381- lt_cv_path_NM="$tmp_nm -B"
10382- break
10383- ;;
10384- *)
10385- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
10386- */dev/null*)
10387- lt_cv_path_NM="$tmp_nm -p"
10388- break
10389- ;;
10390- *)
10391- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
10392- continue # so that we can try to find one that supports BSD flags
10393- ;;
10394- esac
10395- ;;
10396- esac
10397- fi
10398- done
10399- IFS="$lt_save_ifs"
10400- done
10401- : ${lt_cv_path_NM=no}
10402-fi
10403+ # Let the user override the nm to test.
10404+ lt_nm_to_check="$NM"
10405+ else
10406+ lt_nm_to_check="${ac_tool_prefix}nm"
10407+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
10408+ lt_nm_to_check="$lt_nm_to_check nm"
10409+ fi
10410+ fi
10411+ for lt_tmp_nm in $lt_nm_to_check; do
10412+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
10413+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
10414+ IFS="$lt_save_ifs"
10415+ test -z "$ac_dir" && ac_dir=.
10416+ case "$lt_tmp_nm" in
10417+ */*|*\\*) tmp_nm="$lt_tmp_nm";;
10418+ *) tmp_nm="$ac_dir/$lt_tmp_nm";;
10419+ esac
10420+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
10421+ # Check to see if the nm accepts a BSD-compat flag.
10422+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
10423+ # nm: unknown option "B" ignored
10424+ case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
10425+ *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
10426+ break
10427+ ;;
10428+ *)
10429+ case `"$tmp_nm" -p "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
10430+ *$tmp_nm*)
10431+ lt_cv_path_NM="$tmp_nm -p"
10432+ break
10433+ ;;
10434+ *)
10435+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
10436+ continue # so that we can try to find one that supports BSD flags
10437+ ;;
10438+ esac
10439+ ;;
10440+ esac
10441+ fi
10442+ done
10443+ IFS="$lt_save_ifs"
10444+ done
10445+ : ${lt_cv_path_NM=no}
10446 fi
10447 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
10448 $as_echo "$lt_cv_path_NM" >&6; }
10449@@ -6173,8 +6180,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10450 # Try some XSI features
10451 xsi_shell=no
10452 ( _lt_dummy="a/b/c"
10453- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
10454- = c,a/b,, \
10455+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
10456+ = c,a/b,b/c, \
10457 && eval 'test $(( 1 + 1 )) -eq 2 \
10458 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
10459 && xsi_shell=yes
10460@@ -6223,6 +6230,80 @@ esac
10461
10462
10463
10464+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
10465+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
10466+if ${lt_cv_to_host_file_cmd+:} false; then :
10467+ $as_echo_n "(cached) " >&6
10468+else
10469+ case $host in
10470+ *-*-mingw* )
10471+ case $build in
10472+ *-*-mingw* ) # actually msys
10473+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
10474+ ;;
10475+ *-*-cygwin* )
10476+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
10477+ ;;
10478+ * ) # otherwise, assume *nix
10479+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
10480+ ;;
10481+ esac
10482+ ;;
10483+ *-*-cygwin* )
10484+ case $build in
10485+ *-*-mingw* ) # actually msys
10486+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
10487+ ;;
10488+ *-*-cygwin* )
10489+ lt_cv_to_host_file_cmd=func_convert_file_noop
10490+ ;;
10491+ * ) # otherwise, assume *nix
10492+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
10493+ ;;
10494+ esac
10495+ ;;
10496+ * ) # unhandled hosts (and "normal" native builds)
10497+ lt_cv_to_host_file_cmd=func_convert_file_noop
10498+ ;;
10499+esac
10500+
10501+fi
10502+
10503+to_host_file_cmd=$lt_cv_to_host_file_cmd
10504+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
10505+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
10506+
10507+
10508+
10509+
10510+
10511+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
10512+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
10513+if ${lt_cv_to_tool_file_cmd+:} false; then :
10514+ $as_echo_n "(cached) " >&6
10515+else
10516+ #assume ordinary cross tools, or native build.
10517+lt_cv_to_tool_file_cmd=func_convert_file_noop
10518+case $host in
10519+ *-*-mingw* )
10520+ case $build in
10521+ *-*-mingw* ) # actually msys
10522+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
10523+ ;;
10524+ esac
10525+ ;;
10526+esac
10527+
10528+fi
10529+
10530+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
10531+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
10532+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
10533+
10534+
10535+
10536+
10537+
10538 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
10539 $as_echo_n "checking for $LD option to reload object files... " >&6; }
10540 if ${lt_cv_ld_reload_flag+:} false; then :
10541@@ -6239,6 +6320,11 @@ case $reload_flag in
10542 esac
10543 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10544 case $host_os in
10545+ cygwin* | mingw* | pw32* | cegcc*)
10546+ if test "$GCC" != yes; then
10547+ reload_cmds=false
10548+ fi
10549+ ;;
10550 darwin*)
10551 if test "$GCC" = yes; then
10552 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10553@@ -6407,7 +6493,8 @@ mingw* | pw32*)
10554 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10555 lt_cv_file_magic_cmd='func_win32_libid'
10556 else
10557- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10558+ # Keep this pattern in sync with the one in func_win32_libid.
10559+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10560 lt_cv_file_magic_cmd='$OBJDUMP -f'
10561 fi
10562 ;;
10563@@ -6480,7 +6567,7 @@ irix5* | irix6* | nonstopux*)
10564 ;;
10565
10566 # This must be Linux ELF.
10567-linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
10568+linux* | k*bsd*-gnu | kopensolaris*-gnu)
10569 lt_cv_deplibs_check_method=pass_all
10570 ;;
10571
10572@@ -6561,6 +6648,21 @@ esac
10573 fi
10574 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10575 $as_echo "$lt_cv_deplibs_check_method" >&6; }
10576+
10577+file_magic_glob=
10578+want_nocaseglob=no
10579+if test "$build" = "$host"; then
10580+ case $host_os in
10581+ mingw* | pw32*)
10582+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10583+ want_nocaseglob=yes
10584+ else
10585+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
10586+ fi
10587+ ;;
10588+ esac
10589+fi
10590+
10591 file_magic_cmd=$lt_cv_file_magic_cmd
10592 deplibs_check_method=$lt_cv_deplibs_check_method
10593 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10594@@ -6574,11 +6676,177 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10595
10596
10597
10598+
10599+
10600+
10601+
10602+
10603+
10604+
10605+
10606+
10607+
10608
10609
10610 if test -n "$ac_tool_prefix"; then
10611- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
10612-set dummy ${ac_tool_prefix}ar; ac_word=$2
10613+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
10614+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
10615+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10616+$as_echo_n "checking for $ac_word... " >&6; }
10617+if ${ac_cv_prog_DLLTOOL+:} false; then :
10618+ $as_echo_n "(cached) " >&6
10619+else
10620+ if test -n "$DLLTOOL"; then
10621+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
10622+else
10623+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10624+for as_dir in $PATH
10625+do
10626+ IFS=$as_save_IFS
10627+ test -z "$as_dir" && as_dir=.
10628+ for ac_exec_ext in '' $ac_executable_extensions; do
10629+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10630+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
10631+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10632+ break 2
10633+ fi
10634+done
10635+ done
10636+IFS=$as_save_IFS
10637+
10638+fi
10639+fi
10640+DLLTOOL=$ac_cv_prog_DLLTOOL
10641+if test -n "$DLLTOOL"; then
10642+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
10643+$as_echo "$DLLTOOL" >&6; }
10644+else
10645+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10646+$as_echo "no" >&6; }
10647+fi
10648+
10649+
10650+fi
10651+if test -z "$ac_cv_prog_DLLTOOL"; then
10652+ ac_ct_DLLTOOL=$DLLTOOL
10653+ # Extract the first word of "dlltool", so it can be a program name with args.
10654+set dummy dlltool; ac_word=$2
10655+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10656+$as_echo_n "checking for $ac_word... " >&6; }
10657+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
10658+ $as_echo_n "(cached) " >&6
10659+else
10660+ if test -n "$ac_ct_DLLTOOL"; then
10661+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
10662+else
10663+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10664+for as_dir in $PATH
10665+do
10666+ IFS=$as_save_IFS
10667+ test -z "$as_dir" && as_dir=.
10668+ for ac_exec_ext in '' $ac_executable_extensions; do
10669+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10670+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
10671+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10672+ break 2
10673+ fi
10674+done
10675+ done
10676+IFS=$as_save_IFS
10677+
10678+fi
10679+fi
10680+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
10681+if test -n "$ac_ct_DLLTOOL"; then
10682+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
10683+$as_echo "$ac_ct_DLLTOOL" >&6; }
10684+else
10685+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10686+$as_echo "no" >&6; }
10687+fi
10688+
10689+ if test "x$ac_ct_DLLTOOL" = x; then
10690+ DLLTOOL="false"
10691+ else
10692+ case $cross_compiling:$ac_tool_warned in
10693+yes:)
10694+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10695+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10696+ac_tool_warned=yes ;;
10697+esac
10698+ DLLTOOL=$ac_ct_DLLTOOL
10699+ fi
10700+else
10701+ DLLTOOL="$ac_cv_prog_DLLTOOL"
10702+fi
10703+
10704+test -z "$DLLTOOL" && DLLTOOL=dlltool
10705+
10706+
10707+
10708+
10709+
10710+
10711+
10712+
10713+
10714+
10715+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
10716+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
10717+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
10718+ $as_echo_n "(cached) " >&6
10719+else
10720+ lt_cv_sharedlib_from_linklib_cmd='unknown'
10721+
10722+case $host_os in
10723+cygwin* | mingw* | pw32* | cegcc*)
10724+ # two different shell functions defined in ltmain.sh
10725+ # decide which to use based on capabilities of $DLLTOOL
10726+ case `$DLLTOOL --help 2>&1` in
10727+ *--identify-strict*)
10728+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10729+ ;;
10730+ *)
10731+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10732+ ;;
10733+ esac
10734+ ;;
10735+*)
10736+ # fallback: assume linklib IS sharedlib
10737+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10738+ ;;
10739+esac
10740+
10741+fi
10742+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
10743+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
10744+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10745+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10746+
10747+
10748+
10749+
10750+
10751+
10752+
10753+plugin_option=
10754+plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
10755+for plugin in $plugin_names; do
10756+ plugin_so=`${CC} ${CFLAGS} --print-prog-name $plugin`
10757+ if test x$plugin_so = x$plugin; then
10758+ plugin_so=`${CC} ${CFLAGS} --print-file-name $plugin`
10759+ fi
10760+ if test x$plugin_so != x$plugin; then
10761+ plugin_option="--plugin $plugin_so"
10762+ break
10763+ fi
10764+done
10765+
10766+if test -n "$ac_tool_prefix"; then
10767+ for ac_prog in ar
10768+ do
10769+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
10770+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
10771 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10772 $as_echo_n "checking for $ac_word... " >&6; }
10773 if ${ac_cv_prog_AR+:} false; then :
10774@@ -6594,7 +6862,7 @@ do
10775 test -z "$as_dir" && as_dir=.
10776 for ac_exec_ext in '' $ac_executable_extensions; do
10777 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10778- ac_cv_prog_AR="${ac_tool_prefix}ar"
10779+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
10780 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10781 break 2
10782 fi
10783@@ -6614,11 +6882,15 @@ $as_echo "no" >&6; }
10784 fi
10785
10786
10787+ test -n "$AR" && break
10788+ done
10789 fi
10790-if test -z "$ac_cv_prog_AR"; then
10791+if test -z "$AR"; then
10792 ac_ct_AR=$AR
10793- # Extract the first word of "ar", so it can be a program name with args.
10794-set dummy ar; ac_word=$2
10795+ for ac_prog in ar
10796+do
10797+ # Extract the first word of "$ac_prog", so it can be a program name with args.
10798+set dummy $ac_prog; ac_word=$2
10799 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10800 $as_echo_n "checking for $ac_word... " >&6; }
10801 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10802@@ -6634,7 +6906,7 @@ do
10803 test -z "$as_dir" && as_dir=.
10804 for ac_exec_ext in '' $ac_executable_extensions; do
10805 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10806- ac_cv_prog_ac_ct_AR="ar"
10807+ ac_cv_prog_ac_ct_AR="$ac_prog"
10808 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10809 break 2
10810 fi
10811@@ -6653,6 +6925,10 @@ else
10812 $as_echo "no" >&6; }
10813 fi
10814
10815+
10816+ test -n "$ac_ct_AR" && break
10817+done
10818+
10819 if test "x$ac_ct_AR" = x; then
10820 AR="false"
10821 else
10822@@ -6664,12 +6940,21 @@ ac_tool_warned=yes ;;
10823 esac
10824 AR=$ac_ct_AR
10825 fi
10826-else
10827- AR="$ac_cv_prog_AR"
10828 fi
10829
10830-test -z "$AR" && AR=ar
10831-test -z "$AR_FLAGS" && AR_FLAGS=cru
10832+ touch conftest.c
10833+ $AR $plugin_option rc conftest.a conftest.c
10834+ if test "$?" != 0; then
10835+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10836+$as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
10837+ else
10838+ AR="$AR $plugin_option"
10839+ fi
10840+ rm -f conftest.*
10841+: ${AR=ar}
10842+: ${AR_FLAGS=cru}
10843+
10844+
10845
10846
10847
10848@@ -6679,6 +6964,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
10849
10850
10851
10852+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
10853+$as_echo_n "checking for archiver @FILE support... " >&6; }
10854+if ${lt_cv_ar_at_file+:} false; then :
10855+ $as_echo_n "(cached) " >&6
10856+else
10857+ lt_cv_ar_at_file=no
10858+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10859+/* end confdefs.h. */
10860+
10861+int
10862+main ()
10863+{
10864+
10865+ ;
10866+ return 0;
10867+}
10868+_ACEOF
10869+if ac_fn_c_try_compile "$LINENO"; then :
10870+ echo conftest.$ac_objext > conftest.lst
10871+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
10872+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
10873+ (eval $lt_ar_try) 2>&5
10874+ ac_status=$?
10875+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10876+ test $ac_status = 0; }
10877+ if test "$ac_status" -eq 0; then
10878+ # Ensure the archiver fails upon bogus file names.
10879+ rm -f conftest.$ac_objext libconftest.a
10880+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
10881+ (eval $lt_ar_try) 2>&5
10882+ ac_status=$?
10883+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10884+ test $ac_status = 0; }
10885+ if test "$ac_status" -ne 0; then
10886+ lt_cv_ar_at_file=@
10887+ fi
10888+ fi
10889+ rm -f conftest.* libconftest.a
10890+
10891+fi
10892+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10893+
10894+fi
10895+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
10896+$as_echo "$lt_cv_ar_at_file" >&6; }
10897+
10898+if test "x$lt_cv_ar_at_file" = xno; then
10899+ archiver_list_spec=
10900+else
10901+ archiver_list_spec=$lt_cv_ar_at_file
10902+fi
10903+
10904+
10905+
10906+
10907+
10908
10909
10910 if test -n "$ac_tool_prefix"; then
10911@@ -6873,6 +7214,11 @@ else
10912 fi
10913
10914 test -z "$RANLIB" && RANLIB=:
10915+if test -n "$plugin_option" && test "$RANLIB" != ":"; then
10916+ if $RANLIB --help 2>&1 | grep -q "\--plugin"; then
10917+ RANLIB="$RANLIB $plugin_option"
10918+ fi
10919+fi
10920
10921
10922
10923@@ -6987,7 +7333,7 @@ osf*)
10924 symcode='[BCDEGQRST]'
10925 ;;
10926 solaris*)
10927- symcode='[BDRT]'
10928+ symcode='[BCDRT]'
10929 ;;
10930 sco3.2v5*)
10931 symcode='[DT]'
10932@@ -7015,8 +7361,8 @@ esac
10933 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10934
10935 # Transform an extracted symbol line into symbol name and symbol address
10936-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
10937-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
10938+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
10939+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
10940
10941 # Handle CRLF in mingw tool chain
10942 opt_cr=
10943@@ -7052,6 +7398,7 @@ for ac_symprfx in "" "_"; do
10944 else
10945 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10946 fi
10947+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
10948
10949 # Check to see that the pipe works correctly.
10950 pipe_works=no
10951@@ -7093,6 +7440,18 @@ _LT_EOF
10952 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10953 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10954 cat <<_LT_EOF > conftest.$ac_ext
10955+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
10956+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
10957+/* DATA imports from DLLs on WIN32 con't be const, because runtime
10958+ relocations are performed -- see ld's documentation on pseudo-relocs. */
10959+# define LT_DLSYM_CONST
10960+#elif defined(__osf__)
10961+/* This system does not cope well with relocations in const data. */
10962+# define LT_DLSYM_CONST
10963+#else
10964+# define LT_DLSYM_CONST const
10965+#endif
10966+
10967 #ifdef __cplusplus
10968 extern "C" {
10969 #endif
10970@@ -7104,7 +7463,7 @@ _LT_EOF
10971 cat <<_LT_EOF >> conftest.$ac_ext
10972
10973 /* The mapping between symbol names and symbols. */
10974-const struct {
10975+LT_DLSYM_CONST struct {
10976 const char *name;
10977 void *address;
10978 }
10979@@ -7130,8 +7489,8 @@ static const void *lt_preloaded_setup() {
10980 _LT_EOF
10981 # Now try linking the two files.
10982 mv conftest.$ac_objext conftstm.$ac_objext
10983- lt_save_LIBS="$LIBS"
10984- lt_save_CFLAGS="$CFLAGS"
10985+ lt_globsym_save_LIBS=$LIBS
10986+ lt_globsym_save_CFLAGS=$CFLAGS
10987 LIBS="conftstm.$ac_objext"
10988 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
10989 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
10990@@ -7141,8 +7500,8 @@ _LT_EOF
10991 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
10992 pipe_works=yes
10993 fi
10994- LIBS="$lt_save_LIBS"
10995- CFLAGS="$lt_save_CFLAGS"
10996+ LIBS=$lt_globsym_save_LIBS
10997+ CFLAGS=$lt_globsym_save_CFLAGS
10998 else
10999 echo "cannot find nm_test_func in $nlist" >&5
11000 fi
11001@@ -7179,6 +7538,17 @@ else
11002 $as_echo "ok" >&6; }
11003 fi
11004
11005+# Response file support.
11006+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
11007+ nm_file_list_spec='@'
11008+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
11009+ nm_file_list_spec='@'
11010+fi
11011+
11012+
11013+
11014+
11015+
11016
11017
11018
11019@@ -7195,6 +7565,44 @@ fi
11020
11021
11022
11023+
11024+
11025+
11026+
11027+
11028+
11029+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
11030+$as_echo_n "checking for sysroot... " >&6; }
11031+
11032+# Check whether --with-libtool-sysroot was given.
11033+if test "${with_libtool_sysroot+set}" = set; then :
11034+ withval=$with_libtool_sysroot;
11035+else
11036+ with_libtool_sysroot=no
11037+fi
11038+
11039+
11040+lt_sysroot=
11041+case ${with_libtool_sysroot} in #(
11042+ yes)
11043+ if test "$GCC" = yes; then
11044+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
11045+ fi
11046+ ;; #(
11047+ /*)
11048+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
11049+ ;; #(
11050+ no|'')
11051+ ;; #(
11052+ *)
11053+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
11054+$as_echo "${with_libtool_sysroot}" >&6; }
11055+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
11056+ ;;
11057+esac
11058+
11059+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
11060+$as_echo "${lt_sysroot:-no}" >&6; }
11061
11062
11063
11064@@ -7372,39 +7780,156 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
11065 ac_compiler_gnu=$ac_cv_c_compiler_gnu
11066
11067 fi
11068-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
11069-$as_echo "$lt_cv_cc_needs_belf" >&6; }
11070- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
11071- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
11072- CFLAGS="$SAVE_CFLAGS"
11073+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
11074+$as_echo "$lt_cv_cc_needs_belf" >&6; }
11075+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
11076+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
11077+ CFLAGS="$SAVE_CFLAGS"
11078+ fi
11079+ ;;
11080+sparc*-*solaris*)
11081+ # Find out which ABI we are using.
11082+ echo 'int i;' > conftest.$ac_ext
11083+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
11084+ (eval $ac_compile) 2>&5
11085+ ac_status=$?
11086+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11087+ test $ac_status = 0; }; then
11088+ case `/usr/bin/file conftest.o` in
11089+ *64-bit*)
11090+ case $lt_cv_prog_gnu_ld in
11091+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
11092+ *)
11093+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
11094+ LD="${LD-ld} -64"
11095+ fi
11096+ ;;
11097+ esac
11098+ ;;
11099+ esac
11100+ fi
11101+ rm -rf conftest*
11102+ ;;
11103+esac
11104+
11105+need_locks="$enable_libtool_lock"
11106+
11107+if test -n "$ac_tool_prefix"; then
11108+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
11109+set dummy ${ac_tool_prefix}mt; ac_word=$2
11110+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11111+$as_echo_n "checking for $ac_word... " >&6; }
11112+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
11113+ $as_echo_n "(cached) " >&6
11114+else
11115+ if test -n "$MANIFEST_TOOL"; then
11116+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
11117+else
11118+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11119+for as_dir in $PATH
11120+do
11121+ IFS=$as_save_IFS
11122+ test -z "$as_dir" && as_dir=.
11123+ for ac_exec_ext in '' $ac_executable_extensions; do
11124+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11125+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
11126+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11127+ break 2
11128+ fi
11129+done
11130+ done
11131+IFS=$as_save_IFS
11132+
11133+fi
11134+fi
11135+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
11136+if test -n "$MANIFEST_TOOL"; then
11137+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
11138+$as_echo "$MANIFEST_TOOL" >&6; }
11139+else
11140+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11141+$as_echo "no" >&6; }
11142+fi
11143+
11144+
11145+fi
11146+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
11147+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
11148+ # Extract the first word of "mt", so it can be a program name with args.
11149+set dummy mt; ac_word=$2
11150+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11151+$as_echo_n "checking for $ac_word... " >&6; }
11152+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
11153+ $as_echo_n "(cached) " >&6
11154+else
11155+ if test -n "$ac_ct_MANIFEST_TOOL"; then
11156+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
11157+else
11158+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11159+for as_dir in $PATH
11160+do
11161+ IFS=$as_save_IFS
11162+ test -z "$as_dir" && as_dir=.
11163+ for ac_exec_ext in '' $ac_executable_extensions; do
11164+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11165+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
11166+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11167+ break 2
11168+ fi
11169+done
11170+ done
11171+IFS=$as_save_IFS
11172+
11173+fi
11174+fi
11175+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
11176+if test -n "$ac_ct_MANIFEST_TOOL"; then
11177+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
11178+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
11179+else
11180+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11181+$as_echo "no" >&6; }
11182+fi
11183+
11184+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
11185+ MANIFEST_TOOL=":"
11186+ else
11187+ case $cross_compiling:$ac_tool_warned in
11188+yes:)
11189+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11190+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11191+ac_tool_warned=yes ;;
11192+esac
11193+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
11194 fi
11195- ;;
11196-sparc*-*solaris*)
11197- # Find out which ABI we are using.
11198- echo 'int i;' > conftest.$ac_ext
11199- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
11200- (eval $ac_compile) 2>&5
11201- ac_status=$?
11202- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11203- test $ac_status = 0; }; then
11204- case `/usr/bin/file conftest.o` in
11205- *64-bit*)
11206- case $lt_cv_prog_gnu_ld in
11207- yes*) LD="${LD-ld} -m elf64_sparc" ;;
11208- *)
11209- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
11210- LD="${LD-ld} -64"
11211- fi
11212- ;;
11213- esac
11214- ;;
11215- esac
11216+else
11217+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
11218+fi
11219+
11220+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
11221+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
11222+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
11223+if ${lt_cv_path_mainfest_tool+:} false; then :
11224+ $as_echo_n "(cached) " >&6
11225+else
11226+ lt_cv_path_mainfest_tool=no
11227+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
11228+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
11229+ cat conftest.err >&5
11230+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
11231+ lt_cv_path_mainfest_tool=yes
11232 fi
11233- rm -rf conftest*
11234- ;;
11235-esac
11236+ rm -f conftest*
11237+fi
11238+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
11239+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
11240+if test "x$lt_cv_path_mainfest_tool" != xyes; then
11241+ MANIFEST_TOOL=:
11242+fi
11243+
11244+
11245+
11246
11247-need_locks="$enable_libtool_lock"
11248
11249
11250 case $host_os in
11251@@ -7969,6 +8494,8 @@ _LT_EOF
11252 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11253 echo "$AR cru libconftest.a conftest.o" >&5
11254 $AR cru libconftest.a conftest.o 2>&5
11255+ echo "$RANLIB libconftest.a" >&5
11256+ $RANLIB libconftest.a 2>&5
11257 cat > conftest.c << _LT_EOF
11258 int main() { return 0;}
11259 _LT_EOF
11260@@ -7986,25 +8513,23 @@ _LT_EOF
11261 fi
11262 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
11263 $as_echo "$lt_cv_ld_force_load" >&6; }
11264- # Allow for Darwin 4-7 (macOS 10.0-10.3) although these are not expect to
11265- # build without first building modern cctools / linker.
11266- case $host_cpu-$host_os in
11267- *-rhapsody* | *-darwin1.[012])
11268+ case $host_os in
11269+ rhapsody* | darwin1.[012])
11270 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
11271- *-darwin1.*)
11272+ darwin1.*)
11273 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
11274- *-darwin*)
11275- # darwin 5.x (macOS 10.1) onwards we only need to adjust when the
11276- # deployment target is forced to an earlier version.
11277- case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in
11278- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*)
11279- ;;
11280+ darwin*) # darwin 5.x on
11281+ # if running on 10.5 or later, the deployment target defaults
11282+ # to the OS version, if on x86, and 10.4, the deployment
11283+ # target defaults to 10.4. Don't you love it?
11284+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
11285+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
11286+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
11287 10.[012][,.]*)
11288- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
11289- ;;
11290- *)
11291- ;;
11292- esac
11293+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
11294+ 10.*)
11295+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
11296+ esac
11297 ;;
11298 esac
11299 if test "$lt_cv_apple_cc_single_mod" = "yes"; then
11300@@ -8553,8 +9078,6 @@ fi
11301 lt_prog_compiler_pic=
11302 lt_prog_compiler_static=
11303
11304-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11305-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11306
11307 if test "$GCC" = yes; then
11308 lt_prog_compiler_wl='-Wl,'
11309@@ -8720,6 +9243,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11310 lt_prog_compiler_pic='--shared'
11311 lt_prog_compiler_static='--static'
11312 ;;
11313+ nagfor*)
11314+ # NAG Fortran compiler
11315+ lt_prog_compiler_wl='-Wl,-Wl,,'
11316+ lt_prog_compiler_pic='-PIC'
11317+ lt_prog_compiler_static='-Bstatic'
11318+ ;;
11319 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11320 # Portland Group compilers (*not* the Pentium gcc compiler,
11321 # which looks to be a dead project)
11322@@ -8782,7 +9311,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11323 lt_prog_compiler_pic='-KPIC'
11324 lt_prog_compiler_static='-Bstatic'
11325 case $cc_basename in
11326- f77* | f90* | f95*)
11327+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
11328 lt_prog_compiler_wl='-Qoption ld ';;
11329 *)
11330 lt_prog_compiler_wl='-Wl,';;
11331@@ -8839,13 +9368,17 @@ case $host_os in
11332 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11333 ;;
11334 esac
11335-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
11336-$as_echo "$lt_prog_compiler_pic" >&6; }
11337-
11338-
11339-
11340-
11341
11342+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11343+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11344+if ${lt_cv_prog_compiler_pic+:} false; then :
11345+ $as_echo_n "(cached) " >&6
11346+else
11347+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
11348+fi
11349+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
11350+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
11351+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
11352
11353 #
11354 # Check to make sure the PIC flag actually works.
11355@@ -8906,6 +9439,11 @@ fi
11356
11357
11358
11359+
11360+
11361+
11362+
11363+
11364 #
11365 # Check to make sure the static flag actually works.
11366 #
11367@@ -9256,7 +9794,8 @@ _LT_EOF
11368 allow_undefined_flag=unsupported
11369 always_export_symbols=no
11370 enable_shared_with_static_runtimes=yes
11371- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11372+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
11373+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
11374
11375 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11376 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11377@@ -9294,7 +9833,7 @@ _LT_EOF
11378 archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
11379 ;;
11380
11381- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi)
11382+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
11383 tmp_diet=no
11384 if test "$host_os" = linux-dietlibc; then
11385 case $cc_basename in
11386@@ -9355,12 +9894,12 @@ _LT_EOF
11387 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11388 hardcode_libdir_flag_spec=
11389 hardcode_libdir_flag_spec_ld='-rpath $libdir'
11390- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11391+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11392 if test "x$supports_anon_versioning" = xyes; then
11393 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
11394 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11395 echo "local: *; };" >> $output_objdir/$libname.ver~
11396- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11397+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11398 fi
11399 ;;
11400 esac
11401@@ -9374,8 +9913,8 @@ _LT_EOF
11402 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11403 wlarc=
11404 else
11405- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11406- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11407+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11408+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11409 fi
11410 ;;
11411
11412@@ -9393,8 +9932,8 @@ _LT_EOF
11413
11414 _LT_EOF
11415 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11416- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11417- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11418+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11419+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11420 else
11421 ld_shlibs=no
11422 fi
11423@@ -9440,8 +9979,8 @@ _LT_EOF
11424
11425 *)
11426 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11427- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11428- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11429+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11430+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11431 else
11432 ld_shlibs=no
11433 fi
11434@@ -9571,7 +10110,13 @@ _LT_EOF
11435 allow_undefined_flag='-berok'
11436 # Determine the default libpath from the value encoded in an
11437 # empty executable.
11438- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11439+ if test "${lt_cv_aix_libpath+set}" = set; then
11440+ aix_libpath=$lt_cv_aix_libpath
11441+else
11442+ if ${lt_cv_aix_libpath_+:} false; then :
11443+ $as_echo_n "(cached) " >&6
11444+else
11445+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11446 /* end confdefs.h. */
11447
11448 int
11449@@ -9584,22 +10129,29 @@ main ()
11450 _ACEOF
11451 if ac_fn_c_try_link "$LINENO"; then :
11452
11453-lt_aix_libpath_sed='
11454- /Import File Strings/,/^$/ {
11455- /^0/ {
11456- s/^0 *\(.*\)$/\1/
11457- p
11458- }
11459- }'
11460-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11461-# Check for a 64-bit object if we didn't find anything.
11462-if test -z "$aix_libpath"; then
11463- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11464-fi
11465+ lt_aix_libpath_sed='
11466+ /Import File Strings/,/^$/ {
11467+ /^0/ {
11468+ s/^0 *\([^ ]*\) *$/\1/
11469+ p
11470+ }
11471+ }'
11472+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11473+ # Check for a 64-bit object if we didn't find anything.
11474+ if test -z "$lt_cv_aix_libpath_"; then
11475+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11476+ fi
11477 fi
11478 rm -f core conftest.err conftest.$ac_objext \
11479 conftest$ac_exeext conftest.$ac_ext
11480-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11481+ if test -z "$lt_cv_aix_libpath_"; then
11482+ lt_cv_aix_libpath_="/usr/lib:/lib"
11483+ fi
11484+
11485+fi
11486+
11487+ aix_libpath=$lt_cv_aix_libpath_
11488+fi
11489
11490 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11491 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11492@@ -9611,7 +10163,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11493 else
11494 # Determine the default libpath from the value encoded in an
11495 # empty executable.
11496- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11497+ if test "${lt_cv_aix_libpath+set}" = set; then
11498+ aix_libpath=$lt_cv_aix_libpath
11499+else
11500+ if ${lt_cv_aix_libpath_+:} false; then :
11501+ $as_echo_n "(cached) " >&6
11502+else
11503+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11504 /* end confdefs.h. */
11505
11506 int
11507@@ -9624,22 +10182,29 @@ main ()
11508 _ACEOF
11509 if ac_fn_c_try_link "$LINENO"; then :
11510
11511-lt_aix_libpath_sed='
11512- /Import File Strings/,/^$/ {
11513- /^0/ {
11514- s/^0 *\(.*\)$/\1/
11515- p
11516- }
11517- }'
11518-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11519-# Check for a 64-bit object if we didn't find anything.
11520-if test -z "$aix_libpath"; then
11521- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11522-fi
11523+ lt_aix_libpath_sed='
11524+ /Import File Strings/,/^$/ {
11525+ /^0/ {
11526+ s/^0 *\([^ ]*\) *$/\1/
11527+ p
11528+ }
11529+ }'
11530+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11531+ # Check for a 64-bit object if we didn't find anything.
11532+ if test -z "$lt_cv_aix_libpath_"; then
11533+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11534+ fi
11535 fi
11536 rm -f core conftest.err conftest.$ac_objext \
11537 conftest$ac_exeext conftest.$ac_ext
11538-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11539+ if test -z "$lt_cv_aix_libpath_"; then
11540+ lt_cv_aix_libpath_="/usr/lib:/lib"
11541+ fi
11542+
11543+fi
11544+
11545+ aix_libpath=$lt_cv_aix_libpath_
11546+fi
11547
11548 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11549 # Warning - without using the other run time loading flags,
11550@@ -9684,20 +10249,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11551 # Microsoft Visual C++.
11552 # hardcode_libdir_flag_spec is actually meaningless, as there is
11553 # no search path for DLLs.
11554- hardcode_libdir_flag_spec=' '
11555- allow_undefined_flag=unsupported
11556- # Tell ltmain to make .lib files, not .a files.
11557- libext=lib
11558- # Tell ltmain to make .dll files, not .so files.
11559- shrext_cmds=".dll"
11560- # FIXME: Setting linknames here is a bad hack.
11561- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11562- # The linker will automatically build a .lib file if we build a DLL.
11563- old_archive_from_new_cmds='true'
11564- # FIXME: Should let the user specify the lib program.
11565- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11566- fix_srcfile_path='`cygpath -w "$srcfile"`'
11567- enable_shared_with_static_runtimes=yes
11568+ case $cc_basename in
11569+ cl*)
11570+ # Native MSVC
11571+ hardcode_libdir_flag_spec=' '
11572+ allow_undefined_flag=unsupported
11573+ always_export_symbols=yes
11574+ file_list_spec='@'
11575+ # Tell ltmain to make .lib files, not .a files.
11576+ libext=lib
11577+ # Tell ltmain to make .dll files, not .so files.
11578+ shrext_cmds=".dll"
11579+ # FIXME: Setting linknames here is a bad hack.
11580+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11581+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11582+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11583+ else
11584+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11585+ fi~
11586+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11587+ linknames='
11588+ # The linker will not automatically build a static lib if we build a DLL.
11589+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
11590+ enable_shared_with_static_runtimes=yes
11591+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11592+ # Don't use ranlib
11593+ old_postinstall_cmds='chmod 644 $oldlib'
11594+ postlink_cmds='lt_outputfile="@OUTPUT@"~
11595+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11596+ case $lt_outputfile in
11597+ *.exe|*.EXE) ;;
11598+ *)
11599+ lt_outputfile="$lt_outputfile.exe"
11600+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11601+ ;;
11602+ esac~
11603+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11604+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11605+ $RM "$lt_outputfile.manifest";
11606+ fi'
11607+ ;;
11608+ *)
11609+ # Assume MSVC wrapper
11610+ hardcode_libdir_flag_spec=' '
11611+ allow_undefined_flag=unsupported
11612+ # Tell ltmain to make .lib files, not .a files.
11613+ libext=lib
11614+ # Tell ltmain to make .dll files, not .so files.
11615+ shrext_cmds=".dll"
11616+ # FIXME: Setting linknames here is a bad hack.
11617+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11618+ # The linker will automatically build a .lib file if we build a DLL.
11619+ old_archive_from_new_cmds='true'
11620+ # FIXME: Should let the user specify the lib program.
11621+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
11622+ enable_shared_with_static_runtimes=yes
11623+ ;;
11624+ esac
11625 ;;
11626
11627 darwin* | rhapsody*)
11628@@ -9758,7 +10366,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11629
11630 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11631 freebsd* | dragonfly*)
11632- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11633+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11634 hardcode_libdir_flag_spec='-R$libdir'
11635 hardcode_direct=yes
11636 hardcode_shlibpath_var=no
11637@@ -9766,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11638
11639 hpux9*)
11640 if test "$GCC" = yes; then
11641- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11642+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11643 else
11644 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11645 fi
11646@@ -9782,7 +10390,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11647
11648 hpux10*)
11649 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11650- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11651+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11652 else
11653 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11654 fi
11655@@ -9803,19 +10411,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11656 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11657 case $host_cpu in
11658 hppa*64*)
11659- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11660+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11661 ;;
11662 ia64*)
11663- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11664+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11665 ;;
11666 *)
11667- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11668+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11669 ;;
11670 esac
11671 else
11672 case $host_cpu in
11673 hppa*64*)
11674- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11675+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11676 ;;
11677 ia64*)
11678 archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11679@@ -9888,23 +10496,36 @@ fi
11680
11681 irix5* | irix6* | nonstopux*)
11682 if test "$GCC" = yes; then
11683- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11684+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11685 # Try to use the -exported_symbol ld option, if it does not
11686 # work, assume that -exports_file does not work either and
11687 # implicitly export all symbols.
11688- save_LDFLAGS="$LDFLAGS"
11689- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11690- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11691+ # This should be the same for all languages, so no per-tag cache variable.
11692+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
11693+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
11694+if ${lt_cv_irix_exported_symbol+:} false; then :
11695+ $as_echo_n "(cached) " >&6
11696+else
11697+ save_LDFLAGS="$LDFLAGS"
11698+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11699+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11700 /* end confdefs.h. */
11701-int foo(void) {}
11702+int foo (void) { return 0; }
11703 _ACEOF
11704 if ac_fn_c_try_link "$LINENO"; then :
11705- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
11706-
11707+ lt_cv_irix_exported_symbol=yes
11708+else
11709+ lt_cv_irix_exported_symbol=no
11710 fi
11711 rm -f core conftest.err conftest.$ac_objext \
11712 conftest$ac_exeext conftest.$ac_ext
11713- LDFLAGS="$save_LDFLAGS"
11714+ LDFLAGS="$save_LDFLAGS"
11715+fi
11716+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
11717+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
11718+ if test "$lt_cv_irix_exported_symbol" = yes; then
11719+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
11720+ fi
11721 else
11722 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
11723 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
11724@@ -9989,7 +10610,7 @@ rm -f core conftest.err conftest.$ac_objext \
11725 osf4* | osf5*) # as osf3* with the addition of -msym flag
11726 if test "$GCC" = yes; then
11727 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
11728- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11729+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11730 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11731 else
11732 allow_undefined_flag=' -expect_unresolved \*'
11733@@ -10008,9 +10629,9 @@ rm -f core conftest.err conftest.$ac_objext \
11734 no_undefined_flag=' -z defs'
11735 if test "$GCC" = yes; then
11736 wlarc='${wl}'
11737- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11738+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11739 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11740- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11741+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11742 else
11743 case `$CC -V 2>&1` in
11744 *"Compilers 5.0"*)
11745@@ -10586,8 +11207,9 @@ cygwin* | mingw* | pw32* | cegcc*)
11746 need_version=no
11747 need_lib_prefix=no
11748
11749- case $GCC,$host_os in
11750- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
11751+ case $GCC,$cc_basename in
11752+ yes,*)
11753+ # gcc
11754 library_names_spec='$libname.dll.a'
11755 # DLL is installed to $(libdir)/../bin by postinstall_cmds
11756 postinstall_cmds='base_file=`basename \${file}`~
11757@@ -10620,13 +11242,71 @@ cygwin* | mingw* | pw32* | cegcc*)
11758 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11759 ;;
11760 esac
11761+ dynamic_linker='Win32 ld.exe'
11762+ ;;
11763+
11764+ *,cl*)
11765+ # Native MSVC
11766+ libname_spec='$name'
11767+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11768+ library_names_spec='${libname}.dll.lib'
11769+
11770+ case $build_os in
11771+ mingw*)
11772+ sys_lib_search_path_spec=
11773+ lt_save_ifs=$IFS
11774+ IFS=';'
11775+ for lt_path in $LIB
11776+ do
11777+ IFS=$lt_save_ifs
11778+ # Let DOS variable expansion print the short 8.3 style file name.
11779+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
11780+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
11781+ done
11782+ IFS=$lt_save_ifs
11783+ # Convert to MSYS style.
11784+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
11785+ ;;
11786+ cygwin*)
11787+ # Convert to unix form, then to dos form, then back to unix form
11788+ # but this time dos style (no spaces!) so that the unix form looks
11789+ # like /cygdrive/c/PROGRA~1:/cygdr...
11790+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
11791+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
11792+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
11793+ ;;
11794+ *)
11795+ sys_lib_search_path_spec="$LIB"
11796+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
11797+ # It is most probably a Windows format PATH.
11798+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
11799+ else
11800+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
11801+ fi
11802+ # FIXME: find the short name or the path components, as spaces are
11803+ # common. (e.g. "Program Files" -> "PROGRA~1")
11804+ ;;
11805+ esac
11806+
11807+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
11808+ postinstall_cmds='base_file=`basename \${file}`~
11809+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
11810+ dldir=$destdir/`dirname \$dlpath`~
11811+ test -d \$dldir || mkdir -p \$dldir~
11812+ $install_prog $dir/$dlname \$dldir/$dlname'
11813+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
11814+ dlpath=$dir/\$dldll~
11815+ $RM \$dlpath'
11816+ shlibpath_overrides_runpath=yes
11817+ dynamic_linker='Win32 link.exe'
11818 ;;
11819
11820 *)
11821+ # Assume MSVC wrapper
11822 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
11823+ dynamic_linker='Win32 ld.exe'
11824 ;;
11825 esac
11826- dynamic_linker='Win32 ld.exe'
11827 # FIXME: first we should search . and the directory the executable is in
11828 shlibpath_var=PATH
11829 ;;
11830@@ -10708,7 +11388,7 @@ haiku*)
11831 soname_spec='${libname}${release}${shared_ext}$major'
11832 shlibpath_var=LIBRARY_PATH
11833 shlibpath_overrides_runpath=yes
11834- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
11835+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
11836 hardcode_into_libs=yes
11837 ;;
11838
11839@@ -10815,12 +11495,7 @@ linux*oldld* | linux*aout* | linux*coff*)
11840 ;;
11841
11842 # This must be Linux ELF.
11843-
11844-# uclinux* changes (here and below) have been submitted to the libtool
11845-# project, but have not yet been accepted: they are GCC-local changes
11846-# for the time being. (See
11847-# https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html)
11848-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi)
11849+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
11850 version_type=linux
11851 need_lib_prefix=no
11852 need_version=no
11853@@ -11509,7 +12184,7 @@ else
11854 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11855 lt_status=$lt_dlunknown
11856 cat > conftest.$ac_ext <<_LT_EOF
11857-#line 11512 "configure"
11858+#line $LINENO "configure"
11859 #include "confdefs.h"
11860
11861 #if HAVE_DLFCN_H
11862@@ -11553,10 +12228,10 @@ else
11863 /* When -fvisbility=hidden is used, assume the code has been annotated
11864 correspondingly for the symbols needed. */
11865 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11866-void fnord () __attribute__((visibility("default")));
11867+int fnord () __attribute__((visibility("default")));
11868 #endif
11869
11870-void fnord () { int i=42; }
11871+int fnord () { return 42; }
11872 int main ()
11873 {
11874 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11875@@ -11615,7 +12290,7 @@ else
11876 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11877 lt_status=$lt_dlunknown
11878 cat > conftest.$ac_ext <<_LT_EOF
11879-#line 11618 "configure"
11880+#line $LINENO "configure"
11881 #include "confdefs.h"
11882
11883 #if HAVE_DLFCN_H
11884@@ -11659,10 +12334,10 @@ else
11885 /* When -fvisbility=hidden is used, assume the code has been annotated
11886 correspondingly for the symbols needed. */
11887 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11888-void fnord () __attribute__((visibility("default")));
11889+int fnord () __attribute__((visibility("default")));
11890 #endif
11891
11892-void fnord () { int i=42; }
11893+int fnord () { return 42; }
11894 int main ()
11895 {
11896 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11897@@ -14948,13 +15623,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
11898 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
11899 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
11900 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
11901+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
11902+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
11903 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
11904 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
11905 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
11906 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
11907 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
11908+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
11909+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
11910+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
11911+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
11912 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
11913 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
11914+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
11915 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
11916 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
11917 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
11918@@ -14969,14 +15651,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
11919 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
11920 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
11921 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
11922+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
11923+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
11924 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
11925 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
11926 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
11927-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
11928 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
11929+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
11930 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
11931 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
11932 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
11933+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
11934 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
11935 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
11936 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
11937@@ -15009,12 +15694,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
11938 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
11939 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
11940 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
11941-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
11942 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
11943 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
11944 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
11945 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
11946 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
11947+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
11948 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
11949 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
11950 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
11951@@ -15069,8 +15754,13 @@ reload_flag \
11952 OBJDUMP \
11953 deplibs_check_method \
11954 file_magic_cmd \
11955+file_magic_glob \
11956+want_nocaseglob \
11957+DLLTOOL \
11958+sharedlib_from_linklib_cmd \
11959 AR \
11960 AR_FLAGS \
11961+archiver_list_spec \
11962 STRIP \
11963 RANLIB \
11964 CC \
11965@@ -15080,12 +15770,14 @@ lt_cv_sys_global_symbol_pipe \
11966 lt_cv_sys_global_symbol_to_cdecl \
11967 lt_cv_sys_global_symbol_to_c_name_address \
11968 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
11969+nm_file_list_spec \
11970 lt_prog_compiler_no_builtin_flag \
11971-lt_prog_compiler_wl \
11972 lt_prog_compiler_pic \
11973+lt_prog_compiler_wl \
11974 lt_prog_compiler_static \
11975 lt_cv_prog_compiler_c_o \
11976 need_locks \
11977+MANIFEST_TOOL \
11978 DSYMUTIL \
11979 NMEDIT \
11980 LIPO \
11981@@ -15101,7 +15793,6 @@ no_undefined_flag \
11982 hardcode_libdir_flag_spec \
11983 hardcode_libdir_flag_spec_ld \
11984 hardcode_libdir_separator \
11985-fix_srcfile_path \
11986 exclude_expsyms \
11987 include_expsyms \
11988 file_list_spec \
11989@@ -15137,6 +15828,7 @@ module_cmds \
11990 module_expsym_cmds \
11991 export_symbols_cmds \
11992 prelink_cmds \
11993+postlink_cmds \
11994 postinstall_cmds \
11995 postuninstall_cmds \
11996 finish_cmds \
11997@@ -15835,7 +16527,8 @@ esac ;;
11998 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
11999 #
12000 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
12001-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
12002+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
12003+# Inc.
12004 # Written by Gordon Matzigkeit, 1996
12005 #
12006 # This file is part of GNU Libtool.
12007@@ -15938,19 +16631,42 @@ SP2NL=$lt_lt_SP2NL
12008 # turn newlines into spaces.
12009 NL2SP=$lt_lt_NL2SP
12010
12011+# convert \$build file names to \$host format.
12012+to_host_file_cmd=$lt_cv_to_host_file_cmd
12013+
12014+# convert \$build files to toolchain format.
12015+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12016+
12017 # An object symbol dumper.
12018 OBJDUMP=$lt_OBJDUMP
12019
12020 # Method to check whether dependent libraries are shared objects.
12021 deplibs_check_method=$lt_deplibs_check_method
12022
12023-# Command to use when deplibs_check_method == "file_magic".
12024+# Command to use when deplibs_check_method = "file_magic".
12025 file_magic_cmd=$lt_file_magic_cmd
12026
12027+# How to find potential files when deplibs_check_method = "file_magic".
12028+file_magic_glob=$lt_file_magic_glob
12029+
12030+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
12031+want_nocaseglob=$lt_want_nocaseglob
12032+
12033+# DLL creation program.
12034+DLLTOOL=$lt_DLLTOOL
12035+
12036+# Command to associate shared and link libraries.
12037+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
12038+
12039 # The archiver.
12040 AR=$lt_AR
12041+
12042+# Flags to create an archive.
12043 AR_FLAGS=$lt_AR_FLAGS
12044
12045+# How to feed a file listing to the archiver.
12046+archiver_list_spec=$lt_archiver_list_spec
12047+
12048 # A symbol stripping program.
12049 STRIP=$lt_STRIP
12050
12051@@ -15980,6 +16696,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
12052 # Transform the output of nm in a C name address pair when lib prefix is needed.
12053 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
12054
12055+# Specify filename containing input files for \$NM.
12056+nm_file_list_spec=$lt_nm_file_list_spec
12057+
12058+# The root where to search for dependent libraries,and in which our libraries should be installed.
12059+lt_sysroot=$lt_sysroot
12060+
12061 # The name of the directory that contains temporary libtool files.
12062 objdir=$objdir
12063
12064@@ -15989,6 +16711,9 @@ MAGIC_CMD=$MAGIC_CMD
12065 # Must we lock files when doing compilation?
12066 need_locks=$lt_need_locks
12067
12068+# Manifest tool.
12069+MANIFEST_TOOL=$lt_MANIFEST_TOOL
12070+
12071 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
12072 DSYMUTIL=$lt_DSYMUTIL
12073
12074@@ -16103,12 +16828,12 @@ with_gcc=$GCC
12075 # Compiler flag to turn off builtin functions.
12076 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
12077
12078-# How to pass a linker flag through the compiler.
12079-wl=$lt_lt_prog_compiler_wl
12080-
12081 # Additional compiler flags for building library objects.
12082 pic_flag=$lt_lt_prog_compiler_pic
12083
12084+# How to pass a linker flag through the compiler.
12085+wl=$lt_lt_prog_compiler_wl
12086+
12087 # Compiler flag to prevent dynamic linking.
12088 link_static_flag=$lt_lt_prog_compiler_static
12089
12090@@ -16195,9 +16920,6 @@ inherit_rpath=$inherit_rpath
12091 # Whether libtool must link a program against all its dependency libraries.
12092 link_all_deplibs=$link_all_deplibs
12093
12094-# Fix the shell variable \$srcfile for the compiler.
12095-fix_srcfile_path=$lt_fix_srcfile_path
12096-
12097 # Set to "yes" if exported symbols are required.
12098 always_export_symbols=$always_export_symbols
12099
12100@@ -16213,6 +16935,9 @@ include_expsyms=$lt_include_expsyms
12101 # Commands necessary for linking programs (against libraries) with templates.
12102 prelink_cmds=$lt_prelink_cmds
12103
12104+# Commands necessary for finishing linking programs.
12105+postlink_cmds=$lt_postlink_cmds
12106+
12107 # Specify filename containing input files.
12108 file_list_spec=$lt_file_list_spec
12109
12110@@ -16245,210 +16970,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
12111 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12112 # text mode, it properly converts lines to CR/LF. This bash problem
12113 # is reportedly fixed, but why not run on old versions too?
12114- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
12115- || (rm -f "$cfgfile"; exit 1)
12116-
12117- case $xsi_shell in
12118- yes)
12119- cat << \_LT_EOF >> "$cfgfile"
12120-
12121-# func_dirname file append nondir_replacement
12122-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12123-# otherwise set result to NONDIR_REPLACEMENT.
12124-func_dirname ()
12125-{
12126- case ${1} in
12127- */*) func_dirname_result="${1%/*}${2}" ;;
12128- * ) func_dirname_result="${3}" ;;
12129- esac
12130-}
12131-
12132-# func_basename file
12133-func_basename ()
12134-{
12135- func_basename_result="${1##*/}"
12136-}
12137-
12138-# func_dirname_and_basename file append nondir_replacement
12139-# perform func_basename and func_dirname in a single function
12140-# call:
12141-# dirname: Compute the dirname of FILE. If nonempty,
12142-# add APPEND to the result, otherwise set result
12143-# to NONDIR_REPLACEMENT.
12144-# value returned in "$func_dirname_result"
12145-# basename: Compute filename of FILE.
12146-# value retuned in "$func_basename_result"
12147-# Implementation must be kept synchronized with func_dirname
12148-# and func_basename. For efficiency, we do not delegate to
12149-# those functions but instead duplicate the functionality here.
12150-func_dirname_and_basename ()
12151-{
12152- case ${1} in
12153- */*) func_dirname_result="${1%/*}${2}" ;;
12154- * ) func_dirname_result="${3}" ;;
12155- esac
12156- func_basename_result="${1##*/}"
12157-}
12158-
12159-# func_stripname prefix suffix name
12160-# strip PREFIX and SUFFIX off of NAME.
12161-# PREFIX and SUFFIX must not contain globbing or regex special
12162-# characters, hashes, percent signs, but SUFFIX may contain a leading
12163-# dot (in which case that matches only a dot).
12164-func_stripname ()
12165-{
12166- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
12167- # positional parameters, so assign one to ordinary parameter first.
12168- func_stripname_result=${3}
12169- func_stripname_result=${func_stripname_result#"${1}"}
12170- func_stripname_result=${func_stripname_result%"${2}"}
12171-}
12172-
12173-# func_opt_split
12174-func_opt_split ()
12175-{
12176- func_opt_split_opt=${1%%=*}
12177- func_opt_split_arg=${1#*=}
12178-}
12179-
12180-# func_lo2o object
12181-func_lo2o ()
12182-{
12183- case ${1} in
12184- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
12185- *) func_lo2o_result=${1} ;;
12186- esac
12187-}
12188-
12189-# func_xform libobj-or-source
12190-func_xform ()
12191-{
12192- func_xform_result=${1%.*}.lo
12193-}
12194-
12195-# func_arith arithmetic-term...
12196-func_arith ()
12197-{
12198- func_arith_result=$(( $* ))
12199-}
12200-
12201-# func_len string
12202-# STRING may not start with a hyphen.
12203-func_len ()
12204-{
12205- func_len_result=${#1}
12206-}
12207-
12208-_LT_EOF
12209- ;;
12210- *) # Bourne compatible functions.
12211- cat << \_LT_EOF >> "$cfgfile"
12212-
12213-# func_dirname file append nondir_replacement
12214-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12215-# otherwise set result to NONDIR_REPLACEMENT.
12216-func_dirname ()
12217-{
12218- # Extract subdirectory from the argument.
12219- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12220- if test "X$func_dirname_result" = "X${1}"; then
12221- func_dirname_result="${3}"
12222- else
12223- func_dirname_result="$func_dirname_result${2}"
12224- fi
12225-}
12226-
12227-# func_basename file
12228-func_basename ()
12229-{
12230- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12231-}
12232-
12233-
12234-# func_stripname prefix suffix name
12235-# strip PREFIX and SUFFIX off of NAME.
12236-# PREFIX and SUFFIX must not contain globbing or regex special
12237-# characters, hashes, percent signs, but SUFFIX may contain a leading
12238-# dot (in which case that matches only a dot).
12239-# func_strip_suffix prefix name
12240-func_stripname ()
12241-{
12242- case ${2} in
12243- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12244- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12245- esac
12246-}
12247-
12248-# sed scripts:
12249-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
12250-my_sed_long_arg='1s/^-[^=]*=//'
12251-
12252-# func_opt_split
12253-func_opt_split ()
12254-{
12255- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
12256- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
12257-}
12258-
12259-# func_lo2o object
12260-func_lo2o ()
12261-{
12262- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12263-}
12264-
12265-# func_xform libobj-or-source
12266-func_xform ()
12267-{
12268- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12269-}
12270-
12271-# func_arith arithmetic-term...
12272-func_arith ()
12273-{
12274- func_arith_result=`expr "$@"`
12275-}
12276-
12277-# func_len string
12278-# STRING may not start with a hyphen.
12279-func_len ()
12280-{
12281- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
12282-}
12283-
12284-_LT_EOF
12285-esac
12286-
12287-case $lt_shell_append in
12288- yes)
12289- cat << \_LT_EOF >> "$cfgfile"
12290-
12291-# func_append var value
12292-# Append VALUE to the end of shell variable VAR.
12293-func_append ()
12294-{
12295- eval "$1+=\$2"
12296-}
12297-_LT_EOF
12298- ;;
12299- *)
12300- cat << \_LT_EOF >> "$cfgfile"
12301-
12302-# func_append var value
12303-# Append VALUE to the end of shell variable VAR.
12304-func_append ()
12305-{
12306- eval "$1=\$$1\$2"
12307-}
12308-
12309-_LT_EOF
12310- ;;
12311- esac
12312-
12313-
12314- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
12315- || (rm -f "$cfgfile"; exit 1)
12316-
12317- mv -f "$cfgfile" "$ofile" ||
12318+ sed '$q' "$ltmain" >> "$cfgfile" \
12319+ || (rm -f "$cfgfile"; exit 1)
12320+
12321+ if test x"$xsi_shell" = xyes; then
12322+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
12323+func_dirname ()\
12324+{\
12325+\ case ${1} in\
12326+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12327+\ * ) func_dirname_result="${3}" ;;\
12328+\ esac\
12329+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
12330+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12331+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12332+test 0 -eq $? || _lt_function_replace_fail=:
12333+
12334+
12335+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
12336+func_basename ()\
12337+{\
12338+\ func_basename_result="${1##*/}"\
12339+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
12340+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12341+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12342+test 0 -eq $? || _lt_function_replace_fail=:
12343+
12344+
12345+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
12346+func_dirname_and_basename ()\
12347+{\
12348+\ case ${1} in\
12349+\ */*) func_dirname_result="${1%/*}${2}" ;;\
12350+\ * ) func_dirname_result="${3}" ;;\
12351+\ esac\
12352+\ func_basename_result="${1##*/}"\
12353+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
12354+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12355+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12356+test 0 -eq $? || _lt_function_replace_fail=:
12357+
12358+
12359+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
12360+func_stripname ()\
12361+{\
12362+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
12363+\ # positional parameters, so assign one to ordinary parameter first.\
12364+\ func_stripname_result=${3}\
12365+\ func_stripname_result=${func_stripname_result#"${1}"}\
12366+\ func_stripname_result=${func_stripname_result%"${2}"}\
12367+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
12368+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12369+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12370+test 0 -eq $? || _lt_function_replace_fail=:
12371+
12372+
12373+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
12374+func_split_long_opt ()\
12375+{\
12376+\ func_split_long_opt_name=${1%%=*}\
12377+\ func_split_long_opt_arg=${1#*=}\
12378+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
12379+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12380+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12381+test 0 -eq $? || _lt_function_replace_fail=:
12382+
12383+
12384+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
12385+func_split_short_opt ()\
12386+{\
12387+\ func_split_short_opt_arg=${1#??}\
12388+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
12389+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
12390+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12391+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12392+test 0 -eq $? || _lt_function_replace_fail=:
12393+
12394+
12395+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
12396+func_lo2o ()\
12397+{\
12398+\ case ${1} in\
12399+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
12400+\ *) func_lo2o_result=${1} ;;\
12401+\ esac\
12402+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
12403+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12404+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12405+test 0 -eq $? || _lt_function_replace_fail=:
12406+
12407+
12408+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
12409+func_xform ()\
12410+{\
12411+ func_xform_result=${1%.*}.lo\
12412+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
12413+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12414+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12415+test 0 -eq $? || _lt_function_replace_fail=:
12416+
12417+
12418+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
12419+func_arith ()\
12420+{\
12421+ func_arith_result=$(( $* ))\
12422+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
12423+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12424+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12425+test 0 -eq $? || _lt_function_replace_fail=:
12426+
12427+
12428+ sed -e '/^func_len ()$/,/^} # func_len /c\
12429+func_len ()\
12430+{\
12431+ func_len_result=${#1}\
12432+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
12433+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12434+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12435+test 0 -eq $? || _lt_function_replace_fail=:
12436+
12437+fi
12438+
12439+if test x"$lt_shell_append" = xyes; then
12440+ sed -e '/^func_append ()$/,/^} # func_append /c\
12441+func_append ()\
12442+{\
12443+ eval "${1}+=\\${2}"\
12444+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
12445+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12446+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12447+test 0 -eq $? || _lt_function_replace_fail=:
12448+
12449+
12450+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
12451+func_append_quoted ()\
12452+{\
12453+\ func_quote_for_eval "${2}"\
12454+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
12455+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
12456+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12457+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12458+test 0 -eq $? || _lt_function_replace_fail=:
12459+
12460+
12461+ # Save a `func_append' function call where possible by direct use of '+='
12462+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
12463+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12464+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12465+ test 0 -eq $? || _lt_function_replace_fail=:
12466+else
12467+ # Save a `func_append' function call even when '+=' is not available
12468+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
12469+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12470+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12471+ test 0 -eq $? || _lt_function_replace_fail=:
12472+fi
12473+
12474+if test x"$_lt_function_replace_fail" = x":"; then
12475+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
12476+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
12477+fi
12478+
12479+
12480+ mv -f "$cfgfile" "$ofile" ||
12481 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
12482 chmod +x "$ofile"
12483
10358diff --git a/libctf/configure b/libctf/configure 12484diff --git a/libctf/configure b/libctf/configure
10359index 82bcf13a606..a7fb723a145 100755 12485index de10fef84a1..1b0ee0d32c6 100755
10360--- a/libctf/configure 12486--- a/libctf/configure
10361+++ b/libctf/configure 12487+++ b/libctf/configure
10362@@ -666,6 +666,8 @@ OTOOL 12488@@ -669,6 +669,8 @@ OTOOL
10363 LIPO 12489 LIPO
10364 NMEDIT 12490 NMEDIT
10365 DSYMUTIL 12491 DSYMUTIL
@@ -10368,7 +12494,7 @@ index 82bcf13a606..a7fb723a145 100755
10368 OBJDUMP 12494 OBJDUMP
10369 LN_S 12495 LN_S
10370 NM 12496 NM
10371@@ -797,6 +799,7 @@ enable_static 12497@@ -801,6 +803,7 @@ enable_static
10372 with_pic 12498 with_pic
10373 enable_fast_install 12499 enable_fast_install
10374 with_gnu_ld 12500 with_gnu_ld
@@ -10376,7 +12502,7 @@ index 82bcf13a606..a7fb723a145 100755
10376 enable_libtool_lock 12502 enable_libtool_lock
10377 enable_largefile 12503 enable_largefile
10378 enable_werror_always 12504 enable_werror_always
10379@@ -1460,6 +1463,8 @@ Optional Packages: 12505@@ -1475,6 +1478,8 @@ Optional Packages:
10380 --with-pic try to use only PIC/non-PIC objects [default=use 12506 --with-pic try to use only PIC/non-PIC objects [default=use
10381 both] 12507 both]
10382 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 12508 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -10385,7 +12511,7 @@ index 82bcf13a606..a7fb723a145 100755
10385 --with-system-zlib use installed libz 12511 --with-system-zlib use installed libz
10386 12512
10387 Some influential environment variables: 12513 Some influential environment variables:
10388@@ -5529,8 +5534,8 @@ esac 12514@@ -5583,8 +5588,8 @@ esac
10389 12515
10390 12516
10391 12517
@@ -10396,7 +12522,7 @@ index 82bcf13a606..a7fb723a145 100755
10396 12522
10397 12523
10398 12524
10399@@ -5570,7 +5575,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 12525@@ -5624,7 +5629,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10400 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 12526 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
10401 $as_echo_n "checking how to print strings... " >&6; } 12527 $as_echo_n "checking how to print strings... " >&6; }
10402 # Test print first, because it will be a builtin if present. 12528 # Test print first, because it will be a builtin if present.
@@ -10405,7 +12531,7 @@ index 82bcf13a606..a7fb723a145 100755
10405 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 12531 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10406 ECHO='print -r --' 12532 ECHO='print -r --'
10407 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 12533 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10408@@ -6256,8 +6261,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 12534@@ -6311,8 +6316,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10409 # Try some XSI features 12535 # Try some XSI features
10410 xsi_shell=no 12536 xsi_shell=no
10411 ( _lt_dummy="a/b/c" 12537 ( _lt_dummy="a/b/c"
@@ -10416,7 +12542,7 @@ index 82bcf13a606..a7fb723a145 100755
10416 && eval 'test $(( 1 + 1 )) -eq 2 \ 12542 && eval 'test $(( 1 + 1 )) -eq 2 \
10417 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 12543 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
10418 && xsi_shell=yes 12544 && xsi_shell=yes
10419@@ -6306,6 +6311,80 @@ esac 12545@@ -6361,6 +6366,80 @@ esac
10420 12546
10421 12547
10422 12548
@@ -10497,7 +12623,7 @@ index 82bcf13a606..a7fb723a145 100755
10497 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 12623 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
10498 $as_echo_n "checking for $LD option to reload object files... " >&6; } 12624 $as_echo_n "checking for $LD option to reload object files... " >&6; }
10499 if ${lt_cv_ld_reload_flag+:} false; then : 12625 if ${lt_cv_ld_reload_flag+:} false; then :
10500@@ -6322,6 +6401,11 @@ case $reload_flag in 12626@@ -6377,6 +6456,11 @@ case $reload_flag in
10501 esac 12627 esac
10502 reload_cmds='$LD$reload_flag -o $output$reload_objs' 12628 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10503 case $host_os in 12629 case $host_os in
@@ -10509,7 +12635,7 @@ index 82bcf13a606..a7fb723a145 100755
10509 darwin*) 12635 darwin*)
10510 if test "$GCC" = yes; then 12636 if test "$GCC" = yes; then
10511 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 12637 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10512@@ -6490,7 +6574,8 @@ mingw* | pw32*) 12638@@ -6545,7 +6629,8 @@ mingw* | pw32*)
10513 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 12639 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10514 lt_cv_file_magic_cmd='func_win32_libid' 12640 lt_cv_file_magic_cmd='func_win32_libid'
10515 else 12641 else
@@ -10519,7 +12645,7 @@ index 82bcf13a606..a7fb723a145 100755
10519 lt_cv_file_magic_cmd='$OBJDUMP -f' 12645 lt_cv_file_magic_cmd='$OBJDUMP -f'
10520 fi 12646 fi
10521 ;; 12647 ;;
10522@@ -6644,6 +6729,21 @@ esac 12648@@ -6699,6 +6784,21 @@ esac
10523 fi 12649 fi
10524 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 12650 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10525 $as_echo "$lt_cv_deplibs_check_method" >&6; } 12651 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -10541,7 +12667,7 @@ index 82bcf13a606..a7fb723a145 100755
10541 file_magic_cmd=$lt_cv_file_magic_cmd 12667 file_magic_cmd=$lt_cv_file_magic_cmd
10542 deplibs_check_method=$lt_cv_deplibs_check_method 12668 deplibs_check_method=$lt_cv_deplibs_check_method
10543 test -z "$deplibs_check_method" && deplibs_check_method=unknown 12669 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10544@@ -6659,6 +6759,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 12670@@ -6714,6 +6814,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10545 12671
10546 12672
10547 12673
@@ -10699,7 +12825,7 @@ index 82bcf13a606..a7fb723a145 100755
10699 plugin_option= 12825 plugin_option=
10700 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 12826 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
10701 for plugin in $plugin_names; do 12827 for plugin in $plugin_names; do
10702@@ -6673,8 +6924,10 @@ for plugin in $plugin_names; do 12828@@ -6728,8 +6979,10 @@ for plugin in $plugin_names; do
10703 done 12829 done
10704 12830
10705 if test -n "$ac_tool_prefix"; then 12831 if test -n "$ac_tool_prefix"; then
@@ -10712,7 +12838,7 @@ index 82bcf13a606..a7fb723a145 100755
10712 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 12838 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10713 $as_echo_n "checking for $ac_word... " >&6; } 12839 $as_echo_n "checking for $ac_word... " >&6; }
10714 if ${ac_cv_prog_AR+:} false; then : 12840 if ${ac_cv_prog_AR+:} false; then :
10715@@ -6690,7 +6943,7 @@ do 12841@@ -6745,7 +6998,7 @@ do
10716 test -z "$as_dir" && as_dir=. 12842 test -z "$as_dir" && as_dir=.
10717 for ac_exec_ext in '' $ac_executable_extensions; do 12843 for ac_exec_ext in '' $ac_executable_extensions; do
10718 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 12844 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10721,7 +12847,7 @@ index 82bcf13a606..a7fb723a145 100755
10721 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 12847 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10722 break 2 12848 break 2
10723 fi 12849 fi
10724@@ -6710,11 +6963,15 @@ $as_echo "no" >&6; } 12850@@ -6765,11 +7018,15 @@ $as_echo "no" >&6; }
10725 fi 12851 fi
10726 12852
10727 12853
@@ -10740,7 +12866,7 @@ index 82bcf13a606..a7fb723a145 100755
10740 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 12866 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10741 $as_echo_n "checking for $ac_word... " >&6; } 12867 $as_echo_n "checking for $ac_word... " >&6; }
10742 if ${ac_cv_prog_ac_ct_AR+:} false; then : 12868 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10743@@ -6730,7 +6987,7 @@ do 12869@@ -6785,7 +7042,7 @@ do
10744 test -z "$as_dir" && as_dir=. 12870 test -z "$as_dir" && as_dir=.
10745 for ac_exec_ext in '' $ac_executable_extensions; do 12871 for ac_exec_ext in '' $ac_executable_extensions; do
10746 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 12872 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10749,7 +12875,7 @@ index 82bcf13a606..a7fb723a145 100755
10749 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 12875 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10750 break 2 12876 break 2
10751 fi 12877 fi
10752@@ -6749,6 +7006,10 @@ else 12878@@ -6804,6 +7061,10 @@ else
10753 $as_echo "no" >&6; } 12879 $as_echo "no" >&6; }
10754 fi 12880 fi
10755 12881
@@ -10760,7 +12886,7 @@ index 82bcf13a606..a7fb723a145 100755
10760 if test "x$ac_ct_AR" = x; then 12886 if test "x$ac_ct_AR" = x; then
10761 AR="false" 12887 AR="false"
10762 else 12888 else
10763@@ -6760,25 +7021,19 @@ ac_tool_warned=yes ;; 12889@@ -6815,25 +7076,19 @@ ac_tool_warned=yes ;;
10764 esac 12890 esac
10765 AR=$ac_ct_AR 12891 AR=$ac_ct_AR
10766 fi 12892 fi
@@ -10795,7 +12921,7 @@ index 82bcf13a606..a7fb723a145 100755
10795 12921
10796 12922
10797 12923
10798@@ -6790,6 +7045,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 12924@@ -6845,6 +7100,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
10799 12925
10800 12926
10801 12927
@@ -10860,7 +12986,7 @@ index 82bcf13a606..a7fb723a145 100755
10860 if test -n "$ac_tool_prefix"; then 12986 if test -n "$ac_tool_prefix"; then
10861 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 12987 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
10862 set dummy ${ac_tool_prefix}strip; ac_word=$2 12988 set dummy ${ac_tool_prefix}strip; ac_word=$2
10863@@ -7129,8 +7442,8 @@ esac 12989@@ -7184,8 +7497,8 @@ esac
10864 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 12990 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10865 12991
10866 # Transform an extracted symbol line into symbol name and symbol address 12992 # Transform an extracted symbol line into symbol name and symbol address
@@ -10871,7 +12997,7 @@ index 82bcf13a606..a7fb723a145 100755
10871 12997
10872 # Handle CRLF in mingw tool chain 12998 # Handle CRLF in mingw tool chain
10873 opt_cr= 12999 opt_cr=
10874@@ -7166,6 +7479,7 @@ for ac_symprfx in "" "_"; do 13000@@ -7221,6 +7534,7 @@ for ac_symprfx in "" "_"; do
10875 else 13001 else
10876 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 13002 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10877 fi 13003 fi
@@ -10879,7 +13005,7 @@ index 82bcf13a606..a7fb723a145 100755
10879 13005
10880 # Check to see that the pipe works correctly. 13006 # Check to see that the pipe works correctly.
10881 pipe_works=no 13007 pipe_works=no
10882@@ -7207,6 +7521,18 @@ _LT_EOF 13008@@ -7262,6 +7576,18 @@ _LT_EOF
10883 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 13009 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10884 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 13010 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10885 cat <<_LT_EOF > conftest.$ac_ext 13011 cat <<_LT_EOF > conftest.$ac_ext
@@ -10898,7 +13024,7 @@ index 82bcf13a606..a7fb723a145 100755
10898 #ifdef __cplusplus 13024 #ifdef __cplusplus
10899 extern "C" { 13025 extern "C" {
10900 #endif 13026 #endif
10901@@ -7218,7 +7544,7 @@ _LT_EOF 13027@@ -7273,7 +7599,7 @@ _LT_EOF
10902 cat <<_LT_EOF >> conftest.$ac_ext 13028 cat <<_LT_EOF >> conftest.$ac_ext
10903 13029
10904 /* The mapping between symbol names and symbols. */ 13030 /* The mapping between symbol names and symbols. */
@@ -10907,7 +13033,7 @@ index 82bcf13a606..a7fb723a145 100755
10907 const char *name; 13033 const char *name;
10908 void *address; 13034 void *address;
10909 } 13035 }
10910@@ -7244,8 +7570,8 @@ static const void *lt_preloaded_setup() { 13036@@ -7299,8 +7625,8 @@ static const void *lt_preloaded_setup() {
10911 _LT_EOF 13037 _LT_EOF
10912 # Now try linking the two files. 13038 # Now try linking the two files.
10913 mv conftest.$ac_objext conftstm.$ac_objext 13039 mv conftest.$ac_objext conftstm.$ac_objext
@@ -10918,7 +13044,7 @@ index 82bcf13a606..a7fb723a145 100755
10918 LIBS="conftstm.$ac_objext" 13044 LIBS="conftstm.$ac_objext"
10919 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 13045 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
10920 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 13046 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
10921@@ -7255,8 +7581,8 @@ _LT_EOF 13047@@ -7310,8 +7636,8 @@ _LT_EOF
10922 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 13048 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
10923 pipe_works=yes 13049 pipe_works=yes
10924 fi 13050 fi
@@ -10929,7 +13055,7 @@ index 82bcf13a606..a7fb723a145 100755
10929 else 13055 else
10930 echo "cannot find nm_test_func in $nlist" >&5 13056 echo "cannot find nm_test_func in $nlist" >&5
10931 fi 13057 fi
10932@@ -7293,6 +7619,14 @@ else 13058@@ -7348,6 +7674,14 @@ else
10933 $as_echo "ok" >&6; } 13059 $as_echo "ok" >&6; }
10934 fi 13060 fi
10935 13061
@@ -10944,7 +13070,7 @@ index 82bcf13a606..a7fb723a145 100755
10944 13070
10945 13071
10946 13072
10947@@ -7311,6 +7645,47 @@ fi 13073@@ -7366,6 +7700,47 @@ fi
10948 13074
10949 13075
10950 13076
@@ -10992,7 +13118,7 @@ index 82bcf13a606..a7fb723a145 100755
10992 13118
10993 13119
10994 13120
10995@@ -7520,6 +7895,123 @@ esac 13121@@ -7575,6 +7950,123 @@ esac
10996 13122
10997 need_locks="$enable_libtool_lock" 13123 need_locks="$enable_libtool_lock"
10998 13124
@@ -11116,7 +13242,7 @@ index 82bcf13a606..a7fb723a145 100755
11116 13242
11117 case $host_os in 13243 case $host_os in
11118 rhapsody* | darwin*) 13244 rhapsody* | darwin*)
11119@@ -8083,6 +8575,8 @@ _LT_EOF 13245@@ -8138,6 +8630,8 @@ _LT_EOF
11120 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 13246 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11121 echo "$AR cru libconftest.a conftest.o" >&5 13247 echo "$AR cru libconftest.a conftest.o" >&5
11122 $AR cru libconftest.a conftest.o 2>&5 13248 $AR cru libconftest.a conftest.o 2>&5
@@ -11125,7 +13251,7 @@ index 82bcf13a606..a7fb723a145 100755
11125 cat > conftest.c << _LT_EOF 13251 cat > conftest.c << _LT_EOF
11126 int main() { return 0;} 13252 int main() { return 0;}
11127 _LT_EOF 13253 _LT_EOF
11128@@ -8635,8 +9130,6 @@ fi 13254@@ -8690,8 +9184,6 @@ fi
11129 lt_prog_compiler_pic= 13255 lt_prog_compiler_pic=
11130 lt_prog_compiler_static= 13256 lt_prog_compiler_static=
11131 13257
@@ -11134,7 +13260,7 @@ index 82bcf13a606..a7fb723a145 100755
11134 13260
11135 if test "$GCC" = yes; then 13261 if test "$GCC" = yes; then
11136 lt_prog_compiler_wl='-Wl,' 13262 lt_prog_compiler_wl='-Wl,'
11137@@ -8802,6 +9295,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13263@@ -8857,6 +9349,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11138 lt_prog_compiler_pic='--shared' 13264 lt_prog_compiler_pic='--shared'
11139 lt_prog_compiler_static='--static' 13265 lt_prog_compiler_static='--static'
11140 ;; 13266 ;;
@@ -11147,7 +13273,7 @@ index 82bcf13a606..a7fb723a145 100755
11147 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 13273 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11148 # Portland Group compilers (*not* the Pentium gcc compiler, 13274 # Portland Group compilers (*not* the Pentium gcc compiler,
11149 # which looks to be a dead project) 13275 # which looks to be a dead project)
11150@@ -8864,7 +9363,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13276@@ -8919,7 +9417,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11151 lt_prog_compiler_pic='-KPIC' 13277 lt_prog_compiler_pic='-KPIC'
11152 lt_prog_compiler_static='-Bstatic' 13278 lt_prog_compiler_static='-Bstatic'
11153 case $cc_basename in 13279 case $cc_basename in
@@ -11156,7 +13282,7 @@ index 82bcf13a606..a7fb723a145 100755
11156 lt_prog_compiler_wl='-Qoption ld ';; 13282 lt_prog_compiler_wl='-Qoption ld ';;
11157 *) 13283 *)
11158 lt_prog_compiler_wl='-Wl,';; 13284 lt_prog_compiler_wl='-Wl,';;
11159@@ -8921,13 +9420,17 @@ case $host_os in 13285@@ -8976,13 +9474,17 @@ case $host_os in
11160 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 13286 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11161 ;; 13287 ;;
11162 esac 13288 esac
@@ -11180,7 +13306,7 @@ index 82bcf13a606..a7fb723a145 100755
11180 13306
11181 # 13307 #
11182 # Check to make sure the PIC flag actually works. 13308 # Check to make sure the PIC flag actually works.
11183@@ -8988,6 +9491,11 @@ fi 13309@@ -9043,6 +9545,11 @@ fi
11184 13310
11185 13311
11186 13312
@@ -11192,7 +13318,7 @@ index 82bcf13a606..a7fb723a145 100755
11192 # 13318 #
11193 # Check to make sure the static flag actually works. 13319 # Check to make sure the static flag actually works.
11194 # 13320 #
11195@@ -9338,7 +9846,8 @@ _LT_EOF 13321@@ -9393,7 +9900,8 @@ _LT_EOF
11196 allow_undefined_flag=unsupported 13322 allow_undefined_flag=unsupported
11197 always_export_symbols=no 13323 always_export_symbols=no
11198 enable_shared_with_static_runtimes=yes 13324 enable_shared_with_static_runtimes=yes
@@ -11202,7 +13328,7 @@ index 82bcf13a606..a7fb723a145 100755
11202 13328
11203 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 13329 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11204 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 13330 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11205@@ -9437,12 +9946,12 @@ _LT_EOF 13331@@ -9492,12 +10000,12 @@ _LT_EOF
11206 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 13332 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11207 hardcode_libdir_flag_spec= 13333 hardcode_libdir_flag_spec=
11208 hardcode_libdir_flag_spec_ld='-rpath $libdir' 13334 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -11217,7 +13343,7 @@ index 82bcf13a606..a7fb723a145 100755
11217 fi 13343 fi
11218 ;; 13344 ;;
11219 esac 13345 esac
11220@@ -9456,8 +9965,8 @@ _LT_EOF 13346@@ -9511,8 +10019,8 @@ _LT_EOF
11221 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 13347 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11222 wlarc= 13348 wlarc=
11223 else 13349 else
@@ -11228,7 +13354,7 @@ index 82bcf13a606..a7fb723a145 100755
11228 fi 13354 fi
11229 ;; 13355 ;;
11230 13356
11231@@ -9475,8 +9984,8 @@ _LT_EOF 13357@@ -9530,8 +10038,8 @@ _LT_EOF
11232 13358
11233 _LT_EOF 13359 _LT_EOF
11234 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 13360 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11239,7 +13365,7 @@ index 82bcf13a606..a7fb723a145 100755
11239 else 13365 else
11240 ld_shlibs=no 13366 ld_shlibs=no
11241 fi 13367 fi
11242@@ -9522,8 +10031,8 @@ _LT_EOF 13368@@ -9577,8 +10085,8 @@ _LT_EOF
11243 13369
11244 *) 13370 *)
11245 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 13371 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11250,7 +13376,7 @@ index 82bcf13a606..a7fb723a145 100755
11250 else 13376 else
11251 ld_shlibs=no 13377 ld_shlibs=no
11252 fi 13378 fi
11253@@ -9653,7 +10162,13 @@ _LT_EOF 13379@@ -9708,7 +10216,13 @@ _LT_EOF
11254 allow_undefined_flag='-berok' 13380 allow_undefined_flag='-berok'
11255 # Determine the default libpath from the value encoded in an 13381 # Determine the default libpath from the value encoded in an
11256 # empty executable. 13382 # empty executable.
@@ -11265,7 +13391,7 @@ index 82bcf13a606..a7fb723a145 100755
11265 /* end confdefs.h. */ 13391 /* end confdefs.h. */
11266 13392
11267 int 13393 int
11268@@ -9666,22 +10181,29 @@ main () 13394@@ -9721,22 +10235,29 @@ main ()
11269 _ACEOF 13395 _ACEOF
11270 if ac_fn_c_try_link "$LINENO"; then : 13396 if ac_fn_c_try_link "$LINENO"; then :
11271 13397
@@ -11308,7 +13434,7 @@ index 82bcf13a606..a7fb723a145 100755
11308 13434
11309 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 13435 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11310 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 13436 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11311@@ -9693,7 +10215,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13437@@ -9748,7 +10269,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11312 else 13438 else
11313 # Determine the default libpath from the value encoded in an 13439 # Determine the default libpath from the value encoded in an
11314 # empty executable. 13440 # empty executable.
@@ -11323,7 +13449,7 @@ index 82bcf13a606..a7fb723a145 100755
11323 /* end confdefs.h. */ 13449 /* end confdefs.h. */
11324 13450
11325 int 13451 int
11326@@ -9706,22 +10234,29 @@ main () 13452@@ -9761,22 +10288,29 @@ main ()
11327 _ACEOF 13453 _ACEOF
11328 if ac_fn_c_try_link "$LINENO"; then : 13454 if ac_fn_c_try_link "$LINENO"; then :
11329 13455
@@ -11366,7 +13492,7 @@ index 82bcf13a606..a7fb723a145 100755
11366 13492
11367 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 13493 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11368 # Warning - without using the other run time loading flags, 13494 # Warning - without using the other run time loading flags,
11369@@ -9766,20 +10301,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13495@@ -9821,20 +10355,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11370 # Microsoft Visual C++. 13496 # Microsoft Visual C++.
11371 # hardcode_libdir_flag_spec is actually meaningless, as there is 13497 # hardcode_libdir_flag_spec is actually meaningless, as there is
11372 # no search path for DLLs. 13498 # no search path for DLLs.
@@ -11444,7 +13570,7 @@ index 82bcf13a606..a7fb723a145 100755
11444 ;; 13570 ;;
11445 13571
11446 darwin* | rhapsody*) 13572 darwin* | rhapsody*)
11447@@ -9840,7 +10418,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13573@@ -9895,7 +10472,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11448 13574
11449 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 13575 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11450 freebsd* | dragonfly*) 13576 freebsd* | dragonfly*)
@@ -11453,7 +13579,7 @@ index 82bcf13a606..a7fb723a145 100755
11453 hardcode_libdir_flag_spec='-R$libdir' 13579 hardcode_libdir_flag_spec='-R$libdir'
11454 hardcode_direct=yes 13580 hardcode_direct=yes
11455 hardcode_shlibpath_var=no 13581 hardcode_shlibpath_var=no
11456@@ -9848,7 +10426,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13582@@ -9903,7 +10480,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11457 13583
11458 hpux9*) 13584 hpux9*)
11459 if test "$GCC" = yes; then 13585 if test "$GCC" = yes; then
@@ -11462,7 +13588,7 @@ index 82bcf13a606..a7fb723a145 100755
11462 else 13588 else
11463 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 13589 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11464 fi 13590 fi
11465@@ -9864,7 +10442,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13591@@ -9919,7 +10496,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11466 13592
11467 hpux10*) 13593 hpux10*)
11468 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 13594 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -11471,7 +13597,7 @@ index 82bcf13a606..a7fb723a145 100755
11471 else 13597 else
11472 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 13598 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11473 fi 13599 fi
11474@@ -9888,10 +10466,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13600@@ -9943,10 +10520,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11475 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 13601 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11476 ;; 13602 ;;
11477 ia64*) 13603 ia64*)
@@ -11484,7 +13610,7 @@ index 82bcf13a606..a7fb723a145 100755
11484 ;; 13610 ;;
11485 esac 13611 esac
11486 else 13612 else
11487@@ -9970,23 +10548,36 @@ fi 13613@@ -10025,23 +10602,36 @@ fi
11488 13614
11489 irix5* | irix6* | nonstopux*) 13615 irix5* | irix6* | nonstopux*)
11490 if test "$GCC" = yes; then 13616 if test "$GCC" = yes; then
@@ -11529,7 +13655,7 @@ index 82bcf13a606..a7fb723a145 100755
11529 else 13655 else
11530 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 13656 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
11531 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 13657 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
11532@@ -10071,7 +10662,7 @@ rm -f core conftest.err conftest.$ac_objext \ 13658@@ -10126,7 +10716,7 @@ rm -f core conftest.err conftest.$ac_objext \
11533 osf4* | osf5*) # as osf3* with the addition of -msym flag 13659 osf4* | osf5*) # as osf3* with the addition of -msym flag
11534 if test "$GCC" = yes; then 13660 if test "$GCC" = yes; then
11535 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 13661 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -11538,7 +13664,7 @@ index 82bcf13a606..a7fb723a145 100755
11538 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 13664 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11539 else 13665 else
11540 allow_undefined_flag=' -expect_unresolved \*' 13666 allow_undefined_flag=' -expect_unresolved \*'
11541@@ -10090,9 +10681,9 @@ rm -f core conftest.err conftest.$ac_objext \ 13667@@ -10145,9 +10735,9 @@ rm -f core conftest.err conftest.$ac_objext \
11542 no_undefined_flag=' -z defs' 13668 no_undefined_flag=' -z defs'
11543 if test "$GCC" = yes; then 13669 if test "$GCC" = yes; then
11544 wlarc='${wl}' 13670 wlarc='${wl}'
@@ -11550,7 +13676,7 @@ index 82bcf13a606..a7fb723a145 100755
11550 else 13676 else
11551 case `$CC -V 2>&1` in 13677 case `$CC -V 2>&1` in
11552 *"Compilers 5.0"*) 13678 *"Compilers 5.0"*)
11553@@ -10668,8 +11259,9 @@ cygwin* | mingw* | pw32* | cegcc*) 13679@@ -10723,8 +11313,9 @@ cygwin* | mingw* | pw32* | cegcc*)
11554 need_version=no 13680 need_version=no
11555 need_lib_prefix=no 13681 need_lib_prefix=no
11556 13682
@@ -11562,7 +13688,7 @@ index 82bcf13a606..a7fb723a145 100755
11562 library_names_spec='$libname.dll.a' 13688 library_names_spec='$libname.dll.a'
11563 # DLL is installed to $(libdir)/../bin by postinstall_cmds 13689 # DLL is installed to $(libdir)/../bin by postinstall_cmds
11564 postinstall_cmds='base_file=`basename \${file}`~ 13690 postinstall_cmds='base_file=`basename \${file}`~
11565@@ -10702,13 +11294,71 @@ cygwin* | mingw* | pw32* | cegcc*) 13691@@ -10757,13 +11348,71 @@ cygwin* | mingw* | pw32* | cegcc*)
11566 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 13692 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11567 ;; 13693 ;;
11568 esac 13694 esac
@@ -11635,25 +13761,16 @@ index 82bcf13a606..a7fb723a145 100755
11635 # FIXME: first we should search . and the directory the executable is in 13761 # FIXME: first we should search . and the directory the executable is in
11636 shlibpath_var=PATH 13762 shlibpath_var=PATH
11637 ;; 13763 ;;
11638@@ -10790,7 +11440,7 @@ haiku*) 13764@@ -11641,7 +12290,7 @@ else
11639 soname_spec='${libname}${release}${shared_ext}$major'
11640 shlibpath_var=LIBRARY_PATH
11641 shlibpath_overrides_runpath=yes
11642- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
11643+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
11644 hardcode_into_libs=yes
11645 ;;
11646
11647@@ -11586,7 +12236,7 @@ else
11648 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 13765 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11649 lt_status=$lt_dlunknown 13766 lt_status=$lt_dlunknown
11650 cat > conftest.$ac_ext <<_LT_EOF 13767 cat > conftest.$ac_ext <<_LT_EOF
11651-#line 11589 "configure" 13768-#line 11644 "configure"
11652+#line $LINENO "configure" 13769+#line $LINENO "configure"
11653 #include "confdefs.h" 13770 #include "confdefs.h"
11654 13771
11655 #if HAVE_DLFCN_H 13772 #if HAVE_DLFCN_H
11656@@ -11630,10 +12280,10 @@ else 13773@@ -11685,10 +12334,10 @@ else
11657 /* When -fvisbility=hidden is used, assume the code has been annotated 13774 /* When -fvisbility=hidden is used, assume the code has been annotated
11658 correspondingly for the symbols needed. */ 13775 correspondingly for the symbols needed. */
11659 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 13776 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11666,16 +13783,16 @@ index 82bcf13a606..a7fb723a145 100755
11666 int main () 13783 int main ()
11667 { 13784 {
11668 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 13785 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11669@@ -11692,7 +12342,7 @@ else 13786@@ -11747,7 +12396,7 @@ else
11670 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 13787 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11671 lt_status=$lt_dlunknown 13788 lt_status=$lt_dlunknown
11672 cat > conftest.$ac_ext <<_LT_EOF 13789 cat > conftest.$ac_ext <<_LT_EOF
11673-#line 11695 "configure" 13790-#line 11750 "configure"
11674+#line $LINENO "configure" 13791+#line $LINENO "configure"
11675 #include "confdefs.h" 13792 #include "confdefs.h"
11676 13793
11677 #if HAVE_DLFCN_H 13794 #if HAVE_DLFCN_H
11678@@ -11736,10 +12386,10 @@ else 13795@@ -11791,10 +12440,10 @@ else
11679 /* When -fvisbility=hidden is used, assume the code has been annotated 13796 /* When -fvisbility=hidden is used, assume the code has been annotated
11680 correspondingly for the symbols needed. */ 13797 correspondingly for the symbols needed. */
11681 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 13798 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11688,7 +13805,7 @@ index 82bcf13a606..a7fb723a145 100755
11688 int main () 13805 int main ()
11689 { 13806 {
11690 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 13807 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11691@@ -14286,13 +14936,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 13808@@ -14479,13 +15128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
11692 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 13809 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
11693 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 13810 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
11694 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 13811 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -11709,7 +13826,7 @@ index 82bcf13a606..a7fb723a145 100755
11709 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 13826 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
11710 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 13827 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
11711 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 13828 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
11712@@ -14307,14 +14964,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 13829@@ -14500,14 +15156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
11713 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 13830 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
11714 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 13831 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
11715 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 13832 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -11728,7 +13845,7 @@ index 82bcf13a606..a7fb723a145 100755
11728 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 13845 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
11729 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 13846 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
11730 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 13847 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
11731@@ -14347,12 +15007,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 13848@@ -14540,12 +15199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
11732 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 13849 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
11733 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 13850 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
11734 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 13851 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -11742,7 +13859,7 @@ index 82bcf13a606..a7fb723a145 100755
11742 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 13859 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
11743 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 13860 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
11744 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 13861 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
11745@@ -14407,8 +15067,13 @@ reload_flag \ 13862@@ -14600,8 +15259,13 @@ reload_flag \
11746 OBJDUMP \ 13863 OBJDUMP \
11747 deplibs_check_method \ 13864 deplibs_check_method \
11748 file_magic_cmd \ 13865 file_magic_cmd \
@@ -11756,7 +13873,7 @@ index 82bcf13a606..a7fb723a145 100755
11756 STRIP \ 13873 STRIP \
11757 RANLIB \ 13874 RANLIB \
11758 CC \ 13875 CC \
11759@@ -14418,12 +15083,14 @@ lt_cv_sys_global_symbol_pipe \ 13876@@ -14611,12 +15275,14 @@ lt_cv_sys_global_symbol_pipe \
11760 lt_cv_sys_global_symbol_to_cdecl \ 13877 lt_cv_sys_global_symbol_to_cdecl \
11761 lt_cv_sys_global_symbol_to_c_name_address \ 13878 lt_cv_sys_global_symbol_to_c_name_address \
11762 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 13879 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -11772,7 +13889,7 @@ index 82bcf13a606..a7fb723a145 100755
11772 DSYMUTIL \ 13889 DSYMUTIL \
11773 NMEDIT \ 13890 NMEDIT \
11774 LIPO \ 13891 LIPO \
11775@@ -14439,7 +15106,6 @@ no_undefined_flag \ 13892@@ -14632,7 +15298,6 @@ no_undefined_flag \
11776 hardcode_libdir_flag_spec \ 13893 hardcode_libdir_flag_spec \
11777 hardcode_libdir_flag_spec_ld \ 13894 hardcode_libdir_flag_spec_ld \
11778 hardcode_libdir_separator \ 13895 hardcode_libdir_separator \
@@ -11780,7 +13897,7 @@ index 82bcf13a606..a7fb723a145 100755
11780 exclude_expsyms \ 13897 exclude_expsyms \
11781 include_expsyms \ 13898 include_expsyms \
11782 file_list_spec \ 13899 file_list_spec \
11783@@ -14475,6 +15141,7 @@ module_cmds \ 13900@@ -14668,6 +15333,7 @@ module_cmds \
11784 module_expsym_cmds \ 13901 module_expsym_cmds \
11785 export_symbols_cmds \ 13902 export_symbols_cmds \
11786 prelink_cmds \ 13903 prelink_cmds \
@@ -11788,7 +13905,7 @@ index 82bcf13a606..a7fb723a145 100755
11788 postinstall_cmds \ 13905 postinstall_cmds \
11789 postuninstall_cmds \ 13906 postuninstall_cmds \
11790 finish_cmds \ 13907 finish_cmds \
11791@@ -15231,7 +15898,8 @@ $as_echo X"$file" | 13908@@ -15424,7 +16090,8 @@ $as_echo X"$file" |
11792 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 13909 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
11793 # 13910 #
11794 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 13911 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -11798,7 +13915,7 @@ index 82bcf13a606..a7fb723a145 100755
11798 # Written by Gordon Matzigkeit, 1996 13915 # Written by Gordon Matzigkeit, 1996
11799 # 13916 #
11800 # This file is part of GNU Libtool. 13917 # This file is part of GNU Libtool.
11801@@ -15334,19 +16002,42 @@ SP2NL=$lt_lt_SP2NL 13918@@ -15527,19 +16194,42 @@ SP2NL=$lt_lt_SP2NL
11802 # turn newlines into spaces. 13919 # turn newlines into spaces.
11803 NL2SP=$lt_lt_NL2SP 13920 NL2SP=$lt_lt_NL2SP
11804 13921
@@ -11842,7 +13959,7 @@ index 82bcf13a606..a7fb723a145 100755
11842 # A symbol stripping program. 13959 # A symbol stripping program.
11843 STRIP=$lt_STRIP 13960 STRIP=$lt_STRIP
11844 13961
11845@@ -15376,6 +16067,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 13962@@ -15569,6 +16259,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
11846 # Transform the output of nm in a C name address pair when lib prefix is needed. 13963 # Transform the output of nm in a C name address pair when lib prefix is needed.
11847 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 13964 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
11848 13965
@@ -11855,7 +13972,7 @@ index 82bcf13a606..a7fb723a145 100755
11855 # The name of the directory that contains temporary libtool files. 13972 # The name of the directory that contains temporary libtool files.
11856 objdir=$objdir 13973 objdir=$objdir
11857 13974
11858@@ -15385,6 +16082,9 @@ MAGIC_CMD=$MAGIC_CMD 13975@@ -15578,6 +16274,9 @@ MAGIC_CMD=$MAGIC_CMD
11859 # Must we lock files when doing compilation? 13976 # Must we lock files when doing compilation?
11860 need_locks=$lt_need_locks 13977 need_locks=$lt_need_locks
11861 13978
@@ -11865,7 +13982,7 @@ index 82bcf13a606..a7fb723a145 100755
11865 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 13982 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
11866 DSYMUTIL=$lt_DSYMUTIL 13983 DSYMUTIL=$lt_DSYMUTIL
11867 13984
11868@@ -15499,12 +16199,12 @@ with_gcc=$GCC 13985@@ -15692,12 +16391,12 @@ with_gcc=$GCC
11869 # Compiler flag to turn off builtin functions. 13986 # Compiler flag to turn off builtin functions.
11870 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 13987 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
11871 13988
@@ -11881,7 +13998,7 @@ index 82bcf13a606..a7fb723a145 100755
11881 # Compiler flag to prevent dynamic linking. 13998 # Compiler flag to prevent dynamic linking.
11882 link_static_flag=$lt_lt_prog_compiler_static 13999 link_static_flag=$lt_lt_prog_compiler_static
11883 14000
11884@@ -15591,9 +16291,6 @@ inherit_rpath=$inherit_rpath 14001@@ -15784,9 +16483,6 @@ inherit_rpath=$inherit_rpath
11885 # Whether libtool must link a program against all its dependency libraries. 14002 # Whether libtool must link a program against all its dependency libraries.
11886 link_all_deplibs=$link_all_deplibs 14003 link_all_deplibs=$link_all_deplibs
11887 14004
@@ -11891,7 +14008,7 @@ index 82bcf13a606..a7fb723a145 100755
11891 # Set to "yes" if exported symbols are required. 14008 # Set to "yes" if exported symbols are required.
11892 always_export_symbols=$always_export_symbols 14009 always_export_symbols=$always_export_symbols
11893 14010
11894@@ -15609,6 +16306,9 @@ include_expsyms=$lt_include_expsyms 14011@@ -15802,6 +16498,9 @@ include_expsyms=$lt_include_expsyms
11895 # Commands necessary for linking programs (against libraries) with templates. 14012 # Commands necessary for linking programs (against libraries) with templates.
11896 prelink_cmds=$lt_prelink_cmds 14013 prelink_cmds=$lt_prelink_cmds
11897 14014
@@ -11901,7 +14018,7 @@ index 82bcf13a606..a7fb723a145 100755
11901 # Specify filename containing input files. 14018 # Specify filename containing input files.
11902 file_list_spec=$lt_file_list_spec 14019 file_list_spec=$lt_file_list_spec
11903 14020
11904@@ -15641,210 +16341,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 14021@@ -15834,210 +16533,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
11905 # if finds mixed CR/LF and LF-only lines. Since sed operates in 14022 # if finds mixed CR/LF and LF-only lines. Since sed operates in
11906 # text mode, it properly converts lines to CR/LF. This bash problem 14023 # text mode, it properly converts lines to CR/LF. This bash problem
11907 # is reportedly fixed, but why not run on old versions too? 14024 # is reportedly fixed, but why not run on old versions too?
@@ -12276,7 +14393,7 @@ index 82bcf13a606..a7fb723a145 100755
12276 chmod +x "$ofile" 14393 chmod +x "$ofile"
12277 14394
12278diff --git a/libtool.m4 b/libtool.m4 14395diff --git a/libtool.m4 b/libtool.m4
12279index 9a13f3b117a..5be47564443 100644 14396index a216bb14e99..e37c45ac0b1 100644
12280--- a/libtool.m4 14397--- a/libtool.m4
12281+++ b/libtool.m4 14398+++ b/libtool.m4
12282@@ -1,7 +1,8 @@ 14399@@ -1,7 +1,8 @@
@@ -12308,7 +14425,7 @@ index 9a13f3b117a..5be47564443 100644
12308 14425
12309 14426
12310 # LT_PREREQ(VERSION) 14427 # LT_PREREQ(VERSION)
12311@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl 14428@@ -166,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
12312 dnl 14429 dnl
12313 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 14430 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
12314 m4_require([_LT_CHECK_SHELL_FEATURES])dnl 14431 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
@@ -12322,7 +14439,7 @@ index 9a13f3b117a..5be47564443 100644
12322 14439
12323 _LT_CONFIG_LIBTOOL_INIT([ 14440 _LT_CONFIG_LIBTOOL_INIT([
12324 # See if we are running on zsh, and set the options which allow our 14441 # See if we are running on zsh, and set the options which allow our
12325@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl 14442@@ -632,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
12326 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) 14443 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
12327 configured by $[0], generated by m4_PACKAGE_STRING. 14444 configured by $[0], generated by m4_PACKAGE_STRING.
12328 14445
@@ -12331,7 +14448,7 @@ index 9a13f3b117a..5be47564443 100644
12331 This config.lt script is free software; the Free Software Foundation 14448 This config.lt script is free software; the Free Software Foundation
12332 gives unlimited permision to copy, distribute and modify it." 14449 gives unlimited permision to copy, distribute and modify it."
12333 14450
12334@@ -746,15 +752,12 @@ _LT_EOF 14451@@ -746,15 +751,12 @@ _LT_EOF
12335 # if finds mixed CR/LF and LF-only lines. Since sed operates in 14452 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12336 # text mode, it properly converts lines to CR/LF. This bash problem 14453 # text mode, it properly converts lines to CR/LF. This bash problem
12337 # is reportedly fixed, but why not run on old versions too? 14454 # is reportedly fixed, but why not run on old versions too?
@@ -12351,7 +14468,7 @@ index 9a13f3b117a..5be47564443 100644
12351 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 14468 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
12352 chmod +x "$ofile" 14469 chmod +x "$ofile"
12353 ], 14470 ],
12354@@ -980,6 +983,8 @@ _LT_EOF 14471@@ -980,6 +982,8 @@ _LT_EOF
12355 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD 14472 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
12356 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD 14473 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
12357 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD 14474 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
@@ -12360,7 +14477,7 @@ index 9a13f3b117a..5be47564443 100644
12360 cat > conftest.c << _LT_EOF 14477 cat > conftest.c << _LT_EOF
12361 int main() { return 0;} 14478 int main() { return 0;}
12362 _LT_EOF 14479 _LT_EOF
12363@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], 14480@@ -1069,30 +1073,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
12364 fi 14481 fi
12365 ]) 14482 ])
12366 14483
@@ -12418,7 +14535,7 @@ index 9a13f3b117a..5be47564443 100644
12418 ])# _LT_SYS_MODULE_PATH_AIX 14535 ])# _LT_SYS_MODULE_PATH_AIX
12419 14536
12420 14537
12421@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 14538@@ -1117,7 +1132,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
12422 14539
12423 AC_MSG_CHECKING([how to print strings]) 14540 AC_MSG_CHECKING([how to print strings])
12424 # Test print first, because it will be a builtin if present. 14541 # Test print first, because it will be a builtin if present.
@@ -12427,7 +14544,7 @@ index 9a13f3b117a..5be47564443 100644
12427 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 14544 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
12428 ECHO='print -r --' 14545 ECHO='print -r --'
12429 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 14546 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
12430@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) 14547@@ -1161,6 +1176,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
12431 ])# _LT_PROG_ECHO_BACKSLASH 14548 ])# _LT_PROG_ECHO_BACKSLASH
12432 14549
12433 14550
@@ -12467,7 +14584,7 @@ index 9a13f3b117a..5be47564443 100644
12467 # _LT_ENABLE_LOCK 14584 # _LT_ENABLE_LOCK
12468 # --------------- 14585 # ---------------
12469 m4_defun([_LT_ENABLE_LOCK], 14586 m4_defun([_LT_ENABLE_LOCK],
12470@@ -1320,6 +1369,51 @@ need_locks="$enable_libtool_lock" 14587@@ -1320,6 +1368,51 @@ need_locks="$enable_libtool_lock"
12471 ])# _LT_ENABLE_LOCK 14588 ])# _LT_ENABLE_LOCK
12472 14589
12473 14590
@@ -12519,7 +14636,7 @@ index 9a13f3b117a..5be47564443 100644
12519 # _LT_CMD_OLD_ARCHIVE 14636 # _LT_CMD_OLD_ARCHIVE
12520 # ------------------- 14637 # -------------------
12521 m4_defun([_LT_CMD_OLD_ARCHIVE], 14638 m4_defun([_LT_CMD_OLD_ARCHIVE],
12522@@ -1336,23 +1430,7 @@ for plugin in $plugin_names; do 14639@@ -1336,23 +1429,7 @@ for plugin in $plugin_names; do
12523 fi 14640 fi
12524 done 14641 done
12525 14642
@@ -12544,7 +14661,7 @@ index 9a13f3b117a..5be47564443 100644
12544 14661
12545 AC_CHECK_TOOL(STRIP, strip, :) 14662 AC_CHECK_TOOL(STRIP, strip, :)
12546 test -z "$STRIP" && STRIP=: 14663 test -z "$STRIP" && STRIP=:
12547@@ -1653,7 +1731,7 @@ else 14664@@ -1653,7 +1730,7 @@ else
12548 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14665 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12549 lt_status=$lt_dlunknown 14666 lt_status=$lt_dlunknown
12550 cat > conftest.$ac_ext <<_LT_EOF 14667 cat > conftest.$ac_ext <<_LT_EOF
@@ -12553,7 +14670,7 @@ index 9a13f3b117a..5be47564443 100644
12553 #include "confdefs.h" 14670 #include "confdefs.h"
12554 14671
12555 #if HAVE_DLFCN_H 14672 #if HAVE_DLFCN_H
12556@@ -1697,10 +1775,10 @@ else 14673@@ -1697,10 +1774,10 @@ else
12557 /* When -fvisbility=hidden is used, assume the code has been annotated 14674 /* When -fvisbility=hidden is used, assume the code has been annotated
12558 correspondingly for the symbols needed. */ 14675 correspondingly for the symbols needed. */
12559 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14676 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -12566,7 +14683,7 @@ index 9a13f3b117a..5be47564443 100644
12566 int main () 14683 int main ()
12567 { 14684 {
12568 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14685 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12569@@ -2240,8 +2318,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14686@@ -2240,8 +2317,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12570 need_version=no 14687 need_version=no
12571 need_lib_prefix=no 14688 need_lib_prefix=no
12572 14689
@@ -12578,7 +14695,7 @@ index 9a13f3b117a..5be47564443 100644
12578 library_names_spec='$libname.dll.a' 14695 library_names_spec='$libname.dll.a'
12579 # DLL is installed to $(libdir)/../bin by postinstall_cmds 14696 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12580 postinstall_cmds='base_file=`basename \${file}`~ 14697 postinstall_cmds='base_file=`basename \${file}`~
12581@@ -2274,13 +2353,71 @@ m4_if([$1], [],[ 14698@@ -2274,13 +2352,71 @@ m4_if([$1], [],[
12582 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 14699 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
12583 ;; 14700 ;;
12584 esac 14701 esac
@@ -12651,16 +14768,7 @@ index 9a13f3b117a..5be47564443 100644
12651 # FIXME: first we should search . and the directory the executable is in 14768 # FIXME: first we should search . and the directory the executable is in
12652 shlibpath_var=PATH 14769 shlibpath_var=PATH
12653 ;; 14770 ;;
12654@@ -2362,7 +2499,7 @@ haiku*) 14771@@ -2970,6 +3106,11 @@ case $reload_flag in
12655 soname_spec='${libname}${release}${shared_ext}$major'
12656 shlibpath_var=LIBRARY_PATH
12657 shlibpath_overrides_runpath=yes
12658- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
12659+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
12660 hardcode_into_libs=yes
12661 ;;
12662
12663@@ -2970,6 +3107,11 @@ case $reload_flag in
12664 esac 14772 esac
12665 reload_cmds='$LD$reload_flag -o $output$reload_objs' 14773 reload_cmds='$LD$reload_flag -o $output$reload_objs'
12666 case $host_os in 14774 case $host_os in
@@ -12672,7 +14780,7 @@ index 9a13f3b117a..5be47564443 100644
12672 darwin*) 14780 darwin*)
12673 if test "$GCC" = yes; then 14781 if test "$GCC" = yes; then
12674 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 14782 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
12675@@ -3036,7 +3178,8 @@ mingw* | pw32*) 14783@@ -3036,7 +3177,8 @@ mingw* | pw32*)
12676 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 14784 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
12677 lt_cv_file_magic_cmd='func_win32_libid' 14785 lt_cv_file_magic_cmd='func_win32_libid'
12678 else 14786 else
@@ -12682,7 +14790,7 @@ index 9a13f3b117a..5be47564443 100644
12682 lt_cv_file_magic_cmd='$OBJDUMP -f' 14790 lt_cv_file_magic_cmd='$OBJDUMP -f'
12683 fi 14791 fi
12684 ;; 14792 ;;
12685@@ -3187,6 +3330,21 @@ tpf*) 14793@@ -3187,6 +3329,21 @@ tpf*)
12686 ;; 14794 ;;
12687 esac 14795 esac
12688 ]) 14796 ])
@@ -12704,7 +14812,7 @@ index 9a13f3b117a..5be47564443 100644
12704 file_magic_cmd=$lt_cv_file_magic_cmd 14812 file_magic_cmd=$lt_cv_file_magic_cmd
12705 deplibs_check_method=$lt_cv_deplibs_check_method 14813 deplibs_check_method=$lt_cv_deplibs_check_method
12706 test -z "$deplibs_check_method" && deplibs_check_method=unknown 14814 test -z "$deplibs_check_method" && deplibs_check_method=unknown
12707@@ -3194,7 +3352,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 14815@@ -3194,7 +3351,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
12708 _LT_DECL([], [deplibs_check_method], [1], 14816 _LT_DECL([], [deplibs_check_method], [1],
12709 [Method to check whether dependent libraries are shared objects]) 14817 [Method to check whether dependent libraries are shared objects])
12710 _LT_DECL([], [file_magic_cmd], [1], 14818 _LT_DECL([], [file_magic_cmd], [1],
@@ -12717,7 +14825,7 @@ index 9a13f3b117a..5be47564443 100644
12717 ])# _LT_CHECK_MAGIC_METHOD 14825 ])# _LT_CHECK_MAGIC_METHOD
12718 14826
12719 14827
12720@@ -3297,6 +3459,67 @@ dnl aclocal-1.4 backwards compatibility: 14828@@ -3299,6 +3460,67 @@ dnl aclocal-1.4 backwards compatibility:
12721 dnl AC_DEFUN([AM_PROG_NM], []) 14829 dnl AC_DEFUN([AM_PROG_NM], [])
12722 dnl AC_DEFUN([AC_PROG_NM], []) 14830 dnl AC_DEFUN([AC_PROG_NM], [])
12723 14831
@@ -12785,7 +14893,7 @@ index 9a13f3b117a..5be47564443 100644
12785 14893
12786 # LT_LIB_M 14894 # LT_LIB_M
12787 # -------- 14895 # --------
12788@@ -3423,8 +3646,8 @@ esac 14896@@ -3425,8 +3647,8 @@ esac
12789 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 14897 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
12790 14898
12791 # Transform an extracted symbol line into symbol name and symbol address 14899 # Transform an extracted symbol line into symbol name and symbol address
@@ -12796,7 +14904,7 @@ index 9a13f3b117a..5be47564443 100644
12796 14904
12797 # Handle CRLF in mingw tool chain 14905 # Handle CRLF in mingw tool chain
12798 opt_cr= 14906 opt_cr=
12799@@ -3460,6 +3683,7 @@ for ac_symprfx in "" "_"; do 14907@@ -3462,6 +3684,7 @@ for ac_symprfx in "" "_"; do
12800 else 14908 else
12801 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 14909 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
12802 fi 14910 fi
@@ -12804,7 +14912,7 @@ index 9a13f3b117a..5be47564443 100644
12804 14912
12805 # Check to see that the pipe works correctly. 14913 # Check to see that the pipe works correctly.
12806 pipe_works=no 14914 pipe_works=no
12807@@ -3493,6 +3717,18 @@ _LT_EOF 14915@@ -3495,6 +3718,18 @@ _LT_EOF
12808 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 14916 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
12809 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 14917 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
12810 cat <<_LT_EOF > conftest.$ac_ext 14918 cat <<_LT_EOF > conftest.$ac_ext
@@ -12823,7 +14931,7 @@ index 9a13f3b117a..5be47564443 100644
12823 #ifdef __cplusplus 14931 #ifdef __cplusplus
12824 extern "C" { 14932 extern "C" {
12825 #endif 14933 #endif
12826@@ -3504,7 +3740,7 @@ _LT_EOF 14934@@ -3506,7 +3741,7 @@ _LT_EOF
12827 cat <<_LT_EOF >> conftest.$ac_ext 14935 cat <<_LT_EOF >> conftest.$ac_ext
12828 14936
12829 /* The mapping between symbol names and symbols. */ 14937 /* The mapping between symbol names and symbols. */
@@ -12832,7 +14940,7 @@ index 9a13f3b117a..5be47564443 100644
12832 const char *name; 14940 const char *name;
12833 void *address; 14941 void *address;
12834 } 14942 }
12835@@ -3530,15 +3766,15 @@ static const void *lt_preloaded_setup() { 14943@@ -3532,15 +3767,15 @@ static const void *lt_preloaded_setup() {
12836 _LT_EOF 14944 _LT_EOF
12837 # Now try linking the two files. 14945 # Now try linking the two files.
12838 mv conftest.$ac_objext conftstm.$ac_objext 14946 mv conftest.$ac_objext conftstm.$ac_objext
@@ -12852,7 +14960,7 @@ index 9a13f3b117a..5be47564443 100644
12852 else 14960 else
12853 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD 14961 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
12854 fi 14962 fi
12855@@ -3571,6 +3807,13 @@ else 14963@@ -3573,6 +3808,13 @@ else
12856 AC_MSG_RESULT(ok) 14964 AC_MSG_RESULT(ok)
12857 fi 14965 fi
12858 14966
@@ -12866,7 +14974,7 @@ index 9a13f3b117a..5be47564443 100644
12866 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 14974 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
12867 [Take the output of nm and produce a listing of raw symbols and C names]) 14975 [Take the output of nm and produce a listing of raw symbols and C names])
12868 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 14976 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
12869@@ -3581,6 +3824,8 @@ _LT_DECL([global_symbol_to_c_name_address], 14977@@ -3583,6 +3825,8 @@ _LT_DECL([global_symbol_to_c_name_address],
12870 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 14978 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
12871 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 14979 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
12872 [Transform the output of nm in a C name address pair when lib prefix is needed]) 14980 [Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -12875,7 +14983,7 @@ index 9a13f3b117a..5be47564443 100644
12875 ]) # _LT_CMD_GLOBAL_SYMBOLS 14983 ]) # _LT_CMD_GLOBAL_SYMBOLS
12876 14984
12877 14985
12878@@ -3592,7 +3837,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= 14986@@ -3594,7 +3838,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
12879 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 14987 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
12880 _LT_TAGVAR(lt_prog_compiler_static, $1)= 14988 _LT_TAGVAR(lt_prog_compiler_static, $1)=
12881 14989
@@ -12883,7 +14991,7 @@ index 9a13f3b117a..5be47564443 100644
12883 m4_if([$1], [CXX], [ 14991 m4_if([$1], [CXX], [
12884 # C++ specific cases for pic, static, wl, etc. 14992 # C++ specific cases for pic, static, wl, etc.
12885 if test "$GXX" = yes; then 14993 if test "$GXX" = yes; then
12886@@ -3698,6 +3942,12 @@ m4_if([$1], [CXX], [ 14994@@ -3700,6 +3943,12 @@ m4_if([$1], [CXX], [
12887 ;; 14995 ;;
12888 esac 14996 esac
12889 ;; 14997 ;;
@@ -12896,7 +15004,7 @@ index 9a13f3b117a..5be47564443 100644
12896 dgux*) 15004 dgux*)
12897 case $cc_basename in 15005 case $cc_basename in
12898 ec++*) 15006 ec++*)
12899@@ -3850,7 +4100,7 @@ m4_if([$1], [CXX], [ 15007@@ -3852,7 +4101,7 @@ m4_if([$1], [CXX], [
12900 ;; 15008 ;;
12901 solaris*) 15009 solaris*)
12902 case $cc_basename in 15010 case $cc_basename in
@@ -12905,7 +15013,7 @@ index 9a13f3b117a..5be47564443 100644
12905 # Sun C++ 4.2, 5.x and Centerline C++ 15013 # Sun C++ 4.2, 5.x and Centerline C++
12906 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 15014 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12907 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 15015 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12908@@ -4073,6 +4323,12 @@ m4_if([$1], [CXX], [ 15016@@ -4075,6 +4324,12 @@ m4_if([$1], [CXX], [
12909 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' 15017 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
12910 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' 15018 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
12911 ;; 15019 ;;
@@ -12918,7 +15026,7 @@ index 9a13f3b117a..5be47564443 100644
12918 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 15026 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
12919 # Portland Group compilers (*not* the Pentium gcc compiler, 15027 # Portland Group compilers (*not* the Pentium gcc compiler,
12920 # which looks to be a dead project) 15028 # which looks to be a dead project)
12921@@ -4135,7 +4391,7 @@ m4_if([$1], [CXX], [ 15029@@ -4137,7 +4392,7 @@ m4_if([$1], [CXX], [
12922 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 15030 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12923 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 15031 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12924 case $cc_basename in 15032 case $cc_basename in
@@ -12927,7 +15035,7 @@ index 9a13f3b117a..5be47564443 100644
12927 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; 15035 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
12928 *) 15036 *)
12929 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; 15037 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
12930@@ -4192,9 +4448,11 @@ case $host_os in 15038@@ -4194,9 +4449,11 @@ case $host_os in
12931 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" 15039 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
12932 ;; 15040 ;;
12933 esac 15041 esac
@@ -12942,7 +15050,7 @@ index 9a13f3b117a..5be47564443 100644
12942 15050
12943 # 15051 #
12944 # Check to make sure the PIC flag actually works. 15052 # Check to make sure the PIC flag actually works.
12945@@ -4213,6 +4471,8 @@ fi 15053@@ -4215,6 +4472,8 @@ fi
12946 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], 15054 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
12947 [Additional compiler flags for building library objects]) 15055 [Additional compiler flags for building library objects])
12948 15056
@@ -12951,7 +15059,7 @@ index 9a13f3b117a..5be47564443 100644
12951 # 15059 #
12952 # Check to make sure the static flag actually works. 15060 # Check to make sure the static flag actually works.
12953 # 15061 #
12954@@ -4233,6 +4493,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 15062@@ -4235,6 +4494,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
12955 m4_defun([_LT_LINKER_SHLIBS], 15063 m4_defun([_LT_LINKER_SHLIBS],
12956 [AC_REQUIRE([LT_PATH_LD])dnl 15064 [AC_REQUIRE([LT_PATH_LD])dnl
12957 AC_REQUIRE([LT_PATH_NM])dnl 15065 AC_REQUIRE([LT_PATH_NM])dnl
@@ -12959,7 +15067,7 @@ index 9a13f3b117a..5be47564443 100644
12959 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 15067 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
12960 m4_require([_LT_DECL_EGREP])dnl 15068 m4_require([_LT_DECL_EGREP])dnl
12961 m4_require([_LT_DECL_SED])dnl 15069 m4_require([_LT_DECL_SED])dnl
12962@@ -4241,6 +4502,7 @@ m4_require([_LT_TAG_COMPILER])dnl 15070@@ -4243,6 +4503,7 @@ m4_require([_LT_TAG_COMPILER])dnl
12963 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) 15071 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
12964 m4_if([$1], [CXX], [ 15072 m4_if([$1], [CXX], [
12965 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 15073 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -12967,7 +15075,7 @@ index 9a13f3b117a..5be47564443 100644
12967 case $host_os in 15075 case $host_os in
12968 aix[[4-9]]*) 15076 aix[[4-9]]*)
12969 # If we're using GNU nm, then we don't want the "-C" option. 15077 # If we're using GNU nm, then we don't want the "-C" option.
12970@@ -4255,15 +4517,20 @@ m4_if([$1], [CXX], [ 15078@@ -4257,15 +4518,20 @@ m4_if([$1], [CXX], [
12971 ;; 15079 ;;
12972 pw32*) 15080 pw32*)
12973 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 15081 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
@@ -12993,7 +15101,7 @@ index 9a13f3b117a..5be47564443 100644
12993 ], [ 15101 ], [
12994 runpath_var= 15102 runpath_var=
12995 _LT_TAGVAR(allow_undefined_flag, $1)= 15103 _LT_TAGVAR(allow_undefined_flag, $1)=
12996@@ -4431,7 +4698,8 @@ _LT_EOF 15104@@ -4433,7 +4699,8 @@ _LT_EOF
12997 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 15105 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
12998 _LT_TAGVAR(always_export_symbols, $1)=no 15106 _LT_TAGVAR(always_export_symbols, $1)=no
12999 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 15107 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -13003,7 +15111,7 @@ index 9a13f3b117a..5be47564443 100644
13003 15111
13004 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 15112 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
13005 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 15113 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13006@@ -4530,12 +4798,12 @@ _LT_EOF 15114@@ -4532,12 +4799,12 @@ _LT_EOF
13007 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 15115 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
13008 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 15116 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
13009 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' 15117 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
@@ -13018,7 +15126,7 @@ index 9a13f3b117a..5be47564443 100644
13018 fi 15126 fi
13019 ;; 15127 ;;
13020 esac 15128 esac
13021@@ -4549,8 +4817,8 @@ _LT_EOF 15129@@ -4551,8 +4818,8 @@ _LT_EOF
13022 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 15130 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13023 wlarc= 15131 wlarc=
13024 else 15132 else
@@ -13029,7 +15137,7 @@ index 9a13f3b117a..5be47564443 100644
13029 fi 15137 fi
13030 ;; 15138 ;;
13031 15139
13032@@ -4568,8 +4836,8 @@ _LT_EOF 15140@@ -4570,8 +4837,8 @@ _LT_EOF
13033 15141
13034 _LT_EOF 15142 _LT_EOF
13035 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 15143 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13040,7 +15148,7 @@ index 9a13f3b117a..5be47564443 100644
13040 else 15148 else
13041 _LT_TAGVAR(ld_shlibs, $1)=no 15149 _LT_TAGVAR(ld_shlibs, $1)=no
13042 fi 15150 fi
13043@@ -4615,8 +4883,8 @@ _LT_EOF 15151@@ -4617,8 +4884,8 @@ _LT_EOF
13044 15152
13045 *) 15153 *)
13046 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 15154 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13051,7 +15159,7 @@ index 9a13f3b117a..5be47564443 100644
13051 else 15159 else
13052 _LT_TAGVAR(ld_shlibs, $1)=no 15160 _LT_TAGVAR(ld_shlibs, $1)=no
13053 fi 15161 fi
13054@@ -4746,7 +5014,7 @@ _LT_EOF 15162@@ -4748,7 +5015,7 @@ _LT_EOF
13055 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 15163 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
13056 # Determine the default libpath from the value encoded in an 15164 # Determine the default libpath from the value encoded in an
13057 # empty executable. 15165 # empty executable.
@@ -13060,7 +15168,7 @@ index 9a13f3b117a..5be47564443 100644
13060 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 15168 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13061 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 15169 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
13062 else 15170 else
13063@@ -4757,7 +5025,7 @@ _LT_EOF 15171@@ -4759,7 +5026,7 @@ _LT_EOF
13064 else 15172 else
13065 # Determine the default libpath from the value encoded in an 15173 # Determine the default libpath from the value encoded in an
13066 # empty executable. 15174 # empty executable.
@@ -13069,7 +15177,7 @@ index 9a13f3b117a..5be47564443 100644
13069 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 15177 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13070 # Warning - without using the other run time loading flags, 15178 # Warning - without using the other run time loading flags,
13071 # -berok will link without error, but may produce a broken library. 15179 # -berok will link without error, but may produce a broken library.
13072@@ -4801,20 +5069,63 @@ _LT_EOF 15180@@ -4803,20 +5070,63 @@ _LT_EOF
13073 # Microsoft Visual C++. 15181 # Microsoft Visual C++.
13074 # hardcode_libdir_flag_spec is actually meaningless, as there is 15182 # hardcode_libdir_flag_spec is actually meaningless, as there is
13075 # no search path for DLLs. 15183 # no search path for DLLs.
@@ -13147,7 +15255,7 @@ index 9a13f3b117a..5be47564443 100644
13147 ;; 15255 ;;
13148 15256
13149 darwin* | rhapsody*) 15257 darwin* | rhapsody*)
13150@@ -4848,7 +5159,7 @@ _LT_EOF 15258@@ -4850,7 +5160,7 @@ _LT_EOF
13151 15259
13152 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 15260 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
13153 freebsd* | dragonfly*) 15261 freebsd* | dragonfly*)
@@ -13156,7 +15264,7 @@ index 9a13f3b117a..5be47564443 100644
13156 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 15264 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
13157 _LT_TAGVAR(hardcode_direct, $1)=yes 15265 _LT_TAGVAR(hardcode_direct, $1)=yes
13158 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 15266 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
13159@@ -4856,7 +5167,7 @@ _LT_EOF 15267@@ -4858,7 +5168,7 @@ _LT_EOF
13160 15268
13161 hpux9*) 15269 hpux9*)
13162 if test "$GCC" = yes; then 15270 if test "$GCC" = yes; then
@@ -13165,7 +15273,7 @@ index 9a13f3b117a..5be47564443 100644
13165 else 15273 else
13166 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 15274 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
13167 fi 15275 fi
13168@@ -4872,7 +5183,7 @@ _LT_EOF 15276@@ -4874,7 +5184,7 @@ _LT_EOF
13169 15277
13170 hpux10*) 15278 hpux10*)
13171 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 15279 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -13174,7 +15282,7 @@ index 9a13f3b117a..5be47564443 100644
13174 else 15282 else
13175 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 15283 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
13176 fi 15284 fi
13177@@ -4896,10 +5207,10 @@ _LT_EOF 15285@@ -4898,10 +5208,10 @@ _LT_EOF
13178 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 15286 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
13179 ;; 15287 ;;
13180 ia64*) 15288 ia64*)
@@ -13187,7 +15295,7 @@ index 9a13f3b117a..5be47564443 100644
13187 ;; 15295 ;;
13188 esac 15296 esac
13189 else 15297 else
13190@@ -4946,16 +5257,31 @@ _LT_EOF 15298@@ -4948,16 +5258,31 @@ _LT_EOF
13191 15299
13192 irix5* | irix6* | nonstopux*) 15300 irix5* | irix6* | nonstopux*)
13193 if test "$GCC" = yes; then 15301 if test "$GCC" = yes; then
@@ -13226,7 +15334,7 @@ index 9a13f3b117a..5be47564443 100644
13226 else 15334 else
13227 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 15335 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
13228 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 15336 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
13229@@ -5040,7 +5366,7 @@ _LT_EOF 15337@@ -5042,7 +5367,7 @@ _LT_EOF
13230 osf4* | osf5*) # as osf3* with the addition of -msym flag 15338 osf4* | osf5*) # as osf3* with the addition of -msym flag
13231 if test "$GCC" = yes; then 15339 if test "$GCC" = yes; then
13232 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 15340 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -13235,7 +15343,7 @@ index 9a13f3b117a..5be47564443 100644
13235 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 15343 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
13236 else 15344 else
13237 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 15345 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
13238@@ -5059,9 +5385,9 @@ _LT_EOF 15346@@ -5061,9 +5386,9 @@ _LT_EOF
13239 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' 15347 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
13240 if test "$GCC" = yes; then 15348 if test "$GCC" = yes; then
13241 wlarc='${wl}' 15349 wlarc='${wl}'
@@ -13247,7 +15355,7 @@ index 9a13f3b117a..5be47564443 100644
13247 else 15355 else
13248 case `$CC -V 2>&1` in 15356 case `$CC -V 2>&1` in
13249 *"Compilers 5.0"*) 15357 *"Compilers 5.0"*)
13250@@ -5333,8 +5659,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], 15358@@ -5335,8 +5660,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
13251 to runtime path list]) 15359 to runtime path list])
13252 _LT_TAGDECL([], [link_all_deplibs], [0], 15360 _LT_TAGDECL([], [link_all_deplibs], [0],
13253 [Whether libtool must link a program against all its dependency libraries]) 15361 [Whether libtool must link a program against all its dependency libraries])
@@ -13256,7 +15364,7 @@ index 9a13f3b117a..5be47564443 100644
13256 _LT_TAGDECL([], [always_export_symbols], [0], 15364 _LT_TAGDECL([], [always_export_symbols], [0],
13257 [Set to "yes" if exported symbols are required]) 15365 [Set to "yes" if exported symbols are required])
13258 _LT_TAGDECL([], [export_symbols_cmds], [2], 15366 _LT_TAGDECL([], [export_symbols_cmds], [2],
13259@@ -5345,6 +5669,8 @@ _LT_TAGDECL([], [include_expsyms], [1], 15367@@ -5347,6 +5670,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
13260 [Symbols that must always be exported]) 15368 [Symbols that must always be exported])
13261 _LT_TAGDECL([], [prelink_cmds], [2], 15369 _LT_TAGDECL([], [prelink_cmds], [2],
13262 [Commands necessary for linking programs (against libraries) with templates]) 15370 [Commands necessary for linking programs (against libraries) with templates])
@@ -13265,7 +15373,7 @@ index 9a13f3b117a..5be47564443 100644
13265 _LT_TAGDECL([], [file_list_spec], [1], 15373 _LT_TAGDECL([], [file_list_spec], [1],
13266 [Specify filename containing input files]) 15374 [Specify filename containing input files])
13267 dnl FIXME: Not yet implemented 15375 dnl FIXME: Not yet implemented
13268@@ -5446,6 +5772,7 @@ CC="$lt_save_CC" 15376@@ -5448,6 +5773,7 @@ CC="$lt_save_CC"
13269 m4_defun([_LT_LANG_CXX_CONFIG], 15377 m4_defun([_LT_LANG_CXX_CONFIG],
13270 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 15378 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
13271 m4_require([_LT_DECL_EGREP])dnl 15379 m4_require([_LT_DECL_EGREP])dnl
@@ -13273,7 +15381,7 @@ index 9a13f3b117a..5be47564443 100644
13273 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 15381 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
13274 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 15382 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
13275 (test "X$CXX" != "Xg++"))) ; then 15383 (test "X$CXX" != "Xg++"))) ; then
13276@@ -5507,6 +5834,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15384@@ -5509,6 +5835,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13277 15385
13278 # Allow CC to be a program name with arguments. 15386 # Allow CC to be a program name with arguments.
13279 lt_save_CC=$CC 15387 lt_save_CC=$CC
@@ -13281,7 +15389,7 @@ index 9a13f3b117a..5be47564443 100644
13281 lt_save_LD=$LD 15389 lt_save_LD=$LD
13282 lt_save_GCC=$GCC 15390 lt_save_GCC=$GCC
13283 GCC=$GXX 15391 GCC=$GXX
13284@@ -5524,6 +5852,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15392@@ -5526,6 +5853,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13285 fi 15393 fi
13286 test -z "${LDCXX+set}" || LD=$LDCXX 15394 test -z "${LDCXX+set}" || LD=$LDCXX
13287 CC=${CXX-"c++"} 15395 CC=${CXX-"c++"}
@@ -13289,7 +15397,7 @@ index 9a13f3b117a..5be47564443 100644
13289 compiler=$CC 15397 compiler=$CC
13290 _LT_TAGVAR(compiler, $1)=$CC 15398 _LT_TAGVAR(compiler, $1)=$CC
13291 _LT_CC_BASENAME([$compiler]) 15399 _LT_CC_BASENAME([$compiler])
13292@@ -5687,7 +6016,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15400@@ -5689,7 +6017,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13293 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 15401 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
13294 # Determine the default libpath from the value encoded in an empty 15402 # Determine the default libpath from the value encoded in an empty
13295 # executable. 15403 # executable.
@@ -13298,7 +15406,7 @@ index 9a13f3b117a..5be47564443 100644
13298 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 15406 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13299 15407
13300 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 15408 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
13301@@ -5699,7 +6028,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15409@@ -5701,7 +6029,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13302 else 15410 else
13303 # Determine the default libpath from the value encoded in an 15411 # Determine the default libpath from the value encoded in an
13304 # empty executable. 15412 # empty executable.
@@ -13307,7 +15415,7 @@ index 9a13f3b117a..5be47564443 100644
13307 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 15415 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13308 # Warning - without using the other run time loading flags, 15416 # Warning - without using the other run time loading flags,
13309 # -berok will link without error, but may produce a broken library. 15417 # -berok will link without error, but may produce a broken library.
13310@@ -5741,29 +6070,75 @@ if test "$_lt_caught_CXX_error" != yes; then 15418@@ -5743,29 +6071,75 @@ if test "$_lt_caught_CXX_error" != yes; then
13311 ;; 15419 ;;
13312 15420
13313 cygwin* | mingw* | pw32* | cegcc*) 15421 cygwin* | mingw* | pw32* | cegcc*)
@@ -13406,7 +15514,7 @@ index 9a13f3b117a..5be47564443 100644
13406 darwin* | rhapsody*) 15514 darwin* | rhapsody*)
13407 _LT_DARWIN_LINKER_FEATURES($1) 15515 _LT_DARWIN_LINKER_FEATURES($1)
13408 ;; 15516 ;;
13409@@ -5838,7 +6213,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15517@@ -5840,7 +6214,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13410 ;; 15518 ;;
13411 *) 15519 *)
13412 if test "$GXX" = yes; then 15520 if test "$GXX" = yes; then
@@ -13415,7 +15523,7 @@ index 9a13f3b117a..5be47564443 100644
13415 else 15523 else
13416 # FIXME: insert proper C++ library support 15524 # FIXME: insert proper C++ library support
13417 _LT_TAGVAR(ld_shlibs, $1)=no 15525 _LT_TAGVAR(ld_shlibs, $1)=no
13418@@ -5909,10 +6284,10 @@ if test "$_lt_caught_CXX_error" != yes; then 15526@@ -5911,10 +6285,10 @@ if test "$_lt_caught_CXX_error" != yes; then
13419 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 15527 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
13420 ;; 15528 ;;
13421 ia64*) 15529 ia64*)
@@ -13428,7 +15536,7 @@ index 9a13f3b117a..5be47564443 100644
13428 ;; 15536 ;;
13429 esac 15537 esac
13430 fi 15538 fi
13431@@ -5953,9 +6328,9 @@ if test "$_lt_caught_CXX_error" != yes; then 15539@@ -5955,9 +6329,9 @@ if test "$_lt_caught_CXX_error" != yes; then
13432 *) 15540 *)
13433 if test "$GXX" = yes; then 15541 if test "$GXX" = yes; then
13434 if test "$with_gnu_ld" = no; then 15542 if test "$with_gnu_ld" = no; then
@@ -13440,7 +15548,7 @@ index 9a13f3b117a..5be47564443 100644
13440 fi 15548 fi
13441 fi 15549 fi
13442 _LT_TAGVAR(link_all_deplibs, $1)=yes 15550 _LT_TAGVAR(link_all_deplibs, $1)=yes
13443@@ -6025,20 +6400,20 @@ if test "$_lt_caught_CXX_error" != yes; then 15551@@ -6027,20 +6401,20 @@ if test "$_lt_caught_CXX_error" != yes; then
13444 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 15552 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
13445 rm -rf $tpldir~ 15553 rm -rf $tpldir~
13446 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 15554 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -13465,7 +15573,7 @@ index 9a13f3b117a..5be47564443 100644
13465 ;; 15573 ;;
13466 *) # Version 6 and above use weak symbols 15574 *) # Version 6 and above use weak symbols
13467 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 15575 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
13468@@ -6233,7 +6608,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15576@@ -6235,7 +6609,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13469 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 15577 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
13470 ;; 15578 ;;
13471 *) 15579 *)
@@ -13474,7 +15582,7 @@ index 9a13f3b117a..5be47564443 100644
13474 ;; 15582 ;;
13475 esac 15583 esac
13476 15584
13477@@ -6279,7 +6654,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15585@@ -6281,7 +6655,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13478 15586
13479 solaris*) 15587 solaris*)
13480 case $cc_basename in 15588 case $cc_basename in
@@ -13483,7 +15591,7 @@ index 9a13f3b117a..5be47564443 100644
13483 # Sun C++ 4.2, 5.x and Centerline C++ 15591 # Sun C++ 4.2, 5.x and Centerline C++
13484 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 15592 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
13485 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 15593 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
13486@@ -6320,9 +6695,9 @@ if test "$_lt_caught_CXX_error" != yes; then 15594@@ -6322,9 +6696,9 @@ if test "$_lt_caught_CXX_error" != yes; then
13487 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 15595 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
13488 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 15596 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
13489 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 15597 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -13495,7 +15603,7 @@ index 9a13f3b117a..5be47564443 100644
13495 15603
13496 # Commands to make compiler produce verbose output that lists 15604 # Commands to make compiler produce verbose output that lists
13497 # what "hidden" libraries, object files and flags are used when 15605 # what "hidden" libraries, object files and flags are used when
13498@@ -6451,6 +6826,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15606@@ -6453,6 +6827,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13499 fi # test -n "$compiler" 15607 fi # test -n "$compiler"
13500 15608
13501 CC=$lt_save_CC 15609 CC=$lt_save_CC
@@ -13503,7 +15611,7 @@ index 9a13f3b117a..5be47564443 100644
13503 LDCXX=$LD 15611 LDCXX=$LD
13504 LD=$lt_save_LD 15612 LD=$lt_save_LD
13505 GCC=$lt_save_GCC 15613 GCC=$lt_save_GCC
13506@@ -6465,6 +6841,29 @@ AC_LANG_POP 15614@@ -6467,6 +6842,29 @@ AC_LANG_POP
13507 ])# _LT_LANG_CXX_CONFIG 15615 ])# _LT_LANG_CXX_CONFIG
13508 15616
13509 15617
@@ -13533,7 +15641,7 @@ index 9a13f3b117a..5be47564443 100644
13533 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) 15641 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
13534 # --------------------------------- 15642 # ---------------------------------
13535 # Figure out "hidden" library dependencies from verbose 15643 # Figure out "hidden" library dependencies from verbose
13536@@ -6473,6 +6872,7 @@ AC_LANG_POP 15644@@ -6475,6 +6873,7 @@ AC_LANG_POP
13537 # objects, libraries and library flags. 15645 # objects, libraries and library flags.
13538 m4_defun([_LT_SYS_HIDDEN_LIBDEPS], 15646 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
13539 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 15647 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -13541,7 +15649,7 @@ index 9a13f3b117a..5be47564443 100644
13541 # Dependencies to place before and after the object being linked: 15649 # Dependencies to place before and after the object being linked:
13542 _LT_TAGVAR(predep_objects, $1)= 15650 _LT_TAGVAR(predep_objects, $1)=
13543 _LT_TAGVAR(postdep_objects, $1)= 15651 _LT_TAGVAR(postdep_objects, $1)=
13544@@ -6523,6 +6923,13 @@ public class foo { 15652@@ -6525,6 +6924,13 @@ public class foo {
13545 }; 15653 };
13546 _LT_EOF 15654 _LT_EOF
13547 ]) 15655 ])
@@ -13555,7 +15663,7 @@ index 9a13f3b117a..5be47564443 100644
13555 dnl Parse the compiler output and extract the necessary 15663 dnl Parse the compiler output and extract the necessary
13556 dnl objects, libraries and library flags. 15664 dnl objects, libraries and library flags.
13557 if AC_TRY_EVAL(ac_compile); then 15665 if AC_TRY_EVAL(ac_compile); then
13558@@ -6534,7 +6941,7 @@ if AC_TRY_EVAL(ac_compile); then 15666@@ -6536,7 +6942,7 @@ if AC_TRY_EVAL(ac_compile); then
13559 pre_test_object_deps_done=no 15667 pre_test_object_deps_done=no
13560 15668
13561 for p in `eval "$output_verbose_link_cmd"`; do 15669 for p in `eval "$output_verbose_link_cmd"`; do
@@ -13564,7 +15672,7 @@ index 9a13f3b117a..5be47564443 100644
13564 15672
13565 -L* | -R* | -l*) 15673 -L* | -R* | -l*)
13566 # Some compilers place space between "-{L,R}" and the path. 15674 # Some compilers place space between "-{L,R}" and the path.
13567@@ -6543,13 +6950,22 @@ if AC_TRY_EVAL(ac_compile); then 15675@@ -6545,13 +6951,22 @@ if AC_TRY_EVAL(ac_compile); then
13568 test $p = "-R"; then 15676 test $p = "-R"; then
13569 prev=$p 15677 prev=$p
13570 continue 15678 continue
@@ -13591,7 +15699,7 @@ index 9a13f3b117a..5be47564443 100644
13591 # Internal compiler library paths should come after those 15699 # Internal compiler library paths should come after those
13592 # provided the user. The postdeps already come after the 15700 # provided the user. The postdeps already come after the
13593 # user supplied libs so there is no need to process them. 15701 # user supplied libs so there is no need to process them.
13594@@ -6569,8 +6985,10 @@ if AC_TRY_EVAL(ac_compile); then 15702@@ -6571,8 +6986,10 @@ if AC_TRY_EVAL(ac_compile); then
13595 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" 15703 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
13596 fi 15704 fi
13597 fi 15705 fi
@@ -13602,7 +15710,7 @@ index 9a13f3b117a..5be47564443 100644
13602 *.$objext) 15710 *.$objext)
13603 # This assumes that the test object file only shows up 15711 # This assumes that the test object file only shows up
13604 # once in the compiler output. 15712 # once in the compiler output.
13605@@ -6606,6 +7024,7 @@ else 15713@@ -6608,6 +7025,7 @@ else
13606 fi 15714 fi
13607 15715
13608 $RM -f confest.$objext 15716 $RM -f confest.$objext
@@ -13610,7 +15718,7 @@ index 9a13f3b117a..5be47564443 100644
13610 15718
13611 # PORTME: override above test on systems where it is broken 15719 # PORTME: override above test on systems where it is broken
13612 m4_if([$1], [CXX], 15720 m4_if([$1], [CXX],
13613@@ -6642,7 +7061,7 @@ linux*) 15721@@ -6644,7 +7062,7 @@ linux*)
13614 15722
13615 solaris*) 15723 solaris*)
13616 case $cc_basename in 15724 case $cc_basename in
@@ -13619,7 +15727,7 @@ index 9a13f3b117a..5be47564443 100644
13619 # The more standards-conforming stlport4 library is 15727 # The more standards-conforming stlport4 library is
13620 # incompatible with the Cstd library. Avoid specifying 15728 # incompatible with the Cstd library. Avoid specifying
13621 # it if it's in CXXFLAGS. Ignore libCrun as 15729 # it if it's in CXXFLAGS. Ignore libCrun as
13622@@ -6755,7 +7174,9 @@ if test "$_lt_disable_F77" != yes; then 15730@@ -6757,7 +7175,9 @@ if test "$_lt_disable_F77" != yes; then
13623 # Allow CC to be a program name with arguments. 15731 # Allow CC to be a program name with arguments.
13624 lt_save_CC="$CC" 15732 lt_save_CC="$CC"
13625 lt_save_GCC=$GCC 15733 lt_save_GCC=$GCC
@@ -13629,7 +15737,7 @@ index 9a13f3b117a..5be47564443 100644
13629 compiler=$CC 15737 compiler=$CC
13630 _LT_TAGVAR(compiler, $1)=$CC 15738 _LT_TAGVAR(compiler, $1)=$CC
13631 _LT_CC_BASENAME([$compiler]) 15739 _LT_CC_BASENAME([$compiler])
13632@@ -6809,6 +7230,7 @@ if test "$_lt_disable_F77" != yes; then 15740@@ -6811,6 +7231,7 @@ if test "$_lt_disable_F77" != yes; then
13633 15741
13634 GCC=$lt_save_GCC 15742 GCC=$lt_save_GCC
13635 CC="$lt_save_CC" 15743 CC="$lt_save_CC"
@@ -13637,7 +15745,7 @@ index 9a13f3b117a..5be47564443 100644
13637 fi # test "$_lt_disable_F77" != yes 15745 fi # test "$_lt_disable_F77" != yes
13638 15746
13639 AC_LANG_POP 15747 AC_LANG_POP
13640@@ -6885,7 +7307,9 @@ if test "$_lt_disable_FC" != yes; then 15748@@ -6887,7 +7308,9 @@ if test "$_lt_disable_FC" != yes; then
13641 # Allow CC to be a program name with arguments. 15749 # Allow CC to be a program name with arguments.
13642 lt_save_CC="$CC" 15750 lt_save_CC="$CC"
13643 lt_save_GCC=$GCC 15751 lt_save_GCC=$GCC
@@ -13647,7 +15755,7 @@ index 9a13f3b117a..5be47564443 100644
13647 compiler=$CC 15755 compiler=$CC
13648 GCC=$ac_cv_fc_compiler_gnu 15756 GCC=$ac_cv_fc_compiler_gnu
13649 15757
13650@@ -6941,7 +7365,8 @@ if test "$_lt_disable_FC" != yes; then 15758@@ -6943,7 +7366,8 @@ if test "$_lt_disable_FC" != yes; then
13651 fi # test -n "$compiler" 15759 fi # test -n "$compiler"
13652 15760
13653 GCC=$lt_save_GCC 15761 GCC=$lt_save_GCC
@@ -13657,7 +15765,7 @@ index 9a13f3b117a..5be47564443 100644
13657 fi # test "$_lt_disable_FC" != yes 15765 fi # test "$_lt_disable_FC" != yes
13658 15766
13659 AC_LANG_POP 15767 AC_LANG_POP
13660@@ -6978,10 +7403,12 @@ _LT_COMPILER_BOILERPLATE 15768@@ -6980,10 +7404,12 @@ _LT_COMPILER_BOILERPLATE
13661 _LT_LINKER_BOILERPLATE 15769 _LT_LINKER_BOILERPLATE
13662 15770
13663 # Allow CC to be a program name with arguments. 15771 # Allow CC to be a program name with arguments.
@@ -13671,7 +15779,7 @@ index 9a13f3b117a..5be47564443 100644
13671 compiler=$CC 15779 compiler=$CC
13672 _LT_TAGVAR(compiler, $1)=$CC 15780 _LT_TAGVAR(compiler, $1)=$CC
13673 _LT_TAGVAR(LD, $1)="$LD" 15781 _LT_TAGVAR(LD, $1)="$LD"
13674@@ -7012,7 +7439,8 @@ fi 15782@@ -7014,7 +7440,8 @@ fi
13675 AC_LANG_RESTORE 15783 AC_LANG_RESTORE
13676 15784
13677 GCC=$lt_save_GCC 15785 GCC=$lt_save_GCC
@@ -13681,7 +15789,7 @@ index 9a13f3b117a..5be47564443 100644
13681 ])# _LT_LANG_GCJ_CONFIG 15789 ])# _LT_LANG_GCJ_CONFIG
13682 15790
13683 15791
13684@@ -7047,9 +7475,11 @@ _LT_LINKER_BOILERPLATE 15792@@ -7049,9 +7476,11 @@ _LT_LINKER_BOILERPLATE
13685 15793
13686 # Allow CC to be a program name with arguments. 15794 # Allow CC to be a program name with arguments.
13687 lt_save_CC="$CC" 15795 lt_save_CC="$CC"
@@ -13693,7 +15801,7 @@ index 9a13f3b117a..5be47564443 100644
13693 compiler=$CC 15801 compiler=$CC
13694 _LT_TAGVAR(compiler, $1)=$CC 15802 _LT_TAGVAR(compiler, $1)=$CC
13695 _LT_CC_BASENAME([$compiler]) 15803 _LT_CC_BASENAME([$compiler])
13696@@ -7062,7 +7492,8 @@ fi 15804@@ -7064,7 +7493,8 @@ fi
13697 15805
13698 GCC=$lt_save_GCC 15806 GCC=$lt_save_GCC
13699 AC_LANG_RESTORE 15807 AC_LANG_RESTORE
@@ -13703,7 +15811,7 @@ index 9a13f3b117a..5be47564443 100644
13703 ])# _LT_LANG_RC_CONFIG 15811 ])# _LT_LANG_RC_CONFIG
13704 15812
13705 15813
13706@@ -7121,6 +7552,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 15814@@ -7123,6 +7553,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
13707 AC_SUBST([OBJDUMP]) 15815 AC_SUBST([OBJDUMP])
13708 ]) 15816 ])
13709 15817
@@ -13719,7 +15827,7 @@ index 9a13f3b117a..5be47564443 100644
13719 15827
13720 # _LT_DECL_SED 15828 # _LT_DECL_SED
13721 # ------------ 15829 # ------------
13722@@ -7214,8 +7654,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], 15830@@ -7216,8 +7655,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
13723 # Try some XSI features 15831 # Try some XSI features
13724 xsi_shell=no 15832 xsi_shell=no
13725 ( _lt_dummy="a/b/c" 15833 ( _lt_dummy="a/b/c"
@@ -13730,7 +15838,7 @@ index 9a13f3b117a..5be47564443 100644
13730 && eval 'test $(( 1 + 1 )) -eq 2 \ 15838 && eval 'test $(( 1 + 1 )) -eq 2 \
13731 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 15839 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
13732 && xsi_shell=yes 15840 && xsi_shell=yes
13733@@ -7254,206 +7694,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 15841@@ -7256,206 +7695,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
13734 ])# _LT_CHECK_SHELL_FEATURES 15842 ])# _LT_CHECK_SHELL_FEATURES
13735 15843
13736 15844
@@ -19364,10 +21472,10 @@ index bf92b5e0790..c573da90c5c 100644
19364 # These exist entirely to fool aclocal when bootstrapping libtool. 21472 # These exist entirely to fool aclocal when bootstrapping libtool.
19365 # 21473 #
19366diff --git a/opcodes/configure b/opcodes/configure 21474diff --git a/opcodes/configure b/opcodes/configure
19367index 3513e408ce1..133948631e9 100755 21475index 6690a502b2f..badcc0776df 100755
19368--- a/opcodes/configure 21476--- a/opcodes/configure
19369+++ b/opcodes/configure 21477+++ b/opcodes/configure
19370@@ -680,6 +680,9 @@ OTOOL 21478@@ -682,6 +682,9 @@ OTOOL
19371 LIPO 21479 LIPO
19372 NMEDIT 21480 NMEDIT
19373 DSYMUTIL 21481 DSYMUTIL
@@ -19377,7 +21485,7 @@ index 3513e408ce1..133948631e9 100755
19377 OBJDUMP 21485 OBJDUMP
19378 LN_S 21486 LN_S
19379 NM 21487 NM
19380@@ -798,6 +801,7 @@ enable_static 21488@@ -800,6 +803,7 @@ enable_static
19381 with_pic 21489 with_pic
19382 enable_fast_install 21490 enable_fast_install
19383 with_gnu_ld 21491 with_gnu_ld
@@ -19385,7 +21493,7 @@ index 3513e408ce1..133948631e9 100755
19385 enable_libtool_lock 21493 enable_libtool_lock
19386 enable_checking 21494 enable_checking
19387 enable_targets 21495 enable_targets
19388@@ -1464,6 +1468,8 @@ Optional Packages: 21496@@ -1468,6 +1472,8 @@ Optional Packages:
19389 --with-pic try to use only PIC/non-PIC objects [default=use 21497 --with-pic try to use only PIC/non-PIC objects [default=use
19390 both] 21498 both]
19391 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 21499 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -19394,7 +21502,7 @@ index 3513e408ce1..133948631e9 100755
19394 21502
19395 Some influential environment variables: 21503 Some influential environment variables:
19396 CC C compiler command 21504 CC C compiler command
19397@@ -4751,8 +4757,8 @@ esac 21505@@ -4977,8 +4983,8 @@ esac
19398 21506
19399 21507
19400 21508
@@ -19405,7 +21513,7 @@ index 3513e408ce1..133948631e9 100755
19405 21513
19406 21514
19407 21515
19408@@ -4792,7 +4798,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 21516@@ -5018,7 +5024,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19409 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 21517 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19410 $as_echo_n "checking how to print strings... " >&6; } 21518 $as_echo_n "checking how to print strings... " >&6; }
19411 # Test print first, because it will be a builtin if present. 21519 # Test print first, because it will be a builtin if present.
@@ -19414,7 +21522,7 @@ index 3513e408ce1..133948631e9 100755
19414 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 21522 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19415 ECHO='print -r --' 21523 ECHO='print -r --'
19416 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 21524 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19417@@ -5478,8 +5484,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 21525@@ -5705,8 +5711,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19418 # Try some XSI features 21526 # Try some XSI features
19419 xsi_shell=no 21527 xsi_shell=no
19420 ( _lt_dummy="a/b/c" 21528 ( _lt_dummy="a/b/c"
@@ -19425,7 +21533,7 @@ index 3513e408ce1..133948631e9 100755
19425 && eval 'test $(( 1 + 1 )) -eq 2 \ 21533 && eval 'test $(( 1 + 1 )) -eq 2 \
19426 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 21534 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19427 && xsi_shell=yes 21535 && xsi_shell=yes
19428@@ -5528,6 +5534,80 @@ esac 21536@@ -5755,6 +5761,80 @@ esac
19429 21537
19430 21538
19431 21539
@@ -19506,7 +21614,7 @@ index 3513e408ce1..133948631e9 100755
19506 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 21614 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19507 $as_echo_n "checking for $LD option to reload object files... " >&6; } 21615 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19508 if ${lt_cv_ld_reload_flag+:} false; then : 21616 if ${lt_cv_ld_reload_flag+:} false; then :
19509@@ -5544,6 +5624,11 @@ case $reload_flag in 21617@@ -5771,6 +5851,11 @@ case $reload_flag in
19510 esac 21618 esac
19511 reload_cmds='$LD$reload_flag -o $output$reload_objs' 21619 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19512 case $host_os in 21620 case $host_os in
@@ -19518,7 +21626,7 @@ index 3513e408ce1..133948631e9 100755
19518 darwin*) 21626 darwin*)
19519 if test "$GCC" = yes; then 21627 if test "$GCC" = yes; then
19520 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 21628 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19521@@ -5712,7 +5797,8 @@ mingw* | pw32*) 21629@@ -5939,7 +6024,8 @@ mingw* | pw32*)
19522 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 21630 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19523 lt_cv_file_magic_cmd='func_win32_libid' 21631 lt_cv_file_magic_cmd='func_win32_libid'
19524 else 21632 else
@@ -19528,7 +21636,7 @@ index 3513e408ce1..133948631e9 100755
19528 lt_cv_file_magic_cmd='$OBJDUMP -f' 21636 lt_cv_file_magic_cmd='$OBJDUMP -f'
19529 fi 21637 fi
19530 ;; 21638 ;;
19531@@ -5866,6 +5952,21 @@ esac 21639@@ -6093,6 +6179,21 @@ esac
19532 fi 21640 fi
19533 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 21641 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19534 $as_echo "$lt_cv_deplibs_check_method" >&6; } 21642 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -19550,7 +21658,7 @@ index 3513e408ce1..133948631e9 100755
19550 file_magic_cmd=$lt_cv_file_magic_cmd 21658 file_magic_cmd=$lt_cv_file_magic_cmd
19551 deplibs_check_method=$lt_cv_deplibs_check_method 21659 deplibs_check_method=$lt_cv_deplibs_check_method
19552 test -z "$deplibs_check_method" && deplibs_check_method=unknown 21660 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19553@@ -5881,6 +5982,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 21661@@ -6108,6 +6209,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19554 21662
19555 21663
19556 21664
@@ -19708,7 +21816,7 @@ index 3513e408ce1..133948631e9 100755
19708 plugin_option= 21816 plugin_option=
19709 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 21817 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
19710 for plugin in $plugin_names; do 21818 for plugin in $plugin_names; do
19711@@ -5895,8 +6147,10 @@ for plugin in $plugin_names; do 21819@@ -6122,8 +6374,10 @@ for plugin in $plugin_names; do
19712 done 21820 done
19713 21821
19714 if test -n "$ac_tool_prefix"; then 21822 if test -n "$ac_tool_prefix"; then
@@ -19721,7 +21829,7 @@ index 3513e408ce1..133948631e9 100755
19721 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21829 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19722 $as_echo_n "checking for $ac_word... " >&6; } 21830 $as_echo_n "checking for $ac_word... " >&6; }
19723 if ${ac_cv_prog_AR+:} false; then : 21831 if ${ac_cv_prog_AR+:} false; then :
19724@@ -5912,7 +6166,7 @@ do 21832@@ -6139,7 +6393,7 @@ do
19725 test -z "$as_dir" && as_dir=. 21833 test -z "$as_dir" && as_dir=.
19726 for ac_exec_ext in '' $ac_executable_extensions; do 21834 for ac_exec_ext in '' $ac_executable_extensions; do
19727 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21835 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -19730,7 +21838,7 @@ index 3513e408ce1..133948631e9 100755
19730 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21838 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19731 break 2 21839 break 2
19732 fi 21840 fi
19733@@ -5932,11 +6186,15 @@ $as_echo "no" >&6; } 21841@@ -6159,11 +6413,15 @@ $as_echo "no" >&6; }
19734 fi 21842 fi
19735 21843
19736 21844
@@ -19749,7 +21857,7 @@ index 3513e408ce1..133948631e9 100755
19749 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21857 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19750 $as_echo_n "checking for $ac_word... " >&6; } 21858 $as_echo_n "checking for $ac_word... " >&6; }
19751 if ${ac_cv_prog_ac_ct_AR+:} false; then : 21859 if ${ac_cv_prog_ac_ct_AR+:} false; then :
19752@@ -5952,7 +6210,7 @@ do 21860@@ -6179,7 +6437,7 @@ do
19753 test -z "$as_dir" && as_dir=. 21861 test -z "$as_dir" && as_dir=.
19754 for ac_exec_ext in '' $ac_executable_extensions; do 21862 for ac_exec_ext in '' $ac_executable_extensions; do
19755 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21863 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -19758,7 +21866,7 @@ index 3513e408ce1..133948631e9 100755
19758 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21866 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19759 break 2 21867 break 2
19760 fi 21868 fi
19761@@ -5971,6 +6229,10 @@ else 21869@@ -6198,6 +6456,10 @@ else
19762 $as_echo "no" >&6; } 21870 $as_echo "no" >&6; }
19763 fi 21871 fi
19764 21872
@@ -19769,7 +21877,7 @@ index 3513e408ce1..133948631e9 100755
19769 if test "x$ac_ct_AR" = x; then 21877 if test "x$ac_ct_AR" = x; then
19770 AR="false" 21878 AR="false"
19771 else 21879 else
19772@@ -5982,25 +6244,20 @@ ac_tool_warned=yes ;; 21880@@ -6209,25 +6471,20 @@ ac_tool_warned=yes ;;
19773 esac 21881 esac
19774 AR=$ac_ct_AR 21882 AR=$ac_ct_AR
19775 fi 21883 fi
@@ -19805,7 +21913,7 @@ index 3513e408ce1..133948631e9 100755
19805 21913
19806 21914
19807 21915
19808@@ -6011,6 +6268,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 21916@@ -6238,6 +6495,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
19809 21917
19810 21918
19811 21919
@@ -19869,7 +21977,7 @@ index 3513e408ce1..133948631e9 100755
19869 21977
19870 if test -n "$ac_tool_prefix"; then 21978 if test -n "$ac_tool_prefix"; then
19871 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 21979 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
19872@@ -6351,8 +6665,8 @@ esac 21980@@ -6578,8 +6892,8 @@ esac
19873 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 21981 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19874 21982
19875 # Transform an extracted symbol line into symbol name and symbol address 21983 # Transform an extracted symbol line into symbol name and symbol address
@@ -19880,7 +21988,7 @@ index 3513e408ce1..133948631e9 100755
19880 21988
19881 # Handle CRLF in mingw tool chain 21989 # Handle CRLF in mingw tool chain
19882 opt_cr= 21990 opt_cr=
19883@@ -6388,6 +6702,7 @@ for ac_symprfx in "" "_"; do 21991@@ -6615,6 +6929,7 @@ for ac_symprfx in "" "_"; do
19884 else 21992 else
19885 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 21993 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19886 fi 21994 fi
@@ -19888,7 +21996,7 @@ index 3513e408ce1..133948631e9 100755
19888 21996
19889 # Check to see that the pipe works correctly. 21997 # Check to see that the pipe works correctly.
19890 pipe_works=no 21998 pipe_works=no
19891@@ -6429,6 +6744,18 @@ _LT_EOF 21999@@ -6656,6 +6971,18 @@ _LT_EOF
19892 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 22000 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19893 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 22001 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19894 cat <<_LT_EOF > conftest.$ac_ext 22002 cat <<_LT_EOF > conftest.$ac_ext
@@ -19907,7 +22015,7 @@ index 3513e408ce1..133948631e9 100755
19907 #ifdef __cplusplus 22015 #ifdef __cplusplus
19908 extern "C" { 22016 extern "C" {
19909 #endif 22017 #endif
19910@@ -6440,7 +6767,7 @@ _LT_EOF 22018@@ -6667,7 +6994,7 @@ _LT_EOF
19911 cat <<_LT_EOF >> conftest.$ac_ext 22019 cat <<_LT_EOF >> conftest.$ac_ext
19912 22020
19913 /* The mapping between symbol names and symbols. */ 22021 /* The mapping between symbol names and symbols. */
@@ -19916,7 +22024,7 @@ index 3513e408ce1..133948631e9 100755
19916 const char *name; 22024 const char *name;
19917 void *address; 22025 void *address;
19918 } 22026 }
19919@@ -6466,8 +6793,8 @@ static const void *lt_preloaded_setup() { 22027@@ -6693,8 +7020,8 @@ static const void *lt_preloaded_setup() {
19920 _LT_EOF 22028 _LT_EOF
19921 # Now try linking the two files. 22029 # Now try linking the two files.
19922 mv conftest.$ac_objext conftstm.$ac_objext 22030 mv conftest.$ac_objext conftstm.$ac_objext
@@ -19927,7 +22035,7 @@ index 3513e408ce1..133948631e9 100755
19927 LIBS="conftstm.$ac_objext" 22035 LIBS="conftstm.$ac_objext"
19928 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 22036 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19929 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 22037 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19930@@ -6477,8 +6804,8 @@ _LT_EOF 22038@@ -6704,8 +7031,8 @@ _LT_EOF
19931 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 22039 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19932 pipe_works=yes 22040 pipe_works=yes
19933 fi 22041 fi
@@ -19938,7 +22046,7 @@ index 3513e408ce1..133948631e9 100755
19938 else 22046 else
19939 echo "cannot find nm_test_func in $nlist" >&5 22047 echo "cannot find nm_test_func in $nlist" >&5
19940 fi 22048 fi
19941@@ -6515,6 +6842,14 @@ else 22049@@ -6742,6 +7069,14 @@ else
19942 $as_echo "ok" >&6; } 22050 $as_echo "ok" >&6; }
19943 fi 22051 fi
19944 22052
@@ -19953,7 +22061,7 @@ index 3513e408ce1..133948631e9 100755
19953 22061
19954 22062
19955 22063
19956@@ -6533,6 +6868,47 @@ fi 22064@@ -6760,6 +7095,47 @@ fi
19957 22065
19958 22066
19959 22067
@@ -20001,7 +22109,7 @@ index 3513e408ce1..133948631e9 100755
20001 22109
20002 22110
20003 22111
20004@@ -6742,6 +7118,123 @@ esac 22112@@ -6969,6 +7345,123 @@ esac
20005 22113
20006 need_locks="$enable_libtool_lock" 22114 need_locks="$enable_libtool_lock"
20007 22115
@@ -20125,7 +22233,7 @@ index 3513e408ce1..133948631e9 100755
20125 22233
20126 case $host_os in 22234 case $host_os in
20127 rhapsody* | darwin*) 22235 rhapsody* | darwin*)
20128@@ -7305,6 +7798,8 @@ _LT_EOF 22236@@ -7532,6 +8025,8 @@ _LT_EOF
20129 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 22237 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
20130 echo "$AR cru libconftest.a conftest.o" >&5 22238 echo "$AR cru libconftest.a conftest.o" >&5
20131 $AR cru libconftest.a conftest.o 2>&5 22239 $AR cru libconftest.a conftest.o 2>&5
@@ -20134,7 +22242,7 @@ index 3513e408ce1..133948631e9 100755
20134 cat > conftest.c << _LT_EOF 22242 cat > conftest.c << _LT_EOF
20135 int main() { return 0;} 22243 int main() { return 0;}
20136 _LT_EOF 22244 _LT_EOF
20137@@ -7857,8 +8353,6 @@ fi 22245@@ -8084,8 +8579,6 @@ fi
20138 lt_prog_compiler_pic= 22246 lt_prog_compiler_pic=
20139 lt_prog_compiler_static= 22247 lt_prog_compiler_static=
20140 22248
@@ -20143,7 +22251,7 @@ index 3513e408ce1..133948631e9 100755
20143 22251
20144 if test "$GCC" = yes; then 22252 if test "$GCC" = yes; then
20145 lt_prog_compiler_wl='-Wl,' 22253 lt_prog_compiler_wl='-Wl,'
20146@@ -8024,6 +8518,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22254@@ -8251,6 +8744,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20147 lt_prog_compiler_pic='--shared' 22255 lt_prog_compiler_pic='--shared'
20148 lt_prog_compiler_static='--static' 22256 lt_prog_compiler_static='--static'
20149 ;; 22257 ;;
@@ -20156,7 +22264,7 @@ index 3513e408ce1..133948631e9 100755
20156 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 22264 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20157 # Portland Group compilers (*not* the Pentium gcc compiler, 22265 # Portland Group compilers (*not* the Pentium gcc compiler,
20158 # which looks to be a dead project) 22266 # which looks to be a dead project)
20159@@ -8086,7 +8586,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22267@@ -8313,7 +8812,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20160 lt_prog_compiler_pic='-KPIC' 22268 lt_prog_compiler_pic='-KPIC'
20161 lt_prog_compiler_static='-Bstatic' 22269 lt_prog_compiler_static='-Bstatic'
20162 case $cc_basename in 22270 case $cc_basename in
@@ -20165,7 +22273,7 @@ index 3513e408ce1..133948631e9 100755
20165 lt_prog_compiler_wl='-Qoption ld ';; 22273 lt_prog_compiler_wl='-Qoption ld ';;
20166 *) 22274 *)
20167 lt_prog_compiler_wl='-Wl,';; 22275 lt_prog_compiler_wl='-Wl,';;
20168@@ -8143,13 +8643,17 @@ case $host_os in 22276@@ -8370,13 +8869,17 @@ case $host_os in
20169 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 22277 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20170 ;; 22278 ;;
20171 esac 22279 esac
@@ -20189,7 +22297,7 @@ index 3513e408ce1..133948631e9 100755
20189 22297
20190 # 22298 #
20191 # Check to make sure the PIC flag actually works. 22299 # Check to make sure the PIC flag actually works.
20192@@ -8210,6 +8714,11 @@ fi 22300@@ -8437,6 +8940,11 @@ fi
20193 22301
20194 22302
20195 22303
@@ -20201,7 +22309,7 @@ index 3513e408ce1..133948631e9 100755
20201 # 22309 #
20202 # Check to make sure the static flag actually works. 22310 # Check to make sure the static flag actually works.
20203 # 22311 #
20204@@ -8560,7 +9069,8 @@ _LT_EOF 22312@@ -8787,7 +9295,8 @@ _LT_EOF
20205 allow_undefined_flag=unsupported 22313 allow_undefined_flag=unsupported
20206 always_export_symbols=no 22314 always_export_symbols=no
20207 enable_shared_with_static_runtimes=yes 22315 enable_shared_with_static_runtimes=yes
@@ -20211,7 +22319,7 @@ index 3513e408ce1..133948631e9 100755
20211 22319
20212 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 22320 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20213 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 22321 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20214@@ -8659,12 +9169,12 @@ _LT_EOF 22322@@ -8886,12 +9395,12 @@ _LT_EOF
20215 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 22323 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20216 hardcode_libdir_flag_spec= 22324 hardcode_libdir_flag_spec=
20217 hardcode_libdir_flag_spec_ld='-rpath $libdir' 22325 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -20226,7 +22334,7 @@ index 3513e408ce1..133948631e9 100755
20226 fi 22334 fi
20227 ;; 22335 ;;
20228 esac 22336 esac
20229@@ -8678,8 +9188,8 @@ _LT_EOF 22337@@ -8905,8 +9414,8 @@ _LT_EOF
20230 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 22338 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20231 wlarc= 22339 wlarc=
20232 else 22340 else
@@ -20237,7 +22345,7 @@ index 3513e408ce1..133948631e9 100755
20237 fi 22345 fi
20238 ;; 22346 ;;
20239 22347
20240@@ -8697,8 +9207,8 @@ _LT_EOF 22348@@ -8924,8 +9433,8 @@ _LT_EOF
20241 22349
20242 _LT_EOF 22350 _LT_EOF
20243 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22351 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -20248,7 +22356,7 @@ index 3513e408ce1..133948631e9 100755
20248 else 22356 else
20249 ld_shlibs=no 22357 ld_shlibs=no
20250 fi 22358 fi
20251@@ -8744,8 +9254,8 @@ _LT_EOF 22359@@ -8971,8 +9480,8 @@ _LT_EOF
20252 22360
20253 *) 22361 *)
20254 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22362 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -20259,7 +22367,7 @@ index 3513e408ce1..133948631e9 100755
20259 else 22367 else
20260 ld_shlibs=no 22368 ld_shlibs=no
20261 fi 22369 fi
20262@@ -8875,7 +9385,13 @@ _LT_EOF 22370@@ -9102,7 +9611,13 @@ _LT_EOF
20263 allow_undefined_flag='-berok' 22371 allow_undefined_flag='-berok'
20264 # Determine the default libpath from the value encoded in an 22372 # Determine the default libpath from the value encoded in an
20265 # empty executable. 22373 # empty executable.
@@ -20274,7 +22382,7 @@ index 3513e408ce1..133948631e9 100755
20274 /* end confdefs.h. */ 22382 /* end confdefs.h. */
20275 22383
20276 int 22384 int
20277@@ -8888,22 +9404,29 @@ main () 22385@@ -9115,22 +9630,29 @@ main ()
20278 _ACEOF 22386 _ACEOF
20279 if ac_fn_c_try_link "$LINENO"; then : 22387 if ac_fn_c_try_link "$LINENO"; then :
20280 22388
@@ -20317,7 +22425,7 @@ index 3513e408ce1..133948631e9 100755
20317 22425
20318 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22426 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20319 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 22427 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
20320@@ -8915,7 +9438,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22428@@ -9142,7 +9664,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20321 else 22429 else
20322 # Determine the default libpath from the value encoded in an 22430 # Determine the default libpath from the value encoded in an
20323 # empty executable. 22431 # empty executable.
@@ -20332,7 +22440,7 @@ index 3513e408ce1..133948631e9 100755
20332 /* end confdefs.h. */ 22440 /* end confdefs.h. */
20333 22441
20334 int 22442 int
20335@@ -8928,22 +9457,29 @@ main () 22443@@ -9155,22 +9683,29 @@ main ()
20336 _ACEOF 22444 _ACEOF
20337 if ac_fn_c_try_link "$LINENO"; then : 22445 if ac_fn_c_try_link "$LINENO"; then :
20338 22446
@@ -20375,7 +22483,7 @@ index 3513e408ce1..133948631e9 100755
20375 22483
20376 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22484 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20377 # Warning - without using the other run time loading flags, 22485 # Warning - without using the other run time loading flags,
20378@@ -8988,20 +9524,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22486@@ -9215,20 +9750,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20379 # Microsoft Visual C++. 22487 # Microsoft Visual C++.
20380 # hardcode_libdir_flag_spec is actually meaningless, as there is 22488 # hardcode_libdir_flag_spec is actually meaningless, as there is
20381 # no search path for DLLs. 22489 # no search path for DLLs.
@@ -20453,7 +22561,7 @@ index 3513e408ce1..133948631e9 100755
20453 ;; 22561 ;;
20454 22562
20455 darwin* | rhapsody*) 22563 darwin* | rhapsody*)
20456@@ -9062,7 +9641,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22564@@ -9289,7 +9867,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20457 22565
20458 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 22566 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20459 freebsd* | dragonfly*) 22567 freebsd* | dragonfly*)
@@ -20462,7 +22570,7 @@ index 3513e408ce1..133948631e9 100755
20462 hardcode_libdir_flag_spec='-R$libdir' 22570 hardcode_libdir_flag_spec='-R$libdir'
20463 hardcode_direct=yes 22571 hardcode_direct=yes
20464 hardcode_shlibpath_var=no 22572 hardcode_shlibpath_var=no
20465@@ -9070,7 +9649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22573@@ -9297,7 +9875,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20466 22574
20467 hpux9*) 22575 hpux9*)
20468 if test "$GCC" = yes; then 22576 if test "$GCC" = yes; then
@@ -20471,7 +22579,7 @@ index 3513e408ce1..133948631e9 100755
20471 else 22579 else
20472 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 22580 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
20473 fi 22581 fi
20474@@ -9086,7 +9665,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22582@@ -9313,7 +9891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20475 22583
20476 hpux10*) 22584 hpux10*)
20477 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 22585 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -20480,7 +22588,7 @@ index 3513e408ce1..133948631e9 100755
20480 else 22588 else
20481 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 22589 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20482 fi 22590 fi
20483@@ -9110,10 +9689,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22591@@ -9337,10 +9915,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20484 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 22592 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20485 ;; 22593 ;;
20486 ia64*) 22594 ia64*)
@@ -20493,7 +22601,7 @@ index 3513e408ce1..133948631e9 100755
20493 ;; 22601 ;;
20494 esac 22602 esac
20495 else 22603 else
20496@@ -9192,23 +9771,36 @@ fi 22604@@ -9419,23 +9997,36 @@ fi
20497 22605
20498 irix5* | irix6* | nonstopux*) 22606 irix5* | irix6* | nonstopux*)
20499 if test "$GCC" = yes; then 22607 if test "$GCC" = yes; then
@@ -20538,7 +22646,7 @@ index 3513e408ce1..133948631e9 100755
20538 else 22646 else
20539 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 22647 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
20540 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 22648 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
20541@@ -9293,7 +9885,7 @@ rm -f core conftest.err conftest.$ac_objext \ 22649@@ -9520,7 +10111,7 @@ rm -f core conftest.err conftest.$ac_objext \
20542 osf4* | osf5*) # as osf3* with the addition of -msym flag 22650 osf4* | osf5*) # as osf3* with the addition of -msym flag
20543 if test "$GCC" = yes; then 22651 if test "$GCC" = yes; then
20544 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 22652 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -20547,7 +22655,7 @@ index 3513e408ce1..133948631e9 100755
20547 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 22655 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20548 else 22656 else
20549 allow_undefined_flag=' -expect_unresolved \*' 22657 allow_undefined_flag=' -expect_unresolved \*'
20550@@ -9312,9 +9904,9 @@ rm -f core conftest.err conftest.$ac_objext \ 22658@@ -9539,9 +10130,9 @@ rm -f core conftest.err conftest.$ac_objext \
20551 no_undefined_flag=' -z defs' 22659 no_undefined_flag=' -z defs'
20552 if test "$GCC" = yes; then 22660 if test "$GCC" = yes; then
20553 wlarc='${wl}' 22661 wlarc='${wl}'
@@ -20559,7 +22667,7 @@ index 3513e408ce1..133948631e9 100755
20559 else 22667 else
20560 case `$CC -V 2>&1` in 22668 case `$CC -V 2>&1` in
20561 *"Compilers 5.0"*) 22669 *"Compilers 5.0"*)
20562@@ -9890,8 +10482,9 @@ cygwin* | mingw* | pw32* | cegcc*) 22670@@ -10117,8 +10708,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20563 need_version=no 22671 need_version=no
20564 need_lib_prefix=no 22672 need_lib_prefix=no
20565 22673
@@ -20571,7 +22679,7 @@ index 3513e408ce1..133948631e9 100755
20571 library_names_spec='$libname.dll.a' 22679 library_names_spec='$libname.dll.a'
20572 # DLL is installed to $(libdir)/../bin by postinstall_cmds 22680 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20573 postinstall_cmds='base_file=`basename \${file}`~ 22681 postinstall_cmds='base_file=`basename \${file}`~
20574@@ -9924,13 +10517,71 @@ cygwin* | mingw* | pw32* | cegcc*) 22682@@ -10151,13 +10743,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20575 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 22683 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20576 ;; 22684 ;;
20577 esac 22685 esac
@@ -20644,25 +22752,16 @@ index 3513e408ce1..133948631e9 100755
20644 # FIXME: first we should search . and the directory the executable is in 22752 # FIXME: first we should search . and the directory the executable is in
20645 shlibpath_var=PATH 22753 shlibpath_var=PATH
20646 ;; 22754 ;;
20647@@ -10012,7 +10663,7 @@ haiku*) 22755@@ -11035,7 +11685,7 @@ else
20648 soname_spec='${libname}${release}${shared_ext}$major'
20649 shlibpath_var=LIBRARY_PATH
20650 shlibpath_overrides_runpath=yes
20651- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
20652+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
20653 hardcode_into_libs=yes
20654 ;;
20655
20656@@ -10808,7 +11459,7 @@ else
20657 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22756 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20658 lt_status=$lt_dlunknown 22757 lt_status=$lt_dlunknown
20659 cat > conftest.$ac_ext <<_LT_EOF 22758 cat > conftest.$ac_ext <<_LT_EOF
20660-#line 10811 "configure" 22759-#line 11038 "configure"
20661+#line $LINENO "configure" 22760+#line $LINENO "configure"
20662 #include "confdefs.h" 22761 #include "confdefs.h"
20663 22762
20664 #if HAVE_DLFCN_H 22763 #if HAVE_DLFCN_H
20665@@ -10852,10 +11503,10 @@ else 22764@@ -11079,10 +11729,10 @@ else
20666 /* When -fvisbility=hidden is used, assume the code has been annotated 22765 /* When -fvisbility=hidden is used, assume the code has been annotated
20667 correspondingly for the symbols needed. */ 22766 correspondingly for the symbols needed. */
20668 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22767 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20675,16 +22774,16 @@ index 3513e408ce1..133948631e9 100755
20675 int main () 22774 int main ()
20676 { 22775 {
20677 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22776 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20678@@ -10914,7 +11565,7 @@ else 22777@@ -11141,7 +11791,7 @@ else
20679 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22778 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20680 lt_status=$lt_dlunknown 22779 lt_status=$lt_dlunknown
20681 cat > conftest.$ac_ext <<_LT_EOF 22780 cat > conftest.$ac_ext <<_LT_EOF
20682-#line 10917 "configure" 22781-#line 11144 "configure"
20683+#line $LINENO "configure" 22782+#line $LINENO "configure"
20684 #include "confdefs.h" 22783 #include "confdefs.h"
20685 22784
20686 #if HAVE_DLFCN_H 22785 #if HAVE_DLFCN_H
20687@@ -10958,10 +11609,10 @@ else 22786@@ -11185,10 +11835,10 @@ else
20688 /* When -fvisbility=hidden is used, assume the code has been annotated 22787 /* When -fvisbility=hidden is used, assume the code has been annotated
20689 correspondingly for the symbols needed. */ 22788 correspondingly for the symbols needed. */
20690 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22789 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20697,7 +22796,7 @@ index 3513e408ce1..133948631e9 100755
20697 int main () 22796 int main ()
20698 { 22797 {
20699 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22798 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20700@@ -13101,13 +13752,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 22799@@ -13390,13 +14040,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20701 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 22800 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20702 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 22801 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20703 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 22802 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -20718,7 +22817,7 @@ index 3513e408ce1..133948631e9 100755
20718 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 22817 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20719 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 22818 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20720 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 22819 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20721@@ -13122,14 +13780,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 22820@@ -13411,14 +14068,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20722 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 22821 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20723 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 22822 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20724 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 22823 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -20737,7 +22836,7 @@ index 3513e408ce1..133948631e9 100755
20737 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 22836 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20738 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 22837 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20739 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 22838 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20740@@ -13162,12 +13823,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 22839@@ -13451,12 +14111,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20741 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 22840 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20742 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 22841 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20743 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 22842 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -20751,7 +22850,7 @@ index 3513e408ce1..133948631e9 100755
20751 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 22850 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20752 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 22851 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20753 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 22852 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20754@@ -13222,8 +13883,13 @@ reload_flag \ 22853@@ -13511,8 +14171,13 @@ reload_flag \
20755 OBJDUMP \ 22854 OBJDUMP \
20756 deplibs_check_method \ 22855 deplibs_check_method \
20757 file_magic_cmd \ 22856 file_magic_cmd \
@@ -20765,7 +22864,7 @@ index 3513e408ce1..133948631e9 100755
20765 STRIP \ 22864 STRIP \
20766 RANLIB \ 22865 RANLIB \
20767 CC \ 22866 CC \
20768@@ -13233,12 +13899,14 @@ lt_cv_sys_global_symbol_pipe \ 22867@@ -13522,12 +14187,14 @@ lt_cv_sys_global_symbol_pipe \
20769 lt_cv_sys_global_symbol_to_cdecl \ 22868 lt_cv_sys_global_symbol_to_cdecl \
20770 lt_cv_sys_global_symbol_to_c_name_address \ 22869 lt_cv_sys_global_symbol_to_c_name_address \
20771 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 22870 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -20781,7 +22880,7 @@ index 3513e408ce1..133948631e9 100755
20781 DSYMUTIL \ 22880 DSYMUTIL \
20782 NMEDIT \ 22881 NMEDIT \
20783 LIPO \ 22882 LIPO \
20784@@ -13254,7 +13922,6 @@ no_undefined_flag \ 22883@@ -13543,7 +14210,6 @@ no_undefined_flag \
20785 hardcode_libdir_flag_spec \ 22884 hardcode_libdir_flag_spec \
20786 hardcode_libdir_flag_spec_ld \ 22885 hardcode_libdir_flag_spec_ld \
20787 hardcode_libdir_separator \ 22886 hardcode_libdir_separator \
@@ -20789,7 +22888,7 @@ index 3513e408ce1..133948631e9 100755
20789 exclude_expsyms \ 22888 exclude_expsyms \
20790 include_expsyms \ 22889 include_expsyms \
20791 file_list_spec \ 22890 file_list_spec \
20792@@ -13290,6 +13957,7 @@ module_cmds \ 22891@@ -13579,6 +14245,7 @@ module_cmds \
20793 module_expsym_cmds \ 22892 module_expsym_cmds \
20794 export_symbols_cmds \ 22893 export_symbols_cmds \
20795 prelink_cmds \ 22894 prelink_cmds \
@@ -20797,7 +22896,7 @@ index 3513e408ce1..133948631e9 100755
20797 postinstall_cmds \ 22896 postinstall_cmds \
20798 postuninstall_cmds \ 22897 postuninstall_cmds \
20799 finish_cmds \ 22898 finish_cmds \
20800@@ -14055,7 +14723,8 @@ $as_echo X"$file" | 22899@@ -14344,7 +15011,8 @@ $as_echo X"$file" |
20801 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 22900 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20802 # 22901 #
20803 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 22902 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -20807,7 +22906,7 @@ index 3513e408ce1..133948631e9 100755
20807 # Written by Gordon Matzigkeit, 1996 22906 # Written by Gordon Matzigkeit, 1996
20808 # 22907 #
20809 # This file is part of GNU Libtool. 22908 # This file is part of GNU Libtool.
20810@@ -14158,19 +14827,42 @@ SP2NL=$lt_lt_SP2NL 22909@@ -14447,19 +15115,42 @@ SP2NL=$lt_lt_SP2NL
20811 # turn newlines into spaces. 22910 # turn newlines into spaces.
20812 NL2SP=$lt_lt_NL2SP 22911 NL2SP=$lt_lt_NL2SP
20813 22912
@@ -20851,7 +22950,7 @@ index 3513e408ce1..133948631e9 100755
20851 # A symbol stripping program. 22950 # A symbol stripping program.
20852 STRIP=$lt_STRIP 22951 STRIP=$lt_STRIP
20853 22952
20854@@ -14200,6 +14892,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 22953@@ -14489,6 +15180,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20855 # Transform the output of nm in a C name address pair when lib prefix is needed. 22954 # Transform the output of nm in a C name address pair when lib prefix is needed.
20856 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 22955 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20857 22956
@@ -20864,7 +22963,7 @@ index 3513e408ce1..133948631e9 100755
20864 # The name of the directory that contains temporary libtool files. 22963 # The name of the directory that contains temporary libtool files.
20865 objdir=$objdir 22964 objdir=$objdir
20866 22965
20867@@ -14209,6 +14907,9 @@ MAGIC_CMD=$MAGIC_CMD 22966@@ -14498,6 +15195,9 @@ MAGIC_CMD=$MAGIC_CMD
20868 # Must we lock files when doing compilation? 22967 # Must we lock files when doing compilation?
20869 need_locks=$lt_need_locks 22968 need_locks=$lt_need_locks
20870 22969
@@ -20874,7 +22973,7 @@ index 3513e408ce1..133948631e9 100755
20874 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 22973 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20875 DSYMUTIL=$lt_DSYMUTIL 22974 DSYMUTIL=$lt_DSYMUTIL
20876 22975
20877@@ -14323,12 +15024,12 @@ with_gcc=$GCC 22976@@ -14612,12 +15312,12 @@ with_gcc=$GCC
20878 # Compiler flag to turn off builtin functions. 22977 # Compiler flag to turn off builtin functions.
20879 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 22978 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20880 22979
@@ -20890,7 +22989,7 @@ index 3513e408ce1..133948631e9 100755
20890 # Compiler flag to prevent dynamic linking. 22989 # Compiler flag to prevent dynamic linking.
20891 link_static_flag=$lt_lt_prog_compiler_static 22990 link_static_flag=$lt_lt_prog_compiler_static
20892 22991
20893@@ -14415,9 +15116,6 @@ inherit_rpath=$inherit_rpath 22992@@ -14704,9 +15404,6 @@ inherit_rpath=$inherit_rpath
20894 # Whether libtool must link a program against all its dependency libraries. 22993 # Whether libtool must link a program against all its dependency libraries.
20895 link_all_deplibs=$link_all_deplibs 22994 link_all_deplibs=$link_all_deplibs
20896 22995
@@ -20900,7 +22999,7 @@ index 3513e408ce1..133948631e9 100755
20900 # Set to "yes" if exported symbols are required. 22999 # Set to "yes" if exported symbols are required.
20901 always_export_symbols=$always_export_symbols 23000 always_export_symbols=$always_export_symbols
20902 23001
20903@@ -14433,6 +15131,9 @@ include_expsyms=$lt_include_expsyms 23002@@ -14722,6 +15419,9 @@ include_expsyms=$lt_include_expsyms
20904 # Commands necessary for linking programs (against libraries) with templates. 23003 # Commands necessary for linking programs (against libraries) with templates.
20905 prelink_cmds=$lt_prelink_cmds 23004 prelink_cmds=$lt_prelink_cmds
20906 23005
@@ -20910,7 +23009,7 @@ index 3513e408ce1..133948631e9 100755
20910 # Specify filename containing input files. 23009 # Specify filename containing input files.
20911 file_list_spec=$lt_file_list_spec 23010 file_list_spec=$lt_file_list_spec
20912 23011
20913@@ -14465,210 +15166,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 23012@@ -14754,210 +15454,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20914 # if finds mixed CR/LF and LF-only lines. Since sed operates in 23013 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20915 # text mode, it properly converts lines to CR/LF. This bash problem 23014 # text mode, it properly converts lines to CR/LF. This bash problem
20916 # is reportedly fixed, but why not run on old versions too? 23015 # is reportedly fixed, but why not run on old versions too?
@@ -21285,7 +23384,7 @@ index 3513e408ce1..133948631e9 100755
21285 chmod +x "$ofile" 23384 chmod +x "$ofile"
21286 23385
21287diff --git a/zlib/configure b/zlib/configure 23386diff --git a/zlib/configure b/zlib/configure
21288index 695819cd54b..14b5f28013a 100755 23387index db7845c5d42..cd59daa39b5 100755
21289--- a/zlib/configure 23388--- a/zlib/configure
21290+++ b/zlib/configure 23389+++ b/zlib/configure
21291@@ -646,8 +646,11 @@ OTOOL 23390@@ -646,8 +646,11 @@ OTOOL
@@ -21317,7 +23416,7 @@ index 695819cd54b..14b5f28013a 100755
21317 23416
21318 Some influential environment variables: 23417 Some influential environment variables:
21319 CC C compiler command 23418 CC C compiler command
21320@@ -4147,8 +4153,8 @@ esac 23419@@ -4186,8 +4192,8 @@ esac
21321 23420
21322 23421
21323 23422
@@ -21328,7 +23427,7 @@ index 695819cd54b..14b5f28013a 100755
21328 23427
21329 23428
21330 23429
21331@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 23430@@ -4227,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
21332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 23431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
21333 $as_echo_n "checking how to print strings... " >&6; } 23432 $as_echo_n "checking how to print strings... " >&6; }
21334 # Test print first, because it will be a builtin if present. 23433 # Test print first, because it will be a builtin if present.
@@ -21337,7 +23436,7 @@ index 695819cd54b..14b5f28013a 100755
21337 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 23436 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
21338 ECHO='print -r --' 23437 ECHO='print -r --'
21339 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 23438 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
21340@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 23439@@ -5044,8 +5050,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
21341 # Try some XSI features 23440 # Try some XSI features
21342 xsi_shell=no 23441 xsi_shell=no
21343 ( _lt_dummy="a/b/c" 23442 ( _lt_dummy="a/b/c"
@@ -21348,7 +23447,7 @@ index 695819cd54b..14b5f28013a 100755
21348 && eval 'test $(( 1 + 1 )) -eq 2 \ 23447 && eval 'test $(( 1 + 1 )) -eq 2 \
21349 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 23448 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
21350 && xsi_shell=yes 23449 && xsi_shell=yes
21351@@ -5054,6 +5060,80 @@ esac 23450@@ -5094,6 +5100,80 @@ esac
21352 23451
21353 23452
21354 23453
@@ -21429,7 +23528,7 @@ index 695819cd54b..14b5f28013a 100755
21429 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 23528 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
21430 $as_echo_n "checking for $LD option to reload object files... " >&6; } 23529 $as_echo_n "checking for $LD option to reload object files... " >&6; }
21431 if ${lt_cv_ld_reload_flag+:} false; then : 23530 if ${lt_cv_ld_reload_flag+:} false; then :
21432@@ -5070,6 +5150,11 @@ case $reload_flag in 23531@@ -5110,6 +5190,11 @@ case $reload_flag in
21433 esac 23532 esac
21434 reload_cmds='$LD$reload_flag -o $output$reload_objs' 23533 reload_cmds='$LD$reload_flag -o $output$reload_objs'
21435 case $host_os in 23534 case $host_os in
@@ -21441,7 +23540,7 @@ index 695819cd54b..14b5f28013a 100755
21441 darwin*) 23540 darwin*)
21442 if test "$GCC" = yes; then 23541 if test "$GCC" = yes; then
21443 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 23542 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
21444@@ -5238,7 +5323,8 @@ mingw* | pw32*) 23543@@ -5278,7 +5363,8 @@ mingw* | pw32*)
21445 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 23544 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
21446 lt_cv_file_magic_cmd='func_win32_libid' 23545 lt_cv_file_magic_cmd='func_win32_libid'
21447 else 23546 else
@@ -21451,7 +23550,7 @@ index 695819cd54b..14b5f28013a 100755
21451 lt_cv_file_magic_cmd='$OBJDUMP -f' 23550 lt_cv_file_magic_cmd='$OBJDUMP -f'
21452 fi 23551 fi
21453 ;; 23552 ;;
21454@@ -5392,6 +5478,21 @@ esac 23553@@ -5432,6 +5518,21 @@ esac
21455 fi 23554 fi
21456 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 23555 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
21457 $as_echo "$lt_cv_deplibs_check_method" >&6; } 23556 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -21473,7 +23572,7 @@ index 695819cd54b..14b5f28013a 100755
21473 file_magic_cmd=$lt_cv_file_magic_cmd 23572 file_magic_cmd=$lt_cv_file_magic_cmd
21474 deplibs_check_method=$lt_cv_deplibs_check_method 23573 deplibs_check_method=$lt_cv_deplibs_check_method
21475 test -z "$deplibs_check_method" && deplibs_check_method=unknown 23574 test -z "$deplibs_check_method" && deplibs_check_method=unknown
21476@@ -5407,6 +5508,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 23575@@ -5447,6 +5548,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
21477 23576
21478 23577
21479 23578
@@ -21632,7 +23731,7 @@ index 695819cd54b..14b5f28013a 100755
21632 plugin_option= 23731 plugin_option=
21633 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 23732 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
21634 for plugin in $plugin_names; do 23733 for plugin in $plugin_names; do
21635@@ -5421,8 +5674,10 @@ for plugin in $plugin_names; do 23734@@ -5461,8 +5714,10 @@ for plugin in $plugin_names; do
21636 done 23735 done
21637 23736
21638 if test -n "$ac_tool_prefix"; then 23737 if test -n "$ac_tool_prefix"; then
@@ -21645,7 +23744,7 @@ index 695819cd54b..14b5f28013a 100755
21645 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 23744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21646 $as_echo_n "checking for $ac_word... " >&6; } 23745 $as_echo_n "checking for $ac_word... " >&6; }
21647 if ${ac_cv_prog_AR+:} false; then : 23746 if ${ac_cv_prog_AR+:} false; then :
21648@@ -5438,7 +5693,7 @@ do 23747@@ -5478,7 +5733,7 @@ do
21649 test -z "$as_dir" && as_dir=. 23748 test -z "$as_dir" && as_dir=.
21650 for ac_exec_ext in '' $ac_executable_extensions; do 23749 for ac_exec_ext in '' $ac_executable_extensions; do
21651 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 23750 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21654,7 +23753,7 @@ index 695819cd54b..14b5f28013a 100755
21654 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 23753 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21655 break 2 23754 break 2
21656 fi 23755 fi
21657@@ -5458,11 +5713,15 @@ $as_echo "no" >&6; } 23756@@ -5498,11 +5753,15 @@ $as_echo "no" >&6; }
21658 fi 23757 fi
21659 23758
21660 23759
@@ -21673,7 +23772,7 @@ index 695819cd54b..14b5f28013a 100755
21673 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 23772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21674 $as_echo_n "checking for $ac_word... " >&6; } 23773 $as_echo_n "checking for $ac_word... " >&6; }
21675 if ${ac_cv_prog_ac_ct_AR+:} false; then : 23774 if ${ac_cv_prog_ac_ct_AR+:} false; then :
21676@@ -5478,7 +5737,7 @@ do 23775@@ -5518,7 +5777,7 @@ do
21677 test -z "$as_dir" && as_dir=. 23776 test -z "$as_dir" && as_dir=.
21678 for ac_exec_ext in '' $ac_executable_extensions; do 23777 for ac_exec_ext in '' $ac_executable_extensions; do
21679 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 23778 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21682,7 +23781,7 @@ index 695819cd54b..14b5f28013a 100755
21682 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 23781 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21683 break 2 23782 break 2
21684 fi 23783 fi
21685@@ -5497,6 +5756,10 @@ else 23784@@ -5537,6 +5796,10 @@ else
21686 $as_echo "no" >&6; } 23785 $as_echo "no" >&6; }
21687 fi 23786 fi
21688 23787
@@ -21693,7 +23792,7 @@ index 695819cd54b..14b5f28013a 100755
21693 if test "x$ac_ct_AR" = x; then 23792 if test "x$ac_ct_AR" = x; then
21694 AR="false" 23793 AR="false"
21695 else 23794 else
21696@@ -5508,25 +5771,19 @@ ac_tool_warned=yes ;; 23795@@ -5548,25 +5811,19 @@ ac_tool_warned=yes ;;
21697 esac 23796 esac
21698 AR=$ac_ct_AR 23797 AR=$ac_ct_AR
21699 fi 23798 fi
@@ -21728,7 +23827,7 @@ index 695819cd54b..14b5f28013a 100755
21728 23827
21729 23828
21730 23829
21731@@ -5538,6 +5795,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 23830@@ -5578,6 +5835,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
21732 23831
21733 23832
21734 23833
@@ -21793,7 +23892,7 @@ index 695819cd54b..14b5f28013a 100755
21793 if test -n "$ac_tool_prefix"; then 23892 if test -n "$ac_tool_prefix"; then
21794 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 23893 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
21795 set dummy ${ac_tool_prefix}strip; ac_word=$2 23894 set dummy ${ac_tool_prefix}strip; ac_word=$2
21796@@ -5877,8 +6192,8 @@ esac 23895@@ -5917,8 +6232,8 @@ esac
21797 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 23896 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
21798 23897
21799 # Transform an extracted symbol line into symbol name and symbol address 23898 # Transform an extracted symbol line into symbol name and symbol address
@@ -21804,7 +23903,7 @@ index 695819cd54b..14b5f28013a 100755
21804 23903
21805 # Handle CRLF in mingw tool chain 23904 # Handle CRLF in mingw tool chain
21806 opt_cr= 23905 opt_cr=
21807@@ -5914,6 +6229,7 @@ for ac_symprfx in "" "_"; do 23906@@ -5954,6 +6269,7 @@ for ac_symprfx in "" "_"; do
21808 else 23907 else
21809 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 23908 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
21810 fi 23909 fi
@@ -21812,7 +23911,7 @@ index 695819cd54b..14b5f28013a 100755
21812 23911
21813 # Check to see that the pipe works correctly. 23912 # Check to see that the pipe works correctly.
21814 pipe_works=no 23913 pipe_works=no
21815@@ -5955,6 +6271,18 @@ _LT_EOF 23914@@ -5995,6 +6311,18 @@ _LT_EOF
21816 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 23915 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
21817 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 23916 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
21818 cat <<_LT_EOF > conftest.$ac_ext 23917 cat <<_LT_EOF > conftest.$ac_ext
@@ -21831,7 +23930,7 @@ index 695819cd54b..14b5f28013a 100755
21831 #ifdef __cplusplus 23930 #ifdef __cplusplus
21832 extern "C" { 23931 extern "C" {
21833 #endif 23932 #endif
21834@@ -5966,7 +6294,7 @@ _LT_EOF 23933@@ -6006,7 +6334,7 @@ _LT_EOF
21835 cat <<_LT_EOF >> conftest.$ac_ext 23934 cat <<_LT_EOF >> conftest.$ac_ext
21836 23935
21837 /* The mapping between symbol names and symbols. */ 23936 /* The mapping between symbol names and symbols. */
@@ -21840,7 +23939,7 @@ index 695819cd54b..14b5f28013a 100755
21840 const char *name; 23939 const char *name;
21841 void *address; 23940 void *address;
21842 } 23941 }
21843@@ -5992,8 +6320,8 @@ static const void *lt_preloaded_setup() { 23942@@ -6032,8 +6360,8 @@ static const void *lt_preloaded_setup() {
21844 _LT_EOF 23943 _LT_EOF
21845 # Now try linking the two files. 23944 # Now try linking the two files.
21846 mv conftest.$ac_objext conftstm.$ac_objext 23945 mv conftest.$ac_objext conftstm.$ac_objext
@@ -21851,7 +23950,7 @@ index 695819cd54b..14b5f28013a 100755
21851 LIBS="conftstm.$ac_objext" 23950 LIBS="conftstm.$ac_objext"
21852 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 23951 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
21853 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 23952 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
21854@@ -6003,8 +6331,8 @@ _LT_EOF 23953@@ -6043,8 +6371,8 @@ _LT_EOF
21855 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 23954 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
21856 pipe_works=yes 23955 pipe_works=yes
21857 fi 23956 fi
@@ -21862,7 +23961,7 @@ index 695819cd54b..14b5f28013a 100755
21862 else 23961 else
21863 echo "cannot find nm_test_func in $nlist" >&5 23962 echo "cannot find nm_test_func in $nlist" >&5
21864 fi 23963 fi
21865@@ -6041,6 +6369,17 @@ else 23964@@ -6081,6 +6409,17 @@ else
21866 $as_echo "ok" >&6; } 23965 $as_echo "ok" >&6; }
21867 fi 23966 fi
21868 23967
@@ -21880,7 +23979,7 @@ index 695819cd54b..14b5f28013a 100755
21880 23979
21881 23980
21882 23981
21883@@ -6058,6 +6397,43 @@ fi 23982@@ -6098,6 +6437,43 @@ fi
21884 23983
21885 23984
21886 23985
@@ -21924,7 +24023,7 @@ index 695819cd54b..14b5f28013a 100755
21924 24023
21925 24024
21926 24025
21927@@ -6272,6 +6648,123 @@ esac 24026@@ -6312,6 +6688,123 @@ esac
21928 24027
21929 need_locks="$enable_libtool_lock" 24028 need_locks="$enable_libtool_lock"
21930 24029
@@ -22048,7 +24147,7 @@ index 695819cd54b..14b5f28013a 100755
22048 24147
22049 case $host_os in 24148 case $host_os in
22050 rhapsody* | darwin*) 24149 rhapsody* | darwin*)
22051@@ -6838,6 +7331,8 @@ _LT_EOF 24150@@ -6878,6 +7371,8 @@ _LT_EOF
22052 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 24151 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
22053 echo "$AR cru libconftest.a conftest.o" >&5 24152 echo "$AR cru libconftest.a conftest.o" >&5
22054 $AR cru libconftest.a conftest.o 2>&5 24153 $AR cru libconftest.a conftest.o 2>&5
@@ -22057,7 +24156,7 @@ index 695819cd54b..14b5f28013a 100755
22057 cat > conftest.c << _LT_EOF 24156 cat > conftest.c << _LT_EOF
22058 int main() { return 0;} 24157 int main() { return 0;}
22059 _LT_EOF 24158 _LT_EOF
22060@@ -7687,8 +8183,6 @@ fi 24159@@ -7727,8 +8222,6 @@ fi
22061 lt_prog_compiler_pic= 24160 lt_prog_compiler_pic=
22062 lt_prog_compiler_static= 24161 lt_prog_compiler_static=
22063 24162
@@ -22066,7 +24165,7 @@ index 695819cd54b..14b5f28013a 100755
22066 24165
22067 if test "$GCC" = yes; then 24166 if test "$GCC" = yes; then
22068 lt_prog_compiler_wl='-Wl,' 24167 lt_prog_compiler_wl='-Wl,'
22069@@ -7854,6 +8348,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 24168@@ -7894,6 +8387,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22070 lt_prog_compiler_pic='--shared' 24169 lt_prog_compiler_pic='--shared'
22071 lt_prog_compiler_static='--static' 24170 lt_prog_compiler_static='--static'
22072 ;; 24171 ;;
@@ -22079,7 +24178,7 @@ index 695819cd54b..14b5f28013a 100755
22079 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 24178 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
22080 # Portland Group compilers (*not* the Pentium gcc compiler, 24179 # Portland Group compilers (*not* the Pentium gcc compiler,
22081 # which looks to be a dead project) 24180 # which looks to be a dead project)
22082@@ -7916,7 +8416,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 24181@@ -7956,7 +8455,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22083 lt_prog_compiler_pic='-KPIC' 24182 lt_prog_compiler_pic='-KPIC'
22084 lt_prog_compiler_static='-Bstatic' 24183 lt_prog_compiler_static='-Bstatic'
22085 case $cc_basename in 24184 case $cc_basename in
@@ -22088,7 +24187,7 @@ index 695819cd54b..14b5f28013a 100755
22088 lt_prog_compiler_wl='-Qoption ld ';; 24187 lt_prog_compiler_wl='-Qoption ld ';;
22089 *) 24188 *)
22090 lt_prog_compiler_wl='-Wl,';; 24189 lt_prog_compiler_wl='-Wl,';;
22091@@ -7973,13 +8473,17 @@ case $host_os in 24190@@ -8013,13 +8512,17 @@ case $host_os in
22092 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 24191 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
22093 ;; 24192 ;;
22094 esac 24193 esac
@@ -22112,7 +24211,7 @@ index 695819cd54b..14b5f28013a 100755
22112 24211
22113 # 24212 #
22114 # Check to make sure the PIC flag actually works. 24213 # Check to make sure the PIC flag actually works.
22115@@ -8040,6 +8544,11 @@ fi 24214@@ -8080,6 +8583,11 @@ fi
22116 24215
22117 24216
22118 24217
@@ -22124,7 +24223,7 @@ index 695819cd54b..14b5f28013a 100755
22124 # 24223 #
22125 # Check to make sure the static flag actually works. 24224 # Check to make sure the static flag actually works.
22126 # 24225 #
22127@@ -8390,7 +8899,8 @@ _LT_EOF 24226@@ -8430,7 +8938,8 @@ _LT_EOF
22128 allow_undefined_flag=unsupported 24227 allow_undefined_flag=unsupported
22129 always_export_symbols=no 24228 always_export_symbols=no
22130 enable_shared_with_static_runtimes=yes 24229 enable_shared_with_static_runtimes=yes
@@ -22134,7 +24233,7 @@ index 695819cd54b..14b5f28013a 100755
22134 24233
22135 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 24234 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
22136 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 24235 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
22137@@ -8489,12 +8999,12 @@ _LT_EOF 24236@@ -8529,12 +9038,12 @@ _LT_EOF
22138 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 24237 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
22139 hardcode_libdir_flag_spec= 24238 hardcode_libdir_flag_spec=
22140 hardcode_libdir_flag_spec_ld='-rpath $libdir' 24239 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -22149,7 +24248,7 @@ index 695819cd54b..14b5f28013a 100755
22149 fi 24248 fi
22150 ;; 24249 ;;
22151 esac 24250 esac
22152@@ -8508,8 +9018,8 @@ _LT_EOF 24251@@ -8548,8 +9057,8 @@ _LT_EOF
22153 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 24252 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
22154 wlarc= 24253 wlarc=
22155 else 24254 else
@@ -22160,7 +24259,7 @@ index 695819cd54b..14b5f28013a 100755
22160 fi 24259 fi
22161 ;; 24260 ;;
22162 24261
22163@@ -8527,8 +9037,8 @@ _LT_EOF 24262@@ -8567,8 +9076,8 @@ _LT_EOF
22164 24263
22165 _LT_EOF 24264 _LT_EOF
22166 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 24265 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22171,7 +24270,7 @@ index 695819cd54b..14b5f28013a 100755
22171 else 24270 else
22172 ld_shlibs=no 24271 ld_shlibs=no
22173 fi 24272 fi
22174@@ -8574,8 +9084,8 @@ _LT_EOF 24273@@ -8614,8 +9123,8 @@ _LT_EOF
22175 24274
22176 *) 24275 *)
22177 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 24276 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22182,7 +24281,7 @@ index 695819cd54b..14b5f28013a 100755
22182 else 24281 else
22183 ld_shlibs=no 24282 ld_shlibs=no
22184 fi 24283 fi
22185@@ -8705,7 +9215,13 @@ _LT_EOF 24284@@ -8745,7 +9254,13 @@ _LT_EOF
22186 allow_undefined_flag='-berok' 24285 allow_undefined_flag='-berok'
22187 # Determine the default libpath from the value encoded in an 24286 # Determine the default libpath from the value encoded in an
22188 # empty executable. 24287 # empty executable.
@@ -22197,7 +24296,7 @@ index 695819cd54b..14b5f28013a 100755
22197 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 24296 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
22198 fi 24297 fi
22199 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 24298 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22200@@ -8721,22 +9237,29 @@ main () 24299@@ -8761,22 +9276,29 @@ main ()
22201 _ACEOF 24300 _ACEOF
22202 if ac_fn_c_try_link "$LINENO"; then : 24301 if ac_fn_c_try_link "$LINENO"; then :
22203 24302
@@ -22240,7 +24339,7 @@ index 695819cd54b..14b5f28013a 100755
22240 24339
22241 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 24340 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22242 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 24341 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
22243@@ -8748,7 +9271,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24342@@ -8788,7 +9310,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22244 else 24343 else
22245 # Determine the default libpath from the value encoded in an 24344 # Determine the default libpath from the value encoded in an
22246 # empty executable. 24345 # empty executable.
@@ -22255,7 +24354,7 @@ index 695819cd54b..14b5f28013a 100755
22255 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 24354 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
22256 fi 24355 fi
22257 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 24356 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22258@@ -8764,22 +9293,29 @@ main () 24357@@ -8804,22 +9332,29 @@ main ()
22259 _ACEOF 24358 _ACEOF
22260 if ac_fn_c_try_link "$LINENO"; then : 24359 if ac_fn_c_try_link "$LINENO"; then :
22261 24360
@@ -22298,7 +24397,7 @@ index 695819cd54b..14b5f28013a 100755
22298 24397
22299 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 24398 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22300 # Warning - without using the other run time loading flags, 24399 # Warning - without using the other run time loading flags,
22301@@ -8824,20 +9360,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24400@@ -8864,20 +9399,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22302 # Microsoft Visual C++. 24401 # Microsoft Visual C++.
22303 # hardcode_libdir_flag_spec is actually meaningless, as there is 24402 # hardcode_libdir_flag_spec is actually meaningless, as there is
22304 # no search path for DLLs. 24403 # no search path for DLLs.
@@ -22376,7 +24475,7 @@ index 695819cd54b..14b5f28013a 100755
22376 ;; 24475 ;;
22377 24476
22378 darwin* | rhapsody*) 24477 darwin* | rhapsody*)
22379@@ -8898,7 +9477,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24478@@ -8938,7 +9516,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22380 24479
22381 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 24480 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
22382 freebsd* | dragonfly*) 24481 freebsd* | dragonfly*)
@@ -22385,7 +24484,7 @@ index 695819cd54b..14b5f28013a 100755
22385 hardcode_libdir_flag_spec='-R$libdir' 24484 hardcode_libdir_flag_spec='-R$libdir'
22386 hardcode_direct=yes 24485 hardcode_direct=yes
22387 hardcode_shlibpath_var=no 24486 hardcode_shlibpath_var=no
22388@@ -8906,7 +9485,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24487@@ -8946,7 +9524,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22389 24488
22390 hpux9*) 24489 hpux9*)
22391 if test "$GCC" = yes; then 24490 if test "$GCC" = yes; then
@@ -22394,7 +24493,7 @@ index 695819cd54b..14b5f28013a 100755
22394 else 24493 else
22395 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 24494 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
22396 fi 24495 fi
22397@@ -8922,7 +9501,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24496@@ -8962,7 +9540,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22398 24497
22399 hpux10*) 24498 hpux10*)
22400 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 24499 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -22403,7 +24502,7 @@ index 695819cd54b..14b5f28013a 100755
22403 else 24502 else
22404 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 24503 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
22405 fi 24504 fi
22406@@ -8946,10 +9525,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24505@@ -8986,10 +9564,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22407 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 24506 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
22408 ;; 24507 ;;
22409 ia64*) 24508 ia64*)
@@ -22416,7 +24515,7 @@ index 695819cd54b..14b5f28013a 100755
22416 ;; 24515 ;;
22417 esac 24516 esac
22418 else 24517 else
22419@@ -9028,26 +9607,39 @@ fi 24518@@ -9068,26 +9646,39 @@ fi
22420 24519
22421 irix5* | irix6* | nonstopux*) 24520 irix5* | irix6* | nonstopux*)
22422 if test "$GCC" = yes; then 24521 if test "$GCC" = yes; then
@@ -22464,7 +24563,7 @@ index 695819cd54b..14b5f28013a 100755
22464 else 24563 else
22465 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 24564 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
22466 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 24565 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
22467@@ -9132,7 +9724,7 @@ rm -f core conftest.err conftest.$ac_objext \ 24566@@ -9172,7 +9763,7 @@ rm -f core conftest.err conftest.$ac_objext \
22468 osf4* | osf5*) # as osf3* with the addition of -msym flag 24567 osf4* | osf5*) # as osf3* with the addition of -msym flag
22469 if test "$GCC" = yes; then 24568 if test "$GCC" = yes; then
22470 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 24569 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -22473,7 +24572,7 @@ index 695819cd54b..14b5f28013a 100755
22473 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 24572 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22474 else 24573 else
22475 allow_undefined_flag=' -expect_unresolved \*' 24574 allow_undefined_flag=' -expect_unresolved \*'
22476@@ -9151,9 +9743,9 @@ rm -f core conftest.err conftest.$ac_objext \ 24575@@ -9191,9 +9782,9 @@ rm -f core conftest.err conftest.$ac_objext \
22477 no_undefined_flag=' -z defs' 24576 no_undefined_flag=' -z defs'
22478 if test "$GCC" = yes; then 24577 if test "$GCC" = yes; then
22479 wlarc='${wl}' 24578 wlarc='${wl}'
@@ -22485,7 +24584,7 @@ index 695819cd54b..14b5f28013a 100755
22485 else 24584 else
22486 case `$CC -V 2>&1` in 24585 case `$CC -V 2>&1` in
22487 *"Compilers 5.0"*) 24586 *"Compilers 5.0"*)
22488@@ -9729,8 +10321,9 @@ cygwin* | mingw* | pw32* | cegcc*) 24587@@ -9769,8 +10360,9 @@ cygwin* | mingw* | pw32* | cegcc*)
22489 need_version=no 24588 need_version=no
22490 need_lib_prefix=no 24589 need_lib_prefix=no
22491 24590
@@ -22497,7 +24596,7 @@ index 695819cd54b..14b5f28013a 100755
22497 library_names_spec='$libname.dll.a' 24596 library_names_spec='$libname.dll.a'
22498 # DLL is installed to $(libdir)/../bin by postinstall_cmds 24597 # DLL is installed to $(libdir)/../bin by postinstall_cmds
22499 postinstall_cmds='base_file=`basename \${file}`~ 24598 postinstall_cmds='base_file=`basename \${file}`~
22500@@ -9763,13 +10356,71 @@ cygwin* | mingw* | pw32* | cegcc*) 24599@@ -9803,13 +10395,71 @@ cygwin* | mingw* | pw32* | cegcc*)
22501 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 24600 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22502 ;; 24601 ;;
22503 esac 24602 esac
@@ -22570,25 +24669,16 @@ index 695819cd54b..14b5f28013a 100755
22570 # FIXME: first we should search . and the directory the executable is in 24669 # FIXME: first we should search . and the directory the executable is in
22571 shlibpath_var=PATH 24670 shlibpath_var=PATH
22572 ;; 24671 ;;
22573@@ -9851,7 +10502,7 @@ haiku*) 24672@@ -10705,7 +11355,7 @@ else
22574 soname_spec='${libname}${release}${shared_ext}$major'
22575 shlibpath_var=LIBRARY_PATH
22576 shlibpath_overrides_runpath=yes
22577- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
22578+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
22579 hardcode_into_libs=yes
22580 ;;
22581
22582@@ -10665,7 +11316,7 @@ else
22583 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 24673 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22584 lt_status=$lt_dlunknown 24674 lt_status=$lt_dlunknown
22585 cat > conftest.$ac_ext <<_LT_EOF 24675 cat > conftest.$ac_ext <<_LT_EOF
22586-#line 10668 "configure" 24676-#line 10708 "configure"
22587+#line $LINENO "configure" 24677+#line $LINENO "configure"
22588 #include "confdefs.h" 24678 #include "confdefs.h"
22589 24679
22590 #if HAVE_DLFCN_H 24680 #if HAVE_DLFCN_H
22591@@ -10709,10 +11360,10 @@ else 24681@@ -10749,10 +11399,10 @@ else
22592 /* When -fvisbility=hidden is used, assume the code has been annotated 24682 /* When -fvisbility=hidden is used, assume the code has been annotated
22593 correspondingly for the symbols needed. */ 24683 correspondingly for the symbols needed. */
22594 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 24684 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22601,16 +24691,16 @@ index 695819cd54b..14b5f28013a 100755
22601 int main () 24691 int main ()
22602 { 24692 {
22603 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 24693 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22604@@ -10771,7 +11422,7 @@ else 24694@@ -10811,7 +11461,7 @@ else
22605 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 24695 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22606 lt_status=$lt_dlunknown 24696 lt_status=$lt_dlunknown
22607 cat > conftest.$ac_ext <<_LT_EOF 24697 cat > conftest.$ac_ext <<_LT_EOF
22608-#line 10774 "configure" 24698-#line 10814 "configure"
22609+#line $LINENO "configure" 24699+#line $LINENO "configure"
22610 #include "confdefs.h" 24700 #include "confdefs.h"
22611 24701
22612 #if HAVE_DLFCN_H 24702 #if HAVE_DLFCN_H
22613@@ -10815,10 +11466,10 @@ else 24703@@ -10855,10 +11505,10 @@ else
22614 /* When -fvisbility=hidden is used, assume the code has been annotated 24704 /* When -fvisbility=hidden is used, assume the code has been annotated
22615 correspondingly for the symbols needed. */ 24705 correspondingly for the symbols needed. */
22616 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 24706 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22623,7 +24713,7 @@ index 695819cd54b..14b5f28013a 100755
22623 int main () 24713 int main ()
22624 { 24714 {
22625 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 24715 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22626@@ -12288,13 +12939,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 24716@@ -12328,13 +12978,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
22627 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 24717 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
22628 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 24718 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
22629 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 24719 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -22644,7 +24734,7 @@ index 695819cd54b..14b5f28013a 100755
22644 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 24734 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
22645 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 24735 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
22646 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 24736 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
22647@@ -12309,14 +12967,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 24737@@ -12349,14 +13006,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
22648 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 24738 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
22649 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 24739 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
22650 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 24740 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -22663,7 +24753,7 @@ index 695819cd54b..14b5f28013a 100755
22663 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 24753 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
22664 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 24754 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
22665 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 24755 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
22666@@ -12349,12 +13010,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 24756@@ -12389,12 +13049,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
22667 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 24757 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
22668 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 24758 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
22669 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 24759 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -22677,7 +24767,7 @@ index 695819cd54b..14b5f28013a 100755
22677 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 24767 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
22678 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 24768 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
22679 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 24769 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
22680@@ -12409,8 +13070,13 @@ reload_flag \ 24770@@ -12449,8 +13109,13 @@ reload_flag \
22681 OBJDUMP \ 24771 OBJDUMP \
22682 deplibs_check_method \ 24772 deplibs_check_method \
22683 file_magic_cmd \ 24773 file_magic_cmd \
@@ -22691,7 +24781,7 @@ index 695819cd54b..14b5f28013a 100755
22691 STRIP \ 24781 STRIP \
22692 RANLIB \ 24782 RANLIB \
22693 CC \ 24783 CC \
22694@@ -12420,12 +13086,14 @@ lt_cv_sys_global_symbol_pipe \ 24784@@ -12460,12 +13125,14 @@ lt_cv_sys_global_symbol_pipe \
22695 lt_cv_sys_global_symbol_to_cdecl \ 24785 lt_cv_sys_global_symbol_to_cdecl \
22696 lt_cv_sys_global_symbol_to_c_name_address \ 24786 lt_cv_sys_global_symbol_to_c_name_address \
22697 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 24787 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -22707,7 +24797,7 @@ index 695819cd54b..14b5f28013a 100755
22707 DSYMUTIL \ 24797 DSYMUTIL \
22708 NMEDIT \ 24798 NMEDIT \
22709 LIPO \ 24799 LIPO \
22710@@ -12441,7 +13109,6 @@ no_undefined_flag \ 24800@@ -12481,7 +13148,6 @@ no_undefined_flag \
22711 hardcode_libdir_flag_spec \ 24801 hardcode_libdir_flag_spec \
22712 hardcode_libdir_flag_spec_ld \ 24802 hardcode_libdir_flag_spec_ld \
22713 hardcode_libdir_separator \ 24803 hardcode_libdir_separator \
@@ -22715,7 +24805,7 @@ index 695819cd54b..14b5f28013a 100755
22715 exclude_expsyms \ 24805 exclude_expsyms \
22716 include_expsyms \ 24806 include_expsyms \
22717 file_list_spec \ 24807 file_list_spec \
22718@@ -12477,6 +13144,7 @@ module_cmds \ 24808@@ -12517,6 +13183,7 @@ module_cmds \
22719 module_expsym_cmds \ 24809 module_expsym_cmds \
22720 export_symbols_cmds \ 24810 export_symbols_cmds \
22721 prelink_cmds \ 24811 prelink_cmds \
@@ -22723,7 +24813,7 @@ index 695819cd54b..14b5f28013a 100755
22723 postinstall_cmds \ 24813 postinstall_cmds \
22724 postuninstall_cmds \ 24814 postuninstall_cmds \
22725 finish_cmds \ 24815 finish_cmds \
22726@@ -13075,7 +13743,8 @@ $as_echo X"$file" | 24816@@ -13115,7 +13782,8 @@ $as_echo X"$file" |
22727 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 24817 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
22728 # 24818 #
22729 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 24819 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -22733,7 +24823,7 @@ index 695819cd54b..14b5f28013a 100755
22733 # Written by Gordon Matzigkeit, 1996 24823 # Written by Gordon Matzigkeit, 1996
22734 # 24824 #
22735 # This file is part of GNU Libtool. 24825 # This file is part of GNU Libtool.
22736@@ -13178,19 +13847,42 @@ SP2NL=$lt_lt_SP2NL 24826@@ -13218,19 +13886,42 @@ SP2NL=$lt_lt_SP2NL
22737 # turn newlines into spaces. 24827 # turn newlines into spaces.
22738 NL2SP=$lt_lt_NL2SP 24828 NL2SP=$lt_lt_NL2SP
22739 24829
@@ -22777,7 +24867,7 @@ index 695819cd54b..14b5f28013a 100755
22777 # A symbol stripping program. 24867 # A symbol stripping program.
22778 STRIP=$lt_STRIP 24868 STRIP=$lt_STRIP
22779 24869
22780@@ -13220,6 +13912,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 24870@@ -13260,6 +13951,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
22781 # Transform the output of nm in a C name address pair when lib prefix is needed. 24871 # Transform the output of nm in a C name address pair when lib prefix is needed.
22782 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 24872 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
22783 24873
@@ -22790,7 +24880,7 @@ index 695819cd54b..14b5f28013a 100755
22790 # The name of the directory that contains temporary libtool files. 24880 # The name of the directory that contains temporary libtool files.
22791 objdir=$objdir 24881 objdir=$objdir
22792 24882
22793@@ -13229,6 +13927,9 @@ MAGIC_CMD=$MAGIC_CMD 24883@@ -13269,6 +13966,9 @@ MAGIC_CMD=$MAGIC_CMD
22794 # Must we lock files when doing compilation? 24884 # Must we lock files when doing compilation?
22795 need_locks=$lt_need_locks 24885 need_locks=$lt_need_locks
22796 24886
@@ -22800,7 +24890,7 @@ index 695819cd54b..14b5f28013a 100755
22800 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 24890 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
22801 DSYMUTIL=$lt_DSYMUTIL 24891 DSYMUTIL=$lt_DSYMUTIL
22802 24892
22803@@ -13343,12 +14044,12 @@ with_gcc=$GCC 24893@@ -13383,12 +14083,12 @@ with_gcc=$GCC
22804 # Compiler flag to turn off builtin functions. 24894 # Compiler flag to turn off builtin functions.
22805 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 24895 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
22806 24896
@@ -22816,7 +24906,7 @@ index 695819cd54b..14b5f28013a 100755
22816 # Compiler flag to prevent dynamic linking. 24906 # Compiler flag to prevent dynamic linking.
22817 link_static_flag=$lt_lt_prog_compiler_static 24907 link_static_flag=$lt_lt_prog_compiler_static
22818 24908
22819@@ -13435,9 +14136,6 @@ inherit_rpath=$inherit_rpath 24909@@ -13475,9 +14175,6 @@ inherit_rpath=$inherit_rpath
22820 # Whether libtool must link a program against all its dependency libraries. 24910 # Whether libtool must link a program against all its dependency libraries.
22821 link_all_deplibs=$link_all_deplibs 24911 link_all_deplibs=$link_all_deplibs
22822 24912
@@ -22826,7 +24916,7 @@ index 695819cd54b..14b5f28013a 100755
22826 # Set to "yes" if exported symbols are required. 24916 # Set to "yes" if exported symbols are required.
22827 always_export_symbols=$always_export_symbols 24917 always_export_symbols=$always_export_symbols
22828 24918
22829@@ -13453,6 +14151,9 @@ include_expsyms=$lt_include_expsyms 24919@@ -13493,6 +14190,9 @@ include_expsyms=$lt_include_expsyms
22830 # Commands necessary for linking programs (against libraries) with templates. 24920 # Commands necessary for linking programs (against libraries) with templates.
22831 prelink_cmds=$lt_prelink_cmds 24921 prelink_cmds=$lt_prelink_cmds
22832 24922
@@ -22836,7 +24926,7 @@ index 695819cd54b..14b5f28013a 100755
22836 # Specify filename containing input files. 24926 # Specify filename containing input files.
22837 file_list_spec=$lt_file_list_spec 24927 file_list_spec=$lt_file_list_spec
22838 24928
22839@@ -13485,210 +14186,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 24929@@ -13525,210 +14225,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
22840 # if finds mixed CR/LF and LF-only lines. Since sed operates in 24930 # if finds mixed CR/LF and LF-only lines. Since sed operates in
22841 # text mode, it properly converts lines to CR/LF. This bash problem 24931 # text mode, it properly converts lines to CR/LF. This bash problem
22842 # is reportedly fixed, but why not run on old versions too? 24932 # is reportedly fixed, but why not run on old versions too?
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index 0e4790577a..217ba5df85 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,4 +1,4 @@
1From ff256618bf85acca889920a1fb63ddea64cc98bc Mon Sep 17 00:00:00 2001 1From 1c4581a059afe2799bb825b388ae92f8fa6f19a3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:42:38 +0000 3Date: Mon, 2 Mar 2015 01:42:38 +0000
4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled
diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0011-sync-with-OE-libtool-changes.patch
index 6afd37aafc..3607e36ef4 100644
--- a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-sync-with-OE-libtool-changes.patch
@@ -1,4 +1,4 @@
1From 4b612f902c596838ab260194f840a466f8291618 Mon Sep 17 00:00:00 2001 1From d71c715554a054c534954b0aa357ca699ed68430 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 6 Mar 2017 23:33:27 -0800 3Date: Mon, 6 Mar 2017 23:33:27 -0800
4Subject: [PATCH] sync with OE libtool changes 4Subject: [PATCH] sync with OE libtool changes
diff --git a/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0012-Check-for-clang-before-checking-gcc-version.patch
index 135cd0f9ad..8848c05ae0 100644
--- a/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Check-for-clang-before-checking-gcc-version.patch
@@ -1,4 +1,4 @@
1From 707a5d49ecaa4fd722176d764251360a44fc5655 Mon Sep 17 00:00:00 2001 1From 787d7cd71d7886d3193c0fd747101c54ad7c3cd8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Apr 2020 14:17:20 -0700 3Date: Wed, 15 Apr 2020 14:17:20 -0700
4Subject: [PATCH] Check for clang before checking gcc version 4Subject: [PATCH] Check for clang before checking gcc version
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 2 files changed, 2 insertions(+), 2 deletions(-) 18 2 files changed, 2 insertions(+), 2 deletions(-)
19 19
20diff --git a/configure b/configure 20diff --git a/configure b/configure
21index e8ba1a1d3de..e00d4764583 100755 21index 6a1da1665d8..916656dc233 100755
22--- a/configure 22--- a/configure
23+++ b/configure 23+++ b/configure
24@@ -5275,7 +5275,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 24@@ -5287,7 +5287,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
25 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 25 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
26 /* end confdefs.h. */ 26 /* end confdefs.h. */
27 27
@@ -31,7 +31,7 @@ index e8ba1a1d3de..e00d4764583 100755
31 #endif 31 #endif
32 int main() {} 32 int main() {}
33diff --git a/configure.ac b/configure.ac 33diff --git a/configure.ac b/configure.ac
34index 3a8a3ae1f3b..c7f08b802d0 100644 34index 2b10e9a1b02..677a0196c2b 100644
35--- a/configure.ac 35--- a/configure.ac
36+++ b/configure.ac 36+++ b/configure.ac
37@@ -1309,7 +1309,7 @@ if test "$GCC" = yes; then 37@@ -1309,7 +1309,7 @@ if test "$GCC" = yes; then
diff --git a/meta/recipes-devtools/binutils/binutils/0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch b/meta/recipes-devtools/binutils/binutils/0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch
deleted file mode 100644
index 924980b4e8..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch
+++ /dev/null
@@ -1,234 +0,0 @@
1From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
2From: "H.J. Lu" <hjl.tools@gmail.com>
3Date: Mon, 26 Jul 2021 05:59:55 -0700
4Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
5
6Close the file descriptor if there is no archive plugin file descriptor
7to avoid running out of file descriptors on thin archives with many
8archive members.
9
10bfd/
11
12 PR ld/28138
13 * plugin.c (bfd_plugin_close_file_descriptor): Close the file
14 descriptor there is no archive plugin file descriptor.
15
16ld/
17
18 PR ld/28138
19 * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
20 native build.
21
22 PR ld/28138
23 * testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
24 * testsuite/ld-plugin/pr28138.c: New file.
25 * testsuite/ld-plugin/pr28138-1.c: Likewise.
26 * testsuite/ld-plugin/pr28138-2.c: Likewise.
27 * testsuite/ld-plugin/pr28138-3.c: Likewise.
28 * testsuite/ld-plugin/pr28138-4.c: Likewise.
29 * testsuite/ld-plugin/pr28138-5.c: Likewise.
30 * testsuite/ld-plugin/pr28138-6.c: Likewise.
31 * testsuite/ld-plugin/pr28138-7.c: Likewise.
32
33(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
34(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
35
36Upstream-Status: Accepted [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0]
37---
38 bfd/plugin.c | 8 +++++++
39 ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++
40 ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++
41 ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++
42 ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++
43 ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++
44 ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++
45 ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++
46 ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++
47 ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++
48 10 files changed, 104 insertions(+)
49 create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
50 create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
51 create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
52 create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
53 create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
54 create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
55 create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
56 create mode 100644 ld/testsuite/ld-plugin/pr28138.c
57
58diff --git a/bfd/plugin.c b/bfd/plugin.c
59index 6cfa2b66470..3bab8febe88 100644
60--- a/bfd/plugin.c
61+++ b/bfd/plugin.c
62@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
63 && !bfd_is_thin_archive (abfd->my_archive))
64 abfd = abfd->my_archive;
65
66+ /* Close the file descriptor if there is no archive plugin file
67+ descriptor. */
68+ if (abfd->archive_plugin_fd == -1)
69+ {
70+ close (fd);
71+ return;
72+ }
73+
74 abfd->archive_plugin_fd_open_count--;
75 /* Dup the archive plugin file descriptor for later use, which
76 will be closed by _bfd_archive_close_and_cleanup. */
77diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
78index def69e43ab3..999d911ce6a 100644
79--- a/ld/testsuite/ld-plugin/lto.exp
80+++ b/ld/testsuite/ld-plugin/lto.exp
81@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
82 }
83 }
84
85+run_cc_link_tests [list \
86+ [list \
87+ "Build pr28138.a" \
88+ "-T" "" \
89+ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
90+ pr28138-6.c pr28138-7.c} {} "pr28138.a" \
91+ ] \
92+ [list \
93+ "Build pr28138.o" \
94+ "" "" \
95+ {pr28138.c} {} \
96+ ] \
97+]
98+
99+set exec_output [run_host_cmd "sh" \
100+ "-c \"ulimit -n 20; \
101+ $CC -Btmpdir/ld -o tmpdir/pr28138 \
102+ tmpdir/pr28138.o tmpdir/pr28138.a\""]
103+set exec_output [prune_warnings $exec_output]
104+if [string match "" $exec_output] then {
105+ if { [isnative] } {
106+ set exec_output [run_host_cmd "tmpdir/pr28138" ""]
107+ if [string match "PASS" $exec_output] then {
108+ pass "PR ld/28138"
109+ } else {
110+ fail "PR ld/28138"
111+ }
112+ } else {
113+ pass "PR ld/28138"
114+ }
115+} else {
116+ fail "PR ld/28138"
117+}
118+
119 set testname "Build liblto-11.a"
120 remote_file host delete "tmpdir/liblto-11.a"
121 set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
122diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
123new file mode 100644
124index 00000000000..51d119e1642
125--- /dev/null
126+++ b/ld/testsuite/ld-plugin/pr28138-1.c
127@@ -0,0 +1,6 @@
128+extern int a0(void);
129+int
130+a1(void)
131+{
132+ return 1 + a0();
133+}
134diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
135new file mode 100644
136index 00000000000..1120cd797e9
137--- /dev/null
138+++ b/ld/testsuite/ld-plugin/pr28138-2.c
139@@ -0,0 +1,6 @@
140+extern int a1(void);
141+int
142+a2(void)
143+{
144+ return 1 + a1();
145+}
146diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
147new file mode 100644
148index 00000000000..ec464947ee6
149--- /dev/null
150+++ b/ld/testsuite/ld-plugin/pr28138-3.c
151@@ -0,0 +1,6 @@
152+extern int a2(void);
153+int
154+a3(void)
155+{
156+ return 1 + a2();
157+}
158diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
159new file mode 100644
160index 00000000000..475701b2c5c
161--- /dev/null
162+++ b/ld/testsuite/ld-plugin/pr28138-4.c
163@@ -0,0 +1,6 @@
164+extern int a3(void);
165+int
166+a4(void)
167+{
168+ return 1 + a3();
169+}
170diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
171new file mode 100644
172index 00000000000..e24f86c363e
173--- /dev/null
174+++ b/ld/testsuite/ld-plugin/pr28138-5.c
175@@ -0,0 +1,6 @@
176+extern int a4(void);
177+int
178+a5(void)
179+{
180+ return 1 + a4();
181+}
182diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
183new file mode 100644
184index 00000000000..b5b938bdb21
185--- /dev/null
186+++ b/ld/testsuite/ld-plugin/pr28138-6.c
187@@ -0,0 +1,6 @@
188+extern int a5(void);
189+int
190+a6(void)
191+{
192+ return 1 + a5();
193+}
194diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
195new file mode 100644
196index 00000000000..4ef75bf0f0c
197--- /dev/null
198+++ b/ld/testsuite/ld-plugin/pr28138-7.c
199@@ -0,0 +1,6 @@
200+extern int a6(void);
201+int
202+a7(void)
203+{
204+ return 1 + a6();
205+}
206diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
207new file mode 100644
208index 00000000000..68252c9f382
209--- /dev/null
210+++ b/ld/testsuite/ld-plugin/pr28138.c
211@@ -0,0 +1,20 @@
212+#include <stdio.h>
213+
214+extern int a7(void);
215+
216+int
217+a0(void)
218+{
219+ return 0;
220+}
221+
222+int
223+main()
224+{
225+ if (a7() == 7)
226+ {
227+ printf ("PASS\n");
228+ return 0;
229+ }
230+ return 1;
231+}
232--
2332.31.1
234
diff --git a/meta/recipes-devtools/binutils/binutils/161e87d12167b1e36193385485c1f6ce92f74f02.patch b/meta/recipes-devtools/binutils/binutils/161e87d12167b1e36193385485c1f6ce92f74f02.patch
deleted file mode 100644
index 8a655af06c..0000000000
--- a/meta/recipes-devtools/binutils/binutils/161e87d12167b1e36193385485c1f6ce92f74f02.patch
+++ /dev/null
@@ -1,247 +0,0 @@
1From: Alan Modra <amodra@gmail.com>
2Date: Wed, 15 Dec 2021 01:18:42 +0000 (+1030)
3Subject: PR28694, Out-of-bounds write in stab_xcoff_builtin_type
4CVE: CVE-2021-45078
5
6Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=161e87d12167b1e36193385485c1f6ce92f74f02]
7
8PR28694, Out-of-bounds write in stab_xcoff_builtin_type
9
10 PR 28694
11 * stabs.c (stab_xcoff_builtin_type): Make typenum unsigned.
12 Negate typenum earlier, simplifying bounds checking. Correct
13 off-by-one indexing. Adjust switch cases.
14---
15
16diff --git a/binutils/stabs.c b/binutils/stabs.c
17index 274bfb0e7fa..83ee3ea5fa4 100644
18--- a/binutils/stabs.c
19+++ b/binutils/stabs.c
20@@ -202,7 +202,7 @@ static debug_type stab_find_type (void *, struct stab_handle *, const int *);
21 static bool stab_record_type
22 (void *, struct stab_handle *, const int *, debug_type);
23 static debug_type stab_xcoff_builtin_type
24- (void *, struct stab_handle *, int);
25+ (void *, struct stab_handle *, unsigned int);
26 static debug_type stab_find_tagged_type
27 (void *, struct stab_handle *, const char *, int, enum debug_type_kind);
28 static debug_type *stab_demangle_argtypes
29@@ -3496,166 +3496,167 @@ stab_record_type (void *dhandle ATTRIBUTE_UNUSED, struct stab_handle *info,
30
31 static debug_type
32 stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info,
33- int typenum)
34+ unsigned int typenum)
35 {
36 debug_type rettype;
37 const char *name;
38
39- if (typenum >= 0 || typenum < -XCOFF_TYPE_COUNT)
40+ typenum = -typenum - 1;
41+ if (typenum >= XCOFF_TYPE_COUNT)
42 {
43- fprintf (stderr, _("Unrecognized XCOFF type %d\n"), typenum);
44+ fprintf (stderr, _("Unrecognized XCOFF type %d\n"), -typenum - 1);
45 return DEBUG_TYPE_NULL;
46 }
47- if (info->xcoff_types[-typenum] != NULL)
48- return info->xcoff_types[-typenum];
49+ if (info->xcoff_types[typenum] != NULL)
50+ return info->xcoff_types[typenum];
51
52- switch (-typenum)
53+ switch (typenum)
54 {
55- case 1:
56+ case 0:
57 /* The size of this and all the other types are fixed, defined
58 by the debugging format. */
59 name = "int";
60 rettype = debug_make_int_type (dhandle, 4, false);
61 break;
62- case 2:
63+ case 1:
64 name = "char";
65 rettype = debug_make_int_type (dhandle, 1, false);
66 break;
67- case 3:
68+ case 2:
69 name = "short";
70 rettype = debug_make_int_type (dhandle, 2, false);
71 break;
72- case 4:
73+ case 3:
74 name = "long";
75 rettype = debug_make_int_type (dhandle, 4, false);
76 break;
77- case 5:
78+ case 4:
79 name = "unsigned char";
80 rettype = debug_make_int_type (dhandle, 1, true);
81 break;
82- case 6:
83+ case 5:
84 name = "signed char";
85 rettype = debug_make_int_type (dhandle, 1, false);
86 break;
87- case 7:
88+ case 6:
89 name = "unsigned short";
90 rettype = debug_make_int_type (dhandle, 2, true);
91 break;
92- case 8:
93+ case 7:
94 name = "unsigned int";
95 rettype = debug_make_int_type (dhandle, 4, true);
96 break;
97- case 9:
98+ case 8:
99 name = "unsigned";
100 rettype = debug_make_int_type (dhandle, 4, true);
101 break;
102- case 10:
103+ case 9:
104 name = "unsigned long";
105 rettype = debug_make_int_type (dhandle, 4, true);
106 break;
107- case 11:
108+ case 10:
109 name = "void";
110 rettype = debug_make_void_type (dhandle);
111 break;
112- case 12:
113+ case 11:
114 /* IEEE single precision (32 bit). */
115 name = "float";
116 rettype = debug_make_float_type (dhandle, 4);
117 break;
118- case 13:
119+ case 12:
120 /* IEEE double precision (64 bit). */
121 name = "double";
122 rettype = debug_make_float_type (dhandle, 8);
123 break;
124- case 14:
125+ case 13:
126 /* This is an IEEE double on the RS/6000, and different machines
127 with different sizes for "long double" should use different
128 negative type numbers. See stabs.texinfo. */
129 name = "long double";
130 rettype = debug_make_float_type (dhandle, 8);
131 break;
132- case 15:
133+ case 14:
134 name = "integer";
135 rettype = debug_make_int_type (dhandle, 4, false);
136 break;
137- case 16:
138+ case 15:
139 name = "boolean";
140 rettype = debug_make_bool_type (dhandle, 4);
141 break;
142- case 17:
143+ case 16:
144 name = "short real";
145 rettype = debug_make_float_type (dhandle, 4);
146 break;
147- case 18:
148+ case 17:
149 name = "real";
150 rettype = debug_make_float_type (dhandle, 8);
151 break;
152- case 19:
153+ case 18:
154 /* FIXME */
155 name = "stringptr";
156 rettype = NULL;
157 break;
158- case 20:
159+ case 19:
160 /* FIXME */
161 name = "character";
162 rettype = debug_make_int_type (dhandle, 1, true);
163 break;
164- case 21:
165+ case 20:
166 name = "logical*1";
167 rettype = debug_make_bool_type (dhandle, 1);
168 break;
169- case 22:
170+ case 21:
171 name = "logical*2";
172 rettype = debug_make_bool_type (dhandle, 2);
173 break;
174- case 23:
175+ case 22:
176 name = "logical*4";
177 rettype = debug_make_bool_type (dhandle, 4);
178 break;
179- case 24:
180+ case 23:
181 name = "logical";
182 rettype = debug_make_bool_type (dhandle, 4);
183 break;
184- case 25:
185+ case 24:
186 /* Complex type consisting of two IEEE single precision values. */
187 name = "complex";
188 rettype = debug_make_complex_type (dhandle, 8);
189 break;
190- case 26:
191+ case 25:
192 /* Complex type consisting of two IEEE double precision values. */
193 name = "double complex";
194 rettype = debug_make_complex_type (dhandle, 16);
195 break;
196- case 27:
197+ case 26:
198 name = "integer*1";
199 rettype = debug_make_int_type (dhandle, 1, false);
200 break;
201- case 28:
202+ case 27:
203 name = "integer*2";
204 rettype = debug_make_int_type (dhandle, 2, false);
205 break;
206- case 29:
207+ case 28:
208 name = "integer*4";
209 rettype = debug_make_int_type (dhandle, 4, false);
210 break;
211- case 30:
212+ case 29:
213 /* FIXME */
214 name = "wchar";
215 rettype = debug_make_int_type (dhandle, 2, false);
216 break;
217- case 31:
218+ case 30:
219 name = "long long";
220 rettype = debug_make_int_type (dhandle, 8, false);
221 break;
222- case 32:
223+ case 31:
224 name = "unsigned long long";
225 rettype = debug_make_int_type (dhandle, 8, true);
226 break;
227- case 33:
228+ case 32:
229 name = "logical*8";
230 rettype = debug_make_bool_type (dhandle, 8);
231 break;
232- case 34:
233+ case 33:
234 name = "integer*8";
235 rettype = debug_make_int_type (dhandle, 8, false);
236 break;
237@@ -3664,9 +3665,7 @@ stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info,
238 }
239
240 rettype = debug_name_type (dhandle, name, rettype);
241-
242- info->xcoff_types[-typenum] = rettype;
243-
244+ info->xcoff_types[typenum] = rettype;
245 return rettype;
246 }
247
diff --git a/meta/recipes-devtools/binutils/binutils_2.37.bb b/meta/recipes-devtools/binutils/binutils_2.38.bb
index 12a6fb5577..12a6fb5577 100644
--- a/meta/recipes-devtools/binutils/binutils_2.37.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.38.bb