summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.36.inc (renamed from meta/recipes-devtools/binutils/binutils-2.35.1.inc)13
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.35.1.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.35.1.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.36.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.35.1.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.35.1.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch135
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch17
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch21
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch15
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch13
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch14
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch11
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch72
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch13
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch55
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch13
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch9
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch1235
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch7
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch7
-rw-r--r--meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch15
-rw-r--r--meta/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch35
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2020-35448.patch85
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.36.bb (renamed from meta/recipes-devtools/binutils/binutils_2.35.1.bb)0
26 files changed, 737 insertions, 1060 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 5540e37bcf..ba6e360b30 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
18 18
19GCCVERSION ?= "10.%" 19GCCVERSION ?= "10.%"
20SDKGCCVERSION ?= "${GCCVERSION}" 20SDKGCCVERSION ?= "${GCCVERSION}"
21BINUVERSION ?= "2.35%" 21BINUVERSION ?= "2.36%"
22GDBVERSION ?= "10.%" 22GDBVERSION ?= "10.%"
23GLIBCVERSION ?= "2.32" 23GLIBCVERSION ?= "2.32"
24LINUXLIBCVERSION ?= "5.10%" 24LINUXLIBCVERSION ?= "5.10%"
diff --git a/meta/recipes-devtools/binutils/binutils-2.35.1.inc b/meta/recipes-devtools/binutils/binutils-2.36.inc
index 775af2b8f2..ab0760621b 100644
--- a/meta/recipes-devtools/binutils/binutils-2.35.1.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.36.inc
@@ -14,17 +14,17 @@ def binutils_branch_version(d):
14 pvsplit = d.getVar('PV').split('.') 14 pvsplit = d.getVar('PV').split('.')
15 return pvsplit[0] + "_" + pvsplit[1] 15 return pvsplit[0] + "_" + pvsplit[1]
16 16
17# When upgrading to 2.35, please make sure there is no trailing .0, so 17# When upgrading to 2.37, please make sure there is no trailing .0, so
18# that upstream version check can work correctly. 18# that upstream version check can work correctly.
19PV = "2.35.1" 19PV = "2.36"
20CVE_VERSION = "2.35.1" 20CVE_VERSION = "2.36"
21BINUPV = "${@binutils_branch_version(d)}" 21BINUPV = "${@binutils_branch_version(d)}"
22#BRANCH = "binutils-${BINUPV}-branch" 22#BRANCH = "binutils-${BINUPV}-branch"
23BRANCH ?= "binutils-2_35-branch" 23BRANCH ?= "binutils-2_36-branch"
24 24
25UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 25UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
26 26
27SRCREV ?= "7e46a74aa3713c563940960e361e08defda019c2" 27SRCREV ?= "fe0e833171513c1d89668bc5f454192d2db39bce"
28BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" 28BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git"
29SRC_URI = "\ 29SRC_URI = "\
30 ${BINUTILS_GIT_URI} \ 30 ${BINUTILS_GIT_URI} \
@@ -41,8 +41,5 @@ SRC_URI = "\
41 file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ 41 file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
42 file://0015-sync-with-OE-libtool-changes.patch \ 42 file://0015-sync-with-OE-libtool-changes.patch \
43 file://0016-Check-for-clang-before-checking-gcc-version.patch \ 43 file://0016-Check-for-clang-before-checking-gcc-version.patch \
44 file://0017-gas-improve-reproducibility-for-stabs-debugging-data.patch \
45 file://0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch \
46 file://CVE-2020-35448.patch \
47" 44"
48S = "${WORKDIR}/git" 45S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.35.1.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.35.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.35.1.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb
index 07a8e7c417..07a8e7c417 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.35.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.35.1.bb b/meta/recipes-devtools/binutils/binutils-cross_2.36.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.35.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.36.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.35.1.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb
index 37f4d6d2e9..37f4d6d2e9 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.35.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb
diff --git a/meta/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch b/meta/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch
deleted file mode 100644
index f46ddab415..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0001-aarch64-Return-an-error-on-conditional-branch-to-an-.patch
+++ /dev/null
@@ -1,135 +0,0 @@
1From c7cd291722779c9d4703ed0010388fe394c644c8 Mon Sep 17 00:00:00 2001
2From: Siddhesh Poyarekar <siddesh.poyarekar@arm.com>
3Date: Tue, 1 Sep 2020 14:25:52 +0530
4Subject: [PATCH] aarch64: Return an error on conditional branch to an undefined symbol
5
6The fix in 7e05773767820b441b23a16628b55c98cb1aef46 introduced a PLT
7for conditional jumps when the target symbol is undefined. This is
8incorrect because conditional branch relocations are not allowed to
9clobber IP0/IP1 and hence, should not result in a dynamic relocation.
10
11Revert that change and in its place, issue an error when the target
12symbol is undefined.
13
14bfd/
15
16 2020-09-10 Siddhesh Poyarekar <siddesh.poyarekar@arm.com>
17
18 * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Revert
19 changes in 7e05773767820b441b23a16628b55c98cb1aef46. Set
20 error for undefined symbol in BFD_RELOC_AARCH64_BRANCH19 and
21 BFD_RELOC_AARCH64_TSTBR14 relocations.
22
23ld/
24
25 2020-09-10 Siddhesh Poyarekar <siddesh.poyarekar@arm.com>
26
27 * testsuite/ld-aarch64/emit-relocs-560.d: Expect error instead
28 of valid output.
29---
30Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=c7cd291722779c9d4703ed0010388fe394c644c8]
31Signed-off-by: Khem Raj <raj.khem@gmail.com>
32
33 bfd/ChangeLog | 7 +++++
34 bfd/elfnn-aarch64.c | 37 ++++++++++++-----------
35 ld/ChangeLog | 5 +++
36 ld/testsuite/ld-aarch64/emit-relocs-560.d | 7 +----
37 4 files changed, 32 insertions(+), 24 deletions(-)
38
39diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
40index 5b4c189b593..a9924e7ec56 100644
41--- a/bfd/elfnn-aarch64.c
42+++ b/bfd/elfnn-aarch64.c
43@@ -5447,7 +5447,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
44 bfd_vma orig_value = value;
45 bfd_boolean resolved_to_zero;
46 bfd_boolean abs_symbol_p;
47- bfd_boolean via_plt_p;
48
49 globals = elf_aarch64_hash_table (info);
50
51@@ -5469,8 +5468,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
52 : bfd_is_und_section (sym_sec));
53 abs_symbol_p = h != NULL && bfd_is_abs_symbol (&h->root);
54
55- via_plt_p = (globals->root.splt != NULL && h != NULL
56- && h->plt.offset != (bfd_vma) - 1);
57
58 /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
59 it here if it is defined in a non-shared object. */
60@@ -5806,23 +5803,12 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
61 value += signed_addend;
62 break;
63
64- case BFD_RELOC_AARCH64_BRANCH19:
65- case BFD_RELOC_AARCH64_TSTBR14:
66- /* A conditional branch to an undefined weak symbol is converted to a
67- branch to itself. */
68- if (weak_undef_p && !via_plt_p)
69- {
70- value = _bfd_aarch64_elf_resolve_relocation (input_bfd, bfd_r_type,
71- place, value,
72- signed_addend,
73- weak_undef_p);
74- break;
75- }
76- /* Fall through. */
77 case BFD_RELOC_AARCH64_CALL26:
78 case BFD_RELOC_AARCH64_JUMP26:
79 {
80 asection *splt = globals->root.splt;
81+ bfd_boolean via_plt_p =
82+ splt != NULL && h != NULL && h->plt.offset != (bfd_vma) - 1;
83
84 /* A call to an undefined weak symbol is converted to a jump to
85 the next instruction unless a PLT entry will be created.
86@@ -5903,6 +5889,23 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
87 bfd_set_error (bfd_error_bad_value);
88 return bfd_reloc_notsupported;
89 }
90+ value = _bfd_aarch64_elf_resolve_relocation (input_bfd, bfd_r_type,
91+ place, value,
92+ signed_addend,
93+ weak_undef_p);
94+ break;
95+
96+ case BFD_RELOC_AARCH64_BRANCH19:
97+ case BFD_RELOC_AARCH64_TSTBR14:
98+ if (h && h->root.type == bfd_link_hash_undefined)
99+ {
100+ _bfd_error_handler
101+ /* xgettext:c-format */
102+ (_("%pB: conditional branch to undefined symbol `%s' "
103+ "not allowed"), input_bfd, h->root.root.string);
104+ bfd_set_error (bfd_error_bad_value);
105+ return bfd_reloc_notsupported;
106+ }
107 /* Fall through. */
108
109 case BFD_RELOC_AARCH64_16:
110@@ -7968,8 +7971,6 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
111 break;
112 }
113
114- case BFD_RELOC_AARCH64_BRANCH19:
115- case BFD_RELOC_AARCH64_TSTBR14:
116 case BFD_RELOC_AARCH64_CALL26:
117 case BFD_RELOC_AARCH64_JUMP26:
118 /* If this is a local symbol then we resolve it
119diff --git a/ld/testsuite/ld-aarch64/emit-relocs-560.d b/ld/testsuite/ld-aarch64/emit-relocs-560.d
120index 153532457b4..8751b743bd4 100644
121--- a/ld/testsuite/ld-aarch64/emit-relocs-560.d
122+++ b/ld/testsuite/ld-aarch64/emit-relocs-560.d
123@@ -1,8 +1,3 @@
124 #source: emit-relocs-560.s
125 #ld: -shared
126-#readelf: -r
127-
128-Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 2 entries:
129- Offset Info Type Sym. Value Sym. Name \+ Addend
130-[0-9a-f]+ 000100000402 R_AARCH64_JUMP_SL 0000000000000000 baz \+ 0
131-[0-9a-f]+ 000200000402 R_AARCH64_JUMP_SL 0000000000000000 bar \+ 0
132+#error: .*: conditional branch to undefined symbol `bar' not allowed
133--
1342.29.2
135
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 4c1d11291b..49dacfef81 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,7 +1,7 @@
1From a0b23b160d6cfa7be4437c6e623633d76395f2ad Mon Sep 17 00:00:00 2001 1From 3b278a56a0e98d50ec62735598ee5f4b1834e8b3 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 01/16] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
5 5
6This patch will modify the ELF linker scripts so that the crosssdk 6This patch will modify the ELF linker scripts so that the crosssdk
7linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries 7linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries
@@ -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 13e533aaf21..b0afff16e2e 100644 24index a27cb071c75..32b52890b39 100644
25--- a/gold/layout.cc 25--- a/gold/layout.cc
26+++ b/gold/layout.cc 26+++ b/gold/layout.cc
27@@ -5019,7 +5019,7 @@ Layout::create_interp(const Target* target) 27@@ -5032,7 +5032,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 13e533aaf21..b0afff16e2e 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 03392d265c7..435689ea144 100755 37index 088417ef2d5..46a2db7005c 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 03392d265c7..435689ea144 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 eb74743e5c3..c9a8a47615f 100644 62index 29a8f0781d5..75e46f4adaf 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@@ -143,8 +143,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then 65@@ -147,8 +147,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
@@ -73,6 +73,3 @@ index eb74743e5c3..c9a8a47615f 100644
73 fi 73 fi
74 if test -z "$PLT"; then 74 if test -z "$PLT"; then
75 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" 75 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"
76--
772.28.0
78
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 41dff05b25..d07947404f 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,8 +1,7 @@
1From 0d14f8f333a9b519202246ce779f3e380491826c Mon Sep 17 00:00:00 2001 1From cf4c8a97b7dc1fe36a7d5dabed417fe18b15ad6b 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 02/17] binutils-cross: Do not generate linker script 4Subject: [PATCH] binutils-cross: Do not generate linker script directories
5 directories
6 5
7We don't place target libraries within ${exec_prefix}, we'd always place these 6We don't place target libraries within ${exec_prefix}, we'd always place these
8within the target sysroot within the standard library directories. Worse, the 7within the target sysroot within the standard library directories. Worse, the
@@ -23,7 +22,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 1 file changed, 25 deletions(-) 22 1 file changed, 25 deletions(-)
24 23
25diff --git a/ld/genscripts.sh b/ld/genscripts.sh 24diff --git a/ld/genscripts.sh b/ld/genscripts.sh
26index 435689ea144..cff8a1467f9 100755 25index 46a2db7005c..4bb7c33f560 100755
27--- a/ld/genscripts.sh 26--- a/ld/genscripts.sh
28+++ b/ld/genscripts.sh 27+++ b/ld/genscripts.sh
29@@ -235,31 +235,6 @@ append_to_lib_path() 28@@ -235,31 +235,6 @@ append_to_lib_path()
@@ -58,6 +57,3 @@ index 435689ea144..cff8a1467f9 100755
58 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then 57 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
59 libs=${NATIVE_LIB_DIRS} 58 libs=${NATIVE_LIB_DIRS}
60 if [ "x${NATIVE}" = "xyes" ] ; then 59 if [ "x${NATIVE}" = "xyes" ] ; then
61--
622.28.0
63
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 28daf58f74..cc37d30c53 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,8 +1,8 @@
1From 3bbec749ec9fe681ade6812c48c541a752fcffd5 Mon Sep 17 00:00:00 2001 1From 9701cab0fdf6a0c011978ae140c4c12a962956f6 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 03/17] binutils-nativesdk: Search for alternative ld.so.conf 4Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK
5 in SDK installation 5 installation
6 6
7We need binutils to look at our ld.so.conf file within the SDK to ensure 7We need binutils to look at our ld.so.conf file within the SDK to ensure
8we search the SDK's libdirs as well as those from the host system. 8we search the SDK's libdirs as well as those from the host system.
@@ -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 02c4fc16395..a5762227f0a 100644 32index 2c9a487335c..3b01357b651 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 02c4fc16395..a5762227f0a 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 2fe12e14f63..8f0c83ac8d2 100644 46index b41941c89e2..a6382bf2a45 100644
47--- a/ld/Makefile.in 47--- a/ld/Makefile.in
48+++ b/ld/Makefile.in 48+++ b/ld/Makefile.in
49@@ -548,7 +548,8 @@ ZLIB = @zlibdir@ -lz 49@@ -554,7 +554,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,7 +57,7 @@ index 2fe12e14f63..8f0c83ac8d2 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 bada3ade2d7..b4784009d7a 100644 60index f7407ab55a7..b25781cc0c4 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@@ -911,7 +911,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
@@ -70,7 +70,7 @@ index bada3ade2d7..b4784009d7a 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 08be9030cb5..f5c5a336320 100644 73index 863df0293ea..080b1c4c6c2 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 08be9030cb5..f5c5a336320 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 ac7db5720d5..1cbe1771912 100644 85index 38e63922d31..0966914938c 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 @@
@@ -93,6 +93,3 @@ index ac7db5720d5..1cbe1771912 100644
93 extern char *ld_canon_sysroot; 93 extern char *ld_canon_sysroot;
94 extern int ld_canon_sysroot_len; 94 extern int ld_canon_sysroot_len;
95 extern FILE *saved_script_handle; 95 extern FILE *saved_script_handle;
96--
972.28.0
98
diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch
index 2381c7b85e..1cd459ae81 100644
--- a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch
+++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch
@@ -1,7 +1,7 @@
1From 361c2c313196c095d12d17cecf0a069107dd629b Mon Sep 17 00:00:00 2001 1From 7e7512c82402363688cca6f1febea2c01cb03409 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:07:33 +0000 3Date: Mon, 2 Mar 2015 01:07:33 +0000
4Subject: [PATCH 04/17] configure: widen the regexp for SH architectures 4Subject: [PATCH] configure: widen the regexp for SH architectures
5 5
6gprof needs to know about uclibc 6gprof needs to know about uclibc
7 7
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 2 insertions(+), 2 deletions(-) 14 2 files changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 54d0339ab9e..6782f8b6ab8 100755 17index 68779feb42b..7b369071141 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3937,7 +3937,7 @@ case "${target}" in 20@@ -3887,7 +3887,7 @@ case "${target}" in
21 nvptx*-*-*) 21 nvptx*-*-*)
22 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" 22 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
23 ;; 23 ;;
@@ -27,10 +27,10 @@ index 54d0339ab9e..6782f8b6ab8 100755
27 sh*-*-elf) 27 sh*-*-elf)
28 ;; 28 ;;
29diff --git a/configure.ac b/configure.ac 29diff --git a/configure.ac b/configure.ac
30index a910c4fd6ba..55beb1dea46 100644 30index d16a2757689..92f01fb3ed7 100644
31--- a/configure.ac 31--- a/configure.ac
32+++ b/configure.ac 32+++ b/configure.ac
33@@ -1178,7 +1178,7 @@ case "${target}" in 33@@ -1177,7 +1177,7 @@ case "${target}" in
34 nvptx*-*-*) 34 nvptx*-*-*)
35 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" 35 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
36 ;; 36 ;;
@@ -39,6 +39,3 @@ index a910c4fd6ba..55beb1dea46 100644
39 case "${target}" in 39 case "${target}" in
40 sh*-*-elf) 40 sh*-*-elf)
41 ;; 41 ;;
42--
432.28.0
44
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch
index c31a0bc9a6..dde0cb5d6d 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch
+++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch
@@ -1,7 +1,7 @@
1From 39b478b7e52fb1b892a392f3c3750b9023cfabc8 Mon Sep 17 00:00:00 2001 1From 6a67d277941228d997b527990960413f8444fb81 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 05/17] Point scripts location to libdir 4Subject: [PATCH] Point scripts location to libdir
5 5
6Upstream-Status: Inappropriate [debian patch] 6Upstream-Status: Inappropriate [debian patch]
7 7
@@ -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 a5762227f0a..e1c665898f3 100644 15index 3b01357b651..b7a1f7491b0 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 a5762227f0a..e1c665898f3 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 8f0c83ac8d2..acc24ec4130 100644 28index a6382bf2a45..5ee3a4971be 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -556,7 +556,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -562,7 +562,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.
@@ -37,6 +37,3 @@ index 8f0c83ac8d2..acc24ec4130 100644
37 BASEDIR = $(srcdir)/.. 37 BASEDIR = $(srcdir)/..
38 BFDDIR = $(BASEDIR)/bfd 38 BFDDIR = $(BASEDIR)/bfd
39 INCDIR = $(BASEDIR)/include 39 INCDIR = $(BASEDIR)/include
40--
412.28.0
42
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/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index 654b64ff78..caa5f0bdd3 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/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,8 +1,7 @@
1From 59640ddf11104a604ccf7c078a48359d711c2f9c Mon Sep 17 00:00:00 2001 1From 8ad249270414a23a3e65c74fd67a8e4adaebec78 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 06/17] Only generate an RPATH entry if LD_RUN_PATH is not 4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
5 empty
6 5
7for cases where -rpath isn't specified. debian (#151024) 6for cases where -rpath isn't specified. debian (#151024)
8 7
@@ -15,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+) 14 1 file changed, 4 insertions(+)
16 15
17diff --git a/ld/ldelf.c b/ld/ldelf.c 16diff --git a/ld/ldelf.c b/ld/ldelf.c
18index b4784009d7a..541772f4604 100644 17index b25781cc0c4..77d7fb8ff03 100644
19--- a/ld/ldelf.c 18--- a/ld/ldelf.c
20+++ b/ld/ldelf.c 19+++ b/ld/ldelf.c
21@@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, 20@@ -1248,6 +1248,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
22 && command_line.rpath == NULL) 21 && command_line.rpath == NULL)
23 { 22 {
24 path = (const char *) getenv ("LD_RUN_PATH"); 23 path = (const char *) getenv ("LD_RUN_PATH");
@@ -27,7 +26,7 @@ index b4784009d7a..541772f4604 100644
27 if (path 26 if (path
28 && ldelf_search_needed (path, &n, force, 27 && ldelf_search_needed (path, &n, force,
29 is_linux, elfsize)) 28 is_linux, elfsize))
30@@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, char *depaudit, 29@@ -1608,6 +1610,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
31 rpath = command_line.rpath; 30 rpath = command_line.rpath;
32 if (rpath == NULL) 31 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH"); 32 rpath = (const char *) getenv ("LD_RUN_PATH");
@@ -36,6 +35,3 @@ index b4784009d7a..541772f4604 100644
36 35
37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) 36 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) 37 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
39--
402.28.0
41
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/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index 7f8fc9a5c0..b13a35e02f 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/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -1,8 +1,8 @@
1From 2b81508b9af76db292cd756432b03035cb8157e0 Mon Sep 17 00:00:00 2001 1From 091870218f192a5698c4420adf938e7178553c07 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 07/17] don't let the distro compiler point to the wrong 4Subject: [PATCH] don't let the distro compiler point to the wrong installation
5 installation location 5 location
6 6
7Thanks to RP for helping find the source code causing the issue. 7Thanks to RP for helping find the source code causing the issue.
8 8
@@ -17,7 +17,7 @@ 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 895f701bcd0..97a53f15bb6 100644 20index 788590957e1..1bca4aafeb7 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@@ -367,7 +367,8 @@ install-strip: install
@@ -30,6 +30,3 @@ index 895f701bcd0..97a53f15bb6 100644
30 install_to_libdir: all 30 install_to_libdir: all
31 if test -n "${target_header_dir}"; then \ 31 if test -n "${target_header_dir}"; then \
32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ 32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
33--
342.28.0
35
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/0008-warn-for-uses-of-system-directories-when-cross-linki.patch
index 2356c6a60f..3f83d48f62 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,7 +1,7 @@
1From 413075afbdb16e7cc05511682ca9e3c880acb5a7 Mon Sep 17 00:00:00 2001 1From a1d0ca24d3bbdf4cb37537cd84d04a17bf0f813b 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 08/17] warn for uses of system directories when cross linking 4Subject: [PATCH] warn for uses of system directories when cross linking
5 5
62008-07-02 Joseph Myers <joseph@codesourcery.com> 62008-07-02 Joseph Myers <joseph@codesourcery.com>
7 7
@@ -57,13 +57,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
57 ld/ld.h | 8 ++++++++ 57 ld/ld.h | 8 ++++++++
58 ld/ld.texi | 12 ++++++++++++ 58 ld/ld.texi | 12 ++++++++++++
59 ld/ldfile.c | 17 +++++++++++++++++ 59 ld/ldfile.c | 17 +++++++++++++++++
60 ld/ldlex.h | 5 +++++ 60 ld/ldlex.h | 2 ++
61 ld/ldmain.c | 2 ++ 61 ld/ldmain.c | 2 ++
62 ld/lexsup.c | 27 +++++++++++++++++++++++++++ 62 ld/lexsup.c | 15 +++++++++++++++
63 9 files changed, 100 insertions(+) 63 9 files changed, 85 insertions(+)
64 64
65diff --git a/ld/config.in b/ld/config.in 65diff --git a/ld/config.in b/ld/config.in
66index f1712107367..308e0173c16 100644 66index 7b60d778587..37b8e9b6f6c 100644
67--- a/ld/config.in 67--- a/ld/config.in
68+++ b/ld/config.in 68+++ b/ld/config.in
69@@ -40,6 +40,9 @@ 69@@ -40,6 +40,9 @@
@@ -77,10 +77,10 @@ index f1712107367..308e0173c16 100644
77 #undef EXTRA_SHLIB_EXTENSION 77 #undef EXTRA_SHLIB_EXTENSION
78 78
79diff --git a/ld/configure b/ld/configure 79diff --git a/ld/configure b/ld/configure
80index f08ce9969ea..1c872c0db5f 100755 80index d399d08d0c4..8355c433c76 100755
81--- a/ld/configure 81--- a/ld/configure
82+++ b/ld/configure 82+++ b/ld/configure
83@@ -826,6 +826,7 @@ with_lib_path 83@@ -828,6 +828,7 @@ with_lib_path
84 enable_targets 84 enable_targets
85 enable_64_bit_bfd 85 enable_64_bit_bfd
86 with_sysroot 86 with_sysroot
@@ -88,7 +88,7 @@ index f08ce9969ea..1c872c0db5f 100755
88 enable_gold 88 enable_gold
89 enable_got 89 enable_got
90 enable_compressed_debug_sections 90 enable_compressed_debug_sections
91@@ -1493,6 +1494,8 @@ Optional Features: 91@@ -1496,6 +1497,8 @@ Optional Features:
92 --disable-largefile omit support for large files 92 --disable-largefile omit support for large files
93 --enable-targets alternative target configurations 93 --enable-targets alternative target configurations
94 --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)
@@ -97,7 +97,7 @@ index f08ce9969ea..1c872c0db5f 100755
97 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 97 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
98 --enable-got=<type> GOT handling scheme (target, single, negative, 98 --enable-got=<type> GOT handling scheme (target, single, negative,
99 multigot) 99 multigot)
100@@ -15793,6 +15796,19 @@ fi 100@@ -15820,6 +15823,19 @@ fi
101 101
102 102
103 103
@@ -118,7 +118,7 @@ index f08ce9969ea..1c872c0db5f 100755
118 if test "${enable_gold+set}" = set; then : 118 if test "${enable_gold+set}" = set; then :
119 enableval=$enable_gold; case "${enableval}" in 119 enableval=$enable_gold; case "${enableval}" in
120diff --git a/ld/configure.ac b/ld/configure.ac 120diff --git a/ld/configure.ac b/ld/configure.ac
121index 5a4938afdb0..dbbbde74b04 100644 121index c9c69ab9245..59dab0a6ac4 100644
122--- a/ld/configure.ac 122--- a/ld/configure.ac
123+++ b/ld/configure.ac 123+++ b/ld/configure.ac
124@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) 124@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
@@ -139,7 +139,7 @@ index 5a4938afdb0..dbbbde74b04 100644
139 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.
140 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 141diff --git a/ld/ld.h b/ld/ld.h
142index 1790dc81a66..73f832eb169 100644 142index 93f5af92c7d..ff7f71a7b66 100644
143--- a/ld/ld.h 143--- a/ld/ld.h
144+++ b/ld/ld.h 144+++ b/ld/ld.h
145@@ -166,6 +166,14 @@ typedef struct 145@@ -166,6 +166,14 @@ typedef struct
@@ -158,10 +158,10 @@ index 1790dc81a66..73f832eb169 100644
158 enum endian_enum endian; 158 enum endian_enum endian;
159 159
160diff --git a/ld/ld.texi b/ld/ld.texi 160diff --git a/ld/ld.texi b/ld/ld.texi
161index 2a93e9456ac..3eeb70607fd 100644 161index 7a602b9c6ab..cccbfbab3bb 100644
162--- a/ld/ld.texi 162--- a/ld/ld.texi
163+++ b/ld/ld.texi 163+++ b/ld/ld.texi
164@@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. 164@@ -2810,6 +2810,18 @@ string identifying the original linked file does not change.
165 165
166 Passing @code{none} for @var{style} disables the setting from any 166 Passing @code{none} for @var{style} disables the setting from any
167 @code{--build-id} options earlier on the command line. 167 @code{--build-id} options earlier on the command line.
@@ -181,7 +181,7 @@ index 2a93e9456ac..3eeb70607fd 100644
181 181
182 @c man end 182 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c 183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index e39170b5d94..fadc248a140 100644 184index 81cb86d51e2..cd5c2752679 100644
185--- a/ld/ldfile.c 185--- a/ld/ldfile.c
186+++ b/ld/ldfile.c 186+++ b/ld/ldfile.c
187@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) 187@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
@@ -209,26 +209,23 @@ index e39170b5d94..fadc248a140 100644
209 209
210 /* 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 211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index 5ea083ebeb3..941dc5f3dc8 100644 212index b0101028321..77f5accb5d9 100644
213--- a/ld/ldlex.h 213--- a/ld/ldlex.h
214+++ b/ld/ldlex.h 214+++ b/ld/ldlex.h
215@@ -155,6 +155,11 @@ enum option_values 215@@ -161,6 +161,8 @@ enum option_values
216 OPTION_NON_CONTIGUOUS_REGIONS, 216 OPTION_CTF_VARIABLES,
217 OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, 217 OPTION_NO_CTF_VARIABLES,
218 OPTION_DEPENDENCY_FILE, 218 OPTION_CTF_SHARE_TYPES,
219+ OPTION_CTF_VARIABLES,
220+ OPTION_NO_CTF_VARIABLES,
221+ OPTION_CTF_SHARE_TYPES,
222+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, 219+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
223+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, 220+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
224 }; 221 };
225 222
226 /* The initial parser states. */ 223 /* The initial parser states. */
227diff --git a/ld/ldmain.c b/ld/ldmain.c 224diff --git a/ld/ldmain.c b/ld/ldmain.c
228index f5c5a336320..516ba0360e2 100644 225index 080b1c4c6c2..78d8a2df278 100644
229--- a/ld/ldmain.c 226--- a/ld/ldmain.c
230+++ b/ld/ldmain.c 227+++ b/ld/ldmain.c
231@@ -322,6 +322,8 @@ main (int argc, char **argv) 228@@ -324,6 +324,8 @@ main (int argc, char **argv)
232 command_line.warn_mismatch = TRUE; 229 command_line.warn_mismatch = TRUE;
233 command_line.warn_search_mismatch = TRUE; 230 command_line.warn_search_mismatch = TRUE;
234 command_line.check_section_addresses = -1; 231 command_line.check_section_addresses = -1;
@@ -238,25 +235,13 @@ index f5c5a336320..516ba0360e2 100644
238 /* We initialize DEMANGLING based on the environment variable 235 /* We initialize DEMANGLING based on the environment variable
239 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the 236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
240diff --git a/ld/lexsup.c b/ld/lexsup.c 237diff --git a/ld/lexsup.c b/ld/lexsup.c
241index 58c6c078325..879e7bb7658 100644 238index f005a58a045..c83292a9427 100644
242--- a/ld/lexsup.c 239--- a/ld/lexsup.c
243+++ b/ld/lexsup.c 240+++ b/ld/lexsup.c
244@@ -572,6 +572,26 @@ static const struct ld_option ld_options[] = 241@@ -591,6 +591,14 @@ static const struct ld_option ld_options[] =
245 { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, 242 " <method> is: share-unconflicted (default),\n"
246 '\0', NULL, N_("Do not show discarded sections in map file output"), 243 " share-duplicated"),
247 TWO_DASHES }, 244 TWO_DASHES },
248+ { {"ctf-variables", no_argument, NULL, OPTION_CTF_VARIABLES},
249+ '\0', NULL, N_("Emit names and types of static variables in CTF"),
250+ TWO_DASHES },
251+ { {"no-ctf-variables", no_argument, NULL, OPTION_NO_CTF_VARIABLES},
252+ '\0', NULL, N_("Do not emit names and types of static variables in CTF"),
253+ TWO_DASHES },
254+ { {"ctf-share-types=<method>", required_argument, NULL,
255+ OPTION_CTF_SHARE_TYPES},
256+ '\0', NULL, N_("How to share CTF types between translation units.\n"
257+ " <method> is: share-unconflicted (default),\n"
258+ " share-duplicated"),
259+ TWO_DASHES },
260+ { {"no-poison-system-directories", no_argument, NULL, 245+ { {"no-poison-system-directories", no_argument, NULL,
261+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, 246+ OPTION_NO_POISON_SYSTEM_DIRECTORIES},
262+ '\0', NULL, N_("Do not warn for -L options using system directories"), 247+ '\0', NULL, N_("Do not warn for -L options using system directories"),
@@ -268,7 +253,7 @@ index 58c6c078325..879e7bb7658 100644
268 }; 253 };
269 254
270 #define OPTION_COUNT ARRAY_SIZE (ld_options) 255 #define OPTION_COUNT ARRAY_SIZE (ld_options)
271@@ -1632,6 +1652,13 @@ parse_args (unsigned argc, char **argv) 256@@ -1674,6 +1682,13 @@ parse_args (unsigned argc, char **argv)
272 257
273 case OPTION_PRINT_MAP_DISCARDED: 258 case OPTION_PRINT_MAP_DISCARDED:
274 config.print_map_discarded = TRUE; 259 config.print_map_discarded = TRUE;
@@ -282,6 +267,3 @@ index 58c6c078325..879e7bb7658 100644
282 break; 267 break;
283 268
284 case OPTION_DEPENDENCY_FILE: 269 case OPTION_DEPENDENCY_FILE:
285--
2862.28.0
287
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
index fb5276e183..b8a1939d36 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
@@ -1,7 +1,7 @@
1From 13a67e9040c01abd284fe506471e0eab668ee3dc Mon Sep 17 00:00:00 2001 1From 5bd94030de598d3a13091dafaed3b956e0ab708f 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:44:14 +0000 3Date: Mon, 2 Mar 2015 01:44:14 +0000
4Subject: [PATCH 09/17] Change default emulation for mips64*-*-linux 4Subject: [PATCH] Change default emulation for mips64*-*-linux
5 5
6we change the default emulations to be N64 instead of N32 6we change the default emulations to be N64 instead of N32
7 7
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 8 insertions(+), 8 deletions(-) 14 2 files changed, 8 insertions(+), 8 deletions(-)
15 15
16diff --git a/bfd/config.bfd b/bfd/config.bfd 16diff --git a/bfd/config.bfd b/bfd/config.bfd
17index 14523caf0c5..e5233cd1f7e 100644 17index e7b55b0dd78..2caf492e172 100644
18--- a/bfd/config.bfd 18--- a/bfd/config.bfd
19+++ b/bfd/config.bfd 19+++ b/bfd/config.bfd
20@@ -894,12 +894,12 @@ case "${targ}" in 20@@ -896,12 +896,12 @@ case "${targ}" in
21 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" 21 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
22 ;; 22 ;;
23 mips64*el-*-linux*) 23 mips64*el-*-linux*)
@@ -35,7 +35,7 @@ index 14523caf0c5..e5233cd1f7e 100644
35 mips*el-*-linux*) 35 mips*el-*-linux*)
36 targ_defvec=mips_elf32_trad_le_vec 36 targ_defvec=mips_elf32_trad_le_vec
37diff --git a/ld/configure.tgt b/ld/configure.tgt 37diff --git a/ld/configure.tgt b/ld/configure.tgt
38index 87c7d9a4cad..9b4bf2ca964 100644 38index 0c780b24d57..47431770a17 100644
39--- a/ld/configure.tgt 39--- a/ld/configure.tgt
40+++ b/ld/configure.tgt 40+++ b/ld/configure.tgt
41@@ -531,12 +531,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks 41@@ -531,12 +531,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
@@ -55,6 +55,3 @@ index 87c7d9a4cad..9b4bf2ca964 100644
55 targ_extra_libpath=$targ_extra_emuls 55 targ_extra_libpath=$targ_extra_emuls
56 ;; 56 ;;
57 mips*el-*-linux-*) targ_emul=elf32ltsmip 57 mips*el-*-linux-*) targ_emul=elf32ltsmip
58--
592.28.0
60
diff --git a/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
index 277db4ec5c..fe2d02f29d 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch
@@ -1,7 +1,7 @@
1From 69ab45c16f80f18fa78121f6e774750b9e9a200b Mon Sep 17 00:00:00 2001 1From c64a5ca02a55b748311032e2c7d9c4f87bd74c63 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:06:19 +0000 3Date: Sun, 14 Feb 2016 17:06:19 +0000
4Subject: [PATCH 10/17] Add support for Netlogic XLP 4Subject: [PATCH] Add support for Netlogic XLP
5 5
6Patch From: Nebu Philips <nphilips@netlogicmicro.com> 6Patch From: Nebu Philips <nphilips@netlogicmicro.com>
7 7
@@ -35,7 +35,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
35 15 files changed, 65 insertions(+), 21 deletions(-) 35 15 files changed, 65 insertions(+), 21 deletions(-)
36 36
37diff --git a/bfd/aoutx.h b/bfd/aoutx.h 37diff --git a/bfd/aoutx.h b/bfd/aoutx.h
38index d352a1a3e44..2e2c3c1af86 100644 38index 8025b8c5241..cdcb7876896 100644
39--- a/bfd/aoutx.h 39--- a/bfd/aoutx.h
40+++ b/bfd/aoutx.h 40+++ b/bfd/aoutx.h
41@@ -810,6 +810,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, 41@@ -810,6 +810,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
@@ -47,7 +47,7 @@ index d352a1a3e44..2e2c3c1af86 100644
47 arch_flags = M_MIPS2; 47 arch_flags = M_MIPS2;
48 break; 48 break;
49diff --git a/bfd/archures.c b/bfd/archures.c 49diff --git a/bfd/archures.c b/bfd/archures.c
50index 551ec8732f0..2665b378623 100644 50index 8c1d32ca930..b4b2927ebc0 100644
51--- a/bfd/archures.c 51--- a/bfd/archures.c
52+++ b/bfd/archures.c 52+++ b/bfd/archures.c
53@@ -185,6 +185,7 @@ DESCRIPTION 53@@ -185,6 +185,7 @@ DESCRIPTION
@@ -59,10 +59,10 @@ index 551ec8732f0..2665b378623 100644
59 .#define bfd_mach_mipsisa32r2 33 59 .#define bfd_mach_mipsisa32r2 33
60 .#define bfd_mach_mipsisa32r3 34 60 .#define bfd_mach_mipsisa32r3 34
61diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h 61diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
62index 35ef4d755bb..48db00af80b 100644 62index 7eff85b7eaa..6c9eb12865e 100644
63--- a/bfd/bfd-in2.h 63--- a/bfd/bfd-in2.h
64+++ b/bfd/bfd-in2.h 64+++ b/bfd/bfd-in2.h
65@@ -1585,6 +1585,7 @@ enum bfd_architecture 65@@ -1590,6 +1590,7 @@ enum bfd_architecture
66 #define bfd_mach_mips_octeon3 6503 66 #define bfd_mach_mips_octeon3 6503
67 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ 67 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */
68 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ 68 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */
@@ -71,10 +71,10 @@ index 35ef4d755bb..48db00af80b 100644
71 #define bfd_mach_mipsisa32r2 33 71 #define bfd_mach_mipsisa32r2 33
72 #define bfd_mach_mipsisa32r3 34 72 #define bfd_mach_mipsisa32r3 34
73diff --git a/bfd/config.bfd b/bfd/config.bfd 73diff --git a/bfd/config.bfd b/bfd/config.bfd
74index e5233cd1f7e..2e4ae6bbdff 100644 74index 2caf492e172..e75417da4d8 100644
75--- a/bfd/config.bfd 75--- a/bfd/config.bfd
76+++ b/bfd/config.bfd 76+++ b/bfd/config.bfd
77@@ -877,6 +877,11 @@ case "${targ}" in 77@@ -879,6 +879,11 @@ case "${targ}" in
78 targ_defvec=mips_elf32_le_vec 78 targ_defvec=mips_elf32_le_vec
79 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" 79 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
80 ;; 80 ;;
@@ -87,7 +87,7 @@ index e5233cd1f7e..2e4ae6bbdff 100644
87 targ_defvec=mips_elf32_be_vec 87 targ_defvec=mips_elf32_be_vec
88 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" 88 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
89diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c 89diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
90index 802acb45f1e..fd9ec4c0ad4 100644 90index 5a944ceee81..c57d12ba3dd 100644
91--- a/bfd/cpu-mips.c 91--- a/bfd/cpu-mips.c
92+++ b/bfd/cpu-mips.c 92+++ b/bfd/cpu-mips.c
93@@ -108,7 +108,8 @@ enum 93@@ -108,7 +108,8 @@ enum
@@ -111,10 +111,10 @@ index 802acb45f1e..fd9ec4c0ad4 100644
111 111
112 /* The default architecture is mips:3000, but with a machine number of 112 /* The default architecture is mips:3000, but with a machine number of
113diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c 113diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
114index 160febec94c..4c9499cc2cf 100644 114index 3cbb3cf9495..0c6cd47b40c 100644
115--- a/bfd/elfxx-mips.c 115--- a/bfd/elfxx-mips.c
116+++ b/bfd/elfxx-mips.c 116+++ b/bfd/elfxx-mips.c
117@@ -6982,6 +6982,9 @@ _bfd_elf_mips_mach (flagword flags) 117@@ -6980,6 +6980,9 @@ _bfd_elf_mips_mach (flagword flags)
118 case E_MIPS_MACH_IAMR2: 118 case E_MIPS_MACH_IAMR2:
119 return bfd_mach_mips_interaptiv_mr2; 119 return bfd_mach_mips_interaptiv_mr2;
120 120
@@ -124,7 +124,7 @@ index 160febec94c..4c9499cc2cf 100644
124 default: 124 default:
125 switch (flags & EF_MIPS_ARCH) 125 switch (flags & EF_MIPS_ARCH)
126 { 126 {
127@@ -12356,6 +12359,10 @@ mips_set_isa_flags (bfd *abfd) 127@@ -12335,6 +12338,10 @@ mips_set_isa_flags (bfd *abfd)
128 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; 128 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2;
129 break; 129 break;
130 130
@@ -135,7 +135,7 @@ index 160febec94c..4c9499cc2cf 100644
135 case bfd_mach_mipsisa32: 135 case bfd_mach_mipsisa32:
136 val = E_MIPS_ARCH_32; 136 val = E_MIPS_ARCH_32;
137 break; 137 break;
138@@ -14373,6 +14380,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = 138@@ -14352,6 +14359,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
139 { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, 139 { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e },
140 { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, 140 { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 },
141 { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, 141 { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 },
@@ -144,10 +144,10 @@ index 160febec94c..4c9499cc2cf 100644
144 /* MIPS64 extensions. */ 144 /* MIPS64 extensions. */
145 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, 145 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },
146diff --git a/binutils/readelf.c b/binutils/readelf.c 146diff --git a/binutils/readelf.c b/binutils/readelf.c
147index 6057515a89b..ea119b0b254 100644 147index ad16b4571c9..4bf2b732502 100644
148--- a/binutils/readelf.c 148--- a/binutils/readelf.c
149+++ b/binutils/readelf.c 149+++ b/binutils/readelf.c
150@@ -3483,6 +3483,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) 150@@ -3502,6 +3502,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine)
151 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; 151 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break;
152 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; 152 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break;
153 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; 153 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break;
@@ -156,7 +156,7 @@ index 6057515a89b..ea119b0b254 100644
156 /* We simply ignore the field in this case to avoid confusion: 156 /* We simply ignore the field in this case to avoid confusion:
157 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU 157 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU
158diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c 158diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
159index 31acb77d78a..0ead168d51e 100644 159index 538b69710f5..b021b64f14b 100644
160--- a/gas/config/tc-mips.c 160--- a/gas/config/tc-mips.c
161+++ b/gas/config/tc-mips.c 161+++ b/gas/config/tc-mips.c
162@@ -568,6 +568,7 @@ static int mips_32bitmode = 0; 162@@ -568,6 +568,7 @@ static int mips_32bitmode = 0;
@@ -175,7 +175,7 @@ index 31acb77d78a..0ead168d51e 100644
175 ) 175 )
176 176
177 /* Whether the processor uses hardware interlocks to protect reads 177 /* Whether the processor uses hardware interlocks to protect reads
178@@ -20174,7 +20176,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = 178@@ -20156,7 +20158,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
179 /* Broadcom XLP. 179 /* Broadcom XLP.
180 XLP is mostly like XLR, with the prominent exception that it is 180 XLP is mostly like XLR, with the prominent exception that it is
181 MIPS64R2 rather than MIPS64. */ 181 MIPS64R2 rather than MIPS64. */
@@ -185,10 +185,10 @@ index 31acb77d78a..0ead168d51e 100644
185 /* MIPS 64 Release 6. */ 185 /* MIPS 64 Release 6. */
186 { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, 186 { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6},
187diff --git a/gas/configure b/gas/configure 187diff --git a/gas/configure b/gas/configure
188index 5bccfd9d1b7..d4b13e6fc8b 100755 188index d03432c6dc6..d5ae54925e9 100755
189--- a/gas/configure 189--- a/gas/configure
190+++ b/gas/configure 190+++ b/gas/configure
191@@ -12722,6 +12722,9 @@ _ACEOF 191@@ -12761,6 +12761,9 @@ _ACEOF
192 mipsisa64r6 | mipsisa64r6el) 192 mipsisa64r6 | mipsisa64r6el)
193 mips_cpu=mips64r6 193 mips_cpu=mips64r6
194 ;; 194 ;;
@@ -199,10 +199,10 @@ index 5bccfd9d1b7..d4b13e6fc8b 100755
199 mips_cpu=r3900 199 mips_cpu=r3900
200 ;; 200 ;;
201diff --git a/gas/configure.ac b/gas/configure.ac 201diff --git a/gas/configure.ac b/gas/configure.ac
202index b65108fecb2..ce1f2dad9bc 100644 202index 82706561886..f1c27bf2878 100644
203--- a/gas/configure.ac 203--- a/gas/configure.ac
204+++ b/gas/configure.ac 204+++ b/gas/configure.ac
205@@ -325,6 +325,9 @@ changequote([,])dnl 205@@ -332,6 +332,9 @@ changequote([,])dnl
206 mipsisa64r6 | mipsisa64r6el) 206 mipsisa64r6 | mipsisa64r6el)
207 mips_cpu=mips64r6 207 mips_cpu=mips64r6
208 ;; 208 ;;
@@ -213,7 +213,7 @@ index b65108fecb2..ce1f2dad9bc 100644
213 mips_cpu=r3900 213 mips_cpu=r3900
214 ;; 214 ;;
215diff --git a/include/elf/mips.h b/include/elf/mips.h 215diff --git a/include/elf/mips.h b/include/elf/mips.h
216index cc08ebd4318..bb518575ce1 100644 216index 4bd86307120..2d7df22abf2 100644
217--- a/include/elf/mips.h 217--- a/include/elf/mips.h
218+++ b/include/elf/mips.h 218+++ b/include/elf/mips.h
219@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) 219@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
@@ -225,7 +225,7 @@ index cc08ebd4318..bb518575ce1 100644
225 #define E_MIPS_MACH_OCTEON3 0x008e0000 225 #define E_MIPS_MACH_OCTEON3 0x008e0000
226 #define E_MIPS_MACH_5400 0x00910000 226 #define E_MIPS_MACH_5400 0x00910000
227diff --git a/include/opcode/mips.h b/include/opcode/mips.h 227diff --git a/include/opcode/mips.h b/include/opcode/mips.h
228index fd031f37588..a96a44df840 100644 228index d1b4a2574ac..879c68fcfd4 100644
229--- a/include/opcode/mips.h 229--- a/include/opcode/mips.h
230+++ b/include/opcode/mips.h 230+++ b/include/opcode/mips.h
231@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { 231@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = {
@@ -256,7 +256,7 @@ index fd031f37588..a96a44df840 100644
256 return FALSE; 256 return FALSE;
257 } 257 }
258diff --git a/ld/configure.tgt b/ld/configure.tgt 258diff --git a/ld/configure.tgt b/ld/configure.tgt
259index 9b4bf2ca964..f6d7171dff7 100644 259index 47431770a17..f714744eab3 100644
260--- a/ld/configure.tgt 260--- a/ld/configure.tgt
261+++ b/ld/configure.tgt 261+++ b/ld/configure.tgt
262@@ -510,6 +510,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) 262@@ -510,6 +510,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
@@ -270,7 +270,7 @@ index 9b4bf2ca964..f6d7171dff7 100644
270 targ_extra_emuls="elf32lr5900" 270 targ_extra_emuls="elf32lr5900"
271 targ_extra_libpath=$targ_extra_emuls 271 targ_extra_libpath=$targ_extra_emuls
272diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c 272diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
273index 755bbe294bd..ce22ef683a6 100644 273index 317ced51204..6869f890656 100644
274--- a/opcodes/mips-dis.c 274--- a/opcodes/mips-dis.c
275+++ b/opcodes/mips-dis.c 275+++ b/opcodes/mips-dis.c
276@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = 276@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] =
@@ -293,7 +293,7 @@ index 755bbe294bd..ce22ef683a6 100644
293 /* This entry, mips16, is here only for ISA/processor selection; do 293 /* This entry, mips16, is here only for ISA/processor selection; do
294 not print its name. */ 294 not print its name. */
295diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c 295diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
296index 5270aeefa80..d17dc78cd71 100644 296index b45eb40bf69..2f4eb5c0354 100644
297--- a/opcodes/mips-opc.c 297--- a/opcodes/mips-opc.c
298+++ b/opcodes/mips-opc.c 298+++ b/opcodes/mips-opc.c
299@@ -328,6 +328,7 @@ decode_mips_operand (const char *p) 299@@ -328,6 +328,7 @@ decode_mips_operand (const char *p)
@@ -404,6 +404,3 @@ index 5270aeefa80..d17dc78cd71 100644
404 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 404 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
405 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 405 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
406 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, 406 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },
407--
4082.28.0
409
diff --git a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
index 10c3d80865..1041b7301e 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
@@ -1,7 +1,7 @@
1From 7836f8aa56ef0f18c8658dc7e4952a9d097ba7e8 Mon Sep 17 00:00:00 2001 1From 7f4938d062146e40b4e6d427a5eca6cc6acaaeee 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 11/17] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
5 5
6Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> 6Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
7 7
@@ -11,10 +11,10 @@ Upstream-Status: Pending
11 1 file changed, 1 insertion(+), 3 deletions(-) 11 1 file changed, 1 insertion(+), 3 deletions(-)
12 12
13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c 13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
14index 5e20d617664..4c9656ecf08 100644 14index bbbadffad8f..72092355e12 100644
15--- a/opcodes/ppc-opc.c 15--- a/opcodes/ppc-opc.c
16+++ b/opcodes/ppc-opc.c 16+++ b/opcodes/ppc-opc.c
17@@ -6265,8 +6265,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 17@@ -6302,8 +6302,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
18 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, 18 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}},
19 {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, 0, {0}}, 19 {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, 0, {0}},
20 {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, 0, {0}}, 20 {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, 0, {0}},
@@ -23,7 +23,7 @@ index 5e20d617664..4c9656ecf08 100644
23 23
24 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, 24 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
25 25
26@@ -6326,7 +6324,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { 26@@ -6363,7 +6361,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
27 27
28 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 28 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
29 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 29 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
@@ -32,6 +32,3 @@ index 5e20d617664..4c9656ecf08 100644
32 32
33 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, 33 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}},
34 34
35--
362.28.0
37
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch
index ef8b253b6a..659ae799ad 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch
@@ -1,7 +1,7 @@
1From dbff6bdf2123f5495b8be930304d9aa5e88006a7 Mon Sep 17 00:00:00 2001 1From bb229568e505f2276ca58b72fef6781034fa839f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 31 Mar 2017 11:42:03 -0700 3Date: Fri, 31 Mar 2017 11:42:03 -0700
4Subject: [PATCH 12/17] Detect 64-bit MIPS targets 4Subject: [PATCH] Detect 64-bit MIPS targets
5 5
6Add mips64 target triplets and default to N64 6Add mips64 target triplets and default to N64
7 7
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 14 insertions(+) 14 1 file changed, 14 insertions(+)
15 15
16diff --git a/gold/configure.tgt b/gold/configure.tgt 16diff --git a/gold/configure.tgt b/gold/configure.tgt
17index aa7ec552aec..470515062e4 100644 17index cac0866e628..24fbf641456 100644
18--- a/gold/configure.tgt 18--- a/gold/configure.tgt
19+++ b/gold/configure.tgt 19+++ b/gold/configure.tgt
20@@ -153,6 +153,13 @@ aarch64*-*) 20@@ -153,6 +153,13 @@ aarch64*-*)
@@ -45,6 +45,3 @@ index aa7ec552aec..470515062e4 100644
45 mips*-*-*) 45 mips*-*-*)
46 targ_obj=mips 46 targ_obj=mips
47 targ_machine=EM_MIPS 47 targ_machine=EM_MIPS
48--
492.28.0
50
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch
index 987a96f4b7..d4067691cf 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch
@@ -1,7 +1,7 @@
1From 7e2ddee8704c9c3b73760dd9464b18fade563d85 Mon Sep 17 00:00:00 2001 1From a1031fca1b6c1348c078bb8a9df6e7d29148dae1 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 13/17] Use libtool 2.4 4Subject: [PATCH] Use libtool 2.4
5 5
6get libtool sysroot support 6get libtool sysroot support
7 7
@@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26 14 files changed, 10931 insertions(+), 4028 deletions(-) 26 14 files changed, 10931 insertions(+), 4028 deletions(-)
27 27
28diff --git a/bfd/configure b/bfd/configure 28diff --git a/bfd/configure b/bfd/configure
29index 0340ed541b5..2012656b3b7 100755 29index b3665c68c13..376b951d496 100755
30--- a/bfd/configure 30--- a/bfd/configure
31+++ b/bfd/configure 31+++ b/bfd/configure
32@@ -704,6 +704,9 @@ OTOOL 32@@ -705,6 +705,9 @@ OTOOL
33 LIPO 33 LIPO
34 NMEDIT 34 NMEDIT
35 DSYMUTIL 35 DSYMUTIL
@@ -39,7 +39,7 @@ index 0340ed541b5..2012656b3b7 100755
39 OBJDUMP 39 OBJDUMP
40 LN_S 40 LN_S
41 NM 41 NM
42@@ -822,6 +825,7 @@ enable_static 42@@ -823,6 +826,7 @@ enable_static
43 with_pic 43 with_pic
44 enable_fast_install 44 enable_fast_install
45 with_gnu_ld 45 with_gnu_ld
@@ -47,7 +47,7 @@ index 0340ed541b5..2012656b3b7 100755
47 enable_libtool_lock 47 enable_libtool_lock
48 enable_plugins 48 enable_plugins
49 enable_largefile 49 enable_largefile
50@@ -1504,6 +1508,8 @@ Optional Packages: 50@@ -1505,6 +1509,8 @@ Optional Packages:
51 --with-pic try to use only PIC/non-PIC objects [default=use 51 --with-pic try to use only PIC/non-PIC objects [default=use
52 both] 52 both]
53 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 53 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -56,7 +56,7 @@ index 0340ed541b5..2012656b3b7 100755
56 --with-mmap try using mmap for BFD input files if available 56 --with-mmap try using mmap for BFD input files if available
57 --with-separate-debug-dir=DIR 57 --with-separate-debug-dir=DIR
58 Look for global separate debug info in DIR 58 Look for global separate debug info in DIR
59@@ -5693,8 +5699,8 @@ esac 59@@ -5694,8 +5700,8 @@ esac
60 60
61 61
62 62
@@ -67,7 +67,7 @@ index 0340ed541b5..2012656b3b7 100755
67 67
68 68
69 69
70@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 70@@ -5735,7 +5741,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
72 $as_echo_n "checking how to print strings... " >&6; } 72 $as_echo_n "checking how to print strings... " >&6; }
73 # Test print first, because it will be a builtin if present. 73 # Test print first, because it will be a builtin if present.
@@ -76,7 +76,7 @@ index 0340ed541b5..2012656b3b7 100755
76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
77 ECHO='print -r --' 77 ECHO='print -r --'
78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
79@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 79@@ -6421,8 +6427,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
80 # Try some XSI features 80 # Try some XSI features
81 xsi_shell=no 81 xsi_shell=no
82 ( _lt_dummy="a/b/c" 82 ( _lt_dummy="a/b/c"
@@ -87,7 +87,7 @@ index 0340ed541b5..2012656b3b7 100755
87 && eval 'test $(( 1 + 1 )) -eq 2 \ 87 && eval 'test $(( 1 + 1 )) -eq 2 \
88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
89 && xsi_shell=yes 89 && xsi_shell=yes
90@@ -6470,6 +6476,80 @@ esac 90@@ -6471,6 +6477,80 @@ esac
91 91
92 92
93 93
@@ -168,7 +168,7 @@ index 0340ed541b5..2012656b3b7 100755
168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 168 { $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; } 169 $as_echo_n "checking for $LD option to reload object files... " >&6; }
170 if ${lt_cv_ld_reload_flag+:} false; then : 170 if ${lt_cv_ld_reload_flag+:} false; then :
171@@ -6486,6 +6566,11 @@ case $reload_flag in 171@@ -6487,6 +6567,11 @@ case $reload_flag in
172 esac 172 esac
173 reload_cmds='$LD$reload_flag -o $output$reload_objs' 173 reload_cmds='$LD$reload_flag -o $output$reload_objs'
174 case $host_os in 174 case $host_os in
@@ -180,7 +180,7 @@ index 0340ed541b5..2012656b3b7 100755
180 darwin*) 180 darwin*)
181 if test "$GCC" = yes; then 181 if test "$GCC" = yes; then
182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
183@@ -6654,7 +6739,8 @@ mingw* | pw32*) 183@@ -6655,7 +6740,8 @@ mingw* | pw32*)
184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
185 lt_cv_file_magic_cmd='func_win32_libid' 185 lt_cv_file_magic_cmd='func_win32_libid'
186 else 186 else
@@ -190,7 +190,7 @@ index 0340ed541b5..2012656b3b7 100755
190 lt_cv_file_magic_cmd='$OBJDUMP -f' 190 lt_cv_file_magic_cmd='$OBJDUMP -f'
191 fi 191 fi
192 ;; 192 ;;
193@@ -6808,6 +6894,21 @@ esac 193@@ -6809,6 +6895,21 @@ esac
194 fi 194 fi
195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
196 $as_echo "$lt_cv_deplibs_check_method" >&6; } 196 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -212,7 +212,7 @@ index 0340ed541b5..2012656b3b7 100755
212 file_magic_cmd=$lt_cv_file_magic_cmd 212 file_magic_cmd=$lt_cv_file_magic_cmd
213 deplibs_check_method=$lt_cv_deplibs_check_method 213 deplibs_check_method=$lt_cv_deplibs_check_method
214 test -z "$deplibs_check_method" && deplibs_check_method=unknown 214 test -z "$deplibs_check_method" && deplibs_check_method=unknown
215@@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 215@@ -6822,11 +6923,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
216 216
217 217
218 218
@@ -379,7 +379,7 @@ index 0340ed541b5..2012656b3b7 100755
379 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 379 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
380 $as_echo_n "checking for $ac_word... " >&6; } 380 $as_echo_n "checking for $ac_word... " >&6; }
381 if ${ac_cv_prog_AR+:} false; then : 381 if ${ac_cv_prog_AR+:} false; then :
382@@ -6841,7 +7095,7 @@ do 382@@ -6842,7 +7096,7 @@ do
383 test -z "$as_dir" && as_dir=. 383 test -z "$as_dir" && as_dir=.
384 for ac_exec_ext in '' $ac_executable_extensions; do 384 for ac_exec_ext in '' $ac_executable_extensions; do
385 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 385 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -388,7 +388,7 @@ index 0340ed541b5..2012656b3b7 100755
388 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 388 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
389 break 2 389 break 2
390 fi 390 fi
391@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } 391@@ -6862,11 +7116,15 @@ $as_echo "no" >&6; }
392 fi 392 fi
393 393
394 394
@@ -407,7 +407,7 @@ index 0340ed541b5..2012656b3b7 100755
407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
408 $as_echo_n "checking for $ac_word... " >&6; } 408 $as_echo_n "checking for $ac_word... " >&6; }
409 if ${ac_cv_prog_ac_ct_AR+:} false; then : 409 if ${ac_cv_prog_ac_ct_AR+:} false; then :
410@@ -6881,7 +7139,7 @@ do 410@@ -6882,7 +7140,7 @@ do
411 test -z "$as_dir" && as_dir=. 411 test -z "$as_dir" && as_dir=.
412 for ac_exec_ext in '' $ac_executable_extensions; do 412 for ac_exec_ext in '' $ac_executable_extensions; do
413 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 413 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -416,7 +416,7 @@ index 0340ed541b5..2012656b3b7 100755
416 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 416 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
417 break 2 417 break 2
418 fi 418 fi
419@@ -6900,6 +7158,10 @@ else 419@@ -6901,6 +7159,10 @@ else
420 $as_echo "no" >&6; } 420 $as_echo "no" >&6; }
421 fi 421 fi
422 422
@@ -427,7 +427,7 @@ index 0340ed541b5..2012656b3b7 100755
427 if test "x$ac_ct_AR" = x; then 427 if test "x$ac_ct_AR" = x; then
428 AR="false" 428 AR="false"
429 else 429 else
430@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; 430@@ -6912,16 +7174,72 @@ ac_tool_warned=yes ;;
431 esac 431 esac
432 AR=$ac_ct_AR 432 AR=$ac_ct_AR
433 fi 433 fi
@@ -504,7 +504,7 @@ index 0340ed541b5..2012656b3b7 100755
504 504
505 505
506 506
507@@ -7262,8 +7580,8 @@ esac 507@@ -7263,8 +7581,8 @@ esac
508 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 508 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
509 509
510 # Transform an extracted symbol line into symbol name and symbol address 510 # Transform an extracted symbol line into symbol name and symbol address
@@ -515,7 +515,7 @@ index 0340ed541b5..2012656b3b7 100755
515 515
516 # Handle CRLF in mingw tool chain 516 # Handle CRLF in mingw tool chain
517 opt_cr= 517 opt_cr=
518@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do 518@@ -7300,6 +7618,7 @@ for ac_symprfx in "" "_"; do
519 else 519 else
520 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 520 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
521 fi 521 fi
@@ -523,7 +523,7 @@ index 0340ed541b5..2012656b3b7 100755
523 523
524 # Check to see that the pipe works correctly. 524 # Check to see that the pipe works correctly.
525 pipe_works=no 525 pipe_works=no
526@@ -7340,6 +7659,18 @@ _LT_EOF 526@@ -7341,6 +7660,18 @@ _LT_EOF
527 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 527 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
528 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 528 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
529 cat <<_LT_EOF > conftest.$ac_ext 529 cat <<_LT_EOF > conftest.$ac_ext
@@ -542,7 +542,7 @@ index 0340ed541b5..2012656b3b7 100755
542 #ifdef __cplusplus 542 #ifdef __cplusplus
543 extern "C" { 543 extern "C" {
544 #endif 544 #endif
545@@ -7351,7 +7682,7 @@ _LT_EOF 545@@ -7352,7 +7683,7 @@ _LT_EOF
546 cat <<_LT_EOF >> conftest.$ac_ext 546 cat <<_LT_EOF >> conftest.$ac_ext
547 547
548 /* The mapping between symbol names and symbols. */ 548 /* The mapping between symbol names and symbols. */
@@ -551,7 +551,7 @@ index 0340ed541b5..2012656b3b7 100755
551 const char *name; 551 const char *name;
552 void *address; 552 void *address;
553 } 553 }
554@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() { 554@@ -7378,8 +7709,8 @@ static const void *lt_preloaded_setup() {
555 _LT_EOF 555 _LT_EOF
556 # Now try linking the two files. 556 # Now try linking the two files.
557 mv conftest.$ac_objext conftstm.$ac_objext 557 mv conftest.$ac_objext conftstm.$ac_objext
@@ -562,7 +562,7 @@ index 0340ed541b5..2012656b3b7 100755
562 LIBS="conftstm.$ac_objext" 562 LIBS="conftstm.$ac_objext"
563 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 563 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
564 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 564 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
565@@ -7388,8 +7719,8 @@ _LT_EOF 565@@ -7389,8 +7720,8 @@ _LT_EOF
566 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 566 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
567 pipe_works=yes 567 pipe_works=yes
568 fi 568 fi
@@ -573,7 +573,7 @@ index 0340ed541b5..2012656b3b7 100755
573 else 573 else
574 echo "cannot find nm_test_func in $nlist" >&5 574 echo "cannot find nm_test_func in $nlist" >&5
575 fi 575 fi
576@@ -7426,6 +7757,16 @@ else 576@@ -7427,6 +7758,16 @@ else
577 $as_echo "ok" >&6; } 577 $as_echo "ok" >&6; }
578 fi 578 fi
579 579
@@ -590,7 +590,7 @@ index 0340ed541b5..2012656b3b7 100755
590 590
591 591
592 592
593@@ -7442,6 +7783,45 @@ fi 593@@ -7443,6 +7784,45 @@ fi
594 594
595 595
596 596
@@ -636,7 +636,7 @@ index 0340ed541b5..2012656b3b7 100755
636 636
637 637
638 638
639@@ -7653,6 +8033,123 @@ esac 639@@ -7654,6 +8034,123 @@ esac
640 640
641 need_locks="$enable_libtool_lock" 641 need_locks="$enable_libtool_lock"
642 642
@@ -760,7 +760,7 @@ index 0340ed541b5..2012656b3b7 100755
760 760
761 case $host_os in 761 case $host_os in
762 rhapsody* | darwin*) 762 rhapsody* | darwin*)
763@@ -8216,6 +8713,8 @@ _LT_EOF 763@@ -8217,6 +8714,8 @@ _LT_EOF
764 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 764 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
765 echo "$AR cru libconftest.a conftest.o" >&5 765 echo "$AR cru libconftest.a conftest.o" >&5
766 $AR cru libconftest.a conftest.o 2>&5 766 $AR cru libconftest.a conftest.o 2>&5
@@ -769,7 +769,7 @@ index 0340ed541b5..2012656b3b7 100755
769 cat > conftest.c << _LT_EOF 769 cat > conftest.c << _LT_EOF
770 int main() { return 0;} 770 int main() { return 0;}
771 _LT_EOF 771 _LT_EOF
772@@ -8380,7 +8879,8 @@ fi 772@@ -8381,7 +8880,8 @@ fi
773 LIBTOOL_DEPS="$ltmain" 773 LIBTOOL_DEPS="$ltmain"
774 774
775 # Always use our own libtool. 775 # Always use our own libtool.
@@ -779,7 +779,7 @@ index 0340ed541b5..2012656b3b7 100755
779 779
780 780
781 781
782@@ -8469,7 +8969,7 @@ aix3*) 782@@ -8470,7 +8970,7 @@ aix3*)
783 esac 783 esac
784 784
785 # Global variables: 785 # Global variables:
@@ -788,7 +788,7 @@ index 0340ed541b5..2012656b3b7 100755
788 can_build_shared=yes 788 can_build_shared=yes
789 789
790 # All known linkers require a `.a' archive for static linking (except MSVC, 790 # All known linkers require a `.a' archive for static linking (except MSVC,
791@@ -8767,8 +9267,6 @@ fi 791@@ -8768,8 +9268,6 @@ fi
792 lt_prog_compiler_pic= 792 lt_prog_compiler_pic=
793 lt_prog_compiler_static= 793 lt_prog_compiler_static=
794 794
@@ -797,7 +797,7 @@ index 0340ed541b5..2012656b3b7 100755
797 797
798 if test "$GCC" = yes; then 798 if test "$GCC" = yes; then
799 lt_prog_compiler_wl='-Wl,' 799 lt_prog_compiler_wl='-Wl,'
800@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 800@@ -8935,6 +9433,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
801 lt_prog_compiler_pic='--shared' 801 lt_prog_compiler_pic='--shared'
802 lt_prog_compiler_static='--static' 802 lt_prog_compiler_static='--static'
803 ;; 803 ;;
@@ -810,7 +810,7 @@ index 0340ed541b5..2012656b3b7 100755
810 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 810 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
811 # Portland Group compilers (*not* the Pentium gcc compiler, 811 # Portland Group compilers (*not* the Pentium gcc compiler,
812 # which looks to be a dead project) 812 # which looks to be a dead project)
813@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 813@@ -8997,7 +9501,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
814 lt_prog_compiler_pic='-KPIC' 814 lt_prog_compiler_pic='-KPIC'
815 lt_prog_compiler_static='-Bstatic' 815 lt_prog_compiler_static='-Bstatic'
816 case $cc_basename in 816 case $cc_basename in
@@ -819,7 +819,7 @@ index 0340ed541b5..2012656b3b7 100755
819 lt_prog_compiler_wl='-Qoption ld ';; 819 lt_prog_compiler_wl='-Qoption ld ';;
820 *) 820 *)
821 lt_prog_compiler_wl='-Wl,';; 821 lt_prog_compiler_wl='-Wl,';;
822@@ -9053,13 +9557,17 @@ case $host_os in 822@@ -9054,13 +9558,17 @@ case $host_os in
823 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 823 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
824 ;; 824 ;;
825 esac 825 esac
@@ -843,7 +843,7 @@ index 0340ed541b5..2012656b3b7 100755
843 843
844 # 844 #
845 # Check to make sure the PIC flag actually works. 845 # Check to make sure the PIC flag actually works.
846@@ -9120,6 +9628,11 @@ fi 846@@ -9121,6 +9629,11 @@ fi
847 847
848 848
849 849
@@ -855,7 +855,7 @@ index 0340ed541b5..2012656b3b7 100755
855 # 855 #
856 # Check to make sure the static flag actually works. 856 # Check to make sure the static flag actually works.
857 # 857 #
858@@ -9470,7 +9983,8 @@ _LT_EOF 858@@ -9471,7 +9984,8 @@ _LT_EOF
859 allow_undefined_flag=unsupported 859 allow_undefined_flag=unsupported
860 always_export_symbols=no 860 always_export_symbols=no
861 enable_shared_with_static_runtimes=yes 861 enable_shared_with_static_runtimes=yes
@@ -865,7 +865,7 @@ index 0340ed541b5..2012656b3b7 100755
865 865
866 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 866 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
867 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 867 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
868@@ -9569,12 +10083,12 @@ _LT_EOF 868@@ -9570,12 +10084,12 @@ _LT_EOF
869 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 869 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
870 hardcode_libdir_flag_spec= 870 hardcode_libdir_flag_spec=
871 hardcode_libdir_flag_spec_ld='-rpath $libdir' 871 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -880,7 +880,7 @@ index 0340ed541b5..2012656b3b7 100755
880 fi 880 fi
881 ;; 881 ;;
882 esac 882 esac
883@@ -9588,8 +10102,8 @@ _LT_EOF 883@@ -9589,8 +10103,8 @@ _LT_EOF
884 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 884 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
885 wlarc= 885 wlarc=
886 else 886 else
@@ -891,7 +891,7 @@ index 0340ed541b5..2012656b3b7 100755
891 fi 891 fi
892 ;; 892 ;;
893 893
894@@ -9607,8 +10121,8 @@ _LT_EOF 894@@ -9608,8 +10122,8 @@ _LT_EOF
895 895
896 _LT_EOF 896 _LT_EOF
897 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 897 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -902,7 +902,7 @@ index 0340ed541b5..2012656b3b7 100755
902 else 902 else
903 ld_shlibs=no 903 ld_shlibs=no
904 fi 904 fi
905@@ -9654,8 +10168,8 @@ _LT_EOF 905@@ -9655,8 +10169,8 @@ _LT_EOF
906 906
907 *) 907 *)
908 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 908 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -913,7 +913,7 @@ index 0340ed541b5..2012656b3b7 100755
913 else 913 else
914 ld_shlibs=no 914 ld_shlibs=no
915 fi 915 fi
916@@ -9785,7 +10299,13 @@ _LT_EOF 916@@ -9786,7 +10300,13 @@ _LT_EOF
917 allow_undefined_flag='-berok' 917 allow_undefined_flag='-berok'
918 # Determine the default libpath from the value encoded in an 918 # Determine the default libpath from the value encoded in an
919 # empty executable. 919 # empty executable.
@@ -928,7 +928,7 @@ index 0340ed541b5..2012656b3b7 100755
928 /* end confdefs.h. */ 928 /* end confdefs.h. */
929 929
930 int 930 int
931@@ -9798,22 +10318,29 @@ main () 931@@ -9799,22 +10319,29 @@ main ()
932 _ACEOF 932 _ACEOF
933 if ac_fn_c_try_link "$LINENO"; then : 933 if ac_fn_c_try_link "$LINENO"; then :
934 934
@@ -971,7 +971,7 @@ index 0340ed541b5..2012656b3b7 100755
971 971
972 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 972 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
973 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" 973 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"
974@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 974@@ -9826,7 +10353,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
975 else 975 else
976 # Determine the default libpath from the value encoded in an 976 # Determine the default libpath from the value encoded in an
977 # empty executable. 977 # empty executable.
@@ -986,7 +986,7 @@ index 0340ed541b5..2012656b3b7 100755
986 /* end confdefs.h. */ 986 /* end confdefs.h. */
987 987
988 int 988 int
989@@ -9838,22 +10371,29 @@ main () 989@@ -9839,22 +10372,29 @@ main ()
990 _ACEOF 990 _ACEOF
991 if ac_fn_c_try_link "$LINENO"; then : 991 if ac_fn_c_try_link "$LINENO"; then :
992 992
@@ -1029,7 +1029,7 @@ index 0340ed541b5..2012656b3b7 100755
1029 1029
1030 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1030 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1031 # Warning - without using the other run time loading flags, 1031 # Warning - without using the other run time loading flags,
1032@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1032@@ -9899,20 +10439,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1033 # Microsoft Visual C++. 1033 # Microsoft Visual C++.
1034 # hardcode_libdir_flag_spec is actually meaningless, as there is 1034 # hardcode_libdir_flag_spec is actually meaningless, as there is
1035 # no search path for DLLs. 1035 # no search path for DLLs.
@@ -1107,7 +1107,7 @@ index 0340ed541b5..2012656b3b7 100755
1107 ;; 1107 ;;
1108 1108
1109 darwin* | rhapsody*) 1109 darwin* | rhapsody*)
1110@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1110@@ -9973,7 +10556,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1111 1111
1112 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1112 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1113 freebsd* | dragonfly*) 1113 freebsd* | dragonfly*)
@@ -1116,7 +1116,7 @@ index 0340ed541b5..2012656b3b7 100755
1116 hardcode_libdir_flag_spec='-R$libdir' 1116 hardcode_libdir_flag_spec='-R$libdir'
1117 hardcode_direct=yes 1117 hardcode_direct=yes
1118 hardcode_shlibpath_var=no 1118 hardcode_shlibpath_var=no
1119@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1119@@ -9981,7 +10564,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1120 1120
1121 hpux9*) 1121 hpux9*)
1122 if test "$GCC" = yes; then 1122 if test "$GCC" = yes; then
@@ -1125,7 +1125,7 @@ index 0340ed541b5..2012656b3b7 100755
1125 else 1125 else
1126 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' 1126 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'
1127 fi 1127 fi
1128@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1128@@ -9997,7 +10580,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1129 1129
1130 hpux10*) 1130 hpux10*)
1131 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1131 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1134,7 +1134,7 @@ index 0340ed541b5..2012656b3b7 100755
1134 else 1134 else
1135 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1135 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1136 fi 1136 fi
1137@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1137@@ -10021,10 +10604,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1138 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1138 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1139 ;; 1139 ;;
1140 ia64*) 1140 ia64*)
@@ -1147,7 +1147,7 @@ index 0340ed541b5..2012656b3b7 100755
1147 ;; 1147 ;;
1148 esac 1148 esac
1149 else 1149 else
1150@@ -10102,23 +10685,36 @@ fi 1150@@ -10103,23 +10686,36 @@ fi
1151 1151
1152 irix5* | irix6* | nonstopux*) 1152 irix5* | irix6* | nonstopux*)
1153 if test "$GCC" = yes; then 1153 if test "$GCC" = yes; then
@@ -1192,7 +1192,7 @@ index 0340ed541b5..2012656b3b7 100755
1192 else 1192 else
1193 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' 1193 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'
1194 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' 1194 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'
1195@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1195@@ -10204,7 +10800,7 @@ rm -f core conftest.err conftest.$ac_objext \
1196 osf4* | osf5*) # as osf3* with the addition of -msym flag 1196 osf4* | osf5*) # as osf3* with the addition of -msym flag
1197 if test "$GCC" = yes; then 1197 if test "$GCC" = yes; then
1198 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1198 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1201,7 +1201,7 @@ index 0340ed541b5..2012656b3b7 100755
1201 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1201 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1202 else 1202 else
1203 allow_undefined_flag=' -expect_unresolved \*' 1203 allow_undefined_flag=' -expect_unresolved \*'
1204@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1204@@ -10223,9 +10819,9 @@ rm -f core conftest.err conftest.$ac_objext \
1205 no_undefined_flag=' -z defs' 1205 no_undefined_flag=' -z defs'
1206 if test "$GCC" = yes; then 1206 if test "$GCC" = yes; then
1207 wlarc='${wl}' 1207 wlarc='${wl}'
@@ -1213,7 +1213,7 @@ index 0340ed541b5..2012656b3b7 100755
1213 else 1213 else
1214 case `$CC -V 2>&1` in 1214 case `$CC -V 2>&1` in
1215 *"Compilers 5.0"*) 1215 *"Compilers 5.0"*)
1216@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1216@@ -10801,8 +11397,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1217 need_version=no 1217 need_version=no
1218 need_lib_prefix=no 1218 need_lib_prefix=no
1219 1219
@@ -1225,7 +1225,7 @@ index 0340ed541b5..2012656b3b7 100755
1225 library_names_spec='$libname.dll.a' 1225 library_names_spec='$libname.dll.a'
1226 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1226 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1227 postinstall_cmds='base_file=`basename \${file}`~ 1227 postinstall_cmds='base_file=`basename \${file}`~
1228@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1228@@ -10835,13 +11432,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1229 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1229 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1230 ;; 1230 ;;
1231 esac 1231 esac
@@ -1298,7 +1298,7 @@ index 0340ed541b5..2012656b3b7 100755
1298 # FIXME: first we should search . and the directory the executable is in 1298 # FIXME: first we should search . and the directory the executable is in
1299 shlibpath_var=PATH 1299 shlibpath_var=PATH
1300 ;; 1300 ;;
1301@@ -10932,7 +11587,7 @@ haiku*) 1301@@ -10923,7 +11578,7 @@ haiku*)
1302 soname_spec='${libname}${release}${shared_ext}$major' 1302 soname_spec='${libname}${release}${shared_ext}$major'
1303 shlibpath_var=LIBRARY_PATH 1303 shlibpath_var=LIBRARY_PATH
1304 shlibpath_overrides_runpath=yes 1304 shlibpath_overrides_runpath=yes
@@ -1307,16 +1307,16 @@ index 0340ed541b5..2012656b3b7 100755
1307 hardcode_into_libs=yes 1307 hardcode_into_libs=yes
1308 ;; 1308 ;;
1309 1309
1310@@ -11728,7 +12383,7 @@ else 1310@@ -11719,7 +12374,7 @@ else
1311 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1311 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1312 lt_status=$lt_dlunknown 1312 lt_status=$lt_dlunknown
1313 cat > conftest.$ac_ext <<_LT_EOF 1313 cat > conftest.$ac_ext <<_LT_EOF
1314-#line 11731 "configure" 1314-#line 11722 "configure"
1315+#line $LINENO "configure" 1315+#line $LINENO "configure"
1316 #include "confdefs.h" 1316 #include "confdefs.h"
1317 1317
1318 #if HAVE_DLFCN_H 1318 #if HAVE_DLFCN_H
1319@@ -11772,10 +12427,10 @@ else 1319@@ -11763,10 +12418,10 @@ else
1320 /* When -fvisbility=hidden is used, assume the code has been annotated 1320 /* When -fvisbility=hidden is used, assume the code has been annotated
1321 correspondingly for the symbols needed. */ 1321 correspondingly for the symbols needed. */
1322 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1322 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1329,16 +1329,16 @@ index 0340ed541b5..2012656b3b7 100755
1329 int main () 1329 int main ()
1330 { 1330 {
1331 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1331 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1332@@ -11834,7 +12489,7 @@ else 1332@@ -11825,7 +12480,7 @@ else
1333 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1333 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1334 lt_status=$lt_dlunknown 1334 lt_status=$lt_dlunknown
1335 cat > conftest.$ac_ext <<_LT_EOF 1335 cat > conftest.$ac_ext <<_LT_EOF
1336-#line 11837 "configure" 1336-#line 11828 "configure"
1337+#line $LINENO "configure" 1337+#line $LINENO "configure"
1338 #include "confdefs.h" 1338 #include "confdefs.h"
1339 1339
1340 #if HAVE_DLFCN_H 1340 #if HAVE_DLFCN_H
1341@@ -11878,10 +12533,10 @@ else 1341@@ -11869,10 +12524,10 @@ else
1342 /* When -fvisbility=hidden is used, assume the code has been annotated 1342 /* When -fvisbility=hidden is used, assume the code has been annotated
1343 correspondingly for the symbols needed. */ 1343 correspondingly for the symbols needed. */
1344 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1344 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1351,7 +1351,7 @@ index 0340ed541b5..2012656b3b7 100755
1351 int main () 1351 int main ()
1352 { 1352 {
1353 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1353 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1354@@ -14578,7 +15233,7 @@ SHARED_LDFLAGS= 1354@@ -14599,7 +15254,7 @@ SHARED_LDFLAGS=
1355 if test "$enable_shared" = "yes"; then 1355 if test "$enable_shared" = "yes"; then
1356 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'`
1357 if test -n "$x"; then 1357 if test -n "$x"; then
@@ -1360,7 +1360,7 @@ index 0340ed541b5..2012656b3b7 100755
1360 fi 1360 fi
1361 1361
1362 case "${host}" in 1362 case "${host}" in
1363@@ -17197,13 +17852,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1363@@ -17199,13 +17854,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1364 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1364 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1365 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1365 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1366 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1366 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1381,7 +1381,7 @@ index 0340ed541b5..2012656b3b7 100755
1381 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1381 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1382 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1382 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1383 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"`'
1384@@ -17218,14 +17880,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1384@@ -17220,14 +17882,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1385 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"`'
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"`' 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"`'
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"`' 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"`'
@@ -1400,7 +1400,7 @@ index 0340ed541b5..2012656b3b7 100755
1400 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1400 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1401 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1401 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1402 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1402 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1403@@ -17258,12 +17923,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1403@@ -17260,12 +17925,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1404 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1404 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1405 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1405 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1406 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"`'
@@ -1414,7 +1414,7 @@ index 0340ed541b5..2012656b3b7 100755
1414 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"`'
1415 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"`'
1416 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"`'
1417@@ -17318,8 +17983,13 @@ reload_flag \ 1417@@ -17320,8 +17985,13 @@ reload_flag \
1418 OBJDUMP \ 1418 OBJDUMP \
1419 deplibs_check_method \ 1419 deplibs_check_method \
1420 file_magic_cmd \ 1420 file_magic_cmd \
@@ -1428,7 +1428,7 @@ index 0340ed541b5..2012656b3b7 100755
1428 STRIP \ 1428 STRIP \
1429 RANLIB \ 1429 RANLIB \
1430 CC \ 1430 CC \
1431@@ -17329,12 +17999,14 @@ lt_cv_sys_global_symbol_pipe \ 1431@@ -17331,12 +18001,14 @@ lt_cv_sys_global_symbol_pipe \
1432 lt_cv_sys_global_symbol_to_cdecl \ 1432 lt_cv_sys_global_symbol_to_cdecl \
1433 lt_cv_sys_global_symbol_to_c_name_address \ 1433 lt_cv_sys_global_symbol_to_c_name_address \
1434 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1434 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1444,7 +1444,7 @@ index 0340ed541b5..2012656b3b7 100755
1444 DSYMUTIL \ 1444 DSYMUTIL \
1445 NMEDIT \ 1445 NMEDIT \
1446 LIPO \ 1446 LIPO \
1447@@ -17350,7 +18022,6 @@ no_undefined_flag \ 1447@@ -17352,7 +18024,6 @@ no_undefined_flag \
1448 hardcode_libdir_flag_spec \ 1448 hardcode_libdir_flag_spec \
1449 hardcode_libdir_flag_spec_ld \ 1449 hardcode_libdir_flag_spec_ld \
1450 hardcode_libdir_separator \ 1450 hardcode_libdir_separator \
@@ -1452,7 +1452,7 @@ index 0340ed541b5..2012656b3b7 100755
1452 exclude_expsyms \ 1452 exclude_expsyms \
1453 include_expsyms \ 1453 include_expsyms \
1454 file_list_spec \ 1454 file_list_spec \
1455@@ -17386,6 +18057,7 @@ module_cmds \ 1455@@ -17388,6 +18059,7 @@ module_cmds \
1456 module_expsym_cmds \ 1456 module_expsym_cmds \
1457 export_symbols_cmds \ 1457 export_symbols_cmds \
1458 prelink_cmds \ 1458 prelink_cmds \
@@ -1460,7 +1460,7 @@ index 0340ed541b5..2012656b3b7 100755
1460 postinstall_cmds \ 1460 postinstall_cmds \
1461 postuninstall_cmds \ 1461 postuninstall_cmds \
1462 finish_cmds \ 1462 finish_cmds \
1463@@ -18174,7 +18846,8 @@ $as_echo X"$file" | 1463@@ -18176,7 +18848,8 @@ $as_echo X"$file" |
1464 # 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.
1465 # 1465 #
1466 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1466 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1470,7 +1470,7 @@ index 0340ed541b5..2012656b3b7 100755
1470 # Written by Gordon Matzigkeit, 1996 1470 # Written by Gordon Matzigkeit, 1996
1471 # 1471 #
1472 # This file is part of GNU Libtool. 1472 # This file is part of GNU Libtool.
1473@@ -18277,19 +18950,42 @@ SP2NL=$lt_lt_SP2NL 1473@@ -18279,19 +18952,42 @@ SP2NL=$lt_lt_SP2NL
1474 # turn newlines into spaces. 1474 # turn newlines into spaces.
1475 NL2SP=$lt_lt_NL2SP 1475 NL2SP=$lt_lt_NL2SP
1476 1476
@@ -1514,7 +1514,7 @@ index 0340ed541b5..2012656b3b7 100755
1514 # A symbol stripping program. 1514 # A symbol stripping program.
1515 STRIP=$lt_STRIP 1515 STRIP=$lt_STRIP
1516 1516
1517@@ -18319,6 +19015,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1517@@ -18321,6 +19017,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1518 # 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.
1519 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
1520 1520
@@ -1527,7 +1527,7 @@ index 0340ed541b5..2012656b3b7 100755
1527 # The name of the directory that contains temporary libtool files. 1527 # The name of the directory that contains temporary libtool files.
1528 objdir=$objdir 1528 objdir=$objdir
1529 1529
1530@@ -18328,6 +19030,9 @@ MAGIC_CMD=$MAGIC_CMD 1530@@ -18330,6 +19032,9 @@ MAGIC_CMD=$MAGIC_CMD
1531 # Must we lock files when doing compilation? 1531 # Must we lock files when doing compilation?
1532 need_locks=$lt_need_locks 1532 need_locks=$lt_need_locks
1533 1533
@@ -1537,7 +1537,7 @@ index 0340ed541b5..2012656b3b7 100755
1537 # 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.
1538 DSYMUTIL=$lt_DSYMUTIL 1538 DSYMUTIL=$lt_DSYMUTIL
1539 1539
1540@@ -18442,12 +19147,12 @@ with_gcc=$GCC 1540@@ -18444,12 +19149,12 @@ with_gcc=$GCC
1541 # Compiler flag to turn off builtin functions. 1541 # Compiler flag to turn off builtin functions.
1542 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1542 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1543 1543
@@ -1553,7 +1553,7 @@ index 0340ed541b5..2012656b3b7 100755
1553 # Compiler flag to prevent dynamic linking. 1553 # Compiler flag to prevent dynamic linking.
1554 link_static_flag=$lt_lt_prog_compiler_static 1554 link_static_flag=$lt_lt_prog_compiler_static
1555 1555
1556@@ -18534,9 +19239,6 @@ inherit_rpath=$inherit_rpath 1556@@ -18536,9 +19241,6 @@ inherit_rpath=$inherit_rpath
1557 # Whether libtool must link a program against all its dependency libraries. 1557 # Whether libtool must link a program against all its dependency libraries.
1558 link_all_deplibs=$link_all_deplibs 1558 link_all_deplibs=$link_all_deplibs
1559 1559
@@ -1563,7 +1563,7 @@ index 0340ed541b5..2012656b3b7 100755
1563 # Set to "yes" if exported symbols are required. 1563 # Set to "yes" if exported symbols are required.
1564 always_export_symbols=$always_export_symbols 1564 always_export_symbols=$always_export_symbols
1565 1565
1566@@ -18552,6 +19254,9 @@ include_expsyms=$lt_include_expsyms 1566@@ -18554,6 +19256,9 @@ include_expsyms=$lt_include_expsyms
1567 # Commands necessary for linking programs (against libraries) with templates. 1567 # Commands necessary for linking programs (against libraries) with templates.
1568 prelink_cmds=$lt_prelink_cmds 1568 prelink_cmds=$lt_prelink_cmds
1569 1569
@@ -1573,7 +1573,7 @@ index 0340ed541b5..2012656b3b7 100755
1573 # Specify filename containing input files. 1573 # Specify filename containing input files.
1574 file_list_spec=$lt_file_list_spec 1574 file_list_spec=$lt_file_list_spec
1575 1575
1576@@ -18584,210 +19289,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1576@@ -18586,210 +19291,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1577 # 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
1578 # 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
1579 # is reportedly fixed, but why not run on old versions too? 1579 # is reportedly fixed, but why not run on old versions too?
@@ -1948,10 +1948,10 @@ index 0340ed541b5..2012656b3b7 100755
1948 chmod +x "$ofile" 1948 chmod +x "$ofile"
1949 1949
1950diff --git a/bfd/configure.ac b/bfd/configure.ac 1950diff --git a/bfd/configure.ac b/bfd/configure.ac
1951index 8e86f8399ce..e8700c9d4d2 100644 1951index 0797a08ff37..133d714cf18 100644
1952--- a/bfd/configure.ac 1952--- a/bfd/configure.ac
1953+++ b/bfd/configure.ac 1953+++ b/bfd/configure.ac
1954@@ -314,7 +314,7 @@ changequote(,)dnl 1954@@ -315,7 +315,7 @@ changequote(,)dnl
1955 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'`
1956 changequote([,])dnl 1956 changequote([,])dnl
1957 if test -n "$x"; then 1957 if test -n "$x"; then
@@ -1961,10 +1961,10 @@ index 8e86f8399ce..e8700c9d4d2 100644
1961 1961
1962 case "${host}" in 1962 case "${host}" in
1963diff --git a/binutils/configure b/binutils/configure 1963diff --git a/binutils/configure b/binutils/configure
1964index 89c99abfeba..d3289a5efcd 100755 1964index 83b4b0172db..2154238189e 100755
1965--- a/binutils/configure 1965--- a/binutils/configure
1966+++ b/binutils/configure 1966+++ b/binutils/configure
1967@@ -692,8 +692,11 @@ OTOOL 1967@@ -697,8 +697,11 @@ OTOOL
1968 LIPO 1968 LIPO
1969 NMEDIT 1969 NMEDIT
1970 DSYMUTIL 1970 DSYMUTIL
@@ -1976,7 +1976,7 @@ index 89c99abfeba..d3289a5efcd 100755
1976 OBJDUMP 1976 OBJDUMP
1977 LN_S 1977 LN_S
1978 NM 1978 NM
1979@@ -810,6 +813,7 @@ enable_static 1979@@ -815,6 +818,7 @@ enable_static
1980 with_pic 1980 with_pic
1981 enable_fast_install 1981 enable_fast_install
1982 with_gnu_ld 1982 with_gnu_ld
@@ -1984,7 +1984,7 @@ index 89c99abfeba..d3289a5efcd 100755
1984 enable_libtool_lock 1984 enable_libtool_lock
1985 enable_plugins 1985 enable_plugins
1986 enable_largefile 1986 enable_largefile
1987@@ -1490,6 +1494,8 @@ Optional Packages: 1987@@ -1504,6 +1508,8 @@ Optional Packages:
1988 --with-pic try to use only PIC/non-PIC objects [default=use 1988 --with-pic try to use only PIC/non-PIC objects [default=use
1989 both] 1989 both]
1990 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1990 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -1993,7 +1993,7 @@ index 89c99abfeba..d3289a5efcd 100755
1993 --with-debuginfod Enable debuginfo lookups with debuginfod 1993 --with-debuginfod Enable debuginfo lookups with debuginfod
1994 (auto/yes/no) 1994 (auto/yes/no)
1995 --with-system-zlib use installed libz 1995 --with-system-zlib use installed libz
1996@@ -5467,8 +5473,8 @@ esac 1996@@ -5490,8 +5496,8 @@ esac
1997 1997
1998 1998
1999 1999
@@ -2004,7 +2004,7 @@ index 89c99abfeba..d3289a5efcd 100755
2004 2004
2005 2005
2006 2006
2007@@ -5508,7 +5514,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2007@@ -5531,7 +5537,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2008 { $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
2009 $as_echo_n "checking how to print strings... " >&6; } 2009 $as_echo_n "checking how to print strings... " >&6; }
2010 # Test print first, because it will be a builtin if present. 2010 # Test print first, because it will be a builtin if present.
@@ -2013,7 +2013,7 @@ index 89c99abfeba..d3289a5efcd 100755
2013 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2013 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2014 ECHO='print -r --' 2014 ECHO='print -r --'
2015 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
2016@@ -6194,8 +6200,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2016@@ -6217,8 +6223,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2017 # Try some XSI features 2017 # Try some XSI features
2018 xsi_shell=no 2018 xsi_shell=no
2019 ( _lt_dummy="a/b/c" 2019 ( _lt_dummy="a/b/c"
@@ -2024,7 +2024,7 @@ index 89c99abfeba..d3289a5efcd 100755
2024 && eval 'test $(( 1 + 1 )) -eq 2 \ 2024 && eval 'test $(( 1 + 1 )) -eq 2 \
2025 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2025 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2026 && xsi_shell=yes 2026 && xsi_shell=yes
2027@@ -6244,6 +6250,80 @@ esac 2027@@ -6267,6 +6273,80 @@ esac
2028 2028
2029 2029
2030 2030
@@ -2105,7 +2105,7 @@ index 89c99abfeba..d3289a5efcd 100755
2105 { $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
2106 $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; }
2107 if ${lt_cv_ld_reload_flag+:} false; then : 2107 if ${lt_cv_ld_reload_flag+:} false; then :
2108@@ -6260,6 +6340,11 @@ case $reload_flag in 2108@@ -6283,6 +6363,11 @@ case $reload_flag in
2109 esac 2109 esac
2110 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2110 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2111 case $host_os in 2111 case $host_os in
@@ -2117,7 +2117,7 @@ index 89c99abfeba..d3289a5efcd 100755
2117 darwin*) 2117 darwin*)
2118 if test "$GCC" = yes; then 2118 if test "$GCC" = yes; then
2119 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2119 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2120@@ -6428,7 +6513,8 @@ mingw* | pw32*) 2120@@ -6451,7 +6536,8 @@ mingw* | pw32*)
2121 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'
2122 lt_cv_file_magic_cmd='func_win32_libid' 2122 lt_cv_file_magic_cmd='func_win32_libid'
2123 else 2123 else
@@ -2127,7 +2127,7 @@ index 89c99abfeba..d3289a5efcd 100755
2127 lt_cv_file_magic_cmd='$OBJDUMP -f' 2127 lt_cv_file_magic_cmd='$OBJDUMP -f'
2128 fi 2128 fi
2129 ;; 2129 ;;
2130@@ -6582,6 +6668,21 @@ esac 2130@@ -6605,6 +6691,21 @@ esac
2131 fi 2131 fi
2132 { $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
2133 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2133 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2149,7 +2149,7 @@ index 89c99abfeba..d3289a5efcd 100755
2149 file_magic_cmd=$lt_cv_file_magic_cmd 2149 file_magic_cmd=$lt_cv_file_magic_cmd
2150 deplibs_check_method=$lt_cv_deplibs_check_method 2150 deplibs_check_method=$lt_cv_deplibs_check_method
2151 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2151 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2152@@ -6597,9 +6698,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2152@@ -6620,9 +6721,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2153 2153
2154 2154
2155 2155
@@ -2314,7 +2314,7 @@ index 89c99abfeba..d3289a5efcd 100755
2314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2315 $as_echo_n "checking for $ac_word... " >&6; } 2315 $as_echo_n "checking for $ac_word... " >&6; }
2316 if ${ac_cv_prog_AR+:} false; then : 2316 if ${ac_cv_prog_AR+:} false; then :
2317@@ -6615,7 +6869,7 @@ do 2317@@ -6638,7 +6892,7 @@ do
2318 test -z "$as_dir" && as_dir=. 2318 test -z "$as_dir" && as_dir=.
2319 for ac_exec_ext in '' $ac_executable_extensions; do 2319 for ac_exec_ext in '' $ac_executable_extensions; do
2320 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2320 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2323,7 +2323,7 @@ index 89c99abfeba..d3289a5efcd 100755
2323 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2323 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2324 break 2 2324 break 2
2325 fi 2325 fi
2326@@ -6635,11 +6889,15 @@ $as_echo "no" >&6; } 2326@@ -6658,11 +6912,15 @@ $as_echo "no" >&6; }
2327 fi 2327 fi
2328 2328
2329 2329
@@ -2342,7 +2342,7 @@ index 89c99abfeba..d3289a5efcd 100755
2342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2343 $as_echo_n "checking for $ac_word... " >&6; } 2343 $as_echo_n "checking for $ac_word... " >&6; }
2344 if ${ac_cv_prog_ac_ct_AR+:} false; then : 2344 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2345@@ -6655,7 +6913,7 @@ do 2345@@ -6678,7 +6936,7 @@ do
2346 test -z "$as_dir" && as_dir=. 2346 test -z "$as_dir" && as_dir=.
2347 for ac_exec_ext in '' $ac_executable_extensions; do 2347 for ac_exec_ext in '' $ac_executable_extensions; do
2348 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2348 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2351,7 +2351,7 @@ index 89c99abfeba..d3289a5efcd 100755
2351 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2351 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2352 break 2 2352 break 2
2353 fi 2353 fi
2354@@ -6674,6 +6932,10 @@ else 2354@@ -6697,6 +6955,10 @@ else
2355 $as_echo "no" >&6; } 2355 $as_echo "no" >&6; }
2356 fi 2356 fi
2357 2357
@@ -2362,7 +2362,7 @@ index 89c99abfeba..d3289a5efcd 100755
2362 if test "x$ac_ct_AR" = x; then 2362 if test "x$ac_ct_AR" = x; then
2363 AR="false" 2363 AR="false"
2364 else 2364 else
2365@@ -6685,12 +6947,10 @@ ac_tool_warned=yes ;; 2365@@ -6708,12 +6970,10 @@ ac_tool_warned=yes ;;
2366 esac 2366 esac
2367 AR=$ac_ct_AR 2367 AR=$ac_ct_AR
2368 fi 2368 fi
@@ -2377,7 +2377,7 @@ index 89c99abfeba..d3289a5efcd 100755
2377 2377
2378 2378
2379 2379
2380@@ -6702,6 +6962,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 2380@@ -6725,6 +6985,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2381 2381
2382 2382
2383 2383
@@ -2442,7 +2442,7 @@ index 89c99abfeba..d3289a5efcd 100755
2442 if test -n "$ac_tool_prefix"; then 2442 if test -n "$ac_tool_prefix"; then
2443 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 2443 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2444 set dummy ${ac_tool_prefix}strip; ac_word=$2 2444 set dummy ${ac_tool_prefix}strip; ac_word=$2
2445@@ -7036,8 +7354,8 @@ esac 2445@@ -7059,8 +7377,8 @@ esac
2446 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2446 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2447 2447
2448 # Transform an extracted symbol line into symbol name and symbol address 2448 # Transform an extracted symbol line into symbol name and symbol address
@@ -2453,7 +2453,7 @@ index 89c99abfeba..d3289a5efcd 100755
2453 2453
2454 # Handle CRLF in mingw tool chain 2454 # Handle CRLF in mingw tool chain
2455 opt_cr= 2455 opt_cr=
2456@@ -7073,6 +7391,7 @@ for ac_symprfx in "" "_"; do 2456@@ -7096,6 +7414,7 @@ for ac_symprfx in "" "_"; do
2457 else 2457 else
2458 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2458 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2459 fi 2459 fi
@@ -2461,7 +2461,7 @@ index 89c99abfeba..d3289a5efcd 100755
2461 2461
2462 # Check to see that the pipe works correctly. 2462 # Check to see that the pipe works correctly.
2463 pipe_works=no 2463 pipe_works=no
2464@@ -7114,6 +7433,18 @@ _LT_EOF 2464@@ -7137,6 +7456,18 @@ _LT_EOF
2465 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2465 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2466 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2466 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2467 cat <<_LT_EOF > conftest.$ac_ext 2467 cat <<_LT_EOF > conftest.$ac_ext
@@ -2480,7 +2480,7 @@ index 89c99abfeba..d3289a5efcd 100755
2480 #ifdef __cplusplus 2480 #ifdef __cplusplus
2481 extern "C" { 2481 extern "C" {
2482 #endif 2482 #endif
2483@@ -7125,7 +7456,7 @@ _LT_EOF 2483@@ -7148,7 +7479,7 @@ _LT_EOF
2484 cat <<_LT_EOF >> conftest.$ac_ext 2484 cat <<_LT_EOF >> conftest.$ac_ext
2485 2485
2486 /* The mapping between symbol names and symbols. */ 2486 /* The mapping between symbol names and symbols. */
@@ -2489,7 +2489,7 @@ index 89c99abfeba..d3289a5efcd 100755
2489 const char *name; 2489 const char *name;
2490 void *address; 2490 void *address;
2491 } 2491 }
2492@@ -7151,8 +7482,8 @@ static const void *lt_preloaded_setup() { 2492@@ -7174,8 +7505,8 @@ static const void *lt_preloaded_setup() {
2493 _LT_EOF 2493 _LT_EOF
2494 # Now try linking the two files. 2494 # Now try linking the two files.
2495 mv conftest.$ac_objext conftstm.$ac_objext 2495 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2500,7 +2500,7 @@ index 89c99abfeba..d3289a5efcd 100755
2500 LIBS="conftstm.$ac_objext" 2500 LIBS="conftstm.$ac_objext"
2501 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2501 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2502 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2502 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2503@@ -7162,8 +7493,8 @@ _LT_EOF 2503@@ -7185,8 +7516,8 @@ _LT_EOF
2504 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2504 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2505 pipe_works=yes 2505 pipe_works=yes
2506 fi 2506 fi
@@ -2511,7 +2511,7 @@ index 89c99abfeba..d3289a5efcd 100755
2511 else 2511 else
2512 echo "cannot find nm_test_func in $nlist" >&5 2512 echo "cannot find nm_test_func in $nlist" >&5
2513 fi 2513 fi
2514@@ -7200,6 +7531,21 @@ else 2514@@ -7223,6 +7554,21 @@ else
2515 $as_echo "ok" >&6; } 2515 $as_echo "ok" >&6; }
2516 fi 2516 fi
2517 2517
@@ -2533,7 +2533,7 @@ index 89c99abfeba..d3289a5efcd 100755
2533 2533
2534 2534
2535 2535
2536@@ -7216,6 +7562,40 @@ fi 2536@@ -7239,6 +7585,40 @@ fi
2537 2537
2538 2538
2539 2539
@@ -2574,7 +2574,7 @@ index 89c99abfeba..d3289a5efcd 100755
2574 2574
2575 2575
2576 2576
2577@@ -7427,6 +7807,123 @@ esac 2577@@ -7450,6 +7830,123 @@ esac
2578 2578
2579 need_locks="$enable_libtool_lock" 2579 need_locks="$enable_libtool_lock"
2580 2580
@@ -2698,7 +2698,7 @@ index 89c99abfeba..d3289a5efcd 100755
2698 2698
2699 case $host_os in 2699 case $host_os in
2700 rhapsody* | darwin*) 2700 rhapsody* | darwin*)
2701@@ -7990,6 +8487,8 @@ _LT_EOF 2701@@ -8013,6 +8510,8 @@ _LT_EOF
2702 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2702 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2703 echo "$AR cru libconftest.a conftest.o" >&5 2703 echo "$AR cru libconftest.a conftest.o" >&5
2704 $AR cru libconftest.a conftest.o 2>&5 2704 $AR cru libconftest.a conftest.o 2>&5
@@ -2707,7 +2707,7 @@ index 89c99abfeba..d3289a5efcd 100755
2707 cat > conftest.c << _LT_EOF 2707 cat > conftest.c << _LT_EOF
2708 int main() { return 0;} 2708 int main() { return 0;}
2709 _LT_EOF 2709 _LT_EOF
2710@@ -8185,7 +8684,8 @@ fi 2710@@ -8208,7 +8707,8 @@ fi
2711 LIBTOOL_DEPS="$ltmain" 2711 LIBTOOL_DEPS="$ltmain"
2712 2712
2713 # Always use our own libtool. 2713 # Always use our own libtool.
@@ -2717,7 +2717,7 @@ index 89c99abfeba..d3289a5efcd 100755
2717 2717
2718 2718
2719 2719
2720@@ -8274,7 +8774,7 @@ aix3*) 2720@@ -8297,7 +8797,7 @@ aix3*)
2721 esac 2721 esac
2722 2722
2723 # Global variables: 2723 # Global variables:
@@ -2726,7 +2726,7 @@ index 89c99abfeba..d3289a5efcd 100755
2726 can_build_shared=yes 2726 can_build_shared=yes
2727 2727
2728 # All known linkers require a `.a' archive for static linking (except MSVC, 2728 # All known linkers require a `.a' archive for static linking (except MSVC,
2729@@ -8572,8 +9072,6 @@ fi 2729@@ -8595,8 +9095,6 @@ fi
2730 lt_prog_compiler_pic= 2730 lt_prog_compiler_pic=
2731 lt_prog_compiler_static= 2731 lt_prog_compiler_static=
2732 2732
@@ -2735,7 +2735,7 @@ index 89c99abfeba..d3289a5efcd 100755
2735 2735
2736 if test "$GCC" = yes; then 2736 if test "$GCC" = yes; then
2737 lt_prog_compiler_wl='-Wl,' 2737 lt_prog_compiler_wl='-Wl,'
2738@@ -8739,6 +9237,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2738@@ -8762,6 +9260,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2739 lt_prog_compiler_pic='--shared' 2739 lt_prog_compiler_pic='--shared'
2740 lt_prog_compiler_static='--static' 2740 lt_prog_compiler_static='--static'
2741 ;; 2741 ;;
@@ -2748,7 +2748,7 @@ index 89c99abfeba..d3289a5efcd 100755
2748 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2748 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2749 # Portland Group compilers (*not* the Pentium gcc compiler, 2749 # Portland Group compilers (*not* the Pentium gcc compiler,
2750 # which looks to be a dead project) 2750 # which looks to be a dead project)
2751@@ -8801,7 +9305,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2751@@ -8824,7 +9328,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2752 lt_prog_compiler_pic='-KPIC' 2752 lt_prog_compiler_pic='-KPIC'
2753 lt_prog_compiler_static='-Bstatic' 2753 lt_prog_compiler_static='-Bstatic'
2754 case $cc_basename in 2754 case $cc_basename in
@@ -2757,7 +2757,7 @@ index 89c99abfeba..d3289a5efcd 100755
2757 lt_prog_compiler_wl='-Qoption ld ';; 2757 lt_prog_compiler_wl='-Qoption ld ';;
2758 *) 2758 *)
2759 lt_prog_compiler_wl='-Wl,';; 2759 lt_prog_compiler_wl='-Wl,';;
2760@@ -8858,13 +9362,17 @@ case $host_os in 2760@@ -8881,13 +9385,17 @@ case $host_os in
2761 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2761 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2762 ;; 2762 ;;
2763 esac 2763 esac
@@ -2781,7 +2781,7 @@ index 89c99abfeba..d3289a5efcd 100755
2781 2781
2782 # 2782 #
2783 # Check to make sure the PIC flag actually works. 2783 # Check to make sure the PIC flag actually works.
2784@@ -8925,6 +9433,11 @@ fi 2784@@ -8948,6 +9456,11 @@ fi
2785 2785
2786 2786
2787 2787
@@ -2793,7 +2793,7 @@ index 89c99abfeba..d3289a5efcd 100755
2793 # 2793 #
2794 # Check to make sure the static flag actually works. 2794 # Check to make sure the static flag actually works.
2795 # 2795 #
2796@@ -9275,7 +9788,8 @@ _LT_EOF 2796@@ -9298,7 +9811,8 @@ _LT_EOF
2797 allow_undefined_flag=unsupported 2797 allow_undefined_flag=unsupported
2798 always_export_symbols=no 2798 always_export_symbols=no
2799 enable_shared_with_static_runtimes=yes 2799 enable_shared_with_static_runtimes=yes
@@ -2803,7 +2803,7 @@ index 89c99abfeba..d3289a5efcd 100755
2803 2803
2804 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2804 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2805 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2805 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2806@@ -9374,12 +9888,12 @@ _LT_EOF 2806@@ -9397,12 +9911,12 @@ _LT_EOF
2807 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2807 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2808 hardcode_libdir_flag_spec= 2808 hardcode_libdir_flag_spec=
2809 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2809 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2818,7 +2818,7 @@ index 89c99abfeba..d3289a5efcd 100755
2818 fi 2818 fi
2819 ;; 2819 ;;
2820 esac 2820 esac
2821@@ -9393,8 +9907,8 @@ _LT_EOF 2821@@ -9416,8 +9930,8 @@ _LT_EOF
2822 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2822 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2823 wlarc= 2823 wlarc=
2824 else 2824 else
@@ -2829,7 +2829,7 @@ index 89c99abfeba..d3289a5efcd 100755
2829 fi 2829 fi
2830 ;; 2830 ;;
2831 2831
2832@@ -9412,8 +9926,8 @@ _LT_EOF 2832@@ -9435,8 +9949,8 @@ _LT_EOF
2833 2833
2834 _LT_EOF 2834 _LT_EOF
2835 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2835 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2840,7 +2840,7 @@ index 89c99abfeba..d3289a5efcd 100755
2840 else 2840 else
2841 ld_shlibs=no 2841 ld_shlibs=no
2842 fi 2842 fi
2843@@ -9459,8 +9973,8 @@ _LT_EOF 2843@@ -9482,8 +9996,8 @@ _LT_EOF
2844 2844
2845 *) 2845 *)
2846 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2846 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2851,7 +2851,7 @@ index 89c99abfeba..d3289a5efcd 100755
2851 else 2851 else
2852 ld_shlibs=no 2852 ld_shlibs=no
2853 fi 2853 fi
2854@@ -9590,7 +10104,13 @@ _LT_EOF 2854@@ -9613,7 +10127,13 @@ _LT_EOF
2855 allow_undefined_flag='-berok' 2855 allow_undefined_flag='-berok'
2856 # Determine the default libpath from the value encoded in an 2856 # Determine the default libpath from the value encoded in an
2857 # empty executable. 2857 # empty executable.
@@ -2866,7 +2866,7 @@ index 89c99abfeba..d3289a5efcd 100755
2866 /* end confdefs.h. */ 2866 /* end confdefs.h. */
2867 2867
2868 int 2868 int
2869@@ -9603,22 +10123,29 @@ main () 2869@@ -9626,22 +10146,29 @@ main ()
2870 _ACEOF 2870 _ACEOF
2871 if ac_fn_c_try_link "$LINENO"; then : 2871 if ac_fn_c_try_link "$LINENO"; then :
2872 2872
@@ -2909,7 +2909,7 @@ index 89c99abfeba..d3289a5efcd 100755
2909 2909
2910 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2910 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2911 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" 2911 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"
2912@@ -9630,7 +10157,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2912@@ -9653,7 +10180,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2913 else 2913 else
2914 # Determine the default libpath from the value encoded in an 2914 # Determine the default libpath from the value encoded in an
2915 # empty executable. 2915 # empty executable.
@@ -2924,7 +2924,7 @@ index 89c99abfeba..d3289a5efcd 100755
2924 /* end confdefs.h. */ 2924 /* end confdefs.h. */
2925 2925
2926 int 2926 int
2927@@ -9643,22 +10176,29 @@ main () 2927@@ -9666,22 +10199,29 @@ main ()
2928 _ACEOF 2928 _ACEOF
2929 if ac_fn_c_try_link "$LINENO"; then : 2929 if ac_fn_c_try_link "$LINENO"; then :
2930 2930
@@ -2967,7 +2967,7 @@ index 89c99abfeba..d3289a5efcd 100755
2967 2967
2968 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2968 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2969 # Warning - without using the other run time loading flags, 2969 # Warning - without using the other run time loading flags,
2970@@ -9703,20 +10243,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2970@@ -9726,20 +10266,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2971 # Microsoft Visual C++. 2971 # Microsoft Visual C++.
2972 # hardcode_libdir_flag_spec is actually meaningless, as there is 2972 # hardcode_libdir_flag_spec is actually meaningless, as there is
2973 # no search path for DLLs. 2973 # no search path for DLLs.
@@ -3045,7 +3045,7 @@ index 89c99abfeba..d3289a5efcd 100755
3045 ;; 3045 ;;
3046 3046
3047 darwin* | rhapsody*) 3047 darwin* | rhapsody*)
3048@@ -9777,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3048@@ -9800,7 +10383,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3049 3049
3050 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3050 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3051 freebsd* | dragonfly*) 3051 freebsd* | dragonfly*)
@@ -3054,7 +3054,7 @@ index 89c99abfeba..d3289a5efcd 100755
3054 hardcode_libdir_flag_spec='-R$libdir' 3054 hardcode_libdir_flag_spec='-R$libdir'
3055 hardcode_direct=yes 3055 hardcode_direct=yes
3056 hardcode_shlibpath_var=no 3056 hardcode_shlibpath_var=no
3057@@ -9785,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3057@@ -9808,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3058 3058
3059 hpux9*) 3059 hpux9*)
3060 if test "$GCC" = yes; then 3060 if test "$GCC" = yes; then
@@ -3063,7 +3063,7 @@ index 89c99abfeba..d3289a5efcd 100755
3063 else 3063 else
3064 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' 3064 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'
3065 fi 3065 fi
3066@@ -9801,7 +10384,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3066@@ -9824,7 +10407,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3067 3067
3068 hpux10*) 3068 hpux10*)
3069 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3069 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3072,7 +3072,7 @@ index 89c99abfeba..d3289a5efcd 100755
3072 else 3072 else
3073 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3073 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3074 fi 3074 fi
3075@@ -9825,10 +10408,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3075@@ -9848,10 +10431,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3076 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3076 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3077 ;; 3077 ;;
3078 ia64*) 3078 ia64*)
@@ -3085,7 +3085,7 @@ index 89c99abfeba..d3289a5efcd 100755
3085 ;; 3085 ;;
3086 esac 3086 esac
3087 else 3087 else
3088@@ -9907,23 +10490,36 @@ fi 3088@@ -9930,23 +10513,36 @@ fi
3089 3089
3090 irix5* | irix6* | nonstopux*) 3090 irix5* | irix6* | nonstopux*)
3091 if test "$GCC" = yes; then 3091 if test "$GCC" = yes; then
@@ -3130,7 +3130,7 @@ index 89c99abfeba..d3289a5efcd 100755
3130 else 3130 else
3131 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' 3131 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'
3132 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' 3132 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'
3133@@ -10008,7 +10604,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3133@@ -10031,7 +10627,7 @@ rm -f core conftest.err conftest.$ac_objext \
3134 osf4* | osf5*) # as osf3* with the addition of -msym flag 3134 osf4* | osf5*) # as osf3* with the addition of -msym flag
3135 if test "$GCC" = yes; then 3135 if test "$GCC" = yes; then
3136 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3136 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3139,7 +3139,7 @@ index 89c99abfeba..d3289a5efcd 100755
3139 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3139 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3140 else 3140 else
3141 allow_undefined_flag=' -expect_unresolved \*' 3141 allow_undefined_flag=' -expect_unresolved \*'
3142@@ -10027,9 +10623,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3142@@ -10050,9 +10646,9 @@ rm -f core conftest.err conftest.$ac_objext \
3143 no_undefined_flag=' -z defs' 3143 no_undefined_flag=' -z defs'
3144 if test "$GCC" = yes; then 3144 if test "$GCC" = yes; then
3145 wlarc='${wl}' 3145 wlarc='${wl}'
@@ -3151,7 +3151,7 @@ index 89c99abfeba..d3289a5efcd 100755
3151 else 3151 else
3152 case `$CC -V 2>&1` in 3152 case `$CC -V 2>&1` in
3153 *"Compilers 5.0"*) 3153 *"Compilers 5.0"*)
3154@@ -10605,8 +11201,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3154@@ -10628,8 +11224,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3155 need_version=no 3155 need_version=no
3156 need_lib_prefix=no 3156 need_lib_prefix=no
3157 3157
@@ -3163,7 +3163,7 @@ index 89c99abfeba..d3289a5efcd 100755
3163 library_names_spec='$libname.dll.a' 3163 library_names_spec='$libname.dll.a'
3164 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3164 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3165 postinstall_cmds='base_file=`basename \${file}`~ 3165 postinstall_cmds='base_file=`basename \${file}`~
3166@@ -10639,13 +11236,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3166@@ -10662,13 +11259,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3167 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3167 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3168 ;; 3168 ;;
3169 esac 3169 esac
@@ -3236,7 +3236,7 @@ index 89c99abfeba..d3289a5efcd 100755
3236 # FIXME: first we should search . and the directory the executable is in 3236 # FIXME: first we should search . and the directory the executable is in
3237 shlibpath_var=PATH 3237 shlibpath_var=PATH
3238 ;; 3238 ;;
3239@@ -10737,7 +11392,7 @@ haiku*) 3239@@ -10750,7 +11405,7 @@ haiku*)
3240 soname_spec='${libname}${release}${shared_ext}$major' 3240 soname_spec='${libname}${release}${shared_ext}$major'
3241 shlibpath_var=LIBRARY_PATH 3241 shlibpath_var=LIBRARY_PATH
3242 shlibpath_overrides_runpath=yes 3242 shlibpath_overrides_runpath=yes
@@ -3245,16 +3245,16 @@ index 89c99abfeba..d3289a5efcd 100755
3245 hardcode_into_libs=yes 3245 hardcode_into_libs=yes
3246 ;; 3246 ;;
3247 3247
3248@@ -11533,7 +12188,7 @@ else 3248@@ -11546,7 +12201,7 @@ else
3249 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3249 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3250 lt_status=$lt_dlunknown 3250 lt_status=$lt_dlunknown
3251 cat > conftest.$ac_ext <<_LT_EOF 3251 cat > conftest.$ac_ext <<_LT_EOF
3252-#line 11536 "configure" 3252-#line 11549 "configure"
3253+#line $LINENO "configure" 3253+#line $LINENO "configure"
3254 #include "confdefs.h" 3254 #include "confdefs.h"
3255 3255
3256 #if HAVE_DLFCN_H 3256 #if HAVE_DLFCN_H
3257@@ -11577,10 +12232,10 @@ else 3257@@ -11590,10 +12245,10 @@ else
3258 /* When -fvisbility=hidden is used, assume the code has been annotated 3258 /* When -fvisbility=hidden is used, assume the code has been annotated
3259 correspondingly for the symbols needed. */ 3259 correspondingly for the symbols needed. */
3260 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3260 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3267,16 +3267,16 @@ index 89c99abfeba..d3289a5efcd 100755
3267 int main () 3267 int main ()
3268 { 3268 {
3269 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3269 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3270@@ -11639,7 +12294,7 @@ else 3270@@ -11652,7 +12307,7 @@ else
3271 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3271 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3272 lt_status=$lt_dlunknown 3272 lt_status=$lt_dlunknown
3273 cat > conftest.$ac_ext <<_LT_EOF 3273 cat > conftest.$ac_ext <<_LT_EOF
3274-#line 11642 "configure" 3274-#line 11655 "configure"
3275+#line $LINENO "configure" 3275+#line $LINENO "configure"
3276 #include "confdefs.h" 3276 #include "confdefs.h"
3277 3277
3278 #if HAVE_DLFCN_H 3278 #if HAVE_DLFCN_H
3279@@ -11683,10 +12338,10 @@ else 3279@@ -11696,10 +12351,10 @@ else
3280 /* When -fvisbility=hidden is used, assume the code has been annotated 3280 /* When -fvisbility=hidden is used, assume the code has been annotated
3281 correspondingly for the symbols needed. */ 3281 correspondingly for the symbols needed. */
3282 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3282 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3289,7 +3289,7 @@ index 89c99abfeba..d3289a5efcd 100755
3289 int main () 3289 int main ()
3290 { 3290 {
3291 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3291 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3292@@ -16076,13 +16731,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3292@@ -16308,13 +16963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3293 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3293 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3294 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3294 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3295 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3295 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3310,7 +3310,7 @@ index 89c99abfeba..d3289a5efcd 100755
3310 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3310 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3311 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3311 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3312 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3312 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3313@@ -16097,14 +16759,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3313@@ -16329,14 +16991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3314 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3314 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3315 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3315 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3316 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"`' 3316 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"`'
@@ -3329,7 +3329,7 @@ index 89c99abfeba..d3289a5efcd 100755
3329 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3329 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3330 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3330 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3331 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3331 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3332@@ -16137,12 +16802,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3332@@ -16369,12 +17034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3333 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3333 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3334 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3334 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3335 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3335 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3343,7 +3343,7 @@ index 89c99abfeba..d3289a5efcd 100755
3343 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3343 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3344 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3344 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3345 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3345 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3346@@ -16197,8 +16862,13 @@ reload_flag \ 3346@@ -16429,8 +17094,13 @@ reload_flag \
3347 OBJDUMP \ 3347 OBJDUMP \
3348 deplibs_check_method \ 3348 deplibs_check_method \
3349 file_magic_cmd \ 3349 file_magic_cmd \
@@ -3357,7 +3357,7 @@ index 89c99abfeba..d3289a5efcd 100755
3357 STRIP \ 3357 STRIP \
3358 RANLIB \ 3358 RANLIB \
3359 CC \ 3359 CC \
3360@@ -16208,12 +16878,14 @@ lt_cv_sys_global_symbol_pipe \ 3360@@ -16440,12 +17110,14 @@ lt_cv_sys_global_symbol_pipe \
3361 lt_cv_sys_global_symbol_to_cdecl \ 3361 lt_cv_sys_global_symbol_to_cdecl \
3362 lt_cv_sys_global_symbol_to_c_name_address \ 3362 lt_cv_sys_global_symbol_to_c_name_address \
3363 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3363 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3373,7 +3373,7 @@ index 89c99abfeba..d3289a5efcd 100755
3373 DSYMUTIL \ 3373 DSYMUTIL \
3374 NMEDIT \ 3374 NMEDIT \
3375 LIPO \ 3375 LIPO \
3376@@ -16229,7 +16901,6 @@ no_undefined_flag \ 3376@@ -16461,7 +17133,6 @@ no_undefined_flag \
3377 hardcode_libdir_flag_spec \ 3377 hardcode_libdir_flag_spec \
3378 hardcode_libdir_flag_spec_ld \ 3378 hardcode_libdir_flag_spec_ld \
3379 hardcode_libdir_separator \ 3379 hardcode_libdir_separator \
@@ -3381,7 +3381,7 @@ index 89c99abfeba..d3289a5efcd 100755
3381 exclude_expsyms \ 3381 exclude_expsyms \
3382 include_expsyms \ 3382 include_expsyms \
3383 file_list_spec \ 3383 file_list_spec \
3384@@ -16265,6 +16936,7 @@ module_cmds \ 3384@@ -16497,6 +17168,7 @@ module_cmds \
3385 module_expsym_cmds \ 3385 module_expsym_cmds \
3386 export_symbols_cmds \ 3386 export_symbols_cmds \
3387 prelink_cmds \ 3387 prelink_cmds \
@@ -3389,7 +3389,7 @@ index 89c99abfeba..d3289a5efcd 100755
3389 postinstall_cmds \ 3389 postinstall_cmds \
3390 postuninstall_cmds \ 3390 postuninstall_cmds \
3391 finish_cmds \ 3391 finish_cmds \
3392@@ -17031,7 +17703,8 @@ $as_echo X"$file" | 3392@@ -17263,7 +17935,8 @@ $as_echo X"$file" |
3393 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3393 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3394 # 3394 #
3395 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3395 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3399,7 +3399,7 @@ index 89c99abfeba..d3289a5efcd 100755
3399 # Written by Gordon Matzigkeit, 1996 3399 # Written by Gordon Matzigkeit, 1996
3400 # 3400 #
3401 # This file is part of GNU Libtool. 3401 # This file is part of GNU Libtool.
3402@@ -17134,19 +17807,42 @@ SP2NL=$lt_lt_SP2NL 3402@@ -17366,19 +18039,42 @@ SP2NL=$lt_lt_SP2NL
3403 # turn newlines into spaces. 3403 # turn newlines into spaces.
3404 NL2SP=$lt_lt_NL2SP 3404 NL2SP=$lt_lt_NL2SP
3405 3405
@@ -3443,7 +3443,7 @@ index 89c99abfeba..d3289a5efcd 100755
3443 # A symbol stripping program. 3443 # A symbol stripping program.
3444 STRIP=$lt_STRIP 3444 STRIP=$lt_STRIP
3445 3445
3446@@ -17176,6 +17872,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3446@@ -17408,6 +18104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3447 # Transform the output of nm in a C name address pair when lib prefix is needed. 3447 # Transform the output of nm in a C name address pair when lib prefix is needed.
3448 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3448 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3449 3449
@@ -3456,7 +3456,7 @@ index 89c99abfeba..d3289a5efcd 100755
3456 # The name of the directory that contains temporary libtool files. 3456 # The name of the directory that contains temporary libtool files.
3457 objdir=$objdir 3457 objdir=$objdir
3458 3458
3459@@ -17185,6 +17887,9 @@ MAGIC_CMD=$MAGIC_CMD 3459@@ -17417,6 +18119,9 @@ MAGIC_CMD=$MAGIC_CMD
3460 # Must we lock files when doing compilation? 3460 # Must we lock files when doing compilation?
3461 need_locks=$lt_need_locks 3461 need_locks=$lt_need_locks
3462 3462
@@ -3466,7 +3466,7 @@ index 89c99abfeba..d3289a5efcd 100755
3466 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3466 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3467 DSYMUTIL=$lt_DSYMUTIL 3467 DSYMUTIL=$lt_DSYMUTIL
3468 3468
3469@@ -17299,12 +18004,12 @@ with_gcc=$GCC 3469@@ -17531,12 +18236,12 @@ with_gcc=$GCC
3470 # Compiler flag to turn off builtin functions. 3470 # Compiler flag to turn off builtin functions.
3471 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3471 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3472 3472
@@ -3482,7 +3482,7 @@ index 89c99abfeba..d3289a5efcd 100755
3482 # Compiler flag to prevent dynamic linking. 3482 # Compiler flag to prevent dynamic linking.
3483 link_static_flag=$lt_lt_prog_compiler_static 3483 link_static_flag=$lt_lt_prog_compiler_static
3484 3484
3485@@ -17391,9 +18096,6 @@ inherit_rpath=$inherit_rpath 3485@@ -17623,9 +18328,6 @@ inherit_rpath=$inherit_rpath
3486 # Whether libtool must link a program against all its dependency libraries. 3486 # Whether libtool must link a program against all its dependency libraries.
3487 link_all_deplibs=$link_all_deplibs 3487 link_all_deplibs=$link_all_deplibs
3488 3488
@@ -3492,7 +3492,7 @@ index 89c99abfeba..d3289a5efcd 100755
3492 # Set to "yes" if exported symbols are required. 3492 # Set to "yes" if exported symbols are required.
3493 always_export_symbols=$always_export_symbols 3493 always_export_symbols=$always_export_symbols
3494 3494
3495@@ -17409,6 +18111,9 @@ include_expsyms=$lt_include_expsyms 3495@@ -17641,6 +18343,9 @@ include_expsyms=$lt_include_expsyms
3496 # Commands necessary for linking programs (against libraries) with templates. 3496 # Commands necessary for linking programs (against libraries) with templates.
3497 prelink_cmds=$lt_prelink_cmds 3497 prelink_cmds=$lt_prelink_cmds
3498 3498
@@ -3502,7 +3502,7 @@ index 89c99abfeba..d3289a5efcd 100755
3502 # Specify filename containing input files. 3502 # Specify filename containing input files.
3503 file_list_spec=$lt_file_list_spec 3503 file_list_spec=$lt_file_list_spec
3504 3504
3505@@ -17441,210 +18146,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3505@@ -17673,210 +18378,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3506 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3506 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3507 # text mode, it properly converts lines to CR/LF. This bash problem 3507 # text mode, it properly converts lines to CR/LF. This bash problem
3508 # is reportedly fixed, but why not run on old versions too? 3508 # is reportedly fixed, but why not run on old versions too?
@@ -3877,10 +3877,10 @@ index 89c99abfeba..d3289a5efcd 100755
3877 chmod +x "$ofile" 3877 chmod +x "$ofile"
3878 3878
3879diff --git a/gas/configure b/gas/configure 3879diff --git a/gas/configure b/gas/configure
3880index d4b13e6fc8b..dd5224c5c81 100755 3880index d5ae54925e9..3ff1148d9dd 100755
3881--- a/gas/configure 3881--- a/gas/configure
3882+++ b/gas/configure 3882+++ b/gas/configure
3883@@ -681,8 +681,11 @@ OTOOL 3883@@ -682,8 +682,11 @@ OTOOL
3884 LIPO 3884 LIPO
3885 NMEDIT 3885 NMEDIT
3886 DSYMUTIL 3886 DSYMUTIL
@@ -3892,7 +3892,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
3892 OBJDUMP 3892 OBJDUMP
3893 LN_S 3893 LN_S
3894 NM 3894 NM
3895@@ -799,6 +802,7 @@ enable_static 3895@@ -800,6 +803,7 @@ enable_static
3896 with_pic 3896 with_pic
3897 enable_fast_install 3897 enable_fast_install
3898 with_gnu_ld 3898 with_gnu_ld
@@ -3900,7 +3900,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
3900 enable_libtool_lock 3900 enable_libtool_lock
3901 enable_plugins 3901 enable_plugins
3902 enable_largefile 3902 enable_largefile
3903@@ -1490,6 +1494,8 @@ Optional Packages: 3903@@ -1491,6 +1495,8 @@ Optional Packages:
3904 --with-pic try to use only PIC/non-PIC objects [default=use 3904 --with-pic try to use only PIC/non-PIC objects [default=use
3905 both] 3905 both]
3906 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 3906 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -3909,7 +3909,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
3909 --with-cpu=CPU default cpu variant is CPU (currently only supported 3909 --with-cpu=CPU default cpu variant is CPU (currently only supported
3910 on ARC) 3910 on ARC)
3911 --with-system-zlib use installed libz 3911 --with-system-zlib use installed libz
3912@@ -5277,8 +5283,8 @@ esac 3912@@ -5278,8 +5284,8 @@ esac
3913 3913
3914 3914
3915 3915
@@ -3920,7 +3920,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
3920 3920
3921 3921
3922 3922
3923@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 3923@@ -5319,7 +5325,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3924 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3924 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3925 $as_echo_n "checking how to print strings... " >&6; } 3925 $as_echo_n "checking how to print strings... " >&6; }
3926 # Test print first, because it will be a builtin if present. 3926 # Test print first, because it will be a builtin if present.
@@ -3929,7 +3929,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
3929 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3929 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3930 ECHO='print -r --' 3930 ECHO='print -r --'
3931 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3931 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3932@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 3932@@ -6005,8 +6011,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3933 # Try some XSI features 3933 # Try some XSI features
3934 xsi_shell=no 3934 xsi_shell=no
3935 ( _lt_dummy="a/b/c" 3935 ( _lt_dummy="a/b/c"
@@ -3940,7 +3940,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
3940 && eval 'test $(( 1 + 1 )) -eq 2 \ 3940 && eval 'test $(( 1 + 1 )) -eq 2 \
3941 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3941 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3942 && xsi_shell=yes 3942 && xsi_shell=yes
3943@@ -6054,6 +6060,80 @@ esac 3943@@ -6055,6 +6061,80 @@ esac
3944 3944
3945 3945
3946 3946
@@ -4021,7 +4021,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4021 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4021 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4022 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4022 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4023 if ${lt_cv_ld_reload_flag+:} false; then : 4023 if ${lt_cv_ld_reload_flag+:} false; then :
4024@@ -6070,6 +6150,11 @@ case $reload_flag in 4024@@ -6071,6 +6151,11 @@ case $reload_flag in
4025 esac 4025 esac
4026 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4026 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4027 case $host_os in 4027 case $host_os in
@@ -4033,7 +4033,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4033 darwin*) 4033 darwin*)
4034 if test "$GCC" = yes; then 4034 if test "$GCC" = yes; then
4035 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4035 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4036@@ -6238,7 +6323,8 @@ mingw* | pw32*) 4036@@ -6239,7 +6324,8 @@ mingw* | pw32*)
4037 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4037 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4038 lt_cv_file_magic_cmd='func_win32_libid' 4038 lt_cv_file_magic_cmd='func_win32_libid'
4039 else 4039 else
@@ -4043,7 +4043,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4043 lt_cv_file_magic_cmd='$OBJDUMP -f' 4043 lt_cv_file_magic_cmd='$OBJDUMP -f'
4044 fi 4044 fi
4045 ;; 4045 ;;
4046@@ -6392,6 +6478,21 @@ esac 4046@@ -6393,6 +6479,21 @@ esac
4047 fi 4047 fi
4048 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4048 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4049 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4049 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4065,7 +4065,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4065 file_magic_cmd=$lt_cv_file_magic_cmd 4065 file_magic_cmd=$lt_cv_file_magic_cmd
4066 deplibs_check_method=$lt_cv_deplibs_check_method 4066 deplibs_check_method=$lt_cv_deplibs_check_method
4067 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4067 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4068@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4068@@ -6408,9 +6509,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4069 4069
4070 4070
4071 4071
@@ -4230,7 +4230,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4231 $as_echo_n "checking for $ac_word... " >&6; } 4231 $as_echo_n "checking for $ac_word... " >&6; }
4232 if ${ac_cv_prog_AR+:} false; then : 4232 if ${ac_cv_prog_AR+:} false; then :
4233@@ -6425,7 +6679,7 @@ do 4233@@ -6426,7 +6680,7 @@ do
4234 test -z "$as_dir" && as_dir=. 4234 test -z "$as_dir" && as_dir=.
4235 for ac_exec_ext in '' $ac_executable_extensions; do 4235 for ac_exec_ext in '' $ac_executable_extensions; do
4236 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4236 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4239,7 +4239,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4239 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4239 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4240 break 2 4240 break 2
4241 fi 4241 fi
4242@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } 4242@@ -6446,11 +6700,15 @@ $as_echo "no" >&6; }
4243 fi 4243 fi
4244 4244
4245 4245
@@ -4258,7 +4258,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4259 $as_echo_n "checking for $ac_word... " >&6; } 4259 $as_echo_n "checking for $ac_word... " >&6; }
4260 if ${ac_cv_prog_ac_ct_AR+:} false; then : 4260 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4261@@ -6465,7 +6723,7 @@ do 4261@@ -6466,7 +6724,7 @@ do
4262 test -z "$as_dir" && as_dir=. 4262 test -z "$as_dir" && as_dir=.
4263 for ac_exec_ext in '' $ac_executable_extensions; do 4263 for ac_exec_ext in '' $ac_executable_extensions; do
4264 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4264 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4267,7 +4267,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4267 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4267 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4268 break 2 4268 break 2
4269 fi 4269 fi
4270@@ -6484,6 +6742,10 @@ else 4270@@ -6485,6 +6743,10 @@ else
4271 $as_echo "no" >&6; } 4271 $as_echo "no" >&6; }
4272 fi 4272 fi
4273 4273
@@ -4278,7 +4278,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4278 if test "x$ac_ct_AR" = x; then 4278 if test "x$ac_ct_AR" = x; then
4279 AR="false" 4279 AR="false"
4280 else 4280 else
4281@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; 4281@@ -6496,12 +6758,10 @@ ac_tool_warned=yes ;;
4282 esac 4282 esac
4283 AR=$ac_ct_AR 4283 AR=$ac_ct_AR
4284 fi 4284 fi
@@ -4293,7 +4293,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4293 4293
4294 4294
4295 4295
4296@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 4296@@ -6513,6 +6773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4297 4297
4298 4298
4299 4299
@@ -4358,7 +4358,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4358 if test -n "$ac_tool_prefix"; then 4358 if test -n "$ac_tool_prefix"; then
4359 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 4359 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4360 set dummy ${ac_tool_prefix}strip; ac_word=$2 4360 set dummy ${ac_tool_prefix}strip; ac_word=$2
4361@@ -6846,8 +7164,8 @@ esac 4361@@ -6847,8 +7165,8 @@ esac
4362 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4362 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4363 4363
4364 # Transform an extracted symbol line into symbol name and symbol address 4364 # Transform an extracted symbol line into symbol name and symbol address
@@ -4369,7 +4369,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4369 4369
4370 # Handle CRLF in mingw tool chain 4370 # Handle CRLF in mingw tool chain
4371 opt_cr= 4371 opt_cr=
4372@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do 4372@@ -6884,6 +7202,7 @@ for ac_symprfx in "" "_"; do
4373 else 4373 else
4374 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4374 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4375 fi 4375 fi
@@ -4377,7 +4377,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4377 4377
4378 # Check to see that the pipe works correctly. 4378 # Check to see that the pipe works correctly.
4379 pipe_works=no 4379 pipe_works=no
4380@@ -6924,6 +7243,18 @@ _LT_EOF 4380@@ -6925,6 +7244,18 @@ _LT_EOF
4381 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4381 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4382 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4382 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4383 cat <<_LT_EOF > conftest.$ac_ext 4383 cat <<_LT_EOF > conftest.$ac_ext
@@ -4396,7 +4396,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4396 #ifdef __cplusplus 4396 #ifdef __cplusplus
4397 extern "C" { 4397 extern "C" {
4398 #endif 4398 #endif
4399@@ -6935,7 +7266,7 @@ _LT_EOF 4399@@ -6936,7 +7267,7 @@ _LT_EOF
4400 cat <<_LT_EOF >> conftest.$ac_ext 4400 cat <<_LT_EOF >> conftest.$ac_ext
4401 4401
4402 /* The mapping between symbol names and symbols. */ 4402 /* The mapping between symbol names and symbols. */
@@ -4405,7 +4405,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4405 const char *name; 4405 const char *name;
4406 void *address; 4406 void *address;
4407 } 4407 }
4408@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() { 4408@@ -6962,8 +7293,8 @@ static const void *lt_preloaded_setup() {
4409 _LT_EOF 4409 _LT_EOF
4410 # Now try linking the two files. 4410 # Now try linking the two files.
4411 mv conftest.$ac_objext conftstm.$ac_objext 4411 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4416,7 +4416,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4416 LIBS="conftstm.$ac_objext" 4416 LIBS="conftstm.$ac_objext"
4417 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4417 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4418 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4418 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4419@@ -6972,8 +7303,8 @@ _LT_EOF 4419@@ -6973,8 +7304,8 @@ _LT_EOF
4420 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4420 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4421 pipe_works=yes 4421 pipe_works=yes
4422 fi 4422 fi
@@ -4427,7 +4427,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4427 else 4427 else
4428 echo "cannot find nm_test_func in $nlist" >&5 4428 echo "cannot find nm_test_func in $nlist" >&5
4429 fi 4429 fi
4430@@ -7010,6 +7341,21 @@ else 4430@@ -7011,6 +7342,21 @@ else
4431 $as_echo "ok" >&6; } 4431 $as_echo "ok" >&6; }
4432 fi 4432 fi
4433 4433
@@ -4449,7 +4449,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4449 4449
4450 4450
4451 4451
4452@@ -7026,6 +7372,40 @@ fi 4452@@ -7027,6 +7373,40 @@ fi
4453 4453
4454 4454
4455 4455
@@ -4490,7 +4490,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4490 4490
4491 4491
4492 4492
4493@@ -7237,6 +7617,123 @@ esac 4493@@ -7238,6 +7618,123 @@ esac
4494 4494
4495 need_locks="$enable_libtool_lock" 4495 need_locks="$enable_libtool_lock"
4496 4496
@@ -4614,7 +4614,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4614 4614
4615 case $host_os in 4615 case $host_os in
4616 rhapsody* | darwin*) 4616 rhapsody* | darwin*)
4617@@ -7800,6 +8297,8 @@ _LT_EOF 4617@@ -7801,6 +8298,8 @@ _LT_EOF
4618 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4618 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4619 echo "$AR cru libconftest.a conftest.o" >&5 4619 echo "$AR cru libconftest.a conftest.o" >&5
4620 $AR cru libconftest.a conftest.o 2>&5 4620 $AR cru libconftest.a conftest.o 2>&5
@@ -4623,7 +4623,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4623 cat > conftest.c << _LT_EOF 4623 cat > conftest.c << _LT_EOF
4624 int main() { return 0;} 4624 int main() { return 0;}
4625 _LT_EOF 4625 _LT_EOF
4626@@ -7995,7 +8494,8 @@ fi 4626@@ -7996,7 +8495,8 @@ fi
4627 LIBTOOL_DEPS="$ltmain" 4627 LIBTOOL_DEPS="$ltmain"
4628 4628
4629 # Always use our own libtool. 4629 # Always use our own libtool.
@@ -4633,7 +4633,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4633 4633
4634 4634
4635 4635
4636@@ -8084,7 +8584,7 @@ aix3*) 4636@@ -8085,7 +8585,7 @@ aix3*)
4637 esac 4637 esac
4638 4638
4639 # Global variables: 4639 # Global variables:
@@ -4642,7 +4642,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4642 can_build_shared=yes 4642 can_build_shared=yes
4643 4643
4644 # All known linkers require a `.a' archive for static linking (except MSVC, 4644 # All known linkers require a `.a' archive for static linking (except MSVC,
4645@@ -8382,8 +8882,6 @@ fi 4645@@ -8383,8 +8883,6 @@ fi
4646 lt_prog_compiler_pic= 4646 lt_prog_compiler_pic=
4647 lt_prog_compiler_static= 4647 lt_prog_compiler_static=
4648 4648
@@ -4651,7 +4651,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4651 4651
4652 if test "$GCC" = yes; then 4652 if test "$GCC" = yes; then
4653 lt_prog_compiler_wl='-Wl,' 4653 lt_prog_compiler_wl='-Wl,'
4654@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4654@@ -8550,6 +9048,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4655 lt_prog_compiler_pic='--shared' 4655 lt_prog_compiler_pic='--shared'
4656 lt_prog_compiler_static='--static' 4656 lt_prog_compiler_static='--static'
4657 ;; 4657 ;;
@@ -4664,7 +4664,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4664 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4664 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4665 # Portland Group compilers (*not* the Pentium gcc compiler, 4665 # Portland Group compilers (*not* the Pentium gcc compiler,
4666 # which looks to be a dead project) 4666 # which looks to be a dead project)
4667@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4667@@ -8612,7 +9116,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4668 lt_prog_compiler_pic='-KPIC' 4668 lt_prog_compiler_pic='-KPIC'
4669 lt_prog_compiler_static='-Bstatic' 4669 lt_prog_compiler_static='-Bstatic'
4670 case $cc_basename in 4670 case $cc_basename in
@@ -4673,7 +4673,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4673 lt_prog_compiler_wl='-Qoption ld ';; 4673 lt_prog_compiler_wl='-Qoption ld ';;
4674 *) 4674 *)
4675 lt_prog_compiler_wl='-Wl,';; 4675 lt_prog_compiler_wl='-Wl,';;
4676@@ -8668,13 +9172,17 @@ case $host_os in 4676@@ -8669,13 +9173,17 @@ case $host_os in
4677 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4677 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4678 ;; 4678 ;;
4679 esac 4679 esac
@@ -4697,7 +4697,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4697 4697
4698 # 4698 #
4699 # Check to make sure the PIC flag actually works. 4699 # Check to make sure the PIC flag actually works.
4700@@ -8735,6 +9243,11 @@ fi 4700@@ -8736,6 +9244,11 @@ fi
4701 4701
4702 4702
4703 4703
@@ -4709,7 +4709,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4709 # 4709 #
4710 # Check to make sure the static flag actually works. 4710 # Check to make sure the static flag actually works.
4711 # 4711 #
4712@@ -9085,7 +9598,8 @@ _LT_EOF 4712@@ -9086,7 +9599,8 @@ _LT_EOF
4713 allow_undefined_flag=unsupported 4713 allow_undefined_flag=unsupported
4714 always_export_symbols=no 4714 always_export_symbols=no
4715 enable_shared_with_static_runtimes=yes 4715 enable_shared_with_static_runtimes=yes
@@ -4719,7 +4719,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4719 4719
4720 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4720 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4721 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4721 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4722@@ -9184,12 +9698,12 @@ _LT_EOF 4722@@ -9185,12 +9699,12 @@ _LT_EOF
4723 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4723 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4724 hardcode_libdir_flag_spec= 4724 hardcode_libdir_flag_spec=
4725 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4725 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4734,7 +4734,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4734 fi 4734 fi
4735 ;; 4735 ;;
4736 esac 4736 esac
4737@@ -9203,8 +9717,8 @@ _LT_EOF 4737@@ -9204,8 +9718,8 @@ _LT_EOF
4738 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4738 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4739 wlarc= 4739 wlarc=
4740 else 4740 else
@@ -4745,7 +4745,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4745 fi 4745 fi
4746 ;; 4746 ;;
4747 4747
4748@@ -9222,8 +9736,8 @@ _LT_EOF 4748@@ -9223,8 +9737,8 @@ _LT_EOF
4749 4749
4750 _LT_EOF 4750 _LT_EOF
4751 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4751 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4756,7 +4756,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4756 else 4756 else
4757 ld_shlibs=no 4757 ld_shlibs=no
4758 fi 4758 fi
4759@@ -9269,8 +9783,8 @@ _LT_EOF 4759@@ -9270,8 +9784,8 @@ _LT_EOF
4760 4760
4761 *) 4761 *)
4762 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4762 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4767,7 +4767,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4767 else 4767 else
4768 ld_shlibs=no 4768 ld_shlibs=no
4769 fi 4769 fi
4770@@ -9400,7 +9914,13 @@ _LT_EOF 4770@@ -9401,7 +9915,13 @@ _LT_EOF
4771 allow_undefined_flag='-berok' 4771 allow_undefined_flag='-berok'
4772 # Determine the default libpath from the value encoded in an 4772 # Determine the default libpath from the value encoded in an
4773 # empty executable. 4773 # empty executable.
@@ -4782,7 +4782,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4782 /* end confdefs.h. */ 4782 /* end confdefs.h. */
4783 4783
4784 int 4784 int
4785@@ -9413,22 +9933,29 @@ main () 4785@@ -9414,22 +9934,29 @@ main ()
4786 _ACEOF 4786 _ACEOF
4787 if ac_fn_c_try_link "$LINENO"; then : 4787 if ac_fn_c_try_link "$LINENO"; then :
4788 4788
@@ -4825,7 +4825,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4825 4825
4826 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4826 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4827 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" 4827 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"
4828@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4828@@ -9441,7 +9968,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4829 else 4829 else
4830 # Determine the default libpath from the value encoded in an 4830 # Determine the default libpath from the value encoded in an
4831 # empty executable. 4831 # empty executable.
@@ -4840,7 +4840,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4840 /* end confdefs.h. */ 4840 /* end confdefs.h. */
4841 4841
4842 int 4842 int
4843@@ -9453,22 +9986,29 @@ main () 4843@@ -9454,22 +9987,29 @@ main ()
4844 _ACEOF 4844 _ACEOF
4845 if ac_fn_c_try_link "$LINENO"; then : 4845 if ac_fn_c_try_link "$LINENO"; then :
4846 4846
@@ -4883,7 +4883,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4883 4883
4884 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4884 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4885 # Warning - without using the other run time loading flags, 4885 # Warning - without using the other run time loading flags,
4886@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4886@@ -9514,20 +10054,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4887 # Microsoft Visual C++. 4887 # Microsoft Visual C++.
4888 # hardcode_libdir_flag_spec is actually meaningless, as there is 4888 # hardcode_libdir_flag_spec is actually meaningless, as there is
4889 # no search path for DLLs. 4889 # no search path for DLLs.
@@ -4961,7 +4961,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4961 ;; 4961 ;;
4962 4962
4963 darwin* | rhapsody*) 4963 darwin* | rhapsody*)
4964@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4964@@ -9588,7 +10171,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4965 4965
4966 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4966 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4967 freebsd* | dragonfly*) 4967 freebsd* | dragonfly*)
@@ -4970,7 +4970,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4970 hardcode_libdir_flag_spec='-R$libdir' 4970 hardcode_libdir_flag_spec='-R$libdir'
4971 hardcode_direct=yes 4971 hardcode_direct=yes
4972 hardcode_shlibpath_var=no 4972 hardcode_shlibpath_var=no
4973@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4973@@ -9596,7 +10179,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4974 4974
4975 hpux9*) 4975 hpux9*)
4976 if test "$GCC" = yes; then 4976 if test "$GCC" = yes; then
@@ -4979,7 +4979,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4979 else 4979 else
4980 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' 4980 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'
4981 fi 4981 fi
4982@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4982@@ -9612,7 +10195,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4983 4983
4984 hpux10*) 4984 hpux10*)
4985 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4985 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -4988,7 +4988,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
4988 else 4988 else
4989 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 4989 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4990 fi 4990 fi
4991@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4991@@ -9636,10 +10219,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4992 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4992 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4993 ;; 4993 ;;
4994 ia64*) 4994 ia64*)
@@ -5001,7 +5001,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5001 ;; 5001 ;;
5002 esac 5002 esac
5003 else 5003 else
5004@@ -9717,23 +10300,36 @@ fi 5004@@ -9718,23 +10301,36 @@ fi
5005 5005
5006 irix5* | irix6* | nonstopux*) 5006 irix5* | irix6* | nonstopux*)
5007 if test "$GCC" = yes; then 5007 if test "$GCC" = yes; then
@@ -5046,7 +5046,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5046 else 5046 else
5047 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' 5047 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'
5048 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' 5048 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'
5049@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5049@@ -9819,7 +10415,7 @@ rm -f core conftest.err conftest.$ac_objext \
5050 osf4* | osf5*) # as osf3* with the addition of -msym flag 5050 osf4* | osf5*) # as osf3* with the addition of -msym flag
5051 if test "$GCC" = yes; then 5051 if test "$GCC" = yes; then
5052 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5052 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5055,7 +5055,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5055 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5055 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5056 else 5056 else
5057 allow_undefined_flag=' -expect_unresolved \*' 5057 allow_undefined_flag=' -expect_unresolved \*'
5058@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5058@@ -9838,9 +10434,9 @@ rm -f core conftest.err conftest.$ac_objext \
5059 no_undefined_flag=' -z defs' 5059 no_undefined_flag=' -z defs'
5060 if test "$GCC" = yes; then 5060 if test "$GCC" = yes; then
5061 wlarc='${wl}' 5061 wlarc='${wl}'
@@ -5067,7 +5067,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5067 else 5067 else
5068 case `$CC -V 2>&1` in 5068 case `$CC -V 2>&1` in
5069 *"Compilers 5.0"*) 5069 *"Compilers 5.0"*)
5070@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5070@@ -10416,8 +11012,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5071 need_version=no 5071 need_version=no
5072 need_lib_prefix=no 5072 need_lib_prefix=no
5073 5073
@@ -5079,7 +5079,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5079 library_names_spec='$libname.dll.a' 5079 library_names_spec='$libname.dll.a'
5080 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5080 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5081 postinstall_cmds='base_file=`basename \${file}`~ 5081 postinstall_cmds='base_file=`basename \${file}`~
5082@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5082@@ -10450,13 +11047,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5083 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5083 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5084 ;; 5084 ;;
5085 esac 5085 esac
@@ -5152,7 +5152,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5152 # FIXME: first we should search . and the directory the executable is in 5152 # FIXME: first we should search . and the directory the executable is in
5153 shlibpath_var=PATH 5153 shlibpath_var=PATH
5154 ;; 5154 ;;
5155@@ -10547,7 +11202,7 @@ haiku*) 5155@@ -10538,7 +11193,7 @@ haiku*)
5156 soname_spec='${libname}${release}${shared_ext}$major' 5156 soname_spec='${libname}${release}${shared_ext}$major'
5157 shlibpath_var=LIBRARY_PATH 5157 shlibpath_var=LIBRARY_PATH
5158 shlibpath_overrides_runpath=yes 5158 shlibpath_overrides_runpath=yes
@@ -5161,16 +5161,16 @@ index d4b13e6fc8b..dd5224c5c81 100755
5161 hardcode_into_libs=yes 5161 hardcode_into_libs=yes
5162 ;; 5162 ;;
5163 5163
5164@@ -11343,7 +11998,7 @@ else 5164@@ -11334,7 +11989,7 @@ else
5165 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5165 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5166 lt_status=$lt_dlunknown 5166 lt_status=$lt_dlunknown
5167 cat > conftest.$ac_ext <<_LT_EOF 5167 cat > conftest.$ac_ext <<_LT_EOF
5168-#line 11346 "configure" 5168-#line 11337 "configure"
5169+#line $LINENO "configure" 5169+#line $LINENO "configure"
5170 #include "confdefs.h" 5170 #include "confdefs.h"
5171 5171
5172 #if HAVE_DLFCN_H 5172 #if HAVE_DLFCN_H
5173@@ -11387,10 +12042,10 @@ else 5173@@ -11378,10 +12033,10 @@ else
5174 /* When -fvisbility=hidden is used, assume the code has been annotated 5174 /* When -fvisbility=hidden is used, assume the code has been annotated
5175 correspondingly for the symbols needed. */ 5175 correspondingly for the symbols needed. */
5176 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5176 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5183,16 +5183,16 @@ index d4b13e6fc8b..dd5224c5c81 100755
5183 int main () 5183 int main ()
5184 { 5184 {
5185 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5185 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5186@@ -11449,7 +12104,7 @@ else 5186@@ -11440,7 +12095,7 @@ else
5187 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5187 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5188 lt_status=$lt_dlunknown 5188 lt_status=$lt_dlunknown
5189 cat > conftest.$ac_ext <<_LT_EOF 5189 cat > conftest.$ac_ext <<_LT_EOF
5190-#line 11452 "configure" 5190-#line 11443 "configure"
5191+#line $LINENO "configure" 5191+#line $LINENO "configure"
5192 #include "confdefs.h" 5192 #include "confdefs.h"
5193 5193
5194 #if HAVE_DLFCN_H 5194 #if HAVE_DLFCN_H
5195@@ -11493,10 +12148,10 @@ else 5195@@ -11484,10 +12139,10 @@ else
5196 /* When -fvisbility=hidden is used, assume the code has been annotated 5196 /* When -fvisbility=hidden is used, assume the code has been annotated
5197 correspondingly for the symbols needed. */ 5197 correspondingly for the symbols needed. */
5198 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5198 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5205,7 +5205,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5205 int main () 5205 int main ()
5206 { 5206 {
5207 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5207 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5208@@ -15981,13 +16636,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5208@@ -16020,13 +16675,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5209 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5209 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5210 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5210 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5211 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5211 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5226,7 +5226,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5226 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5226 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5227 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5227 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5228 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5228 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5229@@ -16002,14 +16664,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5229@@ -16041,14 +16703,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5230 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5230 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5231 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5231 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5232 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"`' 5232 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"`'
@@ -5245,7 +5245,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5245 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5245 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5246 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5246 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5247 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5247 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5248@@ -16042,12 +16707,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5248@@ -16081,12 +16746,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5249 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5249 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5250 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5250 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5251 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5251 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5259,7 +5259,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5259 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5259 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5260 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5260 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5261 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5261 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5262@@ -16102,8 +16767,13 @@ reload_flag \ 5262@@ -16141,8 +16806,13 @@ reload_flag \
5263 OBJDUMP \ 5263 OBJDUMP \
5264 deplibs_check_method \ 5264 deplibs_check_method \
5265 file_magic_cmd \ 5265 file_magic_cmd \
@@ -5273,7 +5273,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5273 STRIP \ 5273 STRIP \
5274 RANLIB \ 5274 RANLIB \
5275 CC \ 5275 CC \
5276@@ -16113,12 +16783,14 @@ lt_cv_sys_global_symbol_pipe \ 5276@@ -16152,12 +16822,14 @@ lt_cv_sys_global_symbol_pipe \
5277 lt_cv_sys_global_symbol_to_cdecl \ 5277 lt_cv_sys_global_symbol_to_cdecl \
5278 lt_cv_sys_global_symbol_to_c_name_address \ 5278 lt_cv_sys_global_symbol_to_c_name_address \
5279 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5279 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5289,7 +5289,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5289 DSYMUTIL \ 5289 DSYMUTIL \
5290 NMEDIT \ 5290 NMEDIT \
5291 LIPO \ 5291 LIPO \
5292@@ -16134,7 +16806,6 @@ no_undefined_flag \ 5292@@ -16173,7 +16845,6 @@ no_undefined_flag \
5293 hardcode_libdir_flag_spec \ 5293 hardcode_libdir_flag_spec \
5294 hardcode_libdir_flag_spec_ld \ 5294 hardcode_libdir_flag_spec_ld \
5295 hardcode_libdir_separator \ 5295 hardcode_libdir_separator \
@@ -5297,7 +5297,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5297 exclude_expsyms \ 5297 exclude_expsyms \
5298 include_expsyms \ 5298 include_expsyms \
5299 file_list_spec \ 5299 file_list_spec \
5300@@ -16170,6 +16841,7 @@ module_cmds \ 5300@@ -16209,6 +16880,7 @@ module_cmds \
5301 module_expsym_cmds \ 5301 module_expsym_cmds \
5302 export_symbols_cmds \ 5302 export_symbols_cmds \
5303 prelink_cmds \ 5303 prelink_cmds \
@@ -5305,7 +5305,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5305 postinstall_cmds \ 5305 postinstall_cmds \
5306 postuninstall_cmds \ 5306 postuninstall_cmds \
5307 finish_cmds \ 5307 finish_cmds \
5308@@ -16943,7 +17615,8 @@ $as_echo X"$file" | 5308@@ -16982,7 +17654,8 @@ $as_echo X"$file" |
5309 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5309 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5310 # 5310 #
5311 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5311 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5315,7 +5315,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5315 # Written by Gordon Matzigkeit, 1996 5315 # Written by Gordon Matzigkeit, 1996
5316 # 5316 #
5317 # This file is part of GNU Libtool. 5317 # This file is part of GNU Libtool.
5318@@ -17046,19 +17719,42 @@ SP2NL=$lt_lt_SP2NL 5318@@ -17085,19 +17758,42 @@ SP2NL=$lt_lt_SP2NL
5319 # turn newlines into spaces. 5319 # turn newlines into spaces.
5320 NL2SP=$lt_lt_NL2SP 5320 NL2SP=$lt_lt_NL2SP
5321 5321
@@ -5359,7 +5359,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5359 # A symbol stripping program. 5359 # A symbol stripping program.
5360 STRIP=$lt_STRIP 5360 STRIP=$lt_STRIP
5361 5361
5362@@ -17088,6 +17784,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5362@@ -17127,6 +17823,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5363 # Transform the output of nm in a C name address pair when lib prefix is needed. 5363 # Transform the output of nm in a C name address pair when lib prefix is needed.
5364 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5364 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5365 5365
@@ -5372,7 +5372,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5372 # The name of the directory that contains temporary libtool files. 5372 # The name of the directory that contains temporary libtool files.
5373 objdir=$objdir 5373 objdir=$objdir
5374 5374
5375@@ -17097,6 +17799,9 @@ MAGIC_CMD=$MAGIC_CMD 5375@@ -17136,6 +17838,9 @@ MAGIC_CMD=$MAGIC_CMD
5376 # Must we lock files when doing compilation? 5376 # Must we lock files when doing compilation?
5377 need_locks=$lt_need_locks 5377 need_locks=$lt_need_locks
5378 5378
@@ -5382,7 +5382,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5382 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5382 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5383 DSYMUTIL=$lt_DSYMUTIL 5383 DSYMUTIL=$lt_DSYMUTIL
5384 5384
5385@@ -17211,12 +17916,12 @@ with_gcc=$GCC 5385@@ -17250,12 +17955,12 @@ with_gcc=$GCC
5386 # Compiler flag to turn off builtin functions. 5386 # Compiler flag to turn off builtin functions.
5387 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5387 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5388 5388
@@ -5398,7 +5398,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5398 # Compiler flag to prevent dynamic linking. 5398 # Compiler flag to prevent dynamic linking.
5399 link_static_flag=$lt_lt_prog_compiler_static 5399 link_static_flag=$lt_lt_prog_compiler_static
5400 5400
5401@@ -17303,9 +18008,6 @@ inherit_rpath=$inherit_rpath 5401@@ -17342,9 +18047,6 @@ inherit_rpath=$inherit_rpath
5402 # Whether libtool must link a program against all its dependency libraries. 5402 # Whether libtool must link a program against all its dependency libraries.
5403 link_all_deplibs=$link_all_deplibs 5403 link_all_deplibs=$link_all_deplibs
5404 5404
@@ -5408,7 +5408,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5408 # Set to "yes" if exported symbols are required. 5408 # Set to "yes" if exported symbols are required.
5409 always_export_symbols=$always_export_symbols 5409 always_export_symbols=$always_export_symbols
5410 5410
5411@@ -17321,6 +18023,9 @@ include_expsyms=$lt_include_expsyms 5411@@ -17360,6 +18062,9 @@ include_expsyms=$lt_include_expsyms
5412 # Commands necessary for linking programs (against libraries) with templates. 5412 # Commands necessary for linking programs (against libraries) with templates.
5413 prelink_cmds=$lt_prelink_cmds 5413 prelink_cmds=$lt_prelink_cmds
5414 5414
@@ -5418,7 +5418,7 @@ index d4b13e6fc8b..dd5224c5c81 100755
5418 # Specify filename containing input files. 5418 # Specify filename containing input files.
5419 file_list_spec=$lt_file_list_spec 5419 file_list_spec=$lt_file_list_spec
5420 5420
5421@@ -17353,210 +18058,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5421@@ -17392,210 +18097,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5422 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5422 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5423 # text mode, it properly converts lines to CR/LF. This bash problem 5423 # text mode, it properly converts lines to CR/LF. This bash problem
5424 # is reportedly fixed, but why not run on old versions too? 5424 # is reportedly fixed, but why not run on old versions too?
@@ -5793,10 +5793,10 @@ index d4b13e6fc8b..dd5224c5c81 100755
5793 chmod +x "$ofile" 5793 chmod +x "$ofile"
5794 5794
5795diff --git a/gprof/configure b/gprof/configure 5795diff --git a/gprof/configure b/gprof/configure
5796index 3cf41b79116..e5d57f52912 100755 5796index b12ec2e472f..57986ca995a 100755
5797--- a/gprof/configure 5797--- a/gprof/configure
5798+++ b/gprof/configure 5798+++ b/gprof/configure
5799@@ -662,8 +662,11 @@ OTOOL 5799@@ -663,8 +663,11 @@ OTOOL
5800 LIPO 5800 LIPO
5801 NMEDIT 5801 NMEDIT
5802 DSYMUTIL 5802 DSYMUTIL
@@ -5808,7 +5808,7 @@ index 3cf41b79116..e5d57f52912 100755
5808 OBJDUMP 5808 OBJDUMP
5809 LN_S 5809 LN_S
5810 NM 5810 NM
5811@@ -780,6 +783,7 @@ enable_static 5811@@ -781,6 +784,7 @@ enable_static
5812 with_pic 5812 with_pic
5813 enable_fast_install 5813 enable_fast_install
5814 with_gnu_ld 5814 with_gnu_ld
@@ -5816,7 +5816,7 @@ index 3cf41b79116..e5d57f52912 100755
5816 enable_libtool_lock 5816 enable_libtool_lock
5817 enable_plugins 5817 enable_plugins
5818 enable_largefile 5818 enable_largefile
5819@@ -1442,6 +1446,8 @@ Optional Packages: 5819@@ -1443,6 +1447,8 @@ Optional Packages:
5820 --with-pic try to use only PIC/non-PIC objects [default=use 5820 --with-pic try to use only PIC/non-PIC objects [default=use
5821 both] 5821 both]
5822 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 5822 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -5825,7 +5825,7 @@ index 3cf41b79116..e5d57f52912 100755
5825 5825
5826 Some influential environment variables: 5826 Some influential environment variables:
5827 CC C compiler command 5827 CC C compiler command
5828@@ -5124,8 +5130,8 @@ esac 5828@@ -5125,8 +5131,8 @@ esac
5829 5829
5830 5830
5831 5831
@@ -5836,7 +5836,7 @@ index 3cf41b79116..e5d57f52912 100755
5836 5836
5837 5837
5838 5838
5839@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5839@@ -5166,7 +5172,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5840 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5840 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5841 $as_echo_n "checking how to print strings... " >&6; } 5841 $as_echo_n "checking how to print strings... " >&6; }
5842 # Test print first, because it will be a builtin if present. 5842 # Test print first, because it will be a builtin if present.
@@ -5845,7 +5845,7 @@ index 3cf41b79116..e5d57f52912 100755
5845 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5845 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5846 ECHO='print -r --' 5846 ECHO='print -r --'
5847 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5847 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5848@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5848@@ -5852,8 +5858,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5849 # Try some XSI features 5849 # Try some XSI features
5850 xsi_shell=no 5850 xsi_shell=no
5851 ( _lt_dummy="a/b/c" 5851 ( _lt_dummy="a/b/c"
@@ -5856,7 +5856,7 @@ index 3cf41b79116..e5d57f52912 100755
5856 && eval 'test $(( 1 + 1 )) -eq 2 \ 5856 && eval 'test $(( 1 + 1 )) -eq 2 \
5857 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5857 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5858 && xsi_shell=yes 5858 && xsi_shell=yes
5859@@ -5901,6 +5907,80 @@ esac 5859@@ -5902,6 +5908,80 @@ esac
5860 5860
5861 5861
5862 5862
@@ -5937,7 +5937,7 @@ index 3cf41b79116..e5d57f52912 100755
5937 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 5937 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5938 $as_echo_n "checking for $LD option to reload object files... " >&6; } 5938 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5939 if ${lt_cv_ld_reload_flag+:} false; then : 5939 if ${lt_cv_ld_reload_flag+:} false; then :
5940@@ -5917,6 +5997,11 @@ case $reload_flag in 5940@@ -5918,6 +5998,11 @@ case $reload_flag in
5941 esac 5941 esac
5942 reload_cmds='$LD$reload_flag -o $output$reload_objs' 5942 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5943 case $host_os in 5943 case $host_os in
@@ -5949,7 +5949,7 @@ index 3cf41b79116..e5d57f52912 100755
5949 darwin*) 5949 darwin*)
5950 if test "$GCC" = yes; then 5950 if test "$GCC" = yes; then
5951 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 5951 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5952@@ -6085,7 +6170,8 @@ mingw* | pw32*) 5952@@ -6086,7 +6171,8 @@ mingw* | pw32*)
5953 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 5953 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5954 lt_cv_file_magic_cmd='func_win32_libid' 5954 lt_cv_file_magic_cmd='func_win32_libid'
5955 else 5955 else
@@ -5959,7 +5959,7 @@ index 3cf41b79116..e5d57f52912 100755
5959 lt_cv_file_magic_cmd='$OBJDUMP -f' 5959 lt_cv_file_magic_cmd='$OBJDUMP -f'
5960 fi 5960 fi
5961 ;; 5961 ;;
5962@@ -6239,6 +6325,21 @@ esac 5962@@ -6240,6 +6326,21 @@ esac
5963 fi 5963 fi
5964 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5964 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5965 $as_echo "$lt_cv_deplibs_check_method" >&6; } 5965 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -5981,7 +5981,7 @@ index 3cf41b79116..e5d57f52912 100755
5981 file_magic_cmd=$lt_cv_file_magic_cmd 5981 file_magic_cmd=$lt_cv_file_magic_cmd
5982 deplibs_check_method=$lt_cv_deplibs_check_method 5982 deplibs_check_method=$lt_cv_deplibs_check_method
5983 test -z "$deplibs_check_method" && deplibs_check_method=unknown 5983 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5984@@ -6252,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 5984@@ -6253,11 +6354,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5985 5985
5986 5986
5987 5987
@@ -6148,7 +6148,7 @@ index 3cf41b79116..e5d57f52912 100755
6148 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6148 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6149 $as_echo_n "checking for $ac_word... " >&6; } 6149 $as_echo_n "checking for $ac_word... " >&6; }
6150 if ${ac_cv_prog_AR+:} false; then : 6150 if ${ac_cv_prog_AR+:} false; then :
6151@@ -6272,7 +6526,7 @@ do 6151@@ -6273,7 +6527,7 @@ do
6152 test -z "$as_dir" && as_dir=. 6152 test -z "$as_dir" && as_dir=.
6153 for ac_exec_ext in '' $ac_executable_extensions; do 6153 for ac_exec_ext in '' $ac_executable_extensions; do
6154 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6154 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6157,7 +6157,7 @@ index 3cf41b79116..e5d57f52912 100755
6157 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6157 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6158 break 2 6158 break 2
6159 fi 6159 fi
6160@@ -6292,11 +6546,15 @@ $as_echo "no" >&6; } 6160@@ -6293,11 +6547,15 @@ $as_echo "no" >&6; }
6161 fi 6161 fi
6162 6162
6163 6163
@@ -6176,7 +6176,7 @@ index 3cf41b79116..e5d57f52912 100755
6176 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6176 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6177 $as_echo_n "checking for $ac_word... " >&6; } 6177 $as_echo_n "checking for $ac_word... " >&6; }
6178 if ${ac_cv_prog_ac_ct_AR+:} false; then : 6178 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6179@@ -6312,7 +6570,7 @@ do 6179@@ -6313,7 +6571,7 @@ do
6180 test -z "$as_dir" && as_dir=. 6180 test -z "$as_dir" && as_dir=.
6181 for ac_exec_ext in '' $ac_executable_extensions; do 6181 for ac_exec_ext in '' $ac_executable_extensions; do
6182 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6182 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6185,7 +6185,7 @@ index 3cf41b79116..e5d57f52912 100755
6185 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6185 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6186 break 2 6186 break 2
6187 fi 6187 fi
6188@@ -6331,6 +6589,10 @@ else 6188@@ -6332,6 +6590,10 @@ else
6189 $as_echo "no" >&6; } 6189 $as_echo "no" >&6; }
6190 fi 6190 fi
6191 6191
@@ -6196,7 +6196,7 @@ index 3cf41b79116..e5d57f52912 100755
6196 if test "x$ac_ct_AR" = x; then 6196 if test "x$ac_ct_AR" = x; then
6197 AR="false" 6197 AR="false"
6198 else 6198 else
6199@@ -6342,16 +6604,72 @@ ac_tool_warned=yes ;; 6199@@ -6343,16 +6605,72 @@ ac_tool_warned=yes ;;
6200 esac 6200 esac
6201 AR=$ac_ct_AR 6201 AR=$ac_ct_AR
6202 fi 6202 fi
@@ -6273,7 +6273,7 @@ index 3cf41b79116..e5d57f52912 100755
6273 6273
6274 6274
6275 6275
6276@@ -6693,8 +7011,8 @@ esac 6276@@ -6694,8 +7012,8 @@ esac
6277 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6277 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6278 6278
6279 # Transform an extracted symbol line into symbol name and symbol address 6279 # Transform an extracted symbol line into symbol name and symbol address
@@ -6284,7 +6284,7 @@ index 3cf41b79116..e5d57f52912 100755
6284 6284
6285 # Handle CRLF in mingw tool chain 6285 # Handle CRLF in mingw tool chain
6286 opt_cr= 6286 opt_cr=
6287@@ -6730,6 +7048,7 @@ for ac_symprfx in "" "_"; do 6287@@ -6731,6 +7049,7 @@ for ac_symprfx in "" "_"; do
6288 else 6288 else
6289 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6289 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6290 fi 6290 fi
@@ -6292,7 +6292,7 @@ index 3cf41b79116..e5d57f52912 100755
6292 6292
6293 # Check to see that the pipe works correctly. 6293 # Check to see that the pipe works correctly.
6294 pipe_works=no 6294 pipe_works=no
6295@@ -6771,6 +7090,18 @@ _LT_EOF 6295@@ -6772,6 +7091,18 @@ _LT_EOF
6296 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6296 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6297 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6297 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6298 cat <<_LT_EOF > conftest.$ac_ext 6298 cat <<_LT_EOF > conftest.$ac_ext
@@ -6311,7 +6311,7 @@ index 3cf41b79116..e5d57f52912 100755
6311 #ifdef __cplusplus 6311 #ifdef __cplusplus
6312 extern "C" { 6312 extern "C" {
6313 #endif 6313 #endif
6314@@ -6782,7 +7113,7 @@ _LT_EOF 6314@@ -6783,7 +7114,7 @@ _LT_EOF
6315 cat <<_LT_EOF >> conftest.$ac_ext 6315 cat <<_LT_EOF >> conftest.$ac_ext
6316 6316
6317 /* The mapping between symbol names and symbols. */ 6317 /* The mapping between symbol names and symbols. */
@@ -6320,7 +6320,7 @@ index 3cf41b79116..e5d57f52912 100755
6320 const char *name; 6320 const char *name;
6321 void *address; 6321 void *address;
6322 } 6322 }
6323@@ -6808,8 +7139,8 @@ static const void *lt_preloaded_setup() { 6323@@ -6809,8 +7140,8 @@ static const void *lt_preloaded_setup() {
6324 _LT_EOF 6324 _LT_EOF
6325 # Now try linking the two files. 6325 # Now try linking the two files.
6326 mv conftest.$ac_objext conftstm.$ac_objext 6326 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6331,7 +6331,7 @@ index 3cf41b79116..e5d57f52912 100755
6331 LIBS="conftstm.$ac_objext" 6331 LIBS="conftstm.$ac_objext"
6332 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6332 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6333 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6333 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6334@@ -6819,8 +7150,8 @@ _LT_EOF 6334@@ -6820,8 +7151,8 @@ _LT_EOF
6335 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6335 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6336 pipe_works=yes 6336 pipe_works=yes
6337 fi 6337 fi
@@ -6342,7 +6342,7 @@ index 3cf41b79116..e5d57f52912 100755
6342 else 6342 else
6343 echo "cannot find nm_test_func in $nlist" >&5 6343 echo "cannot find nm_test_func in $nlist" >&5
6344 fi 6344 fi
6345@@ -6857,6 +7188,20 @@ else 6345@@ -6858,6 +7189,20 @@ else
6346 $as_echo "ok" >&6; } 6346 $as_echo "ok" >&6; }
6347 fi 6347 fi
6348 6348
@@ -6363,7 +6363,7 @@ index 3cf41b79116..e5d57f52912 100755
6363 6363
6364 6364
6365 6365
6366@@ -6873,6 +7218,41 @@ fi 6366@@ -6874,6 +7219,41 @@ fi
6367 6367
6368 6368
6369 6369
@@ -6405,7 +6405,7 @@ index 3cf41b79116..e5d57f52912 100755
6405 6405
6406 6406
6407 6407
6408@@ -7084,6 +7464,123 @@ esac 6408@@ -7085,6 +7465,123 @@ esac
6409 6409
6410 need_locks="$enable_libtool_lock" 6410 need_locks="$enable_libtool_lock"
6411 6411
@@ -6529,7 +6529,7 @@ index 3cf41b79116..e5d57f52912 100755
6529 6529
6530 case $host_os in 6530 case $host_os in
6531 rhapsody* | darwin*) 6531 rhapsody* | darwin*)
6532@@ -7647,6 +8144,8 @@ _LT_EOF 6532@@ -7648,6 +8145,8 @@ _LT_EOF
6533 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6533 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6534 echo "$AR cru libconftest.a conftest.o" >&5 6534 echo "$AR cru libconftest.a conftest.o" >&5
6535 $AR cru libconftest.a conftest.o 2>&5 6535 $AR cru libconftest.a conftest.o 2>&5
@@ -6538,7 +6538,7 @@ index 3cf41b79116..e5d57f52912 100755
6538 cat > conftest.c << _LT_EOF 6538 cat > conftest.c << _LT_EOF
6539 int main() { return 0;} 6539 int main() { return 0;}
6540 _LT_EOF 6540 _LT_EOF
6541@@ -7842,7 +8341,8 @@ fi 6541@@ -7843,7 +8342,8 @@ fi
6542 LIBTOOL_DEPS="$ltmain" 6542 LIBTOOL_DEPS="$ltmain"
6543 6543
6544 # Always use our own libtool. 6544 # Always use our own libtool.
@@ -6548,7 +6548,7 @@ index 3cf41b79116..e5d57f52912 100755
6548 6548
6549 6549
6550 6550
6551@@ -7931,7 +8431,7 @@ aix3*) 6551@@ -7932,7 +8432,7 @@ aix3*)
6552 esac 6552 esac
6553 6553
6554 # Global variables: 6554 # Global variables:
@@ -6557,7 +6557,7 @@ index 3cf41b79116..e5d57f52912 100755
6557 can_build_shared=yes 6557 can_build_shared=yes
6558 6558
6559 # All known linkers require a `.a' archive for static linking (except MSVC, 6559 # All known linkers require a `.a' archive for static linking (except MSVC,
6560@@ -8229,8 +8729,6 @@ fi 6560@@ -8230,8 +8730,6 @@ fi
6561 lt_prog_compiler_pic= 6561 lt_prog_compiler_pic=
6562 lt_prog_compiler_static= 6562 lt_prog_compiler_static=
6563 6563
@@ -6566,7 +6566,7 @@ index 3cf41b79116..e5d57f52912 100755
6566 6566
6567 if test "$GCC" = yes; then 6567 if test "$GCC" = yes; then
6568 lt_prog_compiler_wl='-Wl,' 6568 lt_prog_compiler_wl='-Wl,'
6569@@ -8396,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6569@@ -8397,6 +8895,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6570 lt_prog_compiler_pic='--shared' 6570 lt_prog_compiler_pic='--shared'
6571 lt_prog_compiler_static='--static' 6571 lt_prog_compiler_static='--static'
6572 ;; 6572 ;;
@@ -6579,7 +6579,7 @@ index 3cf41b79116..e5d57f52912 100755
6579 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6579 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6580 # Portland Group compilers (*not* the Pentium gcc compiler, 6580 # Portland Group compilers (*not* the Pentium gcc compiler,
6581 # which looks to be a dead project) 6581 # which looks to be a dead project)
6582@@ -8458,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6582@@ -8459,7 +8963,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6583 lt_prog_compiler_pic='-KPIC' 6583 lt_prog_compiler_pic='-KPIC'
6584 lt_prog_compiler_static='-Bstatic' 6584 lt_prog_compiler_static='-Bstatic'
6585 case $cc_basename in 6585 case $cc_basename in
@@ -6588,7 +6588,7 @@ index 3cf41b79116..e5d57f52912 100755
6588 lt_prog_compiler_wl='-Qoption ld ';; 6588 lt_prog_compiler_wl='-Qoption ld ';;
6589 *) 6589 *)
6590 lt_prog_compiler_wl='-Wl,';; 6590 lt_prog_compiler_wl='-Wl,';;
6591@@ -8515,13 +9019,17 @@ case $host_os in 6591@@ -8516,13 +9020,17 @@ case $host_os in
6592 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6592 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6593 ;; 6593 ;;
6594 esac 6594 esac
@@ -6612,7 +6612,7 @@ index 3cf41b79116..e5d57f52912 100755
6612 6612
6613 # 6613 #
6614 # Check to make sure the PIC flag actually works. 6614 # Check to make sure the PIC flag actually works.
6615@@ -8582,6 +9090,11 @@ fi 6615@@ -8583,6 +9091,11 @@ fi
6616 6616
6617 6617
6618 6618
@@ -6624,7 +6624,7 @@ index 3cf41b79116..e5d57f52912 100755
6624 # 6624 #
6625 # Check to make sure the static flag actually works. 6625 # Check to make sure the static flag actually works.
6626 # 6626 #
6627@@ -8932,7 +9445,8 @@ _LT_EOF 6627@@ -8933,7 +9446,8 @@ _LT_EOF
6628 allow_undefined_flag=unsupported 6628 allow_undefined_flag=unsupported
6629 always_export_symbols=no 6629 always_export_symbols=no
6630 enable_shared_with_static_runtimes=yes 6630 enable_shared_with_static_runtimes=yes
@@ -6634,7 +6634,7 @@ index 3cf41b79116..e5d57f52912 100755
6634 6634
6635 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6635 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6636 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6636 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6637@@ -9031,12 +9545,12 @@ _LT_EOF 6637@@ -9032,12 +9546,12 @@ _LT_EOF
6638 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6638 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6639 hardcode_libdir_flag_spec= 6639 hardcode_libdir_flag_spec=
6640 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6640 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -6649,7 +6649,7 @@ index 3cf41b79116..e5d57f52912 100755
6649 fi 6649 fi
6650 ;; 6650 ;;
6651 esac 6651 esac
6652@@ -9050,8 +9564,8 @@ _LT_EOF 6652@@ -9051,8 +9565,8 @@ _LT_EOF
6653 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6653 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6654 wlarc= 6654 wlarc=
6655 else 6655 else
@@ -6660,7 +6660,7 @@ index 3cf41b79116..e5d57f52912 100755
6660 fi 6660 fi
6661 ;; 6661 ;;
6662 6662
6663@@ -9069,8 +9583,8 @@ _LT_EOF 6663@@ -9070,8 +9584,8 @@ _LT_EOF
6664 6664
6665 _LT_EOF 6665 _LT_EOF
6666 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6666 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6671,7 +6671,7 @@ index 3cf41b79116..e5d57f52912 100755
6671 else 6671 else
6672 ld_shlibs=no 6672 ld_shlibs=no
6673 fi 6673 fi
6674@@ -9116,8 +9630,8 @@ _LT_EOF 6674@@ -9117,8 +9631,8 @@ _LT_EOF
6675 6675
6676 *) 6676 *)
6677 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6677 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6682,7 +6682,7 @@ index 3cf41b79116..e5d57f52912 100755
6682 else 6682 else
6683 ld_shlibs=no 6683 ld_shlibs=no
6684 fi 6684 fi
6685@@ -9247,7 +9761,13 @@ _LT_EOF 6685@@ -9248,7 +9762,13 @@ _LT_EOF
6686 allow_undefined_flag='-berok' 6686 allow_undefined_flag='-berok'
6687 # Determine the default libpath from the value encoded in an 6687 # Determine the default libpath from the value encoded in an
6688 # empty executable. 6688 # empty executable.
@@ -6697,7 +6697,7 @@ index 3cf41b79116..e5d57f52912 100755
6697 /* end confdefs.h. */ 6697 /* end confdefs.h. */
6698 6698
6699 int 6699 int
6700@@ -9260,22 +9780,29 @@ main () 6700@@ -9261,22 +9781,29 @@ main ()
6701 _ACEOF 6701 _ACEOF
6702 if ac_fn_c_try_link "$LINENO"; then : 6702 if ac_fn_c_try_link "$LINENO"; then :
6703 6703
@@ -6740,7 +6740,7 @@ index 3cf41b79116..e5d57f52912 100755
6740 6740
6741 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6741 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6742 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" 6742 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"
6743@@ -9287,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6743@@ -9288,7 +9815,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6744 else 6744 else
6745 # Determine the default libpath from the value encoded in an 6745 # Determine the default libpath from the value encoded in an
6746 # empty executable. 6746 # empty executable.
@@ -6755,7 +6755,7 @@ index 3cf41b79116..e5d57f52912 100755
6755 /* end confdefs.h. */ 6755 /* end confdefs.h. */
6756 6756
6757 int 6757 int
6758@@ -9300,22 +9833,29 @@ main () 6758@@ -9301,22 +9834,29 @@ main ()
6759 _ACEOF 6759 _ACEOF
6760 if ac_fn_c_try_link "$LINENO"; then : 6760 if ac_fn_c_try_link "$LINENO"; then :
6761 6761
@@ -6798,7 +6798,7 @@ index 3cf41b79116..e5d57f52912 100755
6798 6798
6799 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6799 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6800 # Warning - without using the other run time loading flags, 6800 # Warning - without using the other run time loading flags,
6801@@ -9360,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6801@@ -9361,20 +9901,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6802 # Microsoft Visual C++. 6802 # Microsoft Visual C++.
6803 # hardcode_libdir_flag_spec is actually meaningless, as there is 6803 # hardcode_libdir_flag_spec is actually meaningless, as there is
6804 # no search path for DLLs. 6804 # no search path for DLLs.
@@ -6876,7 +6876,7 @@ index 3cf41b79116..e5d57f52912 100755
6876 ;; 6876 ;;
6877 6877
6878 darwin* | rhapsody*) 6878 darwin* | rhapsody*)
6879@@ -9434,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6879@@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6880 6880
6881 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 6881 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6882 freebsd* | dragonfly*) 6882 freebsd* | dragonfly*)
@@ -6885,7 +6885,7 @@ index 3cf41b79116..e5d57f52912 100755
6885 hardcode_libdir_flag_spec='-R$libdir' 6885 hardcode_libdir_flag_spec='-R$libdir'
6886 hardcode_direct=yes 6886 hardcode_direct=yes
6887 hardcode_shlibpath_var=no 6887 hardcode_shlibpath_var=no
6888@@ -9442,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6888@@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6889 6889
6890 hpux9*) 6890 hpux9*)
6891 if test "$GCC" = yes; then 6891 if test "$GCC" = yes; then
@@ -6894,7 +6894,7 @@ index 3cf41b79116..e5d57f52912 100755
6894 else 6894 else
6895 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' 6895 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'
6896 fi 6896 fi
6897@@ -9458,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6897@@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6898 6898
6899 hpux10*) 6899 hpux10*)
6900 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 6900 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -6903,7 +6903,7 @@ index 3cf41b79116..e5d57f52912 100755
6903 else 6903 else
6904 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 6904 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6905 fi 6905 fi
6906@@ -9482,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6906@@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6907 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6907 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6908 ;; 6908 ;;
6909 ia64*) 6909 ia64*)
@@ -6916,7 +6916,7 @@ index 3cf41b79116..e5d57f52912 100755
6916 ;; 6916 ;;
6917 esac 6917 esac
6918 else 6918 else
6919@@ -9564,23 +10147,36 @@ fi 6919@@ -9565,23 +10148,36 @@ fi
6920 6920
6921 irix5* | irix6* | nonstopux*) 6921 irix5* | irix6* | nonstopux*)
6922 if test "$GCC" = yes; then 6922 if test "$GCC" = yes; then
@@ -6961,7 +6961,7 @@ index 3cf41b79116..e5d57f52912 100755
6961 else 6961 else
6962 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' 6962 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'
6963 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' 6963 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'
6964@@ -9665,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \ 6964@@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_objext \
6965 osf4* | osf5*) # as osf3* with the addition of -msym flag 6965 osf4* | osf5*) # as osf3* with the addition of -msym flag
6966 if test "$GCC" = yes; then 6966 if test "$GCC" = yes; then
6967 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 6967 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6970,7 +6970,7 @@ index 3cf41b79116..e5d57f52912 100755
6970 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 6970 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6971 else 6971 else
6972 allow_undefined_flag=' -expect_unresolved \*' 6972 allow_undefined_flag=' -expect_unresolved \*'
6973@@ -9684,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \ 6973@@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_objext \
6974 no_undefined_flag=' -z defs' 6974 no_undefined_flag=' -z defs'
6975 if test "$GCC" = yes; then 6975 if test "$GCC" = yes; then
6976 wlarc='${wl}' 6976 wlarc='${wl}'
@@ -6982,7 +6982,7 @@ index 3cf41b79116..e5d57f52912 100755
6982 else 6982 else
6983 case `$CC -V 2>&1` in 6983 case `$CC -V 2>&1` in
6984 *"Compilers 5.0"*) 6984 *"Compilers 5.0"*)
6985@@ -10262,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) 6985@@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6986 need_version=no 6986 need_version=no
6987 need_lib_prefix=no 6987 need_lib_prefix=no
6988 6988
@@ -6994,7 +6994,7 @@ index 3cf41b79116..e5d57f52912 100755
6994 library_names_spec='$libname.dll.a' 6994 library_names_spec='$libname.dll.a'
6995 # DLL is installed to $(libdir)/../bin by postinstall_cmds 6995 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6996 postinstall_cmds='base_file=`basename \${file}`~ 6996 postinstall_cmds='base_file=`basename \${file}`~
6997@@ -10296,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*) 6997@@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*)
6998 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 6998 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6999 ;; 6999 ;;
7000 esac 7000 esac
@@ -7067,7 +7067,7 @@ index 3cf41b79116..e5d57f52912 100755
7067 # FIXME: first we should search . and the directory the executable is in 7067 # FIXME: first we should search . and the directory the executable is in
7068 shlibpath_var=PATH 7068 shlibpath_var=PATH
7069 ;; 7069 ;;
7070@@ -10394,7 +11049,7 @@ haiku*) 7070@@ -10385,7 +11040,7 @@ haiku*)
7071 soname_spec='${libname}${release}${shared_ext}$major' 7071 soname_spec='${libname}${release}${shared_ext}$major'
7072 shlibpath_var=LIBRARY_PATH 7072 shlibpath_var=LIBRARY_PATH
7073 shlibpath_overrides_runpath=yes 7073 shlibpath_overrides_runpath=yes
@@ -7076,16 +7076,16 @@ index 3cf41b79116..e5d57f52912 100755
7076 hardcode_into_libs=yes 7076 hardcode_into_libs=yes
7077 ;; 7077 ;;
7078 7078
7079@@ -11190,7 +11845,7 @@ else 7079@@ -11181,7 +11836,7 @@ else
7080 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7080 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7081 lt_status=$lt_dlunknown 7081 lt_status=$lt_dlunknown
7082 cat > conftest.$ac_ext <<_LT_EOF 7082 cat > conftest.$ac_ext <<_LT_EOF
7083-#line 11193 "configure" 7083-#line 11184 "configure"
7084+#line $LINENO "configure" 7084+#line $LINENO "configure"
7085 #include "confdefs.h" 7085 #include "confdefs.h"
7086 7086
7087 #if HAVE_DLFCN_H 7087 #if HAVE_DLFCN_H
7088@@ -11234,10 +11889,10 @@ else 7088@@ -11225,10 +11880,10 @@ else
7089 /* When -fvisbility=hidden is used, assume the code has been annotated 7089 /* When -fvisbility=hidden is used, assume the code has been annotated
7090 correspondingly for the symbols needed. */ 7090 correspondingly for the symbols needed. */
7091 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7091 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7098,16 +7098,16 @@ index 3cf41b79116..e5d57f52912 100755
7098 int main () 7098 int main ()
7099 { 7099 {
7100 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7100 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7101@@ -11296,7 +11951,7 @@ else 7101@@ -11287,7 +11942,7 @@ else
7102 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7102 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7103 lt_status=$lt_dlunknown 7103 lt_status=$lt_dlunknown
7104 cat > conftest.$ac_ext <<_LT_EOF 7104 cat > conftest.$ac_ext <<_LT_EOF
7105-#line 11299 "configure" 7105-#line 11290 "configure"
7106+#line $LINENO "configure" 7106+#line $LINENO "configure"
7107 #include "confdefs.h" 7107 #include "confdefs.h"
7108 7108
7109 #if HAVE_DLFCN_H 7109 #if HAVE_DLFCN_H
7110@@ -11340,10 +11995,10 @@ else 7110@@ -11331,10 +11986,10 @@ else
7111 /* When -fvisbility=hidden is used, assume the code has been annotated 7111 /* When -fvisbility=hidden is used, assume the code has been annotated
7112 correspondingly for the symbols needed. */ 7112 correspondingly for the symbols needed. */
7113 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7113 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7120,7 +7120,7 @@ index 3cf41b79116..e5d57f52912 100755
7120 int main () 7120 int main ()
7121 { 7121 {
7122 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7122 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7123@@ -13309,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7123@@ -13341,13 +13996,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7124 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7124 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7125 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7125 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7126 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7126 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7141,7 +7141,7 @@ index 3cf41b79116..e5d57f52912 100755
7141 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7141 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7142 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7142 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7143 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7143 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7144@@ -13330,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7144@@ -13362,14 +14024,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7145 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7145 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7146 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7146 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7147 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"`' 7147 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"`'
@@ -7160,7 +7160,7 @@ index 3cf41b79116..e5d57f52912 100755
7160 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7160 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7161 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7161 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7162 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7162 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7163@@ -13370,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7163@@ -13402,12 +14067,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7164 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7164 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7165 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7165 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7166 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7166 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7174,7 +7174,7 @@ index 3cf41b79116..e5d57f52912 100755
7174 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7174 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7175 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7175 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7176 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7176 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7177@@ -13430,8 +14095,13 @@ reload_flag \ 7177@@ -13462,8 +14127,13 @@ reload_flag \
7178 OBJDUMP \ 7178 OBJDUMP \
7179 deplibs_check_method \ 7179 deplibs_check_method \
7180 file_magic_cmd \ 7180 file_magic_cmd \
@@ -7188,7 +7188,7 @@ index 3cf41b79116..e5d57f52912 100755
7188 STRIP \ 7188 STRIP \
7189 RANLIB \ 7189 RANLIB \
7190 CC \ 7190 CC \
7191@@ -13441,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ 7191@@ -13473,12 +14143,14 @@ lt_cv_sys_global_symbol_pipe \
7192 lt_cv_sys_global_symbol_to_cdecl \ 7192 lt_cv_sys_global_symbol_to_cdecl \
7193 lt_cv_sys_global_symbol_to_c_name_address \ 7193 lt_cv_sys_global_symbol_to_c_name_address \
7194 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7194 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7204,7 +7204,7 @@ index 3cf41b79116..e5d57f52912 100755
7204 DSYMUTIL \ 7204 DSYMUTIL \
7205 NMEDIT \ 7205 NMEDIT \
7206 LIPO \ 7206 LIPO \
7207@@ -13462,7 +14134,6 @@ no_undefined_flag \ 7207@@ -13494,7 +14166,6 @@ no_undefined_flag \
7208 hardcode_libdir_flag_spec \ 7208 hardcode_libdir_flag_spec \
7209 hardcode_libdir_flag_spec_ld \ 7209 hardcode_libdir_flag_spec_ld \
7210 hardcode_libdir_separator \ 7210 hardcode_libdir_separator \
@@ -7212,7 +7212,7 @@ index 3cf41b79116..e5d57f52912 100755
7212 exclude_expsyms \ 7212 exclude_expsyms \
7213 include_expsyms \ 7213 include_expsyms \
7214 file_list_spec \ 7214 file_list_spec \
7215@@ -13498,6 +14169,7 @@ module_cmds \ 7215@@ -13530,6 +14201,7 @@ module_cmds \
7216 module_expsym_cmds \ 7216 module_expsym_cmds \
7217 export_symbols_cmds \ 7217 export_symbols_cmds \
7218 prelink_cmds \ 7218 prelink_cmds \
@@ -7220,7 +7220,7 @@ index 3cf41b79116..e5d57f52912 100755
7220 postinstall_cmds \ 7220 postinstall_cmds \
7221 postuninstall_cmds \ 7221 postuninstall_cmds \
7222 finish_cmds \ 7222 finish_cmds \
7223@@ -14263,7 +14935,8 @@ $as_echo X"$file" | 7223@@ -14295,7 +14967,8 @@ $as_echo X"$file" |
7224 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7224 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7225 # 7225 #
7226 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7226 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7230,7 +7230,7 @@ index 3cf41b79116..e5d57f52912 100755
7230 # Written by Gordon Matzigkeit, 1996 7230 # Written by Gordon Matzigkeit, 1996
7231 # 7231 #
7232 # This file is part of GNU Libtool. 7232 # This file is part of GNU Libtool.
7233@@ -14366,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL 7233@@ -14398,19 +15071,42 @@ SP2NL=$lt_lt_SP2NL
7234 # turn newlines into spaces. 7234 # turn newlines into spaces.
7235 NL2SP=$lt_lt_NL2SP 7235 NL2SP=$lt_lt_NL2SP
7236 7236
@@ -7274,7 +7274,7 @@ index 3cf41b79116..e5d57f52912 100755
7274 # A symbol stripping program. 7274 # A symbol stripping program.
7275 STRIP=$lt_STRIP 7275 STRIP=$lt_STRIP
7276 7276
7277@@ -14408,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7277@@ -14440,6 +15136,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7278 # Transform the output of nm in a C name address pair when lib prefix is needed. 7278 # Transform the output of nm in a C name address pair when lib prefix is needed.
7279 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7279 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7280 7280
@@ -7287,7 +7287,7 @@ index 3cf41b79116..e5d57f52912 100755
7287 # The name of the directory that contains temporary libtool files. 7287 # The name of the directory that contains temporary libtool files.
7288 objdir=$objdir 7288 objdir=$objdir
7289 7289
7290@@ -14417,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD 7290@@ -14449,6 +15151,9 @@ MAGIC_CMD=$MAGIC_CMD
7291 # Must we lock files when doing compilation? 7291 # Must we lock files when doing compilation?
7292 need_locks=$lt_need_locks 7292 need_locks=$lt_need_locks
7293 7293
@@ -7297,7 +7297,7 @@ index 3cf41b79116..e5d57f52912 100755
7297 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7297 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7298 DSYMUTIL=$lt_DSYMUTIL 7298 DSYMUTIL=$lt_DSYMUTIL
7299 7299
7300@@ -14531,12 +15236,12 @@ with_gcc=$GCC 7300@@ -14563,12 +15268,12 @@ with_gcc=$GCC
7301 # Compiler flag to turn off builtin functions. 7301 # Compiler flag to turn off builtin functions.
7302 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7302 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7303 7303
@@ -7313,7 +7313,7 @@ index 3cf41b79116..e5d57f52912 100755
7313 # Compiler flag to prevent dynamic linking. 7313 # Compiler flag to prevent dynamic linking.
7314 link_static_flag=$lt_lt_prog_compiler_static 7314 link_static_flag=$lt_lt_prog_compiler_static
7315 7315
7316@@ -14623,9 +15328,6 @@ inherit_rpath=$inherit_rpath 7316@@ -14655,9 +15360,6 @@ inherit_rpath=$inherit_rpath
7317 # Whether libtool must link a program against all its dependency libraries. 7317 # Whether libtool must link a program against all its dependency libraries.
7318 link_all_deplibs=$link_all_deplibs 7318 link_all_deplibs=$link_all_deplibs
7319 7319
@@ -7323,7 +7323,7 @@ index 3cf41b79116..e5d57f52912 100755
7323 # Set to "yes" if exported symbols are required. 7323 # Set to "yes" if exported symbols are required.
7324 always_export_symbols=$always_export_symbols 7324 always_export_symbols=$always_export_symbols
7325 7325
7326@@ -14641,6 +15343,9 @@ include_expsyms=$lt_include_expsyms 7326@@ -14673,6 +15375,9 @@ include_expsyms=$lt_include_expsyms
7327 # Commands necessary for linking programs (against libraries) with templates. 7327 # Commands necessary for linking programs (against libraries) with templates.
7328 prelink_cmds=$lt_prelink_cmds 7328 prelink_cmds=$lt_prelink_cmds
7329 7329
@@ -7333,7 +7333,7 @@ index 3cf41b79116..e5d57f52912 100755
7333 # Specify filename containing input files. 7333 # Specify filename containing input files.
7334 file_list_spec=$lt_file_list_spec 7334 file_list_spec=$lt_file_list_spec
7335 7335
7336@@ -14673,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7336@@ -14705,210 +15410,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7337 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7337 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7338 # text mode, it properly converts lines to CR/LF. This bash problem 7338 # text mode, it properly converts lines to CR/LF. This bash problem
7339 # is reportedly fixed, but why not run on old versions too? 7339 # is reportedly fixed, but why not run on old versions too?
@@ -7708,10 +7708,10 @@ index 3cf41b79116..e5d57f52912 100755
7708 chmod +x "$ofile" 7708 chmod +x "$ofile"
7709 7709
7710diff --git a/ld/configure b/ld/configure 7710diff --git a/ld/configure b/ld/configure
7711index 1c872c0db5f..fe938e6c99f 100755 7711index 8355c433c76..a49ab3d1f09 100755
7712--- a/ld/configure 7712--- a/ld/configure
7713+++ b/ld/configure 7713+++ b/ld/configure
7714@@ -691,8 +691,11 @@ OTOOL 7714@@ -693,8 +693,11 @@ OTOOL
7715 LIPO 7715 LIPO
7716 NMEDIT 7716 NMEDIT
7717 DSYMUTIL 7717 DSYMUTIL
@@ -7723,7 +7723,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7723 OBJDUMP 7723 OBJDUMP
7724 LN_S 7724 LN_S
7725 NM 7725 NM
7726@@ -819,6 +822,7 @@ enable_static 7726@@ -821,6 +824,7 @@ enable_static
7727 with_pic 7727 with_pic
7728 enable_fast_install 7728 enable_fast_install
7729 with_gnu_ld 7729 with_gnu_ld
@@ -7731,7 +7731,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7731 enable_libtool_lock 7731 enable_libtool_lock
7732 enable_plugins 7732 enable_plugins
7733 enable_largefile 7733 enable_largefile
7734@@ -1520,6 +1524,8 @@ Optional Packages: 7734@@ -1526,6 +1530,8 @@ Optional Packages:
7735 --with-pic try to use only PIC/non-PIC objects [default=use 7735 --with-pic try to use only PIC/non-PIC objects [default=use
7736 both] 7736 both]
7737 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7737 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7740,7 +7740,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7740 --with-lib-path=dir1:dir2... set default LIB_PATH 7740 --with-lib-path=dir1:dir2... set default LIB_PATH
7741 --with-sysroot=DIR Search for usr/lib et al within DIR. 7741 --with-sysroot=DIR Search for usr/lib et al within DIR.
7742 --with-system-zlib use installed libz 7742 --with-system-zlib use installed libz
7743@@ -5973,8 +5979,8 @@ esac 7743@@ -5979,8 +5985,8 @@ esac
7744 7744
7745 7745
7746 7746
@@ -7751,7 +7751,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7751 7751
7752 7752
7753 7753
7754@@ -6014,7 +6020,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7754@@ -6020,7 +6026,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7756 $as_echo_n "checking how to print strings... " >&6; } 7756 $as_echo_n "checking how to print strings... " >&6; }
7757 # Test print first, because it will be a builtin if present. 7757 # Test print first, because it will be a builtin if present.
@@ -7760,7 +7760,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7760 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7760 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7761 ECHO='print -r --' 7761 ECHO='print -r --'
7762 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7762 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7763@@ -6700,8 +6706,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7763@@ -6706,8 +6712,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7764 # Try some XSI features 7764 # Try some XSI features
7765 xsi_shell=no 7765 xsi_shell=no
7766 ( _lt_dummy="a/b/c" 7766 ( _lt_dummy="a/b/c"
@@ -7771,7 +7771,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7771 && eval 'test $(( 1 + 1 )) -eq 2 \ 7771 && eval 'test $(( 1 + 1 )) -eq 2 \
7772 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7772 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7773 && xsi_shell=yes 7773 && xsi_shell=yes
7774@@ -6750,6 +6756,80 @@ esac 7774@@ -6756,6 +6762,80 @@ esac
7775 7775
7776 7776
7777 7777
@@ -7852,7 +7852,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7852 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7852 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7853 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7853 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7854 if ${lt_cv_ld_reload_flag+:} false; then : 7854 if ${lt_cv_ld_reload_flag+:} false; then :
7855@@ -6766,6 +6846,11 @@ case $reload_flag in 7855@@ -6772,6 +6852,11 @@ case $reload_flag in
7856 esac 7856 esac
7857 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7857 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7858 case $host_os in 7858 case $host_os in
@@ -7864,7 +7864,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7864 darwin*) 7864 darwin*)
7865 if test "$GCC" = yes; then 7865 if test "$GCC" = yes; then
7866 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7866 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7867@@ -6934,7 +7019,8 @@ mingw* | pw32*) 7867@@ -6940,7 +7025,8 @@ mingw* | pw32*)
7868 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7868 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7869 lt_cv_file_magic_cmd='func_win32_libid' 7869 lt_cv_file_magic_cmd='func_win32_libid'
7870 else 7870 else
@@ -7874,7 +7874,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7874 lt_cv_file_magic_cmd='$OBJDUMP -f' 7874 lt_cv_file_magic_cmd='$OBJDUMP -f'
7875 fi 7875 fi
7876 ;; 7876 ;;
7877@@ -7088,6 +7174,21 @@ esac 7877@@ -7094,6 +7180,21 @@ esac
7878 fi 7878 fi
7879 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7879 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7880 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7880 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7896,7 +7896,7 @@ index 1c872c0db5f..fe938e6c99f 100755
7896 file_magic_cmd=$lt_cv_file_magic_cmd 7896 file_magic_cmd=$lt_cv_file_magic_cmd
7897 deplibs_check_method=$lt_cv_deplibs_check_method 7897 deplibs_check_method=$lt_cv_deplibs_check_method
7898 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7898 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7899@@ -7103,9 +7204,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7899@@ -7109,9 +7210,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7900 7900
7901 7901
7902 7902
@@ -8061,7 +8061,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8061 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8061 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8062 $as_echo_n "checking for $ac_word... " >&6; } 8062 $as_echo_n "checking for $ac_word... " >&6; }
8063 if ${ac_cv_prog_AR+:} false; then : 8063 if ${ac_cv_prog_AR+:} false; then :
8064@@ -7121,7 +7375,7 @@ do 8064@@ -7127,7 +7381,7 @@ do
8065 test -z "$as_dir" && as_dir=. 8065 test -z "$as_dir" && as_dir=.
8066 for ac_exec_ext in '' $ac_executable_extensions; do 8066 for ac_exec_ext in '' $ac_executable_extensions; do
8067 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8067 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8070,7 +8070,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8070 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8070 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8071 break 2 8071 break 2
8072 fi 8072 fi
8073@@ -7141,11 +7395,15 @@ $as_echo "no" >&6; } 8073@@ -7147,11 +7401,15 @@ $as_echo "no" >&6; }
8074 fi 8074 fi
8075 8075
8076 8076
@@ -8089,7 +8089,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8089 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8089 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8090 $as_echo_n "checking for $ac_word... " >&6; } 8090 $as_echo_n "checking for $ac_word... " >&6; }
8091 if ${ac_cv_prog_ac_ct_AR+:} false; then : 8091 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8092@@ -7161,7 +7419,7 @@ do 8092@@ -7167,7 +7425,7 @@ do
8093 test -z "$as_dir" && as_dir=. 8093 test -z "$as_dir" && as_dir=.
8094 for ac_exec_ext in '' $ac_executable_extensions; do 8094 for ac_exec_ext in '' $ac_executable_extensions; do
8095 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8095 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8098,7 +8098,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8098 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8098 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8099 break 2 8099 break 2
8100 fi 8100 fi
8101@@ -7180,6 +7438,10 @@ else 8101@@ -7186,6 +7444,10 @@ else
8102 $as_echo "no" >&6; } 8102 $as_echo "no" >&6; }
8103 fi 8103 fi
8104 8104
@@ -8109,7 +8109,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8109 if test "x$ac_ct_AR" = x; then 8109 if test "x$ac_ct_AR" = x; then
8110 AR="false" 8110 AR="false"
8111 else 8111 else
8112@@ -7191,12 +7453,12 @@ ac_tool_warned=yes ;; 8112@@ -7197,12 +7459,12 @@ ac_tool_warned=yes ;;
8113 esac 8113 esac
8114 AR=$ac_ct_AR 8114 AR=$ac_ct_AR
8115 fi 8115 fi
@@ -8126,7 +8126,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8126 8126
8127 8127
8128 8128
8129@@ -7206,6 +7468,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8129@@ -7212,6 +7474,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8130 8130
8131 8131
8132 8132
@@ -8189,7 +8189,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8189 8189
8190 8190
8191 if test -n "$ac_tool_prefix"; then 8191 if test -n "$ac_tool_prefix"; then
8192@@ -7542,8 +7860,8 @@ esac 8192@@ -7548,8 +7866,8 @@ esac
8193 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8193 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8194 8194
8195 # Transform an extracted symbol line into symbol name and symbol address 8195 # Transform an extracted symbol line into symbol name and symbol address
@@ -8200,7 +8200,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8200 8200
8201 # Handle CRLF in mingw tool chain 8201 # Handle CRLF in mingw tool chain
8202 opt_cr= 8202 opt_cr=
8203@@ -7579,6 +7897,7 @@ for ac_symprfx in "" "_"; do 8203@@ -7585,6 +7903,7 @@ for ac_symprfx in "" "_"; do
8204 else 8204 else
8205 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8205 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8206 fi 8206 fi
@@ -8208,7 +8208,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8208 8208
8209 # Check to see that the pipe works correctly. 8209 # Check to see that the pipe works correctly.
8210 pipe_works=no 8210 pipe_works=no
8211@@ -7620,6 +7939,18 @@ _LT_EOF 8211@@ -7626,6 +7945,18 @@ _LT_EOF
8212 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8212 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8213 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8213 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8214 cat <<_LT_EOF > conftest.$ac_ext 8214 cat <<_LT_EOF > conftest.$ac_ext
@@ -8227,7 +8227,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8227 #ifdef __cplusplus 8227 #ifdef __cplusplus
8228 extern "C" { 8228 extern "C" {
8229 #endif 8229 #endif
8230@@ -7631,7 +7962,7 @@ _LT_EOF 8230@@ -7637,7 +7968,7 @@ _LT_EOF
8231 cat <<_LT_EOF >> conftest.$ac_ext 8231 cat <<_LT_EOF >> conftest.$ac_ext
8232 8232
8233 /* The mapping between symbol names and symbols. */ 8233 /* The mapping between symbol names and symbols. */
@@ -8236,7 +8236,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8236 const char *name; 8236 const char *name;
8237 void *address; 8237 void *address;
8238 } 8238 }
8239@@ -7657,8 +7988,8 @@ static const void *lt_preloaded_setup() { 8239@@ -7663,8 +7994,8 @@ static const void *lt_preloaded_setup() {
8240 _LT_EOF 8240 _LT_EOF
8241 # Now try linking the two files. 8241 # Now try linking the two files.
8242 mv conftest.$ac_objext conftstm.$ac_objext 8242 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8247,7 +8247,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8247 LIBS="conftstm.$ac_objext" 8247 LIBS="conftstm.$ac_objext"
8248 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8248 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8249 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8249 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8250@@ -7668,8 +7999,8 @@ _LT_EOF 8250@@ -7674,8 +8005,8 @@ _LT_EOF
8251 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8251 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8252 pipe_works=yes 8252 pipe_works=yes
8253 fi 8253 fi
@@ -8258,7 +8258,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8258 else 8258 else
8259 echo "cannot find nm_test_func in $nlist" >&5 8259 echo "cannot find nm_test_func in $nlist" >&5
8260 fi 8260 fi
8261@@ -7706,6 +8037,19 @@ else 8261@@ -7712,6 +8043,19 @@ else
8262 $as_echo "ok" >&6; } 8262 $as_echo "ok" >&6; }
8263 fi 8263 fi
8264 8264
@@ -8278,7 +8278,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8278 8278
8279 8279
8280 8280
8281@@ -7722,6 +8066,42 @@ fi 8281@@ -7728,6 +8072,42 @@ fi
8282 8282
8283 8283
8284 8284
@@ -8321,7 +8321,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8321 8321
8322 8322
8323 8323
8324@@ -7933,6 +8313,123 @@ esac 8324@@ -7939,6 +8319,123 @@ esac
8325 8325
8326 need_locks="$enable_libtool_lock" 8326 need_locks="$enable_libtool_lock"
8327 8327
@@ -8445,7 +8445,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8445 8445
8446 case $host_os in 8446 case $host_os in
8447 rhapsody* | darwin*) 8447 rhapsody* | darwin*)
8448@@ -8496,6 +8993,8 @@ _LT_EOF 8448@@ -8502,6 +8999,8 @@ _LT_EOF
8449 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8449 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8450 echo "$AR cru libconftest.a conftest.o" >&5 8450 echo "$AR cru libconftest.a conftest.o" >&5
8451 $AR cru libconftest.a conftest.o 2>&5 8451 $AR cru libconftest.a conftest.o 2>&5
@@ -8454,7 +8454,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8454 cat > conftest.c << _LT_EOF 8454 cat > conftest.c << _LT_EOF
8455 int main() { return 0;} 8455 int main() { return 0;}
8456 _LT_EOF 8456 _LT_EOF
8457@@ -8564,6 +9063,16 @@ done 8457@@ -8570,6 +9069,16 @@ done
8458 8458
8459 8459
8460 8460
@@ -8471,7 +8471,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8471 8471
8472 8472
8473 # Set options 8473 # Set options
8474@@ -8692,7 +9201,8 @@ fi 8474@@ -8698,7 +9207,8 @@ fi
8475 LIBTOOL_DEPS="$ltmain" 8475 LIBTOOL_DEPS="$ltmain"
8476 8476
8477 # Always use our own libtool. 8477 # Always use our own libtool.
@@ -8481,7 +8481,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8481 8481
8482 8482
8483 8483
8484@@ -8781,7 +9291,7 @@ aix3*) 8484@@ -8787,7 +9297,7 @@ aix3*)
8485 esac 8485 esac
8486 8486
8487 # Global variables: 8487 # Global variables:
@@ -8490,7 +8490,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8490 can_build_shared=yes 8490 can_build_shared=yes
8491 8491
8492 # All known linkers require a `.a' archive for static linking (except MSVC, 8492 # All known linkers require a `.a' archive for static linking (except MSVC,
8493@@ -9079,8 +9589,6 @@ fi 8493@@ -9085,8 +9595,6 @@ fi
8494 lt_prog_compiler_pic= 8494 lt_prog_compiler_pic=
8495 lt_prog_compiler_static= 8495 lt_prog_compiler_static=
8496 8496
@@ -8499,7 +8499,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8499 8499
8500 if test "$GCC" = yes; then 8500 if test "$GCC" = yes; then
8501 lt_prog_compiler_wl='-Wl,' 8501 lt_prog_compiler_wl='-Wl,'
8502@@ -9246,6 +9754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8502@@ -9252,6 +9760,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8503 lt_prog_compiler_pic='--shared' 8503 lt_prog_compiler_pic='--shared'
8504 lt_prog_compiler_static='--static' 8504 lt_prog_compiler_static='--static'
8505 ;; 8505 ;;
@@ -8512,7 +8512,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8512 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8512 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8513 # Portland Group compilers (*not* the Pentium gcc compiler, 8513 # Portland Group compilers (*not* the Pentium gcc compiler,
8514 # which looks to be a dead project) 8514 # which looks to be a dead project)
8515@@ -9308,7 +9822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8515@@ -9314,7 +9828,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8516 lt_prog_compiler_pic='-KPIC' 8516 lt_prog_compiler_pic='-KPIC'
8517 lt_prog_compiler_static='-Bstatic' 8517 lt_prog_compiler_static='-Bstatic'
8518 case $cc_basename in 8518 case $cc_basename in
@@ -8521,7 +8521,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8521 lt_prog_compiler_wl='-Qoption ld ';; 8521 lt_prog_compiler_wl='-Qoption ld ';;
8522 *) 8522 *)
8523 lt_prog_compiler_wl='-Wl,';; 8523 lt_prog_compiler_wl='-Wl,';;
8524@@ -9365,13 +9879,17 @@ case $host_os in 8524@@ -9371,13 +9885,17 @@ case $host_os in
8525 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8525 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8526 ;; 8526 ;;
8527 esac 8527 esac
@@ -8545,7 +8545,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8545 8545
8546 # 8546 #
8547 # Check to make sure the PIC flag actually works. 8547 # Check to make sure the PIC flag actually works.
8548@@ -9432,6 +9950,11 @@ fi 8548@@ -9438,6 +9956,11 @@ fi
8549 8549
8550 8550
8551 8551
@@ -8557,7 +8557,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8557 # 8557 #
8558 # Check to make sure the static flag actually works. 8558 # Check to make sure the static flag actually works.
8559 # 8559 #
8560@@ -9782,7 +10305,8 @@ _LT_EOF 8560@@ -9788,7 +10311,8 @@ _LT_EOF
8561 allow_undefined_flag=unsupported 8561 allow_undefined_flag=unsupported
8562 always_export_symbols=no 8562 always_export_symbols=no
8563 enable_shared_with_static_runtimes=yes 8563 enable_shared_with_static_runtimes=yes
@@ -8567,7 +8567,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8567 8567
8568 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8568 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8569 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8569 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8570@@ -9881,12 +10405,12 @@ _LT_EOF 8570@@ -9887,12 +10411,12 @@ _LT_EOF
8571 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8571 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8572 hardcode_libdir_flag_spec= 8572 hardcode_libdir_flag_spec=
8573 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8573 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8582,7 +8582,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8582 fi 8582 fi
8583 ;; 8583 ;;
8584 esac 8584 esac
8585@@ -9900,8 +10424,8 @@ _LT_EOF 8585@@ -9906,8 +10430,8 @@ _LT_EOF
8586 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8586 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8587 wlarc= 8587 wlarc=
8588 else 8588 else
@@ -8593,7 +8593,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8593 fi 8593 fi
8594 ;; 8594 ;;
8595 8595
8596@@ -9919,8 +10443,8 @@ _LT_EOF 8596@@ -9925,8 +10449,8 @@ _LT_EOF
8597 8597
8598 _LT_EOF 8598 _LT_EOF
8599 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8599 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8604,7 +8604,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8604 else 8604 else
8605 ld_shlibs=no 8605 ld_shlibs=no
8606 fi 8606 fi
8607@@ -9966,8 +10490,8 @@ _LT_EOF 8607@@ -9972,8 +10496,8 @@ _LT_EOF
8608 8608
8609 *) 8609 *)
8610 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8610 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8615,7 +8615,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8615 else 8615 else
8616 ld_shlibs=no 8616 ld_shlibs=no
8617 fi 8617 fi
8618@@ -10097,7 +10621,13 @@ _LT_EOF 8618@@ -10103,7 +10627,13 @@ _LT_EOF
8619 allow_undefined_flag='-berok' 8619 allow_undefined_flag='-berok'
8620 # Determine the default libpath from the value encoded in an 8620 # Determine the default libpath from the value encoded in an
8621 # empty executable. 8621 # empty executable.
@@ -8630,7 +8630,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8630 /* end confdefs.h. */ 8630 /* end confdefs.h. */
8631 8631
8632 int 8632 int
8633@@ -10110,22 +10640,29 @@ main () 8633@@ -10116,22 +10646,29 @@ main ()
8634 _ACEOF 8634 _ACEOF
8635 if ac_fn_c_try_link "$LINENO"; then : 8635 if ac_fn_c_try_link "$LINENO"; then :
8636 8636
@@ -8673,7 +8673,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8673 8673
8674 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8674 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8675 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" 8675 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"
8676@@ -10137,7 +10674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8676@@ -10143,7 +10680,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8677 else 8677 else
8678 # Determine the default libpath from the value encoded in an 8678 # Determine the default libpath from the value encoded in an
8679 # empty executable. 8679 # empty executable.
@@ -8688,7 +8688,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8688 /* end confdefs.h. */ 8688 /* end confdefs.h. */
8689 8689
8690 int 8690 int
8691@@ -10150,22 +10693,29 @@ main () 8691@@ -10156,22 +10699,29 @@ main ()
8692 _ACEOF 8692 _ACEOF
8693 if ac_fn_c_try_link "$LINENO"; then : 8693 if ac_fn_c_try_link "$LINENO"; then :
8694 8694
@@ -8731,7 +8731,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8731 8731
8732 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8732 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8733 # Warning - without using the other run time loading flags, 8733 # Warning - without using the other run time loading flags,
8734@@ -10209,21 +10759,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8734@@ -10215,21 +10765,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8735 # When not using gcc, we currently assume that we are using 8735 # When not using gcc, we currently assume that we are using
8736 # Microsoft Visual C++. 8736 # Microsoft Visual C++.
8737 # hardcode_libdir_flag_spec is actually meaningless, as there is 8737 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8811,7 +8811,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8811 ;; 8811 ;;
8812 8812
8813 darwin* | rhapsody*) 8813 darwin* | rhapsody*)
8814@@ -10284,7 +10877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8814@@ -10290,7 +10883,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8815 8815
8816 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8816 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8817 freebsd* | dragonfly*) 8817 freebsd* | dragonfly*)
@@ -8820,7 +8820,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8820 hardcode_libdir_flag_spec='-R$libdir' 8820 hardcode_libdir_flag_spec='-R$libdir'
8821 hardcode_direct=yes 8821 hardcode_direct=yes
8822 hardcode_shlibpath_var=no 8822 hardcode_shlibpath_var=no
8823@@ -10292,7 +10885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8823@@ -10298,7 +10891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8824 8824
8825 hpux9*) 8825 hpux9*)
8826 if test "$GCC" = yes; then 8826 if test "$GCC" = yes; then
@@ -8829,7 +8829,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8829 else 8829 else
8830 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' 8830 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'
8831 fi 8831 fi
8832@@ -10308,7 +10901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8832@@ -10314,7 +10907,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8833 8833
8834 hpux10*) 8834 hpux10*)
8835 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8835 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8838,7 +8838,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8838 else 8838 else
8839 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8839 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8840 fi 8840 fi
8841@@ -10332,10 +10925,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8841@@ -10338,10 +10931,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8842 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8842 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8843 ;; 8843 ;;
8844 ia64*) 8844 ia64*)
@@ -8851,7 +8851,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8851 ;; 8851 ;;
8852 esac 8852 esac
8853 else 8853 else
8854@@ -10414,23 +11007,36 @@ fi 8854@@ -10420,23 +11013,36 @@ fi
8855 8855
8856 irix5* | irix6* | nonstopux*) 8856 irix5* | irix6* | nonstopux*)
8857 if test "$GCC" = yes; then 8857 if test "$GCC" = yes; then
@@ -8896,7 +8896,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8896 else 8896 else
8897 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' 8897 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'
8898 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' 8898 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'
8899@@ -10515,7 +11121,7 @@ rm -f core conftest.err conftest.$ac_objext \ 8899@@ -10521,7 +11127,7 @@ rm -f core conftest.err conftest.$ac_objext \
8900 osf4* | osf5*) # as osf3* with the addition of -msym flag 8900 osf4* | osf5*) # as osf3* with the addition of -msym flag
8901 if test "$GCC" = yes; then 8901 if test "$GCC" = yes; then
8902 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8902 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8905,7 +8905,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8905 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8905 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8906 else 8906 else
8907 allow_undefined_flag=' -expect_unresolved \*' 8907 allow_undefined_flag=' -expect_unresolved \*'
8908@@ -10534,9 +11140,9 @@ rm -f core conftest.err conftest.$ac_objext \ 8908@@ -10540,9 +11146,9 @@ rm -f core conftest.err conftest.$ac_objext \
8909 no_undefined_flag=' -z defs' 8909 no_undefined_flag=' -z defs'
8910 if test "$GCC" = yes; then 8910 if test "$GCC" = yes; then
8911 wlarc='${wl}' 8911 wlarc='${wl}'
@@ -8917,7 +8917,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8917 else 8917 else
8918 case `$CC -V 2>&1` in 8918 case `$CC -V 2>&1` in
8919 *"Compilers 5.0"*) 8919 *"Compilers 5.0"*)
8920@@ -11112,8 +11718,9 @@ cygwin* | mingw* | pw32* | cegcc*) 8920@@ -11118,8 +11724,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8921 need_version=no 8921 need_version=no
8922 need_lib_prefix=no 8922 need_lib_prefix=no
8923 8923
@@ -8929,7 +8929,7 @@ index 1c872c0db5f..fe938e6c99f 100755
8929 library_names_spec='$libname.dll.a' 8929 library_names_spec='$libname.dll.a'
8930 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8930 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8931 postinstall_cmds='base_file=`basename \${file}`~ 8931 postinstall_cmds='base_file=`basename \${file}`~
8932@@ -11146,13 +11753,71 @@ cygwin* | mingw* | pw32* | cegcc*) 8932@@ -11152,13 +11759,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8933 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8933 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8934 ;; 8934 ;;
8935 esac 8935 esac
@@ -9002,7 +9002,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9002 # FIXME: first we should search . and the directory the executable is in 9002 # FIXME: first we should search . and the directory the executable is in
9003 shlibpath_var=PATH 9003 shlibpath_var=PATH
9004 ;; 9004 ;;
9005@@ -11244,7 +11909,7 @@ haiku*) 9005@@ -11240,7 +11905,7 @@ haiku*)
9006 soname_spec='${libname}${release}${shared_ext}$major' 9006 soname_spec='${libname}${release}${shared_ext}$major'
9007 shlibpath_var=LIBRARY_PATH 9007 shlibpath_var=LIBRARY_PATH
9008 shlibpath_overrides_runpath=yes 9008 shlibpath_overrides_runpath=yes
@@ -9011,16 +9011,16 @@ index 1c872c0db5f..fe938e6c99f 100755
9011 hardcode_into_libs=yes 9011 hardcode_into_libs=yes
9012 ;; 9012 ;;
9013 9013
9014@@ -12040,7 +12705,7 @@ else 9014@@ -12036,7 +12701,7 @@ else
9015 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9015 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9016 lt_status=$lt_dlunknown 9016 lt_status=$lt_dlunknown
9017 cat > conftest.$ac_ext <<_LT_EOF 9017 cat > conftest.$ac_ext <<_LT_EOF
9018-#line 12040 "configure" 9018-#line 12036 "configure"
9019+#line $LINENO "configure" 9019+#line $LINENO "configure"
9020 #include "confdefs.h" 9020 #include "confdefs.h"
9021 9021
9022 #if HAVE_DLFCN_H 9022 #if HAVE_DLFCN_H
9023@@ -12084,10 +12749,10 @@ else 9023@@ -12080,10 +12745,10 @@ else
9024 /* When -fvisbility=hidden is used, assume the code has been annotated 9024 /* When -fvisbility=hidden is used, assume the code has been annotated
9025 correspondingly for the symbols needed. */ 9025 correspondingly for the symbols needed. */
9026 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9026 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9033,16 +9033,16 @@ index 1c872c0db5f..fe938e6c99f 100755
9033 int main () 9033 int main ()
9034 { 9034 {
9035 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9035 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9036@@ -12146,7 +12811,7 @@ else 9036@@ -12142,7 +12807,7 @@ else
9037 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9037 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9038 lt_status=$lt_dlunknown 9038 lt_status=$lt_dlunknown
9039 cat > conftest.$ac_ext <<_LT_EOF 9039 cat > conftest.$ac_ext <<_LT_EOF
9040-#line 12146 "configure" 9040-#line 12142 "configure"
9041+#line $LINENO "configure" 9041+#line $LINENO "configure"
9042 #include "confdefs.h" 9042 #include "confdefs.h"
9043 9043
9044 #if HAVE_DLFCN_H 9044 #if HAVE_DLFCN_H
9045@@ -12190,10 +12855,10 @@ else 9045@@ -12186,10 +12851,10 @@ else
9046 /* When -fvisbility=hidden is used, assume the code has been annotated 9046 /* When -fvisbility=hidden is used, assume the code has been annotated
9047 correspondingly for the symbols needed. */ 9047 correspondingly for the symbols needed. */
9048 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9048 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9055,7 +9055,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9055 int main () 9055 int main ()
9056 { 9056 {
9057 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9057 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9058@@ -12585,6 +13250,7 @@ $RM -r conftest* 9058@@ -12581,6 +13246,7 @@ $RM -r conftest*
9059 9059
9060 # Allow CC to be a program name with arguments. 9060 # Allow CC to be a program name with arguments.
9061 lt_save_CC=$CC 9061 lt_save_CC=$CC
@@ -9063,7 +9063,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9063 lt_save_LD=$LD 9063 lt_save_LD=$LD
9064 lt_save_GCC=$GCC 9064 lt_save_GCC=$GCC
9065 GCC=$GXX 9065 GCC=$GXX
9066@@ -12602,6 +13268,7 @@ $RM -r conftest* 9066@@ -12598,6 +13264,7 @@ $RM -r conftest*
9067 fi 9067 fi
9068 test -z "${LDCXX+set}" || LD=$LDCXX 9068 test -z "${LDCXX+set}" || LD=$LDCXX
9069 CC=${CXX-"c++"} 9069 CC=${CXX-"c++"}
@@ -9071,7 +9071,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9071 compiler=$CC 9071 compiler=$CC
9072 compiler_CXX=$CC 9072 compiler_CXX=$CC
9073 for cc_temp in $compiler""; do 9073 for cc_temp in $compiler""; do
9074@@ -12884,7 +13551,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9074@@ -12880,7 +13547,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9075 allow_undefined_flag_CXX='-berok' 9075 allow_undefined_flag_CXX='-berok'
9076 # Determine the default libpath from the value encoded in an empty 9076 # Determine the default libpath from the value encoded in an empty
9077 # executable. 9077 # executable.
@@ -9086,7 +9086,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9086 /* end confdefs.h. */ 9086 /* end confdefs.h. */
9087 9087
9088 int 9088 int
9089@@ -12897,22 +13570,29 @@ main () 9089@@ -12893,22 +13566,29 @@ main ()
9090 _ACEOF 9090 _ACEOF
9091 if ac_fn_cxx_try_link "$LINENO"; then : 9091 if ac_fn_cxx_try_link "$LINENO"; then :
9092 9092
@@ -9129,7 +9129,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9129 9129
9130 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9130 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9131 9131
9132@@ -12925,7 +13605,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9132@@ -12921,7 +13601,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9133 else 9133 else
9134 # Determine the default libpath from the value encoded in an 9134 # Determine the default libpath from the value encoded in an
9135 # empty executable. 9135 # empty executable.
@@ -9144,7 +9144,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9144 /* end confdefs.h. */ 9144 /* end confdefs.h. */
9145 9145
9146 int 9146 int
9147@@ -12938,22 +13624,29 @@ main () 9147@@ -12934,22 +13620,29 @@ main ()
9148 _ACEOF 9148 _ACEOF
9149 if ac_fn_cxx_try_link "$LINENO"; then : 9149 if ac_fn_cxx_try_link "$LINENO"; then :
9150 9150
@@ -9187,7 +9187,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9187 9187
9188 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9188 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9189 # Warning - without using the other run time loading flags, 9189 # Warning - without using the other run time loading flags,
9190@@ -12996,29 +13689,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9190@@ -12992,29 +13685,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9191 ;; 9191 ;;
9192 9192
9193 cygwin* | mingw* | pw32* | cegcc*) 9193 cygwin* | mingw* | pw32* | cegcc*)
@@ -9286,7 +9286,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9286 darwin* | rhapsody*) 9286 darwin* | rhapsody*)
9287 9287
9288 9288
9289@@ -13124,7 +13863,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9289@@ -13120,7 +13859,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9290 ;; 9290 ;;
9291 *) 9291 *)
9292 if test "$GXX" = yes; then 9292 if test "$GXX" = yes; then
@@ -9295,7 +9295,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9295 else 9295 else
9296 # FIXME: insert proper C++ library support 9296 # FIXME: insert proper C++ library support
9297 ld_shlibs_CXX=no 9297 ld_shlibs_CXX=no
9298@@ -13195,10 +13934,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9298@@ -13191,10 +13930,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9299 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9299 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9300 ;; 9300 ;;
9301 ia64*) 9301 ia64*)
@@ -9308,7 +9308,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9308 ;; 9308 ;;
9309 esac 9309 esac
9310 fi 9310 fi
9311@@ -13239,9 +13978,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9311@@ -13235,9 +13974,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9312 *) 9312 *)
9313 if test "$GXX" = yes; then 9313 if test "$GXX" = yes; then
9314 if test "$with_gnu_ld" = no; then 9314 if test "$with_gnu_ld" = no; then
@@ -9320,7 +9320,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9320 fi 9320 fi
9321 fi 9321 fi
9322 link_all_deplibs_CXX=yes 9322 link_all_deplibs_CXX=yes
9323@@ -13311,20 +14050,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9323@@ -13307,20 +14046,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9324 prelink_cmds_CXX='tpldir=Template.dir~ 9324 prelink_cmds_CXX='tpldir=Template.dir~
9325 rm -rf $tpldir~ 9325 rm -rf $tpldir~
9326 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9326 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9345,7 +9345,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9345 ;; 9345 ;;
9346 *) # Version 6 and above use weak symbols 9346 *) # Version 6 and above use weak symbols
9347 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9347 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9348@@ -13519,7 +14258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9348@@ -13515,7 +14254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9349 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' 9349 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'
9350 ;; 9350 ;;
9351 *) 9351 *)
@@ -9354,7 +9354,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9354 ;; 9354 ;;
9355 esac 9355 esac
9356 9356
9357@@ -13565,7 +14304,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9357@@ -13561,7 +14300,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9358 9358
9359 solaris*) 9359 solaris*)
9360 case $cc_basename in 9360 case $cc_basename in
@@ -9363,7 +9363,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9363 # Sun C++ 4.2, 5.x and Centerline C++ 9363 # Sun C++ 4.2, 5.x and Centerline C++
9364 archive_cmds_need_lc_CXX=yes 9364 archive_cmds_need_lc_CXX=yes
9365 no_undefined_flag_CXX=' -zdefs' 9365 no_undefined_flag_CXX=' -zdefs'
9366@@ -13606,9 +14345,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9366@@ -13602,9 +14341,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9367 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9367 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9368 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9368 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9369 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9369 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9375,7 +9375,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9375 9375
9376 # Commands to make compiler produce verbose output that lists 9376 # Commands to make compiler produce verbose output that lists
9377 # what "hidden" libraries, object files and flags are used when 9377 # what "hidden" libraries, object files and flags are used when
9378@@ -13743,6 +14482,13 @@ private: 9378@@ -13739,6 +14478,13 @@ private:
9379 }; 9379 };
9380 _LT_EOF 9380 _LT_EOF
9381 9381
@@ -9389,7 +9389,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9389 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9389 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9390 (eval $ac_compile) 2>&5 9390 (eval $ac_compile) 2>&5
9391 ac_status=$? 9391 ac_status=$?
9392@@ -13756,7 +14502,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9392@@ -13752,7 +14498,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9393 pre_test_object_deps_done=no 9393 pre_test_object_deps_done=no
9394 9394
9395 for p in `eval "$output_verbose_link_cmd"`; do 9395 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9398,7 +9398,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9398 9398
9399 -L* | -R* | -l*) 9399 -L* | -R* | -l*)
9400 # Some compilers place space between "-{L,R}" and the path. 9400 # Some compilers place space between "-{L,R}" and the path.
9401@@ -13765,13 +14511,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9401@@ -13761,13 +14507,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9402 test $p = "-R"; then 9402 test $p = "-R"; then
9403 prev=$p 9403 prev=$p
9404 continue 9404 continue
@@ -9425,7 +9425,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9425 # Internal compiler library paths should come after those 9425 # Internal compiler library paths should come after those
9426 # provided the user. The postdeps already come after the 9426 # provided the user. The postdeps already come after the
9427 # user supplied libs so there is no need to process them. 9427 # user supplied libs so there is no need to process them.
9428@@ -13791,8 +14546,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9428@@ -13787,8 +14542,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9429 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9429 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9430 fi 9430 fi
9431 fi 9431 fi
@@ -9436,7 +9436,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9436 *.$objext) 9436 *.$objext)
9437 # This assumes that the test object file only shows up 9437 # This assumes that the test object file only shows up
9438 # once in the compiler output. 9438 # once in the compiler output.
9439@@ -13828,6 +14585,7 @@ else 9439@@ -13824,6 +14581,7 @@ else
9440 fi 9440 fi
9441 9441
9442 $RM -f confest.$objext 9442 $RM -f confest.$objext
@@ -9444,7 +9444,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9444 9444
9445 # PORTME: override above test on systems where it is broken 9445 # PORTME: override above test on systems where it is broken
9446 case $host_os in 9446 case $host_os in
9447@@ -13863,7 +14621,7 @@ linux*) 9447@@ -13859,7 +14617,7 @@ linux*)
9448 9448
9449 solaris*) 9449 solaris*)
9450 case $cc_basename in 9450 case $cc_basename in
@@ -9453,7 +9453,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9453 # The more standards-conforming stlport4 library is 9453 # The more standards-conforming stlport4 library is
9454 # incompatible with the Cstd library. Avoid specifying 9454 # incompatible with the Cstd library. Avoid specifying
9455 # it if it's in CXXFLAGS. Ignore libCrun as 9455 # it if it's in CXXFLAGS. Ignore libCrun as
9456@@ -13928,8 +14686,6 @@ fi 9456@@ -13924,8 +14682,6 @@ fi
9457 lt_prog_compiler_pic_CXX= 9457 lt_prog_compiler_pic_CXX=
9458 lt_prog_compiler_static_CXX= 9458 lt_prog_compiler_static_CXX=
9459 9459
@@ -9462,7 +9462,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9462 9462
9463 # C++ specific cases for pic, static, wl, etc. 9463 # C++ specific cases for pic, static, wl, etc.
9464 if test "$GXX" = yes; then 9464 if test "$GXX" = yes; then
9465@@ -14034,6 +14790,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9465@@ -14030,6 +14786,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9466 ;; 9466 ;;
9467 esac 9467 esac
9468 ;; 9468 ;;
@@ -9474,7 +9474,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9474 dgux*) 9474 dgux*)
9475 case $cc_basename in 9475 case $cc_basename in
9476 ec++*) 9476 ec++*)
9477@@ -14186,7 +14947,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9477@@ -14182,7 +14943,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9478 ;; 9478 ;;
9479 solaris*) 9479 solaris*)
9480 case $cc_basename in 9480 case $cc_basename in
@@ -9483,7 +9483,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9483 # Sun C++ 4.2, 5.x and Centerline C++ 9483 # Sun C++ 4.2, 5.x and Centerline C++
9484 lt_prog_compiler_pic_CXX='-KPIC' 9484 lt_prog_compiler_pic_CXX='-KPIC'
9485 lt_prog_compiler_static_CXX='-Bstatic' 9485 lt_prog_compiler_static_CXX='-Bstatic'
9486@@ -14251,10 +15012,17 @@ case $host_os in 9486@@ -14247,10 +15008,17 @@ case $host_os in
9487 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9487 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9488 ;; 9488 ;;
9489 esac 9489 esac
@@ -9504,7 +9504,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9504 9504
9505 # 9505 #
9506 # Check to make sure the PIC flag actually works. 9506 # Check to make sure the PIC flag actually works.
9507@@ -14312,6 +15080,8 @@ fi 9507@@ -14308,6 +15076,8 @@ fi
9508 9508
9509 9509
9510 9510
@@ -9513,7 +9513,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9513 # 9513 #
9514 # Check to make sure the static flag actually works. 9514 # Check to make sure the static flag actually works.
9515 # 9515 #
9516@@ -14489,6 +15259,7 @@ fi 9516@@ -14485,6 +15255,7 @@ fi
9517 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9517 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9518 9518
9519 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9519 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9521,7 +9521,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9521 case $host_os in 9521 case $host_os in
9522 aix[4-9]*) 9522 aix[4-9]*)
9523 # If we're using GNU nm, then we don't want the "-C" option. 9523 # If we're using GNU nm, then we don't want the "-C" option.
9524@@ -14503,15 +15274,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9524@@ -14499,15 +15270,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9525 ;; 9525 ;;
9526 pw32*) 9526 pw32*)
9527 export_symbols_cmds_CXX="$ltdll_cmds" 9527 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9547,7 +9547,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9547 9547
9548 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9548 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9549 $as_echo "$ld_shlibs_CXX" >&6; } 9549 $as_echo "$ld_shlibs_CXX" >&6; }
9550@@ -14774,8 +15550,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9550@@ -14770,8 +15546,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9551 need_version=no 9551 need_version=no
9552 need_lib_prefix=no 9552 need_lib_prefix=no
9553 9553
@@ -9559,7 +9559,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9559 library_names_spec='$libname.dll.a' 9559 library_names_spec='$libname.dll.a'
9560 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9560 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9561 postinstall_cmds='base_file=`basename \${file}`~ 9561 postinstall_cmds='base_file=`basename \${file}`~
9562@@ -14807,13 +15584,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9562@@ -14803,13 +15580,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9563 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9563 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9564 ;; 9564 ;;
9565 esac 9565 esac
@@ -9632,7 +9632,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9632 # FIXME: first we should search . and the directory the executable is in 9632 # FIXME: first we should search . and the directory the executable is in
9633 shlibpath_var=PATH 9633 shlibpath_var=PATH
9634 ;; 9634 ;;
9635@@ -14904,7 +15739,7 @@ haiku*) 9635@@ -14890,7 +15725,7 @@ haiku*)
9636 soname_spec='${libname}${release}${shared_ext}$major' 9636 soname_spec='${libname}${release}${shared_ext}$major'
9637 shlibpath_var=LIBRARY_PATH 9637 shlibpath_var=LIBRARY_PATH
9638 shlibpath_overrides_runpath=yes 9638 shlibpath_overrides_runpath=yes
@@ -9641,7 +9641,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9641 hardcode_into_libs=yes 9641 hardcode_into_libs=yes
9642 ;; 9642 ;;
9643 9643
9644@@ -15363,6 +16198,7 @@ fi 9644@@ -15349,6 +16184,7 @@ fi
9645 fi # test -n "$compiler" 9645 fi # test -n "$compiler"
9646 9646
9647 CC=$lt_save_CC 9647 CC=$lt_save_CC
@@ -9649,7 +9649,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9649 LDCXX=$LD 9649 LDCXX=$LD
9650 LD=$lt_save_LD 9650 LD=$lt_save_LD
9651 GCC=$lt_save_GCC 9651 GCC=$lt_save_GCC
9652@@ -18554,13 +19390,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9652@@ -18612,13 +19448,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9653 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9653 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9654 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9654 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9655 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9655 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9670,7 +9670,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9670 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9670 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9671 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9671 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9672 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9672 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9673@@ -18575,14 +19418,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9673@@ -18633,14 +19476,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9674 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9674 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9675 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9675 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9676 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"`' 9676 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"`'
@@ -9689,7 +9689,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9689 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9689 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9690 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9690 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9691 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9691 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9692@@ -18615,12 +19461,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9692@@ -18673,12 +19519,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9693 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9693 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9694 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9694 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9695 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9695 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9703,7 +9703,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9703 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9703 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9704 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9704 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9705 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9705 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9706@@ -18659,8 +19505,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9706@@ -18717,8 +19563,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9707 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9707 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9708 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9708 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9709 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9709 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9713,7 +9713,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9713 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9713 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9714 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9714 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9715 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9715 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9716@@ -18687,12 +19533,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9716@@ -18745,12 +19591,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9717 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9717 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9718 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9718 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9719 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9719 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9727,7 +9727,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9727 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9727 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9728 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9728 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9729 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9729 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9730@@ -18730,8 +19576,13 @@ reload_flag \ 9730@@ -18788,8 +19634,13 @@ reload_flag \
9731 OBJDUMP \ 9731 OBJDUMP \
9732 deplibs_check_method \ 9732 deplibs_check_method \
9733 file_magic_cmd \ 9733 file_magic_cmd \
@@ -9741,7 +9741,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9741 STRIP \ 9741 STRIP \
9742 RANLIB \ 9742 RANLIB \
9743 CC \ 9743 CC \
9744@@ -18741,12 +19592,14 @@ lt_cv_sys_global_symbol_pipe \ 9744@@ -18799,12 +19650,14 @@ lt_cv_sys_global_symbol_pipe \
9745 lt_cv_sys_global_symbol_to_cdecl \ 9745 lt_cv_sys_global_symbol_to_cdecl \
9746 lt_cv_sys_global_symbol_to_c_name_address \ 9746 lt_cv_sys_global_symbol_to_c_name_address \
9747 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9747 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9757,7 +9757,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9757 DSYMUTIL \ 9757 DSYMUTIL \
9758 NMEDIT \ 9758 NMEDIT \
9759 LIPO \ 9759 LIPO \
9760@@ -18762,7 +19615,6 @@ no_undefined_flag \ 9760@@ -18820,7 +19673,6 @@ no_undefined_flag \
9761 hardcode_libdir_flag_spec \ 9761 hardcode_libdir_flag_spec \
9762 hardcode_libdir_flag_spec_ld \ 9762 hardcode_libdir_flag_spec_ld \
9763 hardcode_libdir_separator \ 9763 hardcode_libdir_separator \
@@ -9765,7 +9765,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9765 exclude_expsyms \ 9765 exclude_expsyms \
9766 include_expsyms \ 9766 include_expsyms \
9767 file_list_spec \ 9767 file_list_spec \
9768@@ -18784,8 +19636,8 @@ LD_CXX \ 9768@@ -18842,8 +19694,8 @@ LD_CXX \
9769 reload_flag_CXX \ 9769 reload_flag_CXX \
9770 compiler_CXX \ 9770 compiler_CXX \
9771 lt_prog_compiler_no_builtin_flag_CXX \ 9771 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9775,7 +9775,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9775 lt_prog_compiler_static_CXX \ 9775 lt_prog_compiler_static_CXX \
9776 lt_cv_prog_compiler_c_o_CXX \ 9776 lt_cv_prog_compiler_c_o_CXX \
9777 export_dynamic_flag_spec_CXX \ 9777 export_dynamic_flag_spec_CXX \
9778@@ -18797,7 +19649,6 @@ no_undefined_flag_CXX \ 9778@@ -18855,7 +19707,6 @@ no_undefined_flag_CXX \
9779 hardcode_libdir_flag_spec_CXX \ 9779 hardcode_libdir_flag_spec_CXX \
9780 hardcode_libdir_flag_spec_ld_CXX \ 9780 hardcode_libdir_flag_spec_ld_CXX \
9781 hardcode_libdir_separator_CXX \ 9781 hardcode_libdir_separator_CXX \
@@ -9783,7 +9783,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9783 exclude_expsyms_CXX \ 9783 exclude_expsyms_CXX \
9784 include_expsyms_CXX \ 9784 include_expsyms_CXX \
9785 file_list_spec_CXX \ 9785 file_list_spec_CXX \
9786@@ -18831,6 +19682,7 @@ module_cmds \ 9786@@ -18889,6 +19740,7 @@ module_cmds \
9787 module_expsym_cmds \ 9787 module_expsym_cmds \
9788 export_symbols_cmds \ 9788 export_symbols_cmds \
9789 prelink_cmds \ 9789 prelink_cmds \
@@ -9791,7 +9791,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9791 postinstall_cmds \ 9791 postinstall_cmds \
9792 postuninstall_cmds \ 9792 postuninstall_cmds \
9793 finish_cmds \ 9793 finish_cmds \
9794@@ -18845,7 +19697,8 @@ archive_expsym_cmds_CXX \ 9794@@ -18903,7 +19755,8 @@ archive_expsym_cmds_CXX \
9795 module_cmds_CXX \ 9795 module_cmds_CXX \
9796 module_expsym_cmds_CXX \ 9796 module_expsym_cmds_CXX \
9797 export_symbols_cmds_CXX \ 9797 export_symbols_cmds_CXX \
@@ -9801,7 +9801,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9801 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9801 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9802 *[\\\\\\\`\\"\\\$]*) 9802 *[\\\\\\\`\\"\\\$]*)
9803 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9803 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9804@@ -19610,7 +20463,8 @@ $as_echo X"$file" | 9804@@ -19668,7 +20521,8 @@ $as_echo X"$file" |
9805 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9805 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9806 # 9806 #
9807 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9807 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9811,7 +9811,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9811 # Written by Gordon Matzigkeit, 1996 9811 # Written by Gordon Matzigkeit, 1996
9812 # 9812 #
9813 # This file is part of GNU Libtool. 9813 # This file is part of GNU Libtool.
9814@@ -19713,19 +20567,42 @@ SP2NL=$lt_lt_SP2NL 9814@@ -19771,19 +20625,42 @@ SP2NL=$lt_lt_SP2NL
9815 # turn newlines into spaces. 9815 # turn newlines into spaces.
9816 NL2SP=$lt_lt_NL2SP 9816 NL2SP=$lt_lt_NL2SP
9817 9817
@@ -9855,7 +9855,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9855 # A symbol stripping program. 9855 # A symbol stripping program.
9856 STRIP=$lt_STRIP 9856 STRIP=$lt_STRIP
9857 9857
9858@@ -19755,6 +20632,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9858@@ -19813,6 +20690,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9859 # Transform the output of nm in a C name address pair when lib prefix is needed. 9859 # Transform the output of nm in a C name address pair when lib prefix is needed.
9860 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9860 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9861 9861
@@ -9868,7 +9868,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9868 # The name of the directory that contains temporary libtool files. 9868 # The name of the directory that contains temporary libtool files.
9869 objdir=$objdir 9869 objdir=$objdir
9870 9870
9871@@ -19764,6 +20647,9 @@ MAGIC_CMD=$MAGIC_CMD 9871@@ -19822,6 +20705,9 @@ MAGIC_CMD=$MAGIC_CMD
9872 # Must we lock files when doing compilation? 9872 # Must we lock files when doing compilation?
9873 need_locks=$lt_need_locks 9873 need_locks=$lt_need_locks
9874 9874
@@ -9878,7 +9878,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9878 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9878 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9879 DSYMUTIL=$lt_DSYMUTIL 9879 DSYMUTIL=$lt_DSYMUTIL
9880 9880
9881@@ -19878,12 +20764,12 @@ with_gcc=$GCC 9881@@ -19936,12 +20822,12 @@ with_gcc=$GCC
9882 # Compiler flag to turn off builtin functions. 9882 # Compiler flag to turn off builtin functions.
9883 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9883 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9884 9884
@@ -9894,7 +9894,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9894 # Compiler flag to prevent dynamic linking. 9894 # Compiler flag to prevent dynamic linking.
9895 link_static_flag=$lt_lt_prog_compiler_static 9895 link_static_flag=$lt_lt_prog_compiler_static
9896 9896
9897@@ -19970,9 +20856,6 @@ inherit_rpath=$inherit_rpath 9897@@ -20028,9 +20914,6 @@ inherit_rpath=$inherit_rpath
9898 # Whether libtool must link a program against all its dependency libraries. 9898 # Whether libtool must link a program against all its dependency libraries.
9899 link_all_deplibs=$link_all_deplibs 9899 link_all_deplibs=$link_all_deplibs
9900 9900
@@ -9904,7 +9904,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9904 # Set to "yes" if exported symbols are required. 9904 # Set to "yes" if exported symbols are required.
9905 always_export_symbols=$always_export_symbols 9905 always_export_symbols=$always_export_symbols
9906 9906
9907@@ -19988,6 +20871,9 @@ include_expsyms=$lt_include_expsyms 9907@@ -20046,6 +20929,9 @@ include_expsyms=$lt_include_expsyms
9908 # Commands necessary for linking programs (against libraries) with templates. 9908 # Commands necessary for linking programs (against libraries) with templates.
9909 prelink_cmds=$lt_prelink_cmds 9909 prelink_cmds=$lt_prelink_cmds
9910 9910
@@ -9914,7 +9914,7 @@ index 1c872c0db5f..fe938e6c99f 100755
9914 # Specify filename containing input files. 9914 # Specify filename containing input files.
9915 file_list_spec=$lt_file_list_spec 9915 file_list_spec=$lt_file_list_spec
9916 9916
9917@@ -20034,210 +20920,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 9917@@ -20092,210 +20978,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9918 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9918 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9919 # text mode, it properly converts lines to CR/LF. This bash problem 9919 # text mode, it properly converts lines to CR/LF. This bash problem
9920 # is reportedly fixed, but why not run on old versions too? 9920 # is reportedly fixed, but why not run on old versions too?
@@ -10288,7 +10288,7 @@ index 1c872c0db5f..fe938e6c99f 100755
10288 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10288 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10289 chmod +x "$ofile" 10289 chmod +x "$ofile"
10290 10290
10291@@ -20265,12 +21110,12 @@ with_gcc=$GCC_CXX 10291@@ -20323,12 +21168,12 @@ with_gcc=$GCC_CXX
10292 # Compiler flag to turn off builtin functions. 10292 # Compiler flag to turn off builtin functions.
10293 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10293 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10294 10294
@@ -10304,7 +10304,7 @@ index 1c872c0db5f..fe938e6c99f 100755
10304 # Compiler flag to prevent dynamic linking. 10304 # Compiler flag to prevent dynamic linking.
10305 link_static_flag=$lt_lt_prog_compiler_static_CXX 10305 link_static_flag=$lt_lt_prog_compiler_static_CXX
10306 10306
10307@@ -20357,9 +21202,6 @@ inherit_rpath=$inherit_rpath_CXX 10307@@ -20415,9 +21260,6 @@ inherit_rpath=$inherit_rpath_CXX
10308 # Whether libtool must link a program against all its dependency libraries. 10308 # Whether libtool must link a program against all its dependency libraries.
10309 link_all_deplibs=$link_all_deplibs_CXX 10309 link_all_deplibs=$link_all_deplibs_CXX
10310 10310
@@ -10314,7 +10314,7 @@ index 1c872c0db5f..fe938e6c99f 100755
10314 # Set to "yes" if exported symbols are required. 10314 # Set to "yes" if exported symbols are required.
10315 always_export_symbols=$always_export_symbols_CXX 10315 always_export_symbols=$always_export_symbols_CXX
10316 10316
10317@@ -20375,6 +21217,9 @@ include_expsyms=$lt_include_expsyms_CXX 10317@@ -20433,6 +21275,9 @@ include_expsyms=$lt_include_expsyms_CXX
10318 # Commands necessary for linking programs (against libraries) with templates. 10318 # Commands necessary for linking programs (against libraries) with templates.
10319 prelink_cmds=$lt_prelink_cmds_CXX 10319 prelink_cmds=$lt_prelink_cmds_CXX
10320 10320
@@ -10325,7 +10325,7 @@ index 1c872c0db5f..fe938e6c99f 100755
10325 file_list_spec=$lt_file_list_spec_CXX 10325 file_list_spec=$lt_file_list_spec_CXX
10326 10326
10327diff --git a/libctf/configure b/libctf/configure 10327diff --git a/libctf/configure b/libctf/configure
10328index 1dc1b65fac3..c5c2f36bbc0 100755 10328index 6b294bfebfb..52a025bb848 100755
10329--- a/libctf/configure 10329--- a/libctf/configure
10330+++ b/libctf/configure 10330+++ b/libctf/configure
10331@@ -663,6 +663,8 @@ OTOOL 10331@@ -663,6 +663,8 @@ OTOOL
@@ -10345,7 +10345,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10345 enable_libtool_lock 10345 enable_libtool_lock
10346 enable_largefile 10346 enable_largefile
10347 enable_werror_always 10347 enable_werror_always
10348@@ -1448,6 +1451,8 @@ Optional Packages: 10348@@ -1452,6 +1455,8 @@ Optional Packages:
10349 --with-pic try to use only PIC/non-PIC objects [default=use 10349 --with-pic try to use only PIC/non-PIC objects [default=use
10350 both] 10350 both]
10351 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 10351 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -10354,7 +10354,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10354 --with-system-zlib use installed libz 10354 --with-system-zlib use installed libz
10355 10355
10356 Some influential environment variables: 10356 Some influential environment variables:
10357@@ -5406,8 +5411,8 @@ esac 10357@@ -5411,8 +5416,8 @@ esac
10358 10358
10359 10359
10360 10360
@@ -10365,7 +10365,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10365 10365
10366 10366
10367 10367
10368@@ -5518,7 +5523,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 10368@@ -5523,7 +5528,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10369 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 10369 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
10370 $as_echo_n "checking how to print strings... " >&6; } 10370 $as_echo_n "checking how to print strings... " >&6; }
10371 # Test print first, because it will be a builtin if present. 10371 # Test print first, because it will be a builtin if present.
@@ -10374,7 +10374,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10374 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 10374 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10375 ECHO='print -r --' 10375 ECHO='print -r --'
10376 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 10376 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10377@@ -6204,8 +6209,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 10377@@ -6209,8 +6214,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10378 # Try some XSI features 10378 # Try some XSI features
10379 xsi_shell=no 10379 xsi_shell=no
10380 ( _lt_dummy="a/b/c" 10380 ( _lt_dummy="a/b/c"
@@ -10385,7 +10385,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10385 && eval 'test $(( 1 + 1 )) -eq 2 \ 10385 && eval 'test $(( 1 + 1 )) -eq 2 \
10386 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 10386 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
10387 && xsi_shell=yes 10387 && xsi_shell=yes
10388@@ -6254,6 +6259,80 @@ esac 10388@@ -6259,6 +6264,80 @@ esac
10389 10389
10390 10390
10391 10391
@@ -10466,7 +10466,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10466 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 10466 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
10467 $as_echo_n "checking for $LD option to reload object files... " >&6; } 10467 $as_echo_n "checking for $LD option to reload object files... " >&6; }
10468 if ${lt_cv_ld_reload_flag+:} false; then : 10468 if ${lt_cv_ld_reload_flag+:} false; then :
10469@@ -6270,6 +6349,11 @@ case $reload_flag in 10469@@ -6275,6 +6354,11 @@ case $reload_flag in
10470 esac 10470 esac
10471 reload_cmds='$LD$reload_flag -o $output$reload_objs' 10471 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10472 case $host_os in 10472 case $host_os in
@@ -10478,7 +10478,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10478 darwin*) 10478 darwin*)
10479 if test "$GCC" = yes; then 10479 if test "$GCC" = yes; then
10480 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 10480 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10481@@ -6438,7 +6522,8 @@ mingw* | pw32*) 10481@@ -6443,7 +6527,8 @@ mingw* | pw32*)
10482 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 10482 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10483 lt_cv_file_magic_cmd='func_win32_libid' 10483 lt_cv_file_magic_cmd='func_win32_libid'
10484 else 10484 else
@@ -10488,7 +10488,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10488 lt_cv_file_magic_cmd='$OBJDUMP -f' 10488 lt_cv_file_magic_cmd='$OBJDUMP -f'
10489 fi 10489 fi
10490 ;; 10490 ;;
10491@@ -6592,6 +6677,21 @@ esac 10491@@ -6597,6 +6682,21 @@ esac
10492 fi 10492 fi
10493 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 10493 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10494 $as_echo "$lt_cv_deplibs_check_method" >&6; } 10494 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -10510,7 +10510,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10510 file_magic_cmd=$lt_cv_file_magic_cmd 10510 file_magic_cmd=$lt_cv_file_magic_cmd
10511 deplibs_check_method=$lt_cv_deplibs_check_method 10511 deplibs_check_method=$lt_cv_deplibs_check_method
10512 test -z "$deplibs_check_method" && deplibs_check_method=unknown 10512 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10513@@ -6607,9 +6707,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 10513@@ -6612,9 +6712,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10514 10514
10515 10515
10516 10516
@@ -10675,7 +10675,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10676 $as_echo_n "checking for $ac_word... " >&6; } 10676 $as_echo_n "checking for $ac_word... " >&6; }
10677 if ${ac_cv_prog_AR+:} false; then : 10677 if ${ac_cv_prog_AR+:} false; then :
10678@@ -6625,7 +6878,7 @@ do 10678@@ -6630,7 +6883,7 @@ do
10679 test -z "$as_dir" && as_dir=. 10679 test -z "$as_dir" && as_dir=.
10680 for ac_exec_ext in '' $ac_executable_extensions; do 10680 for ac_exec_ext in '' $ac_executable_extensions; do
10681 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10681 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10684,7 +10684,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10684 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10684 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10685 break 2 10685 break 2
10686 fi 10686 fi
10687@@ -6645,11 +6898,15 @@ $as_echo "no" >&6; } 10687@@ -6650,11 +6903,15 @@ $as_echo "no" >&6; }
10688 fi 10688 fi
10689 10689
10690 10690
@@ -10703,7 +10703,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10704 $as_echo_n "checking for $ac_word... " >&6; } 10704 $as_echo_n "checking for $ac_word... " >&6; }
10705 if ${ac_cv_prog_ac_ct_AR+:} false; then : 10705 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10706@@ -6665,7 +6922,7 @@ do 10706@@ -6670,7 +6927,7 @@ do
10707 test -z "$as_dir" && as_dir=. 10707 test -z "$as_dir" && as_dir=.
10708 for ac_exec_ext in '' $ac_executable_extensions; do 10708 for ac_exec_ext in '' $ac_executable_extensions; do
10709 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10709 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10712,7 +10712,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10712 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10712 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10713 break 2 10713 break 2
10714 fi 10714 fi
10715@@ -6684,6 +6941,10 @@ else 10715@@ -6689,6 +6946,10 @@ else
10716 $as_echo "no" >&6; } 10716 $as_echo "no" >&6; }
10717 fi 10717 fi
10718 10718
@@ -10723,7 +10723,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10723 if test "x$ac_ct_AR" = x; then 10723 if test "x$ac_ct_AR" = x; then
10724 AR="false" 10724 AR="false"
10725 else 10725 else
10726@@ -6695,16 +6956,72 @@ ac_tool_warned=yes ;; 10726@@ -6700,16 +6961,72 @@ ac_tool_warned=yes ;;
10727 esac 10727 esac
10728 AR=$ac_ct_AR 10728 AR=$ac_ct_AR
10729 fi 10729 fi
@@ -10800,7 +10800,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10800 10800
10801 10801
10802 10802
10803@@ -7046,8 +7363,8 @@ esac 10803@@ -7051,8 +7368,8 @@ esac
10804 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 10804 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10805 10805
10806 # Transform an extracted symbol line into symbol name and symbol address 10806 # Transform an extracted symbol line into symbol name and symbol address
@@ -10811,7 +10811,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10811 10811
10812 # Handle CRLF in mingw tool chain 10812 # Handle CRLF in mingw tool chain
10813 opt_cr= 10813 opt_cr=
10814@@ -7083,6 +7400,7 @@ for ac_symprfx in "" "_"; do 10814@@ -7088,6 +7405,7 @@ for ac_symprfx in "" "_"; do
10815 else 10815 else
10816 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 10816 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10817 fi 10817 fi
@@ -10819,7 +10819,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10819 10819
10820 # Check to see that the pipe works correctly. 10820 # Check to see that the pipe works correctly.
10821 pipe_works=no 10821 pipe_works=no
10822@@ -7124,6 +7442,18 @@ _LT_EOF 10822@@ -7129,6 +7447,18 @@ _LT_EOF
10823 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 10823 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10824 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 10824 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10825 cat <<_LT_EOF > conftest.$ac_ext 10825 cat <<_LT_EOF > conftest.$ac_ext
@@ -10838,7 +10838,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10838 #ifdef __cplusplus 10838 #ifdef __cplusplus
10839 extern "C" { 10839 extern "C" {
10840 #endif 10840 #endif
10841@@ -7135,7 +7465,7 @@ _LT_EOF 10841@@ -7140,7 +7470,7 @@ _LT_EOF
10842 cat <<_LT_EOF >> conftest.$ac_ext 10842 cat <<_LT_EOF >> conftest.$ac_ext
10843 10843
10844 /* The mapping between symbol names and symbols. */ 10844 /* The mapping between symbol names and symbols. */
@@ -10847,7 +10847,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10847 const char *name; 10847 const char *name;
10848 void *address; 10848 void *address;
10849 } 10849 }
10850@@ -7161,8 +7491,8 @@ static const void *lt_preloaded_setup() { 10850@@ -7166,8 +7496,8 @@ static const void *lt_preloaded_setup() {
10851 _LT_EOF 10851 _LT_EOF
10852 # Now try linking the two files. 10852 # Now try linking the two files.
10853 mv conftest.$ac_objext conftstm.$ac_objext 10853 mv conftest.$ac_objext conftstm.$ac_objext
@@ -10858,7 +10858,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10858 LIBS="conftstm.$ac_objext" 10858 LIBS="conftstm.$ac_objext"
10859 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 10859 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
10860 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 10860 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
10861@@ -7172,8 +7502,8 @@ _LT_EOF 10861@@ -7177,8 +7507,8 @@ _LT_EOF
10862 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 10862 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
10863 pipe_works=yes 10863 pipe_works=yes
10864 fi 10864 fi
@@ -10869,7 +10869,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10869 else 10869 else
10870 echo "cannot find nm_test_func in $nlist" >&5 10870 echo "cannot find nm_test_func in $nlist" >&5
10871 fi 10871 fi
10872@@ -7210,6 +7540,16 @@ else 10872@@ -7215,6 +7545,16 @@ else
10873 $as_echo "ok" >&6; } 10873 $as_echo "ok" >&6; }
10874 fi 10874 fi
10875 10875
@@ -10886,7 +10886,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10886 10886
10887 10887
10888 10888
10889@@ -7226,6 +7566,45 @@ fi 10889@@ -7231,6 +7571,45 @@ fi
10890 10890
10891 10891
10892 10892
@@ -10932,7 +10932,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
10932 10932
10933 10933
10934 10934
10935@@ -7437,6 +7816,123 @@ esac 10935@@ -7442,6 +7821,123 @@ esac
10936 10936
10937 need_locks="$enable_libtool_lock" 10937 need_locks="$enable_libtool_lock"
10938 10938
@@ -11056,7 +11056,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11056 11056
11057 case $host_os in 11057 case $host_os in
11058 rhapsody* | darwin*) 11058 rhapsody* | darwin*)
11059@@ -8000,6 +8496,8 @@ _LT_EOF 11059@@ -8005,6 +8501,8 @@ _LT_EOF
11060 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 11060 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11061 echo "$AR cru libconftest.a conftest.o" >&5 11061 echo "$AR cru libconftest.a conftest.o" >&5
11062 $AR cru libconftest.a conftest.o 2>&5 11062 $AR cru libconftest.a conftest.o 2>&5
@@ -11065,7 +11065,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11065 cat > conftest.c << _LT_EOF 11065 cat > conftest.c << _LT_EOF
11066 int main() { return 0;} 11066 int main() { return 0;}
11067 _LT_EOF 11067 _LT_EOF
11068@@ -8165,7 +8663,8 @@ fi 11068@@ -8170,7 +8668,8 @@ fi
11069 LIBTOOL_DEPS="$ltmain" 11069 LIBTOOL_DEPS="$ltmain"
11070 11070
11071 # Always use our own libtool. 11071 # Always use our own libtool.
@@ -11075,7 +11075,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11075 11075
11076 11076
11077 11077
11078@@ -8254,7 +8753,7 @@ aix3*) 11078@@ -8259,7 +8758,7 @@ aix3*)
11079 esac 11079 esac
11080 11080
11081 # Global variables: 11081 # Global variables:
@@ -11084,7 +11084,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11084 can_build_shared=yes 11084 can_build_shared=yes
11085 11085
11086 # All known linkers require a `.a' archive for static linking (except MSVC, 11086 # All known linkers require a `.a' archive for static linking (except MSVC,
11087@@ -8552,8 +9051,6 @@ fi 11087@@ -8557,8 +9056,6 @@ fi
11088 lt_prog_compiler_pic= 11088 lt_prog_compiler_pic=
11089 lt_prog_compiler_static= 11089 lt_prog_compiler_static=
11090 11090
@@ -11093,7 +11093,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11093 11093
11094 if test "$GCC" = yes; then 11094 if test "$GCC" = yes; then
11095 lt_prog_compiler_wl='-Wl,' 11095 lt_prog_compiler_wl='-Wl,'
11096@@ -8719,6 +9216,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11096@@ -8724,6 +9221,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11097 lt_prog_compiler_pic='--shared' 11097 lt_prog_compiler_pic='--shared'
11098 lt_prog_compiler_static='--static' 11098 lt_prog_compiler_static='--static'
11099 ;; 11099 ;;
@@ -11106,7 +11106,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11106 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 11106 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11107 # Portland Group compilers (*not* the Pentium gcc compiler, 11107 # Portland Group compilers (*not* the Pentium gcc compiler,
11108 # which looks to be a dead project) 11108 # which looks to be a dead project)
11109@@ -8781,7 +9284,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11109@@ -8786,7 +9289,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11110 lt_prog_compiler_pic='-KPIC' 11110 lt_prog_compiler_pic='-KPIC'
11111 lt_prog_compiler_static='-Bstatic' 11111 lt_prog_compiler_static='-Bstatic'
11112 case $cc_basename in 11112 case $cc_basename in
@@ -11115,7 +11115,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11115 lt_prog_compiler_wl='-Qoption ld ';; 11115 lt_prog_compiler_wl='-Qoption ld ';;
11116 *) 11116 *)
11117 lt_prog_compiler_wl='-Wl,';; 11117 lt_prog_compiler_wl='-Wl,';;
11118@@ -8838,13 +9341,17 @@ case $host_os in 11118@@ -8843,13 +9346,17 @@ case $host_os in
11119 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 11119 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11120 ;; 11120 ;;
11121 esac 11121 esac
@@ -11139,7 +11139,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11139 11139
11140 # 11140 #
11141 # Check to make sure the PIC flag actually works. 11141 # Check to make sure the PIC flag actually works.
11142@@ -8905,6 +9412,11 @@ fi 11142@@ -8910,6 +9417,11 @@ fi
11143 11143
11144 11144
11145 11145
@@ -11151,7 +11151,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11151 # 11151 #
11152 # Check to make sure the static flag actually works. 11152 # Check to make sure the static flag actually works.
11153 # 11153 #
11154@@ -9255,7 +9767,8 @@ _LT_EOF 11154@@ -9260,7 +9772,8 @@ _LT_EOF
11155 allow_undefined_flag=unsupported 11155 allow_undefined_flag=unsupported
11156 always_export_symbols=no 11156 always_export_symbols=no
11157 enable_shared_with_static_runtimes=yes 11157 enable_shared_with_static_runtimes=yes
@@ -11161,7 +11161,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11161 11161
11162 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 11162 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11163 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 11163 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11164@@ -9354,12 +9867,12 @@ _LT_EOF 11164@@ -9359,12 +9872,12 @@ _LT_EOF
11165 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 11165 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11166 hardcode_libdir_flag_spec= 11166 hardcode_libdir_flag_spec=
11167 hardcode_libdir_flag_spec_ld='-rpath $libdir' 11167 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -11176,7 +11176,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11176 fi 11176 fi
11177 ;; 11177 ;;
11178 esac 11178 esac
11179@@ -9373,8 +9886,8 @@ _LT_EOF 11179@@ -9378,8 +9891,8 @@ _LT_EOF
11180 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 11180 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11181 wlarc= 11181 wlarc=
11182 else 11182 else
@@ -11187,7 +11187,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11187 fi 11187 fi
11188 ;; 11188 ;;
11189 11189
11190@@ -9392,8 +9905,8 @@ _LT_EOF 11190@@ -9397,8 +9910,8 @@ _LT_EOF
11191 11191
11192 _LT_EOF 11192 _LT_EOF
11193 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11193 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11198,7 +11198,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11198 else 11198 else
11199 ld_shlibs=no 11199 ld_shlibs=no
11200 fi 11200 fi
11201@@ -9439,8 +9952,8 @@ _LT_EOF 11201@@ -9444,8 +9957,8 @@ _LT_EOF
11202 11202
11203 *) 11203 *)
11204 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11204 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11209,7 +11209,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11209 else 11209 else
11210 ld_shlibs=no 11210 ld_shlibs=no
11211 fi 11211 fi
11212@@ -9570,7 +10083,13 @@ _LT_EOF 11212@@ -9575,7 +10088,13 @@ _LT_EOF
11213 allow_undefined_flag='-berok' 11213 allow_undefined_flag='-berok'
11214 # Determine the default libpath from the value encoded in an 11214 # Determine the default libpath from the value encoded in an
11215 # empty executable. 11215 # empty executable.
@@ -11224,7 +11224,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11224 /* end confdefs.h. */ 11224 /* end confdefs.h. */
11225 11225
11226 int 11226 int
11227@@ -9583,22 +10102,29 @@ main () 11227@@ -9588,22 +10107,29 @@ main ()
11228 _ACEOF 11228 _ACEOF
11229 if ac_fn_c_try_link "$LINENO"; then : 11229 if ac_fn_c_try_link "$LINENO"; then :
11230 11230
@@ -11267,7 +11267,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11267 11267
11268 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11268 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11269 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" 11269 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"
11270@@ -9610,7 +10136,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11270@@ -9615,7 +10141,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11271 else 11271 else
11272 # Determine the default libpath from the value encoded in an 11272 # Determine the default libpath from the value encoded in an
11273 # empty executable. 11273 # empty executable.
@@ -11282,7 +11282,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11282 /* end confdefs.h. */ 11282 /* end confdefs.h. */
11283 11283
11284 int 11284 int
11285@@ -9623,22 +10155,29 @@ main () 11285@@ -9628,22 +10160,29 @@ main ()
11286 _ACEOF 11286 _ACEOF
11287 if ac_fn_c_try_link "$LINENO"; then : 11287 if ac_fn_c_try_link "$LINENO"; then :
11288 11288
@@ -11325,7 +11325,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11325 11325
11326 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11326 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11327 # Warning - without using the other run time loading flags, 11327 # Warning - without using the other run time loading flags,
11328@@ -9683,20 +10222,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11328@@ -9688,20 +10227,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11329 # Microsoft Visual C++. 11329 # Microsoft Visual C++.
11330 # hardcode_libdir_flag_spec is actually meaningless, as there is 11330 # hardcode_libdir_flag_spec is actually meaningless, as there is
11331 # no search path for DLLs. 11331 # no search path for DLLs.
@@ -11403,7 +11403,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11403 ;; 11403 ;;
11404 11404
11405 darwin* | rhapsody*) 11405 darwin* | rhapsody*)
11406@@ -9757,7 +10339,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11406@@ -9762,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11407 11407
11408 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 11408 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11409 freebsd* | dragonfly*) 11409 freebsd* | dragonfly*)
@@ -11412,7 +11412,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11412 hardcode_libdir_flag_spec='-R$libdir' 11412 hardcode_libdir_flag_spec='-R$libdir'
11413 hardcode_direct=yes 11413 hardcode_direct=yes
11414 hardcode_shlibpath_var=no 11414 hardcode_shlibpath_var=no
11415@@ -9765,7 +10347,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11415@@ -9770,7 +10352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11416 11416
11417 hpux9*) 11417 hpux9*)
11418 if test "$GCC" = yes; then 11418 if test "$GCC" = yes; then
@@ -11421,7 +11421,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11421 else 11421 else
11422 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' 11422 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'
11423 fi 11423 fi
11424@@ -9781,7 +10363,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11424@@ -9786,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11425 11425
11426 hpux10*) 11426 hpux10*)
11427 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 11427 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -11430,7 +11430,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11430 else 11430 else
11431 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 11431 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11432 fi 11432 fi
11433@@ -9805,10 +10387,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11433@@ -9810,10 +10392,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11434 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11434 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11435 ;; 11435 ;;
11436 ia64*) 11436 ia64*)
@@ -11443,7 +11443,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11443 ;; 11443 ;;
11444 esac 11444 esac
11445 else 11445 else
11446@@ -9887,23 +10469,36 @@ fi 11446@@ -9892,23 +10474,36 @@ fi
11447 11447
11448 irix5* | irix6* | nonstopux*) 11448 irix5* | irix6* | nonstopux*)
11449 if test "$GCC" = yes; then 11449 if test "$GCC" = yes; then
@@ -11488,7 +11488,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11488 else 11488 else
11489 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' 11489 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'
11490 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' 11490 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'
11491@@ -9988,7 +10583,7 @@ rm -f core conftest.err conftest.$ac_objext \ 11491@@ -9993,7 +10588,7 @@ rm -f core conftest.err conftest.$ac_objext \
11492 osf4* | osf5*) # as osf3* with the addition of -msym flag 11492 osf4* | osf5*) # as osf3* with the addition of -msym flag
11493 if test "$GCC" = yes; then 11493 if test "$GCC" = yes; then
11494 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 11494 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -11497,7 +11497,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11497 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 11497 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11498 else 11498 else
11499 allow_undefined_flag=' -expect_unresolved \*' 11499 allow_undefined_flag=' -expect_unresolved \*'
11500@@ -10007,9 +10602,9 @@ rm -f core conftest.err conftest.$ac_objext \ 11500@@ -10012,9 +10607,9 @@ rm -f core conftest.err conftest.$ac_objext \
11501 no_undefined_flag=' -z defs' 11501 no_undefined_flag=' -z defs'
11502 if test "$GCC" = yes; then 11502 if test "$GCC" = yes; then
11503 wlarc='${wl}' 11503 wlarc='${wl}'
@@ -11509,7 +11509,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11509 else 11509 else
11510 case `$CC -V 2>&1` in 11510 case `$CC -V 2>&1` in
11511 *"Compilers 5.0"*) 11511 *"Compilers 5.0"*)
11512@@ -10585,8 +11180,9 @@ cygwin* | mingw* | pw32* | cegcc*) 11512@@ -10590,8 +11185,9 @@ cygwin* | mingw* | pw32* | cegcc*)
11513 need_version=no 11513 need_version=no
11514 need_lib_prefix=no 11514 need_lib_prefix=no
11515 11515
@@ -11521,7 +11521,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11521 library_names_spec='$libname.dll.a' 11521 library_names_spec='$libname.dll.a'
11522 # DLL is installed to $(libdir)/../bin by postinstall_cmds 11522 # DLL is installed to $(libdir)/../bin by postinstall_cmds
11523 postinstall_cmds='base_file=`basename \${file}`~ 11523 postinstall_cmds='base_file=`basename \${file}`~
11524@@ -10619,13 +11215,71 @@ cygwin* | mingw* | pw32* | cegcc*) 11524@@ -10624,13 +11220,71 @@ cygwin* | mingw* | pw32* | cegcc*)
11525 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 11525 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11526 ;; 11526 ;;
11527 esac 11527 esac
@@ -11594,7 +11594,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11594 # FIXME: first we should search . and the directory the executable is in 11594 # FIXME: first we should search . and the directory the executable is in
11595 shlibpath_var=PATH 11595 shlibpath_var=PATH
11596 ;; 11596 ;;
11597@@ -10717,7 +11371,7 @@ haiku*) 11597@@ -10712,7 +11366,7 @@ haiku*)
11598 soname_spec='${libname}${release}${shared_ext}$major' 11598 soname_spec='${libname}${release}${shared_ext}$major'
11599 shlibpath_var=LIBRARY_PATH 11599 shlibpath_var=LIBRARY_PATH
11600 shlibpath_overrides_runpath=yes 11600 shlibpath_overrides_runpath=yes
@@ -11603,16 +11603,16 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11603 hardcode_into_libs=yes 11603 hardcode_into_libs=yes
11604 ;; 11604 ;;
11605 11605
11606@@ -11513,7 +12167,7 @@ else 11606@@ -11508,7 +12162,7 @@ else
11607 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11607 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11608 lt_status=$lt_dlunknown 11608 lt_status=$lt_dlunknown
11609 cat > conftest.$ac_ext <<_LT_EOF 11609 cat > conftest.$ac_ext <<_LT_EOF
11610-#line 11516 "configure" 11610-#line 11511 "configure"
11611+#line $LINENO "configure" 11611+#line $LINENO "configure"
11612 #include "confdefs.h" 11612 #include "confdefs.h"
11613 11613
11614 #if HAVE_DLFCN_H 11614 #if HAVE_DLFCN_H
11615@@ -11557,10 +12211,10 @@ else 11615@@ -11552,10 +12206,10 @@ else
11616 /* When -fvisbility=hidden is used, assume the code has been annotated 11616 /* When -fvisbility=hidden is used, assume the code has been annotated
11617 correspondingly for the symbols needed. */ 11617 correspondingly for the symbols needed. */
11618 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11618 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11625,16 +11625,16 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11625 int main () 11625 int main ()
11626 { 11626 {
11627 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11627 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11628@@ -11619,7 +12273,7 @@ else 11628@@ -11614,7 +12268,7 @@ else
11629 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11629 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11630 lt_status=$lt_dlunknown 11630 lt_status=$lt_dlunknown
11631 cat > conftest.$ac_ext <<_LT_EOF 11631 cat > conftest.$ac_ext <<_LT_EOF
11632-#line 11622 "configure" 11632-#line 11617 "configure"
11633+#line $LINENO "configure" 11633+#line $LINENO "configure"
11634 #include "confdefs.h" 11634 #include "confdefs.h"
11635 11635
11636 #if HAVE_DLFCN_H 11636 #if HAVE_DLFCN_H
11637@@ -11663,10 +12317,10 @@ else 11637@@ -11658,10 +12312,10 @@ else
11638 /* When -fvisbility=hidden is used, assume the code has been annotated 11638 /* When -fvisbility=hidden is used, assume the code has been annotated
11639 correspondingly for the symbols needed. */ 11639 correspondingly for the symbols needed. */
11640 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11640 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11647,7 +11647,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11647 int main () 11647 int main ()
11648 { 11648 {
11649 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11649 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11650@@ -14110,13 +14764,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 11650@@ -14136,13 +14790,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
11651 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 11651 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
11652 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 11652 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
11653 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 11653 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -11668,7 +11668,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11668 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 11668 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
11669 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 11669 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
11670 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 11670 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
11671@@ -14131,14 +14792,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 11671@@ -14157,14 +14818,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
11672 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 11672 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
11673 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 11673 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
11674 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"`' 11674 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"`'
@@ -11687,7 +11687,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11687 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 11687 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
11688 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 11688 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
11689 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 11689 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
11690@@ -14171,12 +14835,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 11690@@ -14197,12 +14861,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
11691 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 11691 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
11692 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 11692 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
11693 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 11693 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -11701,7 +11701,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11701 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 11701 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
11702 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 11702 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
11703 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 11703 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
11704@@ -14231,8 +14895,13 @@ reload_flag \ 11704@@ -14257,8 +14921,13 @@ reload_flag \
11705 OBJDUMP \ 11705 OBJDUMP \
11706 deplibs_check_method \ 11706 deplibs_check_method \
11707 file_magic_cmd \ 11707 file_magic_cmd \
@@ -11715,7 +11715,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11715 STRIP \ 11715 STRIP \
11716 RANLIB \ 11716 RANLIB \
11717 CC \ 11717 CC \
11718@@ -14242,12 +14911,14 @@ lt_cv_sys_global_symbol_pipe \ 11718@@ -14268,12 +14937,14 @@ lt_cv_sys_global_symbol_pipe \
11719 lt_cv_sys_global_symbol_to_cdecl \ 11719 lt_cv_sys_global_symbol_to_cdecl \
11720 lt_cv_sys_global_symbol_to_c_name_address \ 11720 lt_cv_sys_global_symbol_to_c_name_address \
11721 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 11721 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -11731,7 +11731,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11731 DSYMUTIL \ 11731 DSYMUTIL \
11732 NMEDIT \ 11732 NMEDIT \
11733 LIPO \ 11733 LIPO \
11734@@ -14263,7 +14934,6 @@ no_undefined_flag \ 11734@@ -14289,7 +14960,6 @@ no_undefined_flag \
11735 hardcode_libdir_flag_spec \ 11735 hardcode_libdir_flag_spec \
11736 hardcode_libdir_flag_spec_ld \ 11736 hardcode_libdir_flag_spec_ld \
11737 hardcode_libdir_separator \ 11737 hardcode_libdir_separator \
@@ -11739,7 +11739,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11739 exclude_expsyms \ 11739 exclude_expsyms \
11740 include_expsyms \ 11740 include_expsyms \
11741 file_list_spec \ 11741 file_list_spec \
11742@@ -14299,6 +14969,7 @@ module_cmds \ 11742@@ -14325,6 +14995,7 @@ module_cmds \
11743 module_expsym_cmds \ 11743 module_expsym_cmds \
11744 export_symbols_cmds \ 11744 export_symbols_cmds \
11745 prelink_cmds \ 11745 prelink_cmds \
@@ -11747,7 +11747,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11747 postinstall_cmds \ 11747 postinstall_cmds \
11748 postuninstall_cmds \ 11748 postuninstall_cmds \
11749 finish_cmds \ 11749 finish_cmds \
11750@@ -15055,7 +15726,8 @@ $as_echo X"$file" | 11750@@ -15081,7 +15752,8 @@ $as_echo X"$file" |
11751 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 11751 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
11752 # 11752 #
11753 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 11753 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -11757,7 +11757,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11757 # Written by Gordon Matzigkeit, 1996 11757 # Written by Gordon Matzigkeit, 1996
11758 # 11758 #
11759 # This file is part of GNU Libtool. 11759 # This file is part of GNU Libtool.
11760@@ -15158,19 +15830,42 @@ SP2NL=$lt_lt_SP2NL 11760@@ -15184,19 +15856,42 @@ SP2NL=$lt_lt_SP2NL
11761 # turn newlines into spaces. 11761 # turn newlines into spaces.
11762 NL2SP=$lt_lt_NL2SP 11762 NL2SP=$lt_lt_NL2SP
11763 11763
@@ -11801,7 +11801,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11801 # A symbol stripping program. 11801 # A symbol stripping program.
11802 STRIP=$lt_STRIP 11802 STRIP=$lt_STRIP
11803 11803
11804@@ -15200,6 +15895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 11804@@ -15226,6 +15921,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
11805 # Transform the output of nm in a C name address pair when lib prefix is needed. 11805 # Transform the output of nm in a C name address pair when lib prefix is needed.
11806 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 11806 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
11807 11807
@@ -11814,7 +11814,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11814 # The name of the directory that contains temporary libtool files. 11814 # The name of the directory that contains temporary libtool files.
11815 objdir=$objdir 11815 objdir=$objdir
11816 11816
11817@@ -15209,6 +15910,9 @@ MAGIC_CMD=$MAGIC_CMD 11817@@ -15235,6 +15936,9 @@ MAGIC_CMD=$MAGIC_CMD
11818 # Must we lock files when doing compilation? 11818 # Must we lock files when doing compilation?
11819 need_locks=$lt_need_locks 11819 need_locks=$lt_need_locks
11820 11820
@@ -11824,7 +11824,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11824 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 11824 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
11825 DSYMUTIL=$lt_DSYMUTIL 11825 DSYMUTIL=$lt_DSYMUTIL
11826 11826
11827@@ -15323,12 +16027,12 @@ with_gcc=$GCC 11827@@ -15349,12 +16053,12 @@ with_gcc=$GCC
11828 # Compiler flag to turn off builtin functions. 11828 # Compiler flag to turn off builtin functions.
11829 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 11829 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
11830 11830
@@ -11840,7 +11840,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11840 # Compiler flag to prevent dynamic linking. 11840 # Compiler flag to prevent dynamic linking.
11841 link_static_flag=$lt_lt_prog_compiler_static 11841 link_static_flag=$lt_lt_prog_compiler_static
11842 11842
11843@@ -15415,9 +16119,6 @@ inherit_rpath=$inherit_rpath 11843@@ -15441,9 +16145,6 @@ inherit_rpath=$inherit_rpath
11844 # Whether libtool must link a program against all its dependency libraries. 11844 # Whether libtool must link a program against all its dependency libraries.
11845 link_all_deplibs=$link_all_deplibs 11845 link_all_deplibs=$link_all_deplibs
11846 11846
@@ -11850,7 +11850,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11850 # Set to "yes" if exported symbols are required. 11850 # Set to "yes" if exported symbols are required.
11851 always_export_symbols=$always_export_symbols 11851 always_export_symbols=$always_export_symbols
11852 11852
11853@@ -15433,6 +16134,9 @@ include_expsyms=$lt_include_expsyms 11853@@ -15459,6 +16160,9 @@ include_expsyms=$lt_include_expsyms
11854 # Commands necessary for linking programs (against libraries) with templates. 11854 # Commands necessary for linking programs (against libraries) with templates.
11855 prelink_cmds=$lt_prelink_cmds 11855 prelink_cmds=$lt_prelink_cmds
11856 11856
@@ -11860,7 +11860,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
11860 # Specify filename containing input files. 11860 # Specify filename containing input files.
11861 file_list_spec=$lt_file_list_spec 11861 file_list_spec=$lt_file_list_spec
11862 11862
11863@@ -15465,210 +16169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 11863@@ -15491,210 +16195,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
11864 # if finds mixed CR/LF and LF-only lines. Since sed operates in 11864 # if finds mixed CR/LF and LF-only lines. Since sed operates in
11865 # text mode, it properly converts lines to CR/LF. This bash problem 11865 # text mode, it properly converts lines to CR/LF. This bash problem
11866 # is reportedly fixed, but why not run on old versions too? 11866 # is reportedly fixed, but why not run on old versions too?
@@ -12235,7 +12235,7 @@ index 1dc1b65fac3..c5c2f36bbc0 100755
12235 chmod +x "$ofile" 12235 chmod +x "$ofile"
12236 12236
12237diff --git a/libtool.m4 b/libtool.m4 12237diff --git a/libtool.m4 b/libtool.m4
12238index 434530059fa..e45fdc6998c 100644 12238index e993b621ac2..7715af647f4 100644
12239--- a/libtool.m4 12239--- a/libtool.m4
12240+++ b/libtool.m4 12240+++ b/libtool.m4
12241@@ -1,7 +1,8 @@ 12241@@ -1,7 +1,8 @@
@@ -12605,7 +12605,7 @@ index 434530059fa..e45fdc6998c 100644
12605 # FIXME: first we should search . and the directory the executable is in 12605 # FIXME: first we should search . and the directory the executable is in
12606 shlibpath_var=PATH 12606 shlibpath_var=PATH
12607 ;; 12607 ;;
12608@@ -2342,7 +2483,7 @@ haiku*) 12608@@ -2332,7 +2473,7 @@ haiku*)
12609 soname_spec='${libname}${release}${shared_ext}$major' 12609 soname_spec='${libname}${release}${shared_ext}$major'
12610 shlibpath_var=LIBRARY_PATH 12610 shlibpath_var=LIBRARY_PATH
12611 shlibpath_overrides_runpath=yes 12611 shlibpath_overrides_runpath=yes
@@ -12614,7 +12614,7 @@ index 434530059fa..e45fdc6998c 100644
12614 hardcode_into_libs=yes 12614 hardcode_into_libs=yes
12615 ;; 12615 ;;
12616 12616
12617@@ -2950,6 +3091,11 @@ case $reload_flag in 12617@@ -2940,6 +3081,11 @@ case $reload_flag in
12618 esac 12618 esac
12619 reload_cmds='$LD$reload_flag -o $output$reload_objs' 12619 reload_cmds='$LD$reload_flag -o $output$reload_objs'
12620 case $host_os in 12620 case $host_os in
@@ -12626,7 +12626,7 @@ index 434530059fa..e45fdc6998c 100644
12626 darwin*) 12626 darwin*)
12627 if test "$GCC" = yes; then 12627 if test "$GCC" = yes; then
12628 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 12628 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
12629@@ -3016,7 +3162,8 @@ mingw* | pw32*) 12629@@ -3006,7 +3152,8 @@ mingw* | pw32*)
12630 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 12630 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
12631 lt_cv_file_magic_cmd='func_win32_libid' 12631 lt_cv_file_magic_cmd='func_win32_libid'
12632 else 12632 else
@@ -12636,7 +12636,7 @@ index 434530059fa..e45fdc6998c 100644
12636 lt_cv_file_magic_cmd='$OBJDUMP -f' 12636 lt_cv_file_magic_cmd='$OBJDUMP -f'
12637 fi 12637 fi
12638 ;; 12638 ;;
12639@@ -3167,6 +3314,21 @@ tpf*) 12639@@ -3157,6 +3304,21 @@ tpf*)
12640 ;; 12640 ;;
12641 esac 12641 esac
12642 ]) 12642 ])
@@ -12658,7 +12658,7 @@ index 434530059fa..e45fdc6998c 100644
12658 file_magic_cmd=$lt_cv_file_magic_cmd 12658 file_magic_cmd=$lt_cv_file_magic_cmd
12659 deplibs_check_method=$lt_cv_deplibs_check_method 12659 deplibs_check_method=$lt_cv_deplibs_check_method
12660 test -z "$deplibs_check_method" && deplibs_check_method=unknown 12660 test -z "$deplibs_check_method" && deplibs_check_method=unknown
12661@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 12661@@ -3164,7 +3326,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
12662 _LT_DECL([], [deplibs_check_method], [1], 12662 _LT_DECL([], [deplibs_check_method], [1],
12663 [Method to check whether dependent libraries are shared objects]) 12663 [Method to check whether dependent libraries are shared objects])
12664 _LT_DECL([], [file_magic_cmd], [1], 12664 _LT_DECL([], [file_magic_cmd], [1],
@@ -12671,7 +12671,7 @@ index 434530059fa..e45fdc6998c 100644
12671 ])# _LT_CHECK_MAGIC_METHOD 12671 ])# _LT_CHECK_MAGIC_METHOD
12672 12672
12673 12673
12674@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: 12674@@ -3267,6 +3433,67 @@ dnl aclocal-1.4 backwards compatibility:
12675 dnl AC_DEFUN([AM_PROG_NM], []) 12675 dnl AC_DEFUN([AM_PROG_NM], [])
12676 dnl AC_DEFUN([AC_PROG_NM], []) 12676 dnl AC_DEFUN([AC_PROG_NM], [])
12677 12677
@@ -12739,7 +12739,7 @@ index 434530059fa..e45fdc6998c 100644
12739 12739
12740 # LT_LIB_M 12740 # LT_LIB_M
12741 # -------- 12741 # --------
12742@@ -3403,8 +3630,8 @@ esac 12742@@ -3393,8 +3620,8 @@ esac
12743 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 12743 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
12744 12744
12745 # Transform an extracted symbol line into symbol name and symbol address 12745 # Transform an extracted symbol line into symbol name and symbol address
@@ -12750,7 +12750,7 @@ index 434530059fa..e45fdc6998c 100644
12750 12750
12751 # Handle CRLF in mingw tool chain 12751 # Handle CRLF in mingw tool chain
12752 opt_cr= 12752 opt_cr=
12753@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do 12753@@ -3430,6 +3657,7 @@ for ac_symprfx in "" "_"; do
12754 else 12754 else
12755 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 12755 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
12756 fi 12756 fi
@@ -12758,7 +12758,7 @@ index 434530059fa..e45fdc6998c 100644
12758 12758
12759 # Check to see that the pipe works correctly. 12759 # Check to see that the pipe works correctly.
12760 pipe_works=no 12760 pipe_works=no
12761@@ -3473,6 +3701,18 @@ _LT_EOF 12761@@ -3463,6 +3691,18 @@ _LT_EOF
12762 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 12762 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
12763 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 12763 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
12764 cat <<_LT_EOF > conftest.$ac_ext 12764 cat <<_LT_EOF > conftest.$ac_ext
@@ -12777,7 +12777,7 @@ index 434530059fa..e45fdc6998c 100644
12777 #ifdef __cplusplus 12777 #ifdef __cplusplus
12778 extern "C" { 12778 extern "C" {
12779 #endif 12779 #endif
12780@@ -3484,7 +3724,7 @@ _LT_EOF 12780@@ -3474,7 +3714,7 @@ _LT_EOF
12781 cat <<_LT_EOF >> conftest.$ac_ext 12781 cat <<_LT_EOF >> conftest.$ac_ext
12782 12782
12783 /* The mapping between symbol names and symbols. */ 12783 /* The mapping between symbol names and symbols. */
@@ -12786,7 +12786,7 @@ index 434530059fa..e45fdc6998c 100644
12786 const char *name; 12786 const char *name;
12787 void *address; 12787 void *address;
12788 } 12788 }
12789@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { 12789@@ -3500,15 +3740,15 @@ static const void *lt_preloaded_setup() {
12790 _LT_EOF 12790 _LT_EOF
12791 # Now try linking the two files. 12791 # Now try linking the two files.
12792 mv conftest.$ac_objext conftstm.$ac_objext 12792 mv conftest.$ac_objext conftstm.$ac_objext
@@ -12806,7 +12806,7 @@ index 434530059fa..e45fdc6998c 100644
12806 else 12806 else
12807 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD 12807 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
12808 fi 12808 fi
12809@@ -3551,6 +3791,13 @@ else 12809@@ -3541,6 +3781,13 @@ else
12810 AC_MSG_RESULT(ok) 12810 AC_MSG_RESULT(ok)
12811 fi 12811 fi
12812 12812
@@ -12820,7 +12820,7 @@ index 434530059fa..e45fdc6998c 100644
12820 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 12820 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
12821 [Take the output of nm and produce a listing of raw symbols and C names]) 12821 [Take the output of nm and produce a listing of raw symbols and C names])
12822 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 12822 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
12823@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], 12823@@ -3551,6 +3798,8 @@ _LT_DECL([global_symbol_to_c_name_address],
12824 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 12824 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
12825 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 12825 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
12826 [Transform the output of nm in a C name address pair when lib prefix is needed]) 12826 [Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -12829,7 +12829,7 @@ index 434530059fa..e45fdc6998c 100644
12829 ]) # _LT_CMD_GLOBAL_SYMBOLS 12829 ]) # _LT_CMD_GLOBAL_SYMBOLS
12830 12830
12831 12831
12832@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= 12832@@ -3562,7 +3811,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
12833 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 12833 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
12834 _LT_TAGVAR(lt_prog_compiler_static, $1)= 12834 _LT_TAGVAR(lt_prog_compiler_static, $1)=
12835 12835
@@ -12837,7 +12837,7 @@ index 434530059fa..e45fdc6998c 100644
12837 m4_if([$1], [CXX], [ 12837 m4_if([$1], [CXX], [
12838 # C++ specific cases for pic, static, wl, etc. 12838 # C++ specific cases for pic, static, wl, etc.
12839 if test "$GXX" = yes; then 12839 if test "$GXX" = yes; then
12840@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ 12840@@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [
12841 ;; 12841 ;;
12842 esac 12842 esac
12843 ;; 12843 ;;
@@ -12850,7 +12850,7 @@ index 434530059fa..e45fdc6998c 100644
12850 dgux*) 12850 dgux*)
12851 case $cc_basename in 12851 case $cc_basename in
12852 ec++*) 12852 ec++*)
12853@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ 12853@@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [
12854 ;; 12854 ;;
12855 solaris*) 12855 solaris*)
12856 case $cc_basename in 12856 case $cc_basename in
@@ -12859,7 +12859,7 @@ index 434530059fa..e45fdc6998c 100644
12859 # Sun C++ 4.2, 5.x and Centerline C++ 12859 # Sun C++ 4.2, 5.x and Centerline C++
12860 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 12860 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12861 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 12861 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12862@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ 12862@@ -4043,6 +4297,12 @@ m4_if([$1], [CXX], [
12863 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' 12863 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
12864 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' 12864 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
12865 ;; 12865 ;;
@@ -12872,7 +12872,7 @@ index 434530059fa..e45fdc6998c 100644
12872 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 12872 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
12873 # Portland Group compilers (*not* the Pentium gcc compiler, 12873 # Portland Group compilers (*not* the Pentium gcc compiler,
12874 # which looks to be a dead project) 12874 # which looks to be a dead project)
12875@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ 12875@@ -4105,7 +4365,7 @@ m4_if([$1], [CXX], [
12876 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 12876 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12877 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 12877 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12878 case $cc_basename in 12878 case $cc_basename in
@@ -12881,7 +12881,7 @@ index 434530059fa..e45fdc6998c 100644
12881 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; 12881 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
12882 *) 12882 *)
12883 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; 12883 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
12884@@ -4172,9 +4432,11 @@ case $host_os in 12884@@ -4162,9 +4422,11 @@ case $host_os in
12885 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" 12885 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
12886 ;; 12886 ;;
12887 esac 12887 esac
@@ -12896,7 +12896,7 @@ index 434530059fa..e45fdc6998c 100644
12896 12896
12897 # 12897 #
12898 # Check to make sure the PIC flag actually works. 12898 # Check to make sure the PIC flag actually works.
12899@@ -4193,6 +4455,8 @@ fi 12899@@ -4183,6 +4445,8 @@ fi
12900 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], 12900 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
12901 [Additional compiler flags for building library objects]) 12901 [Additional compiler flags for building library objects])
12902 12902
@@ -12905,7 +12905,7 @@ index 434530059fa..e45fdc6998c 100644
12905 # 12905 #
12906 # Check to make sure the static flag actually works. 12906 # Check to make sure the static flag actually works.
12907 # 12907 #
12908@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 12908@@ -4203,6 +4467,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
12909 m4_defun([_LT_LINKER_SHLIBS], 12909 m4_defun([_LT_LINKER_SHLIBS],
12910 [AC_REQUIRE([LT_PATH_LD])dnl 12910 [AC_REQUIRE([LT_PATH_LD])dnl
12911 AC_REQUIRE([LT_PATH_NM])dnl 12911 AC_REQUIRE([LT_PATH_NM])dnl
@@ -12913,7 +12913,7 @@ index 434530059fa..e45fdc6998c 100644
12913 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 12913 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
12914 m4_require([_LT_DECL_EGREP])dnl 12914 m4_require([_LT_DECL_EGREP])dnl
12915 m4_require([_LT_DECL_SED])dnl 12915 m4_require([_LT_DECL_SED])dnl
12916@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl 12916@@ -4211,6 +4476,7 @@ m4_require([_LT_TAG_COMPILER])dnl
12917 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) 12917 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
12918 m4_if([$1], [CXX], [ 12918 m4_if([$1], [CXX], [
12919 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 12919 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -12921,7 +12921,7 @@ index 434530059fa..e45fdc6998c 100644
12921 case $host_os in 12921 case $host_os in
12922 aix[[4-9]]*) 12922 aix[[4-9]]*)
12923 # If we're using GNU nm, then we don't want the "-C" option. 12923 # If we're using GNU nm, then we don't want the "-C" option.
12924@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ 12924@@ -4225,15 +4491,20 @@ m4_if([$1], [CXX], [
12925 ;; 12925 ;;
12926 pw32*) 12926 pw32*)
12927 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 12927 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
@@ -12947,7 +12947,7 @@ index 434530059fa..e45fdc6998c 100644
12947 ], [ 12947 ], [
12948 runpath_var= 12948 runpath_var=
12949 _LT_TAGVAR(allow_undefined_flag, $1)= 12949 _LT_TAGVAR(allow_undefined_flag, $1)=
12950@@ -4411,7 +4682,8 @@ _LT_EOF 12950@@ -4401,7 +4672,8 @@ _LT_EOF
12951 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 12951 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
12952 _LT_TAGVAR(always_export_symbols, $1)=no 12952 _LT_TAGVAR(always_export_symbols, $1)=no
12953 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 12953 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -12957,7 +12957,7 @@ index 434530059fa..e45fdc6998c 100644
12957 12957
12958 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 12958 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
12959 _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' 12959 _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'
12960@@ -4510,12 +4782,12 @@ _LT_EOF 12960@@ -4500,12 +4772,12 @@ _LT_EOF
12961 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 12961 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
12962 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 12962 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
12963 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' 12963 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
@@ -12972,7 +12972,7 @@ index 434530059fa..e45fdc6998c 100644
12972 fi 12972 fi
12973 ;; 12973 ;;
12974 esac 12974 esac
12975@@ -4529,8 +4801,8 @@ _LT_EOF 12975@@ -4519,8 +4791,8 @@ _LT_EOF
12976 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 12976 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
12977 wlarc= 12977 wlarc=
12978 else 12978 else
@@ -12983,7 +12983,7 @@ index 434530059fa..e45fdc6998c 100644
12983 fi 12983 fi
12984 ;; 12984 ;;
12985 12985
12986@@ -4548,8 +4820,8 @@ _LT_EOF 12986@@ -4538,8 +4810,8 @@ _LT_EOF
12987 12987
12988 _LT_EOF 12988 _LT_EOF
12989 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 12989 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -12994,7 +12994,7 @@ index 434530059fa..e45fdc6998c 100644
12994 else 12994 else
12995 _LT_TAGVAR(ld_shlibs, $1)=no 12995 _LT_TAGVAR(ld_shlibs, $1)=no
12996 fi 12996 fi
12997@@ -4595,8 +4867,8 @@ _LT_EOF 12997@@ -4585,8 +4857,8 @@ _LT_EOF
12998 12998
12999 *) 12999 *)
13000 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 13000 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13005,7 +13005,7 @@ index 434530059fa..e45fdc6998c 100644
13005 else 13005 else
13006 _LT_TAGVAR(ld_shlibs, $1)=no 13006 _LT_TAGVAR(ld_shlibs, $1)=no
13007 fi 13007 fi
13008@@ -4726,7 +4998,7 @@ _LT_EOF 13008@@ -4716,7 +4988,7 @@ _LT_EOF
13009 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 13009 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
13010 # Determine the default libpath from the value encoded in an 13010 # Determine the default libpath from the value encoded in an
13011 # empty executable. 13011 # empty executable.
@@ -13014,7 +13014,7 @@ index 434530059fa..e45fdc6998c 100644
13014 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 13014 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13015 _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" 13015 _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"
13016 else 13016 else
13017@@ -4737,7 +5009,7 @@ _LT_EOF 13017@@ -4727,7 +4999,7 @@ _LT_EOF
13018 else 13018 else
13019 # Determine the default libpath from the value encoded in an 13019 # Determine the default libpath from the value encoded in an
13020 # empty executable. 13020 # empty executable.
@@ -13023,7 +13023,7 @@ index 434530059fa..e45fdc6998c 100644
13023 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 13023 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13024 # Warning - without using the other run time loading flags, 13024 # Warning - without using the other run time loading flags,
13025 # -berok will link without error, but may produce a broken library. 13025 # -berok will link without error, but may produce a broken library.
13026@@ -4781,20 +5053,63 @@ _LT_EOF 13026@@ -4771,20 +5043,63 @@ _LT_EOF
13027 # Microsoft Visual C++. 13027 # Microsoft Visual C++.
13028 # hardcode_libdir_flag_spec is actually meaningless, as there is 13028 # hardcode_libdir_flag_spec is actually meaningless, as there is
13029 # no search path for DLLs. 13029 # no search path for DLLs.
@@ -13101,7 +13101,7 @@ index 434530059fa..e45fdc6998c 100644
13101 ;; 13101 ;;
13102 13102
13103 darwin* | rhapsody*) 13103 darwin* | rhapsody*)
13104@@ -4828,7 +5143,7 @@ _LT_EOF 13104@@ -4818,7 +5133,7 @@ _LT_EOF
13105 13105
13106 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 13106 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
13107 freebsd* | dragonfly*) 13107 freebsd* | dragonfly*)
@@ -13110,7 +13110,7 @@ index 434530059fa..e45fdc6998c 100644
13110 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 13110 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
13111 _LT_TAGVAR(hardcode_direct, $1)=yes 13111 _LT_TAGVAR(hardcode_direct, $1)=yes
13112 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 13112 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
13113@@ -4836,7 +5151,7 @@ _LT_EOF 13113@@ -4826,7 +5141,7 @@ _LT_EOF
13114 13114
13115 hpux9*) 13115 hpux9*)
13116 if test "$GCC" = yes; then 13116 if test "$GCC" = yes; then
@@ -13119,7 +13119,7 @@ index 434530059fa..e45fdc6998c 100644
13119 else 13119 else
13120 _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' 13120 _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'
13121 fi 13121 fi
13122@@ -4852,7 +5167,7 @@ _LT_EOF 13122@@ -4842,7 +5157,7 @@ _LT_EOF
13123 13123
13124 hpux10*) 13124 hpux10*)
13125 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 13125 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -13128,7 +13128,7 @@ index 434530059fa..e45fdc6998c 100644
13128 else 13128 else
13129 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 13129 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
13130 fi 13130 fi
13131@@ -4876,10 +5191,10 @@ _LT_EOF 13131@@ -4866,10 +5181,10 @@ _LT_EOF
13132 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 13132 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
13133 ;; 13133 ;;
13134 ia64*) 13134 ia64*)
@@ -13141,7 +13141,7 @@ index 434530059fa..e45fdc6998c 100644
13141 ;; 13141 ;;
13142 esac 13142 esac
13143 else 13143 else
13144@@ -4926,16 +5241,31 @@ _LT_EOF 13144@@ -4916,16 +5231,31 @@ _LT_EOF
13145 13145
13146 irix5* | irix6* | nonstopux*) 13146 irix5* | irix6* | nonstopux*)
13147 if test "$GCC" = yes; then 13147 if test "$GCC" = yes; then
@@ -13180,7 +13180,7 @@ index 434530059fa..e45fdc6998c 100644
13180 else 13180 else
13181 _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' 13181 _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'
13182 _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' 13182 _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'
13183@@ -5020,7 +5350,7 @@ _LT_EOF 13183@@ -5010,7 +5340,7 @@ _LT_EOF
13184 osf4* | osf5*) # as osf3* with the addition of -msym flag 13184 osf4* | osf5*) # as osf3* with the addition of -msym flag
13185 if test "$GCC" = yes; then 13185 if test "$GCC" = yes; then
13186 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 13186 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -13189,7 +13189,7 @@ index 434530059fa..e45fdc6998c 100644
13189 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 13189 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
13190 else 13190 else
13191 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 13191 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
13192@@ -5039,9 +5369,9 @@ _LT_EOF 13192@@ -5029,9 +5359,9 @@ _LT_EOF
13193 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' 13193 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
13194 if test "$GCC" = yes; then 13194 if test "$GCC" = yes; then
13195 wlarc='${wl}' 13195 wlarc='${wl}'
@@ -13201,7 +13201,7 @@ index 434530059fa..e45fdc6998c 100644
13201 else 13201 else
13202 case `$CC -V 2>&1` in 13202 case `$CC -V 2>&1` in
13203 *"Compilers 5.0"*) 13203 *"Compilers 5.0"*)
13204@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], 13204@@ -5303,8 +5633,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
13205 to runtime path list]) 13205 to runtime path list])
13206 _LT_TAGDECL([], [link_all_deplibs], [0], 13206 _LT_TAGDECL([], [link_all_deplibs], [0],
13207 [Whether libtool must link a program against all its dependency libraries]) 13207 [Whether libtool must link a program against all its dependency libraries])
@@ -13210,7 +13210,7 @@ index 434530059fa..e45fdc6998c 100644
13210 _LT_TAGDECL([], [always_export_symbols], [0], 13210 _LT_TAGDECL([], [always_export_symbols], [0],
13211 [Set to "yes" if exported symbols are required]) 13211 [Set to "yes" if exported symbols are required])
13212 _LT_TAGDECL([], [export_symbols_cmds], [2], 13212 _LT_TAGDECL([], [export_symbols_cmds], [2],
13213@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], 13213@@ -5315,6 +5643,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
13214 [Symbols that must always be exported]) 13214 [Symbols that must always be exported])
13215 _LT_TAGDECL([], [prelink_cmds], [2], 13215 _LT_TAGDECL([], [prelink_cmds], [2],
13216 [Commands necessary for linking programs (against libraries) with templates]) 13216 [Commands necessary for linking programs (against libraries) with templates])
@@ -13219,7 +13219,7 @@ index 434530059fa..e45fdc6998c 100644
13219 _LT_TAGDECL([], [file_list_spec], [1], 13219 _LT_TAGDECL([], [file_list_spec], [1],
13220 [Specify filename containing input files]) 13220 [Specify filename containing input files])
13221 dnl FIXME: Not yet implemented 13221 dnl FIXME: Not yet implemented
13222@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" 13222@@ -5416,6 +5746,7 @@ CC="$lt_save_CC"
13223 m4_defun([_LT_LANG_CXX_CONFIG], 13223 m4_defun([_LT_LANG_CXX_CONFIG],
13224 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 13224 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
13225 m4_require([_LT_DECL_EGREP])dnl 13225 m4_require([_LT_DECL_EGREP])dnl
@@ -13227,7 +13227,7 @@ index 434530059fa..e45fdc6998c 100644
13227 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 13227 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
13228 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 13228 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
13229 (test "X$CXX" != "Xg++"))) ; then 13229 (test "X$CXX" != "Xg++"))) ; then
13230@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13230@@ -5477,6 +5808,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13231 13231
13232 # Allow CC to be a program name with arguments. 13232 # Allow CC to be a program name with arguments.
13233 lt_save_CC=$CC 13233 lt_save_CC=$CC
@@ -13235,7 +13235,7 @@ index 434530059fa..e45fdc6998c 100644
13235 lt_save_LD=$LD 13235 lt_save_LD=$LD
13236 lt_save_GCC=$GCC 13236 lt_save_GCC=$GCC
13237 GCC=$GXX 13237 GCC=$GXX
13238@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13238@@ -5494,6 +5826,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13239 fi 13239 fi
13240 test -z "${LDCXX+set}" || LD=$LDCXX 13240 test -z "${LDCXX+set}" || LD=$LDCXX
13241 CC=${CXX-"c++"} 13241 CC=${CXX-"c++"}
@@ -13243,7 +13243,7 @@ index 434530059fa..e45fdc6998c 100644
13243 compiler=$CC 13243 compiler=$CC
13244 _LT_TAGVAR(compiler, $1)=$CC 13244 _LT_TAGVAR(compiler, $1)=$CC
13245 _LT_CC_BASENAME([$compiler]) 13245 _LT_CC_BASENAME([$compiler])
13246@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13246@@ -5657,7 +5990,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13247 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 13247 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
13248 # Determine the default libpath from the value encoded in an empty 13248 # Determine the default libpath from the value encoded in an empty
13249 # executable. 13249 # executable.
@@ -13252,7 +13252,7 @@ index 434530059fa..e45fdc6998c 100644
13252 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 13252 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13253 13253
13254 _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" 13254 _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"
13255@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13255@@ -5669,7 +6002,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13256 else 13256 else
13257 # Determine the default libpath from the value encoded in an 13257 # Determine the default libpath from the value encoded in an
13258 # empty executable. 13258 # empty executable.
@@ -13261,7 +13261,7 @@ index 434530059fa..e45fdc6998c 100644
13261 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 13261 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13262 # Warning - without using the other run time loading flags, 13262 # Warning - without using the other run time loading flags,
13263 # -berok will link without error, but may produce a broken library. 13263 # -berok will link without error, but may produce a broken library.
13264@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then 13264@@ -5711,29 +6044,75 @@ if test "$_lt_caught_CXX_error" != yes; then
13265 ;; 13265 ;;
13266 13266
13267 cygwin* | mingw* | pw32* | cegcc*) 13267 cygwin* | mingw* | pw32* | cegcc*)
@@ -13360,7 +13360,7 @@ index 434530059fa..e45fdc6998c 100644
13360 darwin* | rhapsody*) 13360 darwin* | rhapsody*)
13361 _LT_DARWIN_LINKER_FEATURES($1) 13361 _LT_DARWIN_LINKER_FEATURES($1)
13362 ;; 13362 ;;
13363@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13363@@ -5808,7 +6187,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13364 ;; 13364 ;;
13365 *) 13365 *)
13366 if test "$GXX" = yes; then 13366 if test "$GXX" = yes; then
@@ -13369,7 +13369,7 @@ index 434530059fa..e45fdc6998c 100644
13369 else 13369 else
13370 # FIXME: insert proper C++ library support 13370 # FIXME: insert proper C++ library support
13371 _LT_TAGVAR(ld_shlibs, $1)=no 13371 _LT_TAGVAR(ld_shlibs, $1)=no
13372@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then 13372@@ -5879,10 +6258,10 @@ if test "$_lt_caught_CXX_error" != yes; then
13373 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 13373 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
13374 ;; 13374 ;;
13375 ia64*) 13375 ia64*)
@@ -13382,7 +13382,7 @@ index 434530059fa..e45fdc6998c 100644
13382 ;; 13382 ;;
13383 esac 13383 esac
13384 fi 13384 fi
13385@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then 13385@@ -5923,9 +6302,9 @@ if test "$_lt_caught_CXX_error" != yes; then
13386 *) 13386 *)
13387 if test "$GXX" = yes; then 13387 if test "$GXX" = yes; then
13388 if test "$with_gnu_ld" = no; then 13388 if test "$with_gnu_ld" = no; then
@@ -13394,7 +13394,7 @@ index 434530059fa..e45fdc6998c 100644
13394 fi 13394 fi
13395 fi 13395 fi
13396 _LT_TAGVAR(link_all_deplibs, $1)=yes 13396 _LT_TAGVAR(link_all_deplibs, $1)=yes
13397@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then 13397@@ -5995,20 +6374,20 @@ if test "$_lt_caught_CXX_error" != yes; then
13398 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 13398 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
13399 rm -rf $tpldir~ 13399 rm -rf $tpldir~
13400 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 13400 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -13419,7 +13419,7 @@ index 434530059fa..e45fdc6998c 100644
13419 ;; 13419 ;;
13420 *) # Version 6 and above use weak symbols 13420 *) # Version 6 and above use weak symbols
13421 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 13421 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
13422@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13422@@ -6203,7 +6582,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13423 _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' 13423 _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'
13424 ;; 13424 ;;
13425 *) 13425 *)
@@ -13428,7 +13428,7 @@ index 434530059fa..e45fdc6998c 100644
13428 ;; 13428 ;;
13429 esac 13429 esac
13430 13430
13431@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13431@@ -6249,7 +6628,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13432 13432
13433 solaris*) 13433 solaris*)
13434 case $cc_basename in 13434 case $cc_basename in
@@ -13437,7 +13437,7 @@ index 434530059fa..e45fdc6998c 100644
13437 # Sun C++ 4.2, 5.x and Centerline C++ 13437 # Sun C++ 4.2, 5.x and Centerline C++
13438 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 13438 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
13439 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 13439 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
13440@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then 13440@@ -6290,9 +6669,9 @@ if test "$_lt_caught_CXX_error" != yes; then
13441 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 13441 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
13442 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 13442 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
13443 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 13443 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -13449,7 +13449,7 @@ index 434530059fa..e45fdc6998c 100644
13449 13449
13450 # Commands to make compiler produce verbose output that lists 13450 # Commands to make compiler produce verbose output that lists
13451 # what "hidden" libraries, object files and flags are used when 13451 # what "hidden" libraries, object files and flags are used when
13452@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13452@@ -6421,6 +6800,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13453 fi # test -n "$compiler" 13453 fi # test -n "$compiler"
13454 13454
13455 CC=$lt_save_CC 13455 CC=$lt_save_CC
@@ -13457,7 +13457,7 @@ index 434530059fa..e45fdc6998c 100644
13457 LDCXX=$LD 13457 LDCXX=$LD
13458 LD=$lt_save_LD 13458 LD=$lt_save_LD
13459 GCC=$lt_save_GCC 13459 GCC=$lt_save_GCC
13460@@ -6445,6 +6825,29 @@ AC_LANG_POP 13460@@ -6435,6 +6815,29 @@ AC_LANG_POP
13461 ])# _LT_LANG_CXX_CONFIG 13461 ])# _LT_LANG_CXX_CONFIG
13462 13462
13463 13463
@@ -13487,7 +13487,7 @@ index 434530059fa..e45fdc6998c 100644
13487 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) 13487 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
13488 # --------------------------------- 13488 # ---------------------------------
13489 # Figure out "hidden" library dependencies from verbose 13489 # Figure out "hidden" library dependencies from verbose
13490@@ -6453,6 +6856,7 @@ AC_LANG_POP 13490@@ -6443,6 +6846,7 @@ AC_LANG_POP
13491 # objects, libraries and library flags. 13491 # objects, libraries and library flags.
13492 m4_defun([_LT_SYS_HIDDEN_LIBDEPS], 13492 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
13493 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 13493 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -13495,7 +13495,7 @@ index 434530059fa..e45fdc6998c 100644
13495 # Dependencies to place before and after the object being linked: 13495 # Dependencies to place before and after the object being linked:
13496 _LT_TAGVAR(predep_objects, $1)= 13496 _LT_TAGVAR(predep_objects, $1)=
13497 _LT_TAGVAR(postdep_objects, $1)= 13497 _LT_TAGVAR(postdep_objects, $1)=
13498@@ -6503,6 +6907,13 @@ public class foo { 13498@@ -6493,6 +6897,13 @@ public class foo {
13499 }; 13499 };
13500 _LT_EOF 13500 _LT_EOF
13501 ]) 13501 ])
@@ -13509,7 +13509,7 @@ index 434530059fa..e45fdc6998c 100644
13509 dnl Parse the compiler output and extract the necessary 13509 dnl Parse the compiler output and extract the necessary
13510 dnl objects, libraries and library flags. 13510 dnl objects, libraries and library flags.
13511 if AC_TRY_EVAL(ac_compile); then 13511 if AC_TRY_EVAL(ac_compile); then
13512@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then 13512@@ -6504,7 +6915,7 @@ if AC_TRY_EVAL(ac_compile); then
13513 pre_test_object_deps_done=no 13513 pre_test_object_deps_done=no
13514 13514
13515 for p in `eval "$output_verbose_link_cmd"`; do 13515 for p in `eval "$output_verbose_link_cmd"`; do
@@ -13518,7 +13518,7 @@ index 434530059fa..e45fdc6998c 100644
13518 13518
13519 -L* | -R* | -l*) 13519 -L* | -R* | -l*)
13520 # Some compilers place space between "-{L,R}" and the path. 13520 # Some compilers place space between "-{L,R}" and the path.
13521@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then 13521@@ -6513,13 +6924,22 @@ if AC_TRY_EVAL(ac_compile); then
13522 test $p = "-R"; then 13522 test $p = "-R"; then
13523 prev=$p 13523 prev=$p
13524 continue 13524 continue
@@ -13545,7 +13545,7 @@ index 434530059fa..e45fdc6998c 100644
13545 # Internal compiler library paths should come after those 13545 # Internal compiler library paths should come after those
13546 # provided the user. The postdeps already come after the 13546 # provided the user. The postdeps already come after the
13547 # user supplied libs so there is no need to process them. 13547 # user supplied libs so there is no need to process them.
13548@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then 13548@@ -6539,8 +6959,10 @@ if AC_TRY_EVAL(ac_compile); then
13549 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" 13549 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
13550 fi 13550 fi
13551 fi 13551 fi
@@ -13556,7 +13556,7 @@ index 434530059fa..e45fdc6998c 100644
13556 *.$objext) 13556 *.$objext)
13557 # This assumes that the test object file only shows up 13557 # This assumes that the test object file only shows up
13558 # once in the compiler output. 13558 # once in the compiler output.
13559@@ -6586,6 +7008,7 @@ else 13559@@ -6576,6 +6998,7 @@ else
13560 fi 13560 fi
13561 13561
13562 $RM -f confest.$objext 13562 $RM -f confest.$objext
@@ -13564,7 +13564,7 @@ index 434530059fa..e45fdc6998c 100644
13564 13564
13565 # PORTME: override above test on systems where it is broken 13565 # PORTME: override above test on systems where it is broken
13566 m4_if([$1], [CXX], 13566 m4_if([$1], [CXX],
13567@@ -6622,7 +7045,7 @@ linux*) 13567@@ -6612,7 +7035,7 @@ linux*)
13568 13568
13569 solaris*) 13569 solaris*)
13570 case $cc_basename in 13570 case $cc_basename in
@@ -13573,7 +13573,7 @@ index 434530059fa..e45fdc6998c 100644
13573 # The more standards-conforming stlport4 library is 13573 # The more standards-conforming stlport4 library is
13574 # incompatible with the Cstd library. Avoid specifying 13574 # incompatible with the Cstd library. Avoid specifying
13575 # it if it's in CXXFLAGS. Ignore libCrun as 13575 # it if it's in CXXFLAGS. Ignore libCrun as
13576@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then 13576@@ -6725,7 +7148,9 @@ if test "$_lt_disable_F77" != yes; then
13577 # Allow CC to be a program name with arguments. 13577 # Allow CC to be a program name with arguments.
13578 lt_save_CC="$CC" 13578 lt_save_CC="$CC"
13579 lt_save_GCC=$GCC 13579 lt_save_GCC=$GCC
@@ -13583,7 +13583,7 @@ index 434530059fa..e45fdc6998c 100644
13583 compiler=$CC 13583 compiler=$CC
13584 _LT_TAGVAR(compiler, $1)=$CC 13584 _LT_TAGVAR(compiler, $1)=$CC
13585 _LT_CC_BASENAME([$compiler]) 13585 _LT_CC_BASENAME([$compiler])
13586@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then 13586@@ -6779,6 +7204,7 @@ if test "$_lt_disable_F77" != yes; then
13587 13587
13588 GCC=$lt_save_GCC 13588 GCC=$lt_save_GCC
13589 CC="$lt_save_CC" 13589 CC="$lt_save_CC"
@@ -13591,7 +13591,7 @@ index 434530059fa..e45fdc6998c 100644
13591 fi # test "$_lt_disable_F77" != yes 13591 fi # test "$_lt_disable_F77" != yes
13592 13592
13593 AC_LANG_POP 13593 AC_LANG_POP
13594@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then 13594@@ -6855,7 +7281,9 @@ if test "$_lt_disable_FC" != yes; then
13595 # Allow CC to be a program name with arguments. 13595 # Allow CC to be a program name with arguments.
13596 lt_save_CC="$CC" 13596 lt_save_CC="$CC"
13597 lt_save_GCC=$GCC 13597 lt_save_GCC=$GCC
@@ -13601,7 +13601,7 @@ index 434530059fa..e45fdc6998c 100644
13601 compiler=$CC 13601 compiler=$CC
13602 GCC=$ac_cv_fc_compiler_gnu 13602 GCC=$ac_cv_fc_compiler_gnu
13603 13603
13604@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then 13604@@ -6911,7 +7339,8 @@ if test "$_lt_disable_FC" != yes; then
13605 fi # test -n "$compiler" 13605 fi # test -n "$compiler"
13606 13606
13607 GCC=$lt_save_GCC 13607 GCC=$lt_save_GCC
@@ -13611,7 +13611,7 @@ index 434530059fa..e45fdc6998c 100644
13611 fi # test "$_lt_disable_FC" != yes 13611 fi # test "$_lt_disable_FC" != yes
13612 13612
13613 AC_LANG_POP 13613 AC_LANG_POP
13614@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE 13614@@ -6948,10 +7377,12 @@ _LT_COMPILER_BOILERPLATE
13615 _LT_LINKER_BOILERPLATE 13615 _LT_LINKER_BOILERPLATE
13616 13616
13617 # Allow CC to be a program name with arguments. 13617 # Allow CC to be a program name with arguments.
@@ -13625,7 +13625,7 @@ index 434530059fa..e45fdc6998c 100644
13625 compiler=$CC 13625 compiler=$CC
13626 _LT_TAGVAR(compiler, $1)=$CC 13626 _LT_TAGVAR(compiler, $1)=$CC
13627 _LT_TAGVAR(LD, $1)="$LD" 13627 _LT_TAGVAR(LD, $1)="$LD"
13628@@ -6992,7 +7423,8 @@ fi 13628@@ -6982,7 +7413,8 @@ fi
13629 AC_LANG_RESTORE 13629 AC_LANG_RESTORE
13630 13630
13631 GCC=$lt_save_GCC 13631 GCC=$lt_save_GCC
@@ -13635,7 +13635,7 @@ index 434530059fa..e45fdc6998c 100644
13635 ])# _LT_LANG_GCJ_CONFIG 13635 ])# _LT_LANG_GCJ_CONFIG
13636 13636
13637 13637
13638@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE 13638@@ -7017,9 +7449,11 @@ _LT_LINKER_BOILERPLATE
13639 13639
13640 # Allow CC to be a program name with arguments. 13640 # Allow CC to be a program name with arguments.
13641 lt_save_CC="$CC" 13641 lt_save_CC="$CC"
@@ -13647,7 +13647,7 @@ index 434530059fa..e45fdc6998c 100644
13647 compiler=$CC 13647 compiler=$CC
13648 _LT_TAGVAR(compiler, $1)=$CC 13648 _LT_TAGVAR(compiler, $1)=$CC
13649 _LT_CC_BASENAME([$compiler]) 13649 _LT_CC_BASENAME([$compiler])
13650@@ -7042,7 +7476,8 @@ fi 13650@@ -7032,7 +7466,8 @@ fi
13651 13651
13652 GCC=$lt_save_GCC 13652 GCC=$lt_save_GCC
13653 AC_LANG_RESTORE 13653 AC_LANG_RESTORE
@@ -13657,7 +13657,7 @@ index 434530059fa..e45fdc6998c 100644
13657 ])# _LT_LANG_RC_CONFIG 13657 ])# _LT_LANG_RC_CONFIG
13658 13658
13659 13659
13660@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 13660@@ -7091,6 +7526,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
13661 AC_SUBST([OBJDUMP]) 13661 AC_SUBST([OBJDUMP])
13662 ]) 13662 ])
13663 13663
@@ -13673,7 +13673,7 @@ index 434530059fa..e45fdc6998c 100644
13673 13673
13674 # _LT_DECL_SED 13674 # _LT_DECL_SED
13675 # ------------ 13675 # ------------
13676@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], 13676@@ -7184,8 +7628,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
13677 # Try some XSI features 13677 # Try some XSI features
13678 xsi_shell=no 13678 xsi_shell=no
13679 ( _lt_dummy="a/b/c" 13679 ( _lt_dummy="a/b/c"
@@ -13684,7 +13684,7 @@ index 434530059fa..e45fdc6998c 100644
13684 && eval 'test $(( 1 + 1 )) -eq 2 \ 13684 && eval 'test $(( 1 + 1 )) -eq 2 \
13685 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 13685 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
13686 && xsi_shell=yes 13686 && xsi_shell=yes
13687@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 13687@@ -7224,206 +7668,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
13688 ])# _LT_CHECK_SHELL_FEATURES 13688 ])# _LT_CHECK_SHELL_FEATURES
13689 13689
13690 13690
@@ -19318,7 +19318,7 @@ index bf92b5e0790..c573da90c5c 100644
19318 # These exist entirely to fool aclocal when bootstrapping libtool. 19318 # These exist entirely to fool aclocal when bootstrapping libtool.
19319 # 19319 #
19320diff --git a/opcodes/configure b/opcodes/configure 19320diff --git a/opcodes/configure b/opcodes/configure
19321index 8d1e561c942..a0291dfbfa7 100755 19321index dca94db9c3f..26dcc4b82dd 100755
19322--- a/opcodes/configure 19322--- a/opcodes/configure
19323+++ b/opcodes/configure 19323+++ b/opcodes/configure
19324@@ -680,6 +680,9 @@ OTOOL 19324@@ -680,6 +680,9 @@ OTOOL
@@ -20590,7 +20590,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20590 # FIXME: first we should search . and the directory the executable is in 20590 # FIXME: first we should search . and the directory the executable is in
20591 shlibpath_var=PATH 20591 shlibpath_var=PATH
20592 ;; 20592 ;;
20593@@ -10643,7 +11298,7 @@ haiku*) 20593@@ -10633,7 +11288,7 @@ haiku*)
20594 soname_spec='${libname}${release}${shared_ext}$major' 20594 soname_spec='${libname}${release}${shared_ext}$major'
20595 shlibpath_var=LIBRARY_PATH 20595 shlibpath_var=LIBRARY_PATH
20596 shlibpath_overrides_runpath=yes 20596 shlibpath_overrides_runpath=yes
@@ -20599,16 +20599,16 @@ index 8d1e561c942..a0291dfbfa7 100755
20599 hardcode_into_libs=yes 20599 hardcode_into_libs=yes
20600 ;; 20600 ;;
20601 20601
20602@@ -11439,7 +12094,7 @@ else 20602@@ -11429,7 +12084,7 @@ else
20603 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 20603 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20604 lt_status=$lt_dlunknown 20604 lt_status=$lt_dlunknown
20605 cat > conftest.$ac_ext <<_LT_EOF 20605 cat > conftest.$ac_ext <<_LT_EOF
20606-#line 11442 "configure" 20606-#line 11432 "configure"
20607+#line $LINENO "configure" 20607+#line $LINENO "configure"
20608 #include "confdefs.h" 20608 #include "confdefs.h"
20609 20609
20610 #if HAVE_DLFCN_H 20610 #if HAVE_DLFCN_H
20611@@ -11483,10 +12138,10 @@ else 20611@@ -11473,10 +12128,10 @@ else
20612 /* When -fvisbility=hidden is used, assume the code has been annotated 20612 /* When -fvisbility=hidden is used, assume the code has been annotated
20613 correspondingly for the symbols needed. */ 20613 correspondingly for the symbols needed. */
20614 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 20614 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20621,16 +20621,16 @@ index 8d1e561c942..a0291dfbfa7 100755
20621 int main () 20621 int main ()
20622 { 20622 {
20623 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20623 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20624@@ -11545,7 +12200,7 @@ else 20624@@ -11535,7 +12190,7 @@ else
20625 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 20625 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20626 lt_status=$lt_dlunknown 20626 lt_status=$lt_dlunknown
20627 cat > conftest.$ac_ext <<_LT_EOF 20627 cat > conftest.$ac_ext <<_LT_EOF
20628-#line 11548 "configure" 20628-#line 11538 "configure"
20629+#line $LINENO "configure" 20629+#line $LINENO "configure"
20630 #include "confdefs.h" 20630 #include "confdefs.h"
20631 20631
20632 #if HAVE_DLFCN_H 20632 #if HAVE_DLFCN_H
20633@@ -11589,10 +12244,10 @@ else 20633@@ -11579,10 +12234,10 @@ else
20634 /* When -fvisbility=hidden is used, assume the code has been annotated 20634 /* When -fvisbility=hidden is used, assume the code has been annotated
20635 correspondingly for the symbols needed. */ 20635 correspondingly for the symbols needed. */
20636 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 20636 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20643,7 +20643,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20643 int main () 20643 int main ()
20644 { 20644 {
20645 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20645 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20646@@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 20646@@ -13746,13 +14401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20647 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 20647 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20648 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 20648 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20649 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 20649 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -20664,7 +20664,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20664 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 20664 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20665 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 20665 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20666 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 20666 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20667@@ -13777,14 +14439,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 20667@@ -13767,14 +14429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20668 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 20668 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20669 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 20669 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20670 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"`' 20670 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"`'
@@ -20683,7 +20683,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20683 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 20683 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20684 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 20684 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20685 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 20685 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20686@@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 20686@@ -13807,12 +14472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20687 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 20687 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20688 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 20688 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20689 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 20689 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -20697,7 +20697,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20697 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 20697 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20698 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 20698 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20699 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 20699 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20700@@ -13877,8 +14542,13 @@ reload_flag \ 20700@@ -13867,8 +14532,13 @@ reload_flag \
20701 OBJDUMP \ 20701 OBJDUMP \
20702 deplibs_check_method \ 20702 deplibs_check_method \
20703 file_magic_cmd \ 20703 file_magic_cmd \
@@ -20711,7 +20711,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20711 STRIP \ 20711 STRIP \
20712 RANLIB \ 20712 RANLIB \
20713 CC \ 20713 CC \
20714@@ -13888,12 +14558,14 @@ lt_cv_sys_global_symbol_pipe \ 20714@@ -13878,12 +14548,14 @@ lt_cv_sys_global_symbol_pipe \
20715 lt_cv_sys_global_symbol_to_cdecl \ 20715 lt_cv_sys_global_symbol_to_cdecl \
20716 lt_cv_sys_global_symbol_to_c_name_address \ 20716 lt_cv_sys_global_symbol_to_c_name_address \
20717 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 20717 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -20727,7 +20727,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20727 DSYMUTIL \ 20727 DSYMUTIL \
20728 NMEDIT \ 20728 NMEDIT \
20729 LIPO \ 20729 LIPO \
20730@@ -13909,7 +14581,6 @@ no_undefined_flag \ 20730@@ -13899,7 +14571,6 @@ no_undefined_flag \
20731 hardcode_libdir_flag_spec \ 20731 hardcode_libdir_flag_spec \
20732 hardcode_libdir_flag_spec_ld \ 20732 hardcode_libdir_flag_spec_ld \
20733 hardcode_libdir_separator \ 20733 hardcode_libdir_separator \
@@ -20735,7 +20735,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20735 exclude_expsyms \ 20735 exclude_expsyms \
20736 include_expsyms \ 20736 include_expsyms \
20737 file_list_spec \ 20737 file_list_spec \
20738@@ -13945,6 +14616,7 @@ module_cmds \ 20738@@ -13935,6 +14606,7 @@ module_cmds \
20739 module_expsym_cmds \ 20739 module_expsym_cmds \
20740 export_symbols_cmds \ 20740 export_symbols_cmds \
20741 prelink_cmds \ 20741 prelink_cmds \
@@ -20743,7 +20743,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20743 postinstall_cmds \ 20743 postinstall_cmds \
20744 postuninstall_cmds \ 20744 postuninstall_cmds \
20745 finish_cmds \ 20745 finish_cmds \
20746@@ -14710,7 +15382,8 @@ $as_echo X"$file" | 20746@@ -14700,7 +15372,8 @@ $as_echo X"$file" |
20747 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 20747 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20748 # 20748 #
20749 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 20749 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -20753,7 +20753,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20753 # Written by Gordon Matzigkeit, 1996 20753 # Written by Gordon Matzigkeit, 1996
20754 # 20754 #
20755 # This file is part of GNU Libtool. 20755 # This file is part of GNU Libtool.
20756@@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL 20756@@ -14803,19 +15476,42 @@ SP2NL=$lt_lt_SP2NL
20757 # turn newlines into spaces. 20757 # turn newlines into spaces.
20758 NL2SP=$lt_lt_NL2SP 20758 NL2SP=$lt_lt_NL2SP
20759 20759
@@ -20797,7 +20797,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20797 # A symbol stripping program. 20797 # A symbol stripping program.
20798 STRIP=$lt_STRIP 20798 STRIP=$lt_STRIP
20799 20799
20800@@ -14855,6 +15551,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 20800@@ -14845,6 +15541,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20801 # Transform the output of nm in a C name address pair when lib prefix is needed. 20801 # Transform the output of nm in a C name address pair when lib prefix is needed.
20802 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 20802 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20803 20803
@@ -20810,7 +20810,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20810 # The name of the directory that contains temporary libtool files. 20810 # The name of the directory that contains temporary libtool files.
20811 objdir=$objdir 20811 objdir=$objdir
20812 20812
20813@@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD 20813@@ -14854,6 +15556,9 @@ MAGIC_CMD=$MAGIC_CMD
20814 # Must we lock files when doing compilation? 20814 # Must we lock files when doing compilation?
20815 need_locks=$lt_need_locks 20815 need_locks=$lt_need_locks
20816 20816
@@ -20820,7 +20820,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20820 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 20820 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20821 DSYMUTIL=$lt_DSYMUTIL 20821 DSYMUTIL=$lt_DSYMUTIL
20822 20822
20823@@ -14978,12 +15683,12 @@ with_gcc=$GCC 20823@@ -14968,12 +15673,12 @@ with_gcc=$GCC
20824 # Compiler flag to turn off builtin functions. 20824 # Compiler flag to turn off builtin functions.
20825 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 20825 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20826 20826
@@ -20836,7 +20836,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20836 # Compiler flag to prevent dynamic linking. 20836 # Compiler flag to prevent dynamic linking.
20837 link_static_flag=$lt_lt_prog_compiler_static 20837 link_static_flag=$lt_lt_prog_compiler_static
20838 20838
20839@@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath 20839@@ -15060,9 +15765,6 @@ inherit_rpath=$inherit_rpath
20840 # Whether libtool must link a program against all its dependency libraries. 20840 # Whether libtool must link a program against all its dependency libraries.
20841 link_all_deplibs=$link_all_deplibs 20841 link_all_deplibs=$link_all_deplibs
20842 20842
@@ -20846,7 +20846,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20846 # Set to "yes" if exported symbols are required. 20846 # Set to "yes" if exported symbols are required.
20847 always_export_symbols=$always_export_symbols 20847 always_export_symbols=$always_export_symbols
20848 20848
20849@@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms 20849@@ -15078,6 +15780,9 @@ include_expsyms=$lt_include_expsyms
20850 # Commands necessary for linking programs (against libraries) with templates. 20850 # Commands necessary for linking programs (against libraries) with templates.
20851 prelink_cmds=$lt_prelink_cmds 20851 prelink_cmds=$lt_prelink_cmds
20852 20852
@@ -20856,7 +20856,7 @@ index 8d1e561c942..a0291dfbfa7 100755
20856 # Specify filename containing input files. 20856 # Specify filename containing input files.
20857 file_list_spec=$lt_file_list_spec 20857 file_list_spec=$lt_file_list_spec
20858 20858
20859@@ -15120,210 +15825,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 20859@@ -15110,210 +15815,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20860 # if finds mixed CR/LF and LF-only lines. Since sed operates in 20860 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20861 # text mode, it properly converts lines to CR/LF. This bash problem 20861 # text mode, it properly converts lines to CR/LF. This bash problem
20862 # is reportedly fixed, but why not run on old versions too? 20862 # is reportedly fixed, but why not run on old versions too?
@@ -21231,7 +21231,7 @@ index 8d1e561c942..a0291dfbfa7 100755
21231 chmod +x "$ofile" 21231 chmod +x "$ofile"
21232 21232
21233diff --git a/zlib/configure b/zlib/configure 21233diff --git a/zlib/configure b/zlib/configure
21234index de6fa7e9960..cce448b6a53 100755 21234index b124acf9259..e4075ef3a2c 100755
21235--- a/zlib/configure 21235--- a/zlib/configure
21236+++ b/zlib/configure 21236+++ b/zlib/configure
21237@@ -646,8 +646,11 @@ OTOOL 21237@@ -646,8 +646,11 @@ OTOOL
@@ -22508,7 +22508,7 @@ index de6fa7e9960..cce448b6a53 100755
22508 # FIXME: first we should search . and the directory the executable is in 22508 # FIXME: first we should search . and the directory the executable is in
22509 shlibpath_var=PATH 22509 shlibpath_var=PATH
22510 ;; 22510 ;;
22511@@ -9830,7 +10485,7 @@ haiku*) 22511@@ -9820,7 +10475,7 @@ haiku*)
22512 soname_spec='${libname}${release}${shared_ext}$major' 22512 soname_spec='${libname}${release}${shared_ext}$major'
22513 shlibpath_var=LIBRARY_PATH 22513 shlibpath_var=LIBRARY_PATH
22514 shlibpath_overrides_runpath=yes 22514 shlibpath_overrides_runpath=yes
@@ -22517,16 +22517,16 @@ index de6fa7e9960..cce448b6a53 100755
22517 hardcode_into_libs=yes 22517 hardcode_into_libs=yes
22518 ;; 22518 ;;
22519 22519
22520@@ -10644,7 +11299,7 @@ else 22520@@ -10634,7 +11289,7 @@ else
22521 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22521 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22522 lt_status=$lt_dlunknown 22522 lt_status=$lt_dlunknown
22523 cat > conftest.$ac_ext <<_LT_EOF 22523 cat > conftest.$ac_ext <<_LT_EOF
22524-#line 10647 "configure" 22524-#line 10637 "configure"
22525+#line $LINENO "configure" 22525+#line $LINENO "configure"
22526 #include "confdefs.h" 22526 #include "confdefs.h"
22527 22527
22528 #if HAVE_DLFCN_H 22528 #if HAVE_DLFCN_H
22529@@ -10688,10 +11343,10 @@ else 22529@@ -10678,10 +11333,10 @@ else
22530 /* When -fvisbility=hidden is used, assume the code has been annotated 22530 /* When -fvisbility=hidden is used, assume the code has been annotated
22531 correspondingly for the symbols needed. */ 22531 correspondingly for the symbols needed. */
22532 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22532 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22539,16 +22539,16 @@ index de6fa7e9960..cce448b6a53 100755
22539 int main () 22539 int main ()
22540 { 22540 {
22541 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22541 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22542@@ -10750,7 +11405,7 @@ else 22542@@ -10740,7 +11395,7 @@ else
22543 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22543 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22544 lt_status=$lt_dlunknown 22544 lt_status=$lt_dlunknown
22545 cat > conftest.$ac_ext <<_LT_EOF 22545 cat > conftest.$ac_ext <<_LT_EOF
22546-#line 10753 "configure" 22546-#line 10743 "configure"
22547+#line $LINENO "configure" 22547+#line $LINENO "configure"
22548 #include "confdefs.h" 22548 #include "confdefs.h"
22549 22549
22550 #if HAVE_DLFCN_H 22550 #if HAVE_DLFCN_H
22551@@ -10794,10 +11449,10 @@ else 22551@@ -10784,10 +11439,10 @@ else
22552 /* When -fvisbility=hidden is used, assume the code has been annotated 22552 /* When -fvisbility=hidden is used, assume the code has been annotated
22553 correspondingly for the symbols needed. */ 22553 correspondingly for the symbols needed. */
22554 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22554 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22561,7 +22561,7 @@ index de6fa7e9960..cce448b6a53 100755
22561 int main () 22561 int main ()
22562 { 22562 {
22563 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22563 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22564@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 22564@@ -12257,13 +12912,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
22565 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 22565 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
22566 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 22566 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
22567 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 22567 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -22582,7 +22582,7 @@ index de6fa7e9960..cce448b6a53 100755
22582 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 22582 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
22583 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 22583 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
22584 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 22584 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
22585@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 22585@@ -12278,14 +12940,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
22586 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 22586 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
22587 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 22587 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
22588 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"`' 22588 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"`'
@@ -22601,7 +22601,7 @@ index de6fa7e9960..cce448b6a53 100755
22601 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 22601 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
22602 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 22602 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
22603 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 22603 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
22604@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 22604@@ -12318,12 +12983,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
22605 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 22605 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
22606 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 22606 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
22607 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 22607 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -22615,7 +22615,7 @@ index de6fa7e9960..cce448b6a53 100755
22615 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 22615 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
22616 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 22616 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
22617 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 22617 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
22618@@ -12388,8 +13053,13 @@ reload_flag \ 22618@@ -12378,8 +13043,13 @@ reload_flag \
22619 OBJDUMP \ 22619 OBJDUMP \
22620 deplibs_check_method \ 22620 deplibs_check_method \
22621 file_magic_cmd \ 22621 file_magic_cmd \
@@ -22629,7 +22629,7 @@ index de6fa7e9960..cce448b6a53 100755
22629 STRIP \ 22629 STRIP \
22630 RANLIB \ 22630 RANLIB \
22631 CC \ 22631 CC \
22632@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ 22632@@ -12389,12 +13059,14 @@ lt_cv_sys_global_symbol_pipe \
22633 lt_cv_sys_global_symbol_to_cdecl \ 22633 lt_cv_sys_global_symbol_to_cdecl \
22634 lt_cv_sys_global_symbol_to_c_name_address \ 22634 lt_cv_sys_global_symbol_to_c_name_address \
22635 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 22635 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -22645,7 +22645,7 @@ index de6fa7e9960..cce448b6a53 100755
22645 DSYMUTIL \ 22645 DSYMUTIL \
22646 NMEDIT \ 22646 NMEDIT \
22647 LIPO \ 22647 LIPO \
22648@@ -12420,7 +13092,6 @@ no_undefined_flag \ 22648@@ -12410,7 +13082,6 @@ no_undefined_flag \
22649 hardcode_libdir_flag_spec \ 22649 hardcode_libdir_flag_spec \
22650 hardcode_libdir_flag_spec_ld \ 22650 hardcode_libdir_flag_spec_ld \
22651 hardcode_libdir_separator \ 22651 hardcode_libdir_separator \
@@ -22653,7 +22653,7 @@ index de6fa7e9960..cce448b6a53 100755
22653 exclude_expsyms \ 22653 exclude_expsyms \
22654 include_expsyms \ 22654 include_expsyms \
22655 file_list_spec \ 22655 file_list_spec \
22656@@ -12456,6 +13127,7 @@ module_cmds \ 22656@@ -12446,6 +13117,7 @@ module_cmds \
22657 module_expsym_cmds \ 22657 module_expsym_cmds \
22658 export_symbols_cmds \ 22658 export_symbols_cmds \
22659 prelink_cmds \ 22659 prelink_cmds \
@@ -22661,7 +22661,7 @@ index de6fa7e9960..cce448b6a53 100755
22661 postinstall_cmds \ 22661 postinstall_cmds \
22662 postuninstall_cmds \ 22662 postuninstall_cmds \
22663 finish_cmds \ 22663 finish_cmds \
22664@@ -13054,7 +13726,8 @@ $as_echo X"$file" | 22664@@ -13044,7 +13716,8 @@ $as_echo X"$file" |
22665 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 22665 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
22666 # 22666 #
22667 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 22667 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -22671,7 +22671,7 @@ index de6fa7e9960..cce448b6a53 100755
22671 # Written by Gordon Matzigkeit, 1996 22671 # Written by Gordon Matzigkeit, 1996
22672 # 22672 #
22673 # This file is part of GNU Libtool. 22673 # This file is part of GNU Libtool.
22674@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL 22674@@ -13147,19 +13820,42 @@ SP2NL=$lt_lt_SP2NL
22675 # turn newlines into spaces. 22675 # turn newlines into spaces.
22676 NL2SP=$lt_lt_NL2SP 22676 NL2SP=$lt_lt_NL2SP
22677 22677
@@ -22715,7 +22715,7 @@ index de6fa7e9960..cce448b6a53 100755
22715 # A symbol stripping program. 22715 # A symbol stripping program.
22716 STRIP=$lt_STRIP 22716 STRIP=$lt_STRIP
22717 22717
22718@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 22718@@ -13189,6 +13885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
22719 # Transform the output of nm in a C name address pair when lib prefix is needed. 22719 # Transform the output of nm in a C name address pair when lib prefix is needed.
22720 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 22720 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
22721 22721
@@ -22728,7 +22728,7 @@ index de6fa7e9960..cce448b6a53 100755
22728 # The name of the directory that contains temporary libtool files. 22728 # The name of the directory that contains temporary libtool files.
22729 objdir=$objdir 22729 objdir=$objdir
22730 22730
22731@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD 22731@@ -13198,6 +13900,9 @@ MAGIC_CMD=$MAGIC_CMD
22732 # Must we lock files when doing compilation? 22732 # Must we lock files when doing compilation?
22733 need_locks=$lt_need_locks 22733 need_locks=$lt_need_locks
22734 22734
@@ -22738,7 +22738,7 @@ index de6fa7e9960..cce448b6a53 100755
22738 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 22738 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
22739 DSYMUTIL=$lt_DSYMUTIL 22739 DSYMUTIL=$lt_DSYMUTIL
22740 22740
22741@@ -13322,12 +14027,12 @@ with_gcc=$GCC 22741@@ -13312,12 +14017,12 @@ with_gcc=$GCC
22742 # Compiler flag to turn off builtin functions. 22742 # Compiler flag to turn off builtin functions.
22743 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 22743 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
22744 22744
@@ -22754,7 +22754,7 @@ index de6fa7e9960..cce448b6a53 100755
22754 # Compiler flag to prevent dynamic linking. 22754 # Compiler flag to prevent dynamic linking.
22755 link_static_flag=$lt_lt_prog_compiler_static 22755 link_static_flag=$lt_lt_prog_compiler_static
22756 22756
22757@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath 22757@@ -13404,9 +14109,6 @@ inherit_rpath=$inherit_rpath
22758 # Whether libtool must link a program against all its dependency libraries. 22758 # Whether libtool must link a program against all its dependency libraries.
22759 link_all_deplibs=$link_all_deplibs 22759 link_all_deplibs=$link_all_deplibs
22760 22760
@@ -22764,7 +22764,7 @@ index de6fa7e9960..cce448b6a53 100755
22764 # Set to "yes" if exported symbols are required. 22764 # Set to "yes" if exported symbols are required.
22765 always_export_symbols=$always_export_symbols 22765 always_export_symbols=$always_export_symbols
22766 22766
22767@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms 22767@@ -13422,6 +14124,9 @@ include_expsyms=$lt_include_expsyms
22768 # Commands necessary for linking programs (against libraries) with templates. 22768 # Commands necessary for linking programs (against libraries) with templates.
22769 prelink_cmds=$lt_prelink_cmds 22769 prelink_cmds=$lt_prelink_cmds
22770 22770
@@ -22774,7 +22774,7 @@ index de6fa7e9960..cce448b6a53 100755
22774 # Specify filename containing input files. 22774 # Specify filename containing input files.
22775 file_list_spec=$lt_file_list_spec 22775 file_list_spec=$lt_file_list_spec
22776 22776
22777@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 22777@@ -13454,210 +14159,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
22778 # if finds mixed CR/LF and LF-only lines. Since sed operates in 22778 # if finds mixed CR/LF and LF-only lines. Since sed operates in
22779 # text mode, it properly converts lines to CR/LF. This bash problem 22779 # text mode, it properly converts lines to CR/LF. This bash problem
22780 # is reportedly fixed, but why not run on old versions too? 22780 # is reportedly fixed, but why not run on old versions too?
@@ -23148,6 +23148,3 @@ index de6fa7e9960..cce448b6a53 100755
23148 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 23148 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
23149 chmod +x "$ofile" 23149 chmod +x "$ofile"
23150 23150
23151--
231522.28.0
23153
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index 69a2383782..c3a95e653a 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,7 +1,7 @@
1From f791a5d84475c02356f16679b7f4ee9c9c3408aa Mon Sep 17 00:00:00 2001 1From 0e026a8758a5416b548de21d5245477cf8e33ed2 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 14/17] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled
5 5
6Enabling sysroot support in libtool exposed a bug where the final 6Enabling sysroot support in libtool exposed a bug where the final
7library had an RPATH encoded into it which still pointed to the 7library had an RPATH encoded into it which still pointed to the
@@ -47,6 +47,3 @@ index 70e856e0659..11ee684cccf 100644
47 if test -n "$hardcode_libdir_separator"; then 47 if test -n "$hardcode_libdir_separator"; then
48 if test -z "$hardcode_libdirs"; then 48 if test -z "$hardcode_libdirs"; then
49 hardcode_libdirs="$libdir" 49 hardcode_libdirs="$libdir"
50--
512.28.0
52
diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
index e848f146b0..824d9d4605 100644
--- a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
@@ -1,7 +1,7 @@
1From e087f96e219d47c4d2244c3f32397e56d41bfdec Mon Sep 17 00:00:00 2001 1From 9d41698ca97b2c5c20ac83147de1f02d385fa66f 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 15/17] sync with OE libtool changes 4Subject: [PATCH] sync with OE libtool changes
5 5
6Apply these patches from our libtool patches as not only are redundant RPATHs a 6Apply these patches from our libtool patches as not only are redundant RPATHs a
7waste of space but they can cause incorrect linking when native packages are 7waste of space but they can cause incorrect linking when native packages are
@@ -84,6 +84,3 @@ index 11ee684cccf..3b19ac15328 100644
84 fi 84 fi
85 elif test -n "$runpath_var"; then 85 elif test -n "$runpath_var"; then
86 case "$finalize_perm_rpath " in 86 case "$finalize_perm_rpath " in
87--
882.28.0
89
diff --git a/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch
index 400b79823f..0602c803db 100644
--- a/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch
+++ b/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch
@@ -1,7 +1,7 @@
1From ae5a7d622dc9addb2ca9fc85889c45964c025a9c Mon Sep 17 00:00:00 2001 1From 805e3ce0c20bee5049ff167ab6f620a230c6db51 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 16/17] Check for clang before checking gcc version 4Subject: [PATCH] Check for clang before checking gcc version
5 5
6Clang advertises itself to be gcc 4.2.1, so when compiling this test 6Clang advertises itself to be gcc 4.2.1, so when compiling this test
7here fails since gcc < 4.4.5 did not support -static-libstdc++ but thats 7here fails since gcc < 4.4.5 did not support -static-libstdc++ but thats
@@ -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 6782f8b6ab8..72f5766b363 100755 21index 7b369071141..7da69e27ce9 100755
22--- a/configure 22--- a/configure
23+++ b/configure 23+++ b/configure
24@@ -5143,7 +5143,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 24@@ -5093,7 +5093,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,10 +31,10 @@ index 6782f8b6ab8..72f5766b363 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 55beb1dea46..3f9e613e2d9 100644 34index 92f01fb3ed7..e99d67ab86b 100644
35--- a/configure.ac 35--- a/configure.ac
36+++ b/configure.ac 36+++ b/configure.ac
37@@ -1312,7 +1312,7 @@ if test "$GCC" = yes; then 37@@ -1311,7 +1311,7 @@ if test "$GCC" = yes; then
38 AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) 38 AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
39 AC_LANG_PUSH(C++) 39 AC_LANG_PUSH(C++)
40 AC_LINK_IFELSE([AC_LANG_SOURCE([ 40 AC_LINK_IFELSE([AC_LANG_SOURCE([
@@ -43,6 +43,3 @@ index 55beb1dea46..3f9e613e2d9 100644
43 #error -static-libstdc++ not implemented 43 #error -static-libstdc++ not implemented
44 #endif 44 #endif
45 int main() {}])], 45 int main() {}])],
46--
472.28.0
48
diff --git a/meta/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch b/meta/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch
deleted file mode 100644
index 42e0c1c32d..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0017-gas-improve-reproducibility-for-stabs-debugging-data.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From aa6586e80fc6fcd739aa959a71e4cf064cdef072 Mon Sep 17 00:00:00 2001
2From: Denys Zagorui <dzagorui@cisco.com>
3Date: Mon, 9 Nov 2020 15:39:10 +0000
4Subject: [PATCH] gas: improve reproducibility for stabs debugging data format
5
6 * config/obj-elf (obj_elf_init_stab_section): Improve
7 reproducibility for stabs debugging data format
8
9Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0541201782c006c09d029d18a45c6e743cfea906]
10---
11 gas/config/obj-elf.c | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-)
13
14diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
15index de22b5a1da..2025df8542 100644
16--- a/gas/config/obj-elf.c
17+++ b/gas/config/obj-elf.c
18@@ -2374,12 +2374,13 @@ obj_elf_init_stab_section (segT seg)
19 p = frag_more (12);
20 /* Zero it out. */
21 memset (p, 0, 12);
22- file = as_where (NULL);
23+ file = remap_debug_filename (as_where (NULL));
24 stabstr_name = concat (segment_name (seg), "str", (char *) NULL);
25 stroff = get_stab_string_offset (file, stabstr_name, TRUE);
26 know (stroff == 1 || (stroff == 0 && file[0] == '\0'));
27 md_number_to_chars (p, stroff, 4);
28 seg_info (seg)->stabu.p = p;
29+ xfree ((char *) file);
30 }
31
32 #endif
33--
342.20.1
35
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2020-35448.patch b/meta/recipes-devtools/binutils/binutils/CVE-2020-35448.patch
deleted file mode 100644
index 3bc64776e5..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2020-35448.patch
+++ /dev/null
@@ -1,85 +0,0 @@
1From 6caa41daeb7aa17c400b7300fb78d207cf064d70 Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Fri, 4 Sep 2020 19:19:18 +0930
4Subject: [PATCH] PR26574, heap buffer overflow in
5 _bfd_elf_slurp_secondary_reloc_section
6
7A horribly fuzzed object with section headers inside the ELF header.
8Disallow that, and crazy reloc sizes.
9
10 PR 26574
11 * elfcode.h (elf_object_p): Sanity check section header offset.
12 * elf.c (_bfd_elf_slurp_secondary_reloc_section): Sanity check
13 sh_entsize.
14
15Upstream-Status: Backport
16CVE: CVE-2020-35448
17
18Reference to upstream patch:
19https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;
20 h=8642dafaef21aa6747cec01df1977e9c52eb4679
21
22Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
23---
24 bfd/elf.c | 4 +++-
25 bfd/elfcode.h | 8 ++++----
26 2 files changed, 7 insertions(+), 5 deletions(-)
27
28diff --git a/bfd/elf.c b/bfd/elf.c
29index fe375e7346..9f29166399 100644
30--- a/bfd/elf.c
31+++ b/bfd/elf.c
32@@ -12527,7 +12527,9 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd,
33 Elf_Internal_Shdr * hdr = & elf_section_data (relsec)->this_hdr;
34
35 if (hdr->sh_type == SHT_SECONDARY_RELOC
36- && hdr->sh_info == (unsigned) elf_section_data (sec)->this_idx)
37+ && hdr->sh_info == (unsigned) elf_section_data (sec)->this_idx
38+ && (hdr->sh_entsize == ebd->s->sizeof_rel
39+ || hdr->sh_entsize == ebd->s->sizeof_rela))
40 {
41 bfd_byte * native_relocs;
42 bfd_byte * native_reloc;
43diff --git a/bfd/elfcode.h b/bfd/elfcode.h
44index f4a7829f27..54ef890637 100644
45--- a/bfd/elfcode.h
46+++ b/bfd/elfcode.h
47@@ -568,7 +568,7 @@ elf_object_p (bfd *abfd)
48
49 /* If this is a relocatable file and there is no section header
50 table, then we're hosed. */
51- if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_type == ET_REL)
52+ if (i_ehdrp->e_shoff < sizeof (x_ehdr) && i_ehdrp->e_type == ET_REL)
53 goto got_wrong_format_error;
54
55 /* As a simple sanity check, verify that what BFD thinks is the
56@@ -578,7 +578,7 @@ elf_object_p (bfd *abfd)
57 goto got_wrong_format_error;
58
59 /* Further sanity check. */
60- if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_shnum != 0)
61+ if (i_ehdrp->e_shoff < sizeof (x_ehdr) && i_ehdrp->e_shnum != 0)
62 goto got_wrong_format_error;
63
64 ebd = get_elf_backend_data (abfd);
65@@ -615,7 +615,7 @@ elf_object_p (bfd *abfd)
66 && ebd->elf_osabi != ELFOSABI_NONE)
67 goto got_wrong_format_error;
68
69- if (i_ehdrp->e_shoff != 0)
70+ if (i_ehdrp->e_shoff >= sizeof (x_ehdr))
71 {
72 file_ptr where = (file_ptr) i_ehdrp->e_shoff;
73
74@@ -807,7 +807,7 @@ elf_object_p (bfd *abfd)
75 }
76 }
77
78- if (i_ehdrp->e_shstrndx != 0 && i_ehdrp->e_shoff != 0)
79+ if (i_ehdrp->e_shstrndx != 0 && i_ehdrp->e_shoff >= sizeof (x_ehdr))
80 {
81 unsigned int num_sec;
82
83--
842.29.2
85
diff --git a/meta/recipes-devtools/binutils/binutils_2.35.1.bb b/meta/recipes-devtools/binutils/binutils_2.36.bb
index 976e49765a..976e49765a 100644
--- a/meta/recipes-devtools/binutils/binutils_2.35.1.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.36.bb