summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-08-06 17:41:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:28 +0100
commit30ab044dacf2b8ece625c0735b620b2c47b8cf40 (patch)
tree2c3950f80d0079aed26c15ad8c95bc26c0263741
parent26c6b10da83dcb7a1bcacabcf32e4ee2fab84057 (diff)
downloadpoky-30ab044dacf2b8ece625c0735b620b2c47b8cf40.tar.gz
binutils: Bump to 2.27
(From OE-Core rev: 3f1eb2556026572dca9476c561d89b86723395c7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.27.inc (renamed from meta/recipes-devtools/binutils/binutils-2.26.inc)7
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.27.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.26.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.27.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.26.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.26.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc1
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch16
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch12
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch12
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch1243
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch10
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch8
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch36
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch6
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch14
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch88
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch72
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch36
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-Correct-nios2-_gp-address-computation.patch106
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch36
-rw-r--r--meta/recipes-devtools/binutils/binutils/aarch64-tls.patch177
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.27.bb (renamed from meta/recipes-devtools/binutils/binutils_2.26.bb)0
-rw-r--r--meta/recipes-devtools/strace/strace_4.13.bb1
25 files changed, 713 insertions, 1188 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 3085ec0d52..c579f10290 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
24 24
25GCCVERSION ?= "6.1%" 25GCCVERSION ?= "6.1%"
26SDKGCCVERSION ?= "${GCCVERSION}" 26SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.26%" 27BINUVERSION ?= "2.27%"
28GDBVERSION ?= "7.11%" 28GDBVERSION ?= "7.11%"
29GLIBCVERSION ?= "2.24" 29GLIBCVERSION ?= "2.24"
30UCLIBCVERSION ?= "1.0%" 30UCLIBCVERSION ?= "1.0%"
diff --git a/meta/recipes-devtools/binutils/binutils-2.26.inc b/meta/recipes-devtools/binutils/binutils-2.27.inc
index 1f7bee29eb..9cc57fcdea 100644
--- a/meta/recipes-devtools/binutils/binutils-2.26.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.27.inc
@@ -18,7 +18,7 @@ BINUPV = "${@binutils_branch_version(d)}"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20 20
21SRCREV = "c29838e7f484e0b5714b02e7feb9a88d3a045dd2" 21SRCREV = "5fe53ce37f9d9dd544ec8cc9e2863b68e1a61f4c"
22SRC_URI = "\ 22SRC_URI = "\
23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \ 23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
24 file://0002-configure-widen-the-regexp-for-SH-architectures.patch \ 24 file://0002-configure-widen-the-regexp-for-SH-architectures.patch \
@@ -32,10 +32,7 @@ SRC_URI = "\
32 file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ 32 file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
33 file://0011-Change-default-emulation-for-mips64-linux.patch \ 33 file://0011-Change-default-emulation-for-mips64-linux.patch \
34 file://0012-Add-support-for-Netlogic-XLP.patch \ 34 file://0012-Add-support-for-Netlogic-XLP.patch \
35 file://0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch \ 35 file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
36 file://0014-Correct-nios2-_gp-address-computation.patch \
37 file://0015-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
38 file://aarch64-tls.patch \
39" 36"
40S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
41 38
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.26.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.27.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.26.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.27.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.26.bb b/meta/recipes-devtools/binutils/binutils-cross_2.27.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.26.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.27.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.26.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
index 788106f9e7..788106f9e7 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.26.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 70589ecad9..75d190f802 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -57,7 +57,6 @@ USE_ALTERNATIVES_FOR = " \
57 strings \ 57 strings \
58 strip \ 58 strip \
59" 59"
60USE_ALTERNATIVES_FOR_remove_mips = "ld.gold dwp"
61 60
62python do_package_prepend() { 61python do_package_prepend() {
63 make_alts = d.getVar("USE_ALTERNATIVES_FOR", True) or "" 62 make_alts = d.getVar("USE_ALTERNATIVES_FOR", True) or ""
diff --git a/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
index 91f9017613..cad704a720 100644
--- a/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
+++ b/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
@@ -1,7 +1,7 @@
1From 3c75355342a8562ccb65b8bbbe81a0495fec5c57 Mon Sep 17 00:00:00 2001 1From 2dae6b137ce609fd008f2063034a4403d95484c5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:58:54 +0000 3Date: Mon, 2 Mar 2015 01:58:54 +0000
4Subject: [PATCH 01/14] Generate relocatable SDKs 4Subject: [PATCH 01/13] Generate relocatable SDKs
5 5
6This patch will modify the ELF linker scripts so that the crosssdk 6This patch will modify the ELF linker scripts so that the crosssdk
7linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries 7linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries
@@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 2 files changed, 5 insertions(+), 2 deletions(-) 18 2 files changed, 5 insertions(+), 2 deletions(-)
19 19
20diff --git a/ld/genscripts.sh b/ld/genscripts.sh 20diff --git a/ld/genscripts.sh b/ld/genscripts.sh
21index a84d233..d12c4e2 100755 21index eb262e7..1a3b8bc 100755
22--- a/ld/genscripts.sh 22--- a/ld/genscripts.sh
23+++ b/ld/genscripts.sh 23+++ b/ld/genscripts.sh
24@@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" 24@@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
@@ -43,7 +43,7 @@ index a84d233..d12c4e2 100755
43 LD_FLAG= 43 LD_FLAG=
44 DATA_ALIGNMENT=${DATA_ALIGNMENT_} 44 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
45diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc 45diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
46index ec78c90..f9e7a31 100644 46index f0c6439..223c55f 100644
47--- a/ld/scripttempl/elf.sc 47--- a/ld/scripttempl/elf.sc
48+++ b/ld/scripttempl/elf.sc 48+++ b/ld/scripttempl/elf.sc
49@@ -136,8 +136,8 @@ if test -n "${COMMONPAGESIZE}"; then 49@@ -136,8 +136,8 @@ if test -n "${COMMONPAGESIZE}"; then
@@ -58,5 +58,5 @@ index ec78c90..f9e7a31 100644
58 if test -z "$PLT"; then 58 if test -z "$PLT"; then
59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" 59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"
60-- 60--
612.7.1 612.9.0
62 62
diff --git a/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
index 4a202d0474..8d7cf00d4b 100644
--- a/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
+++ b/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
@@ -1,7 +1,7 @@
1From b1ae604880562ed065f614a745d3f8922838bc5a Mon Sep 17 00:00:00 2001 1From e4cd40722f597dff39c7214fab1742dd5bcc67eb 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 02/14] configure: widen the regexp for SH architectures 4Subject: [PATCH 02/13] configure: widen the regexp for SH architectures
5 5
6gprof needs to know about uclibc 6gprof needs to know about uclibc
7 7
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 7 insertions(+), 2 deletions(-) 14 2 files changed, 7 insertions(+), 2 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 34b66f7..85414ab 100755 17index ad3dfb7..2a74a77 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3445,7 +3445,7 @@ case "${target}" in 20@@ -3444,7 +3444,7 @@ case "${target}" in
21 ;; 21 ;;
22 s390-*-* | s390x-*-*) 22 s390-*-* | s390x-*-*)
23 ;; 23 ;;
@@ -26,7 +26,7 @@ index 34b66f7..85414ab 100755
26 ;; 26 ;;
27 sh64-*-* | sh5*-*-*) 27 sh64-*-* | sh5*-*-*)
28 ;; 28 ;;
29@@ -3939,7 +3939,7 @@ case "${target}" in 29@@ -3946,7 +3946,7 @@ case "${target}" in
30 or1k*-*-*) 30 or1k*-*-*)
31 noconfigdirs="$noconfigdirs gdb" 31 noconfigdirs="$noconfigdirs gdb"
32 ;; 32 ;;
@@ -36,10 +36,10 @@ index 34b66f7..85414ab 100755
36 sh*-*-elf) 36 sh*-*-elf)
37 ;; 37 ;;
38diff --git a/gprof/configure b/gprof/configure 38diff --git a/gprof/configure b/gprof/configure
39index 693b927..d4db554 100755 39index bf3ecaa..626e1c7 100755
40--- a/gprof/configure 40--- a/gprof/configure
41+++ b/gprof/configure 41+++ b/gprof/configure
42@@ -5869,6 +5869,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) 42@@ -5873,6 +5873,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
43 lt_cv_deplibs_check_method=pass_all 43 lt_cv_deplibs_check_method=pass_all
44 ;; 44 ;;
45 45
@@ -52,5 +52,5 @@ index 693b927..d4db554 100755
52 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 52 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
53 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 53 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
54-- 54--
552.7.1 552.9.0
56 56
diff --git a/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
index 2c70ecd93a..acc198b3ef 100644
--- a/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
+++ b/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
@@ -1,7 +1,7 @@
1From 01808e8ef8ee709c8218d962601c18a63a063a1f Mon Sep 17 00:00:00 2001 1From 93c49f6197bd59b2abbf04b3296bf10029b80f48 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 03/14] Point scripts location to libdir 4Subject: [PATCH 03/13] Point scripts location to libdir
5 5
6Upstream-Status: Inappropriate [debian patch] 6Upstream-Status: Inappropriate [debian patch]
7 7
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/ld/Makefile.am b/ld/Makefile.am 14diff --git a/ld/Makefile.am b/ld/Makefile.am
15index 0b3b049..3871c74 100644 15index 0598923..b478ba7 100644
16--- a/ld/Makefile.am 16--- a/ld/Makefile.am
17+++ b/ld/Makefile.am 17+++ b/ld/Makefile.am
18@@ -57,7 +57,7 @@ endif 18@@ -57,7 +57,7 @@ endif
@@ -25,10 +25,10 @@ index 0b3b049..3871c74 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 ed98f87..530e4c9 100644 28index 7c78198..5eb67e0 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -451,7 +451,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.
@@ -38,5 +38,5 @@ index ed98f87..530e4c9 100644
38 BFDDIR = $(BASEDIR)/bfd 38 BFDDIR = $(BASEDIR)/bfd
39 INCDIR = $(BASEDIR)/include 39 INCDIR = $(BASEDIR)/include
40-- 40--
412.7.1 412.9.0
42 42
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index 8f0a40210f..28a17f3865 100644
--- a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,7 +1,7 @@
1From c008c7f97c1cf487749c6c375820a1f3b3c6c53d Mon Sep 17 00:00:00 2001 1From 4ff83779de8621715c6c2a79cf7ed8d74ff2d7c5 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 04/14] Only generate an RPATH entry if LD_RUN_PATH is not 4Subject: [PATCH 04/13] Only generate an RPATH entry if LD_RUN_PATH is not
5 empty 5 empty
6 6
7for cases where -rpath isn't specified. debian (#151024) 7for cases where -rpath isn't specified. debian (#151024)
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
16 16
17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em 17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
18index 0405d4f..73c5447 100644 18index 47fa549..f4c640e 100644
19--- a/ld/emultempl/elf32.em 19--- a/ld/emultempl/elf32.em
20+++ b/ld/emultempl/elf32.em 20+++ b/ld/emultempl/elf32.em
21@@ -1242,6 +1242,8 @@ fragment <<EOF 21@@ -1244,6 +1244,8 @@ fragment <<EOF
22 && command_line.rpath == NULL) 22 && command_line.rpath == NULL)
23 { 23 {
24 lib_path = (const char *) getenv ("LD_RUN_PATH"); 24 lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -27,7 +27,7 @@ index 0405d4f..73c5447 100644
27 if (gld${EMULATION_NAME}_search_needed (lib_path, &n, 27 if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
28 force)) 28 force))
29 break; 29 break;
30@@ -1523,6 +1525,8 @@ gld${EMULATION_NAME}_before_allocation (void) 30@@ -1525,6 +1527,8 @@ gld${EMULATION_NAME}_before_allocation (void)
31 rpath = command_line.rpath; 31 rpath = command_line.rpath;
32 if (rpath == NULL) 32 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH"); 33 rpath = (const char *) getenv ("LD_RUN_PATH");
@@ -37,5 +37,5 @@ index 0405d4f..73c5447 100644
37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) 37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) 38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
39-- 39--
402.7.1 402.9.0
41 41
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch b/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
index 92ead7fb48..331f78221c 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
+++ b/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
@@ -1,7 +1,7 @@
1From 6a41635e29c4a6c064b1f66e79a8fe2026f4361b Mon Sep 17 00:00:00 2001 1From 18a7ae169e8d55ace683357d1de6b07e4fdf797a 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:32:49 +0000 3Date: Mon, 2 Mar 2015 01:32:49 +0000
4Subject: [PATCH 05/14] Explicitly link with libm on uclibc 4Subject: [PATCH 05/13] Explicitly link with libm on uclibc
5 5
6Description: 6Description:
7 7
@@ -31,7 +31,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
31 1 file changed, 6 insertions(+) 31 1 file changed, 6 insertions(+)
32 32
33diff --git a/gas/configure.tgt b/gas/configure.tgt 33diff --git a/gas/configure.tgt b/gas/configure.tgt
34index 0b490d4..086e0d2 100644 34index e2df659..1b9fd99 100644
35--- a/gas/configure.tgt 35--- a/gas/configure.tgt
36+++ b/gas/configure.tgt 36+++ b/gas/configure.tgt
37@@ -487,6 +487,12 @@ case ${generic_target} in 37@@ -487,6 +487,12 @@ case ${generic_target} in
@@ -48,5 +48,5 @@ index 0b490d4..086e0d2 100644
48 aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | sparc | z80 | z8k) 48 aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | sparc | z80 | z8k)
49 bfd_gas=yes 49 bfd_gas=yes
50-- 50--
512.7.1 512.9.0
52 52
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
index e54ab1bc8a..f2411c47df 100644
--- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
@@ -1,7 +1,7 @@
1From da70f0876cdd8ed703d9ed1524212ccfefb09ef3 Mon Sep 17 00:00:00 2001 1From 71adcde3648db47f7fa155db12810591ffd3ae34 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 06/14] Use libtool 2.4 4Subject: [PATCH 06/13] Use libtool 2.4
5 5
6get libtool sysroot support 6get libtool sysroot support
7 7
@@ -9,28 +9,28 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9--- 9---
10Upstream-Status: Pending 10Upstream-Status: Pending
11 11
12 bfd/configure | 1322 +++++++++++++++++------ 12 bfd/configure | 1318 +++++++++++++++++------
13 bfd/configure.ac | 2 +- 13 bfd/configure.ac | 2 +-
14 binutils/configure | 1320 +++++++++++++++++------ 14 binutils/configure | 1316 +++++++++++++++++------
15 configure | 4 +- 15 configure | 4 +-
16 gas/configure | 1320 +++++++++++++++++------ 16 gas/configure | 1314 +++++++++++++++++------
17 gprof/configure | 1325 +++++++++++++++++------ 17 gprof/configure | 1321 +++++++++++++++++------
18 ld/configure | 1695 +++++++++++++++++++++-------- 18 ld/configure | 1691 +++++++++++++++++++++--------
19 libtool.m4 | 1080 +++++++++++++------ 19 libtool.m4 | 1080 +++++++++++++------
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 | 1322 +++++++++++++++++------ 24 opcodes/configure | 1318 +++++++++++++++++------
25 opcodes/configure.ac | 2 +- 25 opcodes/configure.ac | 2 +-
26 zlib/configure | 1320 +++++++++++++++++------ 26 zlib/configure | 1320 +++++++++++++++++------
27 15 files changed, 9944 insertions(+), 3709 deletions(-) 27 15 files changed, 9930 insertions(+), 3697 deletions(-)
28 28
29diff --git a/bfd/configure b/bfd/configure 29diff --git a/bfd/configure b/bfd/configure
30index 7411c6d..eae743e 100755 30index a437569..575a257 100755
31--- a/bfd/configure 31--- a/bfd/configure
32+++ b/bfd/configure 32+++ b/bfd/configure
33@@ -670,6 +670,9 @@ OTOOL 33@@ -671,6 +671,9 @@ OTOOL
34 LIPO 34 LIPO
35 NMEDIT 35 NMEDIT
36 DSYMUTIL 36 DSYMUTIL
@@ -40,7 +40,7 @@ index 7411c6d..eae743e 100755
40 OBJDUMP 40 OBJDUMP
41 LN_S 41 LN_S
42 NM 42 NM
43@@ -782,6 +785,7 @@ enable_static 43@@ -784,6 +787,7 @@ enable_static
44 with_pic 44 with_pic
45 enable_fast_install 45 enable_fast_install
46 with_gnu_ld 46 with_gnu_ld
@@ -48,7 +48,7 @@ index 7411c6d..eae743e 100755
48 enable_libtool_lock 48 enable_libtool_lock
49 enable_plugins 49 enable_plugins
50 enable_largefile 50 enable_largefile
51@@ -1458,6 +1462,8 @@ Optional Packages: 51@@ -1460,6 +1464,8 @@ Optional Packages:
52 --with-pic try to use only PIC/non-PIC objects [default=use 52 --with-pic try to use only PIC/non-PIC objects [default=use
53 both] 53 both]
54 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 54 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -57,7 +57,7 @@ index 7411c6d..eae743e 100755
57 --with-mmap try using mmap for BFD input files if available 57 --with-mmap try using mmap for BFD input files if available
58 --with-separate-debug-dir=DIR 58 --with-separate-debug-dir=DIR
59 Look for global separate debug info in DIR 59 Look for global separate debug info in DIR
60@@ -5388,8 +5394,8 @@ esac 60@@ -5392,8 +5398,8 @@ esac
61 61
62 62
63 63
@@ -68,7 +68,7 @@ index 7411c6d..eae743e 100755
68 68
69 69
70 70
71@@ -5429,7 +5435,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 71@@ -5433,7 +5439,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
72 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 72 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
73 $as_echo_n "checking how to print strings... " >&6; } 73 $as_echo_n "checking how to print strings... " >&6; }
74 # Test print first, because it will be a builtin if present. 74 # Test print first, because it will be a builtin if present.
@@ -77,7 +77,7 @@ index 7411c6d..eae743e 100755
77 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 77 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
78 ECHO='print -r --' 78 ECHO='print -r --'
79 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 79 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
80@@ -6115,8 +6121,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 80@@ -6119,8 +6125,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
81 # Try some XSI features 81 # Try some XSI features
82 xsi_shell=no 82 xsi_shell=no
83 ( _lt_dummy="a/b/c" 83 ( _lt_dummy="a/b/c"
@@ -88,7 +88,7 @@ index 7411c6d..eae743e 100755
88 && eval 'test $(( 1 + 1 )) -eq 2 \ 88 && eval 'test $(( 1 + 1 )) -eq 2 \
89 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 89 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
90 && xsi_shell=yes 90 && xsi_shell=yes
91@@ -6165,6 +6171,80 @@ esac 91@@ -6169,6 +6175,80 @@ esac
92 92
93 93
94 94
@@ -169,7 +169,7 @@ index 7411c6d..eae743e 100755
169 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 169 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
170 $as_echo_n "checking for $LD option to reload object files... " >&6; } 170 $as_echo_n "checking for $LD option to reload object files... " >&6; }
171 if test "${lt_cv_ld_reload_flag+set}" = set; then : 171 if test "${lt_cv_ld_reload_flag+set}" = set; then :
172@@ -6181,6 +6261,11 @@ case $reload_flag in 172@@ -6185,6 +6265,11 @@ case $reload_flag in
173 esac 173 esac
174 reload_cmds='$LD$reload_flag -o $output$reload_objs' 174 reload_cmds='$LD$reload_flag -o $output$reload_objs'
175 case $host_os in 175 case $host_os in
@@ -181,7 +181,7 @@ index 7411c6d..eae743e 100755
181 darwin*) 181 darwin*)
182 if test "$GCC" = yes; then 182 if test "$GCC" = yes; then
183 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 183 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
184@@ -6349,7 +6434,8 @@ mingw* | pw32*) 184@@ -6353,7 +6438,8 @@ mingw* | pw32*)
185 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 185 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
186 lt_cv_file_magic_cmd='func_win32_libid' 186 lt_cv_file_magic_cmd='func_win32_libid'
187 else 187 else
@@ -191,7 +191,7 @@ index 7411c6d..eae743e 100755
191 lt_cv_file_magic_cmd='$OBJDUMP -f' 191 lt_cv_file_magic_cmd='$OBJDUMP -f'
192 fi 192 fi
193 ;; 193 ;;
194@@ -6503,6 +6589,21 @@ esac 194@@ -6507,6 +6593,21 @@ esac
195 fi 195 fi
196 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 196 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
197 $as_echo "$lt_cv_deplibs_check_method" >&6; } 197 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -213,7 +213,7 @@ index 7411c6d..eae743e 100755
213 file_magic_cmd=$lt_cv_file_magic_cmd 213 file_magic_cmd=$lt_cv_file_magic_cmd
214 deplibs_check_method=$lt_cv_deplibs_check_method 214 deplibs_check_method=$lt_cv_deplibs_check_method
215 test -z "$deplibs_check_method" && deplibs_check_method=unknown 215 test -z "$deplibs_check_method" && deplibs_check_method=unknown
216@@ -6518,9 +6619,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 216@@ -6522,9 +6623,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
217 217
218 218
219 219
@@ -378,7 +378,7 @@ index 7411c6d..eae743e 100755
378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
379 $as_echo_n "checking for $ac_word... " >&6; } 379 $as_echo_n "checking for $ac_word... " >&6; }
380 if test "${ac_cv_prog_AR+set}" = set; then : 380 if test "${ac_cv_prog_AR+set}" = set; then :
381@@ -6536,7 +6790,7 @@ do 381@@ -6540,7 +6794,7 @@ do
382 test -z "$as_dir" && as_dir=. 382 test -z "$as_dir" && as_dir=.
383 for ac_exec_ext in '' $ac_executable_extensions; do 383 for ac_exec_ext in '' $ac_executable_extensions; do
384 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 384 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -387,7 +387,7 @@ index 7411c6d..eae743e 100755
387 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 387 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
388 break 2 388 break 2
389 fi 389 fi
390@@ -6556,11 +6810,15 @@ $as_echo "no" >&6; } 390@@ -6560,11 +6814,15 @@ $as_echo "no" >&6; }
391 fi 391 fi
392 392
393 393
@@ -406,7 +406,7 @@ index 7411c6d..eae743e 100755
406 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 406 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
407 $as_echo_n "checking for $ac_word... " >&6; } 407 $as_echo_n "checking for $ac_word... " >&6; }
408 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 408 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
409@@ -6576,7 +6834,7 @@ do 409@@ -6580,7 +6838,7 @@ do
410 test -z "$as_dir" && as_dir=. 410 test -z "$as_dir" && as_dir=.
411 for ac_exec_ext in '' $ac_executable_extensions; do 411 for ac_exec_ext in '' $ac_executable_extensions; do
412 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 412 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -415,7 +415,7 @@ index 7411c6d..eae743e 100755
415 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 415 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
416 break 2 416 break 2
417 fi 417 fi
418@@ -6595,6 +6853,10 @@ else 418@@ -6599,6 +6857,10 @@ else
419 $as_echo "no" >&6; } 419 $as_echo "no" >&6; }
420 fi 420 fi
421 421
@@ -426,7 +426,7 @@ index 7411c6d..eae743e 100755
426 if test "x$ac_ct_AR" = x; then 426 if test "x$ac_ct_AR" = x; then
427 AR="false" 427 AR="false"
428 else 428 else
429@@ -6606,16 +6868,72 @@ ac_tool_warned=yes ;; 429@@ -6610,16 +6872,72 @@ ac_tool_warned=yes ;;
430 esac 430 esac
431 AR=$ac_ct_AR 431 AR=$ac_ct_AR
432 fi 432 fi
@@ -503,7 +503,7 @@ index 7411c6d..eae743e 100755
503 503
504 504
505 505
506@@ -6957,8 +7275,8 @@ esac 506@@ -6961,8 +7279,8 @@ esac
507 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 507 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
508 508
509 # Transform an extracted symbol line into symbol name and symbol address 509 # Transform an extracted symbol line into symbol name and symbol address
@@ -514,7 +514,7 @@ index 7411c6d..eae743e 100755
514 514
515 # Handle CRLF in mingw tool chain 515 # Handle CRLF in mingw tool chain
516 opt_cr= 516 opt_cr=
517@@ -6994,6 +7312,7 @@ for ac_symprfx in "" "_"; do 517@@ -6998,6 +7316,7 @@ for ac_symprfx in "" "_"; do
518 else 518 else
519 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 519 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
520 fi 520 fi
@@ -522,7 +522,7 @@ index 7411c6d..eae743e 100755
522 522
523 # Check to see that the pipe works correctly. 523 # Check to see that the pipe works correctly.
524 pipe_works=no 524 pipe_works=no
525@@ -7035,6 +7354,18 @@ _LT_EOF 525@@ -7039,6 +7358,18 @@ _LT_EOF
526 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 526 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
527 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 527 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
528 cat <<_LT_EOF > conftest.$ac_ext 528 cat <<_LT_EOF > conftest.$ac_ext
@@ -541,7 +541,7 @@ index 7411c6d..eae743e 100755
541 #ifdef __cplusplus 541 #ifdef __cplusplus
542 extern "C" { 542 extern "C" {
543 #endif 543 #endif
544@@ -7046,7 +7377,7 @@ _LT_EOF 544@@ -7050,7 +7381,7 @@ _LT_EOF
545 cat <<_LT_EOF >> conftest.$ac_ext 545 cat <<_LT_EOF >> conftest.$ac_ext
546 546
547 /* The mapping between symbol names and symbols. */ 547 /* The mapping between symbol names and symbols. */
@@ -550,7 +550,7 @@ index 7411c6d..eae743e 100755
550 const char *name; 550 const char *name;
551 void *address; 551 void *address;
552 } 552 }
553@@ -7072,8 +7403,8 @@ static const void *lt_preloaded_setup() { 553@@ -7076,8 +7407,8 @@ static const void *lt_preloaded_setup() {
554 _LT_EOF 554 _LT_EOF
555 # Now try linking the two files. 555 # Now try linking the two files.
556 mv conftest.$ac_objext conftstm.$ac_objext 556 mv conftest.$ac_objext conftstm.$ac_objext
@@ -561,7 +561,7 @@ index 7411c6d..eae743e 100755
561 LIBS="conftstm.$ac_objext" 561 LIBS="conftstm.$ac_objext"
562 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 562 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
563 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 563 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
564@@ -7083,8 +7414,8 @@ _LT_EOF 564@@ -7087,8 +7418,8 @@ _LT_EOF
565 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 565 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
566 pipe_works=yes 566 pipe_works=yes
567 fi 567 fi
@@ -572,7 +572,7 @@ index 7411c6d..eae743e 100755
572 else 572 else
573 echo "cannot find nm_test_func in $nlist" >&5 573 echo "cannot find nm_test_func in $nlist" >&5
574 fi 574 fi
575@@ -7121,6 +7452,16 @@ else 575@@ -7125,6 +7456,16 @@ else
576 $as_echo "ok" >&6; } 576 $as_echo "ok" >&6; }
577 fi 577 fi
578 578
@@ -589,7 +589,7 @@ index 7411c6d..eae743e 100755
589 589
590 590
591 591
592@@ -7142,6 +7483,45 @@ fi 592@@ -7146,6 +7487,45 @@ fi
593 593
594 594
595 595
@@ -635,7 +635,7 @@ index 7411c6d..eae743e 100755
635 # Check whether --enable-libtool-lock was given. 635 # Check whether --enable-libtool-lock was given.
636 if test "${enable_libtool_lock+set}" = set; then : 636 if test "${enable_libtool_lock+set}" = set; then :
637 enableval=$enable_libtool_lock; 637 enableval=$enable_libtool_lock;
638@@ -7348,6 +7728,123 @@ esac 638@@ -7352,6 +7732,123 @@ esac
639 639
640 need_locks="$enable_libtool_lock" 640 need_locks="$enable_libtool_lock"
641 641
@@ -759,7 +759,7 @@ index 7411c6d..eae743e 100755
759 759
760 case $host_os in 760 case $host_os in
761 rhapsody* | darwin*) 761 rhapsody* | darwin*)
762@@ -7911,6 +8408,8 @@ _LT_EOF 762@@ -7915,6 +8412,8 @@ _LT_EOF
763 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 763 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
764 echo "$AR cru libconftest.a conftest.o" >&5 764 echo "$AR cru libconftest.a conftest.o" >&5
765 $AR cru libconftest.a conftest.o 2>&5 765 $AR cru libconftest.a conftest.o 2>&5
@@ -768,7 +768,7 @@ index 7411c6d..eae743e 100755
768 cat > conftest.c << _LT_EOF 768 cat > conftest.c << _LT_EOF
769 int main() { return 0;} 769 int main() { return 0;}
770 _LT_EOF 770 _LT_EOF
771@@ -8075,7 +8574,8 @@ fi 771@@ -8079,7 +8578,8 @@ fi
772 LIBTOOL_DEPS="$ltmain" 772 LIBTOOL_DEPS="$ltmain"
773 773
774 # Always use our own libtool. 774 # Always use our own libtool.
@@ -778,7 +778,7 @@ index 7411c6d..eae743e 100755
778 778
779 779
780 780
781@@ -8164,7 +8664,7 @@ aix3*) 781@@ -8168,7 +8668,7 @@ aix3*)
782 esac 782 esac
783 783
784 # Global variables: 784 # Global variables:
@@ -787,7 +787,7 @@ index 7411c6d..eae743e 100755
787 can_build_shared=yes 787 can_build_shared=yes
788 788
789 # All known linkers require a `.a' archive for static linking (except MSVC, 789 # All known linkers require a `.a' archive for static linking (except MSVC,
790@@ -8462,8 +8962,6 @@ fi 790@@ -8466,8 +8966,6 @@ fi
791 lt_prog_compiler_pic= 791 lt_prog_compiler_pic=
792 lt_prog_compiler_static= 792 lt_prog_compiler_static=
793 793
@@ -796,7 +796,7 @@ index 7411c6d..eae743e 100755
796 796
797 if test "$GCC" = yes; then 797 if test "$GCC" = yes; then
798 lt_prog_compiler_wl='-Wl,' 798 lt_prog_compiler_wl='-Wl,'
799@@ -8629,6 +9127,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 799@@ -8633,6 +9131,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
800 lt_prog_compiler_pic='--shared' 800 lt_prog_compiler_pic='--shared'
801 lt_prog_compiler_static='--static' 801 lt_prog_compiler_static='--static'
802 ;; 802 ;;
@@ -809,7 +809,7 @@ index 7411c6d..eae743e 100755
809 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 809 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
810 # Portland Group compilers (*not* the Pentium gcc compiler, 810 # Portland Group compilers (*not* the Pentium gcc compiler,
811 # which looks to be a dead project) 811 # which looks to be a dead project)
812@@ -8691,7 +9195,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 812@@ -8695,7 +9199,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
813 lt_prog_compiler_pic='-KPIC' 813 lt_prog_compiler_pic='-KPIC'
814 lt_prog_compiler_static='-Bstatic' 814 lt_prog_compiler_static='-Bstatic'
815 case $cc_basename in 815 case $cc_basename in
@@ -818,7 +818,7 @@ index 7411c6d..eae743e 100755
818 lt_prog_compiler_wl='-Qoption ld ';; 818 lt_prog_compiler_wl='-Qoption ld ';;
819 *) 819 *)
820 lt_prog_compiler_wl='-Wl,';; 820 lt_prog_compiler_wl='-Wl,';;
821@@ -8748,13 +9252,17 @@ case $host_os in 821@@ -8752,13 +9256,17 @@ case $host_os in
822 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 822 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
823 ;; 823 ;;
824 esac 824 esac
@@ -842,7 +842,7 @@ index 7411c6d..eae743e 100755
842 842
843 # 843 #
844 # Check to make sure the PIC flag actually works. 844 # Check to make sure the PIC flag actually works.
845@@ -8815,6 +9323,11 @@ fi 845@@ -8819,6 +9327,11 @@ fi
846 846
847 847
848 848
@@ -854,7 +854,7 @@ index 7411c6d..eae743e 100755
854 # 854 #
855 # Check to make sure the static flag actually works. 855 # Check to make sure the static flag actually works.
856 # 856 #
857@@ -9165,7 +9678,8 @@ _LT_EOF 857@@ -9169,7 +9682,8 @@ _LT_EOF
858 allow_undefined_flag=unsupported 858 allow_undefined_flag=unsupported
859 always_export_symbols=no 859 always_export_symbols=no
860 enable_shared_with_static_runtimes=yes 860 enable_shared_with_static_runtimes=yes
@@ -864,7 +864,7 @@ index 7411c6d..eae743e 100755
864 864
865 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 865 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
866 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 866 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
867@@ -9264,12 +9778,12 @@ _LT_EOF 867@@ -9268,12 +9782,12 @@ _LT_EOF
868 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 868 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
869 hardcode_libdir_flag_spec= 869 hardcode_libdir_flag_spec=
870 hardcode_libdir_flag_spec_ld='-rpath $libdir' 870 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -879,7 +879,7 @@ index 7411c6d..eae743e 100755
879 fi 879 fi
880 ;; 880 ;;
881 esac 881 esac
882@@ -9283,8 +9797,8 @@ _LT_EOF 882@@ -9287,8 +9801,8 @@ _LT_EOF
883 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 883 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
884 wlarc= 884 wlarc=
885 else 885 else
@@ -890,7 +890,7 @@ index 7411c6d..eae743e 100755
890 fi 890 fi
891 ;; 891 ;;
892 892
893@@ -9302,8 +9816,8 @@ _LT_EOF 893@@ -9306,8 +9820,8 @@ _LT_EOF
894 894
895 _LT_EOF 895 _LT_EOF
896 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 896 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -901,7 +901,7 @@ index 7411c6d..eae743e 100755
901 else 901 else
902 ld_shlibs=no 902 ld_shlibs=no
903 fi 903 fi
904@@ -9349,8 +9863,8 @@ _LT_EOF 904@@ -9353,8 +9867,8 @@ _LT_EOF
905 905
906 *) 906 *)
907 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 907 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -912,7 +912,7 @@ index 7411c6d..eae743e 100755
912 else 912 else
913 ld_shlibs=no 913 ld_shlibs=no
914 fi 914 fi
915@@ -9480,7 +9994,13 @@ _LT_EOF 915@@ -9484,7 +9998,13 @@ _LT_EOF
916 allow_undefined_flag='-berok' 916 allow_undefined_flag='-berok'
917 # Determine the default libpath from the value encoded in an 917 # Determine the default libpath from the value encoded in an
918 # empty executable. 918 # empty executable.
@@ -927,7 +927,7 @@ index 7411c6d..eae743e 100755
927 /* end confdefs.h. */ 927 /* end confdefs.h. */
928 928
929 int 929 int
930@@ -9493,22 +10013,29 @@ main () 930@@ -9497,22 +10017,29 @@ main ()
931 _ACEOF 931 _ACEOF
932 if ac_fn_c_try_link "$LINENO"; then : 932 if ac_fn_c_try_link "$LINENO"; then :
933 933
@@ -970,7 +970,7 @@ index 7411c6d..eae743e 100755
970 970
971 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 971 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
972 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" 972 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
973@@ -9520,7 +10047,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 973@@ -9524,7 +10051,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
974 else 974 else
975 # Determine the default libpath from the value encoded in an 975 # Determine the default libpath from the value encoded in an
976 # empty executable. 976 # empty executable.
@@ -985,7 +985,7 @@ index 7411c6d..eae743e 100755
985 /* end confdefs.h. */ 985 /* end confdefs.h. */
986 986
987 int 987 int
988@@ -9533,22 +10066,29 @@ main () 988@@ -9537,22 +10070,29 @@ main ()
989 _ACEOF 989 _ACEOF
990 if ac_fn_c_try_link "$LINENO"; then : 990 if ac_fn_c_try_link "$LINENO"; then :
991 991
@@ -1028,7 +1028,7 @@ index 7411c6d..eae743e 100755
1028 1028
1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1029 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1030 # Warning - without using the other run time loading flags, 1030 # Warning - without using the other run time loading flags,
1031@@ -9593,20 +10133,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1031@@ -9597,20 +10137,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1032 # Microsoft Visual C++. 1032 # Microsoft Visual C++.
1033 # hardcode_libdir_flag_spec is actually meaningless, as there is 1033 # hardcode_libdir_flag_spec is actually meaningless, as there is
1034 # no search path for DLLs. 1034 # no search path for DLLs.
@@ -1106,7 +1106,7 @@ index 7411c6d..eae743e 100755
1106 ;; 1106 ;;
1107 1107
1108 darwin* | rhapsody*) 1108 darwin* | rhapsody*)
1109@@ -9667,7 +10250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1109@@ -9671,7 +10254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1110 1110
1111 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1111 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1112 freebsd* | dragonfly*) 1112 freebsd* | dragonfly*)
@@ -1115,7 +1115,7 @@ index 7411c6d..eae743e 100755
1115 hardcode_libdir_flag_spec='-R$libdir' 1115 hardcode_libdir_flag_spec='-R$libdir'
1116 hardcode_direct=yes 1116 hardcode_direct=yes
1117 hardcode_shlibpath_var=no 1117 hardcode_shlibpath_var=no
1118@@ -9675,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1118@@ -9679,7 +10262,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1119 1119
1120 hpux9*) 1120 hpux9*)
1121 if test "$GCC" = yes; then 1121 if test "$GCC" = yes; then
@@ -1124,7 +1124,7 @@ index 7411c6d..eae743e 100755
1124 else 1124 else
1125 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' 1125 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1126 fi 1126 fi
1127@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1127@@ -9695,7 +10278,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1128 1128
1129 hpux10*) 1129 hpux10*)
1130 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1130 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1133,7 +1133,7 @@ index 7411c6d..eae743e 100755
1133 else 1133 else
1134 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1134 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1135 fi 1135 fi
1136@@ -9715,10 +10298,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1136@@ -9719,10 +10302,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1137 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1137 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1138 ;; 1138 ;;
1139 ia64*) 1139 ia64*)
@@ -1146,7 +1146,7 @@ index 7411c6d..eae743e 100755
1146 ;; 1146 ;;
1147 esac 1147 esac
1148 else 1148 else
1149@@ -9797,23 +10380,36 @@ fi 1149@@ -9801,23 +10384,36 @@ fi
1150 1150
1151 irix5* | irix6* | nonstopux*) 1151 irix5* | irix6* | nonstopux*)
1152 if test "$GCC" = yes; then 1152 if test "$GCC" = yes; then
@@ -1191,7 +1191,7 @@ index 7411c6d..eae743e 100755
1191 else 1191 else
1192 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' 1192 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1193 archive_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' 1193 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
1194@@ -9898,7 +10494,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1194@@ -9902,7 +10498,7 @@ rm -f core conftest.err conftest.$ac_objext \
1195 osf4* | osf5*) # as osf3* with the addition of -msym flag 1195 osf4* | osf5*) # as osf3* with the addition of -msym flag
1196 if test "$GCC" = yes; then 1196 if test "$GCC" = yes; then
1197 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1197 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1200,7 +1200,7 @@ index 7411c6d..eae743e 100755
1200 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1200 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1201 else 1201 else
1202 allow_undefined_flag=' -expect_unresolved \*' 1202 allow_undefined_flag=' -expect_unresolved \*'
1203@@ -9917,9 +10513,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1203@@ -9921,9 +10517,9 @@ rm -f core conftest.err conftest.$ac_objext \
1204 no_undefined_flag=' -z defs' 1204 no_undefined_flag=' -z defs'
1205 if test "$GCC" = yes; then 1205 if test "$GCC" = yes; then
1206 wlarc='${wl}' 1206 wlarc='${wl}'
@@ -1212,7 +1212,7 @@ index 7411c6d..eae743e 100755
1212 else 1212 else
1213 case `$CC -V 2>&1` in 1213 case `$CC -V 2>&1` in
1214 *"Compilers 5.0"*) 1214 *"Compilers 5.0"*)
1215@@ -10495,8 +11091,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1215@@ -10499,8 +11095,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1216 need_version=no 1216 need_version=no
1217 need_lib_prefix=no 1217 need_lib_prefix=no
1218 1218
@@ -1224,7 +1224,7 @@ index 7411c6d..eae743e 100755
1224 library_names_spec='$libname.dll.a' 1224 library_names_spec='$libname.dll.a'
1225 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1225 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1226 postinstall_cmds='base_file=`basename \${file}`~ 1226 postinstall_cmds='base_file=`basename \${file}`~
1227@@ -10529,13 +11126,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1227@@ -10533,13 +11130,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1228 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1228 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1229 ;; 1229 ;;
1230 esac 1230 esac
@@ -1297,7 +1297,7 @@ index 7411c6d..eae743e 100755
1297 # FIXME: first we should search . and the directory the executable is in 1297 # FIXME: first we should search . and the directory the executable is in
1298 shlibpath_var=PATH 1298 shlibpath_var=PATH
1299 ;; 1299 ;;
1300@@ -10627,7 +11282,7 @@ haiku*) 1300@@ -10631,7 +11286,7 @@ haiku*)
1301 soname_spec='${libname}${release}${shared_ext}$major' 1301 soname_spec='${libname}${release}${shared_ext}$major'
1302 shlibpath_var=LIBRARY_PATH 1302 shlibpath_var=LIBRARY_PATH
1303 shlibpath_overrides_runpath=yes 1303 shlibpath_overrides_runpath=yes
@@ -1306,16 +1306,7 @@ index 7411c6d..eae743e 100755
1306 hardcode_into_libs=yes 1306 hardcode_into_libs=yes
1307 ;; 1307 ;;
1308 1308
1309@@ -11423,7 +12078,7 @@ else 1309@@ -11471,10 +12126,10 @@ else
1310 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1311 lt_status=$lt_dlunknown
1312 cat > conftest.$ac_ext <<_LT_EOF
1313-#line 11426 "configure"
1314+#line $LINENO "configure"
1315 #include "confdefs.h"
1316
1317 #if HAVE_DLFCN_H
1318@@ -11467,10 +12122,10 @@ else
1319 /* When -fvisbility=hidden is used, assume the code has been annotated 1310 /* When -fvisbility=hidden is used, assume the code has been annotated
1320 correspondingly for the symbols needed. */ 1311 correspondingly for the symbols needed. */
1321 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1312 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1328,16 +1319,7 @@ index 7411c6d..eae743e 100755
1328 int main () 1319 int main ()
1329 { 1320 {
1330 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1321 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1331@@ -11529,7 +12184,7 @@ else 1322@@ -11577,10 +12232,10 @@ else
1332 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1333 lt_status=$lt_dlunknown
1334 cat > conftest.$ac_ext <<_LT_EOF
1335-#line 11532 "configure"
1336+#line $LINENO "configure"
1337 #include "confdefs.h"
1338
1339 #if HAVE_DLFCN_H
1340@@ -11573,10 +12228,10 @@ else
1341 /* When -fvisbility=hidden is used, assume the code has been annotated 1323 /* When -fvisbility=hidden is used, assume the code has been annotated
1342 correspondingly for the symbols needed. */ 1324 correspondingly for the symbols needed. */
1343 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1325 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -1350,7 +1332,7 @@ index 7411c6d..eae743e 100755
1350 int main () 1332 int main ()
1351 { 1333 {
1352 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1334 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1353@@ -15121,7 +15776,7 @@ SHARED_LDFLAGS= 1335@@ -14078,7 +14733,7 @@ SHARED_LDFLAGS=
1354 if test "$enable_shared" = "yes"; then 1336 if test "$enable_shared" = "yes"; then
1355 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1337 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1356 if test -n "$x"; then 1338 if test -n "$x"; then
@@ -1359,7 +1341,7 @@ index 7411c6d..eae743e 100755
1359 fi 1341 fi
1360 1342
1361 # More hacks to build DLLs on Windows. 1343 # More hacks to build DLLs on Windows.
1362@@ -16746,13 +17401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1344@@ -16789,13 +17444,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1363 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1345 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1364 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1346 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1365 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1347 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1380,7 +1362,7 @@ index 7411c6d..eae743e 100755
1380 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1362 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1381 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1363 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1382 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1364 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1383@@ -16767,14 +17429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1365@@ -16810,14 +17472,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1384 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1366 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1385 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1367 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1386 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 1368 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"`'
@@ -1399,7 +1381,7 @@ index 7411c6d..eae743e 100755
1399 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1381 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1400 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1382 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1401 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1383 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1402@@ -16807,12 +17472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1384@@ -16850,12 +17515,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1403 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1385 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1404 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1386 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1405 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1387 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1413,7 +1395,7 @@ index 7411c6d..eae743e 100755
1413 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1395 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1414 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1396 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1415 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1397 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1416@@ -16867,8 +17532,13 @@ reload_flag \ 1398@@ -16910,8 +17575,13 @@ reload_flag \
1417 OBJDUMP \ 1399 OBJDUMP \
1418 deplibs_check_method \ 1400 deplibs_check_method \
1419 file_magic_cmd \ 1401 file_magic_cmd \
@@ -1427,7 +1409,7 @@ index 7411c6d..eae743e 100755
1427 STRIP \ 1409 STRIP \
1428 RANLIB \ 1410 RANLIB \
1429 CC \ 1411 CC \
1430@@ -16878,12 +17548,14 @@ lt_cv_sys_global_symbol_pipe \ 1412@@ -16921,12 +17591,14 @@ lt_cv_sys_global_symbol_pipe \
1431 lt_cv_sys_global_symbol_to_cdecl \ 1413 lt_cv_sys_global_symbol_to_cdecl \
1432 lt_cv_sys_global_symbol_to_c_name_address \ 1414 lt_cv_sys_global_symbol_to_c_name_address \
1433 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1415 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1443,7 +1425,7 @@ index 7411c6d..eae743e 100755
1443 DSYMUTIL \ 1425 DSYMUTIL \
1444 NMEDIT \ 1426 NMEDIT \
1445 LIPO \ 1427 LIPO \
1446@@ -16899,7 +17571,6 @@ no_undefined_flag \ 1428@@ -16942,7 +17614,6 @@ no_undefined_flag \
1447 hardcode_libdir_flag_spec \ 1429 hardcode_libdir_flag_spec \
1448 hardcode_libdir_flag_spec_ld \ 1430 hardcode_libdir_flag_spec_ld \
1449 hardcode_libdir_separator \ 1431 hardcode_libdir_separator \
@@ -1451,7 +1433,7 @@ index 7411c6d..eae743e 100755
1451 exclude_expsyms \ 1433 exclude_expsyms \
1452 include_expsyms \ 1434 include_expsyms \
1453 file_list_spec \ 1435 file_list_spec \
1454@@ -16935,6 +17606,7 @@ module_cmds \ 1436@@ -16978,6 +17649,7 @@ module_cmds \
1455 module_expsym_cmds \ 1437 module_expsym_cmds \
1456 export_symbols_cmds \ 1438 export_symbols_cmds \
1457 prelink_cmds \ 1439 prelink_cmds \
@@ -1459,7 +1441,7 @@ index 7411c6d..eae743e 100755
1459 postinstall_cmds \ 1441 postinstall_cmds \
1460 postuninstall_cmds \ 1442 postuninstall_cmds \
1461 finish_cmds \ 1443 finish_cmds \
1462@@ -17714,7 +18386,8 @@ $as_echo X"$file" | 1444@@ -17757,7 +18429,8 @@ $as_echo X"$file" |
1463 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1445 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1464 # 1446 #
1465 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1447 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1469,7 +1451,7 @@ index 7411c6d..eae743e 100755
1469 # Written by Gordon Matzigkeit, 1996 1451 # Written by Gordon Matzigkeit, 1996
1470 # 1452 #
1471 # This file is part of GNU Libtool. 1453 # This file is part of GNU Libtool.
1472@@ -17817,19 +18490,42 @@ SP2NL=$lt_lt_SP2NL 1454@@ -17860,19 +18533,42 @@ SP2NL=$lt_lt_SP2NL
1473 # turn newlines into spaces. 1455 # turn newlines into spaces.
1474 NL2SP=$lt_lt_NL2SP 1456 NL2SP=$lt_lt_NL2SP
1475 1457
@@ -1513,7 +1495,7 @@ index 7411c6d..eae743e 100755
1513 # A symbol stripping program. 1495 # A symbol stripping program.
1514 STRIP=$lt_STRIP 1496 STRIP=$lt_STRIP
1515 1497
1516@@ -17859,6 +18555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1498@@ -17902,6 +18598,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1517 # Transform the output of nm in a C name address pair when lib prefix is needed. 1499 # Transform the output of nm in a C name address pair when lib prefix is needed.
1518 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1500 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1519 1501
@@ -1526,7 +1508,7 @@ index 7411c6d..eae743e 100755
1526 # The name of the directory that contains temporary libtool files. 1508 # The name of the directory that contains temporary libtool files.
1527 objdir=$objdir 1509 objdir=$objdir
1528 1510
1529@@ -17868,6 +18570,9 @@ MAGIC_CMD=$MAGIC_CMD 1511@@ -17911,6 +18613,9 @@ MAGIC_CMD=$MAGIC_CMD
1530 # Must we lock files when doing compilation? 1512 # Must we lock files when doing compilation?
1531 need_locks=$lt_need_locks 1513 need_locks=$lt_need_locks
1532 1514
@@ -1536,7 +1518,7 @@ index 7411c6d..eae743e 100755
1536 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1518 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1537 DSYMUTIL=$lt_DSYMUTIL 1519 DSYMUTIL=$lt_DSYMUTIL
1538 1520
1539@@ -17982,12 +18687,12 @@ with_gcc=$GCC 1521@@ -18025,12 +18730,12 @@ with_gcc=$GCC
1540 # Compiler flag to turn off builtin functions. 1522 # Compiler flag to turn off builtin functions.
1541 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1523 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1542 1524
@@ -1552,7 +1534,7 @@ index 7411c6d..eae743e 100755
1552 # Compiler flag to prevent dynamic linking. 1534 # Compiler flag to prevent dynamic linking.
1553 link_static_flag=$lt_lt_prog_compiler_static 1535 link_static_flag=$lt_lt_prog_compiler_static
1554 1536
1555@@ -18074,9 +18779,6 @@ inherit_rpath=$inherit_rpath 1537@@ -18117,9 +18822,6 @@ inherit_rpath=$inherit_rpath
1556 # Whether libtool must link a program against all its dependency libraries. 1538 # Whether libtool must link a program against all its dependency libraries.
1557 link_all_deplibs=$link_all_deplibs 1539 link_all_deplibs=$link_all_deplibs
1558 1540
@@ -1562,7 +1544,7 @@ index 7411c6d..eae743e 100755
1562 # Set to "yes" if exported symbols are required. 1544 # Set to "yes" if exported symbols are required.
1563 always_export_symbols=$always_export_symbols 1545 always_export_symbols=$always_export_symbols
1564 1546
1565@@ -18092,6 +18794,9 @@ include_expsyms=$lt_include_expsyms 1547@@ -18135,6 +18837,9 @@ include_expsyms=$lt_include_expsyms
1566 # Commands necessary for linking programs (against libraries) with templates. 1548 # Commands necessary for linking programs (against libraries) with templates.
1567 prelink_cmds=$lt_prelink_cmds 1549 prelink_cmds=$lt_prelink_cmds
1568 1550
@@ -1572,7 +1554,7 @@ index 7411c6d..eae743e 100755
1572 # Specify filename containing input files. 1554 # Specify filename containing input files.
1573 file_list_spec=$lt_file_list_spec 1555 file_list_spec=$lt_file_list_spec
1574 1556
1575@@ -18124,210 +18829,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1557@@ -18167,210 +18872,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1576 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1558 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1577 # text mode, it properly converts lines to CR/LF. This bash problem 1559 # text mode, it properly converts lines to CR/LF. This bash problem
1578 # is reportedly fixed, but why not run on old versions too? 1560 # is reportedly fixed, but why not run on old versions too?
@@ -1947,10 +1929,10 @@ index 7411c6d..eae743e 100755
1947 chmod +x "$ofile" 1929 chmod +x "$ofile"
1948 1930
1949diff --git a/bfd/configure.ac b/bfd/configure.ac 1931diff --git a/bfd/configure.ac b/bfd/configure.ac
1950index 6f5e85f..44bd02c 100644 1932index 669cff7..5f57877 100644
1951--- a/bfd/configure.ac 1933--- a/bfd/configure.ac
1952+++ b/bfd/configure.ac 1934+++ b/bfd/configure.ac
1953@@ -567,7 +567,7 @@ changequote(,)dnl 1935@@ -253,7 +253,7 @@ changequote(,)dnl
1954 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1936 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1955 changequote([,])dnl 1937 changequote([,])dnl
1956 if test -n "$x"; then 1938 if test -n "$x"; then
@@ -1960,10 +1942,10 @@ index 6f5e85f..44bd02c 100644
1960 1942
1961 # More hacks to build DLLs on Windows. 1943 # More hacks to build DLLs on Windows.
1962diff --git a/binutils/configure b/binutils/configure 1944diff --git a/binutils/configure b/binutils/configure
1963index d4f3e1e..a6df5bb 100755 1945index 6cbf17c..6d20600 100755
1964--- a/binutils/configure 1946--- a/binutils/configure
1965+++ b/binutils/configure 1947+++ b/binutils/configure
1966@@ -657,8 +657,11 @@ OTOOL 1948@@ -658,8 +658,11 @@ OTOOL
1967 LIPO 1949 LIPO
1968 NMEDIT 1950 NMEDIT
1969 DSYMUTIL 1951 DSYMUTIL
@@ -1975,7 +1957,7 @@ index d4f3e1e..a6df5bb 100755
1975 OBJDUMP 1957 OBJDUMP
1976 LN_S 1958 LN_S
1977 NM 1959 NM
1978@@ -769,6 +772,7 @@ enable_static 1960@@ -771,6 +774,7 @@ enable_static
1979 with_pic 1961 with_pic
1980 enable_fast_install 1962 enable_fast_install
1981 with_gnu_ld 1963 with_gnu_ld
@@ -1983,7 +1965,7 @@ index d4f3e1e..a6df5bb 100755
1983 enable_libtool_lock 1965 enable_libtool_lock
1984 enable_plugins 1966 enable_plugins
1985 enable_largefile 1967 enable_largefile
1986@@ -1441,6 +1445,8 @@ Optional Packages: 1968@@ -1443,6 +1447,8 @@ Optional Packages:
1987 --with-pic try to use only PIC/non-PIC objects [default=use 1969 --with-pic try to use only PIC/non-PIC objects [default=use
1988 both] 1970 both]
1989 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1971 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -1992,7 +1974,7 @@ index d4f3e1e..a6df5bb 100755
1992 --with-system-zlib use installed libz 1974 --with-system-zlib use installed libz
1993 --with-gnu-ld assume the C compiler uses GNU ld default=no 1975 --with-gnu-ld assume the C compiler uses GNU ld default=no
1994 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib 1976 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1995@@ -5155,8 +5161,8 @@ esac 1977@@ -5159,8 +5165,8 @@ esac
1996 1978
1997 1979
1998 1980
@@ -2003,7 +1985,7 @@ index d4f3e1e..a6df5bb 100755
2003 1985
2004 1986
2005 1987
2006@@ -5196,7 +5202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 1988@@ -5200,7 +5206,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2007 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 1989 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
2008 $as_echo_n "checking how to print strings... " >&6; } 1990 $as_echo_n "checking how to print strings... " >&6; }
2009 # Test print first, because it will be a builtin if present. 1991 # Test print first, because it will be a builtin if present.
@@ -2012,7 +1994,7 @@ index d4f3e1e..a6df5bb 100755
2012 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 1994 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2013 ECHO='print -r --' 1995 ECHO='print -r --'
2014 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 1996 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2015@@ -5882,8 +5888,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 1997@@ -5886,8 +5892,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2016 # Try some XSI features 1998 # Try some XSI features
2017 xsi_shell=no 1999 xsi_shell=no
2018 ( _lt_dummy="a/b/c" 2000 ( _lt_dummy="a/b/c"
@@ -2023,7 +2005,7 @@ index d4f3e1e..a6df5bb 100755
2023 && eval 'test $(( 1 + 1 )) -eq 2 \ 2005 && eval 'test $(( 1 + 1 )) -eq 2 \
2024 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2006 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2025 && xsi_shell=yes 2007 && xsi_shell=yes
2026@@ -5932,6 +5938,80 @@ esac 2008@@ -5936,6 +5942,80 @@ esac
2027 2009
2028 2010
2029 2011
@@ -2104,7 +2086,7 @@ index d4f3e1e..a6df5bb 100755
2104 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2086 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2105 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2087 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2106 if test "${lt_cv_ld_reload_flag+set}" = set; then : 2088 if test "${lt_cv_ld_reload_flag+set}" = set; then :
2107@@ -5948,6 +6028,11 @@ case $reload_flag in 2089@@ -5952,6 +6032,11 @@ case $reload_flag in
2108 esac 2090 esac
2109 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2091 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2110 case $host_os in 2092 case $host_os in
@@ -2116,7 +2098,7 @@ index d4f3e1e..a6df5bb 100755
2116 darwin*) 2098 darwin*)
2117 if test "$GCC" = yes; then 2099 if test "$GCC" = yes; then
2118 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2100 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2119@@ -6116,7 +6201,8 @@ mingw* | pw32*) 2101@@ -6120,7 +6205,8 @@ mingw* | pw32*)
2120 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2102 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2121 lt_cv_file_magic_cmd='func_win32_libid' 2103 lt_cv_file_magic_cmd='func_win32_libid'
2122 else 2104 else
@@ -2126,7 +2108,7 @@ index d4f3e1e..a6df5bb 100755
2126 lt_cv_file_magic_cmd='$OBJDUMP -f' 2108 lt_cv_file_magic_cmd='$OBJDUMP -f'
2127 fi 2109 fi
2128 ;; 2110 ;;
2129@@ -6270,6 +6356,21 @@ esac 2111@@ -6274,6 +6360,21 @@ esac
2130 fi 2112 fi
2131 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2113 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2132 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2114 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -2148,7 +2130,7 @@ index d4f3e1e..a6df5bb 100755
2148 file_magic_cmd=$lt_cv_file_magic_cmd 2130 file_magic_cmd=$lt_cv_file_magic_cmd
2149 deplibs_check_method=$lt_cv_deplibs_check_method 2131 deplibs_check_method=$lt_cv_deplibs_check_method
2150 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2132 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2151@@ -6285,9 +6386,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2133@@ -6289,9 +6390,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2152 2134
2153 2135
2154 2136
@@ -2313,7 +2295,7 @@ index d4f3e1e..a6df5bb 100755
2313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2295 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2314 $as_echo_n "checking for $ac_word... " >&6; } 2296 $as_echo_n "checking for $ac_word... " >&6; }
2315 if test "${ac_cv_prog_AR+set}" = set; then : 2297 if test "${ac_cv_prog_AR+set}" = set; then :
2316@@ -6303,7 +6557,7 @@ do 2298@@ -6307,7 +6561,7 @@ do
2317 test -z "$as_dir" && as_dir=. 2299 test -z "$as_dir" && as_dir=.
2318 for ac_exec_ext in '' $ac_executable_extensions; do 2300 for ac_exec_ext in '' $ac_executable_extensions; do
2319 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2301 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2322,7 +2304,7 @@ index d4f3e1e..a6df5bb 100755
2322 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2304 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2323 break 2 2305 break 2
2324 fi 2306 fi
2325@@ -6323,11 +6577,15 @@ $as_echo "no" >&6; } 2307@@ -6327,11 +6581,15 @@ $as_echo "no" >&6; }
2326 fi 2308 fi
2327 2309
2328 2310
@@ -2341,7 +2323,7 @@ index d4f3e1e..a6df5bb 100755
2341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2342 $as_echo_n "checking for $ac_word... " >&6; } 2324 $as_echo_n "checking for $ac_word... " >&6; }
2343 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 2325 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
2344@@ -6343,7 +6601,7 @@ do 2326@@ -6347,7 +6605,7 @@ do
2345 test -z "$as_dir" && as_dir=. 2327 test -z "$as_dir" && as_dir=.
2346 for ac_exec_ext in '' $ac_executable_extensions; do 2328 for ac_exec_ext in '' $ac_executable_extensions; do
2347 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2329 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2350,7 +2332,7 @@ index d4f3e1e..a6df5bb 100755
2350 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2332 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2351 break 2 2333 break 2
2352 fi 2334 fi
2353@@ -6362,6 +6620,10 @@ else 2335@@ -6366,6 +6624,10 @@ else
2354 $as_echo "no" >&6; } 2336 $as_echo "no" >&6; }
2355 fi 2337 fi
2356 2338
@@ -2361,7 +2343,7 @@ index d4f3e1e..a6df5bb 100755
2361 if test "x$ac_ct_AR" = x; then 2343 if test "x$ac_ct_AR" = x; then
2362 AR="false" 2344 AR="false"
2363 else 2345 else
2364@@ -6373,12 +6635,10 @@ ac_tool_warned=yes ;; 2346@@ -6377,12 +6639,10 @@ ac_tool_warned=yes ;;
2365 esac 2347 esac
2366 AR=$ac_ct_AR 2348 AR=$ac_ct_AR
2367 fi 2349 fi
@@ -2376,7 +2358,7 @@ index d4f3e1e..a6df5bb 100755
2376 2358
2377 2359
2378 2360
2379@@ -6390,6 +6650,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 2361@@ -6394,6 +6654,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
2380 2362
2381 2363
2382 2364
@@ -2441,7 +2423,7 @@ index d4f3e1e..a6df5bb 100755
2441 if test -n "$ac_tool_prefix"; then 2423 if test -n "$ac_tool_prefix"; then
2442 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 2424 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2443 set dummy ${ac_tool_prefix}strip; ac_word=$2 2425 set dummy ${ac_tool_prefix}strip; ac_word=$2
2444@@ -6724,8 +7042,8 @@ esac 2426@@ -6728,8 +7046,8 @@ esac
2445 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2427 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2446 2428
2447 # Transform an extracted symbol line into symbol name and symbol address 2429 # Transform an extracted symbol line into symbol name and symbol address
@@ -2452,7 +2434,7 @@ index d4f3e1e..a6df5bb 100755
2452 2434
2453 # Handle CRLF in mingw tool chain 2435 # Handle CRLF in mingw tool chain
2454 opt_cr= 2436 opt_cr=
2455@@ -6761,6 +7079,7 @@ for ac_symprfx in "" "_"; do 2437@@ -6765,6 +7083,7 @@ for ac_symprfx in "" "_"; do
2456 else 2438 else
2457 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2439 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2458 fi 2440 fi
@@ -2460,7 +2442,7 @@ index d4f3e1e..a6df5bb 100755
2460 2442
2461 # Check to see that the pipe works correctly. 2443 # Check to see that the pipe works correctly.
2462 pipe_works=no 2444 pipe_works=no
2463@@ -6802,6 +7121,18 @@ _LT_EOF 2445@@ -6806,6 +7125,18 @@ _LT_EOF
2464 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2446 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2465 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2447 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2466 cat <<_LT_EOF > conftest.$ac_ext 2448 cat <<_LT_EOF > conftest.$ac_ext
@@ -2479,7 +2461,7 @@ index d4f3e1e..a6df5bb 100755
2479 #ifdef __cplusplus 2461 #ifdef __cplusplus
2480 extern "C" { 2462 extern "C" {
2481 #endif 2463 #endif
2482@@ -6813,7 +7144,7 @@ _LT_EOF 2464@@ -6817,7 +7148,7 @@ _LT_EOF
2483 cat <<_LT_EOF >> conftest.$ac_ext 2465 cat <<_LT_EOF >> conftest.$ac_ext
2484 2466
2485 /* The mapping between symbol names and symbols. */ 2467 /* The mapping between symbol names and symbols. */
@@ -2488,7 +2470,7 @@ index d4f3e1e..a6df5bb 100755
2488 const char *name; 2470 const char *name;
2489 void *address; 2471 void *address;
2490 } 2472 }
2491@@ -6839,8 +7170,8 @@ static const void *lt_preloaded_setup() { 2473@@ -6843,8 +7174,8 @@ static const void *lt_preloaded_setup() {
2492 _LT_EOF 2474 _LT_EOF
2493 # Now try linking the two files. 2475 # Now try linking the two files.
2494 mv conftest.$ac_objext conftstm.$ac_objext 2476 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2499,7 +2481,7 @@ index d4f3e1e..a6df5bb 100755
2499 LIBS="conftstm.$ac_objext" 2481 LIBS="conftstm.$ac_objext"
2500 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2482 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2501 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2483 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2502@@ -6850,8 +7181,8 @@ _LT_EOF 2484@@ -6854,8 +7185,8 @@ _LT_EOF
2503 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2485 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2504 pipe_works=yes 2486 pipe_works=yes
2505 fi 2487 fi
@@ -2510,7 +2492,7 @@ index d4f3e1e..a6df5bb 100755
2510 else 2492 else
2511 echo "cannot find nm_test_func in $nlist" >&5 2493 echo "cannot find nm_test_func in $nlist" >&5
2512 fi 2494 fi
2513@@ -6888,6 +7219,21 @@ else 2495@@ -6892,6 +7223,21 @@ else
2514 $as_echo "ok" >&6; } 2496 $as_echo "ok" >&6; }
2515 fi 2497 fi
2516 2498
@@ -2532,7 +2514,7 @@ index d4f3e1e..a6df5bb 100755
2532 2514
2533 2515
2534 2516
2535@@ -6906,6 +7252,40 @@ fi 2517@@ -6910,6 +7256,40 @@ fi
2536 2518
2537 2519
2538 2520
@@ -2573,7 +2555,7 @@ index d4f3e1e..a6df5bb 100755
2573 2555
2574 2556
2575 2557
2576@@ -7115,6 +7495,123 @@ esac 2558@@ -7119,6 +7499,123 @@ esac
2577 2559
2578 need_locks="$enable_libtool_lock" 2560 need_locks="$enable_libtool_lock"
2579 2561
@@ -2697,7 +2679,7 @@ index d4f3e1e..a6df5bb 100755
2697 2679
2698 case $host_os in 2680 case $host_os in
2699 rhapsody* | darwin*) 2681 rhapsody* | darwin*)
2700@@ -7678,6 +8175,8 @@ _LT_EOF 2682@@ -7682,6 +8179,8 @@ _LT_EOF
2701 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2683 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2702 echo "$AR cru libconftest.a conftest.o" >&5 2684 echo "$AR cru libconftest.a conftest.o" >&5
2703 $AR cru libconftest.a conftest.o 2>&5 2685 $AR cru libconftest.a conftest.o 2>&5
@@ -2706,7 +2688,7 @@ index d4f3e1e..a6df5bb 100755
2706 cat > conftest.c << _LT_EOF 2688 cat > conftest.c << _LT_EOF
2707 int main() { return 0;} 2689 int main() { return 0;}
2708 _LT_EOF 2690 _LT_EOF
2709@@ -7873,7 +8372,8 @@ fi 2691@@ -7877,7 +8376,8 @@ fi
2710 LIBTOOL_DEPS="$ltmain" 2692 LIBTOOL_DEPS="$ltmain"
2711 2693
2712 # Always use our own libtool. 2694 # Always use our own libtool.
@@ -2716,7 +2698,7 @@ index d4f3e1e..a6df5bb 100755
2716 2698
2717 2699
2718 2700
2719@@ -7962,7 +8462,7 @@ aix3*) 2701@@ -7966,7 +8466,7 @@ aix3*)
2720 esac 2702 esac
2721 2703
2722 # Global variables: 2704 # Global variables:
@@ -2725,7 +2707,7 @@ index d4f3e1e..a6df5bb 100755
2725 can_build_shared=yes 2707 can_build_shared=yes
2726 2708
2727 # All known linkers require a `.a' archive for static linking (except MSVC, 2709 # All known linkers require a `.a' archive for static linking (except MSVC,
2728@@ -8260,8 +8760,6 @@ fi 2710@@ -8264,8 +8764,6 @@ fi
2729 lt_prog_compiler_pic= 2711 lt_prog_compiler_pic=
2730 lt_prog_compiler_static= 2712 lt_prog_compiler_static=
2731 2713
@@ -2734,7 +2716,7 @@ index d4f3e1e..a6df5bb 100755
2734 2716
2735 if test "$GCC" = yes; then 2717 if test "$GCC" = yes; then
2736 lt_prog_compiler_wl='-Wl,' 2718 lt_prog_compiler_wl='-Wl,'
2737@@ -8427,6 +8925,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2719@@ -8431,6 +8929,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2738 lt_prog_compiler_pic='--shared' 2720 lt_prog_compiler_pic='--shared'
2739 lt_prog_compiler_static='--static' 2721 lt_prog_compiler_static='--static'
2740 ;; 2722 ;;
@@ -2747,7 +2729,7 @@ index d4f3e1e..a6df5bb 100755
2747 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2729 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2748 # Portland Group compilers (*not* the Pentium gcc compiler, 2730 # Portland Group compilers (*not* the Pentium gcc compiler,
2749 # which looks to be a dead project) 2731 # which looks to be a dead project)
2750@@ -8489,7 +8993,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2732@@ -8493,7 +8997,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2751 lt_prog_compiler_pic='-KPIC' 2733 lt_prog_compiler_pic='-KPIC'
2752 lt_prog_compiler_static='-Bstatic' 2734 lt_prog_compiler_static='-Bstatic'
2753 case $cc_basename in 2735 case $cc_basename in
@@ -2756,7 +2738,7 @@ index d4f3e1e..a6df5bb 100755
2756 lt_prog_compiler_wl='-Qoption ld ';; 2738 lt_prog_compiler_wl='-Qoption ld ';;
2757 *) 2739 *)
2758 lt_prog_compiler_wl='-Wl,';; 2740 lt_prog_compiler_wl='-Wl,';;
2759@@ -8546,13 +9050,17 @@ case $host_os in 2741@@ -8550,13 +9054,17 @@ case $host_os in
2760 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2742 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2761 ;; 2743 ;;
2762 esac 2744 esac
@@ -2780,7 +2762,7 @@ index d4f3e1e..a6df5bb 100755
2780 2762
2781 # 2763 #
2782 # Check to make sure the PIC flag actually works. 2764 # Check to make sure the PIC flag actually works.
2783@@ -8613,6 +9121,11 @@ fi 2765@@ -8617,6 +9125,11 @@ fi
2784 2766
2785 2767
2786 2768
@@ -2792,7 +2774,7 @@ index d4f3e1e..a6df5bb 100755
2792 # 2774 #
2793 # Check to make sure the static flag actually works. 2775 # Check to make sure the static flag actually works.
2794 # 2776 #
2795@@ -8963,7 +9476,8 @@ _LT_EOF 2777@@ -8967,7 +9480,8 @@ _LT_EOF
2796 allow_undefined_flag=unsupported 2778 allow_undefined_flag=unsupported
2797 always_export_symbols=no 2779 always_export_symbols=no
2798 enable_shared_with_static_runtimes=yes 2780 enable_shared_with_static_runtimes=yes
@@ -2802,7 +2784,7 @@ index d4f3e1e..a6df5bb 100755
2802 2784
2803 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2785 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2804 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2786 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2805@@ -9062,12 +9576,12 @@ _LT_EOF 2787@@ -9066,12 +9580,12 @@ _LT_EOF
2806 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2788 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2807 hardcode_libdir_flag_spec= 2789 hardcode_libdir_flag_spec=
2808 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2790 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -2817,7 +2799,7 @@ index d4f3e1e..a6df5bb 100755
2817 fi 2799 fi
2818 ;; 2800 ;;
2819 esac 2801 esac
2820@@ -9081,8 +9595,8 @@ _LT_EOF 2802@@ -9085,8 +9599,8 @@ _LT_EOF
2821 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2803 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2822 wlarc= 2804 wlarc=
2823 else 2805 else
@@ -2828,7 +2810,7 @@ index d4f3e1e..a6df5bb 100755
2828 fi 2810 fi
2829 ;; 2811 ;;
2830 2812
2831@@ -9100,8 +9614,8 @@ _LT_EOF 2813@@ -9104,8 +9618,8 @@ _LT_EOF
2832 2814
2833 _LT_EOF 2815 _LT_EOF
2834 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2816 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2839,7 +2821,7 @@ index d4f3e1e..a6df5bb 100755
2839 else 2821 else
2840 ld_shlibs=no 2822 ld_shlibs=no
2841 fi 2823 fi
2842@@ -9147,8 +9661,8 @@ _LT_EOF 2824@@ -9151,8 +9665,8 @@ _LT_EOF
2843 2825
2844 *) 2826 *)
2845 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2827 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -2850,7 +2832,7 @@ index d4f3e1e..a6df5bb 100755
2850 else 2832 else
2851 ld_shlibs=no 2833 ld_shlibs=no
2852 fi 2834 fi
2853@@ -9278,7 +9792,13 @@ _LT_EOF 2835@@ -9282,7 +9796,13 @@ _LT_EOF
2854 allow_undefined_flag='-berok' 2836 allow_undefined_flag='-berok'
2855 # Determine the default libpath from the value encoded in an 2837 # Determine the default libpath from the value encoded in an
2856 # empty executable. 2838 # empty executable.
@@ -2865,7 +2847,7 @@ index d4f3e1e..a6df5bb 100755
2865 /* end confdefs.h. */ 2847 /* end confdefs.h. */
2866 2848
2867 int 2849 int
2868@@ -9291,22 +9811,29 @@ main () 2850@@ -9295,22 +9815,29 @@ main ()
2869 _ACEOF 2851 _ACEOF
2870 if ac_fn_c_try_link "$LINENO"; then : 2852 if ac_fn_c_try_link "$LINENO"; then :
2871 2853
@@ -2908,7 +2890,7 @@ index d4f3e1e..a6df5bb 100755
2908 2890
2909 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2891 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2910 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" 2892 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2911@@ -9318,7 +9845,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2893@@ -9322,7 +9849,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2912 else 2894 else
2913 # Determine the default libpath from the value encoded in an 2895 # Determine the default libpath from the value encoded in an
2914 # empty executable. 2896 # empty executable.
@@ -2923,7 +2905,7 @@ index d4f3e1e..a6df5bb 100755
2923 /* end confdefs.h. */ 2905 /* end confdefs.h. */
2924 2906
2925 int 2907 int
2926@@ -9331,22 +9864,29 @@ main () 2908@@ -9335,22 +9868,29 @@ main ()
2927 _ACEOF 2909 _ACEOF
2928 if ac_fn_c_try_link "$LINENO"; then : 2910 if ac_fn_c_try_link "$LINENO"; then :
2929 2911
@@ -2966,7 +2948,7 @@ index d4f3e1e..a6df5bb 100755
2966 2948
2967 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2949 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2968 # Warning - without using the other run time loading flags, 2950 # Warning - without using the other run time loading flags,
2969@@ -9391,20 +9931,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2951@@ -9395,20 +9935,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2970 # Microsoft Visual C++. 2952 # Microsoft Visual C++.
2971 # hardcode_libdir_flag_spec is actually meaningless, as there is 2953 # hardcode_libdir_flag_spec is actually meaningless, as there is
2972 # no search path for DLLs. 2954 # no search path for DLLs.
@@ -3044,7 +3026,7 @@ index d4f3e1e..a6df5bb 100755
3044 ;; 3026 ;;
3045 3027
3046 darwin* | rhapsody*) 3028 darwin* | rhapsody*)
3047@@ -9465,7 +10048,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3029@@ -9469,7 +10052,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3048 3030
3049 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3031 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3050 freebsd* | dragonfly*) 3032 freebsd* | dragonfly*)
@@ -3053,7 +3035,7 @@ index d4f3e1e..a6df5bb 100755
3053 hardcode_libdir_flag_spec='-R$libdir' 3035 hardcode_libdir_flag_spec='-R$libdir'
3054 hardcode_direct=yes 3036 hardcode_direct=yes
3055 hardcode_shlibpath_var=no 3037 hardcode_shlibpath_var=no
3056@@ -9473,7 +10056,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3038@@ -9477,7 +10060,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3057 3039
3058 hpux9*) 3040 hpux9*)
3059 if test "$GCC" = yes; then 3041 if test "$GCC" = yes; then
@@ -3062,7 +3044,7 @@ index d4f3e1e..a6df5bb 100755
3062 else 3044 else
3063 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' 3045 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
3064 fi 3046 fi
3065@@ -9489,7 +10072,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3047@@ -9493,7 +10076,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3066 3048
3067 hpux10*) 3049 hpux10*)
3068 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3050 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3071,7 +3053,7 @@ index d4f3e1e..a6df5bb 100755
3071 else 3053 else
3072 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3054 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3073 fi 3055 fi
3074@@ -9513,10 +10096,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3056@@ -9517,10 +10100,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3075 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3057 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3076 ;; 3058 ;;
3077 ia64*) 3059 ia64*)
@@ -3084,7 +3066,7 @@ index d4f3e1e..a6df5bb 100755
3084 ;; 3066 ;;
3085 esac 3067 esac
3086 else 3068 else
3087@@ -9595,23 +10178,36 @@ fi 3069@@ -9599,23 +10182,36 @@ fi
3088 3070
3089 irix5* | irix6* | nonstopux*) 3071 irix5* | irix6* | nonstopux*)
3090 if test "$GCC" = yes; then 3072 if test "$GCC" = yes; then
@@ -3129,7 +3111,7 @@ index d4f3e1e..a6df5bb 100755
3129 else 3111 else
3130 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' 3112 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
3131 archive_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' 3113 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
3132@@ -9696,7 +10292,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3114@@ -9700,7 +10296,7 @@ rm -f core conftest.err conftest.$ac_objext \
3133 osf4* | osf5*) # as osf3* with the addition of -msym flag 3115 osf4* | osf5*) # as osf3* with the addition of -msym flag
3134 if test "$GCC" = yes; then 3116 if test "$GCC" = yes; then
3135 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3117 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3138,7 +3120,7 @@ index d4f3e1e..a6df5bb 100755
3138 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3120 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3139 else 3121 else
3140 allow_undefined_flag=' -expect_unresolved \*' 3122 allow_undefined_flag=' -expect_unresolved \*'
3141@@ -9715,9 +10311,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3123@@ -9719,9 +10315,9 @@ rm -f core conftest.err conftest.$ac_objext \
3142 no_undefined_flag=' -z defs' 3124 no_undefined_flag=' -z defs'
3143 if test "$GCC" = yes; then 3125 if test "$GCC" = yes; then
3144 wlarc='${wl}' 3126 wlarc='${wl}'
@@ -3150,7 +3132,7 @@ index d4f3e1e..a6df5bb 100755
3150 else 3132 else
3151 case `$CC -V 2>&1` in 3133 case `$CC -V 2>&1` in
3152 *"Compilers 5.0"*) 3134 *"Compilers 5.0"*)
3153@@ -10293,8 +10889,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3135@@ -10297,8 +10893,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3154 need_version=no 3136 need_version=no
3155 need_lib_prefix=no 3137 need_lib_prefix=no
3156 3138
@@ -3162,7 +3144,7 @@ index d4f3e1e..a6df5bb 100755
3162 library_names_spec='$libname.dll.a' 3144 library_names_spec='$libname.dll.a'
3163 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3145 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3164 postinstall_cmds='base_file=`basename \${file}`~ 3146 postinstall_cmds='base_file=`basename \${file}`~
3165@@ -10327,13 +10924,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3147@@ -10331,13 +10928,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3166 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3148 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3167 ;; 3149 ;;
3168 esac 3150 esac
@@ -3235,7 +3217,7 @@ index d4f3e1e..a6df5bb 100755
3235 # FIXME: first we should search . and the directory the executable is in 3217 # FIXME: first we should search . and the directory the executable is in
3236 shlibpath_var=PATH 3218 shlibpath_var=PATH
3237 ;; 3219 ;;
3238@@ -10425,7 +11080,7 @@ haiku*) 3220@@ -10429,7 +11084,7 @@ haiku*)
3239 soname_spec='${libname}${release}${shared_ext}$major' 3221 soname_spec='${libname}${release}${shared_ext}$major'
3240 shlibpath_var=LIBRARY_PATH 3222 shlibpath_var=LIBRARY_PATH
3241 shlibpath_overrides_runpath=yes 3223 shlibpath_overrides_runpath=yes
@@ -3244,16 +3226,7 @@ index d4f3e1e..a6df5bb 100755
3244 hardcode_into_libs=yes 3226 hardcode_into_libs=yes
3245 ;; 3227 ;;
3246 3228
3247@@ -11221,7 +11876,7 @@ else 3229@@ -11269,10 +11924,10 @@ else
3248 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3249 lt_status=$lt_dlunknown
3250 cat > conftest.$ac_ext <<_LT_EOF
3251-#line 11224 "configure"
3252+#line $LINENO "configure"
3253 #include "confdefs.h"
3254
3255 #if HAVE_DLFCN_H
3256@@ -11265,10 +11920,10 @@ else
3257 /* When -fvisbility=hidden is used, assume the code has been annotated 3230 /* When -fvisbility=hidden is used, assume the code has been annotated
3258 correspondingly for the symbols needed. */ 3231 correspondingly for the symbols needed. */
3259 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3232 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3266,16 +3239,7 @@ index d4f3e1e..a6df5bb 100755
3266 int main () 3239 int main ()
3267 { 3240 {
3268 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3241 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3269@@ -11327,7 +11982,7 @@ else 3242@@ -11375,10 +12030,10 @@ else
3270 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3271 lt_status=$lt_dlunknown
3272 cat > conftest.$ac_ext <<_LT_EOF
3273-#line 11330 "configure"
3274+#line $LINENO "configure"
3275 #include "confdefs.h"
3276
3277 #if HAVE_DLFCN_H
3278@@ -11371,10 +12026,10 @@ else
3279 /* When -fvisbility=hidden is used, assume the code has been annotated 3243 /* When -fvisbility=hidden is used, assume the code has been annotated
3280 correspondingly for the symbols needed. */ 3244 correspondingly for the symbols needed. */
3281 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3245 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -3288,7 +3252,7 @@ index d4f3e1e..a6df5bb 100755
3288 int main () 3252 int main ()
3289 { 3253 {
3290 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3254 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3291@@ -15355,13 +16010,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3255@@ -15392,13 +16047,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3292 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3256 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3293 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3257 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3294 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3258 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3309,7 +3273,7 @@ index d4f3e1e..a6df5bb 100755
3309 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3273 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3310 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3274 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3311 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3275 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3312@@ -15376,14 +16038,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3276@@ -15413,14 +16075,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3313 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3277 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3314 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3278 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3315 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 3279 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"`'
@@ -3328,7 +3292,7 @@ index d4f3e1e..a6df5bb 100755
3328 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3292 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3329 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3293 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3330 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3294 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3331@@ -15416,12 +16081,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3295@@ -15453,12 +16118,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3332 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3296 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3333 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3297 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3334 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3298 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3342,7 +3306,7 @@ index d4f3e1e..a6df5bb 100755
3342 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3306 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3343 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3307 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3344 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3308 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3345@@ -15476,8 +16141,13 @@ reload_flag \ 3309@@ -15513,8 +16178,13 @@ reload_flag \
3346 OBJDUMP \ 3310 OBJDUMP \
3347 deplibs_check_method \ 3311 deplibs_check_method \
3348 file_magic_cmd \ 3312 file_magic_cmd \
@@ -3356,7 +3320,7 @@ index d4f3e1e..a6df5bb 100755
3356 STRIP \ 3320 STRIP \
3357 RANLIB \ 3321 RANLIB \
3358 CC \ 3322 CC \
3359@@ -15487,12 +16157,14 @@ lt_cv_sys_global_symbol_pipe \ 3323@@ -15524,12 +16194,14 @@ lt_cv_sys_global_symbol_pipe \
3360 lt_cv_sys_global_symbol_to_cdecl \ 3324 lt_cv_sys_global_symbol_to_cdecl \
3361 lt_cv_sys_global_symbol_to_c_name_address \ 3325 lt_cv_sys_global_symbol_to_c_name_address \
3362 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3326 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -3372,7 +3336,7 @@ index d4f3e1e..a6df5bb 100755
3372 DSYMUTIL \ 3336 DSYMUTIL \
3373 NMEDIT \ 3337 NMEDIT \
3374 LIPO \ 3338 LIPO \
3375@@ -15508,7 +16180,6 @@ no_undefined_flag \ 3339@@ -15545,7 +16217,6 @@ no_undefined_flag \
3376 hardcode_libdir_flag_spec \ 3340 hardcode_libdir_flag_spec \
3377 hardcode_libdir_flag_spec_ld \ 3341 hardcode_libdir_flag_spec_ld \
3378 hardcode_libdir_separator \ 3342 hardcode_libdir_separator \
@@ -3380,7 +3344,7 @@ index d4f3e1e..a6df5bb 100755
3380 exclude_expsyms \ 3344 exclude_expsyms \
3381 include_expsyms \ 3345 include_expsyms \
3382 file_list_spec \ 3346 file_list_spec \
3383@@ -15544,6 +16215,7 @@ module_cmds \ 3347@@ -15581,6 +16252,7 @@ module_cmds \
3384 module_expsym_cmds \ 3348 module_expsym_cmds \
3385 export_symbols_cmds \ 3349 export_symbols_cmds \
3386 prelink_cmds \ 3350 prelink_cmds \
@@ -3388,7 +3352,7 @@ index d4f3e1e..a6df5bb 100755
3388 postinstall_cmds \ 3352 postinstall_cmds \
3389 postuninstall_cmds \ 3353 postuninstall_cmds \
3390 finish_cmds \ 3354 finish_cmds \
3391@@ -16301,7 +16973,8 @@ $as_echo X"$file" | 3355@@ -16338,7 +17010,8 @@ $as_echo X"$file" |
3392 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3356 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3393 # 3357 #
3394 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3358 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -3398,7 +3362,7 @@ index d4f3e1e..a6df5bb 100755
3398 # Written by Gordon Matzigkeit, 1996 3362 # Written by Gordon Matzigkeit, 1996
3399 # 3363 #
3400 # This file is part of GNU Libtool. 3364 # This file is part of GNU Libtool.
3401@@ -16404,19 +17077,42 @@ SP2NL=$lt_lt_SP2NL 3365@@ -16441,19 +17114,42 @@ SP2NL=$lt_lt_SP2NL
3402 # turn newlines into spaces. 3366 # turn newlines into spaces.
3403 NL2SP=$lt_lt_NL2SP 3367 NL2SP=$lt_lt_NL2SP
3404 3368
@@ -3442,7 +3406,7 @@ index d4f3e1e..a6df5bb 100755
3442 # A symbol stripping program. 3406 # A symbol stripping program.
3443 STRIP=$lt_STRIP 3407 STRIP=$lt_STRIP
3444 3408
3445@@ -16446,6 +17142,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3409@@ -16483,6 +17179,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3446 # Transform the output of nm in a C name address pair when lib prefix is needed. 3410 # Transform the output of nm in a C name address pair when lib prefix is needed.
3447 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3411 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3448 3412
@@ -3455,7 +3419,7 @@ index d4f3e1e..a6df5bb 100755
3455 # The name of the directory that contains temporary libtool files. 3419 # The name of the directory that contains temporary libtool files.
3456 objdir=$objdir 3420 objdir=$objdir
3457 3421
3458@@ -16455,6 +17157,9 @@ MAGIC_CMD=$MAGIC_CMD 3422@@ -16492,6 +17194,9 @@ MAGIC_CMD=$MAGIC_CMD
3459 # Must we lock files when doing compilation? 3423 # Must we lock files when doing compilation?
3460 need_locks=$lt_need_locks 3424 need_locks=$lt_need_locks
3461 3425
@@ -3465,7 +3429,7 @@ index d4f3e1e..a6df5bb 100755
3465 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3429 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3466 DSYMUTIL=$lt_DSYMUTIL 3430 DSYMUTIL=$lt_DSYMUTIL
3467 3431
3468@@ -16569,12 +17274,12 @@ with_gcc=$GCC 3432@@ -16606,12 +17311,12 @@ with_gcc=$GCC
3469 # Compiler flag to turn off builtin functions. 3433 # Compiler flag to turn off builtin functions.
3470 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3434 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3471 3435
@@ -3481,7 +3445,7 @@ index d4f3e1e..a6df5bb 100755
3481 # Compiler flag to prevent dynamic linking. 3445 # Compiler flag to prevent dynamic linking.
3482 link_static_flag=$lt_lt_prog_compiler_static 3446 link_static_flag=$lt_lt_prog_compiler_static
3483 3447
3484@@ -16661,9 +17366,6 @@ inherit_rpath=$inherit_rpath 3448@@ -16698,9 +17403,6 @@ inherit_rpath=$inherit_rpath
3485 # Whether libtool must link a program against all its dependency libraries. 3449 # Whether libtool must link a program against all its dependency libraries.
3486 link_all_deplibs=$link_all_deplibs 3450 link_all_deplibs=$link_all_deplibs
3487 3451
@@ -3491,7 +3455,7 @@ index d4f3e1e..a6df5bb 100755
3491 # Set to "yes" if exported symbols are required. 3455 # Set to "yes" if exported symbols are required.
3492 always_export_symbols=$always_export_symbols 3456 always_export_symbols=$always_export_symbols
3493 3457
3494@@ -16679,6 +17381,9 @@ include_expsyms=$lt_include_expsyms 3458@@ -16716,6 +17418,9 @@ include_expsyms=$lt_include_expsyms
3495 # Commands necessary for linking programs (against libraries) with templates. 3459 # Commands necessary for linking programs (against libraries) with templates.
3496 prelink_cmds=$lt_prelink_cmds 3460 prelink_cmds=$lt_prelink_cmds
3497 3461
@@ -3501,7 +3465,7 @@ index d4f3e1e..a6df5bb 100755
3501 # Specify filename containing input files. 3465 # Specify filename containing input files.
3502 file_list_spec=$lt_file_list_spec 3466 file_list_spec=$lt_file_list_spec
3503 3467
3504@@ -16711,210 +17416,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3468@@ -16748,210 +17453,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3505 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3469 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3506 # text mode, it properly converts lines to CR/LF. This bash problem 3470 # text mode, it properly converts lines to CR/LF. This bash problem
3507 # is reportedly fixed, but why not run on old versions too? 3471 # is reportedly fixed, but why not run on old versions too?
@@ -3876,10 +3840,10 @@ index d4f3e1e..a6df5bb 100755
3876 chmod +x "$ofile" 3840 chmod +x "$ofile"
3877 3841
3878diff --git a/configure b/configure 3842diff --git a/configure b/configure
3879index 85414ab..34b66f7 100755 3843index 2a74a77..ad3dfb7 100755
3880--- a/configure 3844--- a/configure
3881+++ b/configure 3845+++ b/configure
3882@@ -3445,7 +3445,7 @@ case "${target}" in 3846@@ -3444,7 +3444,7 @@ case "${target}" in
3883 ;; 3847 ;;
3884 s390-*-* | s390x-*-*) 3848 s390-*-* | s390x-*-*)
3885 ;; 3849 ;;
@@ -3888,7 +3852,7 @@ index 85414ab..34b66f7 100755
3888 ;; 3852 ;;
3889 sh64-*-* | sh5*-*-*) 3853 sh64-*-* | sh5*-*-*)
3890 ;; 3854 ;;
3891@@ -3939,7 +3939,7 @@ case "${target}" in 3855@@ -3946,7 +3946,7 @@ case "${target}" in
3892 or1k*-*-*) 3856 or1k*-*-*)
3893 noconfigdirs="$noconfigdirs gdb" 3857 noconfigdirs="$noconfigdirs gdb"
3894 ;; 3858 ;;
@@ -3898,10 +3862,10 @@ index 85414ab..34b66f7 100755
3898 sh*-*-elf) 3862 sh*-*-elf)
3899 ;; 3863 ;;
3900diff --git a/gas/configure b/gas/configure 3864diff --git a/gas/configure b/gas/configure
3901index dd9c953..89f18b3 100755 3865index f7753b8..45da030 100755
3902--- a/gas/configure 3866--- a/gas/configure
3903+++ b/gas/configure 3867+++ b/gas/configure
3904@@ -647,8 +647,11 @@ OTOOL 3868@@ -648,8 +648,11 @@ OTOOL
3905 LIPO 3869 LIPO
3906 NMEDIT 3870 NMEDIT
3907 DSYMUTIL 3871 DSYMUTIL
@@ -3913,7 +3877,7 @@ index dd9c953..89f18b3 100755
3913 OBJDUMP 3877 OBJDUMP
3914 LN_S 3878 LN_S
3915 NM 3879 NM
3916@@ -759,6 +762,7 @@ enable_static 3880@@ -761,6 +764,7 @@ enable_static
3917 with_pic 3881 with_pic
3918 enable_fast_install 3882 enable_fast_install
3919 with_gnu_ld 3883 with_gnu_ld
@@ -3921,16 +3885,7 @@ index dd9c953..89f18b3 100755
3921 enable_libtool_lock 3885 enable_libtool_lock
3922 enable_plugins 3886 enable_plugins
3923 enable_largefile 3887 enable_largefile
3924@@ -1430,6 +1434,8 @@ Optional Packages: 3888@@ -4919,8 +4923,8 @@ esac
3925 --with-pic try to use only PIC/non-PIC objects [default=use
3926 both]
3927 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
3928+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
3929+ (or the compiler's sysroot if not specified).
3930 --with-system-zlib use installed libz
3931
3932 Some influential environment variables:
3933@@ -4909,8 +4915,8 @@ esac
3934 3889
3935 3890
3936 3891
@@ -3941,7 +3896,7 @@ index dd9c953..89f18b3 100755
3941 3896
3942 3897
3943 3898
3944@@ -4950,7 +4956,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 3899@@ -4960,7 +4964,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3945 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3900 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3946 $as_echo_n "checking how to print strings... " >&6; } 3901 $as_echo_n "checking how to print strings... " >&6; }
3947 # Test print first, because it will be a builtin if present. 3902 # Test print first, because it will be a builtin if present.
@@ -3950,7 +3905,7 @@ index dd9c953..89f18b3 100755
3950 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3905 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3951 ECHO='print -r --' 3906 ECHO='print -r --'
3952 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3907 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3953@@ -5636,8 +5642,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 3908@@ -5646,8 +5650,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3954 # Try some XSI features 3909 # Try some XSI features
3955 xsi_shell=no 3910 xsi_shell=no
3956 ( _lt_dummy="a/b/c" 3911 ( _lt_dummy="a/b/c"
@@ -3961,7 +3916,7 @@ index dd9c953..89f18b3 100755
3961 && eval 'test $(( 1 + 1 )) -eq 2 \ 3916 && eval 'test $(( 1 + 1 )) -eq 2 \
3962 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3917 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3963 && xsi_shell=yes 3918 && xsi_shell=yes
3964@@ -5686,6 +5692,80 @@ esac 3919@@ -5696,6 +5700,80 @@ esac
3965 3920
3966 3921
3967 3922
@@ -4042,7 +3997,7 @@ index dd9c953..89f18b3 100755
4042 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 3997 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4043 $as_echo_n "checking for $LD option to reload object files... " >&6; } 3998 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4044 if test "${lt_cv_ld_reload_flag+set}" = set; then : 3999 if test "${lt_cv_ld_reload_flag+set}" = set; then :
4045@@ -5702,6 +5782,11 @@ case $reload_flag in 4000@@ -5712,6 +5790,11 @@ case $reload_flag in
4046 esac 4001 esac
4047 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4002 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4048 case $host_os in 4003 case $host_os in
@@ -4054,7 +4009,7 @@ index dd9c953..89f18b3 100755
4054 darwin*) 4009 darwin*)
4055 if test "$GCC" = yes; then 4010 if test "$GCC" = yes; then
4056 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4011 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4057@@ -5870,7 +5955,8 @@ mingw* | pw32*) 4012@@ -5880,7 +5963,8 @@ mingw* | pw32*)
4058 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4013 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4059 lt_cv_file_magic_cmd='func_win32_libid' 4014 lt_cv_file_magic_cmd='func_win32_libid'
4060 else 4015 else
@@ -4064,7 +4019,7 @@ index dd9c953..89f18b3 100755
4064 lt_cv_file_magic_cmd='$OBJDUMP -f' 4019 lt_cv_file_magic_cmd='$OBJDUMP -f'
4065 fi 4020 fi
4066 ;; 4021 ;;
4067@@ -6024,6 +6110,21 @@ esac 4022@@ -6034,6 +6118,21 @@ esac
4068 fi 4023 fi
4069 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4024 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4070 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4025 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4086,7 +4041,7 @@ index dd9c953..89f18b3 100755
4086 file_magic_cmd=$lt_cv_file_magic_cmd 4041 file_magic_cmd=$lt_cv_file_magic_cmd
4087 deplibs_check_method=$lt_cv_deplibs_check_method 4042 deplibs_check_method=$lt_cv_deplibs_check_method
4088 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4043 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4089@@ -6039,9 +6140,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4044@@ -6049,9 +6148,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4090 4045
4091 4046
4092 4047
@@ -4251,7 +4206,7 @@ index dd9c953..89f18b3 100755
4251 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4206 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4252 $as_echo_n "checking for $ac_word... " >&6; } 4207 $as_echo_n "checking for $ac_word... " >&6; }
4253 if test "${ac_cv_prog_AR+set}" = set; then : 4208 if test "${ac_cv_prog_AR+set}" = set; then :
4254@@ -6057,7 +6311,7 @@ do 4209@@ -6067,7 +6319,7 @@ do
4255 test -z "$as_dir" && as_dir=. 4210 test -z "$as_dir" && as_dir=.
4256 for ac_exec_ext in '' $ac_executable_extensions; do 4211 for ac_exec_ext in '' $ac_executable_extensions; do
4257 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4212 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -4260,7 +4215,7 @@ index dd9c953..89f18b3 100755
4260 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4215 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4261 break 2 4216 break 2
4262 fi 4217 fi
4263@@ -6077,11 +6331,15 @@ $as_echo "no" >&6; } 4218@@ -6087,11 +6339,15 @@ $as_echo "no" >&6; }
4264 fi 4219 fi
4265 4220
4266 4221
@@ -4279,7 +4234,7 @@ index dd9c953..89f18b3 100755
4279 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4234 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4280 $as_echo_n "checking for $ac_word... " >&6; } 4235 $as_echo_n "checking for $ac_word... " >&6; }
4281 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 4236 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
4282@@ -6097,7 +6355,7 @@ do 4237@@ -6107,7 +6363,7 @@ do
4283 test -z "$as_dir" && as_dir=. 4238 test -z "$as_dir" && as_dir=.
4284 for ac_exec_ext in '' $ac_executable_extensions; do 4239 for ac_exec_ext in '' $ac_executable_extensions; do
4285 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4240 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -4288,7 +4243,7 @@ index dd9c953..89f18b3 100755
4288 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4243 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4289 break 2 4244 break 2
4290 fi 4245 fi
4291@@ -6116,6 +6374,10 @@ else 4246@@ -6126,6 +6382,10 @@ else
4292 $as_echo "no" >&6; } 4247 $as_echo "no" >&6; }
4293 fi 4248 fi
4294 4249
@@ -4299,7 +4254,7 @@ index dd9c953..89f18b3 100755
4299 if test "x$ac_ct_AR" = x; then 4254 if test "x$ac_ct_AR" = x; then
4300 AR="false" 4255 AR="false"
4301 else 4256 else
4302@@ -6127,12 +6389,10 @@ ac_tool_warned=yes ;; 4257@@ -6137,12 +6397,10 @@ ac_tool_warned=yes ;;
4303 esac 4258 esac
4304 AR=$ac_ct_AR 4259 AR=$ac_ct_AR
4305 fi 4260 fi
@@ -4314,7 +4269,7 @@ index dd9c953..89f18b3 100755
4314 4269
4315 4270
4316 4271
4317@@ -6144,6 +6404,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 4272@@ -6154,6 +6412,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4318 4273
4319 4274
4320 4275
@@ -4379,7 +4334,7 @@ index dd9c953..89f18b3 100755
4379 if test -n "$ac_tool_prefix"; then 4334 if test -n "$ac_tool_prefix"; then
4380 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 4335 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4381 set dummy ${ac_tool_prefix}strip; ac_word=$2 4336 set dummy ${ac_tool_prefix}strip; ac_word=$2
4382@@ -6478,8 +6796,8 @@ esac 4337@@ -6488,8 +6804,8 @@ esac
4383 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4338 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4384 4339
4385 # Transform an extracted symbol line into symbol name and symbol address 4340 # Transform an extracted symbol line into symbol name and symbol address
@@ -4390,7 +4345,7 @@ index dd9c953..89f18b3 100755
4390 4345
4391 # Handle CRLF in mingw tool chain 4346 # Handle CRLF in mingw tool chain
4392 opt_cr= 4347 opt_cr=
4393@@ -6515,6 +6833,7 @@ for ac_symprfx in "" "_"; do 4348@@ -6525,6 +6841,7 @@ for ac_symprfx in "" "_"; do
4394 else 4349 else
4395 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4350 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4396 fi 4351 fi
@@ -4398,7 +4353,7 @@ index dd9c953..89f18b3 100755
4398 4353
4399 # Check to see that the pipe works correctly. 4354 # Check to see that the pipe works correctly.
4400 pipe_works=no 4355 pipe_works=no
4401@@ -6556,6 +6875,18 @@ _LT_EOF 4356@@ -6566,6 +6883,18 @@ _LT_EOF
4402 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4357 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4403 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4358 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4404 cat <<_LT_EOF > conftest.$ac_ext 4359 cat <<_LT_EOF > conftest.$ac_ext
@@ -4417,7 +4372,7 @@ index dd9c953..89f18b3 100755
4417 #ifdef __cplusplus 4372 #ifdef __cplusplus
4418 extern "C" { 4373 extern "C" {
4419 #endif 4374 #endif
4420@@ -6567,7 +6898,7 @@ _LT_EOF 4375@@ -6577,7 +6906,7 @@ _LT_EOF
4421 cat <<_LT_EOF >> conftest.$ac_ext 4376 cat <<_LT_EOF >> conftest.$ac_ext
4422 4377
4423 /* The mapping between symbol names and symbols. */ 4378 /* The mapping between symbol names and symbols. */
@@ -4426,7 +4381,7 @@ index dd9c953..89f18b3 100755
4426 const char *name; 4381 const char *name;
4427 void *address; 4382 void *address;
4428 } 4383 }
4429@@ -6593,8 +6924,8 @@ static const void *lt_preloaded_setup() { 4384@@ -6603,8 +6932,8 @@ static const void *lt_preloaded_setup() {
4430 _LT_EOF 4385 _LT_EOF
4431 # Now try linking the two files. 4386 # Now try linking the two files.
4432 mv conftest.$ac_objext conftstm.$ac_objext 4387 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4437,7 +4392,7 @@ index dd9c953..89f18b3 100755
4437 LIBS="conftstm.$ac_objext" 4392 LIBS="conftstm.$ac_objext"
4438 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4393 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4439 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4394 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4440@@ -6604,8 +6935,8 @@ _LT_EOF 4395@@ -6614,8 +6943,8 @@ _LT_EOF
4441 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4396 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4442 pipe_works=yes 4397 pipe_works=yes
4443 fi 4398 fi
@@ -4448,7 +4403,7 @@ index dd9c953..89f18b3 100755
4448 else 4403 else
4449 echo "cannot find nm_test_func in $nlist" >&5 4404 echo "cannot find nm_test_func in $nlist" >&5
4450 fi 4405 fi
4451@@ -6642,6 +6973,21 @@ else 4406@@ -6652,6 +6981,21 @@ else
4452 $as_echo "ok" >&6; } 4407 $as_echo "ok" >&6; }
4453 fi 4408 fi
4454 4409
@@ -4470,7 +4425,7 @@ index dd9c953..89f18b3 100755
4470 4425
4471 4426
4472 4427
4473@@ -6660,6 +7006,40 @@ fi 4428@@ -6670,6 +7014,40 @@ fi
4474 4429
4475 4430
4476 4431
@@ -4511,7 +4466,7 @@ index dd9c953..89f18b3 100755
4511 4466
4512 4467
4513 4468
4514@@ -6869,6 +7249,123 @@ esac 4469@@ -6879,6 +7257,123 @@ esac
4515 4470
4516 need_locks="$enable_libtool_lock" 4471 need_locks="$enable_libtool_lock"
4517 4472
@@ -4635,7 +4590,7 @@ index dd9c953..89f18b3 100755
4635 4590
4636 case $host_os in 4591 case $host_os in
4637 rhapsody* | darwin*) 4592 rhapsody* | darwin*)
4638@@ -7432,6 +7929,8 @@ _LT_EOF 4593@@ -7442,6 +7937,8 @@ _LT_EOF
4639 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4594 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4640 echo "$AR cru libconftest.a conftest.o" >&5 4595 echo "$AR cru libconftest.a conftest.o" >&5
4641 $AR cru libconftest.a conftest.o 2>&5 4596 $AR cru libconftest.a conftest.o 2>&5
@@ -4644,7 +4599,7 @@ index dd9c953..89f18b3 100755
4644 cat > conftest.c << _LT_EOF 4599 cat > conftest.c << _LT_EOF
4645 int main() { return 0;} 4600 int main() { return 0;}
4646 _LT_EOF 4601 _LT_EOF
4647@@ -7627,7 +8126,8 @@ fi 4602@@ -7637,7 +8134,8 @@ fi
4648 LIBTOOL_DEPS="$ltmain" 4603 LIBTOOL_DEPS="$ltmain"
4649 4604
4650 # Always use our own libtool. 4605 # Always use our own libtool.
@@ -4654,7 +4609,7 @@ index dd9c953..89f18b3 100755
4654 4609
4655 4610
4656 4611
4657@@ -7716,7 +8216,7 @@ aix3*) 4612@@ -7726,7 +8224,7 @@ aix3*)
4658 esac 4613 esac
4659 4614
4660 # Global variables: 4615 # Global variables:
@@ -4663,7 +4618,7 @@ index dd9c953..89f18b3 100755
4663 can_build_shared=yes 4618 can_build_shared=yes
4664 4619
4665 # All known linkers require a `.a' archive for static linking (except MSVC, 4620 # All known linkers require a `.a' archive for static linking (except MSVC,
4666@@ -8014,8 +8514,6 @@ fi 4621@@ -8024,8 +8522,6 @@ fi
4667 lt_prog_compiler_pic= 4622 lt_prog_compiler_pic=
4668 lt_prog_compiler_static= 4623 lt_prog_compiler_static=
4669 4624
@@ -4672,7 +4627,7 @@ index dd9c953..89f18b3 100755
4672 4627
4673 if test "$GCC" = yes; then 4628 if test "$GCC" = yes; then
4674 lt_prog_compiler_wl='-Wl,' 4629 lt_prog_compiler_wl='-Wl,'
4675@@ -8181,6 +8679,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4630@@ -8191,6 +8687,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4676 lt_prog_compiler_pic='--shared' 4631 lt_prog_compiler_pic='--shared'
4677 lt_prog_compiler_static='--static' 4632 lt_prog_compiler_static='--static'
4678 ;; 4633 ;;
@@ -4685,7 +4640,7 @@ index dd9c953..89f18b3 100755
4685 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4640 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4686 # Portland Group compilers (*not* the Pentium gcc compiler, 4641 # Portland Group compilers (*not* the Pentium gcc compiler,
4687 # which looks to be a dead project) 4642 # which looks to be a dead project)
4688@@ -8243,7 +8747,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4643@@ -8253,7 +8755,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4689 lt_prog_compiler_pic='-KPIC' 4644 lt_prog_compiler_pic='-KPIC'
4690 lt_prog_compiler_static='-Bstatic' 4645 lt_prog_compiler_static='-Bstatic'
4691 case $cc_basename in 4646 case $cc_basename in
@@ -4694,7 +4649,7 @@ index dd9c953..89f18b3 100755
4694 lt_prog_compiler_wl='-Qoption ld ';; 4649 lt_prog_compiler_wl='-Qoption ld ';;
4695 *) 4650 *)
4696 lt_prog_compiler_wl='-Wl,';; 4651 lt_prog_compiler_wl='-Wl,';;
4697@@ -8300,13 +8804,17 @@ case $host_os in 4652@@ -8310,13 +8812,17 @@ case $host_os in
4698 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4653 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4699 ;; 4654 ;;
4700 esac 4655 esac
@@ -4718,7 +4673,7 @@ index dd9c953..89f18b3 100755
4718 4673
4719 # 4674 #
4720 # Check to make sure the PIC flag actually works. 4675 # Check to make sure the PIC flag actually works.
4721@@ -8367,6 +8875,11 @@ fi 4676@@ -8377,6 +8883,11 @@ fi
4722 4677
4723 4678
4724 4679
@@ -4730,7 +4685,7 @@ index dd9c953..89f18b3 100755
4730 # 4685 #
4731 # Check to make sure the static flag actually works. 4686 # Check to make sure the static flag actually works.
4732 # 4687 #
4733@@ -8717,7 +9230,8 @@ _LT_EOF 4688@@ -8727,7 +9238,8 @@ _LT_EOF
4734 allow_undefined_flag=unsupported 4689 allow_undefined_flag=unsupported
4735 always_export_symbols=no 4690 always_export_symbols=no
4736 enable_shared_with_static_runtimes=yes 4691 enable_shared_with_static_runtimes=yes
@@ -4740,7 +4695,7 @@ index dd9c953..89f18b3 100755
4740 4695
4741 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4696 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4742 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4697 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4743@@ -8816,12 +9330,12 @@ _LT_EOF 4698@@ -8826,12 +9338,12 @@ _LT_EOF
4744 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4699 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4745 hardcode_libdir_flag_spec= 4700 hardcode_libdir_flag_spec=
4746 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4701 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4755,7 +4710,7 @@ index dd9c953..89f18b3 100755
4755 fi 4710 fi
4756 ;; 4711 ;;
4757 esac 4712 esac
4758@@ -8835,8 +9349,8 @@ _LT_EOF 4713@@ -8845,8 +9357,8 @@ _LT_EOF
4759 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4714 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4760 wlarc= 4715 wlarc=
4761 else 4716 else
@@ -4766,7 +4721,7 @@ index dd9c953..89f18b3 100755
4766 fi 4721 fi
4767 ;; 4722 ;;
4768 4723
4769@@ -8854,8 +9368,8 @@ _LT_EOF 4724@@ -8864,8 +9376,8 @@ _LT_EOF
4770 4725
4771 _LT_EOF 4726 _LT_EOF
4772 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4727 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4777,7 +4732,7 @@ index dd9c953..89f18b3 100755
4777 else 4732 else
4778 ld_shlibs=no 4733 ld_shlibs=no
4779 fi 4734 fi
4780@@ -8901,8 +9415,8 @@ _LT_EOF 4735@@ -8911,8 +9423,8 @@ _LT_EOF
4781 4736
4782 *) 4737 *)
4783 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4738 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4788,7 +4743,7 @@ index dd9c953..89f18b3 100755
4788 else 4743 else
4789 ld_shlibs=no 4744 ld_shlibs=no
4790 fi 4745 fi
4791@@ -9032,7 +9546,13 @@ _LT_EOF 4746@@ -9042,7 +9554,13 @@ _LT_EOF
4792 allow_undefined_flag='-berok' 4747 allow_undefined_flag='-berok'
4793 # Determine the default libpath from the value encoded in an 4748 # Determine the default libpath from the value encoded in an
4794 # empty executable. 4749 # empty executable.
@@ -4803,7 +4758,7 @@ index dd9c953..89f18b3 100755
4803 /* end confdefs.h. */ 4758 /* end confdefs.h. */
4804 4759
4805 int 4760 int
4806@@ -9045,22 +9565,29 @@ main () 4761@@ -9055,22 +9573,29 @@ main ()
4807 _ACEOF 4762 _ACEOF
4808 if ac_fn_c_try_link "$LINENO"; then : 4763 if ac_fn_c_try_link "$LINENO"; then :
4809 4764
@@ -4846,7 +4801,7 @@ index dd9c953..89f18b3 100755
4846 4801
4847 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4802 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4848 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" 4803 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"
4849@@ -9072,7 +9599,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4804@@ -9082,7 +9607,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4850 else 4805 else
4851 # Determine the default libpath from the value encoded in an 4806 # Determine the default libpath from the value encoded in an
4852 # empty executable. 4807 # empty executable.
@@ -4861,7 +4816,7 @@ index dd9c953..89f18b3 100755
4861 /* end confdefs.h. */ 4816 /* end confdefs.h. */
4862 4817
4863 int 4818 int
4864@@ -9085,22 +9618,29 @@ main () 4819@@ -9095,22 +9626,29 @@ main ()
4865 _ACEOF 4820 _ACEOF
4866 if ac_fn_c_try_link "$LINENO"; then : 4821 if ac_fn_c_try_link "$LINENO"; then :
4867 4822
@@ -4904,7 +4859,7 @@ index dd9c953..89f18b3 100755
4904 4859
4905 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4860 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4906 # Warning - without using the other run time loading flags, 4861 # Warning - without using the other run time loading flags,
4907@@ -9145,20 +9685,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4862@@ -9155,20 +9693,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4908 # Microsoft Visual C++. 4863 # Microsoft Visual C++.
4909 # hardcode_libdir_flag_spec is actually meaningless, as there is 4864 # hardcode_libdir_flag_spec is actually meaningless, as there is
4910 # no search path for DLLs. 4865 # no search path for DLLs.
@@ -4982,7 +4937,7 @@ index dd9c953..89f18b3 100755
4982 ;; 4937 ;;
4983 4938
4984 darwin* | rhapsody*) 4939 darwin* | rhapsody*)
4985@@ -9219,7 +9802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4940@@ -9229,7 +9810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4986 4941
4987 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4942 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4988 freebsd* | dragonfly*) 4943 freebsd* | dragonfly*)
@@ -4991,7 +4946,7 @@ index dd9c953..89f18b3 100755
4991 hardcode_libdir_flag_spec='-R$libdir' 4946 hardcode_libdir_flag_spec='-R$libdir'
4992 hardcode_direct=yes 4947 hardcode_direct=yes
4993 hardcode_shlibpath_var=no 4948 hardcode_shlibpath_var=no
4994@@ -9227,7 +9810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4949@@ -9237,7 +9818,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4995 4950
4996 hpux9*) 4951 hpux9*)
4997 if test "$GCC" = yes; then 4952 if test "$GCC" = yes; then
@@ -5000,7 +4955,7 @@ index dd9c953..89f18b3 100755
5000 else 4955 else
5001 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' 4956 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'
5002 fi 4957 fi
5003@@ -9243,7 +9826,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4958@@ -9253,7 +9834,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5004 4959
5005 hpux10*) 4960 hpux10*)
5006 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4961 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -5009,7 +4964,7 @@ index dd9c953..89f18b3 100755
5009 else 4964 else
5010 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 4965 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
5011 fi 4966 fi
5012@@ -9267,10 +9850,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4967@@ -9277,10 +9858,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5013 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4968 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5014 ;; 4969 ;;
5015 ia64*) 4970 ia64*)
@@ -5022,7 +4977,7 @@ index dd9c953..89f18b3 100755
5022 ;; 4977 ;;
5023 esac 4978 esac
5024 else 4979 else
5025@@ -9349,23 +9932,36 @@ fi 4980@@ -9359,23 +9940,36 @@ fi
5026 4981
5027 irix5* | irix6* | nonstopux*) 4982 irix5* | irix6* | nonstopux*)
5028 if test "$GCC" = yes; then 4983 if test "$GCC" = yes; then
@@ -5067,7 +5022,7 @@ index dd9c953..89f18b3 100755
5067 else 5022 else
5068 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' 5023 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'
5069 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' 5024 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'
5070@@ -9450,7 +10046,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5025@@ -9460,7 +10054,7 @@ rm -f core conftest.err conftest.$ac_objext \
5071 osf4* | osf5*) # as osf3* with the addition of -msym flag 5026 osf4* | osf5*) # as osf3* with the addition of -msym flag
5072 if test "$GCC" = yes; then 5027 if test "$GCC" = yes; then
5073 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5028 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5076,7 +5031,7 @@ index dd9c953..89f18b3 100755
5076 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5031 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5077 else 5032 else
5078 allow_undefined_flag=' -expect_unresolved \*' 5033 allow_undefined_flag=' -expect_unresolved \*'
5079@@ -9469,9 +10065,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5034@@ -9479,9 +10073,9 @@ rm -f core conftest.err conftest.$ac_objext \
5080 no_undefined_flag=' -z defs' 5035 no_undefined_flag=' -z defs'
5081 if test "$GCC" = yes; then 5036 if test "$GCC" = yes; then
5082 wlarc='${wl}' 5037 wlarc='${wl}'
@@ -5088,7 +5043,7 @@ index dd9c953..89f18b3 100755
5088 else 5043 else
5089 case `$CC -V 2>&1` in 5044 case `$CC -V 2>&1` in
5090 *"Compilers 5.0"*) 5045 *"Compilers 5.0"*)
5091@@ -10047,8 +10643,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5046@@ -10057,8 +10651,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5092 need_version=no 5047 need_version=no
5093 need_lib_prefix=no 5048 need_lib_prefix=no
5094 5049
@@ -5100,7 +5055,7 @@ index dd9c953..89f18b3 100755
5100 library_names_spec='$libname.dll.a' 5055 library_names_spec='$libname.dll.a'
5101 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5056 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5102 postinstall_cmds='base_file=`basename \${file}`~ 5057 postinstall_cmds='base_file=`basename \${file}`~
5103@@ -10081,13 +10678,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5058@@ -10091,13 +10686,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5104 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5059 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5105 ;; 5060 ;;
5106 esac 5061 esac
@@ -5173,7 +5128,7 @@ index dd9c953..89f18b3 100755
5173 # FIXME: first we should search . and the directory the executable is in 5128 # FIXME: first we should search . and the directory the executable is in
5174 shlibpath_var=PATH 5129 shlibpath_var=PATH
5175 ;; 5130 ;;
5176@@ -10179,7 +10834,7 @@ haiku*) 5131@@ -10189,7 +10842,7 @@ haiku*)
5177 soname_spec='${libname}${release}${shared_ext}$major' 5132 soname_spec='${libname}${release}${shared_ext}$major'
5178 shlibpath_var=LIBRARY_PATH 5133 shlibpath_var=LIBRARY_PATH
5179 shlibpath_overrides_runpath=yes 5134 shlibpath_overrides_runpath=yes
@@ -5182,16 +5137,7 @@ index dd9c953..89f18b3 100755
5182 hardcode_into_libs=yes 5137 hardcode_into_libs=yes
5183 ;; 5138 ;;
5184 5139
5185@@ -10975,7 +11630,7 @@ else 5140@@ -11029,10 +11682,10 @@ else
5186 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5187 lt_status=$lt_dlunknown
5188 cat > conftest.$ac_ext <<_LT_EOF
5189-#line 10978 "configure"
5190+#line $LINENO "configure"
5191 #include "confdefs.h"
5192
5193 #if HAVE_DLFCN_H
5194@@ -11019,10 +11674,10 @@ else
5195 /* When -fvisbility=hidden is used, assume the code has been annotated 5141 /* When -fvisbility=hidden is used, assume the code has been annotated
5196 correspondingly for the symbols needed. */ 5142 correspondingly for the symbols needed. */
5197 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5143 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5204,16 +5150,7 @@ index dd9c953..89f18b3 100755
5204 int main () 5150 int main ()
5205 { 5151 {
5206 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5152 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5207@@ -11081,7 +11736,7 @@ else 5153@@ -11135,10 +11788,10 @@ else
5208 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5209 lt_status=$lt_dlunknown
5210 cat > conftest.$ac_ext <<_LT_EOF
5211-#line 11084 "configure"
5212+#line $LINENO "configure"
5213 #include "confdefs.h"
5214
5215 #if HAVE_DLFCN_H
5216@@ -11125,10 +11780,10 @@ else
5217 /* When -fvisbility=hidden is used, assume the code has been annotated 5154 /* When -fvisbility=hidden is used, assume the code has been annotated
5218 correspondingly for the symbols needed. */ 5155 correspondingly for the symbols needed. */
5219 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5156 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5226,7 +5163,7 @@ index dd9c953..89f18b3 100755
5226 int main () 5163 int main ()
5227 { 5164 {
5228 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5165 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5229@@ -15276,13 +15931,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5166@@ -15350,13 +16003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5230 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5167 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5231 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5168 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5232 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5169 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5247,7 +5184,7 @@ index dd9c953..89f18b3 100755
5247 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5184 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5248 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5185 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5249 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5186 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5250@@ -15297,14 +15959,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5187@@ -15371,14 +16031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5251 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5188 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5252 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5189 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5253 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"`' 5190 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"`'
@@ -5266,7 +5203,7 @@ index dd9c953..89f18b3 100755
5266 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5203 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5267 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5204 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5268 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5205 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5269@@ -15337,12 +16002,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5206@@ -15411,12 +16074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5270 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5207 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5271 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5208 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5272 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5209 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5280,7 +5217,7 @@ index dd9c953..89f18b3 100755
5280 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5217 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5281 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5218 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5282 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5219 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5283@@ -15397,8 +16062,13 @@ reload_flag \ 5220@@ -15471,8 +16134,13 @@ reload_flag \
5284 OBJDUMP \ 5221 OBJDUMP \
5285 deplibs_check_method \ 5222 deplibs_check_method \
5286 file_magic_cmd \ 5223 file_magic_cmd \
@@ -5294,7 +5231,7 @@ index dd9c953..89f18b3 100755
5294 STRIP \ 5231 STRIP \
5295 RANLIB \ 5232 RANLIB \
5296 CC \ 5233 CC \
5297@@ -15408,12 +16078,14 @@ lt_cv_sys_global_symbol_pipe \ 5234@@ -15482,12 +16150,14 @@ lt_cv_sys_global_symbol_pipe \
5298 lt_cv_sys_global_symbol_to_cdecl \ 5235 lt_cv_sys_global_symbol_to_cdecl \
5299 lt_cv_sys_global_symbol_to_c_name_address \ 5236 lt_cv_sys_global_symbol_to_c_name_address \
5300 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5237 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5310,7 +5247,7 @@ index dd9c953..89f18b3 100755
5310 DSYMUTIL \ 5247 DSYMUTIL \
5311 NMEDIT \ 5248 NMEDIT \
5312 LIPO \ 5249 LIPO \
5313@@ -15429,7 +16101,6 @@ no_undefined_flag \ 5250@@ -15503,7 +16173,6 @@ no_undefined_flag \
5314 hardcode_libdir_flag_spec \ 5251 hardcode_libdir_flag_spec \
5315 hardcode_libdir_flag_spec_ld \ 5252 hardcode_libdir_flag_spec_ld \
5316 hardcode_libdir_separator \ 5253 hardcode_libdir_separator \
@@ -5318,7 +5255,7 @@ index dd9c953..89f18b3 100755
5318 exclude_expsyms \ 5255 exclude_expsyms \
5319 include_expsyms \ 5256 include_expsyms \
5320 file_list_spec \ 5257 file_list_spec \
5321@@ -15465,6 +16136,7 @@ module_cmds \ 5258@@ -15539,6 +16208,7 @@ module_cmds \
5322 module_expsym_cmds \ 5259 module_expsym_cmds \
5323 export_symbols_cmds \ 5260 export_symbols_cmds \
5324 prelink_cmds \ 5261 prelink_cmds \
@@ -5326,7 +5263,7 @@ index dd9c953..89f18b3 100755
5326 postinstall_cmds \ 5263 postinstall_cmds \
5327 postuninstall_cmds \ 5264 postuninstall_cmds \
5328 finish_cmds \ 5265 finish_cmds \
5329@@ -16229,7 +16901,8 @@ $as_echo X"$file" | 5266@@ -16303,7 +16973,8 @@ $as_echo X"$file" |
5330 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5267 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5331 # 5268 #
5332 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5269 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5336,7 +5273,7 @@ index dd9c953..89f18b3 100755
5336 # Written by Gordon Matzigkeit, 1996 5273 # Written by Gordon Matzigkeit, 1996
5337 # 5274 #
5338 # This file is part of GNU Libtool. 5275 # This file is part of GNU Libtool.
5339@@ -16332,19 +17005,42 @@ SP2NL=$lt_lt_SP2NL 5276@@ -16406,19 +17077,42 @@ SP2NL=$lt_lt_SP2NL
5340 # turn newlines into spaces. 5277 # turn newlines into spaces.
5341 NL2SP=$lt_lt_NL2SP 5278 NL2SP=$lt_lt_NL2SP
5342 5279
@@ -5380,7 +5317,7 @@ index dd9c953..89f18b3 100755
5380 # A symbol stripping program. 5317 # A symbol stripping program.
5381 STRIP=$lt_STRIP 5318 STRIP=$lt_STRIP
5382 5319
5383@@ -16374,6 +17070,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5320@@ -16448,6 +17142,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5384 # Transform the output of nm in a C name address pair when lib prefix is needed. 5321 # Transform the output of nm in a C name address pair when lib prefix is needed.
5385 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5322 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5386 5323
@@ -5393,7 +5330,7 @@ index dd9c953..89f18b3 100755
5393 # The name of the directory that contains temporary libtool files. 5330 # The name of the directory that contains temporary libtool files.
5394 objdir=$objdir 5331 objdir=$objdir
5395 5332
5396@@ -16383,6 +17085,9 @@ MAGIC_CMD=$MAGIC_CMD 5333@@ -16457,6 +17157,9 @@ MAGIC_CMD=$MAGIC_CMD
5397 # Must we lock files when doing compilation? 5334 # Must we lock files when doing compilation?
5398 need_locks=$lt_need_locks 5335 need_locks=$lt_need_locks
5399 5336
@@ -5403,7 +5340,7 @@ index dd9c953..89f18b3 100755
5403 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5340 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5404 DSYMUTIL=$lt_DSYMUTIL 5341 DSYMUTIL=$lt_DSYMUTIL
5405 5342
5406@@ -16497,12 +17202,12 @@ with_gcc=$GCC 5343@@ -16571,12 +17274,12 @@ with_gcc=$GCC
5407 # Compiler flag to turn off builtin functions. 5344 # Compiler flag to turn off builtin functions.
5408 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5345 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5409 5346
@@ -5419,7 +5356,7 @@ index dd9c953..89f18b3 100755
5419 # Compiler flag to prevent dynamic linking. 5356 # Compiler flag to prevent dynamic linking.
5420 link_static_flag=$lt_lt_prog_compiler_static 5357 link_static_flag=$lt_lt_prog_compiler_static
5421 5358
5422@@ -16589,9 +17294,6 @@ inherit_rpath=$inherit_rpath 5359@@ -16663,9 +17366,6 @@ inherit_rpath=$inherit_rpath
5423 # Whether libtool must link a program against all its dependency libraries. 5360 # Whether libtool must link a program against all its dependency libraries.
5424 link_all_deplibs=$link_all_deplibs 5361 link_all_deplibs=$link_all_deplibs
5425 5362
@@ -5429,7 +5366,7 @@ index dd9c953..89f18b3 100755
5429 # Set to "yes" if exported symbols are required. 5366 # Set to "yes" if exported symbols are required.
5430 always_export_symbols=$always_export_symbols 5367 always_export_symbols=$always_export_symbols
5431 5368
5432@@ -16607,6 +17309,9 @@ include_expsyms=$lt_include_expsyms 5369@@ -16681,6 +17381,9 @@ include_expsyms=$lt_include_expsyms
5433 # Commands necessary for linking programs (against libraries) with templates. 5370 # Commands necessary for linking programs (against libraries) with templates.
5434 prelink_cmds=$lt_prelink_cmds 5371 prelink_cmds=$lt_prelink_cmds
5435 5372
@@ -5439,7 +5376,7 @@ index dd9c953..89f18b3 100755
5439 # Specify filename containing input files. 5376 # Specify filename containing input files.
5440 file_list_spec=$lt_file_list_spec 5377 file_list_spec=$lt_file_list_spec
5441 5378
5442@@ -16639,210 +17344,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5379@@ -16713,210 +17416,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5443 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5380 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5444 # text mode, it properly converts lines to CR/LF. This bash problem 5381 # text mode, it properly converts lines to CR/LF. This bash problem
5445 # is reportedly fixed, but why not run on old versions too? 5382 # is reportedly fixed, but why not run on old versions too?
@@ -5814,10 +5751,10 @@ index dd9c953..89f18b3 100755
5814 chmod +x "$ofile" 5751 chmod +x "$ofile"
5815 5752
5816diff --git a/gprof/configure b/gprof/configure 5753diff --git a/gprof/configure b/gprof/configure
5817index d4db554..78b292c 100755 5754index 626e1c7..a88719c 100755
5818--- a/gprof/configure 5755--- a/gprof/configure
5819+++ b/gprof/configure 5756+++ b/gprof/configure
5820@@ -629,8 +629,11 @@ OTOOL 5757@@ -630,8 +630,11 @@ OTOOL
5821 LIPO 5758 LIPO
5822 NMEDIT 5759 NMEDIT
5823 DSYMUTIL 5760 DSYMUTIL
@@ -5829,7 +5766,7 @@ index d4db554..78b292c 100755
5829 OBJDUMP 5766 OBJDUMP
5830 LN_S 5767 LN_S
5831 NM 5768 NM
5832@@ -741,6 +744,7 @@ enable_static 5769@@ -743,6 +746,7 @@ enable_static
5833 with_pic 5770 with_pic
5834 enable_fast_install 5771 enable_fast_install
5835 with_gnu_ld 5772 with_gnu_ld
@@ -5837,7 +5774,7 @@ index d4db554..78b292c 100755
5837 enable_libtool_lock 5774 enable_libtool_lock
5838 enable_plugins 5775 enable_plugins
5839 enable_largefile 5776 enable_largefile
5840@@ -1399,6 +1403,8 @@ Optional Packages: 5777@@ -1401,6 +1405,8 @@ Optional Packages:
5841 --with-pic try to use only PIC/non-PIC objects [default=use 5778 --with-pic try to use only PIC/non-PIC objects [default=use
5842 both] 5779 both]
5843 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 5780 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -5846,7 +5783,7 @@ index d4db554..78b292c 100755
5846 5783
5847 Some influential environment variables: 5784 Some influential environment variables:
5848 CC C compiler command 5785 CC C compiler command
5849@@ -4831,8 +4837,8 @@ esac 5786@@ -4835,8 +4841,8 @@ esac
5850 5787
5851 5788
5852 5789
@@ -5857,7 +5794,7 @@ index d4db554..78b292c 100755
5857 5794
5858 5795
5859 5796
5860@@ -4872,7 +4878,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5797@@ -4876,7 +4882,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5861 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5862 $as_echo_n "checking how to print strings... " >&6; } 5799 $as_echo_n "checking how to print strings... " >&6; }
5863 # Test print first, because it will be a builtin if present. 5800 # Test print first, because it will be a builtin if present.
@@ -5866,7 +5803,7 @@ index d4db554..78b292c 100755
5866 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5803 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5867 ECHO='print -r --' 5804 ECHO='print -r --'
5868 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5805 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5869@@ -5558,8 +5564,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5806@@ -5562,8 +5568,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5870 # Try some XSI features 5807 # Try some XSI features
5871 xsi_shell=no 5808 xsi_shell=no
5872 ( _lt_dummy="a/b/c" 5809 ( _lt_dummy="a/b/c"
@@ -5877,7 +5814,7 @@ index d4db554..78b292c 100755
5877 && eval 'test $(( 1 + 1 )) -eq 2 \ 5814 && eval 'test $(( 1 + 1 )) -eq 2 \
5878 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5815 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5879 && xsi_shell=yes 5816 && xsi_shell=yes
5880@@ -5608,6 +5614,80 @@ esac 5817@@ -5612,6 +5618,80 @@ esac
5881 5818
5882 5819
5883 5820
@@ -5958,7 +5895,7 @@ index d4db554..78b292c 100755
5958 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 5895 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5959 $as_echo_n "checking for $LD option to reload object files... " >&6; } 5896 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5960 if test "${lt_cv_ld_reload_flag+set}" = set; then : 5897 if test "${lt_cv_ld_reload_flag+set}" = set; then :
5961@@ -5624,6 +5704,11 @@ case $reload_flag in 5898@@ -5628,6 +5708,11 @@ case $reload_flag in
5962 esac 5899 esac
5963 reload_cmds='$LD$reload_flag -o $output$reload_objs' 5900 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5964 case $host_os in 5901 case $host_os in
@@ -5970,7 +5907,7 @@ index d4db554..78b292c 100755
5970 darwin*) 5907 darwin*)
5971 if test "$GCC" = yes; then 5908 if test "$GCC" = yes; then
5972 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 5909 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5973@@ -5792,7 +5877,8 @@ mingw* | pw32*) 5910@@ -5796,7 +5881,8 @@ mingw* | pw32*)
5974 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 5911 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5975 lt_cv_file_magic_cmd='func_win32_libid' 5912 lt_cv_file_magic_cmd='func_win32_libid'
5976 else 5913 else
@@ -5980,7 +5917,7 @@ index d4db554..78b292c 100755
5980 lt_cv_file_magic_cmd='$OBJDUMP -f' 5917 lt_cv_file_magic_cmd='$OBJDUMP -f'
5981 fi 5918 fi
5982 ;; 5919 ;;
5983@@ -5869,11 +5955,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) 5920@@ -5873,11 +5959,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5984 lt_cv_deplibs_check_method=pass_all 5921 lt_cv_deplibs_check_method=pass_all
5985 ;; 5922 ;;
5986 5923
@@ -5992,7 +5929,7 @@ index d4db554..78b292c 100755
5992 netbsd*) 5929 netbsd*)
5993 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 5930 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5994 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 5931 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5995@@ -5951,6 +6032,21 @@ esac 5932@@ -5955,6 +6036,21 @@ esac
5996 fi 5933 fi
5997 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5934 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5998 $as_echo "$lt_cv_deplibs_check_method" >&6; } 5935 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -6014,7 +5951,7 @@ index d4db554..78b292c 100755
6014 file_magic_cmd=$lt_cv_file_magic_cmd 5951 file_magic_cmd=$lt_cv_file_magic_cmd
6015 deplibs_check_method=$lt_cv_deplibs_check_method 5952 deplibs_check_method=$lt_cv_deplibs_check_method
6016 test -z "$deplibs_check_method" && deplibs_check_method=unknown 5953 test -z "$deplibs_check_method" && deplibs_check_method=unknown
6017@@ -5966,9 +6062,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 5954@@ -5970,9 +6066,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
6018 5955
6019 5956
6020 5957
@@ -6179,7 +6116,7 @@ index d4db554..78b292c 100755
6179 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6180 $as_echo_n "checking for $ac_word... " >&6; } 6117 $as_echo_n "checking for $ac_word... " >&6; }
6181 if test "${ac_cv_prog_AR+set}" = set; then : 6118 if test "${ac_cv_prog_AR+set}" = set; then :
6182@@ -5984,7 +6233,7 @@ do 6119@@ -5988,7 +6237,7 @@ do
6183 test -z "$as_dir" && as_dir=. 6120 test -z "$as_dir" && as_dir=.
6184 for ac_exec_ext in '' $ac_executable_extensions; do 6121 for ac_exec_ext in '' $ac_executable_extensions; do
6185 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6122 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -6188,7 +6125,7 @@ index d4db554..78b292c 100755
6188 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6125 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6189 break 2 6126 break 2
6190 fi 6127 fi
6191@@ -6004,11 +6253,15 @@ $as_echo "no" >&6; } 6128@@ -6008,11 +6257,15 @@ $as_echo "no" >&6; }
6192 fi 6129 fi
6193 6130
6194 6131
@@ -6207,7 +6144,7 @@ index d4db554..78b292c 100755
6207 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6144 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6208 $as_echo_n "checking for $ac_word... " >&6; } 6145 $as_echo_n "checking for $ac_word... " >&6; }
6209 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 6146 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
6210@@ -6024,7 +6277,7 @@ do 6147@@ -6028,7 +6281,7 @@ do
6211 test -z "$as_dir" && as_dir=. 6148 test -z "$as_dir" && as_dir=.
6212 for ac_exec_ext in '' $ac_executable_extensions; do 6149 for ac_exec_ext in '' $ac_executable_extensions; do
6213 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6150 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -6216,7 +6153,7 @@ index d4db554..78b292c 100755
6216 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6153 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6217 break 2 6154 break 2
6218 fi 6155 fi
6219@@ -6043,6 +6296,10 @@ else 6156@@ -6047,6 +6300,10 @@ else
6220 $as_echo "no" >&6; } 6157 $as_echo "no" >&6; }
6221 fi 6158 fi
6222 6159
@@ -6227,7 +6164,7 @@ index d4db554..78b292c 100755
6227 if test "x$ac_ct_AR" = x; then 6164 if test "x$ac_ct_AR" = x; then
6228 AR="false" 6165 AR="false"
6229 else 6166 else
6230@@ -6054,12 +6311,10 @@ ac_tool_warned=yes ;; 6167@@ -6058,12 +6315,10 @@ ac_tool_warned=yes ;;
6231 esac 6168 esac
6232 AR=$ac_ct_AR 6169 AR=$ac_ct_AR
6233 fi 6170 fi
@@ -6242,7 +6179,7 @@ index d4db554..78b292c 100755
6242 6179
6243 6180
6244 6181
6245@@ -6071,6 +6326,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 6182@@ -6075,6 +6330,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6246 6183
6247 6184
6248 6185
@@ -6307,7 +6244,7 @@ index d4db554..78b292c 100755
6307 if test -n "$ac_tool_prefix"; then 6244 if test -n "$ac_tool_prefix"; then
6308 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 6245 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6309 set dummy ${ac_tool_prefix}strip; ac_word=$2 6246 set dummy ${ac_tool_prefix}strip; ac_word=$2
6310@@ -6405,8 +6718,8 @@ esac 6247@@ -6409,8 +6722,8 @@ esac
6311 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6248 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6312 6249
6313 # Transform an extracted symbol line into symbol name and symbol address 6250 # Transform an extracted symbol line into symbol name and symbol address
@@ -6318,7 +6255,7 @@ index d4db554..78b292c 100755
6318 6255
6319 # Handle CRLF in mingw tool chain 6256 # Handle CRLF in mingw tool chain
6320 opt_cr= 6257 opt_cr=
6321@@ -6442,6 +6755,7 @@ for ac_symprfx in "" "_"; do 6258@@ -6446,6 +6759,7 @@ for ac_symprfx in "" "_"; do
6322 else 6259 else
6323 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6260 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6324 fi 6261 fi
@@ -6326,7 +6263,7 @@ index d4db554..78b292c 100755
6326 6263
6327 # Check to see that the pipe works correctly. 6264 # Check to see that the pipe works correctly.
6328 pipe_works=no 6265 pipe_works=no
6329@@ -6483,6 +6797,18 @@ _LT_EOF 6266@@ -6487,6 +6801,18 @@ _LT_EOF
6330 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6267 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6331 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6268 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6332 cat <<_LT_EOF > conftest.$ac_ext 6269 cat <<_LT_EOF > conftest.$ac_ext
@@ -6345,7 +6282,7 @@ index d4db554..78b292c 100755
6345 #ifdef __cplusplus 6282 #ifdef __cplusplus
6346 extern "C" { 6283 extern "C" {
6347 #endif 6284 #endif
6348@@ -6494,7 +6820,7 @@ _LT_EOF 6285@@ -6498,7 +6824,7 @@ _LT_EOF
6349 cat <<_LT_EOF >> conftest.$ac_ext 6286 cat <<_LT_EOF >> conftest.$ac_ext
6350 6287
6351 /* The mapping between symbol names and symbols. */ 6288 /* The mapping between symbol names and symbols. */
@@ -6354,7 +6291,7 @@ index d4db554..78b292c 100755
6354 const char *name; 6291 const char *name;
6355 void *address; 6292 void *address;
6356 } 6293 }
6357@@ -6520,8 +6846,8 @@ static const void *lt_preloaded_setup() { 6294@@ -6524,8 +6850,8 @@ static const void *lt_preloaded_setup() {
6358 _LT_EOF 6295 _LT_EOF
6359 # Now try linking the two files. 6296 # Now try linking the two files.
6360 mv conftest.$ac_objext conftstm.$ac_objext 6297 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6365,7 +6302,7 @@ index d4db554..78b292c 100755
6365 LIBS="conftstm.$ac_objext" 6302 LIBS="conftstm.$ac_objext"
6366 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6303 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6367 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6304 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6368@@ -6531,8 +6857,8 @@ _LT_EOF 6305@@ -6535,8 +6861,8 @@ _LT_EOF
6369 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6306 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6370 pipe_works=yes 6307 pipe_works=yes
6371 fi 6308 fi
@@ -6376,7 +6313,7 @@ index d4db554..78b292c 100755
6376 else 6313 else
6377 echo "cannot find nm_test_func in $nlist" >&5 6314 echo "cannot find nm_test_func in $nlist" >&5
6378 fi 6315 fi
6379@@ -6569,6 +6895,18 @@ else 6316@@ -6573,6 +6899,18 @@ else
6380 $as_echo "ok" >&6; } 6317 $as_echo "ok" >&6; }
6381 fi 6318 fi
6382 6319
@@ -6395,7 +6332,7 @@ index d4db554..78b292c 100755
6395 6332
6396 6333
6397 6334
6398@@ -6590,6 +6928,43 @@ fi 6335@@ -6594,6 +6932,43 @@ fi
6399 6336
6400 6337
6401 6338
@@ -6439,7 +6376,7 @@ index d4db554..78b292c 100755
6439 # Check whether --enable-libtool-lock was given. 6376 # Check whether --enable-libtool-lock was given.
6440 if test "${enable_libtool_lock+set}" = set; then : 6377 if test "${enable_libtool_lock+set}" = set; then :
6441 enableval=$enable_libtool_lock; 6378 enableval=$enable_libtool_lock;
6442@@ -6796,6 +7171,123 @@ esac 6379@@ -6800,6 +7175,123 @@ esac
6443 6380
6444 need_locks="$enable_libtool_lock" 6381 need_locks="$enable_libtool_lock"
6445 6382
@@ -6563,7 +6500,7 @@ index d4db554..78b292c 100755
6563 6500
6564 case $host_os in 6501 case $host_os in
6565 rhapsody* | darwin*) 6502 rhapsody* | darwin*)
6566@@ -7359,6 +7851,8 @@ _LT_EOF 6503@@ -7363,6 +7855,8 @@ _LT_EOF
6567 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6504 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6568 echo "$AR cru libconftest.a conftest.o" >&5 6505 echo "$AR cru libconftest.a conftest.o" >&5
6569 $AR cru libconftest.a conftest.o 2>&5 6506 $AR cru libconftest.a conftest.o 2>&5
@@ -6572,7 +6509,7 @@ index d4db554..78b292c 100755
6572 cat > conftest.c << _LT_EOF 6509 cat > conftest.c << _LT_EOF
6573 int main() { return 0;} 6510 int main() { return 0;}
6574 _LT_EOF 6511 _LT_EOF
6575@@ -7554,7 +8048,8 @@ fi 6512@@ -7558,7 +8052,8 @@ fi
6576 LIBTOOL_DEPS="$ltmain" 6513 LIBTOOL_DEPS="$ltmain"
6577 6514
6578 # Always use our own libtool. 6515 # Always use our own libtool.
@@ -6582,7 +6519,7 @@ index d4db554..78b292c 100755
6582 6519
6583 6520
6584 6521
6585@@ -7643,7 +8138,7 @@ aix3*) 6522@@ -7647,7 +8142,7 @@ aix3*)
6586 esac 6523 esac
6587 6524
6588 # Global variables: 6525 # Global variables:
@@ -6591,7 +6528,7 @@ index d4db554..78b292c 100755
6591 can_build_shared=yes 6528 can_build_shared=yes
6592 6529
6593 # All known linkers require a `.a' archive for static linking (except MSVC, 6530 # All known linkers require a `.a' archive for static linking (except MSVC,
6594@@ -7941,8 +8436,6 @@ fi 6531@@ -7945,8 +8440,6 @@ fi
6595 lt_prog_compiler_pic= 6532 lt_prog_compiler_pic=
6596 lt_prog_compiler_static= 6533 lt_prog_compiler_static=
6597 6534
@@ -6600,7 +6537,7 @@ index d4db554..78b292c 100755
6600 6537
6601 if test "$GCC" = yes; then 6538 if test "$GCC" = yes; then
6602 lt_prog_compiler_wl='-Wl,' 6539 lt_prog_compiler_wl='-Wl,'
6603@@ -8108,6 +8601,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6540@@ -8112,6 +8605,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6604 lt_prog_compiler_pic='--shared' 6541 lt_prog_compiler_pic='--shared'
6605 lt_prog_compiler_static='--static' 6542 lt_prog_compiler_static='--static'
6606 ;; 6543 ;;
@@ -6613,7 +6550,7 @@ index d4db554..78b292c 100755
6613 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6550 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6614 # Portland Group compilers (*not* the Pentium gcc compiler, 6551 # Portland Group compilers (*not* the Pentium gcc compiler,
6615 # which looks to be a dead project) 6552 # which looks to be a dead project)
6616@@ -8170,7 +8669,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6553@@ -8174,7 +8673,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6617 lt_prog_compiler_pic='-KPIC' 6554 lt_prog_compiler_pic='-KPIC'
6618 lt_prog_compiler_static='-Bstatic' 6555 lt_prog_compiler_static='-Bstatic'
6619 case $cc_basename in 6556 case $cc_basename in
@@ -6622,7 +6559,7 @@ index d4db554..78b292c 100755
6622 lt_prog_compiler_wl='-Qoption ld ';; 6559 lt_prog_compiler_wl='-Qoption ld ';;
6623 *) 6560 *)
6624 lt_prog_compiler_wl='-Wl,';; 6561 lt_prog_compiler_wl='-Wl,';;
6625@@ -8227,13 +8726,17 @@ case $host_os in 6562@@ -8231,13 +8730,17 @@ case $host_os in
6626 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6563 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6627 ;; 6564 ;;
6628 esac 6565 esac
@@ -6646,7 +6583,7 @@ index d4db554..78b292c 100755
6646 6583
6647 # 6584 #
6648 # Check to make sure the PIC flag actually works. 6585 # Check to make sure the PIC flag actually works.
6649@@ -8294,6 +8797,11 @@ fi 6586@@ -8298,6 +8801,11 @@ fi
6650 6587
6651 6588
6652 6589
@@ -6658,7 +6595,7 @@ index d4db554..78b292c 100755
6658 # 6595 #
6659 # Check to make sure the static flag actually works. 6596 # Check to make sure the static flag actually works.
6660 # 6597 #
6661@@ -8644,7 +9152,8 @@ _LT_EOF 6598@@ -8648,7 +9156,8 @@ _LT_EOF
6662 allow_undefined_flag=unsupported 6599 allow_undefined_flag=unsupported
6663 always_export_symbols=no 6600 always_export_symbols=no
6664 enable_shared_with_static_runtimes=yes 6601 enable_shared_with_static_runtimes=yes
@@ -6668,7 +6605,7 @@ index d4db554..78b292c 100755
6668 6605
6669 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6606 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6670 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6607 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6671@@ -8743,12 +9252,12 @@ _LT_EOF 6608@@ -8747,12 +9256,12 @@ _LT_EOF
6672 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6609 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6673 hardcode_libdir_flag_spec= 6610 hardcode_libdir_flag_spec=
6674 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6611 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -6683,7 +6620,7 @@ index d4db554..78b292c 100755
6683 fi 6620 fi
6684 ;; 6621 ;;
6685 esac 6622 esac
6686@@ -8762,8 +9271,8 @@ _LT_EOF 6623@@ -8766,8 +9275,8 @@ _LT_EOF
6687 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6624 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6688 wlarc= 6625 wlarc=
6689 else 6626 else
@@ -6694,7 +6631,7 @@ index d4db554..78b292c 100755
6694 fi 6631 fi
6695 ;; 6632 ;;
6696 6633
6697@@ -8781,8 +9290,8 @@ _LT_EOF 6634@@ -8785,8 +9294,8 @@ _LT_EOF
6698 6635
6699 _LT_EOF 6636 _LT_EOF
6700 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6637 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6705,7 +6642,7 @@ index d4db554..78b292c 100755
6705 else 6642 else
6706 ld_shlibs=no 6643 ld_shlibs=no
6707 fi 6644 fi
6708@@ -8828,8 +9337,8 @@ _LT_EOF 6645@@ -8832,8 +9341,8 @@ _LT_EOF
6709 6646
6710 *) 6647 *)
6711 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6648 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -6716,7 +6653,7 @@ index d4db554..78b292c 100755
6716 else 6653 else
6717 ld_shlibs=no 6654 ld_shlibs=no
6718 fi 6655 fi
6719@@ -8959,7 +9468,13 @@ _LT_EOF 6656@@ -8963,7 +9472,13 @@ _LT_EOF
6720 allow_undefined_flag='-berok' 6657 allow_undefined_flag='-berok'
6721 # Determine the default libpath from the value encoded in an 6658 # Determine the default libpath from the value encoded in an
6722 # empty executable. 6659 # empty executable.
@@ -6731,7 +6668,7 @@ index d4db554..78b292c 100755
6731 /* end confdefs.h. */ 6668 /* end confdefs.h. */
6732 6669
6733 int 6670 int
6734@@ -8972,22 +9487,29 @@ main () 6671@@ -8976,22 +9491,29 @@ main ()
6735 _ACEOF 6672 _ACEOF
6736 if ac_fn_c_try_link "$LINENO"; then : 6673 if ac_fn_c_try_link "$LINENO"; then :
6737 6674
@@ -6774,7 +6711,7 @@ index d4db554..78b292c 100755
6774 6711
6775 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6712 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6776 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" 6713 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"
6777@@ -8999,7 +9521,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6714@@ -9003,7 +9525,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6778 else 6715 else
6779 # Determine the default libpath from the value encoded in an 6716 # Determine the default libpath from the value encoded in an
6780 # empty executable. 6717 # empty executable.
@@ -6789,7 +6726,7 @@ index d4db554..78b292c 100755
6789 /* end confdefs.h. */ 6726 /* end confdefs.h. */
6790 6727
6791 int 6728 int
6792@@ -9012,22 +9540,29 @@ main () 6729@@ -9016,22 +9544,29 @@ main ()
6793 _ACEOF 6730 _ACEOF
6794 if ac_fn_c_try_link "$LINENO"; then : 6731 if ac_fn_c_try_link "$LINENO"; then :
6795 6732
@@ -6832,7 +6769,7 @@ index d4db554..78b292c 100755
6832 6769
6833 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6770 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6834 # Warning - without using the other run time loading flags, 6771 # Warning - without using the other run time loading flags,
6835@@ -9072,20 +9607,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6772@@ -9076,20 +9611,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6836 # Microsoft Visual C++. 6773 # Microsoft Visual C++.
6837 # hardcode_libdir_flag_spec is actually meaningless, as there is 6774 # hardcode_libdir_flag_spec is actually meaningless, as there is
6838 # no search path for DLLs. 6775 # no search path for DLLs.
@@ -6910,7 +6847,7 @@ index d4db554..78b292c 100755
6910 ;; 6847 ;;
6911 6848
6912 darwin* | rhapsody*) 6849 darwin* | rhapsody*)
6913@@ -9146,7 +9724,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6850@@ -9150,7 +9728,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6914 6851
6915 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 6852 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6916 freebsd* | dragonfly*) 6853 freebsd* | dragonfly*)
@@ -6919,7 +6856,7 @@ index d4db554..78b292c 100755
6919 hardcode_libdir_flag_spec='-R$libdir' 6856 hardcode_libdir_flag_spec='-R$libdir'
6920 hardcode_direct=yes 6857 hardcode_direct=yes
6921 hardcode_shlibpath_var=no 6858 hardcode_shlibpath_var=no
6922@@ -9154,7 +9732,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6859@@ -9158,7 +9736,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6923 6860
6924 hpux9*) 6861 hpux9*)
6925 if test "$GCC" = yes; then 6862 if test "$GCC" = yes; then
@@ -6928,7 +6865,7 @@ index d4db554..78b292c 100755
6928 else 6865 else
6929 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' 6866 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'
6930 fi 6867 fi
6931@@ -9170,7 +9748,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6868@@ -9174,7 +9752,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6932 6869
6933 hpux10*) 6870 hpux10*)
6934 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 6871 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -6937,7 +6874,7 @@ index d4db554..78b292c 100755
6937 else 6874 else
6938 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 6875 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6939 fi 6876 fi
6940@@ -9194,10 +9772,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6877@@ -9198,10 +9776,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6941 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6878 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6942 ;; 6879 ;;
6943 ia64*) 6880 ia64*)
@@ -6950,7 +6887,7 @@ index d4db554..78b292c 100755
6950 ;; 6887 ;;
6951 esac 6888 esac
6952 else 6889 else
6953@@ -9276,23 +9854,36 @@ fi 6890@@ -9280,23 +9858,36 @@ fi
6954 6891
6955 irix5* | irix6* | nonstopux*) 6892 irix5* | irix6* | nonstopux*)
6956 if test "$GCC" = yes; then 6893 if test "$GCC" = yes; then
@@ -6995,7 +6932,7 @@ index d4db554..78b292c 100755
6995 else 6932 else
6996 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' 6933 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'
6997 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' 6934 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'
6998@@ -9377,7 +9968,7 @@ rm -f core conftest.err conftest.$ac_objext \ 6935@@ -9381,7 +9972,7 @@ rm -f core conftest.err conftest.$ac_objext \
6999 osf4* | osf5*) # as osf3* with the addition of -msym flag 6936 osf4* | osf5*) # as osf3* with the addition of -msym flag
7000 if test "$GCC" = yes; then 6937 if test "$GCC" = yes; then
7001 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 6938 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -7004,7 +6941,7 @@ index d4db554..78b292c 100755
7004 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 6941 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
7005 else 6942 else
7006 allow_undefined_flag=' -expect_unresolved \*' 6943 allow_undefined_flag=' -expect_unresolved \*'
7007@@ -9396,9 +9987,9 @@ rm -f core conftest.err conftest.$ac_objext \ 6944@@ -9400,9 +9991,9 @@ rm -f core conftest.err conftest.$ac_objext \
7008 no_undefined_flag=' -z defs' 6945 no_undefined_flag=' -z defs'
7009 if test "$GCC" = yes; then 6946 if test "$GCC" = yes; then
7010 wlarc='${wl}' 6947 wlarc='${wl}'
@@ -7016,7 +6953,7 @@ index d4db554..78b292c 100755
7016 else 6953 else
7017 case `$CC -V 2>&1` in 6954 case `$CC -V 2>&1` in
7018 *"Compilers 5.0"*) 6955 *"Compilers 5.0"*)
7019@@ -9974,8 +10565,9 @@ cygwin* | mingw* | pw32* | cegcc*) 6956@@ -9978,8 +10569,9 @@ cygwin* | mingw* | pw32* | cegcc*)
7020 need_version=no 6957 need_version=no
7021 need_lib_prefix=no 6958 need_lib_prefix=no
7022 6959
@@ -7028,7 +6965,7 @@ index d4db554..78b292c 100755
7028 library_names_spec='$libname.dll.a' 6965 library_names_spec='$libname.dll.a'
7029 # DLL is installed to $(libdir)/../bin by postinstall_cmds 6966 # DLL is installed to $(libdir)/../bin by postinstall_cmds
7030 postinstall_cmds='base_file=`basename \${file}`~ 6967 postinstall_cmds='base_file=`basename \${file}`~
7031@@ -10008,13 +10600,71 @@ cygwin* | mingw* | pw32* | cegcc*) 6968@@ -10012,13 +10604,71 @@ cygwin* | mingw* | pw32* | cegcc*)
7032 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 6969 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7033 ;; 6970 ;;
7034 esac 6971 esac
@@ -7101,7 +7038,7 @@ index d4db554..78b292c 100755
7101 # FIXME: first we should search . and the directory the executable is in 7038 # FIXME: first we should search . and the directory the executable is in
7102 shlibpath_var=PATH 7039 shlibpath_var=PATH
7103 ;; 7040 ;;
7104@@ -10106,7 +10756,7 @@ haiku*) 7041@@ -10110,7 +10760,7 @@ haiku*)
7105 soname_spec='${libname}${release}${shared_ext}$major' 7042 soname_spec='${libname}${release}${shared_ext}$major'
7106 shlibpath_var=LIBRARY_PATH 7043 shlibpath_var=LIBRARY_PATH
7107 shlibpath_overrides_runpath=yes 7044 shlibpath_overrides_runpath=yes
@@ -7110,16 +7047,7 @@ index d4db554..78b292c 100755
7110 hardcode_into_libs=yes 7047 hardcode_into_libs=yes
7111 ;; 7048 ;;
7112 7049
7113@@ -10902,7 +11552,7 @@ else 7050@@ -10950,10 +11600,10 @@ else
7114 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7115 lt_status=$lt_dlunknown
7116 cat > conftest.$ac_ext <<_LT_EOF
7117-#line 10900 "configure"
7118+#line $LINENO "configure"
7119 #include "confdefs.h"
7120
7121 #if HAVE_DLFCN_H
7122@@ -10946,10 +11596,10 @@ else
7123 /* When -fvisbility=hidden is used, assume the code has been annotated 7051 /* When -fvisbility=hidden is used, assume the code has been annotated
7124 correspondingly for the symbols needed. */ 7052 correspondingly for the symbols needed. */
7125 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7053 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7132,16 +7060,7 @@ index d4db554..78b292c 100755
7132 int main () 7060 int main ()
7133 { 7061 {
7134 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7062 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7135@@ -11008,7 +11658,7 @@ else 7063@@ -11056,10 +11706,10 @@ else
7136 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7137 lt_status=$lt_dlunknown
7138 cat > conftest.$ac_ext <<_LT_EOF
7139-#line 11006 "configure"
7140+#line $LINENO "configure"
7141 #include "confdefs.h"
7142
7143 #if HAVE_DLFCN_H
7144@@ -11052,10 +11702,10 @@ else
7145 /* When -fvisbility=hidden is used, assume the code has been annotated 7064 /* When -fvisbility=hidden is used, assume the code has been annotated
7146 correspondingly for the symbols needed. */ 7065 correspondingly for the symbols needed. */
7147 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7066 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -7154,7 +7073,7 @@ index d4db554..78b292c 100755
7154 int main () 7073 int main ()
7155 { 7074 {
7156 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7075 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7157@@ -12924,13 +13574,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7076@@ -12961,13 +13611,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7158 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7077 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7159 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7078 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7160 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7079 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7175,7 +7094,7 @@ index d4db554..78b292c 100755
7175 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7094 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7176 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7095 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7177 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7096 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7178@@ -12945,14 +13602,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7097@@ -12982,14 +13639,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7179 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7098 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7180 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7099 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7181 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"`' 7100 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"`'
@@ -7194,7 +7113,7 @@ index d4db554..78b292c 100755
7194 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7113 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7195 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7114 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7196 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7115 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7197@@ -12985,12 +13645,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7116@@ -13022,12 +13682,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7198 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7117 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7199 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7118 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7200 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7119 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7208,7 +7127,7 @@ index d4db554..78b292c 100755
7208 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7127 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7209 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7128 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7210 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7129 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7211@@ -13045,8 +13705,13 @@ reload_flag \ 7130@@ -13082,8 +13742,13 @@ reload_flag \
7212 OBJDUMP \ 7131 OBJDUMP \
7213 deplibs_check_method \ 7132 deplibs_check_method \
7214 file_magic_cmd \ 7133 file_magic_cmd \
@@ -7222,7 +7141,7 @@ index d4db554..78b292c 100755
7222 STRIP \ 7141 STRIP \
7223 RANLIB \ 7142 RANLIB \
7224 CC \ 7143 CC \
7225@@ -13056,12 +13721,14 @@ lt_cv_sys_global_symbol_pipe \ 7144@@ -13093,12 +13758,14 @@ lt_cv_sys_global_symbol_pipe \
7226 lt_cv_sys_global_symbol_to_cdecl \ 7145 lt_cv_sys_global_symbol_to_cdecl \
7227 lt_cv_sys_global_symbol_to_c_name_address \ 7146 lt_cv_sys_global_symbol_to_c_name_address \
7228 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7147 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -7238,7 +7157,7 @@ index d4db554..78b292c 100755
7238 DSYMUTIL \ 7157 DSYMUTIL \
7239 NMEDIT \ 7158 NMEDIT \
7240 LIPO \ 7159 LIPO \
7241@@ -13077,7 +13744,6 @@ no_undefined_flag \ 7160@@ -13114,7 +13781,6 @@ no_undefined_flag \
7242 hardcode_libdir_flag_spec \ 7161 hardcode_libdir_flag_spec \
7243 hardcode_libdir_flag_spec_ld \ 7162 hardcode_libdir_flag_spec_ld \
7244 hardcode_libdir_separator \ 7163 hardcode_libdir_separator \
@@ -7246,7 +7165,7 @@ index d4db554..78b292c 100755
7246 exclude_expsyms \ 7165 exclude_expsyms \
7247 include_expsyms \ 7166 include_expsyms \
7248 file_list_spec \ 7167 file_list_spec \
7249@@ -13113,6 +13779,7 @@ module_cmds \ 7168@@ -13150,6 +13816,7 @@ module_cmds \
7250 module_expsym_cmds \ 7169 module_expsym_cmds \
7251 export_symbols_cmds \ 7170 export_symbols_cmds \
7252 prelink_cmds \ 7171 prelink_cmds \
@@ -7254,7 +7173,7 @@ index d4db554..78b292c 100755
7254 postinstall_cmds \ 7173 postinstall_cmds \
7255 postuninstall_cmds \ 7174 postuninstall_cmds \
7256 finish_cmds \ 7175 finish_cmds \
7257@@ -13869,7 +14536,8 @@ $as_echo X"$file" | 7176@@ -13906,7 +14573,8 @@ $as_echo X"$file" |
7258 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7177 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7259 # 7178 #
7260 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7179 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -7264,7 +7183,7 @@ index d4db554..78b292c 100755
7264 # Written by Gordon Matzigkeit, 1996 7183 # Written by Gordon Matzigkeit, 1996
7265 # 7184 #
7266 # This file is part of GNU Libtool. 7185 # This file is part of GNU Libtool.
7267@@ -13972,19 +14640,42 @@ SP2NL=$lt_lt_SP2NL 7186@@ -14009,19 +14677,42 @@ SP2NL=$lt_lt_SP2NL
7268 # turn newlines into spaces. 7187 # turn newlines into spaces.
7269 NL2SP=$lt_lt_NL2SP 7188 NL2SP=$lt_lt_NL2SP
7270 7189
@@ -7308,7 +7227,7 @@ index d4db554..78b292c 100755
7308 # A symbol stripping program. 7227 # A symbol stripping program.
7309 STRIP=$lt_STRIP 7228 STRIP=$lt_STRIP
7310 7229
7311@@ -14014,6 +14705,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7230@@ -14051,6 +14742,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7312 # Transform the output of nm in a C name address pair when lib prefix is needed. 7231 # Transform the output of nm in a C name address pair when lib prefix is needed.
7313 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7232 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7314 7233
@@ -7321,7 +7240,7 @@ index d4db554..78b292c 100755
7321 # The name of the directory that contains temporary libtool files. 7240 # The name of the directory that contains temporary libtool files.
7322 objdir=$objdir 7241 objdir=$objdir
7323 7242
7324@@ -14023,6 +14720,9 @@ MAGIC_CMD=$MAGIC_CMD 7243@@ -14060,6 +14757,9 @@ MAGIC_CMD=$MAGIC_CMD
7325 # Must we lock files when doing compilation? 7244 # Must we lock files when doing compilation?
7326 need_locks=$lt_need_locks 7245 need_locks=$lt_need_locks
7327 7246
@@ -7331,7 +7250,7 @@ index d4db554..78b292c 100755
7331 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7250 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7332 DSYMUTIL=$lt_DSYMUTIL 7251 DSYMUTIL=$lt_DSYMUTIL
7333 7252
7334@@ -14137,12 +14837,12 @@ with_gcc=$GCC 7253@@ -14174,12 +14874,12 @@ with_gcc=$GCC
7335 # Compiler flag to turn off builtin functions. 7254 # Compiler flag to turn off builtin functions.
7336 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7255 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7337 7256
@@ -7347,7 +7266,7 @@ index d4db554..78b292c 100755
7347 # Compiler flag to prevent dynamic linking. 7266 # Compiler flag to prevent dynamic linking.
7348 link_static_flag=$lt_lt_prog_compiler_static 7267 link_static_flag=$lt_lt_prog_compiler_static
7349 7268
7350@@ -14229,9 +14929,6 @@ inherit_rpath=$inherit_rpath 7269@@ -14266,9 +14966,6 @@ inherit_rpath=$inherit_rpath
7351 # Whether libtool must link a program against all its dependency libraries. 7270 # Whether libtool must link a program against all its dependency libraries.
7352 link_all_deplibs=$link_all_deplibs 7271 link_all_deplibs=$link_all_deplibs
7353 7272
@@ -7357,7 +7276,7 @@ index d4db554..78b292c 100755
7357 # Set to "yes" if exported symbols are required. 7276 # Set to "yes" if exported symbols are required.
7358 always_export_symbols=$always_export_symbols 7277 always_export_symbols=$always_export_symbols
7359 7278
7360@@ -14247,6 +14944,9 @@ include_expsyms=$lt_include_expsyms 7279@@ -14284,6 +14981,9 @@ include_expsyms=$lt_include_expsyms
7361 # Commands necessary for linking programs (against libraries) with templates. 7280 # Commands necessary for linking programs (against libraries) with templates.
7362 prelink_cmds=$lt_prelink_cmds 7281 prelink_cmds=$lt_prelink_cmds
7363 7282
@@ -7367,7 +7286,7 @@ index d4db554..78b292c 100755
7367 # Specify filename containing input files. 7286 # Specify filename containing input files.
7368 file_list_spec=$lt_file_list_spec 7287 file_list_spec=$lt_file_list_spec
7369 7288
7370@@ -14279,210 +14979,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7289@@ -14316,210 +15016,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7371 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7290 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7372 # text mode, it properly converts lines to CR/LF. This bash problem 7291 # text mode, it properly converts lines to CR/LF. This bash problem
7373 # is reportedly fixed, but why not run on old versions too? 7292 # is reportedly fixed, but why not run on old versions too?
@@ -7742,10 +7661,10 @@ index d4db554..78b292c 100755
7742 chmod +x "$ofile" 7661 chmod +x "$ofile"
7743 7662
7744diff --git a/ld/configure b/ld/configure 7663diff --git a/ld/configure b/ld/configure
7745index 8095b71..eb4f0d7 100755 7664index f9be51a..3df1149 100755
7746--- a/ld/configure 7665--- a/ld/configure
7747+++ b/ld/configure 7666+++ b/ld/configure
7748@@ -657,8 +657,11 @@ OTOOL 7667@@ -658,8 +658,11 @@ OTOOL
7749 LIPO 7668 LIPO
7750 NMEDIT 7669 NMEDIT
7751 DSYMUTIL 7670 DSYMUTIL
@@ -7757,7 +7676,7 @@ index 8095b71..eb4f0d7 100755
7757 OBJDUMP 7676 OBJDUMP
7758 LN_S 7677 LN_S
7759 NM 7678 NM
7760@@ -779,6 +782,7 @@ enable_static 7679@@ -781,6 +784,7 @@ enable_static
7761 with_pic 7680 with_pic
7762 enable_fast_install 7681 enable_fast_install
7763 with_gnu_ld 7682 with_gnu_ld
@@ -7765,7 +7684,7 @@ index 8095b71..eb4f0d7 100755
7765 enable_libtool_lock 7684 enable_libtool_lock
7766 enable_plugins 7685 enable_plugins
7767 enable_largefile 7686 enable_largefile
7768@@ -1458,6 +1462,8 @@ Optional Packages: 7687@@ -1462,6 +1466,8 @@ Optional Packages:
7769 --with-pic try to use only PIC/non-PIC objects [default=use 7688 --with-pic try to use only PIC/non-PIC objects [default=use
7770 both] 7689 both]
7771 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7690 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7774,7 +7693,7 @@ index 8095b71..eb4f0d7 100755
7774 --with-lib-path=dir1:dir2... set default LIB_PATH 7693 --with-lib-path=dir1:dir2... set default LIB_PATH
7775 --with-sysroot=DIR Search for usr/lib et al within DIR. 7694 --with-sysroot=DIR Search for usr/lib et al within DIR.
7776 7695
7777@@ -5649,8 +5655,8 @@ esac 7696@@ -5656,8 +5662,8 @@ esac
7778 7697
7779 7698
7780 7699
@@ -7785,7 +7704,7 @@ index 8095b71..eb4f0d7 100755
7785 7704
7786 7705
7787 7706
7788@@ -5690,7 +5696,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7707@@ -5697,7 +5703,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7789 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7708 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7790 $as_echo_n "checking how to print strings... " >&6; } 7709 $as_echo_n "checking how to print strings... " >&6; }
7791 # Test print first, because it will be a builtin if present. 7710 # Test print first, because it will be a builtin if present.
@@ -7794,7 +7713,7 @@ index 8095b71..eb4f0d7 100755
7794 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7713 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7795 ECHO='print -r --' 7714 ECHO='print -r --'
7796 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7715 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7797@@ -6376,8 +6382,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7716@@ -6383,8 +6389,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7798 # Try some XSI features 7717 # Try some XSI features
7799 xsi_shell=no 7718 xsi_shell=no
7800 ( _lt_dummy="a/b/c" 7719 ( _lt_dummy="a/b/c"
@@ -7805,7 +7724,7 @@ index 8095b71..eb4f0d7 100755
7805 && eval 'test $(( 1 + 1 )) -eq 2 \ 7724 && eval 'test $(( 1 + 1 )) -eq 2 \
7806 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7725 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7807 && xsi_shell=yes 7726 && xsi_shell=yes
7808@@ -6426,6 +6432,80 @@ esac 7727@@ -6433,6 +6439,80 @@ esac
7809 7728
7810 7729
7811 7730
@@ -7886,7 +7805,7 @@ index 8095b71..eb4f0d7 100755
7886 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7805 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7887 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7806 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7888 if test "${lt_cv_ld_reload_flag+set}" = set; then : 7807 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7889@@ -6442,6 +6522,11 @@ case $reload_flag in 7808@@ -6449,6 +6529,11 @@ case $reload_flag in
7890 esac 7809 esac
7891 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7810 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7892 case $host_os in 7811 case $host_os in
@@ -7898,7 +7817,7 @@ index 8095b71..eb4f0d7 100755
7898 darwin*) 7817 darwin*)
7899 if test "$GCC" = yes; then 7818 if test "$GCC" = yes; then
7900 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7819 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7901@@ -6610,7 +6695,8 @@ mingw* | pw32*) 7820@@ -6617,7 +6702,8 @@ mingw* | pw32*)
7902 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7821 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7903 lt_cv_file_magic_cmd='func_win32_libid' 7822 lt_cv_file_magic_cmd='func_win32_libid'
7904 else 7823 else
@@ -7908,7 +7827,7 @@ index 8095b71..eb4f0d7 100755
7908 lt_cv_file_magic_cmd='$OBJDUMP -f' 7827 lt_cv_file_magic_cmd='$OBJDUMP -f'
7909 fi 7828 fi
7910 ;; 7829 ;;
7911@@ -6764,6 +6850,21 @@ esac 7830@@ -6771,6 +6857,21 @@ esac
7912 fi 7831 fi
7913 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7832 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7914 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7833 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7930,7 +7849,7 @@ index 8095b71..eb4f0d7 100755
7930 file_magic_cmd=$lt_cv_file_magic_cmd 7849 file_magic_cmd=$lt_cv_file_magic_cmd
7931 deplibs_check_method=$lt_cv_deplibs_check_method 7850 deplibs_check_method=$lt_cv_deplibs_check_method
7932 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7851 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7933@@ -6779,9 +6880,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7852@@ -6786,9 +6887,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7934 7853
7935 7854
7936 7855
@@ -8095,7 +8014,7 @@ index 8095b71..eb4f0d7 100755
8095 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8014 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8096 $as_echo_n "checking for $ac_word... " >&6; } 8015 $as_echo_n "checking for $ac_word... " >&6; }
8097 if test "${ac_cv_prog_AR+set}" = set; then : 8016 if test "${ac_cv_prog_AR+set}" = set; then :
8098@@ -6797,7 +7051,7 @@ do 8017@@ -6804,7 +7058,7 @@ do
8099 test -z "$as_dir" && as_dir=. 8018 test -z "$as_dir" && as_dir=.
8100 for ac_exec_ext in '' $ac_executable_extensions; do 8019 for ac_exec_ext in '' $ac_executable_extensions; do
8101 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8020 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -8104,7 +8023,7 @@ index 8095b71..eb4f0d7 100755
8104 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8023 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8105 break 2 8024 break 2
8106 fi 8025 fi
8107@@ -6817,11 +7071,15 @@ $as_echo "no" >&6; } 8026@@ -6824,11 +7078,15 @@ $as_echo "no" >&6; }
8108 fi 8027 fi
8109 8028
8110 8029
@@ -8123,7 +8042,7 @@ index 8095b71..eb4f0d7 100755
8123 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8042 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8124 $as_echo_n "checking for $ac_word... " >&6; } 8043 $as_echo_n "checking for $ac_word... " >&6; }
8125 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 8044 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
8126@@ -6837,7 +7095,7 @@ do 8045@@ -6844,7 +7102,7 @@ do
8127 test -z "$as_dir" && as_dir=. 8046 test -z "$as_dir" && as_dir=.
8128 for ac_exec_ext in '' $ac_executable_extensions; do 8047 for ac_exec_ext in '' $ac_executable_extensions; do
8129 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8048 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -8132,7 +8051,7 @@ index 8095b71..eb4f0d7 100755
8132 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8051 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8133 break 2 8052 break 2
8134 fi 8053 fi
8135@@ -6856,6 +7114,10 @@ else 8054@@ -6863,6 +7121,10 @@ else
8136 $as_echo "no" >&6; } 8055 $as_echo "no" >&6; }
8137 fi 8056 fi
8138 8057
@@ -8143,7 +8062,7 @@ index 8095b71..eb4f0d7 100755
8143 if test "x$ac_ct_AR" = x; then 8062 if test "x$ac_ct_AR" = x; then
8144 AR="false" 8063 AR="false"
8145 else 8064 else
8146@@ -6867,12 +7129,12 @@ ac_tool_warned=yes ;; 8065@@ -6874,12 +7136,12 @@ ac_tool_warned=yes ;;
8147 esac 8066 esac
8148 AR=$ac_ct_AR 8067 AR=$ac_ct_AR
8149 fi 8068 fi
@@ -8160,7 +8079,7 @@ index 8095b71..eb4f0d7 100755
8160 8079
8161 8080
8162 8081
8163@@ -6882,6 +7144,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8082@@ -6889,6 +7151,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8164 8083
8165 8084
8166 8085
@@ -8223,7 +8142,7 @@ index 8095b71..eb4f0d7 100755
8223 8142
8224 8143
8225 if test -n "$ac_tool_prefix"; then 8144 if test -n "$ac_tool_prefix"; then
8226@@ -7218,8 +7536,8 @@ esac 8145@@ -7225,8 +7543,8 @@ esac
8227 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8146 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8228 8147
8229 # Transform an extracted symbol line into symbol name and symbol address 8148 # Transform an extracted symbol line into symbol name and symbol address
@@ -8234,7 +8153,7 @@ index 8095b71..eb4f0d7 100755
8234 8153
8235 # Handle CRLF in mingw tool chain 8154 # Handle CRLF in mingw tool chain
8236 opt_cr= 8155 opt_cr=
8237@@ -7255,6 +7573,7 @@ for ac_symprfx in "" "_"; do 8156@@ -7262,6 +7580,7 @@ for ac_symprfx in "" "_"; do
8238 else 8157 else
8239 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8158 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8240 fi 8159 fi
@@ -8242,7 +8161,7 @@ index 8095b71..eb4f0d7 100755
8242 8161
8243 # Check to see that the pipe works correctly. 8162 # Check to see that the pipe works correctly.
8244 pipe_works=no 8163 pipe_works=no
8245@@ -7296,6 +7615,18 @@ _LT_EOF 8164@@ -7303,6 +7622,18 @@ _LT_EOF
8246 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8165 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8247 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8166 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8248 cat <<_LT_EOF > conftest.$ac_ext 8167 cat <<_LT_EOF > conftest.$ac_ext
@@ -8261,7 +8180,7 @@ index 8095b71..eb4f0d7 100755
8261 #ifdef __cplusplus 8180 #ifdef __cplusplus
8262 extern "C" { 8181 extern "C" {
8263 #endif 8182 #endif
8264@@ -7307,7 +7638,7 @@ _LT_EOF 8183@@ -7314,7 +7645,7 @@ _LT_EOF
8265 cat <<_LT_EOF >> conftest.$ac_ext 8184 cat <<_LT_EOF >> conftest.$ac_ext
8266 8185
8267 /* The mapping between symbol names and symbols. */ 8186 /* The mapping between symbol names and symbols. */
@@ -8270,7 +8189,7 @@ index 8095b71..eb4f0d7 100755
8270 const char *name; 8189 const char *name;
8271 void *address; 8190 void *address;
8272 } 8191 }
8273@@ -7333,8 +7664,8 @@ static const void *lt_preloaded_setup() { 8192@@ -7340,8 +7671,8 @@ static const void *lt_preloaded_setup() {
8274 _LT_EOF 8193 _LT_EOF
8275 # Now try linking the two files. 8194 # Now try linking the two files.
8276 mv conftest.$ac_objext conftstm.$ac_objext 8195 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8281,7 +8200,7 @@ index 8095b71..eb4f0d7 100755
8281 LIBS="conftstm.$ac_objext" 8200 LIBS="conftstm.$ac_objext"
8282 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8201 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8283 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8202 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8284@@ -7344,8 +7675,8 @@ _LT_EOF 8203@@ -7351,8 +7682,8 @@ _LT_EOF
8285 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8204 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8286 pipe_works=yes 8205 pipe_works=yes
8287 fi 8206 fi
@@ -8292,7 +8211,7 @@ index 8095b71..eb4f0d7 100755
8292 else 8211 else
8293 echo "cannot find nm_test_func in $nlist" >&5 8212 echo "cannot find nm_test_func in $nlist" >&5
8294 fi 8213 fi
8295@@ -7382,6 +7713,19 @@ else 8214@@ -7389,6 +7720,19 @@ else
8296 $as_echo "ok" >&6; } 8215 $as_echo "ok" >&6; }
8297 fi 8216 fi
8298 8217
@@ -8312,7 +8231,7 @@ index 8095b71..eb4f0d7 100755
8312 8231
8313 8232
8314 8233
8315@@ -7402,6 +7746,42 @@ fi 8234@@ -7409,6 +7753,42 @@ fi
8316 8235
8317 8236
8318 8237
@@ -8355,7 +8274,7 @@ index 8095b71..eb4f0d7 100755
8355 8274
8356 # Check whether --enable-libtool-lock was given. 8275 # Check whether --enable-libtool-lock was given.
8357 if test "${enable_libtool_lock+set}" = set; then : 8276 if test "${enable_libtool_lock+set}" = set; then :
8358@@ -7609,6 +7989,123 @@ esac 8277@@ -7616,6 +7996,123 @@ esac
8359 8278
8360 need_locks="$enable_libtool_lock" 8279 need_locks="$enable_libtool_lock"
8361 8280
@@ -8479,7 +8398,7 @@ index 8095b71..eb4f0d7 100755
8479 8398
8480 case $host_os in 8399 case $host_os in
8481 rhapsody* | darwin*) 8400 rhapsody* | darwin*)
8482@@ -8172,6 +8669,8 @@ _LT_EOF 8401@@ -8179,6 +8676,8 @@ _LT_EOF
8483 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8402 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8484 echo "$AR cru libconftest.a conftest.o" >&5 8403 echo "$AR cru libconftest.a conftest.o" >&5
8485 $AR cru libconftest.a conftest.o 2>&5 8404 $AR cru libconftest.a conftest.o 2>&5
@@ -8488,7 +8407,7 @@ index 8095b71..eb4f0d7 100755
8488 cat > conftest.c << _LT_EOF 8407 cat > conftest.c << _LT_EOF
8489 int main() { return 0;} 8408 int main() { return 0;}
8490 _LT_EOF 8409 _LT_EOF
8491@@ -8240,6 +8739,16 @@ done 8410@@ -8247,6 +8746,16 @@ done
8492 8411
8493 8412
8494 8413
@@ -8505,7 +8424,7 @@ index 8095b71..eb4f0d7 100755
8505 8424
8506 8425
8507 # Set options 8426 # Set options
8508@@ -8368,7 +8877,8 @@ fi 8427@@ -8375,7 +8884,8 @@ fi
8509 LIBTOOL_DEPS="$ltmain" 8428 LIBTOOL_DEPS="$ltmain"
8510 8429
8511 # Always use our own libtool. 8430 # Always use our own libtool.
@@ -8515,7 +8434,7 @@ index 8095b71..eb4f0d7 100755
8515 8434
8516 8435
8517 8436
8518@@ -8457,7 +8967,7 @@ aix3*) 8437@@ -8464,7 +8974,7 @@ aix3*)
8519 esac 8438 esac
8520 8439
8521 # Global variables: 8440 # Global variables:
@@ -8524,7 +8443,7 @@ index 8095b71..eb4f0d7 100755
8524 can_build_shared=yes 8443 can_build_shared=yes
8525 8444
8526 # All known linkers require a `.a' archive for static linking (except MSVC, 8445 # All known linkers require a `.a' archive for static linking (except MSVC,
8527@@ -8755,8 +9265,6 @@ fi 8446@@ -8762,8 +9272,6 @@ fi
8528 lt_prog_compiler_pic= 8447 lt_prog_compiler_pic=
8529 lt_prog_compiler_static= 8448 lt_prog_compiler_static=
8530 8449
@@ -8533,7 +8452,7 @@ index 8095b71..eb4f0d7 100755
8533 8452
8534 if test "$GCC" = yes; then 8453 if test "$GCC" = yes; then
8535 lt_prog_compiler_wl='-Wl,' 8454 lt_prog_compiler_wl='-Wl,'
8536@@ -8922,6 +9430,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8455@@ -8929,6 +9437,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8537 lt_prog_compiler_pic='--shared' 8456 lt_prog_compiler_pic='--shared'
8538 lt_prog_compiler_static='--static' 8457 lt_prog_compiler_static='--static'
8539 ;; 8458 ;;
@@ -8546,7 +8465,7 @@ index 8095b71..eb4f0d7 100755
8546 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8465 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8547 # Portland Group compilers (*not* the Pentium gcc compiler, 8466 # Portland Group compilers (*not* the Pentium gcc compiler,
8548 # which looks to be a dead project) 8467 # which looks to be a dead project)
8549@@ -8984,7 +9498,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8468@@ -8991,7 +9505,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8550 lt_prog_compiler_pic='-KPIC' 8469 lt_prog_compiler_pic='-KPIC'
8551 lt_prog_compiler_static='-Bstatic' 8470 lt_prog_compiler_static='-Bstatic'
8552 case $cc_basename in 8471 case $cc_basename in
@@ -8555,7 +8474,7 @@ index 8095b71..eb4f0d7 100755
8555 lt_prog_compiler_wl='-Qoption ld ';; 8474 lt_prog_compiler_wl='-Qoption ld ';;
8556 *) 8475 *)
8557 lt_prog_compiler_wl='-Wl,';; 8476 lt_prog_compiler_wl='-Wl,';;
8558@@ -9041,13 +9555,17 @@ case $host_os in 8477@@ -9048,13 +9562,17 @@ case $host_os in
8559 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8478 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8560 ;; 8479 ;;
8561 esac 8480 esac
@@ -8579,7 +8498,7 @@ index 8095b71..eb4f0d7 100755
8579 8498
8580 # 8499 #
8581 # Check to make sure the PIC flag actually works. 8500 # Check to make sure the PIC flag actually works.
8582@@ -9108,6 +9626,11 @@ fi 8501@@ -9115,6 +9633,11 @@ fi
8583 8502
8584 8503
8585 8504
@@ -8591,7 +8510,7 @@ index 8095b71..eb4f0d7 100755
8591 # 8510 #
8592 # Check to make sure the static flag actually works. 8511 # Check to make sure the static flag actually works.
8593 # 8512 #
8594@@ -9458,7 +9981,8 @@ _LT_EOF 8513@@ -9465,7 +9988,8 @@ _LT_EOF
8595 allow_undefined_flag=unsupported 8514 allow_undefined_flag=unsupported
8596 always_export_symbols=no 8515 always_export_symbols=no
8597 enable_shared_with_static_runtimes=yes 8516 enable_shared_with_static_runtimes=yes
@@ -8601,7 +8520,7 @@ index 8095b71..eb4f0d7 100755
8601 8520
8602 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8521 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8603 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8522 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8604@@ -9557,12 +10081,12 @@ _LT_EOF 8523@@ -9564,12 +10088,12 @@ _LT_EOF
8605 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8524 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8606 hardcode_libdir_flag_spec= 8525 hardcode_libdir_flag_spec=
8607 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8526 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8616,7 +8535,7 @@ index 8095b71..eb4f0d7 100755
8616 fi 8535 fi
8617 ;; 8536 ;;
8618 esac 8537 esac
8619@@ -9576,8 +10100,8 @@ _LT_EOF 8538@@ -9583,8 +10107,8 @@ _LT_EOF
8620 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8539 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8621 wlarc= 8540 wlarc=
8622 else 8541 else
@@ -8627,7 +8546,7 @@ index 8095b71..eb4f0d7 100755
8627 fi 8546 fi
8628 ;; 8547 ;;
8629 8548
8630@@ -9595,8 +10119,8 @@ _LT_EOF 8549@@ -9602,8 +10126,8 @@ _LT_EOF
8631 8550
8632 _LT_EOF 8551 _LT_EOF
8633 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8552 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8638,7 +8557,7 @@ index 8095b71..eb4f0d7 100755
8638 else 8557 else
8639 ld_shlibs=no 8558 ld_shlibs=no
8640 fi 8559 fi
8641@@ -9642,8 +10166,8 @@ _LT_EOF 8560@@ -9649,8 +10173,8 @@ _LT_EOF
8642 8561
8643 *) 8562 *)
8644 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8563 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8649,7 +8568,7 @@ index 8095b71..eb4f0d7 100755
8649 else 8568 else
8650 ld_shlibs=no 8569 ld_shlibs=no
8651 fi 8570 fi
8652@@ -9773,7 +10297,13 @@ _LT_EOF 8571@@ -9780,7 +10304,13 @@ _LT_EOF
8653 allow_undefined_flag='-berok' 8572 allow_undefined_flag='-berok'
8654 # Determine the default libpath from the value encoded in an 8573 # Determine the default libpath from the value encoded in an
8655 # empty executable. 8574 # empty executable.
@@ -8664,7 +8583,7 @@ index 8095b71..eb4f0d7 100755
8664 /* end confdefs.h. */ 8583 /* end confdefs.h. */
8665 8584
8666 int 8585 int
8667@@ -9786,22 +10316,29 @@ main () 8586@@ -9793,22 +10323,29 @@ main ()
8668 _ACEOF 8587 _ACEOF
8669 if ac_fn_c_try_link "$LINENO"; then : 8588 if ac_fn_c_try_link "$LINENO"; then :
8670 8589
@@ -8707,7 +8626,7 @@ index 8095b71..eb4f0d7 100755
8707 8626
8708 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8627 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8709 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" 8628 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"
8710@@ -9813,7 +10350,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8629@@ -9820,7 +10357,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8711 else 8630 else
8712 # Determine the default libpath from the value encoded in an 8631 # Determine the default libpath from the value encoded in an
8713 # empty executable. 8632 # empty executable.
@@ -8722,7 +8641,7 @@ index 8095b71..eb4f0d7 100755
8722 /* end confdefs.h. */ 8641 /* end confdefs.h. */
8723 8642
8724 int 8643 int
8725@@ -9826,22 +10369,29 @@ main () 8644@@ -9833,22 +10376,29 @@ main ()
8726 _ACEOF 8645 _ACEOF
8727 if ac_fn_c_try_link "$LINENO"; then : 8646 if ac_fn_c_try_link "$LINENO"; then :
8728 8647
@@ -8765,7 +8684,7 @@ index 8095b71..eb4f0d7 100755
8765 8684
8766 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8685 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8767 # Warning - without using the other run time loading flags, 8686 # Warning - without using the other run time loading flags,
8768@@ -9885,21 +10435,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8687@@ -9892,21 +10442,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8769 # When not using gcc, we currently assume that we are using 8688 # When not using gcc, we currently assume that we are using
8770 # Microsoft Visual C++. 8689 # Microsoft Visual C++.
8771 # hardcode_libdir_flag_spec is actually meaningless, as there is 8690 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8845,7 +8764,7 @@ index 8095b71..eb4f0d7 100755
8845 ;; 8764 ;;
8846 8765
8847 darwin* | rhapsody*) 8766 darwin* | rhapsody*)
8848@@ -9960,7 +10553,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8767@@ -9967,7 +10560,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8849 8768
8850 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8769 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8851 freebsd* | dragonfly*) 8770 freebsd* | dragonfly*)
@@ -8854,7 +8773,7 @@ index 8095b71..eb4f0d7 100755
8854 hardcode_libdir_flag_spec='-R$libdir' 8773 hardcode_libdir_flag_spec='-R$libdir'
8855 hardcode_direct=yes 8774 hardcode_direct=yes
8856 hardcode_shlibpath_var=no 8775 hardcode_shlibpath_var=no
8857@@ -9968,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8776@@ -9975,7 +10568,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8858 8777
8859 hpux9*) 8778 hpux9*)
8860 if test "$GCC" = yes; then 8779 if test "$GCC" = yes; then
@@ -8863,7 +8782,7 @@ index 8095b71..eb4f0d7 100755
8863 else 8782 else
8864 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' 8783 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'
8865 fi 8784 fi
8866@@ -9984,7 +10577,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8785@@ -9991,7 +10584,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8867 8786
8868 hpux10*) 8787 hpux10*)
8869 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8788 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8872,7 +8791,7 @@ index 8095b71..eb4f0d7 100755
8872 else 8791 else
8873 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8792 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8874 fi 8793 fi
8875@@ -10008,10 +10601,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8794@@ -10015,10 +10608,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8876 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8795 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8877 ;; 8796 ;;
8878 ia64*) 8797 ia64*)
@@ -8885,7 +8804,7 @@ index 8095b71..eb4f0d7 100755
8885 ;; 8804 ;;
8886 esac 8805 esac
8887 else 8806 else
8888@@ -10090,23 +10683,36 @@ fi 8807@@ -10097,23 +10690,36 @@ fi
8889 8808
8890 irix5* | irix6* | nonstopux*) 8809 irix5* | irix6* | nonstopux*)
8891 if test "$GCC" = yes; then 8810 if test "$GCC" = yes; then
@@ -8930,7 +8849,7 @@ index 8095b71..eb4f0d7 100755
8930 else 8849 else
8931 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' 8850 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'
8932 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' 8851 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'
8933@@ -10191,7 +10797,7 @@ rm -f core conftest.err conftest.$ac_objext \ 8852@@ -10198,7 +10804,7 @@ rm -f core conftest.err conftest.$ac_objext \
8934 osf4* | osf5*) # as osf3* with the addition of -msym flag 8853 osf4* | osf5*) # as osf3* with the addition of -msym flag
8935 if test "$GCC" = yes; then 8854 if test "$GCC" = yes; then
8936 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8855 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8939,7 +8858,7 @@ index 8095b71..eb4f0d7 100755
8939 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8858 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8940 else 8859 else
8941 allow_undefined_flag=' -expect_unresolved \*' 8860 allow_undefined_flag=' -expect_unresolved \*'
8942@@ -10210,9 +10816,9 @@ rm -f core conftest.err conftest.$ac_objext \ 8861@@ -10217,9 +10823,9 @@ rm -f core conftest.err conftest.$ac_objext \
8943 no_undefined_flag=' -z defs' 8862 no_undefined_flag=' -z defs'
8944 if test "$GCC" = yes; then 8863 if test "$GCC" = yes; then
8945 wlarc='${wl}' 8864 wlarc='${wl}'
@@ -8951,7 +8870,7 @@ index 8095b71..eb4f0d7 100755
8951 else 8870 else
8952 case `$CC -V 2>&1` in 8871 case `$CC -V 2>&1` in
8953 *"Compilers 5.0"*) 8872 *"Compilers 5.0"*)
8954@@ -10788,8 +11394,9 @@ cygwin* | mingw* | pw32* | cegcc*) 8873@@ -10795,8 +11401,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8955 need_version=no 8874 need_version=no
8956 need_lib_prefix=no 8875 need_lib_prefix=no
8957 8876
@@ -8963,7 +8882,7 @@ index 8095b71..eb4f0d7 100755
8963 library_names_spec='$libname.dll.a' 8882 library_names_spec='$libname.dll.a'
8964 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8883 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8965 postinstall_cmds='base_file=`basename \${file}`~ 8884 postinstall_cmds='base_file=`basename \${file}`~
8966@@ -10822,13 +11429,71 @@ cygwin* | mingw* | pw32* | cegcc*) 8885@@ -10829,13 +11436,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8967 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8886 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8968 ;; 8887 ;;
8969 esac 8888 esac
@@ -9036,7 +8955,7 @@ index 8095b71..eb4f0d7 100755
9036 # FIXME: first we should search . and the directory the executable is in 8955 # FIXME: first we should search . and the directory the executable is in
9037 shlibpath_var=PATH 8956 shlibpath_var=PATH
9038 ;; 8957 ;;
9039@@ -10920,7 +11585,7 @@ haiku*) 8958@@ -10927,7 +11592,7 @@ haiku*)
9040 soname_spec='${libname}${release}${shared_ext}$major' 8959 soname_spec='${libname}${release}${shared_ext}$major'
9041 shlibpath_var=LIBRARY_PATH 8960 shlibpath_var=LIBRARY_PATH
9042 shlibpath_overrides_runpath=yes 8961 shlibpath_overrides_runpath=yes
@@ -9045,16 +8964,7 @@ index 8095b71..eb4f0d7 100755
9045 hardcode_into_libs=yes 8964 hardcode_into_libs=yes
9046 ;; 8965 ;;
9047 8966
9048@@ -11716,7 +12381,7 @@ else 8967@@ -11767,10 +12432,10 @@ else
9049 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9050 lt_status=$lt_dlunknown
9051 cat > conftest.$ac_ext <<_LT_EOF
9052-#line 11719 "configure"
9053+#line $LINENO "configure"
9054 #include "confdefs.h"
9055
9056 #if HAVE_DLFCN_H
9057@@ -11760,10 +12425,10 @@ else
9058 /* When -fvisbility=hidden is used, assume the code has been annotated 8968 /* When -fvisbility=hidden is used, assume the code has been annotated
9059 correspondingly for the symbols needed. */ 8969 correspondingly for the symbols needed. */
9060 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 8970 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9067,16 +8977,7 @@ index 8095b71..eb4f0d7 100755
9067 int main () 8977 int main ()
9068 { 8978 {
9069 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 8979 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9070@@ -11822,7 +12487,7 @@ else 8980@@ -11873,10 +12538,10 @@ else
9071 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9072 lt_status=$lt_dlunknown
9073 cat > conftest.$ac_ext <<_LT_EOF
9074-#line 11825 "configure"
9075+#line $LINENO "configure"
9076 #include "confdefs.h"
9077
9078 #if HAVE_DLFCN_H
9079@@ -11866,10 +12531,10 @@ else
9080 /* When -fvisbility=hidden is used, assume the code has been annotated 8981 /* When -fvisbility=hidden is used, assume the code has been annotated
9081 correspondingly for the symbols needed. */ 8982 correspondingly for the symbols needed. */
9082 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 8983 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9089,7 +8990,7 @@ index 8095b71..eb4f0d7 100755
9089 int main () 8990 int main ()
9090 { 8991 {
9091 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 8992 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9092@@ -12261,6 +12926,7 @@ $RM -r conftest* 8993@@ -12268,6 +12933,7 @@ $RM -r conftest*
9093 8994
9094 # Allow CC to be a program name with arguments. 8995 # Allow CC to be a program name with arguments.
9095 lt_save_CC=$CC 8996 lt_save_CC=$CC
@@ -9097,7 +8998,7 @@ index 8095b71..eb4f0d7 100755
9097 lt_save_LD=$LD 8998 lt_save_LD=$LD
9098 lt_save_GCC=$GCC 8999 lt_save_GCC=$GCC
9099 GCC=$GXX 9000 GCC=$GXX
9100@@ -12278,6 +12944,7 @@ $RM -r conftest* 9001@@ -12285,6 +12951,7 @@ $RM -r conftest*
9101 fi 9002 fi
9102 test -z "${LDCXX+set}" || LD=$LDCXX 9003 test -z "${LDCXX+set}" || LD=$LDCXX
9103 CC=${CXX-"c++"} 9004 CC=${CXX-"c++"}
@@ -9105,7 +9006,7 @@ index 8095b71..eb4f0d7 100755
9105 compiler=$CC 9006 compiler=$CC
9106 compiler_CXX=$CC 9007 compiler_CXX=$CC
9107 for cc_temp in $compiler""; do 9008 for cc_temp in $compiler""; do
9108@@ -12560,7 +13227,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9009@@ -12567,7 +13234,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9109 allow_undefined_flag_CXX='-berok' 9010 allow_undefined_flag_CXX='-berok'
9110 # Determine the default libpath from the value encoded in an empty 9011 # Determine the default libpath from the value encoded in an empty
9111 # executable. 9012 # executable.
@@ -9120,7 +9021,7 @@ index 8095b71..eb4f0d7 100755
9120 /* end confdefs.h. */ 9021 /* end confdefs.h. */
9121 9022
9122 int 9023 int
9123@@ -12573,22 +13246,29 @@ main () 9024@@ -12580,22 +13253,29 @@ main ()
9124 _ACEOF 9025 _ACEOF
9125 if ac_fn_cxx_try_link "$LINENO"; then : 9026 if ac_fn_cxx_try_link "$LINENO"; then :
9126 9027
@@ -9163,7 +9064,7 @@ index 8095b71..eb4f0d7 100755
9163 9064
9164 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9065 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9165 9066
9166@@ -12601,7 +13281,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9067@@ -12608,7 +13288,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9167 else 9068 else
9168 # Determine the default libpath from the value encoded in an 9069 # Determine the default libpath from the value encoded in an
9169 # empty executable. 9070 # empty executable.
@@ -9178,7 +9079,7 @@ index 8095b71..eb4f0d7 100755
9178 /* end confdefs.h. */ 9079 /* end confdefs.h. */
9179 9080
9180 int 9081 int
9181@@ -12614,22 +13300,29 @@ main () 9082@@ -12621,22 +13307,29 @@ main ()
9182 _ACEOF 9083 _ACEOF
9183 if ac_fn_cxx_try_link "$LINENO"; then : 9084 if ac_fn_cxx_try_link "$LINENO"; then :
9184 9085
@@ -9221,7 +9122,7 @@ index 8095b71..eb4f0d7 100755
9221 9122
9222 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9123 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9223 # Warning - without using the other run time loading flags, 9124 # Warning - without using the other run time loading flags,
9224@@ -12672,29 +13365,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9125@@ -12679,29 +13372,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9225 ;; 9126 ;;
9226 9127
9227 cygwin* | mingw* | pw32* | cegcc*) 9128 cygwin* | mingw* | pw32* | cegcc*)
@@ -9320,7 +9221,7 @@ index 8095b71..eb4f0d7 100755
9320 darwin* | rhapsody*) 9221 darwin* | rhapsody*)
9321 9222
9322 9223
9323@@ -12800,7 +13539,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9224@@ -12807,7 +13546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9324 ;; 9225 ;;
9325 *) 9226 *)
9326 if test "$GXX" = yes; then 9227 if test "$GXX" = yes; then
@@ -9329,7 +9230,7 @@ index 8095b71..eb4f0d7 100755
9329 else 9230 else
9330 # FIXME: insert proper C++ library support 9231 # FIXME: insert proper C++ library support
9331 ld_shlibs_CXX=no 9232 ld_shlibs_CXX=no
9332@@ -12871,10 +13610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9233@@ -12878,10 +13617,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9333 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9234 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9334 ;; 9235 ;;
9335 ia64*) 9236 ia64*)
@@ -9342,7 +9243,7 @@ index 8095b71..eb4f0d7 100755
9342 ;; 9243 ;;
9343 esac 9244 esac
9344 fi 9245 fi
9345@@ -12915,9 +13654,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9246@@ -12922,9 +13661,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9346 *) 9247 *)
9347 if test "$GXX" = yes; then 9248 if test "$GXX" = yes; then
9348 if test "$with_gnu_ld" = no; then 9249 if test "$with_gnu_ld" = no; then
@@ -9354,7 +9255,7 @@ index 8095b71..eb4f0d7 100755
9354 fi 9255 fi
9355 fi 9256 fi
9356 link_all_deplibs_CXX=yes 9257 link_all_deplibs_CXX=yes
9357@@ -12987,20 +13726,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9258@@ -12994,20 +13733,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9358 prelink_cmds_CXX='tpldir=Template.dir~ 9259 prelink_cmds_CXX='tpldir=Template.dir~
9359 rm -rf $tpldir~ 9260 rm -rf $tpldir~
9360 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9261 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9379,7 +9280,7 @@ index 8095b71..eb4f0d7 100755
9379 ;; 9280 ;;
9380 *) # Version 6 and above use weak symbols 9281 *) # Version 6 and above use weak symbols
9381 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9282 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9382@@ -13195,7 +13934,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9283@@ -13202,7 +13941,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9383 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' 9284 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'
9384 ;; 9285 ;;
9385 *) 9286 *)
@@ -9388,7 +9289,7 @@ index 8095b71..eb4f0d7 100755
9388 ;; 9289 ;;
9389 esac 9290 esac
9390 9291
9391@@ -13241,7 +13980,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9292@@ -13248,7 +13987,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9392 9293
9393 solaris*) 9294 solaris*)
9394 case $cc_basename in 9295 case $cc_basename in
@@ -9397,7 +9298,7 @@ index 8095b71..eb4f0d7 100755
9397 # Sun C++ 4.2, 5.x and Centerline C++ 9298 # Sun C++ 4.2, 5.x and Centerline C++
9398 archive_cmds_need_lc_CXX=yes 9299 archive_cmds_need_lc_CXX=yes
9399 no_undefined_flag_CXX=' -zdefs' 9300 no_undefined_flag_CXX=' -zdefs'
9400@@ -13282,9 +14021,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9301@@ -13289,9 +14028,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9401 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9302 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9402 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9303 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9403 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9304 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9409,7 +9310,7 @@ index 8095b71..eb4f0d7 100755
9409 9310
9410 # Commands to make compiler produce verbose output that lists 9311 # Commands to make compiler produce verbose output that lists
9411 # what "hidden" libraries, object files and flags are used when 9312 # what "hidden" libraries, object files and flags are used when
9412@@ -13419,6 +14158,13 @@ private: 9313@@ -13426,6 +14165,13 @@ private:
9413 }; 9314 };
9414 _LT_EOF 9315 _LT_EOF
9415 9316
@@ -9423,7 +9324,7 @@ index 8095b71..eb4f0d7 100755
9423 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9324 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9424 (eval $ac_compile) 2>&5 9325 (eval $ac_compile) 2>&5
9425 ac_status=$? 9326 ac_status=$?
9426@@ -13432,7 +14178,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9327@@ -13439,7 +14185,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9427 pre_test_object_deps_done=no 9328 pre_test_object_deps_done=no
9428 9329
9429 for p in `eval "$output_verbose_link_cmd"`; do 9330 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9432,7 +9333,7 @@ index 8095b71..eb4f0d7 100755
9432 9333
9433 -L* | -R* | -l*) 9334 -L* | -R* | -l*)
9434 # Some compilers place space between "-{L,R}" and the path. 9335 # Some compilers place space between "-{L,R}" and the path.
9435@@ -13441,13 +14187,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9336@@ -13448,13 +14194,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9436 test $p = "-R"; then 9337 test $p = "-R"; then
9437 prev=$p 9338 prev=$p
9438 continue 9339 continue
@@ -9459,7 +9360,7 @@ index 8095b71..eb4f0d7 100755
9459 # Internal compiler library paths should come after those 9360 # Internal compiler library paths should come after those
9460 # provided the user. The postdeps already come after the 9361 # provided the user. The postdeps already come after the
9461 # user supplied libs so there is no need to process them. 9362 # user supplied libs so there is no need to process them.
9462@@ -13467,8 +14222,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9363@@ -13474,8 +14229,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9463 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9364 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9464 fi 9365 fi
9465 fi 9366 fi
@@ -9470,7 +9371,7 @@ index 8095b71..eb4f0d7 100755
9470 *.$objext) 9371 *.$objext)
9471 # This assumes that the test object file only shows up 9372 # This assumes that the test object file only shows up
9472 # once in the compiler output. 9373 # once in the compiler output.
9473@@ -13504,6 +14261,7 @@ else 9374@@ -13511,6 +14268,7 @@ else
9474 fi 9375 fi
9475 9376
9476 $RM -f confest.$objext 9377 $RM -f confest.$objext
@@ -9478,7 +9379,7 @@ index 8095b71..eb4f0d7 100755
9478 9379
9479 # PORTME: override above test on systems where it is broken 9380 # PORTME: override above test on systems where it is broken
9480 case $host_os in 9381 case $host_os in
9481@@ -13539,7 +14297,7 @@ linux*) 9382@@ -13546,7 +14304,7 @@ linux*)
9482 9383
9483 solaris*) 9384 solaris*)
9484 case $cc_basename in 9385 case $cc_basename in
@@ -9487,7 +9388,7 @@ index 8095b71..eb4f0d7 100755
9487 # The more standards-conforming stlport4 library is 9388 # The more standards-conforming stlport4 library is
9488 # incompatible with the Cstd library. Avoid specifying 9389 # incompatible with the Cstd library. Avoid specifying
9489 # it if it's in CXXFLAGS. Ignore libCrun as 9390 # it if it's in CXXFLAGS. Ignore libCrun as
9490@@ -13604,8 +14362,6 @@ fi 9391@@ -13611,8 +14369,6 @@ fi
9491 lt_prog_compiler_pic_CXX= 9392 lt_prog_compiler_pic_CXX=
9492 lt_prog_compiler_static_CXX= 9393 lt_prog_compiler_static_CXX=
9493 9394
@@ -9496,7 +9397,7 @@ index 8095b71..eb4f0d7 100755
9496 9397
9497 # C++ specific cases for pic, static, wl, etc. 9398 # C++ specific cases for pic, static, wl, etc.
9498 if test "$GXX" = yes; then 9399 if test "$GXX" = yes; then
9499@@ -13710,6 +14466,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9400@@ -13717,6 +14473,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9500 ;; 9401 ;;
9501 esac 9402 esac
9502 ;; 9403 ;;
@@ -9508,7 +9409,7 @@ index 8095b71..eb4f0d7 100755
9508 dgux*) 9409 dgux*)
9509 case $cc_basename in 9410 case $cc_basename in
9510 ec++*) 9411 ec++*)
9511@@ -13862,7 +14623,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9412@@ -13869,7 +14630,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9512 ;; 9413 ;;
9513 solaris*) 9414 solaris*)
9514 case $cc_basename in 9415 case $cc_basename in
@@ -9517,7 +9418,7 @@ index 8095b71..eb4f0d7 100755
9517 # Sun C++ 4.2, 5.x and Centerline C++ 9418 # Sun C++ 4.2, 5.x and Centerline C++
9518 lt_prog_compiler_pic_CXX='-KPIC' 9419 lt_prog_compiler_pic_CXX='-KPIC'
9519 lt_prog_compiler_static_CXX='-Bstatic' 9420 lt_prog_compiler_static_CXX='-Bstatic'
9520@@ -13927,10 +14688,17 @@ case $host_os in 9421@@ -13934,10 +14695,17 @@ case $host_os in
9521 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9422 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9522 ;; 9423 ;;
9523 esac 9424 esac
@@ -9538,7 +9439,7 @@ index 8095b71..eb4f0d7 100755
9538 9439
9539 # 9440 #
9540 # Check to make sure the PIC flag actually works. 9441 # Check to make sure the PIC flag actually works.
9541@@ -13988,6 +14756,8 @@ fi 9442@@ -13995,6 +14763,8 @@ fi
9542 9443
9543 9444
9544 9445
@@ -9547,7 +9448,7 @@ index 8095b71..eb4f0d7 100755
9547 # 9448 #
9548 # Check to make sure the static flag actually works. 9449 # Check to make sure the static flag actually works.
9549 # 9450 #
9550@@ -14165,6 +14935,7 @@ fi 9451@@ -14172,6 +14942,7 @@ fi
9551 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9452 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9552 9453
9553 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9454 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9555,7 +9456,7 @@ index 8095b71..eb4f0d7 100755
9555 case $host_os in 9456 case $host_os in
9556 aix[4-9]*) 9457 aix[4-9]*)
9557 # If we're using GNU nm, then we don't want the "-C" option. 9458 # If we're using GNU nm, then we don't want the "-C" option.
9558@@ -14179,15 +14950,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9459@@ -14186,15 +14957,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9559 ;; 9460 ;;
9560 pw32*) 9461 pw32*)
9561 export_symbols_cmds_CXX="$ltdll_cmds" 9462 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9581,7 +9482,7 @@ index 8095b71..eb4f0d7 100755
9581 9482
9582 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9483 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9583 $as_echo "$ld_shlibs_CXX" >&6; } 9484 $as_echo "$ld_shlibs_CXX" >&6; }
9584@@ -14450,8 +15226,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9485@@ -14457,8 +15233,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9585 need_version=no 9486 need_version=no
9586 need_lib_prefix=no 9487 need_lib_prefix=no
9587 9488
@@ -9593,7 +9494,7 @@ index 8095b71..eb4f0d7 100755
9593 library_names_spec='$libname.dll.a' 9494 library_names_spec='$libname.dll.a'
9594 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9495 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9595 postinstall_cmds='base_file=`basename \${file}`~ 9496 postinstall_cmds='base_file=`basename \${file}`~
9596@@ -14483,13 +15260,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9497@@ -14490,13 +15267,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9597 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9498 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9598 ;; 9499 ;;
9599 esac 9500 esac
@@ -9666,7 +9567,7 @@ index 8095b71..eb4f0d7 100755
9666 # FIXME: first we should search . and the directory the executable is in 9567 # FIXME: first we should search . and the directory the executable is in
9667 shlibpath_var=PATH 9568 shlibpath_var=PATH
9668 ;; 9569 ;;
9669@@ -14580,7 +15415,7 @@ haiku*) 9570@@ -14587,7 +15422,7 @@ haiku*)
9670 soname_spec='${libname}${release}${shared_ext}$major' 9571 soname_spec='${libname}${release}${shared_ext}$major'
9671 shlibpath_var=LIBRARY_PATH 9572 shlibpath_var=LIBRARY_PATH
9672 shlibpath_overrides_runpath=yes 9573 shlibpath_overrides_runpath=yes
@@ -9675,7 +9576,7 @@ index 8095b71..eb4f0d7 100755
9675 hardcode_into_libs=yes 9576 hardcode_into_libs=yes
9676 ;; 9577 ;;
9677 9578
9678@@ -15039,6 +15874,7 @@ fi 9579@@ -15046,6 +15881,7 @@ fi
9679 fi # test -n "$compiler" 9580 fi # test -n "$compiler"
9680 9581
9681 CC=$lt_save_CC 9582 CC=$lt_save_CC
@@ -9683,7 +9584,7 @@ index 8095b71..eb4f0d7 100755
9683 LDCXX=$LD 9584 LDCXX=$LD
9684 LD=$lt_save_LD 9585 LD=$lt_save_LD
9685 GCC=$lt_save_GCC 9586 GCC=$lt_save_GCC
9686@@ -17953,13 +18789,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9587@@ -17982,13 +18818,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
9687 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9588 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9688 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9589 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9689 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9590 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9704,7 +9605,7 @@ index 8095b71..eb4f0d7 100755
9704 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9605 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9705 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9606 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9706 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9607 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9707@@ -17974,14 +18817,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9608@@ -18003,14 +18846,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9708 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9609 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9709 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9610 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9710 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"`' 9611 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"`'
@@ -9723,7 +9624,7 @@ index 8095b71..eb4f0d7 100755
9723 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9624 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9724 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9625 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9725 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9626 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9726@@ -18014,12 +18860,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9627@@ -18043,12 +18889,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9727 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9628 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9728 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9629 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9729 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9630 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9737,7 +9638,7 @@ index 8095b71..eb4f0d7 100755
9737 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9638 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9738 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9639 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9739 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9640 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9740@@ -18058,8 +18904,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9641@@ -18087,8 +18933,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9741 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9642 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9742 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9643 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9743 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9644 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9747,7 +9648,7 @@ index 8095b71..eb4f0d7 100755
9747 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9648 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9748 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9649 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9749 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9650 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9750@@ -18086,12 +18932,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9651@@ -18115,12 +18961,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9751 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9652 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9752 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9653 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9753 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9654 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9761,7 +9662,7 @@ index 8095b71..eb4f0d7 100755
9761 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9662 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9762 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9663 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9763 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9664 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9764@@ -18129,8 +18975,13 @@ reload_flag \ 9665@@ -18158,8 +19004,13 @@ reload_flag \
9765 OBJDUMP \ 9666 OBJDUMP \
9766 deplibs_check_method \ 9667 deplibs_check_method \
9767 file_magic_cmd \ 9668 file_magic_cmd \
@@ -9775,7 +9676,7 @@ index 8095b71..eb4f0d7 100755
9775 STRIP \ 9676 STRIP \
9776 RANLIB \ 9677 RANLIB \
9777 CC \ 9678 CC \
9778@@ -18140,12 +18991,14 @@ lt_cv_sys_global_symbol_pipe \ 9679@@ -18169,12 +19020,14 @@ lt_cv_sys_global_symbol_pipe \
9779 lt_cv_sys_global_symbol_to_cdecl \ 9680 lt_cv_sys_global_symbol_to_cdecl \
9780 lt_cv_sys_global_symbol_to_c_name_address \ 9681 lt_cv_sys_global_symbol_to_c_name_address \
9781 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9682 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9791,7 +9692,7 @@ index 8095b71..eb4f0d7 100755
9791 DSYMUTIL \ 9692 DSYMUTIL \
9792 NMEDIT \ 9693 NMEDIT \
9793 LIPO \ 9694 LIPO \
9794@@ -18161,7 +19014,6 @@ no_undefined_flag \ 9695@@ -18190,7 +19043,6 @@ no_undefined_flag \
9795 hardcode_libdir_flag_spec \ 9696 hardcode_libdir_flag_spec \
9796 hardcode_libdir_flag_spec_ld \ 9697 hardcode_libdir_flag_spec_ld \
9797 hardcode_libdir_separator \ 9698 hardcode_libdir_separator \
@@ -9799,7 +9700,7 @@ index 8095b71..eb4f0d7 100755
9799 exclude_expsyms \ 9700 exclude_expsyms \
9800 include_expsyms \ 9701 include_expsyms \
9801 file_list_spec \ 9702 file_list_spec \
9802@@ -18183,8 +19035,8 @@ LD_CXX \ 9703@@ -18212,8 +19064,8 @@ LD_CXX \
9803 reload_flag_CXX \ 9704 reload_flag_CXX \
9804 compiler_CXX \ 9705 compiler_CXX \
9805 lt_prog_compiler_no_builtin_flag_CXX \ 9706 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9809,7 +9710,7 @@ index 8095b71..eb4f0d7 100755
9809 lt_prog_compiler_static_CXX \ 9710 lt_prog_compiler_static_CXX \
9810 lt_cv_prog_compiler_c_o_CXX \ 9711 lt_cv_prog_compiler_c_o_CXX \
9811 export_dynamic_flag_spec_CXX \ 9712 export_dynamic_flag_spec_CXX \
9812@@ -18196,7 +19048,6 @@ no_undefined_flag_CXX \ 9713@@ -18225,7 +19077,6 @@ no_undefined_flag_CXX \
9813 hardcode_libdir_flag_spec_CXX \ 9714 hardcode_libdir_flag_spec_CXX \
9814 hardcode_libdir_flag_spec_ld_CXX \ 9715 hardcode_libdir_flag_spec_ld_CXX \
9815 hardcode_libdir_separator_CXX \ 9716 hardcode_libdir_separator_CXX \
@@ -9817,7 +9718,7 @@ index 8095b71..eb4f0d7 100755
9817 exclude_expsyms_CXX \ 9718 exclude_expsyms_CXX \
9818 include_expsyms_CXX \ 9719 include_expsyms_CXX \
9819 file_list_spec_CXX \ 9720 file_list_spec_CXX \
9820@@ -18230,6 +19081,7 @@ module_cmds \ 9721@@ -18259,6 +19110,7 @@ module_cmds \
9821 module_expsym_cmds \ 9722 module_expsym_cmds \
9822 export_symbols_cmds \ 9723 export_symbols_cmds \
9823 prelink_cmds \ 9724 prelink_cmds \
@@ -9825,7 +9726,7 @@ index 8095b71..eb4f0d7 100755
9825 postinstall_cmds \ 9726 postinstall_cmds \
9826 postuninstall_cmds \ 9727 postuninstall_cmds \
9827 finish_cmds \ 9728 finish_cmds \
9828@@ -18244,7 +19096,8 @@ archive_expsym_cmds_CXX \ 9729@@ -18273,7 +19125,8 @@ archive_expsym_cmds_CXX \
9829 module_cmds_CXX \ 9730 module_cmds_CXX \
9830 module_expsym_cmds_CXX \ 9731 module_expsym_cmds_CXX \
9831 export_symbols_cmds_CXX \ 9732 export_symbols_cmds_CXX \
@@ -9835,7 +9736,7 @@ index 8095b71..eb4f0d7 100755
9835 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9736 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9836 *[\\\\\\\`\\"\\\$]*) 9737 *[\\\\\\\`\\"\\\$]*)
9837 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9738 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9838@@ -19037,7 +19890,8 @@ $as_echo X"$file" | 9739@@ -19066,7 +19919,8 @@ $as_echo X"$file" |
9839 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9740 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9840 # 9741 #
9841 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9742 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9845,7 +9746,7 @@ index 8095b71..eb4f0d7 100755
9845 # Written by Gordon Matzigkeit, 1996 9746 # Written by Gordon Matzigkeit, 1996
9846 # 9747 #
9847 # This file is part of GNU Libtool. 9748 # This file is part of GNU Libtool.
9848@@ -19140,19 +19994,42 @@ SP2NL=$lt_lt_SP2NL 9749@@ -19169,19 +20023,42 @@ SP2NL=$lt_lt_SP2NL
9849 # turn newlines into spaces. 9750 # turn newlines into spaces.
9850 NL2SP=$lt_lt_NL2SP 9751 NL2SP=$lt_lt_NL2SP
9851 9752
@@ -9889,7 +9790,7 @@ index 8095b71..eb4f0d7 100755
9889 # A symbol stripping program. 9790 # A symbol stripping program.
9890 STRIP=$lt_STRIP 9791 STRIP=$lt_STRIP
9891 9792
9892@@ -19182,6 +20059,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9793@@ -19211,6 +20088,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9893 # Transform the output of nm in a C name address pair when lib prefix is needed. 9794 # Transform the output of nm in a C name address pair when lib prefix is needed.
9894 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9795 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9895 9796
@@ -9902,7 +9803,7 @@ index 8095b71..eb4f0d7 100755
9902 # The name of the directory that contains temporary libtool files. 9803 # The name of the directory that contains temporary libtool files.
9903 objdir=$objdir 9804 objdir=$objdir
9904 9805
9905@@ -19191,6 +20074,9 @@ MAGIC_CMD=$MAGIC_CMD 9806@@ -19220,6 +20103,9 @@ MAGIC_CMD=$MAGIC_CMD
9906 # Must we lock files when doing compilation? 9807 # Must we lock files when doing compilation?
9907 need_locks=$lt_need_locks 9808 need_locks=$lt_need_locks
9908 9809
@@ -9912,7 +9813,7 @@ index 8095b71..eb4f0d7 100755
9912 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9813 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9913 DSYMUTIL=$lt_DSYMUTIL 9814 DSYMUTIL=$lt_DSYMUTIL
9914 9815
9915@@ -19305,12 +20191,12 @@ with_gcc=$GCC 9816@@ -19334,12 +20220,12 @@ with_gcc=$GCC
9916 # Compiler flag to turn off builtin functions. 9817 # Compiler flag to turn off builtin functions.
9917 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9818 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9918 9819
@@ -9928,7 +9829,7 @@ index 8095b71..eb4f0d7 100755
9928 # Compiler flag to prevent dynamic linking. 9829 # Compiler flag to prevent dynamic linking.
9929 link_static_flag=$lt_lt_prog_compiler_static 9830 link_static_flag=$lt_lt_prog_compiler_static
9930 9831
9931@@ -19397,9 +20283,6 @@ inherit_rpath=$inherit_rpath 9832@@ -19426,9 +20312,6 @@ inherit_rpath=$inherit_rpath
9932 # Whether libtool must link a program against all its dependency libraries. 9833 # Whether libtool must link a program against all its dependency libraries.
9933 link_all_deplibs=$link_all_deplibs 9834 link_all_deplibs=$link_all_deplibs
9934 9835
@@ -9938,7 +9839,7 @@ index 8095b71..eb4f0d7 100755
9938 # Set to "yes" if exported symbols are required. 9839 # Set to "yes" if exported symbols are required.
9939 always_export_symbols=$always_export_symbols 9840 always_export_symbols=$always_export_symbols
9940 9841
9941@@ -19415,6 +20298,9 @@ include_expsyms=$lt_include_expsyms 9842@@ -19444,6 +20327,9 @@ include_expsyms=$lt_include_expsyms
9942 # Commands necessary for linking programs (against libraries) with templates. 9843 # Commands necessary for linking programs (against libraries) with templates.
9943 prelink_cmds=$lt_prelink_cmds 9844 prelink_cmds=$lt_prelink_cmds
9944 9845
@@ -9948,7 +9849,7 @@ index 8095b71..eb4f0d7 100755
9948 # Specify filename containing input files. 9849 # Specify filename containing input files.
9949 file_list_spec=$lt_file_list_spec 9850 file_list_spec=$lt_file_list_spec
9950 9851
9951@@ -19461,210 +20347,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 9852@@ -19490,210 +20376,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9952 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9853 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9953 # text mode, it properly converts lines to CR/LF. This bash problem 9854 # text mode, it properly converts lines to CR/LF. This bash problem
9954 # is reportedly fixed, but why not run on old versions too? 9855 # is reportedly fixed, but why not run on old versions too?
@@ -10322,7 +10223,7 @@ index 8095b71..eb4f0d7 100755
10322 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10223 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10323 chmod +x "$ofile" 10224 chmod +x "$ofile"
10324 10225
10325@@ -19692,12 +20537,12 @@ with_gcc=$GCC_CXX 10226@@ -19721,12 +20566,12 @@ with_gcc=$GCC_CXX
10326 # Compiler flag to turn off builtin functions. 10227 # Compiler flag to turn off builtin functions.
10327 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10228 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10328 10229
@@ -10338,7 +10239,7 @@ index 8095b71..eb4f0d7 100755
10338 # Compiler flag to prevent dynamic linking. 10239 # Compiler flag to prevent dynamic linking.
10339 link_static_flag=$lt_lt_prog_compiler_static_CXX 10240 link_static_flag=$lt_lt_prog_compiler_static_CXX
10340 10241
10341@@ -19784,9 +20629,6 @@ inherit_rpath=$inherit_rpath_CXX 10242@@ -19813,9 +20658,6 @@ inherit_rpath=$inherit_rpath_CXX
10342 # Whether libtool must link a program against all its dependency libraries. 10243 # Whether libtool must link a program against all its dependency libraries.
10343 link_all_deplibs=$link_all_deplibs_CXX 10244 link_all_deplibs=$link_all_deplibs_CXX
10344 10245
@@ -10348,7 +10249,7 @@ index 8095b71..eb4f0d7 100755
10348 # Set to "yes" if exported symbols are required. 10249 # Set to "yes" if exported symbols are required.
10349 always_export_symbols=$always_export_symbols_CXX 10250 always_export_symbols=$always_export_symbols_CXX
10350 10251
10351@@ -19802,6 +20644,9 @@ include_expsyms=$lt_include_expsyms_CXX 10252@@ -19831,6 +20673,9 @@ include_expsyms=$lt_include_expsyms_CXX
10352 # Commands necessary for linking programs (against libraries) with templates. 10253 # Commands necessary for linking programs (against libraries) with templates.
10353 prelink_cmds=$lt_prelink_cmds_CXX 10254 prelink_cmds=$lt_prelink_cmds_CXX
10354 10255
@@ -10359,7 +10260,7 @@ index 8095b71..eb4f0d7 100755
10359 file_list_spec=$lt_file_list_spec_CXX 10260 file_list_spec=$lt_file_list_spec_CXX
10360 10261
10361diff --git a/libtool.m4 b/libtool.m4 10262diff --git a/libtool.m4 b/libtool.m4
10362index 4b2d30a..008d331 100644 10263index 24d13f3..e45fdc6 100644
10363--- a/libtool.m4 10264--- a/libtool.m4
10364+++ b/libtool.m4 10265+++ b/libtool.m4
10365@@ -1,7 +1,8 @@ 10266@@ -1,7 +1,8 @@
@@ -17442,10 +17343,10 @@ index bf92b5e..c573da9 100644
17442 # These exist entirely to fool aclocal when bootstrapping libtool. 17343 # These exist entirely to fool aclocal when bootstrapping libtool.
17443 # 17344 #
17444diff --git a/opcodes/configure b/opcodes/configure 17345diff --git a/opcodes/configure b/opcodes/configure
17445index eedb184..d3076e1 100755 17346index f615634..a340983 100755
17446--- a/opcodes/configure 17347--- a/opcodes/configure
17447+++ b/opcodes/configure 17348+++ b/opcodes/configure
17448@@ -648,6 +648,9 @@ OTOOL 17349@@ -649,6 +649,9 @@ OTOOL
17449 LIPO 17350 LIPO
17450 NMEDIT 17351 NMEDIT
17451 DSYMUTIL 17352 DSYMUTIL
@@ -17455,7 +17356,7 @@ index eedb184..d3076e1 100755
17455 OBJDUMP 17356 OBJDUMP
17456 LN_S 17357 LN_S
17457 NM 17358 NM
17458@@ -760,6 +763,7 @@ enable_static 17359@@ -762,6 +765,7 @@ enable_static
17459 with_pic 17360 with_pic
17460 enable_fast_install 17361 enable_fast_install
17461 with_gnu_ld 17362 with_gnu_ld
@@ -17463,7 +17364,7 @@ index eedb184..d3076e1 100755
17463 enable_libtool_lock 17364 enable_libtool_lock
17464 enable_targets 17365 enable_targets
17465 enable_werror 17366 enable_werror
17466@@ -1420,6 +1424,8 @@ Optional Packages: 17367@@ -1422,6 +1426,8 @@ Optional Packages:
17467 --with-pic try to use only PIC/non-PIC objects [default=use 17368 --with-pic try to use only PIC/non-PIC objects [default=use
17468 both] 17369 both]
17469 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 17370 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -17472,7 +17373,7 @@ index eedb184..d3076e1 100755
17472 17373
17473 Some influential environment variables: 17374 Some influential environment variables:
17474 CC C compiler command 17375 CC C compiler command
17475@@ -5110,8 +5116,8 @@ esac 17376@@ -5114,8 +5120,8 @@ esac
17476 17377
17477 17378
17478 17379
@@ -17483,7 +17384,7 @@ index eedb184..d3076e1 100755
17483 17384
17484 17385
17485 17386
17486@@ -5151,7 +5157,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 17387@@ -5155,7 +5161,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
17487 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 17388 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
17488 $as_echo_n "checking how to print strings... " >&6; } 17389 $as_echo_n "checking how to print strings... " >&6; }
17489 # Test print first, because it will be a builtin if present. 17390 # Test print first, because it will be a builtin if present.
@@ -17492,7 +17393,7 @@ index eedb184..d3076e1 100755
17492 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 17393 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17493 ECHO='print -r --' 17394 ECHO='print -r --'
17494 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 17395 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17495@@ -5837,8 +5843,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 17396@@ -5841,8 +5847,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
17496 # Try some XSI features 17397 # Try some XSI features
17497 xsi_shell=no 17398 xsi_shell=no
17498 ( _lt_dummy="a/b/c" 17399 ( _lt_dummy="a/b/c"
@@ -17503,7 +17404,7 @@ index eedb184..d3076e1 100755
17503 && eval 'test $(( 1 + 1 )) -eq 2 \ 17404 && eval 'test $(( 1 + 1 )) -eq 2 \
17504 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 17405 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
17505 && xsi_shell=yes 17406 && xsi_shell=yes
17506@@ -5887,6 +5893,80 @@ esac 17407@@ -5891,6 +5897,80 @@ esac
17507 17408
17508 17409
17509 17410
@@ -17584,7 +17485,7 @@ index eedb184..d3076e1 100755
17584 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 17485 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
17585 $as_echo_n "checking for $LD option to reload object files... " >&6; } 17486 $as_echo_n "checking for $LD option to reload object files... " >&6; }
17586 if test "${lt_cv_ld_reload_flag+set}" = set; then : 17487 if test "${lt_cv_ld_reload_flag+set}" = set; then :
17587@@ -5903,6 +5983,11 @@ case $reload_flag in 17488@@ -5907,6 +5987,11 @@ case $reload_flag in
17588 esac 17489 esac
17589 reload_cmds='$LD$reload_flag -o $output$reload_objs' 17490 reload_cmds='$LD$reload_flag -o $output$reload_objs'
17590 case $host_os in 17491 case $host_os in
@@ -17596,7 +17497,7 @@ index eedb184..d3076e1 100755
17596 darwin*) 17497 darwin*)
17597 if test "$GCC" = yes; then 17498 if test "$GCC" = yes; then
17598 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 17499 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
17599@@ -6071,7 +6156,8 @@ mingw* | pw32*) 17500@@ -6075,7 +6160,8 @@ mingw* | pw32*)
17600 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 17501 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
17601 lt_cv_file_magic_cmd='func_win32_libid' 17502 lt_cv_file_magic_cmd='func_win32_libid'
17602 else 17503 else
@@ -17606,7 +17507,7 @@ index eedb184..d3076e1 100755
17606 lt_cv_file_magic_cmd='$OBJDUMP -f' 17507 lt_cv_file_magic_cmd='$OBJDUMP -f'
17607 fi 17508 fi
17608 ;; 17509 ;;
17609@@ -6225,6 +6311,21 @@ esac 17510@@ -6229,6 +6315,21 @@ esac
17610 fi 17511 fi
17611 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 17512 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
17612 $as_echo "$lt_cv_deplibs_check_method" >&6; } 17513 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -17628,7 +17529,7 @@ index eedb184..d3076e1 100755
17628 file_magic_cmd=$lt_cv_file_magic_cmd 17529 file_magic_cmd=$lt_cv_file_magic_cmd
17629 deplibs_check_method=$lt_cv_deplibs_check_method 17530 deplibs_check_method=$lt_cv_deplibs_check_method
17630 test -z "$deplibs_check_method" && deplibs_check_method=unknown 17531 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17631@@ -6240,9 +6341,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 17532@@ -6244,9 +6345,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
17632 17533
17633 17534
17634 17535
@@ -17793,7 +17694,7 @@ index eedb184..d3076e1 100755
17793 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17694 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17794 $as_echo_n "checking for $ac_word... " >&6; } 17695 $as_echo_n "checking for $ac_word... " >&6; }
17795 if test "${ac_cv_prog_AR+set}" = set; then : 17696 if test "${ac_cv_prog_AR+set}" = set; then :
17796@@ -6258,7 +6512,7 @@ do 17697@@ -6262,7 +6516,7 @@ do
17797 test -z "$as_dir" && as_dir=. 17698 test -z "$as_dir" && as_dir=.
17798 for ac_exec_ext in '' $ac_executable_extensions; do 17699 for ac_exec_ext in '' $ac_executable_extensions; do
17799 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 17700 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -17802,7 +17703,7 @@ index eedb184..d3076e1 100755
17802 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17703 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17803 break 2 17704 break 2
17804 fi 17705 fi
17805@@ -6278,11 +6532,15 @@ $as_echo "no" >&6; } 17706@@ -6282,11 +6536,15 @@ $as_echo "no" >&6; }
17806 fi 17707 fi
17807 17708
17808 17709
@@ -17821,7 +17722,7 @@ index eedb184..d3076e1 100755
17821 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17822 $as_echo_n "checking for $ac_word... " >&6; } 17723 $as_echo_n "checking for $ac_word... " >&6; }
17823 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 17724 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17824@@ -6298,7 +6556,7 @@ do 17725@@ -6302,7 +6560,7 @@ do
17825 test -z "$as_dir" && as_dir=. 17726 test -z "$as_dir" && as_dir=.
17826 for ac_exec_ext in '' $ac_executable_extensions; do 17727 for ac_exec_ext in '' $ac_executable_extensions; do
17827 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 17728 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -17830,7 +17731,7 @@ index eedb184..d3076e1 100755
17830 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17731 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17831 break 2 17732 break 2
17832 fi 17733 fi
17833@@ -6317,6 +6575,10 @@ else 17734@@ -6321,6 +6579,10 @@ else
17834 $as_echo "no" >&6; } 17735 $as_echo "no" >&6; }
17835 fi 17736 fi
17836 17737
@@ -17841,7 +17742,7 @@ index eedb184..d3076e1 100755
17841 if test "x$ac_ct_AR" = x; then 17742 if test "x$ac_ct_AR" = x; then
17842 AR="false" 17743 AR="false"
17843 else 17744 else
17844@@ -6328,16 +6590,72 @@ ac_tool_warned=yes ;; 17745@@ -6332,16 +6594,72 @@ ac_tool_warned=yes ;;
17845 esac 17746 esac
17846 AR=$ac_ct_AR 17747 AR=$ac_ct_AR
17847 fi 17748 fi
@@ -17918,7 +17819,7 @@ index eedb184..d3076e1 100755
17918 17819
17919 17820
17920 17821
17921@@ -6679,8 +6997,8 @@ esac 17822@@ -6683,8 +7001,8 @@ esac
17922 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 17823 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17923 17824
17924 # Transform an extracted symbol line into symbol name and symbol address 17825 # Transform an extracted symbol line into symbol name and symbol address
@@ -17929,7 +17830,7 @@ index eedb184..d3076e1 100755
17929 17830
17930 # Handle CRLF in mingw tool chain 17831 # Handle CRLF in mingw tool chain
17931 opt_cr= 17832 opt_cr=
17932@@ -6716,6 +7034,7 @@ for ac_symprfx in "" "_"; do 17833@@ -6720,6 +7038,7 @@ for ac_symprfx in "" "_"; do
17933 else 17834 else
17934 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 17835 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17935 fi 17836 fi
@@ -17937,7 +17838,7 @@ index eedb184..d3076e1 100755
17937 17838
17938 # Check to see that the pipe works correctly. 17839 # Check to see that the pipe works correctly.
17939 pipe_works=no 17840 pipe_works=no
17940@@ -6757,6 +7076,18 @@ _LT_EOF 17841@@ -6761,6 +7080,18 @@ _LT_EOF
17941 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 17842 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17942 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 17843 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17943 cat <<_LT_EOF > conftest.$ac_ext 17844 cat <<_LT_EOF > conftest.$ac_ext
@@ -17956,7 +17857,7 @@ index eedb184..d3076e1 100755
17956 #ifdef __cplusplus 17857 #ifdef __cplusplus
17957 extern "C" { 17858 extern "C" {
17958 #endif 17859 #endif
17959@@ -6768,7 +7099,7 @@ _LT_EOF 17860@@ -6772,7 +7103,7 @@ _LT_EOF
17960 cat <<_LT_EOF >> conftest.$ac_ext 17861 cat <<_LT_EOF >> conftest.$ac_ext
17961 17862
17962 /* The mapping between symbol names and symbols. */ 17863 /* The mapping between symbol names and symbols. */
@@ -17965,7 +17866,7 @@ index eedb184..d3076e1 100755
17965 const char *name; 17866 const char *name;
17966 void *address; 17867 void *address;
17967 } 17868 }
17968@@ -6794,8 +7125,8 @@ static const void *lt_preloaded_setup() { 17869@@ -6798,8 +7129,8 @@ static const void *lt_preloaded_setup() {
17969 _LT_EOF 17870 _LT_EOF
17970 # Now try linking the two files. 17871 # Now try linking the two files.
17971 mv conftest.$ac_objext conftstm.$ac_objext 17872 mv conftest.$ac_objext conftstm.$ac_objext
@@ -17976,7 +17877,7 @@ index eedb184..d3076e1 100755
17976 LIBS="conftstm.$ac_objext" 17877 LIBS="conftstm.$ac_objext"
17977 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 17878 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17978 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 17879 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17979@@ -6805,8 +7136,8 @@ _LT_EOF 17880@@ -6809,8 +7140,8 @@ _LT_EOF
17980 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 17881 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17981 pipe_works=yes 17882 pipe_works=yes
17982 fi 17883 fi
@@ -17987,7 +17888,7 @@ index eedb184..d3076e1 100755
17987 else 17888 else
17988 echo "cannot find nm_test_func in $nlist" >&5 17889 echo "cannot find nm_test_func in $nlist" >&5
17989 fi 17890 fi
17990@@ -6843,6 +7174,16 @@ else 17891@@ -6847,6 +7178,16 @@ else
17991 $as_echo "ok" >&6; } 17892 $as_echo "ok" >&6; }
17992 fi 17893 fi
17993 17894
@@ -18004,7 +17905,7 @@ index eedb184..d3076e1 100755
18004 17905
18005 17906
18006 17907
18007@@ -6864,6 +7205,45 @@ fi 17908@@ -6868,6 +7209,45 @@ fi
18008 17909
18009 17910
18010 17911
@@ -18050,7 +17951,7 @@ index eedb184..d3076e1 100755
18050 # Check whether --enable-libtool-lock was given. 17951 # Check whether --enable-libtool-lock was given.
18051 if test "${enable_libtool_lock+set}" = set; then : 17952 if test "${enable_libtool_lock+set}" = set; then :
18052 enableval=$enable_libtool_lock; 17953 enableval=$enable_libtool_lock;
18053@@ -7070,6 +7450,123 @@ esac 17954@@ -7074,6 +7454,123 @@ esac
18054 17955
18055 need_locks="$enable_libtool_lock" 17956 need_locks="$enable_libtool_lock"
18056 17957
@@ -18174,7 +18075,7 @@ index eedb184..d3076e1 100755
18174 18075
18175 case $host_os in 18076 case $host_os in
18176 rhapsody* | darwin*) 18077 rhapsody* | darwin*)
18177@@ -7633,6 +8130,8 @@ _LT_EOF 18078@@ -7637,6 +8134,8 @@ _LT_EOF
18178 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 18079 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
18179 echo "$AR cru libconftest.a conftest.o" >&5 18080 echo "$AR cru libconftest.a conftest.o" >&5
18180 $AR cru libconftest.a conftest.o 2>&5 18081 $AR cru libconftest.a conftest.o 2>&5
@@ -18183,7 +18084,7 @@ index eedb184..d3076e1 100755
18183 cat > conftest.c << _LT_EOF 18084 cat > conftest.c << _LT_EOF
18184 int main() { return 0;} 18085 int main() { return 0;}
18185 _LT_EOF 18086 _LT_EOF
18186@@ -7798,7 +8297,8 @@ fi 18087@@ -7802,7 +8301,8 @@ fi
18187 LIBTOOL_DEPS="$ltmain" 18088 LIBTOOL_DEPS="$ltmain"
18188 18089
18189 # Always use our own libtool. 18090 # Always use our own libtool.
@@ -18193,7 +18094,7 @@ index eedb184..d3076e1 100755
18193 18094
18194 18095
18195 18096
18196@@ -7887,7 +8387,7 @@ aix3*) 18097@@ -7891,7 +8391,7 @@ aix3*)
18197 esac 18098 esac
18198 18099
18199 # Global variables: 18100 # Global variables:
@@ -18202,7 +18103,7 @@ index eedb184..d3076e1 100755
18202 can_build_shared=yes 18103 can_build_shared=yes
18203 18104
18204 # All known linkers require a `.a' archive for static linking (except MSVC, 18105 # All known linkers require a `.a' archive for static linking (except MSVC,
18205@@ -8185,8 +8685,6 @@ fi 18106@@ -8189,8 +8689,6 @@ fi
18206 lt_prog_compiler_pic= 18107 lt_prog_compiler_pic=
18207 lt_prog_compiler_static= 18108 lt_prog_compiler_static=
18208 18109
@@ -18211,7 +18112,7 @@ index eedb184..d3076e1 100755
18211 18112
18212 if test "$GCC" = yes; then 18113 if test "$GCC" = yes; then
18213 lt_prog_compiler_wl='-Wl,' 18114 lt_prog_compiler_wl='-Wl,'
18214@@ -8352,6 +8850,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18115@@ -8356,6 +8854,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18215 lt_prog_compiler_pic='--shared' 18116 lt_prog_compiler_pic='--shared'
18216 lt_prog_compiler_static='--static' 18117 lt_prog_compiler_static='--static'
18217 ;; 18118 ;;
@@ -18224,7 +18125,7 @@ index eedb184..d3076e1 100755
18224 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 18125 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18225 # Portland Group compilers (*not* the Pentium gcc compiler, 18126 # Portland Group compilers (*not* the Pentium gcc compiler,
18226 # which looks to be a dead project) 18127 # which looks to be a dead project)
18227@@ -8414,7 +8918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18128@@ -8418,7 +8922,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18228 lt_prog_compiler_pic='-KPIC' 18129 lt_prog_compiler_pic='-KPIC'
18229 lt_prog_compiler_static='-Bstatic' 18130 lt_prog_compiler_static='-Bstatic'
18230 case $cc_basename in 18131 case $cc_basename in
@@ -18233,7 +18134,7 @@ index eedb184..d3076e1 100755
18233 lt_prog_compiler_wl='-Qoption ld ';; 18134 lt_prog_compiler_wl='-Qoption ld ';;
18234 *) 18135 *)
18235 lt_prog_compiler_wl='-Wl,';; 18136 lt_prog_compiler_wl='-Wl,';;
18236@@ -8471,13 +8975,17 @@ case $host_os in 18137@@ -8475,13 +8979,17 @@ case $host_os in
18237 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 18138 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
18238 ;; 18139 ;;
18239 esac 18140 esac
@@ -18257,7 +18158,7 @@ index eedb184..d3076e1 100755
18257 18158
18258 # 18159 #
18259 # Check to make sure the PIC flag actually works. 18160 # Check to make sure the PIC flag actually works.
18260@@ -8538,6 +9046,11 @@ fi 18161@@ -8542,6 +9050,11 @@ fi
18261 18162
18262 18163
18263 18164
@@ -18269,7 +18170,7 @@ index eedb184..d3076e1 100755
18269 # 18170 #
18270 # Check to make sure the static flag actually works. 18171 # Check to make sure the static flag actually works.
18271 # 18172 #
18272@@ -8888,7 +9401,8 @@ _LT_EOF 18173@@ -8892,7 +9405,8 @@ _LT_EOF
18273 allow_undefined_flag=unsupported 18174 allow_undefined_flag=unsupported
18274 always_export_symbols=no 18175 always_export_symbols=no
18275 enable_shared_with_static_runtimes=yes 18176 enable_shared_with_static_runtimes=yes
@@ -18279,7 +18180,7 @@ index eedb184..d3076e1 100755
18279 18180
18280 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 18181 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18281 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 18182 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18282@@ -8987,12 +9501,12 @@ _LT_EOF 18183@@ -8991,12 +9505,12 @@ _LT_EOF
18283 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 18184 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18284 hardcode_libdir_flag_spec= 18185 hardcode_libdir_flag_spec=
18285 hardcode_libdir_flag_spec_ld='-rpath $libdir' 18186 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -18294,7 +18195,7 @@ index eedb184..d3076e1 100755
18294 fi 18195 fi
18295 ;; 18196 ;;
18296 esac 18197 esac
18297@@ -9006,8 +9520,8 @@ _LT_EOF 18198@@ -9010,8 +9524,8 @@ _LT_EOF
18298 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 18199 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18299 wlarc= 18200 wlarc=
18300 else 18201 else
@@ -18305,7 +18206,7 @@ index eedb184..d3076e1 100755
18305 fi 18206 fi
18306 ;; 18207 ;;
18307 18208
18308@@ -9025,8 +9539,8 @@ _LT_EOF 18209@@ -9029,8 +9543,8 @@ _LT_EOF
18309 18210
18310 _LT_EOF 18211 _LT_EOF
18311 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18212 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -18316,7 +18217,7 @@ index eedb184..d3076e1 100755
18316 else 18217 else
18317 ld_shlibs=no 18218 ld_shlibs=no
18318 fi 18219 fi
18319@@ -9072,8 +9586,8 @@ _LT_EOF 18220@@ -9076,8 +9590,8 @@ _LT_EOF
18320 18221
18321 *) 18222 *)
18322 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18223 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -18327,7 +18228,7 @@ index eedb184..d3076e1 100755
18327 else 18228 else
18328 ld_shlibs=no 18229 ld_shlibs=no
18329 fi 18230 fi
18330@@ -9203,7 +9717,13 @@ _LT_EOF 18231@@ -9207,7 +9721,13 @@ _LT_EOF
18331 allow_undefined_flag='-berok' 18232 allow_undefined_flag='-berok'
18332 # Determine the default libpath from the value encoded in an 18233 # Determine the default libpath from the value encoded in an
18333 # empty executable. 18234 # empty executable.
@@ -18342,7 +18243,7 @@ index eedb184..d3076e1 100755
18342 /* end confdefs.h. */ 18243 /* end confdefs.h. */
18343 18244
18344 int 18245 int
18345@@ -9216,22 +9736,29 @@ main () 18246@@ -9220,22 +9740,29 @@ main ()
18346 _ACEOF 18247 _ACEOF
18347 if ac_fn_c_try_link "$LINENO"; then : 18248 if ac_fn_c_try_link "$LINENO"; then :
18348 18249
@@ -18385,7 +18286,7 @@ index eedb184..d3076e1 100755
18385 18286
18386 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18287 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18387 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" 18288 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"
18388@@ -9243,7 +9770,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18289@@ -9247,7 +9774,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18389 else 18290 else
18390 # Determine the default libpath from the value encoded in an 18291 # Determine the default libpath from the value encoded in an
18391 # empty executable. 18292 # empty executable.
@@ -18400,7 +18301,7 @@ index eedb184..d3076e1 100755
18400 /* end confdefs.h. */ 18301 /* end confdefs.h. */
18401 18302
18402 int 18303 int
18403@@ -9256,22 +9789,29 @@ main () 18304@@ -9260,22 +9793,29 @@ main ()
18404 _ACEOF 18305 _ACEOF
18405 if ac_fn_c_try_link "$LINENO"; then : 18306 if ac_fn_c_try_link "$LINENO"; then :
18406 18307
@@ -18443,7 +18344,7 @@ index eedb184..d3076e1 100755
18443 18344
18444 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18345 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18445 # Warning - without using the other run time loading flags, 18346 # Warning - without using the other run time loading flags,
18446@@ -9316,20 +9856,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18347@@ -9320,20 +9860,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18447 # Microsoft Visual C++. 18348 # Microsoft Visual C++.
18448 # hardcode_libdir_flag_spec is actually meaningless, as there is 18349 # hardcode_libdir_flag_spec is actually meaningless, as there is
18449 # no search path for DLLs. 18350 # no search path for DLLs.
@@ -18521,7 +18422,7 @@ index eedb184..d3076e1 100755
18521 ;; 18422 ;;
18522 18423
18523 darwin* | rhapsody*) 18424 darwin* | rhapsody*)
18524@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18425@@ -9394,7 +9977,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18525 18426
18526 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 18427 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18527 freebsd* | dragonfly*) 18428 freebsd* | dragonfly*)
@@ -18530,7 +18431,7 @@ index eedb184..d3076e1 100755
18530 hardcode_libdir_flag_spec='-R$libdir' 18431 hardcode_libdir_flag_spec='-R$libdir'
18531 hardcode_direct=yes 18432 hardcode_direct=yes
18532 hardcode_shlibpath_var=no 18433 hardcode_shlibpath_var=no
18533@@ -9398,7 +9981,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18434@@ -9402,7 +9985,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18534 18435
18535 hpux9*) 18436 hpux9*)
18536 if test "$GCC" = yes; then 18437 if test "$GCC" = yes; then
@@ -18539,7 +18440,7 @@ index eedb184..d3076e1 100755
18539 else 18440 else
18540 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' 18441 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'
18541 fi 18442 fi
18542@@ -9414,7 +9997,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18443@@ -9418,7 +10001,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18543 18444
18544 hpux10*) 18445 hpux10*)
18545 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 18446 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -18548,7 +18449,7 @@ index eedb184..d3076e1 100755
18548 else 18449 else
18549 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 18450 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18550 fi 18451 fi
18551@@ -9438,10 +10021,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18452@@ -9442,10 +10025,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18552 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 18453 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18553 ;; 18454 ;;
18554 ia64*) 18455 ia64*)
@@ -18561,7 +18462,7 @@ index eedb184..d3076e1 100755
18561 ;; 18462 ;;
18562 esac 18463 esac
18563 else 18464 else
18564@@ -9520,23 +10103,36 @@ fi 18465@@ -9524,23 +10107,36 @@ fi
18565 18466
18566 irix5* | irix6* | nonstopux*) 18467 irix5* | irix6* | nonstopux*)
18567 if test "$GCC" = yes; then 18468 if test "$GCC" = yes; then
@@ -18606,7 +18507,7 @@ index eedb184..d3076e1 100755
18606 else 18507 else
18607 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' 18508 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'
18608 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' 18509 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'
18609@@ -9621,7 +10217,7 @@ rm -f core conftest.err conftest.$ac_objext \ 18510@@ -9625,7 +10221,7 @@ rm -f core conftest.err conftest.$ac_objext \
18610 osf4* | osf5*) # as osf3* with the addition of -msym flag 18511 osf4* | osf5*) # as osf3* with the addition of -msym flag
18611 if test "$GCC" = yes; then 18512 if test "$GCC" = yes; then
18612 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 18513 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -18615,7 +18516,7 @@ index eedb184..d3076e1 100755
18615 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 18516 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18616 else 18517 else
18617 allow_undefined_flag=' -expect_unresolved \*' 18518 allow_undefined_flag=' -expect_unresolved \*'
18618@@ -9640,9 +10236,9 @@ rm -f core conftest.err conftest.$ac_objext \ 18519@@ -9644,9 +10240,9 @@ rm -f core conftest.err conftest.$ac_objext \
18619 no_undefined_flag=' -z defs' 18520 no_undefined_flag=' -z defs'
18620 if test "$GCC" = yes; then 18521 if test "$GCC" = yes; then
18621 wlarc='${wl}' 18522 wlarc='${wl}'
@@ -18627,7 +18528,7 @@ index eedb184..d3076e1 100755
18627 else 18528 else
18628 case `$CC -V 2>&1` in 18529 case `$CC -V 2>&1` in
18629 *"Compilers 5.0"*) 18530 *"Compilers 5.0"*)
18630@@ -10218,8 +10814,9 @@ cygwin* | mingw* | pw32* | cegcc*) 18531@@ -10222,8 +10818,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18631 need_version=no 18532 need_version=no
18632 need_lib_prefix=no 18533 need_lib_prefix=no
18633 18534
@@ -18639,7 +18540,7 @@ index eedb184..d3076e1 100755
18639 library_names_spec='$libname.dll.a' 18540 library_names_spec='$libname.dll.a'
18640 # DLL is installed to $(libdir)/../bin by postinstall_cmds 18541 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18641 postinstall_cmds='base_file=`basename \${file}`~ 18542 postinstall_cmds='base_file=`basename \${file}`~
18642@@ -10252,13 +10849,71 @@ cygwin* | mingw* | pw32* | cegcc*) 18543@@ -10256,13 +10853,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18643 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 18544 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18644 ;; 18545 ;;
18645 esac 18546 esac
@@ -18712,7 +18613,7 @@ index eedb184..d3076e1 100755
18712 # FIXME: first we should search . and the directory the executable is in 18613 # FIXME: first we should search . and the directory the executable is in
18713 shlibpath_var=PATH 18614 shlibpath_var=PATH
18714 ;; 18615 ;;
18715@@ -10350,7 +11005,7 @@ haiku*) 18616@@ -10354,7 +11009,7 @@ haiku*)
18716 soname_spec='${libname}${release}${shared_ext}$major' 18617 soname_spec='${libname}${release}${shared_ext}$major'
18717 shlibpath_var=LIBRARY_PATH 18618 shlibpath_var=LIBRARY_PATH
18718 shlibpath_overrides_runpath=yes 18619 shlibpath_overrides_runpath=yes
@@ -18721,16 +18622,7 @@ index eedb184..d3076e1 100755
18721 hardcode_into_libs=yes 18622 hardcode_into_libs=yes
18722 ;; 18623 ;;
18723 18624
18724@@ -11146,7 +11801,7 @@ else 18625@@ -11194,10 +11849,10 @@ else
18725 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18726 lt_status=$lt_dlunknown
18727 cat > conftest.$ac_ext <<_LT_EOF
18728-#line 11149 "configure"
18729+#line $LINENO "configure"
18730 #include "confdefs.h"
18731
18732 #if HAVE_DLFCN_H
18733@@ -11190,10 +11845,10 @@ else
18734 /* When -fvisbility=hidden is used, assume the code has been annotated 18626 /* When -fvisbility=hidden is used, assume the code has been annotated
18735 correspondingly for the symbols needed. */ 18627 correspondingly for the symbols needed. */
18736 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 18628 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -18743,16 +18635,7 @@ index eedb184..d3076e1 100755
18743 int main () 18635 int main ()
18744 { 18636 {
18745 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 18637 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18746@@ -11252,7 +11907,7 @@ else 18638@@ -11300,10 +11955,10 @@ else
18747 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18748 lt_status=$lt_dlunknown
18749 cat > conftest.$ac_ext <<_LT_EOF
18750-#line 11255 "configure"
18751+#line $LINENO "configure"
18752 #include "confdefs.h"
18753
18754 #if HAVE_DLFCN_H
18755@@ -11296,10 +11951,10 @@ else
18756 /* When -fvisbility=hidden is used, assume the code has been annotated 18639 /* When -fvisbility=hidden is used, assume the code has been annotated
18757 correspondingly for the symbols needed. */ 18640 correspondingly for the symbols needed. */
18758 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 18641 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -18765,7 +18648,7 @@ index eedb184..d3076e1 100755
18765 int main () 18648 int main ()
18766 { 18649 {
18767 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 18650 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18768@@ -12462,7 +13117,7 @@ if test "$enable_shared" = "yes"; then 18651@@ -12499,7 +13154,7 @@ if test "$enable_shared" = "yes"; then
18769 # since libbfd may not pull in the entirety of libiberty. 18652 # since libbfd may not pull in the entirety of libiberty.
18770 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 18653 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18771 if test -n "$x"; then 18654 if test -n "$x"; then
@@ -18774,7 +18657,7 @@ index eedb184..d3076e1 100755
18774 fi 18657 fi
18775 18658
18776 case "${host}" in 18659 case "${host}" in
18777@@ -13436,13 +14091,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 18660@@ -13473,13 +14128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18778 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 18661 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18779 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 18662 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18780 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 18663 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -18795,7 +18678,7 @@ index eedb184..d3076e1 100755
18795 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 18678 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18796 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 18679 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18797 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 18680 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18798@@ -13457,14 +14119,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 18681@@ -13494,14 +14156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18799 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 18682 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18800 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 18683 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18801 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"`' 18684 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"`'
@@ -18814,7 +18697,7 @@ index eedb184..d3076e1 100755
18814 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 18697 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18815 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 18698 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18816 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 18699 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18817@@ -13497,12 +14162,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 18700@@ -13534,12 +14199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18818 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 18701 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18819 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 18702 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18820 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 18703 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -18828,7 +18711,7 @@ index eedb184..d3076e1 100755
18828 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 18711 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18829 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 18712 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18830 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 18713 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18831@@ -13557,8 +14222,13 @@ reload_flag \ 18714@@ -13594,8 +14259,13 @@ reload_flag \
18832 OBJDUMP \ 18715 OBJDUMP \
18833 deplibs_check_method \ 18716 deplibs_check_method \
18834 file_magic_cmd \ 18717 file_magic_cmd \
@@ -18842,7 +18725,7 @@ index eedb184..d3076e1 100755
18842 STRIP \ 18725 STRIP \
18843 RANLIB \ 18726 RANLIB \
18844 CC \ 18727 CC \
18845@@ -13568,12 +14238,14 @@ lt_cv_sys_global_symbol_pipe \ 18728@@ -13605,12 +14275,14 @@ lt_cv_sys_global_symbol_pipe \
18846 lt_cv_sys_global_symbol_to_cdecl \ 18729 lt_cv_sys_global_symbol_to_cdecl \
18847 lt_cv_sys_global_symbol_to_c_name_address \ 18730 lt_cv_sys_global_symbol_to_c_name_address \
18848 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 18731 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -18858,7 +18741,7 @@ index eedb184..d3076e1 100755
18858 DSYMUTIL \ 18741 DSYMUTIL \
18859 NMEDIT \ 18742 NMEDIT \
18860 LIPO \ 18743 LIPO \
18861@@ -13589,7 +14261,6 @@ no_undefined_flag \ 18744@@ -13626,7 +14298,6 @@ no_undefined_flag \
18862 hardcode_libdir_flag_spec \ 18745 hardcode_libdir_flag_spec \
18863 hardcode_libdir_flag_spec_ld \ 18746 hardcode_libdir_flag_spec_ld \
18864 hardcode_libdir_separator \ 18747 hardcode_libdir_separator \
@@ -18866,7 +18749,7 @@ index eedb184..d3076e1 100755
18866 exclude_expsyms \ 18749 exclude_expsyms \
18867 include_expsyms \ 18750 include_expsyms \
18868 file_list_spec \ 18751 file_list_spec \
18869@@ -13625,6 +14296,7 @@ module_cmds \ 18752@@ -13662,6 +14333,7 @@ module_cmds \
18870 module_expsym_cmds \ 18753 module_expsym_cmds \
18871 export_symbols_cmds \ 18754 export_symbols_cmds \
18872 prelink_cmds \ 18755 prelink_cmds \
@@ -18874,7 +18757,7 @@ index eedb184..d3076e1 100755
18874 postinstall_cmds \ 18757 postinstall_cmds \
18875 postuninstall_cmds \ 18758 postuninstall_cmds \
18876 finish_cmds \ 18759 finish_cmds \
18877@@ -14381,7 +15053,8 @@ $as_echo X"$file" | 18760@@ -14418,7 +15090,8 @@ $as_echo X"$file" |
18878 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 18761 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18879 # 18762 #
18880 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 18763 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -18884,7 +18767,7 @@ index eedb184..d3076e1 100755
18884 # Written by Gordon Matzigkeit, 1996 18767 # Written by Gordon Matzigkeit, 1996
18885 # 18768 #
18886 # This file is part of GNU Libtool. 18769 # This file is part of GNU Libtool.
18887@@ -14484,19 +15157,42 @@ SP2NL=$lt_lt_SP2NL 18770@@ -14521,19 +15194,42 @@ SP2NL=$lt_lt_SP2NL
18888 # turn newlines into spaces. 18771 # turn newlines into spaces.
18889 NL2SP=$lt_lt_NL2SP 18772 NL2SP=$lt_lt_NL2SP
18890 18773
@@ -18928,7 +18811,7 @@ index eedb184..d3076e1 100755
18928 # A symbol stripping program. 18811 # A symbol stripping program.
18929 STRIP=$lt_STRIP 18812 STRIP=$lt_STRIP
18930 18813
18931@@ -14526,6 +15222,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 18814@@ -14563,6 +15259,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18932 # Transform the output of nm in a C name address pair when lib prefix is needed. 18815 # Transform the output of nm in a C name address pair when lib prefix is needed.
18933 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 18816 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18934 18817
@@ -18941,7 +18824,7 @@ index eedb184..d3076e1 100755
18941 # The name of the directory that contains temporary libtool files. 18824 # The name of the directory that contains temporary libtool files.
18942 objdir=$objdir 18825 objdir=$objdir
18943 18826
18944@@ -14535,6 +15237,9 @@ MAGIC_CMD=$MAGIC_CMD 18827@@ -14572,6 +15274,9 @@ MAGIC_CMD=$MAGIC_CMD
18945 # Must we lock files when doing compilation? 18828 # Must we lock files when doing compilation?
18946 need_locks=$lt_need_locks 18829 need_locks=$lt_need_locks
18947 18830
@@ -18951,7 +18834,7 @@ index eedb184..d3076e1 100755
18951 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 18834 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18952 DSYMUTIL=$lt_DSYMUTIL 18835 DSYMUTIL=$lt_DSYMUTIL
18953 18836
18954@@ -14649,12 +15354,12 @@ with_gcc=$GCC 18837@@ -14686,12 +15391,12 @@ with_gcc=$GCC
18955 # Compiler flag to turn off builtin functions. 18838 # Compiler flag to turn off builtin functions.
18956 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 18839 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18957 18840
@@ -18967,7 +18850,7 @@ index eedb184..d3076e1 100755
18967 # Compiler flag to prevent dynamic linking. 18850 # Compiler flag to prevent dynamic linking.
18968 link_static_flag=$lt_lt_prog_compiler_static 18851 link_static_flag=$lt_lt_prog_compiler_static
18969 18852
18970@@ -14741,9 +15446,6 @@ inherit_rpath=$inherit_rpath 18853@@ -14778,9 +15483,6 @@ inherit_rpath=$inherit_rpath
18971 # Whether libtool must link a program against all its dependency libraries. 18854 # Whether libtool must link a program against all its dependency libraries.
18972 link_all_deplibs=$link_all_deplibs 18855 link_all_deplibs=$link_all_deplibs
18973 18856
@@ -18977,7 +18860,7 @@ index eedb184..d3076e1 100755
18977 # Set to "yes" if exported symbols are required. 18860 # Set to "yes" if exported symbols are required.
18978 always_export_symbols=$always_export_symbols 18861 always_export_symbols=$always_export_symbols
18979 18862
18980@@ -14759,6 +15461,9 @@ include_expsyms=$lt_include_expsyms 18863@@ -14796,6 +15498,9 @@ include_expsyms=$lt_include_expsyms
18981 # Commands necessary for linking programs (against libraries) with templates. 18864 # Commands necessary for linking programs (against libraries) with templates.
18982 prelink_cmds=$lt_prelink_cmds 18865 prelink_cmds=$lt_prelink_cmds
18983 18866
@@ -18987,7 +18870,7 @@ index eedb184..d3076e1 100755
18987 # Specify filename containing input files. 18870 # Specify filename containing input files.
18988 file_list_spec=$lt_file_list_spec 18871 file_list_spec=$lt_file_list_spec
18989 18872
18990@@ -14791,210 +15496,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 18873@@ -14828,210 +15533,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18991 # if finds mixed CR/LF and LF-only lines. Since sed operates in 18874 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18992 # text mode, it properly converts lines to CR/LF. This bash problem 18875 # text mode, it properly converts lines to CR/LF. This bash problem
18993 # is reportedly fixed, but why not run on old versions too? 18876 # is reportedly fixed, but why not run on old versions too?
@@ -19362,7 +19245,7 @@ index eedb184..d3076e1 100755
19362 chmod +x "$ofile" 19245 chmod +x "$ofile"
19363 19246
19364diff --git a/opcodes/configure.ac b/opcodes/configure.ac 19247diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19365index 07e3162..c0c75d4 100644 19248index c7f4783..f2e002d 100644
19366--- a/opcodes/configure.ac 19249--- a/opcodes/configure.ac
19367+++ b/opcodes/configure.ac 19250+++ b/opcodes/configure.ac
19368@@ -167,7 +167,7 @@ changequote(,)dnl 19251@@ -167,7 +167,7 @@ changequote(,)dnl
@@ -19375,7 +19258,7 @@ index 07e3162..c0c75d4 100644
19375 19258
19376 case "${host}" in 19259 case "${host}" in
19377diff --git a/zlib/configure b/zlib/configure 19260diff --git a/zlib/configure b/zlib/configure
19378index 8378857..7584940 100755 19261index bba9fd2..25a2dae 100755
19379--- a/zlib/configure 19262--- a/zlib/configure
19380+++ b/zlib/configure 19263+++ b/zlib/configure
19381@@ -614,8 +614,11 @@ OTOOL 19264@@ -614,8 +614,11 @@ OTOOL
@@ -19390,7 +19273,7 @@ index 8378857..7584940 100755
19390 OBJDUMP 19273 OBJDUMP
19391 LN_S 19274 LN_S
19392 NM 19275 NM
19393@@ -736,6 +739,7 @@ enable_static 19276@@ -737,6 +740,7 @@ enable_static
19394 with_pic 19277 with_pic
19395 enable_fast_install 19278 enable_fast_install
19396 with_gnu_ld 19279 with_gnu_ld
@@ -19398,7 +19281,7 @@ index 8378857..7584940 100755
19398 enable_libtool_lock 19281 enable_libtool_lock
19399 enable_host_shared 19282 enable_host_shared
19400 ' 19283 '
19401@@ -1384,6 +1388,8 @@ Optional Packages: 19284@@ -1385,6 +1389,8 @@ Optional Packages:
19402 --with-pic try to use only PIC/non-PIC objects [default=use 19285 --with-pic try to use only PIC/non-PIC objects [default=use
19403 both] 19286 both]
19404 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 19287 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -19407,7 +19290,7 @@ index 8378857..7584940 100755
19407 19290
19408 Some influential environment variables: 19291 Some influential environment variables:
19409 CC C compiler command 19292 CC C compiler command
19410@@ -3907,8 +3913,8 @@ esac 19293@@ -3910,8 +3916,8 @@ esac
19411 19294
19412 19295
19413 19296
@@ -19418,7 +19301,7 @@ index 8378857..7584940 100755
19418 19301
19419 19302
19420 19303
19421@@ -3948,7 +3954,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 19304@@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
19422 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 19305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
19423 $as_echo_n "checking how to print strings... " >&6; } 19306 $as_echo_n "checking how to print strings... " >&6; }
19424 # Test print first, because it will be a builtin if present. 19307 # Test print first, because it will be a builtin if present.
@@ -19427,7 +19310,7 @@ index 8378857..7584940 100755
19427 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 19310 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19428 ECHO='print -r --' 19311 ECHO='print -r --'
19429 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 19312 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19430@@ -4764,8 +4770,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 19313@@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
19431 # Try some XSI features 19314 # Try some XSI features
19432 xsi_shell=no 19315 xsi_shell=no
19433 ( _lt_dummy="a/b/c" 19316 ( _lt_dummy="a/b/c"
@@ -19438,7 +19321,7 @@ index 8378857..7584940 100755
19438 && eval 'test $(( 1 + 1 )) -eq 2 \ 19321 && eval 'test $(( 1 + 1 )) -eq 2 \
19439 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 19322 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
19440 && xsi_shell=yes 19323 && xsi_shell=yes
19441@@ -4814,6 +4820,80 @@ esac 19324@@ -4817,6 +4823,80 @@ esac
19442 19325
19443 19326
19444 19327
@@ -19519,7 +19402,7 @@ index 8378857..7584940 100755
19519 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 19402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
19520 $as_echo_n "checking for $LD option to reload object files... " >&6; } 19403 $as_echo_n "checking for $LD option to reload object files... " >&6; }
19521 if test "${lt_cv_ld_reload_flag+set}" = set; then : 19404 if test "${lt_cv_ld_reload_flag+set}" = set; then :
19522@@ -4830,6 +4910,11 @@ case $reload_flag in 19405@@ -4833,6 +4913,11 @@ case $reload_flag in
19523 esac 19406 esac
19524 reload_cmds='$LD$reload_flag -o $output$reload_objs' 19407 reload_cmds='$LD$reload_flag -o $output$reload_objs'
19525 case $host_os in 19408 case $host_os in
@@ -19531,7 +19414,7 @@ index 8378857..7584940 100755
19531 darwin*) 19414 darwin*)
19532 if test "$GCC" = yes; then 19415 if test "$GCC" = yes; then
19533 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 19416 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
19534@@ -4998,7 +5083,8 @@ mingw* | pw32*) 19417@@ -5001,7 +5086,8 @@ mingw* | pw32*)
19535 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 19418 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
19536 lt_cv_file_magic_cmd='func_win32_libid' 19419 lt_cv_file_magic_cmd='func_win32_libid'
19537 else 19420 else
@@ -19541,7 +19424,7 @@ index 8378857..7584940 100755
19541 lt_cv_file_magic_cmd='$OBJDUMP -f' 19424 lt_cv_file_magic_cmd='$OBJDUMP -f'
19542 fi 19425 fi
19543 ;; 19426 ;;
19544@@ -5152,6 +5238,21 @@ esac 19427@@ -5155,6 +5241,21 @@ esac
19545 fi 19428 fi
19546 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 19429 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
19547 $as_echo "$lt_cv_deplibs_check_method" >&6; } 19430 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -19563,7 +19446,7 @@ index 8378857..7584940 100755
19563 file_magic_cmd=$lt_cv_file_magic_cmd 19446 file_magic_cmd=$lt_cv_file_magic_cmd
19564 deplibs_check_method=$lt_cv_deplibs_check_method 19447 deplibs_check_method=$lt_cv_deplibs_check_method
19565 test -z "$deplibs_check_method" && deplibs_check_method=unknown 19448 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19566@@ -5167,9 +5268,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 19449@@ -5170,9 +5271,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
19567 19450
19568 19451
19569 19452
@@ -19729,7 +19612,7 @@ index 8378857..7584940 100755
19729 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19612 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19730 $as_echo_n "checking for $ac_word... " >&6; } 19613 $as_echo_n "checking for $ac_word... " >&6; }
19731 if test "${ac_cv_prog_AR+set}" = set; then : 19614 if test "${ac_cv_prog_AR+set}" = set; then :
19732@@ -5185,7 +5440,7 @@ do 19615@@ -5188,7 +5443,7 @@ do
19733 test -z "$as_dir" && as_dir=. 19616 test -z "$as_dir" && as_dir=.
19734 for ac_exec_ext in '' $ac_executable_extensions; do 19617 for ac_exec_ext in '' $ac_executable_extensions; do
19735 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 19618 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -19738,7 +19621,7 @@ index 8378857..7584940 100755
19738 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19621 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19739 break 2 19622 break 2
19740 fi 19623 fi
19741@@ -5205,11 +5460,15 @@ $as_echo "no" >&6; } 19624@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; }
19742 fi 19625 fi
19743 19626
19744 19627
@@ -19757,7 +19640,7 @@ index 8378857..7584940 100755
19757 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 19640 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19758 $as_echo_n "checking for $ac_word... " >&6; } 19641 $as_echo_n "checking for $ac_word... " >&6; }
19759 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 19642 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
19760@@ -5225,7 +5484,7 @@ do 19643@@ -5228,7 +5487,7 @@ do
19761 test -z "$as_dir" && as_dir=. 19644 test -z "$as_dir" && as_dir=.
19762 for ac_exec_ext in '' $ac_executable_extensions; do 19645 for ac_exec_ext in '' $ac_executable_extensions; do
19763 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 19646 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -19766,7 +19649,7 @@ index 8378857..7584940 100755
19766 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 19649 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19767 break 2 19650 break 2
19768 fi 19651 fi
19769@@ -5244,6 +5503,10 @@ else 19652@@ -5247,6 +5506,10 @@ else
19770 $as_echo "no" >&6; } 19653 $as_echo "no" >&6; }
19771 fi 19654 fi
19772 19655
@@ -19777,7 +19660,7 @@ index 8378857..7584940 100755
19777 if test "x$ac_ct_AR" = x; then 19660 if test "x$ac_ct_AR" = x; then
19778 AR="false" 19661 AR="false"
19779 else 19662 else
19780@@ -5255,16 +5518,72 @@ ac_tool_warned=yes ;; 19663@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;;
19781 esac 19664 esac
19782 AR=$ac_ct_AR 19665 AR=$ac_ct_AR
19783 fi 19666 fi
@@ -19854,7 +19737,7 @@ index 8378857..7584940 100755
19854 19737
19855 19738
19856 19739
19857@@ -5606,8 +5925,8 @@ esac 19740@@ -5609,8 +5928,8 @@ esac
19858 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 19741 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19859 19742
19860 # Transform an extracted symbol line into symbol name and symbol address 19743 # Transform an extracted symbol line into symbol name and symbol address
@@ -19865,7 +19748,7 @@ index 8378857..7584940 100755
19865 19748
19866 # Handle CRLF in mingw tool chain 19749 # Handle CRLF in mingw tool chain
19867 opt_cr= 19750 opt_cr=
19868@@ -5643,6 +5962,7 @@ for ac_symprfx in "" "_"; do 19751@@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do
19869 else 19752 else
19870 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 19753 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
19871 fi 19754 fi
@@ -19873,7 +19756,7 @@ index 8378857..7584940 100755
19873 19756
19874 # Check to see that the pipe works correctly. 19757 # Check to see that the pipe works correctly.
19875 pipe_works=no 19758 pipe_works=no
19876@@ -5684,6 +6004,18 @@ _LT_EOF 19759@@ -5687,6 +6007,18 @@ _LT_EOF
19877 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 19760 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
19878 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 19761 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
19879 cat <<_LT_EOF > conftest.$ac_ext 19762 cat <<_LT_EOF > conftest.$ac_ext
@@ -19892,7 +19775,7 @@ index 8378857..7584940 100755
19892 #ifdef __cplusplus 19775 #ifdef __cplusplus
19893 extern "C" { 19776 extern "C" {
19894 #endif 19777 #endif
19895@@ -5695,7 +6027,7 @@ _LT_EOF 19778@@ -5698,7 +6030,7 @@ _LT_EOF
19896 cat <<_LT_EOF >> conftest.$ac_ext 19779 cat <<_LT_EOF >> conftest.$ac_ext
19897 19780
19898 /* The mapping between symbol names and symbols. */ 19781 /* The mapping between symbol names and symbols. */
@@ -19901,7 +19784,7 @@ index 8378857..7584940 100755
19901 const char *name; 19784 const char *name;
19902 void *address; 19785 void *address;
19903 } 19786 }
19904@@ -5721,8 +6053,8 @@ static const void *lt_preloaded_setup() { 19787@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() {
19905 _LT_EOF 19788 _LT_EOF
19906 # Now try linking the two files. 19789 # Now try linking the two files.
19907 mv conftest.$ac_objext conftstm.$ac_objext 19790 mv conftest.$ac_objext conftstm.$ac_objext
@@ -19912,7 +19795,7 @@ index 8378857..7584940 100755
19912 LIBS="conftstm.$ac_objext" 19795 LIBS="conftstm.$ac_objext"
19913 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 19796 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
19914 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 19797 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
19915@@ -5732,8 +6064,8 @@ _LT_EOF 19798@@ -5735,8 +6067,8 @@ _LT_EOF
19916 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 19799 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
19917 pipe_works=yes 19800 pipe_works=yes
19918 fi 19801 fi
@@ -19923,7 +19806,7 @@ index 8378857..7584940 100755
19923 else 19806 else
19924 echo "cannot find nm_test_func in $nlist" >&5 19807 echo "cannot find nm_test_func in $nlist" >&5
19925 fi 19808 fi
19926@@ -5770,6 +6102,19 @@ else 19809@@ -5773,6 +6105,19 @@ else
19927 $as_echo "ok" >&6; } 19810 $as_echo "ok" >&6; }
19928 fi 19811 fi
19929 19812
@@ -19943,7 +19826,7 @@ index 8378857..7584940 100755
19943 19826
19944 19827
19945 19828
19946@@ -5790,6 +6135,41 @@ fi 19829@@ -5793,6 +6138,41 @@ fi
19947 19830
19948 19831
19949 19832
@@ -19985,7 +19868,7 @@ index 8378857..7584940 100755
19985 19868
19986 19869
19987 # Check whether --enable-libtool-lock was given. 19870 # Check whether --enable-libtool-lock was given.
19988@@ -6001,6 +6381,123 @@ esac 19871@@ -6004,6 +6384,123 @@ esac
19989 19872
19990 need_locks="$enable_libtool_lock" 19873 need_locks="$enable_libtool_lock"
19991 19874
@@ -20109,7 +19992,7 @@ index 8378857..7584940 100755
20109 19992
20110 case $host_os in 19993 case $host_os in
20111 rhapsody* | darwin*) 19994 rhapsody* | darwin*)
20112@@ -6567,6 +7064,8 @@ _LT_EOF 19995@@ -6570,6 +7067,8 @@ _LT_EOF
20113 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 19996 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
20114 echo "$AR cru libconftest.a conftest.o" >&5 19997 echo "$AR cru libconftest.a conftest.o" >&5
20115 $AR cru libconftest.a conftest.o 2>&5 19998 $AR cru libconftest.a conftest.o 2>&5
@@ -20118,7 +20001,7 @@ index 8378857..7584940 100755
20118 cat > conftest.c << _LT_EOF 20001 cat > conftest.c << _LT_EOF
20119 int main() { return 0;} 20002 int main() { return 0;}
20120 _LT_EOF 20003 _LT_EOF
20121@@ -7030,7 +7529,8 @@ fi 20004@@ -7033,7 +7532,8 @@ fi
20122 LIBTOOL_DEPS="$ltmain" 20005 LIBTOOL_DEPS="$ltmain"
20123 20006
20124 # Always use our own libtool. 20007 # Always use our own libtool.
@@ -20128,7 +20011,7 @@ index 8378857..7584940 100755
20128 20011
20129 20012
20130 20013
20131@@ -7119,7 +7619,7 @@ aix3*) 20014@@ -7122,7 +7622,7 @@ aix3*)
20132 esac 20015 esac
20133 20016
20134 # Global variables: 20017 # Global variables:
@@ -20137,7 +20020,7 @@ index 8378857..7584940 100755
20137 can_build_shared=yes 20020 can_build_shared=yes
20138 20021
20139 # All known linkers require a `.a' archive for static linking (except MSVC, 20022 # All known linkers require a `.a' archive for static linking (except MSVC,
20140@@ -7417,8 +7917,6 @@ fi 20023@@ -7420,8 +7920,6 @@ fi
20141 lt_prog_compiler_pic= 20024 lt_prog_compiler_pic=
20142 lt_prog_compiler_static= 20025 lt_prog_compiler_static=
20143 20026
@@ -20146,7 +20029,7 @@ index 8378857..7584940 100755
20146 20029
20147 if test "$GCC" = yes; then 20030 if test "$GCC" = yes; then
20148 lt_prog_compiler_wl='-Wl,' 20031 lt_prog_compiler_wl='-Wl,'
20149@@ -7584,6 +8082,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20032@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20150 lt_prog_compiler_pic='--shared' 20033 lt_prog_compiler_pic='--shared'
20151 lt_prog_compiler_static='--static' 20034 lt_prog_compiler_static='--static'
20152 ;; 20035 ;;
@@ -20159,7 +20042,7 @@ index 8378857..7584940 100755
20159 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 20042 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20160 # Portland Group compilers (*not* the Pentium gcc compiler, 20043 # Portland Group compilers (*not* the Pentium gcc compiler,
20161 # which looks to be a dead project) 20044 # which looks to be a dead project)
20162@@ -7646,7 +8150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20045@@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
20163 lt_prog_compiler_pic='-KPIC' 20046 lt_prog_compiler_pic='-KPIC'
20164 lt_prog_compiler_static='-Bstatic' 20047 lt_prog_compiler_static='-Bstatic'
20165 case $cc_basename in 20048 case $cc_basename in
@@ -20168,7 +20051,7 @@ index 8378857..7584940 100755
20168 lt_prog_compiler_wl='-Qoption ld ';; 20051 lt_prog_compiler_wl='-Qoption ld ';;
20169 *) 20052 *)
20170 lt_prog_compiler_wl='-Wl,';; 20053 lt_prog_compiler_wl='-Wl,';;
20171@@ -7703,13 +8207,17 @@ case $host_os in 20054@@ -7706,13 +8210,17 @@ case $host_os in
20172 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 20055 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
20173 ;; 20056 ;;
20174 esac 20057 esac
@@ -20192,7 +20075,7 @@ index 8378857..7584940 100755
20192 20075
20193 # 20076 #
20194 # Check to make sure the PIC flag actually works. 20077 # Check to make sure the PIC flag actually works.
20195@@ -7770,6 +8278,11 @@ fi 20078@@ -7773,6 +8281,11 @@ fi
20196 20079
20197 20080
20198 20081
@@ -20204,7 +20087,7 @@ index 8378857..7584940 100755
20204 # 20087 #
20205 # Check to make sure the static flag actually works. 20088 # Check to make sure the static flag actually works.
20206 # 20089 #
20207@@ -8120,7 +8633,8 @@ _LT_EOF 20090@@ -8123,7 +8636,8 @@ _LT_EOF
20208 allow_undefined_flag=unsupported 20091 allow_undefined_flag=unsupported
20209 always_export_symbols=no 20092 always_export_symbols=no
20210 enable_shared_with_static_runtimes=yes 20093 enable_shared_with_static_runtimes=yes
@@ -20214,7 +20097,7 @@ index 8378857..7584940 100755
20214 20097
20215 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 20098 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
20216 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 20099 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
20217@@ -8219,12 +8733,12 @@ _LT_EOF 20100@@ -8222,12 +8736,12 @@ _LT_EOF
20218 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 20101 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
20219 hardcode_libdir_flag_spec= 20102 hardcode_libdir_flag_spec=
20220 hardcode_libdir_flag_spec_ld='-rpath $libdir' 20103 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -20229,7 +20112,7 @@ index 8378857..7584940 100755
20229 fi 20112 fi
20230 ;; 20113 ;;
20231 esac 20114 esac
20232@@ -8238,8 +8752,8 @@ _LT_EOF 20115@@ -8241,8 +8755,8 @@ _LT_EOF
20233 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 20116 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
20234 wlarc= 20117 wlarc=
20235 else 20118 else
@@ -20240,7 +20123,7 @@ index 8378857..7584940 100755
20240 fi 20123 fi
20241 ;; 20124 ;;
20242 20125
20243@@ -8257,8 +8771,8 @@ _LT_EOF 20126@@ -8260,8 +8774,8 @@ _LT_EOF
20244 20127
20245 _LT_EOF 20128 _LT_EOF
20246 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 20129 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -20251,7 +20134,7 @@ index 8378857..7584940 100755
20251 else 20134 else
20252 ld_shlibs=no 20135 ld_shlibs=no
20253 fi 20136 fi
20254@@ -8304,8 +8818,8 @@ _LT_EOF 20137@@ -8307,8 +8821,8 @@ _LT_EOF
20255 20138
20256 *) 20139 *)
20257 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 20140 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -20262,7 +20145,7 @@ index 8378857..7584940 100755
20262 else 20145 else
20263 ld_shlibs=no 20146 ld_shlibs=no
20264 fi 20147 fi
20265@@ -8435,7 +8949,13 @@ _LT_EOF 20148@@ -8438,7 +8952,13 @@ _LT_EOF
20266 allow_undefined_flag='-berok' 20149 allow_undefined_flag='-berok'
20267 # Determine the default libpath from the value encoded in an 20150 # Determine the default libpath from the value encoded in an
20268 # empty executable. 20151 # empty executable.
@@ -20277,7 +20160,7 @@ index 8378857..7584940 100755
20277 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 20160 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20278 fi 20161 fi
20279 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 20162 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20280@@ -8451,22 +8971,29 @@ main () 20163@@ -8454,22 +8974,29 @@ main ()
20281 _ACEOF 20164 _ACEOF
20282 if ac_fn_c_try_link "$LINENO"; then : 20165 if ac_fn_c_try_link "$LINENO"; then :
20283 20166
@@ -20320,7 +20203,7 @@ index 8378857..7584940 100755
20320 20203
20321 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 20204 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20322 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" 20205 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"
20323@@ -8478,7 +9005,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20206@@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20324 else 20207 else
20325 # Determine the default libpath from the value encoded in an 20208 # Determine the default libpath from the value encoded in an
20326 # empty executable. 20209 # empty executable.
@@ -20335,7 +20218,7 @@ index 8378857..7584940 100755
20335 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 20218 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
20336 fi 20219 fi
20337 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 20220 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20338@@ -8494,22 +9027,29 @@ main () 20221@@ -8497,22 +9030,29 @@ main ()
20339 _ACEOF 20222 _ACEOF
20340 if ac_fn_c_try_link "$LINENO"; then : 20223 if ac_fn_c_try_link "$LINENO"; then :
20341 20224
@@ -20378,7 +20261,7 @@ index 8378857..7584940 100755
20378 20261
20379 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 20262 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20380 # Warning - without using the other run time loading flags, 20263 # Warning - without using the other run time loading flags,
20381@@ -8554,20 +9094,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20264@@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20382 # Microsoft Visual C++. 20265 # Microsoft Visual C++.
20383 # hardcode_libdir_flag_spec is actually meaningless, as there is 20266 # hardcode_libdir_flag_spec is actually meaningless, as there is
20384 # no search path for DLLs. 20267 # no search path for DLLs.
@@ -20456,7 +20339,7 @@ index 8378857..7584940 100755
20456 ;; 20339 ;;
20457 20340
20458 darwin* | rhapsody*) 20341 darwin* | rhapsody*)
20459@@ -8628,7 +9211,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20342@@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20460 20343
20461 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 20344 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20462 freebsd* | dragonfly*) 20345 freebsd* | dragonfly*)
@@ -20465,7 +20348,7 @@ index 8378857..7584940 100755
20465 hardcode_libdir_flag_spec='-R$libdir' 20348 hardcode_libdir_flag_spec='-R$libdir'
20466 hardcode_direct=yes 20349 hardcode_direct=yes
20467 hardcode_shlibpath_var=no 20350 hardcode_shlibpath_var=no
20468@@ -8636,7 +9219,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20351@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20469 20352
20470 hpux9*) 20353 hpux9*)
20471 if test "$GCC" = yes; then 20354 if test "$GCC" = yes; then
@@ -20474,7 +20357,7 @@ index 8378857..7584940 100755
20474 else 20357 else
20475 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' 20358 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'
20476 fi 20359 fi
20477@@ -8652,7 +9235,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20360@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20478 20361
20479 hpux10*) 20362 hpux10*)
20480 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 20363 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -20483,7 +20366,7 @@ index 8378857..7584940 100755
20483 else 20366 else
20484 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 20367 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20485 fi 20368 fi
20486@@ -8676,10 +9259,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20369@@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
20487 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 20370 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20488 ;; 20371 ;;
20489 ia64*) 20372 ia64*)
@@ -20496,7 +20379,7 @@ index 8378857..7584940 100755
20496 ;; 20379 ;;
20497 esac 20380 esac
20498 else 20381 else
20499@@ -8758,26 +9341,39 @@ fi 20382@@ -8761,26 +9344,39 @@ fi
20500 20383
20501 irix5* | irix6* | nonstopux*) 20384 irix5* | irix6* | nonstopux*)
20502 if test "$GCC" = yes; then 20385 if test "$GCC" = yes; then
@@ -20544,7 +20427,7 @@ index 8378857..7584940 100755
20544 else 20427 else
20545 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' 20428 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'
20546 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' 20429 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'
20547@@ -8862,7 +9458,7 @@ rm -f core conftest.err conftest.$ac_objext \ 20430@@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \
20548 osf4* | osf5*) # as osf3* with the addition of -msym flag 20431 osf4* | osf5*) # as osf3* with the addition of -msym flag
20549 if test "$GCC" = yes; then 20432 if test "$GCC" = yes; then
20550 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 20433 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -20553,7 +20436,7 @@ index 8378857..7584940 100755
20553 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 20436 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20554 else 20437 else
20555 allow_undefined_flag=' -expect_unresolved \*' 20438 allow_undefined_flag=' -expect_unresolved \*'
20556@@ -8881,9 +9477,9 @@ rm -f core conftest.err conftest.$ac_objext \ 20439@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \
20557 no_undefined_flag=' -z defs' 20440 no_undefined_flag=' -z defs'
20558 if test "$GCC" = yes; then 20441 if test "$GCC" = yes; then
20559 wlarc='${wl}' 20442 wlarc='${wl}'
@@ -20565,7 +20448,7 @@ index 8378857..7584940 100755
20565 else 20448 else
20566 case `$CC -V 2>&1` in 20449 case `$CC -V 2>&1` in
20567 *"Compilers 5.0"*) 20450 *"Compilers 5.0"*)
20568@@ -9459,8 +10055,9 @@ cygwin* | mingw* | pw32* | cegcc*) 20451@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*)
20569 need_version=no 20452 need_version=no
20570 need_lib_prefix=no 20453 need_lib_prefix=no
20571 20454
@@ -20577,7 +20460,7 @@ index 8378857..7584940 100755
20577 library_names_spec='$libname.dll.a' 20460 library_names_spec='$libname.dll.a'
20578 # DLL is installed to $(libdir)/../bin by postinstall_cmds 20461 # DLL is installed to $(libdir)/../bin by postinstall_cmds
20579 postinstall_cmds='base_file=`basename \${file}`~ 20462 postinstall_cmds='base_file=`basename \${file}`~
20580@@ -9493,13 +10090,71 @@ cygwin* | mingw* | pw32* | cegcc*) 20463@@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*)
20581 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 20464 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
20582 ;; 20465 ;;
20583 esac 20466 esac
@@ -20650,7 +20533,7 @@ index 8378857..7584940 100755
20650 # FIXME: first we should search . and the directory the executable is in 20533 # FIXME: first we should search . and the directory the executable is in
20651 shlibpath_var=PATH 20534 shlibpath_var=PATH
20652 ;; 20535 ;;
20653@@ -9591,7 +10246,7 @@ haiku*) 20536@@ -9594,7 +10249,7 @@ haiku*)
20654 soname_spec='${libname}${release}${shared_ext}$major' 20537 soname_spec='${libname}${release}${shared_ext}$major'
20655 shlibpath_var=LIBRARY_PATH 20538 shlibpath_var=LIBRARY_PATH
20656 shlibpath_overrides_runpath=yes 20539 shlibpath_overrides_runpath=yes
@@ -20659,16 +20542,16 @@ index 8378857..7584940 100755
20659 hardcode_into_libs=yes 20542 hardcode_into_libs=yes
20660 ;; 20543 ;;
20661 20544
20662@@ -10405,7 +11060,7 @@ else 20545@@ -10408,7 +11063,7 @@ else
20663 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 20546 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20664 lt_status=$lt_dlunknown 20547 lt_status=$lt_dlunknown
20665 cat > conftest.$ac_ext <<_LT_EOF 20548 cat > conftest.$ac_ext <<_LT_EOF
20666-#line 10408 "configure" 20549-#line 10411 "configure"
20667+#line $LINENO "configure" 20550+#line $LINENO "configure"
20668 #include "confdefs.h" 20551 #include "confdefs.h"
20669 20552
20670 #if HAVE_DLFCN_H 20553 #if HAVE_DLFCN_H
20671@@ -10449,10 +11104,10 @@ else 20554@@ -10452,10 +11107,10 @@ else
20672 /* When -fvisbility=hidden is used, assume the code has been annotated 20555 /* When -fvisbility=hidden is used, assume the code has been annotated
20673 correspondingly for the symbols needed. */ 20556 correspondingly for the symbols needed. */
20674 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 20557 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20681,16 +20564,16 @@ index 8378857..7584940 100755
20681 int main () 20564 int main ()
20682 { 20565 {
20683 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20566 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20684@@ -10511,7 +11166,7 @@ else 20567@@ -10514,7 +11169,7 @@ else
20685 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 20568 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20686 lt_status=$lt_dlunknown 20569 lt_status=$lt_dlunknown
20687 cat > conftest.$ac_ext <<_LT_EOF 20570 cat > conftest.$ac_ext <<_LT_EOF
20688-#line 10514 "configure" 20571-#line 10517 "configure"
20689+#line $LINENO "configure" 20572+#line $LINENO "configure"
20690 #include "confdefs.h" 20573 #include "confdefs.h"
20691 20574
20692 #if HAVE_DLFCN_H 20575 #if HAVE_DLFCN_H
20693@@ -10555,10 +11210,10 @@ else 20576@@ -10558,10 +11213,10 @@ else
20694 /* When -fvisbility=hidden is used, assume the code has been annotated 20577 /* When -fvisbility=hidden is used, assume the code has been annotated
20695 correspondingly for the symbols needed. */ 20578 correspondingly for the symbols needed. */
20696 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 20579 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -20703,7 +20586,7 @@ index 8378857..7584940 100755
20703 int main () 20586 int main ()
20704 { 20587 {
20705 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20588 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20706@@ -11990,13 +12645,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 20589@@ -11993,13 +12648,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
20707 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 20590 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20708 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 20591 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20709 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 20592 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -20724,7 +20607,7 @@ index 8378857..7584940 100755
20724 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 20607 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20725 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 20608 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20726 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 20609 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20727@@ -12011,14 +12673,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 20610@@ -12014,14 +12676,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
20728 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 20611 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20729 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 20612 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20730 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"`' 20613 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"`'
@@ -20743,7 +20626,7 @@ index 8378857..7584940 100755
20743 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 20626 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20744 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 20627 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20745 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 20628 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20746@@ -12051,12 +12716,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 20629@@ -12054,12 +12719,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
20747 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 20630 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20748 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 20631 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20749 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 20632 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -20757,7 +20640,7 @@ index 8378857..7584940 100755
20757 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 20640 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
20758 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 20641 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
20759 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 20642 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
20760@@ -12111,8 +12776,13 @@ reload_flag \ 20643@@ -12114,8 +12779,13 @@ reload_flag \
20761 OBJDUMP \ 20644 OBJDUMP \
20762 deplibs_check_method \ 20645 deplibs_check_method \
20763 file_magic_cmd \ 20646 file_magic_cmd \
@@ -20771,7 +20654,7 @@ index 8378857..7584940 100755
20771 STRIP \ 20654 STRIP \
20772 RANLIB \ 20655 RANLIB \
20773 CC \ 20656 CC \
20774@@ -12122,12 +12792,14 @@ lt_cv_sys_global_symbol_pipe \ 20657@@ -12125,12 +12795,14 @@ lt_cv_sys_global_symbol_pipe \
20775 lt_cv_sys_global_symbol_to_cdecl \ 20658 lt_cv_sys_global_symbol_to_cdecl \
20776 lt_cv_sys_global_symbol_to_c_name_address \ 20659 lt_cv_sys_global_symbol_to_c_name_address \
20777 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 20660 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -20787,7 +20670,7 @@ index 8378857..7584940 100755
20787 DSYMUTIL \ 20670 DSYMUTIL \
20788 NMEDIT \ 20671 NMEDIT \
20789 LIPO \ 20672 LIPO \
20790@@ -12143,7 +12815,6 @@ no_undefined_flag \ 20673@@ -12146,7 +12818,6 @@ no_undefined_flag \
20791 hardcode_libdir_flag_spec \ 20674 hardcode_libdir_flag_spec \
20792 hardcode_libdir_flag_spec_ld \ 20675 hardcode_libdir_flag_spec_ld \
20793 hardcode_libdir_separator \ 20676 hardcode_libdir_separator \
@@ -20795,7 +20678,7 @@ index 8378857..7584940 100755
20795 exclude_expsyms \ 20678 exclude_expsyms \
20796 include_expsyms \ 20679 include_expsyms \
20797 file_list_spec \ 20680 file_list_spec \
20798@@ -12179,6 +12850,7 @@ module_cmds \ 20681@@ -12182,6 +12853,7 @@ module_cmds \
20799 module_expsym_cmds \ 20682 module_expsym_cmds \
20800 export_symbols_cmds \ 20683 export_symbols_cmds \
20801 prelink_cmds \ 20684 prelink_cmds \
@@ -20803,7 +20686,7 @@ index 8378857..7584940 100755
20803 postinstall_cmds \ 20686 postinstall_cmds \
20804 postuninstall_cmds \ 20687 postuninstall_cmds \
20805 finish_cmds \ 20688 finish_cmds \
20806@@ -12768,7 +13440,8 @@ $as_echo X"$file" | 20689@@ -12771,7 +13443,8 @@ $as_echo X"$file" |
20807 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 20690 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
20808 # 20691 #
20809 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 20692 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -20813,7 +20696,7 @@ index 8378857..7584940 100755
20813 # Written by Gordon Matzigkeit, 1996 20696 # Written by Gordon Matzigkeit, 1996
20814 # 20697 #
20815 # This file is part of GNU Libtool. 20698 # This file is part of GNU Libtool.
20816@@ -12871,19 +13544,42 @@ SP2NL=$lt_lt_SP2NL 20699@@ -12874,19 +13547,42 @@ SP2NL=$lt_lt_SP2NL
20817 # turn newlines into spaces. 20700 # turn newlines into spaces.
20818 NL2SP=$lt_lt_NL2SP 20701 NL2SP=$lt_lt_NL2SP
20819 20702
@@ -20857,7 +20740,7 @@ index 8378857..7584940 100755
20857 # A symbol stripping program. 20740 # A symbol stripping program.
20858 STRIP=$lt_STRIP 20741 STRIP=$lt_STRIP
20859 20742
20860@@ -12913,6 +13609,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 20743@@ -12916,6 +13612,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
20861 # Transform the output of nm in a C name address pair when lib prefix is needed. 20744 # Transform the output of nm in a C name address pair when lib prefix is needed.
20862 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 20745 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20863 20746
@@ -20870,7 +20753,7 @@ index 8378857..7584940 100755
20870 # The name of the directory that contains temporary libtool files. 20753 # The name of the directory that contains temporary libtool files.
20871 objdir=$objdir 20754 objdir=$objdir
20872 20755
20873@@ -12922,6 +13624,9 @@ MAGIC_CMD=$MAGIC_CMD 20756@@ -12925,6 +13627,9 @@ MAGIC_CMD=$MAGIC_CMD
20874 # Must we lock files when doing compilation? 20757 # Must we lock files when doing compilation?
20875 need_locks=$lt_need_locks 20758 need_locks=$lt_need_locks
20876 20759
@@ -20880,7 +20763,7 @@ index 8378857..7584940 100755
20880 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 20763 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
20881 DSYMUTIL=$lt_DSYMUTIL 20764 DSYMUTIL=$lt_DSYMUTIL
20882 20765
20883@@ -13036,12 +13741,12 @@ with_gcc=$GCC 20766@@ -13039,12 +13744,12 @@ with_gcc=$GCC
20884 # Compiler flag to turn off builtin functions. 20767 # Compiler flag to turn off builtin functions.
20885 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 20768 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
20886 20769
@@ -20896,7 +20779,7 @@ index 8378857..7584940 100755
20896 # Compiler flag to prevent dynamic linking. 20779 # Compiler flag to prevent dynamic linking.
20897 link_static_flag=$lt_lt_prog_compiler_static 20780 link_static_flag=$lt_lt_prog_compiler_static
20898 20781
20899@@ -13128,9 +13833,6 @@ inherit_rpath=$inherit_rpath 20782@@ -13131,9 +13836,6 @@ inherit_rpath=$inherit_rpath
20900 # Whether libtool must link a program against all its dependency libraries. 20783 # Whether libtool must link a program against all its dependency libraries.
20901 link_all_deplibs=$link_all_deplibs 20784 link_all_deplibs=$link_all_deplibs
20902 20785
@@ -20906,7 +20789,7 @@ index 8378857..7584940 100755
20906 # Set to "yes" if exported symbols are required. 20789 # Set to "yes" if exported symbols are required.
20907 always_export_symbols=$always_export_symbols 20790 always_export_symbols=$always_export_symbols
20908 20791
20909@@ -13146,6 +13848,9 @@ include_expsyms=$lt_include_expsyms 20792@@ -13149,6 +13851,9 @@ include_expsyms=$lt_include_expsyms
20910 # Commands necessary for linking programs (against libraries) with templates. 20793 # Commands necessary for linking programs (against libraries) with templates.
20911 prelink_cmds=$lt_prelink_cmds 20794 prelink_cmds=$lt_prelink_cmds
20912 20795
@@ -20916,7 +20799,7 @@ index 8378857..7584940 100755
20916 # Specify filename containing input files. 20799 # Specify filename containing input files.
20917 file_list_spec=$lt_file_list_spec 20800 file_list_spec=$lt_file_list_spec
20918 20801
20919@@ -13178,210 +13883,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 20802@@ -13181,210 +13886,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
20920 # if finds mixed CR/LF and LF-only lines. Since sed operates in 20803 # if finds mixed CR/LF and LF-only lines. Since sed operates in
20921 # text mode, it properly converts lines to CR/LF. This bash problem 20804 # text mode, it properly converts lines to CR/LF. This bash problem
20922 # is reportedly fixed, but why not run on old versions too? 20805 # is reportedly fixed, but why not run on old versions too?
@@ -21291,5 +21174,5 @@ index 8378857..7584940 100755
21291 chmod +x "$ofile" 21174 chmod +x "$ofile"
21292 21175
21293-- 21176--
212942.7.1 211772.9.0
21295 21178
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
index cb3f83b4fb..795abf3659 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
@@ -1,7 +1,7 @@
1From 4ff9dbe13f38e4fea24fbcc9879cf7352c0561ff Mon Sep 17 00:00:00 2001 1From 9475aee8a702aa531737ec12dfd928d52951bc84 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:37:10 +0000 3Date: Mon, 2 Mar 2015 01:37:10 +0000
4Subject: [PATCH 07/14] Add the armv5e architecture to binutils 4Subject: [PATCH 07/13] Add the armv5e architecture to binutils
5 5
6Binutils has a comment that indicates it is supposed to match gcc for 6Binutils has a comment that indicates it is supposed to match gcc for
7all of the support "-march=" settings, but it was lacking the armv5e setting. 7all of the support "-march=" settings, but it was lacking the armv5e setting.
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 1 file changed, 1 insertion(+) 19 1 file changed, 1 insertion(+)
20 20
21diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c 21diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
22index 3bd4bc9..5d99921 100644 22index 73d0531..4b9e32f 100644
23--- a/gas/config/tc-arm.c 23--- a/gas/config/tc-arm.c
24+++ b/gas/config/tc-arm.c 24+++ b/gas/config/tc-arm.c
25@@ -24791,6 +24791,7 @@ static const struct arm_arch_option_table arm_archs[] = 25@@ -25421,6 +25421,7 @@ static const struct arm_arch_option_table arm_archs[] =
26 ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA), 26 ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA),
27 ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA), 27 ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA),
28 ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP), 28 ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP),
@@ -31,5 +31,5 @@ index 3bd4bc9..5d99921 100644
31 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP), 31 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP),
32 ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP), 32 ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP),
33-- 33--
342.7.1 342.9.0
35 35
diff --git a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index f8382f872e..af524ced29 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -1,7 +1,7 @@
1From cb36d94dbd521752e6444418af500e139a26eabb Mon Sep 17 00:00:00 2001 1From b2d277937d11f1ce1d581f48ff74a25822a052da 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 08/14] don't let the distro compiler point to the wrong 4Subject: [PATCH 08/13] don't let the distro compiler point to the wrong
5 installation location 5 installation location
6 6
7Thanks to RP for helping find the source code causing the issue. 7Thanks to RP for helping find the source code causing the issue.
@@ -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 7d7e2f4..1aaaf0e 100644 20index c7a4568..f766b72 100644
21--- a/libiberty/Makefile.in 21--- a/libiberty/Makefile.in
22+++ b/libiberty/Makefile.in 22+++ b/libiberty/Makefile.in
23@@ -364,7 +364,8 @@ install-strip: install 23@@ -364,7 +364,8 @@ install-strip: install
@@ -31,5 +31,5 @@ index 7d7e2f4..1aaaf0e 100644
31 if test -n "${target_header_dir}"; then \ 31 if test -n "${target_header_dir}"; then \
32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ 32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
33-- 33--
342.7.1 342.9.0
35 35
diff --git a/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
index d3f510b11a..3c83e69e43 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,7 +1,7 @@
1From 4daa841ce16ba52b717bdff9eb1dfc4f19638814 Mon Sep 17 00:00:00 2001 1From 7ab8e318659eb5d9adc758c78d084a95560b93fd 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 09/14] warn for uses of system directories when cross linking 4Subject: [PATCH 09/13] warn for uses of system directories when cross linking
5 5
62008-07-02 Joseph Myers <joseph@codesourcery.com> 62008-07-02 Joseph Myers <joseph@codesourcery.com>
7 7
@@ -63,10 +63,10 @@ Upstream-Status: Pending
63 9 files changed, 86 insertions(+) 63 9 files changed, 86 insertions(+)
64 64
65diff --git a/ld/config.in b/ld/config.in 65diff --git a/ld/config.in b/ld/config.in
66index 276fb77..35c58eb 100644 66index 2c6d698..d3cb7e8 100644
67--- a/ld/config.in 67--- a/ld/config.in
68+++ b/ld/config.in 68+++ b/ld/config.in
69@@ -14,6 +14,9 @@ 69@@ -17,6 +17,9 @@
70 language is requested. */ 70 language is requested. */
71 #undef ENABLE_NLS 71 #undef ENABLE_NLS
72 72
@@ -77,10 +77,10 @@ index 276fb77..35c58eb 100644
77 #undef EXTRA_SHLIB_EXTENSION 77 #undef EXTRA_SHLIB_EXTENSION
78 78
79diff --git a/ld/configure b/ld/configure 79diff --git a/ld/configure b/ld/configure
80index eb4f0d7..e9054b4 100755 80index 3df1149..0601c98 100755
81--- a/ld/configure 81--- a/ld/configure
82+++ b/ld/configure 82+++ b/ld/configure
83@@ -790,6 +790,7 @@ with_lib_path 83@@ -792,6 +792,7 @@ with_lib_path
84 enable_targets 84 enable_targets
85 enable_64_bit_bfd 85 enable_64_bit_bfd
86 with_sysroot 86 with_sysroot
@@ -88,7 +88,7 @@ index eb4f0d7..e9054b4 100755
88 enable_gold 88 enable_gold
89 enable_got 89 enable_got
90 enable_compressed_debug_sections 90 enable_compressed_debug_sections
91@@ -1446,6 +1447,8 @@ Optional Features: 91@@ -1449,6 +1450,8 @@ Optional Features:
92 --disable-largefile omit support for large files 92 --disable-largefile omit support for large files
93 --enable-targets alternative target configurations 93 --enable-targets alternative target configurations
94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) 94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
@@ -97,7 +97,7 @@ index eb4f0d7..e9054b4 100755
97 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 97 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
98 --enable-got=<type> GOT handling scheme (target, single, negative, 98 --enable-got=<type> GOT handling scheme (target, single, negative,
99 multigot) 99 multigot)
100@@ -16306,6 +16309,19 @@ fi 100@@ -16313,6 +16316,19 @@ fi
101 101
102 102
103 103
@@ -118,7 +118,7 @@ index eb4f0d7..e9054b4 100755
118 if test "${enable_gold+set}" = set; then : 118 if test "${enable_gold+set}" = set; then :
119 enableval=$enable_gold; case "${enableval}" in 119 enableval=$enable_gold; case "${enableval}" in
120diff --git a/ld/configure.ac b/ld/configure.ac 120diff --git a/ld/configure.ac b/ld/configure.ac
121index e28f38e..7b474e7 100644 121index d17281f..9fb3db9 100644
122--- a/ld/configure.ac 122--- a/ld/configure.ac
123+++ b/ld/configure.ac 123+++ b/ld/configure.ac
124@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) 124@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
@@ -139,10 +139,10 @@ index e28f38e..7b474e7 100644
139 dnl "install_as_default" is set to false if gold is the default linker. 139 dnl "install_as_default" is set to false if gold is the default linker.
140 dnl "installed_linker" is the installed BFD linker name. 140 dnl "installed_linker" is the installed BFD linker name.
141diff --git a/ld/ld.h b/ld/ld.h 141diff --git a/ld/ld.h b/ld/ld.h
142index d84ec4e..3476b26 100644 142index 85a48ad..a8fdddf 100644
143--- a/ld/ld.h 143--- a/ld/ld.h
144+++ b/ld/ld.h 144+++ b/ld/ld.h
145@@ -164,6 +164,14 @@ typedef struct { 145@@ -169,6 +169,14 @@ typedef struct
146 /* If set, display the target memory usage (per memory region). */ 146 /* If set, display the target memory usage (per memory region). */
147 bfd_boolean print_memory_usage; 147 bfd_boolean print_memory_usage;
148 148
@@ -158,10 +158,10 @@ index d84ec4e..3476b26 100644
158 enum endian_enum endian; 158 enum endian_enum endian;
159 159
160diff --git a/ld/ld.texinfo b/ld/ld.texinfo 160diff --git a/ld/ld.texinfo b/ld/ld.texinfo
161index 2389661..d06112b 100644 161index bc16764..838c75d 100644
162--- a/ld/ld.texinfo 162--- a/ld/ld.texinfo
163+++ b/ld/ld.texinfo 163+++ b/ld/ld.texinfo
164@@ -2338,6 +2338,18 @@ string identifying the original linked file does not change. 164@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.
165 165
166 Passing @code{none} for @var{style} disables the setting from any 166 Passing @code{none} for @var{style} disables the setting from any
167 @code{--build-id} options earlier on the command line. 167 @code{--build-id} options earlier on the command line.
@@ -181,7 +181,7 @@ index 2389661..d06112b 100644
181 181
182 @c man end 182 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c 183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index 96f9ecc..af231c0 100644 184index e397737..013727b 100644
185--- a/ld/ldfile.c 185--- a/ld/ldfile.c
186+++ b/ld/ldfile.c 186+++ b/ld/ldfile.c
187@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) 187@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
@@ -209,7 +209,7 @@ index 96f9ecc..af231c0 100644
209 209
210 /* Try to open a BFD for a lang_input_statement. */ 210 /* Try to open a BFD for a lang_input_statement. */
211diff --git a/ld/ldlex.h b/ld/ldlex.h 211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index 6f11e7b..0ca3110 100644 212index cf943e4..12cfcaa 100644
213--- a/ld/ldlex.h 213--- a/ld/ldlex.h
214+++ b/ld/ldlex.h 214+++ b/ld/ldlex.h
215@@ -144,6 +144,8 @@ enum option_values 215@@ -144,6 +144,8 @@ enum option_values
@@ -222,7 +222,7 @@ index 6f11e7b..0ca3110 100644
222 222
223 /* The initial parser states. */ 223 /* The initial parser states. */
224diff --git a/ld/ldmain.c b/ld/ldmain.c 224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index bb0b9cc..a23c56c 100644 225index e7a8dff..3ccf2af 100644
226--- a/ld/ldmain.c 226--- a/ld/ldmain.c
227+++ b/ld/ldmain.c 227+++ b/ld/ldmain.c
228@@ -257,6 +257,8 @@ main (int argc, char **argv) 228@@ -257,6 +257,8 @@ main (int argc, char **argv)
@@ -235,7 +235,7 @@ index bb0b9cc..a23c56c 100644
235 /* We initialize DEMANGLING based on the environment variable 235 /* We initialize DEMANGLING based on the environment variable
236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the 236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
237diff --git a/ld/lexsup.c b/ld/lexsup.c 237diff --git a/ld/lexsup.c b/ld/lexsup.c
238index e2fb212..a2064f1 100644 238index 6d28e91..5c9da57 100644
239--- a/ld/lexsup.c 239--- a/ld/lexsup.c
240+++ b/ld/lexsup.c 240+++ b/ld/lexsup.c
241@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] = 241@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
@@ -269,5 +269,5 @@ index e2fb212..a2064f1 100644
269 } 269 }
270 270
271-- 271--
2722.7.1 2722.9.0
273 273
diff --git a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index 4074241037..e2f6a51a39 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,7 +1,7 @@
1From bb9eb09411ddcef515f0f7ad7c29214b0766e960 Mon Sep 17 00:00:00 2001 1From 27fc7a4927ab92925a5be84217959d9f1c808ccc 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 10/14] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH 10/13] Fix rpath in libtool when sysroot is enabled
5 5
6Enabling sysroot support in libtool exposed a bug where the final 6Enabling sysroot support in libtool exposed a bug where the final
7library had an RPATH encoded into it which still pointed to the 7library had an RPATH encoded into it which still pointed to the
@@ -48,5 +48,5 @@ index 70e856e..11ee684 100644
48 if test -z "$hardcode_libdirs"; then 48 if test -z "$hardcode_libdirs"; then
49 hardcode_libdirs="$libdir" 49 hardcode_libdirs="$libdir"
50-- 50--
512.7.1 512.9.0
52 52
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
index c0d2d718a6..3fdb5eb927 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
@@ -1,7 +1,7 @@
1From af1b4ee69b4fd617b88127ed40c3ca7351a9532f Mon Sep 17 00:00:00 2001 1From 6b018e8129298dbd5b714e459ef0b3aef5bbce13 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 11/14] Change default emulation for mips64*-*-linux 4Subject: [PATCH 11/13] Change default emulation for mips64*-*-linux
5 5
6we change the default emulations to be N64 instead of N32 6we change the default emulations to be N64 instead of N32
7 7
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 8 insertions(+), 8 deletions(-) 14 2 files changed, 8 insertions(+), 8 deletions(-)
15 15
16diff --git a/bfd/config.bfd b/bfd/config.bfd 16diff --git a/bfd/config.bfd b/bfd/config.bfd
17index c5688cb..5c27b49 100644 17index b998830..ab17e72 100644
18--- a/bfd/config.bfd 18--- a/bfd/config.bfd
19+++ b/bfd/config.bfd 19+++ b/bfd/config.bfd
20@@ -1087,12 +1087,12 @@ case "${targ}" in 20@@ -1101,12 +1101,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 c5688cb..5c27b49 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 6b6bbf2..b45b1e5 100644 38index a3db909..212327c 100644
39--- a/ld/configure.tgt 39--- a/ld/configure.tgt
40+++ b/ld/configure.tgt 40+++ b/ld/configure.tgt
41@@ -509,11 +509,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks 41@@ -513,11 +513,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks
42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks 42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
43 targ_extra_emuls="elf32elmipvxworks" ;; 43 targ_extra_emuls="elf32elmipvxworks" ;;
44 mips*-*-windiss) targ_emul=elf32mipswindiss ;; 44 mips*-*-windiss) targ_emul=elf32mipswindiss ;;
@@ -55,5 +55,5 @@ index 6b6bbf2..b45b1e5 100644
55 mips*el-*-linux-*) targ_emul=elf32ltsmip 55 mips*el-*-linux-*) targ_emul=elf32ltsmip
56 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" 56 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
57-- 57--
582.7.1 582.9.0
59 59
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
index af7f12ff8b..8103347ba4 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
@@ -1,7 +1,7 @@
1From 9f967c555b3fda64af4549ae252a0fba00120529 Mon Sep 17 00:00:00 2001 1From c2e138f4ccdf8af81c18c8511c901d3deee696b5 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 12/14] Add support for Netlogic XLP 4Subject: [PATCH 12/13] Add support for Netlogic XLP
5 5
6Patch From: Nebu Philips <nphilips@netlogicmicro.com> 6Patch From: Nebu Philips <nphilips@netlogicmicro.com>
7 7
@@ -35,10 +35,10 @@ Upstream-Status: Pending
35 15 files changed, 65 insertions(+), 25 deletions(-) 35 15 files changed, 65 insertions(+), 25 deletions(-)
36 36
37diff --git a/bfd/aoutx.h b/bfd/aoutx.h 37diff --git a/bfd/aoutx.h b/bfd/aoutx.h
38index f78b910..d0d8dd3 100644 38index be0126a..4ca7e24 100644
39--- a/bfd/aoutx.h 39--- a/bfd/aoutx.h
40+++ b/bfd/aoutx.h 40+++ b/bfd/aoutx.h
41@@ -802,6 +802,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, 41@@ -812,6 +812,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
42 case bfd_mach_mipsisa64r6: 42 case bfd_mach_mipsisa64r6:
43 case bfd_mach_mips_sb1: 43 case bfd_mach_mips_sb1:
44 case bfd_mach_mips_xlr: 44 case bfd_mach_mips_xlr:
@@ -47,10 +47,10 @@ index f78b910..d0d8dd3 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 51068b9..727741f 100644 50index 96c9109..5a30d02 100644
51--- a/bfd/archures.c 51--- a/bfd/archures.c
52+++ b/bfd/archures.c 52+++ b/bfd/archures.c
53@@ -181,6 +181,7 @@ DESCRIPTION 53@@ -197,6 +197,7 @@ DESCRIPTION
54 .#define bfd_mach_mips_octeon2 6502 54 .#define bfd_mach_mips_octeon2 6502
55 .#define bfd_mach_mips_octeon3 6503 55 .#define bfd_mach_mips_octeon3 6503
56 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *} 56 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *}
@@ -59,10 +59,10 @@ index 51068b9..727741f 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 779ffbf..bf5a565 100644 62index 30513c4..5e8ed4c 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@@ -1993,6 +1993,7 @@ enum bfd_architecture 65@@ -2008,6 +2008,7 @@ enum bfd_architecture
66 #define bfd_mach_mips_octeon2 6502 66 #define bfd_mach_mips_octeon2 6502
67 #define bfd_mach_mips_octeon3 6503 67 #define bfd_mach_mips_octeon3 6503
68 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */ 68 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */
@@ -71,10 +71,10 @@ index 779ffbf..bf5a565 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 5c27b49..d553039 100644 74index ab17e72..863be89 100644
75--- a/bfd/config.bfd 75--- a/bfd/config.bfd
76+++ b/bfd/config.bfd 76+++ b/bfd/config.bfd
77@@ -1066,6 +1066,11 @@ case "${targ}" in 77@@ -1084,6 +1084,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 ;;
@@ -83,11 +83,11 @@ index 5c27b49..d553039 100644
83+ targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" 83+ targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
84+ want64=true 84+ want64=true
85+ ;; 85+ ;;
86 mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks | mips*-*-windiss) 86 mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none)
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 8a9475d..de7e5a3 100644 90index d209fb6..b6a86ae 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@@ -104,7 +104,8 @@ enum 93@@ -104,7 +104,8 @@ enum
@@ -111,10 +111,10 @@ index 8a9475d..de7e5a3 100644
111 111
112 /* The default architecture is mips:3000, but with a machine number of 112 /* The default architecture is mips:3000, but with a machine number of
113diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c 113diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
114index 1f2f4a3..700afd3 100644 114index e47276b..71c30a0 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@@ -6605,6 +6605,9 @@ _bfd_elf_mips_mach (flagword flags) 117@@ -6646,6 +6646,9 @@ _bfd_elf_mips_mach (flagword flags)
118 case E_MIPS_MACH_XLR: 118 case E_MIPS_MACH_XLR:
119 return bfd_mach_mips_xlr; 119 return bfd_mach_mips_xlr;
120 120
@@ -124,7 +124,7 @@ index 1f2f4a3..700afd3 100644
124 default: 124 default:
125 switch (flags & EF_MIPS_ARCH) 125 switch (flags & EF_MIPS_ARCH)
126 { 126 {
127@@ -11901,6 +11904,10 @@ mips_set_isa_flags (bfd *abfd) 127@@ -11949,6 +11952,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 1f2f4a3..700afd3 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@@ -13931,6 +13938,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = 138@@ -13975,6 +13982,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
139 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon }, 139 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
140 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 }, 140 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
141 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 }, 141 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 },
@@ -144,10 +144,10 @@ index 1f2f4a3..700afd3 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 d5dd46f..66810cc 100644 147index 274ddd1..d31558c 100644
148--- a/binutils/readelf.c 148--- a/binutils/readelf.c
149+++ b/binutils/readelf.c 149+++ b/binutils/readelf.c
150@@ -3140,6 +3140,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) 150@@ -3230,6 +3230,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
151 case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break; 151 case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break;
152 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; 152 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break;
153 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; 153 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break;
@@ -156,7 +156,7 @@ index d5dd46f..66810cc 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 a2d45a4..75902c0 100644 159index eb8b26b..e59dce6 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@@ -552,6 +552,7 @@ static int mips_32bitmode = 0; 162@@ -552,6 +552,7 @@ static int mips_32bitmode = 0;
@@ -175,20 +175,20 @@ index a2d45a4..75902c0 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@@ -18702,7 +18704,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = 178@@ -18858,7 +18860,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. */
182- { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR }, 182- { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR },
183+ { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLP }, 183+ { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLP },
184 184
185 /* i6400. */ 185 /* MIPS 64 Release 6 */
186 { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, 186 { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6},
187diff --git a/gas/configure b/gas/configure 187diff --git a/gas/configure b/gas/configure
188index 89f18b3..86b19ae 100755 188index 45da030..aba89f7 100755
189--- a/gas/configure 189--- a/gas/configure
190+++ b/gas/configure 190+++ b/gas/configure
191@@ -12851,6 +12851,9 @@ _ACEOF 191@@ -12914,6 +12914,9 @@ _ACEOF
192 mipsisa64r6 | mipsisa64r6el) 192 mipsisa64r6 | mipsisa64r6el)
193 mips_cpu=mips64r6 193 mips_cpu=mips64r6
194 ;; 194 ;;
@@ -199,7 +199,7 @@ index 89f18b3..86b19ae 100755
199 mips_cpu=r3900 199 mips_cpu=r3900
200 ;; 200 ;;
201diff --git a/gas/configure.tgt b/gas/configure.tgt 201diff --git a/gas/configure.tgt b/gas/configure.tgt
202index 086e0d2..2b71270 100644 202index 1b9fd99..a9f1977 100644
203--- a/gas/configure.tgt 203--- a/gas/configure.tgt
204+++ b/gas/configure.tgt 204+++ b/gas/configure.tgt
205@@ -339,7 +339,7 @@ case ${generic_target} in 205@@ -339,7 +339,7 @@ case ${generic_target} in
@@ -212,10 +212,10 @@ index 086e0d2..2b71270 100644
212 mips-*-openbsd*) fmt=elf em=tmips ;; 212 mips-*-openbsd*) fmt=elf em=tmips ;;
213 213
214diff --git a/include/elf/mips.h b/include/elf/mips.h 214diff --git a/include/elf/mips.h b/include/elf/mips.h
215index 57de3bc..9ba141d 100644 215index 7e813de..d7d72c1 100644
216--- a/include/elf/mips.h 216--- a/include/elf/mips.h
217+++ b/include/elf/mips.h 217+++ b/include/elf/mips.h
218@@ -285,6 +285,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) 218@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
219 #define E_MIPS_MACH_SB1 0x008a0000 219 #define E_MIPS_MACH_SB1 0x008a0000
220 #define E_MIPS_MACH_OCTEON 0x008b0000 220 #define E_MIPS_MACH_OCTEON 0x008b0000
221 #define E_MIPS_MACH_XLR 0x008c0000 221 #define E_MIPS_MACH_XLR 0x008c0000
@@ -224,10 +224,10 @@ index 57de3bc..9ba141d 100644
224 #define E_MIPS_MACH_OCTEON3 0x008e0000 224 #define E_MIPS_MACH_OCTEON3 0x008e0000
225 #define E_MIPS_MACH_5400 0x00910000 225 #define E_MIPS_MACH_5400 0x00910000
226diff --git a/include/opcode/mips.h b/include/opcode/mips.h 226diff --git a/include/opcode/mips.h b/include/opcode/mips.h
227index 9318fcc..9be5645 100644 227index b1d4ef6..f2c8e88 100644
228--- a/include/opcode/mips.h 228--- a/include/opcode/mips.h
229+++ b/include/opcode/mips.h 229+++ b/include/opcode/mips.h
230@@ -1228,8 +1228,10 @@ static const unsigned int mips_isa_table[] = { 230@@ -1232,8 +1232,10 @@ static const unsigned int mips_isa_table[] = {
231 #define INSN_LOONGSON_2F 0x80000000 231 #define INSN_LOONGSON_2F 0x80000000
232 /* Loongson 3A. */ 232 /* Loongson 3A. */
233 #define INSN_LOONGSON_3A 0x00000400 233 #define INSN_LOONGSON_3A 0x00000400
@@ -240,7 +240,7 @@ index 9318fcc..9be5645 100644
240 240
241 /* DSP ASE */ 241 /* DSP ASE */
242 #define ASE_DSP 0x00000001 242 #define ASE_DSP 0x00000001
243@@ -1326,6 +1328,7 @@ static const unsigned int mips_isa_table[] = { 243@@ -1331,6 +1333,7 @@ static const unsigned int mips_isa_table[] = {
244 #define CPU_OCTEON2 6502 244 #define CPU_OCTEON2 6502
245 #define CPU_OCTEON3 6503 245 #define CPU_OCTEON3 6503
246 #define CPU_XLR 887682 /* decimal 'XLR' */ 246 #define CPU_XLR 887682 /* decimal 'XLR' */
@@ -248,7 +248,7 @@ index 9318fcc..9be5645 100644
248 248
249 /* Return true if the given CPU is included in INSN_* mask MASK. */ 249 /* Return true if the given CPU is included in INSN_* mask MASK. */
250 250
251@@ -1403,6 +1406,9 @@ cpu_is_member (int cpu, unsigned int mask) 251@@ -1408,6 +1411,9 @@ cpu_is_member (int cpu, unsigned int mask)
252 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) 252 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6)
253 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); 253 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6);
254 254
@@ -259,10 +259,10 @@ index 9318fcc..9be5645 100644
259 return FALSE; 259 return FALSE;
260 } 260 }
261diff --git a/ld/configure.tgt b/ld/configure.tgt 261diff --git a/ld/configure.tgt b/ld/configure.tgt
262index b45b1e5..fb2f36a 100644 262index 212327c..212e09c 100644
263--- a/ld/configure.tgt 263--- a/ld/configure.tgt
264+++ b/ld/configure.tgt 264+++ b/ld/configure.tgt
265@@ -495,6 +495,8 @@ mips*el-sde-elf*) targ_emul=elf32ltsmip 265@@ -499,6 +499,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*)
266 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) 266 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
267 targ_emul=elf32btsmip 267 targ_emul=elf32btsmip
268 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; 268 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;;
@@ -272,7 +272,7 @@ index b45b1e5..fb2f36a 100644
272 targ_extra_emuls="elf32lr5900" 272 targ_extra_emuls="elf32lr5900"
273 targ_extra_libpath=$targ_extra_emuls ;; 273 targ_extra_libpath=$targ_extra_emuls ;;
274diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c 274diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
275index 8200920..40d9fe2 100644 275index 3f874e7..9813d0e 100644
276--- a/opcodes/mips-dis.c 276--- a/opcodes/mips-dis.c
277+++ b/opcodes/mips-dis.c 277+++ b/opcodes/mips-dis.c
278@@ -648,13 +648,11 @@ const struct mips_arch_choice mips_arch_choices[] = 278@@ -648,13 +648,11 @@ const struct mips_arch_choice mips_arch_choices[] =
@@ -295,7 +295,7 @@ index 8200920..40d9fe2 100644
295 /* This entry, mips16, is here only for ISA/processor selection; do 295 /* This entry, mips16, is here only for ISA/processor selection; do
296 not print its name. */ 296 not print its name. */
297diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c 297diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
298index 402f887..3764836 100644 298index a95eff1..99fb7bb 100644
299--- a/opcodes/mips-opc.c 299--- a/opcodes/mips-opc.c
300+++ b/opcodes/mips-opc.c 300+++ b/opcodes/mips-opc.c
301@@ -320,7 +320,8 @@ decode_mips_operand (const char *p) 301@@ -320,7 +320,8 @@ decode_mips_operand (const char *p)
@@ -308,7 +308,7 @@ index 402f887..3764836 100644
308 #define IVIRT ASE_VIRT 308 #define IVIRT ASE_VIRT
309 #define IVIRT64 ASE_VIRT64 309 #define IVIRT64 ASE_VIRT64
310 310
311@@ -957,6 +958,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 311@@ -958,6 +959,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
312 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 312 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
313 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, 313 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 },
314 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 314 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
@@ -316,7 +316,7 @@ index 402f887..3764836 100644
316 /* ctc0 is at the bottom of the table. */ 316 /* ctc0 is at the bottom of the table. */
317 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 317 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
318 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 318 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
319@@ -989,12 +991,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 319@@ -990,12 +992,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
320 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, 320 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 },
321 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, 321 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 },
322 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, 322 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 },
@@ -331,7 +331,7 @@ index 402f887..3764836 100644
331 /* dctr and dctw are used on the r5000. */ 331 /* dctr and dctw are used on the r5000. */
332 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 332 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
333 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 333 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
334@@ -1066,6 +1069,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 334@@ -1067,6 +1070,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
335 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, 335 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 },
336 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 336 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
337 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 337 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
@@ -339,7 +339,7 @@ index 402f887..3764836 100644
339 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, 339 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
340 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, 340 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
341 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, 341 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },
342@@ -1081,6 +1085,8 @@ const struct mips_opcode mips_builtin_opcodes[] = 342@@ -1082,6 +1086,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
343 /* dmfc3 is at the bottom of the table. */ 343 /* dmfc3 is at the bottom of the table. */
344 /* dmtc3 is at the bottom of the table. */ 344 /* dmtc3 is at the bottom of the table. */
345 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 345 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
@@ -348,7 +348,7 @@ index 402f887..3764836 100644
348 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 348 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
349 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, 349 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
350 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, 350 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },
351@@ -1234,9 +1240,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 351@@ -1235,9 +1241,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
352 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, 352 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
353 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, 353 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
354 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, 354 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 },
@@ -361,7 +361,7 @@ index 402f887..3764836 100644
361 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 361 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
362 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 362 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
363 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, 363 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF },
364@@ -1401,7 +1407,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 364@@ -1402,7 +1408,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
365 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, 365 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 },
366 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, 366 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 },
367 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, 367 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -370,7 +370,7 @@ index 402f887..3764836 100644
370 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, 370 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 },
371 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, 371 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 },
372 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, 372 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 },
373@@ -1446,10 +1452,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 373@@ -1447,10 +1453,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
374 /* move is at the top of the table. */ 374 /* move is at the top of the table. */
375 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, 375 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 },
376 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, 376 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 },
@@ -386,7 +386,7 @@ index 402f887..3764836 100644
386 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, 386 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 },
387 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, 387 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 },
388 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, 388 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 },
389@@ -1499,7 +1508,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 389@@ -1500,7 +1509,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
390 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, 390 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 },
391 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, 391 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 },
392 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, 392 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -395,7 +395,7 @@ index 402f887..3764836 100644
395 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 395 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
396 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, 396 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
397 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 397 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
398@@ -1936,9 +1945,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 398@@ -1937,9 +1946,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
399 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, 399 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37},
400 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, 400 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 },
401 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, 401 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 },
@@ -409,5 +409,5 @@ index 402f887..3764836 100644
409 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 409 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
410 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, 410 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },
411-- 411--
4122.7.1 4122.9.0
413 413
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch b/meta/recipes-devtools/binutils/binutils/0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch
deleted file mode 100644
index 24af1207ce..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From 9619a608528383a44ccc1637ae939b5f3e97adc5 Mon Sep 17 00:00:00 2001
2From: Sandra Loosemore <sandra@codesourcery.com>
3Date: Wed, 9 Dec 2015 16:13:58 -0800
4Subject: [PATCH 13/14] Fix GOT address computations in initial PLT entries for
5 nios2.
6
72015-12-09 Sandra Loosemore <sandra@codesourcery.com>
8
9 bfd/
10 * elf32-nios2.c (nios2_elf32_finish_dynamic_sections): Correct
11 %hiadj/%lo computations for _GLOBAL_OFFSET_TABLE_ in initial
12 PLT entries. Assert alignment requirements.
13
14Signed-off-by: Marek Vasut <marex@denx.de>
15Upstream-Status: Backport
16---
17 bfd/elf32-nios2.c | 23 ++++++++++++++++-------
18 1 file changed, 16 insertions(+), 7 deletions(-)
19
20diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
21index 6b29d8b..1c54320 100644
22--- a/bfd/elf32-nios2.c
23+++ b/bfd/elf32-nios2.c
24@@ -5383,12 +5383,17 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd,
25 + sgotplt->output_offset);
26 if (bfd_link_pic (info))
27 {
28- bfd_vma corrected = got_address - (splt->output_section->vma
29- + splt->output_offset + 4);
30+ bfd_vma got_pcrel = got_address - (splt->output_section->vma
31+ + splt->output_offset);
32+ /* Both GOT and PLT must be aligned to a 16-byte boundary
33+ for the two loads to share the %hiadj part. The 4-byte
34+ offset for nextpc is accounted for in the %lo offsets
35+ on the loads. */
36+ BFD_ASSERT ((got_pcrel & 0xf) == 0);
37 nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6);
38- nios2_elf32_install_imm16 (splt, 4, hiadj (corrected));
39- nios2_elf32_install_imm16 (splt, 12, (corrected & 0xffff) + 4);
40- nios2_elf32_install_imm16 (splt, 16, (corrected & 0xffff) + 8);
41+ nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel));
42+ nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff);
43+ nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff);
44 }
45 else
46 {
47@@ -5404,6 +5409,10 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd,
48 6 | ((res_size - (res_offset + 4)) << 6),
49 splt->contents + res_offset);
50
51+ /* The GOT must be aligned to a 16-byte boundary for the
52+ two loads to share the same %hiadj part. */
53+ BFD_ASSERT ((got_address & 0xf) == 0);
54+
55 nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7);
56 nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start));
57 nios2_elf32_install_imm16 (splt, res_size + 4,
58@@ -5411,9 +5420,9 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd,
59 nios2_elf32_install_imm16 (splt, res_size + 12,
60 hiadj (got_address));
61 nios2_elf32_install_imm16 (splt, res_size + 16,
62- (got_address & 0xffff) + 4);
63+ (got_address + 4) & 0xffff);
64 nios2_elf32_install_imm16 (splt, res_size + 20,
65- (got_address & 0xffff) + 8);
66+ (got_address + 8) & 0xffff);
67 }
68 }
69 }
70--
712.7.1
72
diff --git a/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
new file mode 100644
index 0000000000..f314d6420d
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
@@ -0,0 +1,36 @@
1From 0c04c3b626998c8e7b595381b35456428581f52a Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH 13/13] fix the incorrect assembling for ppc wait mnemonic
5
6Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
7
8Upstream-Status: Pending
9---
10 opcodes/ppc-opc.c | 3 +--
11 1 file changed, 1 insertion(+), 2 deletions(-)
12
13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
14index 8106ab7..ca4b0f3 100644
15--- a/opcodes/ppc-opc.c
16+++ b/opcodes/ppc-opc.c
17@@ -4811,7 +4811,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
18 {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
19
20 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}},
21-{"wait", X(31,30), XWC_MASK, POWER9, 0, {WC}},
22
23 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
24
25@@ -4865,7 +4864,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
26
27 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
28 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
29-{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}},
30+{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9, 0, {WC}},
31
32 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}},
33
34--
352.9.0
36
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Correct-nios2-_gp-address-computation.patch b/meta/recipes-devtools/binutils/binutils/0014-Correct-nios2-_gp-address-computation.patch
deleted file mode 100644
index 86eeded6e8..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0014-Correct-nios2-_gp-address-computation.patch
+++ /dev/null
@@ -1,106 +0,0 @@
1From 27f155fd0ab4ba954366643dbfdc3c7104933794 Mon Sep 17 00:00:00 2001
2From: Sandra Loosemore <sandra@codesourcery.com>
3Date: Sun, 27 Dec 2015 12:30:26 -0800
4Subject: [PATCH 14/14] Correct nios2 _gp address computation.
5
62015-12-27 Sandra Loosemore <sandra@codesourcery.com>
7
8 bfd/
9 * elf32-nios2.c (nios2_elf_assign_gp): Correct computation of _gp
10 address.
11 (nios2_elf32_relocate_section): Tidy code for R_NIOS2_GPREL error
12 messages.
13
14Signed-off-by: Marek Vasut <marex@denx.de>
15Upstream-Status: Backport
16---
17 bfd/elf32-nios2.c | 31 +++++++++++++++++++++----------
18 1 file changed, 21 insertions(+), 10 deletions(-)
19
20diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
21index 1c54320..babecf3 100644
22--- a/bfd/elf32-nios2.c
23+++ b/bfd/elf32-nios2.c
24@@ -3086,7 +3086,15 @@ lookup:
25 case bfd_link_hash_defined:
26 case bfd_link_hash_defweak:
27 gp_found = TRUE;
28- *pgp = lh->u.def.value;
29+ {
30+ asection *sym_sec = lh->u.def.section;
31+ bfd_vma sym_value = lh->u.def.value;
32+
33+ if (sym_sec->output_section)
34+ sym_value = (sym_value + sym_sec->output_offset
35+ + sym_sec->output_section->vma);
36+ *pgp = sym_value;
37+ }
38 break;
39 case bfd_link_hash_indirect:
40 case bfd_link_hash_warning:
41@@ -3719,7 +3727,6 @@ nios2_elf32_relocate_section (bfd *output_bfd,
42 struct elf32_nios2_link_hash_entry *eh;
43 bfd_vma relocation;
44 bfd_vma gp;
45- bfd_vma reloc_address;
46 bfd_reloc_status_type r = bfd_reloc_ok;
47 const char *name = NULL;
48 int r_type;
49@@ -3762,12 +3769,6 @@ nios2_elf32_relocate_section (bfd *output_bfd,
50 if (bfd_link_relocatable (info))
51 continue;
52
53- if (sec && sec->output_section)
54- reloc_address = (sec->output_section->vma + sec->output_offset
55- + rel->r_offset);
56- else
57- reloc_address = 0;
58-
59 if (howto)
60 {
61 switch (howto->type)
62@@ -3816,6 +3817,15 @@ nios2_elf32_relocate_section (bfd *output_bfd,
63 /* Turns an absolute address into a gp-relative address. */
64 if (!nios2_elf_assign_gp (output_bfd, &gp, info))
65 {
66+ bfd_vma reloc_address;
67+
68+ if (sec && sec->output_section)
69+ reloc_address = (sec->output_section->vma
70+ + sec->output_offset
71+ + rel->r_offset);
72+ else
73+ reloc_address = 0;
74+
75 format = _("global pointer relative relocation at address "
76 "0x%08x when _gp not defined\n");
77 sprintf (msgbuf, format, reloc_address);
78@@ -3825,7 +3835,7 @@ nios2_elf32_relocate_section (bfd *output_bfd,
79 else
80 {
81 bfd_vma symbol_address = rel->r_addend + relocation;
82- relocation = relocation + rel->r_addend - gp;
83+ relocation = symbol_address - gp;
84 rel->r_addend = 0;
85 if (((signed) relocation < -32768
86 || (signed) relocation > 32767)
87@@ -3833,6 +3843,8 @@ nios2_elf32_relocate_section (bfd *output_bfd,
88 || h->root.type == bfd_link_hash_defined
89 || h->root.type == bfd_link_hash_defweak))
90 {
91+ if (h)
92+ name = h->root.root.string;
93 format = _("Unable to reach %s (at 0x%08x) from the "
94 "global pointer (at 0x%08x) because the "
95 "offset (%d) is out of the allowed range, "
96@@ -3848,7 +3860,6 @@ nios2_elf32_relocate_section (bfd *output_bfd,
97 rel->r_offset, relocation,
98 rel->r_addend);
99 }
100-
101 break;
102 case R_NIOS2_UJMP:
103 r = nios2_elf32_do_ujmp_relocate (input_bfd, howto,
104--
1052.7.1
106
diff --git a/meta/recipes-devtools/binutils/binutils/0015-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0015-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
deleted file mode 100644
index 5aa5e318e9..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0015-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 78decbeb84fb60db4e549ad3e8eb34e030e96d39 Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
5
6Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
7
8Upstream-Status: Pending
9---
10 opcodes/ppc-opc.c | 3 +--
11 1 file changed, 1 insertion(+), 2 deletions(-)
12
13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
14index e8c92f6..a9de474 100644
15--- a/opcodes/ppc-opc.c
16+++ b/opcodes/ppc-opc.c
17@@ -4777,7 +4777,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
18 {"ldepx", X(31,29), X_MASK, E500MC|PPCA2|PPCVLE, PPCNONE, {RT, RA0, RB}},
19
20 {"waitasec", X(31,30), XRTRARB_MASK,POWER8, POWER9, {0}},
21-{"wait", X(31,30), XWC_MASK, POWER9, PPCNONE, {WC}},
22
23 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2|PPCVLE, PPCNONE, {RT, RA0, RB}},
24
25@@ -4831,7 +4830,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
26
27 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, PPCNONE, {0}},
28 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, PPCNONE, {0}},
29-{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|PPCVLE, PPCNONE, {WC}},
30+{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|PPCVLE|POWER9, PPCNONE, {WC}},
31
32 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2|PPCVLE, PPCNONE, {RA0, RB}},
33
34--
352.5.0
36
diff --git a/meta/recipes-devtools/binutils/binutils/aarch64-tls.patch b/meta/recipes-devtools/binutils/binutils/aarch64-tls.patch
deleted file mode 100644
index 6b123ac515..0000000000
--- a/meta/recipes-devtools/binutils/binutils/aarch64-tls.patch
+++ /dev/null
@@ -1,177 +0,0 @@
1Building WebKit on an aarch64 host will fail:
2
3gold/ld-new: internal error in relocate_tls, at ../../binutils/gold/aarch64.cc:7418
4
5This was a binutils bug, so backport the fix.
6
7https://sourceware.org/bugzilla/show_bug.cgi?id=19353
8
9Upstream-Status: Backport
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11
12From d21f123b0ead1806416cf0dafae12bec4cca8920 Mon Sep 17 00:00:00 2001
13From: Cary Coutant <ccoutant@gmail.com>
14Date: Mon, 11 Jan 2016 23:57:44 -0800
15Subject: [PATCH] Fix internal error when applying TLSDESC relocations with no TLS segment.
16
17gold/
18 PR gold/19353
19 * aarch64.cc (Target_aarch64::relocate_tls): Don't insist that
20 we have a TLS segment for GD-to-IE optimization.
21 * i386.cc (Target_i386::tls_gd_to_ie): Remove tls_segment parameter.
22 Adjust all calls.
23 (Target_i386::tls_desc_gd_to_ie): Likewise.
24 (Target_i386::relocate_tls): Don't insist that we have a TLS segment
25 for TLSDESC GD-to-IE optimizations.
26 * x86_64.cc (Target_x86_64::tls_gd_to_ie): Remove tls_segment parameter.
27 Adjust all calls.
28 (Target_x86_64::tls_desc_gd_to_ie): Likewise.
29 (Target_x86_64::relocate_tls): Don't insist that we have a TLS segment
30 for TLSDESC GD-to-IE optimizations.
31---
32 gold/ChangeLog | 16 ++++++++++++++++
33 gold/aarch64.cc | 6 ------
34 gold/i386.cc | 14 ++------------
35 gold/x86_64.cc | 14 ++------------
36 4 files changed, 20 insertions(+), 30 deletions(-)
37
38diff --git a/gold/aarch64.cc b/gold/aarch64.cc
39index 20f2f4f..5ad061b 100644
40--- a/gold/aarch64.cc
41+++ b/gold/aarch64.cc
42@@ -7422,12 +7422,6 @@ Target_aarch64<size, big_endian>::Relocate::relocate_tls(
43 }
44 if (tlsopt == tls::TLSOPT_TO_IE)
45 {
46- if (tls_segment == NULL)
47- {
48- gold_assert(parameters->errors()->error_count() > 0
49- || issue_undefined_symbol_error(gsym));
50- return aarch64_reloc_funcs::STATUS_BAD_RELOC;
51- }
52 return tls_desc_gd_to_ie(relinfo, target, rela, r_type,
53 view, psymval, got_entry_address,
54 address);
55diff --git a/gold/i386.cc b/gold/i386.cc
56index 82886d4..a7168a8 100644
57--- a/gold/i386.cc
58+++ b/gold/i386.cc
59@@ -668,7 +668,6 @@ class Target_i386 : public Sized_target<32, false>
60 // Do a TLS General-Dynamic to Initial-Exec transition.
61 inline void
62 tls_gd_to_ie(const Relocate_info<32, false>*, size_t relnum,
63- Output_segment* tls_segment,
64 const elfcpp::Rel<32, false>&, unsigned int r_type,
65 elfcpp::Elf_types<32>::Elf_Addr value,
66 unsigned char* view,
67@@ -687,7 +686,6 @@ class Target_i386 : public Sized_target<32, false>
68 // transition.
69 inline void
70 tls_desc_gd_to_ie(const Relocate_info<32, false>*, size_t relnum,
71- Output_segment* tls_segment,
72 const elfcpp::Rel<32, false>&, unsigned int r_type,
73 elfcpp::Elf_types<32>::Elf_Addr value,
74 unsigned char* view,
75@@ -3054,7 +3052,7 @@ Target_i386::Relocate::relocate_tls(const Relocate_info<32, false>* relinfo,
76 }
77 if (optimized_type == tls::TLSOPT_TO_IE)
78 {
79- this->tls_gd_to_ie(relinfo, relnum, tls_segment, rel, r_type,
80+ this->tls_gd_to_ie(relinfo, relnum, rel, r_type,
81 got_offset, view, view_size);
82 break;
83 }
84@@ -3116,13 +3114,7 @@ Target_i386::Relocate::relocate_tls(const Relocate_info<32, false>* relinfo,
85 }
86 if (optimized_type == tls::TLSOPT_TO_IE)
87 {
88- if (tls_segment == NULL)
89- {
90- gold_assert(parameters->errors()->error_count() > 0
91- || issue_undefined_symbol_error(gsym));
92- return;
93- }
94- this->tls_desc_gd_to_ie(relinfo, relnum, tls_segment, rel, r_type,
95+ this->tls_desc_gd_to_ie(relinfo, relnum, rel, r_type,
96 got_offset, view, view_size);
97 break;
98 }
99@@ -3354,7 +3346,6 @@ Target_i386::Relocate::tls_gd_to_le(const Relocate_info<32, false>* relinfo,
100 inline void
101 Target_i386::Relocate::tls_gd_to_ie(const Relocate_info<32, false>* relinfo,
102 size_t relnum,
103- Output_segment*,
104 const elfcpp::Rel<32, false>& rel,
105 unsigned int,
106 elfcpp::Elf_types<32>::Elf_Addr value,
107@@ -3449,7 +3440,6 @@ inline void
108 Target_i386::Relocate::tls_desc_gd_to_ie(
109 const Relocate_info<32, false>* relinfo,
110 size_t relnum,
111- Output_segment*,
112 const elfcpp::Rel<32, false>& rel,
113 unsigned int r_type,
114 elfcpp::Elf_types<32>::Elf_Addr value,
115diff --git a/gold/x86_64.cc b/gold/x86_64.cc
116index 3cfc064..4ad5afc 100644
117--- a/gold/x86_64.cc
118+++ b/gold/x86_64.cc
119@@ -816,7 +816,6 @@ class Target_x86_64 : public Sized_target<size, false>
120 // Do a TLS General-Dynamic to Initial-Exec transition.
121 inline void
122 tls_gd_to_ie(const Relocate_info<size, false>*, size_t relnum,
123- Output_segment* tls_segment,
124 const elfcpp::Rela<size, false>&, unsigned int r_type,
125 typename elfcpp::Elf_types<size>::Elf_Addr value,
126 unsigned char* view,
127@@ -835,7 +834,6 @@ class Target_x86_64 : public Sized_target<size, false>
128 // Do a TLSDESC-style General-Dynamic to Initial-Exec transition.
129 inline void
130 tls_desc_gd_to_ie(const Relocate_info<size, false>*, size_t relnum,
131- Output_segment* tls_segment,
132 const elfcpp::Rela<size, false>&, unsigned int r_type,
133 typename elfcpp::Elf_types<size>::Elf_Addr value,
134 unsigned char* view,
135@@ -3733,7 +3731,7 @@ Target_x86_64<size>::Relocate::relocate_tls(
136 if (optimized_type == tls::TLSOPT_TO_IE)
137 {
138 value = target->got_plt_section()->address() + got_offset;
139- this->tls_gd_to_ie(relinfo, relnum, tls_segment, rela, r_type,
140+ this->tls_gd_to_ie(relinfo, relnum, rela, r_type,
141 value, view, address, view_size);
142 break;
143 }
144@@ -3800,14 +3798,8 @@ Target_x86_64<size>::Relocate::relocate_tls(
145 }
146 if (optimized_type == tls::TLSOPT_TO_IE)
147 {
148- if (tls_segment == NULL)
149- {
150- gold_assert(parameters->errors()->error_count() > 0
151- || issue_undefined_symbol_error(gsym));
152- return;
153- }
154 value = target->got_plt_section()->address() + got_offset;
155- this->tls_desc_gd_to_ie(relinfo, relnum, tls_segment,
156+ this->tls_desc_gd_to_ie(relinfo, relnum,
157 rela, r_type, value, view, address,
158 view_size);
159 break;
160@@ -3973,7 +3965,6 @@ inline void
161 Target_x86_64<size>::Relocate::tls_gd_to_ie(
162 const Relocate_info<size, false>* relinfo,
163 size_t relnum,
164- Output_segment*,
165 const elfcpp::Rela<size, false>& rela,
166 unsigned int,
167 typename elfcpp::Elf_types<size>::Elf_Addr value,
168@@ -4085,7 +4076,6 @@ inline void
169 Target_x86_64<size>::Relocate::tls_desc_gd_to_ie(
170 const Relocate_info<size, false>* relinfo,
171 size_t relnum,
172- Output_segment*,
173 const elfcpp::Rela<size, false>& rela,
174 unsigned int r_type,
175 typename elfcpp::Elf_types<size>::Elf_Addr value,
176--
1771.7.1
diff --git a/meta/recipes-devtools/binutils/binutils_2.26.bb b/meta/recipes-devtools/binutils/binutils_2.27.bb
index b51437bbc3..b51437bbc3 100644
--- a/meta/recipes-devtools/binutils/binutils_2.26.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.27.bb
diff --git a/meta/recipes-devtools/strace/strace_4.13.bb b/meta/recipes-devtools/strace/strace_4.13.bb
index 1a576b3a04..51ff41eb67 100644
--- a/meta/recipes-devtools/strace/strace_4.13.bb
+++ b/meta/recipes-devtools/strace/strace_4.13.bb
@@ -45,3 +45,4 @@ do_install_ptest() {
45} 45}
46 46
47BBCLASSEXTEND = "native" 47BBCLASSEXTEND = "native"
48TOOLCHAIN = "gcc"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 06:41:49 +0000