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.37.inc (renamed from meta/recipes-devtools/binutils/binutils-2.36.inc)11
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.37.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-testsuite_2.37.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb)4
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.37.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.36.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch14
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch4
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch84
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch119
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch16
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch2017
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch183
-rw-r--r--meta/recipes-devtools/binutils/binutils/0018-Add-DWARF-5-support-in-gold.patch1374
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2021-20197.patch388
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.37.bb (renamed from meta/recipes-devtools/binutils/binutils_2.36.bb)0
27 files changed, 1281 insertions, 2993 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 68e5d848ba..105a879f3a 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 ?= "11.%" 19GCCVERSION ?= "11.%"
20SDKGCCVERSION ?= "${GCCVERSION}" 20SDKGCCVERSION ?= "${GCCVERSION}"
21BINUVERSION ?= "2.36%" 21BINUVERSION ?= "2.37%"
22GDBVERSION ?= "10.%" 22GDBVERSION ?= "10.%"
23GLIBCVERSION ?= "2.33" 23GLIBCVERSION ?= "2.33"
24LINUXLIBCVERSION ?= "5.13%" 24LINUXLIBCVERSION ?= "5.13%"
diff --git a/meta/recipes-devtools/binutils/binutils-2.36.inc b/meta/recipes-devtools/binutils/binutils-2.37.inc
index d54e2a3457..4218c0a616 100644
--- a/meta/recipes-devtools/binutils/binutils-2.36.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.37.inc
@@ -12,13 +12,13 @@ LIC_FILES_CHKSUM="\
12 12
13# When upgrading to 2.37, please make sure there is no trailing .0, so 13# When upgrading to 2.37, please make sure there is no trailing .0, so
14# that upstream version check can work correctly. 14# that upstream version check can work correctly.
15PV = "2.36.1" 15PV = "2.37"
16CVE_VERSION = "2.36.1" 16CVE_VERSION = "2.37"
17SRCBRANCH ?= "binutils-2_36-branch" 17SRCBRANCH ?= "binutils-2_37-branch"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20 20
21SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" 21SRCREV ?= "87d4632d36323091e731eb07b8aa65f90293da66"
22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" 22BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git"
23SRC_URI = "\ 23SRC_URI = "\
24 ${BINUTILS_GIT_URI} \ 24 ${BINUTILS_GIT_URI} \
@@ -35,8 +35,5 @@ SRC_URI = "\
35 file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ 35 file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
36 file://0015-sync-with-OE-libtool-changes.patch \ 36 file://0015-sync-with-OE-libtool-changes.patch \
37 file://0016-Check-for-clang-before-checking-gcc-version.patch \ 37 file://0016-Check-for-clang-before-checking-gcc-version.patch \
38 file://0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch \
39 file://0018-Add-DWARF-5-support-in-gold.patch \
40 file://CVE-2021-20197.patch \
41" 38"
42S = "${WORKDIR}/git" 39S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.37.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.37.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.37.bb
index 07a8e7c417..ca99e91130 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.37.bb
@@ -15,9 +15,6 @@ do_configure[dirs] += "${B}/ld ${B}/bfd"
15do_configure() { 15do_configure() {
16 # create config.h, oe enables initfini-array by default 16 # create config.h, oe enables initfini-array by default
17 echo "#define HAVE_INITFINI_ARRAY" > ${B}/ld/config.h 17 echo "#define HAVE_INITFINI_ARRAY" > ${B}/ld/config.h
18 # use the bfd_stdint.h from binutils-native, this is the same of the one
19 # generated by binutils-cross
20 cp ${RECIPE_SYSROOT_NATIVE}/usr/include/bfd_stdint.h ${B}/bfd/
21} 18}
22 19
23# target depends 20# target depends
@@ -82,4 +79,3 @@ do_check() {
82 done 79 done
83} 80}
84addtask check after do_configure 81addtask check after do_configure
85
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.36.bb b/meta/recipes-devtools/binutils/binutils-cross_2.37.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.36.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.37.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb
index 37f4d6d2e9..37f4d6d2e9 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 81891963c8..e15a12b93e 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -170,8 +170,6 @@ do_install () {
170 done 170 done
171 171
172 oe_multilib_header bfd.h 172 oe_multilib_header bfd.h
173 # bfd_stdint.h encodes the compiler name in the header
174 sed -i ${D}${includedir}/bfd_stdint.h -e "s,${TARGET_PREFIX},,"
175} 173}
176 174
177inherit update-alternatives 175inherit update-alternatives
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 49dacfef81..53e30a0aaa 100644
--- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
+++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
@@ -1,4 +1,4 @@
1From 3b278a56a0e98d50ec62735598ee5f4b1834e8b3 Mon Sep 17 00:00:00 2001 1From 257ad1ce148417e1cefe2332d8acc5c8216c2522 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:58:54 +0000 3Date: Mon, 2 Mar 2015 01:58:54 +0000
4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
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 d07947404f..a6ca41374a 100644
--- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
+++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
@@ -1,4 +1,4 @@
1From cf4c8a97b7dc1fe36a7d5dabed417fe18b15ad6b Mon Sep 17 00:00:00 2001 1From 6e93d0328f499569db7ce6396f94f304ce340df8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:37:05 -0800 3Date: Mon, 6 Mar 2017 23:37:05 -0800
4Subject: [PATCH] binutils-cross: Do not generate linker script directories 4Subject: [PATCH] binutils-cross: Do not generate linker script directories
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 cc37d30c53..3c4f706f2d 100644
--- a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
+++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch
@@ -1,4 +1,4 @@
1From 9701cab0fdf6a0c011978ae140c4c12a962956f6 Mon Sep 17 00:00:00 2001 1From d49016d3faf684319bf3ac37450558920d70be03 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 19 Feb 2020 09:51:16 -0800 3Date: Wed, 19 Feb 2020 09:51:16 -0800
4Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK 4Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
29 5 files changed, 7 insertions(+), 3 deletions(-) 29 5 files changed, 7 insertions(+), 3 deletions(-)
30 30
31diff --git a/ld/Makefile.am b/ld/Makefile.am 31diff --git a/ld/Makefile.am b/ld/Makefile.am
32index 2c9a487335c..3b01357b651 100644 32index f8e99325361..fd196541f59 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 2c9a487335c..3b01357b651 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 b41941c89e2..a6382bf2a45 100644 46index ef2e99e08da..cb8f5bfb70e 100644
47--- a/ld/Makefile.in 47--- a/ld/Makefile.in
48+++ b/ld/Makefile.in 48+++ b/ld/Makefile.in
49@@ -554,7 +554,8 @@ ZLIB = @zlibdir@ -lz 49@@ -555,7 +555,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 b41941c89e2..a6382bf2a45 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 f7407ab55a7..b25781cc0c4 100644 60index 21e655bb55c..d1615003ede 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 f7407ab55a7..b25781cc0c4 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 863df0293ea..080b1c4c6c2 100644 73index 42660eb9a3c..5a4a4d5da3d 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 863df0293ea..080b1c4c6c2 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 38e63922d31..0966914938c 100644 85index 39d08a6c378..4c3519e7970 100644
86--- a/ld/ldmain.h 86--- a/ld/ldmain.h
87+++ b/ld/ldmain.h 87+++ b/ld/ldmain.h
88@@ -23,6 +23,7 @@ 88@@ -23,6 +23,7 @@
diff --git a/meta/recipes-devtools/binutils/binutils/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 1cd459ae81..f476ff210f 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,4 +1,4 @@
1From 7e7512c82402363688cca6f1febea2c01cb03409 Mon Sep 17 00:00:00 2001 1From b8d43b6b8d98e176346871c92935458b06598c5b 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] configure: widen the regexp for SH architectures 4Subject: [PATCH] configure: widen the regexp for SH architectures
@@ -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 68779feb42b..7b369071141 100755 17index 3dd206525a7..e8ba1a1d3de 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3887,7 +3887,7 @@ case "${target}" in 20@@ -3892,7 +3892,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 68779feb42b..7b369071141 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 d16a2757689..92f01fb3ed7 100644 30index 797a624621e..3a8a3ae1f3b 100644
31--- a/configure.ac 31--- a/configure.ac
32+++ b/configure.ac 32+++ b/configure.ac
33@@ -1177,7 +1177,7 @@ case "${target}" in 33@@ -1175,7 +1175,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 ;;
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 dde0cb5d6d..7cd4a99d33 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,4 +1,4 @@
1From 6a67d277941228d997b527990960413f8444fb81 Mon Sep 17 00:00:00 2001 1From 1a9fcaae50e63b993019bd4dc00219e43421efdc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000 3Date: Mon, 2 Mar 2015 01:09:58 +0000
4Subject: [PATCH] Point scripts location to libdir 4Subject: [PATCH] Point scripts location to libdir
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/ld/Makefile.am b/ld/Makefile.am 14diff --git a/ld/Makefile.am b/ld/Makefile.am
15index 3b01357b651..b7a1f7491b0 100644 15index fd196541f59..d94fa7e64e1 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 3b01357b651..b7a1f7491b0 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 a6382bf2a45..5ee3a4971be 100644 28index cb8f5bfb70e..9a58879c5ca 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -562,7 +562,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
32 # We put the scripts in the directory $(scriptdir)/ldscripts. 32 # We put the scripts in the directory $(scriptdir)/ldscripts.
33 # We can't put the scripts in $(datadir) because the SEARCH_DIR 33 # We can't put the scripts in $(datadir) because the SEARCH_DIR
34 # directives need to be different for native and cross linkers. 34 # directives need to be different for native and cross linkers.
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index caa5f0bdd3..d6b04fdae4 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,4 +1,4 @@
1From 8ad249270414a23a3e65c74fd67a8e4adaebec78 Mon Sep 17 00:00:00 2001 1From 29517900352336708495d41902b5b7e8cc9a401a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:27:17 +0000 3Date: Mon, 2 Mar 2015 01:27:17 +0000
4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty 4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 4 insertions(+) 14 1 file changed, 4 insertions(+)
15 15
16diff --git a/ld/ldelf.c b/ld/ldelf.c 16diff --git a/ld/ldelf.c b/ld/ldelf.c
17index b25781cc0c4..77d7fb8ff03 100644 17index d1615003ede..6a894285b11 100644
18--- a/ld/ldelf.c 18--- a/ld/ldelf.c
19+++ b/ld/ldelf.c 19+++ b/ld/ldelf.c
20@@ -1248,6 +1248,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, 20@@ -1250,6 +1250,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
21 && command_line.rpath == NULL) 21 && command_line.rpath == NULL)
22 { 22 {
23 path = (const char *) getenv ("LD_RUN_PATH"); 23 path = (const char *) getenv ("LD_RUN_PATH");
@@ -26,7 +26,7 @@ index b25781cc0c4..77d7fb8ff03 100644
26 if (path 26 if (path
27 && ldelf_search_needed (path, &n, force, 27 && ldelf_search_needed (path, &n, force,
28 is_linux, elfsize)) 28 is_linux, elfsize))
29@@ -1608,6 +1610,8 @@ ldelf_before_allocation (char *audit, char *depaudit, 29@@ -1610,6 +1612,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
30 rpath = command_line.rpath; 30 rpath = command_line.rpath;
31 if (rpath == NULL) 31 if (rpath == NULL)
32 rpath = (const char *) getenv ("LD_RUN_PATH"); 32 rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index b13a35e02f..39cef70bcd 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,4 +1,4 @@
1From 091870218f192a5698c4420adf938e7178553c07 Mon Sep 17 00:00:00 2001 1From 37581c8ce9d98a1183706e12a2c9a73f7f40462d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:39:01 +0000 3Date: Mon, 2 Mar 2015 01:39:01 +0000
4Subject: [PATCH] don't let the distro compiler point to the wrong installation 4Subject: [PATCH] don't let the distro compiler point to the wrong installation
@@ -17,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 788590957e1..1bca4aafeb7 100644 20index 4f1213b983b..2ba18b75cac 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
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 5c148eaa95..c724dfd7a7 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,4 +1,4 @@
1From bb48edf1a87bbc711e8978dd1e9112fe953dc1bf Mon Sep 17 00:00:00 2001 1From 99e1565b9d2b929d4ee4e9da6f63766b22b23fc3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Jan 2016 06:31:09 +0000 3Date: Fri, 15 Jan 2016 06:31:09 +0000
4Subject: [PATCH] warn for uses of system directories when cross linking 4Subject: [PATCH] warn for uses of system directories when cross linking
@@ -62,11 +62,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
62 ld/lexsup.c | 16 ++++++++++++++++ 62 ld/lexsup.c | 16 ++++++++++++++++
63 9 files changed, 86 insertions(+) 63 9 files changed, 86 insertions(+)
64 64
65diff --git a/ld/config.in b/ld/config.in
66index 7b60d778587..37b8e9b6f6c 100644
67--- a/ld/config.in 65--- a/ld/config.in
68+++ b/ld/config.in 66+++ b/ld/config.in
69@@ -40,6 +40,9 @@ 67@@ -43,6 +43,9 @@
70 language is requested. */ 68 language is requested. */
71 #undef ENABLE_NLS 69 #undef ENABLE_NLS
72 70
@@ -76,11 +74,9 @@ index 7b60d778587..37b8e9b6f6c 100644
76 /* Additional extension a shared object might have. */ 74 /* Additional extension a shared object might have. */
77 #undef EXTRA_SHLIB_EXTENSION 75 #undef EXTRA_SHLIB_EXTENSION
78 76
79diff --git a/ld/configure b/ld/configure
80index b0969791959..50bb04ce6a8 100755
81--- a/ld/configure 77--- a/ld/configure
82+++ b/ld/configure 78+++ b/ld/configure
83@@ -828,6 +828,7 @@ with_lib_path 79@@ -829,6 +829,7 @@ with_lib_path
84 enable_targets 80 enable_targets
85 enable_64_bit_bfd 81 enable_64_bit_bfd
86 with_sysroot 82 with_sysroot
@@ -88,8 +84,8 @@ index b0969791959..50bb04ce6a8 100755
88 enable_gold 84 enable_gold
89 enable_got 85 enable_got
90 enable_compressed_debug_sections 86 enable_compressed_debug_sections
91@@ -1496,6 +1497,8 @@ Optional Features: 87@@ -1498,6 +1499,8 @@ Optional Features:
92 --disable-largefile omit support for large files 88 --enable-checking enable run-time checks
93 --enable-targets alternative target configurations 89 --enable-targets alternative target configurations
94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) 90 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
95+ --enable-poison-system-directories 91+ --enable-poison-system-directories
@@ -97,7 +93,7 @@ index b0969791959..50bb04ce6a8 100755
97 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 93 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
98 --enable-got=<type> GOT handling scheme (target, single, negative, 94 --enable-got=<type> GOT handling scheme (target, single, negative,
99 multigot) 95 multigot)
100@@ -15820,6 +15823,19 @@ fi 96@@ -15215,6 +15218,19 @@ fi
101 97
102 98
103 99
@@ -117,11 +113,9 @@ index b0969791959..50bb04ce6a8 100755
117 # Check whether --enable-gold was given. 113 # Check whether --enable-gold was given.
118 if test "${enable_gold+set}" = set; then : 114 if test "${enable_gold+set}" = set; then :
119 enableval=$enable_gold; case "${enableval}" in 115 enableval=$enable_gold; case "${enableval}" in
120diff --git a/ld/configure.ac b/ld/configure.ac
121index c9c69ab9245..59dab0a6ac4 100644
122--- a/ld/configure.ac 116--- a/ld/configure.ac
123+++ b/ld/configure.ac 117+++ b/ld/configure.ac
124@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) 118@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot)
125 AC_SUBST(TARGET_SYSTEM_ROOT) 119 AC_SUBST(TARGET_SYSTEM_ROOT)
126 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) 120 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
127 121
@@ -138,30 +132,26 @@ index c9c69ab9245..59dab0a6ac4 100644
138 dnl Use --enable-gold to decide if this linker should be the default. 132 dnl Use --enable-gold to decide if this linker should be the default.
139 dnl "install_as_default" is set to false if gold is the default linker. 133 dnl "install_as_default" is set to false if gold is the default linker.
140 dnl "installed_linker" is the installed BFD linker name. 134 dnl "installed_linker" is the installed BFD linker name.
141diff --git a/ld/ld.h b/ld/ld.h
142index 93f5af92c7d..ff7f71a7b66 100644
143--- a/ld/ld.h 135--- a/ld/ld.h
144+++ b/ld/ld.h 136+++ b/ld/ld.h
145@@ -166,6 +166,14 @@ typedef struct 137@@ -162,6 +162,14 @@ typedef struct
146 in the linker script. */ 138 in the linker script. */
147 bfd_boolean force_group_allocation; 139 bool force_group_allocation;
148 140
149+ /* If TRUE (the default) warn for uses of system directories when 141+ /* If TRUE (the default) warn for uses of system directories when
150+ cross linking. */ 142+ cross linking. */
151+ bfd_boolean poison_system_directories; 143+ bool poison_system_directories;
152+ 144+
153+ /* If TRUE (default FALSE) give an error for uses of system 145+ /* If TRUE (default FALSE) give an error for uses of system
154+ directories when cross linking instead of a warning. */ 146+ directories when cross linking instead of a warning. */
155+ bfd_boolean error_poison_system_directories; 147+ bool error_poison_system_directories;
156+ 148+
157 /* Big or little endian as set on command line. */ 149 /* Big or little endian as set on command line. */
158 enum endian_enum endian; 150 enum endian_enum endian;
159 151
160diff --git a/ld/ld.texi b/ld/ld.texi
161index 7a602b9c6ab..cccbfbab3bb 100644
162--- a/ld/ld.texi 152--- a/ld/ld.texi
163+++ b/ld/ld.texi 153+++ b/ld/ld.texi
164@@ -2810,6 +2810,18 @@ string identifying the original linked file does not change. 154@@ -2863,6 +2863,18 @@ string identifying the original linked f
165 155
166 Passing @code{none} for @var{style} disables the setting from any 156 Passing @code{none} for @var{style} disables the setting from any
167 @code{--build-id} options earlier on the command line. 157 @code{--build-id} options earlier on the command line.
@@ -180,11 +170,9 @@ index 7a602b9c6ab..cccbfbab3bb 100644
180 @end table 170 @end table
181 171
182 @c man end 172 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index 81cb86d51e2..cd5c2752679 100644
185--- a/ld/ldfile.c 173--- a/ld/ldfile.c
186+++ b/ld/ldfile.c 174+++ b/ld/ldfile.c
187@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) 175@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *nam
188 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); 176 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
189 else 177 else
190 new_dirs->name = xstrdup (name); 178 new_dirs->name = xstrdup (name);
@@ -208,11 +196,9 @@ index 81cb86d51e2..cd5c2752679 100644
208 } 196 }
209 197
210 /* Try to open a BFD for a lang_input_statement. */ 198 /* Try to open a BFD for a lang_input_statement. */
211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index b0101028321..77f5accb5d9 100644
213--- a/ld/ldlex.h 199--- a/ld/ldlex.h
214+++ b/ld/ldlex.h 200+++ b/ld/ldlex.h
215@@ -161,6 +161,8 @@ enum option_values 201@@ -163,6 +163,8 @@ enum option_values
216 OPTION_CTF_VARIABLES, 202 OPTION_CTF_VARIABLES,
217 OPTION_NO_CTF_VARIABLES, 203 OPTION_NO_CTF_VARIABLES,
218 OPTION_CTF_SHARE_TYPES, 204 OPTION_CTF_SHARE_TYPES,
@@ -221,24 +207,38 @@ index b0101028321..77f5accb5d9 100644
221 }; 207 };
222 208
223 /* The initial parser states. */ 209 /* The initial parser states. */
224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index 080b1c4c6c2..78d8a2df278 100644
226--- a/ld/ldmain.c 210--- a/ld/ldmain.c
227+++ b/ld/ldmain.c 211+++ b/ld/ldmain.c
228@@ -324,6 +324,8 @@ main (int argc, char **argv) 212@@ -321,6 +321,8 @@ main (int argc, char **argv)
229 command_line.warn_mismatch = TRUE; 213 command_line.warn_mismatch = true;
230 command_line.warn_search_mismatch = TRUE; 214 command_line.warn_search_mismatch = true;
231 command_line.check_section_addresses = -1; 215 command_line.check_section_addresses = -1;
232+ command_line.poison_system_directories = TRUE; 216+ command_line.poison_system_directories = true;
233+ command_line.error_poison_system_directories = FALSE; 217+ command_line.error_poison_system_directories = false;
234 218
235 /* We initialize DEMANGLING based on the environment variable 219 /* We initialize DEMANGLING based on the environment variable
236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the 220 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
237diff --git a/ld/lexsup.c b/ld/lexsup.c 221@@ -1444,7 +1446,7 @@ undefined_symbol (struct bfd_link_info *
238index f005a58a045..5eb8439fef7 100644 222 argv[1] = "undefined-symbol";
223 argv[2] = (char *) name;
224 argv[3] = NULL;
225-
226+
227 if (verbose)
228 einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"),
229 argv[0], argv[1], argv[2]);
230@@ -1465,7 +1467,7 @@ undefined_symbol (struct bfd_link_info *
231 carry on to issue the normal error message. */
232 }
233 #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */
234-
235+
236 if (section != NULL)
237 {
238 if (error_count < MAX_ERRORS_IN_A_ROW)
239--- a/ld/lexsup.c 239--- a/ld/lexsup.c
240+++ b/ld/lexsup.c 240+++ b/ld/lexsup.c
241@@ -591,6 +591,14 @@ static const struct ld_option ld_options[] = 241@@ -595,6 +595,14 @@ static const struct ld_option ld_options
242 " <method> is: share-unconflicted (default),\n" 242 " <method> is: share-unconflicted (default),\n"
243 " share-duplicated"), 243 " share-duplicated"),
244 TWO_DASHES }, 244 TWO_DASHES },
@@ -253,16 +253,16 @@ index f005a58a045..5eb8439fef7 100644
253 }; 253 };
254 254
255 #define OPTION_COUNT ARRAY_SIZE (ld_options) 255 #define OPTION_COUNT ARRAY_SIZE (ld_options)
256@@ -1676,6 +1684,14 @@ parse_args (unsigned argc, char **argv) 256@@ -1686,6 +1694,14 @@ parse_args (unsigned argc, char **argv)
257 config.print_map_discarded = TRUE; 257 config.print_map_discarded = true;
258 break; 258 break;
259 259
260+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: 260+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
261+ command_line.poison_system_directories = FALSE; 261+ command_line.poison_system_directories = false;
262+ break; 262+ break;
263+ 263+
264+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: 264+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
265+ command_line.error_poison_system_directories = TRUE; 265+ command_line.error_poison_system_directories = true;
266+ break; 266+ break;
267+ 267+
268 case OPTION_DEPENDENCY_FILE: 268 case OPTION_DEPENDENCY_FILE:
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 b8a1939d36..fab92d52e6 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,4 +1,4 @@
1From 5bd94030de598d3a13091dafaed3b956e0ab708f Mon Sep 17 00:00:00 2001 1From fb6d52dda9c230baf869ed5f981581a7b5094b70 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] Change default emulation for mips64*-*-linux 4Subject: [PATCH] Change default emulation for mips64*-*-linux
@@ -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 e7b55b0dd78..2caf492e172 100644 17index 30087e3b8f8..1896e11790c 100644
18--- a/bfd/config.bfd 18--- a/bfd/config.bfd
19+++ b/bfd/config.bfd 19+++ b/bfd/config.bfd
20@@ -896,12 +896,12 @@ case "${targ}" in 20@@ -891,12 +891,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,10 +35,10 @@ index e7b55b0dd78..2caf492e172 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 0c780b24d57..47431770a17 100644 38index 6205d7c9872..c08533658e5 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@@ -530,12 +530,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
42 ;; 42 ;;
43 mips*-*-windiss) targ_emul=elf32mipswindiss 43 mips*-*-windiss) targ_emul=elf32mipswindiss
44 ;; 44 ;;
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 fe2d02f29d..b2f7448a28 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,4 +1,4 @@
1From c64a5ca02a55b748311032e2c7d9c4f87bd74c63 Mon Sep 17 00:00:00 2001 1From 21920b7a3d10a7dae4c1f18a4bb185de78048e3f 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] Add support for Netlogic XLP 4Subject: [PATCH] Add support for Netlogic XLP
@@ -28,14 +28,14 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
28 gas/configure | 3 +++ 28 gas/configure | 3 +++
29 gas/configure.ac | 3 +++ 29 gas/configure.ac | 3 +++
30 include/elf/mips.h | 1 + 30 include/elf/mips.h | 1 +
31 include/opcode/mips.h | 6 ++++++ 31 include/opcode/mips.h | 8 +++++++-
32 ld/configure.tgt | 3 +++ 32 ld/configure.tgt | 3 +++
33 opcodes/mips-dis.c | 12 +++++------- 33 opcodes/mips-dis.c | 12 +++++-------
34 opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- 34 opcodes/mips-opc.c | 31 ++++++++++++++++++++-----------
35 15 files changed, 65 insertions(+), 21 deletions(-) 35 15 files changed, 66 insertions(+), 22 deletions(-)
36 36
37diff --git a/bfd/aoutx.h b/bfd/aoutx.h 37diff --git a/bfd/aoutx.h b/bfd/aoutx.h
38index 8025b8c5241..cdcb7876896 100644 38index 17560bd8f54..10b1cad74e6 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 8025b8c5241..cdcb7876896 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 8c1d32ca930..b4b2927ebc0 100644 50index 390691bfba1..b0b7a5fa7a0 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 8c1d32ca930..b4b2927ebc0 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 7eff85b7eaa..6c9eb12865e 100644 62index 57b3c453649..a00b0d44359 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@@ -1590,6 +1590,7 @@ enum bfd_architecture 65@@ -1562,6 +1562,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 7eff85b7eaa..6c9eb12865e 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 2caf492e172..e75417da4d8 100644 74index 1896e11790c..8270fd2708d 100644
75--- a/bfd/config.bfd 75--- a/bfd/config.bfd
76+++ b/bfd/config.bfd 76+++ b/bfd/config.bfd
77@@ -879,6 +879,11 @@ case "${targ}" in 77@@ -874,6 +874,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 2caf492e172..e75417da4d8 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 5a944ceee81..c57d12ba3dd 100644 90index 76b507e3c77..c1563cf4319 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
@@ -101,17 +101,17 @@ index 5a944ceee81..c57d12ba3dd 100644
101 101
102 #define NN(index) (&arch_info_struct[(index) + 1]) 102 #define NN(index) (&arch_info_struct[(index) + 1])
103@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = 103@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] =
104 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), 104 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", false, NN(I_xlr)),
105 N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, 105 N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", false,
106 NN(I_interaptiv_mr2)), 106 NN(I_interaptiv_mr2)),
107- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) 107- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", false, NULL)
108+ N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), 108+ N (64, 64, bfd_mach_mips_micromips, "mips:micromips", false, NN(I_micromips)),
109+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) 109+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", false, NULL)
110 }; 110 };
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 3cbb3cf9495..0c6cd47b40c 100644 114index e4827fd17de..fa8c2512837 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@@ -6980,6 +6980,9 @@ _bfd_elf_mips_mach (flagword flags) 117@@ -6980,6 +6980,9 @@ _bfd_elf_mips_mach (flagword flags)
@@ -124,7 +124,7 @@ index 3cbb3cf9495..0c6cd47b40c 100644
124 default: 124 default:
125 switch (flags & EF_MIPS_ARCH) 125 switch (flags & EF_MIPS_ARCH)
126 { 126 {
127@@ -12335,6 +12338,10 @@ mips_set_isa_flags (bfd *abfd) 127@@ -12339,6 +12342,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 3cbb3cf9495..0c6cd47b40c 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@@ -14352,6 +14359,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = 138@@ -14428,6 +14435,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 3cbb3cf9495..0c6cd47b40c 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 ad16b4571c9..4bf2b732502 100644 147index a6073f7ec80..2f2448b5eba 100644
148--- a/binutils/readelf.c 148--- a/binutils/readelf.c
149+++ b/binutils/readelf.c 149+++ b/binutils/readelf.c
150@@ -3502,6 +3502,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) 150@@ -3613,6 +3613,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,10 +156,10 @@ index ad16b4571c9..4bf2b732502 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 538b69710f5..b021b64f14b 100644 159index 0201f816814..a3cfcdbe982 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@@ -570,6 +570,7 @@ static int mips_32bitmode = 0;
163 || mips_opts.arch == CPU_RM7000 \ 163 || mips_opts.arch == CPU_RM7000 \
164 || mips_opts.arch == CPU_VR5500 \ 164 || mips_opts.arch == CPU_VR5500 \
165 || mips_opts.micromips \ 165 || mips_opts.micromips \
@@ -167,7 +167,7 @@ index 538b69710f5..b021b64f14b 100644
167 ) 167 )
168 168
169 /* Whether the processor uses hardware interlocks to protect reads 169 /* Whether the processor uses hardware interlocks to protect reads
170@@ -597,6 +598,7 @@ static int mips_32bitmode = 0; 170@@ -599,6 +600,7 @@ static int mips_32bitmode = 0;
171 && mips_opts.isa != ISA_MIPS3) \ 171 && mips_opts.isa != ISA_MIPS3) \
172 || mips_opts.arch == CPU_R4300 \ 172 || mips_opts.arch == CPU_R4300 \
173 || mips_opts.micromips \ 173 || mips_opts.micromips \
@@ -175,7 +175,7 @@ index 538b69710f5..b021b64f14b 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@@ -20156,7 +20158,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = 178@@ -20157,7 +20159,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 538b69710f5..b021b64f14b 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 d03432c6dc6..d5ae54925e9 100755 188index 110d707f079..789d1b38b33 100755
189--- a/gas/configure 189--- a/gas/configure
190+++ b/gas/configure 190+++ b/gas/configure
191@@ -12761,6 +12761,9 @@ _ACEOF 191@@ -12083,6 +12083,9 @@ _ACEOF
192 mipsisa64r6 | mipsisa64r6el) 192 mipsisa64r6 | mipsisa64r6el)
193 mips_cpu=mips64r6 193 mips_cpu=mips64r6
194 ;; 194 ;;
@@ -199,10 +199,10 @@ index d03432c6dc6..d5ae54925e9 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 82706561886..f1c27bf2878 100644 202index 78efba88e23..c1b4ef6b3b0 100644
203--- a/gas/configure.ac 203--- a/gas/configure.ac
204+++ b/gas/configure.ac 204+++ b/gas/configure.ac
205@@ -332,6 +332,9 @@ changequote([,])dnl 205@@ -331,6 +331,9 @@ changequote([,])dnl
206 mipsisa64r6 | mipsisa64r6el) 206 mipsisa64r6 | mipsisa64r6el)
207 mips_cpu=mips64r6 207 mips_cpu=mips64r6
208 ;; 208 ;;
@@ -225,10 +225,19 @@ index 4bd86307120..2d7df22abf2 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 d1b4a2574ac..879c68fcfd4 100644 228index 9add3c9d5bf..a99c53f652f 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@@ -1157,7 +1157,7 @@ mips_opcode_32bit_p (const struct mips_opcode *mo)
232 #define INSN_ISA32R3 8
233 #define INSN_ISA32R5 9
234 #define INSN_ISA32R6 10
235-#define INSN_ISA64 11
236+#define INSN_ISA64 11
237 #define INSN_ISA64R2 12
238 #define INSN_ISA64R3 13
239 #define INSN_ISA64R5 14
240@@ -1265,6 +1265,8 @@ static const unsigned int mips_isa_table[] = {
232 #define INSN_XLR 0x00000020 241 #define INSN_XLR 0x00000020
233 /* Imagination interAptiv MR2. */ 242 /* Imagination interAptiv MR2. */
234 #define INSN_INTERAPTIV_MR2 0x04000000 243 #define INSN_INTERAPTIV_MR2 0x04000000
@@ -237,7 +246,7 @@ index d1b4a2574ac..879c68fcfd4 100644
237 246
238 /* DSP ASE */ 247 /* DSP ASE */
239 #define ASE_DSP 0x00000001 248 #define ASE_DSP 0x00000001
240@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { 249@@ -1389,6 +1391,7 @@ static const unsigned int mips_isa_table[] = {
241 #define CPU_OCTEON3 6503 250 #define CPU_OCTEON3 6503
242 #define CPU_XLR 887682 /* decimal 'XLR' */ 251 #define CPU_XLR 887682 /* decimal 'XLR' */
243 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ 252 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */
@@ -245,21 +254,21 @@ index d1b4a2574ac..879c68fcfd4 100644
245 254
246 /* Return true if the given CPU is included in INSN_* mask MASK. */ 255 /* Return true if the given CPU is included in INSN_* mask MASK. */
247 256
248@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) 257@@ -1459,6 +1462,9 @@ cpu_is_member (int cpu, unsigned int mask)
249 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) 258 case CPU_INTERAPTIV_MR2:
250 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); 259 return (mask & INSN_INTERAPTIV_MR2) != 0;
251 260
252+ case CPU_XLP: 261+ case CPU_XLP:
253+ return (mask & INSN_XLP) != 0; 262+ return (mask & INSN_XLP) != 0;
254+ 263+
255 default: 264 default:
256 return FALSE; 265 return false;
257 } 266 }
258diff --git a/ld/configure.tgt b/ld/configure.tgt 267diff --git a/ld/configure.tgt b/ld/configure.tgt
259index 47431770a17..f714744eab3 100644 268index c08533658e5..7abf32215c2 100644
260--- a/ld/configure.tgt 269--- a/ld/configure.tgt
261+++ b/ld/configure.tgt 270+++ b/ld/configure.tgt
262@@ -510,6 +510,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) 271@@ -509,6 +509,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
263 targ_emul=elf32btsmip 272 targ_emul=elf32btsmip
264 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" 273 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
265 ;; 274 ;;
@@ -270,10 +279,10 @@ index 47431770a17..f714744eab3 100644
270 targ_extra_emuls="elf32lr5900" 279 targ_extra_emuls="elf32lr5900"
271 targ_extra_libpath=$targ_extra_emuls 280 targ_extra_libpath=$targ_extra_emuls
272diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c 281diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
273index 317ced51204..6869f890656 100644 282index 591caf11e28..00120afed47 100644
274--- a/opcodes/mips-dis.c 283--- a/opcodes/mips-dis.c
275+++ b/opcodes/mips-dis.c 284+++ b/opcodes/mips-dis.c
276@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = 285@@ -698,13 +698,11 @@ const struct mips_arch_choice mips_arch_choices[] =
277 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), 286 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
278 mips_cp1_names_mips3264, mips_hwr_names_numeric }, 287 mips_cp1_names_mips3264, mips_hwr_names_numeric },
279 288
@@ -293,10 +302,10 @@ index 317ced51204..6869f890656 100644
293 /* This entry, mips16, is here only for ISA/processor selection; do 302 /* This entry, mips16, is here only for ISA/processor selection; do
294 not print its name. */ 303 not print its name. */
295diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c 304diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
296index b45eb40bf69..2f4eb5c0354 100644 305index db72c039bfd..ff2fa614de1 100644
297--- a/opcodes/mips-opc.c 306--- a/opcodes/mips-opc.c
298+++ b/opcodes/mips-opc.c 307+++ b/opcodes/mips-opc.c
299@@ -328,6 +328,7 @@ decode_mips_operand (const char *p) 308@@ -329,6 +329,7 @@ decode_mips_operand (const char *p)
300 #define IOCT3 INSN_OCTEON3 309 #define IOCT3 INSN_OCTEON3
301 #define XLR INSN_XLR 310 #define XLR INSN_XLR
302 #define IAMR2 INSN_INTERAPTIV_MR2 311 #define IAMR2 INSN_INTERAPTIV_MR2
@@ -304,15 +313,15 @@ index b45eb40bf69..2f4eb5c0354 100644
304 #define IVIRT ASE_VIRT 313 #define IVIRT ASE_VIRT
305 #define IVIRT64 ASE_VIRT64 314 #define IVIRT64 ASE_VIRT64
306 315
307@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 316@@ -991,6 +992,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
308 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 317 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
309 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, 318 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 },
310 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 319 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
311+{"crc", "d,s,t", 0x7000001c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, 320+{"crc", "d,s,t", 0x7000001c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },
312 /* ctc0 is at the bottom of the table. */ 321 /* ctc0 is at the bottom of the table. */
313 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 322 {"ctc1", "t,g", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
314 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 323 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
315@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 324@@ -1023,12 +1025,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
316 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, 325 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 },
317 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, 326 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 },
318 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, 327 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 },
@@ -327,7 +336,7 @@ index b45eb40bf69..2f4eb5c0354 100644
327 /* dctr and dctw are used on the r5000. */ 336 /* dctr and dctw are used on the r5000. */
328 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 337 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
329 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 338 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
330@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 339@@ -1100,6 +1103,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
331 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, 340 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 },
332 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 341 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
333 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 342 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
@@ -335,16 +344,16 @@ index b45eb40bf69..2f4eb5c0354 100644
335 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, 344 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
336 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, 345 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
337 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, 346 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },
338@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = 347@@ -1113,6 +1117,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
339 /* dmfc3 is at the bottom of the table. */ 348 /* dmfc2 is at the bottom of the table. */
340 /* dmtc3 is at the bottom of the table. */ 349 /* dmtc2 is at the bottom of the table. */
341 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 350 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
342+{"dmtur", "t,d", 0x7000001f, 0xffe007ff, RD_1, 0, XLP, 0, 0 }, 351+{"dmtur", "t,d", 0x7000001f, 0xffe007ff, RD_1, 0, XLP, 0, 0 },
343+{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, 352+{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },
344 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 353 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
345 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, 354 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
346 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, 355 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },
347@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 356@@ -1266,9 +1272,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
348 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, 357 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
349 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, 358 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
350 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, 359 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 },
@@ -357,7 +366,7 @@ index b45eb40bf69..2f4eb5c0354 100644
357 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 366 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
358 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 367 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
359 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, 368 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF },
360@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 369@@ -1437,7 +1443,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
361 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, 370 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 },
362 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, 371 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 },
363 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, 372 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -366,7 +375,7 @@ index b45eb40bf69..2f4eb5c0354 100644
366 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, 375 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 },
367 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, 376 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 },
368 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, 377 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 },
369@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 378@@ -1482,10 +1488,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
370 /* move is at the top of the table. */ 379 /* move is at the top of the table. */
371 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, 380 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 },
372 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, 381 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 },
@@ -382,7 +391,7 @@ index b45eb40bf69..2f4eb5c0354 100644
382 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, 391 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 },
383 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, 392 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 },
384 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, 393 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 },
385@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 394@@ -1535,7 +1544,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
386 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, 395 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 },
387 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, 396 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 },
388 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, 397 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -391,7 +400,7 @@ index b45eb40bf69..2f4eb5c0354 100644
391 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 400 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
392 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, 401 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
393 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 402 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
394@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 403@@ -1977,9 +1986,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
395 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, 404 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37},
396 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, 405 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 },
397 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, 406 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 },
@@ -401,6 +410,6 @@ index b45eb40bf69..2f4eb5c0354 100644
401+{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, 410+{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
402+{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, 411+{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
403+{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, 412+{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
404 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 413 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, I2 },
405 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 414 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, I2 },
406 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, 415 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },
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 1041b7301e..389232c1e3 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,4 +1,4 @@
1From 7f4938d062146e40b4e6d427a5eca6cc6acaaeee Mon Sep 17 00:00:00 2001 1From b77c5a67d4ac2513d0b4bab5e4dd1c33b339689b Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com> 2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500 3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
@@ -11,22 +11,22 @@ 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 bbbadffad8f..72092355e12 100644 14index 13d8b6c3c07..cd979f9c80c 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@@ -6302,8 +6302,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 17@@ -6378,8 +6378,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, EXT, {0}},
20 {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, 0, {0}}, 20 {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}},
21-{"wait", X(31,30), XWCPL_MASK, POWER10, 0, {WC, PL}}, 21-{"wait", X(31,30), XWCPL_MASK, POWER10, 0, {WC, PL}},
22-{"wait", X(31,30), XWC_MASK, POWER9, POWER10, {WC}}, 22-{"wait", X(31,30), XWC_MASK, POWER9, POWER10, {WC}},
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@@ -6363,7 +6361,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { 26@@ -6433,7 +6431,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, EXT, {0}},
29 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 29 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}},
30-{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, 30-{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}},
31+{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9|POWER10, 0, {WC}}, 31+{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9|POWER10, 0, {WC}},
32 32
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 659ae799ad..04f81c6671 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,4 +1,4 @@
1From bb229568e505f2276ca58b72fef6781034fa839f Mon Sep 17 00:00:00 2001 1From 02374940dd34fddd2b04624af3f23e01f9cb81cd 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] Detect 64-bit MIPS targets 4Subject: [PATCH] Detect 64-bit MIPS targets
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 d4067691cf..a75e72105f 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,4 +1,4 @@
1From a1031fca1b6c1348c078bb8a9df6e7d29148dae1 Mon Sep 17 00:00:00 2001 1From fd34d57c9e2a0bff1283a6707062ed4a42476b10 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 17:04:07 +0000 3Date: Sun, 14 Feb 2016 17:04:07 +0000
4Subject: [PATCH] Use libtool 2.4 4Subject: [PATCH] Use libtool 2.4
@@ -9,24 +9,24 @@ Upstream-Status: Pending
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 11---
12 bfd/configure | 1322 +++++++++++++++----- 12 bfd/configure | 1340 +++++++++++++++-----
13 bfd/configure.ac | 2 +- 13 bfd/configure.ac | 2 +-
14 binutils/configure | 1320 +++++++++++++++----- 14 binutils/configure | 1338 +++++++++++++++-----
15 gas/configure | 1320 +++++++++++++++----- 15 gas/configure | 1338 +++++++++++++++-----
16 gprof/configure | 1320 +++++++++++++++----- 16 gprof/configure | 1338 +++++++++++++++-----
17 ld/configure | 1695 ++++++++++++++++++------- 17 ld/configure | 1713 +++++++++++++++++++-------
18 libctf/configure | 1319 +++++++++++++++----- 18 libctf/configure | 1337 +++++++++++++++-----
19 libtool.m4 | 1080 +++++++++++----- 19 libtool.m4 | 1100 +++++++++++------
20 ltmain.sh | 2925 +++++++++++++++++++++++++++++--------------- 20 ltmain.sh | 2925 +++++++++++++++++++++++++++++---------------
21 ltoptions.m4 | 2 +- 21 ltoptions.m4 | 2 +-
22 ltversion.m4 | 12 +- 22 ltversion.m4 | 12 +-
23 lt~obsolete.m4 | 2 +- 23 lt~obsolete.m4 | 2 +-
24 opcodes/configure | 1320 +++++++++++++++----- 24 opcodes/configure | 1338 +++++++++++++++-----
25 zlib/configure | 1320 +++++++++++++++----- 25 zlib/configure | 1338 +++++++++++++++-----
26 14 files changed, 10931 insertions(+), 4028 deletions(-) 26 14 files changed, 10995 insertions(+), 4128 deletions(-)
27 27
28diff --git a/bfd/configure b/bfd/configure 28diff --git a/bfd/configure b/bfd/configure
29index b3665c68c13..376b951d496 100755 29index daa51244369..79d0c4b4623 100755
30--- a/bfd/configure 30--- a/bfd/configure
31+++ b/bfd/configure 31+++ b/bfd/configure
32@@ -705,6 +705,9 @@ OTOOL 32@@ -705,6 +705,9 @@ OTOOL
@@ -47,7 +47,7 @@ index b3665c68c13..376b951d496 100755
47 enable_libtool_lock 47 enable_libtool_lock
48 enable_plugins 48 enable_plugins
49 enable_largefile 49 enable_largefile
50@@ -1505,6 +1509,8 @@ Optional Packages: 50@@ -1507,6 +1511,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 b3665c68c13..376b951d496 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@@ -5694,8 +5700,8 @@ esac 59@@ -4988,8 +4994,8 @@ esac
60 60
61 61
62 62
@@ -67,7 +67,7 @@ index b3665c68c13..376b951d496 100755
67 67
68 68
69 69
70@@ -5735,7 +5741,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 70@@ -5029,7 +5035,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 b3665c68c13..376b951d496 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@@ -6421,8 +6427,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 79@@ -5715,8 +5721,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 b3665c68c13..376b951d496 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@@ -6471,6 +6477,80 @@ esac 90@@ -5765,6 +5771,80 @@ esac
91 91
92 92
93 93
@@ -168,7 +168,7 @@ index b3665c68c13..376b951d496 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@@ -6487,6 +6567,11 @@ case $reload_flag in 171@@ -5781,6 +5861,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 b3665c68c13..376b951d496 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@@ -6655,7 +6740,8 @@ mingw* | pw32*) 183@@ -5949,7 +6034,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 b3665c68c13..376b951d496 100755
190 lt_cv_file_magic_cmd='$OBJDUMP -f' 190 lt_cv_file_magic_cmd='$OBJDUMP -f'
191 fi 191 fi
192 ;; 192 ;;
193@@ -6809,6 +6895,21 @@ esac 193@@ -6103,6 +6189,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 b3665c68c13..376b951d496 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@@ -6822,11 +6923,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 215@@ -6118,6 +6219,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
216 216
217 217
218 218
@@ -226,11 +226,7 @@ index b3665c68c13..376b951d496 100755
226+ 226+
227+ 227+
228+ 228+
229 229+if test -n "$ac_tool_prefix"; then
230
231 if test -n "$ac_tool_prefix"; then
232- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
233-set dummy ${ac_tool_prefix}ar; ac_word=$2
234+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 230+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
235+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 231+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
236+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 232+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -371,7 +367,15 @@ index b3665c68c13..376b951d496 100755
371+ 367+
372+ 368+
373+ 369+
374+if test -n "$ac_tool_prefix"; then 370 plugin_option=
371 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
372 for plugin in $plugin_names; do
373@@ -6132,8 +6384,10 @@ for plugin in $plugin_names; do
374 done
375
376 if test -n "$ac_tool_prefix"; then
377- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
378-set dummy ${ac_tool_prefix}ar; ac_word=$2
375+ for ac_prog in ar 379+ for ac_prog in ar
376+ do 380+ do
377+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 381+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -379,7 +383,7 @@ index b3665c68c13..376b951d496 100755
379 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 383 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
380 $as_echo_n "checking for $ac_word... " >&6; } 384 $as_echo_n "checking for $ac_word... " >&6; }
381 if ${ac_cv_prog_AR+:} false; then : 385 if ${ac_cv_prog_AR+:} false; then :
382@@ -6842,7 +7096,7 @@ do 386@@ -6149,7 +6403,7 @@ do
383 test -z "$as_dir" && as_dir=. 387 test -z "$as_dir" && as_dir=.
384 for ac_exec_ext in '' $ac_executable_extensions; do 388 for ac_exec_ext in '' $ac_executable_extensions; do
385 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 389 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -388,7 +392,7 @@ index b3665c68c13..376b951d496 100755
388 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 392 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
389 break 2 393 break 2
390 fi 394 fi
391@@ -6862,11 +7116,15 @@ $as_echo "no" >&6; } 395@@ -6169,11 +6423,15 @@ $as_echo "no" >&6; }
392 fi 396 fi
393 397
394 398
@@ -407,7 +411,7 @@ index b3665c68c13..376b951d496 100755
407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 411 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
408 $as_echo_n "checking for $ac_word... " >&6; } 412 $as_echo_n "checking for $ac_word... " >&6; }
409 if ${ac_cv_prog_ac_ct_AR+:} false; then : 413 if ${ac_cv_prog_ac_ct_AR+:} false; then :
410@@ -6882,7 +7140,7 @@ do 414@@ -6189,7 +6447,7 @@ do
411 test -z "$as_dir" && as_dir=. 415 test -z "$as_dir" && as_dir=.
412 for ac_exec_ext in '' $ac_executable_extensions; do 416 for ac_exec_ext in '' $ac_executable_extensions; do
413 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 417 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -416,7 +420,7 @@ index b3665c68c13..376b951d496 100755
416 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 420 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
417 break 2 421 break 2
418 fi 422 fi
419@@ -6901,6 +7159,10 @@ else 423@@ -6208,6 +6466,10 @@ else
420 $as_echo "no" >&6; } 424 $as_echo "no" >&6; }
421 fi 425 fi
422 426
@@ -427,7 +431,7 @@ index b3665c68c13..376b951d496 100755
427 if test "x$ac_ct_AR" = x; then 431 if test "x$ac_ct_AR" = x; then
428 AR="false" 432 AR="false"
429 else 433 else
430@@ -6912,16 +7174,72 @@ ac_tool_warned=yes ;; 434@@ -6219,25 +6481,20 @@ ac_tool_warned=yes ;;
431 esac 435 esac
432 AR=$ac_ct_AR 436 AR=$ac_ct_AR
433 fi 437 fi
@@ -436,20 +440,37 @@ index b3665c68c13..376b951d496 100755
436 fi 440 fi
437 441
438-test -z "$AR" && AR=ar 442-test -z "$AR" && AR=ar
443-if test -n "$plugin_option"; then
444- if $AR --help 2>&1 | grep -q "\--plugin"; then
445- touch conftest.c
446- $AR $plugin_option rc conftest.a conftest.c
447- if test "$?" != 0; then
448- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
449+ touch conftest.c
450+ $AR $plugin_option rc conftest.a conftest.c
451+ if test "$?" != 0; then
452+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
453 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
454- else
455- AR="$AR $plugin_option"
456- fi
457- rm -f conftest.*
458+ else
459+ AR="$AR $plugin_option"
460 fi
461-fi
439-test -z "$AR_FLAGS" && AR_FLAGS=cru 462-test -z "$AR_FLAGS" && AR_FLAGS=cru
463+ rm -f conftest.*
440+: ${AR=ar} 464+: ${AR=ar}
441+: ${AR_FLAGS=cru} 465+: ${AR_FLAGS=cru}
442+ 466+
443+ 467
444+ 468
445+ 469
446+ 470@@ -6248,6 +6505,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
447+ 471
448+ 472
449+ 473
450+
451+
452+
453+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 474+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
454+$as_echo_n "checking for archiver @FILE support... " >&6; } 475+$as_echo_n "checking for archiver @FILE support... " >&6; }
455+if ${lt_cv_ar_at_file+:} false; then : 476+if ${lt_cv_ar_at_file+:} false; then :
@@ -462,7 +483,7 @@ index b3665c68c13..376b951d496 100755
462+int 483+int
463+main () 484+main ()
464+{ 485+{
465 486+
466+ ; 487+ ;
467+ return 0; 488+ return 0;
468+} 489+}
@@ -488,23 +509,29 @@ index b3665c68c13..376b951d496 100755
488+ fi 509+ fi
489+ fi 510+ fi
490+ rm -f conftest.* libconftest.a 511+ rm -f conftest.* libconftest.a
491 512+
492+fi 513+fi
493+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 514+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
494 515+
495+fi 516+fi
496+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 517+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
497+$as_echo "$lt_cv_ar_at_file" >&6; } 518+$as_echo "$lt_cv_ar_at_file" >&6; }
498 519+
499+if test "x$lt_cv_ar_at_file" = xno; then 520+if test "x$lt_cv_ar_at_file" = xno; then
500+ archiver_list_spec= 521+ archiver_list_spec=
501+else 522+else
502+ archiver_list_spec=$lt_cv_ar_at_file 523+ archiver_list_spec=$lt_cv_ar_at_file
503+fi 524+fi
525+
526+
527+
528+
529+
530+
504 531
505 532 if test -n "$ac_tool_prefix"; then
506 533 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
507@@ -7263,8 +7581,8 @@ esac 534@@ -6588,8 +6902,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'" 535 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
509 536
510 # Transform an extracted symbol line into symbol name and symbol address 537 # Transform an extracted symbol line into symbol name and symbol address
@@ -515,7 +542,7 @@ index b3665c68c13..376b951d496 100755
515 542
516 # Handle CRLF in mingw tool chain 543 # Handle CRLF in mingw tool chain
517 opt_cr= 544 opt_cr=
518@@ -7300,6 +7618,7 @@ for ac_symprfx in "" "_"; do 545@@ -6625,6 +6939,7 @@ for ac_symprfx in "" "_"; do
519 else 546 else
520 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 547 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
521 fi 548 fi
@@ -523,7 +550,7 @@ index b3665c68c13..376b951d496 100755
523 550
524 # Check to see that the pipe works correctly. 551 # Check to see that the pipe works correctly.
525 pipe_works=no 552 pipe_works=no
526@@ -7341,6 +7660,18 @@ _LT_EOF 553@@ -6666,6 +6981,18 @@ _LT_EOF
527 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 554 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
528 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 555 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
529 cat <<_LT_EOF > conftest.$ac_ext 556 cat <<_LT_EOF > conftest.$ac_ext
@@ -542,7 +569,7 @@ index b3665c68c13..376b951d496 100755
542 #ifdef __cplusplus 569 #ifdef __cplusplus
543 extern "C" { 570 extern "C" {
544 #endif 571 #endif
545@@ -7352,7 +7683,7 @@ _LT_EOF 572@@ -6677,7 +7004,7 @@ _LT_EOF
546 cat <<_LT_EOF >> conftest.$ac_ext 573 cat <<_LT_EOF >> conftest.$ac_ext
547 574
548 /* The mapping between symbol names and symbols. */ 575 /* The mapping between symbol names and symbols. */
@@ -551,7 +578,7 @@ index b3665c68c13..376b951d496 100755
551 const char *name; 578 const char *name;
552 void *address; 579 void *address;
553 } 580 }
554@@ -7378,8 +7709,8 @@ static const void *lt_preloaded_setup() { 581@@ -6703,8 +7030,8 @@ static const void *lt_preloaded_setup() {
555 _LT_EOF 582 _LT_EOF
556 # Now try linking the two files. 583 # Now try linking the two files.
557 mv conftest.$ac_objext conftstm.$ac_objext 584 mv conftest.$ac_objext conftstm.$ac_objext
@@ -562,7 +589,7 @@ index b3665c68c13..376b951d496 100755
562 LIBS="conftstm.$ac_objext" 589 LIBS="conftstm.$ac_objext"
563 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 590 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
564 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 591 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
565@@ -7389,8 +7720,8 @@ _LT_EOF 592@@ -6714,8 +7041,8 @@ _LT_EOF
566 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 593 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
567 pipe_works=yes 594 pipe_works=yes
568 fi 595 fi
@@ -573,7 +600,7 @@ index b3665c68c13..376b951d496 100755
573 else 600 else
574 echo "cannot find nm_test_func in $nlist" >&5 601 echo "cannot find nm_test_func in $nlist" >&5
575 fi 602 fi
576@@ -7427,6 +7758,16 @@ else 603@@ -6752,6 +7079,14 @@ else
577 $as_echo "ok" >&6; } 604 $as_echo "ok" >&6; }
578 fi 605 fi
579 606
@@ -585,12 +612,10 @@ index b3665c68c13..376b951d496 100755
585+fi 612+fi
586+ 613+
587+ 614+
588+
589+
590 615
591 616
592 617
593@@ -7443,6 +7784,45 @@ fi 618@@ -6770,6 +7105,47 @@ fi
594 619
595 620
596 621
@@ -633,10 +658,12 @@ index b3665c68c13..376b951d496 100755
633+ 658+
634+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 659+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
635+$as_echo "${lt_sysroot:-no}" >&6; } 660+$as_echo "${lt_sysroot:-no}" >&6; }
661+
662+
636 663
637 664
638 665
639@@ -7654,6 +8034,123 @@ esac 666@@ -6979,6 +7355,123 @@ esac
640 667
641 need_locks="$enable_libtool_lock" 668 need_locks="$enable_libtool_lock"
642 669
@@ -760,7 +787,7 @@ index b3665c68c13..376b951d496 100755
760 787
761 case $host_os in 788 case $host_os in
762 rhapsody* | darwin*) 789 rhapsody* | darwin*)
763@@ -8217,6 +8714,8 @@ _LT_EOF 790@@ -7542,6 +8035,8 @@ _LT_EOF
764 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 791 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
765 echo "$AR cru libconftest.a conftest.o" >&5 792 echo "$AR cru libconftest.a conftest.o" >&5
766 $AR cru libconftest.a conftest.o 2>&5 793 $AR cru libconftest.a conftest.o 2>&5
@@ -769,7 +796,7 @@ index b3665c68c13..376b951d496 100755
769 cat > conftest.c << _LT_EOF 796 cat > conftest.c << _LT_EOF
770 int main() { return 0;} 797 int main() { return 0;}
771 _LT_EOF 798 _LT_EOF
772@@ -8381,7 +8880,8 @@ fi 799@@ -7706,7 +8201,8 @@ fi
773 LIBTOOL_DEPS="$ltmain" 800 LIBTOOL_DEPS="$ltmain"
774 801
775 # Always use our own libtool. 802 # Always use our own libtool.
@@ -779,7 +806,7 @@ index b3665c68c13..376b951d496 100755
779 806
780 807
781 808
782@@ -8470,7 +8970,7 @@ aix3*) 809@@ -7795,7 +8291,7 @@ aix3*)
783 esac 810 esac
784 811
785 # Global variables: 812 # Global variables:
@@ -788,7 +815,7 @@ index b3665c68c13..376b951d496 100755
788 can_build_shared=yes 815 can_build_shared=yes
789 816
790 # All known linkers require a `.a' archive for static linking (except MSVC, 817 # All known linkers require a `.a' archive for static linking (except MSVC,
791@@ -8768,8 +9268,6 @@ fi 818@@ -8093,8 +8589,6 @@ fi
792 lt_prog_compiler_pic= 819 lt_prog_compiler_pic=
793 lt_prog_compiler_static= 820 lt_prog_compiler_static=
794 821
@@ -797,7 +824,7 @@ index b3665c68c13..376b951d496 100755
797 824
798 if test "$GCC" = yes; then 825 if test "$GCC" = yes; then
799 lt_prog_compiler_wl='-Wl,' 826 lt_prog_compiler_wl='-Wl,'
800@@ -8935,6 +9433,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 827@@ -8260,6 +8754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
801 lt_prog_compiler_pic='--shared' 828 lt_prog_compiler_pic='--shared'
802 lt_prog_compiler_static='--static' 829 lt_prog_compiler_static='--static'
803 ;; 830 ;;
@@ -810,7 +837,7 @@ index b3665c68c13..376b951d496 100755
810 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 837 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
811 # Portland Group compilers (*not* the Pentium gcc compiler, 838 # Portland Group compilers (*not* the Pentium gcc compiler,
812 # which looks to be a dead project) 839 # which looks to be a dead project)
813@@ -8997,7 +9501,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 840@@ -8322,7 +8822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
814 lt_prog_compiler_pic='-KPIC' 841 lt_prog_compiler_pic='-KPIC'
815 lt_prog_compiler_static='-Bstatic' 842 lt_prog_compiler_static='-Bstatic'
816 case $cc_basename in 843 case $cc_basename in
@@ -819,7 +846,7 @@ index b3665c68c13..376b951d496 100755
819 lt_prog_compiler_wl='-Qoption ld ';; 846 lt_prog_compiler_wl='-Qoption ld ';;
820 *) 847 *)
821 lt_prog_compiler_wl='-Wl,';; 848 lt_prog_compiler_wl='-Wl,';;
822@@ -9054,13 +9558,17 @@ case $host_os in 849@@ -8379,13 +8879,17 @@ case $host_os in
823 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 850 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
824 ;; 851 ;;
825 esac 852 esac
@@ -843,7 +870,7 @@ index b3665c68c13..376b951d496 100755
843 870
844 # 871 #
845 # Check to make sure the PIC flag actually works. 872 # Check to make sure the PIC flag actually works.
846@@ -9121,6 +9629,11 @@ fi 873@@ -8446,6 +8950,11 @@ fi
847 874
848 875
849 876
@@ -855,7 +882,7 @@ index b3665c68c13..376b951d496 100755
855 # 882 #
856 # Check to make sure the static flag actually works. 883 # Check to make sure the static flag actually works.
857 # 884 #
858@@ -9471,7 +9984,8 @@ _LT_EOF 885@@ -8796,7 +9305,8 @@ _LT_EOF
859 allow_undefined_flag=unsupported 886 allow_undefined_flag=unsupported
860 always_export_symbols=no 887 always_export_symbols=no
861 enable_shared_with_static_runtimes=yes 888 enable_shared_with_static_runtimes=yes
@@ -865,7 +892,7 @@ index b3665c68c13..376b951d496 100755
865 892
866 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 893 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' 894 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
868@@ -9570,12 +10084,12 @@ _LT_EOF 895@@ -8895,12 +9405,12 @@ _LT_EOF
869 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 896 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
870 hardcode_libdir_flag_spec= 897 hardcode_libdir_flag_spec=
871 hardcode_libdir_flag_spec_ld='-rpath $libdir' 898 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -880,7 +907,7 @@ index b3665c68c13..376b951d496 100755
880 fi 907 fi
881 ;; 908 ;;
882 esac 909 esac
883@@ -9589,8 +10103,8 @@ _LT_EOF 910@@ -8914,8 +9424,8 @@ _LT_EOF
884 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 911 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
885 wlarc= 912 wlarc=
886 else 913 else
@@ -891,7 +918,7 @@ index b3665c68c13..376b951d496 100755
891 fi 918 fi
892 ;; 919 ;;
893 920
894@@ -9608,8 +10122,8 @@ _LT_EOF 921@@ -8933,8 +9443,8 @@ _LT_EOF
895 922
896 _LT_EOF 923 _LT_EOF
897 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 924 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -902,7 +929,7 @@ index b3665c68c13..376b951d496 100755
902 else 929 else
903 ld_shlibs=no 930 ld_shlibs=no
904 fi 931 fi
905@@ -9655,8 +10169,8 @@ _LT_EOF 932@@ -8980,8 +9490,8 @@ _LT_EOF
906 933
907 *) 934 *)
908 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 935 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -913,7 +940,7 @@ index b3665c68c13..376b951d496 100755
913 else 940 else
914 ld_shlibs=no 941 ld_shlibs=no
915 fi 942 fi
916@@ -9786,7 +10300,13 @@ _LT_EOF 943@@ -9111,7 +9621,13 @@ _LT_EOF
917 allow_undefined_flag='-berok' 944 allow_undefined_flag='-berok'
918 # Determine the default libpath from the value encoded in an 945 # Determine the default libpath from the value encoded in an
919 # empty executable. 946 # empty executable.
@@ -928,7 +955,7 @@ index b3665c68c13..376b951d496 100755
928 /* end confdefs.h. */ 955 /* end confdefs.h. */
929 956
930 int 957 int
931@@ -9799,22 +10319,29 @@ main () 958@@ -9124,22 +9640,29 @@ main ()
932 _ACEOF 959 _ACEOF
933 if ac_fn_c_try_link "$LINENO"; then : 960 if ac_fn_c_try_link "$LINENO"; then :
934 961
@@ -971,7 +998,7 @@ index b3665c68c13..376b951d496 100755
971 998
972 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 999 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" 1000 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@@ -9826,7 +10353,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1001@@ -9151,7 +9674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
975 else 1002 else
976 # Determine the default libpath from the value encoded in an 1003 # Determine the default libpath from the value encoded in an
977 # empty executable. 1004 # empty executable.
@@ -986,7 +1013,7 @@ index b3665c68c13..376b951d496 100755
986 /* end confdefs.h. */ 1013 /* end confdefs.h. */
987 1014
988 int 1015 int
989@@ -9839,22 +10372,29 @@ main () 1016@@ -9164,22 +9693,29 @@ main ()
990 _ACEOF 1017 _ACEOF
991 if ac_fn_c_try_link "$LINENO"; then : 1018 if ac_fn_c_try_link "$LINENO"; then :
992 1019
@@ -1029,7 +1056,7 @@ index b3665c68c13..376b951d496 100755
1029 1056
1030 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1057 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1031 # Warning - without using the other run time loading flags, 1058 # Warning - without using the other run time loading flags,
1032@@ -9899,20 +10439,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1059@@ -9224,20 +9760,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1033 # Microsoft Visual C++. 1060 # Microsoft Visual C++.
1034 # hardcode_libdir_flag_spec is actually meaningless, as there is 1061 # hardcode_libdir_flag_spec is actually meaningless, as there is
1035 # no search path for DLLs. 1062 # no search path for DLLs.
@@ -1107,7 +1134,7 @@ index b3665c68c13..376b951d496 100755
1107 ;; 1134 ;;
1108 1135
1109 darwin* | rhapsody*) 1136 darwin* | rhapsody*)
1110@@ -9973,7 +10556,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1137@@ -9298,7 +9877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1111 1138
1112 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1139 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1113 freebsd* | dragonfly*) 1140 freebsd* | dragonfly*)
@@ -1116,7 +1143,7 @@ index b3665c68c13..376b951d496 100755
1116 hardcode_libdir_flag_spec='-R$libdir' 1143 hardcode_libdir_flag_spec='-R$libdir'
1117 hardcode_direct=yes 1144 hardcode_direct=yes
1118 hardcode_shlibpath_var=no 1145 hardcode_shlibpath_var=no
1119@@ -9981,7 +10564,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1146@@ -9306,7 +9885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1120 1147
1121 hpux9*) 1148 hpux9*)
1122 if test "$GCC" = yes; then 1149 if test "$GCC" = yes; then
@@ -1125,7 +1152,7 @@ index b3665c68c13..376b951d496 100755
1125 else 1152 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' 1153 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 1154 fi
1128@@ -9997,7 +10580,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1155@@ -9322,7 +9901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1129 1156
1130 hpux10*) 1157 hpux10*)
1131 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1158 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1134,7 +1161,7 @@ index b3665c68c13..376b951d496 100755
1134 else 1161 else
1135 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1162 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1136 fi 1163 fi
1137@@ -10021,10 +10604,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1164@@ -9346,10 +9925,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' 1165 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1139 ;; 1166 ;;
1140 ia64*) 1167 ia64*)
@@ -1147,7 +1174,7 @@ index b3665c68c13..376b951d496 100755
1147 ;; 1174 ;;
1148 esac 1175 esac
1149 else 1176 else
1150@@ -10103,23 +10686,36 @@ fi 1177@@ -9428,23 +10007,36 @@ fi
1151 1178
1152 irix5* | irix6* | nonstopux*) 1179 irix5* | irix6* | nonstopux*)
1153 if test "$GCC" = yes; then 1180 if test "$GCC" = yes; then
@@ -1192,7 +1219,7 @@ index b3665c68c13..376b951d496 100755
1192 else 1219 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' 1220 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' 1221 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@@ -10204,7 +10800,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1222@@ -9529,7 +10121,7 @@ rm -f core conftest.err conftest.$ac_objext \
1196 osf4* | osf5*) # as osf3* with the addition of -msym flag 1223 osf4* | osf5*) # as osf3* with the addition of -msym flag
1197 if test "$GCC" = yes; then 1224 if test "$GCC" = yes; then
1198 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1225 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1201,7 +1228,7 @@ index b3665c68c13..376b951d496 100755
1201 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1228 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1202 else 1229 else
1203 allow_undefined_flag=' -expect_unresolved \*' 1230 allow_undefined_flag=' -expect_unresolved \*'
1204@@ -10223,9 +10819,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1231@@ -9548,9 +10140,9 @@ rm -f core conftest.err conftest.$ac_objext \
1205 no_undefined_flag=' -z defs' 1232 no_undefined_flag=' -z defs'
1206 if test "$GCC" = yes; then 1233 if test "$GCC" = yes; then
1207 wlarc='${wl}' 1234 wlarc='${wl}'
@@ -1213,7 +1240,7 @@ index b3665c68c13..376b951d496 100755
1213 else 1240 else
1214 case `$CC -V 2>&1` in 1241 case `$CC -V 2>&1` in
1215 *"Compilers 5.0"*) 1242 *"Compilers 5.0"*)
1216@@ -10801,8 +11397,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1243@@ -10126,8 +10718,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1217 need_version=no 1244 need_version=no
1218 need_lib_prefix=no 1245 need_lib_prefix=no
1219 1246
@@ -1225,7 +1252,7 @@ index b3665c68c13..376b951d496 100755
1225 library_names_spec='$libname.dll.a' 1252 library_names_spec='$libname.dll.a'
1226 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1253 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1227 postinstall_cmds='base_file=`basename \${file}`~ 1254 postinstall_cmds='base_file=`basename \${file}`~
1228@@ -10835,13 +11432,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1255@@ -10160,13 +10753,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}' 1256 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1230 ;; 1257 ;;
1231 esac 1258 esac
@@ -1298,7 +1325,7 @@ index b3665c68c13..376b951d496 100755
1298 # FIXME: first we should search . and the directory the executable is in 1325 # FIXME: first we should search . and the directory the executable is in
1299 shlibpath_var=PATH 1326 shlibpath_var=PATH
1300 ;; 1327 ;;
1301@@ -10923,7 +11578,7 @@ haiku*) 1328@@ -10248,7 +10899,7 @@ haiku*)
1302 soname_spec='${libname}${release}${shared_ext}$major' 1329 soname_spec='${libname}${release}${shared_ext}$major'
1303 shlibpath_var=LIBRARY_PATH 1330 shlibpath_var=LIBRARY_PATH
1304 shlibpath_overrides_runpath=yes 1331 shlibpath_overrides_runpath=yes
@@ -1307,16 +1334,16 @@ index b3665c68c13..376b951d496 100755
1307 hardcode_into_libs=yes 1334 hardcode_into_libs=yes
1308 ;; 1335 ;;
1309 1336
1310@@ -11719,7 +12374,7 @@ else 1337@@ -11044,7 +11695,7 @@ else
1311 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1338 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1312 lt_status=$lt_dlunknown 1339 lt_status=$lt_dlunknown
1313 cat > conftest.$ac_ext <<_LT_EOF 1340 cat > conftest.$ac_ext <<_LT_EOF
1314-#line 11722 "configure" 1341-#line 11047 "configure"
1315+#line $LINENO "configure" 1342+#line $LINENO "configure"
1316 #include "confdefs.h" 1343 #include "confdefs.h"
1317 1344
1318 #if HAVE_DLFCN_H 1345 #if HAVE_DLFCN_H
1319@@ -11763,10 +12418,10 @@ else 1346@@ -11088,10 +11739,10 @@ else
1320 /* When -fvisbility=hidden is used, assume the code has been annotated 1347 /* When -fvisbility=hidden is used, assume the code has been annotated
1321 correspondingly for the symbols needed. */ 1348 correspondingly for the symbols needed. */
1322 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1349 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1329,16 +1356,16 @@ index b3665c68c13..376b951d496 100755
1329 int main () 1356 int main ()
1330 { 1357 {
1331 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1358 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1332@@ -11825,7 +12480,7 @@ else 1359@@ -11150,7 +11801,7 @@ else
1333 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1360 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1334 lt_status=$lt_dlunknown 1361 lt_status=$lt_dlunknown
1335 cat > conftest.$ac_ext <<_LT_EOF 1362 cat > conftest.$ac_ext <<_LT_EOF
1336-#line 11828 "configure" 1363-#line 11153 "configure"
1337+#line $LINENO "configure" 1364+#line $LINENO "configure"
1338 #include "confdefs.h" 1365 #include "confdefs.h"
1339 1366
1340 #if HAVE_DLFCN_H 1367 #if HAVE_DLFCN_H
1341@@ -11869,10 +12524,10 @@ else 1368@@ -11194,10 +11845,10 @@ else
1342 /* When -fvisbility=hidden is used, assume the code has been annotated 1369 /* When -fvisbility=hidden is used, assume the code has been annotated
1343 correspondingly for the symbols needed. */ 1370 correspondingly for the symbols needed. */
1344 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1371 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1351,16 +1378,16 @@ index b3665c68c13..376b951d496 100755
1351 int main () 1378 int main ()
1352 { 1379 {
1353 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1380 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1354@@ -14599,7 +15254,7 @@ SHARED_LDFLAGS= 1381@@ -13114,7 +13765,7 @@ SHARED_LDFLAGS=
1355 if test "$enable_shared" = "yes"; then 1382 if test "$enable_shared" = "yes"; then
1356 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1383 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1357 if test -n "$x"; then 1384 if test -n "$x"; then
1358- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" 1385- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1359+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" 1386+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1360 fi 1387 fi
1388 fi
1361 1389
1362 case "${host}" in 1390@@ -15762,13 +16413,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"`' 1391 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1365 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1392 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1366 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1393 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1381,7 +1408,7 @@ index b3665c68c13..376b951d496 100755
1381 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1408 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1382 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1409 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1383 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1410 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1384@@ -17220,14 +17882,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1411@@ -15783,14 +16441,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"`' 1412 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"`' 1413 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"`' 1414 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 +1427,7 @@ index b3665c68c13..376b951d496 100755
1400 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1427 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1401 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1428 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1402 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1429 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1403@@ -17260,12 +17925,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1430@@ -15823,12 +16484,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1404 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1431 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1405 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1432 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1406 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1433 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1414,7 +1441,7 @@ index b3665c68c13..376b951d496 100755
1414 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1441 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"`' 1442 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"`' 1443 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1417@@ -17320,8 +17985,13 @@ reload_flag \ 1444@@ -15883,8 +16544,13 @@ reload_flag \
1418 OBJDUMP \ 1445 OBJDUMP \
1419 deplibs_check_method \ 1446 deplibs_check_method \
1420 file_magic_cmd \ 1447 file_magic_cmd \
@@ -1428,7 +1455,7 @@ index b3665c68c13..376b951d496 100755
1428 STRIP \ 1455 STRIP \
1429 RANLIB \ 1456 RANLIB \
1430 CC \ 1457 CC \
1431@@ -17331,12 +18001,14 @@ lt_cv_sys_global_symbol_pipe \ 1458@@ -15894,12 +16560,14 @@ lt_cv_sys_global_symbol_pipe \
1432 lt_cv_sys_global_symbol_to_cdecl \ 1459 lt_cv_sys_global_symbol_to_cdecl \
1433 lt_cv_sys_global_symbol_to_c_name_address \ 1460 lt_cv_sys_global_symbol_to_c_name_address \
1434 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1461 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1444,7 +1471,7 @@ index b3665c68c13..376b951d496 100755
1444 DSYMUTIL \ 1471 DSYMUTIL \
1445 NMEDIT \ 1472 NMEDIT \
1446 LIPO \ 1473 LIPO \
1447@@ -17352,7 +18024,6 @@ no_undefined_flag \ 1474@@ -15915,7 +16583,6 @@ no_undefined_flag \
1448 hardcode_libdir_flag_spec \ 1475 hardcode_libdir_flag_spec \
1449 hardcode_libdir_flag_spec_ld \ 1476 hardcode_libdir_flag_spec_ld \
1450 hardcode_libdir_separator \ 1477 hardcode_libdir_separator \
@@ -1452,7 +1479,7 @@ index b3665c68c13..376b951d496 100755
1452 exclude_expsyms \ 1479 exclude_expsyms \
1453 include_expsyms \ 1480 include_expsyms \
1454 file_list_spec \ 1481 file_list_spec \
1455@@ -17388,6 +18059,7 @@ module_cmds \ 1482@@ -15951,6 +16618,7 @@ module_cmds \
1456 module_expsym_cmds \ 1483 module_expsym_cmds \
1457 export_symbols_cmds \ 1484 export_symbols_cmds \
1458 prelink_cmds \ 1485 prelink_cmds \
@@ -1460,7 +1487,7 @@ index b3665c68c13..376b951d496 100755
1460 postinstall_cmds \ 1487 postinstall_cmds \
1461 postuninstall_cmds \ 1488 postuninstall_cmds \
1462 finish_cmds \ 1489 finish_cmds \
1463@@ -18176,7 +18848,8 @@ $as_echo X"$file" | 1490@@ -16720,7 +17388,8 @@ $as_echo X"$file" |
1464 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1491 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1465 # 1492 #
1466 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1493 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1470,7 +1497,7 @@ index b3665c68c13..376b951d496 100755
1470 # Written by Gordon Matzigkeit, 1996 1497 # Written by Gordon Matzigkeit, 1996
1471 # 1498 #
1472 # This file is part of GNU Libtool. 1499 # This file is part of GNU Libtool.
1473@@ -18279,19 +18952,42 @@ SP2NL=$lt_lt_SP2NL 1500@@ -16823,19 +17492,42 @@ SP2NL=$lt_lt_SP2NL
1474 # turn newlines into spaces. 1501 # turn newlines into spaces.
1475 NL2SP=$lt_lt_NL2SP 1502 NL2SP=$lt_lt_NL2SP
1476 1503
@@ -1514,7 +1541,7 @@ index b3665c68c13..376b951d496 100755
1514 # A symbol stripping program. 1541 # A symbol stripping program.
1515 STRIP=$lt_STRIP 1542 STRIP=$lt_STRIP
1516 1543
1517@@ -18321,6 +19017,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1544@@ -16865,6 +17557,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. 1545 # 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 1546 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1520 1547
@@ -1527,7 +1554,7 @@ index b3665c68c13..376b951d496 100755
1527 # The name of the directory that contains temporary libtool files. 1554 # The name of the directory that contains temporary libtool files.
1528 objdir=$objdir 1555 objdir=$objdir
1529 1556
1530@@ -18330,6 +19032,9 @@ MAGIC_CMD=$MAGIC_CMD 1557@@ -16874,6 +17572,9 @@ MAGIC_CMD=$MAGIC_CMD
1531 # Must we lock files when doing compilation? 1558 # Must we lock files when doing compilation?
1532 need_locks=$lt_need_locks 1559 need_locks=$lt_need_locks
1533 1560
@@ -1537,7 +1564,7 @@ index b3665c68c13..376b951d496 100755
1537 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1564 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1538 DSYMUTIL=$lt_DSYMUTIL 1565 DSYMUTIL=$lt_DSYMUTIL
1539 1566
1540@@ -18444,12 +19149,12 @@ with_gcc=$GCC 1567@@ -16988,12 +17689,12 @@ with_gcc=$GCC
1541 # Compiler flag to turn off builtin functions. 1568 # Compiler flag to turn off builtin functions.
1542 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1569 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1543 1570
@@ -1553,7 +1580,7 @@ index b3665c68c13..376b951d496 100755
1553 # Compiler flag to prevent dynamic linking. 1580 # Compiler flag to prevent dynamic linking.
1554 link_static_flag=$lt_lt_prog_compiler_static 1581 link_static_flag=$lt_lt_prog_compiler_static
1555 1582
1556@@ -18536,9 +19241,6 @@ inherit_rpath=$inherit_rpath 1583@@ -17080,9 +17781,6 @@ inherit_rpath=$inherit_rpath
1557 # Whether libtool must link a program against all its dependency libraries. 1584 # Whether libtool must link a program against all its dependency libraries.
1558 link_all_deplibs=$link_all_deplibs 1585 link_all_deplibs=$link_all_deplibs
1559 1586
@@ -1563,7 +1590,7 @@ index b3665c68c13..376b951d496 100755
1563 # Set to "yes" if exported symbols are required. 1590 # Set to "yes" if exported symbols are required.
1564 always_export_symbols=$always_export_symbols 1591 always_export_symbols=$always_export_symbols
1565 1592
1566@@ -18554,6 +19256,9 @@ include_expsyms=$lt_include_expsyms 1593@@ -17098,6 +17796,9 @@ include_expsyms=$lt_include_expsyms
1567 # Commands necessary for linking programs (against libraries) with templates. 1594 # Commands necessary for linking programs (against libraries) with templates.
1568 prelink_cmds=$lt_prelink_cmds 1595 prelink_cmds=$lt_prelink_cmds
1569 1596
@@ -1573,7 +1600,7 @@ index b3665c68c13..376b951d496 100755
1573 # Specify filename containing input files. 1600 # Specify filename containing input files.
1574 file_list_spec=$lt_file_list_spec 1601 file_list_spec=$lt_file_list_spec
1575 1602
1576@@ -18586,210 +19291,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1603@@ -17130,210 +17831,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1577 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1604 # 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 1605 # text mode, it properly converts lines to CR/LF. This bash problem
1579 # is reportedly fixed, but why not run on old versions too? 1606 # is reportedly fixed, but why not run on old versions too?
@@ -1948,23 +1975,23 @@ index b3665c68c13..376b951d496 100755
1948 chmod +x "$ofile" 1975 chmod +x "$ofile"
1949 1976
1950diff --git a/bfd/configure.ac b/bfd/configure.ac 1977diff --git a/bfd/configure.ac b/bfd/configure.ac
1951index 0797a08ff37..133d714cf18 100644 1978index 07a75ed1626..288374c504c 100644
1952--- a/bfd/configure.ac 1979--- a/bfd/configure.ac
1953+++ b/bfd/configure.ac 1980+++ b/bfd/configure.ac
1954@@ -315,7 +315,7 @@ changequote(,)dnl 1981@@ -304,7 +304,7 @@ changequote(,)dnl
1955 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1982 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1956 changequote([,])dnl 1983 changequote([,])dnl
1957 if test -n "$x"; then 1984 if test -n "$x"; then
1958- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" 1985- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1959+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" 1986+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1960 fi 1987 fi
1988 fi
1961 1989
1962 case "${host}" in
1963diff --git a/binutils/configure b/binutils/configure 1990diff --git a/binutils/configure b/binutils/configure
1964index 83b4b0172db..2154238189e 100755 1991index bf6461dab1e..8e6f6d30b4d 100755
1965--- a/binutils/configure 1992--- a/binutils/configure
1966+++ b/binutils/configure 1993+++ b/binutils/configure
1967@@ -697,8 +697,11 @@ OTOOL 1994@@ -696,8 +696,11 @@ OTOOL
1968 LIPO 1995 LIPO
1969 NMEDIT 1996 NMEDIT
1970 DSYMUTIL 1997 DSYMUTIL
@@ -1976,7 +2003,7 @@ index 83b4b0172db..2154238189e 100755
1976 OBJDUMP 2003 OBJDUMP
1977 LN_S 2004 LN_S
1978 NM 2005 NM
1979@@ -815,6 +818,7 @@ enable_static 2006@@ -814,6 +817,7 @@ enable_static
1980 with_pic 2007 with_pic
1981 enable_fast_install 2008 enable_fast_install
1982 with_gnu_ld 2009 with_gnu_ld
@@ -1984,7 +2011,7 @@ index 83b4b0172db..2154238189e 100755
1984 enable_libtool_lock 2011 enable_libtool_lock
1985 enable_plugins 2012 enable_plugins
1986 enable_largefile 2013 enable_largefile
1987@@ -1504,6 +1508,8 @@ Optional Packages: 2014@@ -1509,6 +1513,8 @@ Optional Packages:
1988 --with-pic try to use only PIC/non-PIC objects [default=use 2015 --with-pic try to use only PIC/non-PIC objects [default=use
1989 both] 2016 both]
1990 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 2017 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -1993,7 +2020,7 @@ index 83b4b0172db..2154238189e 100755
1993 --with-debuginfod Enable debuginfo lookups with debuginfod 2020 --with-debuginfod Enable debuginfo lookups with debuginfod
1994 (auto/yes/no) 2021 (auto/yes/no)
1995 --with-system-zlib use installed libz 2022 --with-system-zlib use installed libz
1996@@ -5490,8 +5496,8 @@ esac 2023@@ -4844,8 +4850,8 @@ esac
1997 2024
1998 2025
1999 2026
@@ -2004,7 +2031,7 @@ index 83b4b0172db..2154238189e 100755
2004 2031
2005 2032
2006 2033
2007@@ -5531,7 +5537,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2034@@ -4885,7 +4891,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2008 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2035 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2009 $as_echo_n "checking how to print strings... " >&6; } 2036 $as_echo_n "checking how to print strings... " >&6; }
2010 # Test print first, because it will be a builtin if present. 2037 # Test print first, because it will be a builtin if present.
@@ -2013,7 +2040,7 @@ index 83b4b0172db..2154238189e 100755
2013 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2040 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2014 ECHO='print -r --' 2041 ECHO='print -r --'
2015 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2042 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2016@@ -6217,8 +6223,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2043@@ -5571,8 +5577,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2017 # Try some XSI features 2044 # Try some XSI features
2018 xsi_shell=no 2045 xsi_shell=no
2019 ( _lt_dummy="a/b/c" 2046 ( _lt_dummy="a/b/c"
@@ -2024,7 +2051,7 @@ index 83b4b0172db..2154238189e 100755
2024 && eval 'test $(( 1 + 1 )) -eq 2 \ 2051 && eval 'test $(( 1 + 1 )) -eq 2 \
2025 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2052 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2026 && xsi_shell=yes 2053 && xsi_shell=yes
2027@@ -6267,6 +6273,80 @@ esac 2054@@ -5621,6 +5627,80 @@ esac
2028 2055
2029 2056
2030 2057
@@ -2105,7 +2132,7 @@ index 83b4b0172db..2154238189e 100755
2105 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2132 { $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; } 2133 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2107 if ${lt_cv_ld_reload_flag+:} false; then : 2134 if ${lt_cv_ld_reload_flag+:} false; then :
2108@@ -6283,6 +6363,11 @@ case $reload_flag in 2135@@ -5637,6 +5717,11 @@ case $reload_flag in
2109 esac 2136 esac
2110 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2137 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2111 case $host_os in 2138 case $host_os in
@@ -2117,7 +2144,7 @@ index 83b4b0172db..2154238189e 100755
2117 darwin*) 2144 darwin*)
2118 if test "$GCC" = yes; then 2145 if test "$GCC" = yes; then
2119 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2146 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2120@@ -6451,7 +6536,8 @@ mingw* | pw32*) 2147@@ -5805,7 +5890,8 @@ mingw* | pw32*)
2121 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2148 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2122 lt_cv_file_magic_cmd='func_win32_libid' 2149 lt_cv_file_magic_cmd='func_win32_libid'
2123 else 2150 else
@@ -2127,7 +2154,7 @@ index 83b4b0172db..2154238189e 100755
2127 lt_cv_file_magic_cmd='$OBJDUMP -f' 2154 lt_cv_file_magic_cmd='$OBJDUMP -f'
2128 fi 2155 fi
2129 ;; 2156 ;;
2130@@ -6605,6 +6691,21 @@ esac 2157@@ -5959,6 +6045,21 @@ esac
2131 fi 2158 fi
2132 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2159 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2133 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2160 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2149,7 +2176,7 @@ index 83b4b0172db..2154238189e 100755
2149 file_magic_cmd=$lt_cv_file_magic_cmd 2176 file_magic_cmd=$lt_cv_file_magic_cmd
2150 deplibs_check_method=$lt_cv_deplibs_check_method 2177 deplibs_check_method=$lt_cv_deplibs_check_method
2151 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2178 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2152@@ -6620,9 +6721,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2179@@ -5974,6 +6075,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2153 2180
2154 2181
2155 2182
@@ -2304,6 +2331,12 @@ index 83b4b0172db..2154238189e 100755
2304+ 2331+
2305+ 2332+
2306+ 2333+
2334 plugin_option=
2335 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
2336 for plugin in $plugin_names; do
2337@@ -5988,8 +6240,10 @@ for plugin in $plugin_names; do
2338 done
2339
2307 if test -n "$ac_tool_prefix"; then 2340 if test -n "$ac_tool_prefix"; then
2308- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 2341- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2309-set dummy ${ac_tool_prefix}ar; ac_word=$2 2342-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -2314,7 +2347,7 @@ index 83b4b0172db..2154238189e 100755
2314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2347 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2315 $as_echo_n "checking for $ac_word... " >&6; } 2348 $as_echo_n "checking for $ac_word... " >&6; }
2316 if ${ac_cv_prog_AR+:} false; then : 2349 if ${ac_cv_prog_AR+:} false; then :
2317@@ -6638,7 +6892,7 @@ do 2350@@ -6005,7 +6259,7 @@ do
2318 test -z "$as_dir" && as_dir=. 2351 test -z "$as_dir" && as_dir=.
2319 for ac_exec_ext in '' $ac_executable_extensions; do 2352 for ac_exec_ext in '' $ac_executable_extensions; do
2320 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2353 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2323,7 +2356,7 @@ index 83b4b0172db..2154238189e 100755
2323 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2356 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2324 break 2 2357 break 2
2325 fi 2358 fi
2326@@ -6658,11 +6912,15 @@ $as_echo "no" >&6; } 2359@@ -6025,11 +6279,15 @@ $as_echo "no" >&6; }
2327 fi 2360 fi
2328 2361
2329 2362
@@ -2342,7 +2375,7 @@ index 83b4b0172db..2154238189e 100755
2342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2375 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2343 $as_echo_n "checking for $ac_word... " >&6; } 2376 $as_echo_n "checking for $ac_word... " >&6; }
2344 if ${ac_cv_prog_ac_ct_AR+:} false; then : 2377 if ${ac_cv_prog_ac_ct_AR+:} false; then :
2345@@ -6678,7 +6936,7 @@ do 2378@@ -6045,7 +6303,7 @@ do
2346 test -z "$as_dir" && as_dir=. 2379 test -z "$as_dir" && as_dir=.
2347 for ac_exec_ext in '' $ac_executable_extensions; do 2380 for ac_exec_ext in '' $ac_executable_extensions; do
2348 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2381 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -2351,7 +2384,7 @@ index 83b4b0172db..2154238189e 100755
2351 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2384 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2352 break 2 2385 break 2
2353 fi 2386 fi
2354@@ -6697,6 +6955,10 @@ else 2387@@ -6064,6 +6322,10 @@ else
2355 $as_echo "no" >&6; } 2388 $as_echo "no" >&6; }
2356 fi 2389 fi
2357 2390
@@ -2362,7 +2395,7 @@ index 83b4b0172db..2154238189e 100755
2362 if test "x$ac_ct_AR" = x; then 2395 if test "x$ac_ct_AR" = x; then
2363 AR="false" 2396 AR="false"
2364 else 2397 else
2365@@ -6708,12 +6970,10 @@ ac_tool_warned=yes ;; 2398@@ -6075,29 +6337,81 @@ ac_tool_warned=yes ;;
2366 esac 2399 esac
2367 AR=$ac_ct_AR 2400 AR=$ac_ct_AR
2368 fi 2401 fi
@@ -2371,16 +2404,40 @@ index 83b4b0172db..2154238189e 100755
2371 fi 2404 fi
2372 2405
2373-test -z "$AR" && AR=ar 2406-test -z "$AR" && AR=ar
2407-if test -n "$plugin_option"; then
2408- if $AR --help 2>&1 | grep -q "\--plugin"; then
2409- touch conftest.c
2410- $AR $plugin_option rc conftest.a conftest.c
2411- if test "$?" != 0; then
2412- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
2413+ touch conftest.c
2414+ $AR $plugin_option rc conftest.a conftest.c
2415+ if test "$?" != 0; then
2416+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
2417 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
2418- else
2419- AR="$AR $plugin_option"
2420- fi
2421- rm -f conftest.*
2422+ else
2423+ AR="$AR $plugin_option"
2424 fi
2425-fi
2374-test -z "$AR_FLAGS" && AR_FLAGS=cru 2426-test -z "$AR_FLAGS" && AR_FLAGS=cru
2427+ rm -f conftest.*
2375+: ${AR=ar} 2428+: ${AR=ar}
2376+: ${AR_FLAGS=cru} 2429+: ${AR_FLAGS=cru}
2377 2430+
2378 2431+
2379 2432+
2380@@ -6725,6 +6985,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 2433+
2381 2434+
2382 2435+
2383 2436+
2437+
2438+
2439+
2440+
2384+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 2441+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2385+$as_echo_n "checking for archiver @FILE support... " >&6; } 2442+$as_echo_n "checking for archiver @FILE support... " >&6; }
2386+if ${lt_cv_ar_at_file+:} false; then : 2443+if ${lt_cv_ar_at_file+:} false; then :
@@ -2393,7 +2450,7 @@ index 83b4b0172db..2154238189e 100755
2393+int 2450+int
2394+main () 2451+main ()
2395+{ 2452+{
2396+ 2453
2397+ ; 2454+ ;
2398+ return 0; 2455+ return 0;
2399+} 2456+}
@@ -2419,30 +2476,23 @@ index 83b4b0172db..2154238189e 100755
2419+ fi 2476+ fi
2420+ fi 2477+ fi
2421+ rm -f conftest.* libconftest.a 2478+ rm -f conftest.* libconftest.a
2422+ 2479
2423+fi 2480+fi
2424+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 2481+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2425+ 2482
2426+fi 2483+fi
2427+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 2484+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2428+$as_echo "$lt_cv_ar_at_file" >&6; } 2485+$as_echo "$lt_cv_ar_at_file" >&6; }
2429+ 2486
2430+if test "x$lt_cv_ar_at_file" = xno; then 2487+if test "x$lt_cv_ar_at_file" = xno; then
2431+ archiver_list_spec= 2488+ archiver_list_spec=
2432+else 2489+else
2433+ archiver_list_spec=$lt_cv_ar_at_file 2490+ archiver_list_spec=$lt_cv_ar_at_file
2434+fi 2491+fi
2435+ 2492
2436+ 2493
2437+ 2494
2438+ 2495@@ -6444,8 +6758,8 @@ esac
2439+
2440+
2441+
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.
2444 set dummy ${ac_tool_prefix}strip; ac_word=$2
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'" 2496 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2447 2497
2448 # Transform an extracted symbol line into symbol name and symbol address 2498 # Transform an extracted symbol line into symbol name and symbol address
@@ -2453,7 +2503,7 @@ index 83b4b0172db..2154238189e 100755
2453 2503
2454 # Handle CRLF in mingw tool chain 2504 # Handle CRLF in mingw tool chain
2455 opt_cr= 2505 opt_cr=
2456@@ -7096,6 +7414,7 @@ for ac_symprfx in "" "_"; do 2506@@ -6481,6 +6795,7 @@ for ac_symprfx in "" "_"; do
2457 else 2507 else
2458 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2508 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2459 fi 2509 fi
@@ -2461,7 +2511,7 @@ index 83b4b0172db..2154238189e 100755
2461 2511
2462 # Check to see that the pipe works correctly. 2512 # Check to see that the pipe works correctly.
2463 pipe_works=no 2513 pipe_works=no
2464@@ -7137,6 +7456,18 @@ _LT_EOF 2514@@ -6522,6 +6837,18 @@ _LT_EOF
2465 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2515 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2466 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2516 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2467 cat <<_LT_EOF > conftest.$ac_ext 2517 cat <<_LT_EOF > conftest.$ac_ext
@@ -2480,7 +2530,7 @@ index 83b4b0172db..2154238189e 100755
2480 #ifdef __cplusplus 2530 #ifdef __cplusplus
2481 extern "C" { 2531 extern "C" {
2482 #endif 2532 #endif
2483@@ -7148,7 +7479,7 @@ _LT_EOF 2533@@ -6533,7 +6860,7 @@ _LT_EOF
2484 cat <<_LT_EOF >> conftest.$ac_ext 2534 cat <<_LT_EOF >> conftest.$ac_ext
2485 2535
2486 /* The mapping between symbol names and symbols. */ 2536 /* The mapping between symbol names and symbols. */
@@ -2489,7 +2539,7 @@ index 83b4b0172db..2154238189e 100755
2489 const char *name; 2539 const char *name;
2490 void *address; 2540 void *address;
2491 } 2541 }
2492@@ -7174,8 +7505,8 @@ static const void *lt_preloaded_setup() { 2542@@ -6559,8 +6886,8 @@ static const void *lt_preloaded_setup() {
2493 _LT_EOF 2543 _LT_EOF
2494 # Now try linking the two files. 2544 # Now try linking the two files.
2495 mv conftest.$ac_objext conftstm.$ac_objext 2545 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2500,7 +2550,7 @@ index 83b4b0172db..2154238189e 100755
2500 LIBS="conftstm.$ac_objext" 2550 LIBS="conftstm.$ac_objext"
2501 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2551 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2502 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2552 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2503@@ -7185,8 +7516,8 @@ _LT_EOF 2553@@ -6570,8 +6897,8 @@ _LT_EOF
2504 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2554 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2505 pipe_works=yes 2555 pipe_works=yes
2506 fi 2556 fi
@@ -2511,7 +2561,7 @@ index 83b4b0172db..2154238189e 100755
2511 else 2561 else
2512 echo "cannot find nm_test_func in $nlist" >&5 2562 echo "cannot find nm_test_func in $nlist" >&5
2513 fi 2563 fi
2514@@ -7223,6 +7554,21 @@ else 2564@@ -6608,6 +6935,19 @@ else
2515 $as_echo "ok" >&6; } 2565 $as_echo "ok" >&6; }
2516 fi 2566 fi
2517 2567
@@ -2528,17 +2578,17 @@ index 83b4b0172db..2154238189e 100755
2528+ 2578+
2529+ 2579+
2530+ 2580+
2531+
2532+
2533 2581
2534 2582
2535 2583
2536@@ -7239,6 +7585,40 @@ fi 2584@@ -6624,6 +6964,42 @@ fi
2537 2585
2538 2586
2539 2587
2540+ 2588+
2541+ 2589+
2590+
2591+
2542+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 2592+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2543+$as_echo_n "checking for sysroot... " >&6; } 2593+$as_echo_n "checking for sysroot... " >&6; }
2544+ 2594+
@@ -2574,7 +2624,7 @@ index 83b4b0172db..2154238189e 100755
2574 2624
2575 2625
2576 2626
2577@@ -7450,6 +7830,123 @@ esac 2627@@ -6835,6 +7211,123 @@ esac
2578 2628
2579 need_locks="$enable_libtool_lock" 2629 need_locks="$enable_libtool_lock"
2580 2630
@@ -2698,7 +2748,7 @@ index 83b4b0172db..2154238189e 100755
2698 2748
2699 case $host_os in 2749 case $host_os in
2700 rhapsody* | darwin*) 2750 rhapsody* | darwin*)
2701@@ -8013,6 +8510,8 @@ _LT_EOF 2751@@ -7398,6 +7891,8 @@ _LT_EOF
2702 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2752 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2703 echo "$AR cru libconftest.a conftest.o" >&5 2753 echo "$AR cru libconftest.a conftest.o" >&5
2704 $AR cru libconftest.a conftest.o 2>&5 2754 $AR cru libconftest.a conftest.o 2>&5
@@ -2707,7 +2757,7 @@ index 83b4b0172db..2154238189e 100755
2707 cat > conftest.c << _LT_EOF 2757 cat > conftest.c << _LT_EOF
2708 int main() { return 0;} 2758 int main() { return 0;}
2709 _LT_EOF 2759 _LT_EOF
2710@@ -8208,7 +8707,8 @@ fi 2760@@ -7593,7 +8088,8 @@ fi
2711 LIBTOOL_DEPS="$ltmain" 2761 LIBTOOL_DEPS="$ltmain"
2712 2762
2713 # Always use our own libtool. 2763 # Always use our own libtool.
@@ -2717,7 +2767,7 @@ index 83b4b0172db..2154238189e 100755
2717 2767
2718 2768
2719 2769
2720@@ -8297,7 +8797,7 @@ aix3*) 2770@@ -7682,7 +8178,7 @@ aix3*)
2721 esac 2771 esac
2722 2772
2723 # Global variables: 2773 # Global variables:
@@ -2726,7 +2776,7 @@ index 83b4b0172db..2154238189e 100755
2726 can_build_shared=yes 2776 can_build_shared=yes
2727 2777
2728 # All known linkers require a `.a' archive for static linking (except MSVC, 2778 # All known linkers require a `.a' archive for static linking (except MSVC,
2729@@ -8595,8 +9095,6 @@ fi 2779@@ -7980,8 +8476,6 @@ fi
2730 lt_prog_compiler_pic= 2780 lt_prog_compiler_pic=
2731 lt_prog_compiler_static= 2781 lt_prog_compiler_static=
2732 2782
@@ -2735,7 +2785,7 @@ index 83b4b0172db..2154238189e 100755
2735 2785
2736 if test "$GCC" = yes; then 2786 if test "$GCC" = yes; then
2737 lt_prog_compiler_wl='-Wl,' 2787 lt_prog_compiler_wl='-Wl,'
2738@@ -8762,6 +9260,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2788@@ -8147,6 +8641,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2739 lt_prog_compiler_pic='--shared' 2789 lt_prog_compiler_pic='--shared'
2740 lt_prog_compiler_static='--static' 2790 lt_prog_compiler_static='--static'
2741 ;; 2791 ;;
@@ -2748,7 +2798,7 @@ index 83b4b0172db..2154238189e 100755
2748 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2798 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2749 # Portland Group compilers (*not* the Pentium gcc compiler, 2799 # Portland Group compilers (*not* the Pentium gcc compiler,
2750 # which looks to be a dead project) 2800 # which looks to be a dead project)
2751@@ -8824,7 +9328,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2801@@ -8209,7 +8709,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2752 lt_prog_compiler_pic='-KPIC' 2802 lt_prog_compiler_pic='-KPIC'
2753 lt_prog_compiler_static='-Bstatic' 2803 lt_prog_compiler_static='-Bstatic'
2754 case $cc_basename in 2804 case $cc_basename in
@@ -2757,7 +2807,7 @@ index 83b4b0172db..2154238189e 100755
2757 lt_prog_compiler_wl='-Qoption ld ';; 2807 lt_prog_compiler_wl='-Qoption ld ';;
2758 *) 2808 *)
2759 lt_prog_compiler_wl='-Wl,';; 2809 lt_prog_compiler_wl='-Wl,';;
2760@@ -8881,13 +9385,17 @@ case $host_os in 2810@@ -8266,13 +8766,17 @@ case $host_os in
2761 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2811 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2762 ;; 2812 ;;
2763 esac 2813 esac
@@ -2781,7 +2831,7 @@ index 83b4b0172db..2154238189e 100755
2781 2831
2782 # 2832 #
2783 # Check to make sure the PIC flag actually works. 2833 # Check to make sure the PIC flag actually works.
2784@@ -8948,6 +9456,11 @@ fi 2834@@ -8333,6 +8837,11 @@ fi
2785 2835
2786 2836
2787 2837
@@ -2793,7 +2843,7 @@ index 83b4b0172db..2154238189e 100755
2793 # 2843 #
2794 # Check to make sure the static flag actually works. 2844 # Check to make sure the static flag actually works.
2795 # 2845 #
2796@@ -9298,7 +9811,8 @@ _LT_EOF 2846@@ -8683,7 +9192,8 @@ _LT_EOF
2797 allow_undefined_flag=unsupported 2847 allow_undefined_flag=unsupported
2798 always_export_symbols=no 2848 always_export_symbols=no
2799 enable_shared_with_static_runtimes=yes 2849 enable_shared_with_static_runtimes=yes
@@ -2803,7 +2853,7 @@ index 83b4b0172db..2154238189e 100755
2803 2853
2804 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2854 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' 2855 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2806@@ -9397,12 +9911,12 @@ _LT_EOF 2856@@ -8782,12 +9292,12 @@ _LT_EOF
2807 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2857 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2808 hardcode_libdir_flag_spec= 2858 hardcode_libdir_flag_spec=
2809 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2859 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2818,7 +2868,7 @@ index 83b4b0172db..2154238189e 100755
2818 fi 2868 fi
2819 ;; 2869 ;;
2820 esac 2870 esac
2821@@ -9416,8 +9930,8 @@ _LT_EOF 2871@@ -8801,8 +9311,8 @@ _LT_EOF
2822 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2872 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2823 wlarc= 2873 wlarc=
2824 else 2874 else
@@ -2829,7 +2879,7 @@ index 83b4b0172db..2154238189e 100755
2829 fi 2879 fi
2830 ;; 2880 ;;
2831 2881
2832@@ -9435,8 +9949,8 @@ _LT_EOF 2882@@ -8820,8 +9330,8 @@ _LT_EOF
2833 2883
2834 _LT_EOF 2884 _LT_EOF
2835 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2885 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2840,7 +2890,7 @@ index 83b4b0172db..2154238189e 100755
2840 else 2890 else
2841 ld_shlibs=no 2891 ld_shlibs=no
2842 fi 2892 fi
2843@@ -9482,8 +9996,8 @@ _LT_EOF 2893@@ -8867,8 +9377,8 @@ _LT_EOF
2844 2894
2845 *) 2895 *)
2846 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2896 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2851,7 +2901,7 @@ index 83b4b0172db..2154238189e 100755
2851 else 2901 else
2852 ld_shlibs=no 2902 ld_shlibs=no
2853 fi 2903 fi
2854@@ -9613,7 +10127,13 @@ _LT_EOF 2904@@ -8998,7 +9508,13 @@ _LT_EOF
2855 allow_undefined_flag='-berok' 2905 allow_undefined_flag='-berok'
2856 # Determine the default libpath from the value encoded in an 2906 # Determine the default libpath from the value encoded in an
2857 # empty executable. 2907 # empty executable.
@@ -2866,7 +2916,7 @@ index 83b4b0172db..2154238189e 100755
2866 /* end confdefs.h. */ 2916 /* end confdefs.h. */
2867 2917
2868 int 2918 int
2869@@ -9626,22 +10146,29 @@ main () 2919@@ -9011,22 +9527,29 @@ main ()
2870 _ACEOF 2920 _ACEOF
2871 if ac_fn_c_try_link "$LINENO"; then : 2921 if ac_fn_c_try_link "$LINENO"; then :
2872 2922
@@ -2909,7 +2959,7 @@ index 83b4b0172db..2154238189e 100755
2909 2959
2910 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2960 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" 2961 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@@ -9653,7 +10180,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2962@@ -9038,7 +9561,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2913 else 2963 else
2914 # Determine the default libpath from the value encoded in an 2964 # Determine the default libpath from the value encoded in an
2915 # empty executable. 2965 # empty executable.
@@ -2924,7 +2974,7 @@ index 83b4b0172db..2154238189e 100755
2924 /* end confdefs.h. */ 2974 /* end confdefs.h. */
2925 2975
2926 int 2976 int
2927@@ -9666,22 +10199,29 @@ main () 2977@@ -9051,22 +9580,29 @@ main ()
2928 _ACEOF 2978 _ACEOF
2929 if ac_fn_c_try_link "$LINENO"; then : 2979 if ac_fn_c_try_link "$LINENO"; then :
2930 2980
@@ -2967,7 +3017,7 @@ index 83b4b0172db..2154238189e 100755
2967 3017
2968 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 3018 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2969 # Warning - without using the other run time loading flags, 3019 # Warning - without using the other run time loading flags,
2970@@ -9726,20 +10266,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3020@@ -9111,20 +9647,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2971 # Microsoft Visual C++. 3021 # Microsoft Visual C++.
2972 # hardcode_libdir_flag_spec is actually meaningless, as there is 3022 # hardcode_libdir_flag_spec is actually meaningless, as there is
2973 # no search path for DLLs. 3023 # no search path for DLLs.
@@ -3045,7 +3095,7 @@ index 83b4b0172db..2154238189e 100755
3045 ;; 3095 ;;
3046 3096
3047 darwin* | rhapsody*) 3097 darwin* | rhapsody*)
3048@@ -9800,7 +10383,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3098@@ -9185,7 +9764,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3049 3099
3050 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3100 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3051 freebsd* | dragonfly*) 3101 freebsd* | dragonfly*)
@@ -3054,7 +3104,7 @@ index 83b4b0172db..2154238189e 100755
3054 hardcode_libdir_flag_spec='-R$libdir' 3104 hardcode_libdir_flag_spec='-R$libdir'
3055 hardcode_direct=yes 3105 hardcode_direct=yes
3056 hardcode_shlibpath_var=no 3106 hardcode_shlibpath_var=no
3057@@ -9808,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3107@@ -9193,7 +9772,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3058 3108
3059 hpux9*) 3109 hpux9*)
3060 if test "$GCC" = yes; then 3110 if test "$GCC" = yes; then
@@ -3063,7 +3113,7 @@ index 83b4b0172db..2154238189e 100755
3063 else 3113 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' 3114 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 3115 fi
3066@@ -9824,7 +10407,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3116@@ -9209,7 +9788,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3067 3117
3068 hpux10*) 3118 hpux10*)
3069 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3119 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3072,7 +3122,7 @@ index 83b4b0172db..2154238189e 100755
3072 else 3122 else
3073 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3123 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3074 fi 3124 fi
3075@@ -9848,10 +10431,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3125@@ -9233,10 +9812,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' 3126 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3077 ;; 3127 ;;
3078 ia64*) 3128 ia64*)
@@ -3085,7 +3135,7 @@ index 83b4b0172db..2154238189e 100755
3085 ;; 3135 ;;
3086 esac 3136 esac
3087 else 3137 else
3088@@ -9930,23 +10513,36 @@ fi 3138@@ -9315,23 +9894,36 @@ fi
3089 3139
3090 irix5* | irix6* | nonstopux*) 3140 irix5* | irix6* | nonstopux*)
3091 if test "$GCC" = yes; then 3141 if test "$GCC" = yes; then
@@ -3130,7 +3180,7 @@ index 83b4b0172db..2154238189e 100755
3130 else 3180 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' 3181 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' 3182 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@@ -10031,7 +10627,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3183@@ -9416,7 +10008,7 @@ rm -f core conftest.err conftest.$ac_objext \
3134 osf4* | osf5*) # as osf3* with the addition of -msym flag 3184 osf4* | osf5*) # as osf3* with the addition of -msym flag
3135 if test "$GCC" = yes; then 3185 if test "$GCC" = yes; then
3136 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3186 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3139,7 +3189,7 @@ index 83b4b0172db..2154238189e 100755
3139 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3189 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3140 else 3190 else
3141 allow_undefined_flag=' -expect_unresolved \*' 3191 allow_undefined_flag=' -expect_unresolved \*'
3142@@ -10050,9 +10646,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3192@@ -9435,9 +10027,9 @@ rm -f core conftest.err conftest.$ac_objext \
3143 no_undefined_flag=' -z defs' 3193 no_undefined_flag=' -z defs'
3144 if test "$GCC" = yes; then 3194 if test "$GCC" = yes; then
3145 wlarc='${wl}' 3195 wlarc='${wl}'
@@ -3151,7 +3201,7 @@ index 83b4b0172db..2154238189e 100755
3151 else 3201 else
3152 case `$CC -V 2>&1` in 3202 case `$CC -V 2>&1` in
3153 *"Compilers 5.0"*) 3203 *"Compilers 5.0"*)
3154@@ -10628,8 +11224,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3204@@ -10013,8 +10605,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3155 need_version=no 3205 need_version=no
3156 need_lib_prefix=no 3206 need_lib_prefix=no
3157 3207
@@ -3163,7 +3213,7 @@ index 83b4b0172db..2154238189e 100755
3163 library_names_spec='$libname.dll.a' 3213 library_names_spec='$libname.dll.a'
3164 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3214 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3165 postinstall_cmds='base_file=`basename \${file}`~ 3215 postinstall_cmds='base_file=`basename \${file}`~
3166@@ -10662,13 +11259,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3216@@ -10047,13 +10640,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}' 3217 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3168 ;; 3218 ;;
3169 esac 3219 esac
@@ -3236,7 +3286,7 @@ index 83b4b0172db..2154238189e 100755
3236 # FIXME: first we should search . and the directory the executable is in 3286 # FIXME: first we should search . and the directory the executable is in
3237 shlibpath_var=PATH 3287 shlibpath_var=PATH
3238 ;; 3288 ;;
3239@@ -10750,7 +11405,7 @@ haiku*) 3289@@ -10135,7 +10786,7 @@ haiku*)
3240 soname_spec='${libname}${release}${shared_ext}$major' 3290 soname_spec='${libname}${release}${shared_ext}$major'
3241 shlibpath_var=LIBRARY_PATH 3291 shlibpath_var=LIBRARY_PATH
3242 shlibpath_overrides_runpath=yes 3292 shlibpath_overrides_runpath=yes
@@ -3245,16 +3295,16 @@ index 83b4b0172db..2154238189e 100755
3245 hardcode_into_libs=yes 3295 hardcode_into_libs=yes
3246 ;; 3296 ;;
3247 3297
3248@@ -11546,7 +12201,7 @@ else 3298@@ -10931,7 +11582,7 @@ else
3249 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3299 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3250 lt_status=$lt_dlunknown 3300 lt_status=$lt_dlunknown
3251 cat > conftest.$ac_ext <<_LT_EOF 3301 cat > conftest.$ac_ext <<_LT_EOF
3252-#line 11549 "configure" 3302-#line 10934 "configure"
3253+#line $LINENO "configure" 3303+#line $LINENO "configure"
3254 #include "confdefs.h" 3304 #include "confdefs.h"
3255 3305
3256 #if HAVE_DLFCN_H 3306 #if HAVE_DLFCN_H
3257@@ -11590,10 +12245,10 @@ else 3307@@ -10975,10 +11626,10 @@ else
3258 /* When -fvisbility=hidden is used, assume the code has been annotated 3308 /* When -fvisbility=hidden is used, assume the code has been annotated
3259 correspondingly for the symbols needed. */ 3309 correspondingly for the symbols needed. */
3260 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3310 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3267,16 +3317,16 @@ index 83b4b0172db..2154238189e 100755
3267 int main () 3317 int main ()
3268 { 3318 {
3269 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3319 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3270@@ -11652,7 +12307,7 @@ else 3320@@ -11037,7 +11688,7 @@ else
3271 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3321 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3272 lt_status=$lt_dlunknown 3322 lt_status=$lt_dlunknown
3273 cat > conftest.$ac_ext <<_LT_EOF 3323 cat > conftest.$ac_ext <<_LT_EOF
3274-#line 11655 "configure" 3324-#line 11040 "configure"
3275+#line $LINENO "configure" 3325+#line $LINENO "configure"
3276 #include "confdefs.h" 3326 #include "confdefs.h"
3277 3327
3278 #if HAVE_DLFCN_H 3328 #if HAVE_DLFCN_H
3279@@ -11696,10 +12351,10 @@ else 3329@@ -11081,10 +11732,10 @@ else
3280 /* When -fvisbility=hidden is used, assume the code has been annotated 3330 /* When -fvisbility=hidden is used, assume the code has been annotated
3281 correspondingly for the symbols needed. */ 3331 correspondingly for the symbols needed. */
3282 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3332 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3289,7 +3339,7 @@ index 83b4b0172db..2154238189e 100755
3289 int main () 3339 int main ()
3290 { 3340 {
3291 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3341 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3292@@ -16308,13 +16963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3342@@ -15455,13 +16106,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3293 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3343 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3294 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3344 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3295 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3345 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3310,7 +3360,7 @@ index 83b4b0172db..2154238189e 100755
3310 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3360 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3311 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3361 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3312 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3362 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3313@@ -16329,14 +16991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3363@@ -15476,14 +16134,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"`' 3364 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"`' 3365 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"`' 3366 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 +3379,7 @@ index 83b4b0172db..2154238189e 100755
3329 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3379 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3330 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3380 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3331 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3381 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3332@@ -16369,12 +17034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3382@@ -15516,12 +16177,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3333 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3383 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3334 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3384 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3335 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3385 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3343,7 +3393,7 @@ index 83b4b0172db..2154238189e 100755
3343 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3393 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"`' 3394 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"`' 3395 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3346@@ -16429,8 +17094,13 @@ reload_flag \ 3396@@ -15576,8 +16237,13 @@ reload_flag \
3347 OBJDUMP \ 3397 OBJDUMP \
3348 deplibs_check_method \ 3398 deplibs_check_method \
3349 file_magic_cmd \ 3399 file_magic_cmd \
@@ -3357,7 +3407,7 @@ index 83b4b0172db..2154238189e 100755
3357 STRIP \ 3407 STRIP \
3358 RANLIB \ 3408 RANLIB \
3359 CC \ 3409 CC \
3360@@ -16440,12 +17110,14 @@ lt_cv_sys_global_symbol_pipe \ 3410@@ -15587,12 +16253,14 @@ lt_cv_sys_global_symbol_pipe \
3361 lt_cv_sys_global_symbol_to_cdecl \ 3411 lt_cv_sys_global_symbol_to_cdecl \
3362 lt_cv_sys_global_symbol_to_c_name_address \ 3412 lt_cv_sys_global_symbol_to_c_name_address \
3363 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3413 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3373,7 +3423,7 @@ index 83b4b0172db..2154238189e 100755
3373 DSYMUTIL \ 3423 DSYMUTIL \
3374 NMEDIT \ 3424 NMEDIT \
3375 LIPO \ 3425 LIPO \
3376@@ -16461,7 +17133,6 @@ no_undefined_flag \ 3426@@ -15608,7 +16276,6 @@ no_undefined_flag \
3377 hardcode_libdir_flag_spec \ 3427 hardcode_libdir_flag_spec \
3378 hardcode_libdir_flag_spec_ld \ 3428 hardcode_libdir_flag_spec_ld \
3379 hardcode_libdir_separator \ 3429 hardcode_libdir_separator \
@@ -3381,7 +3431,7 @@ index 83b4b0172db..2154238189e 100755
3381 exclude_expsyms \ 3431 exclude_expsyms \
3382 include_expsyms \ 3432 include_expsyms \
3383 file_list_spec \ 3433 file_list_spec \
3384@@ -16497,6 +17168,7 @@ module_cmds \ 3434@@ -15644,6 +16311,7 @@ module_cmds \
3385 module_expsym_cmds \ 3435 module_expsym_cmds \
3386 export_symbols_cmds \ 3436 export_symbols_cmds \
3387 prelink_cmds \ 3437 prelink_cmds \
@@ -3389,7 +3439,7 @@ index 83b4b0172db..2154238189e 100755
3389 postinstall_cmds \ 3439 postinstall_cmds \
3390 postuninstall_cmds \ 3440 postuninstall_cmds \
3391 finish_cmds \ 3441 finish_cmds \
3392@@ -17263,7 +17935,8 @@ $as_echo X"$file" | 3442@@ -16410,7 +17078,8 @@ $as_echo X"$file" |
3393 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3443 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3394 # 3444 #
3395 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3445 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3399,7 +3449,7 @@ index 83b4b0172db..2154238189e 100755
3399 # Written by Gordon Matzigkeit, 1996 3449 # Written by Gordon Matzigkeit, 1996
3400 # 3450 #
3401 # This file is part of GNU Libtool. 3451 # This file is part of GNU Libtool.
3402@@ -17366,19 +18039,42 @@ SP2NL=$lt_lt_SP2NL 3452@@ -16513,19 +17182,42 @@ SP2NL=$lt_lt_SP2NL
3403 # turn newlines into spaces. 3453 # turn newlines into spaces.
3404 NL2SP=$lt_lt_NL2SP 3454 NL2SP=$lt_lt_NL2SP
3405 3455
@@ -3443,7 +3493,7 @@ index 83b4b0172db..2154238189e 100755
3443 # A symbol stripping program. 3493 # A symbol stripping program.
3444 STRIP=$lt_STRIP 3494 STRIP=$lt_STRIP
3445 3495
3446@@ -17408,6 +18104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3496@@ -16555,6 +17247,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. 3497 # 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 3498 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3449 3499
@@ -3456,7 +3506,7 @@ index 83b4b0172db..2154238189e 100755
3456 # The name of the directory that contains temporary libtool files. 3506 # The name of the directory that contains temporary libtool files.
3457 objdir=$objdir 3507 objdir=$objdir
3458 3508
3459@@ -17417,6 +18119,9 @@ MAGIC_CMD=$MAGIC_CMD 3509@@ -16564,6 +17262,9 @@ MAGIC_CMD=$MAGIC_CMD
3460 # Must we lock files when doing compilation? 3510 # Must we lock files when doing compilation?
3461 need_locks=$lt_need_locks 3511 need_locks=$lt_need_locks
3462 3512
@@ -3466,7 +3516,7 @@ index 83b4b0172db..2154238189e 100755
3466 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3516 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3467 DSYMUTIL=$lt_DSYMUTIL 3517 DSYMUTIL=$lt_DSYMUTIL
3468 3518
3469@@ -17531,12 +18236,12 @@ with_gcc=$GCC 3519@@ -16678,12 +17379,12 @@ with_gcc=$GCC
3470 # Compiler flag to turn off builtin functions. 3520 # Compiler flag to turn off builtin functions.
3471 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3521 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3472 3522
@@ -3482,7 +3532,7 @@ index 83b4b0172db..2154238189e 100755
3482 # Compiler flag to prevent dynamic linking. 3532 # Compiler flag to prevent dynamic linking.
3483 link_static_flag=$lt_lt_prog_compiler_static 3533 link_static_flag=$lt_lt_prog_compiler_static
3484 3534
3485@@ -17623,9 +18328,6 @@ inherit_rpath=$inherit_rpath 3535@@ -16770,9 +17471,6 @@ inherit_rpath=$inherit_rpath
3486 # Whether libtool must link a program against all its dependency libraries. 3536 # Whether libtool must link a program against all its dependency libraries.
3487 link_all_deplibs=$link_all_deplibs 3537 link_all_deplibs=$link_all_deplibs
3488 3538
@@ -3492,7 +3542,7 @@ index 83b4b0172db..2154238189e 100755
3492 # Set to "yes" if exported symbols are required. 3542 # Set to "yes" if exported symbols are required.
3493 always_export_symbols=$always_export_symbols 3543 always_export_symbols=$always_export_symbols
3494 3544
3495@@ -17641,6 +18343,9 @@ include_expsyms=$lt_include_expsyms 3545@@ -16788,6 +17486,9 @@ include_expsyms=$lt_include_expsyms
3496 # Commands necessary for linking programs (against libraries) with templates. 3546 # Commands necessary for linking programs (against libraries) with templates.
3497 prelink_cmds=$lt_prelink_cmds 3547 prelink_cmds=$lt_prelink_cmds
3498 3548
@@ -3502,7 +3552,7 @@ index 83b4b0172db..2154238189e 100755
3502 # Specify filename containing input files. 3552 # Specify filename containing input files.
3503 file_list_spec=$lt_file_list_spec 3553 file_list_spec=$lt_file_list_spec
3504 3554
3505@@ -17673,210 +18378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3555@@ -16820,210 +17521,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3506 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3556 # 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 3557 # text mode, it properly converts lines to CR/LF. This bash problem
3508 # is reportedly fixed, but why not run on old versions too? 3558 # is reportedly fixed, but why not run on old versions too?
@@ -3877,10 +3927,10 @@ index 83b4b0172db..2154238189e 100755
3877 chmod +x "$ofile" 3927 chmod +x "$ofile"
3878 3928
3879diff --git a/gas/configure b/gas/configure 3929diff --git a/gas/configure b/gas/configure
3880index d5ae54925e9..3ff1148d9dd 100755 3930index 789d1b38b33..7ac563a13ad 100755
3881--- a/gas/configure 3931--- a/gas/configure
3882+++ b/gas/configure 3932+++ b/gas/configure
3883@@ -682,8 +682,11 @@ OTOOL 3933@@ -681,8 +681,11 @@ OTOOL
3884 LIPO 3934 LIPO
3885 NMEDIT 3935 NMEDIT
3886 DSYMUTIL 3936 DSYMUTIL
@@ -3892,7 +3942,7 @@ index d5ae54925e9..3ff1148d9dd 100755
3892 OBJDUMP 3942 OBJDUMP
3893 LN_S 3943 LN_S
3894 NM 3944 NM
3895@@ -800,6 +803,7 @@ enable_static 3945@@ -799,6 +802,7 @@ enable_static
3896 with_pic 3946 with_pic
3897 enable_fast_install 3947 enable_fast_install
3898 with_gnu_ld 3948 with_gnu_ld
@@ -3900,7 +3950,7 @@ index d5ae54925e9..3ff1148d9dd 100755
3900 enable_libtool_lock 3950 enable_libtool_lock
3901 enable_plugins 3951 enable_plugins
3902 enable_largefile 3952 enable_largefile
3903@@ -1491,6 +1495,8 @@ Optional Packages: 3953@@ -1490,6 +1494,8 @@ Optional Packages:
3904 --with-pic try to use only PIC/non-PIC objects [default=use 3954 --with-pic try to use only PIC/non-PIC objects [default=use
3905 both] 3955 both]
3906 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 3956 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -3909,7 +3959,7 @@ index d5ae54925e9..3ff1148d9dd 100755
3909 --with-cpu=CPU default cpu variant is CPU (currently only supported 3959 --with-cpu=CPU default cpu variant is CPU (currently only supported
3910 on ARC) 3960 on ARC)
3911 --with-system-zlib use installed libz 3961 --with-system-zlib use installed libz
3912@@ -5278,8 +5284,8 @@ esac 3962@@ -4569,8 +4575,8 @@ esac
3913 3963
3914 3964
3915 3965
@@ -3920,7 +3970,7 @@ index d5ae54925e9..3ff1148d9dd 100755
3920 3970
3921 3971
3922 3972
3923@@ -5319,7 +5325,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 3973@@ -4610,7 +4616,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3924 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3974 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3925 $as_echo_n "checking how to print strings... " >&6; } 3975 $as_echo_n "checking how to print strings... " >&6; }
3926 # Test print first, because it will be a builtin if present. 3976 # Test print first, because it will be a builtin if present.
@@ -3929,7 +3979,7 @@ index d5ae54925e9..3ff1148d9dd 100755
3929 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3979 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3930 ECHO='print -r --' 3980 ECHO='print -r --'
3931 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3981 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3932@@ -6005,8 +6011,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 3982@@ -5296,8 +5302,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3933 # Try some XSI features 3983 # Try some XSI features
3934 xsi_shell=no 3984 xsi_shell=no
3935 ( _lt_dummy="a/b/c" 3985 ( _lt_dummy="a/b/c"
@@ -3940,7 +3990,7 @@ index d5ae54925e9..3ff1148d9dd 100755
3940 && eval 'test $(( 1 + 1 )) -eq 2 \ 3990 && eval 'test $(( 1 + 1 )) -eq 2 \
3941 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3991 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3942 && xsi_shell=yes 3992 && xsi_shell=yes
3943@@ -6055,6 +6061,80 @@ esac 3993@@ -5346,6 +5352,80 @@ esac
3944 3994
3945 3995
3946 3996
@@ -4021,7 +4071,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4021 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4071 { $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; } 4072 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4023 if ${lt_cv_ld_reload_flag+:} false; then : 4073 if ${lt_cv_ld_reload_flag+:} false; then :
4024@@ -6071,6 +6151,11 @@ case $reload_flag in 4074@@ -5362,6 +5442,11 @@ case $reload_flag in
4025 esac 4075 esac
4026 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4076 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4027 case $host_os in 4077 case $host_os in
@@ -4033,7 +4083,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4033 darwin*) 4083 darwin*)
4034 if test "$GCC" = yes; then 4084 if test "$GCC" = yes; then
4035 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4085 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4036@@ -6239,7 +6324,8 @@ mingw* | pw32*) 4086@@ -5530,7 +5615,8 @@ mingw* | pw32*)
4037 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4087 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4038 lt_cv_file_magic_cmd='func_win32_libid' 4088 lt_cv_file_magic_cmd='func_win32_libid'
4039 else 4089 else
@@ -4043,7 +4093,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4043 lt_cv_file_magic_cmd='$OBJDUMP -f' 4093 lt_cv_file_magic_cmd='$OBJDUMP -f'
4044 fi 4094 fi
4045 ;; 4095 ;;
4046@@ -6393,6 +6479,21 @@ esac 4096@@ -5684,6 +5770,21 @@ esac
4047 fi 4097 fi
4048 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4098 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4049 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4099 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4065,7 +4115,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4065 file_magic_cmd=$lt_cv_file_magic_cmd 4115 file_magic_cmd=$lt_cv_file_magic_cmd
4066 deplibs_check_method=$lt_cv_deplibs_check_method 4116 deplibs_check_method=$lt_cv_deplibs_check_method
4067 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4117 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4068@@ -6408,9 +6509,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4118@@ -5699,6 +5800,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4069 4119
4070 4120
4071 4121
@@ -4220,6 +4270,12 @@ index d5ae54925e9..3ff1148d9dd 100755
4220+ 4270+
4221+ 4271+
4222+ 4272+
4273 plugin_option=
4274 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
4275 for plugin in $plugin_names; do
4276@@ -5713,8 +5965,10 @@ for plugin in $plugin_names; do
4277 done
4278
4223 if test -n "$ac_tool_prefix"; then 4279 if test -n "$ac_tool_prefix"; then
4224- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 4280- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4225-set dummy ${ac_tool_prefix}ar; ac_word=$2 4281-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -4230,7 +4286,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4231 $as_echo_n "checking for $ac_word... " >&6; } 4287 $as_echo_n "checking for $ac_word... " >&6; }
4232 if ${ac_cv_prog_AR+:} false; then : 4288 if ${ac_cv_prog_AR+:} false; then :
4233@@ -6426,7 +6680,7 @@ do 4289@@ -5730,7 +5984,7 @@ do
4234 test -z "$as_dir" && as_dir=. 4290 test -z "$as_dir" && as_dir=.
4235 for ac_exec_ext in '' $ac_executable_extensions; do 4291 for ac_exec_ext in '' $ac_executable_extensions; do
4236 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4292 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4239,7 +4295,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4239 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4295 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4240 break 2 4296 break 2
4241 fi 4297 fi
4242@@ -6446,11 +6700,15 @@ $as_echo "no" >&6; } 4298@@ -5750,11 +6004,15 @@ $as_echo "no" >&6; }
4243 fi 4299 fi
4244 4300
4245 4301
@@ -4258,7 +4314,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4259 $as_echo_n "checking for $ac_word... " >&6; } 4315 $as_echo_n "checking for $ac_word... " >&6; }
4260 if ${ac_cv_prog_ac_ct_AR+:} false; then : 4316 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4261@@ -6466,7 +6724,7 @@ do 4317@@ -5770,7 +6028,7 @@ do
4262 test -z "$as_dir" && as_dir=. 4318 test -z "$as_dir" && as_dir=.
4263 for ac_exec_ext in '' $ac_executable_extensions; do 4319 for ac_exec_ext in '' $ac_executable_extensions; do
4264 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4320 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4267,7 +4323,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4267 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4323 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4268 break 2 4324 break 2
4269 fi 4325 fi
4270@@ -6485,6 +6743,10 @@ else 4326@@ -5789,6 +6047,10 @@ else
4271 $as_echo "no" >&6; } 4327 $as_echo "no" >&6; }
4272 fi 4328 fi
4273 4329
@@ -4278,7 +4334,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4278 if test "x$ac_ct_AR" = x; then 4334 if test "x$ac_ct_AR" = x; then
4279 AR="false" 4335 AR="false"
4280 else 4336 else
4281@@ -6496,12 +6758,10 @@ ac_tool_warned=yes ;; 4337@@ -5800,29 +6062,81 @@ ac_tool_warned=yes ;;
4282 esac 4338 esac
4283 AR=$ac_ct_AR 4339 AR=$ac_ct_AR
4284 fi 4340 fi
@@ -4287,16 +4343,40 @@ index d5ae54925e9..3ff1148d9dd 100755
4287 fi 4343 fi
4288 4344
4289-test -z "$AR" && AR=ar 4345-test -z "$AR" && AR=ar
4346-if test -n "$plugin_option"; then
4347- if $AR --help 2>&1 | grep -q "\--plugin"; then
4348- touch conftest.c
4349- $AR $plugin_option rc conftest.a conftest.c
4350- if test "$?" != 0; then
4351- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
4352+ touch conftest.c
4353+ $AR $plugin_option rc conftest.a conftest.c
4354+ if test "$?" != 0; then
4355+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
4356 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
4357- else
4358- AR="$AR $plugin_option"
4359- fi
4360- rm -f conftest.*
4361+ else
4362+ AR="$AR $plugin_option"
4363 fi
4364-fi
4290-test -z "$AR_FLAGS" && AR_FLAGS=cru 4365-test -z "$AR_FLAGS" && AR_FLAGS=cru
4366+ rm -f conftest.*
4291+: ${AR=ar} 4367+: ${AR=ar}
4292+: ${AR_FLAGS=cru} 4368+: ${AR_FLAGS=cru}
4293 4369+
4294 4370+
4295 4371+
4296@@ -6513,6 +6773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 4372+
4297 4373+
4298 4374+
4299 4375+
4376+
4377+
4378+
4379+
4300+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 4380+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4301+$as_echo_n "checking for archiver @FILE support... " >&6; } 4381+$as_echo_n "checking for archiver @FILE support... " >&6; }
4302+if ${lt_cv_ar_at_file+:} false; then : 4382+if ${lt_cv_ar_at_file+:} false; then :
@@ -4309,7 +4389,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4309+int 4389+int
4310+main () 4390+main ()
4311+{ 4391+{
4312+ 4392
4313+ ; 4393+ ;
4314+ return 0; 4394+ return 0;
4315+} 4395+}
@@ -4335,30 +4415,23 @@ index d5ae54925e9..3ff1148d9dd 100755
4335+ fi 4415+ fi
4336+ fi 4416+ fi
4337+ rm -f conftest.* libconftest.a 4417+ rm -f conftest.* libconftest.a
4338+ 4418
4339+fi 4419+fi
4340+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4420+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4341+ 4421
4342+fi 4422+fi
4343+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 4423+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
4344+$as_echo "$lt_cv_ar_at_file" >&6; } 4424+$as_echo "$lt_cv_ar_at_file" >&6; }
4345+ 4425
4346+if test "x$lt_cv_ar_at_file" = xno; then 4426+if test "x$lt_cv_ar_at_file" = xno; then
4347+ archiver_list_spec= 4427+ archiver_list_spec=
4348+else 4428+else
4349+ archiver_list_spec=$lt_cv_ar_at_file 4429+ archiver_list_spec=$lt_cv_ar_at_file
4350+fi 4430+fi
4351+ 4431
4352+ 4432
4353+ 4433
4354+ 4434@@ -6169,8 +6483,8 @@ esac
4355+
4356+
4357+
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.
4360 set dummy ${ac_tool_prefix}strip; ac_word=$2
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'" 4435 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4363 4436
4364 # Transform an extracted symbol line into symbol name and symbol address 4437 # Transform an extracted symbol line into symbol name and symbol address
@@ -4369,7 +4442,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4369 4442
4370 # Handle CRLF in mingw tool chain 4443 # Handle CRLF in mingw tool chain
4371 opt_cr= 4444 opt_cr=
4372@@ -6884,6 +7202,7 @@ for ac_symprfx in "" "_"; do 4445@@ -6206,6 +6520,7 @@ for ac_symprfx in "" "_"; do
4373 else 4446 else
4374 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4447 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4375 fi 4448 fi
@@ -4377,7 +4450,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4377 4450
4378 # Check to see that the pipe works correctly. 4451 # Check to see that the pipe works correctly.
4379 pipe_works=no 4452 pipe_works=no
4380@@ -6925,6 +7244,18 @@ _LT_EOF 4453@@ -6247,6 +6562,18 @@ _LT_EOF
4381 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4454 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4382 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4455 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4383 cat <<_LT_EOF > conftest.$ac_ext 4456 cat <<_LT_EOF > conftest.$ac_ext
@@ -4396,7 +4469,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4396 #ifdef __cplusplus 4469 #ifdef __cplusplus
4397 extern "C" { 4470 extern "C" {
4398 #endif 4471 #endif
4399@@ -6936,7 +7267,7 @@ _LT_EOF 4472@@ -6258,7 +6585,7 @@ _LT_EOF
4400 cat <<_LT_EOF >> conftest.$ac_ext 4473 cat <<_LT_EOF >> conftest.$ac_ext
4401 4474
4402 /* The mapping between symbol names and symbols. */ 4475 /* The mapping between symbol names and symbols. */
@@ -4405,7 +4478,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4405 const char *name; 4478 const char *name;
4406 void *address; 4479 void *address;
4407 } 4480 }
4408@@ -6962,8 +7293,8 @@ static const void *lt_preloaded_setup() { 4481@@ -6284,8 +6611,8 @@ static const void *lt_preloaded_setup() {
4409 _LT_EOF 4482 _LT_EOF
4410 # Now try linking the two files. 4483 # Now try linking the two files.
4411 mv conftest.$ac_objext conftstm.$ac_objext 4484 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4416,7 +4489,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4416 LIBS="conftstm.$ac_objext" 4489 LIBS="conftstm.$ac_objext"
4417 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4490 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4418 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4491 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4419@@ -6973,8 +7304,8 @@ _LT_EOF 4492@@ -6295,8 +6622,8 @@ _LT_EOF
4420 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4493 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4421 pipe_works=yes 4494 pipe_works=yes
4422 fi 4495 fi
@@ -4427,7 +4500,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4427 else 4500 else
4428 echo "cannot find nm_test_func in $nlist" >&5 4501 echo "cannot find nm_test_func in $nlist" >&5
4429 fi 4502 fi
4430@@ -7011,6 +7342,21 @@ else 4503@@ -6333,6 +6660,19 @@ else
4431 $as_echo "ok" >&6; } 4504 $as_echo "ok" >&6; }
4432 fi 4505 fi
4433 4506
@@ -4444,17 +4517,17 @@ index d5ae54925e9..3ff1148d9dd 100755
4444+ 4517+
4445+ 4518+
4446+ 4519+
4447+
4448+
4449 4520
4450 4521
4451 4522
4452@@ -7027,6 +7373,40 @@ fi 4523@@ -6349,6 +6689,42 @@ fi
4453 4524
4454 4525
4455 4526
4456+ 4527+
4457+ 4528+
4529+
4530+
4458+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 4531+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4459+$as_echo_n "checking for sysroot... " >&6; } 4532+$as_echo_n "checking for sysroot... " >&6; }
4460+ 4533+
@@ -4490,7 +4563,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4490 4563
4491 4564
4492 4565
4493@@ -7238,6 +7618,123 @@ esac 4566@@ -6560,6 +6936,123 @@ esac
4494 4567
4495 need_locks="$enable_libtool_lock" 4568 need_locks="$enable_libtool_lock"
4496 4569
@@ -4614,7 +4687,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4614 4687
4615 case $host_os in 4688 case $host_os in
4616 rhapsody* | darwin*) 4689 rhapsody* | darwin*)
4617@@ -7801,6 +8298,8 @@ _LT_EOF 4690@@ -7123,6 +7616,8 @@ _LT_EOF
4618 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4691 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4619 echo "$AR cru libconftest.a conftest.o" >&5 4692 echo "$AR cru libconftest.a conftest.o" >&5
4620 $AR cru libconftest.a conftest.o 2>&5 4693 $AR cru libconftest.a conftest.o 2>&5
@@ -4623,7 +4696,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4623 cat > conftest.c << _LT_EOF 4696 cat > conftest.c << _LT_EOF
4624 int main() { return 0;} 4697 int main() { return 0;}
4625 _LT_EOF 4698 _LT_EOF
4626@@ -7996,7 +8495,8 @@ fi 4699@@ -7318,7 +7813,8 @@ fi
4627 LIBTOOL_DEPS="$ltmain" 4700 LIBTOOL_DEPS="$ltmain"
4628 4701
4629 # Always use our own libtool. 4702 # Always use our own libtool.
@@ -4633,7 +4706,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4633 4706
4634 4707
4635 4708
4636@@ -8085,7 +8585,7 @@ aix3*) 4709@@ -7407,7 +7903,7 @@ aix3*)
4637 esac 4710 esac
4638 4711
4639 # Global variables: 4712 # Global variables:
@@ -4642,7 +4715,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4642 can_build_shared=yes 4715 can_build_shared=yes
4643 4716
4644 # All known linkers require a `.a' archive for static linking (except MSVC, 4717 # All known linkers require a `.a' archive for static linking (except MSVC,
4645@@ -8383,8 +8883,6 @@ fi 4718@@ -7705,8 +8201,6 @@ fi
4646 lt_prog_compiler_pic= 4719 lt_prog_compiler_pic=
4647 lt_prog_compiler_static= 4720 lt_prog_compiler_static=
4648 4721
@@ -4651,7 +4724,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4651 4724
4652 if test "$GCC" = yes; then 4725 if test "$GCC" = yes; then
4653 lt_prog_compiler_wl='-Wl,' 4726 lt_prog_compiler_wl='-Wl,'
4654@@ -8550,6 +9048,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4727@@ -7872,6 +8366,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4655 lt_prog_compiler_pic='--shared' 4728 lt_prog_compiler_pic='--shared'
4656 lt_prog_compiler_static='--static' 4729 lt_prog_compiler_static='--static'
4657 ;; 4730 ;;
@@ -4664,7 +4737,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4664 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4737 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4665 # Portland Group compilers (*not* the Pentium gcc compiler, 4738 # Portland Group compilers (*not* the Pentium gcc compiler,
4666 # which looks to be a dead project) 4739 # which looks to be a dead project)
4667@@ -8612,7 +9116,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4740@@ -7934,7 +8434,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4668 lt_prog_compiler_pic='-KPIC' 4741 lt_prog_compiler_pic='-KPIC'
4669 lt_prog_compiler_static='-Bstatic' 4742 lt_prog_compiler_static='-Bstatic'
4670 case $cc_basename in 4743 case $cc_basename in
@@ -4673,7 +4746,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4673 lt_prog_compiler_wl='-Qoption ld ';; 4746 lt_prog_compiler_wl='-Qoption ld ';;
4674 *) 4747 *)
4675 lt_prog_compiler_wl='-Wl,';; 4748 lt_prog_compiler_wl='-Wl,';;
4676@@ -8669,13 +9173,17 @@ case $host_os in 4749@@ -7991,13 +8491,17 @@ case $host_os in
4677 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4750 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4678 ;; 4751 ;;
4679 esac 4752 esac
@@ -4697,7 +4770,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4697 4770
4698 # 4771 #
4699 # Check to make sure the PIC flag actually works. 4772 # Check to make sure the PIC flag actually works.
4700@@ -8736,6 +9244,11 @@ fi 4773@@ -8058,6 +8562,11 @@ fi
4701 4774
4702 4775
4703 4776
@@ -4709,7 +4782,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4709 # 4782 #
4710 # Check to make sure the static flag actually works. 4783 # Check to make sure the static flag actually works.
4711 # 4784 #
4712@@ -9086,7 +9599,8 @@ _LT_EOF 4785@@ -8408,7 +8917,8 @@ _LT_EOF
4713 allow_undefined_flag=unsupported 4786 allow_undefined_flag=unsupported
4714 always_export_symbols=no 4787 always_export_symbols=no
4715 enable_shared_with_static_runtimes=yes 4788 enable_shared_with_static_runtimes=yes
@@ -4719,7 +4792,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4719 4792
4720 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4793 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' 4794 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4722@@ -9185,12 +9699,12 @@ _LT_EOF 4795@@ -8507,12 +9017,12 @@ _LT_EOF
4723 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4796 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4724 hardcode_libdir_flag_spec= 4797 hardcode_libdir_flag_spec=
4725 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4798 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4734,7 +4807,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4734 fi 4807 fi
4735 ;; 4808 ;;
4736 esac 4809 esac
4737@@ -9204,8 +9718,8 @@ _LT_EOF 4810@@ -8526,8 +9036,8 @@ _LT_EOF
4738 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4811 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4739 wlarc= 4812 wlarc=
4740 else 4813 else
@@ -4745,7 +4818,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4745 fi 4818 fi
4746 ;; 4819 ;;
4747 4820
4748@@ -9223,8 +9737,8 @@ _LT_EOF 4821@@ -8545,8 +9055,8 @@ _LT_EOF
4749 4822
4750 _LT_EOF 4823 _LT_EOF
4751 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4824 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4756,7 +4829,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4756 else 4829 else
4757 ld_shlibs=no 4830 ld_shlibs=no
4758 fi 4831 fi
4759@@ -9270,8 +9784,8 @@ _LT_EOF 4832@@ -8592,8 +9102,8 @@ _LT_EOF
4760 4833
4761 *) 4834 *)
4762 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4835 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4767,7 +4840,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4767 else 4840 else
4768 ld_shlibs=no 4841 ld_shlibs=no
4769 fi 4842 fi
4770@@ -9401,7 +9915,13 @@ _LT_EOF 4843@@ -8723,7 +9233,13 @@ _LT_EOF
4771 allow_undefined_flag='-berok' 4844 allow_undefined_flag='-berok'
4772 # Determine the default libpath from the value encoded in an 4845 # Determine the default libpath from the value encoded in an
4773 # empty executable. 4846 # empty executable.
@@ -4782,7 +4855,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4782 /* end confdefs.h. */ 4855 /* end confdefs.h. */
4783 4856
4784 int 4857 int
4785@@ -9414,22 +9934,29 @@ main () 4858@@ -8736,22 +9252,29 @@ main ()
4786 _ACEOF 4859 _ACEOF
4787 if ac_fn_c_try_link "$LINENO"; then : 4860 if ac_fn_c_try_link "$LINENO"; then :
4788 4861
@@ -4825,7 +4898,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4825 4898
4826 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4899 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" 4900 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@@ -9441,7 +9968,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4901@@ -8763,7 +9286,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4829 else 4902 else
4830 # Determine the default libpath from the value encoded in an 4903 # Determine the default libpath from the value encoded in an
4831 # empty executable. 4904 # empty executable.
@@ -4840,7 +4913,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4840 /* end confdefs.h. */ 4913 /* end confdefs.h. */
4841 4914
4842 int 4915 int
4843@@ -9454,22 +9987,29 @@ main () 4916@@ -8776,22 +9305,29 @@ main ()
4844 _ACEOF 4917 _ACEOF
4845 if ac_fn_c_try_link "$LINENO"; then : 4918 if ac_fn_c_try_link "$LINENO"; then :
4846 4919
@@ -4883,7 +4956,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4883 4956
4884 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4957 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4885 # Warning - without using the other run time loading flags, 4958 # Warning - without using the other run time loading flags,
4886@@ -9514,20 +10054,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4959@@ -8836,20 +9372,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4887 # Microsoft Visual C++. 4960 # Microsoft Visual C++.
4888 # hardcode_libdir_flag_spec is actually meaningless, as there is 4961 # hardcode_libdir_flag_spec is actually meaningless, as there is
4889 # no search path for DLLs. 4962 # no search path for DLLs.
@@ -4961,7 +5034,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4961 ;; 5034 ;;
4962 5035
4963 darwin* | rhapsody*) 5036 darwin* | rhapsody*)
4964@@ -9588,7 +10171,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5037@@ -8910,7 +9489,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4965 5038
4966 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 5039 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4967 freebsd* | dragonfly*) 5040 freebsd* | dragonfly*)
@@ -4970,7 +5043,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4970 hardcode_libdir_flag_spec='-R$libdir' 5043 hardcode_libdir_flag_spec='-R$libdir'
4971 hardcode_direct=yes 5044 hardcode_direct=yes
4972 hardcode_shlibpath_var=no 5045 hardcode_shlibpath_var=no
4973@@ -9596,7 +10179,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5046@@ -8918,7 +9497,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4974 5047
4975 hpux9*) 5048 hpux9*)
4976 if test "$GCC" = yes; then 5049 if test "$GCC" = yes; then
@@ -4979,7 +5052,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4979 else 5052 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' 5053 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 5054 fi
4982@@ -9612,7 +10195,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5055@@ -8934,7 +9513,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4983 5056
4984 hpux10*) 5057 hpux10*)
4985 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 5058 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -4988,7 +5061,7 @@ index d5ae54925e9..3ff1148d9dd 100755
4988 else 5061 else
4989 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 5062 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4990 fi 5063 fi
4991@@ -9636,10 +10219,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 5064@@ -8958,10 +9537,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' 5065 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4993 ;; 5066 ;;
4994 ia64*) 5067 ia64*)
@@ -5001,7 +5074,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5001 ;; 5074 ;;
5002 esac 5075 esac
5003 else 5076 else
5004@@ -9718,23 +10301,36 @@ fi 5077@@ -9040,23 +9619,36 @@ fi
5005 5078
5006 irix5* | irix6* | nonstopux*) 5079 irix5* | irix6* | nonstopux*)
5007 if test "$GCC" = yes; then 5080 if test "$GCC" = yes; then
@@ -5046,7 +5119,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5046 else 5119 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' 5120 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' 5121 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@@ -9819,7 +10415,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5122@@ -9141,7 +9733,7 @@ rm -f core conftest.err conftest.$ac_objext \
5050 osf4* | osf5*) # as osf3* with the addition of -msym flag 5123 osf4* | osf5*) # as osf3* with the addition of -msym flag
5051 if test "$GCC" = yes; then 5124 if test "$GCC" = yes; then
5052 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5125 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5055,7 +5128,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5055 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5128 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5056 else 5129 else
5057 allow_undefined_flag=' -expect_unresolved \*' 5130 allow_undefined_flag=' -expect_unresolved \*'
5058@@ -9838,9 +10434,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5131@@ -9160,9 +9752,9 @@ rm -f core conftest.err conftest.$ac_objext \
5059 no_undefined_flag=' -z defs' 5132 no_undefined_flag=' -z defs'
5060 if test "$GCC" = yes; then 5133 if test "$GCC" = yes; then
5061 wlarc='${wl}' 5134 wlarc='${wl}'
@@ -5067,7 +5140,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5067 else 5140 else
5068 case `$CC -V 2>&1` in 5141 case `$CC -V 2>&1` in
5069 *"Compilers 5.0"*) 5142 *"Compilers 5.0"*)
5070@@ -10416,8 +11012,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5143@@ -9738,8 +10330,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5071 need_version=no 5144 need_version=no
5072 need_lib_prefix=no 5145 need_lib_prefix=no
5073 5146
@@ -5079,7 +5152,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5079 library_names_spec='$libname.dll.a' 5152 library_names_spec='$libname.dll.a'
5080 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5153 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5081 postinstall_cmds='base_file=`basename \${file}`~ 5154 postinstall_cmds='base_file=`basename \${file}`~
5082@@ -10450,13 +11047,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5155@@ -9772,13 +10365,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}' 5156 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5084 ;; 5157 ;;
5085 esac 5158 esac
@@ -5152,7 +5225,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5152 # FIXME: first we should search . and the directory the executable is in 5225 # FIXME: first we should search . and the directory the executable is in
5153 shlibpath_var=PATH 5226 shlibpath_var=PATH
5154 ;; 5227 ;;
5155@@ -10538,7 +11193,7 @@ haiku*) 5228@@ -9860,7 +10511,7 @@ haiku*)
5156 soname_spec='${libname}${release}${shared_ext}$major' 5229 soname_spec='${libname}${release}${shared_ext}$major'
5157 shlibpath_var=LIBRARY_PATH 5230 shlibpath_var=LIBRARY_PATH
5158 shlibpath_overrides_runpath=yes 5231 shlibpath_overrides_runpath=yes
@@ -5161,16 +5234,16 @@ index d5ae54925e9..3ff1148d9dd 100755
5161 hardcode_into_libs=yes 5234 hardcode_into_libs=yes
5162 ;; 5235 ;;
5163 5236
5164@@ -11334,7 +11989,7 @@ else 5237@@ -10656,7 +11307,7 @@ else
5165 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5238 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5166 lt_status=$lt_dlunknown 5239 lt_status=$lt_dlunknown
5167 cat > conftest.$ac_ext <<_LT_EOF 5240 cat > conftest.$ac_ext <<_LT_EOF
5168-#line 11337 "configure" 5241-#line 10659 "configure"
5169+#line $LINENO "configure" 5242+#line $LINENO "configure"
5170 #include "confdefs.h" 5243 #include "confdefs.h"
5171 5244
5172 #if HAVE_DLFCN_H 5245 #if HAVE_DLFCN_H
5173@@ -11378,10 +12033,10 @@ else 5246@@ -10700,10 +11351,10 @@ else
5174 /* When -fvisbility=hidden is used, assume the code has been annotated 5247 /* When -fvisbility=hidden is used, assume the code has been annotated
5175 correspondingly for the symbols needed. */ 5248 correspondingly for the symbols needed. */
5176 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5249 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5183,16 +5256,16 @@ index d5ae54925e9..3ff1148d9dd 100755
5183 int main () 5256 int main ()
5184 { 5257 {
5185 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5258 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5186@@ -11440,7 +12095,7 @@ else 5259@@ -10762,7 +11413,7 @@ else
5187 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5260 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5188 lt_status=$lt_dlunknown 5261 lt_status=$lt_dlunknown
5189 cat > conftest.$ac_ext <<_LT_EOF 5262 cat > conftest.$ac_ext <<_LT_EOF
5190-#line 11443 "configure" 5263-#line 10765 "configure"
5191+#line $LINENO "configure" 5264+#line $LINENO "configure"
5192 #include "confdefs.h" 5265 #include "confdefs.h"
5193 5266
5194 #if HAVE_DLFCN_H 5267 #if HAVE_DLFCN_H
5195@@ -11484,10 +12139,10 @@ else 5268@@ -10806,10 +11457,10 @@ else
5196 /* When -fvisbility=hidden is used, assume the code has been annotated 5269 /* When -fvisbility=hidden is used, assume the code has been annotated
5197 correspondingly for the symbols needed. */ 5270 correspondingly for the symbols needed. */
5198 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5271 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5205,7 +5278,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5205 int main () 5278 int main ()
5206 { 5279 {
5207 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5280 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5208@@ -16020,13 +16675,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5281@@ -14785,13 +15436,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5209 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5282 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5210 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5283 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5211 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5284 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5226,7 +5299,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5226 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5299 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5227 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5300 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5228 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5301 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5229@@ -16041,14 +16703,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5302@@ -14806,14 +15464,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"`' 5303 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"`' 5304 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"`' 5305 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 +5318,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5245 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5318 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5246 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5319 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5247 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5320 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5248@@ -16081,12 +16746,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5321@@ -14846,12 +15507,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5249 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5322 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5250 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5323 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5251 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5324 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5259,7 +5332,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5259 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5332 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"`' 5333 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"`' 5334 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5262@@ -16141,8 +16806,13 @@ reload_flag \ 5335@@ -14906,8 +15567,13 @@ reload_flag \
5263 OBJDUMP \ 5336 OBJDUMP \
5264 deplibs_check_method \ 5337 deplibs_check_method \
5265 file_magic_cmd \ 5338 file_magic_cmd \
@@ -5273,7 +5346,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5273 STRIP \ 5346 STRIP \
5274 RANLIB \ 5347 RANLIB \
5275 CC \ 5348 CC \
5276@@ -16152,12 +16822,14 @@ lt_cv_sys_global_symbol_pipe \ 5349@@ -14917,12 +15583,14 @@ lt_cv_sys_global_symbol_pipe \
5277 lt_cv_sys_global_symbol_to_cdecl \ 5350 lt_cv_sys_global_symbol_to_cdecl \
5278 lt_cv_sys_global_symbol_to_c_name_address \ 5351 lt_cv_sys_global_symbol_to_c_name_address \
5279 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5352 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5289,7 +5362,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5289 DSYMUTIL \ 5362 DSYMUTIL \
5290 NMEDIT \ 5363 NMEDIT \
5291 LIPO \ 5364 LIPO \
5292@@ -16173,7 +16845,6 @@ no_undefined_flag \ 5365@@ -14938,7 +15606,6 @@ no_undefined_flag \
5293 hardcode_libdir_flag_spec \ 5366 hardcode_libdir_flag_spec \
5294 hardcode_libdir_flag_spec_ld \ 5367 hardcode_libdir_flag_spec_ld \
5295 hardcode_libdir_separator \ 5368 hardcode_libdir_separator \
@@ -5297,7 +5370,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5297 exclude_expsyms \ 5370 exclude_expsyms \
5298 include_expsyms \ 5371 include_expsyms \
5299 file_list_spec \ 5372 file_list_spec \
5300@@ -16209,6 +16880,7 @@ module_cmds \ 5373@@ -14974,6 +15641,7 @@ module_cmds \
5301 module_expsym_cmds \ 5374 module_expsym_cmds \
5302 export_symbols_cmds \ 5375 export_symbols_cmds \
5303 prelink_cmds \ 5376 prelink_cmds \
@@ -5305,7 +5378,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5305 postinstall_cmds \ 5378 postinstall_cmds \
5306 postuninstall_cmds \ 5379 postuninstall_cmds \
5307 finish_cmds \ 5380 finish_cmds \
5308@@ -16982,7 +17654,8 @@ $as_echo X"$file" | 5381@@ -15747,7 +16415,8 @@ $as_echo X"$file" |
5309 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5382 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5310 # 5383 #
5311 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5384 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5315,7 +5388,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5315 # Written by Gordon Matzigkeit, 1996 5388 # Written by Gordon Matzigkeit, 1996
5316 # 5389 #
5317 # This file is part of GNU Libtool. 5390 # This file is part of GNU Libtool.
5318@@ -17085,19 +17758,42 @@ SP2NL=$lt_lt_SP2NL 5391@@ -15850,19 +16519,42 @@ SP2NL=$lt_lt_SP2NL
5319 # turn newlines into spaces. 5392 # turn newlines into spaces.
5320 NL2SP=$lt_lt_NL2SP 5393 NL2SP=$lt_lt_NL2SP
5321 5394
@@ -5359,7 +5432,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5359 # A symbol stripping program. 5432 # A symbol stripping program.
5360 STRIP=$lt_STRIP 5433 STRIP=$lt_STRIP
5361 5434
5362@@ -17127,6 +17823,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5435@@ -15892,6 +16584,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. 5436 # 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 5437 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5365 5438
@@ -5372,7 +5445,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5372 # The name of the directory that contains temporary libtool files. 5445 # The name of the directory that contains temporary libtool files.
5373 objdir=$objdir 5446 objdir=$objdir
5374 5447
5375@@ -17136,6 +17838,9 @@ MAGIC_CMD=$MAGIC_CMD 5448@@ -15901,6 +16599,9 @@ MAGIC_CMD=$MAGIC_CMD
5376 # Must we lock files when doing compilation? 5449 # Must we lock files when doing compilation?
5377 need_locks=$lt_need_locks 5450 need_locks=$lt_need_locks
5378 5451
@@ -5382,7 +5455,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5382 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5455 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5383 DSYMUTIL=$lt_DSYMUTIL 5456 DSYMUTIL=$lt_DSYMUTIL
5384 5457
5385@@ -17250,12 +17955,12 @@ with_gcc=$GCC 5458@@ -16015,12 +16716,12 @@ with_gcc=$GCC
5386 # Compiler flag to turn off builtin functions. 5459 # Compiler flag to turn off builtin functions.
5387 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5460 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5388 5461
@@ -5398,7 +5471,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5398 # Compiler flag to prevent dynamic linking. 5471 # Compiler flag to prevent dynamic linking.
5399 link_static_flag=$lt_lt_prog_compiler_static 5472 link_static_flag=$lt_lt_prog_compiler_static
5400 5473
5401@@ -17342,9 +18047,6 @@ inherit_rpath=$inherit_rpath 5474@@ -16107,9 +16808,6 @@ inherit_rpath=$inherit_rpath
5402 # Whether libtool must link a program against all its dependency libraries. 5475 # Whether libtool must link a program against all its dependency libraries.
5403 link_all_deplibs=$link_all_deplibs 5476 link_all_deplibs=$link_all_deplibs
5404 5477
@@ -5408,7 +5481,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5408 # Set to "yes" if exported symbols are required. 5481 # Set to "yes" if exported symbols are required.
5409 always_export_symbols=$always_export_symbols 5482 always_export_symbols=$always_export_symbols
5410 5483
5411@@ -17360,6 +18062,9 @@ include_expsyms=$lt_include_expsyms 5484@@ -16125,6 +16823,9 @@ include_expsyms=$lt_include_expsyms
5412 # Commands necessary for linking programs (against libraries) with templates. 5485 # Commands necessary for linking programs (against libraries) with templates.
5413 prelink_cmds=$lt_prelink_cmds 5486 prelink_cmds=$lt_prelink_cmds
5414 5487
@@ -5418,7 +5491,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5418 # Specify filename containing input files. 5491 # Specify filename containing input files.
5419 file_list_spec=$lt_file_list_spec 5492 file_list_spec=$lt_file_list_spec
5420 5493
5421@@ -17392,210 +18097,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5494@@ -16157,210 +16858,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5422 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5495 # 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 5496 # text mode, it properly converts lines to CR/LF. This bash problem
5424 # is reportedly fixed, but why not run on old versions too? 5497 # is reportedly fixed, but why not run on old versions too?
@@ -5793,7 +5866,7 @@ index d5ae54925e9..3ff1148d9dd 100755
5793 chmod +x "$ofile" 5866 chmod +x "$ofile"
5794 5867
5795diff --git a/gprof/configure b/gprof/configure 5868diff --git a/gprof/configure b/gprof/configure
5796index b12ec2e472f..57986ca995a 100755 5869index 5703bba4462..e1ac86ec797 100755
5797--- a/gprof/configure 5870--- a/gprof/configure
5798+++ b/gprof/configure 5871+++ b/gprof/configure
5799@@ -663,8 +663,11 @@ OTOOL 5872@@ -663,8 +663,11 @@ OTOOL
@@ -5825,7 +5898,7 @@ index b12ec2e472f..57986ca995a 100755
5825 5898
5826 Some influential environment variables: 5899 Some influential environment variables:
5827 CC C compiler command 5900 CC C compiler command
5828@@ -5125,8 +5131,8 @@ esac 5901@@ -4471,8 +4477,8 @@ esac
5829 5902
5830 5903
5831 5904
@@ -5836,7 +5909,7 @@ index b12ec2e472f..57986ca995a 100755
5836 5909
5837 5910
5838 5911
5839@@ -5166,7 +5172,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5912@@ -4512,7 +4518,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5840 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5913 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5841 $as_echo_n "checking how to print strings... " >&6; } 5914 $as_echo_n "checking how to print strings... " >&6; }
5842 # Test print first, because it will be a builtin if present. 5915 # Test print first, because it will be a builtin if present.
@@ -5845,7 +5918,7 @@ index b12ec2e472f..57986ca995a 100755
5845 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5918 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5846 ECHO='print -r --' 5919 ECHO='print -r --'
5847 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5920 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5848@@ -5852,8 +5858,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5921@@ -5198,8 +5204,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5849 # Try some XSI features 5922 # Try some XSI features
5850 xsi_shell=no 5923 xsi_shell=no
5851 ( _lt_dummy="a/b/c" 5924 ( _lt_dummy="a/b/c"
@@ -5856,7 +5929,7 @@ index b12ec2e472f..57986ca995a 100755
5856 && eval 'test $(( 1 + 1 )) -eq 2 \ 5929 && eval 'test $(( 1 + 1 )) -eq 2 \
5857 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5930 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5858 && xsi_shell=yes 5931 && xsi_shell=yes
5859@@ -5902,6 +5908,80 @@ esac 5932@@ -5248,6 +5254,80 @@ esac
5860 5933
5861 5934
5862 5935
@@ -5937,7 +6010,7 @@ index b12ec2e472f..57986ca995a 100755
5937 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 6010 { $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; } 6011 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5939 if ${lt_cv_ld_reload_flag+:} false; then : 6012 if ${lt_cv_ld_reload_flag+:} false; then :
5940@@ -5918,6 +5998,11 @@ case $reload_flag in 6013@@ -5264,6 +5344,11 @@ case $reload_flag in
5941 esac 6014 esac
5942 reload_cmds='$LD$reload_flag -o $output$reload_objs' 6015 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5943 case $host_os in 6016 case $host_os in
@@ -5949,7 +6022,7 @@ index b12ec2e472f..57986ca995a 100755
5949 darwin*) 6022 darwin*)
5950 if test "$GCC" = yes; then 6023 if test "$GCC" = yes; then
5951 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 6024 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5952@@ -6086,7 +6171,8 @@ mingw* | pw32*) 6025@@ -5432,7 +5517,8 @@ mingw* | pw32*)
5953 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 6026 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5954 lt_cv_file_magic_cmd='func_win32_libid' 6027 lt_cv_file_magic_cmd='func_win32_libid'
5955 else 6028 else
@@ -5959,7 +6032,7 @@ index b12ec2e472f..57986ca995a 100755
5959 lt_cv_file_magic_cmd='$OBJDUMP -f' 6032 lt_cv_file_magic_cmd='$OBJDUMP -f'
5960 fi 6033 fi
5961 ;; 6034 ;;
5962@@ -6240,6 +6326,21 @@ esac 6035@@ -5586,6 +5672,21 @@ esac
5963 fi 6036 fi
5964 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 6037 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5965 $as_echo "$lt_cv_deplibs_check_method" >&6; } 6038 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -5981,7 +6054,7 @@ index b12ec2e472f..57986ca995a 100755
5981 file_magic_cmd=$lt_cv_file_magic_cmd 6054 file_magic_cmd=$lt_cv_file_magic_cmd
5982 deplibs_check_method=$lt_cv_deplibs_check_method 6055 deplibs_check_method=$lt_cv_deplibs_check_method
5983 test -z "$deplibs_check_method" && deplibs_check_method=unknown 6056 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5984@@ -6253,11 +6354,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 6057@@ -5601,6 +5702,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5985 6058
5986 6059
5987 6060
@@ -5995,11 +6068,7 @@ index b12ec2e472f..57986ca995a 100755
5995+ 6068+
5996+ 6069+
5997+ 6070+
5998 6071+if test -n "$ac_tool_prefix"; then
5999
6000 if test -n "$ac_tool_prefix"; then
6001- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6002-set dummy ${ac_tool_prefix}ar; ac_word=$2
6003+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 6072+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
6004+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 6073+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
6005+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6074+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -6140,7 +6209,15 @@ index b12ec2e472f..57986ca995a 100755
6140+ 6209+
6141+ 6210+
6142+ 6211+
6143+if test -n "$ac_tool_prefix"; then 6212 plugin_option=
6213 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
6214 for plugin in $plugin_names; do
6215@@ -5615,8 +5867,10 @@ for plugin in $plugin_names; do
6216 done
6217
6218 if test -n "$ac_tool_prefix"; then
6219- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6220-set dummy ${ac_tool_prefix}ar; ac_word=$2
6144+ for ac_prog in ar 6221+ for ac_prog in ar
6145+ do 6222+ do
6146+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 6223+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -6148,7 +6225,7 @@ index b12ec2e472f..57986ca995a 100755
6148 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6225 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6149 $as_echo_n "checking for $ac_word... " >&6; } 6226 $as_echo_n "checking for $ac_word... " >&6; }
6150 if ${ac_cv_prog_AR+:} false; then : 6227 if ${ac_cv_prog_AR+:} false; then :
6151@@ -6273,7 +6527,7 @@ do 6228@@ -5632,7 +5886,7 @@ do
6152 test -z "$as_dir" && as_dir=. 6229 test -z "$as_dir" && as_dir=.
6153 for ac_exec_ext in '' $ac_executable_extensions; do 6230 for ac_exec_ext in '' $ac_executable_extensions; do
6154 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6231 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6157,7 +6234,7 @@ index b12ec2e472f..57986ca995a 100755
6157 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6234 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6158 break 2 6235 break 2
6159 fi 6236 fi
6160@@ -6293,11 +6547,15 @@ $as_echo "no" >&6; } 6237@@ -5652,11 +5906,15 @@ $as_echo "no" >&6; }
6161 fi 6238 fi
6162 6239
6163 6240
@@ -6176,7 +6253,7 @@ index b12ec2e472f..57986ca995a 100755
6176 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6253 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6177 $as_echo_n "checking for $ac_word... " >&6; } 6254 $as_echo_n "checking for $ac_word... " >&6; }
6178 if ${ac_cv_prog_ac_ct_AR+:} false; then : 6255 if ${ac_cv_prog_ac_ct_AR+:} false; then :
6179@@ -6313,7 +6571,7 @@ do 6256@@ -5672,7 +5930,7 @@ do
6180 test -z "$as_dir" && as_dir=. 6257 test -z "$as_dir" && as_dir=.
6181 for ac_exec_ext in '' $ac_executable_extensions; do 6258 for ac_exec_ext in '' $ac_executable_extensions; do
6182 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6259 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -6185,7 +6262,7 @@ index b12ec2e472f..57986ca995a 100755
6185 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6262 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6186 break 2 6263 break 2
6187 fi 6264 fi
6188@@ -6332,6 +6590,10 @@ else 6265@@ -5691,6 +5949,10 @@ else
6189 $as_echo "no" >&6; } 6266 $as_echo "no" >&6; }
6190 fi 6267 fi
6191 6268
@@ -6196,7 +6273,7 @@ index b12ec2e472f..57986ca995a 100755
6196 if test "x$ac_ct_AR" = x; then 6273 if test "x$ac_ct_AR" = x; then
6197 AR="false" 6274 AR="false"
6198 else 6275 else
6199@@ -6343,16 +6605,72 @@ ac_tool_warned=yes ;; 6276@@ -5702,25 +5964,19 @@ ac_tool_warned=yes ;;
6200 esac 6277 esac
6201 AR=$ac_ct_AR 6278 AR=$ac_ct_AR
6202 fi 6279 fi
@@ -6205,20 +6282,36 @@ index b12ec2e472f..57986ca995a 100755
6205 fi 6282 fi
6206 6283
6207-test -z "$AR" && AR=ar 6284-test -z "$AR" && AR=ar
6285-if test -n "$plugin_option"; then
6286- if $AR --help 2>&1 | grep -q "\--plugin"; then
6287- touch conftest.c
6288- $AR $plugin_option rc conftest.a conftest.c
6289- if test "$?" != 0; then
6290- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
6291+ touch conftest.c
6292+ $AR $plugin_option rc conftest.a conftest.c
6293+ if test "$?" != 0; then
6294+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
6295 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
6296- else
6297- AR="$AR $plugin_option"
6298- fi
6299- rm -f conftest.*
6300+ else
6301+ AR="$AR $plugin_option"
6302 fi
6303-fi
6208-test -z "$AR_FLAGS" && AR_FLAGS=cru 6304-test -z "$AR_FLAGS" && AR_FLAGS=cru
6305+ rm -f conftest.*
6209+: ${AR=ar} 6306+: ${AR=ar}
6210+: ${AR_FLAGS=cru} 6307+: ${AR_FLAGS=cru}
6211+ 6308
6212+ 6309
6213+ 6310
6214+ 6311@@ -5732,6 +5988,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6215+ 6312
6216+ 6313
6217+ 6314
6218+
6219+
6220+
6221+
6222+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 6315+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6223+$as_echo_n "checking for archiver @FILE support... " >&6; } 6316+$as_echo_n "checking for archiver @FILE support... " >&6; }
6224+if ${lt_cv_ar_at_file+:} false; then : 6317+if ${lt_cv_ar_at_file+:} false; then :
@@ -6231,7 +6324,7 @@ index b12ec2e472f..57986ca995a 100755
6231+int 6324+int
6232+main () 6325+main ()
6233+{ 6326+{
6234 6327+
6235+ ; 6328+ ;
6236+ return 0; 6329+ return 0;
6237+} 6330+}
@@ -6257,23 +6350,30 @@ index b12ec2e472f..57986ca995a 100755
6257+ fi 6350+ fi
6258+ fi 6351+ fi
6259+ rm -f conftest.* libconftest.a 6352+ rm -f conftest.* libconftest.a
6260 6353+
6261+fi 6354+fi
6262+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6355+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6263 6356+
6264+fi 6357+fi
6265+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 6358+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6266+$as_echo "$lt_cv_ar_at_file" >&6; } 6359+$as_echo "$lt_cv_ar_at_file" >&6; }
6267 6360+
6268+if test "x$lt_cv_ar_at_file" = xno; then 6361+if test "x$lt_cv_ar_at_file" = xno; then
6269+ archiver_list_spec= 6362+ archiver_list_spec=
6270+else 6363+else
6271+ archiver_list_spec=$lt_cv_ar_at_file 6364+ archiver_list_spec=$lt_cv_ar_at_file
6272+fi 6365+fi
6273 6366+
6274 6367+
6275 6368+
6276@@ -6694,8 +7012,8 @@ esac 6369+
6370+
6371+
6372+
6373 if test -n "$ac_tool_prefix"; then
6374 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6375 set dummy ${ac_tool_prefix}strip; ac_word=$2
6376@@ -6071,8 +6385,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'" 6377 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6278 6378
6279 # Transform an extracted symbol line into symbol name and symbol address 6379 # Transform an extracted symbol line into symbol name and symbol address
@@ -6284,7 +6384,7 @@ index b12ec2e472f..57986ca995a 100755
6284 6384
6285 # Handle CRLF in mingw tool chain 6385 # Handle CRLF in mingw tool chain
6286 opt_cr= 6386 opt_cr=
6287@@ -6731,6 +7049,7 @@ for ac_symprfx in "" "_"; do 6387@@ -6108,6 +6422,7 @@ for ac_symprfx in "" "_"; do
6288 else 6388 else
6289 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6389 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6290 fi 6390 fi
@@ -6292,7 +6392,7 @@ index b12ec2e472f..57986ca995a 100755
6292 6392
6293 # Check to see that the pipe works correctly. 6393 # Check to see that the pipe works correctly.
6294 pipe_works=no 6394 pipe_works=no
6295@@ -6772,6 +7091,18 @@ _LT_EOF 6395@@ -6149,6 +6464,18 @@ _LT_EOF
6296 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6396 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6297 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6397 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6298 cat <<_LT_EOF > conftest.$ac_ext 6398 cat <<_LT_EOF > conftest.$ac_ext
@@ -6311,7 +6411,7 @@ index b12ec2e472f..57986ca995a 100755
6311 #ifdef __cplusplus 6411 #ifdef __cplusplus
6312 extern "C" { 6412 extern "C" {
6313 #endif 6413 #endif
6314@@ -6783,7 +7114,7 @@ _LT_EOF 6414@@ -6160,7 +6487,7 @@ _LT_EOF
6315 cat <<_LT_EOF >> conftest.$ac_ext 6415 cat <<_LT_EOF >> conftest.$ac_ext
6316 6416
6317 /* The mapping between symbol names and symbols. */ 6417 /* The mapping between symbol names and symbols. */
@@ -6320,7 +6420,7 @@ index b12ec2e472f..57986ca995a 100755
6320 const char *name; 6420 const char *name;
6321 void *address; 6421 void *address;
6322 } 6422 }
6323@@ -6809,8 +7140,8 @@ static const void *lt_preloaded_setup() { 6423@@ -6186,8 +6513,8 @@ static const void *lt_preloaded_setup() {
6324 _LT_EOF 6424 _LT_EOF
6325 # Now try linking the two files. 6425 # Now try linking the two files.
6326 mv conftest.$ac_objext conftstm.$ac_objext 6426 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6331,7 +6431,7 @@ index b12ec2e472f..57986ca995a 100755
6331 LIBS="conftstm.$ac_objext" 6431 LIBS="conftstm.$ac_objext"
6332 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6432 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6333 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6433 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6334@@ -6820,8 +7151,8 @@ _LT_EOF 6434@@ -6197,8 +6524,8 @@ _LT_EOF
6335 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6435 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6336 pipe_works=yes 6436 pipe_works=yes
6337 fi 6437 fi
@@ -6342,7 +6442,7 @@ index b12ec2e472f..57986ca995a 100755
6342 else 6442 else
6343 echo "cannot find nm_test_func in $nlist" >&5 6443 echo "cannot find nm_test_func in $nlist" >&5
6344 fi 6444 fi
6345@@ -6858,6 +7189,20 @@ else 6445@@ -6235,6 +6562,18 @@ else
6346 $as_echo "ok" >&6; } 6446 $as_echo "ok" >&6; }
6347 fi 6447 fi
6348 6448
@@ -6358,18 +6458,18 @@ index b12ec2e472f..57986ca995a 100755
6358+ 6458+
6359+ 6459+
6360+ 6460+
6361+
6362+
6363 6461
6364 6462
6365 6463
6366@@ -6874,6 +7219,41 @@ fi 6464@@ -6251,6 +6590,43 @@ fi
6367 6465
6368 6466
6369 6467
6370+ 6468+
6371+ 6469+
6372+ 6470+
6471+
6472+
6373+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 6473+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6374+$as_echo_n "checking for sysroot... " >&6; } 6474+$as_echo_n "checking for sysroot... " >&6; }
6375+ 6475+
@@ -6405,7 +6505,7 @@ index b12ec2e472f..57986ca995a 100755
6405 6505
6406 6506
6407 6507
6408@@ -7085,6 +7465,123 @@ esac 6508@@ -6462,6 +6838,123 @@ esac
6409 6509
6410 need_locks="$enable_libtool_lock" 6510 need_locks="$enable_libtool_lock"
6411 6511
@@ -6529,7 +6629,7 @@ index b12ec2e472f..57986ca995a 100755
6529 6629
6530 case $host_os in 6630 case $host_os in
6531 rhapsody* | darwin*) 6631 rhapsody* | darwin*)
6532@@ -7648,6 +8145,8 @@ _LT_EOF 6632@@ -7025,6 +7518,8 @@ _LT_EOF
6533 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6633 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6534 echo "$AR cru libconftest.a conftest.o" >&5 6634 echo "$AR cru libconftest.a conftest.o" >&5
6535 $AR cru libconftest.a conftest.o 2>&5 6635 $AR cru libconftest.a conftest.o 2>&5
@@ -6538,7 +6638,7 @@ index b12ec2e472f..57986ca995a 100755
6538 cat > conftest.c << _LT_EOF 6638 cat > conftest.c << _LT_EOF
6539 int main() { return 0;} 6639 int main() { return 0;}
6540 _LT_EOF 6640 _LT_EOF
6541@@ -7843,7 +8342,8 @@ fi 6641@@ -7220,7 +7715,8 @@ fi
6542 LIBTOOL_DEPS="$ltmain" 6642 LIBTOOL_DEPS="$ltmain"
6543 6643
6544 # Always use our own libtool. 6644 # Always use our own libtool.
@@ -6548,7 +6648,7 @@ index b12ec2e472f..57986ca995a 100755
6548 6648
6549 6649
6550 6650
6551@@ -7932,7 +8432,7 @@ aix3*) 6651@@ -7309,7 +7805,7 @@ aix3*)
6552 esac 6652 esac
6553 6653
6554 # Global variables: 6654 # Global variables:
@@ -6557,7 +6657,7 @@ index b12ec2e472f..57986ca995a 100755
6557 can_build_shared=yes 6657 can_build_shared=yes
6558 6658
6559 # All known linkers require a `.a' archive for static linking (except MSVC, 6659 # All known linkers require a `.a' archive for static linking (except MSVC,
6560@@ -8230,8 +8730,6 @@ fi 6660@@ -7607,8 +8103,6 @@ fi
6561 lt_prog_compiler_pic= 6661 lt_prog_compiler_pic=
6562 lt_prog_compiler_static= 6662 lt_prog_compiler_static=
6563 6663
@@ -6566,7 +6666,7 @@ index b12ec2e472f..57986ca995a 100755
6566 6666
6567 if test "$GCC" = yes; then 6667 if test "$GCC" = yes; then
6568 lt_prog_compiler_wl='-Wl,' 6668 lt_prog_compiler_wl='-Wl,'
6569@@ -8397,6 +8895,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6669@@ -7774,6 +8268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6570 lt_prog_compiler_pic='--shared' 6670 lt_prog_compiler_pic='--shared'
6571 lt_prog_compiler_static='--static' 6671 lt_prog_compiler_static='--static'
6572 ;; 6672 ;;
@@ -6579,7 +6679,7 @@ index b12ec2e472f..57986ca995a 100755
6579 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6679 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6580 # Portland Group compilers (*not* the Pentium gcc compiler, 6680 # Portland Group compilers (*not* the Pentium gcc compiler,
6581 # which looks to be a dead project) 6681 # which looks to be a dead project)
6582@@ -8459,7 +8963,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6682@@ -7836,7 +8336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6583 lt_prog_compiler_pic='-KPIC' 6683 lt_prog_compiler_pic='-KPIC'
6584 lt_prog_compiler_static='-Bstatic' 6684 lt_prog_compiler_static='-Bstatic'
6585 case $cc_basename in 6685 case $cc_basename in
@@ -6588,7 +6688,7 @@ index b12ec2e472f..57986ca995a 100755
6588 lt_prog_compiler_wl='-Qoption ld ';; 6688 lt_prog_compiler_wl='-Qoption ld ';;
6589 *) 6689 *)
6590 lt_prog_compiler_wl='-Wl,';; 6690 lt_prog_compiler_wl='-Wl,';;
6591@@ -8516,13 +9020,17 @@ case $host_os in 6691@@ -7893,13 +8393,17 @@ case $host_os in
6592 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6692 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6593 ;; 6693 ;;
6594 esac 6694 esac
@@ -6612,7 +6712,7 @@ index b12ec2e472f..57986ca995a 100755
6612 6712
6613 # 6713 #
6614 # Check to make sure the PIC flag actually works. 6714 # Check to make sure the PIC flag actually works.
6615@@ -8583,6 +9091,11 @@ fi 6715@@ -7960,6 +8464,11 @@ fi
6616 6716
6617 6717
6618 6718
@@ -6624,7 +6724,7 @@ index b12ec2e472f..57986ca995a 100755
6624 # 6724 #
6625 # Check to make sure the static flag actually works. 6725 # Check to make sure the static flag actually works.
6626 # 6726 #
6627@@ -8933,7 +9446,8 @@ _LT_EOF 6727@@ -8310,7 +8819,8 @@ _LT_EOF
6628 allow_undefined_flag=unsupported 6728 allow_undefined_flag=unsupported
6629 always_export_symbols=no 6729 always_export_symbols=no
6630 enable_shared_with_static_runtimes=yes 6730 enable_shared_with_static_runtimes=yes
@@ -6634,7 +6734,7 @@ index b12ec2e472f..57986ca995a 100755
6634 6734
6635 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6735 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' 6736 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6637@@ -9032,12 +9546,12 @@ _LT_EOF 6737@@ -8409,12 +8919,12 @@ _LT_EOF
6638 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6738 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6639 hardcode_libdir_flag_spec= 6739 hardcode_libdir_flag_spec=
6640 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6740 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -6649,7 +6749,7 @@ index b12ec2e472f..57986ca995a 100755
6649 fi 6749 fi
6650 ;; 6750 ;;
6651 esac 6751 esac
6652@@ -9051,8 +9565,8 @@ _LT_EOF 6752@@ -8428,8 +8938,8 @@ _LT_EOF
6653 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6753 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6654 wlarc= 6754 wlarc=
6655 else 6755 else
@@ -6660,7 +6760,7 @@ index b12ec2e472f..57986ca995a 100755
6660 fi 6760 fi
6661 ;; 6761 ;;
6662 6762
6663@@ -9070,8 +9584,8 @@ _LT_EOF 6763@@ -8447,8 +8957,8 @@ _LT_EOF
6664 6764
6665 _LT_EOF 6765 _LT_EOF
6666 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6766 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6671,7 +6771,7 @@ index b12ec2e472f..57986ca995a 100755
6671 else 6771 else
6672 ld_shlibs=no 6772 ld_shlibs=no
6673 fi 6773 fi
6674@@ -9117,8 +9631,8 @@ _LT_EOF 6774@@ -8494,8 +9004,8 @@ _LT_EOF
6675 6775
6676 *) 6776 *)
6677 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6777 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6682,7 +6782,7 @@ index b12ec2e472f..57986ca995a 100755
6682 else 6782 else
6683 ld_shlibs=no 6783 ld_shlibs=no
6684 fi 6784 fi
6685@@ -9248,7 +9762,13 @@ _LT_EOF 6785@@ -8625,7 +9135,13 @@ _LT_EOF
6686 allow_undefined_flag='-berok' 6786 allow_undefined_flag='-berok'
6687 # Determine the default libpath from the value encoded in an 6787 # Determine the default libpath from the value encoded in an
6688 # empty executable. 6788 # empty executable.
@@ -6697,7 +6797,7 @@ index b12ec2e472f..57986ca995a 100755
6697 /* end confdefs.h. */ 6797 /* end confdefs.h. */
6698 6798
6699 int 6799 int
6700@@ -9261,22 +9781,29 @@ main () 6800@@ -8638,22 +9154,29 @@ main ()
6701 _ACEOF 6801 _ACEOF
6702 if ac_fn_c_try_link "$LINENO"; then : 6802 if ac_fn_c_try_link "$LINENO"; then :
6703 6803
@@ -6740,7 +6840,7 @@ index b12ec2e472f..57986ca995a 100755
6740 6840
6741 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6841 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" 6842 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@@ -9288,7 +9815,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6843@@ -8665,7 +9188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6744 else 6844 else
6745 # Determine the default libpath from the value encoded in an 6845 # Determine the default libpath from the value encoded in an
6746 # empty executable. 6846 # empty executable.
@@ -6755,7 +6855,7 @@ index b12ec2e472f..57986ca995a 100755
6755 /* end confdefs.h. */ 6855 /* end confdefs.h. */
6756 6856
6757 int 6857 int
6758@@ -9301,22 +9834,29 @@ main () 6858@@ -8678,22 +9207,29 @@ main ()
6759 _ACEOF 6859 _ACEOF
6760 if ac_fn_c_try_link "$LINENO"; then : 6860 if ac_fn_c_try_link "$LINENO"; then :
6761 6861
@@ -6798,7 +6898,7 @@ index b12ec2e472f..57986ca995a 100755
6798 6898
6799 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6899 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6800 # Warning - without using the other run time loading flags, 6900 # Warning - without using the other run time loading flags,
6801@@ -9361,20 +9901,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6901@@ -8738,20 +9274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6802 # Microsoft Visual C++. 6902 # Microsoft Visual C++.
6803 # hardcode_libdir_flag_spec is actually meaningless, as there is 6903 # hardcode_libdir_flag_spec is actually meaningless, as there is
6804 # no search path for DLLs. 6904 # no search path for DLLs.
@@ -6876,7 +6976,7 @@ index b12ec2e472f..57986ca995a 100755
6876 ;; 6976 ;;
6877 6977
6878 darwin* | rhapsody*) 6978 darwin* | rhapsody*)
6879@@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6979@@ -8812,7 +9391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6880 6980
6881 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 6981 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6882 freebsd* | dragonfly*) 6982 freebsd* | dragonfly*)
@@ -6885,7 +6985,7 @@ index b12ec2e472f..57986ca995a 100755
6885 hardcode_libdir_flag_spec='-R$libdir' 6985 hardcode_libdir_flag_spec='-R$libdir'
6886 hardcode_direct=yes 6986 hardcode_direct=yes
6887 hardcode_shlibpath_var=no 6987 hardcode_shlibpath_var=no
6888@@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6988@@ -8820,7 +9399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6889 6989
6890 hpux9*) 6990 hpux9*)
6891 if test "$GCC" = yes; then 6991 if test "$GCC" = yes; then
@@ -6894,7 +6994,7 @@ index b12ec2e472f..57986ca995a 100755
6894 else 6994 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' 6995 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 6996 fi
6897@@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6997@@ -8836,7 +9415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6898 6998
6899 hpux10*) 6999 hpux10*)
6900 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 7000 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -6903,7 +7003,7 @@ index b12ec2e472f..57986ca995a 100755
6903 else 7003 else
6904 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 7004 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6905 fi 7005 fi
6906@@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 7006@@ -8860,10 +9439,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' 7007 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6908 ;; 7008 ;;
6909 ia64*) 7009 ia64*)
@@ -6916,7 +7016,7 @@ index b12ec2e472f..57986ca995a 100755
6916 ;; 7016 ;;
6917 esac 7017 esac
6918 else 7018 else
6919@@ -9565,23 +10148,36 @@ fi 7019@@ -8942,23 +9521,36 @@ fi
6920 7020
6921 irix5* | irix6* | nonstopux*) 7021 irix5* | irix6* | nonstopux*)
6922 if test "$GCC" = yes; then 7022 if test "$GCC" = yes; then
@@ -6961,7 +7061,7 @@ index b12ec2e472f..57986ca995a 100755
6961 else 7061 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' 7062 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' 7063 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@@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_objext \ 7064@@ -9043,7 +9635,7 @@ rm -f core conftest.err conftest.$ac_objext \
6965 osf4* | osf5*) # as osf3* with the addition of -msym flag 7065 osf4* | osf5*) # as osf3* with the addition of -msym flag
6966 if test "$GCC" = yes; then 7066 if test "$GCC" = yes; then
6967 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 7067 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6970,7 +7070,7 @@ index b12ec2e472f..57986ca995a 100755
6970 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 7070 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6971 else 7071 else
6972 allow_undefined_flag=' -expect_unresolved \*' 7072 allow_undefined_flag=' -expect_unresolved \*'
6973@@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_objext \ 7073@@ -9062,9 +9654,9 @@ rm -f core conftest.err conftest.$ac_objext \
6974 no_undefined_flag=' -z defs' 7074 no_undefined_flag=' -z defs'
6975 if test "$GCC" = yes; then 7075 if test "$GCC" = yes; then
6976 wlarc='${wl}' 7076 wlarc='${wl}'
@@ -6982,7 +7082,7 @@ index b12ec2e472f..57986ca995a 100755
6982 else 7082 else
6983 case `$CC -V 2>&1` in 7083 case `$CC -V 2>&1` in
6984 *"Compilers 5.0"*) 7084 *"Compilers 5.0"*)
6985@@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*) 7085@@ -9640,8 +10232,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6986 need_version=no 7086 need_version=no
6987 need_lib_prefix=no 7087 need_lib_prefix=no
6988 7088
@@ -6994,7 +7094,7 @@ index b12ec2e472f..57986ca995a 100755
6994 library_names_spec='$libname.dll.a' 7094 library_names_spec='$libname.dll.a'
6995 # DLL is installed to $(libdir)/../bin by postinstall_cmds 7095 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6996 postinstall_cmds='base_file=`basename \${file}`~ 7096 postinstall_cmds='base_file=`basename \${file}`~
6997@@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*) 7097@@ -9674,13 +10267,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}' 7098 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
6999 ;; 7099 ;;
7000 esac 7100 esac
@@ -7067,7 +7167,7 @@ index b12ec2e472f..57986ca995a 100755
7067 # FIXME: first we should search . and the directory the executable is in 7167 # FIXME: first we should search . and the directory the executable is in
7068 shlibpath_var=PATH 7168 shlibpath_var=PATH
7069 ;; 7169 ;;
7070@@ -10385,7 +11040,7 @@ haiku*) 7170@@ -9762,7 +10413,7 @@ haiku*)
7071 soname_spec='${libname}${release}${shared_ext}$major' 7171 soname_spec='${libname}${release}${shared_ext}$major'
7072 shlibpath_var=LIBRARY_PATH 7172 shlibpath_var=LIBRARY_PATH
7073 shlibpath_overrides_runpath=yes 7173 shlibpath_overrides_runpath=yes
@@ -7076,16 +7176,16 @@ index b12ec2e472f..57986ca995a 100755
7076 hardcode_into_libs=yes 7176 hardcode_into_libs=yes
7077 ;; 7177 ;;
7078 7178
7079@@ -11181,7 +11836,7 @@ else 7179@@ -10558,7 +11209,7 @@ else
7080 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7180 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7081 lt_status=$lt_dlunknown 7181 lt_status=$lt_dlunknown
7082 cat > conftest.$ac_ext <<_LT_EOF 7182 cat > conftest.$ac_ext <<_LT_EOF
7083-#line 11184 "configure" 7183-#line 10561 "configure"
7084+#line $LINENO "configure" 7184+#line $LINENO "configure"
7085 #include "confdefs.h" 7185 #include "confdefs.h"
7086 7186
7087 #if HAVE_DLFCN_H 7187 #if HAVE_DLFCN_H
7088@@ -11225,10 +11880,10 @@ else 7188@@ -10602,10 +11253,10 @@ else
7089 /* When -fvisbility=hidden is used, assume the code has been annotated 7189 /* When -fvisbility=hidden is used, assume the code has been annotated
7090 correspondingly for the symbols needed. */ 7190 correspondingly for the symbols needed. */
7091 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7191 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7098,16 +7198,16 @@ index b12ec2e472f..57986ca995a 100755
7098 int main () 7198 int main ()
7099 { 7199 {
7100 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7200 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7101@@ -11287,7 +11942,7 @@ else 7201@@ -10664,7 +11315,7 @@ else
7102 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7202 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7103 lt_status=$lt_dlunknown 7203 lt_status=$lt_dlunknown
7104 cat > conftest.$ac_ext <<_LT_EOF 7204 cat > conftest.$ac_ext <<_LT_EOF
7105-#line 11290 "configure" 7205-#line 10667 "configure"
7106+#line $LINENO "configure" 7206+#line $LINENO "configure"
7107 #include "confdefs.h" 7207 #include "confdefs.h"
7108 7208
7109 #if HAVE_DLFCN_H 7209 #if HAVE_DLFCN_H
7110@@ -11331,10 +11986,10 @@ else 7210@@ -10708,10 +11359,10 @@ else
7111 /* When -fvisbility=hidden is used, assume the code has been annotated 7211 /* When -fvisbility=hidden is used, assume the code has been annotated
7112 correspondingly for the symbols needed. */ 7212 correspondingly for the symbols needed. */
7113 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7213 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7120,7 +7220,7 @@ index b12ec2e472f..57986ca995a 100755
7120 int main () 7220 int main ()
7121 { 7221 {
7122 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7222 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7123@@ -13341,13 +13996,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7223@@ -12731,13 +13382,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7124 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7224 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7125 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7225 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7126 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7226 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7141,7 +7241,7 @@ index b12ec2e472f..57986ca995a 100755
7141 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7241 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7142 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7242 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7143 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7243 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7144@@ -13362,14 +14024,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7244@@ -12752,14 +13410,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"`' 7245 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"`' 7246 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"`' 7247 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 +7260,7 @@ index b12ec2e472f..57986ca995a 100755
7160 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7260 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7161 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7261 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7162 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7262 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7163@@ -13402,12 +14067,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7263@@ -12792,12 +13453,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7164 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7264 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7165 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7265 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7166 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7266 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7174,7 +7274,7 @@ index b12ec2e472f..57986ca995a 100755
7174 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7274 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"`' 7275 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"`' 7276 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7177@@ -13462,8 +14127,13 @@ reload_flag \ 7277@@ -12852,8 +13513,13 @@ reload_flag \
7178 OBJDUMP \ 7278 OBJDUMP \
7179 deplibs_check_method \ 7279 deplibs_check_method \
7180 file_magic_cmd \ 7280 file_magic_cmd \
@@ -7188,7 +7288,7 @@ index b12ec2e472f..57986ca995a 100755
7188 STRIP \ 7288 STRIP \
7189 RANLIB \ 7289 RANLIB \
7190 CC \ 7290 CC \
7191@@ -13473,12 +14143,14 @@ lt_cv_sys_global_symbol_pipe \ 7291@@ -12863,12 +13529,14 @@ lt_cv_sys_global_symbol_pipe \
7192 lt_cv_sys_global_symbol_to_cdecl \ 7292 lt_cv_sys_global_symbol_to_cdecl \
7193 lt_cv_sys_global_symbol_to_c_name_address \ 7293 lt_cv_sys_global_symbol_to_c_name_address \
7194 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7294 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7204,7 +7304,7 @@ index b12ec2e472f..57986ca995a 100755
7204 DSYMUTIL \ 7304 DSYMUTIL \
7205 NMEDIT \ 7305 NMEDIT \
7206 LIPO \ 7306 LIPO \
7207@@ -13494,7 +14166,6 @@ no_undefined_flag \ 7307@@ -12884,7 +13552,6 @@ no_undefined_flag \
7208 hardcode_libdir_flag_spec \ 7308 hardcode_libdir_flag_spec \
7209 hardcode_libdir_flag_spec_ld \ 7309 hardcode_libdir_flag_spec_ld \
7210 hardcode_libdir_separator \ 7310 hardcode_libdir_separator \
@@ -7212,7 +7312,7 @@ index b12ec2e472f..57986ca995a 100755
7212 exclude_expsyms \ 7312 exclude_expsyms \
7213 include_expsyms \ 7313 include_expsyms \
7214 file_list_spec \ 7314 file_list_spec \
7215@@ -13530,6 +14201,7 @@ module_cmds \ 7315@@ -12920,6 +13587,7 @@ module_cmds \
7216 module_expsym_cmds \ 7316 module_expsym_cmds \
7217 export_symbols_cmds \ 7317 export_symbols_cmds \
7218 prelink_cmds \ 7318 prelink_cmds \
@@ -7220,7 +7320,7 @@ index b12ec2e472f..57986ca995a 100755
7220 postinstall_cmds \ 7320 postinstall_cmds \
7221 postuninstall_cmds \ 7321 postuninstall_cmds \
7222 finish_cmds \ 7322 finish_cmds \
7223@@ -14295,7 +14967,8 @@ $as_echo X"$file" | 7323@@ -13685,7 +14353,8 @@ $as_echo X"$file" |
7224 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7324 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7225 # 7325 #
7226 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7326 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7230,7 +7330,7 @@ index b12ec2e472f..57986ca995a 100755
7230 # Written by Gordon Matzigkeit, 1996 7330 # Written by Gordon Matzigkeit, 1996
7231 # 7331 #
7232 # This file is part of GNU Libtool. 7332 # This file is part of GNU Libtool.
7233@@ -14398,19 +15071,42 @@ SP2NL=$lt_lt_SP2NL 7333@@ -13788,19 +14457,42 @@ SP2NL=$lt_lt_SP2NL
7234 # turn newlines into spaces. 7334 # turn newlines into spaces.
7235 NL2SP=$lt_lt_NL2SP 7335 NL2SP=$lt_lt_NL2SP
7236 7336
@@ -7274,7 +7374,7 @@ index b12ec2e472f..57986ca995a 100755
7274 # A symbol stripping program. 7374 # A symbol stripping program.
7275 STRIP=$lt_STRIP 7375 STRIP=$lt_STRIP
7276 7376
7277@@ -14440,6 +15136,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7377@@ -13830,6 +14522,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. 7378 # 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 7379 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7280 7380
@@ -7287,7 +7387,7 @@ index b12ec2e472f..57986ca995a 100755
7287 # The name of the directory that contains temporary libtool files. 7387 # The name of the directory that contains temporary libtool files.
7288 objdir=$objdir 7388 objdir=$objdir
7289 7389
7290@@ -14449,6 +15151,9 @@ MAGIC_CMD=$MAGIC_CMD 7390@@ -13839,6 +14537,9 @@ MAGIC_CMD=$MAGIC_CMD
7291 # Must we lock files when doing compilation? 7391 # Must we lock files when doing compilation?
7292 need_locks=$lt_need_locks 7392 need_locks=$lt_need_locks
7293 7393
@@ -7297,7 +7397,7 @@ index b12ec2e472f..57986ca995a 100755
7297 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7397 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7298 DSYMUTIL=$lt_DSYMUTIL 7398 DSYMUTIL=$lt_DSYMUTIL
7299 7399
7300@@ -14563,12 +15268,12 @@ with_gcc=$GCC 7400@@ -13953,12 +14654,12 @@ with_gcc=$GCC
7301 # Compiler flag to turn off builtin functions. 7401 # Compiler flag to turn off builtin functions.
7302 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7402 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7303 7403
@@ -7313,7 +7413,7 @@ index b12ec2e472f..57986ca995a 100755
7313 # Compiler flag to prevent dynamic linking. 7413 # Compiler flag to prevent dynamic linking.
7314 link_static_flag=$lt_lt_prog_compiler_static 7414 link_static_flag=$lt_lt_prog_compiler_static
7315 7415
7316@@ -14655,9 +15360,6 @@ inherit_rpath=$inherit_rpath 7416@@ -14045,9 +14746,6 @@ inherit_rpath=$inherit_rpath
7317 # Whether libtool must link a program against all its dependency libraries. 7417 # Whether libtool must link a program against all its dependency libraries.
7318 link_all_deplibs=$link_all_deplibs 7418 link_all_deplibs=$link_all_deplibs
7319 7419
@@ -7323,7 +7423,7 @@ index b12ec2e472f..57986ca995a 100755
7323 # Set to "yes" if exported symbols are required. 7423 # Set to "yes" if exported symbols are required.
7324 always_export_symbols=$always_export_symbols 7424 always_export_symbols=$always_export_symbols
7325 7425
7326@@ -14673,6 +15375,9 @@ include_expsyms=$lt_include_expsyms 7426@@ -14063,6 +14761,9 @@ include_expsyms=$lt_include_expsyms
7327 # Commands necessary for linking programs (against libraries) with templates. 7427 # Commands necessary for linking programs (against libraries) with templates.
7328 prelink_cmds=$lt_prelink_cmds 7428 prelink_cmds=$lt_prelink_cmds
7329 7429
@@ -7333,7 +7433,7 @@ index b12ec2e472f..57986ca995a 100755
7333 # Specify filename containing input files. 7433 # Specify filename containing input files.
7334 file_list_spec=$lt_file_list_spec 7434 file_list_spec=$lt_file_list_spec
7335 7435
7336@@ -14705,210 +15410,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7436@@ -14095,210 +14796,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7337 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7437 # 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 7438 # text mode, it properly converts lines to CR/LF. This bash problem
7339 # is reportedly fixed, but why not run on old versions too? 7439 # is reportedly fixed, but why not run on old versions too?
@@ -7708,7 +7808,7 @@ index b12ec2e472f..57986ca995a 100755
7708 chmod +x "$ofile" 7808 chmod +x "$ofile"
7709 7809
7710diff --git a/ld/configure b/ld/configure 7810diff --git a/ld/configure b/ld/configure
7711index 8355c433c76..a49ab3d1f09 100755 7811index 2aeb3317b65..5ef46d31558 100755
7712--- a/ld/configure 7812--- a/ld/configure
7713+++ b/ld/configure 7813+++ b/ld/configure
7714@@ -693,8 +693,11 @@ OTOOL 7814@@ -693,8 +693,11 @@ OTOOL
@@ -7731,7 +7831,7 @@ index 8355c433c76..a49ab3d1f09 100755
7731 enable_libtool_lock 7831 enable_libtool_lock
7732 enable_plugins 7832 enable_plugins
7733 enable_largefile 7833 enable_largefile
7734@@ -1526,6 +1530,8 @@ Optional Packages: 7834@@ -1528,6 +1532,8 @@ Optional Packages:
7735 --with-pic try to use only PIC/non-PIC objects [default=use 7835 --with-pic try to use only PIC/non-PIC objects [default=use
7736 both] 7836 both]
7737 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7837 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7740,7 +7840,7 @@ index 8355c433c76..a49ab3d1f09 100755
7740 --with-lib-path=dir1:dir2... set default LIB_PATH 7840 --with-lib-path=dir1:dir2... set default LIB_PATH
7741 --with-sysroot=DIR Search for usr/lib et al within DIR. 7841 --with-sysroot=DIR Search for usr/lib et al within DIR.
7742 --with-system-zlib use installed libz 7842 --with-system-zlib use installed libz
7743@@ -5979,8 +5985,8 @@ esac 7843@@ -5327,8 +5333,8 @@ esac
7744 7844
7745 7845
7746 7846
@@ -7751,7 +7851,7 @@ index 8355c433c76..a49ab3d1f09 100755
7751 7851
7752 7852
7753 7853
7754@@ -6020,7 +6026,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7854@@ -5368,7 +5374,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7855 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7756 $as_echo_n "checking how to print strings... " >&6; } 7856 $as_echo_n "checking how to print strings... " >&6; }
7757 # Test print first, because it will be a builtin if present. 7857 # Test print first, because it will be a builtin if present.
@@ -7760,7 +7860,7 @@ index 8355c433c76..a49ab3d1f09 100755
7760 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7860 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7761 ECHO='print -r --' 7861 ECHO='print -r --'
7762 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7862 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7763@@ -6706,8 +6712,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7863@@ -6054,8 +6060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7764 # Try some XSI features 7864 # Try some XSI features
7765 xsi_shell=no 7865 xsi_shell=no
7766 ( _lt_dummy="a/b/c" 7866 ( _lt_dummy="a/b/c"
@@ -7771,7 +7871,7 @@ index 8355c433c76..a49ab3d1f09 100755
7771 && eval 'test $(( 1 + 1 )) -eq 2 \ 7871 && eval 'test $(( 1 + 1 )) -eq 2 \
7772 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7872 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7773 && xsi_shell=yes 7873 && xsi_shell=yes
7774@@ -6756,6 +6762,80 @@ esac 7874@@ -6104,6 +6110,80 @@ esac
7775 7875
7776 7876
7777 7877
@@ -7852,7 +7952,7 @@ index 8355c433c76..a49ab3d1f09 100755
7852 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7952 { $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; } 7953 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7854 if ${lt_cv_ld_reload_flag+:} false; then : 7954 if ${lt_cv_ld_reload_flag+:} false; then :
7855@@ -6772,6 +6852,11 @@ case $reload_flag in 7955@@ -6120,6 +6200,11 @@ case $reload_flag in
7856 esac 7956 esac
7857 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7957 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7858 case $host_os in 7958 case $host_os in
@@ -7864,7 +7964,7 @@ index 8355c433c76..a49ab3d1f09 100755
7864 darwin*) 7964 darwin*)
7865 if test "$GCC" = yes; then 7965 if test "$GCC" = yes; then
7866 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7966 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7867@@ -6940,7 +7025,8 @@ mingw* | pw32*) 7967@@ -6288,7 +6373,8 @@ mingw* | pw32*)
7868 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7968 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7869 lt_cv_file_magic_cmd='func_win32_libid' 7969 lt_cv_file_magic_cmd='func_win32_libid'
7870 else 7970 else
@@ -7874,7 +7974,7 @@ index 8355c433c76..a49ab3d1f09 100755
7874 lt_cv_file_magic_cmd='$OBJDUMP -f' 7974 lt_cv_file_magic_cmd='$OBJDUMP -f'
7875 fi 7975 fi
7876 ;; 7976 ;;
7877@@ -7094,6 +7180,21 @@ esac 7977@@ -6442,6 +6528,21 @@ esac
7878 fi 7978 fi
7879 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7979 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7880 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7980 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7896,7 +7996,7 @@ index 8355c433c76..a49ab3d1f09 100755
7896 file_magic_cmd=$lt_cv_file_magic_cmd 7996 file_magic_cmd=$lt_cv_file_magic_cmd
7897 deplibs_check_method=$lt_cv_deplibs_check_method 7997 deplibs_check_method=$lt_cv_deplibs_check_method
7898 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7998 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7899@@ -7109,9 +7210,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7999@@ -6457,6 +6558,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7900 8000
7901 8001
7902 8002
@@ -8051,6 +8151,12 @@ index 8355c433c76..a49ab3d1f09 100755
8051+ 8151+
8052+ 8152+
8053+ 8153+
8154 plugin_option=
8155 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
8156 for plugin in $plugin_names; do
8157@@ -6471,8 +6723,10 @@ for plugin in $plugin_names; do
8158 done
8159
8054 if test -n "$ac_tool_prefix"; then 8160 if test -n "$ac_tool_prefix"; then
8055- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 8161- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
8056-set dummy ${ac_tool_prefix}ar; ac_word=$2 8162-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -8061,7 +8167,7 @@ index 8355c433c76..a49ab3d1f09 100755
8061 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8167 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8062 $as_echo_n "checking for $ac_word... " >&6; } 8168 $as_echo_n "checking for $ac_word... " >&6; }
8063 if ${ac_cv_prog_AR+:} false; then : 8169 if ${ac_cv_prog_AR+:} false; then :
8064@@ -7127,7 +7381,7 @@ do 8170@@ -6488,7 +6742,7 @@ do
8065 test -z "$as_dir" && as_dir=. 8171 test -z "$as_dir" && as_dir=.
8066 for ac_exec_ext in '' $ac_executable_extensions; do 8172 for ac_exec_ext in '' $ac_executable_extensions; do
8067 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8173 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8070,7 +8176,7 @@ index 8355c433c76..a49ab3d1f09 100755
8070 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8176 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8071 break 2 8177 break 2
8072 fi 8178 fi
8073@@ -7147,11 +7401,15 @@ $as_echo "no" >&6; } 8179@@ -6508,11 +6762,15 @@ $as_echo "no" >&6; }
8074 fi 8180 fi
8075 8181
8076 8182
@@ -8089,7 +8195,7 @@ index 8355c433c76..a49ab3d1f09 100755
8089 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8195 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8090 $as_echo_n "checking for $ac_word... " >&6; } 8196 $as_echo_n "checking for $ac_word... " >&6; }
8091 if ${ac_cv_prog_ac_ct_AR+:} false; then : 8197 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8092@@ -7167,7 +7425,7 @@ do 8198@@ -6528,7 +6786,7 @@ do
8093 test -z "$as_dir" && as_dir=. 8199 test -z "$as_dir" && as_dir=.
8094 for ac_exec_ext in '' $ac_executable_extensions; do 8200 for ac_exec_ext in '' $ac_executable_extensions; do
8095 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8201 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8098,7 +8204,7 @@ index 8355c433c76..a49ab3d1f09 100755
8098 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8204 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8099 break 2 8205 break 2
8100 fi 8206 fi
8101@@ -7186,6 +7444,10 @@ else 8207@@ -6547,6 +6805,10 @@ else
8102 $as_echo "no" >&6; } 8208 $as_echo "no" >&6; }
8103 fi 8209 fi
8104 8210
@@ -8109,7 +8215,7 @@ index 8355c433c76..a49ab3d1f09 100755
8109 if test "x$ac_ct_AR" = x; then 8215 if test "x$ac_ct_AR" = x; then
8110 AR="false" 8216 AR="false"
8111 else 8217 else
8112@@ -7197,12 +7459,12 @@ ac_tool_warned=yes ;; 8218@@ -6558,25 +6820,19 @@ ac_tool_warned=yes ;;
8113 esac 8219 esac
8114 AR=$ac_ct_AR 8220 AR=$ac_ct_AR
8115 fi 8221 fi
@@ -8118,15 +8224,33 @@ index 8355c433c76..a49ab3d1f09 100755
8118 fi 8224 fi
8119 8225
8120-test -z "$AR" && AR=ar 8226-test -z "$AR" && AR=ar
8227-if test -n "$plugin_option"; then
8228- if $AR --help 2>&1 | grep -q "\--plugin"; then
8229- touch conftest.c
8230- $AR $plugin_option rc conftest.a conftest.c
8231- if test "$?" != 0; then
8232- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
8233+ touch conftest.c
8234+ $AR $plugin_option rc conftest.a conftest.c
8235+ if test "$?" != 0; then
8236+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
8237 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
8238- else
8239- AR="$AR $plugin_option"
8240- fi
8241- rm -f conftest.*
8242+ else
8243+ AR="$AR $plugin_option"
8244 fi
8245-fi
8121-test -z "$AR_FLAGS" && AR_FLAGS=cru 8246-test -z "$AR_FLAGS" && AR_FLAGS=cru
8247+ rm -f conftest.*
8122+: ${AR=ar} 8248+: ${AR=ar}
8123+: ${AR_FLAGS=cru} 8249+: ${AR_FLAGS=cru}
8124+
8125+
8126 8250
8127 8251
8128 8252
8129@@ -7212,6 +7474,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8253@@ -6588,6 +6844,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8130 8254
8131 8255
8132 8256
@@ -8186,10 +8310,12 @@ index 8355c433c76..a49ab3d1f09 100755
8186+ 8310+
8187+ 8311+
8188+ 8312+
8189 8313+
8190 8314+
8191 if test -n "$ac_tool_prefix"; then 8315 if test -n "$ac_tool_prefix"; then
8192@@ -7548,8 +7866,8 @@ esac 8316 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8317 set dummy ${ac_tool_prefix}strip; ac_word=$2
8318@@ -6927,8 +7241,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'" 8319 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8194 8320
8195 # Transform an extracted symbol line into symbol name and symbol address 8321 # Transform an extracted symbol line into symbol name and symbol address
@@ -8200,7 +8326,7 @@ index 8355c433c76..a49ab3d1f09 100755
8200 8326
8201 # Handle CRLF in mingw tool chain 8327 # Handle CRLF in mingw tool chain
8202 opt_cr= 8328 opt_cr=
8203@@ -7585,6 +7903,7 @@ for ac_symprfx in "" "_"; do 8329@@ -6964,6 +7278,7 @@ for ac_symprfx in "" "_"; do
8204 else 8330 else
8205 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8331 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8206 fi 8332 fi
@@ -8208,7 +8334,7 @@ index 8355c433c76..a49ab3d1f09 100755
8208 8334
8209 # Check to see that the pipe works correctly. 8335 # Check to see that the pipe works correctly.
8210 pipe_works=no 8336 pipe_works=no
8211@@ -7626,6 +7945,18 @@ _LT_EOF 8337@@ -7005,6 +7320,18 @@ _LT_EOF
8212 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8338 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8213 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8339 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8214 cat <<_LT_EOF > conftest.$ac_ext 8340 cat <<_LT_EOF > conftest.$ac_ext
@@ -8227,7 +8353,7 @@ index 8355c433c76..a49ab3d1f09 100755
8227 #ifdef __cplusplus 8353 #ifdef __cplusplus
8228 extern "C" { 8354 extern "C" {
8229 #endif 8355 #endif
8230@@ -7637,7 +7968,7 @@ _LT_EOF 8356@@ -7016,7 +7343,7 @@ _LT_EOF
8231 cat <<_LT_EOF >> conftest.$ac_ext 8357 cat <<_LT_EOF >> conftest.$ac_ext
8232 8358
8233 /* The mapping between symbol names and symbols. */ 8359 /* The mapping between symbol names and symbols. */
@@ -8236,7 +8362,7 @@ index 8355c433c76..a49ab3d1f09 100755
8236 const char *name; 8362 const char *name;
8237 void *address; 8363 void *address;
8238 } 8364 }
8239@@ -7663,8 +7994,8 @@ static const void *lt_preloaded_setup() { 8365@@ -7042,8 +7369,8 @@ static const void *lt_preloaded_setup() {
8240 _LT_EOF 8366 _LT_EOF
8241 # Now try linking the two files. 8367 # Now try linking the two files.
8242 mv conftest.$ac_objext conftstm.$ac_objext 8368 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8247,7 +8373,7 @@ index 8355c433c76..a49ab3d1f09 100755
8247 LIBS="conftstm.$ac_objext" 8373 LIBS="conftstm.$ac_objext"
8248 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8374 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8249 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8375 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8250@@ -7674,8 +8005,8 @@ _LT_EOF 8376@@ -7053,8 +7380,8 @@ _LT_EOF
8251 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8377 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8252 pipe_works=yes 8378 pipe_works=yes
8253 fi 8379 fi
@@ -8258,7 +8384,7 @@ index 8355c433c76..a49ab3d1f09 100755
8258 else 8384 else
8259 echo "cannot find nm_test_func in $nlist" >&5 8385 echo "cannot find nm_test_func in $nlist" >&5
8260 fi 8386 fi
8261@@ -7712,6 +8043,19 @@ else 8387@@ -7091,6 +7418,17 @@ else
8262 $as_echo "ok" >&6; } 8388 $as_echo "ok" >&6; }
8263 fi 8389 fi
8264 8390
@@ -8273,12 +8399,10 @@ index 8355c433c76..a49ab3d1f09 100755
8273+ 8399+
8274+ 8400+
8275+ 8401+
8276+
8277+
8278 8402
8279 8403
8280 8404
8281@@ -7728,6 +8072,42 @@ fi 8405@@ -7107,6 +7445,44 @@ fi
8282 8406
8283 8407
8284 8408
@@ -8286,6 +8410,8 @@ index 8355c433c76..a49ab3d1f09 100755
8286+ 8410+
8287+ 8411+
8288+ 8412+
8413+
8414+
8289+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 8415+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8290+$as_echo_n "checking for sysroot... " >&6; } 8416+$as_echo_n "checking for sysroot... " >&6; }
8291+ 8417+
@@ -8321,7 +8447,7 @@ index 8355c433c76..a49ab3d1f09 100755
8321 8447
8322 8448
8323 8449
8324@@ -7939,6 +8319,123 @@ esac 8450@@ -7318,6 +7694,123 @@ esac
8325 8451
8326 need_locks="$enable_libtool_lock" 8452 need_locks="$enable_libtool_lock"
8327 8453
@@ -8445,7 +8571,7 @@ index 8355c433c76..a49ab3d1f09 100755
8445 8571
8446 case $host_os in 8572 case $host_os in
8447 rhapsody* | darwin*) 8573 rhapsody* | darwin*)
8448@@ -8502,6 +8999,8 @@ _LT_EOF 8574@@ -7881,6 +8374,8 @@ _LT_EOF
8449 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8575 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8450 echo "$AR cru libconftest.a conftest.o" >&5 8576 echo "$AR cru libconftest.a conftest.o" >&5
8451 $AR cru libconftest.a conftest.o 2>&5 8577 $AR cru libconftest.a conftest.o 2>&5
@@ -8454,7 +8580,7 @@ index 8355c433c76..a49ab3d1f09 100755
8454 cat > conftest.c << _LT_EOF 8580 cat > conftest.c << _LT_EOF
8455 int main() { return 0;} 8581 int main() { return 0;}
8456 _LT_EOF 8582 _LT_EOF
8457@@ -8570,6 +9069,16 @@ done 8583@@ -7949,6 +8444,16 @@ done
8458 8584
8459 8585
8460 8586
@@ -8471,7 +8597,7 @@ index 8355c433c76..a49ab3d1f09 100755
8471 8597
8472 8598
8473 # Set options 8599 # Set options
8474@@ -8698,7 +9207,8 @@ fi 8600@@ -8077,7 +8582,8 @@ fi
8475 LIBTOOL_DEPS="$ltmain" 8601 LIBTOOL_DEPS="$ltmain"
8476 8602
8477 # Always use our own libtool. 8603 # Always use our own libtool.
@@ -8481,7 +8607,7 @@ index 8355c433c76..a49ab3d1f09 100755
8481 8607
8482 8608
8483 8609
8484@@ -8787,7 +9297,7 @@ aix3*) 8610@@ -8166,7 +8672,7 @@ aix3*)
8485 esac 8611 esac
8486 8612
8487 # Global variables: 8613 # Global variables:
@@ -8490,7 +8616,7 @@ index 8355c433c76..a49ab3d1f09 100755
8490 can_build_shared=yes 8616 can_build_shared=yes
8491 8617
8492 # All known linkers require a `.a' archive for static linking (except MSVC, 8618 # All known linkers require a `.a' archive for static linking (except MSVC,
8493@@ -9085,8 +9595,6 @@ fi 8619@@ -8464,8 +8970,6 @@ fi
8494 lt_prog_compiler_pic= 8620 lt_prog_compiler_pic=
8495 lt_prog_compiler_static= 8621 lt_prog_compiler_static=
8496 8622
@@ -8499,7 +8625,7 @@ index 8355c433c76..a49ab3d1f09 100755
8499 8625
8500 if test "$GCC" = yes; then 8626 if test "$GCC" = yes; then
8501 lt_prog_compiler_wl='-Wl,' 8627 lt_prog_compiler_wl='-Wl,'
8502@@ -9252,6 +9760,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8628@@ -8631,6 +9135,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8503 lt_prog_compiler_pic='--shared' 8629 lt_prog_compiler_pic='--shared'
8504 lt_prog_compiler_static='--static' 8630 lt_prog_compiler_static='--static'
8505 ;; 8631 ;;
@@ -8512,7 +8638,7 @@ index 8355c433c76..a49ab3d1f09 100755
8512 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8638 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8513 # Portland Group compilers (*not* the Pentium gcc compiler, 8639 # Portland Group compilers (*not* the Pentium gcc compiler,
8514 # which looks to be a dead project) 8640 # which looks to be a dead project)
8515@@ -9314,7 +9828,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8641@@ -8693,7 +9203,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8516 lt_prog_compiler_pic='-KPIC' 8642 lt_prog_compiler_pic='-KPIC'
8517 lt_prog_compiler_static='-Bstatic' 8643 lt_prog_compiler_static='-Bstatic'
8518 case $cc_basename in 8644 case $cc_basename in
@@ -8521,7 +8647,7 @@ index 8355c433c76..a49ab3d1f09 100755
8521 lt_prog_compiler_wl='-Qoption ld ';; 8647 lt_prog_compiler_wl='-Qoption ld ';;
8522 *) 8648 *)
8523 lt_prog_compiler_wl='-Wl,';; 8649 lt_prog_compiler_wl='-Wl,';;
8524@@ -9371,13 +9885,17 @@ case $host_os in 8650@@ -8750,13 +9260,17 @@ case $host_os in
8525 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8651 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8526 ;; 8652 ;;
8527 esac 8653 esac
@@ -8545,7 +8671,7 @@ index 8355c433c76..a49ab3d1f09 100755
8545 8671
8546 # 8672 #
8547 # Check to make sure the PIC flag actually works. 8673 # Check to make sure the PIC flag actually works.
8548@@ -9438,6 +9956,11 @@ fi 8674@@ -8817,6 +9331,11 @@ fi
8549 8675
8550 8676
8551 8677
@@ -8557,7 +8683,7 @@ index 8355c433c76..a49ab3d1f09 100755
8557 # 8683 #
8558 # Check to make sure the static flag actually works. 8684 # Check to make sure the static flag actually works.
8559 # 8685 #
8560@@ -9788,7 +10311,8 @@ _LT_EOF 8686@@ -9167,7 +9686,8 @@ _LT_EOF
8561 allow_undefined_flag=unsupported 8687 allow_undefined_flag=unsupported
8562 always_export_symbols=no 8688 always_export_symbols=no
8563 enable_shared_with_static_runtimes=yes 8689 enable_shared_with_static_runtimes=yes
@@ -8567,7 +8693,7 @@ index 8355c433c76..a49ab3d1f09 100755
8567 8693
8568 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8694 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' 8695 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8570@@ -9887,12 +10411,12 @@ _LT_EOF 8696@@ -9266,12 +9786,12 @@ _LT_EOF
8571 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8697 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8572 hardcode_libdir_flag_spec= 8698 hardcode_libdir_flag_spec=
8573 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8699 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8582,7 +8708,7 @@ index 8355c433c76..a49ab3d1f09 100755
8582 fi 8708 fi
8583 ;; 8709 ;;
8584 esac 8710 esac
8585@@ -9906,8 +10430,8 @@ _LT_EOF 8711@@ -9285,8 +9805,8 @@ _LT_EOF
8586 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8712 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8587 wlarc= 8713 wlarc=
8588 else 8714 else
@@ -8593,7 +8719,7 @@ index 8355c433c76..a49ab3d1f09 100755
8593 fi 8719 fi
8594 ;; 8720 ;;
8595 8721
8596@@ -9925,8 +10449,8 @@ _LT_EOF 8722@@ -9304,8 +9824,8 @@ _LT_EOF
8597 8723
8598 _LT_EOF 8724 _LT_EOF
8599 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8725 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8604,7 +8730,7 @@ index 8355c433c76..a49ab3d1f09 100755
8604 else 8730 else
8605 ld_shlibs=no 8731 ld_shlibs=no
8606 fi 8732 fi
8607@@ -9972,8 +10496,8 @@ _LT_EOF 8733@@ -9351,8 +9871,8 @@ _LT_EOF
8608 8734
8609 *) 8735 *)
8610 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8736 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8615,7 +8741,7 @@ index 8355c433c76..a49ab3d1f09 100755
8615 else 8741 else
8616 ld_shlibs=no 8742 ld_shlibs=no
8617 fi 8743 fi
8618@@ -10103,7 +10627,13 @@ _LT_EOF 8744@@ -9482,7 +10002,13 @@ _LT_EOF
8619 allow_undefined_flag='-berok' 8745 allow_undefined_flag='-berok'
8620 # Determine the default libpath from the value encoded in an 8746 # Determine the default libpath from the value encoded in an
8621 # empty executable. 8747 # empty executable.
@@ -8630,7 +8756,7 @@ index 8355c433c76..a49ab3d1f09 100755
8630 /* end confdefs.h. */ 8756 /* end confdefs.h. */
8631 8757
8632 int 8758 int
8633@@ -10116,22 +10646,29 @@ main () 8759@@ -9495,22 +10021,29 @@ main ()
8634 _ACEOF 8760 _ACEOF
8635 if ac_fn_c_try_link "$LINENO"; then : 8761 if ac_fn_c_try_link "$LINENO"; then :
8636 8762
@@ -8673,7 +8799,7 @@ index 8355c433c76..a49ab3d1f09 100755
8673 8799
8674 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8800 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" 8801 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@@ -10143,7 +10680,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8802@@ -9522,7 +10055,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8677 else 8803 else
8678 # Determine the default libpath from the value encoded in an 8804 # Determine the default libpath from the value encoded in an
8679 # empty executable. 8805 # empty executable.
@@ -8688,7 +8814,7 @@ index 8355c433c76..a49ab3d1f09 100755
8688 /* end confdefs.h. */ 8814 /* end confdefs.h. */
8689 8815
8690 int 8816 int
8691@@ -10156,22 +10699,29 @@ main () 8817@@ -9535,22 +10074,29 @@ main ()
8692 _ACEOF 8818 _ACEOF
8693 if ac_fn_c_try_link "$LINENO"; then : 8819 if ac_fn_c_try_link "$LINENO"; then :
8694 8820
@@ -8731,7 +8857,7 @@ index 8355c433c76..a49ab3d1f09 100755
8731 8857
8732 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8858 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8733 # Warning - without using the other run time loading flags, 8859 # Warning - without using the other run time loading flags,
8734@@ -10215,21 +10765,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8860@@ -9594,21 +10140,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 8861 # When not using gcc, we currently assume that we are using
8736 # Microsoft Visual C++. 8862 # Microsoft Visual C++.
8737 # hardcode_libdir_flag_spec is actually meaningless, as there is 8863 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8811,7 +8937,7 @@ index 8355c433c76..a49ab3d1f09 100755
8811 ;; 8937 ;;
8812 8938
8813 darwin* | rhapsody*) 8939 darwin* | rhapsody*)
8814@@ -10290,7 +10883,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8940@@ -9669,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8815 8941
8816 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8942 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8817 freebsd* | dragonfly*) 8943 freebsd* | dragonfly*)
@@ -8820,7 +8946,7 @@ index 8355c433c76..a49ab3d1f09 100755
8820 hardcode_libdir_flag_spec='-R$libdir' 8946 hardcode_libdir_flag_spec='-R$libdir'
8821 hardcode_direct=yes 8947 hardcode_direct=yes
8822 hardcode_shlibpath_var=no 8948 hardcode_shlibpath_var=no
8823@@ -10298,7 +10891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8949@@ -9677,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8824 8950
8825 hpux9*) 8951 hpux9*)
8826 if test "$GCC" = yes; then 8952 if test "$GCC" = yes; then
@@ -8829,7 +8955,7 @@ index 8355c433c76..a49ab3d1f09 100755
8829 else 8955 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' 8956 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 8957 fi
8832@@ -10314,7 +10907,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8958@@ -9693,7 +10282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8833 8959
8834 hpux10*) 8960 hpux10*)
8835 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8961 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8838,7 +8964,7 @@ index 8355c433c76..a49ab3d1f09 100755
8838 else 8964 else
8839 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8965 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8840 fi 8966 fi
8841@@ -10338,10 +10931,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8967@@ -9717,10 +10306,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' 8968 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8843 ;; 8969 ;;
8844 ia64*) 8970 ia64*)
@@ -8851,7 +8977,7 @@ index 8355c433c76..a49ab3d1f09 100755
8851 ;; 8977 ;;
8852 esac 8978 esac
8853 else 8979 else
8854@@ -10420,23 +11013,36 @@ fi 8980@@ -9799,23 +10388,36 @@ fi
8855 8981
8856 irix5* | irix6* | nonstopux*) 8982 irix5* | irix6* | nonstopux*)
8857 if test "$GCC" = yes; then 8983 if test "$GCC" = yes; then
@@ -8896,7 +9022,7 @@ index 8355c433c76..a49ab3d1f09 100755
8896 else 9022 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' 9023 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' 9024 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@@ -10521,7 +11127,7 @@ rm -f core conftest.err conftest.$ac_objext \ 9025@@ -9900,7 +10502,7 @@ rm -f core conftest.err conftest.$ac_objext \
8900 osf4* | osf5*) # as osf3* with the addition of -msym flag 9026 osf4* | osf5*) # as osf3* with the addition of -msym flag
8901 if test "$GCC" = yes; then 9027 if test "$GCC" = yes; then
8902 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 9028 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8905,7 +9031,7 @@ index 8355c433c76..a49ab3d1f09 100755
8905 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 9031 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8906 else 9032 else
8907 allow_undefined_flag=' -expect_unresolved \*' 9033 allow_undefined_flag=' -expect_unresolved \*'
8908@@ -10540,9 +11146,9 @@ rm -f core conftest.err conftest.$ac_objext \ 9034@@ -9919,9 +10521,9 @@ rm -f core conftest.err conftest.$ac_objext \
8909 no_undefined_flag=' -z defs' 9035 no_undefined_flag=' -z defs'
8910 if test "$GCC" = yes; then 9036 if test "$GCC" = yes; then
8911 wlarc='${wl}' 9037 wlarc='${wl}'
@@ -8917,7 +9043,7 @@ index 8355c433c76..a49ab3d1f09 100755
8917 else 9043 else
8918 case `$CC -V 2>&1` in 9044 case `$CC -V 2>&1` in
8919 *"Compilers 5.0"*) 9045 *"Compilers 5.0"*)
8920@@ -11118,8 +11724,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9046@@ -10497,8 +11099,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8921 need_version=no 9047 need_version=no
8922 need_lib_prefix=no 9048 need_lib_prefix=no
8923 9049
@@ -8929,7 +9055,7 @@ index 8355c433c76..a49ab3d1f09 100755
8929 library_names_spec='$libname.dll.a' 9055 library_names_spec='$libname.dll.a'
8930 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9056 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8931 postinstall_cmds='base_file=`basename \${file}`~ 9057 postinstall_cmds='base_file=`basename \${file}`~
8932@@ -11152,13 +11759,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9058@@ -10531,13 +11134,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}' 9059 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8934 ;; 9060 ;;
8935 esac 9061 esac
@@ -9002,7 +9128,7 @@ index 8355c433c76..a49ab3d1f09 100755
9002 # FIXME: first we should search . and the directory the executable is in 9128 # FIXME: first we should search . and the directory the executable is in
9003 shlibpath_var=PATH 9129 shlibpath_var=PATH
9004 ;; 9130 ;;
9005@@ -11240,7 +11905,7 @@ haiku*) 9131@@ -10619,7 +11280,7 @@ haiku*)
9006 soname_spec='${libname}${release}${shared_ext}$major' 9132 soname_spec='${libname}${release}${shared_ext}$major'
9007 shlibpath_var=LIBRARY_PATH 9133 shlibpath_var=LIBRARY_PATH
9008 shlibpath_overrides_runpath=yes 9134 shlibpath_overrides_runpath=yes
@@ -9011,16 +9137,16 @@ index 8355c433c76..a49ab3d1f09 100755
9011 hardcode_into_libs=yes 9137 hardcode_into_libs=yes
9012 ;; 9138 ;;
9013 9139
9014@@ -12036,7 +12701,7 @@ else 9140@@ -11415,7 +12076,7 @@ else
9015 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9141 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9016 lt_status=$lt_dlunknown 9142 lt_status=$lt_dlunknown
9017 cat > conftest.$ac_ext <<_LT_EOF 9143 cat > conftest.$ac_ext <<_LT_EOF
9018-#line 12036 "configure" 9144-#line 11415 "configure"
9019+#line $LINENO "configure" 9145+#line $LINENO "configure"
9020 #include "confdefs.h" 9146 #include "confdefs.h"
9021 9147
9022 #if HAVE_DLFCN_H 9148 #if HAVE_DLFCN_H
9023@@ -12080,10 +12745,10 @@ else 9149@@ -11459,10 +12120,10 @@ else
9024 /* When -fvisbility=hidden is used, assume the code has been annotated 9150 /* When -fvisbility=hidden is used, assume the code has been annotated
9025 correspondingly for the symbols needed. */ 9151 correspondingly for the symbols needed. */
9026 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9152 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9033,16 +9159,16 @@ index 8355c433c76..a49ab3d1f09 100755
9033 int main () 9159 int main ()
9034 { 9160 {
9035 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9161 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9036@@ -12142,7 +12807,7 @@ else 9162@@ -11521,7 +12182,7 @@ else
9037 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9163 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9038 lt_status=$lt_dlunknown 9164 lt_status=$lt_dlunknown
9039 cat > conftest.$ac_ext <<_LT_EOF 9165 cat > conftest.$ac_ext <<_LT_EOF
9040-#line 12142 "configure" 9166-#line 11521 "configure"
9041+#line $LINENO "configure" 9167+#line $LINENO "configure"
9042 #include "confdefs.h" 9168 #include "confdefs.h"
9043 9169
9044 #if HAVE_DLFCN_H 9170 #if HAVE_DLFCN_H
9045@@ -12186,10 +12851,10 @@ else 9171@@ -11565,10 +12226,10 @@ else
9046 /* When -fvisbility=hidden is used, assume the code has been annotated 9172 /* When -fvisbility=hidden is used, assume the code has been annotated
9047 correspondingly for the symbols needed. */ 9173 correspondingly for the symbols needed. */
9048 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9174 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9055,7 +9181,7 @@ index 8355c433c76..a49ab3d1f09 100755
9055 int main () 9181 int main ()
9056 { 9182 {
9057 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9183 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9058@@ -12581,6 +13246,7 @@ $RM -r conftest* 9184@@ -11960,6 +12621,7 @@ $RM -r conftest*
9059 9185
9060 # Allow CC to be a program name with arguments. 9186 # Allow CC to be a program name with arguments.
9061 lt_save_CC=$CC 9187 lt_save_CC=$CC
@@ -9063,7 +9189,7 @@ index 8355c433c76..a49ab3d1f09 100755
9063 lt_save_LD=$LD 9189 lt_save_LD=$LD
9064 lt_save_GCC=$GCC 9190 lt_save_GCC=$GCC
9065 GCC=$GXX 9191 GCC=$GXX
9066@@ -12598,6 +13264,7 @@ $RM -r conftest* 9192@@ -11977,6 +12639,7 @@ $RM -r conftest*
9067 fi 9193 fi
9068 test -z "${LDCXX+set}" || LD=$LDCXX 9194 test -z "${LDCXX+set}" || LD=$LDCXX
9069 CC=${CXX-"c++"} 9195 CC=${CXX-"c++"}
@@ -9071,7 +9197,7 @@ index 8355c433c76..a49ab3d1f09 100755
9071 compiler=$CC 9197 compiler=$CC
9072 compiler_CXX=$CC 9198 compiler_CXX=$CC
9073 for cc_temp in $compiler""; do 9199 for cc_temp in $compiler""; do
9074@@ -12880,7 +13547,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9200@@ -12259,7 +12922,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9075 allow_undefined_flag_CXX='-berok' 9201 allow_undefined_flag_CXX='-berok'
9076 # Determine the default libpath from the value encoded in an empty 9202 # Determine the default libpath from the value encoded in an empty
9077 # executable. 9203 # executable.
@@ -9086,7 +9212,7 @@ index 8355c433c76..a49ab3d1f09 100755
9086 /* end confdefs.h. */ 9212 /* end confdefs.h. */
9087 9213
9088 int 9214 int
9089@@ -12893,22 +13566,29 @@ main () 9215@@ -12272,22 +12941,29 @@ main ()
9090 _ACEOF 9216 _ACEOF
9091 if ac_fn_cxx_try_link "$LINENO"; then : 9217 if ac_fn_cxx_try_link "$LINENO"; then :
9092 9218
@@ -9129,7 +9255,7 @@ index 8355c433c76..a49ab3d1f09 100755
9129 9255
9130 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9256 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9131 9257
9132@@ -12921,7 +13601,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9258@@ -12300,7 +12976,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9133 else 9259 else
9134 # Determine the default libpath from the value encoded in an 9260 # Determine the default libpath from the value encoded in an
9135 # empty executable. 9261 # empty executable.
@@ -9144,7 +9270,7 @@ index 8355c433c76..a49ab3d1f09 100755
9144 /* end confdefs.h. */ 9270 /* end confdefs.h. */
9145 9271
9146 int 9272 int
9147@@ -12934,22 +13620,29 @@ main () 9273@@ -12313,22 +12995,29 @@ main ()
9148 _ACEOF 9274 _ACEOF
9149 if ac_fn_cxx_try_link "$LINENO"; then : 9275 if ac_fn_cxx_try_link "$LINENO"; then :
9150 9276
@@ -9187,7 +9313,7 @@ index 8355c433c76..a49ab3d1f09 100755
9187 9313
9188 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9314 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9189 # Warning - without using the other run time loading flags, 9315 # Warning - without using the other run time loading flags,
9190@@ -12992,29 +13685,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9316@@ -12371,29 +13060,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9191 ;; 9317 ;;
9192 9318
9193 cygwin* | mingw* | pw32* | cegcc*) 9319 cygwin* | mingw* | pw32* | cegcc*)
@@ -9286,7 +9412,7 @@ index 8355c433c76..a49ab3d1f09 100755
9286 darwin* | rhapsody*) 9412 darwin* | rhapsody*)
9287 9413
9288 9414
9289@@ -13120,7 +13859,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9415@@ -12499,7 +13234,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9290 ;; 9416 ;;
9291 *) 9417 *)
9292 if test "$GXX" = yes; then 9418 if test "$GXX" = yes; then
@@ -9295,7 +9421,7 @@ index 8355c433c76..a49ab3d1f09 100755
9295 else 9421 else
9296 # FIXME: insert proper C++ library support 9422 # FIXME: insert proper C++ library support
9297 ld_shlibs_CXX=no 9423 ld_shlibs_CXX=no
9298@@ -13191,10 +13930,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9424@@ -12570,10 +13305,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' 9425 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9300 ;; 9426 ;;
9301 ia64*) 9427 ia64*)
@@ -9308,7 +9434,7 @@ index 8355c433c76..a49ab3d1f09 100755
9308 ;; 9434 ;;
9309 esac 9435 esac
9310 fi 9436 fi
9311@@ -13235,9 +13974,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9437@@ -12614,9 +13349,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9312 *) 9438 *)
9313 if test "$GXX" = yes; then 9439 if test "$GXX" = yes; then
9314 if test "$with_gnu_ld" = no; then 9440 if test "$with_gnu_ld" = no; then
@@ -9320,7 +9446,7 @@ index 8355c433c76..a49ab3d1f09 100755
9320 fi 9446 fi
9321 fi 9447 fi
9322 link_all_deplibs_CXX=yes 9448 link_all_deplibs_CXX=yes
9323@@ -13307,20 +14046,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9449@@ -12686,20 +13421,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9324 prelink_cmds_CXX='tpldir=Template.dir~ 9450 prelink_cmds_CXX='tpldir=Template.dir~
9325 rm -rf $tpldir~ 9451 rm -rf $tpldir~
9326 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9452 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9345,7 +9471,7 @@ index 8355c433c76..a49ab3d1f09 100755
9345 ;; 9471 ;;
9346 *) # Version 6 and above use weak symbols 9472 *) # 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' 9473 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9348@@ -13515,7 +14254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9474@@ -12894,7 +13629,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' 9475 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 ;; 9476 ;;
9351 *) 9477 *)
@@ -9354,7 +9480,7 @@ index 8355c433c76..a49ab3d1f09 100755
9354 ;; 9480 ;;
9355 esac 9481 esac
9356 9482
9357@@ -13561,7 +14300,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9483@@ -12940,7 +13675,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9358 9484
9359 solaris*) 9485 solaris*)
9360 case $cc_basename in 9486 case $cc_basename in
@@ -9363,7 +9489,7 @@ index 8355c433c76..a49ab3d1f09 100755
9363 # Sun C++ 4.2, 5.x and Centerline C++ 9489 # Sun C++ 4.2, 5.x and Centerline C++
9364 archive_cmds_need_lc_CXX=yes 9490 archive_cmds_need_lc_CXX=yes
9365 no_undefined_flag_CXX=' -zdefs' 9491 no_undefined_flag_CXX=' -zdefs'
9366@@ -13602,9 +14341,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9492@@ -12981,9 +13716,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9367 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9493 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9368 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9494 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9369 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9495 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9375,7 +9501,7 @@ index 8355c433c76..a49ab3d1f09 100755
9375 9501
9376 # Commands to make compiler produce verbose output that lists 9502 # Commands to make compiler produce verbose output that lists
9377 # what "hidden" libraries, object files and flags are used when 9503 # what "hidden" libraries, object files and flags are used when
9378@@ -13739,6 +14478,13 @@ private: 9504@@ -13118,6 +13853,13 @@ private:
9379 }; 9505 };
9380 _LT_EOF 9506 _LT_EOF
9381 9507
@@ -9389,7 +9515,7 @@ index 8355c433c76..a49ab3d1f09 100755
9389 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9515 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9390 (eval $ac_compile) 2>&5 9516 (eval $ac_compile) 2>&5
9391 ac_status=$? 9517 ac_status=$?
9392@@ -13752,7 +14498,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9518@@ -13131,7 +13873,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9393 pre_test_object_deps_done=no 9519 pre_test_object_deps_done=no
9394 9520
9395 for p in `eval "$output_verbose_link_cmd"`; do 9521 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9398,7 +9524,7 @@ index 8355c433c76..a49ab3d1f09 100755
9398 9524
9399 -L* | -R* | -l*) 9525 -L* | -R* | -l*)
9400 # Some compilers place space between "-{L,R}" and the path. 9526 # Some compilers place space between "-{L,R}" and the path.
9401@@ -13761,13 +14507,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9527@@ -13140,13 +13882,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9402 test $p = "-R"; then 9528 test $p = "-R"; then
9403 prev=$p 9529 prev=$p
9404 continue 9530 continue
@@ -9425,7 +9551,7 @@ index 8355c433c76..a49ab3d1f09 100755
9425 # Internal compiler library paths should come after those 9551 # Internal compiler library paths should come after those
9426 # provided the user. The postdeps already come after the 9552 # provided the user. The postdeps already come after the
9427 # user supplied libs so there is no need to process them. 9553 # user supplied libs so there is no need to process them.
9428@@ -13787,8 +14542,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9554@@ -13166,8 +13917,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9429 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9555 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9430 fi 9556 fi
9431 fi 9557 fi
@@ -9436,7 +9562,7 @@ index 8355c433c76..a49ab3d1f09 100755
9436 *.$objext) 9562 *.$objext)
9437 # This assumes that the test object file only shows up 9563 # This assumes that the test object file only shows up
9438 # once in the compiler output. 9564 # once in the compiler output.
9439@@ -13824,6 +14581,7 @@ else 9565@@ -13203,6 +13956,7 @@ else
9440 fi 9566 fi
9441 9567
9442 $RM -f confest.$objext 9568 $RM -f confest.$objext
@@ -9444,7 +9570,7 @@ index 8355c433c76..a49ab3d1f09 100755
9444 9570
9445 # PORTME: override above test on systems where it is broken 9571 # PORTME: override above test on systems where it is broken
9446 case $host_os in 9572 case $host_os in
9447@@ -13859,7 +14617,7 @@ linux*) 9573@@ -13238,7 +13992,7 @@ linux*)
9448 9574
9449 solaris*) 9575 solaris*)
9450 case $cc_basename in 9576 case $cc_basename in
@@ -9453,7 +9579,7 @@ index 8355c433c76..a49ab3d1f09 100755
9453 # The more standards-conforming stlport4 library is 9579 # The more standards-conforming stlport4 library is
9454 # incompatible with the Cstd library. Avoid specifying 9580 # incompatible with the Cstd library. Avoid specifying
9455 # it if it's in CXXFLAGS. Ignore libCrun as 9581 # it if it's in CXXFLAGS. Ignore libCrun as
9456@@ -13924,8 +14682,6 @@ fi 9582@@ -13303,8 +14057,6 @@ fi
9457 lt_prog_compiler_pic_CXX= 9583 lt_prog_compiler_pic_CXX=
9458 lt_prog_compiler_static_CXX= 9584 lt_prog_compiler_static_CXX=
9459 9585
@@ -9462,7 +9588,7 @@ index 8355c433c76..a49ab3d1f09 100755
9462 9588
9463 # C++ specific cases for pic, static, wl, etc. 9589 # C++ specific cases for pic, static, wl, etc.
9464 if test "$GXX" = yes; then 9590 if test "$GXX" = yes; then
9465@@ -14030,6 +14786,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9591@@ -13409,6 +14161,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9466 ;; 9592 ;;
9467 esac 9593 esac
9468 ;; 9594 ;;
@@ -9474,7 +9600,7 @@ index 8355c433c76..a49ab3d1f09 100755
9474 dgux*) 9600 dgux*)
9475 case $cc_basename in 9601 case $cc_basename in
9476 ec++*) 9602 ec++*)
9477@@ -14182,7 +14943,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9603@@ -13561,7 +14318,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9478 ;; 9604 ;;
9479 solaris*) 9605 solaris*)
9480 case $cc_basename in 9606 case $cc_basename in
@@ -9483,7 +9609,7 @@ index 8355c433c76..a49ab3d1f09 100755
9483 # Sun C++ 4.2, 5.x and Centerline C++ 9609 # Sun C++ 4.2, 5.x and Centerline C++
9484 lt_prog_compiler_pic_CXX='-KPIC' 9610 lt_prog_compiler_pic_CXX='-KPIC'
9485 lt_prog_compiler_static_CXX='-Bstatic' 9611 lt_prog_compiler_static_CXX='-Bstatic'
9486@@ -14247,10 +15008,17 @@ case $host_os in 9612@@ -13626,10 +14383,17 @@ case $host_os in
9487 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9613 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9488 ;; 9614 ;;
9489 esac 9615 esac
@@ -9504,7 +9630,7 @@ index 8355c433c76..a49ab3d1f09 100755
9504 9630
9505 # 9631 #
9506 # Check to make sure the PIC flag actually works. 9632 # Check to make sure the PIC flag actually works.
9507@@ -14308,6 +15076,8 @@ fi 9633@@ -13687,6 +14451,8 @@ fi
9508 9634
9509 9635
9510 9636
@@ -9513,7 +9639,7 @@ index 8355c433c76..a49ab3d1f09 100755
9513 # 9639 #
9514 # Check to make sure the static flag actually works. 9640 # Check to make sure the static flag actually works.
9515 # 9641 #
9516@@ -14485,6 +15255,7 @@ fi 9642@@ -13864,6 +14630,7 @@ fi
9517 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9643 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9518 9644
9519 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9645 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9521,7 +9647,7 @@ index 8355c433c76..a49ab3d1f09 100755
9521 case $host_os in 9647 case $host_os in
9522 aix[4-9]*) 9648 aix[4-9]*)
9523 # If we're using GNU nm, then we don't want the "-C" option. 9649 # If we're using GNU nm, then we don't want the "-C" option.
9524@@ -14499,15 +15270,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9650@@ -13878,15 +14645,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9525 ;; 9651 ;;
9526 pw32*) 9652 pw32*)
9527 export_symbols_cmds_CXX="$ltdll_cmds" 9653 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9547,7 +9673,7 @@ index 8355c433c76..a49ab3d1f09 100755
9547 9673
9548 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9674 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9549 $as_echo "$ld_shlibs_CXX" >&6; } 9675 $as_echo "$ld_shlibs_CXX" >&6; }
9550@@ -14770,8 +15546,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9676@@ -14149,8 +14921,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9551 need_version=no 9677 need_version=no
9552 need_lib_prefix=no 9678 need_lib_prefix=no
9553 9679
@@ -9559,7 +9685,7 @@ index 8355c433c76..a49ab3d1f09 100755
9559 library_names_spec='$libname.dll.a' 9685 library_names_spec='$libname.dll.a'
9560 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9686 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9561 postinstall_cmds='base_file=`basename \${file}`~ 9687 postinstall_cmds='base_file=`basename \${file}`~
9562@@ -14803,13 +15580,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9688@@ -14182,13 +14955,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}' 9689 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9564 ;; 9690 ;;
9565 esac 9691 esac
@@ -9632,7 +9758,7 @@ index 8355c433c76..a49ab3d1f09 100755
9632 # FIXME: first we should search . and the directory the executable is in 9758 # FIXME: first we should search . and the directory the executable is in
9633 shlibpath_var=PATH 9759 shlibpath_var=PATH
9634 ;; 9760 ;;
9635@@ -14890,7 +15725,7 @@ haiku*) 9761@@ -14269,7 +15100,7 @@ haiku*)
9636 soname_spec='${libname}${release}${shared_ext}$major' 9762 soname_spec='${libname}${release}${shared_ext}$major'
9637 shlibpath_var=LIBRARY_PATH 9763 shlibpath_var=LIBRARY_PATH
9638 shlibpath_overrides_runpath=yes 9764 shlibpath_overrides_runpath=yes
@@ -9641,7 +9767,7 @@ index 8355c433c76..a49ab3d1f09 100755
9641 hardcode_into_libs=yes 9767 hardcode_into_libs=yes
9642 ;; 9768 ;;
9643 9769
9644@@ -15349,6 +16184,7 @@ fi 9770@@ -14728,6 +15559,7 @@ fi
9645 fi # test -n "$compiler" 9771 fi # test -n "$compiler"
9646 9772
9647 CC=$lt_save_CC 9773 CC=$lt_save_CC
@@ -9649,7 +9775,7 @@ index 8355c433c76..a49ab3d1f09 100755
9649 LDCXX=$LD 9775 LDCXX=$LD
9650 LD=$lt_save_LD 9776 LD=$lt_save_LD
9651 GCC=$lt_save_GCC 9777 GCC=$lt_save_GCC
9652@@ -18612,13 +19448,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9778@@ -17770,13 +18602,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9653 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9779 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9654 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9780 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9655 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9781 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9670,7 +9796,7 @@ index 8355c433c76..a49ab3d1f09 100755
9670 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9796 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9671 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9797 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9672 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9798 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9673@@ -18633,14 +19476,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9799@@ -17791,14 +18630,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"`' 9800 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"`' 9801 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"`' 9802 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 +9815,7 @@ index 8355c433c76..a49ab3d1f09 100755
9689 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9815 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9690 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9816 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9691 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9817 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9692@@ -18673,12 +19519,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9818@@ -17831,12 +18673,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9693 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9819 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9694 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9820 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9695 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9821 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9703,7 +9829,7 @@ index 8355c433c76..a49ab3d1f09 100755
9703 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9829 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"`' 9830 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"`' 9831 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9706@@ -18717,8 +19563,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9832@@ -17875,8 +18717,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"`' 9833 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9708 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9834 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"`' 9835 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9713,7 +9839,7 @@ index 8355c433c76..a49ab3d1f09 100755
9713 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9839 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"`' 9840 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"`' 9841 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9716@@ -18745,12 +19591,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9842@@ -17903,12 +18745,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"`' 9843 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"`' 9844 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"`' 9845 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9727,7 +9853,7 @@ index 8355c433c76..a49ab3d1f09 100755
9727 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9853 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"`' 9854 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"`' 9855 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9730@@ -18788,8 +19634,13 @@ reload_flag \ 9856@@ -17946,8 +18788,13 @@ reload_flag \
9731 OBJDUMP \ 9857 OBJDUMP \
9732 deplibs_check_method \ 9858 deplibs_check_method \
9733 file_magic_cmd \ 9859 file_magic_cmd \
@@ -9741,7 +9867,7 @@ index 8355c433c76..a49ab3d1f09 100755
9741 STRIP \ 9867 STRIP \
9742 RANLIB \ 9868 RANLIB \
9743 CC \ 9869 CC \
9744@@ -18799,12 +19650,14 @@ lt_cv_sys_global_symbol_pipe \ 9870@@ -17957,12 +18804,14 @@ lt_cv_sys_global_symbol_pipe \
9745 lt_cv_sys_global_symbol_to_cdecl \ 9871 lt_cv_sys_global_symbol_to_cdecl \
9746 lt_cv_sys_global_symbol_to_c_name_address \ 9872 lt_cv_sys_global_symbol_to_c_name_address \
9747 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9873 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9757,7 +9883,7 @@ index 8355c433c76..a49ab3d1f09 100755
9757 DSYMUTIL \ 9883 DSYMUTIL \
9758 NMEDIT \ 9884 NMEDIT \
9759 LIPO \ 9885 LIPO \
9760@@ -18820,7 +19673,6 @@ no_undefined_flag \ 9886@@ -17978,7 +18827,6 @@ no_undefined_flag \
9761 hardcode_libdir_flag_spec \ 9887 hardcode_libdir_flag_spec \
9762 hardcode_libdir_flag_spec_ld \ 9888 hardcode_libdir_flag_spec_ld \
9763 hardcode_libdir_separator \ 9889 hardcode_libdir_separator \
@@ -9765,7 +9891,7 @@ index 8355c433c76..a49ab3d1f09 100755
9765 exclude_expsyms \ 9891 exclude_expsyms \
9766 include_expsyms \ 9892 include_expsyms \
9767 file_list_spec \ 9893 file_list_spec \
9768@@ -18842,8 +19694,8 @@ LD_CXX \ 9894@@ -18000,8 +18848,8 @@ LD_CXX \
9769 reload_flag_CXX \ 9895 reload_flag_CXX \
9770 compiler_CXX \ 9896 compiler_CXX \
9771 lt_prog_compiler_no_builtin_flag_CXX \ 9897 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9775,7 +9901,7 @@ index 8355c433c76..a49ab3d1f09 100755
9775 lt_prog_compiler_static_CXX \ 9901 lt_prog_compiler_static_CXX \
9776 lt_cv_prog_compiler_c_o_CXX \ 9902 lt_cv_prog_compiler_c_o_CXX \
9777 export_dynamic_flag_spec_CXX \ 9903 export_dynamic_flag_spec_CXX \
9778@@ -18855,7 +19707,6 @@ no_undefined_flag_CXX \ 9904@@ -18013,7 +18861,6 @@ no_undefined_flag_CXX \
9779 hardcode_libdir_flag_spec_CXX \ 9905 hardcode_libdir_flag_spec_CXX \
9780 hardcode_libdir_flag_spec_ld_CXX \ 9906 hardcode_libdir_flag_spec_ld_CXX \
9781 hardcode_libdir_separator_CXX \ 9907 hardcode_libdir_separator_CXX \
@@ -9783,7 +9909,7 @@ index 8355c433c76..a49ab3d1f09 100755
9783 exclude_expsyms_CXX \ 9909 exclude_expsyms_CXX \
9784 include_expsyms_CXX \ 9910 include_expsyms_CXX \
9785 file_list_spec_CXX \ 9911 file_list_spec_CXX \
9786@@ -18889,6 +19740,7 @@ module_cmds \ 9912@@ -18047,6 +18894,7 @@ module_cmds \
9787 module_expsym_cmds \ 9913 module_expsym_cmds \
9788 export_symbols_cmds \ 9914 export_symbols_cmds \
9789 prelink_cmds \ 9915 prelink_cmds \
@@ -9791,7 +9917,7 @@ index 8355c433c76..a49ab3d1f09 100755
9791 postinstall_cmds \ 9917 postinstall_cmds \
9792 postuninstall_cmds \ 9918 postuninstall_cmds \
9793 finish_cmds \ 9919 finish_cmds \
9794@@ -18903,7 +19755,8 @@ archive_expsym_cmds_CXX \ 9920@@ -18061,7 +18909,8 @@ archive_expsym_cmds_CXX \
9795 module_cmds_CXX \ 9921 module_cmds_CXX \
9796 module_expsym_cmds_CXX \ 9922 module_expsym_cmds_CXX \
9797 export_symbols_cmds_CXX \ 9923 export_symbols_cmds_CXX \
@@ -9801,7 +9927,7 @@ index 8355c433c76..a49ab3d1f09 100755
9801 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9927 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9802 *[\\\\\\\`\\"\\\$]*) 9928 *[\\\\\\\`\\"\\\$]*)
9803 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9929 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9804@@ -19668,7 +20521,8 @@ $as_echo X"$file" | 9930@@ -18826,7 +19675,8 @@ $as_echo X"$file" |
9805 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9931 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9806 # 9932 #
9807 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9933 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9811,7 +9937,7 @@ index 8355c433c76..a49ab3d1f09 100755
9811 # Written by Gordon Matzigkeit, 1996 9937 # Written by Gordon Matzigkeit, 1996
9812 # 9938 #
9813 # This file is part of GNU Libtool. 9939 # This file is part of GNU Libtool.
9814@@ -19771,19 +20625,42 @@ SP2NL=$lt_lt_SP2NL 9940@@ -18929,19 +19779,42 @@ SP2NL=$lt_lt_SP2NL
9815 # turn newlines into spaces. 9941 # turn newlines into spaces.
9816 NL2SP=$lt_lt_NL2SP 9942 NL2SP=$lt_lt_NL2SP
9817 9943
@@ -9855,7 +9981,7 @@ index 8355c433c76..a49ab3d1f09 100755
9855 # A symbol stripping program. 9981 # A symbol stripping program.
9856 STRIP=$lt_STRIP 9982 STRIP=$lt_STRIP
9857 9983
9858@@ -19813,6 +20690,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9984@@ -18971,6 +19844,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. 9985 # 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 9986 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9861 9987
@@ -9868,7 +9994,7 @@ index 8355c433c76..a49ab3d1f09 100755
9868 # The name of the directory that contains temporary libtool files. 9994 # The name of the directory that contains temporary libtool files.
9869 objdir=$objdir 9995 objdir=$objdir
9870 9996
9871@@ -19822,6 +20705,9 @@ MAGIC_CMD=$MAGIC_CMD 9997@@ -18980,6 +19859,9 @@ MAGIC_CMD=$MAGIC_CMD
9872 # Must we lock files when doing compilation? 9998 # Must we lock files when doing compilation?
9873 need_locks=$lt_need_locks 9999 need_locks=$lt_need_locks
9874 10000
@@ -9878,7 +10004,7 @@ index 8355c433c76..a49ab3d1f09 100755
9878 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 10004 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9879 DSYMUTIL=$lt_DSYMUTIL 10005 DSYMUTIL=$lt_DSYMUTIL
9880 10006
9881@@ -19936,12 +20822,12 @@ with_gcc=$GCC 10007@@ -19094,12 +19976,12 @@ with_gcc=$GCC
9882 # Compiler flag to turn off builtin functions. 10008 # Compiler flag to turn off builtin functions.
9883 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 10009 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9884 10010
@@ -9894,7 +10020,7 @@ index 8355c433c76..a49ab3d1f09 100755
9894 # Compiler flag to prevent dynamic linking. 10020 # Compiler flag to prevent dynamic linking.
9895 link_static_flag=$lt_lt_prog_compiler_static 10021 link_static_flag=$lt_lt_prog_compiler_static
9896 10022
9897@@ -20028,9 +20914,6 @@ inherit_rpath=$inherit_rpath 10023@@ -19186,9 +20068,6 @@ inherit_rpath=$inherit_rpath
9898 # Whether libtool must link a program against all its dependency libraries. 10024 # Whether libtool must link a program against all its dependency libraries.
9899 link_all_deplibs=$link_all_deplibs 10025 link_all_deplibs=$link_all_deplibs
9900 10026
@@ -9904,7 +10030,7 @@ index 8355c433c76..a49ab3d1f09 100755
9904 # Set to "yes" if exported symbols are required. 10030 # Set to "yes" if exported symbols are required.
9905 always_export_symbols=$always_export_symbols 10031 always_export_symbols=$always_export_symbols
9906 10032
9907@@ -20046,6 +20929,9 @@ include_expsyms=$lt_include_expsyms 10033@@ -19204,6 +20083,9 @@ include_expsyms=$lt_include_expsyms
9908 # Commands necessary for linking programs (against libraries) with templates. 10034 # Commands necessary for linking programs (against libraries) with templates.
9909 prelink_cmds=$lt_prelink_cmds 10035 prelink_cmds=$lt_prelink_cmds
9910 10036
@@ -9914,7 +10040,7 @@ index 8355c433c76..a49ab3d1f09 100755
9914 # Specify filename containing input files. 10040 # Specify filename containing input files.
9915 file_list_spec=$lt_file_list_spec 10041 file_list_spec=$lt_file_list_spec
9916 10042
9917@@ -20092,210 +20978,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 10043@@ -19250,210 +20132,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9918 # if finds mixed CR/LF and LF-only lines. Since sed operates in 10044 # 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 10045 # text mode, it properly converts lines to CR/LF. This bash problem
9920 # is reportedly fixed, but why not run on old versions too? 10046 # is reportedly fixed, but why not run on old versions too?
@@ -10288,7 +10414,7 @@ index 8355c433c76..a49ab3d1f09 100755
10288 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10414 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10289 chmod +x "$ofile" 10415 chmod +x "$ofile"
10290 10416
10291@@ -20323,12 +21168,12 @@ with_gcc=$GCC_CXX 10417@@ -19481,12 +20322,12 @@ with_gcc=$GCC_CXX
10292 # Compiler flag to turn off builtin functions. 10418 # Compiler flag to turn off builtin functions.
10293 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10419 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10294 10420
@@ -10304,7 +10430,7 @@ index 8355c433c76..a49ab3d1f09 100755
10304 # Compiler flag to prevent dynamic linking. 10430 # Compiler flag to prevent dynamic linking.
10305 link_static_flag=$lt_lt_prog_compiler_static_CXX 10431 link_static_flag=$lt_lt_prog_compiler_static_CXX
10306 10432
10307@@ -20415,9 +21260,6 @@ inherit_rpath=$inherit_rpath_CXX 10433@@ -19573,9 +20414,6 @@ inherit_rpath=$inherit_rpath_CXX
10308 # Whether libtool must link a program against all its dependency libraries. 10434 # Whether libtool must link a program against all its dependency libraries.
10309 link_all_deplibs=$link_all_deplibs_CXX 10435 link_all_deplibs=$link_all_deplibs_CXX
10310 10436
@@ -10314,7 +10440,7 @@ index 8355c433c76..a49ab3d1f09 100755
10314 # Set to "yes" if exported symbols are required. 10440 # Set to "yes" if exported symbols are required.
10315 always_export_symbols=$always_export_symbols_CXX 10441 always_export_symbols=$always_export_symbols_CXX
10316 10442
10317@@ -20433,6 +21275,9 @@ include_expsyms=$lt_include_expsyms_CXX 10443@@ -19591,6 +20429,9 @@ include_expsyms=$lt_include_expsyms_CXX
10318 # Commands necessary for linking programs (against libraries) with templates. 10444 # Commands necessary for linking programs (against libraries) with templates.
10319 prelink_cmds=$lt_prelink_cmds_CXX 10445 prelink_cmds=$lt_prelink_cmds_CXX
10320 10446
@@ -10325,10 +10451,10 @@ index 8355c433c76..a49ab3d1f09 100755
10325 file_list_spec=$lt_file_list_spec_CXX 10451 file_list_spec=$lt_file_list_spec_CXX
10326 10452
10327diff --git a/libctf/configure b/libctf/configure 10453diff --git a/libctf/configure b/libctf/configure
10328index 6b294bfebfb..52a025bb848 100755 10454index 82bcf13a606..a7fb723a145 100755
10329--- a/libctf/configure 10455--- a/libctf/configure
10330+++ b/libctf/configure 10456+++ b/libctf/configure
10331@@ -663,6 +663,8 @@ OTOOL 10457@@ -666,6 +666,8 @@ OTOOL
10332 LIPO 10458 LIPO
10333 NMEDIT 10459 NMEDIT
10334 DSYMUTIL 10460 DSYMUTIL
@@ -10337,7 +10463,7 @@ index 6b294bfebfb..52a025bb848 100755
10337 OBJDUMP 10463 OBJDUMP
10338 LN_S 10464 LN_S
10339 NM 10465 NM
10340@@ -790,6 +792,7 @@ enable_static 10466@@ -797,6 +799,7 @@ enable_static
10341 with_pic 10467 with_pic
10342 enable_fast_install 10468 enable_fast_install
10343 with_gnu_ld 10469 with_gnu_ld
@@ -10345,7 +10471,7 @@ index 6b294bfebfb..52a025bb848 100755
10345 enable_libtool_lock 10471 enable_libtool_lock
10346 enable_largefile 10472 enable_largefile
10347 enable_werror_always 10473 enable_werror_always
10348@@ -1452,6 +1455,8 @@ Optional Packages: 10474@@ -1460,6 +1463,8 @@ Optional Packages:
10349 --with-pic try to use only PIC/non-PIC objects [default=use 10475 --with-pic try to use only PIC/non-PIC objects [default=use
10350 both] 10476 both]
10351 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 10477 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -10354,7 +10480,7 @@ index 6b294bfebfb..52a025bb848 100755
10354 --with-system-zlib use installed libz 10480 --with-system-zlib use installed libz
10355 10481
10356 Some influential environment variables: 10482 Some influential environment variables:
10357@@ -5411,8 +5416,8 @@ esac 10483@@ -5529,8 +5534,8 @@ esac
10358 10484
10359 10485
10360 10486
@@ -10365,7 +10491,7 @@ index 6b294bfebfb..52a025bb848 100755
10365 10491
10366 10492
10367 10493
10368@@ -5523,7 +5528,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 10494@@ -5570,7 +5575,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10369 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 10495 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
10370 $as_echo_n "checking how to print strings... " >&6; } 10496 $as_echo_n "checking how to print strings... " >&6; }
10371 # Test print first, because it will be a builtin if present. 10497 # Test print first, because it will be a builtin if present.
@@ -10374,7 +10500,7 @@ index 6b294bfebfb..52a025bb848 100755
10374 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 10500 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10375 ECHO='print -r --' 10501 ECHO='print -r --'
10376 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 10502 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10377@@ -6209,8 +6214,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 10503@@ -6256,8 +6261,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10378 # Try some XSI features 10504 # Try some XSI features
10379 xsi_shell=no 10505 xsi_shell=no
10380 ( _lt_dummy="a/b/c" 10506 ( _lt_dummy="a/b/c"
@@ -10385,7 +10511,7 @@ index 6b294bfebfb..52a025bb848 100755
10385 && eval 'test $(( 1 + 1 )) -eq 2 \ 10511 && eval 'test $(( 1 + 1 )) -eq 2 \
10386 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 10512 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
10387 && xsi_shell=yes 10513 && xsi_shell=yes
10388@@ -6259,6 +6264,80 @@ esac 10514@@ -6306,6 +6311,80 @@ esac
10389 10515
10390 10516
10391 10517
@@ -10466,7 +10592,7 @@ index 6b294bfebfb..52a025bb848 100755
10466 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 10592 { $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; } 10593 $as_echo_n "checking for $LD option to reload object files... " >&6; }
10468 if ${lt_cv_ld_reload_flag+:} false; then : 10594 if ${lt_cv_ld_reload_flag+:} false; then :
10469@@ -6275,6 +6354,11 @@ case $reload_flag in 10595@@ -6322,6 +6401,11 @@ case $reload_flag in
10470 esac 10596 esac
10471 reload_cmds='$LD$reload_flag -o $output$reload_objs' 10597 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10472 case $host_os in 10598 case $host_os in
@@ -10478,7 +10604,7 @@ index 6b294bfebfb..52a025bb848 100755
10478 darwin*) 10604 darwin*)
10479 if test "$GCC" = yes; then 10605 if test "$GCC" = yes; then
10480 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 10606 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10481@@ -6443,7 +6527,8 @@ mingw* | pw32*) 10607@@ -6490,7 +6574,8 @@ mingw* | pw32*)
10482 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 10608 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10483 lt_cv_file_magic_cmd='func_win32_libid' 10609 lt_cv_file_magic_cmd='func_win32_libid'
10484 else 10610 else
@@ -10488,7 +10614,7 @@ index 6b294bfebfb..52a025bb848 100755
10488 lt_cv_file_magic_cmd='$OBJDUMP -f' 10614 lt_cv_file_magic_cmd='$OBJDUMP -f'
10489 fi 10615 fi
10490 ;; 10616 ;;
10491@@ -6597,6 +6682,21 @@ esac 10617@@ -6644,6 +6729,21 @@ esac
10492 fi 10618 fi
10493 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 10619 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
10494 $as_echo "$lt_cv_deplibs_check_method" >&6; } 10620 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -10510,7 +10636,7 @@ index 6b294bfebfb..52a025bb848 100755
10510 file_magic_cmd=$lt_cv_file_magic_cmd 10636 file_magic_cmd=$lt_cv_file_magic_cmd
10511 deplibs_check_method=$lt_cv_deplibs_check_method 10637 deplibs_check_method=$lt_cv_deplibs_check_method
10512 test -z "$deplibs_check_method" && deplibs_check_method=unknown 10638 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10513@@ -6612,9 +6712,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 10639@@ -6659,6 +6759,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10514 10640
10515 10641
10516 10642
@@ -10665,6 +10791,12 @@ index 6b294bfebfb..52a025bb848 100755
10665+ 10791+
10666+ 10792+
10667+ 10793+
10794 plugin_option=
10795 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
10796 for plugin in $plugin_names; do
10797@@ -6673,8 +6924,10 @@ for plugin in $plugin_names; do
10798 done
10799
10668 if test -n "$ac_tool_prefix"; then 10800 if test -n "$ac_tool_prefix"; then
10669- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 10801- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
10670-set dummy ${ac_tool_prefix}ar; ac_word=$2 10802-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -10675,7 +10807,7 @@ index 6b294bfebfb..52a025bb848 100755
10675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10807 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10676 $as_echo_n "checking for $ac_word... " >&6; } 10808 $as_echo_n "checking for $ac_word... " >&6; }
10677 if ${ac_cv_prog_AR+:} false; then : 10809 if ${ac_cv_prog_AR+:} false; then :
10678@@ -6630,7 +6883,7 @@ do 10810@@ -6690,7 +6943,7 @@ do
10679 test -z "$as_dir" && as_dir=. 10811 test -z "$as_dir" && as_dir=.
10680 for ac_exec_ext in '' $ac_executable_extensions; do 10812 for ac_exec_ext in '' $ac_executable_extensions; do
10681 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10813 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10684,7 +10816,7 @@ index 6b294bfebfb..52a025bb848 100755
10684 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10816 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10685 break 2 10817 break 2
10686 fi 10818 fi
10687@@ -6650,11 +6903,15 @@ $as_echo "no" >&6; } 10819@@ -6710,11 +6963,15 @@ $as_echo "no" >&6; }
10688 fi 10820 fi
10689 10821
10690 10822
@@ -10703,7 +10835,7 @@ index 6b294bfebfb..52a025bb848 100755
10703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10835 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10704 $as_echo_n "checking for $ac_word... " >&6; } 10836 $as_echo_n "checking for $ac_word... " >&6; }
10705 if ${ac_cv_prog_ac_ct_AR+:} false; then : 10837 if ${ac_cv_prog_ac_ct_AR+:} false; then :
10706@@ -6670,7 +6927,7 @@ do 10838@@ -6730,7 +6987,7 @@ do
10707 test -z "$as_dir" && as_dir=. 10839 test -z "$as_dir" && as_dir=.
10708 for ac_exec_ext in '' $ac_executable_extensions; do 10840 for ac_exec_ext in '' $ac_executable_extensions; do
10709 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10841 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -10712,7 +10844,7 @@ index 6b294bfebfb..52a025bb848 100755
10712 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10844 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10713 break 2 10845 break 2
10714 fi 10846 fi
10715@@ -6689,6 +6946,10 @@ else 10847@@ -6749,6 +7006,10 @@ else
10716 $as_echo "no" >&6; } 10848 $as_echo "no" >&6; }
10717 fi 10849 fi
10718 10850
@@ -10723,7 +10855,7 @@ index 6b294bfebfb..52a025bb848 100755
10723 if test "x$ac_ct_AR" = x; then 10855 if test "x$ac_ct_AR" = x; then
10724 AR="false" 10856 AR="false"
10725 else 10857 else
10726@@ -6700,16 +6961,72 @@ ac_tool_warned=yes ;; 10858@@ -6760,25 +7021,19 @@ ac_tool_warned=yes ;;
10727 esac 10859 esac
10728 AR=$ac_ct_AR 10860 AR=$ac_ct_AR
10729 fi 10861 fi
@@ -10732,20 +10864,36 @@ index 6b294bfebfb..52a025bb848 100755
10732 fi 10864 fi
10733 10865
10734-test -z "$AR" && AR=ar 10866-test -z "$AR" && AR=ar
10867-if test -n "$plugin_option"; then
10868- if $AR --help 2>&1 | grep -q "\--plugin"; then
10869- touch conftest.c
10870- $AR $plugin_option rc conftest.a conftest.c
10871- if test "$?" != 0; then
10872- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10873+ touch conftest.c
10874+ $AR $plugin_option rc conftest.a conftest.c
10875+ if test "$?" != 0; then
10876+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
10877 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
10878- else
10879- AR="$AR $plugin_option"
10880- fi
10881- rm -f conftest.*
10882+ else
10883+ AR="$AR $plugin_option"
10884 fi
10885-fi
10735-test -z "$AR_FLAGS" && AR_FLAGS=cru 10886-test -z "$AR_FLAGS" && AR_FLAGS=cru
10887+ rm -f conftest.*
10736+: ${AR=ar} 10888+: ${AR=ar}
10737+: ${AR_FLAGS=cru} 10889+: ${AR_FLAGS=cru}
10738+ 10890
10739+ 10891
10740+ 10892
10741+ 10893@@ -6790,6 +7045,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
10742+ 10894
10743+ 10895
10744+ 10896
10745+
10746+
10747+
10748+
10749+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 10897+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
10750+$as_echo_n "checking for archiver @FILE support... " >&6; } 10898+$as_echo_n "checking for archiver @FILE support... " >&6; }
10751+if ${lt_cv_ar_at_file+:} false; then : 10899+if ${lt_cv_ar_at_file+:} false; then :
@@ -10758,7 +10906,7 @@ index 6b294bfebfb..52a025bb848 100755
10758+int 10906+int
10759+main () 10907+main ()
10760+{ 10908+{
10761 10909+
10762+ ; 10910+ ;
10763+ return 0; 10911+ return 0;
10764+} 10912+}
@@ -10784,23 +10932,30 @@ index 6b294bfebfb..52a025bb848 100755
10784+ fi 10932+ fi
10785+ fi 10933+ fi
10786+ rm -f conftest.* libconftest.a 10934+ rm -f conftest.* libconftest.a
10787 10935+
10788+fi 10936+fi
10789+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 10937+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10790 10938+
10791+fi 10939+fi
10792+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 10940+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
10793+$as_echo "$lt_cv_ar_at_file" >&6; } 10941+$as_echo "$lt_cv_ar_at_file" >&6; }
10794 10942+
10795+if test "x$lt_cv_ar_at_file" = xno; then 10943+if test "x$lt_cv_ar_at_file" = xno; then
10796+ archiver_list_spec= 10944+ archiver_list_spec=
10797+else 10945+else
10798+ archiver_list_spec=$lt_cv_ar_at_file 10946+ archiver_list_spec=$lt_cv_ar_at_file
10799+fi 10947+fi
10800 10948+
10801 10949+
10802 10950+
10803@@ -7051,8 +7368,8 @@ esac 10951+
10952+
10953+
10954+
10955 if test -n "$ac_tool_prefix"; then
10956 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
10957 set dummy ${ac_tool_prefix}strip; ac_word=$2
10958@@ -7129,8 +7442,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'" 10959 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10805 10960
10806 # Transform an extracted symbol line into symbol name and symbol address 10961 # Transform an extracted symbol line into symbol name and symbol address
@@ -10811,7 +10966,7 @@ index 6b294bfebfb..52a025bb848 100755
10811 10966
10812 # Handle CRLF in mingw tool chain 10967 # Handle CRLF in mingw tool chain
10813 opt_cr= 10968 opt_cr=
10814@@ -7088,6 +7405,7 @@ for ac_symprfx in "" "_"; do 10969@@ -7166,6 +7479,7 @@ for ac_symprfx in "" "_"; do
10815 else 10970 else
10816 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 10971 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10817 fi 10972 fi
@@ -10819,7 +10974,7 @@ index 6b294bfebfb..52a025bb848 100755
10819 10974
10820 # Check to see that the pipe works correctly. 10975 # Check to see that the pipe works correctly.
10821 pipe_works=no 10976 pipe_works=no
10822@@ -7129,6 +7447,18 @@ _LT_EOF 10977@@ -7207,6 +7521,18 @@ _LT_EOF
10823 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 10978 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10824 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 10979 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10825 cat <<_LT_EOF > conftest.$ac_ext 10980 cat <<_LT_EOF > conftest.$ac_ext
@@ -10838,7 +10993,7 @@ index 6b294bfebfb..52a025bb848 100755
10838 #ifdef __cplusplus 10993 #ifdef __cplusplus
10839 extern "C" { 10994 extern "C" {
10840 #endif 10995 #endif
10841@@ -7140,7 +7470,7 @@ _LT_EOF 10996@@ -7218,7 +7544,7 @@ _LT_EOF
10842 cat <<_LT_EOF >> conftest.$ac_ext 10997 cat <<_LT_EOF >> conftest.$ac_ext
10843 10998
10844 /* The mapping between symbol names and symbols. */ 10999 /* The mapping between symbol names and symbols. */
@@ -10847,7 +11002,7 @@ index 6b294bfebfb..52a025bb848 100755
10847 const char *name; 11002 const char *name;
10848 void *address; 11003 void *address;
10849 } 11004 }
10850@@ -7166,8 +7496,8 @@ static const void *lt_preloaded_setup() { 11005@@ -7244,8 +7570,8 @@ static const void *lt_preloaded_setup() {
10851 _LT_EOF 11006 _LT_EOF
10852 # Now try linking the two files. 11007 # Now try linking the two files.
10853 mv conftest.$ac_objext conftstm.$ac_objext 11008 mv conftest.$ac_objext conftstm.$ac_objext
@@ -10858,7 +11013,7 @@ index 6b294bfebfb..52a025bb848 100755
10858 LIBS="conftstm.$ac_objext" 11013 LIBS="conftstm.$ac_objext"
10859 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 11014 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
10860 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 11015 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
10861@@ -7177,8 +7507,8 @@ _LT_EOF 11016@@ -7255,8 +7581,8 @@ _LT_EOF
10862 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 11017 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
10863 pipe_works=yes 11018 pipe_works=yes
10864 fi 11019 fi
@@ -10869,7 +11024,7 @@ index 6b294bfebfb..52a025bb848 100755
10869 else 11024 else
10870 echo "cannot find nm_test_func in $nlist" >&5 11025 echo "cannot find nm_test_func in $nlist" >&5
10871 fi 11026 fi
10872@@ -7215,6 +7545,16 @@ else 11027@@ -7293,6 +7619,14 @@ else
10873 $as_echo "ok" >&6; } 11028 $as_echo "ok" >&6; }
10874 fi 11029 fi
10875 11030
@@ -10881,12 +11036,10 @@ index 6b294bfebfb..52a025bb848 100755
10881+fi 11036+fi
10882+ 11037+
10883+ 11038+
10884+
10885+
10886 11039
10887 11040
10888 11041
10889@@ -7231,6 +7571,45 @@ fi 11042@@ -7311,6 +7645,47 @@ fi
10890 11043
10891 11044
10892 11045
@@ -10929,10 +11082,12 @@ index 6b294bfebfb..52a025bb848 100755
10929+ 11082+
10930+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 11083+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
10931+$as_echo "${lt_sysroot:-no}" >&6; } 11084+$as_echo "${lt_sysroot:-no}" >&6; }
11085+
11086+
10932 11087
10933 11088
10934 11089
10935@@ -7442,6 +7821,123 @@ esac 11090@@ -7520,6 +7895,123 @@ esac
10936 11091
10937 need_locks="$enable_libtool_lock" 11092 need_locks="$enable_libtool_lock"
10938 11093
@@ -11056,7 +11211,7 @@ index 6b294bfebfb..52a025bb848 100755
11056 11211
11057 case $host_os in 11212 case $host_os in
11058 rhapsody* | darwin*) 11213 rhapsody* | darwin*)
11059@@ -8005,6 +8501,8 @@ _LT_EOF 11214@@ -8083,6 +8575,8 @@ _LT_EOF
11060 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 11215 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11061 echo "$AR cru libconftest.a conftest.o" >&5 11216 echo "$AR cru libconftest.a conftest.o" >&5
11062 $AR cru libconftest.a conftest.o 2>&5 11217 $AR cru libconftest.a conftest.o 2>&5
@@ -11065,7 +11220,7 @@ index 6b294bfebfb..52a025bb848 100755
11065 cat > conftest.c << _LT_EOF 11220 cat > conftest.c << _LT_EOF
11066 int main() { return 0;} 11221 int main() { return 0;}
11067 _LT_EOF 11222 _LT_EOF
11068@@ -8170,7 +8668,8 @@ fi 11223@@ -8248,7 +8742,8 @@ fi
11069 LIBTOOL_DEPS="$ltmain" 11224 LIBTOOL_DEPS="$ltmain"
11070 11225
11071 # Always use our own libtool. 11226 # Always use our own libtool.
@@ -11075,7 +11230,7 @@ index 6b294bfebfb..52a025bb848 100755
11075 11230
11076 11231
11077 11232
11078@@ -8259,7 +8758,7 @@ aix3*) 11233@@ -8337,7 +8832,7 @@ aix3*)
11079 esac 11234 esac
11080 11235
11081 # Global variables: 11236 # Global variables:
@@ -11084,7 +11239,7 @@ index 6b294bfebfb..52a025bb848 100755
11084 can_build_shared=yes 11239 can_build_shared=yes
11085 11240
11086 # All known linkers require a `.a' archive for static linking (except MSVC, 11241 # All known linkers require a `.a' archive for static linking (except MSVC,
11087@@ -8557,8 +9056,6 @@ fi 11242@@ -8635,8 +9130,6 @@ fi
11088 lt_prog_compiler_pic= 11243 lt_prog_compiler_pic=
11089 lt_prog_compiler_static= 11244 lt_prog_compiler_static=
11090 11245
@@ -11093,7 +11248,7 @@ index 6b294bfebfb..52a025bb848 100755
11093 11248
11094 if test "$GCC" = yes; then 11249 if test "$GCC" = yes; then
11095 lt_prog_compiler_wl='-Wl,' 11250 lt_prog_compiler_wl='-Wl,'
11096@@ -8724,6 +9221,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11251@@ -8802,6 +9295,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11097 lt_prog_compiler_pic='--shared' 11252 lt_prog_compiler_pic='--shared'
11098 lt_prog_compiler_static='--static' 11253 lt_prog_compiler_static='--static'
11099 ;; 11254 ;;
@@ -11106,7 +11261,7 @@ index 6b294bfebfb..52a025bb848 100755
11106 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 11261 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11107 # Portland Group compilers (*not* the Pentium gcc compiler, 11262 # Portland Group compilers (*not* the Pentium gcc compiler,
11108 # which looks to be a dead project) 11263 # which looks to be a dead project)
11109@@ -8786,7 +9289,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11264@@ -8864,7 +9363,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11110 lt_prog_compiler_pic='-KPIC' 11265 lt_prog_compiler_pic='-KPIC'
11111 lt_prog_compiler_static='-Bstatic' 11266 lt_prog_compiler_static='-Bstatic'
11112 case $cc_basename in 11267 case $cc_basename in
@@ -11115,7 +11270,7 @@ index 6b294bfebfb..52a025bb848 100755
11115 lt_prog_compiler_wl='-Qoption ld ';; 11270 lt_prog_compiler_wl='-Qoption ld ';;
11116 *) 11271 *)
11117 lt_prog_compiler_wl='-Wl,';; 11272 lt_prog_compiler_wl='-Wl,';;
11118@@ -8843,13 +9346,17 @@ case $host_os in 11273@@ -8921,13 +9420,17 @@ case $host_os in
11119 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 11274 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11120 ;; 11275 ;;
11121 esac 11276 esac
@@ -11139,7 +11294,7 @@ index 6b294bfebfb..52a025bb848 100755
11139 11294
11140 # 11295 #
11141 # Check to make sure the PIC flag actually works. 11296 # Check to make sure the PIC flag actually works.
11142@@ -8910,6 +9417,11 @@ fi 11297@@ -8988,6 +9491,11 @@ fi
11143 11298
11144 11299
11145 11300
@@ -11151,7 +11306,7 @@ index 6b294bfebfb..52a025bb848 100755
11151 # 11306 #
11152 # Check to make sure the static flag actually works. 11307 # Check to make sure the static flag actually works.
11153 # 11308 #
11154@@ -9260,7 +9772,8 @@ _LT_EOF 11309@@ -9338,7 +9846,8 @@ _LT_EOF
11155 allow_undefined_flag=unsupported 11310 allow_undefined_flag=unsupported
11156 always_export_symbols=no 11311 always_export_symbols=no
11157 enable_shared_with_static_runtimes=yes 11312 enable_shared_with_static_runtimes=yes
@@ -11161,7 +11316,7 @@ index 6b294bfebfb..52a025bb848 100755
11161 11316
11162 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 11317 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' 11318 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11164@@ -9359,12 +9872,12 @@ _LT_EOF 11319@@ -9437,12 +9946,12 @@ _LT_EOF
11165 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 11320 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11166 hardcode_libdir_flag_spec= 11321 hardcode_libdir_flag_spec=
11167 hardcode_libdir_flag_spec_ld='-rpath $libdir' 11322 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -11176,7 +11331,7 @@ index 6b294bfebfb..52a025bb848 100755
11176 fi 11331 fi
11177 ;; 11332 ;;
11178 esac 11333 esac
11179@@ -9378,8 +9891,8 @@ _LT_EOF 11334@@ -9456,8 +9965,8 @@ _LT_EOF
11180 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 11335 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11181 wlarc= 11336 wlarc=
11182 else 11337 else
@@ -11187,7 +11342,7 @@ index 6b294bfebfb..52a025bb848 100755
11187 fi 11342 fi
11188 ;; 11343 ;;
11189 11344
11190@@ -9397,8 +9910,8 @@ _LT_EOF 11345@@ -9475,8 +9984,8 @@ _LT_EOF
11191 11346
11192 _LT_EOF 11347 _LT_EOF
11193 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11348 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11198,7 +11353,7 @@ index 6b294bfebfb..52a025bb848 100755
11198 else 11353 else
11199 ld_shlibs=no 11354 ld_shlibs=no
11200 fi 11355 fi
11201@@ -9444,8 +9957,8 @@ _LT_EOF 11356@@ -9522,8 +10031,8 @@ _LT_EOF
11202 11357
11203 *) 11358 *)
11204 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11359 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11209,7 +11364,7 @@ index 6b294bfebfb..52a025bb848 100755
11209 else 11364 else
11210 ld_shlibs=no 11365 ld_shlibs=no
11211 fi 11366 fi
11212@@ -9575,7 +10088,13 @@ _LT_EOF 11367@@ -9653,7 +10162,13 @@ _LT_EOF
11213 allow_undefined_flag='-berok' 11368 allow_undefined_flag='-berok'
11214 # Determine the default libpath from the value encoded in an 11369 # Determine the default libpath from the value encoded in an
11215 # empty executable. 11370 # empty executable.
@@ -11224,7 +11379,7 @@ index 6b294bfebfb..52a025bb848 100755
11224 /* end confdefs.h. */ 11379 /* end confdefs.h. */
11225 11380
11226 int 11381 int
11227@@ -9588,22 +10107,29 @@ main () 11382@@ -9666,22 +10181,29 @@ main ()
11228 _ACEOF 11383 _ACEOF
11229 if ac_fn_c_try_link "$LINENO"; then : 11384 if ac_fn_c_try_link "$LINENO"; then :
11230 11385
@@ -11267,7 +11422,7 @@ index 6b294bfebfb..52a025bb848 100755
11267 11422
11268 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11423 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" 11424 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@@ -9615,7 +10141,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11425@@ -9693,7 +10215,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11271 else 11426 else
11272 # Determine the default libpath from the value encoded in an 11427 # Determine the default libpath from the value encoded in an
11273 # empty executable. 11428 # empty executable.
@@ -11282,7 +11437,7 @@ index 6b294bfebfb..52a025bb848 100755
11282 /* end confdefs.h. */ 11437 /* end confdefs.h. */
11283 11438
11284 int 11439 int
11285@@ -9628,22 +10160,29 @@ main () 11440@@ -9706,22 +10234,29 @@ main ()
11286 _ACEOF 11441 _ACEOF
11287 if ac_fn_c_try_link "$LINENO"; then : 11442 if ac_fn_c_try_link "$LINENO"; then :
11288 11443
@@ -11325,7 +11480,7 @@ index 6b294bfebfb..52a025bb848 100755
11325 11480
11326 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11481 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11327 # Warning - without using the other run time loading flags, 11482 # Warning - without using the other run time loading flags,
11328@@ -9688,20 +10227,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11483@@ -9766,20 +10301,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11329 # Microsoft Visual C++. 11484 # Microsoft Visual C++.
11330 # hardcode_libdir_flag_spec is actually meaningless, as there is 11485 # hardcode_libdir_flag_spec is actually meaningless, as there is
11331 # no search path for DLLs. 11486 # no search path for DLLs.
@@ -11403,7 +11558,7 @@ index 6b294bfebfb..52a025bb848 100755
11403 ;; 11558 ;;
11404 11559
11405 darwin* | rhapsody*) 11560 darwin* | rhapsody*)
11406@@ -9762,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11561@@ -9840,7 +10418,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11407 11562
11408 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 11563 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11409 freebsd* | dragonfly*) 11564 freebsd* | dragonfly*)
@@ -11412,7 +11567,7 @@ index 6b294bfebfb..52a025bb848 100755
11412 hardcode_libdir_flag_spec='-R$libdir' 11567 hardcode_libdir_flag_spec='-R$libdir'
11413 hardcode_direct=yes 11568 hardcode_direct=yes
11414 hardcode_shlibpath_var=no 11569 hardcode_shlibpath_var=no
11415@@ -9770,7 +10352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11570@@ -9848,7 +10426,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11416 11571
11417 hpux9*) 11572 hpux9*)
11418 if test "$GCC" = yes; then 11573 if test "$GCC" = yes; then
@@ -11421,7 +11576,7 @@ index 6b294bfebfb..52a025bb848 100755
11421 else 11576 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' 11577 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 11578 fi
11424@@ -9786,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11579@@ -9864,7 +10442,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11425 11580
11426 hpux10*) 11581 hpux10*)
11427 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 11582 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -11430,7 +11585,7 @@ index 6b294bfebfb..52a025bb848 100755
11430 else 11585 else
11431 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 11586 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11432 fi 11587 fi
11433@@ -9810,10 +10392,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11588@@ -9888,10 +10466,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' 11589 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11435 ;; 11590 ;;
11436 ia64*) 11591 ia64*)
@@ -11443,7 +11598,7 @@ index 6b294bfebfb..52a025bb848 100755
11443 ;; 11598 ;;
11444 esac 11599 esac
11445 else 11600 else
11446@@ -9892,23 +10474,36 @@ fi 11601@@ -9970,23 +10548,36 @@ fi
11447 11602
11448 irix5* | irix6* | nonstopux*) 11603 irix5* | irix6* | nonstopux*)
11449 if test "$GCC" = yes; then 11604 if test "$GCC" = yes; then
@@ -11488,7 +11643,7 @@ index 6b294bfebfb..52a025bb848 100755
11488 else 11643 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' 11644 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' 11645 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@@ -9993,7 +10588,7 @@ rm -f core conftest.err conftest.$ac_objext \ 11646@@ -10071,7 +10662,7 @@ rm -f core conftest.err conftest.$ac_objext \
11492 osf4* | osf5*) # as osf3* with the addition of -msym flag 11647 osf4* | osf5*) # as osf3* with the addition of -msym flag
11493 if test "$GCC" = yes; then 11648 if test "$GCC" = yes; then
11494 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 11649 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -11497,7 +11652,7 @@ index 6b294bfebfb..52a025bb848 100755
11497 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 11652 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
11498 else 11653 else
11499 allow_undefined_flag=' -expect_unresolved \*' 11654 allow_undefined_flag=' -expect_unresolved \*'
11500@@ -10012,9 +10607,9 @@ rm -f core conftest.err conftest.$ac_objext \ 11655@@ -10090,9 +10681,9 @@ rm -f core conftest.err conftest.$ac_objext \
11501 no_undefined_flag=' -z defs' 11656 no_undefined_flag=' -z defs'
11502 if test "$GCC" = yes; then 11657 if test "$GCC" = yes; then
11503 wlarc='${wl}' 11658 wlarc='${wl}'
@@ -11509,7 +11664,7 @@ index 6b294bfebfb..52a025bb848 100755
11509 else 11664 else
11510 case `$CC -V 2>&1` in 11665 case `$CC -V 2>&1` in
11511 *"Compilers 5.0"*) 11666 *"Compilers 5.0"*)
11512@@ -10590,8 +11185,9 @@ cygwin* | mingw* | pw32* | cegcc*) 11667@@ -10668,8 +11259,9 @@ cygwin* | mingw* | pw32* | cegcc*)
11513 need_version=no 11668 need_version=no
11514 need_lib_prefix=no 11669 need_lib_prefix=no
11515 11670
@@ -11521,7 +11676,7 @@ index 6b294bfebfb..52a025bb848 100755
11521 library_names_spec='$libname.dll.a' 11676 library_names_spec='$libname.dll.a'
11522 # DLL is installed to $(libdir)/../bin by postinstall_cmds 11677 # DLL is installed to $(libdir)/../bin by postinstall_cmds
11523 postinstall_cmds='base_file=`basename \${file}`~ 11678 postinstall_cmds='base_file=`basename \${file}`~
11524@@ -10624,13 +11220,71 @@ cygwin* | mingw* | pw32* | cegcc*) 11679@@ -10702,13 +11294,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}' 11680 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11526 ;; 11681 ;;
11527 esac 11682 esac
@@ -11594,7 +11749,7 @@ index 6b294bfebfb..52a025bb848 100755
11594 # FIXME: first we should search . and the directory the executable is in 11749 # FIXME: first we should search . and the directory the executable is in
11595 shlibpath_var=PATH 11750 shlibpath_var=PATH
11596 ;; 11751 ;;
11597@@ -10712,7 +11366,7 @@ haiku*) 11752@@ -10790,7 +11440,7 @@ haiku*)
11598 soname_spec='${libname}${release}${shared_ext}$major' 11753 soname_spec='${libname}${release}${shared_ext}$major'
11599 shlibpath_var=LIBRARY_PATH 11754 shlibpath_var=LIBRARY_PATH
11600 shlibpath_overrides_runpath=yes 11755 shlibpath_overrides_runpath=yes
@@ -11603,16 +11758,16 @@ index 6b294bfebfb..52a025bb848 100755
11603 hardcode_into_libs=yes 11758 hardcode_into_libs=yes
11604 ;; 11759 ;;
11605 11760
11606@@ -11508,7 +12162,7 @@ else 11761@@ -11586,7 +12236,7 @@ else
11607 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11762 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11608 lt_status=$lt_dlunknown 11763 lt_status=$lt_dlunknown
11609 cat > conftest.$ac_ext <<_LT_EOF 11764 cat > conftest.$ac_ext <<_LT_EOF
11610-#line 11511 "configure" 11765-#line 11589 "configure"
11611+#line $LINENO "configure" 11766+#line $LINENO "configure"
11612 #include "confdefs.h" 11767 #include "confdefs.h"
11613 11768
11614 #if HAVE_DLFCN_H 11769 #if HAVE_DLFCN_H
11615@@ -11552,10 +12206,10 @@ else 11770@@ -11630,10 +12280,10 @@ else
11616 /* When -fvisbility=hidden is used, assume the code has been annotated 11771 /* When -fvisbility=hidden is used, assume the code has been annotated
11617 correspondingly for the symbols needed. */ 11772 correspondingly for the symbols needed. */
11618 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11773 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11625,16 +11780,16 @@ index 6b294bfebfb..52a025bb848 100755
11625 int main () 11780 int main ()
11626 { 11781 {
11627 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11782 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11628@@ -11614,7 +12268,7 @@ else 11783@@ -11692,7 +12342,7 @@ else
11629 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11784 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11630 lt_status=$lt_dlunknown 11785 lt_status=$lt_dlunknown
11631 cat > conftest.$ac_ext <<_LT_EOF 11786 cat > conftest.$ac_ext <<_LT_EOF
11632-#line 11617 "configure" 11787-#line 11695 "configure"
11633+#line $LINENO "configure" 11788+#line $LINENO "configure"
11634 #include "confdefs.h" 11789 #include "confdefs.h"
11635 11790
11636 #if HAVE_DLFCN_H 11791 #if HAVE_DLFCN_H
11637@@ -11658,10 +12312,10 @@ else 11792@@ -11736,10 +12386,10 @@ else
11638 /* When -fvisbility=hidden is used, assume the code has been annotated 11793 /* When -fvisbility=hidden is used, assume the code has been annotated
11639 correspondingly for the symbols needed. */ 11794 correspondingly for the symbols needed. */
11640 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11795 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -11647,7 +11802,7 @@ index 6b294bfebfb..52a025bb848 100755
11647 int main () 11802 int main ()
11648 { 11803 {
11649 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11804 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11650@@ -14136,13 +14790,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 11805@@ -14286,13 +14936,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
11651 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 11806 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
11652 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 11807 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
11653 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 11808 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -11668,7 +11823,7 @@ index 6b294bfebfb..52a025bb848 100755
11668 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 11823 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
11669 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 11824 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
11670 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 11825 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
11671@@ -14157,14 +14818,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 11826@@ -14307,14 +14964,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"`' 11827 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"`' 11828 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"`' 11829 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 +11842,7 @@ index 6b294bfebfb..52a025bb848 100755
11687 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 11842 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
11688 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 11843 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
11689 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 11844 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
11690@@ -14197,12 +14861,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 11845@@ -14347,12 +15007,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
11691 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 11846 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
11692 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 11847 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
11693 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 11848 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -11701,7 +11856,7 @@ index 6b294bfebfb..52a025bb848 100755
11701 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 11856 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"`' 11857 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"`' 11858 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
11704@@ -14257,8 +14921,13 @@ reload_flag \ 11859@@ -14407,8 +15067,13 @@ reload_flag \
11705 OBJDUMP \ 11860 OBJDUMP \
11706 deplibs_check_method \ 11861 deplibs_check_method \
11707 file_magic_cmd \ 11862 file_magic_cmd \
@@ -11715,7 +11870,7 @@ index 6b294bfebfb..52a025bb848 100755
11715 STRIP \ 11870 STRIP \
11716 RANLIB \ 11871 RANLIB \
11717 CC \ 11872 CC \
11718@@ -14268,12 +14937,14 @@ lt_cv_sys_global_symbol_pipe \ 11873@@ -14418,12 +15083,14 @@ lt_cv_sys_global_symbol_pipe \
11719 lt_cv_sys_global_symbol_to_cdecl \ 11874 lt_cv_sys_global_symbol_to_cdecl \
11720 lt_cv_sys_global_symbol_to_c_name_address \ 11875 lt_cv_sys_global_symbol_to_c_name_address \
11721 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 11876 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -11731,7 +11886,7 @@ index 6b294bfebfb..52a025bb848 100755
11731 DSYMUTIL \ 11886 DSYMUTIL \
11732 NMEDIT \ 11887 NMEDIT \
11733 LIPO \ 11888 LIPO \
11734@@ -14289,7 +14960,6 @@ no_undefined_flag \ 11889@@ -14439,7 +15106,6 @@ no_undefined_flag \
11735 hardcode_libdir_flag_spec \ 11890 hardcode_libdir_flag_spec \
11736 hardcode_libdir_flag_spec_ld \ 11891 hardcode_libdir_flag_spec_ld \
11737 hardcode_libdir_separator \ 11892 hardcode_libdir_separator \
@@ -11739,7 +11894,7 @@ index 6b294bfebfb..52a025bb848 100755
11739 exclude_expsyms \ 11894 exclude_expsyms \
11740 include_expsyms \ 11895 include_expsyms \
11741 file_list_spec \ 11896 file_list_spec \
11742@@ -14325,6 +14995,7 @@ module_cmds \ 11897@@ -14475,6 +15141,7 @@ module_cmds \
11743 module_expsym_cmds \ 11898 module_expsym_cmds \
11744 export_symbols_cmds \ 11899 export_symbols_cmds \
11745 prelink_cmds \ 11900 prelink_cmds \
@@ -11747,7 +11902,7 @@ index 6b294bfebfb..52a025bb848 100755
11747 postinstall_cmds \ 11902 postinstall_cmds \
11748 postuninstall_cmds \ 11903 postuninstall_cmds \
11749 finish_cmds \ 11904 finish_cmds \
11750@@ -15081,7 +15752,8 @@ $as_echo X"$file" | 11905@@ -15231,7 +15898,8 @@ $as_echo X"$file" |
11751 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 11906 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
11752 # 11907 #
11753 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 11908 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -11757,7 +11912,7 @@ index 6b294bfebfb..52a025bb848 100755
11757 # Written by Gordon Matzigkeit, 1996 11912 # Written by Gordon Matzigkeit, 1996
11758 # 11913 #
11759 # This file is part of GNU Libtool. 11914 # This file is part of GNU Libtool.
11760@@ -15184,19 +15856,42 @@ SP2NL=$lt_lt_SP2NL 11915@@ -15334,19 +16002,42 @@ SP2NL=$lt_lt_SP2NL
11761 # turn newlines into spaces. 11916 # turn newlines into spaces.
11762 NL2SP=$lt_lt_NL2SP 11917 NL2SP=$lt_lt_NL2SP
11763 11918
@@ -11801,7 +11956,7 @@ index 6b294bfebfb..52a025bb848 100755
11801 # A symbol stripping program. 11956 # A symbol stripping program.
11802 STRIP=$lt_STRIP 11957 STRIP=$lt_STRIP
11803 11958
11804@@ -15226,6 +15921,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 11959@@ -15376,6 +16067,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. 11960 # 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 11961 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
11807 11962
@@ -11814,7 +11969,7 @@ index 6b294bfebfb..52a025bb848 100755
11814 # The name of the directory that contains temporary libtool files. 11969 # The name of the directory that contains temporary libtool files.
11815 objdir=$objdir 11970 objdir=$objdir
11816 11971
11817@@ -15235,6 +15936,9 @@ MAGIC_CMD=$MAGIC_CMD 11972@@ -15385,6 +16082,9 @@ MAGIC_CMD=$MAGIC_CMD
11818 # Must we lock files when doing compilation? 11973 # Must we lock files when doing compilation?
11819 need_locks=$lt_need_locks 11974 need_locks=$lt_need_locks
11820 11975
@@ -11824,7 +11979,7 @@ index 6b294bfebfb..52a025bb848 100755
11824 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 11979 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
11825 DSYMUTIL=$lt_DSYMUTIL 11980 DSYMUTIL=$lt_DSYMUTIL
11826 11981
11827@@ -15349,12 +16053,12 @@ with_gcc=$GCC 11982@@ -15499,12 +16199,12 @@ with_gcc=$GCC
11828 # Compiler flag to turn off builtin functions. 11983 # Compiler flag to turn off builtin functions.
11829 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 11984 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
11830 11985
@@ -11840,7 +11995,7 @@ index 6b294bfebfb..52a025bb848 100755
11840 # Compiler flag to prevent dynamic linking. 11995 # Compiler flag to prevent dynamic linking.
11841 link_static_flag=$lt_lt_prog_compiler_static 11996 link_static_flag=$lt_lt_prog_compiler_static
11842 11997
11843@@ -15441,9 +16145,6 @@ inherit_rpath=$inherit_rpath 11998@@ -15591,9 +16291,6 @@ inherit_rpath=$inherit_rpath
11844 # Whether libtool must link a program against all its dependency libraries. 11999 # Whether libtool must link a program against all its dependency libraries.
11845 link_all_deplibs=$link_all_deplibs 12000 link_all_deplibs=$link_all_deplibs
11846 12001
@@ -11850,7 +12005,7 @@ index 6b294bfebfb..52a025bb848 100755
11850 # Set to "yes" if exported symbols are required. 12005 # Set to "yes" if exported symbols are required.
11851 always_export_symbols=$always_export_symbols 12006 always_export_symbols=$always_export_symbols
11852 12007
11853@@ -15459,6 +16160,9 @@ include_expsyms=$lt_include_expsyms 12008@@ -15609,6 +16306,9 @@ include_expsyms=$lt_include_expsyms
11854 # Commands necessary for linking programs (against libraries) with templates. 12009 # Commands necessary for linking programs (against libraries) with templates.
11855 prelink_cmds=$lt_prelink_cmds 12010 prelink_cmds=$lt_prelink_cmds
11856 12011
@@ -11860,7 +12015,7 @@ index 6b294bfebfb..52a025bb848 100755
11860 # Specify filename containing input files. 12015 # Specify filename containing input files.
11861 file_list_spec=$lt_file_list_spec 12016 file_list_spec=$lt_file_list_spec
11862 12017
11863@@ -15491,210 +16195,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 12018@@ -15641,210 +16341,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
11864 # if finds mixed CR/LF and LF-only lines. Since sed operates in 12019 # 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 12020 # text mode, it properly converts lines to CR/LF. This bash problem
11866 # is reportedly fixed, but why not run on old versions too? 12021 # is reportedly fixed, but why not run on old versions too?
@@ -12235,7 +12390,7 @@ index 6b294bfebfb..52a025bb848 100755
12235 chmod +x "$ofile" 12390 chmod +x "$ofile"
12236 12391
12237diff --git a/libtool.m4 b/libtool.m4 12392diff --git a/libtool.m4 b/libtool.m4
12238index e993b621ac2..7715af647f4 100644 12393index 9a13f3b117a..5be47564443 100644
12239--- a/libtool.m4 12394--- a/libtool.m4
12240+++ b/libtool.m4 12395+++ b/libtool.m4
12241@@ -1,7 +1,8 @@ 12396@@ -1,7 +1,8 @@
@@ -12445,7 +12600,7 @@ index e993b621ac2..7715af647f4 100644
12445 # _LT_ENABLE_LOCK 12600 # _LT_ENABLE_LOCK
12446 # --------------- 12601 # ---------------
12447 m4_defun([_LT_ENABLE_LOCK], 12602 m4_defun([_LT_ENABLE_LOCK],
12448@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" 12603@@ -1320,6 +1369,51 @@ need_locks="$enable_libtool_lock"
12449 ])# _LT_ENABLE_LOCK 12604 ])# _LT_ENABLE_LOCK
12450 12605
12451 12606
@@ -12453,6 +12608,14 @@ index e993b621ac2..7715af647f4 100644
12453+# ----------- 12608+# -----------
12454+m4_defun([_LT_PROG_AR], 12609+m4_defun([_LT_PROG_AR],
12455+[AC_CHECK_TOOLS(AR, [ar], false) 12610+[AC_CHECK_TOOLS(AR, [ar], false)
12611+ touch conftest.c
12612+ $AR $plugin_option rc conftest.a conftest.c
12613+ if test "$?" != 0; then
12614+ AC_MSG_WARN([Failed: $AR $plugin_option rc])
12615+ else
12616+ AR="$AR $plugin_option"
12617+ fi
12618+ rm -f conftest.*
12456+: ${AR=ar} 12619+: ${AR=ar}
12457+: ${AR_FLAGS=cru} 12620+: ${AR_FLAGS=cru}
12458+_LT_DECL([], [AR], [1], [The archiver]) 12621+_LT_DECL([], [AR], [1], [The archiver])
@@ -12489,16 +12652,32 @@ index e993b621ac2..7715af647f4 100644
12489 # _LT_CMD_OLD_ARCHIVE 12652 # _LT_CMD_OLD_ARCHIVE
12490 # ------------------- 12653 # -------------------
12491 m4_defun([_LT_CMD_OLD_ARCHIVE], 12654 m4_defun([_LT_CMD_OLD_ARCHIVE],
12492-[AC_CHECK_TOOL(AR, ar, false) 12655@@ -1336,23 +1430,7 @@ for plugin in $plugin_names; do
12656 fi
12657 done
12658
12659-AC_CHECK_TOOL(AR, ar, false)
12493-test -z "$AR" && AR=ar 12660-test -z "$AR" && AR=ar
12661-if test -n "$plugin_option"; then
12662- if $AR --help 2>&1 | grep -q "\--plugin"; then
12663- touch conftest.c
12664- $AR $plugin_option rc conftest.a conftest.c
12665- if test "$?" != 0; then
12666- AC_MSG_WARN([Failed: $AR $plugin_option rc])
12667- else
12668- AR="$AR $plugin_option"
12669- fi
12670- rm -f conftest.*
12671- fi
12672-fi
12494-test -z "$AR_FLAGS" && AR_FLAGS=cru 12673-test -z "$AR_FLAGS" && AR_FLAGS=cru
12495-_LT_DECL([], [AR], [1], [The archiver]) 12674-_LT_DECL([], [AR], [1], [The archiver])
12496-_LT_DECL([], [AR_FLAGS], [1]) 12675-_LT_DECL([], [AR_FLAGS], [1])
12497+[_LT_PROG_AR 12676+_LT_PROG_AR
12498 12677
12499 AC_CHECK_TOOL(STRIP, strip, :) 12678 AC_CHECK_TOOL(STRIP, strip, :)
12500 test -z "$STRIP" && STRIP=: 12679 test -z "$STRIP" && STRIP=:
12501@@ -1623,7 +1705,7 @@ else 12680@@ -1653,7 +1731,7 @@ else
12502 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12681 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12503 lt_status=$lt_dlunknown 12682 lt_status=$lt_dlunknown
12504 cat > conftest.$ac_ext <<_LT_EOF 12683 cat > conftest.$ac_ext <<_LT_EOF
@@ -12507,7 +12686,7 @@ index e993b621ac2..7715af647f4 100644
12507 #include "confdefs.h" 12686 #include "confdefs.h"
12508 12687
12509 #if HAVE_DLFCN_H 12688 #if HAVE_DLFCN_H
12510@@ -1667,10 +1749,10 @@ else 12689@@ -1697,10 +1775,10 @@ else
12511 /* When -fvisbility=hidden is used, assume the code has been annotated 12690 /* When -fvisbility=hidden is used, assume the code has been annotated
12512 correspondingly for the symbols needed. */ 12691 correspondingly for the symbols needed. */
12513 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 12692 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -12520,7 +12699,7 @@ index e993b621ac2..7715af647f4 100644
12520 int main () 12699 int main ()
12521 { 12700 {
12522 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 12701 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12523@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) 12702@@ -2240,8 +2318,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12524 need_version=no 12703 need_version=no
12525 need_lib_prefix=no 12704 need_lib_prefix=no
12526 12705
@@ -12532,7 +12711,7 @@ index e993b621ac2..7715af647f4 100644
12532 library_names_spec='$libname.dll.a' 12711 library_names_spec='$libname.dll.a'
12533 # DLL is installed to $(libdir)/../bin by postinstall_cmds 12712 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12534 postinstall_cmds='base_file=`basename \${file}`~ 12713 postinstall_cmds='base_file=`basename \${file}`~
12535@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ 12714@@ -2274,13 +2353,71 @@ m4_if([$1], [],[
12536 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 12715 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
12537 ;; 12716 ;;
12538 esac 12717 esac
@@ -12605,7 +12784,7 @@ index e993b621ac2..7715af647f4 100644
12605 # FIXME: first we should search . and the directory the executable is in 12784 # FIXME: first we should search . and the directory the executable is in
12606 shlibpath_var=PATH 12785 shlibpath_var=PATH
12607 ;; 12786 ;;
12608@@ -2332,7 +2473,7 @@ haiku*) 12787@@ -2362,7 +2499,7 @@ haiku*)
12609 soname_spec='${libname}${release}${shared_ext}$major' 12788 soname_spec='${libname}${release}${shared_ext}$major'
12610 shlibpath_var=LIBRARY_PATH 12789 shlibpath_var=LIBRARY_PATH
12611 shlibpath_overrides_runpath=yes 12790 shlibpath_overrides_runpath=yes
@@ -12614,7 +12793,7 @@ index e993b621ac2..7715af647f4 100644
12614 hardcode_into_libs=yes 12793 hardcode_into_libs=yes
12615 ;; 12794 ;;
12616 12795
12617@@ -2940,6 +3081,11 @@ case $reload_flag in 12796@@ -2970,6 +3107,11 @@ case $reload_flag in
12618 esac 12797 esac
12619 reload_cmds='$LD$reload_flag -o $output$reload_objs' 12798 reload_cmds='$LD$reload_flag -o $output$reload_objs'
12620 case $host_os in 12799 case $host_os in
@@ -12626,7 +12805,7 @@ index e993b621ac2..7715af647f4 100644
12626 darwin*) 12805 darwin*)
12627 if test "$GCC" = yes; then 12806 if test "$GCC" = yes; then
12628 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 12807 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
12629@@ -3006,7 +3152,8 @@ mingw* | pw32*) 12808@@ -3036,7 +3178,8 @@ mingw* | pw32*)
12630 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 12809 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
12631 lt_cv_file_magic_cmd='func_win32_libid' 12810 lt_cv_file_magic_cmd='func_win32_libid'
12632 else 12811 else
@@ -12636,7 +12815,7 @@ index e993b621ac2..7715af647f4 100644
12636 lt_cv_file_magic_cmd='$OBJDUMP -f' 12815 lt_cv_file_magic_cmd='$OBJDUMP -f'
12637 fi 12816 fi
12638 ;; 12817 ;;
12639@@ -3157,6 +3304,21 @@ tpf*) 12818@@ -3187,6 +3330,21 @@ tpf*)
12640 ;; 12819 ;;
12641 esac 12820 esac
12642 ]) 12821 ])
@@ -12658,7 +12837,7 @@ index e993b621ac2..7715af647f4 100644
12658 file_magic_cmd=$lt_cv_file_magic_cmd 12837 file_magic_cmd=$lt_cv_file_magic_cmd
12659 deplibs_check_method=$lt_cv_deplibs_check_method 12838 deplibs_check_method=$lt_cv_deplibs_check_method
12660 test -z "$deplibs_check_method" && deplibs_check_method=unknown 12839 test -z "$deplibs_check_method" && deplibs_check_method=unknown
12661@@ -3164,7 +3326,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 12840@@ -3194,7 +3352,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
12662 _LT_DECL([], [deplibs_check_method], [1], 12841 _LT_DECL([], [deplibs_check_method], [1],
12663 [Method to check whether dependent libraries are shared objects]) 12842 [Method to check whether dependent libraries are shared objects])
12664 _LT_DECL([], [file_magic_cmd], [1], 12843 _LT_DECL([], [file_magic_cmd], [1],
@@ -12671,7 +12850,7 @@ index e993b621ac2..7715af647f4 100644
12671 ])# _LT_CHECK_MAGIC_METHOD 12850 ])# _LT_CHECK_MAGIC_METHOD
12672 12851
12673 12852
12674@@ -3267,6 +3433,67 @@ dnl aclocal-1.4 backwards compatibility: 12853@@ -3297,6 +3459,67 @@ dnl aclocal-1.4 backwards compatibility:
12675 dnl AC_DEFUN([AM_PROG_NM], []) 12854 dnl AC_DEFUN([AM_PROG_NM], [])
12676 dnl AC_DEFUN([AC_PROG_NM], []) 12855 dnl AC_DEFUN([AC_PROG_NM], [])
12677 12856
@@ -12739,7 +12918,7 @@ index e993b621ac2..7715af647f4 100644
12739 12918
12740 # LT_LIB_M 12919 # LT_LIB_M
12741 # -------- 12920 # --------
12742@@ -3393,8 +3620,8 @@ esac 12921@@ -3423,8 +3646,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'" 12922 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
12744 12923
12745 # Transform an extracted symbol line into symbol name and symbol address 12924 # Transform an extracted symbol line into symbol name and symbol address
@@ -12750,7 +12929,7 @@ index e993b621ac2..7715af647f4 100644
12750 12929
12751 # Handle CRLF in mingw tool chain 12930 # Handle CRLF in mingw tool chain
12752 opt_cr= 12931 opt_cr=
12753@@ -3430,6 +3657,7 @@ for ac_symprfx in "" "_"; do 12932@@ -3460,6 +3683,7 @@ for ac_symprfx in "" "_"; do
12754 else 12933 else
12755 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 12934 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
12756 fi 12935 fi
@@ -12758,7 +12937,7 @@ index e993b621ac2..7715af647f4 100644
12758 12937
12759 # Check to see that the pipe works correctly. 12938 # Check to see that the pipe works correctly.
12760 pipe_works=no 12939 pipe_works=no
12761@@ -3463,6 +3691,18 @@ _LT_EOF 12940@@ -3493,6 +3717,18 @@ _LT_EOF
12762 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 12941 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
12763 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 12942 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
12764 cat <<_LT_EOF > conftest.$ac_ext 12943 cat <<_LT_EOF > conftest.$ac_ext
@@ -12777,7 +12956,7 @@ index e993b621ac2..7715af647f4 100644
12777 #ifdef __cplusplus 12956 #ifdef __cplusplus
12778 extern "C" { 12957 extern "C" {
12779 #endif 12958 #endif
12780@@ -3474,7 +3714,7 @@ _LT_EOF 12959@@ -3504,7 +3740,7 @@ _LT_EOF
12781 cat <<_LT_EOF >> conftest.$ac_ext 12960 cat <<_LT_EOF >> conftest.$ac_ext
12782 12961
12783 /* The mapping between symbol names and symbols. */ 12962 /* The mapping between symbol names and symbols. */
@@ -12786,7 +12965,7 @@ index e993b621ac2..7715af647f4 100644
12786 const char *name; 12965 const char *name;
12787 void *address; 12966 void *address;
12788 } 12967 }
12789@@ -3500,15 +3740,15 @@ static const void *lt_preloaded_setup() { 12968@@ -3530,15 +3766,15 @@ static const void *lt_preloaded_setup() {
12790 _LT_EOF 12969 _LT_EOF
12791 # Now try linking the two files. 12970 # Now try linking the two files.
12792 mv conftest.$ac_objext conftstm.$ac_objext 12971 mv conftest.$ac_objext conftstm.$ac_objext
@@ -12806,7 +12985,7 @@ index e993b621ac2..7715af647f4 100644
12806 else 12985 else
12807 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD 12986 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
12808 fi 12987 fi
12809@@ -3541,6 +3781,13 @@ else 12988@@ -3571,6 +3807,13 @@ else
12810 AC_MSG_RESULT(ok) 12989 AC_MSG_RESULT(ok)
12811 fi 12990 fi
12812 12991
@@ -12820,7 +12999,7 @@ index e993b621ac2..7715af647f4 100644
12820 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 12999 _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]) 13000 [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], 13001 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
12823@@ -3551,6 +3798,8 @@ _LT_DECL([global_symbol_to_c_name_address], 13002@@ -3581,6 +3824,8 @@ _LT_DECL([global_symbol_to_c_name_address],
12824 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 13003 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
12825 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 13004 [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]) 13005 [Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -12829,7 +13008,7 @@ index e993b621ac2..7715af647f4 100644
12829 ]) # _LT_CMD_GLOBAL_SYMBOLS 13008 ]) # _LT_CMD_GLOBAL_SYMBOLS
12830 13009
12831 13010
12832@@ -3562,7 +3811,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= 13011@@ -3592,7 +3837,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
12833 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 13012 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
12834 _LT_TAGVAR(lt_prog_compiler_static, $1)= 13013 _LT_TAGVAR(lt_prog_compiler_static, $1)=
12835 13014
@@ -12837,7 +13016,7 @@ index e993b621ac2..7715af647f4 100644
12837 m4_if([$1], [CXX], [ 13016 m4_if([$1], [CXX], [
12838 # C++ specific cases for pic, static, wl, etc. 13017 # C++ specific cases for pic, static, wl, etc.
12839 if test "$GXX" = yes; then 13018 if test "$GXX" = yes; then
12840@@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [ 13019@@ -3698,6 +3942,12 @@ m4_if([$1], [CXX], [
12841 ;; 13020 ;;
12842 esac 13021 esac
12843 ;; 13022 ;;
@@ -12850,7 +13029,7 @@ index e993b621ac2..7715af647f4 100644
12850 dgux*) 13029 dgux*)
12851 case $cc_basename in 13030 case $cc_basename in
12852 ec++*) 13031 ec++*)
12853@@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [ 13032@@ -3850,7 +4100,7 @@ m4_if([$1], [CXX], [
12854 ;; 13033 ;;
12855 solaris*) 13034 solaris*)
12856 case $cc_basename in 13035 case $cc_basename in
@@ -12859,7 +13038,7 @@ index e993b621ac2..7715af647f4 100644
12859 # Sun C++ 4.2, 5.x and Centerline C++ 13038 # Sun C++ 4.2, 5.x and Centerline C++
12860 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 13039 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12861 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 13040 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12862@@ -4043,6 +4297,12 @@ m4_if([$1], [CXX], [ 13041@@ -4073,6 +4323,12 @@ m4_if([$1], [CXX], [
12863 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' 13042 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
12864 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' 13043 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
12865 ;; 13044 ;;
@@ -12872,7 +13051,7 @@ index e993b621ac2..7715af647f4 100644
12872 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 13051 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
12873 # Portland Group compilers (*not* the Pentium gcc compiler, 13052 # Portland Group compilers (*not* the Pentium gcc compiler,
12874 # which looks to be a dead project) 13053 # which looks to be a dead project)
12875@@ -4105,7 +4365,7 @@ m4_if([$1], [CXX], [ 13054@@ -4135,7 +4391,7 @@ m4_if([$1], [CXX], [
12876 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 13055 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
12877 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 13056 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
12878 case $cc_basename in 13057 case $cc_basename in
@@ -12881,7 +13060,7 @@ index e993b621ac2..7715af647f4 100644
12881 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; 13060 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
12882 *) 13061 *)
12883 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; 13062 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
12884@@ -4162,9 +4422,11 @@ case $host_os in 13063@@ -4192,9 +4448,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],[])])" 13064 _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 ;; 13065 ;;
12887 esac 13066 esac
@@ -12896,7 +13075,7 @@ index e993b621ac2..7715af647f4 100644
12896 13075
12897 # 13076 #
12898 # Check to make sure the PIC flag actually works. 13077 # Check to make sure the PIC flag actually works.
12899@@ -4183,6 +4445,8 @@ fi 13078@@ -4213,6 +4471,8 @@ fi
12900 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], 13079 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
12901 [Additional compiler flags for building library objects]) 13080 [Additional compiler flags for building library objects])
12902 13081
@@ -12905,7 +13084,7 @@ index e993b621ac2..7715af647f4 100644
12905 # 13084 #
12906 # Check to make sure the static flag actually works. 13085 # Check to make sure the static flag actually works.
12907 # 13086 #
12908@@ -4203,6 +4467,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 13087@@ -4233,6 +4493,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
12909 m4_defun([_LT_LINKER_SHLIBS], 13088 m4_defun([_LT_LINKER_SHLIBS],
12910 [AC_REQUIRE([LT_PATH_LD])dnl 13089 [AC_REQUIRE([LT_PATH_LD])dnl
12911 AC_REQUIRE([LT_PATH_NM])dnl 13090 AC_REQUIRE([LT_PATH_NM])dnl
@@ -12913,7 +13092,7 @@ index e993b621ac2..7715af647f4 100644
12913 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 13092 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
12914 m4_require([_LT_DECL_EGREP])dnl 13093 m4_require([_LT_DECL_EGREP])dnl
12915 m4_require([_LT_DECL_SED])dnl 13094 m4_require([_LT_DECL_SED])dnl
12916@@ -4211,6 +4476,7 @@ m4_require([_LT_TAG_COMPILER])dnl 13095@@ -4241,6 +4502,7 @@ m4_require([_LT_TAG_COMPILER])dnl
12917 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) 13096 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
12918 m4_if([$1], [CXX], [ 13097 m4_if([$1], [CXX], [
12919 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 13098 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -12921,7 +13100,7 @@ index e993b621ac2..7715af647f4 100644
12921 case $host_os in 13100 case $host_os in
12922 aix[[4-9]]*) 13101 aix[[4-9]]*)
12923 # If we're using GNU nm, then we don't want the "-C" option. 13102 # If we're using GNU nm, then we don't want the "-C" option.
12924@@ -4225,15 +4491,20 @@ m4_if([$1], [CXX], [ 13103@@ -4255,15 +4517,20 @@ m4_if([$1], [CXX], [
12925 ;; 13104 ;;
12926 pw32*) 13105 pw32*)
12927 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 13106 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
@@ -12947,7 +13126,7 @@ index e993b621ac2..7715af647f4 100644
12947 ], [ 13126 ], [
12948 runpath_var= 13127 runpath_var=
12949 _LT_TAGVAR(allow_undefined_flag, $1)= 13128 _LT_TAGVAR(allow_undefined_flag, $1)=
12950@@ -4401,7 +4672,8 @@ _LT_EOF 13129@@ -4431,7 +4698,8 @@ _LT_EOF
12951 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 13130 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
12952 _LT_TAGVAR(always_export_symbols, $1)=no 13131 _LT_TAGVAR(always_export_symbols, $1)=no
12953 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 13132 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -12957,7 +13136,7 @@ index e993b621ac2..7715af647f4 100644
12957 13136
12958 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 13137 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' 13138 _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@@ -4500,12 +4772,12 @@ _LT_EOF 13139@@ -4530,12 +4798,12 @@ _LT_EOF
12961 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 13140 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
12962 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 13141 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
12963 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' 13142 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
@@ -12972,7 +13151,7 @@ index e993b621ac2..7715af647f4 100644
12972 fi 13151 fi
12973 ;; 13152 ;;
12974 esac 13153 esac
12975@@ -4519,8 +4791,8 @@ _LT_EOF 13154@@ -4549,8 +4817,8 @@ _LT_EOF
12976 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 13155 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
12977 wlarc= 13156 wlarc=
12978 else 13157 else
@@ -12983,7 +13162,7 @@ index e993b621ac2..7715af647f4 100644
12983 fi 13162 fi
12984 ;; 13163 ;;
12985 13164
12986@@ -4538,8 +4810,8 @@ _LT_EOF 13165@@ -4568,8 +4836,8 @@ _LT_EOF
12987 13166
12988 _LT_EOF 13167 _LT_EOF
12989 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 13168 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -12994,7 +13173,7 @@ index e993b621ac2..7715af647f4 100644
12994 else 13173 else
12995 _LT_TAGVAR(ld_shlibs, $1)=no 13174 _LT_TAGVAR(ld_shlibs, $1)=no
12996 fi 13175 fi
12997@@ -4585,8 +4857,8 @@ _LT_EOF 13176@@ -4615,8 +4883,8 @@ _LT_EOF
12998 13177
12999 *) 13178 *)
13000 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 13179 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13005,7 +13184,7 @@ index e993b621ac2..7715af647f4 100644
13005 else 13184 else
13006 _LT_TAGVAR(ld_shlibs, $1)=no 13185 _LT_TAGVAR(ld_shlibs, $1)=no
13007 fi 13186 fi
13008@@ -4716,7 +4988,7 @@ _LT_EOF 13187@@ -4746,7 +5014,7 @@ _LT_EOF
13009 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 13188 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
13010 # Determine the default libpath from the value encoded in an 13189 # Determine the default libpath from the value encoded in an
13011 # empty executable. 13190 # empty executable.
@@ -13014,7 +13193,7 @@ index e993b621ac2..7715af647f4 100644
13014 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 13193 _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" 13194 _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 13195 else
13017@@ -4727,7 +4999,7 @@ _LT_EOF 13196@@ -4757,7 +5025,7 @@ _LT_EOF
13018 else 13197 else
13019 # Determine the default libpath from the value encoded in an 13198 # Determine the default libpath from the value encoded in an
13020 # empty executable. 13199 # empty executable.
@@ -13023,7 +13202,7 @@ index e993b621ac2..7715af647f4 100644
13023 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 13202 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13024 # Warning - without using the other run time loading flags, 13203 # Warning - without using the other run time loading flags,
13025 # -berok will link without error, but may produce a broken library. 13204 # -berok will link without error, but may produce a broken library.
13026@@ -4771,20 +5043,63 @@ _LT_EOF 13205@@ -4801,20 +5069,63 @@ _LT_EOF
13027 # Microsoft Visual C++. 13206 # Microsoft Visual C++.
13028 # hardcode_libdir_flag_spec is actually meaningless, as there is 13207 # hardcode_libdir_flag_spec is actually meaningless, as there is
13029 # no search path for DLLs. 13208 # no search path for DLLs.
@@ -13101,7 +13280,7 @@ index e993b621ac2..7715af647f4 100644
13101 ;; 13280 ;;
13102 13281
13103 darwin* | rhapsody*) 13282 darwin* | rhapsody*)
13104@@ -4818,7 +5133,7 @@ _LT_EOF 13283@@ -4848,7 +5159,7 @@ _LT_EOF
13105 13284
13106 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 13285 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
13107 freebsd* | dragonfly*) 13286 freebsd* | dragonfly*)
@@ -13110,7 +13289,7 @@ index e993b621ac2..7715af647f4 100644
13110 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 13289 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
13111 _LT_TAGVAR(hardcode_direct, $1)=yes 13290 _LT_TAGVAR(hardcode_direct, $1)=yes
13112 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 13291 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
13113@@ -4826,7 +5141,7 @@ _LT_EOF 13292@@ -4856,7 +5167,7 @@ _LT_EOF
13114 13293
13115 hpux9*) 13294 hpux9*)
13116 if test "$GCC" = yes; then 13295 if test "$GCC" = yes; then
@@ -13119,7 +13298,7 @@ index e993b621ac2..7715af647f4 100644
13119 else 13298 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' 13299 _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 13300 fi
13122@@ -4842,7 +5157,7 @@ _LT_EOF 13301@@ -4872,7 +5183,7 @@ _LT_EOF
13123 13302
13124 hpux10*) 13303 hpux10*)
13125 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 13304 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -13128,7 +13307,7 @@ index e993b621ac2..7715af647f4 100644
13128 else 13307 else
13129 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 13308 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
13130 fi 13309 fi
13131@@ -4866,10 +5181,10 @@ _LT_EOF 13310@@ -4896,10 +5207,10 @@ _LT_EOF
13132 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 13311 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
13133 ;; 13312 ;;
13134 ia64*) 13313 ia64*)
@@ -13141,7 +13320,7 @@ index e993b621ac2..7715af647f4 100644
13141 ;; 13320 ;;
13142 esac 13321 esac
13143 else 13322 else
13144@@ -4916,16 +5231,31 @@ _LT_EOF 13323@@ -4946,16 +5257,31 @@ _LT_EOF
13145 13324
13146 irix5* | irix6* | nonstopux*) 13325 irix5* | irix6* | nonstopux*)
13147 if test "$GCC" = yes; then 13326 if test "$GCC" = yes; then
@@ -13180,7 +13359,7 @@ index e993b621ac2..7715af647f4 100644
13180 else 13359 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' 13360 _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' 13361 _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@@ -5010,7 +5340,7 @@ _LT_EOF 13362@@ -5040,7 +5366,7 @@ _LT_EOF
13184 osf4* | osf5*) # as osf3* with the addition of -msym flag 13363 osf4* | osf5*) # as osf3* with the addition of -msym flag
13185 if test "$GCC" = yes; then 13364 if test "$GCC" = yes; then
13186 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 13365 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -13189,7 +13368,7 @@ index e993b621ac2..7715af647f4 100644
13189 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 13368 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
13190 else 13369 else
13191 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 13370 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
13192@@ -5029,9 +5359,9 @@ _LT_EOF 13371@@ -5059,9 +5385,9 @@ _LT_EOF
13193 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' 13372 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
13194 if test "$GCC" = yes; then 13373 if test "$GCC" = yes; then
13195 wlarc='${wl}' 13374 wlarc='${wl}'
@@ -13201,7 +13380,7 @@ index e993b621ac2..7715af647f4 100644
13201 else 13380 else
13202 case `$CC -V 2>&1` in 13381 case `$CC -V 2>&1` in
13203 *"Compilers 5.0"*) 13382 *"Compilers 5.0"*)
13204@@ -5303,8 +5633,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], 13383@@ -5333,8 +5659,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
13205 to runtime path list]) 13384 to runtime path list])
13206 _LT_TAGDECL([], [link_all_deplibs], [0], 13385 _LT_TAGDECL([], [link_all_deplibs], [0],
13207 [Whether libtool must link a program against all its dependency libraries]) 13386 [Whether libtool must link a program against all its dependency libraries])
@@ -13210,7 +13389,7 @@ index e993b621ac2..7715af647f4 100644
13210 _LT_TAGDECL([], [always_export_symbols], [0], 13389 _LT_TAGDECL([], [always_export_symbols], [0],
13211 [Set to "yes" if exported symbols are required]) 13390 [Set to "yes" if exported symbols are required])
13212 _LT_TAGDECL([], [export_symbols_cmds], [2], 13391 _LT_TAGDECL([], [export_symbols_cmds], [2],
13213@@ -5315,6 +5643,8 @@ _LT_TAGDECL([], [include_expsyms], [1], 13392@@ -5345,6 +5669,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
13214 [Symbols that must always be exported]) 13393 [Symbols that must always be exported])
13215 _LT_TAGDECL([], [prelink_cmds], [2], 13394 _LT_TAGDECL([], [prelink_cmds], [2],
13216 [Commands necessary for linking programs (against libraries) with templates]) 13395 [Commands necessary for linking programs (against libraries) with templates])
@@ -13219,7 +13398,7 @@ index e993b621ac2..7715af647f4 100644
13219 _LT_TAGDECL([], [file_list_spec], [1], 13398 _LT_TAGDECL([], [file_list_spec], [1],
13220 [Specify filename containing input files]) 13399 [Specify filename containing input files])
13221 dnl FIXME: Not yet implemented 13400 dnl FIXME: Not yet implemented
13222@@ -5416,6 +5746,7 @@ CC="$lt_save_CC" 13401@@ -5446,6 +5772,7 @@ CC="$lt_save_CC"
13223 m4_defun([_LT_LANG_CXX_CONFIG], 13402 m4_defun([_LT_LANG_CXX_CONFIG],
13224 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 13403 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
13225 m4_require([_LT_DECL_EGREP])dnl 13404 m4_require([_LT_DECL_EGREP])dnl
@@ -13227,7 +13406,7 @@ index e993b621ac2..7715af647f4 100644
13227 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 13406 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
13228 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 13407 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
13229 (test "X$CXX" != "Xg++"))) ; then 13408 (test "X$CXX" != "Xg++"))) ; then
13230@@ -5477,6 +5808,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13409@@ -5507,6 +5834,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13231 13410
13232 # Allow CC to be a program name with arguments. 13411 # Allow CC to be a program name with arguments.
13233 lt_save_CC=$CC 13412 lt_save_CC=$CC
@@ -13235,7 +13414,7 @@ index e993b621ac2..7715af647f4 100644
13235 lt_save_LD=$LD 13414 lt_save_LD=$LD
13236 lt_save_GCC=$GCC 13415 lt_save_GCC=$GCC
13237 GCC=$GXX 13416 GCC=$GXX
13238@@ -5494,6 +5826,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13417@@ -5524,6 +5852,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13239 fi 13418 fi
13240 test -z "${LDCXX+set}" || LD=$LDCXX 13419 test -z "${LDCXX+set}" || LD=$LDCXX
13241 CC=${CXX-"c++"} 13420 CC=${CXX-"c++"}
@@ -13243,7 +13422,7 @@ index e993b621ac2..7715af647f4 100644
13243 compiler=$CC 13422 compiler=$CC
13244 _LT_TAGVAR(compiler, $1)=$CC 13423 _LT_TAGVAR(compiler, $1)=$CC
13245 _LT_CC_BASENAME([$compiler]) 13424 _LT_CC_BASENAME([$compiler])
13246@@ -5657,7 +5990,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13425@@ -5687,7 +6016,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13247 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 13426 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
13248 # Determine the default libpath from the value encoded in an empty 13427 # Determine the default libpath from the value encoded in an empty
13249 # executable. 13428 # executable.
@@ -13252,7 +13431,7 @@ index e993b621ac2..7715af647f4 100644
13252 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 13431 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13253 13432
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" 13433 _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@@ -5669,7 +6002,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13434@@ -5699,7 +6028,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13256 else 13435 else
13257 # Determine the default libpath from the value encoded in an 13436 # Determine the default libpath from the value encoded in an
13258 # empty executable. 13437 # empty executable.
@@ -13261,7 +13440,7 @@ index e993b621ac2..7715af647f4 100644
13261 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 13440 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
13262 # Warning - without using the other run time loading flags, 13441 # Warning - without using the other run time loading flags,
13263 # -berok will link without error, but may produce a broken library. 13442 # -berok will link without error, but may produce a broken library.
13264@@ -5711,29 +6044,75 @@ if test "$_lt_caught_CXX_error" != yes; then 13443@@ -5741,29 +6070,75 @@ if test "$_lt_caught_CXX_error" != yes; then
13265 ;; 13444 ;;
13266 13445
13267 cygwin* | mingw* | pw32* | cegcc*) 13446 cygwin* | mingw* | pw32* | cegcc*)
@@ -13360,7 +13539,7 @@ index e993b621ac2..7715af647f4 100644
13360 darwin* | rhapsody*) 13539 darwin* | rhapsody*)
13361 _LT_DARWIN_LINKER_FEATURES($1) 13540 _LT_DARWIN_LINKER_FEATURES($1)
13362 ;; 13541 ;;
13363@@ -5808,7 +6187,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13542@@ -5838,7 +6213,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13364 ;; 13543 ;;
13365 *) 13544 *)
13366 if test "$GXX" = yes; then 13545 if test "$GXX" = yes; then
@@ -13369,7 +13548,7 @@ index e993b621ac2..7715af647f4 100644
13369 else 13548 else
13370 # FIXME: insert proper C++ library support 13549 # FIXME: insert proper C++ library support
13371 _LT_TAGVAR(ld_shlibs, $1)=no 13550 _LT_TAGVAR(ld_shlibs, $1)=no
13372@@ -5879,10 +6258,10 @@ if test "$_lt_caught_CXX_error" != yes; then 13551@@ -5909,10 +6284,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' 13552 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
13374 ;; 13553 ;;
13375 ia64*) 13554 ia64*)
@@ -13382,7 +13561,7 @@ index e993b621ac2..7715af647f4 100644
13382 ;; 13561 ;;
13383 esac 13562 esac
13384 fi 13563 fi
13385@@ -5923,9 +6302,9 @@ if test "$_lt_caught_CXX_error" != yes; then 13564@@ -5953,9 +6328,9 @@ if test "$_lt_caught_CXX_error" != yes; then
13386 *) 13565 *)
13387 if test "$GXX" = yes; then 13566 if test "$GXX" = yes; then
13388 if test "$with_gnu_ld" = no; then 13567 if test "$with_gnu_ld" = no; then
@@ -13394,7 +13573,7 @@ index e993b621ac2..7715af647f4 100644
13394 fi 13573 fi
13395 fi 13574 fi
13396 _LT_TAGVAR(link_all_deplibs, $1)=yes 13575 _LT_TAGVAR(link_all_deplibs, $1)=yes
13397@@ -5995,20 +6374,20 @@ if test "$_lt_caught_CXX_error" != yes; then 13576@@ -6025,20 +6400,20 @@ if test "$_lt_caught_CXX_error" != yes; then
13398 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 13577 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
13399 rm -rf $tpldir~ 13578 rm -rf $tpldir~
13400 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 13579 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -13419,7 +13598,7 @@ index e993b621ac2..7715af647f4 100644
13419 ;; 13598 ;;
13420 *) # Version 6 and above use weak symbols 13599 *) # 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' 13600 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
13422@@ -6203,7 +6582,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13601@@ -6233,7 +6608,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' 13602 _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 ;; 13603 ;;
13425 *) 13604 *)
@@ -13428,7 +13607,7 @@ index e993b621ac2..7715af647f4 100644
13428 ;; 13607 ;;
13429 esac 13608 esac
13430 13609
13431@@ -6249,7 +6628,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13610@@ -6279,7 +6654,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13432 13611
13433 solaris*) 13612 solaris*)
13434 case $cc_basename in 13613 case $cc_basename in
@@ -13437,7 +13616,7 @@ index e993b621ac2..7715af647f4 100644
13437 # Sun C++ 4.2, 5.x and Centerline C++ 13616 # Sun C++ 4.2, 5.x and Centerline C++
13438 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 13617 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
13439 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 13618 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
13440@@ -6290,9 +6669,9 @@ if test "$_lt_caught_CXX_error" != yes; then 13619@@ -6320,9 +6695,9 @@ if test "$_lt_caught_CXX_error" != yes; then
13441 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 13620 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
13442 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 13621 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
13443 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 13622 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -13449,7 +13628,7 @@ index e993b621ac2..7715af647f4 100644
13449 13628
13450 # Commands to make compiler produce verbose output that lists 13629 # Commands to make compiler produce verbose output that lists
13451 # what "hidden" libraries, object files and flags are used when 13630 # what "hidden" libraries, object files and flags are used when
13452@@ -6421,6 +6800,7 @@ if test "$_lt_caught_CXX_error" != yes; then 13631@@ -6451,6 +6826,7 @@ if test "$_lt_caught_CXX_error" != yes; then
13453 fi # test -n "$compiler" 13632 fi # test -n "$compiler"
13454 13633
13455 CC=$lt_save_CC 13634 CC=$lt_save_CC
@@ -13457,7 +13636,7 @@ index e993b621ac2..7715af647f4 100644
13457 LDCXX=$LD 13636 LDCXX=$LD
13458 LD=$lt_save_LD 13637 LD=$lt_save_LD
13459 GCC=$lt_save_GCC 13638 GCC=$lt_save_GCC
13460@@ -6435,6 +6815,29 @@ AC_LANG_POP 13639@@ -6465,6 +6841,29 @@ AC_LANG_POP
13461 ])# _LT_LANG_CXX_CONFIG 13640 ])# _LT_LANG_CXX_CONFIG
13462 13641
13463 13642
@@ -13487,7 +13666,7 @@ index e993b621ac2..7715af647f4 100644
13487 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) 13666 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
13488 # --------------------------------- 13667 # ---------------------------------
13489 # Figure out "hidden" library dependencies from verbose 13668 # Figure out "hidden" library dependencies from verbose
13490@@ -6443,6 +6846,7 @@ AC_LANG_POP 13669@@ -6473,6 +6872,7 @@ AC_LANG_POP
13491 # objects, libraries and library flags. 13670 # objects, libraries and library flags.
13492 m4_defun([_LT_SYS_HIDDEN_LIBDEPS], 13671 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
13493 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 13672 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -13495,7 +13674,7 @@ index e993b621ac2..7715af647f4 100644
13495 # Dependencies to place before and after the object being linked: 13674 # Dependencies to place before and after the object being linked:
13496 _LT_TAGVAR(predep_objects, $1)= 13675 _LT_TAGVAR(predep_objects, $1)=
13497 _LT_TAGVAR(postdep_objects, $1)= 13676 _LT_TAGVAR(postdep_objects, $1)=
13498@@ -6493,6 +6897,13 @@ public class foo { 13677@@ -6523,6 +6923,13 @@ public class foo {
13499 }; 13678 };
13500 _LT_EOF 13679 _LT_EOF
13501 ]) 13680 ])
@@ -13509,7 +13688,7 @@ index e993b621ac2..7715af647f4 100644
13509 dnl Parse the compiler output and extract the necessary 13688 dnl Parse the compiler output and extract the necessary
13510 dnl objects, libraries and library flags. 13689 dnl objects, libraries and library flags.
13511 if AC_TRY_EVAL(ac_compile); then 13690 if AC_TRY_EVAL(ac_compile); then
13512@@ -6504,7 +6915,7 @@ if AC_TRY_EVAL(ac_compile); then 13691@@ -6534,7 +6941,7 @@ if AC_TRY_EVAL(ac_compile); then
13513 pre_test_object_deps_done=no 13692 pre_test_object_deps_done=no
13514 13693
13515 for p in `eval "$output_verbose_link_cmd"`; do 13694 for p in `eval "$output_verbose_link_cmd"`; do
@@ -13518,7 +13697,7 @@ index e993b621ac2..7715af647f4 100644
13518 13697
13519 -L* | -R* | -l*) 13698 -L* | -R* | -l*)
13520 # Some compilers place space between "-{L,R}" and the path. 13699 # Some compilers place space between "-{L,R}" and the path.
13521@@ -6513,13 +6924,22 @@ if AC_TRY_EVAL(ac_compile); then 13700@@ -6543,13 +6950,22 @@ if AC_TRY_EVAL(ac_compile); then
13522 test $p = "-R"; then 13701 test $p = "-R"; then
13523 prev=$p 13702 prev=$p
13524 continue 13703 continue
@@ -13545,7 +13724,7 @@ index e993b621ac2..7715af647f4 100644
13545 # Internal compiler library paths should come after those 13724 # Internal compiler library paths should come after those
13546 # provided the user. The postdeps already come after the 13725 # provided the user. The postdeps already come after the
13547 # user supplied libs so there is no need to process them. 13726 # user supplied libs so there is no need to process them.
13548@@ -6539,8 +6959,10 @@ if AC_TRY_EVAL(ac_compile); then 13727@@ -6569,8 +6985,10 @@ if AC_TRY_EVAL(ac_compile); then
13549 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" 13728 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
13550 fi 13729 fi
13551 fi 13730 fi
@@ -13556,7 +13735,7 @@ index e993b621ac2..7715af647f4 100644
13556 *.$objext) 13735 *.$objext)
13557 # This assumes that the test object file only shows up 13736 # This assumes that the test object file only shows up
13558 # once in the compiler output. 13737 # once in the compiler output.
13559@@ -6576,6 +6998,7 @@ else 13738@@ -6606,6 +7024,7 @@ else
13560 fi 13739 fi
13561 13740
13562 $RM -f confest.$objext 13741 $RM -f confest.$objext
@@ -13564,7 +13743,7 @@ index e993b621ac2..7715af647f4 100644
13564 13743
13565 # PORTME: override above test on systems where it is broken 13744 # PORTME: override above test on systems where it is broken
13566 m4_if([$1], [CXX], 13745 m4_if([$1], [CXX],
13567@@ -6612,7 +7035,7 @@ linux*) 13746@@ -6642,7 +7061,7 @@ linux*)
13568 13747
13569 solaris*) 13748 solaris*)
13570 case $cc_basename in 13749 case $cc_basename in
@@ -13573,7 +13752,7 @@ index e993b621ac2..7715af647f4 100644
13573 # The more standards-conforming stlport4 library is 13752 # The more standards-conforming stlport4 library is
13574 # incompatible with the Cstd library. Avoid specifying 13753 # incompatible with the Cstd library. Avoid specifying
13575 # it if it's in CXXFLAGS. Ignore libCrun as 13754 # it if it's in CXXFLAGS. Ignore libCrun as
13576@@ -6725,7 +7148,9 @@ if test "$_lt_disable_F77" != yes; then 13755@@ -6755,7 +7174,9 @@ if test "$_lt_disable_F77" != yes; then
13577 # Allow CC to be a program name with arguments. 13756 # Allow CC to be a program name with arguments.
13578 lt_save_CC="$CC" 13757 lt_save_CC="$CC"
13579 lt_save_GCC=$GCC 13758 lt_save_GCC=$GCC
@@ -13583,7 +13762,7 @@ index e993b621ac2..7715af647f4 100644
13583 compiler=$CC 13762 compiler=$CC
13584 _LT_TAGVAR(compiler, $1)=$CC 13763 _LT_TAGVAR(compiler, $1)=$CC
13585 _LT_CC_BASENAME([$compiler]) 13764 _LT_CC_BASENAME([$compiler])
13586@@ -6779,6 +7204,7 @@ if test "$_lt_disable_F77" != yes; then 13765@@ -6809,6 +7230,7 @@ if test "$_lt_disable_F77" != yes; then
13587 13766
13588 GCC=$lt_save_GCC 13767 GCC=$lt_save_GCC
13589 CC="$lt_save_CC" 13768 CC="$lt_save_CC"
@@ -13591,7 +13770,7 @@ index e993b621ac2..7715af647f4 100644
13591 fi # test "$_lt_disable_F77" != yes 13770 fi # test "$_lt_disable_F77" != yes
13592 13771
13593 AC_LANG_POP 13772 AC_LANG_POP
13594@@ -6855,7 +7281,9 @@ if test "$_lt_disable_FC" != yes; then 13773@@ -6885,7 +7307,9 @@ if test "$_lt_disable_FC" != yes; then
13595 # Allow CC to be a program name with arguments. 13774 # Allow CC to be a program name with arguments.
13596 lt_save_CC="$CC" 13775 lt_save_CC="$CC"
13597 lt_save_GCC=$GCC 13776 lt_save_GCC=$GCC
@@ -13601,7 +13780,7 @@ index e993b621ac2..7715af647f4 100644
13601 compiler=$CC 13780 compiler=$CC
13602 GCC=$ac_cv_fc_compiler_gnu 13781 GCC=$ac_cv_fc_compiler_gnu
13603 13782
13604@@ -6911,7 +7339,8 @@ if test "$_lt_disable_FC" != yes; then 13783@@ -6941,7 +7365,8 @@ if test "$_lt_disable_FC" != yes; then
13605 fi # test -n "$compiler" 13784 fi # test -n "$compiler"
13606 13785
13607 GCC=$lt_save_GCC 13786 GCC=$lt_save_GCC
@@ -13611,7 +13790,7 @@ index e993b621ac2..7715af647f4 100644
13611 fi # test "$_lt_disable_FC" != yes 13790 fi # test "$_lt_disable_FC" != yes
13612 13791
13613 AC_LANG_POP 13792 AC_LANG_POP
13614@@ -6948,10 +7377,12 @@ _LT_COMPILER_BOILERPLATE 13793@@ -6978,10 +7403,12 @@ _LT_COMPILER_BOILERPLATE
13615 _LT_LINKER_BOILERPLATE 13794 _LT_LINKER_BOILERPLATE
13616 13795
13617 # Allow CC to be a program name with arguments. 13796 # Allow CC to be a program name with arguments.
@@ -13625,7 +13804,7 @@ index e993b621ac2..7715af647f4 100644
13625 compiler=$CC 13804 compiler=$CC
13626 _LT_TAGVAR(compiler, $1)=$CC 13805 _LT_TAGVAR(compiler, $1)=$CC
13627 _LT_TAGVAR(LD, $1)="$LD" 13806 _LT_TAGVAR(LD, $1)="$LD"
13628@@ -6982,7 +7413,8 @@ fi 13807@@ -7012,7 +7439,8 @@ fi
13629 AC_LANG_RESTORE 13808 AC_LANG_RESTORE
13630 13809
13631 GCC=$lt_save_GCC 13810 GCC=$lt_save_GCC
@@ -13635,7 +13814,7 @@ index e993b621ac2..7715af647f4 100644
13635 ])# _LT_LANG_GCJ_CONFIG 13814 ])# _LT_LANG_GCJ_CONFIG
13636 13815
13637 13816
13638@@ -7017,9 +7449,11 @@ _LT_LINKER_BOILERPLATE 13817@@ -7047,9 +7475,11 @@ _LT_LINKER_BOILERPLATE
13639 13818
13640 # Allow CC to be a program name with arguments. 13819 # Allow CC to be a program name with arguments.
13641 lt_save_CC="$CC" 13820 lt_save_CC="$CC"
@@ -13647,7 +13826,7 @@ index e993b621ac2..7715af647f4 100644
13647 compiler=$CC 13826 compiler=$CC
13648 _LT_TAGVAR(compiler, $1)=$CC 13827 _LT_TAGVAR(compiler, $1)=$CC
13649 _LT_CC_BASENAME([$compiler]) 13828 _LT_CC_BASENAME([$compiler])
13650@@ -7032,7 +7466,8 @@ fi 13829@@ -7062,7 +7492,8 @@ fi
13651 13830
13652 GCC=$lt_save_GCC 13831 GCC=$lt_save_GCC
13653 AC_LANG_RESTORE 13832 AC_LANG_RESTORE
@@ -13657,7 +13836,7 @@ index e993b621ac2..7715af647f4 100644
13657 ])# _LT_LANG_RC_CONFIG 13836 ])# _LT_LANG_RC_CONFIG
13658 13837
13659 13838
13660@@ -7091,6 +7526,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 13839@@ -7121,6 +7552,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
13661 AC_SUBST([OBJDUMP]) 13840 AC_SUBST([OBJDUMP])
13662 ]) 13841 ])
13663 13842
@@ -13673,7 +13852,7 @@ index e993b621ac2..7715af647f4 100644
13673 13852
13674 # _LT_DECL_SED 13853 # _LT_DECL_SED
13675 # ------------ 13854 # ------------
13676@@ -7184,8 +7628,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], 13855@@ -7214,8 +7654,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
13677 # Try some XSI features 13856 # Try some XSI features
13678 xsi_shell=no 13857 xsi_shell=no
13679 ( _lt_dummy="a/b/c" 13858 ( _lt_dummy="a/b/c"
@@ -13684,7 +13863,7 @@ index e993b621ac2..7715af647f4 100644
13684 && eval 'test $(( 1 + 1 )) -eq 2 \ 13863 && eval 'test $(( 1 + 1 )) -eq 2 \
13685 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 13864 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
13686 && xsi_shell=yes 13865 && xsi_shell=yes
13687@@ -7224,206 +7668,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 13866@@ -7254,206 +7694,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
13688 ])# _LT_CHECK_SHELL_FEATURES 13867 ])# _LT_CHECK_SHELL_FEATURES
13689 13868
13690 13869
@@ -19318,7 +19497,7 @@ index bf92b5e0790..c573da90c5c 100644
19318 # These exist entirely to fool aclocal when bootstrapping libtool. 19497 # These exist entirely to fool aclocal when bootstrapping libtool.
19319 # 19498 #
19320diff --git a/opcodes/configure b/opcodes/configure 19499diff --git a/opcodes/configure b/opcodes/configure
19321index dca94db9c3f..26dcc4b82dd 100755 19500index 3513e408ce1..133948631e9 100755
19322--- a/opcodes/configure 19501--- a/opcodes/configure
19323+++ b/opcodes/configure 19502+++ b/opcodes/configure
19324@@ -680,6 +680,9 @@ OTOOL 19503@@ -680,6 +680,9 @@ OTOOL
@@ -19337,9 +19516,9 @@ index dca94db9c3f..26dcc4b82dd 100755
19337 with_gnu_ld 19516 with_gnu_ld
19338+with_libtool_sysroot 19517+with_libtool_sysroot
19339 enable_libtool_lock 19518 enable_libtool_lock
19519 enable_checking
19340 enable_targets 19520 enable_targets
19341 enable_werror 19521@@ -1464,6 +1468,8 @@ Optional Packages:
19342@@ -1462,6 +1466,8 @@ Optional Packages:
19343 --with-pic try to use only PIC/non-PIC objects [default=use 19522 --with-pic try to use only PIC/non-PIC objects [default=use
19344 both] 19523 both]
19345 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 19524 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -19348,7 +19527,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19348 19527
19349 Some influential environment variables: 19528 Some influential environment variables:
19350 CC C compiler command 19529 CC C compiler command
19351@@ -5403,8 +5409,8 @@ esac 19530@@ -4751,8 +4757,8 @@ esac
19352 19531
19353 19532
19354 19533
@@ -19359,7 +19538,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19359 19538
19360 19539
19361 19540
19362@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 19541@@ -4792,7 +4798,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19363 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 19542 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19364 $as_echo_n "checking how to print strings... " >&6; } 19543 $as_echo_n "checking how to print strings... " >&6; }
19365 # Test print first, because it will be a builtin if present. 19544 # Test print first, because it will be a builtin if present.
@@ -19368,7 +19547,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19368 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 19547 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19369 ECHO='print -r --' 19548 ECHO='print -r --'
19370 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 19549 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19371@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 19550@@ -5478,8 +5484,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19372 # Try some XSI features 19551 # Try some XSI features
19373 xsi_shell=no 19552 xsi_shell=no
19374 ( _lt_dummy="a/b/c" 19553 ( _lt_dummy="a/b/c"
@@ -19379,7 +19558,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19379 && eval 'test $(( 1 + 1 )) -eq 2 \ 19558 && eval 'test $(( 1 + 1 )) -eq 2 \
19380 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 19559 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19381 && xsi_shell=yes 19560 && xsi_shell=yes
19382@@ -6180,6 +6186,80 @@ esac 19561@@ -5528,6 +5534,80 @@ esac
19383 19562
19384 19563
19385 19564
@@ -19460,7 +19639,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 19639 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19461 $as_echo_n "checking for $LD option to reload object files... " >&6; } 19640 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19462 if ${lt_cv_ld_reload_flag+:} false; then : 19641 if ${lt_cv_ld_reload_flag+:} false; then :
19463@@ -6196,6 +6276,11 @@ case $reload_flag in 19642@@ -5544,6 +5624,11 @@ case $reload_flag in
19464 esac 19643 esac
19465 reload_cmds='$LD$reload_flag -o $output$reload_objs' 19644 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19466 case $host_os in 19645 case $host_os in
@@ -19472,7 +19651,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19472 darwin*) 19651 darwin*)
19473 if test "$GCC" = yes; then 19652 if test "$GCC" = yes; then
19474 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 19653 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19475@@ -6364,7 +6449,8 @@ mingw* | pw32*) 19654@@ -5712,7 +5797,8 @@ mingw* | pw32*)
19476 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 19655 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19477 lt_cv_file_magic_cmd='func_win32_libid' 19656 lt_cv_file_magic_cmd='func_win32_libid'
19478 else 19657 else
@@ -19482,7 +19661,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19482 lt_cv_file_magic_cmd='$OBJDUMP -f' 19661 lt_cv_file_magic_cmd='$OBJDUMP -f'
19483 fi 19662 fi
19484 ;; 19663 ;;
19485@@ -6518,6 +6604,21 @@ esac 19664@@ -5866,6 +5952,21 @@ esac
19486 fi 19665 fi
19487 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 19666 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19488 $as_echo "$lt_cv_deplibs_check_method" >&6; } 19667 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -19504,7 +19683,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19504 file_magic_cmd=$lt_cv_file_magic_cmd 19683 file_magic_cmd=$lt_cv_file_magic_cmd
19505 deplibs_check_method=$lt_cv_deplibs_check_method 19684 deplibs_check_method=$lt_cv_deplibs_check_method
19506 test -z "$deplibs_check_method" && deplibs_check_method=unknown 19685 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19507@@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 19686@@ -5881,6 +5982,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19508 19687
19509 19688
19510 19689
@@ -19518,11 +19697,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19518+ 19697+
19519+ 19698+
19520+ 19699+
19521 19700+if test -n "$ac_tool_prefix"; then
19522
19523 if test -n "$ac_tool_prefix"; then
19524- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19525-set dummy ${ac_tool_prefix}ar; ac_word=$2
19526+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 19701+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
19527+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 19702+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
19528+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19703+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -19663,7 +19838,15 @@ index dca94db9c3f..26dcc4b82dd 100755
19663+ 19838+
19664+ 19839+
19665+ 19840+
19666+if test -n "$ac_tool_prefix"; then 19841 plugin_option=
19842 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
19843 for plugin in $plugin_names; do
19844@@ -5895,8 +6147,10 @@ for plugin in $plugin_names; do
19845 done
19846
19847 if test -n "$ac_tool_prefix"; then
19848- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19849-set dummy ${ac_tool_prefix}ar; ac_word=$2
19667+ for ac_prog in ar 19850+ for ac_prog in ar
19668+ do 19851+ do
19669+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 19852+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -19671,7 +19854,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19671 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19672 $as_echo_n "checking for $ac_word... " >&6; } 19855 $as_echo_n "checking for $ac_word... " >&6; }
19673 if ${ac_cv_prog_AR+:} false; then : 19856 if ${ac_cv_prog_AR+:} false; then :
19674@@ -6551,7 +6805,7 @@ do 19857@@ -5912,7 +6166,7 @@ do
19675 test -z "$as_dir" && as_dir=. 19858 test -z "$as_dir" && as_dir=.
19676 for ac_exec_ext in '' $ac_executable_extensions; do 19859 for ac_exec_ext in '' $ac_executable_extensions; do
19677 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 19860 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -19680,7 +19863,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19680 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19863 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19681 break 2 19864 break 2
19682 fi 19865 fi
19683@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } 19866@@ -5932,11 +6186,15 @@ $as_echo "no" >&6; }
19684 fi 19867 fi
19685 19868
19686 19869
@@ -19699,7 +19882,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19699 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19882 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19700 $as_echo_n "checking for $ac_word... " >&6; } 19883 $as_echo_n "checking for $ac_word... " >&6; }
19701 if ${ac_cv_prog_ac_ct_AR+:} false; then : 19884 if ${ac_cv_prog_ac_ct_AR+:} false; then :
19702@@ -6591,7 +6849,7 @@ do 19885@@ -5952,7 +6210,7 @@ do
19703 test -z "$as_dir" && as_dir=. 19886 test -z "$as_dir" && as_dir=.
19704 for ac_exec_ext in '' $ac_executable_extensions; do 19887 for ac_exec_ext in '' $ac_executable_extensions; do
19705 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 19888 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -19708,7 +19891,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19708 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19891 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19709 break 2 19892 break 2
19710 fi 19893 fi
19711@@ -6610,6 +6868,10 @@ else 19894@@ -5971,6 +6229,10 @@ else
19712 $as_echo "no" >&6; } 19895 $as_echo "no" >&6; }
19713 fi 19896 fi
19714 19897
@@ -19719,7 +19902,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19719 if test "x$ac_ct_AR" = x; then 19902 if test "x$ac_ct_AR" = x; then
19720 AR="false" 19903 AR="false"
19721 else 19904 else
19722@@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; 19905@@ -5982,25 +6244,20 @@ ac_tool_warned=yes ;;
19723 esac 19906 esac
19724 AR=$ac_ct_AR 19907 AR=$ac_ct_AR
19725 fi 19908 fi
@@ -19728,20 +19911,37 @@ index dca94db9c3f..26dcc4b82dd 100755
19728 fi 19911 fi
19729 19912
19730-test -z "$AR" && AR=ar 19913-test -z "$AR" && AR=ar
19914-if test -n "$plugin_option"; then
19915- if $AR --help 2>&1 | grep -q "\--plugin"; then
19916- touch conftest.c
19917- $AR $plugin_option rc conftest.a conftest.c
19918- if test "$?" != 0; then
19919- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
19920+ touch conftest.c
19921+ $AR $plugin_option rc conftest.a conftest.c
19922+ if test "$?" != 0; then
19923+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
19924 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
19925- else
19926- AR="$AR $plugin_option"
19927- fi
19928- rm -f conftest.*
19929+ else
19930+ AR="$AR $plugin_option"
19931 fi
19932-fi
19731-test -z "$AR_FLAGS" && AR_FLAGS=cru 19933-test -z "$AR_FLAGS" && AR_FLAGS=cru
19934+ rm -f conftest.*
19732+: ${AR=ar} 19935+: ${AR=ar}
19733+: ${AR_FLAGS=cru} 19936+: ${AR_FLAGS=cru}
19734+ 19937+
19735+ 19938
19736+ 19939
19737+ 19940
19738+ 19941@@ -6011,6 +6268,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
19739+ 19942
19740+ 19943
19741+ 19944
19742+
19743+
19744+
19745+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 19945+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19746+$as_echo_n "checking for archiver @FILE support... " >&6; } 19946+$as_echo_n "checking for archiver @FILE support... " >&6; }
19747+if ${lt_cv_ar_at_file+:} false; then : 19947+if ${lt_cv_ar_at_file+:} false; then :
@@ -19754,7 +19954,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19754+int 19954+int
19755+main () 19955+main ()
19756+{ 19956+{
19757 19957+
19758+ ; 19958+ ;
19759+ return 0; 19959+ return 0;
19760+} 19960+}
@@ -19780,23 +19980,29 @@ index dca94db9c3f..26dcc4b82dd 100755
19780+ fi 19980+ fi
19781+ fi 19981+ fi
19782+ rm -f conftest.* libconftest.a 19982+ rm -f conftest.* libconftest.a
19783 19983+
19784+fi 19984+fi
19785+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 19985+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19786 19986+
19787+fi 19987+fi
19788+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 19988+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19789+$as_echo "$lt_cv_ar_at_file" >&6; } 19989+$as_echo "$lt_cv_ar_at_file" >&6; }
19790 19990+
19791+if test "x$lt_cv_ar_at_file" = xno; then 19991+if test "x$lt_cv_ar_at_file" = xno; then
19792+ archiver_list_spec= 19992+ archiver_list_spec=
19793+else 19993+else
19794+ archiver_list_spec=$lt_cv_ar_at_file 19994+ archiver_list_spec=$lt_cv_ar_at_file
19795+fi 19995+fi
19996+
19997+
19998+
19999+
20000+
20001+
19796 20002
19797 20003 if test -n "$ac_tool_prefix"; then
19798 20004 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
19799@@ -6972,8 +7290,8 @@ esac 20005@@ -6351,8 +6665,8 @@ esac
19800 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 20006 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19801 20007
19802 # Transform an extracted symbol line into symbol name and symbol address 20008 # Transform an extracted symbol line into symbol name and symbol address
@@ -19807,7 +20013,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19807 20013
19808 # Handle CRLF in mingw tool chain 20014 # Handle CRLF in mingw tool chain
19809 opt_cr= 20015 opt_cr=
19810@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do 20016@@ -6388,6 +6702,7 @@ for ac_symprfx in "" "_"; do
19811 else 20017 else
19812 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 20018 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19813 fi 20019 fi
@@ -19815,7 +20021,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19815 20021
19816 # Check to see that the pipe works correctly. 20022 # Check to see that the pipe works correctly.
19817 pipe_works=no 20023 pipe_works=no
19818@@ -7050,6 +7369,18 @@ _LT_EOF 20024@@ -6429,6 +6744,18 @@ _LT_EOF
19819 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 20025 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19820 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 20026 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19821 cat <<_LT_EOF > conftest.$ac_ext 20027 cat <<_LT_EOF > conftest.$ac_ext
@@ -19834,7 +20040,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19834 #ifdef __cplusplus 20040 #ifdef __cplusplus
19835 extern "C" { 20041 extern "C" {
19836 #endif 20042 #endif
19837@@ -7061,7 +7392,7 @@ _LT_EOF 20043@@ -6440,7 +6767,7 @@ _LT_EOF
19838 cat <<_LT_EOF >> conftest.$ac_ext 20044 cat <<_LT_EOF >> conftest.$ac_ext
19839 20045
19840 /* The mapping between symbol names and symbols. */ 20046 /* The mapping between symbol names and symbols. */
@@ -19843,7 +20049,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19843 const char *name; 20049 const char *name;
19844 void *address; 20050 void *address;
19845 } 20051 }
19846@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { 20052@@ -6466,8 +6793,8 @@ static const void *lt_preloaded_setup() {
19847 _LT_EOF 20053 _LT_EOF
19848 # Now try linking the two files. 20054 # Now try linking the two files.
19849 mv conftest.$ac_objext conftstm.$ac_objext 20055 mv conftest.$ac_objext conftstm.$ac_objext
@@ -19854,7 +20060,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19854 LIBS="conftstm.$ac_objext" 20060 LIBS="conftstm.$ac_objext"
19855 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 20061 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19856 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 20062 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19857@@ -7098,8 +7429,8 @@ _LT_EOF 20063@@ -6477,8 +6804,8 @@ _LT_EOF
19858 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 20064 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19859 pipe_works=yes 20065 pipe_works=yes
19860 fi 20066 fi
@@ -19865,7 +20071,7 @@ index dca94db9c3f..26dcc4b82dd 100755
19865 else 20071 else
19866 echo "cannot find nm_test_func in $nlist" >&5 20072 echo "cannot find nm_test_func in $nlist" >&5
19867 fi 20073 fi
19868@@ -7136,6 +7467,16 @@ else 20074@@ -6515,6 +6842,14 @@ else
19869 $as_echo "ok" >&6; } 20075 $as_echo "ok" >&6; }
19870 fi 20076 fi
19871 20077
@@ -19877,12 +20083,10 @@ index dca94db9c3f..26dcc4b82dd 100755
19877+fi 20083+fi
19878+ 20084+
19879+ 20085+
19880+
19881+
19882 20086
19883 20087
19884 20088
19885@@ -7152,6 +7493,45 @@ fi 20089@@ -6533,6 +6868,47 @@ fi
19886 20090
19887 20091
19888 20092
@@ -19925,10 +20129,12 @@ index dca94db9c3f..26dcc4b82dd 100755
19925+ 20129+
19926+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 20130+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19927+$as_echo "${lt_sysroot:-no}" >&6; } 20131+$as_echo "${lt_sysroot:-no}" >&6; }
20132+
20133+
19928 20134
19929 20135
19930 20136
19931@@ -7363,6 +7743,123 @@ esac 20137@@ -6742,6 +7118,123 @@ esac
19932 20138
19933 need_locks="$enable_libtool_lock" 20139 need_locks="$enable_libtool_lock"
19934 20140
@@ -20052,7 +20258,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20052 20258
20053 case $host_os in 20259 case $host_os in
20054 rhapsody* | darwin*) 20260 rhapsody* | darwin*)
20055@@ -7926,6 +8423,8 @@ _LT_EOF 20261@@ -7305,6 +7798,8 @@ _LT_EOF
20056 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 20262 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
20057 echo "$AR cru libconftest.a conftest.o" >&5 20263 echo "$AR cru libconftest.a conftest.o" >&5
20058 $AR cru libconftest.a conftest.o 2>&5 20264 $AR cru libconftest.a conftest.o 2>&5
@@ -20061,7 +20267,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20061 cat > conftest.c << _LT_EOF 20267 cat > conftest.c << _LT_EOF
20062 int main() { return 0;} 20268 int main() { return 0;}
20063 _LT_EOF 20269 _LT_EOF
20064@@ -8091,7 +8590,8 @@ fi 20270@@ -7470,7 +7965,8 @@ fi
20065 LIBTOOL_DEPS="$ltmain" 20271 LIBTOOL_DEPS="$ltmain"
20066 20272
20067 # Always use our own libtool. 20273 # Always use our own libtool.
@@ -20071,7 +20277,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20071 20277
20072 20278
20073 20279
20074@@ -8180,7 +8680,7 @@ aix3*) 20280@@ -7559,7 +8055,7 @@ aix3*)
20075 esac 20281 esac
20076 20282
20077 # Global variables: 20283 # Global variables:
@@ -20080,7 +20286,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20080 can_build_shared=yes 20286 can_build_shared=yes
20081 20287
20082 # All known linkers require a `.a' archive for static linking (except MSVC, 20288 # All known linkers require a `.a' archive for static linking (except MSVC,
20083@@ -8478,8 +8978,6 @@ fi 20289@@ -7857,8 +8353,6 @@ fi
20084 lt_prog_compiler_pic= 20290 lt_prog_compiler_pic=
20085 lt_prog_compiler_static= 20291 lt_prog_compiler_static=
20086 20292
@@ -20089,7 +20295,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20089 20295
20090 if test "$GCC" = yes; then 20296 if test "$GCC" = yes; then
20091 lt_prog_compiler_wl='-Wl,' 20297 lt_prog_compiler_wl='-Wl,'
20092@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20298@@ -8024,6 +8518,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20093 lt_prog_compiler_pic='--shared' 20299 lt_prog_compiler_pic='--shared'
20094 lt_prog_compiler_static='--static' 20300 lt_prog_compiler_static='--static'
20095 ;; 20301 ;;
@@ -20102,7 +20308,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20102 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 20308 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20103 # Portland Group compilers (*not* the Pentium gcc compiler, 20309 # Portland Group compilers (*not* the Pentium gcc compiler,
20104 # which looks to be a dead project) 20310 # which looks to be a dead project)
20105@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20311@@ -8086,7 +8586,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20106 lt_prog_compiler_pic='-KPIC' 20312 lt_prog_compiler_pic='-KPIC'
20107 lt_prog_compiler_static='-Bstatic' 20313 lt_prog_compiler_static='-Bstatic'
20108 case $cc_basename in 20314 case $cc_basename in
@@ -20111,7 +20317,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20111 lt_prog_compiler_wl='-Qoption ld ';; 20317 lt_prog_compiler_wl='-Qoption ld ';;
20112 *) 20318 *)
20113 lt_prog_compiler_wl='-Wl,';; 20319 lt_prog_compiler_wl='-Wl,';;
20114@@ -8764,13 +9268,17 @@ case $host_os in 20320@@ -8143,13 +8643,17 @@ case $host_os in
20115 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 20321 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20116 ;; 20322 ;;
20117 esac 20323 esac
@@ -20135,7 +20341,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20135 20341
20136 # 20342 #
20137 # Check to make sure the PIC flag actually works. 20343 # Check to make sure the PIC flag actually works.
20138@@ -8831,6 +9339,11 @@ fi 20344@@ -8210,6 +8714,11 @@ fi
20139 20345
20140 20346
20141 20347
@@ -20147,7 +20353,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20147 # 20353 #
20148 # Check to make sure the static flag actually works. 20354 # Check to make sure the static flag actually works.
20149 # 20355 #
20150@@ -9181,7 +9694,8 @@ _LT_EOF 20356@@ -8560,7 +9069,8 @@ _LT_EOF
20151 allow_undefined_flag=unsupported 20357 allow_undefined_flag=unsupported
20152 always_export_symbols=no 20358 always_export_symbols=no
20153 enable_shared_with_static_runtimes=yes 20359 enable_shared_with_static_runtimes=yes
@@ -20157,7 +20363,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20157 20363
20158 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 20364 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20159 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 20365 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20160@@ -9280,12 +9794,12 @@ _LT_EOF 20366@@ -8659,12 +9169,12 @@ _LT_EOF
20161 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 20367 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20162 hardcode_libdir_flag_spec= 20368 hardcode_libdir_flag_spec=
20163 hardcode_libdir_flag_spec_ld='-rpath $libdir' 20369 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -20172,7 +20378,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20172 fi 20378 fi
20173 ;; 20379 ;;
20174 esac 20380 esac
20175@@ -9299,8 +9813,8 @@ _LT_EOF 20381@@ -8678,8 +9188,8 @@ _LT_EOF
20176 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 20382 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20177 wlarc= 20383 wlarc=
20178 else 20384 else
@@ -20183,7 +20389,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20183 fi 20389 fi
20184 ;; 20390 ;;
20185 20391
20186@@ -9318,8 +9832,8 @@ _LT_EOF 20392@@ -8697,8 +9207,8 @@ _LT_EOF
20187 20393
20188 _LT_EOF 20394 _LT_EOF
20189 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 20395 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -20194,7 +20400,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20194 else 20400 else
20195 ld_shlibs=no 20401 ld_shlibs=no
20196 fi 20402 fi
20197@@ -9365,8 +9879,8 @@ _LT_EOF 20403@@ -8744,8 +9254,8 @@ _LT_EOF
20198 20404
20199 *) 20405 *)
20200 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 20406 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -20205,7 +20411,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20205 else 20411 else
20206 ld_shlibs=no 20412 ld_shlibs=no
20207 fi 20413 fi
20208@@ -9496,7 +10010,13 @@ _LT_EOF 20414@@ -8875,7 +9385,13 @@ _LT_EOF
20209 allow_undefined_flag='-berok' 20415 allow_undefined_flag='-berok'
20210 # Determine the default libpath from the value encoded in an 20416 # Determine the default libpath from the value encoded in an
20211 # empty executable. 20417 # empty executable.
@@ -20220,7 +20426,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20220 /* end confdefs.h. */ 20426 /* end confdefs.h. */
20221 20427
20222 int 20428 int
20223@@ -9509,22 +10029,29 @@ main () 20429@@ -8888,22 +9404,29 @@ main ()
20224 _ACEOF 20430 _ACEOF
20225 if ac_fn_c_try_link "$LINENO"; then : 20431 if ac_fn_c_try_link "$LINENO"; then :
20226 20432
@@ -20263,7 +20469,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20263 20469
20264 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 20470 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20265 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" 20471 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"
20266@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20472@@ -8915,7 +9438,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20267 else 20473 else
20268 # Determine the default libpath from the value encoded in an 20474 # Determine the default libpath from the value encoded in an
20269 # empty executable. 20475 # empty executable.
@@ -20278,7 +20484,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20278 /* end confdefs.h. */ 20484 /* end confdefs.h. */
20279 20485
20280 int 20486 int
20281@@ -9549,22 +10082,29 @@ main () 20487@@ -8928,22 +9457,29 @@ main ()
20282 _ACEOF 20488 _ACEOF
20283 if ac_fn_c_try_link "$LINENO"; then : 20489 if ac_fn_c_try_link "$LINENO"; then :
20284 20490
@@ -20321,7 +20527,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20321 20527
20322 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 20528 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20323 # Warning - without using the other run time loading flags, 20529 # Warning - without using the other run time loading flags,
20324@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20530@@ -8988,20 +9524,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20325 # Microsoft Visual C++. 20531 # Microsoft Visual C++.
20326 # hardcode_libdir_flag_spec is actually meaningless, as there is 20532 # hardcode_libdir_flag_spec is actually meaningless, as there is
20327 # no search path for DLLs. 20533 # no search path for DLLs.
@@ -20399,7 +20605,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20399 ;; 20605 ;;
20400 20606
20401 darwin* | rhapsody*) 20607 darwin* | rhapsody*)
20402@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20608@@ -9062,7 +9641,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20403 20609
20404 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 20610 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20405 freebsd* | dragonfly*) 20611 freebsd* | dragonfly*)
@@ -20408,7 +20614,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20408 hardcode_libdir_flag_spec='-R$libdir' 20614 hardcode_libdir_flag_spec='-R$libdir'
20409 hardcode_direct=yes 20615 hardcode_direct=yes
20410 hardcode_shlibpath_var=no 20616 hardcode_shlibpath_var=no
20411@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20617@@ -9070,7 +9649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20412 20618
20413 hpux9*) 20619 hpux9*)
20414 if test "$GCC" = yes; then 20620 if test "$GCC" = yes; then
@@ -20417,7 +20623,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20417 else 20623 else
20418 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' 20624 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'
20419 fi 20625 fi
20420@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20626@@ -9086,7 +9665,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20421 20627
20422 hpux10*) 20628 hpux10*)
20423 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 20629 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -20426,7 +20632,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20426 else 20632 else
20427 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 20633 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20428 fi 20634 fi
20429@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20635@@ -9110,10 +9689,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20430 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 20636 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20431 ;; 20637 ;;
20432 ia64*) 20638 ia64*)
@@ -20439,7 +20645,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20439 ;; 20645 ;;
20440 esac 20646 esac
20441 else 20647 else
20442@@ -9813,23 +10396,36 @@ fi 20648@@ -9192,23 +9771,36 @@ fi
20443 20649
20444 irix5* | irix6* | nonstopux*) 20650 irix5* | irix6* | nonstopux*)
20445 if test "$GCC" = yes; then 20651 if test "$GCC" = yes; then
@@ -20484,7 +20690,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20484 else 20690 else
20485 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' 20691 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'
20486 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' 20692 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'
20487@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ 20693@@ -9293,7 +9885,7 @@ rm -f core conftest.err conftest.$ac_objext \
20488 osf4* | osf5*) # as osf3* with the addition of -msym flag 20694 osf4* | osf5*) # as osf3* with the addition of -msym flag
20489 if test "$GCC" = yes; then 20695 if test "$GCC" = yes; then
20490 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 20696 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -20493,7 +20699,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20493 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 20699 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20494 else 20700 else
20495 allow_undefined_flag=' -expect_unresolved \*' 20701 allow_undefined_flag=' -expect_unresolved \*'
20496@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ 20702@@ -9312,9 +9904,9 @@ rm -f core conftest.err conftest.$ac_objext \
20497 no_undefined_flag=' -z defs' 20703 no_undefined_flag=' -z defs'
20498 if test "$GCC" = yes; then 20704 if test "$GCC" = yes; then
20499 wlarc='${wl}' 20705 wlarc='${wl}'
@@ -20505,7 +20711,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20505 else 20711 else
20506 case `$CC -V 2>&1` in 20712 case `$CC -V 2>&1` in
20507 *"Compilers 5.0"*) 20713 *"Compilers 5.0"*)
20508@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) 20714@@ -9890,8 +10482,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20509 need_version=no 20715 need_version=no
20510 need_lib_prefix=no 20716 need_lib_prefix=no
20511 20717
@@ -20517,7 +20723,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20517 library_names_spec='$libname.dll.a' 20723 library_names_spec='$libname.dll.a'
20518 # DLL is installed to $(libdir)/../bin by postinstall_cmds 20724 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20519 postinstall_cmds='base_file=`basename \${file}`~ 20725 postinstall_cmds='base_file=`basename \${file}`~
20520@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) 20726@@ -9924,13 +10517,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20521 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 20727 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20522 ;; 20728 ;;
20523 esac 20729 esac
@@ -20590,7 +20796,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20590 # FIXME: first we should search . and the directory the executable is in 20796 # FIXME: first we should search . and the directory the executable is in
20591 shlibpath_var=PATH 20797 shlibpath_var=PATH
20592 ;; 20798 ;;
20593@@ -10633,7 +11288,7 @@ haiku*) 20799@@ -10012,7 +10663,7 @@ haiku*)
20594 soname_spec='${libname}${release}${shared_ext}$major' 20800 soname_spec='${libname}${release}${shared_ext}$major'
20595 shlibpath_var=LIBRARY_PATH 20801 shlibpath_var=LIBRARY_PATH
20596 shlibpath_overrides_runpath=yes 20802 shlibpath_overrides_runpath=yes
@@ -20599,16 +20805,16 @@ index dca94db9c3f..26dcc4b82dd 100755
20599 hardcode_into_libs=yes 20805 hardcode_into_libs=yes
20600 ;; 20806 ;;
20601 20807
20602@@ -11429,7 +12084,7 @@ else 20808@@ -10808,7 +11459,7 @@ else
20603 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 20809 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20604 lt_status=$lt_dlunknown 20810 lt_status=$lt_dlunknown
20605 cat > conftest.$ac_ext <<_LT_EOF 20811 cat > conftest.$ac_ext <<_LT_EOF
20606-#line 11432 "configure" 20812-#line 10811 "configure"
20607+#line $LINENO "configure" 20813+#line $LINENO "configure"
20608 #include "confdefs.h" 20814 #include "confdefs.h"
20609 20815
20610 #if HAVE_DLFCN_H 20816 #if HAVE_DLFCN_H
20611@@ -11473,10 +12128,10 @@ else 20817@@ -10852,10 +11503,10 @@ else
20612 /* When -fvisbility=hidden is used, assume the code has been annotated 20818 /* When -fvisbility=hidden is used, assume the code has been annotated
20613 correspondingly for the symbols needed. */ 20819 correspondingly for the symbols needed. */
20614 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 20820 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20621,16 +20827,16 @@ index dca94db9c3f..26dcc4b82dd 100755
20621 int main () 20827 int main ()
20622 { 20828 {
20623 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20829 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20624@@ -11535,7 +12190,7 @@ else 20830@@ -10914,7 +11565,7 @@ else
20625 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 20831 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20626 lt_status=$lt_dlunknown 20832 lt_status=$lt_dlunknown
20627 cat > conftest.$ac_ext <<_LT_EOF 20833 cat > conftest.$ac_ext <<_LT_EOF
20628-#line 11538 "configure" 20834-#line 10917 "configure"
20629+#line $LINENO "configure" 20835+#line $LINENO "configure"
20630 #include "confdefs.h" 20836 #include "confdefs.h"
20631 20837
20632 #if HAVE_DLFCN_H 20838 #if HAVE_DLFCN_H
20633@@ -11579,10 +12234,10 @@ else 20839@@ -10958,10 +11609,10 @@ else
20634 /* When -fvisbility=hidden is used, assume the code has been annotated 20840 /* When -fvisbility=hidden is used, assume the code has been annotated
20635 correspondingly for the symbols needed. */ 20841 correspondingly for the symbols needed. */
20636 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 20842 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20643,7 +20849,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20643 int main () 20849 int main ()
20644 { 20850 {
20645 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20851 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20646@@ -13746,13 +14401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 20852@@ -13101,13 +13752,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20647 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 20853 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20648 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 20854 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20649 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 20855 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -20664,7 +20870,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20664 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 20870 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20665 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 20871 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20666 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 20872 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20667@@ -13767,14 +14429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 20873@@ -13122,14 +13780,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"`' 20874 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"`' 20875 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"`' 20876 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 +20889,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20683 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 20889 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20684 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 20890 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20685 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 20891 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20686@@ -13807,12 +14472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 20892@@ -13162,12 +13823,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20687 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 20893 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20688 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 20894 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20689 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 20895 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -20697,7 +20903,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20697 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 20903 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"`' 20904 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"`' 20905 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20700@@ -13867,8 +14532,13 @@ reload_flag \ 20906@@ -13222,8 +13883,13 @@ reload_flag \
20701 OBJDUMP \ 20907 OBJDUMP \
20702 deplibs_check_method \ 20908 deplibs_check_method \
20703 file_magic_cmd \ 20909 file_magic_cmd \
@@ -20711,7 +20917,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20711 STRIP \ 20917 STRIP \
20712 RANLIB \ 20918 RANLIB \
20713 CC \ 20919 CC \
20714@@ -13878,12 +14548,14 @@ lt_cv_sys_global_symbol_pipe \ 20920@@ -13233,12 +13899,14 @@ lt_cv_sys_global_symbol_pipe \
20715 lt_cv_sys_global_symbol_to_cdecl \ 20921 lt_cv_sys_global_symbol_to_cdecl \
20716 lt_cv_sys_global_symbol_to_c_name_address \ 20922 lt_cv_sys_global_symbol_to_c_name_address \
20717 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 20923 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -20727,7 +20933,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20727 DSYMUTIL \ 20933 DSYMUTIL \
20728 NMEDIT \ 20934 NMEDIT \
20729 LIPO \ 20935 LIPO \
20730@@ -13899,7 +14571,6 @@ no_undefined_flag \ 20936@@ -13254,7 +13922,6 @@ no_undefined_flag \
20731 hardcode_libdir_flag_spec \ 20937 hardcode_libdir_flag_spec \
20732 hardcode_libdir_flag_spec_ld \ 20938 hardcode_libdir_flag_spec_ld \
20733 hardcode_libdir_separator \ 20939 hardcode_libdir_separator \
@@ -20735,7 +20941,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20735 exclude_expsyms \ 20941 exclude_expsyms \
20736 include_expsyms \ 20942 include_expsyms \
20737 file_list_spec \ 20943 file_list_spec \
20738@@ -13935,6 +14606,7 @@ module_cmds \ 20944@@ -13290,6 +13957,7 @@ module_cmds \
20739 module_expsym_cmds \ 20945 module_expsym_cmds \
20740 export_symbols_cmds \ 20946 export_symbols_cmds \
20741 prelink_cmds \ 20947 prelink_cmds \
@@ -20743,7 +20949,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20743 postinstall_cmds \ 20949 postinstall_cmds \
20744 postuninstall_cmds \ 20950 postuninstall_cmds \
20745 finish_cmds \ 20951 finish_cmds \
20746@@ -14700,7 +15372,8 @@ $as_echo X"$file" | 20952@@ -14055,7 +14723,8 @@ $as_echo X"$file" |
20747 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 20953 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20748 # 20954 #
20749 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 20955 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -20753,7 +20959,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20753 # Written by Gordon Matzigkeit, 1996 20959 # Written by Gordon Matzigkeit, 1996
20754 # 20960 #
20755 # This file is part of GNU Libtool. 20961 # This file is part of GNU Libtool.
20756@@ -14803,19 +15476,42 @@ SP2NL=$lt_lt_SP2NL 20962@@ -14158,19 +14827,42 @@ SP2NL=$lt_lt_SP2NL
20757 # turn newlines into spaces. 20963 # turn newlines into spaces.
20758 NL2SP=$lt_lt_NL2SP 20964 NL2SP=$lt_lt_NL2SP
20759 20965
@@ -20797,7 +21003,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20797 # A symbol stripping program. 21003 # A symbol stripping program.
20798 STRIP=$lt_STRIP 21004 STRIP=$lt_STRIP
20799 21005
20800@@ -14845,6 +15541,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 21006@@ -14200,6 +14892,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. 21007 # 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 21008 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20803 21009
@@ -20810,7 +21016,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20810 # The name of the directory that contains temporary libtool files. 21016 # The name of the directory that contains temporary libtool files.
20811 objdir=$objdir 21017 objdir=$objdir
20812 21018
20813@@ -14854,6 +15556,9 @@ MAGIC_CMD=$MAGIC_CMD 21019@@ -14209,6 +14907,9 @@ MAGIC_CMD=$MAGIC_CMD
20814 # Must we lock files when doing compilation? 21020 # Must we lock files when doing compilation?
20815 need_locks=$lt_need_locks 21021 need_locks=$lt_need_locks
20816 21022
@@ -20820,7 +21026,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20820 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 21026 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20821 DSYMUTIL=$lt_DSYMUTIL 21027 DSYMUTIL=$lt_DSYMUTIL
20822 21028
20823@@ -14968,12 +15673,12 @@ with_gcc=$GCC 21029@@ -14323,12 +15024,12 @@ with_gcc=$GCC
20824 # Compiler flag to turn off builtin functions. 21030 # Compiler flag to turn off builtin functions.
20825 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 21031 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20826 21032
@@ -20836,7 +21042,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20836 # Compiler flag to prevent dynamic linking. 21042 # Compiler flag to prevent dynamic linking.
20837 link_static_flag=$lt_lt_prog_compiler_static 21043 link_static_flag=$lt_lt_prog_compiler_static
20838 21044
20839@@ -15060,9 +15765,6 @@ inherit_rpath=$inherit_rpath 21045@@ -14415,9 +15116,6 @@ inherit_rpath=$inherit_rpath
20840 # Whether libtool must link a program against all its dependency libraries. 21046 # Whether libtool must link a program against all its dependency libraries.
20841 link_all_deplibs=$link_all_deplibs 21047 link_all_deplibs=$link_all_deplibs
20842 21048
@@ -20846,7 +21052,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20846 # Set to "yes" if exported symbols are required. 21052 # Set to "yes" if exported symbols are required.
20847 always_export_symbols=$always_export_symbols 21053 always_export_symbols=$always_export_symbols
20848 21054
20849@@ -15078,6 +15780,9 @@ include_expsyms=$lt_include_expsyms 21055@@ -14433,6 +15131,9 @@ include_expsyms=$lt_include_expsyms
20850 # Commands necessary for linking programs (against libraries) with templates. 21056 # Commands necessary for linking programs (against libraries) with templates.
20851 prelink_cmds=$lt_prelink_cmds 21057 prelink_cmds=$lt_prelink_cmds
20852 21058
@@ -20856,7 +21062,7 @@ index dca94db9c3f..26dcc4b82dd 100755
20856 # Specify filename containing input files. 21062 # Specify filename containing input files.
20857 file_list_spec=$lt_file_list_spec 21063 file_list_spec=$lt_file_list_spec
20858 21064
20859@@ -15110,210 +15815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 21065@@ -14465,210 +15166,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20860 # if finds mixed CR/LF and LF-only lines. Since sed operates in 21066 # 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 21067 # text mode, it properly converts lines to CR/LF. This bash problem
20862 # is reportedly fixed, but why not run on old versions too? 21068 # is reportedly fixed, but why not run on old versions too?
@@ -21231,7 +21437,7 @@ index dca94db9c3f..26dcc4b82dd 100755
21231 chmod +x "$ofile" 21437 chmod +x "$ofile"
21232 21438
21233diff --git a/zlib/configure b/zlib/configure 21439diff --git a/zlib/configure b/zlib/configure
21234index b124acf9259..e4075ef3a2c 100755 21440index 695819cd54b..14b5f28013a 100755
21235--- a/zlib/configure 21441--- a/zlib/configure
21236+++ b/zlib/configure 21442+++ b/zlib/configure
21237@@ -646,8 +646,11 @@ OTOOL 21443@@ -646,8 +646,11 @@ OTOOL
@@ -21419,7 +21625,7 @@ index b124acf9259..e4075ef3a2c 100755
21419 file_magic_cmd=$lt_cv_file_magic_cmd 21625 file_magic_cmd=$lt_cv_file_magic_cmd
21420 deplibs_check_method=$lt_cv_deplibs_check_method 21626 deplibs_check_method=$lt_cv_deplibs_check_method
21421 test -z "$deplibs_check_method" && deplibs_check_method=unknown 21627 test -z "$deplibs_check_method" && deplibs_check_method=unknown
21422@@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 21628@@ -5407,6 +5508,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
21423 21629
21424 21630
21425 21631
@@ -21433,11 +21639,7 @@ index b124acf9259..e4075ef3a2c 100755
21433+ 21639+
21434+ 21640+
21435+ 21641+
21436 21642+if test -n "$ac_tool_prefix"; then
21437
21438 if test -n "$ac_tool_prefix"; then
21439- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
21440-set dummy ${ac_tool_prefix}ar; ac_word=$2
21441+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 21643+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
21442+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 21644+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
21443+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21645+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -21579,7 +21781,15 @@ index b124acf9259..e4075ef3a2c 100755
21579+ 21781+
21580+ 21782+
21581+ 21783+
21582+if test -n "$ac_tool_prefix"; then 21784 plugin_option=
21785 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
21786 for plugin in $plugin_names; do
21787@@ -5421,8 +5674,10 @@ for plugin in $plugin_names; do
21788 done
21789
21790 if test -n "$ac_tool_prefix"; then
21791- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
21792-set dummy ${ac_tool_prefix}ar; ac_word=$2
21583+ for ac_prog in ar 21793+ for ac_prog in ar
21584+ do 21794+ do
21585+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 21795+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -21587,7 +21797,7 @@ index b124acf9259..e4075ef3a2c 100755
21587 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21797 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21588 $as_echo_n "checking for $ac_word... " >&6; } 21798 $as_echo_n "checking for $ac_word... " >&6; }
21589 if ${ac_cv_prog_AR+:} false; then : 21799 if ${ac_cv_prog_AR+:} false; then :
21590@@ -5425,7 +5680,7 @@ do 21800@@ -5438,7 +5693,7 @@ do
21591 test -z "$as_dir" && as_dir=. 21801 test -z "$as_dir" && as_dir=.
21592 for ac_exec_ext in '' $ac_executable_extensions; do 21802 for ac_exec_ext in '' $ac_executable_extensions; do
21593 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21803 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21596,7 +21806,7 @@ index b124acf9259..e4075ef3a2c 100755
21596 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21806 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21597 break 2 21807 break 2
21598 fi 21808 fi
21599@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } 21809@@ -5458,11 +5713,15 @@ $as_echo "no" >&6; }
21600 fi 21810 fi
21601 21811
21602 21812
@@ -21615,7 +21825,7 @@ index b124acf9259..e4075ef3a2c 100755
21615 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21825 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
21616 $as_echo_n "checking for $ac_word... " >&6; } 21826 $as_echo_n "checking for $ac_word... " >&6; }
21617 if ${ac_cv_prog_ac_ct_AR+:} false; then : 21827 if ${ac_cv_prog_ac_ct_AR+:} false; then :
21618@@ -5465,7 +5724,7 @@ do 21828@@ -5478,7 +5737,7 @@ do
21619 test -z "$as_dir" && as_dir=. 21829 test -z "$as_dir" && as_dir=.
21620 for ac_exec_ext in '' $ac_executable_extensions; do 21830 for ac_exec_ext in '' $ac_executable_extensions; do
21621 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21831 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -21624,7 +21834,7 @@ index b124acf9259..e4075ef3a2c 100755
21624 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21834 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
21625 break 2 21835 break 2
21626 fi 21836 fi
21627@@ -5484,6 +5743,10 @@ else 21837@@ -5497,6 +5756,10 @@ else
21628 $as_echo "no" >&6; } 21838 $as_echo "no" >&6; }
21629 fi 21839 fi
21630 21840
@@ -21635,7 +21845,7 @@ index b124acf9259..e4075ef3a2c 100755
21635 if test "x$ac_ct_AR" = x; then 21845 if test "x$ac_ct_AR" = x; then
21636 AR="false" 21846 AR="false"
21637 else 21847 else
21638@@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; 21848@@ -5508,25 +5771,19 @@ ac_tool_warned=yes ;;
21639 esac 21849 esac
21640 AR=$ac_ct_AR 21850 AR=$ac_ct_AR
21641 fi 21851 fi
@@ -21644,20 +21854,36 @@ index b124acf9259..e4075ef3a2c 100755
21644 fi 21854 fi
21645 21855
21646-test -z "$AR" && AR=ar 21856-test -z "$AR" && AR=ar
21857-if test -n "$plugin_option"; then
21858- if $AR --help 2>&1 | grep -q "\--plugin"; then
21859- touch conftest.c
21860- $AR $plugin_option rc conftest.a conftest.c
21861- if test "$?" != 0; then
21862- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
21863+ touch conftest.c
21864+ $AR $plugin_option rc conftest.a conftest.c
21865+ if test "$?" != 0; then
21866+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
21867 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
21868- else
21869- AR="$AR $plugin_option"
21870- fi
21871- rm -f conftest.*
21872+ else
21873+ AR="$AR $plugin_option"
21874 fi
21875-fi
21647-test -z "$AR_FLAGS" && AR_FLAGS=cru 21876-test -z "$AR_FLAGS" && AR_FLAGS=cru
21877+ rm -f conftest.*
21648+: ${AR=ar} 21878+: ${AR=ar}
21649+: ${AR_FLAGS=cru} 21879+: ${AR_FLAGS=cru}
21650+ 21880
21651+ 21881
21652+ 21882
21653+ 21883@@ -5538,6 +5795,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
21654+ 21884
21655+ 21885
21656+ 21886
21657+
21658+
21659+
21660+
21661+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 21887+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
21662+$as_echo_n "checking for archiver @FILE support... " >&6; } 21888+$as_echo_n "checking for archiver @FILE support... " >&6; }
21663+if ${lt_cv_ar_at_file+:} false; then : 21889+if ${lt_cv_ar_at_file+:} false; then :
@@ -21670,7 +21896,7 @@ index b124acf9259..e4075ef3a2c 100755
21670+int 21896+int
21671+main () 21897+main ()
21672+{ 21898+{
21673 21899+
21674+ ; 21900+ ;
21675+ return 0; 21901+ return 0;
21676+} 21902+}
@@ -21696,23 +21922,30 @@ index b124acf9259..e4075ef3a2c 100755
21696+ fi 21922+ fi
21697+ fi 21923+ fi
21698+ rm -f conftest.* libconftest.a 21924+ rm -f conftest.* libconftest.a
21699 21925+
21700+fi 21926+fi
21701+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 21927+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
21702 21928+
21703+fi 21929+fi
21704+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 21930+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
21705+$as_echo "$lt_cv_ar_at_file" >&6; } 21931+$as_echo "$lt_cv_ar_at_file" >&6; }
21706 21932+
21707+if test "x$lt_cv_ar_at_file" = xno; then 21933+if test "x$lt_cv_ar_at_file" = xno; then
21708+ archiver_list_spec= 21934+ archiver_list_spec=
21709+else 21935+else
21710+ archiver_list_spec=$lt_cv_ar_at_file 21936+ archiver_list_spec=$lt_cv_ar_at_file
21711+fi 21937+fi
21712 21938+
21713 21939+
21714 21940+
21715@@ -5846,8 +6165,8 @@ esac 21941+
21942+
21943+
21944+
21945 if test -n "$ac_tool_prefix"; then
21946 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
21947 set dummy ${ac_tool_prefix}strip; ac_word=$2
21948@@ -5877,8 +6192,8 @@ esac
21716 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 21949 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
21717 21950
21718 # Transform an extracted symbol line into symbol name and symbol address 21951 # Transform an extracted symbol line into symbol name and symbol address
@@ -21723,7 +21956,7 @@ index b124acf9259..e4075ef3a2c 100755
21723 21956
21724 # Handle CRLF in mingw tool chain 21957 # Handle CRLF in mingw tool chain
21725 opt_cr= 21958 opt_cr=
21726@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do 21959@@ -5914,6 +6229,7 @@ for ac_symprfx in "" "_"; do
21727 else 21960 else
21728 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 21961 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
21729 fi 21962 fi
@@ -21731,7 +21964,7 @@ index b124acf9259..e4075ef3a2c 100755
21731 21964
21732 # Check to see that the pipe works correctly. 21965 # Check to see that the pipe works correctly.
21733 pipe_works=no 21966 pipe_works=no
21734@@ -5924,6 +6244,18 @@ _LT_EOF 21967@@ -5955,6 +6271,18 @@ _LT_EOF
21735 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 21968 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
21736 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 21969 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
21737 cat <<_LT_EOF > conftest.$ac_ext 21970 cat <<_LT_EOF > conftest.$ac_ext
@@ -21750,7 +21983,7 @@ index b124acf9259..e4075ef3a2c 100755
21750 #ifdef __cplusplus 21983 #ifdef __cplusplus
21751 extern "C" { 21984 extern "C" {
21752 #endif 21985 #endif
21753@@ -5935,7 +6267,7 @@ _LT_EOF 21986@@ -5966,7 +6294,7 @@ _LT_EOF
21754 cat <<_LT_EOF >> conftest.$ac_ext 21987 cat <<_LT_EOF >> conftest.$ac_ext
21755 21988
21756 /* The mapping between symbol names and symbols. */ 21989 /* The mapping between symbol names and symbols. */
@@ -21759,7 +21992,7 @@ index b124acf9259..e4075ef3a2c 100755
21759 const char *name; 21992 const char *name;
21760 void *address; 21993 void *address;
21761 } 21994 }
21762@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { 21995@@ -5992,8 +6320,8 @@ static const void *lt_preloaded_setup() {
21763 _LT_EOF 21996 _LT_EOF
21764 # Now try linking the two files. 21997 # Now try linking the two files.
21765 mv conftest.$ac_objext conftstm.$ac_objext 21998 mv conftest.$ac_objext conftstm.$ac_objext
@@ -21770,7 +22003,7 @@ index b124acf9259..e4075ef3a2c 100755
21770 LIBS="conftstm.$ac_objext" 22003 LIBS="conftstm.$ac_objext"
21771 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 22004 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
21772 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 22005 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
21773@@ -5972,8 +6304,8 @@ _LT_EOF 22006@@ -6003,8 +6331,8 @@ _LT_EOF
21774 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 22007 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
21775 pipe_works=yes 22008 pipe_works=yes
21776 fi 22009 fi
@@ -21781,7 +22014,7 @@ index b124acf9259..e4075ef3a2c 100755
21781 else 22014 else
21782 echo "cannot find nm_test_func in $nlist" >&5 22015 echo "cannot find nm_test_func in $nlist" >&5
21783 fi 22016 fi
21784@@ -6010,6 +6342,19 @@ else 22017@@ -6041,6 +6369,17 @@ else
21785 $as_echo "ok" >&6; } 22018 $as_echo "ok" >&6; }
21786 fi 22019 fi
21787 22020
@@ -21796,18 +22029,18 @@ index b124acf9259..e4075ef3a2c 100755
21796+ 22029+
21797+ 22030+
21798+ 22031+
21799+
21800+
21801 22032
21802 22033
21803 22034
21804@@ -6027,6 +6372,41 @@ fi 22035@@ -6058,6 +6397,43 @@ fi
21805 22036
21806 22037
21807 22038
21808+ 22039+
21809+ 22040+
21810+ 22041+
22042+
22043+
21811+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 22044+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
21812+$as_echo_n "checking for sysroot... " >&6; } 22045+$as_echo_n "checking for sysroot... " >&6; }
21813+ 22046+
@@ -21843,7 +22076,7 @@ index b124acf9259..e4075ef3a2c 100755
21843 22076
21844 22077
21845 22078
21846@@ -6241,6 +6621,123 @@ esac 22079@@ -6272,6 +6648,123 @@ esac
21847 22080
21848 need_locks="$enable_libtool_lock" 22081 need_locks="$enable_libtool_lock"
21849 22082
@@ -21967,7 +22200,7 @@ index b124acf9259..e4075ef3a2c 100755
21967 22200
21968 case $host_os in 22201 case $host_os in
21969 rhapsody* | darwin*) 22202 rhapsody* | darwin*)
21970@@ -6807,6 +7304,8 @@ _LT_EOF 22203@@ -6838,6 +7331,8 @@ _LT_EOF
21971 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 22204 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
21972 echo "$AR cru libconftest.a conftest.o" >&5 22205 echo "$AR cru libconftest.a conftest.o" >&5
21973 $AR cru libconftest.a conftest.o 2>&5 22206 $AR cru libconftest.a conftest.o 2>&5
@@ -21976,7 +22209,7 @@ index b124acf9259..e4075ef3a2c 100755
21976 cat > conftest.c << _LT_EOF 22209 cat > conftest.c << _LT_EOF
21977 int main() { return 0;} 22210 int main() { return 0;}
21978 _LT_EOF 22211 _LT_EOF
21979@@ -7269,7 +7768,8 @@ fi 22212@@ -7300,7 +7795,8 @@ fi
21980 LIBTOOL_DEPS="$ltmain" 22213 LIBTOOL_DEPS="$ltmain"
21981 22214
21982 # Always use our own libtool. 22215 # Always use our own libtool.
@@ -21986,7 +22219,7 @@ index b124acf9259..e4075ef3a2c 100755
21986 22219
21987 22220
21988 22221
21989@@ -7358,7 +7858,7 @@ aix3*) 22222@@ -7389,7 +7885,7 @@ aix3*)
21990 esac 22223 esac
21991 22224
21992 # Global variables: 22225 # Global variables:
@@ -21995,7 +22228,7 @@ index b124acf9259..e4075ef3a2c 100755
21995 can_build_shared=yes 22228 can_build_shared=yes
21996 22229
21997 # All known linkers require a `.a' archive for static linking (except MSVC, 22230 # All known linkers require a `.a' archive for static linking (except MSVC,
21998@@ -7656,8 +8156,6 @@ fi 22231@@ -7687,8 +8183,6 @@ fi
21999 lt_prog_compiler_pic= 22232 lt_prog_compiler_pic=
22000 lt_prog_compiler_static= 22233 lt_prog_compiler_static=
22001 22234
@@ -22004,7 +22237,7 @@ index b124acf9259..e4075ef3a2c 100755
22004 22237
22005 if test "$GCC" = yes; then 22238 if test "$GCC" = yes; then
22006 lt_prog_compiler_wl='-Wl,' 22239 lt_prog_compiler_wl='-Wl,'
22007@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22240@@ -7854,6 +8348,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22008 lt_prog_compiler_pic='--shared' 22241 lt_prog_compiler_pic='--shared'
22009 lt_prog_compiler_static='--static' 22242 lt_prog_compiler_static='--static'
22010 ;; 22243 ;;
@@ -22017,7 +22250,7 @@ index b124acf9259..e4075ef3a2c 100755
22017 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 22250 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
22018 # Portland Group compilers (*not* the Pentium gcc compiler, 22251 # Portland Group compilers (*not* the Pentium gcc compiler,
22019 # which looks to be a dead project) 22252 # which looks to be a dead project)
22020@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22253@@ -7916,7 +8416,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
22021 lt_prog_compiler_pic='-KPIC' 22254 lt_prog_compiler_pic='-KPIC'
22022 lt_prog_compiler_static='-Bstatic' 22255 lt_prog_compiler_static='-Bstatic'
22023 case $cc_basename in 22256 case $cc_basename in
@@ -22026,7 +22259,7 @@ index b124acf9259..e4075ef3a2c 100755
22026 lt_prog_compiler_wl='-Qoption ld ';; 22259 lt_prog_compiler_wl='-Qoption ld ';;
22027 *) 22260 *)
22028 lt_prog_compiler_wl='-Wl,';; 22261 lt_prog_compiler_wl='-Wl,';;
22029@@ -7942,13 +8446,17 @@ case $host_os in 22262@@ -7973,13 +8473,17 @@ case $host_os in
22030 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 22263 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
22031 ;; 22264 ;;
22032 esac 22265 esac
@@ -22050,7 +22283,7 @@ index b124acf9259..e4075ef3a2c 100755
22050 22283
22051 # 22284 #
22052 # Check to make sure the PIC flag actually works. 22285 # Check to make sure the PIC flag actually works.
22053@@ -8009,6 +8517,11 @@ fi 22286@@ -8040,6 +8544,11 @@ fi
22054 22287
22055 22288
22056 22289
@@ -22062,7 +22295,7 @@ index b124acf9259..e4075ef3a2c 100755
22062 # 22295 #
22063 # Check to make sure the static flag actually works. 22296 # Check to make sure the static flag actually works.
22064 # 22297 #
22065@@ -8359,7 +8872,8 @@ _LT_EOF 22298@@ -8390,7 +8899,8 @@ _LT_EOF
22066 allow_undefined_flag=unsupported 22299 allow_undefined_flag=unsupported
22067 always_export_symbols=no 22300 always_export_symbols=no
22068 enable_shared_with_static_runtimes=yes 22301 enable_shared_with_static_runtimes=yes
@@ -22072,7 +22305,7 @@ index b124acf9259..e4075ef3a2c 100755
22072 22305
22073 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 22306 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
22074 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 22307 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
22075@@ -8458,12 +8972,12 @@ _LT_EOF 22308@@ -8489,12 +8999,12 @@ _LT_EOF
22076 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 22309 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
22077 hardcode_libdir_flag_spec= 22310 hardcode_libdir_flag_spec=
22078 hardcode_libdir_flag_spec_ld='-rpath $libdir' 22311 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -22087,7 +22320,7 @@ index b124acf9259..e4075ef3a2c 100755
22087 fi 22320 fi
22088 ;; 22321 ;;
22089 esac 22322 esac
22090@@ -8477,8 +8991,8 @@ _LT_EOF 22323@@ -8508,8 +9018,8 @@ _LT_EOF
22091 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 22324 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
22092 wlarc= 22325 wlarc=
22093 else 22326 else
@@ -22098,7 +22331,7 @@ index b124acf9259..e4075ef3a2c 100755
22098 fi 22331 fi
22099 ;; 22332 ;;
22100 22333
22101@@ -8496,8 +9010,8 @@ _LT_EOF 22334@@ -8527,8 +9037,8 @@ _LT_EOF
22102 22335
22103 _LT_EOF 22336 _LT_EOF
22104 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22337 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22109,7 +22342,7 @@ index b124acf9259..e4075ef3a2c 100755
22109 else 22342 else
22110 ld_shlibs=no 22343 ld_shlibs=no
22111 fi 22344 fi
22112@@ -8543,8 +9057,8 @@ _LT_EOF 22345@@ -8574,8 +9084,8 @@ _LT_EOF
22113 22346
22114 *) 22347 *)
22115 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22348 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -22120,7 +22353,7 @@ index b124acf9259..e4075ef3a2c 100755
22120 else 22353 else
22121 ld_shlibs=no 22354 ld_shlibs=no
22122 fi 22355 fi
22123@@ -8674,7 +9188,13 @@ _LT_EOF 22356@@ -8705,7 +9215,13 @@ _LT_EOF
22124 allow_undefined_flag='-berok' 22357 allow_undefined_flag='-berok'
22125 # Determine the default libpath from the value encoded in an 22358 # Determine the default libpath from the value encoded in an
22126 # empty executable. 22359 # empty executable.
@@ -22135,7 +22368,7 @@ index b124acf9259..e4075ef3a2c 100755
22135 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 22368 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
22136 fi 22369 fi
22137 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22370 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22138@@ -8690,22 +9210,29 @@ main () 22371@@ -8721,22 +9237,29 @@ main ()
22139 _ACEOF 22372 _ACEOF
22140 if ac_fn_c_try_link "$LINENO"; then : 22373 if ac_fn_c_try_link "$LINENO"; then :
22141 22374
@@ -22178,7 +22411,7 @@ index b124acf9259..e4075ef3a2c 100755
22178 22411
22179 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22412 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22180 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" 22413 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"
22181@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22414@@ -8748,7 +9271,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22182 else 22415 else
22183 # Determine the default libpath from the value encoded in an 22416 # Determine the default libpath from the value encoded in an
22184 # empty executable. 22417 # empty executable.
@@ -22193,7 +22426,7 @@ index b124acf9259..e4075ef3a2c 100755
22193 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 22426 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
22194 fi 22427 fi
22195 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22428 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22196@@ -8733,22 +9266,29 @@ main () 22429@@ -8764,22 +9293,29 @@ main ()
22197 _ACEOF 22430 _ACEOF
22198 if ac_fn_c_try_link "$LINENO"; then : 22431 if ac_fn_c_try_link "$LINENO"; then :
22199 22432
@@ -22236,7 +22469,7 @@ index b124acf9259..e4075ef3a2c 100755
22236 22469
22237 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22470 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
22238 # Warning - without using the other run time loading flags, 22471 # Warning - without using the other run time loading flags,
22239@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22472@@ -8824,20 +9360,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22240 # Microsoft Visual C++. 22473 # Microsoft Visual C++.
22241 # hardcode_libdir_flag_spec is actually meaningless, as there is 22474 # hardcode_libdir_flag_spec is actually meaningless, as there is
22242 # no search path for DLLs. 22475 # no search path for DLLs.
@@ -22314,7 +22547,7 @@ index b124acf9259..e4075ef3a2c 100755
22314 ;; 22547 ;;
22315 22548
22316 darwin* | rhapsody*) 22549 darwin* | rhapsody*)
22317@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22550@@ -8898,7 +9477,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22318 22551
22319 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 22552 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
22320 freebsd* | dragonfly*) 22553 freebsd* | dragonfly*)
@@ -22323,7 +22556,7 @@ index b124acf9259..e4075ef3a2c 100755
22323 hardcode_libdir_flag_spec='-R$libdir' 22556 hardcode_libdir_flag_spec='-R$libdir'
22324 hardcode_direct=yes 22557 hardcode_direct=yes
22325 hardcode_shlibpath_var=no 22558 hardcode_shlibpath_var=no
22326@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22559@@ -8906,7 +9485,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22327 22560
22328 hpux9*) 22561 hpux9*)
22329 if test "$GCC" = yes; then 22562 if test "$GCC" = yes; then
@@ -22332,7 +22565,7 @@ index b124acf9259..e4075ef3a2c 100755
22332 else 22565 else
22333 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' 22566 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'
22334 fi 22567 fi
22335@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22568@@ -8922,7 +9501,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22336 22569
22337 hpux10*) 22570 hpux10*)
22338 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 22571 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -22341,7 +22574,7 @@ index b124acf9259..e4075ef3a2c 100755
22341 else 22574 else
22342 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 22575 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
22343 fi 22576 fi
22344@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22577@@ -8946,10 +9525,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
22345 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 22578 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
22346 ;; 22579 ;;
22347 ia64*) 22580 ia64*)
@@ -22354,7 +22587,7 @@ index b124acf9259..e4075ef3a2c 100755
22354 ;; 22587 ;;
22355 esac 22588 esac
22356 else 22589 else
22357@@ -8997,26 +9580,39 @@ fi 22590@@ -9028,26 +9607,39 @@ fi
22358 22591
22359 irix5* | irix6* | nonstopux*) 22592 irix5* | irix6* | nonstopux*)
22360 if test "$GCC" = yes; then 22593 if test "$GCC" = yes; then
@@ -22402,7 +22635,7 @@ index b124acf9259..e4075ef3a2c 100755
22402 else 22635 else
22403 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' 22636 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'
22404 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' 22637 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'
22405@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ 22638@@ -9132,7 +9724,7 @@ rm -f core conftest.err conftest.$ac_objext \
22406 osf4* | osf5*) # as osf3* with the addition of -msym flag 22639 osf4* | osf5*) # as osf3* with the addition of -msym flag
22407 if test "$GCC" = yes; then 22640 if test "$GCC" = yes; then
22408 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 22641 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -22411,7 +22644,7 @@ index b124acf9259..e4075ef3a2c 100755
22411 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 22644 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
22412 else 22645 else
22413 allow_undefined_flag=' -expect_unresolved \*' 22646 allow_undefined_flag=' -expect_unresolved \*'
22414@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ 22647@@ -9151,9 +9743,9 @@ rm -f core conftest.err conftest.$ac_objext \
22415 no_undefined_flag=' -z defs' 22648 no_undefined_flag=' -z defs'
22416 if test "$GCC" = yes; then 22649 if test "$GCC" = yes; then
22417 wlarc='${wl}' 22650 wlarc='${wl}'
@@ -22423,7 +22656,7 @@ index b124acf9259..e4075ef3a2c 100755
22423 else 22656 else
22424 case `$CC -V 2>&1` in 22657 case `$CC -V 2>&1` in
22425 *"Compilers 5.0"*) 22658 *"Compilers 5.0"*)
22426@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) 22659@@ -9729,8 +10321,9 @@ cygwin* | mingw* | pw32* | cegcc*)
22427 need_version=no 22660 need_version=no
22428 need_lib_prefix=no 22661 need_lib_prefix=no
22429 22662
@@ -22435,7 +22668,7 @@ index b124acf9259..e4075ef3a2c 100755
22435 library_names_spec='$libname.dll.a' 22668 library_names_spec='$libname.dll.a'
22436 # DLL is installed to $(libdir)/../bin by postinstall_cmds 22669 # DLL is installed to $(libdir)/../bin by postinstall_cmds
22437 postinstall_cmds='base_file=`basename \${file}`~ 22670 postinstall_cmds='base_file=`basename \${file}`~
22438@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) 22671@@ -9763,13 +10356,71 @@ cygwin* | mingw* | pw32* | cegcc*)
22439 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 22672 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
22440 ;; 22673 ;;
22441 esac 22674 esac
@@ -22508,7 +22741,7 @@ index b124acf9259..e4075ef3a2c 100755
22508 # FIXME: first we should search . and the directory the executable is in 22741 # FIXME: first we should search . and the directory the executable is in
22509 shlibpath_var=PATH 22742 shlibpath_var=PATH
22510 ;; 22743 ;;
22511@@ -9820,7 +10475,7 @@ haiku*) 22744@@ -9851,7 +10502,7 @@ haiku*)
22512 soname_spec='${libname}${release}${shared_ext}$major' 22745 soname_spec='${libname}${release}${shared_ext}$major'
22513 shlibpath_var=LIBRARY_PATH 22746 shlibpath_var=LIBRARY_PATH
22514 shlibpath_overrides_runpath=yes 22747 shlibpath_overrides_runpath=yes
@@ -22517,16 +22750,16 @@ index b124acf9259..e4075ef3a2c 100755
22517 hardcode_into_libs=yes 22750 hardcode_into_libs=yes
22518 ;; 22751 ;;
22519 22752
22520@@ -10634,7 +11289,7 @@ else 22753@@ -10665,7 +11316,7 @@ else
22521 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22754 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22522 lt_status=$lt_dlunknown 22755 lt_status=$lt_dlunknown
22523 cat > conftest.$ac_ext <<_LT_EOF 22756 cat > conftest.$ac_ext <<_LT_EOF
22524-#line 10637 "configure" 22757-#line 10668 "configure"
22525+#line $LINENO "configure" 22758+#line $LINENO "configure"
22526 #include "confdefs.h" 22759 #include "confdefs.h"
22527 22760
22528 #if HAVE_DLFCN_H 22761 #if HAVE_DLFCN_H
22529@@ -10678,10 +11333,10 @@ else 22762@@ -10709,10 +11360,10 @@ else
22530 /* When -fvisbility=hidden is used, assume the code has been annotated 22763 /* When -fvisbility=hidden is used, assume the code has been annotated
22531 correspondingly for the symbols needed. */ 22764 correspondingly for the symbols needed. */
22532 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22765 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22539,16 +22772,16 @@ index b124acf9259..e4075ef3a2c 100755
22539 int main () 22772 int main ()
22540 { 22773 {
22541 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22774 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22542@@ -10740,7 +11395,7 @@ else 22775@@ -10771,7 +11422,7 @@ else
22543 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22776 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
22544 lt_status=$lt_dlunknown 22777 lt_status=$lt_dlunknown
22545 cat > conftest.$ac_ext <<_LT_EOF 22778 cat > conftest.$ac_ext <<_LT_EOF
22546-#line 10743 "configure" 22779-#line 10774 "configure"
22547+#line $LINENO "configure" 22780+#line $LINENO "configure"
22548 #include "confdefs.h" 22781 #include "confdefs.h"
22549 22782
22550 #if HAVE_DLFCN_H 22783 #if HAVE_DLFCN_H
22551@@ -10784,10 +11439,10 @@ else 22784@@ -10815,10 +11466,10 @@ else
22552 /* When -fvisbility=hidden is used, assume the code has been annotated 22785 /* When -fvisbility=hidden is used, assume the code has been annotated
22553 correspondingly for the symbols needed. */ 22786 correspondingly for the symbols needed. */
22554 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22787 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -22561,7 +22794,7 @@ index b124acf9259..e4075ef3a2c 100755
22561 int main () 22794 int main ()
22562 { 22795 {
22563 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22796 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
22564@@ -12257,13 +12912,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 22797@@ -12288,13 +12939,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
22565 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 22798 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
22566 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 22799 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
22567 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 22800 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -22582,7 +22815,7 @@ index b124acf9259..e4075ef3a2c 100755
22582 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 22815 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
22583 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 22816 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
22584 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 22817 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
22585@@ -12278,14 +12940,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 22818@@ -12309,14 +12967,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"`' 22819 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"`' 22820 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"`' 22821 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 +22834,7 @@ index b124acf9259..e4075ef3a2c 100755
22601 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 22834 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
22602 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 22835 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
22603 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 22836 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
22604@@ -12318,12 +12983,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 22837@@ -12349,12 +13010,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
22605 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 22838 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
22606 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 22839 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
22607 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 22840 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -22615,7 +22848,7 @@ index b124acf9259..e4075ef3a2c 100755
22615 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 22848 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"`' 22849 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"`' 22850 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
22618@@ -12378,8 +13043,13 @@ reload_flag \ 22851@@ -12409,8 +13070,13 @@ reload_flag \
22619 OBJDUMP \ 22852 OBJDUMP \
22620 deplibs_check_method \ 22853 deplibs_check_method \
22621 file_magic_cmd \ 22854 file_magic_cmd \
@@ -22629,7 +22862,7 @@ index b124acf9259..e4075ef3a2c 100755
22629 STRIP \ 22862 STRIP \
22630 RANLIB \ 22863 RANLIB \
22631 CC \ 22864 CC \
22632@@ -12389,12 +13059,14 @@ lt_cv_sys_global_symbol_pipe \ 22865@@ -12420,12 +13086,14 @@ lt_cv_sys_global_symbol_pipe \
22633 lt_cv_sys_global_symbol_to_cdecl \ 22866 lt_cv_sys_global_symbol_to_cdecl \
22634 lt_cv_sys_global_symbol_to_c_name_address \ 22867 lt_cv_sys_global_symbol_to_c_name_address \
22635 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 22868 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -22645,7 +22878,7 @@ index b124acf9259..e4075ef3a2c 100755
22645 DSYMUTIL \ 22878 DSYMUTIL \
22646 NMEDIT \ 22879 NMEDIT \
22647 LIPO \ 22880 LIPO \
22648@@ -12410,7 +13082,6 @@ no_undefined_flag \ 22881@@ -12441,7 +13109,6 @@ no_undefined_flag \
22649 hardcode_libdir_flag_spec \ 22882 hardcode_libdir_flag_spec \
22650 hardcode_libdir_flag_spec_ld \ 22883 hardcode_libdir_flag_spec_ld \
22651 hardcode_libdir_separator \ 22884 hardcode_libdir_separator \
@@ -22653,7 +22886,7 @@ index b124acf9259..e4075ef3a2c 100755
22653 exclude_expsyms \ 22886 exclude_expsyms \
22654 include_expsyms \ 22887 include_expsyms \
22655 file_list_spec \ 22888 file_list_spec \
22656@@ -12446,6 +13117,7 @@ module_cmds \ 22889@@ -12477,6 +13144,7 @@ module_cmds \
22657 module_expsym_cmds \ 22890 module_expsym_cmds \
22658 export_symbols_cmds \ 22891 export_symbols_cmds \
22659 prelink_cmds \ 22892 prelink_cmds \
@@ -22661,7 +22894,7 @@ index b124acf9259..e4075ef3a2c 100755
22661 postinstall_cmds \ 22894 postinstall_cmds \
22662 postuninstall_cmds \ 22895 postuninstall_cmds \
22663 finish_cmds \ 22896 finish_cmds \
22664@@ -13044,7 +13716,8 @@ $as_echo X"$file" | 22897@@ -13075,7 +13743,8 @@ $as_echo X"$file" |
22665 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 22898 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
22666 # 22899 #
22667 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 22900 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -22671,7 +22904,7 @@ index b124acf9259..e4075ef3a2c 100755
22671 # Written by Gordon Matzigkeit, 1996 22904 # Written by Gordon Matzigkeit, 1996
22672 # 22905 #
22673 # This file is part of GNU Libtool. 22906 # This file is part of GNU Libtool.
22674@@ -13147,19 +13820,42 @@ SP2NL=$lt_lt_SP2NL 22907@@ -13178,19 +13847,42 @@ SP2NL=$lt_lt_SP2NL
22675 # turn newlines into spaces. 22908 # turn newlines into spaces.
22676 NL2SP=$lt_lt_NL2SP 22909 NL2SP=$lt_lt_NL2SP
22677 22910
@@ -22715,7 +22948,7 @@ index b124acf9259..e4075ef3a2c 100755
22715 # A symbol stripping program. 22948 # A symbol stripping program.
22716 STRIP=$lt_STRIP 22949 STRIP=$lt_STRIP
22717 22950
22718@@ -13189,6 +13885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 22951@@ -13220,6 +13912,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. 22952 # 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 22953 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
22721 22954
@@ -22728,7 +22961,7 @@ index b124acf9259..e4075ef3a2c 100755
22728 # The name of the directory that contains temporary libtool files. 22961 # The name of the directory that contains temporary libtool files.
22729 objdir=$objdir 22962 objdir=$objdir
22730 22963
22731@@ -13198,6 +13900,9 @@ MAGIC_CMD=$MAGIC_CMD 22964@@ -13229,6 +13927,9 @@ MAGIC_CMD=$MAGIC_CMD
22732 # Must we lock files when doing compilation? 22965 # Must we lock files when doing compilation?
22733 need_locks=$lt_need_locks 22966 need_locks=$lt_need_locks
22734 22967
@@ -22738,7 +22971,7 @@ index b124acf9259..e4075ef3a2c 100755
22738 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 22971 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
22739 DSYMUTIL=$lt_DSYMUTIL 22972 DSYMUTIL=$lt_DSYMUTIL
22740 22973
22741@@ -13312,12 +14017,12 @@ with_gcc=$GCC 22974@@ -13343,12 +14044,12 @@ with_gcc=$GCC
22742 # Compiler flag to turn off builtin functions. 22975 # Compiler flag to turn off builtin functions.
22743 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 22976 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
22744 22977
@@ -22754,7 +22987,7 @@ index b124acf9259..e4075ef3a2c 100755
22754 # Compiler flag to prevent dynamic linking. 22987 # Compiler flag to prevent dynamic linking.
22755 link_static_flag=$lt_lt_prog_compiler_static 22988 link_static_flag=$lt_lt_prog_compiler_static
22756 22989
22757@@ -13404,9 +14109,6 @@ inherit_rpath=$inherit_rpath 22990@@ -13435,9 +14136,6 @@ inherit_rpath=$inherit_rpath
22758 # Whether libtool must link a program against all its dependency libraries. 22991 # Whether libtool must link a program against all its dependency libraries.
22759 link_all_deplibs=$link_all_deplibs 22992 link_all_deplibs=$link_all_deplibs
22760 22993
@@ -22764,7 +22997,7 @@ index b124acf9259..e4075ef3a2c 100755
22764 # Set to "yes" if exported symbols are required. 22997 # Set to "yes" if exported symbols are required.
22765 always_export_symbols=$always_export_symbols 22998 always_export_symbols=$always_export_symbols
22766 22999
22767@@ -13422,6 +14124,9 @@ include_expsyms=$lt_include_expsyms 23000@@ -13453,6 +14151,9 @@ include_expsyms=$lt_include_expsyms
22768 # Commands necessary for linking programs (against libraries) with templates. 23001 # Commands necessary for linking programs (against libraries) with templates.
22769 prelink_cmds=$lt_prelink_cmds 23002 prelink_cmds=$lt_prelink_cmds
22770 23003
@@ -22774,7 +23007,7 @@ index b124acf9259..e4075ef3a2c 100755
22774 # Specify filename containing input files. 23007 # Specify filename containing input files.
22775 file_list_spec=$lt_file_list_spec 23008 file_list_spec=$lt_file_list_spec
22776 23009
22777@@ -13454,210 +14159,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 23010@@ -13485,210 +14186,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
22778 # if finds mixed CR/LF and LF-only lines. Since sed operates in 23011 # 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 23012 # text mode, it properly converts lines to CR/LF. This bash problem
22780 # is reportedly fixed, but why not run on old versions too? 23013 # is reportedly fixed, but why not run on old versions too?
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index c3a95e653a..0e4790577a 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,4 +1,4 @@
1From 0e026a8758a5416b548de21d5245477cf8e33ed2 Mon Sep 17 00:00:00 2001 1From ff256618bf85acca889920a1fb63ddea64cc98bc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:42:38 +0000 3Date: Mon, 2 Mar 2015 01:42:38 +0000
4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled
diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
index 824d9d4605..6afd37aafc 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,4 +1,4 @@
1From 9d41698ca97b2c5c20ac83147de1f02d385fa66f Mon Sep 17 00:00:00 2001 1From 4b612f902c596838ab260194f840a466f8291618 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 6 Mar 2017 23:33:27 -0800 3Date: Mon, 6 Mar 2017 23:33:27 -0800
4Subject: [PATCH] sync with OE libtool changes 4Subject: [PATCH] sync with OE libtool changes
diff --git a/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch
index 0602c803db..135cd0f9ad 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,4 +1,4 @@
1From 805e3ce0c20bee5049ff167ab6f620a230c6db51 Mon Sep 17 00:00:00 2001 1From 707a5d49ecaa4fd722176d764251360a44fc5655 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Apr 2020 14:17:20 -0700 3Date: Wed, 15 Apr 2020 14:17:20 -0700
4Subject: [PATCH] Check for clang before checking gcc version 4Subject: [PATCH] Check for clang before checking gcc version
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 2 files changed, 2 insertions(+), 2 deletions(-) 18 2 files changed, 2 insertions(+), 2 deletions(-)
19 19
20diff --git a/configure b/configure 20diff --git a/configure b/configure
21index 7b369071141..7da69e27ce9 100755 21index e8ba1a1d3de..e00d4764583 100755
22--- a/configure 22--- a/configure
23+++ b/configure 23+++ b/configure
24@@ -5093,7 +5093,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 24@@ -5275,7 +5275,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 7b369071141..7da69e27ce9 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 92f01fb3ed7..e99d67ab86b 100644 34index 3a8a3ae1f3b..c7f08b802d0 100644
35--- a/configure.ac 35--- a/configure.ac
36+++ b/configure.ac 36+++ b/configure.ac
37@@ -1311,7 +1311,7 @@ if test "$GCC" = yes; then 37@@ -1309,7 +1309,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([
diff --git a/meta/recipes-devtools/binutils/binutils/0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch b/meta/recipes-devtools/binutils/binutils/0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch
deleted file mode 100644
index b4880e0d14..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch
+++ /dev/null
@@ -1,183 +0,0 @@
1From a50c11a7a47b26e6a3e095dfb72aa2e465919fb6 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Fri, 5 Mar 2021 17:06:59 +0000
4Subject: [PATCH] Add support for the DW_FORM_strx* forms to the BFD library.
5
6 PR 27521
7 * dwarf2.c (is_str_attr): Add DW_FORM_strx* forms.
8 (read_indexed_string): Placeholder function.
9 (read_attribute_value): Handle DW_FORM_strx* and DW_FORM_addrx*
10 forms.
11
12Upstream-Status: Backport [https://sourceware.org/bugzilla/show_bug.cgi?id=27521]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 bfd/dwarf2.c | 105 ++++++++++++++++++++++++++++++++-------------------
16 1 file changed, 67 insertions(+), 38 deletions(-)
17
18diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
19index 5651696c0f7..5ffcd93f54c 100644
20--- a/bfd/dwarf2.c
21+++ b/bfd/dwarf2.c
22@@ -1160,8 +1160,23 @@ read_abbrevs (bfd *abfd, bfd_uint64_t offset, struct dwarf2_debug *stash,
23 static inline bfd_boolean
24 is_str_attr (enum dwarf_form form)
25 {
26- return (form == DW_FORM_string || form == DW_FORM_strp
27- || form == DW_FORM_line_strp || form == DW_FORM_GNU_strp_alt);
28+ return (form == DW_FORM_string
29+ || form == DW_FORM_strp
30+ || form == DW_FORM_strx
31+ || form == DW_FORM_strx1
32+ || form == DW_FORM_strx2
33+ || form == DW_FORM_strx3
34+ || form == DW_FORM_strx4
35+ || form == DW_FORM_line_strp
36+ || form == DW_FORM_GNU_strp_alt);
37+}
38+
39+static const char *
40+read_indexed_string (bfd_uint64_t index ATTRIBUTE_UNUSED,
41+ struct comp_unit * unit ATTRIBUTE_UNUSED)
42+{
43+ /* FIXME: Add support for indexed strings. */
44+ return "<indexed strings not yet supported>";
45 }
46
47 /* Read and fill in the value of attribute ATTR as described by FORM.
48@@ -1192,6 +1207,9 @@ read_attribute_value (struct attribute * attr,
49
50 switch (form)
51 {
52+ case DW_FORM_flag_present:
53+ attr->u.val = 1;
54+ break;
55 case DW_FORM_ref_addr:
56 /* DW_FORM_ref_addr is an address in DWARF2, and an offset in
57 DWARF3. */
58@@ -1237,15 +1255,32 @@ read_attribute_value (struct attribute * attr,
59 info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);
60 attr->u.blk = blk;
61 break;
62+ case DW_FORM_ref1:
63+ case DW_FORM_flag:
64+ case DW_FORM_data1:
65+ case DW_FORM_addrx1:
66+ attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end);
67+ info_ptr += 1;
68+ break;
69 case DW_FORM_data2:
70+ case DW_FORM_ref2:
71 attr->u.val = read_2_bytes (abfd, info_ptr, info_ptr_end);
72 info_ptr += 2;
73 break;
74+ case DW_FORM_addrx3:
75+ attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end);
76+ attr->u.val &= 0xffffff;
77+ info_ptr += 3;
78+ break;
79+ case DW_FORM_ref4:
80 case DW_FORM_data4:
81+ case DW_FORM_addrx4:
82 attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end);
83 info_ptr += 4;
84 break;
85 case DW_FORM_data8:
86+ case DW_FORM_ref8:
87+ case DW_FORM_ref_sig8:
88 attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end);
89 info_ptr += 8;
90 break;
91@@ -1265,6 +1300,33 @@ read_attribute_value (struct attribute * attr,
92 attr->u.str = read_alt_indirect_string (unit, info_ptr, info_ptr_end, &bytes_read);
93 info_ptr += bytes_read;
94 break;
95+ case DW_FORM_strx1:
96+ attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end);
97+ info_ptr += 1;
98+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit);
99+ break;
100+ case DW_FORM_strx2:
101+ attr->u.val = read_2_bytes (abfd, info_ptr, info_ptr_end);
102+ info_ptr += 2;
103+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit);
104+ break;
105+ case DW_FORM_strx3:
106+ attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end);
107+ info_ptr += 3;
108+ attr->u.val &= 0xffffff;
109+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit);
110+ break;
111+ case DW_FORM_strx4:
112+ attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end);
113+ info_ptr += 4;
114+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit);
115+ break;
116+ case DW_FORM_strx:
117+ attr->u.val = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
118+ FALSE, info_ptr_end);
119+ info_ptr += bytes_read;
120+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit);
121+ break;
122 case DW_FORM_exprloc:
123 case DW_FORM_block:
124 amt = sizeof (struct dwarf_block);
125@@ -1287,48 +1349,14 @@ read_attribute_value (struct attribute * attr,
126 info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);
127 attr->u.blk = blk;
128 break;
129- case DW_FORM_data1:
130- attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end);
131- info_ptr += 1;
132- break;
133- case DW_FORM_flag:
134- attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end);
135- info_ptr += 1;
136- break;
137- case DW_FORM_flag_present:
138- attr->u.val = 1;
139- break;
140 case DW_FORM_sdata:
141 attr->u.sval = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
142 TRUE, info_ptr_end);
143 info_ptr += bytes_read;
144 break;
145- case DW_FORM_udata:
146- attr->u.val = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
147- FALSE, info_ptr_end);
148- info_ptr += bytes_read;
149- break;
150- case DW_FORM_ref1:
151- attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end);
152- info_ptr += 1;
153- break;
154- case DW_FORM_ref2:
155- attr->u.val = read_2_bytes (abfd, info_ptr, info_ptr_end);
156- info_ptr += 2;
157- break;
158- case DW_FORM_ref4:
159- attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end);
160- info_ptr += 4;
161- break;
162- case DW_FORM_ref8:
163- attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end);
164- info_ptr += 8;
165- break;
166- case DW_FORM_ref_sig8:
167- attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end);
168- info_ptr += 8;
169- break;
170 case DW_FORM_ref_udata:
171+ case DW_FORM_udata:
172+ case DW_FORM_addrx:
173 attr->u.val = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read,
174 FALSE, info_ptr_end);
175 info_ptr += bytes_read;
176@@ -1361,6 +1389,7 @@ read_attribute_value (struct attribute * attr,
177 info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk);
178 attr->u.blk = blk;
179 break;
180+
181 default:
182 _bfd_error_handler (_("DWARF error: invalid or unhandled FORM value: %#x"),
183 form);
diff --git a/meta/recipes-devtools/binutils/binutils/0018-Add-DWARF-5-support-in-gold.patch b/meta/recipes-devtools/binutils/binutils/0018-Add-DWARF-5-support-in-gold.patch
deleted file mode 100644
index 353b680857..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0018-Add-DWARF-5-support-in-gold.patch
+++ /dev/null
@@ -1,1374 +0,0 @@
1From 29dab7648672342418a9d32767e3b3182d9e6a30 Mon Sep 17 00:00:00 2001
2From: Cary Coutant <ccoutant@gmail.com>
3Date: Wed, 17 Mar 2021 21:31:15 -0700
4Subject: [PATCH] Add DWARF 5 support in gold.
5
6elfcpp/
7 PR gold/27246
8 * dwarf.h (enum DW_LNCT): Add line number table content type codes.
9 (enum DW_LINE_OPS): Reformat.
10 (enum DW_LINE_EXTENDED_OPS): Reformat.
11 (enum DW_CHILDREN): Reformat.
12 (enum DW_RLE): Add range list entry types.
13 (enum DW_SECT): Update values for DWARF 5.
14
15gold/
16 PR gold/27246
17 * dwarf_reader.cc (Dwarf_abbrev_table::do_get_abbrev): Handle
18 DW_FORM_implicit_const.
19 (Dwarf_ranges_table::read_ranges_table): Add version parameter;
20 Adjust all callers. Look for .debug_rnglists section if DWARF 5.
21 (Dwarf_ranges_table::read_range_list_v5): New method.
22 (Dwarf_die::read_attributes): Handle new DWARF 5 DW_FORM codes.
23 (Dwarf_die::skip_attributes): Likewise.
24 (Dwarf_info_reader::do_parse): Support DWARF 5 unit header format.
25 (Dwarf_info_reader::read_3bytes_from_pointer): New method.
26 (Sized_dwarf_line_info::Sized_dwarf_line_info): Initialize
27 str_buffer_, str_buffer_start, reloc_map_, line_number_map_.
28 Look for .debug_line_str section.
29 (Sized_dwarf_line_info::read_header_prolog): Support DWARF 5 prolog.
30 (Sized_dwarf_line_info::read_header_tables): Rename to...
31 (Sized_dwarf_line_info::read_header_tables_v2): ... this.
32 (Sized_dwarf_line_info::read_header_tables_v5): New method.
33 (Sized_dwarf_line_info::process_one_opcode): Insert missing "this->".
34 Change advance_line to signed int64_t.
35 (Sized_dwarf_line_info::read_lines): Add endptr parameter; adjust
36 callers. Insert missing "this->".
37 (Sized_dwarf_line_info::read_line_mappings): Support DWARF 5.
38 (Sized_dwarf_line_info::do_addr2line): Add debug code.
39 * dwarf_reader.h (Dwarf_abbrev_table::Attribute): Add implicit_const
40 field. Adjust constructor.
41 (Dwarf_abbrev_table::add_sttribute): Add implicit_const parameter.
42 (Dwarf_ranges_table::read_ranges_table): Add version parameter.
43 (Dwarf_ranges_table::read_range_list_v5): New method.
44 (Dwarf_die): Remove unused attr_off field.
45 (Dwarf_info_reader::Dwarf_info_reader): Initialize unit_type_ field.
46 (Dwarf_info_reader::is_type_unit): New method.
47 (Dwarf_info_reader::read_3bytes_from_pointer): New method.
48 (Dwarf_info_reader::read_range_list): Call read_range_list_v5 for
49 DWARF 5 range lists.
50 (Dwarf_info_reader::is_type_unit_): Remove.
51 (Dwarf_info_reader::unit_type_): New field.
52 (Sized_dwarf_line_info::~Sized_dwarf_line_info): Delete
53 str_buffer_start_.
54 (Sized_dwarf_line_info::read_header_tables): Rename to...
55 (Sized_dwarf_line_info::read_header_tables_v2): ... this.
56 (Sized_dwarf_line_info::read_header_tables_v5): New method.
57 (Sized_dwarf_line_info::read_lines): Add endptr parameter.
58 (Sized_dwarf_line_info::Dwarf_line_infoHeader): Add address_size field.
59 (Sized_dwarf_line_info::str_buffer_): New field.
60 (Sized_dwarf_line_info::str_buffer_end_): New field.
61 (Sized_dwarf_line_info::str_buffer_start_): New field.
62 (Sized_dwarf_line_info::end_of_header_length_): New field.
63 (Sized_dwarf_line_info::end_of_unit_): New field.
64
65Upstream-Status: Backport [5cde809b7b9 Add DWARF 5 support in gold.]
66
67Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
68---
69 elfcpp/dwarf.h | 89 +++++--
70 gold/dwarf_reader.cc | 591 +++++++++++++++++++++++++++++++++++++------
71 gold/dwarf_reader.h | 103 ++++++--
72 3 files changed, 654 insertions(+), 129 deletions(-)
73
74diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h
75index e24347f8481..c9a9e02369c 100644
76--- a/elfcpp/dwarf.h
77+++ b/elfcpp/dwarf.h
78@@ -152,35 +152,48 @@ enum DW_EH_PE
79 DW_EH_PE_indirect = 0x80
80 };
81
82+// Line number table content type codes.
83+
84+enum DW_LNCT
85+{
86+ DW_LNCT_path = 0x1,
87+ DW_LNCT_directory_index = 0x2,
88+ DW_LNCT_timestamp = 0x3,
89+ DW_LNCT_size = 0x4,
90+ DW_LNCT_MD5 = 0x5,
91+ DW_LNCT_lo_user = 0x2000,
92+ DW_LNCT_hi_user = 0x3fff
93+};
94+
95 // Line number opcodes.
96
97 enum DW_LINE_OPS
98 {
99- DW_LNS_extended_op = 0,
100- DW_LNS_copy = 1,
101- DW_LNS_advance_pc = 2,
102- DW_LNS_advance_line = 3,
103- DW_LNS_set_file = 4,
104- DW_LNS_set_column = 5,
105- DW_LNS_negate_stmt = 6,
106- DW_LNS_set_basic_block = 7,
107- DW_LNS_const_add_pc = 8,
108- DW_LNS_fixed_advance_pc = 9,
109+ DW_LNS_extended_op = 0x00,
110+ DW_LNS_copy = 0x01,
111+ DW_LNS_advance_pc = 0x02,
112+ DW_LNS_advance_line = 0x03,
113+ DW_LNS_set_file = 0x04,
114+ DW_LNS_set_column = 0x05,
115+ DW_LNS_negate_stmt = 0x06,
116+ DW_LNS_set_basic_block = 0x07,
117+ DW_LNS_const_add_pc = 0x08,
118+ DW_LNS_fixed_advance_pc = 0x09,
119 // DWARF 3.
120- DW_LNS_set_prologue_end = 10,
121- DW_LNS_set_epilogue_begin = 11,
122- DW_LNS_set_isa = 12
123+ DW_LNS_set_prologue_end = 0x0a,
124+ DW_LNS_set_epilogue_begin = 0x0b,
125+ DW_LNS_set_isa = 0x0c
126 };
127
128 // Line number extended opcodes.
129
130 enum DW_LINE_EXTENDED_OPS
131 {
132- DW_LNE_end_sequence = 1,
133- DW_LNE_set_address = 2,
134- DW_LNE_define_file = 3,
135+ DW_LNE_end_sequence = 0x01,
136+ DW_LNE_set_address = 0x02,
137+ DW_LNE_define_file = 0x03,
138 // DWARF4.
139- DW_LNE_set_discriminator = 4,
140+ DW_LNE_set_discriminator = 0x04,
141 // HP extensions.
142 DW_LNE_HP_negate_is_UV_update = 0x11,
143 DW_LNE_HP_push_context = 0x12,
144@@ -191,13 +204,15 @@ enum DW_LINE_EXTENDED_OPS
145 DW_LNE_HP_negate_post_semantics = 0x17,
146 DW_LNE_HP_negate_function_exit = 0x18,
147 DW_LNE_HP_negate_front_end_logical = 0x19,
148- DW_LNE_HP_define_proc = 0x20
149+ DW_LNE_HP_define_proc = 0x20,
150+ DW_LNE_lo_user = 0x80,
151+ DW_LNE_hi_user = 0xff
152 };
153
154 enum DW_CHILDREN
155 {
156- DW_CHILDREN_no =0x00,
157- DW_CHILDREN_yes =0x01
158+ DW_CHILDREN_no = 0,
159+ DW_CHILDREN_yes = 1
160 };
161
162 // Source language names and codes.
163@@ -247,20 +262,38 @@ enum DW_LANG
164 DW_LANG_HP_Assembler = 0x8007
165 };
166
167+// Range list entry kinds in .debug_rnglists* section.
168+
169+enum DW_RLE
170+{
171+ DW_RLE_end_of_list = 0x00,
172+ DW_RLE_base_addressx = 0x01,
173+ DW_RLE_startx_endx = 0x02,
174+ DW_RLE_startx_length = 0x03,
175+ DW_RLE_offset_pair = 0x04,
176+ DW_RLE_base_address = 0x05,
177+ DW_RLE_start_end = 0x06,
178+ DW_RLE_start_length = 0x07
179+};
180+
181 // DWARF section identifiers used in the package format.
182 // Extensions for Fission. See http://gcc.gnu.org/wiki/DebugFissionDWP.
183+// Added (with changes) in DWARF 5.
184
185 enum DW_SECT
186 {
187- DW_SECT_INFO = 1,
188- DW_SECT_TYPES = 2,
189- DW_SECT_ABBREV = 3,
190- DW_SECT_LINE = 4,
191- DW_SECT_LOC = 5,
192+ DW_SECT_INFO = 1,
193+ DW_SECT_ABBREV = 3,
194+ DW_SECT_LINE = 4,
195+ DW_SECT_LOCLISTS = 5,
196 DW_SECT_STR_OFFSETS = 6,
197- DW_SECT_MACINFO = 7,
198- DW_SECT_MACRO = 8,
199- DW_SECT_MAX = DW_SECT_MACRO,
200+ DW_SECT_MACINFO = 7,
201+ DW_SECT_RNGLISTS = 8,
202+ DW_SECT_MAX = DW_SECT_RNGLISTS,
203+ // These were used only for the experimental Fission support in DWARF 4.
204+ DW_SECT_TYPES = 2,
205+ DW_SECT_LOC = 5,
206+ DW_SECT_MACRO = 8
207 };
208
209 } // End namespace elfcpp.
210diff --git a/gold/dwarf_reader.cc b/gold/dwarf_reader.cc
211index f0e6b89bde2..83a0114ed39 100644
212--- a/gold/dwarf_reader.cc
213+++ b/gold/dwarf_reader.cc
214@@ -26,6 +26,7 @@
215 #include <utility>
216 #include <vector>
217
218+#include "debug.h"
219 #include "elfcpp_swap.h"
220 #include "dwarf.h"
221 #include "object.h"
222@@ -275,6 +276,14 @@ Dwarf_abbrev_table::do_get_abbrev(unsigned int code)
223 uint64_t form = read_unsigned_LEB_128(this->buffer_pos_, &len);
224 this->buffer_pos_ += len;
225
226+ // For DW_FORM_implicit_const, read the constant.
227+ int64_t implicit_const = 0;
228+ if (form == elfcpp::DW_FORM_implicit_const)
229+ {
230+ implicit_const = read_signed_LEB_128(this->buffer_pos_, &len);
231+ this->buffer_pos_ += len;
232+ }
233+
234 // A (0,0) pair terminates the list.
235 if (attr == 0 && form == 0)
236 break;
237@@ -282,7 +291,7 @@ Dwarf_abbrev_table::do_get_abbrev(unsigned int code)
238 if (attr == elfcpp::DW_AT_sibling)
239 entry->has_sibling_attribute = true;
240
241- entry->add_attribute(attr, form);
242+ entry->add_attribute(attr, form, implicit_const);
243 }
244
245 this->store_abbrev(nextcode, entry);
246@@ -302,8 +311,16 @@ Dwarf_ranges_table::read_ranges_table(
247 Relobj* object,
248 const unsigned char* symtab,
249 off_t symtab_size,
250- unsigned int ranges_shndx)
251+ unsigned int ranges_shndx,
252+ unsigned int version)
253 {
254+ const std::string section_name(version < 5
255+ ? ".debug_ranges"
256+ : ".debug_rnglists");
257+ const std::string compressed_section_name(version < 5
258+ ? ".zdebug_ranges"
259+ : ".zdebug_rnglists");
260+
261 // If we've already read this abbrev table, return immediately.
262 if (this->ranges_shndx_ > 0
263 && this->ranges_shndx_ == ranges_shndx)
264@@ -318,7 +335,7 @@ Dwarf_ranges_table::read_ranges_table(
265 for (unsigned int i = 1; i < object->shnum(); ++i)
266 {
267 std::string name = object->section_name(i);
268- if (name == ".debug_ranges" || name == ".zdebug_ranges")
269+ if (name == section_name || name == compressed_section_name)
270 {
271 ranges_shndx = i;
272 this->output_section_offset_ = object->output_section_offset(i);
273@@ -393,7 +410,7 @@ Dwarf_ranges_table::read_range_list(
274 {
275 Dwarf_range_list* ranges;
276
277- if (!this->read_ranges_table(object, symtab, symtab_size, ranges_shndx))
278+ if (!this->read_ranges_table(object, symtab, symtab_size, ranges_shndx, 4))
279 return NULL;
280
281 // Correct the offset. For incremental update links, we have a
282@@ -459,6 +476,125 @@ Dwarf_ranges_table::read_range_list(
283 return ranges;
284 }
285
286+// Read a DWARF 5 range list from section RANGES_SHNDX at offset RANGES_OFFSET.
287+
288+Dwarf_range_list*
289+Dwarf_ranges_table::read_range_list_v5(
290+ Relobj* object,
291+ const unsigned char* symtab,
292+ off_t symtab_size,
293+ unsigned int addr_size,
294+ unsigned int ranges_shndx,
295+ off_t offset)
296+{
297+ Dwarf_range_list* ranges;
298+
299+ if (!this->read_ranges_table(object, symtab, symtab_size, ranges_shndx, 5))
300+ return NULL;
301+
302+ ranges = new Dwarf_range_list();
303+ off_t base = 0;
304+ unsigned int shndx0 = 0;
305+
306+ // Correct the offset. For incremental update links, we have a
307+ // relocated offset that is relative to the output section, but
308+ // here we need an offset relative to the input section.
309+ offset -= this->output_section_offset_;
310+
311+ // Read the range list at OFFSET.
312+ const unsigned char* prle = this->ranges_buffer_ + offset;
313+ while (prle < this->ranges_buffer_end_)
314+ {
315+ off_t start;
316+ off_t end;
317+ unsigned int shndx1 = 0;
318+ unsigned int shndx2 = 0;
319+ size_t len;
320+
321+ // Read the entry type.
322+ unsigned int rle_type = *prle++;
323+ offset += 1;
324+
325+ if (rle_type == elfcpp::DW_RLE_end_of_list)
326+ break;
327+
328+ switch (rle_type)
329+ {
330+ case elfcpp::DW_RLE_base_address:
331+ if (addr_size == 4)
332+ base = this->dwinfo_->read_from_pointer<32>(prle);
333+ else
334+ base = this->dwinfo_->read_from_pointer<64>(prle);
335+ if (this->ranges_reloc_mapper_ != NULL)
336+ shndx0 = this->lookup_reloc(offset, &base);
337+ prle += addr_size;
338+ offset += addr_size;
339+ break;
340+
341+ case elfcpp::DW_RLE_offset_pair:
342+ start = read_unsigned_LEB_128(prle, &len);
343+ prle += len;
344+ offset += len;
345+ end = read_unsigned_LEB_128(prle, &len);
346+ prle += len;
347+ offset += len;
348+ if (shndx0 == 0 || object->is_section_included(shndx0))
349+ ranges->add(shndx0, base + start, base + end);
350+ break;
351+
352+ case elfcpp::DW_RLE_start_end:
353+ if (addr_size == 4)
354+ {
355+ start = this->dwinfo_->read_from_pointer<32>(prle);
356+ end = this->dwinfo_->read_from_pointer<32>(prle + 4);
357+ }
358+ else
359+ {
360+ start = this->dwinfo_->read_from_pointer<64>(prle);
361+ end = this->dwinfo_->read_from_pointer<64>(prle + 8);
362+ }
363+ if (this->ranges_reloc_mapper_ != NULL)
364+ {
365+ shndx1 = this->lookup_reloc(offset, &start);
366+ shndx2 = this->lookup_reloc(offset + addr_size, &end);
367+ if (shndx1 != shndx2)
368+ gold_warning(_("%s: DWARF info may be corrupt; offsets in a "
369+ "range list entry are in different sections"),
370+ object->name().c_str());
371+ }
372+ prle += addr_size * 2;
373+ offset += addr_size * 2;
374+ if (shndx1 == 0 || object->is_section_included(shndx1))
375+ ranges->add(shndx1, start, end);
376+ break;
377+
378+ case elfcpp::DW_RLE_start_length:
379+ if (addr_size == 4)
380+ start = this->dwinfo_->read_from_pointer<32>(prle);
381+ else
382+ start = this->dwinfo_->read_from_pointer<64>(prle);
383+ if (this->ranges_reloc_mapper_ != NULL)
384+ shndx1 = this->lookup_reloc(offset, &start);
385+ prle += addr_size;
386+ offset += addr_size;
387+ end = start + read_unsigned_LEB_128(prle, &len);
388+ prle += len;
389+ offset += len;
390+ if (shndx1 == 0 || object->is_section_included(shndx1))
391+ ranges->add(shndx1, start, end);
392+ break;
393+
394+ default:
395+ gold_warning(_("%s: DWARF range list contains "
396+ "unsupported entry type (%d)"),
397+ object->name().c_str(), rle_type);
398+ break;
399+ }
400+ }
401+
402+ return ranges;
403+}
404+
405 // Look for a relocation at offset OFF in the range table,
406 // and return the section index and offset of the target.
407
408@@ -709,7 +845,13 @@ Dwarf_die::read_attributes()
409 case elfcpp::DW_FORM_flag_present:
410 attr_value.val.intval = 1;
411 break;
412+ case elfcpp::DW_FORM_implicit_const:
413+ attr_value.val.intval =
414+ this->abbrev_code_->attributes[i].implicit_const;
415+ break;
416 case elfcpp::DW_FORM_strp:
417+ case elfcpp::DW_FORM_strp_sup:
418+ case elfcpp::DW_FORM_line_strp:
419 {
420 off_t str_off;
421 if (this->dwinfo_->offset_size() == 4)
422@@ -722,6 +864,26 @@ Dwarf_die::read_attributes()
423 attr_value.val.refval = str_off;
424 break;
425 }
426+ case elfcpp::DW_FORM_strx:
427+ case elfcpp::DW_FORM_GNU_str_index:
428+ attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len);
429+ pattr += len;
430+ break;
431+ case elfcpp::DW_FORM_strx1:
432+ attr_value.val.uintval = *pattr++;
433+ break;
434+ case elfcpp::DW_FORM_strx2:
435+ attr_value.val.uintval =
436+ this->dwinfo_->read_from_pointer<16>(&pattr);
437+ break;
438+ case elfcpp::DW_FORM_strx3:
439+ attr_value.val.uintval =
440+ this->dwinfo_->read_3bytes_from_pointer(&pattr);
441+ break;
442+ case elfcpp::DW_FORM_strx4:
443+ attr_value.val.uintval =
444+ this->dwinfo_->read_from_pointer<32>(&pattr);
445+ break;
446 case elfcpp::DW_FORM_sec_offset:
447 {
448 off_t sec_off;
449@@ -747,7 +909,6 @@ Dwarf_die::read_attributes()
450 this->dwinfo_->lookup_reloc(attr_off, &sec_off);
451 attr_value.aux.shndx = shndx;
452 attr_value.val.refval = sec_off;
453- ref_form = true;
454 break;
455 }
456 case elfcpp::DW_FORM_ref_addr:
457@@ -815,6 +976,7 @@ Dwarf_die::read_attributes()
458 break;
459 }
460 case elfcpp::DW_FORM_ref4:
461+ case elfcpp::DW_FORM_ref_sup4:
462 {
463 off_t sec_off;
464 sec_off = this->dwinfo_->read_from_pointer<32>(&pattr);
465@@ -835,11 +997,20 @@ Dwarf_die::read_attributes()
466 attr_value.val.intval = sec_off;
467 break;
468 }
469+ case elfcpp::DW_FORM_data16:
470+ {
471+ // For now, treat this as a 16-byte block.
472+ attr_value.val.blockval = pattr;
473+ attr_value.aux.blocklen = 16;
474+ pattr += 16;
475+ break;
476+ }
477 case elfcpp::DW_FORM_ref_sig8:
478 attr_value.val.uintval =
479 this->dwinfo_->read_from_pointer<64>(&pattr);
480 break;
481 case elfcpp::DW_FORM_ref8:
482+ case elfcpp::DW_FORM_ref_sup8:
483 {
484 off_t sec_off;
485 sec_off = this->dwinfo_->read_from_pointer<64>(&pattr);
486@@ -856,11 +1027,29 @@ Dwarf_die::read_attributes()
487 pattr += len;
488 break;
489 case elfcpp::DW_FORM_udata:
490+ attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len);
491+ pattr += len;
492+ break;
493+ case elfcpp::DW_FORM_addrx:
494 case elfcpp::DW_FORM_GNU_addr_index:
495- case elfcpp::DW_FORM_GNU_str_index:
496 attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len);
497 pattr += len;
498 break;
499+ case elfcpp::DW_FORM_addrx1:
500+ attr_value.val.uintval = *pattr++;
501+ break;
502+ case elfcpp::DW_FORM_addrx2:
503+ attr_value.val.uintval =
504+ this->dwinfo_->read_from_pointer<16>(&pattr);
505+ break;
506+ case elfcpp::DW_FORM_addrx3:
507+ attr_value.val.uintval =
508+ this->dwinfo_->read_3bytes_from_pointer(&pattr);
509+ break;
510+ case elfcpp::DW_FORM_addrx4:
511+ attr_value.val.uintval =
512+ this->dwinfo_->read_from_pointer<32>(&pattr);
513+ break;
514 case elfcpp::DW_FORM_sdata:
515 attr_value.val.intval = read_signed_LEB_128(pattr, &len);
516 pattr += len;
517@@ -870,6 +1059,11 @@ Dwarf_die::read_attributes()
518 len = strlen(attr_value.val.stringval);
519 pattr += len + 1;
520 break;
521+ case elfcpp::DW_FORM_loclistx:
522+ case elfcpp::DW_FORM_rnglistx:
523+ attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len);
524+ pattr += len;
525+ break;
526 default:
527 return false;
528 }
529@@ -954,9 +1148,12 @@ Dwarf_die::skip_attributes()
530 switch(form)
531 {
532 case elfcpp::DW_FORM_flag_present:
533+ case elfcpp::DW_FORM_implicit_const:
534 break;
535 case elfcpp::DW_FORM_strp:
536 case elfcpp::DW_FORM_sec_offset:
537+ case elfcpp::DW_FORM_strp_sup:
538+ case elfcpp::DW_FORM_line_strp:
539 pattr += this->dwinfo_->offset_size();
540 break;
541 case elfcpp::DW_FORM_addr:
542@@ -993,23 +1190,42 @@ Dwarf_die::skip_attributes()
543 case elfcpp::DW_FORM_data1:
544 case elfcpp::DW_FORM_ref1:
545 case elfcpp::DW_FORM_flag:
546+ case elfcpp::DW_FORM_strx1:
547+ case elfcpp::DW_FORM_addrx1:
548 pattr += 1;
549 break;
550 case elfcpp::DW_FORM_data2:
551 case elfcpp::DW_FORM_ref2:
552+ case elfcpp::DW_FORM_strx2:
553+ case elfcpp::DW_FORM_addrx2:
554 pattr += 2;
555 break;
556+ case elfcpp::DW_FORM_strx3:
557+ case elfcpp::DW_FORM_addrx3:
558+ pattr += 3;
559+ break;
560 case elfcpp::DW_FORM_data4:
561 case elfcpp::DW_FORM_ref4:
562+ case elfcpp::DW_FORM_ref_sup4:
563+ case elfcpp::DW_FORM_strx4:
564+ case elfcpp::DW_FORM_addrx4:
565 pattr += 4;
566 break;
567 case elfcpp::DW_FORM_data8:
568 case elfcpp::DW_FORM_ref8:
569 case elfcpp::DW_FORM_ref_sig8:
570+ case elfcpp::DW_FORM_ref_sup8:
571 pattr += 8;
572 break;
573+ case elfcpp::DW_FORM_data16:
574+ pattr += 16;
575+ break;
576 case elfcpp::DW_FORM_ref_udata:
577 case elfcpp::DW_FORM_udata:
578+ case elfcpp::DW_FORM_addrx:
579+ case elfcpp::DW_FORM_strx:
580+ case elfcpp::DW_FORM_loclistx:
581+ case elfcpp::DW_FORM_rnglistx:
582 case elfcpp::DW_FORM_GNU_addr_index:
583 case elfcpp::DW_FORM_GNU_str_index:
584 read_unsigned_LEB_128(pattr, &len);
585@@ -1313,6 +1529,13 @@ Dwarf_info_reader::do_parse()
586 elfcpp::Swap_unaligned<16, big_endian>::readval(pinfo);
587 pinfo += 2;
588
589+ // DWARF 5: Read the unit type (1 byte) and address size (1 byte).
590+ if (this->cu_version_ >= 5)
591+ {
592+ this->unit_type_ = *pinfo++;
593+ this->address_size_ = *pinfo++;
594+ }
595+
596 // Read debug_abbrev_offset (4 or 8 bytes).
597 if (this->offset_size_ == 4)
598 abbrev_offset = elfcpp::Swap_unaligned<32, big_endian>::readval(pinfo);
599@@ -1333,13 +1556,14 @@ Dwarf_info_reader::do_parse()
600 }
601 pinfo += this->offset_size_;
602
603- // Read address_size (1 byte).
604- this->address_size_ = *pinfo++;
605+ // DWARF 2-4: Read address_size (1 byte).
606+ if (this->cu_version_ < 5)
607+ this->address_size_ = *pinfo++;
608
609 // For type units, read the two extra fields.
610 uint64_t signature = 0;
611 off_t type_offset = 0;
612- if (this->is_type_unit_)
613+ if (this->is_type_unit())
614 {
615 if (!this->check_buffer(pinfo + 8 + this->offset_size_))
616 break;
617@@ -1369,7 +1593,7 @@ Dwarf_info_reader::do_parse()
618 if (root_die.tag() != 0)
619 {
620 // Visit the CU or TU.
621- if (this->is_type_unit_)
622+ if (this->is_type_unit())
623 this->visit_type_unit(section_offset + this->cu_offset_,
624 cu_end - cu_start, type_offset, signature,
625 &root_die);
626@@ -1460,6 +1684,19 @@ Dwarf_info_reader::read_from_pointer(const unsigned char** source)
627 return return_value;
628 }
629
630+// Read a 3-byte integer. Update SOURCE after read.
631+inline typename elfcpp::Valtype_base<32>::Valtype
632+Dwarf_info_reader::read_3bytes_from_pointer(const unsigned char** source)
633+{
634+ typename elfcpp::Valtype_base<32>::Valtype return_value;
635+ if (this->object_->is_big_endian())
636+ return_value = ((*source)[0] << 16) | ((*source)[1] << 8) | (*source)[2];
637+ else
638+ return_value = ((*source)[2] << 16) | ((*source)[1] << 8) | (*source)[0];
639+ *source += 3;
640+ return return_value;
641+}
642+
643 // Look for a relocation at offset ATTR_OFF in the dwarf info,
644 // and return the section index and offset of the target.
645
646@@ -1561,27 +1798,40 @@ Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info(
647 Object* object,
648 unsigned int read_shndx)
649 : data_valid_(false), buffer_(NULL), buffer_start_(NULL),
650+ str_buffer_(NULL), str_buffer_start_(NULL),
651 reloc_mapper_(NULL), symtab_buffer_(NULL), directories_(), files_(),
652- current_header_index_(-1)
653+ current_header_index_(-1), reloc_map_(), line_number_map_()
654 {
655- unsigned int debug_shndx;
656+ unsigned int debug_line_shndx = 0;
657+ unsigned int debug_line_str_shndx = 0;
658
659- for (debug_shndx = 1; debug_shndx < object->shnum(); ++debug_shndx)
660+ for (unsigned int i = 1; i < object->shnum(); ++i)
661 {
662+ section_size_type buffer_size;
663+ bool is_new = false;
664+
665 // FIXME: do this more efficiently: section_name() isn't super-fast
666- std::string name = object->section_name(debug_shndx);
667+ std::string name = object->section_name(i);
668 if (name == ".debug_line" || name == ".zdebug_line")
669 {
670- section_size_type buffer_size;
671- bool is_new = false;
672- this->buffer_ = object->decompressed_section_contents(debug_shndx,
673- &buffer_size,
674- &is_new);
675+ this->buffer_ =
676+ object->decompressed_section_contents(i, &buffer_size, &is_new);
677 if (is_new)
678 this->buffer_start_ = this->buffer_;
679 this->buffer_end_ = this->buffer_ + buffer_size;
680- break;
681+ debug_line_shndx = i;
682+ }
683+ else if (name == ".debug_line_str" || name == ".zdebug_line_str")
684+ {
685+ this->str_buffer_ =
686+ object->decompressed_section_contents(i, &buffer_size, &is_new);
687+ if (is_new)
688+ this->str_buffer_start_ = this->str_buffer_;
689+ this->str_buffer_end_ = this->str_buffer_ + buffer_size;
690+ debug_line_str_shndx = i;
691 }
692+ if (debug_line_shndx > 0 && debug_line_str_shndx > 0)
693+ break;
694 }
695 if (this->buffer_ == NULL)
696 return;
697@@ -1594,7 +1844,7 @@ Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info(
698 unsigned int reloc_sh_type = object->section_type(i);
699 if ((reloc_sh_type == elfcpp::SHT_REL
700 || reloc_sh_type == elfcpp::SHT_RELA)
701- && object->section_info(i) == debug_shndx)
702+ && object->section_info(i) == debug_line_shndx)
703 {
704 reloc_shndx = i;
705 this->track_relocs_type_ = reloc_sh_type;
706@@ -1640,65 +1890,80 @@ Sized_dwarf_line_info<size, big_endian>::read_header_prolog(
707 uint32_t initial_length = elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr);
708 lineptr += 4;
709
710- // In DWARF2/3, if the initial length is all 1 bits, then the offset
711+ // In DWARF, if the initial length is all 1 bits, then the offset
712 // size is 8 and we need to read the next 8 bytes for the real length.
713 if (initial_length == 0xffffffff)
714 {
715- header_.offset_size = 8;
716+ this->header_.offset_size = 8;
717 initial_length = elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr);
718 lineptr += 8;
719 }
720 else
721- header_.offset_size = 4;
722+ this->header_.offset_size = 4;
723
724- header_.total_length = initial_length;
725+ this->header_.total_length = initial_length;
726
727- gold_assert(lineptr + header_.total_length <= buffer_end_);
728+ this->end_of_unit_ = lineptr + initial_length;
729+ gold_assert(this->end_of_unit_ <= buffer_end_);
730
731- header_.version = elfcpp::Swap_unaligned<16, big_endian>::readval(lineptr);
732+ this->header_.version =
733+ elfcpp::Swap_unaligned<16, big_endian>::readval(lineptr);
734 lineptr += 2;
735
736- // Skip address size and segment selector for DWARF5.
737- if (header_.version >= 5)
738- lineptr += 2;
739+ // We can only read versions 2-5 of the DWARF line number table.
740+ // For other versions, just skip the entire line number table.
741+ if (this->header_.version < 2 || this->header_.version > 5)
742+ return this->end_of_unit_;
743
744- if (header_.offset_size == 4)
745- header_.prologue_length = elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr);
746+ // DWARF 5 only: address size and segment selector.
747+ if (this->header_.version >= 5)
748+ {
749+ this->header_.address_size = *lineptr;
750+ // We ignore the segment selector.
751+ lineptr += 2;
752+ }
753+
754+ if (this->header_.offset_size == 4)
755+ this->header_.prologue_length =
756+ elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr);
757 else
758- header_.prologue_length = elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr);
759- lineptr += header_.offset_size;
760+ this->header_.prologue_length =
761+ elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr);
762+ lineptr += this->header_.offset_size;
763
764- header_.min_insn_length = *lineptr;
765+ this->end_of_header_length_ = lineptr;
766+
767+ this->header_.min_insn_length = *lineptr;
768 lineptr += 1;
769
770- if (header_.version < 4)
771- header_.max_ops_per_insn = 1;
772+ if (this->header_.version < 4)
773+ this->header_.max_ops_per_insn = 1;
774 else
775 {
776 // DWARF 4 added the maximum_operations_per_instruction field.
777- header_.max_ops_per_insn = *lineptr;
778+ this->header_.max_ops_per_insn = *lineptr;
779 lineptr += 1;
780 // TODO: Add support for values other than 1.
781- gold_assert(header_.max_ops_per_insn == 1);
782+ gold_assert(this->header_.max_ops_per_insn == 1);
783 }
784
785- header_.default_is_stmt = *lineptr;
786+ this->header_.default_is_stmt = *lineptr;
787 lineptr += 1;
788
789- header_.line_base = *reinterpret_cast<const signed char*>(lineptr);
790+ this->header_.line_base = *reinterpret_cast<const signed char*>(lineptr);
791 lineptr += 1;
792
793- header_.line_range = *lineptr;
794+ this->header_.line_range = *lineptr;
795 lineptr += 1;
796
797- header_.opcode_base = *lineptr;
798+ this->header_.opcode_base = *lineptr;
799 lineptr += 1;
800
801- header_.std_opcode_lengths.resize(header_.opcode_base + 1);
802- header_.std_opcode_lengths[0] = 0;
803- for (int i = 1; i < header_.opcode_base; i++)
804+ this->header_.std_opcode_lengths.resize(this->header_.opcode_base + 1);
805+ this->header_.std_opcode_lengths[0] = 0;
806+ for (int i = 1; i < this->header_.opcode_base; i++)
807 {
808- header_.std_opcode_lengths[i] = *lineptr;
809+ this->header_.std_opcode_lengths[i] = *lineptr;
810 lineptr += 1;
811 }
812
813@@ -1707,10 +1972,11 @@ Sized_dwarf_line_info<size, big_endian>::read_header_prolog(
814
815 // The header for a debug_line section is mildly complicated, because
816 // the line info is very tightly encoded.
817+// This routine is for DWARF versions 2, 3, and 4.
818
819 template<int size, bool big_endian>
820 const unsigned char*
821-Sized_dwarf_line_info<size, big_endian>::read_header_tables(
822+Sized_dwarf_line_info<size, big_endian>::read_header_tables_v2(
823 const unsigned char* lineptr)
824 {
825 ++this->current_header_index_;
826@@ -1775,6 +2041,169 @@ Sized_dwarf_line_info<size, big_endian>::read_header_tables(
827 return lineptr;
828 }
829
830+// This routine is for DWARF version 5.
831+
832+template<int size, bool big_endian>
833+const unsigned char*
834+Sized_dwarf_line_info<size, big_endian>::read_header_tables_v5(
835+ const unsigned char* lineptr)
836+{
837+ size_t len;
838+
839+ ++this->current_header_index_;
840+
841+ gold_assert(static_cast<int>(this->directories_.size())
842+ == this->current_header_index_);
843+ gold_assert(static_cast<int>(this->files_.size())
844+ == this->current_header_index_);
845+
846+ // Read the directory list.
847+ unsigned int format_count = *lineptr;
848+ lineptr += 1;
849+
850+ unsigned int *types = new unsigned int[format_count];
851+ unsigned int *forms = new unsigned int[format_count];
852+
853+ for (unsigned int i = 0; i < format_count; i++)
854+ {
855+ types[i] = read_unsigned_LEB_128(lineptr, &len);
856+ lineptr += len;
857+ forms[i] = read_unsigned_LEB_128(lineptr, &len);
858+ lineptr += len;
859+ }
860+
861+ uint64_t entry_count = read_unsigned_LEB_128(lineptr, &len);
862+ lineptr += len;
863+ this->directories_.push_back(std::vector<std::string>(0));
864+ std::vector<std::string>& dir_list = this->directories_.back();
865+
866+ for (unsigned int j = 0; j < entry_count; j++)
867+ {
868+ std::string dirname;
869+
870+ for (unsigned int i = 0; i < format_count; i++)
871+ {
872+ if (types[i] == elfcpp::DW_LNCT_path)
873+ {
874+ if (forms[i] == elfcpp::DW_FORM_string)
875+ {
876+ dirname = reinterpret_cast<const char*>(lineptr);
877+ lineptr += dirname.size() + 1;
878+ }
879+ else if (forms[i] == elfcpp::DW_FORM_line_strp)
880+ {
881+ uint64_t offset;
882+ if (this->header_.offset_size == 4)
883+ offset =
884+ elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr);
885+ else
886+ offset =
887+ elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr);
888+ typename Reloc_map::const_iterator it
889+ = this->reloc_map_.find(lineptr - this->buffer_);
890+ if (it != reloc_map_.end())
891+ {
892+ if (this->track_relocs_type_ == elfcpp::SHT_RELA)
893+ offset = 0;
894+ offset += it->second.second;
895+ }
896+ lineptr += this->header_.offset_size;
897+ dirname = reinterpret_cast<const char*>(this->str_buffer_
898+ + offset);
899+ }
900+ else
901+ return lineptr;
902+ }
903+ else
904+ return lineptr;
905+ }
906+ dir_list.push_back(dirname);
907+ }
908+
909+ delete[] types;
910+ delete[] forms;
911+
912+ // Read the filenames list.
913+ format_count = *lineptr;
914+ lineptr += 1;
915+
916+ types = new unsigned int[format_count];
917+ forms = new unsigned int[format_count];
918+
919+ for (unsigned int i = 0; i < format_count; i++)
920+ {
921+ types[i] = read_unsigned_LEB_128(lineptr, &len);
922+ lineptr += len;
923+ forms[i] = read_unsigned_LEB_128(lineptr, &len);
924+ lineptr += len;
925+ }
926+
927+ entry_count = read_unsigned_LEB_128(lineptr, &len);
928+ lineptr += len;
929+ this->files_.push_back(
930+ std::vector<std::pair<int, std::string> >(0));
931+ std::vector<std::pair<int, std::string> >& file_list = this->files_.back();
932+
933+ for (unsigned int j = 0; j < entry_count; j++)
934+ {
935+ const char* path = NULL;
936+ int dirindex = 0;
937+
938+ for (unsigned int i = 0; i < format_count; i++)
939+ {
940+ if (types[i] == elfcpp::DW_LNCT_path)
941+ {
942+ if (forms[i] == elfcpp::DW_FORM_string)
943+ {
944+ path = reinterpret_cast<const char*>(lineptr);
945+ lineptr += strlen(path) + 1;
946+ }
947+ else if (forms[i] == elfcpp::DW_FORM_line_strp)
948+ {
949+ uint64_t offset;
950+ if (this->header_.offset_size == 4)
951+ offset = elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr);
952+ else
953+ offset = elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr);
954+ typename Reloc_map::const_iterator it
955+ = this->reloc_map_.find(lineptr - this->buffer_);
956+ if (it != reloc_map_.end())
957+ {
958+ if (this->track_relocs_type_ == elfcpp::SHT_RELA)
959+ offset = 0;
960+ offset += it->second.second;
961+ }
962+ lineptr += this->header_.offset_size;
963+ path = reinterpret_cast<const char*>(this->str_buffer_
964+ + offset);
965+ }
966+ else
967+ return lineptr;
968+ }
969+ else if (types[i] == elfcpp::DW_LNCT_directory_index)
970+ {
971+ if (forms[i] == elfcpp::DW_FORM_udata)
972+ {
973+ dirindex = read_unsigned_LEB_128(lineptr, &len);
974+ lineptr += len;
975+ }
976+ else
977+ return lineptr;
978+ }
979+ else
980+ return lineptr;
981+ }
982+ gold_debug(DEBUG_LOCATION, "File %3d: %s",
983+ static_cast<int>(file_list.size()), path);
984+ file_list.push_back(std::make_pair(dirindex, path));
985+ }
986+
987+ delete[] types;
988+ delete[] forms;
989+
990+ return lineptr;
991+}
992+
993 // Process a single opcode in the .debug.line structure.
994
995 template<int size, bool big_endian>
996@@ -1790,15 +2219,15 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode(
997
998 // If the opcode is great than the opcode_base, it is a special
999 // opcode. Most line programs consist mainly of special opcodes.
1000- if (opcode >= header_.opcode_base)
1001+ if (opcode >= this->header_.opcode_base)
1002 {
1003- opcode -= header_.opcode_base;
1004- const int advance_address = ((opcode / header_.line_range)
1005- * header_.min_insn_length);
1006+ opcode -= this->header_.opcode_base;
1007+ const int advance_address = ((opcode / this->header_.line_range)
1008+ * this->header_.min_insn_length);
1009 lsm->address += advance_address;
1010
1011- const int advance_line = ((opcode % header_.line_range)
1012- + header_.line_base);
1013+ const int advance_line = ((opcode % this->header_.line_range)
1014+ + this->header_.line_base);
1015 lsm->line_num += advance_line;
1016 lsm->basic_block = true;
1017 *len = oplen;
1018@@ -1818,13 +2247,13 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode(
1019 const uint64_t advance_address
1020 = read_unsigned_LEB_128(start, &templen);
1021 oplen += templen;
1022- lsm->address += header_.min_insn_length * advance_address;
1023+ lsm->address += this->header_.min_insn_length * advance_address;
1024 }
1025 break;
1026
1027 case elfcpp::DW_LNS_advance_line:
1028 {
1029- const uint64_t advance_line = read_signed_LEB_128(start, &templen);
1030+ const int64_t advance_line = read_signed_LEB_128(start, &templen);
1031 oplen += templen;
1032 lsm->line_num += advance_line;
1033 }
1034@@ -1865,9 +2294,9 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode(
1035
1036 case elfcpp::DW_LNS_const_add_pc:
1037 {
1038- const int advance_address = (header_.min_insn_length
1039- * ((255 - header_.opcode_base)
1040- / header_.line_range));
1041+ const int advance_address = (this->header_.min_insn_length
1042+ * ((255 - this->header_.opcode_base)
1043+ / this->header_.line_range));
1044 lsm->address += advance_address;
1045 }
1046 break;
1047@@ -1950,7 +2379,7 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode(
1048 default:
1049 {
1050 // Ignore unknown opcode silently
1051- for (int i = 0; i < header_.std_opcode_lengths[opcode]; i++)
1052+ for (int i = 0; i < this->header_.std_opcode_lengths[opcode]; i++)
1053 {
1054 size_t templen;
1055 read_unsigned_LEB_128(start, &templen);
1056@@ -1970,28 +2399,24 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode(
1057 template<int size, bool big_endian>
1058 unsigned const char*
1059 Sized_dwarf_line_info<size, big_endian>::read_lines(unsigned const char* lineptr,
1060+ unsigned const char* endptr,
1061 unsigned int shndx)
1062 {
1063 struct LineStateMachine lsm;
1064
1065- // LENGTHSTART is the place the length field is based on. It is the
1066- // point in the header after the initial length field.
1067- const unsigned char* lengthstart = buffer_;
1068-
1069- // In 64 bit dwarf, the initial length is 12 bytes, because of the
1070- // 0xffffffff at the start.
1071- if (header_.offset_size == 8)
1072- lengthstart += 12;
1073- else
1074- lengthstart += 4;
1075-
1076- while (lineptr < lengthstart + header_.total_length)
1077+ while (lineptr < endptr)
1078 {
1079- ResetLineStateMachine(&lsm, header_.default_is_stmt);
1080+ ResetLineStateMachine(&lsm, this->header_.default_is_stmt);
1081 while (!lsm.end_sequence)
1082 {
1083 size_t oplength;
1084+
1085+ if (lineptr >= endptr)
1086+ break;
1087+
1088 bool add_line = this->process_one_opcode(lineptr, &lsm, &oplength);
1089+ lineptr += oplength;
1090+
1091 if (add_line
1092 && (shndx == -1U || lsm.shndx == -1U || shndx == lsm.shndx))
1093 {
1094@@ -2012,11 +2437,10 @@ Sized_dwarf_line_info<size, big_endian>::read_lines(unsigned const char* lineptr
1095 map.back().last_line_for_offset = false;
1096 map.push_back(entry);
1097 }
1098- lineptr += oplength;
1099 }
1100 }
1101
1102- return lengthstart + header_.total_length;
1103+ return endptr;
1104 }
1105
1106 // Read the relocations into a Reloc_map.
1107@@ -2057,9 +2481,17 @@ Sized_dwarf_line_info<size, big_endian>::read_line_mappings(unsigned int shndx)
1108 {
1109 const unsigned char* lineptr = this->buffer_;
1110 lineptr = this->read_header_prolog(lineptr);
1111- lineptr = this->read_header_tables(lineptr);
1112- lineptr = this->read_lines(lineptr, shndx);
1113- this->buffer_ = lineptr;
1114+ if (this->header_.version >= 2 && this->header_.version <= 4)
1115+ {
1116+ lineptr = this->read_header_tables_v2(lineptr);
1117+ lineptr = this->read_lines(lineptr, this->end_of_unit_, shndx);
1118+ }
1119+ else if (this->header_.version == 5)
1120+ {
1121+ lineptr = this->read_header_tables_v5(lineptr);
1122+ lineptr = this->read_lines(lineptr, this->end_of_unit_, shndx);
1123+ }
1124+ this->buffer_ = this->end_of_unit_;
1125 }
1126
1127 // Sort the lines numbers, so addr2line can use binary search.
1128@@ -2215,6 +2647,9 @@ Sized_dwarf_line_info<size, big_endian>::do_addr2line(
1129 off_t offset,
1130 std::vector<std::string>* other_lines)
1131 {
1132+ gold_debug(DEBUG_LOCATION, "do_addr2line: shndx %u offset %08x",
1133+ shndx, static_cast<int>(offset));
1134+
1135 if (this->data_valid_ == false)
1136 return "";
1137
1138diff --git a/gold/dwarf_reader.h b/gold/dwarf_reader.h
1139index 80b2231327c..921a1f7c876 100644
1140--- a/gold/dwarf_reader.h
1141+++ b/gold/dwarf_reader.h
1142@@ -173,11 +173,12 @@ class Dwarf_abbrev_table
1143 // An attribute list entry.
1144 struct Attribute
1145 {
1146- Attribute(unsigned int a, unsigned int f)
1147- : attr(a), form(f)
1148+ Attribute(unsigned int a, unsigned int f, int c)
1149+ : attr(a), form(f), implicit_const(c)
1150 { }
1151 unsigned int attr;
1152 unsigned int form;
1153+ int implicit_const;
1154 };
1155
1156 // An abbrev code entry.
1157@@ -190,9 +191,9 @@ class Dwarf_abbrev_table
1158 }
1159
1160 void
1161- add_attribute(unsigned int attr, unsigned int form)
1162+ add_attribute(unsigned int attr, unsigned int form, int implicit_const)
1163 {
1164- this->attributes.push_back(Attribute(attr, form));
1165+ this->attributes.push_back(Attribute(attr, form, implicit_const));
1166 }
1167
1168 // The DWARF tag.
1169@@ -349,14 +350,15 @@ class Dwarf_ranges_table
1170 delete this->ranges_reloc_mapper_;
1171 }
1172
1173- // Read the ranges table from an object file.
1174+ // Fetch the contents of the ranges table from an object file.
1175 bool
1176 read_ranges_table(Relobj* object,
1177 const unsigned char* symtab,
1178 off_t symtab_size,
1179- unsigned int ranges_shndx);
1180+ unsigned int ranges_shndx,
1181+ unsigned int version);
1182
1183- // Read the range table from an object file.
1184+ // Read the DWARF 2/3/4 range table.
1185 Dwarf_range_list*
1186 read_range_list(Relobj* object,
1187 const unsigned char* symtab,
1188@@ -365,6 +367,15 @@ class Dwarf_ranges_table
1189 unsigned int ranges_shndx,
1190 off_t ranges_offset);
1191
1192+ // Read the DWARF 5 rnglists table.
1193+ Dwarf_range_list*
1194+ read_range_list_v5(Relobj* object,
1195+ const unsigned char* symtab,
1196+ off_t symtab_size,
1197+ unsigned int address_size,
1198+ unsigned int ranges_shndx,
1199+ off_t ranges_offset);
1200+
1201 // Look for a relocation at offset OFF in the range table,
1202 // and return the section index and offset of the target.
1203 unsigned int
1204@@ -490,8 +501,6 @@ class Dwarf_die
1205 unsigned int shndx;
1206 // Block length for block forms.
1207 unsigned int blocklen;
1208- // Attribute offset for DW_FORM_strp.
1209- unsigned int attr_off;
1210 } aux;
1211 };
1212
1213@@ -684,6 +693,10 @@ class Dwarf_die
1214 // calls the various visit_xxx() methods for each header. Clients
1215 // should derive a new class from this one and implement the
1216 // visit_compilation_unit() and visit_type_unit() functions.
1217+// IS_TYPE_UNIT is true if we are reading from a .debug_types section,
1218+// which is used only in DWARF 4. For DWARF 5, it will be false,
1219+// and we will determine whether it's a type init when we parse the
1220+// header.
1221
1222 class Dwarf_info_reader
1223 {
1224@@ -695,7 +708,7 @@ class Dwarf_info_reader
1225 unsigned int shndx,
1226 unsigned int reloc_shndx,
1227 unsigned int reloc_type)
1228- : is_type_unit_(is_type_unit), object_(object), symtab_(symtab),
1229+ : object_(object), symtab_(symtab),
1230 symtab_size_(symtab_size), shndx_(shndx), reloc_shndx_(reloc_shndx),
1231 reloc_type_(reloc_type), abbrev_shndx_(0), string_shndx_(0),
1232 buffer_(NULL), buffer_end_(NULL), cu_offset_(0), cu_length_(0),
1233@@ -703,7 +716,12 @@ class Dwarf_info_reader
1234 abbrev_table_(), ranges_table_(this),
1235 reloc_mapper_(NULL), string_buffer_(NULL), string_buffer_end_(NULL),
1236 owns_string_buffer_(false), string_output_section_offset_(0)
1237- { }
1238+ {
1239+ // For DWARF 4, we infer the unit type from the section name.
1240+ // For DWARF 5, we will read this from the unit header.
1241+ this->unit_type_ =
1242+ (is_type_unit ? elfcpp::DW_UT_type : elfcpp::DW_UT_compile);
1243+ }
1244
1245 virtual
1246 ~Dwarf_info_reader()
1247@@ -714,6 +732,13 @@ class Dwarf_info_reader
1248 delete[] this->string_buffer_;
1249 }
1250
1251+ bool
1252+ is_type_unit() const
1253+ {
1254+ return (this->unit_type_ == elfcpp::DW_UT_type
1255+ || this->unit_type_ == elfcpp::DW_UT_split_type);
1256+ }
1257+
1258 // Begin parsing the debug info. This calls visit_compilation_unit()
1259 // or visit_type_unit() for each compilation or type unit found in the
1260 // section, and visit_die() for each top-level DIE.
1261@@ -745,6 +770,9 @@ class Dwarf_info_reader
1262 inline typename elfcpp::Valtype_base<valsize>::Valtype
1263 read_from_pointer(const unsigned char** source);
1264
1265+ inline typename elfcpp::Valtype_base<32>::Valtype
1266+ read_3bytes_from_pointer(const unsigned char** source);
1267+
1268 // Look for a relocation at offset ATTR_OFF in the dwarf info,
1269 // and return the section index and offset of the target.
1270 unsigned int
1271@@ -818,12 +846,20 @@ class Dwarf_info_reader
1272 Dwarf_range_list*
1273 read_range_list(unsigned int ranges_shndx, off_t ranges_offset)
1274 {
1275- return this->ranges_table_.read_range_list(this->object_,
1276- this->symtab_,
1277- this->symtab_size_,
1278- this->address_size_,
1279- ranges_shndx,
1280- ranges_offset);
1281+ if (this->cu_version_ < 5)
1282+ return this->ranges_table_.read_range_list(this->object_,
1283+ this->symtab_,
1284+ this->symtab_size_,
1285+ this->address_size_,
1286+ ranges_shndx,
1287+ ranges_offset);
1288+ else
1289+ return this->ranges_table_.read_range_list_v5(this->object_,
1290+ this->symtab_,
1291+ this->symtab_size_,
1292+ this->address_size_,
1293+ ranges_shndx,
1294+ ranges_offset);
1295 }
1296
1297 // Return the object.
1298@@ -873,8 +909,8 @@ class Dwarf_info_reader
1299 bool
1300 do_read_string_table(unsigned int string_shndx);
1301
1302- // True if this is a type unit; false for a compilation unit.
1303- bool is_type_unit_;
1304+ // The unit type (DW_UT_xxx).
1305+ unsigned int unit_type_;
1306 // The object containing the .debug_info or .debug_types input section.
1307 Relobj* object_;
1308 // The ELF symbol table.
1309@@ -1008,6 +1044,8 @@ class Sized_dwarf_line_info : public Dwarf_line_info
1310 {
1311 if (this->buffer_start_ != NULL)
1312 delete[] this->buffer_start_;
1313+ if (this->str_buffer_start_ != NULL)
1314+ delete[] this->str_buffer_start_;
1315 }
1316
1317 private:
1318@@ -1030,19 +1068,23 @@ class Sized_dwarf_line_info : public Dwarf_line_info
1319 void
1320 read_relocs();
1321
1322- // Reads the DWARF2/3 header for this line info. Each takes as input
1323+ // Reads the DWARF header for this line info. Each takes as input
1324 // a starting buffer position, and returns the ending position.
1325 const unsigned char*
1326 read_header_prolog(const unsigned char* lineptr);
1327
1328 const unsigned char*
1329- read_header_tables(const unsigned char* lineptr);
1330+ read_header_tables_v2(const unsigned char* lineptr);
1331+
1332+ const unsigned char*
1333+ read_header_tables_v5(const unsigned char* lineptr);
1334
1335- // Reads the DWARF2/3 line information. If shndx is non-negative,
1336+ // Reads the DWARF line information. If shndx is non-negative,
1337 // discard all line information that doesn't pertain to the given
1338 // section.
1339 const unsigned char*
1340- read_lines(const unsigned char* lineptr, unsigned int shndx);
1341+ read_lines(const unsigned char* lineptr, const unsigned char* endptr,
1342+ unsigned int shndx);
1343
1344 // Process a single line info opcode at START using the state
1345 // machine at LSM. Return true if we should define a line using the
1346@@ -1069,6 +1111,7 @@ class Sized_dwarf_line_info : public Dwarf_line_info
1347 {
1348 off_t total_length;
1349 int version;
1350+ int address_size;
1351 off_t prologue_length;
1352 int min_insn_length; // insn stands for instruction
1353 int max_ops_per_insn; // Added in DWARF-4.
1354@@ -1089,6 +1132,20 @@ class Sized_dwarf_line_info : public Dwarf_line_info
1355 // of the buffer.
1356 const unsigned char* buffer_start_;
1357
1358+ // str_buffer is the buffer for the line table strings.
1359+ const unsigned char* str_buffer_;
1360+ const unsigned char* str_buffer_end_;
1361+ // If the buffer was allocated temporarily, and therefore must be
1362+ // deallocated in the dtor, this contains a pointer to the start
1363+ // of the buffer.
1364+ const unsigned char* str_buffer_start_;
1365+
1366+ // Pointer to the end of the header_length field (aka prologue_length).
1367+ const unsigned char* end_of_header_length_;
1368+
1369+ // Pointer to the end of the current compilation unit.
1370+ const unsigned char* end_of_unit_;
1371+
1372 // This has relocations that point into buffer.
1373 Sized_elf_reloc_mapper<size, big_endian>* reloc_mapper_;
1374 // The type of the reloc section in track_relocs_--SHT_REL or SHT_RELA.
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2021-20197.patch b/meta/recipes-devtools/binutils/binutils/CVE-2021-20197.patch
deleted file mode 100644
index d6117b65a4..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2021-20197.patch
+++ /dev/null
@@ -1,388 +0,0 @@
1From d3edaa91d4cf7202ec14342410194841e2f67f12 Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Fri, 26 Feb 2021 11:30:32 +1030
4Subject: [PATCH] Reinstate various pieces backed out from smart_rename changes
5
6In the interests of a stable release various last minute smart_rename
7patches were backed out of the 2.36 branch. The main reason to
8reinstate some of those backed out changes here is to make necessary
9followup fixes to commit 8e03235147a9 simple cherry-picks from
10mainline. A secondary reason is that ar -M support isn't fixed for
11pr26945 without this patch.
12
13 PR 26945
14 * ar.c: Don't include libbfd.h.
15 (write_archive): Replace xmalloc+strcpy with xstrdup.
16 * arsup.c (temp_name, real_ofd): New static variables.
17 (ar_open): Use make_tempname and bfd_fdopenw.
18 (ar_save): Adjust to suit ar_open changes.
19 * objcopy.c: Don't include libbfd.h.
20 * rename.c: Rename and reorder variables.
21
22(cherry picked from commit 95b91a043aeaeb546d2fea556d84a2de1e917770)
23
24Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d3edaa91d4cf7202ec14342410194841e2f67f12]
25CVE: CVE-2021-20197
26Signed-off-by: Vinay Kumar <vinay.m.engg@gmail.com>
27---
28 binutils/ar.c | 6 +-
29 binutils/arsup.c | 37 ++++++++----
30 binutils/bucomm.h | 3 +-
31 binutils/objcopy.c | 9 +--
32 binutils/rename.c | 148 +++++++++++----------------------------------
33 5 files changed, 67 insertions(+), 136 deletions(-)
34
35diff --git a/binutils/ar.c b/binutils/ar.c
36index 45a34e3a6cf..44df48c5c67 100644
37--- a/binutils/ar.c
38+++ b/binutils/ar.c
39@@ -25,7 +25,6 @@
40
41 #include "sysdep.h"
42 #include "bfd.h"
43-#include "libbfd.h"
44 #include "libiberty.h"
45 #include "progress.h"
46 #include "getopt.h"
47@@ -1255,8 +1254,7 @@ write_archive (bfd *iarch)
48 bfd *contents_head = iarch->archive_next;
49 int ofd = -1;
50
51- old_name = (char *) xmalloc (strlen (bfd_get_filename (iarch)) + 1);
52- strcpy (old_name, bfd_get_filename (iarch));
53+ old_name = xstrdup (bfd_get_filename (iarch));
54 new_name = make_tempname (old_name, &ofd);
55
56 if (new_name == NULL)
57@@ -1308,7 +1306,7 @@ write_archive (bfd *iarch)
58 /* We don't care if this fails; we might be creating the archive. */
59 bfd_close (iarch);
60
61- if (smart_rename (new_name, old_name, 0) != 0)
62+ if (smart_rename (new_name, old_name, NULL) != 0)
63 xexit (1);
64 free (old_name);
65 free (new_name);
66diff --git a/binutils/arsup.c b/binutils/arsup.c
67index 5403a0c5d74..f7ce8f0bc82 100644
68--- a/binutils/arsup.c
69+++ b/binutils/arsup.c
70@@ -42,6 +42,8 @@ extern int deterministic;
71
72 static bfd *obfd;
73 static char *real_name;
74+static char *temp_name;
75+static int real_ofd;
76 static FILE *outfile;
77
78 static void
79@@ -149,27 +151,24 @@ maybequit (void)
80 void
81 ar_open (char *name, int t)
82 {
83- char *tname;
84- const char *bname = lbasename (name);
85- real_name = name;
86+ real_name = xstrdup (name);
87+ temp_name = make_tempname (real_name, &real_ofd);
88
89- /* Prepend tmp- to the beginning, to avoid file-name clashes after
90- truncation on filesystems with limited namespaces (DOS). */
91- if (asprintf (&tname, "%.*stmp-%s", (int) (bname - name), name, bname) == -1)
92+ if (temp_name == NULL)
93 {
94- fprintf (stderr, _("%s: Can't allocate memory for temp name (%s)\n"),
95+ fprintf (stderr, _("%s: Can't open temporary file (%s)\n"),
96 program_name, strerror(errno));
97 maybequit ();
98 return;
99 }
100
101- obfd = bfd_openw (tname, NULL);
102+ obfd = bfd_fdopenw (temp_name, NULL, real_ofd);
103
104 if (!obfd)
105 {
106 fprintf (stderr,
107 _("%s: Can't open output archive %s\n"),
108- program_name, tname);
109+ program_name, temp_name);
110
111 maybequit ();
112 }
113@@ -344,16 +343,30 @@ ar_save (void)
114 }
115 else
116 {
117- char *ofilename = xstrdup (bfd_get_filename (obfd));
118+ struct stat target_stat;
119
120 if (deterministic > 0)
121 obfd->flags |= BFD_DETERMINISTIC_OUTPUT;
122
123 bfd_close (obfd);
124
125- smart_rename (ofilename, real_name, 0);
126+ if (stat (real_name, &target_stat) != 0)
127+ {
128+ /* The temp file created in ar_open has mode 0600 as per mkstemp.
129+ Create the real empty output file here so smart_rename will
130+ update the mode according to the process umask. */
131+ obfd = bfd_openw (real_name, NULL);
132+ if (obfd != NULL)
133+ {
134+ bfd_set_format (obfd, bfd_archive);
135+ bfd_close (obfd);
136+ }
137+ }
138+
139+ smart_rename (temp_name, real_name, NULL);
140 obfd = 0;
141- free (ofilename);
142+ free (temp_name);
143+ free (real_name);
144 }
145 }
146
147diff --git a/binutils/bucomm.h b/binutils/bucomm.h
148index 91f6a5b228f..aa7e33d8cd1 100644
149--- a/binutils/bucomm.h
150+++ b/binutils/bucomm.h
151@@ -71,7 +71,8 @@ extern void print_version (const char *);
152 /* In rename.c. */
153 extern void set_times (const char *, const struct stat *);
154
155-extern int smart_rename (const char *, const char *, int);
156+extern int smart_rename (const char *, const char *, struct stat *);
157+
158
159 /* In libiberty. */
160 void *xmalloc (size_t);
161diff --git a/binutils/objcopy.c b/binutils/objcopy.c
162index eab3b6db585..73aa8bc2514 100644
163--- a/binutils/objcopy.c
164+++ b/binutils/objcopy.c
165@@ -20,7 +20,6 @@
166
167 #include "sysdep.h"
168 #include "bfd.h"
169-#include "libbfd.h"
170 #include "progress.h"
171 #include "getopt.h"
172 #include "libiberty.h"
173@@ -4861,12 +4860,10 @@ strip_main (int argc, char *argv[])
174 output_target, NULL);
175 if (status == 0)
176 {
177- if (preserve_dates)
178- set_times (tmpname, &statbuf);
179 if (output_file != tmpname)
180 status = (smart_rename (tmpname,
181 output_file ? output_file : argv[i],
182- preserve_dates) != 0);
183+ preserve_dates ? &statbuf : NULL) != 0);
184 if (status == 0)
185 status = hold_status;
186 }
187@@ -5931,11 +5928,9 @@ copy_main (int argc, char *argv[])
188 output_target, input_arch);
189 if (status == 0)
190 {
191- if (preserve_dates)
192- set_times (tmpname, &statbuf);
193 if (tmpname != output_filename)
194 status = (smart_rename (tmpname, input_filename,
195- preserve_dates) != 0);
196+ preserve_dates ? &statbuf : NULL) != 0);
197 }
198 else
199 unlink_if_ordinary (tmpname);
200diff --git a/binutils/rename.c b/binutils/rename.c
201index 65ad5bf52c4..72a9323d72c 100644
202--- a/binutils/rename.c
203+++ b/binutils/rename.c
204@@ -24,14 +24,9 @@
205
206 #ifdef HAVE_GOOD_UTIME_H
207 #include <utime.h>
208-#else /* ! HAVE_GOOD_UTIME_H */
209-#ifdef HAVE_UTIMES
210+#elif defined HAVE_UTIMES
211 #include <sys/time.h>
212-#endif /* HAVE_UTIMES */
213-#endif /* ! HAVE_GOOD_UTIME_H */
214-
215-#if ! defined (_WIN32) || defined (__CYGWIN32__)
216-static int simple_copy (const char *, const char *);
217+#endif
218
219 /* The number of bytes to copy at once. */
220 #define COPY_BUF 8192
221@@ -82,7 +77,6 @@ simple_copy (const char *from, const char *to)
222 }
223 return 0;
224 }
225-#endif /* __CYGWIN32__ or not _WIN32 */
226
227 /* Set the times of the file DESTINATION to be the same as those in
228 STATBUF. */
229@@ -91,122 +85,52 @@ void
230 set_times (const char *destination, const struct stat *statbuf)
231 {
232 int result;
233-
234- {
235 #ifdef HAVE_GOOD_UTIME_H
236- struct utimbuf tb;
237-
238- tb.actime = statbuf->st_atime;
239- tb.modtime = statbuf->st_mtime;
240- result = utime (destination, &tb);
241-#else /* ! HAVE_GOOD_UTIME_H */
242-#ifndef HAVE_UTIMES
243- long tb[2];
244-
245- tb[0] = statbuf->st_atime;
246- tb[1] = statbuf->st_mtime;
247- result = utime (destination, tb);
248-#else /* HAVE_UTIMES */
249- struct timeval tv[2];
250-
251- tv[0].tv_sec = statbuf->st_atime;
252- tv[0].tv_usec = 0;
253- tv[1].tv_sec = statbuf->st_mtime;
254- tv[1].tv_usec = 0;
255- result = utimes (destination, tv);
256-#endif /* HAVE_UTIMES */
257-#endif /* ! HAVE_GOOD_UTIME_H */
258- }
259+ struct utimbuf tb;
260+
261+ tb.actime = statbuf->st_atime;
262+ tb.modtime = statbuf->st_mtime;
263+ result = utime (destination, &tb);
264+#elif defined HAVE_UTIMES
265+ struct timeval tv[2];
266+
267+ tv[0].tv_sec = statbuf->st_atime;
268+ tv[0].tv_usec = 0;
269+ tv[1].tv_sec = statbuf->st_mtime;
270+ tv[1].tv_usec = 0;
271+ result = utimes (destination, tv);
272+#else
273+ long tb[2];
274+
275+ tb[0] = statbuf->st_atime;
276+ tb[1] = statbuf->st_mtime;
277+ result = utime (destination, tb);
278+#endif
279
280 if (result != 0)
281 non_fatal (_("%s: cannot set time: %s"), destination, strerror (errno));
282 }
283
284-#ifndef S_ISLNK
285-#ifdef S_IFLNK
286-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
287-#else
288-#define S_ISLNK(m) 0
289-#define lstat stat
290-#endif
291-#endif
292-
293-/* Rename FROM to TO, copying if TO is a link.
294- Return 0 if ok, -1 if error. */
295+/* Copy FROM to TO. TARGET_STAT has the file status that, if non-NULL,
296+ is used to fix up timestamps. Return 0 if ok, -1 if error.
297+ At one time this function renamed files, but file permissions are
298+ tricky to update given the number of different schemes used by
299+ various systems. So now we just copy. */
300
301 int
302-smart_rename (const char *from, const char *to, int preserve_dates ATTRIBUTE_UNUSED)
303+smart_rename (const char *from, const char *to,
304+ struct stat *target_stat)
305 {
306- bfd_boolean exists;
307- struct stat s;
308- int ret = 0;
309-
310- exists = lstat (to, &s) == 0;
311-
312-#if defined (_WIN32) && !defined (__CYGWIN32__)
313- /* Win32, unlike unix, will not erase `to' in `rename(from, to)' but
314- fail instead. Also, chown is not present. */
315+ int ret;
316
317- if (exists)
318- remove (to);
319-
320- ret = rename (from, to);
321+ ret = simple_copy (from, to);
322 if (ret != 0)
323- {
324- /* We have to clean up here. */
325- non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror (errno));
326- unlink (from);
327- }
328-#else
329- /* Use rename only if TO is not a symbolic link and has
330- only one hard link, and we have permission to write to it. */
331- if (! exists
332- || (!S_ISLNK (s.st_mode)
333- && S_ISREG (s.st_mode)
334- && (s.st_mode & S_IWUSR)
335- && s.st_nlink == 1)
336- )
337- {
338- ret = rename (from, to);
339- if (ret == 0)
340- {
341- if (exists)
342- {
343- /* Try to preserve the permission bits and ownership of
344- TO. First get the mode right except for the setuid
345- bit. Then change the ownership. Then fix the setuid
346- bit. We do the chmod before the chown because if the
347- chown succeeds, and we are a normal user, we won't be
348- able to do the chmod afterward. We don't bother to
349- fix the setuid bit first because that might introduce
350- a fleeting security problem, and because the chown
351- will clear the setuid bit anyhow. We only fix the
352- setuid bit if the chown succeeds, because we don't
353- want to introduce an unexpected setuid file owned by
354- the user running objcopy. */
355- chmod (to, s.st_mode & 0777);
356- if (chown (to, s.st_uid, s.st_gid) >= 0)
357- chmod (to, s.st_mode & 07777);
358- }
359- }
360- else
361- {
362- /* We have to clean up here. */
363- non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror (errno));
364- unlink (from);
365- }
366- }
367- else
368- {
369- ret = simple_copy (from, to);
370- if (ret != 0)
371- non_fatal (_("unable to copy file '%s'; reason: %s"), to, strerror (errno));
372+ non_fatal (_("unable to copy file '%s'; reason: %s"),
373+ to, strerror (errno));
374
375- if (preserve_dates)
376- set_times (to, &s);
377- unlink (from);
378- }
379-#endif /* _WIN32 && !__CYGWIN32__ */
380+ if (target_stat != NULL)
381+ set_times (to, target_stat);
382+ unlink (from);
383
384 return ret;
385 }
386--
3872.17.1
388
diff --git a/meta/recipes-devtools/binutils/binutils_2.36.bb b/meta/recipes-devtools/binutils/binutils_2.37.bb
index ee9617de1d..ee9617de1d 100644
--- a/meta/recipes-devtools/binutils/binutils_2.36.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.37.bb