summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-12-08 00:37:59 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 12:00:43 +0000
commitcf872ba730f96c47b9c36532b0a3a59cae98d0aa (patch)
tree93bf9b6282b7ef25a437edd753cb82664e963bf2
parent50fec7cce59e74b999ae397cbe18f6e2f8f0e893 (diff)
downloadpoky-cf872ba730f96c47b9c36532b0a3a59cae98d0aa.tar.gz
binutils: Upgrade to 2.33.1
Drop CVE patches which are already available on binutils-2_33-branch Forward port rest of the patches (From OE-Core rev: 7bcfce05045fb7e10456aa1f5301e70c178f20d7) 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.33.inc (renamed from meta/recipes-devtools/binutils/binutils-2.32.inc)16
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.32.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.32.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross_2.33.bb (renamed from meta/recipes-devtools/binutils/binutils-cross_2.32.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb (renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb)0
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch27
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch12
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch13
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch15
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch16
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch1247
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch9
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch60
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch7
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch14
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch99
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch13
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch7
-rw-r--r--meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch7
-rw-r--r--meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch15
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-12972.patch51
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-14250.patch33
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-14444.patch28
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch17
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch7
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-9071.patch165
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch68
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch119
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch49
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch37
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.33.bb (renamed from meta/recipes-devtools/binutils/binutils_2.32.bb)0
32 files changed, 719 insertions, 1434 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index c6c4cf7ce0..8bea58a98e 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
18 18
19GCCVERSION ?= "9.%" 19GCCVERSION ?= "9.%"
20SDKGCCVERSION ?= "${GCCVERSION}" 20SDKGCCVERSION ?= "${GCCVERSION}"
21BINUVERSION ?= "2.32%" 21BINUVERSION ?= "2.33%"
22GDBVERSION ?= "8.3%" 22GDBVERSION ?= "8.3%"
23GLIBCVERSION ?= "2.30%" 23GLIBCVERSION ?= "2.30%"
24LINUXLIBCVERSION ?= "5.2%" 24LINUXLIBCVERSION ?= "5.2%"
diff --git a/meta/recipes-devtools/binutils/binutils-2.32.inc b/meta/recipes-devtools/binutils/binutils-2.33.inc
index 349c3e1154..84a9ec8fc3 100644
--- a/meta/recipes-devtools/binutils/binutils-2.32.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.33.inc
@@ -16,15 +16,15 @@ def binutils_branch_version(d):
16 16
17# When upgrading to 2.33, please make sure there is no trailing .0, so 17# When upgrading to 2.33, please make sure there is no trailing .0, so
18# that upstream version check can work correctly. 18# that upstream version check can work correctly.
19PV = "2.32.0" 19PV = "2.33.1"
20CVE_VERSION = "2.32" 20CVE_VERSION = "2.33"
21BINUPV = "${@binutils_branch_version(d)}" 21BINUPV = "${@binutils_branch_version(d)}"
22#BRANCH = "binutils-${BINUPV}-branch" 22#BRANCH = "binutils-${BINUPV}-branch"
23BRANCH ?= "binutils-2_32-branch" 23BRANCH ?= "binutils-2_33-branch"
24 24
25UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" 25UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
26 26
27SRCREV ?= "b8c1f608db9ef3edd483d21a921d1fbedc71df6f" 27SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02"
28BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" 28BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git"
29SRC_URI = "\ 29SRC_URI = "\
30 ${BINUTILS_GIT_URI} \ 30 ${BINUTILS_GIT_URI} \
@@ -41,14 +41,6 @@ SRC_URI = "\
41 file://0013-Detect-64-bit-MIPS-targets.patch \ 41 file://0013-Detect-64-bit-MIPS-targets.patch \
42 file://0014-sync-with-OE-libtool-changes.patch \ 42 file://0014-sync-with-OE-libtool-changes.patch \
43 file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ 43 file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \
44 file://CVE-2019-9074.patch \
45 file://CVE-2019-9075.patch \
46 file://CVE-2019-9076.patch \
47 file://CVE-2019-9077.patch \
48 file://CVE-2019-9071.patch \
49 file://CVE-2019-12972.patch \
50 file://CVE-2019-14250.patch \
51 file://CVE-2019-14444.patch \
52 file://CVE-2019-17450.patch \ 44 file://CVE-2019-17450.patch \
53 file://CVE-2019-17451.patch \ 45 file://CVE-2019-17451.patch \
54" 46"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.32.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb
index 5dbaa03017..5dbaa03017 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.32.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.32.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb
index 07a8e7c417..07a8e7c417 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.32.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.32.bb b/meta/recipes-devtools/binutils/binutils-cross_2.33.bb
index fbd1f7d25a..fbd1f7d25a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_2.32.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.33.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb
index 37f4d6d2e9..37f4d6d2e9 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb
diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
index 6581bad119..3a9461bf4a 100644
--- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
+++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
@@ -1,7 +1,7 @@
1From 5bcd884f8af5106d0fa380c42cffe07f3c993ed2 Mon Sep 17 00:00:00 2001 1From c9aed4cb3c02715b2ba1fc70949043849f202f46 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: Sun, 8 Dec 2019 00:31:35 -0800
4Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs 4Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
5 5
6This patch will modify the ELF linker scripts so that the crosssdk 6This patch will modify the ELF linker scripts so that the crosssdk
7linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries 7linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries
@@ -18,35 +18,35 @@ 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 77ddbbc8f8..d789e77943 100755 21index cb2b081e9e..db2e9fd569 100755
22--- a/ld/genscripts.sh 22--- a/ld/genscripts.sh
23+++ b/ld/genscripts.sh 23+++ b/ld/genscripts.sh
24@@ -310,6 +310,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" 24@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
25 LD_FLAG=r 25 LD_FLAG=r
26 DATA_ALIGNMENT=${DATA_ALIGNMENT_r} 26 DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
27 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 27 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
28+PARTIAL_LINKING=" " 28+PARTIAL_LINKING=" "
29 ( echo "/* Script for ld -r: link without relocation */" 29 ( echo "/* Script for ld -r: link without relocation */"
30 . ${CUSTOMIZER_SCRIPT} 30 source_sh ${CUSTOMIZER_SCRIPT}
31 . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc 31 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
32@@ -318,10 +319,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 32@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
33 LD_FLAG=u 33 LD_FLAG=u
34 DATA_ALIGNMENT=${DATA_ALIGNMENT_u} 34 DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
35 CONSTRUCTING=" " 35 CONSTRUCTING=" "
36+PARTIAL_LINKING=" " 36+PARTIAL_LINKING=" "
37 ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" 37 ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */"
38 . ${CUSTOMIZER_SCRIPT} 38 source_sh ${CUSTOMIZER_SCRIPT}
39 . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc 39 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
40 ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu 40 ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu
41+unset PARTIAL_LINKING 41+unset PARTIAL_LINKING
42 42
43 DATA_ALIGNMENT=${DATA_ALIGNMENT_} 43 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
44 RELOCATING=" " 44 RELOCATING=" "
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 bd7584120e..8bbe052d4b 100644 46index f9f0f7d402..9e469dca86 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@@ -139,8 +139,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then 49@@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
50 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" 50 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
51 fi 51 fi
52 fi 52 fi
@@ -57,6 +57,3 @@ index bd7584120e..8bbe052d4b 100644
57 fi 57 fi
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--
612.20.1
62
diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
index 32537d4b58..1b499a4504 100644
--- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
+++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
@@ -1,8 +1,7 @@
1From 11927913560fc5a5d51af3bc5eb8ad62a86c9840 Mon Sep 17 00:00:00 2001 1From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 23:37:05 -0800 3Date: Mon, 6 Mar 2017 23:37:05 -0800
4Subject: [PATCH 02/15] binutils-cross: Do not generate linker script 4Subject: [PATCH] binutils-cross: Do not generate linker script directories
5 directories
6 5
7We don't place target libraries within ${exec_prefix}, we'd always place these 6We don't place target libraries within ${exec_prefix}, we'd always place these
8within the target sysroot within the standard library directories. Worse, the 7within the target sysroot within the standard library directories. Worse, the
@@ -23,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 1 file changed, 25 deletions(-) 22 1 file changed, 25 deletions(-)
24 23
25diff --git a/ld/genscripts.sh b/ld/genscripts.sh 24diff --git a/ld/genscripts.sh b/ld/genscripts.sh
26index d789e77943..144e2e8736 100755 25index c90f38a63c..97ad1a24d6 100755
27--- a/ld/genscripts.sh 26--- a/ld/genscripts.sh
28+++ b/ld/genscripts.sh 27+++ b/ld/genscripts.sh
29@@ -220,31 +220,6 @@ append_to_lib_path() 28@@ -235,31 +235,6 @@ append_to_lib_path()
30 fi 29 fi
31 } 30 }
32 31
@@ -58,6 +57,3 @@ index d789e77943..144e2e8736 100755
58 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then 57 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
59 libs=${NATIVE_LIB_DIRS} 58 libs=${NATIVE_LIB_DIRS}
60 if [ "x${NATIVE}" = "xyes" ] ; then 59 if [ "x${NATIVE}" = "xyes" ] ; then
61--
622.20.1
63
diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
index a30138295a..4a6b107126 100644
--- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
+++ b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
@@ -1,7 +1,7 @@
1From da3939de6fb36da2c6484f14f08a37be195d9dc3 Mon Sep 17 00:00:00 2001 1From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a 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 03/15] configure: widen the regexp for SH architectures 4Subject: [PATCH] configure: widen the regexp for SH architectures
5 5
6gprof needs to know about uclibc 6gprof needs to know about uclibc
7 7
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 6 insertions(+), 1 deletion(-) 14 2 files changed, 6 insertions(+), 1 deletion(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 3747645961..78b5240101 100755 17index 6a9719f609..001523eebf 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3861,7 +3861,7 @@ case "${target}" in 20@@ -3865,7 +3865,7 @@ case "${target}" in
21 nvptx*-*-*) 21 nvptx*-*-*)
22 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" 22 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
23 ;; 23 ;;
@@ -27,7 +27,7 @@ index 3747645961..78b5240101 100755
27 sh*-*-elf) 27 sh*-*-elf)
28 ;; 28 ;;
29diff --git a/gprof/configure b/gprof/configure 29diff --git a/gprof/configure b/gprof/configure
30index f84efaba20..ab32bab2b6 100755 30index cbb3aced46..b5eabceb77 100755
31--- a/gprof/configure 31--- a/gprof/configure
32+++ b/gprof/configure 32+++ b/gprof/configure
33@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) 33@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -42,6 +42,3 @@ index f84efaba20..ab32bab2b6 100755
42 netbsd*) 42 netbsd*)
43 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 43 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
44 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 44 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
45--
462.20.1
47
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
index f8e352228f..8318bd3899 100644
--- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
+++ b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
@@ -1,7 +1,7 @@
1From fc1ff860fd88fa2d0584bd19181c880a76331a8d Mon Sep 17 00:00:00 2001 1From a9332107872ada73e72e92872ea2998a4e1495e0 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 04/15] Point scripts location to libdir 4Subject: [PATCH] Point scripts location to libdir
5 5
6Upstream-Status: Inappropriate [debian patch] 6Upstream-Status: Inappropriate [debian patch]
7 7
@@ -12,10 +12,10 @@ 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 c2c798b4fe..d7faf19271 100644 15index ddc7a78368..6fa7bf2583 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@@ -63,7 +63,7 @@ endif
19 # We put the scripts in the directory $(scriptdir)/ldscripts. 19 # We put the scripts in the directory $(scriptdir)/ldscripts.
20 # We can't put the scripts in $(datadir) because the SEARCH_DIR 20 # We can't put the scripts in $(datadir) because the SEARCH_DIR
21 # directives need to be different for native and cross linkers. 21 # directives need to be different for native and cross linkers.
@@ -25,10 +25,10 @@ index c2c798b4fe..d7faf19271 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 fc687fc516..8b14f5236c 100644 28index fdf06128b2..5c108b9e05 100644
29--- a/ld/Makefile.in 29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in 30+++ b/ld/Makefile.in
31@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) 31@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
32 # We put the scripts in the directory $(scriptdir)/ldscripts. 32 # We put the scripts in the directory $(scriptdir)/ldscripts.
33 # We can't put the scripts in $(datadir) because the SEARCH_DIR 33 # We can't put the scripts in $(datadir) because the SEARCH_DIR
34 # directives need to be different for native and cross linkers. 34 # directives need to be different for native and cross linkers.
@@ -37,6 +37,3 @@ index fc687fc516..8b14f5236c 100644
37 BASEDIR = $(srcdir)/.. 37 BASEDIR = $(srcdir)/..
38 BFDDIR = $(BASEDIR)/bfd 38 BFDDIR = $(BASEDIR)/bfd
39 INCDIR = $(BASEDIR)/include 39 INCDIR = $(BASEDIR)/include
40--
412.20.1
42
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index 1bad53175e..214ae06344 100644
--- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,8 +1,7 @@
1From 66861bff389434e3454c7650ee29fade7a1cc5ed Mon Sep 17 00:00:00 2001 1From 65fb7a33aba30dec8690e0a237efaa3b9649154c 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 05/15] Only generate an RPATH entry if LD_RUN_PATH is not 4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
5 empty
6 5
7for cases where -rpath isn't specified. debian (#151024) 6for cases where -rpath isn't specified. debian (#151024)
8 7
@@ -14,20 +13,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 ld/emultempl/elf32.em | 4 ++++ 13 ld/emultempl/elf32.em | 4 ++++
15 1 file changed, 4 insertions(+) 14 1 file changed, 4 insertions(+)
16 15
17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
18index f4f7ad6b4e..cfd787ff28 100644
19--- a/ld/emultempl/elf32.em 16--- a/ld/emultempl/elf32.em
20+++ b/ld/emultempl/elf32.em 17+++ b/ld/emultempl/elf32.em
21@@ -1471,6 +1471,8 @@ fragment <<EOF 18@@ -1470,6 +1470,8 @@ fragment <<EOF
22 && command_line.rpath == NULL) 19 && command_line.rpath == NULL)
23 { 20 {
24 path = (const char *) getenv ("LD_RUN_PATH"); 21 path = (const char *) getenv ("LD_RUN_PATH");
25+ if ((path) && (strlen (path) == 0)) 22+ if ((path) && (strlen (path) == 0))
26+ path = NULL; 23+ path = NULL;
27 if (path 24 if (path
28 && gld${EMULATION_NAME}_search_needed (path, &n, force)) 25 && gld${EMULATION_NAME}_search_needed (path, &n, force))
29 break; 26 break;
30@@ -1746,6 +1748,8 @@ gld${EMULATION_NAME}_before_allocation (void) 27@@ -1745,6 +1747,8 @@ gld${EMULATION_NAME}_before_allocation (
31 rpath = command_line.rpath; 28 rpath = command_line.rpath;
32 if (rpath == NULL) 29 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH"); 30 rpath = (const char *) getenv ("LD_RUN_PATH");
@@ -36,6 +33,3 @@ index f4f7ad6b4e..cfd787ff28 100644
36 33
37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) 34 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) 35 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
39--
402.20.1
41
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 f0c4d251bd..135eb8877c 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 418527a2971d4e77a87085400397090d89fc5c94 Mon Sep 17 00:00:00 2001 1From 9cebc65f222dfd4e0b3072b53f46ffcf328e9fe4 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/15] Use libtool 2.4 4Subject: [PATCH] Use libtool 2.4
5 5
6get libtool sysroot support 6get libtool sysroot support
7 7
@@ -25,8 +25,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 zlib/configure | 1320 ++++++++++++++----- 25 zlib/configure | 1320 ++++++++++++++-----
26 14 files changed, 9940 insertions(+), 3705 deletions(-) 26 14 files changed, 9940 insertions(+), 3705 deletions(-)
27 27
28diff --git a/bfd/configure b/bfd/configure
29index 17960684f8..925fb401f2 100755
30--- a/bfd/configure 28--- a/bfd/configure
31+++ b/bfd/configure 29+++ b/bfd/configure
32@@ -704,6 +704,9 @@ OTOOL 30@@ -704,6 +704,9 @@ OTOOL
@@ -76,7 +74,7 @@ index 17960684f8..925fb401f2 100755
76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 74 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
77 ECHO='print -r --' 75 ECHO='print -r --'
78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 76 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
79@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 77@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u
80 # Try some XSI features 78 # Try some XSI features
81 xsi_shell=no 79 xsi_shell=no
82 ( _lt_dummy="a/b/c" 80 ( _lt_dummy="a/b/c"
@@ -212,7 +210,7 @@ index 17960684f8..925fb401f2 100755
212 file_magic_cmd=$lt_cv_file_magic_cmd 210 file_magic_cmd=$lt_cv_file_magic_cmd
213 deplibs_check_method=$lt_cv_deplibs_check_method 211 deplibs_check_method=$lt_cv_deplibs_check_method
214 test -z "$deplibs_check_method" && deplibs_check_method=unknown 212 test -z "$deplibs_check_method" && deplibs_check_method=unknown
215@@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 213@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli
216 214
217 215
218 216
@@ -226,8 +224,6 @@ index 17960684f8..925fb401f2 100755
226+ 224+
227+ 225+
228+ 226+
229
230
231 if test -n "$ac_tool_prefix"; then 227 if test -n "$ac_tool_prefix"; then
232- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 228- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
233-set dummy ${ac_tool_prefix}ar; ac_word=$2 229-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -449,7 +445,7 @@ index 17960684f8..925fb401f2 100755
449+ 445+
450+ 446+
451+ 447+
452+ 448
453+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 449+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
454+$as_echo_n "checking for archiver @FILE support... " >&6; } 450+$as_echo_n "checking for archiver @FILE support... " >&6; }
455+if ${lt_cv_ar_at_file+:} false; then : 451+if ${lt_cv_ar_at_file+:} false; then :
@@ -458,7 +454,7 @@ index 17960684f8..925fb401f2 100755
458+ lt_cv_ar_at_file=no 454+ lt_cv_ar_at_file=no
459+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 455+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
460+/* end confdefs.h. */ 456+/* end confdefs.h. */
461+ 457
462+int 458+int
463+main () 459+main ()
464+{ 460+{
@@ -491,11 +487,11 @@ index 17960684f8..925fb401f2 100755
491 487
492+fi 488+fi
493+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 489+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
494 490+
495+fi 491+fi
496+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 492+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
497+$as_echo "$lt_cv_ar_at_file" >&6; } 493+$as_echo "$lt_cv_ar_at_file" >&6; }
498 494+
499+if test "x$lt_cv_ar_at_file" = xno; then 495+if test "x$lt_cv_ar_at_file" = xno; then
500+ archiver_list_spec= 496+ archiver_list_spec=
501+else 497+else
@@ -551,7 +547,7 @@ index 17960684f8..925fb401f2 100755
551 const char *name; 547 const char *name;
552 void *address; 548 void *address;
553 } 549 }
554@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() { 550@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup()
555 _LT_EOF 551 _LT_EOF
556 # Now try linking the two files. 552 # Now try linking the two files.
557 mv conftest.$ac_objext conftstm.$ac_objext 553 mv conftest.$ac_objext conftstm.$ac_objext
@@ -573,7 +569,7 @@ index 17960684f8..925fb401f2 100755
573 else 569 else
574 echo "cannot find nm_test_func in $nlist" >&5 570 echo "cannot find nm_test_func in $nlist" >&5
575 fi 571 fi
576@@ -7426,6 +7757,16 @@ else 572@@ -7426,6 +7757,20 @@ else
577 $as_echo "ok" >&6; } 573 $as_echo "ok" >&6; }
578 fi 574 fi
579 575
@@ -587,20 +583,17 @@ index 17960684f8..925fb401f2 100755
587+ 583+
588+ 584+
589+ 585+
586+
587+
588+
589+
590 590
591 591
592 592
593@@ -7442,6 +7783,45 @@ fi 593@@ -7445,6 +7790,41 @@ fi
594 594
595 595
596 596
597+
598+
599+
600+
601+
602+
603+
604+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 597+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
605+$as_echo_n "checking for sysroot... " >&6; } 598+$as_echo_n "checking for sysroot... " >&6; }
606+ 599+
@@ -633,9 +626,12 @@ index 17960684f8..925fb401f2 100755
633+ 626+
634+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 627+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
635+$as_echo "${lt_sysroot:-no}" >&6; } 628+$as_echo "${lt_sysroot:-no}" >&6; }
629+
630+
631+
636 632
637 633
638 634 # Check whether --enable-libtool-lock was given.
639@@ -7653,6 +8033,123 @@ esac 635@@ -7653,6 +8033,123 @@ esac
640 636
641 need_locks="$enable_libtool_lock" 637 need_locks="$enable_libtool_lock"
@@ -797,7 +793,7 @@ index 17960684f8..925fb401f2 100755
797 793
798 if test "$GCC" = yes; then 794 if test "$GCC" = yes; then
799 lt_prog_compiler_wl='-Wl,' 795 lt_prog_compiler_wl='-Wl,'
800@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 796@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio
801 lt_prog_compiler_pic='--shared' 797 lt_prog_compiler_pic='--shared'
802 lt_prog_compiler_static='--static' 798 lt_prog_compiler_static='--static'
803 ;; 799 ;;
@@ -810,7 +806,7 @@ index 17960684f8..925fb401f2 100755
810 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 806 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
811 # Portland Group compilers (*not* the Pentium gcc compiler, 807 # Portland Group compilers (*not* the Pentium gcc compiler,
812 # which looks to be a dead project) 808 # which looks to be a dead project)
813@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 809@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio
814 lt_prog_compiler_pic='-KPIC' 810 lt_prog_compiler_pic='-KPIC'
815 lt_prog_compiler_static='-Bstatic' 811 lt_prog_compiler_static='-Bstatic'
816 case $cc_basename in 812 case $cc_basename in
@@ -971,7 +967,7 @@ index 17960684f8..925fb401f2 100755
971 967
972 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 968 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
973 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 969 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
974@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 970@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp
975 else 971 else
976 # Determine the default libpath from the value encoded in an 972 # Determine the default libpath from the value encoded in an
977 # empty executable. 973 # empty executable.
@@ -1029,7 +1025,7 @@ index 17960684f8..925fb401f2 100755
1029 1025
1030 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1026 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1031 # Warning - without using the other run time loading flags, 1027 # Warning - without using the other run time loading flags,
1032@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1028@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp
1033 # Microsoft Visual C++. 1029 # Microsoft Visual C++.
1034 # hardcode_libdir_flag_spec is actually meaningless, as there is 1030 # hardcode_libdir_flag_spec is actually meaningless, as there is
1035 # no search path for DLLs. 1031 # no search path for DLLs.
@@ -1107,7 +1103,7 @@ index 17960684f8..925fb401f2 100755
1107 ;; 1103 ;;
1108 1104
1109 darwin* | rhapsody*) 1105 darwin* | rhapsody*)
1110@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1106@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp
1111 1107
1112 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1108 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1113 freebsd* | dragonfly*) 1109 freebsd* | dragonfly*)
@@ -1116,7 +1112,7 @@ index 17960684f8..925fb401f2 100755
1116 hardcode_libdir_flag_spec='-R$libdir' 1112 hardcode_libdir_flag_spec='-R$libdir'
1117 hardcode_direct=yes 1113 hardcode_direct=yes
1118 hardcode_shlibpath_var=no 1114 hardcode_shlibpath_var=no
1119@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1115@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp
1120 1116
1121 hpux9*) 1117 hpux9*)
1122 if test "$GCC" = yes; then 1118 if test "$GCC" = yes; then
@@ -1125,7 +1121,7 @@ index 17960684f8..925fb401f2 100755
1125 else 1121 else
1126 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 1122 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1127 fi 1123 fi
1128@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1124@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp
1129 1125
1130 hpux10*) 1126 hpux10*)
1131 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1127 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -1134,7 +1130,7 @@ index 17960684f8..925fb401f2 100755
1134 else 1130 else
1135 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1131 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1136 fi 1132 fi
1137@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1133@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp
1138 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1134 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1139 ;; 1135 ;;
1140 ia64*) 1136 ia64*)
@@ -1192,7 +1188,7 @@ index 17960684f8..925fb401f2 100755
1192 else 1188 else
1193 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 1189 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
1194 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 1190 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
1195@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1191@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj
1196 osf4* | osf5*) # as osf3* with the addition of -msym flag 1192 osf4* | osf5*) # as osf3* with the addition of -msym flag
1197 if test "$GCC" = yes; then 1193 if test "$GCC" = yes; then
1198 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1194 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -1201,7 +1197,7 @@ index 17960684f8..925fb401f2 100755
1201 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1197 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1202 else 1198 else
1203 allow_undefined_flag=' -expect_unresolved \*' 1199 allow_undefined_flag=' -expect_unresolved \*'
1204@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1200@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj
1205 no_undefined_flag=' -z defs' 1201 no_undefined_flag=' -z defs'
1206 if test "$GCC" = yes; then 1202 if test "$GCC" = yes; then
1207 wlarc='${wl}' 1203 wlarc='${wl}'
@@ -1351,7 +1347,7 @@ index 17960684f8..925fb401f2 100755
1351 int main () 1347 int main ()
1352 { 1348 {
1353 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1349 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1354@@ -14525,7 +15180,7 @@ SHARED_LDFLAGS= 1350@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS=
1355 if test "$enable_shared" = "yes"; then 1351 if test "$enable_shared" = "yes"; then
1356 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1352 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1357 if test -n "$x"; then 1353 if test -n "$x"; then
@@ -1359,8 +1355,8 @@ index 17960684f8..925fb401f2 100755
1359+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" 1355+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1360 fi 1356 fi
1361 1357
1362 # More hacks to build DLLs on Windows. 1358 case "${host}" in
1363@@ -17142,13 +17797,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1359@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
1364 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1360 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1365 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1361 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1366 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1362 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -1381,7 +1377,7 @@ index 17960684f8..925fb401f2 100755
1381 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1377 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1382 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1378 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1383 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1379 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1384@@ -17163,14 +17825,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1380@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
1385 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1381 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
1386 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1382 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
1387 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 1383 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -1400,7 +1396,7 @@ index 17960684f8..925fb401f2 100755
1400 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1396 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1401 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1397 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1402 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1398 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1403@@ -17203,12 +17868,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1399@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
1404 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1400 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1405 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1401 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1406 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1402 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -1414,7 +1410,7 @@ index 17960684f8..925fb401f2 100755
1414 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1410 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1415 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1411 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1416 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1412 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1417@@ -17263,8 +17928,13 @@ reload_flag \ 1413@@ -17298,8 +17963,13 @@ reload_flag \
1418 OBJDUMP \ 1414 OBJDUMP \
1419 deplibs_check_method \ 1415 deplibs_check_method \
1420 file_magic_cmd \ 1416 file_magic_cmd \
@@ -1428,7 +1424,7 @@ index 17960684f8..925fb401f2 100755
1428 STRIP \ 1424 STRIP \
1429 RANLIB \ 1425 RANLIB \
1430 CC \ 1426 CC \
1431@@ -17274,12 +17944,14 @@ lt_cv_sys_global_symbol_pipe \ 1427@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \
1432 lt_cv_sys_global_symbol_to_cdecl \ 1428 lt_cv_sys_global_symbol_to_cdecl \
1433 lt_cv_sys_global_symbol_to_c_name_address \ 1429 lt_cv_sys_global_symbol_to_c_name_address \
1434 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1430 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -1444,7 +1440,7 @@ index 17960684f8..925fb401f2 100755
1444 DSYMUTIL \ 1440 DSYMUTIL \
1445 NMEDIT \ 1441 NMEDIT \
1446 LIPO \ 1442 LIPO \
1447@@ -17295,7 +17967,6 @@ no_undefined_flag \ 1443@@ -17330,7 +18002,6 @@ no_undefined_flag \
1448 hardcode_libdir_flag_spec \ 1444 hardcode_libdir_flag_spec \
1449 hardcode_libdir_flag_spec_ld \ 1445 hardcode_libdir_flag_spec_ld \
1450 hardcode_libdir_separator \ 1446 hardcode_libdir_separator \
@@ -1452,7 +1448,7 @@ index 17960684f8..925fb401f2 100755
1452 exclude_expsyms \ 1448 exclude_expsyms \
1453 include_expsyms \ 1449 include_expsyms \
1454 file_list_spec \ 1450 file_list_spec \
1455@@ -17331,6 +18002,7 @@ module_cmds \ 1451@@ -17366,6 +18037,7 @@ module_cmds \
1456 module_expsym_cmds \ 1452 module_expsym_cmds \
1457 export_symbols_cmds \ 1453 export_symbols_cmds \
1458 prelink_cmds \ 1454 prelink_cmds \
@@ -1460,7 +1456,7 @@ index 17960684f8..925fb401f2 100755
1460 postinstall_cmds \ 1456 postinstall_cmds \
1461 postuninstall_cmds \ 1457 postuninstall_cmds \
1462 finish_cmds \ 1458 finish_cmds \
1463@@ -18119,7 +18791,8 @@ $as_echo X"$file" | 1459@@ -18154,7 +18826,8 @@ $as_echo X"$file" |
1464 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1460 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1465 # 1461 #
1466 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1462 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -1470,7 +1466,7 @@ index 17960684f8..925fb401f2 100755
1470 # Written by Gordon Matzigkeit, 1996 1466 # Written by Gordon Matzigkeit, 1996
1471 # 1467 #
1472 # This file is part of GNU Libtool. 1468 # This file is part of GNU Libtool.
1473@@ -18222,19 +18895,42 @@ SP2NL=$lt_lt_SP2NL 1469@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL
1474 # turn newlines into spaces. 1470 # turn newlines into spaces.
1475 NL2SP=$lt_lt_NL2SP 1471 NL2SP=$lt_lt_NL2SP
1476 1472
@@ -1514,7 +1510,7 @@ index 17960684f8..925fb401f2 100755
1514 # A symbol stripping program. 1510 # A symbol stripping program.
1515 STRIP=$lt_STRIP 1511 STRIP=$lt_STRIP
1516 1512
1517@@ -18264,6 +18960,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1513@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c
1518 # Transform the output of nm in a C name address pair when lib prefix is needed. 1514 # Transform the output of nm in a C name address pair when lib prefix is needed.
1519 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1515 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1520 1516
@@ -1527,7 +1523,7 @@ index 17960684f8..925fb401f2 100755
1527 # The name of the directory that contains temporary libtool files. 1523 # The name of the directory that contains temporary libtool files.
1528 objdir=$objdir 1524 objdir=$objdir
1529 1525
1530@@ -18273,6 +18975,9 @@ MAGIC_CMD=$MAGIC_CMD 1526@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD
1531 # Must we lock files when doing compilation? 1527 # Must we lock files when doing compilation?
1532 need_locks=$lt_need_locks 1528 need_locks=$lt_need_locks
1533 1529
@@ -1537,7 +1533,7 @@ index 17960684f8..925fb401f2 100755
1537 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1533 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1538 DSYMUTIL=$lt_DSYMUTIL 1534 DSYMUTIL=$lt_DSYMUTIL
1539 1535
1540@@ -18387,12 +19092,12 @@ with_gcc=$GCC 1536@@ -18422,12 +19127,12 @@ with_gcc=$GCC
1541 # Compiler flag to turn off builtin functions. 1537 # Compiler flag to turn off builtin functions.
1542 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1538 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1543 1539
@@ -1553,7 +1549,7 @@ index 17960684f8..925fb401f2 100755
1553 # Compiler flag to prevent dynamic linking. 1549 # Compiler flag to prevent dynamic linking.
1554 link_static_flag=$lt_lt_prog_compiler_static 1550 link_static_flag=$lt_lt_prog_compiler_static
1555 1551
1556@@ -18479,9 +19184,6 @@ inherit_rpath=$inherit_rpath 1552@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath
1557 # Whether libtool must link a program against all its dependency libraries. 1553 # Whether libtool must link a program against all its dependency libraries.
1558 link_all_deplibs=$link_all_deplibs 1554 link_all_deplibs=$link_all_deplibs
1559 1555
@@ -1563,7 +1559,7 @@ index 17960684f8..925fb401f2 100755
1563 # Set to "yes" if exported symbols are required. 1559 # Set to "yes" if exported symbols are required.
1564 always_export_symbols=$always_export_symbols 1560 always_export_symbols=$always_export_symbols
1565 1561
1566@@ -18497,6 +19199,9 @@ include_expsyms=$lt_include_expsyms 1562@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms
1567 # Commands necessary for linking programs (against libraries) with templates. 1563 # Commands necessary for linking programs (against libraries) with templates.
1568 prelink_cmds=$lt_prelink_cmds 1564 prelink_cmds=$lt_prelink_cmds
1569 1565
@@ -1573,7 +1569,7 @@ index 17960684f8..925fb401f2 100755
1573 # Specify filename containing input files. 1569 # Specify filename containing input files.
1574 file_list_spec=$lt_file_list_spec 1570 file_list_spec=$lt_file_list_spec
1575 1571
1576@@ -18529,210 +19234,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1572@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1577 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1573 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1578 # text mode, it properly converts lines to CR/LF. This bash problem 1574 # text mode, it properly converts lines to CR/LF. This bash problem
1579 # is reportedly fixed, but why not run on old versions too? 1575 # is reportedly fixed, but why not run on old versions too?
@@ -1775,15 +1771,9 @@ index 17960684f8..925fb401f2 100755
1775-_LT_EOF 1771-_LT_EOF
1776- ;; 1772- ;;
1777- esac 1773- esac
1778-
1779-
1780- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1781- || (rm -f "$cfgfile"; exit 1)
1782-
1783- mv -f "$cfgfile" "$ofile" ||
1784+ sed '$q' "$ltmain" >> "$cfgfile" \ 1774+ sed '$q' "$ltmain" >> "$cfgfile" \
1785+ || (rm -f "$cfgfile"; exit 1) 1775+ || (rm -f "$cfgfile"; exit 1)
1786+ 1776
1787+ if test x"$xsi_shell" = xyes; then 1777+ if test x"$xsi_shell" = xyes; then
1788+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 1778+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1789+func_dirname ()\ 1779+func_dirname ()\
@@ -1941,17 +1931,18 @@ index 17960684f8..925fb401f2 100755
1941+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 1931+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1942+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 1932+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1943+fi 1933+fi
1944+ 1934
1945+ 1935- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1936- || (rm -f "$cfgfile"; exit 1)
1937
1938- mv -f "$cfgfile" "$ofile" ||
1946+ mv -f "$cfgfile" "$ofile" || 1939+ mv -f "$cfgfile" "$ofile" ||
1947 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 1940 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1948 chmod +x "$ofile" 1941 chmod +x "$ofile"
1949 1942
1950diff --git a/bfd/configure.ac b/bfd/configure.ac
1951index eda38ea086..7cdf9c8146 100644
1952--- a/bfd/configure.ac 1943--- a/bfd/configure.ac
1953+++ b/bfd/configure.ac 1944+++ b/bfd/configure.ac
1954@@ -293,7 +293,7 @@ changequote(,)dnl 1945@@ -290,7 +290,7 @@ changequote(,)dnl
1955 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1946 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1956 changequote([,])dnl 1947 changequote([,])dnl
1957 if test -n "$x"; then 1948 if test -n "$x"; then
@@ -1959,9 +1950,7 @@ index eda38ea086..7cdf9c8146 100644
1959+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" 1950+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1960 fi 1951 fi
1961 1952
1962 # More hacks to build DLLs on Windows. 1953 case "${host}" in
1963diff --git a/binutils/configure b/binutils/configure
1964index 38128e146d..c74f797996 100755
1965--- a/binutils/configure 1954--- a/binutils/configure
1966+++ b/binutils/configure 1955+++ b/binutils/configure
1967@@ -689,8 +689,11 @@ OTOOL 1956@@ -689,8 +689,11 @@ OTOOL
@@ -2013,7 +2002,7 @@ index 38128e146d..c74f797996 100755
2013 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2002 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2014 ECHO='print -r --' 2003 ECHO='print -r --'
2015 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2004 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2016@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2005@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u
2017 # Try some XSI features 2006 # Try some XSI features
2018 xsi_shell=no 2007 xsi_shell=no
2019 ( _lt_dummy="a/b/c" 2008 ( _lt_dummy="a/b/c"
@@ -2149,7 +2138,7 @@ index 38128e146d..c74f797996 100755
2149 file_magic_cmd=$lt_cv_file_magic_cmd 2138 file_magic_cmd=$lt_cv_file_magic_cmd
2150 deplibs_check_method=$lt_cv_deplibs_check_method 2139 deplibs_check_method=$lt_cv_deplibs_check_method
2151 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2140 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2152@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2141@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli
2153 2142
2154 2143
2155 2144
@@ -2489,7 +2478,7 @@ index 38128e146d..c74f797996 100755
2489 const char *name; 2478 const char *name;
2490 void *address; 2479 void *address;
2491 } 2480 }
2492@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() { 2481@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup()
2493 _LT_EOF 2482 _LT_EOF
2494 # Now try linking the two files. 2483 # Now try linking the two files.
2495 mv conftest.$ac_objext conftstm.$ac_objext 2484 mv conftest.$ac_objext conftstm.$ac_objext
@@ -2511,7 +2500,7 @@ index 38128e146d..c74f797996 100755
2511 else 2500 else
2512 echo "cannot find nm_test_func in $nlist" >&5 2501 echo "cannot find nm_test_func in $nlist" >&5
2513 fi 2502 fi
2514@@ -7190,6 +7521,21 @@ else 2503@@ -7190,6 +7521,18 @@ else
2515 $as_echo "ok" >&6; } 2504 $as_echo "ok" >&6; }
2516 fi 2505 fi
2517 2506
@@ -2527,18 +2516,13 @@ index 38128e146d..c74f797996 100755
2527+ 2516+
2528+ 2517+
2529+ 2518+
2530+
2531+
2532+
2533 2519
2534 2520
2535 2521
2536@@ -7206,6 +7552,40 @@ fi 2522@@ -7211,6 +7554,43 @@ fi
2537 2523
2538 2524
2539 2525
2540+
2541+
2542+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 2526+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2543+$as_echo_n "checking for sysroot... " >&6; } 2527+$as_echo_n "checking for sysroot... " >&6; }
2544+ 2528+
@@ -2571,9 +2555,14 @@ index 38128e146d..c74f797996 100755
2571+ 2555+
2572+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 2556+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2573+$as_echo "${lt_sysroot:-no}" >&6; } 2557+$as_echo "${lt_sysroot:-no}" >&6; }
2574 2558+
2575 2559+
2576 2560+
2561+
2562+
2563 # Check whether --enable-libtool-lock was given.
2564 if test "${enable_libtool_lock+set}" = set; then :
2565 enableval=$enable_libtool_lock;
2577@@ -7417,6 +7797,123 @@ esac 2566@@ -7417,6 +7797,123 @@ esac
2578 2567
2579 need_locks="$enable_libtool_lock" 2568 need_locks="$enable_libtool_lock"
@@ -2735,7 +2724,7 @@ index 38128e146d..c74f797996 100755
2735 2724
2736 if test "$GCC" = yes; then 2725 if test "$GCC" = yes; then
2737 lt_prog_compiler_wl='-Wl,' 2726 lt_prog_compiler_wl='-Wl,'
2738@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2727@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio
2739 lt_prog_compiler_pic='--shared' 2728 lt_prog_compiler_pic='--shared'
2740 lt_prog_compiler_static='--static' 2729 lt_prog_compiler_static='--static'
2741 ;; 2730 ;;
@@ -2748,7 +2737,7 @@ index 38128e146d..c74f797996 100755
2748 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2737 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2749 # Portland Group compilers (*not* the Pentium gcc compiler, 2738 # Portland Group compilers (*not* the Pentium gcc compiler,
2750 # which looks to be a dead project) 2739 # which looks to be a dead project)
2751@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2740@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio
2752 lt_prog_compiler_pic='-KPIC' 2741 lt_prog_compiler_pic='-KPIC'
2753 lt_prog_compiler_static='-Bstatic' 2742 lt_prog_compiler_static='-Bstatic'
2754 case $cc_basename in 2743 case $cc_basename in
@@ -2909,7 +2898,7 @@ index 38128e146d..c74f797996 100755
2909 2898
2910 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2899 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2911 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 2900 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2912@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2901@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp
2913 else 2902 else
2914 # Determine the default libpath from the value encoded in an 2903 # Determine the default libpath from the value encoded in an
2915 # empty executable. 2904 # empty executable.
@@ -2967,7 +2956,7 @@ index 38128e146d..c74f797996 100755
2967 2956
2968 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2957 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2969 # Warning - without using the other run time loading flags, 2958 # Warning - without using the other run time loading flags,
2970@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2959@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp
2971 # Microsoft Visual C++. 2960 # Microsoft Visual C++.
2972 # hardcode_libdir_flag_spec is actually meaningless, as there is 2961 # hardcode_libdir_flag_spec is actually meaningless, as there is
2973 # no search path for DLLs. 2962 # no search path for DLLs.
@@ -3045,7 +3034,7 @@ index 38128e146d..c74f797996 100755
3045 ;; 3034 ;;
3046 3035
3047 darwin* | rhapsody*) 3036 darwin* | rhapsody*)
3048@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3037@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp
3049 3038
3050 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3039 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3051 freebsd* | dragonfly*) 3040 freebsd* | dragonfly*)
@@ -3054,7 +3043,7 @@ index 38128e146d..c74f797996 100755
3054 hardcode_libdir_flag_spec='-R$libdir' 3043 hardcode_libdir_flag_spec='-R$libdir'
3055 hardcode_direct=yes 3044 hardcode_direct=yes
3056 hardcode_shlibpath_var=no 3045 hardcode_shlibpath_var=no
3057@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3046@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp
3058 3047
3059 hpux9*) 3048 hpux9*)
3060 if test "$GCC" = yes; then 3049 if test "$GCC" = yes; then
@@ -3063,7 +3052,7 @@ index 38128e146d..c74f797996 100755
3063 else 3052 else
3064 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 3053 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
3065 fi 3054 fi
3066@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3055@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp
3067 3056
3068 hpux10*) 3057 hpux10*)
3069 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3058 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -3072,7 +3061,7 @@ index 38128e146d..c74f797996 100755
3072 else 3061 else
3073 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3062 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3074 fi 3063 fi
3075@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3064@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp
3076 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3065 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3077 ;; 3066 ;;
3078 ia64*) 3067 ia64*)
@@ -3130,7 +3119,7 @@ index 38128e146d..c74f797996 100755
3130 else 3119 else
3131 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 3120 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
3132 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 3121 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
3133@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3122@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj
3134 osf4* | osf5*) # as osf3* with the addition of -msym flag 3123 osf4* | osf5*) # as osf3* with the addition of -msym flag
3135 if test "$GCC" = yes; then 3124 if test "$GCC" = yes; then
3136 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3125 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3139,7 +3128,7 @@ index 38128e146d..c74f797996 100755
3139 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3128 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3140 else 3129 else
3141 allow_undefined_flag=' -expect_unresolved \*' 3130 allow_undefined_flag=' -expect_unresolved \*'
3142@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3131@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj
3143 no_undefined_flag=' -z defs' 3132 no_undefined_flag=' -z defs'
3144 if test "$GCC" = yes; then 3133 if test "$GCC" = yes; then
3145 wlarc='${wl}' 3134 wlarc='${wl}'
@@ -3289,7 +3278,7 @@ index 38128e146d..c74f797996 100755
3289 int main () 3278 int main ()
3290 { 3279 {
3291 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3280 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3292@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3281@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
3293 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3282 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3294 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3283 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3295 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3284 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -3310,7 +3299,7 @@ index 38128e146d..c74f797996 100755
3310 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3299 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3311 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3300 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3312 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3301 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3313@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3302@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
3314 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3303 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
3315 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3304 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
3316 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 3305 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -3329,7 +3318,7 @@ index 38128e146d..c74f797996 100755
3329 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3318 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3330 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3319 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3331 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3320 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3332@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3321@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
3333 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3322 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3334 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3323 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3335 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3324 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -3443,7 +3432,7 @@ index 38128e146d..c74f797996 100755
3443 # A symbol stripping program. 3432 # A symbol stripping program.
3444 STRIP=$lt_STRIP 3433 STRIP=$lt_STRIP
3445 3434
3446@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3435@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c
3447 # Transform the output of nm in a C name address pair when lib prefix is needed. 3436 # Transform the output of nm in a C name address pair when lib prefix is needed.
3448 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3437 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3449 3438
@@ -3704,15 +3693,9 @@ index 38128e146d..c74f797996 100755
3704-_LT_EOF 3693-_LT_EOF
3705- ;; 3694- ;;
3706- esac 3695- esac
3707-
3708-
3709- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3710- || (rm -f "$cfgfile"; exit 1)
3711-
3712- mv -f "$cfgfile" "$ofile" ||
3713+ sed '$q' "$ltmain" >> "$cfgfile" \ 3696+ sed '$q' "$ltmain" >> "$cfgfile" \
3714+ || (rm -f "$cfgfile"; exit 1) 3697+ || (rm -f "$cfgfile"; exit 1)
3715+ 3698
3716+ if test x"$xsi_shell" = xyes; then 3699+ if test x"$xsi_shell" = xyes; then
3717+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 3700+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3718+func_dirname ()\ 3701+func_dirname ()\
@@ -3870,14 +3853,15 @@ index 38128e146d..c74f797996 100755
3870+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 3853+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3871+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 3854+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3872+fi 3855+fi
3873+ 3856
3874+ 3857- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3858- || (rm -f "$cfgfile"; exit 1)
3859
3860- mv -f "$cfgfile" "$ofile" ||
3875+ mv -f "$cfgfile" "$ofile" || 3861+ mv -f "$cfgfile" "$ofile" ||
3876 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 3862 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3877 chmod +x "$ofile" 3863 chmod +x "$ofile"
3878 3864
3879diff --git a/gas/configure b/gas/configure
3880index 64de9f19da..a82fde7fa8 100755
3881--- a/gas/configure 3865--- a/gas/configure
3882+++ b/gas/configure 3866+++ b/gas/configure
3883@@ -681,8 +681,11 @@ OTOOL 3867@@ -681,8 +681,11 @@ OTOOL
@@ -3900,7 +3884,7 @@ index 64de9f19da..a82fde7fa8 100755
3900 enable_libtool_lock 3884 enable_libtool_lock
3901 enable_plugins 3885 enable_plugins
3902 enable_largefile 3886 enable_largefile
3903@@ -1487,6 +1491,8 @@ Optional Packages: 3887@@ -1490,6 +1494,8 @@ Optional Packages:
3904 --with-pic try to use only PIC/non-PIC objects [default=use 3888 --with-pic try to use only PIC/non-PIC objects [default=use
3905 both] 3889 both]
3906 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 3890 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -3909,7 +3893,7 @@ index 64de9f19da..a82fde7fa8 100755
3909 --with-cpu=CPU default cpu variant is CPU (currently only supported 3893 --with-cpu=CPU default cpu variant is CPU (currently only supported
3910 on ARC) 3894 on ARC)
3911 --with-system-zlib use installed libz 3895 --with-system-zlib use installed libz
3912@@ -5274,8 +5280,8 @@ esac 3896@@ -5277,8 +5283,8 @@ esac
3913 3897
3914 3898
3915 3899
@@ -3920,7 +3904,7 @@ index 64de9f19da..a82fde7fa8 100755
3920 3904
3921 3905
3922 3906
3923@@ -5315,7 +5321,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 3907@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3924 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3908 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3925 $as_echo_n "checking how to print strings... " >&6; } 3909 $as_echo_n "checking how to print strings... " >&6; }
3926 # Test print first, because it will be a builtin if present. 3910 # Test print first, because it will be a builtin if present.
@@ -3929,7 +3913,7 @@ index 64de9f19da..a82fde7fa8 100755
3929 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3913 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3930 ECHO='print -r --' 3914 ECHO='print -r --'
3931 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3915 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3932@@ -6001,8 +6007,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 3916@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u
3933 # Try some XSI features 3917 # Try some XSI features
3934 xsi_shell=no 3918 xsi_shell=no
3935 ( _lt_dummy="a/b/c" 3919 ( _lt_dummy="a/b/c"
@@ -3940,7 +3924,7 @@ index 64de9f19da..a82fde7fa8 100755
3940 && eval 'test $(( 1 + 1 )) -eq 2 \ 3924 && eval 'test $(( 1 + 1 )) -eq 2 \
3941 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3925 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3942 && xsi_shell=yes 3926 && xsi_shell=yes
3943@@ -6051,6 +6057,80 @@ esac 3927@@ -6054,6 +6060,80 @@ esac
3944 3928
3945 3929
3946 3930
@@ -4021,7 +4005,7 @@ index 64de9f19da..a82fde7fa8 100755
4021 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4005 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4022 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4006 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4023 if ${lt_cv_ld_reload_flag+:} false; then : 4007 if ${lt_cv_ld_reload_flag+:} false; then :
4024@@ -6067,6 +6147,11 @@ case $reload_flag in 4008@@ -6070,6 +6150,11 @@ case $reload_flag in
4025 esac 4009 esac
4026 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4010 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4027 case $host_os in 4011 case $host_os in
@@ -4033,7 +4017,7 @@ index 64de9f19da..a82fde7fa8 100755
4033 darwin*) 4017 darwin*)
4034 if test "$GCC" = yes; then 4018 if test "$GCC" = yes; then
4035 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4019 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4036@@ -6235,7 +6320,8 @@ mingw* | pw32*) 4020@@ -6238,7 +6323,8 @@ mingw* | pw32*)
4037 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4021 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4038 lt_cv_file_magic_cmd='func_win32_libid' 4022 lt_cv_file_magic_cmd='func_win32_libid'
4039 else 4023 else
@@ -4043,7 +4027,7 @@ index 64de9f19da..a82fde7fa8 100755
4043 lt_cv_file_magic_cmd='$OBJDUMP -f' 4027 lt_cv_file_magic_cmd='$OBJDUMP -f'
4044 fi 4028 fi
4045 ;; 4029 ;;
4046@@ -6389,6 +6475,21 @@ esac 4030@@ -6392,6 +6478,21 @@ esac
4047 fi 4031 fi
4048 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4032 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4049 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4033 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -4065,7 +4049,7 @@ index 64de9f19da..a82fde7fa8 100755
4065 file_magic_cmd=$lt_cv_file_magic_cmd 4049 file_magic_cmd=$lt_cv_file_magic_cmd
4066 deplibs_check_method=$lt_cv_deplibs_check_method 4050 deplibs_check_method=$lt_cv_deplibs_check_method
4067 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4051 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4068@@ -6404,9 +6505,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4052@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli
4069 4053
4070 4054
4071 4055
@@ -4079,7 +4063,9 @@ index 64de9f19da..a82fde7fa8 100755
4079+ 4063+
4080+ 4064+
4081+ 4065+
4082+if test -n "$ac_tool_prefix"; then 4066 if test -n "$ac_tool_prefix"; then
4067- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4068-set dummy ${ac_tool_prefix}ar; ac_word=$2
4083+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 4069+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4084+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 4070+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4085+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4071+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -4220,9 +4206,7 @@ index 64de9f19da..a82fde7fa8 100755
4220+ 4206+
4221+ 4207+
4222+ 4208+
4223 if test -n "$ac_tool_prefix"; then 4209+if test -n "$ac_tool_prefix"; then
4224- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4225-set dummy ${ac_tool_prefix}ar; ac_word=$2
4226+ for ac_prog in ar 4210+ for ac_prog in ar
4227+ do 4211+ do
4228+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 4212+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -4230,7 +4214,7 @@ index 64de9f19da..a82fde7fa8 100755
4230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4214 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4231 $as_echo_n "checking for $ac_word... " >&6; } 4215 $as_echo_n "checking for $ac_word... " >&6; }
4232 if ${ac_cv_prog_AR+:} false; then : 4216 if ${ac_cv_prog_AR+:} false; then :
4233@@ -6422,7 +6676,7 @@ do 4217@@ -6425,7 +6679,7 @@ do
4234 test -z "$as_dir" && as_dir=. 4218 test -z "$as_dir" && as_dir=.
4235 for ac_exec_ext in '' $ac_executable_extensions; do 4219 for ac_exec_ext in '' $ac_executable_extensions; do
4236 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4220 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4239,7 +4223,7 @@ index 64de9f19da..a82fde7fa8 100755
4239 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4223 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4240 break 2 4224 break 2
4241 fi 4225 fi
4242@@ -6442,11 +6696,15 @@ $as_echo "no" >&6; } 4226@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; }
4243 fi 4227 fi
4244 4228
4245 4229
@@ -4258,7 +4242,7 @@ index 64de9f19da..a82fde7fa8 100755
4258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4242 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4259 $as_echo_n "checking for $ac_word... " >&6; } 4243 $as_echo_n "checking for $ac_word... " >&6; }
4260 if ${ac_cv_prog_ac_ct_AR+:} false; then : 4244 if ${ac_cv_prog_ac_ct_AR+:} false; then :
4261@@ -6462,7 +6720,7 @@ do 4245@@ -6465,7 +6723,7 @@ do
4262 test -z "$as_dir" && as_dir=. 4246 test -z "$as_dir" && as_dir=.
4263 for ac_exec_ext in '' $ac_executable_extensions; do 4247 for ac_exec_ext in '' $ac_executable_extensions; do
4264 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4248 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -4267,7 +4251,7 @@ index 64de9f19da..a82fde7fa8 100755
4267 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4251 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4268 break 2 4252 break 2
4269 fi 4253 fi
4270@@ -6481,6 +6739,10 @@ else 4254@@ -6484,6 +6742,10 @@ else
4271 $as_echo "no" >&6; } 4255 $as_echo "no" >&6; }
4272 fi 4256 fi
4273 4257
@@ -4278,7 +4262,7 @@ index 64de9f19da..a82fde7fa8 100755
4278 if test "x$ac_ct_AR" = x; then 4262 if test "x$ac_ct_AR" = x; then
4279 AR="false" 4263 AR="false"
4280 else 4264 else
4281@@ -6492,12 +6754,10 @@ ac_tool_warned=yes ;; 4265@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;;
4282 esac 4266 esac
4283 AR=$ac_ct_AR 4267 AR=$ac_ct_AR
4284 fi 4268 fi
@@ -4293,7 +4277,7 @@ index 64de9f19da..a82fde7fa8 100755
4293 4277
4294 4278
4295 4279
4296@@ -6509,6 +6769,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 4280@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4297 4281
4298 4282
4299 4283
@@ -4358,7 +4342,7 @@ index 64de9f19da..a82fde7fa8 100755
4358 if test -n "$ac_tool_prefix"; then 4342 if test -n "$ac_tool_prefix"; then
4359 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 4343 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4360 set dummy ${ac_tool_prefix}strip; ac_word=$2 4344 set dummy ${ac_tool_prefix}strip; ac_word=$2
4361@@ -6843,8 +7161,8 @@ esac 4345@@ -6846,8 +7164,8 @@ esac
4362 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4346 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4363 4347
4364 # Transform an extracted symbol line into symbol name and symbol address 4348 # Transform an extracted symbol line into symbol name and symbol address
@@ -4369,7 +4353,7 @@ index 64de9f19da..a82fde7fa8 100755
4369 4353
4370 # Handle CRLF in mingw tool chain 4354 # Handle CRLF in mingw tool chain
4371 opt_cr= 4355 opt_cr=
4372@@ -6880,6 +7198,7 @@ for ac_symprfx in "" "_"; do 4356@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do
4373 else 4357 else
4374 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4358 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4375 fi 4359 fi
@@ -4377,7 +4361,7 @@ index 64de9f19da..a82fde7fa8 100755
4377 4361
4378 # Check to see that the pipe works correctly. 4362 # Check to see that the pipe works correctly.
4379 pipe_works=no 4363 pipe_works=no
4380@@ -6921,6 +7240,18 @@ _LT_EOF 4364@@ -6924,6 +7243,18 @@ _LT_EOF
4381 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4365 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4382 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4366 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4383 cat <<_LT_EOF > conftest.$ac_ext 4367 cat <<_LT_EOF > conftest.$ac_ext
@@ -4396,7 +4380,7 @@ index 64de9f19da..a82fde7fa8 100755
4396 #ifdef __cplusplus 4380 #ifdef __cplusplus
4397 extern "C" { 4381 extern "C" {
4398 #endif 4382 #endif
4399@@ -6932,7 +7263,7 @@ _LT_EOF 4383@@ -6935,7 +7266,7 @@ _LT_EOF
4400 cat <<_LT_EOF >> conftest.$ac_ext 4384 cat <<_LT_EOF >> conftest.$ac_ext
4401 4385
4402 /* The mapping between symbol names and symbols. */ 4386 /* The mapping between symbol names and symbols. */
@@ -4405,7 +4389,7 @@ index 64de9f19da..a82fde7fa8 100755
4405 const char *name; 4389 const char *name;
4406 void *address; 4390 void *address;
4407 } 4391 }
4408@@ -6958,8 +7289,8 @@ static const void *lt_preloaded_setup() { 4392@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup()
4409 _LT_EOF 4393 _LT_EOF
4410 # Now try linking the two files. 4394 # Now try linking the two files.
4411 mv conftest.$ac_objext conftstm.$ac_objext 4395 mv conftest.$ac_objext conftstm.$ac_objext
@@ -4416,7 +4400,7 @@ index 64de9f19da..a82fde7fa8 100755
4416 LIBS="conftstm.$ac_objext" 4400 LIBS="conftstm.$ac_objext"
4417 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4401 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4418 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4402 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4419@@ -6969,8 +7300,8 @@ _LT_EOF 4403@@ -6972,8 +7303,8 @@ _LT_EOF
4420 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4404 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4421 pipe_works=yes 4405 pipe_works=yes
4422 fi 4406 fi
@@ -4427,7 +4411,7 @@ index 64de9f19da..a82fde7fa8 100755
4427 else 4411 else
4428 echo "cannot find nm_test_func in $nlist" >&5 4412 echo "cannot find nm_test_func in $nlist" >&5
4429 fi 4413 fi
4430@@ -7007,6 +7338,21 @@ else 4414@@ -7010,6 +7341,19 @@ else
4431 $as_echo "ok" >&6; } 4415 $as_echo "ok" >&6; }
4432 fi 4416 fi
4433 4417
@@ -4444,17 +4428,13 @@ index 64de9f19da..a82fde7fa8 100755
4444+ 4428+
4445+ 4429+
4446+ 4430+
4447+
4448+
4449 4431
4450 4432
4451 4433
4452@@ -7023,6 +7369,40 @@ fi 4434@@ -7030,6 +7374,42 @@ fi
4453 4435
4454 4436
4455 4437
4456+
4457+
4458+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 4438+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4459+$as_echo_n "checking for sysroot... " >&6; } 4439+$as_echo_n "checking for sysroot... " >&6; }
4460+ 4440+
@@ -4487,10 +4467,14 @@ index 64de9f19da..a82fde7fa8 100755
4487+ 4467+
4488+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 4468+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4489+$as_echo "${lt_sysroot:-no}" >&6; } 4469+$as_echo "${lt_sysroot:-no}" >&6; }
4470+
4471+
4472+
4473+
4490 4474
4491 4475 # Check whether --enable-libtool-lock was given.
4492 4476 if test "${enable_libtool_lock+set}" = set; then :
4493@@ -7234,6 +7614,123 @@ esac 4477@@ -7237,6 +7617,123 @@ esac
4494 4478
4495 need_locks="$enable_libtool_lock" 4479 need_locks="$enable_libtool_lock"
4496 4480
@@ -4614,7 +4598,7 @@ index 64de9f19da..a82fde7fa8 100755
4614 4598
4615 case $host_os in 4599 case $host_os in
4616 rhapsody* | darwin*) 4600 rhapsody* | darwin*)
4617@@ -7797,6 +8294,8 @@ _LT_EOF 4601@@ -7800,6 +8297,8 @@ _LT_EOF
4618 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4602 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4619 echo "$AR cru libconftest.a conftest.o" >&5 4603 echo "$AR cru libconftest.a conftest.o" >&5
4620 $AR cru libconftest.a conftest.o 2>&5 4604 $AR cru libconftest.a conftest.o 2>&5
@@ -4623,7 +4607,7 @@ index 64de9f19da..a82fde7fa8 100755
4623 cat > conftest.c << _LT_EOF 4607 cat > conftest.c << _LT_EOF
4624 int main() { return 0;} 4608 int main() { return 0;}
4625 _LT_EOF 4609 _LT_EOF
4626@@ -7992,7 +8491,8 @@ fi 4610@@ -7995,7 +8494,8 @@ fi
4627 LIBTOOL_DEPS="$ltmain" 4611 LIBTOOL_DEPS="$ltmain"
4628 4612
4629 # Always use our own libtool. 4613 # Always use our own libtool.
@@ -4633,7 +4617,7 @@ index 64de9f19da..a82fde7fa8 100755
4633 4617
4634 4618
4635 4619
4636@@ -8081,7 +8581,7 @@ aix3*) 4620@@ -8084,7 +8584,7 @@ aix3*)
4637 esac 4621 esac
4638 4622
4639 # Global variables: 4623 # Global variables:
@@ -4642,7 +4626,7 @@ index 64de9f19da..a82fde7fa8 100755
4642 can_build_shared=yes 4626 can_build_shared=yes
4643 4627
4644 # All known linkers require a `.a' archive for static linking (except MSVC, 4628 # All known linkers require a `.a' archive for static linking (except MSVC,
4645@@ -8379,8 +8879,6 @@ fi 4629@@ -8382,8 +8882,6 @@ fi
4646 lt_prog_compiler_pic= 4630 lt_prog_compiler_pic=
4647 lt_prog_compiler_static= 4631 lt_prog_compiler_static=
4648 4632
@@ -4651,7 +4635,7 @@ index 64de9f19da..a82fde7fa8 100755
4651 4635
4652 if test "$GCC" = yes; then 4636 if test "$GCC" = yes; then
4653 lt_prog_compiler_wl='-Wl,' 4637 lt_prog_compiler_wl='-Wl,'
4654@@ -8546,6 +9044,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4638@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio
4655 lt_prog_compiler_pic='--shared' 4639 lt_prog_compiler_pic='--shared'
4656 lt_prog_compiler_static='--static' 4640 lt_prog_compiler_static='--static'
4657 ;; 4641 ;;
@@ -4664,7 +4648,7 @@ index 64de9f19da..a82fde7fa8 100755
4664 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4648 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4665 # Portland Group compilers (*not* the Pentium gcc compiler, 4649 # Portland Group compilers (*not* the Pentium gcc compiler,
4666 # which looks to be a dead project) 4650 # which looks to be a dead project)
4667@@ -8608,7 +9112,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4651@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio
4668 lt_prog_compiler_pic='-KPIC' 4652 lt_prog_compiler_pic='-KPIC'
4669 lt_prog_compiler_static='-Bstatic' 4653 lt_prog_compiler_static='-Bstatic'
4670 case $cc_basename in 4654 case $cc_basename in
@@ -4673,7 +4657,7 @@ index 64de9f19da..a82fde7fa8 100755
4673 lt_prog_compiler_wl='-Qoption ld ';; 4657 lt_prog_compiler_wl='-Qoption ld ';;
4674 *) 4658 *)
4675 lt_prog_compiler_wl='-Wl,';; 4659 lt_prog_compiler_wl='-Wl,';;
4676@@ -8665,13 +9169,17 @@ case $host_os in 4660@@ -8668,13 +9172,17 @@ case $host_os in
4677 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4661 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4678 ;; 4662 ;;
4679 esac 4663 esac
@@ -4697,7 +4681,7 @@ index 64de9f19da..a82fde7fa8 100755
4697 4681
4698 # 4682 #
4699 # Check to make sure the PIC flag actually works. 4683 # Check to make sure the PIC flag actually works.
4700@@ -8732,6 +9240,11 @@ fi 4684@@ -8735,6 +9243,11 @@ fi
4701 4685
4702 4686
4703 4687
@@ -4709,7 +4693,7 @@ index 64de9f19da..a82fde7fa8 100755
4709 # 4693 #
4710 # Check to make sure the static flag actually works. 4694 # Check to make sure the static flag actually works.
4711 # 4695 #
4712@@ -9082,7 +9595,8 @@ _LT_EOF 4696@@ -9085,7 +9598,8 @@ _LT_EOF
4713 allow_undefined_flag=unsupported 4697 allow_undefined_flag=unsupported
4714 always_export_symbols=no 4698 always_export_symbols=no
4715 enable_shared_with_static_runtimes=yes 4699 enable_shared_with_static_runtimes=yes
@@ -4719,7 +4703,7 @@ index 64de9f19da..a82fde7fa8 100755
4719 4703
4720 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4704 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4721 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4705 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4722@@ -9181,12 +9695,12 @@ _LT_EOF 4706@@ -9184,12 +9698,12 @@ _LT_EOF
4723 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4707 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4724 hardcode_libdir_flag_spec= 4708 hardcode_libdir_flag_spec=
4725 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4709 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -4734,7 +4718,7 @@ index 64de9f19da..a82fde7fa8 100755
4734 fi 4718 fi
4735 ;; 4719 ;;
4736 esac 4720 esac
4737@@ -9200,8 +9714,8 @@ _LT_EOF 4721@@ -9203,8 +9717,8 @@ _LT_EOF
4738 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4722 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4739 wlarc= 4723 wlarc=
4740 else 4724 else
@@ -4745,7 +4729,7 @@ index 64de9f19da..a82fde7fa8 100755
4745 fi 4729 fi
4746 ;; 4730 ;;
4747 4731
4748@@ -9219,8 +9733,8 @@ _LT_EOF 4732@@ -9222,8 +9736,8 @@ _LT_EOF
4749 4733
4750 _LT_EOF 4734 _LT_EOF
4751 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4735 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4756,7 +4740,7 @@ index 64de9f19da..a82fde7fa8 100755
4756 else 4740 else
4757 ld_shlibs=no 4741 ld_shlibs=no
4758 fi 4742 fi
4759@@ -9266,8 +9780,8 @@ _LT_EOF 4743@@ -9269,8 +9783,8 @@ _LT_EOF
4760 4744
4761 *) 4745 *)
4762 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4746 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -4767,7 +4751,7 @@ index 64de9f19da..a82fde7fa8 100755
4767 else 4751 else
4768 ld_shlibs=no 4752 ld_shlibs=no
4769 fi 4753 fi
4770@@ -9397,7 +9911,13 @@ _LT_EOF 4754@@ -9400,7 +9914,13 @@ _LT_EOF
4771 allow_undefined_flag='-berok' 4755 allow_undefined_flag='-berok'
4772 # Determine the default libpath from the value encoded in an 4756 # Determine the default libpath from the value encoded in an
4773 # empty executable. 4757 # empty executable.
@@ -4782,7 +4766,7 @@ index 64de9f19da..a82fde7fa8 100755
4782 /* end confdefs.h. */ 4766 /* end confdefs.h. */
4783 4767
4784 int 4768 int
4785@@ -9410,22 +9930,29 @@ main () 4769@@ -9413,22 +9933,29 @@ main ()
4786 _ACEOF 4770 _ACEOF
4787 if ac_fn_c_try_link "$LINENO"; then : 4771 if ac_fn_c_try_link "$LINENO"; then :
4788 4772
@@ -4825,7 +4809,7 @@ index 64de9f19da..a82fde7fa8 100755
4825 4809
4826 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4810 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4827 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 4811 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4828@@ -9437,7 +9964,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4812@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp
4829 else 4813 else
4830 # Determine the default libpath from the value encoded in an 4814 # Determine the default libpath from the value encoded in an
4831 # empty executable. 4815 # empty executable.
@@ -4840,7 +4824,7 @@ index 64de9f19da..a82fde7fa8 100755
4840 /* end confdefs.h. */ 4824 /* end confdefs.h. */
4841 4825
4842 int 4826 int
4843@@ -9450,22 +9983,29 @@ main () 4827@@ -9453,22 +9986,29 @@ main ()
4844 _ACEOF 4828 _ACEOF
4845 if ac_fn_c_try_link "$LINENO"; then : 4829 if ac_fn_c_try_link "$LINENO"; then :
4846 4830
@@ -4883,7 +4867,7 @@ index 64de9f19da..a82fde7fa8 100755
4883 4867
4884 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4868 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4885 # Warning - without using the other run time loading flags, 4869 # Warning - without using the other run time loading flags,
4886@@ -9510,20 +10050,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4870@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp
4887 # Microsoft Visual C++. 4871 # Microsoft Visual C++.
4888 # hardcode_libdir_flag_spec is actually meaningless, as there is 4872 # hardcode_libdir_flag_spec is actually meaningless, as there is
4889 # no search path for DLLs. 4873 # no search path for DLLs.
@@ -4961,7 +4945,7 @@ index 64de9f19da..a82fde7fa8 100755
4961 ;; 4945 ;;
4962 4946
4963 darwin* | rhapsody*) 4947 darwin* | rhapsody*)
4964@@ -9584,7 +10167,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4948@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp
4965 4949
4966 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4950 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4967 freebsd* | dragonfly*) 4951 freebsd* | dragonfly*)
@@ -4970,7 +4954,7 @@ index 64de9f19da..a82fde7fa8 100755
4970 hardcode_libdir_flag_spec='-R$libdir' 4954 hardcode_libdir_flag_spec='-R$libdir'
4971 hardcode_direct=yes 4955 hardcode_direct=yes
4972 hardcode_shlibpath_var=no 4956 hardcode_shlibpath_var=no
4973@@ -9592,7 +10175,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4957@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp
4974 4958
4975 hpux9*) 4959 hpux9*)
4976 if test "$GCC" = yes; then 4960 if test "$GCC" = yes; then
@@ -4979,7 +4963,7 @@ index 64de9f19da..a82fde7fa8 100755
4979 else 4963 else
4980 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 4964 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
4981 fi 4965 fi
4982@@ -9608,7 +10191,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4966@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp
4983 4967
4984 hpux10*) 4968 hpux10*)
4985 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4969 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -4988,7 +4972,7 @@ index 64de9f19da..a82fde7fa8 100755
4988 else 4972 else
4989 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 4973 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4990 fi 4974 fi
4991@@ -9632,10 +10215,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4975@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp
4992 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4976 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4993 ;; 4977 ;;
4994 ia64*) 4978 ia64*)
@@ -5001,7 +4985,7 @@ index 64de9f19da..a82fde7fa8 100755
5001 ;; 4985 ;;
5002 esac 4986 esac
5003 else 4987 else
5004@@ -9714,23 +10297,36 @@ fi 4988@@ -9717,23 +10300,36 @@ fi
5005 4989
5006 irix5* | irix6* | nonstopux*) 4990 irix5* | irix6* | nonstopux*)
5007 if test "$GCC" = yes; then 4991 if test "$GCC" = yes; then
@@ -5046,7 +5030,7 @@ index 64de9f19da..a82fde7fa8 100755
5046 else 5030 else
5047 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 5031 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
5048 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 5032 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
5049@@ -9815,7 +10411,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5033@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj
5050 osf4* | osf5*) # as osf3* with the addition of -msym flag 5034 osf4* | osf5*) # as osf3* with the addition of -msym flag
5051 if test "$GCC" = yes; then 5035 if test "$GCC" = yes; then
5052 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5036 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5055,7 +5039,7 @@ index 64de9f19da..a82fde7fa8 100755
5055 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5039 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5056 else 5040 else
5057 allow_undefined_flag=' -expect_unresolved \*' 5041 allow_undefined_flag=' -expect_unresolved \*'
5058@@ -9834,9 +10430,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5042@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj
5059 no_undefined_flag=' -z defs' 5043 no_undefined_flag=' -z defs'
5060 if test "$GCC" = yes; then 5044 if test "$GCC" = yes; then
5061 wlarc='${wl}' 5045 wlarc='${wl}'
@@ -5067,7 +5051,7 @@ index 64de9f19da..a82fde7fa8 100755
5067 else 5051 else
5068 case `$CC -V 2>&1` in 5052 case `$CC -V 2>&1` in
5069 *"Compilers 5.0"*) 5053 *"Compilers 5.0"*)
5070@@ -10412,8 +11008,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5054@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5071 need_version=no 5055 need_version=no
5072 need_lib_prefix=no 5056 need_lib_prefix=no
5073 5057
@@ -5079,7 +5063,7 @@ index 64de9f19da..a82fde7fa8 100755
5079 library_names_spec='$libname.dll.a' 5063 library_names_spec='$libname.dll.a'
5080 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5064 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5081 postinstall_cmds='base_file=`basename \${file}`~ 5065 postinstall_cmds='base_file=`basename \${file}`~
5082@@ -10446,13 +11043,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5066@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5083 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5067 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5084 ;; 5068 ;;
5085 esac 5069 esac
@@ -5152,7 +5136,7 @@ index 64de9f19da..a82fde7fa8 100755
5152 # FIXME: first we should search . and the directory the executable is in 5136 # FIXME: first we should search . and the directory the executable is in
5153 shlibpath_var=PATH 5137 shlibpath_var=PATH
5154 ;; 5138 ;;
5155@@ -10544,7 +11199,7 @@ haiku*) 5139@@ -10547,7 +11202,7 @@ haiku*)
5156 soname_spec='${libname}${release}${shared_ext}$major' 5140 soname_spec='${libname}${release}${shared_ext}$major'
5157 shlibpath_var=LIBRARY_PATH 5141 shlibpath_var=LIBRARY_PATH
5158 shlibpath_overrides_runpath=yes 5142 shlibpath_overrides_runpath=yes
@@ -5161,16 +5145,16 @@ index 64de9f19da..a82fde7fa8 100755
5161 hardcode_into_libs=yes 5145 hardcode_into_libs=yes
5162 ;; 5146 ;;
5163 5147
5164@@ -11340,7 +11995,7 @@ else 5148@@ -11343,7 +11998,7 @@ else
5165 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5149 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5166 lt_status=$lt_dlunknown 5150 lt_status=$lt_dlunknown
5167 cat > conftest.$ac_ext <<_LT_EOF 5151 cat > conftest.$ac_ext <<_LT_EOF
5168-#line 11343 "configure" 5152-#line 11346 "configure"
5169+#line $LINENO "configure" 5153+#line $LINENO "configure"
5170 #include "confdefs.h" 5154 #include "confdefs.h"
5171 5155
5172 #if HAVE_DLFCN_H 5156 #if HAVE_DLFCN_H
5173@@ -11384,10 +12039,10 @@ else 5157@@ -11387,10 +12042,10 @@ else
5174 /* When -fvisbility=hidden is used, assume the code has been annotated 5158 /* When -fvisbility=hidden is used, assume the code has been annotated
5175 correspondingly for the symbols needed. */ 5159 correspondingly for the symbols needed. */
5176 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5160 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5183,16 +5167,16 @@ index 64de9f19da..a82fde7fa8 100755
5183 int main () 5167 int main ()
5184 { 5168 {
5185 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5169 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5186@@ -11446,7 +12101,7 @@ else 5170@@ -11449,7 +12104,7 @@ else
5187 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5171 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5188 lt_status=$lt_dlunknown 5172 lt_status=$lt_dlunknown
5189 cat > conftest.$ac_ext <<_LT_EOF 5173 cat > conftest.$ac_ext <<_LT_EOF
5190-#line 11449 "configure" 5174-#line 11452 "configure"
5191+#line $LINENO "configure" 5175+#line $LINENO "configure"
5192 #include "confdefs.h" 5176 #include "confdefs.h"
5193 5177
5194 #if HAVE_DLFCN_H 5178 #if HAVE_DLFCN_H
5195@@ -11490,10 +12145,10 @@ else 5179@@ -11493,10 +12148,10 @@ else
5196 /* When -fvisbility=hidden is used, assume the code has been annotated 5180 /* When -fvisbility=hidden is used, assume the code has been annotated
5197 correspondingly for the symbols needed. */ 5181 correspondingly for the symbols needed. */
5198 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5182 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -5205,7 +5189,7 @@ index 64de9f19da..a82fde7fa8 100755
5205 int main () 5189 int main ()
5206 { 5190 {
5207 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5191 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5208@@ -15896,13 +16551,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5192@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
5209 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5193 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5210 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5194 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5211 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5195 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -5226,7 +5210,7 @@ index 64de9f19da..a82fde7fa8 100755
5226 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5210 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5227 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5211 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5228 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5212 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5229@@ -15917,14 +16579,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5213@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
5230 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5214 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
5231 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5215 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
5232 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' 5216 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -5245,7 +5229,7 @@ index 64de9f19da..a82fde7fa8 100755
5245 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5229 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5246 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5230 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5247 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5231 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5248@@ -15957,12 +16622,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5232@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
5249 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5233 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5250 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5234 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5251 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5235 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -5259,7 +5243,7 @@ index 64de9f19da..a82fde7fa8 100755
5259 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5243 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5260 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5244 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5261 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5245 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5262@@ -16017,8 +16682,13 @@ reload_flag \ 5246@@ -16049,8 +16714,13 @@ reload_flag \
5263 OBJDUMP \ 5247 OBJDUMP \
5264 deplibs_check_method \ 5248 deplibs_check_method \
5265 file_magic_cmd \ 5249 file_magic_cmd \
@@ -5273,7 +5257,7 @@ index 64de9f19da..a82fde7fa8 100755
5273 STRIP \ 5257 STRIP \
5274 RANLIB \ 5258 RANLIB \
5275 CC \ 5259 CC \
5276@@ -16028,12 +16698,14 @@ lt_cv_sys_global_symbol_pipe \ 5260@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \
5277 lt_cv_sys_global_symbol_to_cdecl \ 5261 lt_cv_sys_global_symbol_to_cdecl \
5278 lt_cv_sys_global_symbol_to_c_name_address \ 5262 lt_cv_sys_global_symbol_to_c_name_address \
5279 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5263 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -5289,7 +5273,7 @@ index 64de9f19da..a82fde7fa8 100755
5289 DSYMUTIL \ 5273 DSYMUTIL \
5290 NMEDIT \ 5274 NMEDIT \
5291 LIPO \ 5275 LIPO \
5292@@ -16049,7 +16721,6 @@ no_undefined_flag \ 5276@@ -16081,7 +16753,6 @@ no_undefined_flag \
5293 hardcode_libdir_flag_spec \ 5277 hardcode_libdir_flag_spec \
5294 hardcode_libdir_flag_spec_ld \ 5278 hardcode_libdir_flag_spec_ld \
5295 hardcode_libdir_separator \ 5279 hardcode_libdir_separator \
@@ -5297,7 +5281,7 @@ index 64de9f19da..a82fde7fa8 100755
5297 exclude_expsyms \ 5281 exclude_expsyms \
5298 include_expsyms \ 5282 include_expsyms \
5299 file_list_spec \ 5283 file_list_spec \
5300@@ -16085,6 +16756,7 @@ module_cmds \ 5284@@ -16117,6 +16788,7 @@ module_cmds \
5301 module_expsym_cmds \ 5285 module_expsym_cmds \
5302 export_symbols_cmds \ 5286 export_symbols_cmds \
5303 prelink_cmds \ 5287 prelink_cmds \
@@ -5305,7 +5289,7 @@ index 64de9f19da..a82fde7fa8 100755
5305 postinstall_cmds \ 5289 postinstall_cmds \
5306 postuninstall_cmds \ 5290 postuninstall_cmds \
5307 finish_cmds \ 5291 finish_cmds \
5308@@ -16858,7 +17530,8 @@ $as_echo X"$file" | 5292@@ -16890,7 +17562,8 @@ $as_echo X"$file" |
5309 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5293 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5310 # 5294 #
5311 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5295 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -5315,7 +5299,7 @@ index 64de9f19da..a82fde7fa8 100755
5315 # Written by Gordon Matzigkeit, 1996 5299 # Written by Gordon Matzigkeit, 1996
5316 # 5300 #
5317 # This file is part of GNU Libtool. 5301 # This file is part of GNU Libtool.
5318@@ -16961,19 +17634,42 @@ SP2NL=$lt_lt_SP2NL 5302@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL
5319 # turn newlines into spaces. 5303 # turn newlines into spaces.
5320 NL2SP=$lt_lt_NL2SP 5304 NL2SP=$lt_lt_NL2SP
5321 5305
@@ -5359,7 +5343,7 @@ index 64de9f19da..a82fde7fa8 100755
5359 # A symbol stripping program. 5343 # A symbol stripping program.
5360 STRIP=$lt_STRIP 5344 STRIP=$lt_STRIP
5361 5345
5362@@ -17003,6 +17699,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5346@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c
5363 # Transform the output of nm in a C name address pair when lib prefix is needed. 5347 # Transform the output of nm in a C name address pair when lib prefix is needed.
5364 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5348 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5365 5349
@@ -5372,7 +5356,7 @@ index 64de9f19da..a82fde7fa8 100755
5372 # The name of the directory that contains temporary libtool files. 5356 # The name of the directory that contains temporary libtool files.
5373 objdir=$objdir 5357 objdir=$objdir
5374 5358
5375@@ -17012,6 +17714,9 @@ MAGIC_CMD=$MAGIC_CMD 5359@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD
5376 # Must we lock files when doing compilation? 5360 # Must we lock files when doing compilation?
5377 need_locks=$lt_need_locks 5361 need_locks=$lt_need_locks
5378 5362
@@ -5382,7 +5366,7 @@ index 64de9f19da..a82fde7fa8 100755
5382 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5366 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5383 DSYMUTIL=$lt_DSYMUTIL 5367 DSYMUTIL=$lt_DSYMUTIL
5384 5368
5385@@ -17126,12 +17831,12 @@ with_gcc=$GCC 5369@@ -17158,12 +17863,12 @@ with_gcc=$GCC
5386 # Compiler flag to turn off builtin functions. 5370 # Compiler flag to turn off builtin functions.
5387 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5371 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5388 5372
@@ -5398,7 +5382,7 @@ index 64de9f19da..a82fde7fa8 100755
5398 # Compiler flag to prevent dynamic linking. 5382 # Compiler flag to prevent dynamic linking.
5399 link_static_flag=$lt_lt_prog_compiler_static 5383 link_static_flag=$lt_lt_prog_compiler_static
5400 5384
5401@@ -17218,9 +17923,6 @@ inherit_rpath=$inherit_rpath 5385@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath
5402 # Whether libtool must link a program against all its dependency libraries. 5386 # Whether libtool must link a program against all its dependency libraries.
5403 link_all_deplibs=$link_all_deplibs 5387 link_all_deplibs=$link_all_deplibs
5404 5388
@@ -5408,7 +5392,7 @@ index 64de9f19da..a82fde7fa8 100755
5408 # Set to "yes" if exported symbols are required. 5392 # Set to "yes" if exported symbols are required.
5409 always_export_symbols=$always_export_symbols 5393 always_export_symbols=$always_export_symbols
5410 5394
5411@@ -17236,6 +17938,9 @@ include_expsyms=$lt_include_expsyms 5395@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms
5412 # Commands necessary for linking programs (against libraries) with templates. 5396 # Commands necessary for linking programs (against libraries) with templates.
5413 prelink_cmds=$lt_prelink_cmds 5397 prelink_cmds=$lt_prelink_cmds
5414 5398
@@ -5418,7 +5402,7 @@ index 64de9f19da..a82fde7fa8 100755
5418 # Specify filename containing input files. 5402 # Specify filename containing input files.
5419 file_list_spec=$lt_file_list_spec 5403 file_list_spec=$lt_file_list_spec
5420 5404
5421@@ -17268,210 +17973,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5405@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5422 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5406 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5423 # text mode, it properly converts lines to CR/LF. This bash problem 5407 # text mode, it properly converts lines to CR/LF. This bash problem
5424 # is reportedly fixed, but why not run on old versions too? 5408 # is reportedly fixed, but why not run on old versions too?
@@ -5620,15 +5604,9 @@ index 64de9f19da..a82fde7fa8 100755
5620-_LT_EOF 5604-_LT_EOF
5621- ;; 5605- ;;
5622- esac 5606- esac
5623-
5624-
5625- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5626- || (rm -f "$cfgfile"; exit 1)
5627-
5628- mv -f "$cfgfile" "$ofile" ||
5629+ sed '$q' "$ltmain" >> "$cfgfile" \ 5607+ sed '$q' "$ltmain" >> "$cfgfile" \
5630+ || (rm -f "$cfgfile"; exit 1) 5608+ || (rm -f "$cfgfile"; exit 1)
5631+ 5609
5632+ if test x"$xsi_shell" = xyes; then 5610+ if test x"$xsi_shell" = xyes; then
5633+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 5611+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5634+func_dirname ()\ 5612+func_dirname ()\
@@ -5786,14 +5764,15 @@ index 64de9f19da..a82fde7fa8 100755
5786+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 5764+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5787+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 5765+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5788+fi 5766+fi
5789+ 5767
5790+ 5768- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5769- || (rm -f "$cfgfile"; exit 1)
5770
5771- mv -f "$cfgfile" "$ofile" ||
5791+ mv -f "$cfgfile" "$ofile" || 5772+ mv -f "$cfgfile" "$ofile" ||
5792 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 5773 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5793 chmod +x "$ofile" 5774 chmod +x "$ofile"
5794 5775
5795diff --git a/gprof/configure b/gprof/configure
5796index ab32bab2b6..5119c6019f 100755
5797--- a/gprof/configure 5776--- a/gprof/configure
5798+++ b/gprof/configure 5777+++ b/gprof/configure
5799@@ -662,8 +662,11 @@ OTOOL 5778@@ -662,8 +662,11 @@ OTOOL
@@ -5845,7 +5824,7 @@ index ab32bab2b6..5119c6019f 100755
5845 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5824 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5846 ECHO='print -r --' 5825 ECHO='print -r --'
5847 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5826 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5848@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5827@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u
5849 # Try some XSI features 5828 # Try some XSI features
5850 xsi_shell=no 5829 xsi_shell=no
5851 ( _lt_dummy="a/b/c" 5830 ( _lt_dummy="a/b/c"
@@ -5993,7 +5972,7 @@ index ab32bab2b6..5119c6019f 100755
5993 file_magic_cmd=$lt_cv_file_magic_cmd 5972 file_magic_cmd=$lt_cv_file_magic_cmd
5994 deplibs_check_method=$lt_cv_deplibs_check_method 5973 deplibs_check_method=$lt_cv_deplibs_check_method
5995 test -z "$deplibs_check_method" && deplibs_check_method=unknown 5974 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5996@@ -6257,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 5975@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli
5997 5976
5998 5977
5999 5978
@@ -6007,8 +5986,6 @@ index ab32bab2b6..5119c6019f 100755
6007+ 5986+
6008+ 5987+
6009+ 5988+
6010
6011
6012 if test -n "$ac_tool_prefix"; then 5989 if test -n "$ac_tool_prefix"; then
6013- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 5990- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6014-set dummy ${ac_tool_prefix}ar; ac_word=$2 5991-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -6201,7 +6178,7 @@ index ab32bab2b6..5119c6019f 100755
6201 if test "x$ac_ct_AR" = x; then 6178 if test "x$ac_ct_AR" = x; then
6202 AR="false" 6179 AR="false"
6203 else 6180 else
6204@@ -6347,16 +6604,72 @@ ac_tool_warned=yes ;; 6181@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;;
6205 esac 6182 esac
6206 AR=$ac_ct_AR 6183 AR=$ac_ct_AR
6207 fi 6184 fi
@@ -6213,17 +6190,13 @@ index ab32bab2b6..5119c6019f 100755
6213-test -z "$AR_FLAGS" && AR_FLAGS=cru 6190-test -z "$AR_FLAGS" && AR_FLAGS=cru
6214+: ${AR=ar} 6191+: ${AR=ar}
6215+: ${AR_FLAGS=cru} 6192+: ${AR_FLAGS=cru}
6216+ 6193
6217+ 6194
6218+ 6195
6219+ 6196@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6220+ 6197
6221+ 6198
6222+ 6199
6223+
6224+
6225+
6226+
6227+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 6200+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6228+$as_echo_n "checking for archiver @FILE support... " >&6; } 6201+$as_echo_n "checking for archiver @FILE support... " >&6; }
6229+if test "${lt_cv_ar_at_file+set}" = set; then : 6202+if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -6236,7 +6209,7 @@ index ab32bab2b6..5119c6019f 100755
6236+int 6209+int
6237+main () 6210+main ()
6238+{ 6211+{
6239 6212+
6240+ ; 6213+ ;
6241+ return 0; 6214+ return 0;
6242+} 6215+}
@@ -6262,22 +6235,29 @@ index ab32bab2b6..5119c6019f 100755
6262+ fi 6235+ fi
6263+ fi 6236+ fi
6264+ rm -f conftest.* libconftest.a 6237+ rm -f conftest.* libconftest.a
6265 6238+
6266+fi 6239+fi
6267+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6240+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6268 6241+
6269+fi 6242+fi
6270+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 6243+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6271+$as_echo "$lt_cv_ar_at_file" >&6; } 6244+$as_echo "$lt_cv_ar_at_file" >&6; }
6272 6245+
6273+if test "x$lt_cv_ar_at_file" = xno; then 6246+if test "x$lt_cv_ar_at_file" = xno; then
6274+ archiver_list_spec= 6247+ archiver_list_spec=
6275+else 6248+else
6276+ archiver_list_spec=$lt_cv_ar_at_file 6249+ archiver_list_spec=$lt_cv_ar_at_file
6277+fi 6250+fi
6278 6251+
6279 6252+
6280 6253+
6254+
6255+
6256+
6257+
6258 if test -n "$ac_tool_prefix"; then
6259 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6260 set dummy ${ac_tool_prefix}strip; ac_word=$2
6281@@ -6698,8 +7011,8 @@ esac 6261@@ -6698,8 +7011,8 @@ esac
6282 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6262 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6283 6263
@@ -6325,7 +6305,7 @@ index ab32bab2b6..5119c6019f 100755
6325 const char *name; 6305 const char *name;
6326 void *address; 6306 void *address;
6327 } 6307 }
6328@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() { 6308@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup()
6329 _LT_EOF 6309 _LT_EOF
6330 # Now try linking the two files. 6310 # Now try linking the two files.
6331 mv conftest.$ac_objext conftstm.$ac_objext 6311 mv conftest.$ac_objext conftstm.$ac_objext
@@ -6347,7 +6327,7 @@ index ab32bab2b6..5119c6019f 100755
6347 else 6327 else
6348 echo "cannot find nm_test_func in $nlist" >&5 6328 echo "cannot find nm_test_func in $nlist" >&5
6349 fi 6329 fi
6350@@ -6862,6 +7188,18 @@ else 6330@@ -6862,6 +7188,17 @@ else
6351 $as_echo "ok" >&6; } 6331 $as_echo "ok" >&6; }
6352 fi 6332 fi
6353 6333
@@ -6362,19 +6342,14 @@ index ab32bab2b6..5119c6019f 100755
6362+ 6342+
6363+ 6343+
6364+ 6344+
6365+
6366 6345
6367 6346
6368 6347
6369@@ -6878,6 +7216,43 @@ fi 6348@@ -6883,6 +7220,44 @@ fi
6370 6349
6371 6350
6372 6351
6373+ 6352+
6374+
6375+
6376+
6377+
6378+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 6353+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6379+$as_echo_n "checking for sysroot... " >&6; } 6354+$as_echo_n "checking for sysroot... " >&6; }
6380+ 6355+
@@ -6407,9 +6382,14 @@ index ab32bab2b6..5119c6019f 100755
6407+ 6382+
6408+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 6383+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6409+$as_echo "${lt_sysroot:-no}" >&6; } 6384+$as_echo "${lt_sysroot:-no}" >&6; }
6410 6385+
6411 6386+
6412 6387+
6388+
6389+
6390 # Check whether --enable-libtool-lock was given.
6391 if test "${enable_libtool_lock+set}" = set; then :
6392 enableval=$enable_libtool_lock;
6413@@ -7089,6 +7464,123 @@ esac 6393@@ -7089,6 +7464,123 @@ esac
6414 6394
6415 need_locks="$enable_libtool_lock" 6395 need_locks="$enable_libtool_lock"
@@ -6571,7 +6551,7 @@ index ab32bab2b6..5119c6019f 100755
6571 6551
6572 if test "$GCC" = yes; then 6552 if test "$GCC" = yes; then
6573 lt_prog_compiler_wl='-Wl,' 6553 lt_prog_compiler_wl='-Wl,'
6574@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6554@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio
6575 lt_prog_compiler_pic='--shared' 6555 lt_prog_compiler_pic='--shared'
6576 lt_prog_compiler_static='--static' 6556 lt_prog_compiler_static='--static'
6577 ;; 6557 ;;
@@ -6584,7 +6564,7 @@ index ab32bab2b6..5119c6019f 100755
6584 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6564 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6585 # Portland Group compilers (*not* the Pentium gcc compiler, 6565 # Portland Group compilers (*not* the Pentium gcc compiler,
6586 # which looks to be a dead project) 6566 # which looks to be a dead project)
6587@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6567@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio
6588 lt_prog_compiler_pic='-KPIC' 6568 lt_prog_compiler_pic='-KPIC'
6589 lt_prog_compiler_static='-Bstatic' 6569 lt_prog_compiler_static='-Bstatic'
6590 case $cc_basename in 6570 case $cc_basename in
@@ -6745,7 +6725,7 @@ index ab32bab2b6..5119c6019f 100755
6745 6725
6746 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6726 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6747 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" 6727 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"
6748@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6728@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp
6749 else 6729 else
6750 # Determine the default libpath from the value encoded in an 6730 # Determine the default libpath from the value encoded in an
6751 # empty executable. 6731 # empty executable.
@@ -6803,7 +6783,7 @@ index ab32bab2b6..5119c6019f 100755
6803 6783
6804 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6784 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6805 # Warning - without using the other run time loading flags, 6785 # Warning - without using the other run time loading flags,
6806@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6786@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp
6807 # Microsoft Visual C++. 6787 # Microsoft Visual C++.
6808 # hardcode_libdir_flag_spec is actually meaningless, as there is 6788 # hardcode_libdir_flag_spec is actually meaningless, as there is
6809 # no search path for DLLs. 6789 # no search path for DLLs.
@@ -6881,7 +6861,7 @@ index ab32bab2b6..5119c6019f 100755
6881 ;; 6861 ;;
6882 6862
6883 darwin* | rhapsody*) 6863 darwin* | rhapsody*)
6884@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6864@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp
6885 6865
6886 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 6866 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6887 freebsd* | dragonfly*) 6867 freebsd* | dragonfly*)
@@ -6890,7 +6870,7 @@ index ab32bab2b6..5119c6019f 100755
6890 hardcode_libdir_flag_spec='-R$libdir' 6870 hardcode_libdir_flag_spec='-R$libdir'
6891 hardcode_direct=yes 6871 hardcode_direct=yes
6892 hardcode_shlibpath_var=no 6872 hardcode_shlibpath_var=no
6893@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6873@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp
6894 6874
6895 hpux9*) 6875 hpux9*)
6896 if test "$GCC" = yes; then 6876 if test "$GCC" = yes; then
@@ -6899,7 +6879,7 @@ index ab32bab2b6..5119c6019f 100755
6899 else 6879 else
6900 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' 6880 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'
6901 fi 6881 fi
6902@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6882@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp
6903 6883
6904 hpux10*) 6884 hpux10*)
6905 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 6885 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -6908,7 +6888,7 @@ index ab32bab2b6..5119c6019f 100755
6908 else 6888 else
6909 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 6889 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6910 fi 6890 fi
6911@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6891@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp
6912 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6892 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6913 ;; 6893 ;;
6914 ia64*) 6894 ia64*)
@@ -6966,7 +6946,7 @@ index ab32bab2b6..5119c6019f 100755
6966 else 6946 else
6967 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' 6947 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'
6968 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' 6948 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'
6969@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \ 6949@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj
6970 osf4* | osf5*) # as osf3* with the addition of -msym flag 6950 osf4* | osf5*) # as osf3* with the addition of -msym flag
6971 if test "$GCC" = yes; then 6951 if test "$GCC" = yes; then
6972 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 6952 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6975,7 +6955,7 @@ index ab32bab2b6..5119c6019f 100755
6975 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 6955 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6976 else 6956 else
6977 allow_undefined_flag=' -expect_unresolved \*' 6957 allow_undefined_flag=' -expect_unresolved \*'
6978@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \ 6958@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj
6979 no_undefined_flag=' -z defs' 6959 no_undefined_flag=' -z defs'
6980 if test "$GCC" = yes; then 6960 if test "$GCC" = yes; then
6981 wlarc='${wl}' 6961 wlarc='${wl}'
@@ -7107,7 +7087,7 @@ index ab32bab2b6..5119c6019f 100755
7107 int main () 7087 int main ()
7108 { 7088 {
7109 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7089 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7110@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7090@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
7111 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7091 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7112 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7092 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7113 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7093 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -7128,7 +7108,7 @@ index ab32bab2b6..5119c6019f 100755
7128 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7108 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7129 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7109 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7130 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7110 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7131@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7111@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
7132 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7112 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
7133 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7113 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
7134 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"`' 7114 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -7147,7 +7127,7 @@ index ab32bab2b6..5119c6019f 100755
7147 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7127 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7148 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7128 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7149 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7129 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7150@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7130@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
7151 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7131 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7152 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7132 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7153 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7133 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -7261,7 +7241,7 @@ index ab32bab2b6..5119c6019f 100755
7261 # A symbol stripping program. 7241 # A symbol stripping program.
7262 STRIP=$lt_STRIP 7242 STRIP=$lt_STRIP
7263 7243
7264@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7244@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c
7265 # Transform the output of nm in a C name address pair when lib prefix is needed. 7245 # Transform the output of nm in a C name address pair when lib prefix is needed.
7266 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7246 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7267 7247
@@ -7522,15 +7502,9 @@ index ab32bab2b6..5119c6019f 100755
7522-_LT_EOF 7502-_LT_EOF
7523- ;; 7503- ;;
7524- esac 7504- esac
7525-
7526-
7527- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7528- || (rm -f "$cfgfile"; exit 1)
7529-
7530- mv -f "$cfgfile" "$ofile" ||
7531+ sed '$q' "$ltmain" >> "$cfgfile" \ 7505+ sed '$q' "$ltmain" >> "$cfgfile" \
7532+ || (rm -f "$cfgfile"; exit 1) 7506+ || (rm -f "$cfgfile"; exit 1)
7533+ 7507
7534+ if test x"$xsi_shell" = xyes; then 7508+ if test x"$xsi_shell" = xyes; then
7535+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 7509+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7536+func_dirname ()\ 7510+func_dirname ()\
@@ -7688,17 +7662,18 @@ index ab32bab2b6..5119c6019f 100755
7688+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 7662+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7689+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 7663+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7690+fi 7664+fi
7691+ 7665
7692+ 7666- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7667- || (rm -f "$cfgfile"; exit 1)
7668
7669- mv -f "$cfgfile" "$ofile" ||
7693+ mv -f "$cfgfile" "$ofile" || 7670+ mv -f "$cfgfile" "$ofile" ||
7694 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 7671 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7695 chmod +x "$ofile" 7672 chmod +x "$ofile"
7696 7673
7697diff --git a/ld/configure b/ld/configure
7698index bc09e7ef81..43c391c2b3 100755
7699--- a/ld/configure 7674--- a/ld/configure
7700+++ b/ld/configure 7675+++ b/ld/configure
7701@@ -687,8 +687,11 @@ OTOOL 7676@@ -688,8 +688,11 @@ OTOOL
7702 LIPO 7677 LIPO
7703 NMEDIT 7678 NMEDIT
7704 DSYMUTIL 7679 DSYMUTIL
@@ -7710,7 +7685,7 @@ index bc09e7ef81..43c391c2b3 100755
7710 OBJDUMP 7685 OBJDUMP
7711 LN_S 7686 LN_S
7712 NM 7687 NM
7713@@ -815,6 +818,7 @@ enable_static 7688@@ -816,6 +819,7 @@ enable_static
7714 with_pic 7689 with_pic
7715 enable_fast_install 7690 enable_fast_install
7716 with_gnu_ld 7691 with_gnu_ld
@@ -7718,7 +7693,7 @@ index bc09e7ef81..43c391c2b3 100755
7718 enable_libtool_lock 7693 enable_libtool_lock
7719 enable_plugins 7694 enable_plugins
7720 enable_largefile 7695 enable_largefile
7721@@ -1507,6 +1511,8 @@ Optional Packages: 7696@@ -1508,6 +1512,8 @@ Optional Packages:
7722 --with-pic try to use only PIC/non-PIC objects [default=use 7697 --with-pic try to use only PIC/non-PIC objects [default=use
7723 both] 7698 both]
7724 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7699 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7727,7 +7702,7 @@ index bc09e7ef81..43c391c2b3 100755
7727 --with-lib-path=dir1:dir2... set default LIB_PATH 7702 --with-lib-path=dir1:dir2... set default LIB_PATH
7728 --with-sysroot=DIR Search for usr/lib et al within DIR. 7703 --with-sysroot=DIR Search for usr/lib et al within DIR.
7729 7704
7730@@ -5959,8 +5965,8 @@ esac 7705@@ -5960,8 +5966,8 @@ esac
7731 7706
7732 7707
7733 7708
@@ -7738,7 +7713,7 @@ index bc09e7ef81..43c391c2b3 100755
7738 7713
7739 7714
7740 7715
7741@@ -6000,7 +6006,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7716@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7742 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7717 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7743 $as_echo_n "checking how to print strings... " >&6; } 7718 $as_echo_n "checking how to print strings... " >&6; }
7744 # Test print first, because it will be a builtin if present. 7719 # Test print first, because it will be a builtin if present.
@@ -7747,7 +7722,7 @@ index bc09e7ef81..43c391c2b3 100755
7747 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7722 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7748 ECHO='print -r --' 7723 ECHO='print -r --'
7749 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7724 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7750@@ -6686,8 +6692,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7725@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u
7751 # Try some XSI features 7726 # Try some XSI features
7752 xsi_shell=no 7727 xsi_shell=no
7753 ( _lt_dummy="a/b/c" 7728 ( _lt_dummy="a/b/c"
@@ -7758,7 +7733,7 @@ index bc09e7ef81..43c391c2b3 100755
7758 && eval 'test $(( 1 + 1 )) -eq 2 \ 7733 && eval 'test $(( 1 + 1 )) -eq 2 \
7759 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7734 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7760 && xsi_shell=yes 7735 && xsi_shell=yes
7761@@ -6736,6 +6742,80 @@ esac 7736@@ -6737,6 +6743,80 @@ esac
7762 7737
7763 7738
7764 7739
@@ -7839,7 +7814,7 @@ index bc09e7ef81..43c391c2b3 100755
7839 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7814 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7840 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7815 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7841 if ${lt_cv_ld_reload_flag+:} false; then : 7816 if ${lt_cv_ld_reload_flag+:} false; then :
7842@@ -6752,6 +6832,11 @@ case $reload_flag in 7817@@ -6753,6 +6833,11 @@ case $reload_flag in
7843 esac 7818 esac
7844 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7819 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7845 case $host_os in 7820 case $host_os in
@@ -7851,7 +7826,7 @@ index bc09e7ef81..43c391c2b3 100755
7851 darwin*) 7826 darwin*)
7852 if test "$GCC" = yes; then 7827 if test "$GCC" = yes; then
7853 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7828 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7854@@ -6920,7 +7005,8 @@ mingw* | pw32*) 7829@@ -6921,7 +7006,8 @@ mingw* | pw32*)
7855 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7830 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7856 lt_cv_file_magic_cmd='func_win32_libid' 7831 lt_cv_file_magic_cmd='func_win32_libid'
7857 else 7832 else
@@ -7861,7 +7836,7 @@ index bc09e7ef81..43c391c2b3 100755
7861 lt_cv_file_magic_cmd='$OBJDUMP -f' 7836 lt_cv_file_magic_cmd='$OBJDUMP -f'
7862 fi 7837 fi
7863 ;; 7838 ;;
7864@@ -7074,6 +7160,21 @@ esac 7839@@ -7075,6 +7161,21 @@ esac
7865 fi 7840 fi
7866 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7841 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7867 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7842 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7883,7 +7858,7 @@ index bc09e7ef81..43c391c2b3 100755
7883 file_magic_cmd=$lt_cv_file_magic_cmd 7858 file_magic_cmd=$lt_cv_file_magic_cmd
7884 deplibs_check_method=$lt_cv_deplibs_check_method 7859 deplibs_check_method=$lt_cv_deplibs_check_method
7885 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7860 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7886@@ -7089,9 +7190,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7861@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli
7887 7862
7888 7863
7889 7864
@@ -8048,7 +8023,7 @@ index bc09e7ef81..43c391c2b3 100755
8048 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8023 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8049 $as_echo_n "checking for $ac_word... " >&6; } 8024 $as_echo_n "checking for $ac_word... " >&6; }
8050 if ${ac_cv_prog_AR+:} false; then : 8025 if ${ac_cv_prog_AR+:} false; then :
8051@@ -7107,7 +7361,7 @@ do 8026@@ -7108,7 +7362,7 @@ do
8052 test -z "$as_dir" && as_dir=. 8027 test -z "$as_dir" && as_dir=.
8053 for ac_exec_ext in '' $ac_executable_extensions; do 8028 for ac_exec_ext in '' $ac_executable_extensions; do
8054 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8029 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8057,7 +8032,7 @@ index bc09e7ef81..43c391c2b3 100755
8057 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8032 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8058 break 2 8033 break 2
8059 fi 8034 fi
8060@@ -7127,11 +7381,15 @@ $as_echo "no" >&6; } 8035@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; }
8061 fi 8036 fi
8062 8037
8063 8038
@@ -8076,7 +8051,7 @@ index bc09e7ef81..43c391c2b3 100755
8076 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8051 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8077 $as_echo_n "checking for $ac_word... " >&6; } 8052 $as_echo_n "checking for $ac_word... " >&6; }
8078 if ${ac_cv_prog_ac_ct_AR+:} false; then : 8053 if ${ac_cv_prog_ac_ct_AR+:} false; then :
8079@@ -7147,7 +7405,7 @@ do 8054@@ -7148,7 +7406,7 @@ do
8080 test -z "$as_dir" && as_dir=. 8055 test -z "$as_dir" && as_dir=.
8081 for ac_exec_ext in '' $ac_executable_extensions; do 8056 for ac_exec_ext in '' $ac_executable_extensions; do
8082 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8057 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -8085,7 +8060,7 @@ index bc09e7ef81..43c391c2b3 100755
8085 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8060 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8086 break 2 8061 break 2
8087 fi 8062 fi
8088@@ -7166,6 +7424,10 @@ else 8063@@ -7167,6 +7425,10 @@ else
8089 $as_echo "no" >&6; } 8064 $as_echo "no" >&6; }
8090 fi 8065 fi
8091 8066
@@ -8096,7 +8071,7 @@ index bc09e7ef81..43c391c2b3 100755
8096 if test "x$ac_ct_AR" = x; then 8071 if test "x$ac_ct_AR" = x; then
8097 AR="false" 8072 AR="false"
8098 else 8073 else
8099@@ -7177,12 +7439,12 @@ ac_tool_warned=yes ;; 8074@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;;
8100 esac 8075 esac
8101 AR=$ac_ct_AR 8076 AR=$ac_ct_AR
8102 fi 8077 fi
@@ -8109,11 +8084,10 @@ index bc09e7ef81..43c391c2b3 100755
8109+: ${AR=ar} 8084+: ${AR=ar}
8110+: ${AR_FLAGS=cru} 8085+: ${AR_FLAGS=cru}
8111+ 8086+
8112+
8113 8087
8114 8088
8115 8089
8116@@ -7192,6 +7454,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8090@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8117 8091
8118 8092
8119 8093
@@ -8173,10 +8147,11 @@ index bc09e7ef81..43c391c2b3 100755
8173+ 8147+
8174+ 8148+
8175+ 8149+
8176 8150+
8177 8151
8178 if test -n "$ac_tool_prefix"; then 8152 if test -n "$ac_tool_prefix"; then
8179@@ -7528,8 +7846,8 @@ esac 8153 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8154@@ -7529,8 +7847,8 @@ esac
8180 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8155 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8181 8156
8182 # Transform an extracted symbol line into symbol name and symbol address 8157 # Transform an extracted symbol line into symbol name and symbol address
@@ -8187,7 +8162,7 @@ index bc09e7ef81..43c391c2b3 100755
8187 8162
8188 # Handle CRLF in mingw tool chain 8163 # Handle CRLF in mingw tool chain
8189 opt_cr= 8164 opt_cr=
8190@@ -7565,6 +7883,7 @@ for ac_symprfx in "" "_"; do 8165@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do
8191 else 8166 else
8192 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8167 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8193 fi 8168 fi
@@ -8195,7 +8170,7 @@ index bc09e7ef81..43c391c2b3 100755
8195 8170
8196 # Check to see that the pipe works correctly. 8171 # Check to see that the pipe works correctly.
8197 pipe_works=no 8172 pipe_works=no
8198@@ -7606,6 +7925,18 @@ _LT_EOF 8173@@ -7607,6 +7926,18 @@ _LT_EOF
8199 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8174 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8200 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8175 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8201 cat <<_LT_EOF > conftest.$ac_ext 8176 cat <<_LT_EOF > conftest.$ac_ext
@@ -8214,7 +8189,7 @@ index bc09e7ef81..43c391c2b3 100755
8214 #ifdef __cplusplus 8189 #ifdef __cplusplus
8215 extern "C" { 8190 extern "C" {
8216 #endif 8191 #endif
8217@@ -7617,7 +7948,7 @@ _LT_EOF 8192@@ -7618,7 +7949,7 @@ _LT_EOF
8218 cat <<_LT_EOF >> conftest.$ac_ext 8193 cat <<_LT_EOF >> conftest.$ac_ext
8219 8194
8220 /* The mapping between symbol names and symbols. */ 8195 /* The mapping between symbol names and symbols. */
@@ -8223,7 +8198,7 @@ index bc09e7ef81..43c391c2b3 100755
8223 const char *name; 8198 const char *name;
8224 void *address; 8199 void *address;
8225 } 8200 }
8226@@ -7643,8 +7974,8 @@ static const void *lt_preloaded_setup() { 8201@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup()
8227 _LT_EOF 8202 _LT_EOF
8228 # Now try linking the two files. 8203 # Now try linking the two files.
8229 mv conftest.$ac_objext conftstm.$ac_objext 8204 mv conftest.$ac_objext conftstm.$ac_objext
@@ -8234,7 +8209,7 @@ index bc09e7ef81..43c391c2b3 100755
8234 LIBS="conftstm.$ac_objext" 8209 LIBS="conftstm.$ac_objext"
8235 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8210 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8236 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8211 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8237@@ -7654,8 +7985,8 @@ _LT_EOF 8212@@ -7655,8 +7986,8 @@ _LT_EOF
8238 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8213 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8239 pipe_works=yes 8214 pipe_works=yes
8240 fi 8215 fi
@@ -8245,7 +8220,7 @@ index bc09e7ef81..43c391c2b3 100755
8245 else 8220 else
8246 echo "cannot find nm_test_func in $nlist" >&5 8221 echo "cannot find nm_test_func in $nlist" >&5
8247 fi 8222 fi
8248@@ -7692,6 +8023,19 @@ else 8223@@ -7693,6 +8024,13 @@ else
8249 $as_echo "ok" >&6; } 8224 $as_echo "ok" >&6; }
8250 fi 8225 fi
8251 8226
@@ -8256,16 +8231,10 @@ index bc09e7ef81..43c391c2b3 100755
8256+ nm_file_list_spec='@' 8231+ nm_file_list_spec='@'
8257+fi 8232+fi
8258+ 8233+
8259+
8260+
8261+
8262+
8263+
8264+
8265 8234
8266 8235
8267 8236
8268@@ -7708,6 +8052,42 @@ fi 8237@@ -7714,6 +8052,48 @@ fi
8269 8238
8270 8239
8271 8240
@@ -8273,6 +8242,7 @@ index bc09e7ef81..43c391c2b3 100755
8273+ 8242+
8274+ 8243+
8275+ 8244+
8245+
8276+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 8246+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8277+$as_echo_n "checking for sysroot... " >&6; } 8247+$as_echo_n "checking for sysroot... " >&6; }
8278+ 8248+
@@ -8305,10 +8275,15 @@ index bc09e7ef81..43c391c2b3 100755
8305+ 8275+
8306+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 8276+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8307+$as_echo "${lt_sysroot:-no}" >&6; } 8277+$as_echo "${lt_sysroot:-no}" >&6; }
8308 8278+
8309 8279+
8310 8280+
8311@@ -7919,6 +8299,123 @@ esac 8281+
8282+
8283 # Check whether --enable-libtool-lock was given.
8284 if test "${enable_libtool_lock+set}" = set; then :
8285 enableval=$enable_libtool_lock;
8286@@ -7920,6 +8300,123 @@ esac
8312 8287
8313 need_locks="$enable_libtool_lock" 8288 need_locks="$enable_libtool_lock"
8314 8289
@@ -8432,7 +8407,7 @@ index bc09e7ef81..43c391c2b3 100755
8432 8407
8433 case $host_os in 8408 case $host_os in
8434 rhapsody* | darwin*) 8409 rhapsody* | darwin*)
8435@@ -8482,6 +8979,8 @@ _LT_EOF 8410@@ -8483,6 +8980,8 @@ _LT_EOF
8436 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8411 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8437 echo "$AR cru libconftest.a conftest.o" >&5 8412 echo "$AR cru libconftest.a conftest.o" >&5
8438 $AR cru libconftest.a conftest.o 2>&5 8413 $AR cru libconftest.a conftest.o 2>&5
@@ -8441,7 +8416,7 @@ index bc09e7ef81..43c391c2b3 100755
8441 cat > conftest.c << _LT_EOF 8416 cat > conftest.c << _LT_EOF
8442 int main() { return 0;} 8417 int main() { return 0;}
8443 _LT_EOF 8418 _LT_EOF
8444@@ -8550,6 +9049,16 @@ done 8419@@ -8551,6 +9050,16 @@ done
8445 8420
8446 8421
8447 8422
@@ -8458,7 +8433,7 @@ index bc09e7ef81..43c391c2b3 100755
8458 8433
8459 8434
8460 # Set options 8435 # Set options
8461@@ -8678,7 +9187,8 @@ fi 8436@@ -8679,7 +9188,8 @@ fi
8462 LIBTOOL_DEPS="$ltmain" 8437 LIBTOOL_DEPS="$ltmain"
8463 8438
8464 # Always use our own libtool. 8439 # Always use our own libtool.
@@ -8468,7 +8443,7 @@ index bc09e7ef81..43c391c2b3 100755
8468 8443
8469 8444
8470 8445
8471@@ -8767,7 +9277,7 @@ aix3*) 8446@@ -8768,7 +9278,7 @@ aix3*)
8472 esac 8447 esac
8473 8448
8474 # Global variables: 8449 # Global variables:
@@ -8477,7 +8452,7 @@ index bc09e7ef81..43c391c2b3 100755
8477 can_build_shared=yes 8452 can_build_shared=yes
8478 8453
8479 # All known linkers require a `.a' archive for static linking (except MSVC, 8454 # All known linkers require a `.a' archive for static linking (except MSVC,
8480@@ -9065,8 +9575,6 @@ fi 8455@@ -9066,8 +9576,6 @@ fi
8481 lt_prog_compiler_pic= 8456 lt_prog_compiler_pic=
8482 lt_prog_compiler_static= 8457 lt_prog_compiler_static=
8483 8458
@@ -8486,7 +8461,7 @@ index bc09e7ef81..43c391c2b3 100755
8486 8461
8487 if test "$GCC" = yes; then 8462 if test "$GCC" = yes; then
8488 lt_prog_compiler_wl='-Wl,' 8463 lt_prog_compiler_wl='-Wl,'
8489@@ -9232,6 +9740,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8464@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio
8490 lt_prog_compiler_pic='--shared' 8465 lt_prog_compiler_pic='--shared'
8491 lt_prog_compiler_static='--static' 8466 lt_prog_compiler_static='--static'
8492 ;; 8467 ;;
@@ -8499,7 +8474,7 @@ index bc09e7ef81..43c391c2b3 100755
8499 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8474 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8500 # Portland Group compilers (*not* the Pentium gcc compiler, 8475 # Portland Group compilers (*not* the Pentium gcc compiler,
8501 # which looks to be a dead project) 8476 # which looks to be a dead project)
8502@@ -9294,7 +9808,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8477@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio
8503 lt_prog_compiler_pic='-KPIC' 8478 lt_prog_compiler_pic='-KPIC'
8504 lt_prog_compiler_static='-Bstatic' 8479 lt_prog_compiler_static='-Bstatic'
8505 case $cc_basename in 8480 case $cc_basename in
@@ -8508,7 +8483,7 @@ index bc09e7ef81..43c391c2b3 100755
8508 lt_prog_compiler_wl='-Qoption ld ';; 8483 lt_prog_compiler_wl='-Qoption ld ';;
8509 *) 8484 *)
8510 lt_prog_compiler_wl='-Wl,';; 8485 lt_prog_compiler_wl='-Wl,';;
8511@@ -9351,13 +9865,17 @@ case $host_os in 8486@@ -9352,13 +9866,17 @@ case $host_os in
8512 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8487 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8513 ;; 8488 ;;
8514 esac 8489 esac
@@ -8532,7 +8507,7 @@ index bc09e7ef81..43c391c2b3 100755
8532 8507
8533 # 8508 #
8534 # Check to make sure the PIC flag actually works. 8509 # Check to make sure the PIC flag actually works.
8535@@ -9418,6 +9936,11 @@ fi 8510@@ -9419,6 +9937,11 @@ fi
8536 8511
8537 8512
8538 8513
@@ -8544,7 +8519,7 @@ index bc09e7ef81..43c391c2b3 100755
8544 # 8519 #
8545 # Check to make sure the static flag actually works. 8520 # Check to make sure the static flag actually works.
8546 # 8521 #
8547@@ -9768,7 +10291,8 @@ _LT_EOF 8522@@ -9769,7 +10292,8 @@ _LT_EOF
8548 allow_undefined_flag=unsupported 8523 allow_undefined_flag=unsupported
8549 always_export_symbols=no 8524 always_export_symbols=no
8550 enable_shared_with_static_runtimes=yes 8525 enable_shared_with_static_runtimes=yes
@@ -8554,7 +8529,7 @@ index bc09e7ef81..43c391c2b3 100755
8554 8529
8555 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8530 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8556 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8531 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8557@@ -9867,12 +10391,12 @@ _LT_EOF 8532@@ -9868,12 +10392,12 @@ _LT_EOF
8558 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8533 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8559 hardcode_libdir_flag_spec= 8534 hardcode_libdir_flag_spec=
8560 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8535 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -8569,7 +8544,7 @@ index bc09e7ef81..43c391c2b3 100755
8569 fi 8544 fi
8570 ;; 8545 ;;
8571 esac 8546 esac
8572@@ -9886,8 +10410,8 @@ _LT_EOF 8547@@ -9887,8 +10411,8 @@ _LT_EOF
8573 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8548 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8574 wlarc= 8549 wlarc=
8575 else 8550 else
@@ -8580,7 +8555,7 @@ index bc09e7ef81..43c391c2b3 100755
8580 fi 8555 fi
8581 ;; 8556 ;;
8582 8557
8583@@ -9905,8 +10429,8 @@ _LT_EOF 8558@@ -9906,8 +10430,8 @@ _LT_EOF
8584 8559
8585 _LT_EOF 8560 _LT_EOF
8586 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8561 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8591,7 +8566,7 @@ index bc09e7ef81..43c391c2b3 100755
8591 else 8566 else
8592 ld_shlibs=no 8567 ld_shlibs=no
8593 fi 8568 fi
8594@@ -9952,8 +10476,8 @@ _LT_EOF 8569@@ -9953,8 +10477,8 @@ _LT_EOF
8595 8570
8596 *) 8571 *)
8597 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8572 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8602,7 +8577,7 @@ index bc09e7ef81..43c391c2b3 100755
8602 else 8577 else
8603 ld_shlibs=no 8578 ld_shlibs=no
8604 fi 8579 fi
8605@@ -10083,7 +10607,13 @@ _LT_EOF 8580@@ -10084,7 +10608,13 @@ _LT_EOF
8606 allow_undefined_flag='-berok' 8581 allow_undefined_flag='-berok'
8607 # Determine the default libpath from the value encoded in an 8582 # Determine the default libpath from the value encoded in an
8608 # empty executable. 8583 # empty executable.
@@ -8617,7 +8592,7 @@ index bc09e7ef81..43c391c2b3 100755
8617 /* end confdefs.h. */ 8592 /* end confdefs.h. */
8618 8593
8619 int 8594 int
8620@@ -10096,22 +10626,29 @@ main () 8595@@ -10097,22 +10627,29 @@ main ()
8621 _ACEOF 8596 _ACEOF
8622 if ac_fn_c_try_link "$LINENO"; then : 8597 if ac_fn_c_try_link "$LINENO"; then :
8623 8598
@@ -8660,7 +8635,7 @@ index bc09e7ef81..43c391c2b3 100755
8660 8635
8661 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8636 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8662 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" 8637 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"
8663@@ -10123,7 +10660,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8638@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp
8664 else 8639 else
8665 # Determine the default libpath from the value encoded in an 8640 # Determine the default libpath from the value encoded in an
8666 # empty executable. 8641 # empty executable.
@@ -8675,7 +8650,7 @@ index bc09e7ef81..43c391c2b3 100755
8675 /* end confdefs.h. */ 8650 /* end confdefs.h. */
8676 8651
8677 int 8652 int
8678@@ -10136,22 +10679,29 @@ main () 8653@@ -10137,22 +10680,29 @@ main ()
8679 _ACEOF 8654 _ACEOF
8680 if ac_fn_c_try_link "$LINENO"; then : 8655 if ac_fn_c_try_link "$LINENO"; then :
8681 8656
@@ -8718,11 +8693,10 @@ index bc09e7ef81..43c391c2b3 100755
8718 8693
8719 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8694 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8720 # Warning - without using the other run time loading flags, 8695 # Warning - without using the other run time loading flags,
8721@@ -10195,21 +10745,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8696@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp
8722 # When not using gcc, we currently assume that we are using
8723 # Microsoft Visual C++. 8697 # Microsoft Visual C++.
8724 # hardcode_libdir_flag_spec is actually meaningless, as there is 8698 # hardcode_libdir_flag_spec is actually meaningless, as there is
8725- # no search path for DLLs. 8699 # no search path for DLLs.
8726- hardcode_libdir_flag_spec=' ' 8700- hardcode_libdir_flag_spec=' '
8727- allow_undefined_flag=unsupported 8701- allow_undefined_flag=unsupported
8728- # Tell ltmain to make .lib files, not .a files. 8702- # Tell ltmain to make .lib files, not .a files.
@@ -8737,7 +8711,6 @@ index bc09e7ef81..43c391c2b3 100755
8737- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 8711- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8738- fix_srcfile_path='`cygpath -w "$srcfile"`' 8712- fix_srcfile_path='`cygpath -w "$srcfile"`'
8739- enable_shared_with_static_runtimes=yes 8713- enable_shared_with_static_runtimes=yes
8740+ # no search path for DLLs.
8741+ case $cc_basename in 8714+ case $cc_basename in
8742+ cl*) 8715+ cl*)
8743+ # Native MSVC 8716+ # Native MSVC
@@ -8798,7 +8771,7 @@ index bc09e7ef81..43c391c2b3 100755
8798 ;; 8771 ;;
8799 8772
8800 darwin* | rhapsody*) 8773 darwin* | rhapsody*)
8801@@ -10270,7 +10863,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8774@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp
8802 8775
8803 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8776 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8804 freebsd* | dragonfly*) 8777 freebsd* | dragonfly*)
@@ -8807,7 +8780,7 @@ index bc09e7ef81..43c391c2b3 100755
8807 hardcode_libdir_flag_spec='-R$libdir' 8780 hardcode_libdir_flag_spec='-R$libdir'
8808 hardcode_direct=yes 8781 hardcode_direct=yes
8809 hardcode_shlibpath_var=no 8782 hardcode_shlibpath_var=no
8810@@ -10278,7 +10871,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8783@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp
8811 8784
8812 hpux9*) 8785 hpux9*)
8813 if test "$GCC" = yes; then 8786 if test "$GCC" = yes; then
@@ -8816,7 +8789,7 @@ index bc09e7ef81..43c391c2b3 100755
8816 else 8789 else
8817 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' 8790 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'
8818 fi 8791 fi
8819@@ -10294,7 +10887,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8792@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp
8820 8793
8821 hpux10*) 8794 hpux10*)
8822 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8795 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8825,7 +8798,7 @@ index bc09e7ef81..43c391c2b3 100755
8825 else 8798 else
8826 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8799 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8827 fi 8800 fi
8828@@ -10318,10 +10911,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8801@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp
8829 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8802 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8830 ;; 8803 ;;
8831 ia64*) 8804 ia64*)
@@ -8838,7 +8811,7 @@ index bc09e7ef81..43c391c2b3 100755
8838 ;; 8811 ;;
8839 esac 8812 esac
8840 else 8813 else
8841@@ -10400,23 +10993,36 @@ fi 8814@@ -10401,23 +10994,36 @@ fi
8842 8815
8843 irix5* | irix6* | nonstopux*) 8816 irix5* | irix6* | nonstopux*)
8844 if test "$GCC" = yes; then 8817 if test "$GCC" = yes; then
@@ -8883,7 +8856,7 @@ index bc09e7ef81..43c391c2b3 100755
8883 else 8856 else
8884 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' 8857 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'
8885 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' 8858 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'
8886@@ -10501,7 +11107,7 @@ rm -f core conftest.err conftest.$ac_objext \ 8859@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj
8887 osf4* | osf5*) # as osf3* with the addition of -msym flag 8860 osf4* | osf5*) # as osf3* with the addition of -msym flag
8888 if test "$GCC" = yes; then 8861 if test "$GCC" = yes; then
8889 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8862 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8892,7 +8865,7 @@ index bc09e7ef81..43c391c2b3 100755
8892 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8865 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8893 else 8866 else
8894 allow_undefined_flag=' -expect_unresolved \*' 8867 allow_undefined_flag=' -expect_unresolved \*'
8895@@ -10520,9 +11126,9 @@ rm -f core conftest.err conftest.$ac_objext \ 8868@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj
8896 no_undefined_flag=' -z defs' 8869 no_undefined_flag=' -z defs'
8897 if test "$GCC" = yes; then 8870 if test "$GCC" = yes; then
8898 wlarc='${wl}' 8871 wlarc='${wl}'
@@ -8904,7 +8877,7 @@ index bc09e7ef81..43c391c2b3 100755
8904 else 8877 else
8905 case `$CC -V 2>&1` in 8878 case `$CC -V 2>&1` in
8906 *"Compilers 5.0"*) 8879 *"Compilers 5.0"*)
8907@@ -11098,8 +11704,9 @@ cygwin* | mingw* | pw32* | cegcc*) 8880@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8908 need_version=no 8881 need_version=no
8909 need_lib_prefix=no 8882 need_lib_prefix=no
8910 8883
@@ -8916,7 +8889,7 @@ index bc09e7ef81..43c391c2b3 100755
8916 library_names_spec='$libname.dll.a' 8889 library_names_spec='$libname.dll.a'
8917 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8890 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8918 postinstall_cmds='base_file=`basename \${file}`~ 8891 postinstall_cmds='base_file=`basename \${file}`~
8919@@ -11132,13 +11739,71 @@ cygwin* | mingw* | pw32* | cegcc*) 8892@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8920 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8893 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8921 ;; 8894 ;;
8922 esac 8895 esac
@@ -8989,7 +8962,7 @@ index bc09e7ef81..43c391c2b3 100755
8989 # FIXME: first we should search . and the directory the executable is in 8962 # FIXME: first we should search . and the directory the executable is in
8990 shlibpath_var=PATH 8963 shlibpath_var=PATH
8991 ;; 8964 ;;
8992@@ -11230,7 +11895,7 @@ haiku*) 8965@@ -11231,7 +11896,7 @@ haiku*)
8993 soname_spec='${libname}${release}${shared_ext}$major' 8966 soname_spec='${libname}${release}${shared_ext}$major'
8994 shlibpath_var=LIBRARY_PATH 8967 shlibpath_var=LIBRARY_PATH
8995 shlibpath_overrides_runpath=yes 8968 shlibpath_overrides_runpath=yes
@@ -8998,16 +8971,16 @@ index bc09e7ef81..43c391c2b3 100755
8998 hardcode_into_libs=yes 8971 hardcode_into_libs=yes
8999 ;; 8972 ;;
9000 8973
9001@@ -12026,7 +12691,7 @@ else 8974@@ -12027,7 +12692,7 @@ else
9002 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 8975 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9003 lt_status=$lt_dlunknown 8976 lt_status=$lt_dlunknown
9004 cat > conftest.$ac_ext <<_LT_EOF 8977 cat > conftest.$ac_ext <<_LT_EOF
9005-#line 12029 "configure" 8978-#line 12030 "configure"
9006+#line $LINENO "configure" 8979+#line $LINENO "configure"
9007 #include "confdefs.h" 8980 #include "confdefs.h"
9008 8981
9009 #if HAVE_DLFCN_H 8982 #if HAVE_DLFCN_H
9010@@ -12070,10 +12735,10 @@ else 8983@@ -12071,10 +12736,10 @@ else
9011 /* When -fvisbility=hidden is used, assume the code has been annotated 8984 /* When -fvisbility=hidden is used, assume the code has been annotated
9012 correspondingly for the symbols needed. */ 8985 correspondingly for the symbols needed. */
9013 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 8986 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9020,16 +8993,16 @@ index bc09e7ef81..43c391c2b3 100755
9020 int main () 8993 int main ()
9021 { 8994 {
9022 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 8995 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9023@@ -12132,7 +12797,7 @@ else 8996@@ -12133,7 +12798,7 @@ else
9024 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 8997 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9025 lt_status=$lt_dlunknown 8998 lt_status=$lt_dlunknown
9026 cat > conftest.$ac_ext <<_LT_EOF 8999 cat > conftest.$ac_ext <<_LT_EOF
9027-#line 12135 "configure" 9000-#line 12136 "configure"
9028+#line $LINENO "configure" 9001+#line $LINENO "configure"
9029 #include "confdefs.h" 9002 #include "confdefs.h"
9030 9003
9031 #if HAVE_DLFCN_H 9004 #if HAVE_DLFCN_H
9032@@ -12176,10 +12841,10 @@ else 9005@@ -12177,10 +12842,10 @@ else
9033 /* When -fvisbility=hidden is used, assume the code has been annotated 9006 /* When -fvisbility=hidden is used, assume the code has been annotated
9034 correspondingly for the symbols needed. */ 9007 correspondingly for the symbols needed. */
9035 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9008 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -9042,7 +9015,7 @@ index bc09e7ef81..43c391c2b3 100755
9042 int main () 9015 int main ()
9043 { 9016 {
9044 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9017 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
9045@@ -12571,6 +13236,7 @@ $RM -r conftest* 9018@@ -12572,6 +13237,7 @@ $RM -r conftest*
9046 9019
9047 # Allow CC to be a program name with arguments. 9020 # Allow CC to be a program name with arguments.
9048 lt_save_CC=$CC 9021 lt_save_CC=$CC
@@ -9050,7 +9023,7 @@ index bc09e7ef81..43c391c2b3 100755
9050 lt_save_LD=$LD 9023 lt_save_LD=$LD
9051 lt_save_GCC=$GCC 9024 lt_save_GCC=$GCC
9052 GCC=$GXX 9025 GCC=$GXX
9053@@ -12588,6 +13254,7 @@ $RM -r conftest* 9026@@ -12589,6 +13255,7 @@ $RM -r conftest*
9054 fi 9027 fi
9055 test -z "${LDCXX+set}" || LD=$LDCXX 9028 test -z "${LDCXX+set}" || LD=$LDCXX
9056 CC=${CXX-"c++"} 9029 CC=${CXX-"c++"}
@@ -9058,7 +9031,7 @@ index bc09e7ef81..43c391c2b3 100755
9058 compiler=$CC 9031 compiler=$CC
9059 compiler_CXX=$CC 9032 compiler_CXX=$CC
9060 for cc_temp in $compiler""; do 9033 for cc_temp in $compiler""; do
9061@@ -12870,7 +13537,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9034@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil
9062 allow_undefined_flag_CXX='-berok' 9035 allow_undefined_flag_CXX='-berok'
9063 # Determine the default libpath from the value encoded in an empty 9036 # Determine the default libpath from the value encoded in an empty
9064 # executable. 9037 # executable.
@@ -9073,7 +9046,7 @@ index bc09e7ef81..43c391c2b3 100755
9073 /* end confdefs.h. */ 9046 /* end confdefs.h. */
9074 9047
9075 int 9048 int
9076@@ -12883,22 +13556,29 @@ main () 9049@@ -12884,22 +13557,29 @@ main ()
9077 _ACEOF 9050 _ACEOF
9078 if ac_fn_cxx_try_link "$LINENO"; then : 9051 if ac_fn_cxx_try_link "$LINENO"; then :
9079 9052
@@ -9116,7 +9089,7 @@ index bc09e7ef81..43c391c2b3 100755
9116 9089
9117 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9090 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9118 9091
9119@@ -12911,7 +13591,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9092@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp
9120 else 9093 else
9121 # Determine the default libpath from the value encoded in an 9094 # Determine the default libpath from the value encoded in an
9122 # empty executable. 9095 # empty executable.
@@ -9131,7 +9104,7 @@ index bc09e7ef81..43c391c2b3 100755
9131 /* end confdefs.h. */ 9104 /* end confdefs.h. */
9132 9105
9133 int 9106 int
9134@@ -12924,22 +13610,29 @@ main () 9107@@ -12925,22 +13611,29 @@ main ()
9135 _ACEOF 9108 _ACEOF
9136 if ac_fn_cxx_try_link "$LINENO"; then : 9109 if ac_fn_cxx_try_link "$LINENO"; then :
9137 9110
@@ -9174,7 +9147,7 @@ index bc09e7ef81..43c391c2b3 100755
9174 9147
9175 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9148 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9176 # Warning - without using the other run time loading flags, 9149 # Warning - without using the other run time loading flags,
9177@@ -12982,29 +13675,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9150@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp
9178 ;; 9151 ;;
9179 9152
9180 cygwin* | mingw* | pw32* | cegcc*) 9153 cygwin* | mingw* | pw32* | cegcc*)
@@ -9273,7 +9246,7 @@ index bc09e7ef81..43c391c2b3 100755
9273 darwin* | rhapsody*) 9246 darwin* | rhapsody*)
9274 9247
9275 9248
9276@@ -13110,7 +13849,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9249@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp
9277 ;; 9250 ;;
9278 *) 9251 *)
9279 if test "$GXX" = yes; then 9252 if test "$GXX" = yes; then
@@ -9282,7 +9255,7 @@ index bc09e7ef81..43c391c2b3 100755
9282 else 9255 else
9283 # FIXME: insert proper C++ library support 9256 # FIXME: insert proper C++ library support
9284 ld_shlibs_CXX=no 9257 ld_shlibs_CXX=no
9285@@ -13181,10 +13920,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9258@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp
9286 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9259 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9287 ;; 9260 ;;
9288 ia64*) 9261 ia64*)
@@ -9295,7 +9268,7 @@ index bc09e7ef81..43c391c2b3 100755
9295 ;; 9268 ;;
9296 esac 9269 esac
9297 fi 9270 fi
9298@@ -13225,9 +13964,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9271@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp
9299 *) 9272 *)
9300 if test "$GXX" = yes; then 9273 if test "$GXX" = yes; then
9301 if test "$with_gnu_ld" = no; then 9274 if test "$with_gnu_ld" = no; then
@@ -9307,7 +9280,7 @@ index bc09e7ef81..43c391c2b3 100755
9307 fi 9280 fi
9308 fi 9281 fi
9309 link_all_deplibs_CXX=yes 9282 link_all_deplibs_CXX=yes
9310@@ -13297,20 +14036,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9283@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp
9311 prelink_cmds_CXX='tpldir=Template.dir~ 9284 prelink_cmds_CXX='tpldir=Template.dir~
9312 rm -rf $tpldir~ 9285 rm -rf $tpldir~
9313 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9286 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -9332,7 +9305,7 @@ index bc09e7ef81..43c391c2b3 100755
9332 ;; 9305 ;;
9333 *) # Version 6 and above use weak symbols 9306 *) # Version 6 and above use weak symbols
9334 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9307 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9335@@ -13505,7 +14244,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9308@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp
9336 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 9309 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'
9337 ;; 9310 ;;
9338 *) 9311 *)
@@ -9341,7 +9314,7 @@ index bc09e7ef81..43c391c2b3 100755
9341 ;; 9314 ;;
9342 esac 9315 esac
9343 9316
9344@@ -13551,7 +14290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9317@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp
9345 9318
9346 solaris*) 9319 solaris*)
9347 case $cc_basename in 9320 case $cc_basename in
@@ -9350,7 +9323,7 @@ index bc09e7ef81..43c391c2b3 100755
9350 # Sun C++ 4.2, 5.x and Centerline C++ 9323 # Sun C++ 4.2, 5.x and Centerline C++
9351 archive_cmds_need_lc_CXX=yes 9324 archive_cmds_need_lc_CXX=yes
9352 no_undefined_flag_CXX=' -zdefs' 9325 no_undefined_flag_CXX=' -zdefs'
9353@@ -13592,9 +14331,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9326@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp
9354 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9327 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9355 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9328 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9356 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9329 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -9362,7 +9335,7 @@ index bc09e7ef81..43c391c2b3 100755
9362 9335
9363 # Commands to make compiler produce verbose output that lists 9336 # Commands to make compiler produce verbose output that lists
9364 # what "hidden" libraries, object files and flags are used when 9337 # what "hidden" libraries, object files and flags are used when
9365@@ -13729,6 +14468,13 @@ private: 9338@@ -13730,6 +14469,13 @@ private:
9366 }; 9339 };
9367 _LT_EOF 9340 _LT_EOF
9368 9341
@@ -9376,7 +9349,7 @@ index bc09e7ef81..43c391c2b3 100755
9376 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9349 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9377 (eval $ac_compile) 2>&5 9350 (eval $ac_compile) 2>&5
9378 ac_status=$? 9351 ac_status=$?
9379@@ -13742,7 +14488,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9352@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen
9380 pre_test_object_deps_done=no 9353 pre_test_object_deps_done=no
9381 9354
9382 for p in `eval "$output_verbose_link_cmd"`; do 9355 for p in `eval "$output_verbose_link_cmd"`; do
@@ -9385,7 +9358,7 @@ index bc09e7ef81..43c391c2b3 100755
9385 9358
9386 -L* | -R* | -l*) 9359 -L* | -R* | -l*)
9387 # Some compilers place space between "-{L,R}" and the path. 9360 # Some compilers place space between "-{L,R}" and the path.
9388@@ -13751,13 +14497,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9361@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen
9389 test $p = "-R"; then 9362 test $p = "-R"; then
9390 prev=$p 9363 prev=$p
9391 continue 9364 continue
@@ -9412,7 +9385,7 @@ index bc09e7ef81..43c391c2b3 100755
9412 # Internal compiler library paths should come after those 9385 # Internal compiler library paths should come after those
9413 # provided the user. The postdeps already come after the 9386 # provided the user. The postdeps already come after the
9414 # user supplied libs so there is no need to process them. 9387 # user supplied libs so there is no need to process them.
9415@@ -13777,8 +14532,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9388@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen
9416 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9389 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9417 fi 9390 fi
9418 fi 9391 fi
@@ -9423,7 +9396,7 @@ index bc09e7ef81..43c391c2b3 100755
9423 *.$objext) 9396 *.$objext)
9424 # This assumes that the test object file only shows up 9397 # This assumes that the test object file only shows up
9425 # once in the compiler output. 9398 # once in the compiler output.
9426@@ -13814,6 +14571,7 @@ else 9399@@ -13815,6 +14572,7 @@ else
9427 fi 9400 fi
9428 9401
9429 $RM -f confest.$objext 9402 $RM -f confest.$objext
@@ -9431,7 +9404,7 @@ index bc09e7ef81..43c391c2b3 100755
9431 9404
9432 # PORTME: override above test on systems where it is broken 9405 # PORTME: override above test on systems where it is broken
9433 case $host_os in 9406 case $host_os in
9434@@ -13849,7 +14607,7 @@ linux*) 9407@@ -13850,7 +14608,7 @@ linux*)
9435 9408
9436 solaris*) 9409 solaris*)
9437 case $cc_basename in 9410 case $cc_basename in
@@ -9440,7 +9413,7 @@ index bc09e7ef81..43c391c2b3 100755
9440 # The more standards-conforming stlport4 library is 9413 # The more standards-conforming stlport4 library is
9441 # incompatible with the Cstd library. Avoid specifying 9414 # incompatible with the Cstd library. Avoid specifying
9442 # it if it's in CXXFLAGS. Ignore libCrun as 9415 # it if it's in CXXFLAGS. Ignore libCrun as
9443@@ -13914,8 +14672,6 @@ fi 9416@@ -13915,8 +14673,6 @@ fi
9444 lt_prog_compiler_pic_CXX= 9417 lt_prog_compiler_pic_CXX=
9445 lt_prog_compiler_static_CXX= 9418 lt_prog_compiler_static_CXX=
9446 9419
@@ -9449,7 +9422,7 @@ index bc09e7ef81..43c391c2b3 100755
9449 9422
9450 # C++ specific cases for pic, static, wl, etc. 9423 # C++ specific cases for pic, static, wl, etc.
9451 if test "$GXX" = yes; then 9424 if test "$GXX" = yes; then
9452@@ -14020,6 +14776,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9425@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio
9453 ;; 9426 ;;
9454 esac 9427 esac
9455 ;; 9428 ;;
@@ -9461,7 +9434,7 @@ index bc09e7ef81..43c391c2b3 100755
9461 dgux*) 9434 dgux*)
9462 case $cc_basename in 9435 case $cc_basename in
9463 ec++*) 9436 ec++*)
9464@@ -14172,7 +14933,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9437@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio
9465 ;; 9438 ;;
9466 solaris*) 9439 solaris*)
9467 case $cc_basename in 9440 case $cc_basename in
@@ -9470,7 +9443,7 @@ index bc09e7ef81..43c391c2b3 100755
9470 # Sun C++ 4.2, 5.x and Centerline C++ 9443 # Sun C++ 4.2, 5.x and Centerline C++
9471 lt_prog_compiler_pic_CXX='-KPIC' 9444 lt_prog_compiler_pic_CXX='-KPIC'
9472 lt_prog_compiler_static_CXX='-Bstatic' 9445 lt_prog_compiler_static_CXX='-Bstatic'
9473@@ -14237,10 +14998,17 @@ case $host_os in 9446@@ -14238,10 +14999,17 @@ case $host_os in
9474 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9447 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9475 ;; 9448 ;;
9476 esac 9449 esac
@@ -9491,7 +9464,7 @@ index bc09e7ef81..43c391c2b3 100755
9491 9464
9492 # 9465 #
9493 # Check to make sure the PIC flag actually works. 9466 # Check to make sure the PIC flag actually works.
9494@@ -14298,6 +15066,8 @@ fi 9467@@ -14299,6 +15067,8 @@ fi
9495 9468
9496 9469
9497 9470
@@ -9500,7 +9473,7 @@ index bc09e7ef81..43c391c2b3 100755
9500 # 9473 #
9501 # Check to make sure the static flag actually works. 9474 # Check to make sure the static flag actually works.
9502 # 9475 #
9503@@ -14475,6 +15245,7 @@ fi 9476@@ -14476,6 +15246,7 @@ fi
9504 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9477 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9505 9478
9506 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9479 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -9508,7 +9481,7 @@ index bc09e7ef81..43c391c2b3 100755
9508 case $host_os in 9481 case $host_os in
9509 aix[4-9]*) 9482 aix[4-9]*)
9510 # If we're using GNU nm, then we don't want the "-C" option. 9483 # If we're using GNU nm, then we don't want the "-C" option.
9511@@ -14489,15 +15260,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9484@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil
9512 ;; 9485 ;;
9513 pw32*) 9486 pw32*)
9514 export_symbols_cmds_CXX="$ltdll_cmds" 9487 export_symbols_cmds_CXX="$ltdll_cmds"
@@ -9534,7 +9507,7 @@ index bc09e7ef81..43c391c2b3 100755
9534 9507
9535 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9508 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9536 $as_echo "$ld_shlibs_CXX" >&6; } 9509 $as_echo "$ld_shlibs_CXX" >&6; }
9537@@ -14760,8 +15536,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9510@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9538 need_version=no 9511 need_version=no
9539 need_lib_prefix=no 9512 need_lib_prefix=no
9540 9513
@@ -9546,7 +9519,7 @@ index bc09e7ef81..43c391c2b3 100755
9546 library_names_spec='$libname.dll.a' 9519 library_names_spec='$libname.dll.a'
9547 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9520 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9548 postinstall_cmds='base_file=`basename \${file}`~ 9521 postinstall_cmds='base_file=`basename \${file}`~
9549@@ -14793,13 +15570,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9522@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9550 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9523 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9551 ;; 9524 ;;
9552 esac 9525 esac
@@ -9619,7 +9592,7 @@ index bc09e7ef81..43c391c2b3 100755
9619 # FIXME: first we should search . and the directory the executable is in 9592 # FIXME: first we should search . and the directory the executable is in
9620 shlibpath_var=PATH 9593 shlibpath_var=PATH
9621 ;; 9594 ;;
9622@@ -14890,7 +15725,7 @@ haiku*) 9595@@ -14891,7 +15726,7 @@ haiku*)
9623 soname_spec='${libname}${release}${shared_ext}$major' 9596 soname_spec='${libname}${release}${shared_ext}$major'
9624 shlibpath_var=LIBRARY_PATH 9597 shlibpath_var=LIBRARY_PATH
9625 shlibpath_overrides_runpath=yes 9598 shlibpath_overrides_runpath=yes
@@ -9628,7 +9601,7 @@ index bc09e7ef81..43c391c2b3 100755
9628 hardcode_into_libs=yes 9601 hardcode_into_libs=yes
9629 ;; 9602 ;;
9630 9603
9631@@ -15349,6 +16184,7 @@ fi 9604@@ -15350,6 +16185,7 @@ fi
9632 fi # test -n "$compiler" 9605 fi # test -n "$compiler"
9633 9606
9634 CC=$lt_save_CC 9607 CC=$lt_save_CC
@@ -9636,7 +9609,7 @@ index bc09e7ef81..43c391c2b3 100755
9636 LDCXX=$LD 9609 LDCXX=$LD
9637 LD=$lt_save_LD 9610 LD=$lt_save_LD
9638 GCC=$lt_save_GCC 9611 GCC=$lt_save_GCC
9639@@ -18444,13 +19280,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9612@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
9640 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9613 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9641 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9614 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9642 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9615 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -9657,7 +9630,7 @@ index bc09e7ef81..43c391c2b3 100755
9657 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9630 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9658 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9631 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9659 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9632 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9660@@ -18465,14 +19308,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9633@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
9661 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9634 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
9662 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9635 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
9663 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"`' 9636 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -9676,7 +9649,7 @@ index bc09e7ef81..43c391c2b3 100755
9676 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9649 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9677 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9650 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9678 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9651 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9679@@ -18505,12 +19351,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9652@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
9680 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9653 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9681 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9654 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9682 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9655 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -9690,7 +9663,7 @@ index bc09e7ef81..43c391c2b3 100755
9690 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9663 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9691 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9664 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9692 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9665 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
9693@@ -18549,8 +19395,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9666@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi
9694 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9667 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9695 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9668 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9696 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9669 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9700,7 +9673,7 @@ index bc09e7ef81..43c391c2b3 100755
9700 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9673 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9701 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9674 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9702 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9675 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9703@@ -18577,12 +19423,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9676@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har
9704 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9677 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9705 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9678 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9706 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9679 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
@@ -9714,7 +9687,7 @@ index bc09e7ef81..43c391c2b3 100755
9714 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9687 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9715 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9688 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9716 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9689 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9717@@ -18620,8 +19466,13 @@ reload_flag \ 9690@@ -18625,8 +19471,13 @@ reload_flag \
9718 OBJDUMP \ 9691 OBJDUMP \
9719 deplibs_check_method \ 9692 deplibs_check_method \
9720 file_magic_cmd \ 9693 file_magic_cmd \
@@ -9728,7 +9701,7 @@ index bc09e7ef81..43c391c2b3 100755
9728 STRIP \ 9701 STRIP \
9729 RANLIB \ 9702 RANLIB \
9730 CC \ 9703 CC \
9731@@ -18631,12 +19482,14 @@ lt_cv_sys_global_symbol_pipe \ 9704@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \
9732 lt_cv_sys_global_symbol_to_cdecl \ 9705 lt_cv_sys_global_symbol_to_cdecl \
9733 lt_cv_sys_global_symbol_to_c_name_address \ 9706 lt_cv_sys_global_symbol_to_c_name_address \
9734 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9707 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -9744,7 +9717,7 @@ index bc09e7ef81..43c391c2b3 100755
9744 DSYMUTIL \ 9717 DSYMUTIL \
9745 NMEDIT \ 9718 NMEDIT \
9746 LIPO \ 9719 LIPO \
9747@@ -18652,7 +19505,6 @@ no_undefined_flag \ 9720@@ -18657,7 +19510,6 @@ no_undefined_flag \
9748 hardcode_libdir_flag_spec \ 9721 hardcode_libdir_flag_spec \
9749 hardcode_libdir_flag_spec_ld \ 9722 hardcode_libdir_flag_spec_ld \
9750 hardcode_libdir_separator \ 9723 hardcode_libdir_separator \
@@ -9752,7 +9725,7 @@ index bc09e7ef81..43c391c2b3 100755
9752 exclude_expsyms \ 9725 exclude_expsyms \
9753 include_expsyms \ 9726 include_expsyms \
9754 file_list_spec \ 9727 file_list_spec \
9755@@ -18674,8 +19526,8 @@ LD_CXX \ 9728@@ -18679,8 +19531,8 @@ LD_CXX \
9756 reload_flag_CXX \ 9729 reload_flag_CXX \
9757 compiler_CXX \ 9730 compiler_CXX \
9758 lt_prog_compiler_no_builtin_flag_CXX \ 9731 lt_prog_compiler_no_builtin_flag_CXX \
@@ -9762,7 +9735,7 @@ index bc09e7ef81..43c391c2b3 100755
9762 lt_prog_compiler_static_CXX \ 9735 lt_prog_compiler_static_CXX \
9763 lt_cv_prog_compiler_c_o_CXX \ 9736 lt_cv_prog_compiler_c_o_CXX \
9764 export_dynamic_flag_spec_CXX \ 9737 export_dynamic_flag_spec_CXX \
9765@@ -18687,7 +19539,6 @@ no_undefined_flag_CXX \ 9738@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \
9766 hardcode_libdir_flag_spec_CXX \ 9739 hardcode_libdir_flag_spec_CXX \
9767 hardcode_libdir_flag_spec_ld_CXX \ 9740 hardcode_libdir_flag_spec_ld_CXX \
9768 hardcode_libdir_separator_CXX \ 9741 hardcode_libdir_separator_CXX \
@@ -9770,7 +9743,7 @@ index bc09e7ef81..43c391c2b3 100755
9770 exclude_expsyms_CXX \ 9743 exclude_expsyms_CXX \
9771 include_expsyms_CXX \ 9744 include_expsyms_CXX \
9772 file_list_spec_CXX \ 9745 file_list_spec_CXX \
9773@@ -18721,6 +19572,7 @@ module_cmds \ 9746@@ -18726,6 +19577,7 @@ module_cmds \
9774 module_expsym_cmds \ 9747 module_expsym_cmds \
9775 export_symbols_cmds \ 9748 export_symbols_cmds \
9776 prelink_cmds \ 9749 prelink_cmds \
@@ -9778,7 +9751,7 @@ index bc09e7ef81..43c391c2b3 100755
9778 postinstall_cmds \ 9751 postinstall_cmds \
9779 postuninstall_cmds \ 9752 postuninstall_cmds \
9780 finish_cmds \ 9753 finish_cmds \
9781@@ -18735,7 +19587,8 @@ archive_expsym_cmds_CXX \ 9754@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \
9782 module_cmds_CXX \ 9755 module_cmds_CXX \
9783 module_expsym_cmds_CXX \ 9756 module_expsym_cmds_CXX \
9784 export_symbols_cmds_CXX \ 9757 export_symbols_cmds_CXX \
@@ -9788,7 +9761,7 @@ index bc09e7ef81..43c391c2b3 100755
9788 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9761 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9789 *[\\\\\\\`\\"\\\$]*) 9762 *[\\\\\\\`\\"\\\$]*)
9790 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9763 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9791@@ -19539,7 +20392,8 @@ $as_echo X"$file" | 9764@@ -19505,7 +20358,8 @@ $as_echo X"$file" |
9792 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9765 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9793 # 9766 #
9794 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9767 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -9798,7 +9771,7 @@ index bc09e7ef81..43c391c2b3 100755
9798 # Written by Gordon Matzigkeit, 1996 9771 # Written by Gordon Matzigkeit, 1996
9799 # 9772 #
9800 # This file is part of GNU Libtool. 9773 # This file is part of GNU Libtool.
9801@@ -19642,19 +20496,42 @@ SP2NL=$lt_lt_SP2NL 9774@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL
9802 # turn newlines into spaces. 9775 # turn newlines into spaces.
9803 NL2SP=$lt_lt_NL2SP 9776 NL2SP=$lt_lt_NL2SP
9804 9777
@@ -9842,7 +9815,7 @@ index bc09e7ef81..43c391c2b3 100755
9842 # A symbol stripping program. 9815 # A symbol stripping program.
9843 STRIP=$lt_STRIP 9816 STRIP=$lt_STRIP
9844 9817
9845@@ -19684,6 +20561,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9818@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c
9846 # Transform the output of nm in a C name address pair when lib prefix is needed. 9819 # Transform the output of nm in a C name address pair when lib prefix is needed.
9847 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9820 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9848 9821
@@ -9855,7 +9828,7 @@ index bc09e7ef81..43c391c2b3 100755
9855 # The name of the directory that contains temporary libtool files. 9828 # The name of the directory that contains temporary libtool files.
9856 objdir=$objdir 9829 objdir=$objdir
9857 9830
9858@@ -19693,6 +20576,9 @@ MAGIC_CMD=$MAGIC_CMD 9831@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD
9859 # Must we lock files when doing compilation? 9832 # Must we lock files when doing compilation?
9860 need_locks=$lt_need_locks 9833 need_locks=$lt_need_locks
9861 9834
@@ -9865,7 +9838,7 @@ index bc09e7ef81..43c391c2b3 100755
9865 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9838 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9866 DSYMUTIL=$lt_DSYMUTIL 9839 DSYMUTIL=$lt_DSYMUTIL
9867 9840
9868@@ -19807,12 +20693,12 @@ with_gcc=$GCC 9841@@ -19773,12 +20659,12 @@ with_gcc=$GCC
9869 # Compiler flag to turn off builtin functions. 9842 # Compiler flag to turn off builtin functions.
9870 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9843 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9871 9844
@@ -9881,7 +9854,7 @@ index bc09e7ef81..43c391c2b3 100755
9881 # Compiler flag to prevent dynamic linking. 9854 # Compiler flag to prevent dynamic linking.
9882 link_static_flag=$lt_lt_prog_compiler_static 9855 link_static_flag=$lt_lt_prog_compiler_static
9883 9856
9884@@ -19899,9 +20785,6 @@ inherit_rpath=$inherit_rpath 9857@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath
9885 # Whether libtool must link a program against all its dependency libraries. 9858 # Whether libtool must link a program against all its dependency libraries.
9886 link_all_deplibs=$link_all_deplibs 9859 link_all_deplibs=$link_all_deplibs
9887 9860
@@ -9891,7 +9864,7 @@ index bc09e7ef81..43c391c2b3 100755
9891 # Set to "yes" if exported symbols are required. 9864 # Set to "yes" if exported symbols are required.
9892 always_export_symbols=$always_export_symbols 9865 always_export_symbols=$always_export_symbols
9893 9866
9894@@ -19917,6 +20800,9 @@ include_expsyms=$lt_include_expsyms 9867@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms
9895 # Commands necessary for linking programs (against libraries) with templates. 9868 # Commands necessary for linking programs (against libraries) with templates.
9896 prelink_cmds=$lt_prelink_cmds 9869 prelink_cmds=$lt_prelink_cmds
9897 9870
@@ -9901,7 +9874,7 @@ index bc09e7ef81..43c391c2b3 100755
9901 # Specify filename containing input files. 9874 # Specify filename containing input files.
9902 file_list_spec=$lt_file_list_spec 9875 file_list_spec=$lt_file_list_spec
9903 9876
9904@@ -19963,210 +20849,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 9877@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9905 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9878 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9906 # text mode, it properly converts lines to CR/LF. This bash problem 9879 # text mode, it properly converts lines to CR/LF. This bash problem
9907 # is reportedly fixed, but why not run on old versions too? 9880 # is reportedly fixed, but why not run on old versions too?
@@ -10103,15 +10076,9 @@ index bc09e7ef81..43c391c2b3 100755
10103-_LT_EOF 10076-_LT_EOF
10104- ;; 10077- ;;
10105- esac 10078- esac
10106-
10107-
10108- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10109- || (rm -f "$cfgfile"; exit 1)
10110-
10111- mv -f "$cfgfile" "$ofile" ||
10112+ sed '$q' "$ltmain" >> "$cfgfile" \ 10079+ sed '$q' "$ltmain" >> "$cfgfile" \
10113+ || (rm -f "$cfgfile"; exit 1) 10080+ || (rm -f "$cfgfile"; exit 1)
10114+ 10081
10115+ if test x"$xsi_shell" = xyes; then 10082+ if test x"$xsi_shell" = xyes; then
10116+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 10083+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10117+func_dirname ()\ 10084+func_dirname ()\
@@ -10269,13 +10236,16 @@ index bc09e7ef81..43c391c2b3 100755
10269+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 10236+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10270+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 10237+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10271+fi 10238+fi
10272+ 10239
10273+ 10240- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10241- || (rm -f "$cfgfile"; exit 1)
10242
10243- mv -f "$cfgfile" "$ofile" ||
10274+ mv -f "$cfgfile" "$ofile" || 10244+ mv -f "$cfgfile" "$ofile" ||
10275 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10245 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10276 chmod +x "$ofile" 10246 chmod +x "$ofile"
10277 10247
10278@@ -20194,12 +21039,12 @@ with_gcc=$GCC_CXX 10248@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX
10279 # Compiler flag to turn off builtin functions. 10249 # Compiler flag to turn off builtin functions.
10280 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10250 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10281 10251
@@ -10291,7 +10261,7 @@ index bc09e7ef81..43c391c2b3 100755
10291 # Compiler flag to prevent dynamic linking. 10261 # Compiler flag to prevent dynamic linking.
10292 link_static_flag=$lt_lt_prog_compiler_static_CXX 10262 link_static_flag=$lt_lt_prog_compiler_static_CXX
10293 10263
10294@@ -20286,9 +21131,6 @@ inherit_rpath=$inherit_rpath_CXX 10264@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX
10295 # Whether libtool must link a program against all its dependency libraries. 10265 # Whether libtool must link a program against all its dependency libraries.
10296 link_all_deplibs=$link_all_deplibs_CXX 10266 link_all_deplibs=$link_all_deplibs_CXX
10297 10267
@@ -10301,7 +10271,7 @@ index bc09e7ef81..43c391c2b3 100755
10301 # Set to "yes" if exported symbols are required. 10271 # Set to "yes" if exported symbols are required.
10302 always_export_symbols=$always_export_symbols_CXX 10272 always_export_symbols=$always_export_symbols_CXX
10303 10273
10304@@ -20304,6 +21146,9 @@ include_expsyms=$lt_include_expsyms_CXX 10274@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX
10305 # Commands necessary for linking programs (against libraries) with templates. 10275 # Commands necessary for linking programs (against libraries) with templates.
10306 prelink_cmds=$lt_prelink_cmds_CXX 10276 prelink_cmds=$lt_prelink_cmds_CXX
10307 10277
@@ -10311,8 +10281,6 @@ index bc09e7ef81..43c391c2b3 100755
10311 # Specify filename containing input files. 10281 # Specify filename containing input files.
10312 file_list_spec=$lt_file_list_spec_CXX 10282 file_list_spec=$lt_file_list_spec_CXX
10313 10283
10314diff --git a/libtool.m4 b/libtool.m4
10315index 434530059f..e45fdc6998 100644
10316--- a/libtool.m4 10284--- a/libtool.m4
10317+++ b/libtool.m4 10285+++ b/libtool.m4
10318@@ -1,7 +1,8 @@ 10286@@ -1,7 +1,8 @@
@@ -10354,7 +10322,7 @@ index 434530059f..e45fdc6998 100644
10354 AC_SUBST(LIBTOOL)dnl 10322 AC_SUBST(LIBTOOL)dnl
10355 10323
10356 _LT_SETUP 10324 _LT_SETUP
10357@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl 10325@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable
10358 dnl 10326 dnl
10359 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 10327 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10360 m4_require([_LT_CHECK_SHELL_FEATURES])dnl 10328 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
@@ -10377,7 +10345,7 @@ index 434530059f..e45fdc6998 100644
10377 can_build_shared=yes 10345 can_build_shared=yes
10378 10346
10379 # All known linkers require a `.a' archive for static linking (except MSVC, 10347 # All known linkers require a `.a' archive for static linking (except MSVC,
10380@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl 10348@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
10381 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) 10349 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
10382 configured by $[0], generated by m4_PACKAGE_STRING. 10350 configured by $[0], generated by m4_PACKAGE_STRING.
10383 10351
@@ -10482,7 +10450,7 @@ index 434530059f..e45fdc6998 100644
10482 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 10450 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10483 ECHO='print -r --' 10451 ECHO='print -r --'
10484 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 10452 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10485@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) 10453@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr
10486 ])# _LT_PROG_ECHO_BACKSLASH 10454 ])# _LT_PROG_ECHO_BACKSLASH
10487 10455
10488 10456
@@ -10735,7 +10703,7 @@ index 434530059f..e45fdc6998 100644
10735 file_magic_cmd=$lt_cv_file_magic_cmd 10703 file_magic_cmd=$lt_cv_file_magic_cmd
10736 deplibs_check_method=$lt_cv_deplibs_check_method 10704 deplibs_check_method=$lt_cv_deplibs_check_method
10737 test -z "$deplibs_check_method" && deplibs_check_method=unknown 10705 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10738@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 10706@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli
10739 _LT_DECL([], [deplibs_check_method], [1], 10707 _LT_DECL([], [deplibs_check_method], [1],
10740 [Method to check whether dependent libraries are shared objects]) 10708 [Method to check whether dependent libraries are shared objects])
10741 _LT_DECL([], [file_magic_cmd], [1], 10709 _LT_DECL([], [file_magic_cmd], [1],
@@ -10863,7 +10831,7 @@ index 434530059f..e45fdc6998 100644
10863 const char *name; 10831 const char *name;
10864 void *address; 10832 void *address;
10865 } 10833 }
10866@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { 10834@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup()
10867 _LT_EOF 10835 _LT_EOF
10868 # Now try linking the two files. 10836 # Now try linking the two files.
10869 mv conftest.$ac_objext conftstm.$ac_objext 10837 mv conftest.$ac_objext conftstm.$ac_objext
@@ -10897,7 +10865,7 @@ index 434530059f..e45fdc6998 100644
10897 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 10865 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
10898 [Take the output of nm and produce a listing of raw symbols and C names]) 10866 [Take the output of nm and produce a listing of raw symbols and C names])
10899 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 10867 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
10900@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], 10868@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres
10901 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 10869 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
10902 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 10870 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
10903 [Transform the output of nm in a C name address pair when lib prefix is needed]) 10871 [Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -10982,7 +10950,7 @@ index 434530059f..e45fdc6998 100644
10982 # 10950 #
10983 # Check to make sure the static flag actually works. 10951 # Check to make sure the static flag actually works.
10984 # 10952 #
10985@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 10953@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog
10986 m4_defun([_LT_LINKER_SHLIBS], 10954 m4_defun([_LT_LINKER_SHLIBS],
10987 [AC_REQUIRE([LT_PATH_LD])dnl 10955 [AC_REQUIRE([LT_PATH_LD])dnl
10988 AC_REQUIRE([LT_PATH_NM])dnl 10956 AC_REQUIRE([LT_PATH_NM])dnl
@@ -11304,7 +11272,7 @@ index 434530059f..e45fdc6998 100644
11304 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 11272 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11305 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 11273 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11306 (test "X$CXX" != "Xg++"))) ; then 11274 (test "X$CXX" != "Xg++"))) ; then
11307@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11275@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes;
11308 11276
11309 # Allow CC to be a program name with arguments. 11277 # Allow CC to be a program name with arguments.
11310 lt_save_CC=$CC 11278 lt_save_CC=$CC
@@ -11312,7 +11280,7 @@ index 434530059f..e45fdc6998 100644
11312 lt_save_LD=$LD 11280 lt_save_LD=$LD
11313 lt_save_GCC=$GCC 11281 lt_save_GCC=$GCC
11314 GCC=$GXX 11282 GCC=$GXX
11315@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11283@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes;
11316 fi 11284 fi
11317 test -z "${LDCXX+set}" || LD=$LDCXX 11285 test -z "${LDCXX+set}" || LD=$LDCXX
11318 CC=${CXX-"c++"} 11286 CC=${CXX-"c++"}
@@ -11320,7 +11288,7 @@ index 434530059f..e45fdc6998 100644
11320 compiler=$CC 11288 compiler=$CC
11321 _LT_TAGVAR(compiler, $1)=$CC 11289 _LT_TAGVAR(compiler, $1)=$CC
11322 _LT_CC_BASENAME([$compiler]) 11290 _LT_CC_BASENAME([$compiler])
11323@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11291@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes;
11324 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 11292 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11325 # Determine the default libpath from the value encoded in an empty 11293 # Determine the default libpath from the value encoded in an empty
11326 # executable. 11294 # executable.
@@ -11329,7 +11297,7 @@ index 434530059f..e45fdc6998 100644
11329 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 11297 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11330 11298
11331 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 11299 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11332@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11300@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes;
11333 else 11301 else
11334 # Determine the default libpath from the value encoded in an 11302 # Determine the default libpath from the value encoded in an
11335 # empty executable. 11303 # empty executable.
@@ -11338,7 +11306,7 @@ index 434530059f..e45fdc6998 100644
11338 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 11306 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11339 # Warning - without using the other run time loading flags, 11307 # Warning - without using the other run time loading flags,
11340 # -berok will link without error, but may produce a broken library. 11308 # -berok will link without error, but may produce a broken library.
11341@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then 11309@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes;
11342 ;; 11310 ;;
11343 11311
11344 cygwin* | mingw* | pw32* | cegcc*) 11312 cygwin* | mingw* | pw32* | cegcc*)
@@ -11437,7 +11405,7 @@ index 434530059f..e45fdc6998 100644
11437 darwin* | rhapsody*) 11405 darwin* | rhapsody*)
11438 _LT_DARWIN_LINKER_FEATURES($1) 11406 _LT_DARWIN_LINKER_FEATURES($1)
11439 ;; 11407 ;;
11440@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11408@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes;
11441 ;; 11409 ;;
11442 *) 11410 *)
11443 if test "$GXX" = yes; then 11411 if test "$GXX" = yes; then
@@ -11446,7 +11414,7 @@ index 434530059f..e45fdc6998 100644
11446 else 11414 else
11447 # FIXME: insert proper C++ library support 11415 # FIXME: insert proper C++ library support
11448 _LT_TAGVAR(ld_shlibs, $1)=no 11416 _LT_TAGVAR(ld_shlibs, $1)=no
11449@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then 11417@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes;
11450 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 11418 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11451 ;; 11419 ;;
11452 ia64*) 11420 ia64*)
@@ -11459,7 +11427,7 @@ index 434530059f..e45fdc6998 100644
11459 ;; 11427 ;;
11460 esac 11428 esac
11461 fi 11429 fi
11462@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then 11430@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes;
11463 *) 11431 *)
11464 if test "$GXX" = yes; then 11432 if test "$GXX" = yes; then
11465 if test "$with_gnu_ld" = no; then 11433 if test "$with_gnu_ld" = no; then
@@ -11471,7 +11439,7 @@ index 434530059f..e45fdc6998 100644
11471 fi 11439 fi
11472 fi 11440 fi
11473 _LT_TAGVAR(link_all_deplibs, $1)=yes 11441 _LT_TAGVAR(link_all_deplibs, $1)=yes
11474@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then 11442@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes;
11475 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 11443 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
11476 rm -rf $tpldir~ 11444 rm -rf $tpldir~
11477 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 11445 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -11496,7 +11464,7 @@ index 434530059f..e45fdc6998 100644
11496 ;; 11464 ;;
11497 *) # Version 6 and above use weak symbols 11465 *) # Version 6 and above use weak symbols
11498 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 11466 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11499@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11467@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes;
11500 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 11468 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11501 ;; 11469 ;;
11502 *) 11470 *)
@@ -11505,7 +11473,7 @@ index 434530059f..e45fdc6998 100644
11505 ;; 11473 ;;
11506 esac 11474 esac
11507 11475
11508@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11476@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes;
11509 11477
11510 solaris*) 11478 solaris*)
11511 case $cc_basename in 11479 case $cc_basename in
@@ -11514,7 +11482,7 @@ index 434530059f..e45fdc6998 100644
11514 # Sun C++ 4.2, 5.x and Centerline C++ 11482 # Sun C++ 4.2, 5.x and Centerline C++
11515 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 11483 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
11516 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 11484 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
11517@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then 11485@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes;
11518 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 11486 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11519 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 11487 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
11520 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 11488 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -11526,7 +11494,7 @@ index 434530059f..e45fdc6998 100644
11526 11494
11527 # Commands to make compiler produce verbose output that lists 11495 # Commands to make compiler produce verbose output that lists
11528 # what "hidden" libraries, object files and flags are used when 11496 # what "hidden" libraries, object files and flags are used when
11529@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then 11497@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes;
11530 fi # test -n "$compiler" 11498 fi # test -n "$compiler"
11531 11499
11532 CC=$lt_save_CC 11500 CC=$lt_save_CC
@@ -11734,7 +11702,7 @@ index 434530059f..e45fdc6998 100644
11734 ])# _LT_LANG_RC_CONFIG 11702 ])# _LT_LANG_RC_CONFIG
11735 11703
11736 11704
11737@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 11705@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object
11738 AC_SUBST([OBJDUMP]) 11706 AC_SUBST([OBJDUMP])
11739 ]) 11707 ])
11740 11708
@@ -11761,7 +11729,7 @@ index 434530059f..e45fdc6998 100644
11761 && eval 'test $(( 1 + 1 )) -eq 2 \ 11729 && eval 'test $(( 1 + 1 )) -eq 2 \
11762 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 11730 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11763 && xsi_shell=yes 11731 && xsi_shell=yes
11764@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 11732@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
11765 ])# _LT_CHECK_SHELL_FEATURES 11733 ])# _LT_CHECK_SHELL_FEATURES
11766 11734
11767 11735
@@ -11859,6 +11827,31 @@ index 434530059f..e45fdc6998 100644
11859-{ 11827-{
11860- func_len_result=${#1} 11828- func_len_result=${#1}
11861-} 11829-}
11830-
11831-_LT_EOF
11832- ;;
11833- *) # Bourne compatible functions.
11834- cat << \_LT_EOF >> "$cfgfile"
11835-
11836-# func_dirname file append nondir_replacement
11837-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11838-# otherwise set result to NONDIR_REPLACEMENT.
11839-func_dirname ()
11840-{
11841- # Extract subdirectory from the argument.
11842- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11843- if test "X$func_dirname_result" = "X${1}"; then
11844- func_dirname_result="${3}"
11845- else
11846- func_dirname_result="$func_dirname_result${2}"
11847- fi
11848-}
11849-
11850-# func_basename file
11851-func_basename ()
11852-{
11853- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11854-}
11862+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) 11855+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
11863+# ------------------------------------------------------ 11856+# ------------------------------------------------------
11864+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and 11857+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
@@ -11875,23 +11868,22 @@ index 434530059f..e45fdc6998 100644
11875+test 0 -eq $? || _lt_function_replace_fail=: 11868+test 0 -eq $? || _lt_function_replace_fail=:
11876+]) 11869+])
11877 11870
11878-_LT_EOF 11871-dnl func_dirname_and_basename
11879- ;; 11872-dnl A portable version of this function is already defined in general.m4sh
11880- *) # Bourne compatible functions. 11873-dnl so there is no need for it here.
11881- cat << \_LT_EOF >> "$cfgfile"
11882 11874
11883-# func_dirname file append nondir_replacement 11875-# func_stripname prefix suffix name
11884-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 11876-# strip PREFIX and SUFFIX off of NAME.
11885-# otherwise set result to NONDIR_REPLACEMENT. 11877-# PREFIX and SUFFIX must not contain globbing or regex special
11886-func_dirname () 11878-# characters, hashes, percent signs, but SUFFIX may contain a leading
11879-# dot (in which case that matches only a dot).
11880-# func_strip_suffix prefix name
11881-func_stripname ()
11887-{ 11882-{
11888- # Extract subdirectory from the argument. 11883- case ${2} in
11889- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 11884- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11890- if test "X$func_dirname_result" = "X${1}"; then 11885- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11891- func_dirname_result="${3}" 11886- esac
11892- else
11893- func_dirname_result="$func_dirname_result${2}"
11894- fi
11895-} 11887-}
11896+# _LT_PROG_REPLACE_SHELLFNS 11888+# _LT_PROG_REPLACE_SHELLFNS
11897+# ------------------------- 11889+# -------------------------
@@ -11915,45 +11907,24 @@ index 434530059f..e45fdc6998 100644
11915+ esac 11907+ esac
11916+ func_basename_result="${1##*/}"]) 11908+ func_basename_result="${1##*/}"])
11917 11909
11918-# func_basename file 11910-# sed scripts:
11919-func_basename () 11911-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11920-{ 11912-my_sed_long_arg='1s/^-[[^=]]*=//'
11921- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11922-}
11923+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl 11913+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
11924+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 11914+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11925+ # positional parameters, so assign one to ordinary parameter first. 11915+ # positional parameters, so assign one to ordinary parameter first.
11926+ func_stripname_result=${3} 11916+ func_stripname_result=${3}
11927+ func_stripname_result=${func_stripname_result#"${1}"} 11917+ func_stripname_result=${func_stripname_result#"${1}"}
11928+ func_stripname_result=${func_stripname_result%"${2}"}]) 11918+ func_stripname_result=${func_stripname_result%"${2}"}])
11929 11919+
11930-dnl func_dirname_and_basename
11931-dnl A portable version of this function is already defined in general.m4sh
11932-dnl so there is no need for it here.
11933+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl 11920+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
11934+ func_split_long_opt_name=${1%%=*} 11921+ func_split_long_opt_name=${1%%=*}
11935+ func_split_long_opt_arg=${1#*=}]) 11922+ func_split_long_opt_arg=${1#*=}])
11936 11923+
11937-# func_stripname prefix suffix name
11938-# strip PREFIX and SUFFIX off of NAME.
11939-# PREFIX and SUFFIX must not contain globbing or regex special
11940-# characters, hashes, percent signs, but SUFFIX may contain a leading
11941-# dot (in which case that matches only a dot).
11942-# func_strip_suffix prefix name
11943-func_stripname ()
11944-{
11945- case ${2} in
11946- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11947- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11948- esac
11949-}
11950+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl 11924+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
11951+ func_split_short_opt_arg=${1#??} 11925+ func_split_short_opt_arg=${1#??}
11952+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) 11926+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
11953 11927+
11954-# sed scripts:
11955-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11956-my_sed_long_arg='1s/^-[[^=]]*=//'
11957+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl 11928+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
11958+ case ${1} in 11929+ case ${1} in
11959+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 11930+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
@@ -12001,9 +11972,7 @@ index 434530059f..e45fdc6998 100644
12001+ func_quote_for_eval "${2}" 11972+ func_quote_for_eval "${2}"
12002+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ 11973+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
12003+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) 11974+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
12004 11975+
12005-_LT_EOF
12006-esac
12007+ # Save a `func_append' function call where possible by direct use of '+=' 11976+ # Save a `func_append' function call where possible by direct use of '+='
12008+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 11977+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
12009+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 11978+ && mv -f "$cfgfile.tmp" "$cfgfile" \
@@ -12017,14 +11986,17 @@ index 434530059f..e45fdc6998 100644
12017+ test 0 -eq $? || _lt_function_replace_fail=: 11986+ test 0 -eq $? || _lt_function_replace_fail=:
12018+fi 11987+fi
12019 11988
12020-case $lt_shell_append in 11989-_LT_EOF
12021- yes) 11990-esac
12022- cat << \_LT_EOF >> "$cfgfile"
12023+if test x"$_lt_function_replace_fail" = x":"; then 11991+if test x"$_lt_function_replace_fail" = x":"; then
12024+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) 11992+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
12025+fi 11993+fi
12026+]) 11994+])
12027 11995
11996-case $lt_shell_append in
11997- yes)
11998- cat << \_LT_EOF >> "$cfgfile"
11999-
12028-# func_append var value 12000-# func_append var value
12029-# Append VALUE to the end of shell variable VAR. 12001-# Append VALUE to the end of shell variable VAR.
12030-func_append () 12002-func_append ()
@@ -12110,8 +12082,6 @@ index 434530059f..e45fdc6998 100644
12110+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], 12082+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
12111+ [0], [convert $build files to toolchain format])dnl 12083+ [0], [convert $build files to toolchain format])dnl
12112+])# _LT_PATH_CONVERSION_FUNCTIONS 12084+])# _LT_PATH_CONVERSION_FUNCTIONS
12113diff --git a/ltmain.sh b/ltmain.sh
12114index 9503ec85d7..70e856e065 100644
12115--- a/ltmain.sh 12085--- a/ltmain.sh
12116+++ b/ltmain.sh 12086+++ b/ltmain.sh
12117@@ -1,10 +1,9 @@ 12087@@ -1,10 +1,9 @@
@@ -12543,31 +12513,7 @@ index 9503ec85d7..70e856e065 100644
12543+$progname: of $PACKAGE $VERSION and run autoconf again. 12513+$progname: of $PACKAGE $VERSION and run autoconf again.
12544+_LT_EOF 12514+_LT_EOF
12545+ fi 12515+ fi
12546 12516+
12547- # Shorthand for --mode=foo, only valid as the first argument
12548- case $1 in
12549- clean|clea|cle|cl)
12550- shift; set dummy --mode clean ${1+"$@"}; shift
12551- ;;
12552- compile|compil|compi|comp|com|co|c)
12553- shift; set dummy --mode compile ${1+"$@"}; shift
12554- ;;
12555- execute|execut|execu|exec|exe|ex|e)
12556- shift; set dummy --mode execute ${1+"$@"}; shift
12557- ;;
12558- finish|finis|fini|fin|fi|f)
12559- shift; set dummy --mode finish ${1+"$@"}; shift
12560- ;;
12561- install|instal|insta|inst|ins|in|i)
12562- shift; set dummy --mode install ${1+"$@"}; shift
12563- ;;
12564- link|lin|li|l)
12565- shift; set dummy --mode link ${1+"$@"}; shift
12566- ;;
12567- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12568- shift; set dummy --mode uninstall ${1+"$@"}; shift
12569- ;;
12570- esac
12571+ exit $EXIT_MISMATCH 12517+ exit $EXIT_MISMATCH
12572+ fi 12518+ fi
12573+} 12519+}
@@ -12597,9 +12543,7 @@ index 9503ec85d7..70e856e065 100644
12597+ shift; set dummy --mode uninstall ${1+"$@"}; shift 12543+ shift; set dummy --mode uninstall ${1+"$@"}; shift
12598+ ;; 12544+ ;;
12599+esac 12545+esac
12600 12546+
12601- # Parse non-mode specific arguments:
12602- while test "$#" -gt 0; do
12603+ 12547+
12604+ 12548+
12605+# Option defaults: 12549+# Option defaults:
@@ -12615,8 +12559,34 @@ index 9503ec85d7..70e856e065 100644
12615+opt_verbose=: 12559+opt_verbose=:
12616+opt_silent=false 12560+opt_silent=false
12617+opt_verbose=false 12561+opt_verbose=false
12618+ 12562
12619+ 12563- # Shorthand for --mode=foo, only valid as the first argument
12564- case $1 in
12565- clean|clea|cle|cl)
12566- shift; set dummy --mode clean ${1+"$@"}; shift
12567- ;;
12568- compile|compil|compi|comp|com|co|c)
12569- shift; set dummy --mode compile ${1+"$@"}; shift
12570- ;;
12571- execute|execut|execu|exec|exe|ex|e)
12572- shift; set dummy --mode execute ${1+"$@"}; shift
12573- ;;
12574- finish|finis|fini|fin|fi|f)
12575- shift; set dummy --mode finish ${1+"$@"}; shift
12576- ;;
12577- install|instal|insta|inst|ins|in|i)
12578- shift; set dummy --mode install ${1+"$@"}; shift
12579- ;;
12580- link|lin|li|l)
12581- shift; set dummy --mode link ${1+"$@"}; shift
12582- ;;
12583- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12584- shift; set dummy --mode uninstall ${1+"$@"}; shift
12585- ;;
12586- esac
12587
12588- # Parse non-mode specific arguments:
12589- while test "$#" -gt 0; do
12620+# Parse options once, thoroughly. This comes as soon as possible in the 12590+# Parse options once, thoroughly. This comes as soon as possible in the
12621+# script to make things like `--version' happen as quickly as we can. 12591+# script to make things like `--version' happen as quickly as we can.
12622+{ 12592+{
@@ -12860,13 +12830,13 @@ index 9503ec85d7..70e856e065 100644
12860- fi 12830- fi
12861-} 12831-}
12862- 12832-
12863+ # Darwin sucks 12833-
12864+ eval std_shrext=\"$shrext_cmds\"
12865
12866-## ----------- ## 12834-## ----------- ##
12867-## Main. ## 12835-## Main. ##
12868-## ----------- ## 12836-## ----------- ##
12869- 12837+ # Darwin sucks
12838+ eval std_shrext=\"$shrext_cmds\"
12839
12870-$opt_help || { 12840-$opt_help || {
12871- # Sanity checks first: 12841- # Sanity checks first:
12872- func_check_version_match 12842- func_check_version_match
@@ -13587,7 +13557,7 @@ index 9503ec85d7..70e856e065 100644
13587 "") 13557 "")
13588 # Generic help is extracted from the usage comments 13558 # Generic help is extracted from the usage comments
13589 # at the start of this file. 13559 # at the start of this file.
13590@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: 13560@@ -1659,8 +2327,8 @@ This mode accepts the following addition
13591 13561
13592 -o OUTPUT-FILE set the output file name to OUTPUT-FILE 13562 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
13593 -no-suppress do not suppress compiler output for multiple passes 13563 -no-suppress do not suppress compiler output for multiple passes
@@ -13598,7 +13568,7 @@ index 9503ec85d7..70e856e065 100644
13598 -shared do not build a \`.o' file suitable for static linking 13568 -shared do not build a \`.o' file suitable for static linking
13599 -static only build a \`.o' file suitable for static linking 13569 -static only build a \`.o' file suitable for static linking
13600 -Wc,FLAG pass FLAG directly to the compiler 13570 -Wc,FLAG pass FLAG directly to the compiler
13601@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." 13571@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u
13602 ;; 13572 ;;
13603 13573
13604 *) 13574 *)
@@ -13700,7 +13670,7 @@ index 9503ec85d7..70e856e065 100644
13700+ do 13670+ do
13701+ if test -d "$opt"; then 13671+ if test -d "$opt"; then
13702+ func_append libdirs " $opt" 13672+ func_append libdirs " $opt"
13703 13673+
13704+ elif test -f "$opt"; then 13674+ elif test -f "$opt"; then
13705+ if func_lalib_unsafe_p "$opt"; then 13675+ if func_lalib_unsafe_p "$opt"; then
13706+ func_append libs " $opt" 13676+ func_append libs " $opt"
@@ -13720,7 +13690,7 @@ index 9503ec85d7..70e856e065 100644
13720+ else 13690+ else
13721+ sysroot_cmd= 13691+ sysroot_cmd=
13722+ fi 13692+ fi
13723+ 13693
13724+ # Remove sysroot references 13694+ # Remove sysroot references
13725+ if $opt_dry_run; then 13695+ if $opt_dry_run; then
13726+ for lib in $libs; do 13696+ for lib in $libs; do
@@ -14132,7 +14102,7 @@ index 9503ec85d7..70e856e065 100644
14132 lt_${my_prefix}_LTX_preloaded_symbols[] = 14102 lt_${my_prefix}_LTX_preloaded_symbols[] =
14133 {\ 14103 {\
14134 { \"$my_originator\", (void *) 0 }," 14104 { \"$my_originator\", (void *) 0 },"
14135@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { 14105@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup()
14136 for arg in $LTCFLAGS; do 14106 for arg in $LTCFLAGS; do
14137 case $arg in 14107 case $arg in
14138 -pie | -fpie | -fPIE) ;; 14108 -pie | -fpie | -fPIE) ;;
@@ -14661,7 +14631,7 @@ index 9503ec85d7..70e856e065 100644
14661 */ 14631 */
14662 EOF 14632 EOF
14663 cat <<"EOF" 14633 cat <<"EOF"
14664@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); 14634@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *,
14665 if (stale) { free ((void *) stale); stale = 0; } \ 14635 if (stale) { free ((void *) stale); stale = 0; } \
14666 } while (0) 14636 } while (0)
14667 14637
@@ -14688,7 +14658,7 @@ index 9503ec85d7..70e856e065 100644
14688 14658
14689 void *xmalloc (size_t num); 14659 void *xmalloc (size_t num);
14690 char *xstrdup (const char *string); 14660 char *xstrdup (const char *string);
14691@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); 14661@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp
14692 int make_executable (const char *path); 14662 int make_executable (const char *path);
14693 int check_executable (const char *path); 14663 int check_executable (const char *path);
14694 char *strendzap (char *str, const char *pat); 14664 char *strendzap (char *str, const char *pat);
@@ -15016,7 +14986,7 @@ index 9503ec85d7..70e856e065 100644
15016 vfprintf (stderr, message, ap); 14986 vfprintf (stderr, message, ap);
15017 fprintf (stderr, ".\n"); 14987 fprintf (stderr, ".\n");
15018 14988
15019@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, 14989@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch
15020 } 14990 }
15021 14991
15022 void 14992 void
@@ -15054,7 +15024,7 @@ index 9503ec85d7..70e856e065 100644
15054 { 15024 {
15055 #ifdef HAVE_SETENV 15025 #ifdef HAVE_SETENV
15056 /* always make a copy, for consistency with !HAVE_SETENV */ 15026 /* always make a copy, for consistency with !HAVE_SETENV */
15057@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) 15027@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c
15058 void 15028 void
15059 lt_update_exe_path (const char *name, const char *value) 15029 lt_update_exe_path (const char *name, const char *value)
15060 { 15030 {
@@ -15067,7 +15037,7 @@ index 9503ec85d7..70e856e065 100644
15067 15037
15068 if (name && *name && value && *value) 15038 if (name && *name && value && *value)
15069 { 15039 {
15070@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) 15040@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co
15071 void 15041 void
15072 lt_update_lib_path (const char *name, const char *value) 15042 lt_update_lib_path (const char *name, const char *value)
15073 { 15043 {
@@ -17340,8 +17310,6 @@ index 9503ec85d7..70e856e065 100644
17340 17310
17341 if test -n "$exec_cmd"; then 17311 if test -n "$exec_cmd"; then
17342 eval exec "$exec_cmd" 17312 eval exec "$exec_cmd"
17343diff --git a/ltoptions.m4 b/ltoptions.m4
17344index 5ef12ced2a..17cfd51c0b 100644
17345--- a/ltoptions.m4 17313--- a/ltoptions.m4
17346+++ b/ltoptions.m4 17314+++ b/ltoptions.m4
17347@@ -8,7 +8,7 @@ 17315@@ -8,7 +8,7 @@
@@ -17353,8 +17321,6 @@ index 5ef12ced2a..17cfd51c0b 100644
17353 17321
17354 # This is to help aclocal find these macros, as it can't see m4_define. 17322 # This is to help aclocal find these macros, as it can't see m4_define.
17355 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) 17323 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
17356diff --git a/ltversion.m4 b/ltversion.m4
17357index bf87f77132..9c7b5d4118 100644
17358--- a/ltversion.m4 17324--- a/ltversion.m4
17359+++ b/ltversion.m4 17325+++ b/ltversion.m4
17360@@ -7,17 +7,17 @@ 17326@@ -7,17 +7,17 @@
@@ -17381,8 +17347,6 @@ index bf87f77132..9c7b5d4118 100644
17381 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) 17347 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
17382 _LT_DECL(, macro_revision, 0) 17348 _LT_DECL(, macro_revision, 0)
17383 ]) 17349 ])
17384diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
17385index bf92b5e079..c573da90c5 100644
17386--- a/lt~obsolete.m4 17350--- a/lt~obsolete.m4
17387+++ b/lt~obsolete.m4 17351+++ b/lt~obsolete.m4
17388@@ -7,7 +7,7 @@ 17352@@ -7,7 +7,7 @@
@@ -17394,8 +17358,6 @@ index bf92b5e079..c573da90c5 100644
17394 17358
17395 # These exist entirely to fool aclocal when bootstrapping libtool. 17359 # These exist entirely to fool aclocal when bootstrapping libtool.
17396 # 17360 #
17397diff --git a/opcodes/configure b/opcodes/configure
17398index 853849ee58..5f74ecf7da 100755
17399--- a/opcodes/configure 17361--- a/opcodes/configure
17400+++ b/opcodes/configure 17362+++ b/opcodes/configure
17401@@ -680,6 +680,9 @@ OTOOL 17363@@ -680,6 +680,9 @@ OTOOL
@@ -17445,7 +17407,7 @@ index 853849ee58..5f74ecf7da 100755
17445 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 17407 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17446 ECHO='print -r --' 17408 ECHO='print -r --'
17447 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 17409 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17448@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 17410@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u
17449 # Try some XSI features 17411 # Try some XSI features
17450 xsi_shell=no 17412 xsi_shell=no
17451 ( _lt_dummy="a/b/c" 17413 ( _lt_dummy="a/b/c"
@@ -17581,7 +17543,7 @@ index 853849ee58..5f74ecf7da 100755
17581 file_magic_cmd=$lt_cv_file_magic_cmd 17543 file_magic_cmd=$lt_cv_file_magic_cmd
17582 deplibs_check_method=$lt_cv_deplibs_check_method 17544 deplibs_check_method=$lt_cv_deplibs_check_method
17583 test -z "$deplibs_check_method" && deplibs_check_method=unknown 17545 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17584@@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 17546@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli
17585 17547
17586 17548
17587 17549
@@ -17595,8 +17557,6 @@ index 853849ee58..5f74ecf7da 100755
17595+ 17557+
17596+ 17558+
17597+ 17559+
17598
17599
17600 if test -n "$ac_tool_prefix"; then 17560 if test -n "$ac_tool_prefix"; then
17601- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 17561- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17602-set dummy ${ac_tool_prefix}ar; ac_word=$2 17562-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -17796,7 +17756,7 @@ index 853849ee58..5f74ecf7da 100755
17796 if test "x$ac_ct_AR" = x; then 17756 if test "x$ac_ct_AR" = x; then
17797 AR="false" 17757 AR="false"
17798 else 17758 else
17799@@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; 17759@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;;
17800 esac 17760 esac
17801 AR=$ac_ct_AR 17761 AR=$ac_ct_AR
17802 fi 17762 fi
@@ -17809,16 +17769,13 @@ index 853849ee58..5f74ecf7da 100755
17809+: ${AR=ar} 17769+: ${AR=ar}
17810+: ${AR_FLAGS=cru} 17770+: ${AR_FLAGS=cru}
17811+ 17771+
17812+ 17772
17813+ 17773
17814+ 17774
17815+ 17775@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
17816+ 17776
17817+ 17777
17818+ 17778
17819+
17820+
17821+
17822+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 17779+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17823+$as_echo_n "checking for archiver @FILE support... " >&6; } 17780+$as_echo_n "checking for archiver @FILE support... " >&6; }
17824+if ${lt_cv_ar_at_file+:} false; then : 17781+if ${lt_cv_ar_at_file+:} false; then :
@@ -17831,7 +17788,7 @@ index 853849ee58..5f74ecf7da 100755
17831+int 17788+int
17832+main () 17789+main ()
17833+{ 17790+{
17834 17791+
17835+ ; 17792+ ;
17836+ return 0; 17793+ return 0;
17837+} 17794+}
@@ -17857,22 +17814,28 @@ index 853849ee58..5f74ecf7da 100755
17857+ fi 17814+ fi
17858+ fi 17815+ fi
17859+ rm -f conftest.* libconftest.a 17816+ rm -f conftest.* libconftest.a
17860 17817+
17861+fi 17818+fi
17862+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 17819+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17863 17820+
17864+fi 17821+fi
17865+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 17822+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17866+$as_echo "$lt_cv_ar_at_file" >&6; } 17823+$as_echo "$lt_cv_ar_at_file" >&6; }
17867 17824+
17868+if test "x$lt_cv_ar_at_file" = xno; then 17825+if test "x$lt_cv_ar_at_file" = xno; then
17869+ archiver_list_spec= 17826+ archiver_list_spec=
17870+else 17827+else
17871+ archiver_list_spec=$lt_cv_ar_at_file 17828+ archiver_list_spec=$lt_cv_ar_at_file
17872+fi 17829+fi
17830+
17831+
17832+
17833+
17834+
17835+
17873 17836
17874 17837 if test -n "$ac_tool_prefix"; then
17875 17838 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
17876@@ -6972,8 +7290,8 @@ esac 17839@@ -6972,8 +7290,8 @@ esac
17877 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 17840 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17878 17841
@@ -17920,7 +17883,7 @@ index 853849ee58..5f74ecf7da 100755
17920 const char *name; 17883 const char *name;
17921 void *address; 17884 void *address;
17922 } 17885 }
17923@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { 17886@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup()
17924 _LT_EOF 17887 _LT_EOF
17925 # Now try linking the two files. 17888 # Now try linking the two files.
17926 mv conftest.$ac_objext conftstm.$ac_objext 17889 mv conftest.$ac_objext conftstm.$ac_objext
@@ -17942,7 +17905,7 @@ index 853849ee58..5f74ecf7da 100755
17942 else 17905 else
17943 echo "cannot find nm_test_func in $nlist" >&5 17906 echo "cannot find nm_test_func in $nlist" >&5
17944 fi 17907 fi
17945@@ -7136,6 +7467,16 @@ else 17908@@ -7136,6 +7467,14 @@ else
17946 $as_echo "ok" >&6; } 17909 $as_echo "ok" >&6; }
17947 fi 17910 fi
17948 17911
@@ -17954,12 +17917,10 @@ index 853849ee58..5f74ecf7da 100755
17954+fi 17917+fi
17955+ 17918+
17956+ 17919+
17957+
17958+
17959 17920
17960 17921
17961 17922
17962@@ -7152,6 +7493,45 @@ fi 17923@@ -7157,6 +7496,47 @@ fi
17963 17924
17964 17925
17965 17926
@@ -17967,9 +17928,6 @@ index 853849ee58..5f74ecf7da 100755
17967+ 17928+
17968+ 17929+
17969+ 17930+
17970+
17971+
17972+
17973+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 17931+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17974+$as_echo_n "checking for sysroot... " >&6; } 17932+$as_echo_n "checking for sysroot... " >&6; }
17975+ 17933+
@@ -18002,9 +17960,14 @@ index 853849ee58..5f74ecf7da 100755
18002+ 17960+
18003+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 17961+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
18004+$as_echo "${lt_sysroot:-no}" >&6; } 17962+$as_echo "${lt_sysroot:-no}" >&6; }
18005 17963+
18006 17964+
18007 17965+
17966+
17967+
17968 # Check whether --enable-libtool-lock was given.
17969 if test "${enable_libtool_lock+set}" = set; then :
17970 enableval=$enable_libtool_lock;
18008@@ -7363,6 +7743,123 @@ esac 17971@@ -7363,6 +7743,123 @@ esac
18009 17972
18010 need_locks="$enable_libtool_lock" 17973 need_locks="$enable_libtool_lock"
@@ -18166,7 +18129,7 @@ index 853849ee58..5f74ecf7da 100755
18166 18129
18167 if test "$GCC" = yes; then 18130 if test "$GCC" = yes; then
18168 lt_prog_compiler_wl='-Wl,' 18131 lt_prog_compiler_wl='-Wl,'
18169@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18132@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio
18170 lt_prog_compiler_pic='--shared' 18133 lt_prog_compiler_pic='--shared'
18171 lt_prog_compiler_static='--static' 18134 lt_prog_compiler_static='--static'
18172 ;; 18135 ;;
@@ -18179,7 +18142,7 @@ index 853849ee58..5f74ecf7da 100755
18179 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 18142 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18180 # Portland Group compilers (*not* the Pentium gcc compiler, 18143 # Portland Group compilers (*not* the Pentium gcc compiler,
18181 # which looks to be a dead project) 18144 # which looks to be a dead project)
18182@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18145@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio
18183 lt_prog_compiler_pic='-KPIC' 18146 lt_prog_compiler_pic='-KPIC'
18184 lt_prog_compiler_static='-Bstatic' 18147 lt_prog_compiler_static='-Bstatic'
18185 case $cc_basename in 18148 case $cc_basename in
@@ -18340,7 +18303,7 @@ index 853849ee58..5f74ecf7da 100755
18340 18303
18341 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18304 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18342 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" 18305 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"
18343@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18306@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp
18344 else 18307 else
18345 # Determine the default libpath from the value encoded in an 18308 # Determine the default libpath from the value encoded in an
18346 # empty executable. 18309 # empty executable.
@@ -18398,7 +18361,7 @@ index 853849ee58..5f74ecf7da 100755
18398 18361
18399 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18362 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18400 # Warning - without using the other run time loading flags, 18363 # Warning - without using the other run time loading flags,
18401@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18364@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp
18402 # Microsoft Visual C++. 18365 # Microsoft Visual C++.
18403 # hardcode_libdir_flag_spec is actually meaningless, as there is 18366 # hardcode_libdir_flag_spec is actually meaningless, as there is
18404 # no search path for DLLs. 18367 # no search path for DLLs.
@@ -18476,7 +18439,7 @@ index 853849ee58..5f74ecf7da 100755
18476 ;; 18439 ;;
18477 18440
18478 darwin* | rhapsody*) 18441 darwin* | rhapsody*)
18479@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18442@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp
18480 18443
18481 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 18444 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18482 freebsd* | dragonfly*) 18445 freebsd* | dragonfly*)
@@ -18485,7 +18448,7 @@ index 853849ee58..5f74ecf7da 100755
18485 hardcode_libdir_flag_spec='-R$libdir' 18448 hardcode_libdir_flag_spec='-R$libdir'
18486 hardcode_direct=yes 18449 hardcode_direct=yes
18487 hardcode_shlibpath_var=no 18450 hardcode_shlibpath_var=no
18488@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18451@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp
18489 18452
18490 hpux9*) 18453 hpux9*)
18491 if test "$GCC" = yes; then 18454 if test "$GCC" = yes; then
@@ -18494,7 +18457,7 @@ index 853849ee58..5f74ecf7da 100755
18494 else 18457 else
18495 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' 18458 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'
18496 fi 18459 fi
18497@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18460@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp
18498 18461
18499 hpux10*) 18462 hpux10*)
18500 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 18463 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -18503,7 +18466,7 @@ index 853849ee58..5f74ecf7da 100755
18503 else 18466 else
18504 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 18467 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18505 fi 18468 fi
18506@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18469@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp
18507 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 18470 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18508 ;; 18471 ;;
18509 ia64*) 18472 ia64*)
@@ -18561,7 +18524,7 @@ index 853849ee58..5f74ecf7da 100755
18561 else 18524 else
18562 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' 18525 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'
18563 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' 18526 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'
18564@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ 18527@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj
18565 osf4* | osf5*) # as osf3* with the addition of -msym flag 18528 osf4* | osf5*) # as osf3* with the addition of -msym flag
18566 if test "$GCC" = yes; then 18529 if test "$GCC" = yes; then
18567 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 18530 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -18570,7 +18533,7 @@ index 853849ee58..5f74ecf7da 100755
18570 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 18533 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18571 else 18534 else
18572 allow_undefined_flag=' -expect_unresolved \*' 18535 allow_undefined_flag=' -expect_unresolved \*'
18573@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ 18536@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj
18574 no_undefined_flag=' -z defs' 18537 no_undefined_flag=' -z defs'
18575 if test "$GCC" = yes; then 18538 if test "$GCC" = yes; then
18576 wlarc='${wl}' 18539 wlarc='${wl}'
@@ -18729,7 +18692,7 @@ index 853849ee58..5f74ecf7da 100755
18729 fi 18692 fi
18730 18693
18731 case "${host}" in 18694 case "${host}" in
18732@@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 18695@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
18733 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 18696 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18734 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 18697 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18735 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 18698 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -18750,7 +18713,7 @@ index 853849ee58..5f74ecf7da 100755
18750 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 18713 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18751 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 18714 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18752 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 18715 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18753@@ -13777,14 +14439,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 18716@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
18754 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 18717 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18755 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 18718 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18756 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"`' 18719 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"`'
@@ -18769,7 +18732,7 @@ index 853849ee58..5f74ecf7da 100755
18769 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 18732 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18770 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 18733 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18771 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 18734 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18772@@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 18735@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
18773 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 18736 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18774 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 18737 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18775 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 18738 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -18783,7 +18746,7 @@ index 853849ee58..5f74ecf7da 100755
18783 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 18746 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18784 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 18747 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18785 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 18748 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18786@@ -13877,8 +14542,13 @@ reload_flag \ 18749@@ -13878,8 +14543,13 @@ reload_flag \
18787 OBJDUMP \ 18750 OBJDUMP \
18788 deplibs_check_method \ 18751 deplibs_check_method \
18789 file_magic_cmd \ 18752 file_magic_cmd \
@@ -18797,7 +18760,7 @@ index 853849ee58..5f74ecf7da 100755
18797 STRIP \ 18760 STRIP \
18798 RANLIB \ 18761 RANLIB \
18799 CC \ 18762 CC \
18800@@ -13888,12 +14558,14 @@ lt_cv_sys_global_symbol_pipe \ 18763@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \
18801 lt_cv_sys_global_symbol_to_cdecl \ 18764 lt_cv_sys_global_symbol_to_cdecl \
18802 lt_cv_sys_global_symbol_to_c_name_address \ 18765 lt_cv_sys_global_symbol_to_c_name_address \
18803 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 18766 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -18813,7 +18776,7 @@ index 853849ee58..5f74ecf7da 100755
18813 DSYMUTIL \ 18776 DSYMUTIL \
18814 NMEDIT \ 18777 NMEDIT \
18815 LIPO \ 18778 LIPO \
18816@@ -13909,7 +14581,6 @@ no_undefined_flag \ 18779@@ -13910,7 +14582,6 @@ no_undefined_flag \
18817 hardcode_libdir_flag_spec \ 18780 hardcode_libdir_flag_spec \
18818 hardcode_libdir_flag_spec_ld \ 18781 hardcode_libdir_flag_spec_ld \
18819 hardcode_libdir_separator \ 18782 hardcode_libdir_separator \
@@ -18821,7 +18784,7 @@ index 853849ee58..5f74ecf7da 100755
18821 exclude_expsyms \ 18784 exclude_expsyms \
18822 include_expsyms \ 18785 include_expsyms \
18823 file_list_spec \ 18786 file_list_spec \
18824@@ -13945,6 +14616,7 @@ module_cmds \ 18787@@ -13946,6 +14617,7 @@ module_cmds \
18825 module_expsym_cmds \ 18788 module_expsym_cmds \
18826 export_symbols_cmds \ 18789 export_symbols_cmds \
18827 prelink_cmds \ 18790 prelink_cmds \
@@ -18829,7 +18792,7 @@ index 853849ee58..5f74ecf7da 100755
18829 postinstall_cmds \ 18792 postinstall_cmds \
18830 postuninstall_cmds \ 18793 postuninstall_cmds \
18831 finish_cmds \ 18794 finish_cmds \
18832@@ -14710,7 +15382,8 @@ $as_echo X"$file" | 18795@@ -14711,7 +15383,8 @@ $as_echo X"$file" |
18833 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 18796 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18834 # 18797 #
18835 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 18798 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -18839,7 +18802,7 @@ index 853849ee58..5f74ecf7da 100755
18839 # Written by Gordon Matzigkeit, 1996 18802 # Written by Gordon Matzigkeit, 1996
18840 # 18803 #
18841 # This file is part of GNU Libtool. 18804 # This file is part of GNU Libtool.
18842@@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL 18805@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL
18843 # turn newlines into spaces. 18806 # turn newlines into spaces.
18844 NL2SP=$lt_lt_NL2SP 18807 NL2SP=$lt_lt_NL2SP
18845 18808
@@ -18883,7 +18846,7 @@ index 853849ee58..5f74ecf7da 100755
18883 # A symbol stripping program. 18846 # A symbol stripping program.
18884 STRIP=$lt_STRIP 18847 STRIP=$lt_STRIP
18885 18848
18886@@ -14855,6 +15551,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 18849@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c
18887 # Transform the output of nm in a C name address pair when lib prefix is needed. 18850 # Transform the output of nm in a C name address pair when lib prefix is needed.
18888 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 18851 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18889 18852
@@ -18896,7 +18859,7 @@ index 853849ee58..5f74ecf7da 100755
18896 # The name of the directory that contains temporary libtool files. 18859 # The name of the directory that contains temporary libtool files.
18897 objdir=$objdir 18860 objdir=$objdir
18898 18861
18899@@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD 18862@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD
18900 # Must we lock files when doing compilation? 18863 # Must we lock files when doing compilation?
18901 need_locks=$lt_need_locks 18864 need_locks=$lt_need_locks
18902 18865
@@ -18906,7 +18869,7 @@ index 853849ee58..5f74ecf7da 100755
18906 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 18869 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18907 DSYMUTIL=$lt_DSYMUTIL 18870 DSYMUTIL=$lt_DSYMUTIL
18908 18871
18909@@ -14978,12 +15683,12 @@ with_gcc=$GCC 18872@@ -14979,12 +15684,12 @@ with_gcc=$GCC
18910 # Compiler flag to turn off builtin functions. 18873 # Compiler flag to turn off builtin functions.
18911 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 18874 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18912 18875
@@ -18922,7 +18885,7 @@ index 853849ee58..5f74ecf7da 100755
18922 # Compiler flag to prevent dynamic linking. 18885 # Compiler flag to prevent dynamic linking.
18923 link_static_flag=$lt_lt_prog_compiler_static 18886 link_static_flag=$lt_lt_prog_compiler_static
18924 18887
18925@@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath 18888@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath
18926 # Whether libtool must link a program against all its dependency libraries. 18889 # Whether libtool must link a program against all its dependency libraries.
18927 link_all_deplibs=$link_all_deplibs 18890 link_all_deplibs=$link_all_deplibs
18928 18891
@@ -18932,7 +18895,7 @@ index 853849ee58..5f74ecf7da 100755
18932 # Set to "yes" if exported symbols are required. 18895 # Set to "yes" if exported symbols are required.
18933 always_export_symbols=$always_export_symbols 18896 always_export_symbols=$always_export_symbols
18934 18897
18935@@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms 18898@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms
18936 # Commands necessary for linking programs (against libraries) with templates. 18899 # Commands necessary for linking programs (against libraries) with templates.
18937 prelink_cmds=$lt_prelink_cmds 18900 prelink_cmds=$lt_prelink_cmds
18938 18901
@@ -18942,7 +18905,7 @@ index 853849ee58..5f74ecf7da 100755
18942 # Specify filename containing input files. 18905 # Specify filename containing input files.
18943 file_list_spec=$lt_file_list_spec 18906 file_list_spec=$lt_file_list_spec
18944 18907
18945@@ -15120,210 +15825,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 18908@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18946 # if finds mixed CR/LF and LF-only lines. Since sed operates in 18909 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18947 # text mode, it properly converts lines to CR/LF. This bash problem 18910 # text mode, it properly converts lines to CR/LF. This bash problem
18948 # is reportedly fixed, but why not run on old versions too? 18911 # is reportedly fixed, but why not run on old versions too?
@@ -19144,15 +19107,9 @@ index 853849ee58..5f74ecf7da 100755
19144-_LT_EOF 19107-_LT_EOF
19145- ;; 19108- ;;
19146- esac 19109- esac
19147-
19148-
19149- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19150- || (rm -f "$cfgfile"; exit 1)
19151-
19152- mv -f "$cfgfile" "$ofile" ||
19153+ sed '$q' "$ltmain" >> "$cfgfile" \ 19110+ sed '$q' "$ltmain" >> "$cfgfile" \
19154+ || (rm -f "$cfgfile"; exit 1) 19111+ || (rm -f "$cfgfile"; exit 1)
19155+ 19112
19156+ if test x"$xsi_shell" = xyes; then 19113+ if test x"$xsi_shell" = xyes; then
19157+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 19114+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19158+func_dirname ()\ 19115+func_dirname ()\
@@ -19310,14 +19267,15 @@ index 853849ee58..5f74ecf7da 100755
19310+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 19267+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
19311+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 19268+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
19312+fi 19269+fi
19313+ 19270
19314+ 19271- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19272- || (rm -f "$cfgfile"; exit 1)
19273
19274- mv -f "$cfgfile" "$ofile" ||
19315+ mv -f "$cfgfile" "$ofile" || 19275+ mv -f "$cfgfile" "$ofile" ||
19316 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 19276 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19317 chmod +x "$ofile" 19277 chmod +x "$ofile"
19318 19278
19319diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19320index 4eb19005e8..19a57608b9 100644
19321--- a/opcodes/configure.ac 19279--- a/opcodes/configure.ac
19322+++ b/opcodes/configure.ac 19280+++ b/opcodes/configure.ac
19323@@ -170,7 +170,7 @@ changequote(,)dnl 19281@@ -170,7 +170,7 @@ changequote(,)dnl
@@ -19329,8 +19287,6 @@ index 4eb19005e8..19a57608b9 100644
19329 fi 19287 fi
19330 19288
19331 case "${host}" in 19289 case "${host}" in
19332diff --git a/zlib/configure b/zlib/configure
19333index 041cbdbf71..19d605fc85 100755
19334--- a/zlib/configure 19290--- a/zlib/configure
19335+++ b/zlib/configure 19291+++ b/zlib/configure
19336@@ -646,8 +646,11 @@ OTOOL 19292@@ -646,8 +646,11 @@ OTOOL
@@ -19382,7 +19338,7 @@ index 041cbdbf71..19d605fc85 100755
19382 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 19338 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
19383 ECHO='print -r --' 19339 ECHO='print -r --'
19384 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 19340 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
19385@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 19341@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u
19386 # Try some XSI features 19342 # Try some XSI features
19387 xsi_shell=no 19343 xsi_shell=no
19388 ( _lt_dummy="a/b/c" 19344 ( _lt_dummy="a/b/c"
@@ -19518,7 +19474,7 @@ index 041cbdbf71..19d605fc85 100755
19518 file_magic_cmd=$lt_cv_file_magic_cmd 19474 file_magic_cmd=$lt_cv_file_magic_cmd
19519 deplibs_check_method=$lt_cv_deplibs_check_method 19475 deplibs_check_method=$lt_cv_deplibs_check_method
19520 test -z "$deplibs_check_method" && deplibs_check_method=unknown 19476 test -z "$deplibs_check_method" && deplibs_check_method=unknown
19521@@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 19477@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli
19522 19478
19523 19479
19524 19480
@@ -19532,8 +19488,6 @@ index 041cbdbf71..19d605fc85 100755
19532+ 19488+
19533+ 19489+
19534+ 19490+
19535
19536
19537 if test -n "$ac_tool_prefix"; then 19491 if test -n "$ac_tool_prefix"; then
19538- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 19492- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
19539-set dummy ${ac_tool_prefix}ar; ac_word=$2 19493-set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -19734,7 +19688,7 @@ index 041cbdbf71..19d605fc85 100755
19734 if test "x$ac_ct_AR" = x; then 19688 if test "x$ac_ct_AR" = x; then
19735 AR="false" 19689 AR="false"
19736 else 19690 else
19737@@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; 19691@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;;
19738 esac 19692 esac
19739 AR=$ac_ct_AR 19693 AR=$ac_ct_AR
19740 fi 19694 fi
@@ -19746,17 +19700,13 @@ index 041cbdbf71..19d605fc85 100755
19746-test -z "$AR_FLAGS" && AR_FLAGS=cru 19700-test -z "$AR_FLAGS" && AR_FLAGS=cru
19747+: ${AR=ar} 19701+: ${AR=ar}
19748+: ${AR_FLAGS=cru} 19702+: ${AR_FLAGS=cru}
19749+ 19703
19750+ 19704
19751+ 19705
19752+ 19706@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
19753+ 19707
19754+ 19708
19755+ 19709
19756+
19757+
19758+
19759+
19760+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 19710+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
19761+$as_echo_n "checking for archiver @FILE support... " >&6; } 19711+$as_echo_n "checking for archiver @FILE support... " >&6; }
19762+if ${lt_cv_ar_at_file+:} false; then : 19712+if ${lt_cv_ar_at_file+:} false; then :
@@ -19769,7 +19719,7 @@ index 041cbdbf71..19d605fc85 100755
19769+int 19719+int
19770+main () 19720+main ()
19771+{ 19721+{
19772 19722+
19773+ ; 19723+ ;
19774+ return 0; 19724+ return 0;
19775+} 19725+}
@@ -19795,22 +19745,29 @@ index 041cbdbf71..19d605fc85 100755
19795+ fi 19745+ fi
19796+ fi 19746+ fi
19797+ rm -f conftest.* libconftest.a 19747+ rm -f conftest.* libconftest.a
19798 19748+
19799+fi 19749+fi
19800+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 19750+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19801 19751+
19802+fi 19752+fi
19803+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 19753+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
19804+$as_echo "$lt_cv_ar_at_file" >&6; } 19754+$as_echo "$lt_cv_ar_at_file" >&6; }
19805 19755+
19806+if test "x$lt_cv_ar_at_file" = xno; then 19756+if test "x$lt_cv_ar_at_file" = xno; then
19807+ archiver_list_spec= 19757+ archiver_list_spec=
19808+else 19758+else
19809+ archiver_list_spec=$lt_cv_ar_at_file 19759+ archiver_list_spec=$lt_cv_ar_at_file
19810+fi 19760+fi
19811 19761+
19812 19762+
19813 19763+
19764+
19765+
19766+
19767+
19768 if test -n "$ac_tool_prefix"; then
19769 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
19770 set dummy ${ac_tool_prefix}strip; ac_word=$2
19814@@ -5846,8 +6165,8 @@ esac 19771@@ -5846,8 +6165,8 @@ esac
19815 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 19772 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
19816 19773
@@ -19858,7 +19815,7 @@ index 041cbdbf71..19d605fc85 100755
19858 const char *name; 19815 const char *name;
19859 void *address; 19816 void *address;
19860 } 19817 }
19861@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { 19818@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup()
19862 _LT_EOF 19819 _LT_EOF
19863 # Now try linking the two files. 19820 # Now try linking the two files.
19864 mv conftest.$ac_objext conftstm.$ac_objext 19821 mv conftest.$ac_objext conftstm.$ac_objext
@@ -19880,7 +19837,7 @@ index 041cbdbf71..19d605fc85 100755
19880 else 19837 else
19881 echo "cannot find nm_test_func in $nlist" >&5 19838 echo "cannot find nm_test_func in $nlist" >&5
19882 fi 19839 fi
19883@@ -6010,6 +6342,19 @@ else 19840@@ -6010,6 +6342,18 @@ else
19884 $as_echo "ok" >&6; } 19841 $as_echo "ok" >&6; }
19885 fi 19842 fi
19886 19843
@@ -19896,17 +19853,13 @@ index 041cbdbf71..19d605fc85 100755
19896+ 19853+
19897+ 19854+
19898+ 19855+
19899+
19900 19856
19901 19857
19902 19858
19903@@ -6027,6 +6372,41 @@ fi 19859@@ -6031,6 +6375,42 @@ fi
19904 19860
19905 19861
19906 19862
19907+
19908+
19909+
19910+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 19863+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
19911+$as_echo_n "checking for sysroot... " >&6; } 19864+$as_echo_n "checking for sysroot... " >&6; }
19912+ 19865+
@@ -19939,9 +19892,13 @@ index 041cbdbf71..19d605fc85 100755
19939+ 19892+
19940+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 19893+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
19941+$as_echo "${lt_sysroot:-no}" >&6; } 19894+$as_echo "${lt_sysroot:-no}" >&6; }
19895+
19896+
19897+
19898+
19942 19899
19943 19900 # Check whether --enable-libtool-lock was given.
19944 19901 if test "${enable_libtool_lock+set}" = set; then :
19945@@ -6241,6 +6621,123 @@ esac 19902@@ -6241,6 +6621,123 @@ esac
19946 19903
19947 need_locks="$enable_libtool_lock" 19904 need_locks="$enable_libtool_lock"
@@ -20103,7 +20060,7 @@ index 041cbdbf71..19d605fc85 100755
20103 20060
20104 if test "$GCC" = yes; then 20061 if test "$GCC" = yes; then
20105 lt_prog_compiler_wl='-Wl,' 20062 lt_prog_compiler_wl='-Wl,'
20106@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20063@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio
20107 lt_prog_compiler_pic='--shared' 20064 lt_prog_compiler_pic='--shared'
20108 lt_prog_compiler_static='--static' 20065 lt_prog_compiler_static='--static'
20109 ;; 20066 ;;
@@ -20116,7 +20073,7 @@ index 041cbdbf71..19d605fc85 100755
20116 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 20073 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
20117 # Portland Group compilers (*not* the Pentium gcc compiler, 20074 # Portland Group compilers (*not* the Pentium gcc compiler,
20118 # which looks to be a dead project) 20075 # which looks to be a dead project)
20119@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 20076@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio
20120 lt_prog_compiler_pic='-KPIC' 20077 lt_prog_compiler_pic='-KPIC'
20121 lt_prog_compiler_static='-Bstatic' 20078 lt_prog_compiler_static='-Bstatic'
20122 case $cc_basename in 20079 case $cc_basename in
@@ -20277,7 +20234,7 @@ index 041cbdbf71..19d605fc85 100755
20277 20234
20278 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 20235 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20279 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" 20236 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"
20280@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20237@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp
20281 else 20238 else
20282 # Determine the default libpath from the value encoded in an 20239 # Determine the default libpath from the value encoded in an
20283 # empty executable. 20240 # empty executable.
@@ -20335,7 +20292,7 @@ index 041cbdbf71..19d605fc85 100755
20335 20292
20336 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 20293 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
20337 # Warning - without using the other run time loading flags, 20294 # Warning - without using the other run time loading flags,
20338@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20295@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp
20339 # Microsoft Visual C++. 20296 # Microsoft Visual C++.
20340 # hardcode_libdir_flag_spec is actually meaningless, as there is 20297 # hardcode_libdir_flag_spec is actually meaningless, as there is
20341 # no search path for DLLs. 20298 # no search path for DLLs.
@@ -20413,7 +20370,7 @@ index 041cbdbf71..19d605fc85 100755
20413 ;; 20370 ;;
20414 20371
20415 darwin* | rhapsody*) 20372 darwin* | rhapsody*)
20416@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20373@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp
20417 20374
20418 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 20375 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
20419 freebsd* | dragonfly*) 20376 freebsd* | dragonfly*)
@@ -20422,7 +20379,7 @@ index 041cbdbf71..19d605fc85 100755
20422 hardcode_libdir_flag_spec='-R$libdir' 20379 hardcode_libdir_flag_spec='-R$libdir'
20423 hardcode_direct=yes 20380 hardcode_direct=yes
20424 hardcode_shlibpath_var=no 20381 hardcode_shlibpath_var=no
20425@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20382@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp
20426 20383
20427 hpux9*) 20384 hpux9*)
20428 if test "$GCC" = yes; then 20385 if test "$GCC" = yes; then
@@ -20431,7 +20388,7 @@ index 041cbdbf71..19d605fc85 100755
20431 else 20388 else
20432 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' 20389 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'
20433 fi 20390 fi
20434@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20391@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp
20435 20392
20436 hpux10*) 20393 hpux10*)
20437 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 20394 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -20440,7 +20397,7 @@ index 041cbdbf71..19d605fc85 100755
20440 else 20397 else
20441 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 20398 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
20442 fi 20399 fi
20443@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 20400@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp
20444 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 20401 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
20445 ;; 20402 ;;
20446 ia64*) 20403 ia64*)
@@ -20501,7 +20458,7 @@ index 041cbdbf71..19d605fc85 100755
20501 else 20458 else
20502 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' 20459 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'
20503 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' 20460 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'
20504@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ 20461@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj
20505 osf4* | osf5*) # as osf3* with the addition of -msym flag 20462 osf4* | osf5*) # as osf3* with the addition of -msym flag
20506 if test "$GCC" = yes; then 20463 if test "$GCC" = yes; then
20507 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 20464 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -20510,7 +20467,7 @@ index 041cbdbf71..19d605fc85 100755
20510 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 20467 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
20511 else 20468 else
20512 allow_undefined_flag=' -expect_unresolved \*' 20469 allow_undefined_flag=' -expect_unresolved \*'
20513@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ 20470@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj
20514 no_undefined_flag=' -z defs' 20471 no_undefined_flag=' -z defs'
20515 if test "$GCC" = yes; then 20472 if test "$GCC" = yes; then
20516 wlarc='${wl}' 20473 wlarc='${wl}'
@@ -20660,7 +20617,7 @@ index 041cbdbf71..19d605fc85 100755
20660 int main () 20617 int main ()
20661 { 20618 {
20662 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 20619 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
20663@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 20620@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
20664 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 20621 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
20665 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 20622 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
20666 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 20623 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -20681,7 +20638,7 @@ index 041cbdbf71..19d605fc85 100755
20681 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 20638 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
20682 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 20639 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
20683 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 20640 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
20684@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 20641@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
20685 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 20642 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
20686 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 20643 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
20687 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"`' 20644 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"`'
@@ -20700,7 +20657,7 @@ index 041cbdbf71..19d605fc85 100755
20700 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 20657 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
20701 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 20658 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
20702 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 20659 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
20703@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 20660@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
20704 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 20661 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
20705 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 20662 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
20706 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 20663 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -20814,7 +20771,7 @@ index 041cbdbf71..19d605fc85 100755
20814 # A symbol stripping program. 20771 # A symbol stripping program.
20815 STRIP=$lt_STRIP 20772 STRIP=$lt_STRIP
20816 20773
20817@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 20774@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c
20818 # Transform the output of nm in a C name address pair when lib prefix is needed. 20775 # Transform the output of nm in a C name address pair when lib prefix is needed.
20819 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 20776 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
20820 20777
@@ -21075,15 +21032,9 @@ index 041cbdbf71..19d605fc85 100755
21075-_LT_EOF 21032-_LT_EOF
21076- ;; 21033- ;;
21077- esac 21034- esac
21078-
21079-
21080- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
21081- || (rm -f "$cfgfile"; exit 1)
21082-
21083- mv -f "$cfgfile" "$ofile" ||
21084+ sed '$q' "$ltmain" >> "$cfgfile" \ 21035+ sed '$q' "$ltmain" >> "$cfgfile" \
21085+ || (rm -f "$cfgfile"; exit 1) 21036+ || (rm -f "$cfgfile"; exit 1)
21086+ 21037
21087+ if test x"$xsi_shell" = xyes; then 21038+ if test x"$xsi_shell" = xyes; then
21088+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 21039+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
21089+func_dirname ()\ 21040+func_dirname ()\
@@ -21241,12 +21192,12 @@ index 041cbdbf71..19d605fc85 100755
21241+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 21192+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
21242+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 21193+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
21243+fi 21194+fi
21244+ 21195
21245+ 21196- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
21197- || (rm -f "$cfgfile"; exit 1)
21198
21199- mv -f "$cfgfile" "$ofile" ||
21246+ mv -f "$cfgfile" "$ofile" || 21200+ mv -f "$cfgfile" "$ofile" ||
21247 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 21201 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
21248 chmod +x "$ofile" 21202 chmod +x "$ofile"
21249 21203
21250--
212512.20.1
21252
diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
index a2c6312d0a..5a195054f6 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -1,8 +1,8 @@
1From 8cb013106c379e81fe40cfdf486d9805c9e276ad Mon Sep 17 00:00:00 2001 1From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:39:01 +0000 3Date: Mon, 2 Mar 2015 01:39:01 +0000
4Subject: [PATCH 07/15] don't let the distro compiler point to the wrong 4Subject: [PATCH] don't let the distro compiler point to the wrong installation
5 installation location 5 location
6 6
7Thanks to RP for helping find the source code causing the issue. 7Thanks to RP for helping find the source code causing the issue.
8 8
@@ -30,6 +30,3 @@ index 0be45b4ae8..4817616bb2 100644
30 install_to_libdir: all 30 install_to_libdir: all
31 if test -n "${target_header_dir}"; then \ 31 if test -n "${target_header_dir}"; then \
32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ 32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
33--
342.20.1
35
diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch
index 9727821b1f..655cc375a9 100644
--- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,7 +1,7 @@
1From 98f68c0892ba4bbd53b0a0a4cbbdf0b7197e0320 Mon Sep 17 00:00:00 2001 1From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 15 Jan 2016 06:31:09 +0000 3Date: Fri, 15 Jan 2016 06:31:09 +0000
4Subject: [PATCH 08/15] warn for uses of system directories when cross linking 4Subject: [PATCH] warn for uses of system directories when cross linking
5 5
62008-07-02 Joseph Myers <joseph@codesourcery.com> 62008-07-02 Joseph Myers <joseph@codesourcery.com>
7 7
@@ -62,8 +62,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
62 ld/lexsup.c | 16 ++++++++++++++++ 62 ld/lexsup.c | 16 ++++++++++++++++
63 9 files changed, 86 insertions(+) 63 9 files changed, 86 insertions(+)
64 64
65diff --git a/ld/config.in b/ld/config.in
66index d93c9b0830..5da2742bea 100644
67--- a/ld/config.in 65--- a/ld/config.in
68+++ b/ld/config.in 66+++ b/ld/config.in
69@@ -31,6 +31,9 @@ 67@@ -31,6 +31,9 @@
@@ -76,11 +74,9 @@ index d93c9b0830..5da2742bea 100644
76 /* Additional extension a shared object might have. */ 74 /* Additional extension a shared object might have. */
77 #undef EXTRA_SHLIB_EXTENSION 75 #undef EXTRA_SHLIB_EXTENSION
78 76
79diff --git a/ld/configure b/ld/configure
80index 43c391c2b3..ff9f6b3c02 100755
81--- a/ld/configure 77--- a/ld/configure
82+++ b/ld/configure 78+++ b/ld/configure
83@@ -826,6 +826,7 @@ with_lib_path 79@@ -827,6 +827,7 @@ with_lib_path
84 enable_targets 80 enable_targets
85 enable_64_bit_bfd 81 enable_64_bit_bfd
86 with_sysroot 82 with_sysroot
@@ -88,7 +84,7 @@ index 43c391c2b3..ff9f6b3c02 100755
88 enable_gold 84 enable_gold
89 enable_got 85 enable_got
90 enable_compressed_debug_sections 86 enable_compressed_debug_sections
91@@ -1490,6 +1491,8 @@ Optional Features: 87@@ -1491,6 +1492,8 @@ Optional Features:
92 --disable-largefile omit support for large files 88 --disable-largefile omit support for large files
93 --enable-targets alternative target configurations 89 --enable-targets alternative target configurations
94 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) 90 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
@@ -97,7 +93,7 @@ index 43c391c2b3..ff9f6b3c02 100755
97 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 93 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
98 --enable-got=<type> GOT handling scheme (target, single, negative, 94 --enable-got=<type> GOT handling scheme (target, single, negative,
99 multigot) 95 multigot)
100@@ -16618,6 +16621,19 @@ fi 96@@ -16619,6 +16622,19 @@ fi
101 97
102 98
103 99
@@ -117,8 +113,6 @@ index 43c391c2b3..ff9f6b3c02 100755
117 # Check whether --enable-gold was given. 113 # Check whether --enable-gold was given.
118 if test "${enable_gold+set}" = set; then : 114 if test "${enable_gold+set}" = set; then :
119 enableval=$enable_gold; case "${enableval}" in 115 enableval=$enable_gold; case "${enableval}" in
120diff --git a/ld/configure.ac b/ld/configure.ac
121index d335f21091..7f692d9387 100644
122--- a/ld/configure.ac 116--- a/ld/configure.ac
123+++ b/ld/configure.ac 117+++ b/ld/configure.ac
124@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) 118@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
@@ -138,8 +132,6 @@ index d335f21091..7f692d9387 100644
138 dnl Use --enable-gold to decide if this linker should be the default. 132 dnl Use --enable-gold to decide if this linker should be the default.
139 dnl "install_as_default" is set to false if gold is the default linker. 133 dnl "install_as_default" is set to false if gold is the default linker.
140 dnl "installed_linker" is the installed BFD linker name. 134 dnl "installed_linker" is the installed BFD linker name.
141diff --git a/ld/ld.h b/ld/ld.h
142index b97d977f37..f3bbd2d55d 100644
143--- a/ld/ld.h 135--- a/ld/ld.h
144+++ b/ld/ld.h 136+++ b/ld/ld.h
145@@ -180,6 +180,14 @@ typedef struct 137@@ -180,6 +180,14 @@ typedef struct
@@ -157,11 +149,9 @@ index b97d977f37..f3bbd2d55d 100644
157 /* Big or little endian as set on command line. */ 149 /* Big or little endian as set on command line. */
158 enum endian_enum endian; 150 enum endian_enum endian;
159 151
160diff --git a/ld/ld.texi b/ld/ld.texi
161index 5179af3e0e..f78bf74682 100644
162--- a/ld/ld.texi 152--- a/ld/ld.texi
163+++ b/ld/ld.texi 153+++ b/ld/ld.texi
164@@ -2524,6 +2524,18 @@ string identifying the original linked file does not change. 154@@ -2557,6 +2557,18 @@ string identifying the original linked f
165 155
166 Passing @code{none} for @var{style} disables the setting from any 156 Passing @code{none} for @var{style} disables the setting from any
167 @code{--build-id} options earlier on the command line. 157 @code{--build-id} options earlier on the command line.
@@ -180,11 +170,9 @@ index 5179af3e0e..f78bf74682 100644
180 @end table 170 @end table
181 171
182 @c man end 172 @c man end
183diff --git a/ld/ldfile.c b/ld/ldfile.c
184index fcadc08c73..63e295ce8a 100644
185--- a/ld/ldfile.c 173--- a/ld/ldfile.c
186+++ b/ld/ldfile.c 174+++ b/ld/ldfile.c
187@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) 175@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam
188 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); 176 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
189 else 177 else
190 new_dirs->name = xstrdup (name); 178 new_dirs->name = xstrdup (name);
@@ -208,24 +196,20 @@ index fcadc08c73..63e295ce8a 100644
208 } 196 }
209 197
210 /* Try to open a BFD for a lang_input_statement. */ 198 /* Try to open a BFD for a lang_input_statement. */
211diff --git a/ld/ldlex.h b/ld/ldlex.h
212index 32853debe4..8135361c49 100644
213--- a/ld/ldlex.h 199--- a/ld/ldlex.h
214+++ b/ld/ldlex.h 200+++ b/ld/ldlex.h
215@@ -148,6 +148,8 @@ enum option_values 201@@ -150,6 +150,8 @@ enum option_values
216 OPTION_REQUIRE_DEFINED_SYMBOL,
217 OPTION_ORPHAN_HANDLING,
218 OPTION_FORCE_GROUP_ALLOCATION, 202 OPTION_FORCE_GROUP_ALLOCATION,
203 OPTION_PRINT_MAP_DISCARDED,
204 OPTION_NO_PRINT_MAP_DISCARDED,
219+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, 205+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
220+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, 206+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
221 }; 207 };
222 208
223 /* The initial parser states. */ 209 /* The initial parser states. */
224diff --git a/ld/ldmain.c b/ld/ldmain.c
225index 77cdbd0dd2..725512f126 100644
226--- a/ld/ldmain.c 210--- a/ld/ldmain.c
227+++ b/ld/ldmain.c 211+++ b/ld/ldmain.c
228@@ -269,6 +269,8 @@ main (int argc, char **argv) 212@@ -270,6 +270,8 @@ main (int argc, char **argv)
229 command_line.warn_mismatch = TRUE; 213 command_line.warn_mismatch = TRUE;
230 command_line.warn_search_mismatch = TRUE; 214 command_line.warn_search_mismatch = TRUE;
231 command_line.check_section_addresses = -1; 215 command_line.check_section_addresses = -1;
@@ -234,13 +218,11 @@ index 77cdbd0dd2..725512f126 100644
234 218
235 /* We initialize DEMANGLING based on the environment variable 219 /* We initialize DEMANGLING based on the environment variable
236 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the 220 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
237diff --git a/ld/lexsup.c b/ld/lexsup.c
238index 88e85c73f4..eed1b71456 100644
239--- a/ld/lexsup.c 221--- a/ld/lexsup.c
240+++ b/ld/lexsup.c 222+++ b/ld/lexsup.c
241@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = 223@@ -549,6 +549,14 @@ static const struct ld_option ld_options
242 { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, 224 { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED},
243 '\0', N_("=MODE"), N_("Control how orphan sections are handled."), 225 '\0', NULL, N_("Do not show discarded sections in map file output"),
244 TWO_DASHES }, 226 TWO_DASHES },
245+ { {"no-poison-system-directories", no_argument, NULL, 227+ { {"no-poison-system-directories", no_argument, NULL,
246+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, 228+ OPTION_NO_POISON_SYSTEM_DIRECTORIES},
@@ -253,10 +235,10 @@ index 88e85c73f4..eed1b71456 100644
253 }; 235 };
254 236
255 #define OPTION_COUNT ARRAY_SIZE (ld_options) 237 #define OPTION_COUNT ARRAY_SIZE (ld_options)
256@@ -1577,6 +1585,14 @@ parse_args (unsigned argc, char **argv) 238@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv)
257 einfo (_("%F%P: invalid argument to option" 239
258 " \"--orphan-handling\"\n")); 240 case OPTION_PRINT_MAP_DISCARDED:
259 break; 241 config.print_map_discarded = TRUE;
260+ 242+
261+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: 243+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
262+ command_line.poison_system_directories = FALSE; 244+ command_line.poison_system_directories = FALSE;
@@ -264,10 +246,6 @@ index 88e85c73f4..eed1b71456 100644
264+ 246+
265+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: 247+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
266+ command_line.error_poison_system_directories = TRUE; 248+ command_line.error_poison_system_directories = TRUE;
267+ break; 249 break;
268 } 250 }
269 } 251 }
270
271--
2722.20.1
273
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index b6b1e7a672..e63d278bcd 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,7 +1,7 @@
1From 2cd5613a86f8772f9d7f188532718363668ed99d Mon Sep 17 00:00:00 2001 1From 903a43f07b7229adadff0f01d560646eb4b0e200 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 09/15] Fix rpath in libtool when sysroot is enabled 4Subject: [PATCH] Fix rpath in libtool when sysroot is enabled
5 5
6Enabling sysroot support in libtool exposed a bug where the final 6Enabling sysroot support in libtool exposed a bug where the final
7library had an RPATH encoded into it which still pointed to the 7library had an RPATH encoded into it which still pointed to the
@@ -47,6 +47,3 @@ index 70e856e065..11ee684ccc 100644
47 if test -n "$hardcode_libdir_separator"; then 47 if test -n "$hardcode_libdir_separator"; then
48 if test -z "$hardcode_libdirs"; then 48 if test -z "$hardcode_libdirs"; then
49 hardcode_libdirs="$libdir" 49 hardcode_libdirs="$libdir"
50--
512.20.1
52
diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch
index 5f4ac72f48..e6b50dbcde 100644
--- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch
@@ -1,7 +1,7 @@
1From 958a49749b772660d3bafb80748829cba6bed065 Mon Sep 17 00:00:00 2001 1From 84349ede307f61d624e5d97397074f5177a5bdc9 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 10/15] Change default emulation for mips64*-*-linux 4Subject: [PATCH] Change default emulation for mips64*-*-linux
5 5
6we change the default emulations to be N64 instead of N32 6we change the default emulations to be N64 instead of N32
7 7
@@ -13,11 +13,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 ld/configure.tgt | 8 ++++---- 13 ld/configure.tgt | 8 ++++----
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
17index 0e1ddb659c..d4f50f0a8d 100644
18--- a/bfd/config.bfd 16--- a/bfd/config.bfd
19+++ b/bfd/config.bfd 17+++ b/bfd/config.bfd
20@@ -919,12 +919,12 @@ case "${targ}" in 18@@ -915,12 +915,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" 19 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
22 ;; 20 ;;
23 mips64*el-*-linux*) 21 mips64*el-*-linux*)
@@ -30,15 +28,13 @@ index 0e1ddb659c..d4f50f0a8d 100644
30- targ_defvec=mips_elf32_ntrad_be_vec 28- targ_defvec=mips_elf32_ntrad_be_vec
31- targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" 29- targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
32+ targ_defvec=mips_elf64_trad_be_vec 30+ targ_defvec=mips_elf64_trad_be_vec
33+ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec" 31+ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_be_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
34 ;; 32 ;;
35 mips*el-*-linux*) 33 mips*el-*-linux*)
36 targ_defvec=mips_elf32_trad_le_vec 34 targ_defvec=mips_elf32_trad_le_vec
37diff --git a/ld/configure.tgt b/ld/configure.tgt
38index beba17ef51..917be6f8eb 100644
39--- a/ld/configure.tgt 35--- a/ld/configure.tgt
40+++ b/ld/configure.tgt 36+++ b/ld/configure.tgt
41@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks 37@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip
42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks 38 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
43 targ_extra_emuls="elf32elmipvxworks" ;; 39 targ_extra_emuls="elf32elmipvxworks" ;;
44 mips*-*-windiss) targ_emul=elf32mipswindiss ;; 40 mips*-*-windiss) targ_emul=elf32mipswindiss ;;
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch
index 20c5ed6308..b710752245 100644
--- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch
@@ -1,7 +1,7 @@
1From e4a0cd30c7e9334ed507c93014a8b2d1315ff937 Mon Sep 17 00:00:00 2001 1From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d 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 11/15] Add support for Netlogic XLP 4Subject: [PATCH] Add support for Netlogic XLP
5 5
6Patch From: Nebu Philips <nphilips@netlogicmicro.com> 6Patch From: Nebu Philips <nphilips@netlogicmicro.com>
7 7
@@ -28,16 +28,14 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
28 gas/configure | 3 +++ 28 gas/configure | 3 +++
29 include/elf/mips.h | 1 + 29 include/elf/mips.h | 1 +
30 include/opcode/mips.h | 6 ++++++ 30 include/opcode/mips.h | 6 ++++++
31 ld/configure.tgt | 2 ++ 31 ld/configure.tgt | 3 +++
32 opcodes/mips-dis.c | 12 +++++------- 32 opcodes/mips-dis.c | 12 +++++-------
33 opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- 33 opcodes/mips-opc.c | 31 ++++++++++++++++++++-----------
34 14 files changed, 61 insertions(+), 21 deletions(-) 34 14 files changed, 62 insertions(+), 21 deletions(-)
35 35
36diff --git a/bfd/aoutx.h b/bfd/aoutx.h
37index e5d8dcf390..2cc74a2d61 100644
38--- a/bfd/aoutx.h 36--- a/bfd/aoutx.h
39+++ b/bfd/aoutx.h 37+++ b/bfd/aoutx.h
40@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, 38@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch
41 case bfd_mach_mipsisa64r6: 39 case bfd_mach_mipsisa64r6:
42 case bfd_mach_mips_sb1: 40 case bfd_mach_mips_sb1:
43 case bfd_mach_mips_xlr: 41 case bfd_mach_mips_xlr:
@@ -45,8 +43,6 @@ index e5d8dcf390..2cc74a2d61 100644
45 /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ 43 /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */
46 arch_flags = M_MIPS2; 44 arch_flags = M_MIPS2;
47 break; 45 break;
48diff --git a/bfd/archures.c b/bfd/archures.c
49index 647cf0d8d4..7e1d0c810f 100644
50--- a/bfd/archures.c 46--- a/bfd/archures.c
51+++ b/bfd/archures.c 47+++ b/bfd/archures.c
52@@ -185,6 +185,7 @@ DESCRIPTION 48@@ -185,6 +185,7 @@ DESCRIPTION
@@ -57,11 +53,9 @@ index 647cf0d8d4..7e1d0c810f 100644
57 .#define bfd_mach_mipsisa32 32 53 .#define bfd_mach_mipsisa32 32
58 .#define bfd_mach_mipsisa32r2 33 54 .#define bfd_mach_mipsisa32r2 33
59 .#define bfd_mach_mipsisa32r3 34 55 .#define bfd_mach_mipsisa32r3 34
60diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
61index e25da50aaf..e251d7e7aa 100644
62--- a/bfd/bfd-in2.h 56--- a/bfd/bfd-in2.h
63+++ b/bfd/bfd-in2.h 57+++ b/bfd/bfd-in2.h
64@@ -2084,6 +2084,7 @@ enum bfd_architecture 58@@ -2125,6 +2125,7 @@ enum bfd_architecture
65 #define bfd_mach_mips_octeon3 6503 59 #define bfd_mach_mips_octeon3 6503
66 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ 60 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */
67 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ 61 #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */
@@ -69,11 +63,9 @@ index e25da50aaf..e251d7e7aa 100644
69 #define bfd_mach_mipsisa32 32 63 #define bfd_mach_mipsisa32 32
70 #define bfd_mach_mipsisa32r2 33 64 #define bfd_mach_mipsisa32r2 33
71 #define bfd_mach_mipsisa32r3 34 65 #define bfd_mach_mipsisa32r3 34
72diff --git a/bfd/config.bfd b/bfd/config.bfd
73index cc65547588..3614ff79d4 100644
74--- a/bfd/config.bfd 66--- a/bfd/config.bfd
75+++ b/bfd/config.bfd 67+++ b/bfd/config.bfd
76@@ -902,6 +902,11 @@ case "${targ}" in 68@@ -898,6 +898,11 @@ case "${targ}" in
77 targ_defvec=mips_elf32_le_vec 69 targ_defvec=mips_elf32_le_vec
78 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" 70 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
79 ;; 71 ;;
@@ -85,8 +77,6 @@ index cc65547588..3614ff79d4 100644
85 mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) 77 mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none)
86 targ_defvec=mips_elf32_be_vec 78 targ_defvec=mips_elf32_be_vec
87 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" 79 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
88diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
89index b359491305..61a3e7aaca 100644
90--- a/bfd/cpu-mips.c 80--- a/bfd/cpu-mips.c
91+++ b/bfd/cpu-mips.c 81+++ b/bfd/cpu-mips.c
92@@ -107,7 +107,8 @@ enum 82@@ -107,7 +107,8 @@ enum
@@ -99,21 +89,19 @@ index b359491305..61a3e7aaca 100644
99 }; 89 };
100 90
101 #define NN(index) (&arch_info_struct[(index) + 1]) 91 #define NN(index) (&arch_info_struct[(index) + 1])
102@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_info_struct[] = 92@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf
103 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), 93 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)),
104 N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, 94 N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE,
105 NN(I_interaptiv_mr2)), 95 NN(I_interaptiv_mr2)),
106- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) 96- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0)
107+ N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,NN(I_micromips)), 97+ N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)),
108+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, 0) 98+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL)
109 }; 99 };
110 100
111 /* The default architecture is mips:3000, but with a machine number of 101 /* The default architecture is mips:3000, but with a machine number of
112diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
113index 5998bc43a8..0d5795222b 100644
114--- a/bfd/elfxx-mips.c 102--- a/bfd/elfxx-mips.c
115+++ b/bfd/elfxx-mips.c 103+++ b/bfd/elfxx-mips.c
116@@ -6919,6 +6919,9 @@ _bfd_elf_mips_mach (flagword flags) 104@@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags)
117 case E_MIPS_MACH_IAMR2: 105 case E_MIPS_MACH_IAMR2:
118 return bfd_mach_mips_interaptiv_mr2; 106 return bfd_mach_mips_interaptiv_mr2;
119 107
@@ -123,7 +111,7 @@ index 5998bc43a8..0d5795222b 100644
123 default: 111 default:
124 switch (flags & EF_MIPS_ARCH) 112 switch (flags & EF_MIPS_ARCH)
125 { 113 {
126@@ -12199,6 +12202,10 @@ mips_set_isa_flags (bfd *abfd) 114@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd)
127 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; 115 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2;
128 break; 116 break;
129 117
@@ -134,7 +122,7 @@ index 5998bc43a8..0d5795222b 100644
134 case bfd_mach_mipsisa32: 122 case bfd_mach_mipsisa32:
135 val = E_MIPS_ARCH_32; 123 val = E_MIPS_ARCH_32;
136 break; 124 break;
137@@ -14214,6 +14221,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = 125@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension
138 { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, 126 { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e },
139 { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, 127 { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 },
140 { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, 128 { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 },
@@ -142,11 +130,9 @@ index 5998bc43a8..0d5795222b 100644
142 130
143 /* MIPS64 extensions. */ 131 /* MIPS64 extensions. */
144 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, 132 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },
145diff --git a/binutils/readelf.c b/binutils/readelf.c
146index b13eb6a43b..9df3742682 100644
147--- a/binutils/readelf.c 133--- a/binutils/readelf.c
148+++ b/binutils/readelf.c 134+++ b/binutils/readelf.c
149@@ -3412,6 +3412,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) 135@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata,
150 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; 136 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break;
151 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; 137 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break;
152 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; 138 case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break;
@@ -154,11 +140,9 @@ index b13eb6a43b..9df3742682 100644
154 case 0: 140 case 0:
155 /* We simply ignore the field in this case to avoid confusion: 141 /* We simply ignore the field in this case to avoid confusion:
156 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU 142 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU
157diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
158index ae55904229..d6882712f5 100644
159--- a/gas/config/tc-mips.c 143--- a/gas/config/tc-mips.c
160+++ b/gas/config/tc-mips.c 144+++ b/gas/config/tc-mips.c
161@@ -554,6 +554,7 @@ static int mips_32bitmode = 0; 145@@ -568,6 +568,7 @@ static int mips_32bitmode = 0;
162 || mips_opts.arch == CPU_RM7000 \ 146 || mips_opts.arch == CPU_RM7000 \
163 || mips_opts.arch == CPU_VR5500 \ 147 || mips_opts.arch == CPU_VR5500 \
164 || mips_opts.micromips \ 148 || mips_opts.micromips \
@@ -166,7 +150,7 @@ index ae55904229..d6882712f5 100644
166 ) 150 )
167 151
168 /* Whether the processor uses hardware interlocks to protect reads 152 /* Whether the processor uses hardware interlocks to protect reads
169@@ -583,6 +584,7 @@ static int mips_32bitmode = 0; 153@@ -597,6 +598,7 @@ static int mips_32bitmode = 0;
170 && mips_opts.isa != ISA_MIPS3) \ 154 && mips_opts.isa != ISA_MIPS3) \
171 || mips_opts.arch == CPU_R4300 \ 155 || mips_opts.arch == CPU_R4300 \
172 || mips_opts.micromips \ 156 || mips_opts.micromips \
@@ -174,20 +158,18 @@ index ae55904229..d6882712f5 100644
174 ) 158 )
175 159
176 /* Whether the processor uses hardware interlocks to protect reads 160 /* Whether the processor uses hardware interlocks to protect reads
177@@ -19867,7 +19869,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = 161@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c
178 /* Broadcom XLP. 162 /* Broadcom XLP.
179 XLP is mostly like XLR, with the prominent exception that it is 163 XLP is mostly like XLR, with the prominent exception that it is
180 MIPS64R2 rather than MIPS64. */ 164 MIPS64R2 rather than MIPS64. */
181- { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR }, 165- { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR },
182+ { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLP }, 166+ { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLP },
183 167
184 /* MIPS 64 Release 6 */ 168 /* MIPS 64 Release 6. */
185 { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, 169 { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6},
186diff --git a/gas/configure b/gas/configure
187index a82fde7fa8..afc77c347a 100755
188--- a/gas/configure 170--- a/gas/configure
189+++ b/gas/configure 171+++ b/gas/configure
190@@ -13364,6 +13364,9 @@ _ACEOF 172@@ -13377,6 +13377,9 @@ _ACEOF
191 mipsisa64r6 | mipsisa64r6el) 173 mipsisa64r6 | mipsisa64r6el)
192 mips_cpu=mips64r6 174 mips_cpu=mips64r6
193 ;; 175 ;;
@@ -197,8 +179,6 @@ index a82fde7fa8..afc77c347a 100755
197 mipstx39 | mipstx39el) 179 mipstx39 | mipstx39el)
198 mips_cpu=r3900 180 mips_cpu=r3900
199 ;; 181 ;;
200diff --git a/include/elf/mips.h b/include/elf/mips.h
201index b76d450ae2..7cddb365ad 100644
202--- a/include/elf/mips.h 182--- a/include/elf/mips.h
203+++ b/include/elf/mips.h 183+++ b/include/elf/mips.h
204@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) 184@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
@@ -209,11 +189,9 @@ index b76d450ae2..7cddb365ad 100644
209 #define E_MIPS_MACH_OCTEON2 0x008d0000 189 #define E_MIPS_MACH_OCTEON2 0x008d0000
210 #define E_MIPS_MACH_OCTEON3 0x008e0000 190 #define E_MIPS_MACH_OCTEON3 0x008e0000
211 #define E_MIPS_MACH_5400 0x00910000 191 #define E_MIPS_MACH_5400 0x00910000
212diff --git a/include/opcode/mips.h b/include/opcode/mips.h
213index abd52c8980..53b6752a1c 100644
214--- a/include/opcode/mips.h 192--- a/include/opcode/mips.h
215+++ b/include/opcode/mips.h 193+++ b/include/opcode/mips.h
216@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { 194@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table
217 #define INSN_XLR 0x00000020 195 #define INSN_XLR 0x00000020
218 /* Imagination interAptiv MR2. */ 196 /* Imagination interAptiv MR2. */
219 #define INSN_INTERAPTIV_MR2 0x04000000 197 #define INSN_INTERAPTIV_MR2 0x04000000
@@ -222,7 +200,7 @@ index abd52c8980..53b6752a1c 100644
222 200
223 /* DSP ASE */ 201 /* DSP ASE */
224 #define ASE_DSP 0x00000001 202 #define ASE_DSP 0x00000001
225@@ -1381,6 +1383,7 @@ static const unsigned int mips_isa_table[] = { 203@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table
226 #define CPU_OCTEON3 6503 204 #define CPU_OCTEON3 6503
227 #define CPU_XLR 887682 /* decimal 'XLR' */ 205 #define CPU_XLR 887682 /* decimal 'XLR' */
228 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ 206 #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */
@@ -230,7 +208,7 @@ index abd52c8980..53b6752a1c 100644
230 208
231 /* Return true if the given CPU is included in INSN_* mask MASK. */ 209 /* Return true if the given CPU is included in INSN_* mask MASK. */
232 210
233@@ -1458,6 +1461,9 @@ cpu_is_member (int cpu, unsigned int mask) 211@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas
234 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) 212 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6)
235 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); 213 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6);
236 214
@@ -240,11 +218,9 @@ index abd52c8980..53b6752a1c 100644
240 default: 218 default:
241 return FALSE; 219 return FALSE;
242 } 220 }
243diff --git a/ld/configure.tgt b/ld/configure.tgt
244index 917be6f8eb..347df6c3f6 100644
245--- a/ld/configure.tgt 221--- a/ld/configure.tgt
246+++ b/ld/configure.tgt 222+++ b/ld/configure.tgt
247@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*) 223@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi
248 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) 224 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
249 targ_emul=elf32btsmip 225 targ_emul=elf32btsmip
250 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; 226 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;;
@@ -253,11 +229,9 @@ index 917be6f8eb..347df6c3f6 100644
253 mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 229 mips64*el-ps2-elf*) targ_emul=elf32lr5900n32
254 targ_extra_emuls="elf32lr5900" 230 targ_extra_emuls="elf32lr5900"
255 targ_extra_libpath=$targ_extra_emuls ;; 231 targ_extra_libpath=$targ_extra_emuls ;;
256diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
257index 0dd85e3779..1ea708dde7 100644
258--- a/opcodes/mips-dis.c 232--- a/opcodes/mips-dis.c
259+++ b/opcodes/mips-dis.c 233+++ b/opcodes/mips-dis.c
260@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_choices[] = 234@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_
261 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), 235 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
262 mips_cp1_names_mips3264, mips_hwr_names_numeric }, 236 mips_cp1_names_mips3264, mips_hwr_names_numeric },
263 237
@@ -276,8 +250,6 @@ index 0dd85e3779..1ea708dde7 100644
276 250
277 /* This entry, mips16, is here only for ISA/processor selection; do 251 /* This entry, mips16, is here only for ISA/processor selection; do
278 not print its name. */ 252 not print its name. */
279diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
280index 837da6bd99..d3ea5b8877 100644
281--- a/opcodes/mips-opc.c 253--- a/opcodes/mips-opc.c
282+++ b/opcodes/mips-opc.c 254+++ b/opcodes/mips-opc.c
283@@ -328,6 +328,7 @@ decode_mips_operand (const char *p) 255@@ -328,6 +328,7 @@ decode_mips_operand (const char *p)
@@ -288,7 +260,7 @@ index 837da6bd99..d3ea5b8877 100644
288 #define IVIRT ASE_VIRT 260 #define IVIRT ASE_VIRT
289 #define IVIRT64 ASE_VIRT64 261 #define IVIRT64 ASE_VIRT64
290 262
291@@ -989,6 +990,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 263@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op
292 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 264 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
293 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, 265 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 },
294 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, 266 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
@@ -296,7 +268,7 @@ index 837da6bd99..d3ea5b8877 100644
296 /* ctc0 is at the bottom of the table. */ 268 /* ctc0 is at the bottom of the table. */
297 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 269 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
298 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, 270 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
299@@ -1021,12 +1023,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 271@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op
300 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, 272 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 },
301 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, 273 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 },
302 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, 274 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 },
@@ -311,7 +283,7 @@ index 837da6bd99..d3ea5b8877 100644
311 /* dctr and dctw are used on the r5000. */ 283 /* dctr and dctw are used on the r5000. */
312 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 284 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
313 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, 285 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
314@@ -1098,6 +1101,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 286@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op
315 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, 287 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 },
316 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 288 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
317 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, 289 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
@@ -319,7 +291,7 @@ index 837da6bd99..d3ea5b8877 100644
319 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, 291 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
320 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, 292 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
321 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, 293 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },
322@@ -1113,6 +1117,8 @@ const struct mips_opcode mips_builtin_opcodes[] = 294@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op
323 /* dmfc3 is at the bottom of the table. */ 295 /* dmfc3 is at the bottom of the table. */
324 /* dmtc3 is at the bottom of the table. */ 296 /* dmtc3 is at the bottom of the table. */
325 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 297 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
@@ -328,7 +300,7 @@ index 837da6bd99..d3ea5b8877 100644
328 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 300 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
329 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, 301 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
330 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, 302 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },
331@@ -1266,9 +1272,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 303@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op
332 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, 304 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
333 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, 305 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
334 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, 306 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 },
@@ -341,7 +313,7 @@ index 837da6bd99..d3ea5b8877 100644
341 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 313 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
342 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, 314 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
343 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, 315 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF },
344@@ -1433,7 +1439,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 316@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op
345 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, 317 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 },
346 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, 318 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 },
347 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, 319 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -350,7 +322,7 @@ index 837da6bd99..d3ea5b8877 100644
350 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, 322 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 },
351 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, 323 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 },
352 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, 324 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 },
353@@ -1478,10 +1484,13 @@ const struct mips_opcode mips_builtin_opcodes[] = 325@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op
354 /* move is at the top of the table. */ 326 /* move is at the top of the table. */
355 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, 327 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 },
356 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, 328 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 },
@@ -366,7 +338,7 @@ index 837da6bd99..d3ea5b8877 100644
366 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, 338 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 },
367 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, 339 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 },
368 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, 340 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 },
369@@ -1531,7 +1540,7 @@ const struct mips_opcode mips_builtin_opcodes[] = 341@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op
370 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, 342 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 },
371 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, 343 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 },
372 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, 344 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },
@@ -375,7 +347,7 @@ index 837da6bd99..d3ea5b8877 100644
375 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 347 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
376 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, 348 {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
377 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, 349 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
378@@ -1968,9 +1977,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 350@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op
379 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, 351 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37},
380 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, 352 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 },
381 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, 353 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 },
@@ -388,6 +360,3 @@ index 837da6bd99..d3ea5b8877 100644
388 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 360 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
389 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 361 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
390 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, 362 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },
391--
3922.20.1
393
diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
index 6a3b78f227..f686763594 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
@@ -1,7 +1,7 @@
1From e48767a0298e6ccf53d83fecc93bb6d26b595897 Mon Sep 17 00:00:00 2001 1From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@nxp.com> 2From: Zhenhua Luo <zhenhua.luo@nxp.com>
3Date: Sat, 11 Jun 2016 22:08:29 -0500 3Date: Sat, 11 Jun 2016 22:08:29 -0500
4Subject: [PATCH 12/15] fix the incorrect assembling for ppc wait mnemonic 4Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic
5 5
6Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> 6Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
7 7
@@ -11,10 +11,10 @@ Upstream-Status: Pending
11 1 file changed, 1 insertion(+), 2 deletions(-) 11 1 file changed, 1 insertion(+), 2 deletions(-)
12 12
13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c 13diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
14index 3032631d4e..142f096ef4 100644 14index b56fe3e21a..696fe83a7b 100644
15--- a/opcodes/ppc-opc.c 15--- a/opcodes/ppc-opc.c
16+++ b/opcodes/ppc-opc.c 16+++ b/opcodes/ppc-opc.c
17@@ -5325,7 +5325,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { 17@@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
18 {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, 18 {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
19 19
20 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, 20 {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}},
@@ -22,7 +22,7 @@ index 3032631d4e..142f096ef4 100644
22 22
23 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, 23 {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}},
24 24
25@@ -5379,7 +5378,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { 25@@ -5763,7 +5762,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
26 26
27 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 27 {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
28 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, 28 {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}},
@@ -31,6 +31,3 @@ index 3032631d4e..142f096ef4 100644
31 31
32 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, 32 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}},
33 33
34--
352.20.1
36
diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch
index d929179de2..493b05026d 100644
--- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch
+++ b/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch
@@ -1,7 +1,7 @@
1From 6587e7b8e7730dda20d8c47cabe9f7f8397efa3c Mon Sep 17 00:00:00 2001 1From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 31 Mar 2017 11:42:03 -0700 3Date: Fri, 31 Mar 2017 11:42:03 -0700
4Subject: [PATCH 13/15] Detect 64-bit MIPS targets 4Subject: [PATCH] Detect 64-bit MIPS targets
5 5
6Add mips64 target triplets and default to N64 6Add mips64 target triplets and default to N64
7 7
@@ -45,6 +45,3 @@ index 3e066edaa8..caf130ceda 100644
45 mips*-*-*) 45 mips*-*-*)
46 targ_obj=mips 46 targ_obj=mips
47 targ_machine=EM_MIPS 47 targ_machine=EM_MIPS
48--
492.20.1
50
diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch
index 65ba10a553..ae5915d39b 100644
--- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch
+++ b/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch
@@ -1,7 +1,7 @@
1From b7729343206fa196b9a11747a92b3cf563277056 Mon Sep 17 00:00:00 2001 1From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 6 Mar 2017 23:33:27 -0800 3Date: Mon, 6 Mar 2017 23:33:27 -0800
4Subject: [PATCH 14/15] sync with OE libtool changes 4Subject: [PATCH] sync with OE libtool changes
5 5
6Apply these patches from our libtool patches as not only are redundant RPATHs a 6Apply these patches from our libtool patches as not only are redundant RPATHs a
7waste of space but they can cause incorrect linking when native packages are 7waste of space but they can cause incorrect linking when native packages are
@@ -84,6 +84,3 @@ index 11ee684ccc..3b19ac1532 100644
84 fi 84 fi
85 elif test -n "$runpath_var"; then 85 elif test -n "$runpath_var"; then
86 case "$finalize_perm_rpath " in 86 case "$finalize_perm_rpath " in
87--
882.20.1
89
diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch
index bfde561dee..d25ce61626 100644
--- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch
+++ b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch
@@ -1,8 +1,8 @@
1From d5d783903e335302e562bac8da1a083338d75b25 Mon Sep 17 00:00:00 2001 1From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Nov 2018 17:46:40 -0800 3Date: Thu, 29 Nov 2018 17:46:40 -0800
4Subject: [PATCH 15/15] binutils : enable x86_64-pep for producing EFI binaries 4Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on
5 on x86-64 5 x86-64
6 6
7Add x86_64-pep emulation support to the set enabled for x86_64 targets 7Add x86_64-pep emulation support to the set enabled for x86_64 targets
8to enable the linker to produce Portable Executables for EFI binaries. 8to enable the linker to produce Portable Executables for EFI binaries.
@@ -19,8 +19,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 ld/configure.tgt | 5 +++-- 19 ld/configure.tgt | 5 +++--
20 2 files changed, 4 insertions(+), 3 deletions(-) 20 2 files changed, 4 insertions(+), 3 deletions(-)
21 21
22diff --git a/bfd/config.bfd b/bfd/config.bfd
23index 3614ff79d4..aef144803a 100644
24--- a/bfd/config.bfd 22--- a/bfd/config.bfd
25+++ b/bfd/config.bfd 23+++ b/bfd/config.bfd
26@@ -694,7 +694,7 @@ case "${targ}" in 24@@ -694,7 +694,7 @@ case "${targ}" in
@@ -32,11 +30,9 @@ index 3614ff79d4..aef144803a 100644
32 want64=true 30 want64=true
33 ;; 31 ;;
34 x86_64-*-nacl*) 32 x86_64-*-nacl*)
35diff --git a/ld/configure.tgt b/ld/configure.tgt
36index 347df6c3f6..1e37d747a9 100644
37--- a/ld/configure.tgt 33--- a/ld/configure.tgt
38+++ b/ld/configure.tgt 34+++ b/ld/configure.tgt
39@@ -257,8 +257,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x86_64 35@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x
40 tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` 36 tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'`
41 tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; 37 tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;;
42 x86_64-*-linux-*) targ_emul=elf_x86_64 38 x86_64-*-linux-*) targ_emul=elf_x86_64
@@ -48,6 +44,3 @@ index 347df6c3f6..1e37d747a9 100644
48 tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; 44 tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
49 i[3-7]86-*-redox*) targ_emul=elf_i386 45 i[3-7]86-*-redox*) targ_emul=elf_i386
50 targ_extra_emuls=elf_x86_64 ;; 46 targ_extra_emuls=elf_x86_64 ;;
51--
522.20.1
53
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-12972.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-12972.patch
deleted file mode 100644
index 07d1d65467..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-12972.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 30bcc01478433a1cb05b36dc5c4beef7d2c89b5b Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Fri, 21 Jun 2019 11:51:38 +0930
4Subject: [PATCH] PR24689, string table corruption
5
6The testcase in the PR had a e_shstrndx section of type SHT_GROUP.
7hdr->contents were initialized by setup_group rather than being read
8from the file, thus last byte was not zero and string dereference ran
9off the end of the buffer.
10
11 PR 24689
12 * elfcode.h (elf_object_p): Check type of e_shstrndx section.
13
14Upstream-Status: Backport
15CVE: CVE-2019-12972
16Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
17---
18 bfd/ChangeLog | 5 +++++
19 bfd/elfcode.h | 3 ++-
20 2 files changed, 7 insertions(+), 1 deletion(-)
21
22diff --git a/bfd/ChangeLog b/bfd/ChangeLog
23index 91f09e6346..e66fb40a2c 100644
24--- a/bfd/ChangeLog
25+++ b/bfd/ChangeLog
26@@ -1,3 +1,8 @@
27+2019-06-21 Alan Modra <amodra@gmail.com>
28+
29+ PR 24689
30+ * elfcode.h (elf_object_p): Check type of e_shstrndx section.
31+
32 2019-02-20 Alan Modra <amodra@gmail.com>
33
34 PR 24236
35diff --git a/bfd/elfcode.h b/bfd/elfcode.h
36index ec5ea766de..a35a629087 100644
37--- a/bfd/elfcode.h
38+++ b/bfd/elfcode.h
39@@ -755,7 +755,8 @@ elf_object_p (bfd *abfd)
40 /* A further sanity check. */
41 if (i_ehdrp->e_shnum != 0)
42 {
43- if (i_ehdrp->e_shstrndx >= elf_numsections (abfd))
44+ if (i_ehdrp->e_shstrndx >= elf_numsections (abfd)
45+ || i_shdrp[i_ehdrp->e_shstrndx].sh_type != SHT_STRTAB)
46 {
47 /* PR 2257:
48 We used to just goto got_wrong_format_error here
49--
502.20.1
51
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-14250.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-14250.patch
deleted file mode 100644
index c915a832b0..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-14250.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From df78be05daf4eb07f60f50ec1080cb979af32ec0 Mon Sep 17 00:00:00 2001
2From: marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Tue, 23 Jul 2019 07:33:32 +0000
4Subject: [PATCH] libiberty: Check zero value shstrndx in simple-object-elf.c
5
6git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@273718 138bc75d-0d04-0410-961f-82ee72b054a4
7
8CVE: CVE-2019-14250
9Upstream-Status: Backport [from gcc: https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=273718]
10[Removed Changelog entry]
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13diff --git a/libiberty/simple-object-elf.c b/libiberty/simple-object-elf.c
14index 502388991a08..bdee963634d6 100644
15--- a/libiberty/simple-object-elf.c
16+++ b/libiberty/simple-object-elf.c
17@@ -548,7 +548,15 @@ simple_object_elf_match (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN],
18 XDELETE (eor);
19 return NULL;
20 }
21-
22+
23+ if (eor->shstrndx == 0)
24+ {
25+ *errmsg = "invalid ELF shstrndx == 0";
26+ *err = 0;
27+ XDELETE (eor);
28+ return NULL;
29+ }
30+
31 return (void *) eor;
32 }
33
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-14444.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-14444.patch
deleted file mode 100644
index 85b9a9f916..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-14444.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From e17869db99195849826eaaf5d2d0eb2cfdd7a2a7 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Mon, 5 Aug 2019 10:40:35 +0100
4Subject: [PATCH] Catch potential integer overflow in readelf when processing
5 corrupt binaries.
6
7 PR 24829
8 * readelf.c (apply_relocations): Catch potential integer overflow
9 whilst checking reloc location against section size.
10
11CVE: CVE-2019-14444
12Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e17869db99195849826eaaf5d2d0eb2cfdd7a2a7]
13[Removed Changelog entry]
14Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15---
16diff --git a/binutils/readelf.c b/binutils/readelf.c
17index b896ad9f406..e785fde43e7 100644
18--- a/binutils/readelf.c
19+++ b/binutils/readelf.c
20@@ -13366,7 +13366,7 @@ apply_relocations (Filedata * filedata,
21 }
22
23 rloc = start + rp->r_offset;
24- if ((rloc + reloc_size) > end || (rloc < start))
25+ if (rloc >= end || (rloc + reloc_size) > end || (rloc < start))
26 {
27 warn (_("skipping invalid relocation offset 0x%lx in section %s\n"),
28 (unsigned long) rp->r_offset,
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch
index a6ce0b9a8a..ce5b9f392d 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch
@@ -20,12 +20,10 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
20 bfd/dwarf2.c | 35 +++++++++++++++++------------------ 20 bfd/dwarf2.c | 35 +++++++++++++++++------------------
21 1 file changed, 17 insertions(+), 18 deletions(-) 21 1 file changed, 17 insertions(+), 18 deletions(-)
22 22
23diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
24index 0b4e485582..20ec9e2e56 100644
25--- a/bfd/dwarf2.c 23--- a/bfd/dwarf2.c
26+++ b/bfd/dwarf2.c 24+++ b/bfd/dwarf2.c
27@@ -2803,13 +2803,13 @@ lookup_symbol_in_variable_table (struct comp_unit *unit, 25@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod
28 } 26 struct dwarf2_debug *);
29 27
30 static bfd_boolean 28 static bfd_boolean
31-find_abstract_instance (struct comp_unit * unit, 29-find_abstract_instance (struct comp_unit * unit,
@@ -45,7 +43,7 @@ index 0b4e485582..20ec9e2e56 100644
45 { 43 {
46 bfd *abfd = unit->abfd; 44 bfd *abfd = unit->abfd;
47 bfd_byte *info_ptr; 45 bfd_byte *info_ptr;
48@@ -2820,6 +2820,14 @@ find_abstract_instance (struct comp_unit * unit, 46@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit
49 struct attribute attr; 47 struct attribute attr;
50 const char *name = NULL; 48 const char *name = NULL;
51 49
@@ -60,7 +58,7 @@ index 0b4e485582..20ec9e2e56 100644
60 /* DW_FORM_ref_addr can reference an entry in a different CU. It 58 /* DW_FORM_ref_addr can reference an entry in a different CU. It
61 is an offset from the .debug_info section, not the current CU. */ 59 is an offset from the .debug_info section, not the current CU. */
62 if (attr_ptr->form == DW_FORM_ref_addr) 60 if (attr_ptr->form == DW_FORM_ref_addr)
63@@ -2939,15 +2947,6 @@ find_abstract_instance (struct comp_unit * unit, 61@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit
64 info_ptr, info_ptr_end); 62 info_ptr, info_ptr_end);
65 if (info_ptr == NULL) 63 if (info_ptr == NULL)
66 break; 64 break;
@@ -76,7 +74,7 @@ index 0b4e485582..20ec9e2e56 100644
76 switch (attr.name) 74 switch (attr.name)
77 { 75 {
78 case DW_AT_name: 76 case DW_AT_name:
79@@ -2961,7 +2960,7 @@ find_abstract_instance (struct comp_unit * unit, 77@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit
80 } 78 }
81 break; 79 break;
82 case DW_AT_specification: 80 case DW_AT_specification:
@@ -85,7 +83,7 @@ index 0b4e485582..20ec9e2e56 100644
85 &name, is_linkage, 83 &name, is_linkage,
86 filename_ptr, linenumber_ptr)) 84 filename_ptr, linenumber_ptr))
87 return FALSE; 85 return FALSE;
88@@ -3175,7 +3174,7 @@ scan_unit_for_symbols (struct comp_unit *unit) 86@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit
89 87
90 case DW_AT_abstract_origin: 88 case DW_AT_abstract_origin:
91 case DW_AT_specification: 89 case DW_AT_specification:
@@ -94,6 +92,3 @@ index 0b4e485582..20ec9e2e56 100644
94 &func->name, 92 &func->name,
95 &func->is_linkage, 93 &func->is_linkage,
96 &func->file, 94 &func->file,
97--
982.23.0
99
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch
index b36a532668..1fe05d310e 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch
@@ -24,11 +24,9 @@ section of course overflows the buffer and tramples on other memory.
24 bfd/dwarf2.c | 11 ++++++++++- 24 bfd/dwarf2.c | 11 ++++++++++-
25 1 file changed, 10 insertions(+), 1 deletion(-) 25 1 file changed, 10 insertions(+), 1 deletion(-)
26 26
27diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
28index 0b4e485582..a91597b1d0 100644
29--- a/bfd/dwarf2.c 27--- a/bfd/dwarf2.c
30+++ b/bfd/dwarf2.c 28+++ b/bfd/dwarf2.c
31@@ -4426,7 +4426,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd, 29@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd,
32 for (total_size = 0; 30 for (total_size = 0;
33 msec; 31 msec;
34 msec = find_debug_info (debug_bfd, debug_sections, msec)) 32 msec = find_debug_info (debug_bfd, debug_sections, msec))
@@ -46,6 +44,3 @@ index 0b4e485582..a91597b1d0 100644
46 44
47 stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); 45 stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size);
48 if (stash->info_ptr_memory == NULL) 46 if (stash->info_ptr_memory == NULL)
49--
502.23.0
51
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9071.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9071.patch
deleted file mode 100644
index f02539942f..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-9071.patch
+++ /dev/null
@@ -1,165 +0,0 @@
1From c1202057eb9161a86af27d867703235fee7b7555 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Wed, 10 Apr 2019 15:49:36 +0100
4Subject: [PATCH] Pull in patch for libiberty that fixes a stack exhaustion bug
5 when demangling a pathalogically constructed mangled name.
6
7 PR 89394
8 * cp-demangle.c (cplus_demangle_fill_name): Reject negative
9 lengths.
10 (d_count_templates_scopes): Replace num_templates and num_scopes
11 parameters with a struct d_print_info pointer parameter. Adjust
12 body of the function accordingly. Add recursion counter and check
13 that the recursion limit is not reached.
14 (d_print_init): Pass dpi parameter to d_count_templates_scopes.
15 Reset recursion counter afterwards, unless the recursion limit was
16 reached.
17
18CVE: CVE-2019-9071
19CVE: CVE-2019-9070
20Upstream-Status: Backport
21Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
22---
23 ChangeLog | 16 ++++++++++++++
24 libiberty/cp-demangle.c | 48 ++++++++++++++++++++++-------------------
25 2 files changed, 42 insertions(+), 22 deletions(-)
26
27diff --git a/ChangeLog b/ChangeLog
28index cd631a15b6..4df3aaa62c 100644
29--- a/ChangeLog
30+++ b/ChangeLog
31@@ -1,3 +1,19 @@
32+2019-04-10 Nick Clifton <nickc@redhat.com>
33+
34+ * libiberty: Sync with gcc. Bring in:
35+ 2019-04-10 Nick Clifton <nickc@redhat.com>
36+
37+ PR 89394
38+ * cp-demangle.c (cplus_demangle_fill_name): Reject negative
39+ lengths.
40+ (d_count_templates_scopes): Replace num_templates and num_scopes
41+ parameters with a struct d_print_info pointer parameter. Adjust
42+ body of the function accordingly. Add recursion counter and check
43+ that the recursion limit is not reached.
44+ (d_print_init): Pass dpi parameter to d_count_templates_scopes.
45+ Reset recursion counter afterwards, unless the recursion limit was
46+ reached.
47+
48 2018-06-24 Nick Clifton <nickc@redhat.com>
49
50 2.32 branch created.
51diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
52index b34b485692..779b4e763a 100644
53--- a/libiberty/cp-demangle.c
54+++ b/libiberty/cp-demangle.c
55@@ -861,7 +861,7 @@ CP_STATIC_IF_GLIBCPP_V3
56 int
57 cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len)
58 {
59- if (p == NULL || s == NULL || len == 0)
60+ if (p == NULL || s == NULL || len <= 0)
61 return 0;
62 p->d_printing = 0;
63 p->type = DEMANGLE_COMPONENT_NAME;
64@@ -4061,7 +4061,7 @@ d_growable_string_callback_adapter (const char *s, size_t l, void *opaque)
65 are larger than the actual numbers encountered. */
66
67 static void
68-d_count_templates_scopes (int *num_templates, int *num_scopes,
69+d_count_templates_scopes (struct d_print_info *dpi,
70 const struct demangle_component *dc)
71 {
72 if (dc == NULL)
73@@ -4081,13 +4081,13 @@ d_count_templates_scopes (int *num_templates, int *num_scopes,
74 break;
75
76 case DEMANGLE_COMPONENT_TEMPLATE:
77- (*num_templates)++;
78+ dpi->num_copy_templates++;
79 goto recurse_left_right;
80
81 case DEMANGLE_COMPONENT_REFERENCE:
82 case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
83 if (d_left (dc)->type == DEMANGLE_COMPONENT_TEMPLATE_PARAM)
84- (*num_scopes)++;
85+ dpi->num_saved_scopes++;
86 goto recurse_left_right;
87
88 case DEMANGLE_COMPONENT_QUAL_NAME:
89@@ -4152,42 +4152,42 @@ d_count_templates_scopes (int *num_templates, int *num_scopes,
90 case DEMANGLE_COMPONENT_TAGGED_NAME:
91 case DEMANGLE_COMPONENT_CLONE:
92 recurse_left_right:
93- d_count_templates_scopes (num_templates, num_scopes,
94- d_left (dc));
95- d_count_templates_scopes (num_templates, num_scopes,
96- d_right (dc));
97+ /* PR 89394 - Check for too much recursion. */
98+ if (dpi->recursion > DEMANGLE_RECURSION_LIMIT)
99+ /* FIXME: There ought to be a way to report to the
100+ user that the recursion limit has been reached. */
101+ return;
102+
103+ ++ dpi->recursion;
104+ d_count_templates_scopes (dpi, d_left (dc));
105+ d_count_templates_scopes (dpi, d_right (dc));
106+ -- dpi->recursion;
107 break;
108
109 case DEMANGLE_COMPONENT_CTOR:
110- d_count_templates_scopes (num_templates, num_scopes,
111- dc->u.s_ctor.name);
112+ d_count_templates_scopes (dpi, dc->u.s_ctor.name);
113 break;
114
115 case DEMANGLE_COMPONENT_DTOR:
116- d_count_templates_scopes (num_templates, num_scopes,
117- dc->u.s_dtor.name);
118+ d_count_templates_scopes (dpi, dc->u.s_dtor.name);
119 break;
120
121 case DEMANGLE_COMPONENT_EXTENDED_OPERATOR:
122- d_count_templates_scopes (num_templates, num_scopes,
123- dc->u.s_extended_operator.name);
124+ d_count_templates_scopes (dpi, dc->u.s_extended_operator.name);
125 break;
126
127 case DEMANGLE_COMPONENT_FIXED_TYPE:
128- d_count_templates_scopes (num_templates, num_scopes,
129- dc->u.s_fixed.length);
130+ d_count_templates_scopes (dpi, dc->u.s_fixed.length);
131 break;
132
133 case DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS:
134 case DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS:
135- d_count_templates_scopes (num_templates, num_scopes,
136- d_left (dc));
137+ d_count_templates_scopes (dpi, d_left (dc));
138 break;
139
140 case DEMANGLE_COMPONENT_LAMBDA:
141 case DEMANGLE_COMPONENT_DEFAULT_ARG:
142- d_count_templates_scopes (num_templates, num_scopes,
143- dc->u.s_unary_num.sub);
144+ d_count_templates_scopes (dpi, dc->u.s_unary_num.sub);
145 break;
146 }
147 }
148@@ -4222,8 +4222,12 @@ d_print_init (struct d_print_info *dpi, demangle_callbackref callback,
149 dpi->next_copy_template = 0;
150 dpi->num_copy_templates = 0;
151
152- d_count_templates_scopes (&dpi->num_copy_templates,
153- &dpi->num_saved_scopes, dc);
154+ d_count_templates_scopes (dpi, dc);
155+ /* If we did not reach the recursion limit, then reset the
156+ current recursion value back to 0, so that we can print
157+ the templates. */
158+ if (dpi->recursion < DEMANGLE_RECURSION_LIMIT)
159+ dpi->recursion = 0;
160 dpi->num_copy_templates *= dpi->num_saved_scopes;
161
162 dpi->current_template = NULL;
163--
1642.20.1
165
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch
deleted file mode 100644
index a11a51200e..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From e2ebb3906432dcca2727186ad79415f920730fb2 Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Tue, 19 Feb 2019 22:48:44 +1030
4Subject: [PATCH] PR24235, Read memory violation in pei-x86_64.c
5
6 PR 24235
7 * pei-x86_64.c (pex64_bfd_print_pdata_section): Correct checks
8 attempting to prevent read past end of section.
9
10Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/179f2db0d9c397d7dd8a59907b84208b79f7f48c]
11CVE: CVE-2019-9074
12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13---
14 bfd/ChangeLog | 6 ++++++
15 bfd/pei-x86_64.c | 9 ++++-----
16 2 files changed, 10 insertions(+), 5 deletions(-)
17
18diff --git a/bfd/ChangeLog b/bfd/ChangeLog
19index dd2c741..cbf30de 100644
20--- a/bfd/ChangeLog
21+++ b/bfd/ChangeLog
22@@ -1,3 +1,9 @@
23+2019-02-19 Alan Modra <amodra@gmail.com>
24+
25+ PR 24235
26+ * pei-x86_64.c (pex64_bfd_print_pdata_section): Correct checks
27+ attempting to prevent read past end of section.
28+
29 2019-02-04 Nick Clifton <nickc@redhat.com>
30
31 * development.sh (experimental) Set to false.
32diff --git a/bfd/pei-x86_64.c b/bfd/pei-x86_64.c
33index ff1093c..7e75104 100644
34--- a/bfd/pei-x86_64.c
35+++ b/bfd/pei-x86_64.c
36@@ -541,7 +541,7 @@ pex64_bfd_print_pdata_section (bfd *abfd, void *vfile, asection *pdata_section)
37 /* virt_size might be zero for objects. */
38 if (stop == 0 && strcmp (abfd->xvec->name, "pe-x86-64") == 0)
39 {
40- stop = (datasize / onaline) * onaline;
41+ stop = datasize;
42 virt_size_is_zero = TRUE;
43 }
44 else if (datasize < stop)
45@@ -551,8 +551,8 @@ pex64_bfd_print_pdata_section (bfd *abfd, void *vfile, asection *pdata_section)
46 _("Warning: %s section size (%ld) is smaller than virtual size (%ld)\n"),
47 pdata_section->name, (unsigned long) datasize,
48 (unsigned long) stop);
49- /* Be sure not to read passed datasize. */
50- stop = datasize / onaline;
51+ /* Be sure not to read past datasize. */
52+ stop = datasize;
53 }
54
55 /* Display functions table. */
56@@ -724,8 +724,7 @@ pex64_bfd_print_pdata_section (bfd *abfd, void *vfile, asection *pdata_section)
57 altent += imagebase;
58
59 if (altent >= pdata_vma
60- && (altent + PDATA_ROW_SIZE <= pdata_vma
61- + pei_section_data (abfd, pdata_section)->virt_size))
62+ && altent - pdata_vma + PDATA_ROW_SIZE <= stop)
63 {
64 pex64_get_runtime_function
65 (abfd, &arf, &pdata[altent - pdata_vma]);
66--
672.7.4
68
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch
deleted file mode 100644
index bcb1310f16..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch
+++ /dev/null
@@ -1,119 +0,0 @@
1From 8abac8031ed369a2734b1cdb7df28a39a54b4b49 Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Wed, 20 Feb 2019 08:21:24 +1030
4Subject: [PATCH] PR24236, Heap buffer overflow in
5 _bfd_archive_64_bit_slurp_armap
6
7 PR 24236
8 * archive64.c (_bfd_archive_64_bit_slurp_armap): Move code adding
9 sentinel NUL to string buffer nearer to loop where it is used.
10 Don't go past sentinel when scanning strings, and don't write
11 NUL again.
12 * archive.c (do_slurp_coff_armap): Simplify string handling to
13 archive64.c style.
14
15Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/8abac8031ed369a2734b1cdb7df28a39a54b4b49]
16CVE: CVE-2019-9075
17Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
18---
19 bfd/ChangeLog | 10 ++++++++++
20 bfd/archive.c | 17 +++++++----------
21 bfd/archive64.c | 10 +++++-----
22 3 files changed, 22 insertions(+), 15 deletions(-)
23
24diff --git a/bfd/ChangeLog b/bfd/ChangeLog
25index 72c87c7..e39bb12 100644
26--- a/bfd/ChangeLog
27+++ b/bfd/ChangeLog
28@@ -1,3 +1,13 @@
29+2019-02-20 Alan Modra <amodra@gmail.com>
30+
31+ PR 24236
32+ * archive64.c (_bfd_archive_64_bit_slurp_armap): Move code adding
33+ sentinel NUL to string buffer nearer to loop where it is used.
34+ Don't go past sentinel when scanning strings, and don't write
35+ NUL again.
36+ * archive.c (do_slurp_coff_armap): Simplify string handling to
37+ archive64.c style.
38+
39 2019-02-19 Alan Modra <amodra@gmail.com>
40
41 PR 24235
42diff --git a/bfd/archive.c b/bfd/archive.c
43index d2d9b72..68a92a3 100644
44--- a/bfd/archive.c
45+++ b/bfd/archive.c
46@@ -1012,6 +1012,7 @@ do_slurp_coff_armap (bfd *abfd)
47 int *raw_armap, *rawptr;
48 struct artdata *ardata = bfd_ardata (abfd);
49 char *stringbase;
50+ char *stringend;
51 bfd_size_type stringsize;
52 bfd_size_type parsed_size;
53 carsym *carsyms;
54@@ -1071,22 +1072,18 @@ do_slurp_coff_armap (bfd *abfd)
55 }
56
57 /* OK, build the carsyms. */
58- for (i = 0; i < nsymz && stringsize > 0; i++)
59+ stringend = stringbase + stringsize;
60+ *stringend = 0;
61+ for (i = 0; i < nsymz; i++)
62 {
63- bfd_size_type len;
64-
65 rawptr = raw_armap + i;
66 carsyms->file_offset = swap ((bfd_byte *) rawptr);
67 carsyms->name = stringbase;
68- /* PR 17512: file: 4a1d50c1. */
69- len = strnlen (stringbase, stringsize);
70- if (len < stringsize)
71- len ++;
72- stringbase += len;
73- stringsize -= len;
74+ stringbase += strlen (stringbase);
75+ if (stringbase != stringend)
76+ ++stringbase;
77 carsyms++;
78 }
79- *stringbase = 0;
80
81 ardata->symdef_count = nsymz;
82 ardata->first_file_filepos = bfd_tell (abfd);
83diff --git a/bfd/archive64.c b/bfd/archive64.c
84index 312bf82..42f6ed9 100644
85--- a/bfd/archive64.c
86+++ b/bfd/archive64.c
87@@ -100,8 +100,6 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
88 return FALSE;
89 carsyms = ardata->symdefs;
90 stringbase = ((char *) ardata->symdefs) + carsym_size;
91- stringbase[stringsize] = 0;
92- stringend = stringbase + stringsize;
93
94 raw_armap = (bfd_byte *) bfd_alloc (abfd, ptrsize);
95 if (raw_armap == NULL)
96@@ -115,15 +113,17 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
97 goto release_raw_armap;
98 }
99
100+ stringend = stringbase + stringsize;
101+ *stringend = 0;
102 for (i = 0; i < nsymz; i++)
103 {
104 carsyms->file_offset = bfd_getb64 (raw_armap + i * 8);
105 carsyms->name = stringbase;
106- if (stringbase < stringend)
107- stringbase += strlen (stringbase) + 1;
108+ stringbase += strlen (stringbase);
109+ if (stringbase != stringend)
110+ ++stringbase;
111 ++carsyms;
112 }
113- *stringbase = '\0';
114
115 ardata->symdef_count = nsymz;
116 ardata->first_file_filepos = bfd_tell (abfd);
117--
1182.7.4
119
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch
deleted file mode 100644
index ec8cde2503..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 9f841c583880eb6d0194455c1583a766f853e628 Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Wed, 20 Feb 2019 12:06:31 +1030
4Subject: [PATCH] PR24233, Out of memory
5
6 PR 24233
7 * objdump.c (dump_bfd_private_header): Print warning if
8 bfd_print_private_bfd_data returns false.
9
10Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/7d272a55caebfc26ab2e15d1e9439bac978b9bb7]
11CVE: CVE-2019-9076
12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13---
14 binutils/ChangeLog | 6 ++++++
15 binutils/objdump.c | 4 +++-
16 2 files changed, 9 insertions(+), 1 deletion(-)
17
18diff --git a/binutils/ChangeLog b/binutils/ChangeLog
19index f837c37..d5dd7cb 100644
20--- a/binutils/ChangeLog
21+++ b/binutils/ChangeLog
22@@ -1,3 +1,9 @@
23+2019-02-20 Alan Modra <amodra@gmail.com>
24+
25+ PR 24233
26+ * objdump.c (dump_bfd_private_header): Print warning if
27+ bfd_print_private_bfd_data returns false.
28+
29 2019-02-02 Nick Clifton <nickc@redhat.com>
30
31 * configure: Regenerate.
32diff --git a/binutils/objdump.c b/binutils/objdump.c
33index 8725390..7d0c6a4 100644
34--- a/binutils/objdump.c
35+++ b/binutils/objdump.c
36@@ -3178,7 +3178,9 @@ dump_bfd_header (bfd *abfd)
37 static void
38 dump_bfd_private_header (bfd *abfd)
39 {
40- bfd_print_private_bfd_data (abfd, stdout);
41+ if (!bfd_print_private_bfd_data (abfd, stdout))
42+ non_fatal (_("warning: private headers incomplete: %s"),
43+ bfd_errmsg (bfd_get_error ()));
44 }
45
46 static void
47--
482.7.4
49
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch
deleted file mode 100644
index 11ecb71b2e..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From f7bbc8890de45df6eda0ddef5dd04f835f54eecf Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Wed, 20 Feb 2019 17:03:47 +0000
4Subject: [PATCH] Fix a illegal memory access fault when parsing a corrupt MIPS
5 option section using readelf.
6
7 PR 24243
8 * readelf.c (process_mips_specific): Check for an options section
9 that is too small to even contain a single option.
10
11Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/7fc0c668f2aceb8582d74db1ad2528e2bba8a921]
12CVE: CVE-2019-9077
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14---
15 binutils/readelf.c | 6 ++++++
16 1 file changed, 6 insertions(+)
17
18diff --git a/binutils/readelf.c b/binutils/readelf.c
19index 9df3742..18ab806 100644
20--- a/binutils/readelf.c
21+++ b/binutils/readelf.c
22@@ -16179,6 +16179,12 @@ process_mips_specific (Filedata * filedata)
23 error (_("No MIPS_OPTIONS header found\n"));
24 return FALSE;
25 }
26+ /* PR 24243 */
27+ if (sect->sh_size < sizeof (* eopt))
28+ {
29+ error (_("The MIPS options section is too small.\n"));
30+ return FALSE;
31+ }
32
33 eopt = (Elf_External_Options *) get_data (NULL, filedata, options_offset, 1,
34 sect->sh_size, _("options"));
35--
362.7.4
37
diff --git a/meta/recipes-devtools/binutils/binutils_2.32.bb b/meta/recipes-devtools/binutils/binutils_2.33.bb
index 89315915c4..89315915c4 100644
--- a/meta/recipes-devtools/binutils/binutils_2.32.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.33.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 09:23:16 +0000