summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-03-02 02:06:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:11 +0100
commitb559d7f81f0793e70bdfcf6c1258530ba07c0217 (patch)
tree18910f69e4552c7f68e7b2992deb6960dabb7832 /meta/recipes-devtools
parent1cb175fd7b9b1b954ccbc71f45fd968069c76b2a (diff)
downloadpoky-b559d7f81f0793e70bdfcf6c1258530ba07c0217.tar.gz
binutils: Switch to using binutils stable/2.25 branch
We have a lot of patches on top of 2.25 release that we need its easier/cleaner to use the git src instead of tarball and use the latest on the 2.25 branch Additionally, drop binutils-uclibc-300-006_better_file_error.patch since it has been redone with https://sourceware.org/ml/binutils/2006-10/msg00337.html upstream git'ify the patches against upstream repos for better maintainance Change-Id: I572c9bb49f60853e7ade4e8f63ab77b7e41476c5 (From OE-Core rev: 3c7fe424f850af70989ad682dd9c5be70cd02ca5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.25.inc40
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch31
-rw-r--r--meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch (renamed from meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch)45
-rw-r--r--meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch56
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch42
-rw-r--r--meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch41
-rw-r--r--meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch52
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch (renamed from meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch)17045
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch35
-rw-r--r--meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch35
-rw-r--r--meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch (renamed from meta/recipes-devtools/binutils/binutils/binutils-poison.patch)191
-rw-r--r--meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch (renamed from meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch)25
-rw-r--r--meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch (renamed from meta/recipes-devtools/binutils/binutils/mips64-default-ld-emulation.patch)33
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch (renamed from meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch)48
-rw-r--r--meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch (renamed from meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch)11
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch25
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch40
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch55
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch45
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch49
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch38
-rw-r--r--meta/recipes-devtools/binutils/binutils/binutils-uninitialised-warning.patch50
-rw-r--r--meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch22
24 files changed, 9045 insertions, 9011 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.25.inc b/meta/recipes-devtools/binutils/binutils-2.25.inc
index d9075b61f4..6f76530445 100644
--- a/meta/recipes-devtools/binutils/binutils-2.25.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.25.inc
@@ -10,22 +10,30 @@ LIC_FILES_CHKSUM="\
10 file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\ 10 file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
11 " 11 "
12 12
13def binutils_branch_version(d):
14 pvsplit = d.getVar('PV', True).split('.')
15 return pvsplit[0] + "_" + pvsplit[1]
16
17BINUPV = "${@binutils_branch_version(d)}"
18
19SRCREV = "f2df1e49400f9e2d8d63a5d0fec9bf8c5c2b3342"
13SRC_URI = "\ 20SRC_URI = "\
14 ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ 21 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
15 file://binutils-uclibc-100-uclibc-conf.patch \ 22 file://0002-configure-widen-the-regexp-for-SH-architectures.patch \
16 file://binutils-uclibc-300-001_ld_makefile_patch.patch \ 23 file://0003-Point-scripts-location-to-libdir.patch \
17 file://binutils-uclibc-300-006_better_file_error.patch \ 24 file://0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
18 file://binutils-uclibc-300-012_check_ldrunpath_length.patch \ 25 file://0005-Explicitly-link-with-libm-on-uclibc.patch \
19 file://binutils-uclibc-gas-needs-libm.patch \ 26 file://0006-Use-libtool-2.4.patch \
20 file://libtool-2.4-update.patch \ 27 file://0007-Add-the-armv5e-architecture-to-binutils.patch \
21 file://libiberty_path_fix.patch \ 28 file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
22 file://binutils-poison.patch \ 29 file://0009-Upstream-Status-Inappropriate-distribution-codesourc.patch \
23 file://libtool-rpath-fix.patch \ 30 file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
24 file://binutils-armv5e.patch \ 31 file://0011-Change-default-emulation-for-mips64-linux.patch \
25 file://mips64-default-ld-emulation.patch \ 32 file://0012-Add-XLP-instructions-support.patch \
26 file://binutils-xlp-support.patch \ 33 file://0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch \
27 file://0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch \
28 " 34 "
29SRC_URI[md5sum] = "d9f3303f802a5b6b0bb73a335ab89d66" 35S = "${WORKDIR}/git"
30SRC_URI[sha256sum] = "22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923"
31 36
37do_configure_prepend () {
38 rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim
39}
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb
index b6d9a215e1..788106f9e7 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb
@@ -6,7 +6,7 @@ PN = "binutils-crosssdk-${TARGET_ARCH}"
6 6
7PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" 7PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
8 8
9SRC_URI += "file://relocatable_sdk.patch" 9SRC_URI += "file://0001-Generate-relocatable-SDKs.patch"
10 10
11do_configure_prepend () { 11do_configure_prepend () {
12 sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt 12 sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
diff --git a/meta/recipes-devtools/binutils/binutils/0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch b/meta/recipes-devtools/binutils/binutils/0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch
deleted file mode 100644
index f786b176f2..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Backport
2
3From 0a09fb4a09e80c36fa3ef763ae276fd13d272a36 Mon Sep 17 00:00:00 2001
4From: Hans-Peter Nilsson <hp@bitrange.com>
5Date: Sat, 1 Feb 2014 01:11:28 +0100
6Subject: [PATCH] Fix MMIX build breakage from bfd_set_section_vma change.
7
8 * emultempl/mmix-elfnmmo.em (mmix_after_allocation): Fix typo in
9 call to bfd_set_section_vma exposed by recent bfd_set_section_vma
10 change.
11---
12 ld/ChangeLog | 6 ++++++
13 ld/emultempl/mmix-elfnmmo.em | 2 +-
14 2 files changed, 7 insertions(+), 1 deletion(-)
15
16diff --git a/ld/emultempl/mmix-elfnmmo.em b/ld/emultempl/mmix-elfnmmo.em
17index 0059792..5e9781a 100644
18--- a/ld/emultempl/mmix-elfnmmo.em
19+++ b/ld/emultempl/mmix-elfnmmo.em
20@@ -102,7 +102,7 @@ mmix_after_allocation (void)
21 This section is only present when there are register symbols. */
22 sec = bfd_get_section_by_name (link_info.output_bfd, MMIX_REG_SECTION_NAME);
23 if (sec != NULL)
24- bfd_set_section_vma (abfd, sec, 0);
25+ bfd_set_section_vma (sec->owner, sec, 0);
26
27 if (!_bfd_mmix_after_linker_allocation (link_info.output_bfd, &link_info))
28 {
29--
301.7.10.4
31
diff --git a/meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch b/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
index 7408c31aad..1e80c1f791 100644
--- a/meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch
+++ b/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
@@ -1,17 +1,27 @@
1Upstream-Status: Inappropriate [SDK specific] 1From f71ecf251f84b4bbc9b7a832d5cd4a8bae95d83b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:58:54 +0000
4Subject: [PATCH 01/13] Generate relocatable SDKs
5
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
8will be relocated, at SDK install time, the interpreter path can be easily
9changed by the relocating script.
2 10
3This patch will modify the ELF linker scripts so that the crosssdk linker will 11Upstream-Status: Inappropriate [SDK specific]
4generate binaries with a 4096 bytes PT_INTERP section. When the binaries will
5be relocated, at SDK install time, the interpreter path can be easily changed
6by the relocating script.
7 12
8Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> 13Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 ld/genscripts.sh | 3 +++
17 ld/scripttempl/elf.sc | 4 ++--
18 2 files changed, 5 insertions(+), 2 deletions(-)
9 19
10Index: binutils_git/ld/genscripts.sh 20diff --git a/ld/genscripts.sh b/ld/genscripts.sh
11=================================================================== 21index 499607a..075dd04 100755
12--- binutils_git.orig/ld/genscripts.sh 2012-11-21 11:58:23.325441925 +0200 22--- a/ld/genscripts.sh
13+++ binutils_git/ld/genscripts.sh 2012-11-21 12:03:42.106815400 +0200 23+++ b/ld/genscripts.sh
14@@ -290,6 +290,7 @@ 24@@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
15 LD_FLAG=r 25 LD_FLAG=r
16 DATA_ALIGNMENT=${DATA_ALIGNMENT_r} 26 DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
17 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" 27 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
@@ -19,7 +29,7 @@ Index: binutils_git/ld/genscripts.sh
19 ( echo "/* Script for ld -r: link without relocation */" 29 ( echo "/* Script for ld -r: link without relocation */"
20 . ${CUSTOMIZER_SCRIPT} 30 . ${CUSTOMIZER_SCRIPT}
21 . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc 31 . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
22@@ -298,10 +299,12 @@ 32@@ -285,10 +286,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
23 LD_FLAG=u 33 LD_FLAG=u
24 DATA_ALIGNMENT=${DATA_ALIGNMENT_u} 34 DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
25 CONSTRUCTING=" " 35 CONSTRUCTING=" "
@@ -32,11 +42,11 @@ Index: binutils_git/ld/genscripts.sh
32 42
33 LD_FLAG= 43 LD_FLAG=
34 DATA_ALIGNMENT=${DATA_ALIGNMENT_} 44 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
35Index: binutils_git/ld/scripttempl/elf.sc 45diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
36=================================================================== 46index 4368fd9..9f01e8c 100644
37--- binutils_git.orig/ld/scripttempl/elf.sc 2012-11-21 12:02:26.800377384 +0200 47--- a/ld/scripttempl/elf.sc
38+++ binutils_git/ld/scripttempl/elf.sc 2012-11-21 12:04:16.166109621 +0200 48+++ b/ld/scripttempl/elf.sc
39@@ -124,8 +124,8 @@ 49@@ -131,8 +131,8 @@ if test -n "${COMMONPAGESIZE}"; then
40 DATA_SEGMENT_END=". = DATA_SEGMENT_END (.);" 50 DATA_SEGMENT_END=". = DATA_SEGMENT_END (.);"
41 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" 51 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
42 fi 52 fi
@@ -47,3 +57,6 @@ Index: binutils_git/ld/scripttempl/elf.sc
47 fi 57 fi
48 if test -z "$PLT"; then 58 if test -z "$PLT"; then
49 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" 59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"
60--
612.1.4
62
diff --git a/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
new file mode 100644
index 0000000000..34e21d144d
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
@@ -0,0 +1,56 @@
1From dfbcfb0d71765b337e63562299a943043928d2d2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:07:33 +0000
4Subject: [PATCH 02/13] configure: widen the regexp for SH architectures
5
6gprof needs to know about uclibc
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure | 4 ++--
13 gprof/configure | 5 +++++
14 2 files changed, 7 insertions(+), 2 deletions(-)
15
16diff --git a/configure b/configure
17index 87677bc..e9f2f13 100755
18--- a/configure
19+++ b/configure
20@@ -3341,7 +3341,7 @@ case "${target}" in
21 ;;
22 s390-*-* | s390x-*-*)
23 ;;
24- sh-*-* | sh[34]*-*-*)
25+ sh*-*-* | sh[34]*-*-*)
26 ;;
27 sh64-*-* | sh5*-*-*)
28 ;;
29@@ -3812,7 +3812,7 @@ case "${target}" in
30 or1k*-*-*)
31 noconfigdirs="$noconfigdirs gdb"
32 ;;
33- sh-*-* | sh64-*-*)
34+ sh*-*-* | sh64-*-*)
35 case "${target}" in
36 sh*-*-elf)
37 ;;
38diff --git a/gprof/configure b/gprof/configure
39index b09c8fb..79961c5 100755
40--- a/gprof/configure
41+++ b/gprof/configure
42@@ -5869,6 +5869,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
43 lt_cv_deplibs_check_method=pass_all
44 ;;
45
46+linux-uclibc*)
47+ lt_cv_deplibs_check_method=pass_all
48+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
49+ ;;
50+
51 netbsd*)
52 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
53 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
54--
552.1.4
56
diff --git a/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
new file mode 100644
index 0000000000..f5ce7674d4
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
@@ -0,0 +1,42 @@
1From dfb1412da67bbfe3e993d107d0b5e392f44141ab Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000
4Subject: [PATCH 03/13] Point scripts location to libdir
5
6Upstream-Status: Inappropriate [debian patch]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 ld/Makefile.am | 2 +-
11 ld/Makefile.in | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/ld/Makefile.am b/ld/Makefile.am
15index 9575f1f..84df0bf 100644
16--- a/ld/Makefile.am
17+++ b/ld/Makefile.am
18@@ -54,7 +54,7 @@ endif
19 # We put the scripts in the directory $(scriptdir)/ldscripts.
20 # We can't put the scripts in $(datadir) because the SEARCH_DIR
21 # directives need to be different for native and cross linkers.
22-scriptdir = $(tooldir)/lib
23+scriptdir = $(libdir)
24
25 EMUL = @EMUL@
26 EMULATION_OFILES = @EMULATION_OFILES@
27diff --git a/ld/Makefile.in b/ld/Makefile.in
28index 9f56ca1..272860f 100644
29--- a/ld/Makefile.in
30+++ b/ld/Makefile.in
31@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
32 # We put the scripts in the directory $(scriptdir)/ldscripts.
33 # We can't put the scripts in $(datadir) because the SEARCH_DIR
34 # directives need to be different for native and cross linkers.
35-scriptdir = $(tooldir)/lib
36+scriptdir = $(libdir)
37 BASEDIR = $(srcdir)/..
38 BFDDIR = $(BASEDIR)/bfd
39 INCDIR = $(BASEDIR)/include
40--
412.1.4
42
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
new file mode 100644
index 0000000000..e3cd2a4d64
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -0,0 +1,41 @@
1From 3126608b8c95a792ade56cf62a531d935d391c50 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:27:17 +0000
4Subject: [PATCH 04/13] Only generate an RPATH entry if LD_RUN_PATH is not
5 empty
6
7for cases where -rpath isn't specified. debian (#151024)
8
9Upstream-Status: Pending
10
11Signed-off-by: Chris Chimelis <chris@debian.org>
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 ld/emultempl/elf32.em | 4 ++++
15 1 file changed, 4 insertions(+)
16
17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
18index 36dee8e..07bea52 100644
19--- a/ld/emultempl/elf32.em
20+++ b/ld/emultempl/elf32.em
21@@ -1198,6 +1198,8 @@ fragment <<EOF
22 && command_line.rpath == NULL)
23 {
24 lib_path = (const char *) getenv ("LD_RUN_PATH");
25+ if ((lib_path) && (strlen (lib_path) == 0))
26+ lib_path = NULL;
27 if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
28 force))
29 break;
30@@ -1461,6 +1463,8 @@ gld${EMULATION_NAME}_before_allocation (void)
31 rpath = command_line.rpath;
32 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH");
34+ if ((rpath) && (strlen (rpath) == 0))
35+ rpath = NULL;
36
37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
39--
402.1.4
41
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch b/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
new file mode 100644
index 0000000000..9bbd93e972
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
@@ -0,0 +1,52 @@
1From f1703bcc7a5c507e471e2630b5a2de129100315a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:32:49 +0000
4Subject: [PATCH 05/13] Explicitly link with libm on uclibc
5
6Description:
7
8We do not need to have the libtool patch anymore for binutils after
9libtool has been updated upstream it include support for it. However
10for building gas natively on uclibc systems we have to link it with
11-lm so that it picks up missing symbols.
12
13/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o):
14In function `floatformat_from_double':
15floatformat.c:(.text+0x1ec): undefined reference to `frexp'
16floatformat.c:(.text+0x2f8): undefined reference to `ldexp'
17/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o):
18In function `floatformat_to_double':
19floatformat.c:(.text+0x38a): undefined reference to `ldexp'
20floatformat.c:(.text+0x3d2): undefined reference to `ldexp'
21floatformat.c:(.text+0x43e): undefined reference to `ldexp'
22floatformat.c:(.text+0x4e2): undefined reference to `ldexp'
23collect2: ld returned 1 exit status
24make[4]: *** [as-new] Error 1
25
26Upstream-Status: Pending
27
28Signed-off-by: Khem Raj <raj.khem@gmail.com>
29---
30 gas/configure.tgt | 6 ++++++
31 1 file changed, 6 insertions(+)
32
33diff --git a/gas/configure.tgt b/gas/configure.tgt
34index 9abc768..1d92f55 100644
35--- a/gas/configure.tgt
36+++ b/gas/configure.tgt
37@@ -477,6 +477,12 @@ case ${generic_target} in
38 *-*-netware) fmt=elf em=netware ;;
39 esac
40
41+case ${generic_target} in
42+ arm-*-*uclibc*)
43+ need_libm=yes
44+ ;;
45+esac
46+
47 case ${cpu_type} in
48 aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | sparc | z80 | z8k)
49 bfd_gas=yes
50--
512.1.4
52
diff --git a/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
index 9aaecd9443..62967efb19 100644
--- a/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
@@ -1,7130 +1,35 @@
1Upstream-Status: Inappropriate [embedded specific] 1From 03eb9b4fe583e88a22fd8c25b43fbd9bafe21af6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:34:41 +0000
4Subject: [PATCH 06/13] Use libtool 2.4
2 5
3Index: binutils-2.24/libtool.m4 6So we can get libtool sysroot support
4=================================================================== 7
5--- binutils-2.24.orig/libtool.m4 2013-11-04 07:33:40.000000000 -0800 8Upstream-Status: Pending
6+++ binutils-2.24/libtool.m4 2013-12-15 11:10:23.863785363 -0800 9
7@@ -1,7 +1,8 @@ 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
8 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- 11---
9 # 12 bfd/configure | 1320 +++++++++++++++++------
10 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 13 bfd/configure.ac | 2 +-
11-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 14 binutils/configure | 1318 +++++++++++++++++------
12+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 15 configure | 2 +-
13+# Inc. 16 gas/configure | 1318 +++++++++++++++++------
14 # Written by Gordon Matzigkeit, 1996 17 gprof/configure | 1323 +++++++++++++++++------
15 # 18 ld/configure | 1701 +++++++++++++++++++++--------
16 # This file is free software; the Free Software Foundation gives 19 libtool.m4 | 1086 +++++++++++++------
17@@ -10,7 +11,8 @@ 20 ltmain.sh | 2925 +++++++++++++++++++++++++++++++++-----------------
18 21 ltoptions.m4 | 2 +-
19 m4_define([_LT_COPYING], [dnl 22 ltversion.m4 | 12 +-
20 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 23 lt~obsolete.m4 | 2 +-
21-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 24 opcodes/configure | 1320 +++++++++++++++++------
22+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 25 opcodes/configure.ac | 2 +-
23+# Inc. 26 14 files changed, 8952 insertions(+), 3381 deletions(-)
24 # Written by Gordon Matzigkeit, 1996 27
25 # 28diff --git a/bfd/configure b/bfd/configure
26 # This file is part of GNU Libtool. 29index 85e6b82..3d3dd88 100755
27@@ -37,7 +39,7 @@ 30--- a/bfd/configure
28 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 31+++ b/bfd/configure
29 ]) 32@@ -668,6 +668,9 @@ OTOOL
30
31-# serial 56 LT_INIT
32+# serial 57 LT_INIT
33
34
35 # LT_PREREQ(VERSION)
36@@ -92,7 +94,8 @@
37 LIBTOOL_DEPS="$ltmain"
38
39 # Always use our own libtool.
40-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
41+LIBTOOL='$(SHELL) $(top_builddir)'
42+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
43 AC_SUBST(LIBTOOL)dnl
44
45 _LT_SETUP
46@@ -166,10 +169,13 @@
47 dnl
48 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
49 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
50+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
51 m4_require([_LT_CMD_RELOAD])dnl
52 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
53+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
54 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
55 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
56+m4_require([_LT_WITH_SYSROOT])dnl
57
58 _LT_CONFIG_LIBTOOL_INIT([
59 # See if we are running on zsh, and set the options which allow our
60@@ -199,7 +205,7 @@
61 esac
62
63 # Global variables:
64-ofile=libtool
65+ofile=${host_alias}-libtool
66 can_build_shared=yes
67
68 # All known linkers require a `.a' archive for static linking (except MSVC,
69@@ -632,7 +638,7 @@
70 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
71 configured by $[0], generated by m4_PACKAGE_STRING.
72
73-Copyright (C) 2009 Free Software Foundation, Inc.
74+Copyright (C) 2010 Free Software Foundation, Inc.
75 This config.lt script is free software; the Free Software Foundation
76 gives unlimited permision to copy, distribute and modify it."
77
78@@ -746,15 +752,12 @@
79 # if finds mixed CR/LF and LF-only lines. Since sed operates in
80 # text mode, it properly converts lines to CR/LF. This bash problem
81 # is reportedly fixed, but why not run on old versions too?
82- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
83- || (rm -f "$cfgfile"; exit 1)
84+ sed '$q' "$ltmain" >> "$cfgfile" \
85+ || (rm -f "$cfgfile"; exit 1)
86
87- _LT_PROG_XSI_SHELLFNS
88+ _LT_PROG_REPLACE_SHELLFNS
89
90- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
91- || (rm -f "$cfgfile"; exit 1)
92-
93- mv -f "$cfgfile" "$ofile" ||
94+ mv -f "$cfgfile" "$ofile" ||
95 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
96 chmod +x "$ofile"
97 ],
98@@ -980,6 +983,8 @@
99 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
100 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
101 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
102+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
103+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
104 cat > conftest.c << _LT_EOF
105 int main() { return 0;}
106 _LT_EOF
107@@ -1069,30 +1074,41 @@
108 fi
109 ])
110
111-# _LT_SYS_MODULE_PATH_AIX
112-# -----------------------
113+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
114+# ----------------------------------
115 # Links a minimal program and checks the executable
116 # for the system default hardcoded library path. In most cases,
117 # this is /usr/lib:/lib, but when the MPI compilers are used
118 # the location of the communication and MPI libs are included too.
119 # If we don't find anything, use the default library path according
120 # to the aix ld manual.
121+# Store the results from the different compilers for each TAGNAME.
122+# Allow to override them for all tags through lt_cv_aix_libpath.
123 m4_defun([_LT_SYS_MODULE_PATH_AIX],
124 [m4_require([_LT_DECL_SED])dnl
125-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
126-lt_aix_libpath_sed='
127- /Import File Strings/,/^$/ {
128- /^0/ {
129- s/^0 *\(.*\)$/\1/
130- p
131- }
132- }'
133-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
134-# Check for a 64-bit object if we didn't find anything.
135-if test -z "$aix_libpath"; then
136- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
137-fi],[])
138-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
139+if test "${lt_cv_aix_libpath+set}" = set; then
140+ aix_libpath=$lt_cv_aix_libpath
141+else
142+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
143+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
144+ lt_aix_libpath_sed='[
145+ /Import File Strings/,/^$/ {
146+ /^0/ {
147+ s/^0 *\([^ ]*\) *$/\1/
148+ p
149+ }
150+ }]'
151+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
152+ # Check for a 64-bit object if we didn't find anything.
153+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
154+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
155+ fi],[])
156+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
157+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
158+ fi
159+ ])
160+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
161+fi
162 ])# _LT_SYS_MODULE_PATH_AIX
163
164
165@@ -1117,7 +1133,7 @@
166
167 AC_MSG_CHECKING([how to print strings])
168 # Test print first, because it will be a builtin if present.
169-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
170+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
171 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
172 ECHO='print -r --'
173 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
174@@ -1161,6 +1177,39 @@
175 ])# _LT_PROG_ECHO_BACKSLASH
176
177
178+# _LT_WITH_SYSROOT
179+# ----------------
180+AC_DEFUN([_LT_WITH_SYSROOT],
181+[AC_MSG_CHECKING([for sysroot])
182+AC_ARG_WITH([libtool-sysroot],
183+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
184+ (or the compiler's sysroot if not specified).],
185+[], [with_libtool_sysroot=no])
186+
187+dnl lt_sysroot will always be passed unquoted. We quote it here
188+dnl in case the user passed a directory name.
189+lt_sysroot=
190+case ${with_libtool_sysroot} in #(
191+ yes)
192+ if test "$GCC" = yes; then
193+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
194+ fi
195+ ;; #(
196+ /*)
197+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
198+ ;; #(
199+ no|'')
200+ ;; #(
201+ *)
202+ AC_MSG_RESULT([${with_libtool_sysroot}])
203+ AC_MSG_ERROR([The sysroot must be an absolute path.])
204+ ;;
205+esac
206+
207+ AC_MSG_RESULT([${lt_sysroot:-no}])
208+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
209+[dependent libraries, and in which our libraries should be installed.])])
210+
211 # _LT_ENABLE_LOCK
212 # ---------------
213 m4_defun([_LT_ENABLE_LOCK],
214@@ -1320,14 +1369,47 @@
215 ])# _LT_ENABLE_LOCK
216
217
218+# _LT_PROG_AR
219+# -----------
220+m4_defun([_LT_PROG_AR],
221+[AC_CHECK_TOOLS(AR, [ar], false)
222+: ${AR=ar}
223+: ${AR_FLAGS=cru}
224+_LT_DECL([], [AR], [1], [The archiver])
225+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
226+
227+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
228+ [lt_cv_ar_at_file=no
229+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
230+ [echo conftest.$ac_objext > conftest.lst
231+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
232+ AC_TRY_EVAL([lt_ar_try])
233+ if test "$ac_status" -eq 0; then
234+ # Ensure the archiver fails upon bogus file names.
235+ rm -f conftest.$ac_objext libconftest.a
236+ AC_TRY_EVAL([lt_ar_try])
237+ if test "$ac_status" -ne 0; then
238+ lt_cv_ar_at_file=@
239+ fi
240+ fi
241+ rm -f conftest.* libconftest.a
242+ ])
243+ ])
244+
245+if test "x$lt_cv_ar_at_file" = xno; then
246+ archiver_list_spec=
247+else
248+ archiver_list_spec=$lt_cv_ar_at_file
249+fi
250+_LT_DECL([], [archiver_list_spec], [1],
251+ [How to feed a file listing to the archiver])
252+])# _LT_PROG_AR
253+
254+
255 # _LT_CMD_OLD_ARCHIVE
256 # -------------------
257 m4_defun([_LT_CMD_OLD_ARCHIVE],
258-[AC_CHECK_TOOL(AR, ar, false)
259-test -z "$AR" && AR=ar
260-test -z "$AR_FLAGS" && AR_FLAGS=cru
261-_LT_DECL([], [AR], [1], [The archiver])
262-_LT_DECL([], [AR_FLAGS], [1])
263+[_LT_PROG_AR
264
265 AC_CHECK_TOOL(STRIP, strip, :)
266 test -z "$STRIP" && STRIP=:
267@@ -1623,7 +1705,7 @@
268 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
269 lt_status=$lt_dlunknown
270 cat > conftest.$ac_ext <<_LT_EOF
271-[#line __oline__ "configure"
272+[#line $LINENO "configure"
273 #include "confdefs.h"
274
275 #if HAVE_DLFCN_H
276@@ -1667,10 +1749,10 @@
277 /* When -fvisbility=hidden is used, assume the code has been annotated
278 correspondingly for the symbols needed. */
279 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
280-void fnord () __attribute__((visibility("default")));
281+int fnord () __attribute__((visibility("default")));
282 #endif
283
284-void fnord () { int i=42; }
285+int fnord () { return 42; }
286 int main ()
287 {
288 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
289@@ -2210,8 +2292,9 @@
290 need_version=no
291 need_lib_prefix=no
292
293- case $GCC,$host_os in
294- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
295+ case $GCC,$cc_basename in
296+ yes,*)
297+ # gcc
298 library_names_spec='$libname.dll.a'
299 # DLL is installed to $(libdir)/../bin by postinstall_cmds
300 postinstall_cmds='base_file=`basename \${file}`~
301@@ -2244,13 +2327,71 @@
302 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
303 ;;
304 esac
305+ dynamic_linker='Win32 ld.exe'
306+ ;;
307+
308+ *,cl*)
309+ # Native MSVC
310+ libname_spec='$name'
311+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
312+ library_names_spec='${libname}.dll.lib'
313+
314+ case $build_os in
315+ mingw*)
316+ sys_lib_search_path_spec=
317+ lt_save_ifs=$IFS
318+ IFS=';'
319+ for lt_path in $LIB
320+ do
321+ IFS=$lt_save_ifs
322+ # Let DOS variable expansion print the short 8.3 style file name.
323+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
324+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
325+ done
326+ IFS=$lt_save_ifs
327+ # Convert to MSYS style.
328+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
329+ ;;
330+ cygwin*)
331+ # Convert to unix form, then to dos form, then back to unix form
332+ # but this time dos style (no spaces!) so that the unix form looks
333+ # like /cygdrive/c/PROGRA~1:/cygdr...
334+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
335+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
336+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
337+ ;;
338+ *)
339+ sys_lib_search_path_spec="$LIB"
340+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
341+ # It is most probably a Windows format PATH.
342+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
343+ else
344+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
345+ fi
346+ # FIXME: find the short name or the path components, as spaces are
347+ # common. (e.g. "Program Files" -> "PROGRA~1")
348+ ;;
349+ esac
350+
351+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
352+ postinstall_cmds='base_file=`basename \${file}`~
353+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
354+ dldir=$destdir/`dirname \$dlpath`~
355+ test -d \$dldir || mkdir -p \$dldir~
356+ $install_prog $dir/$dlname \$dldir/$dlname'
357+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
358+ dlpath=$dir/\$dldll~
359+ $RM \$dlpath'
360+ shlibpath_overrides_runpath=yes
361+ dynamic_linker='Win32 link.exe'
362 ;;
363
364 *)
365+ # Assume MSVC wrapper
366 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
367+ dynamic_linker='Win32 ld.exe'
368 ;;
369 esac
370- dynamic_linker='Win32 ld.exe'
371 # FIXME: first we should search . and the directory the executable is in
372 shlibpath_var=PATH
373 ;;
374@@ -2342,7 +2483,7 @@
375 soname_spec='${libname}${release}${shared_ext}$major'
376 shlibpath_var=LIBRARY_PATH
377 shlibpath_overrides_runpath=yes
378- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
379+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
380 hardcode_into_libs=yes
381 ;;
382
383@@ -2950,6 +3091,11 @@
384 esac
385 reload_cmds='$LD$reload_flag -o $output$reload_objs'
386 case $host_os in
387+ cygwin* | mingw* | pw32* | cegcc*)
388+ if test "$GCC" != yes; then
389+ reload_cmds=false
390+ fi
391+ ;;
392 darwin*)
393 if test "$GCC" = yes; then
394 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
395@@ -3016,7 +3162,8 @@
396 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
397 lt_cv_file_magic_cmd='func_win32_libid'
398 else
399- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
400+ # Keep this pattern in sync with the one in func_win32_libid.
401+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
402 lt_cv_file_magic_cmd='$OBJDUMP -f'
403 fi
404 ;;
405@@ -3167,6 +3314,21 @@
406 ;;
407 esac
408 ])
409+
410+file_magic_glob=
411+want_nocaseglob=no
412+if test "$build" = "$host"; then
413+ case $host_os in
414+ mingw* | pw32*)
415+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
416+ want_nocaseglob=yes
417+ else
418+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
419+ fi
420+ ;;
421+ esac
422+fi
423+
424 file_magic_cmd=$lt_cv_file_magic_cmd
425 deplibs_check_method=$lt_cv_deplibs_check_method
426 test -z "$deplibs_check_method" && deplibs_check_method=unknown
427@@ -3174,7 +3336,11 @@
428 _LT_DECL([], [deplibs_check_method], [1],
429 [Method to check whether dependent libraries are shared objects])
430 _LT_DECL([], [file_magic_cmd], [1],
431- [Command to use when deplibs_check_method == "file_magic"])
432+ [Command to use when deplibs_check_method = "file_magic"])
433+_LT_DECL([], [file_magic_glob], [1],
434+ [How to find potential files when deplibs_check_method = "file_magic"])
435+_LT_DECL([], [want_nocaseglob], [1],
436+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
437 ])# _LT_CHECK_MAGIC_METHOD
438
439
440@@ -3277,6 +3443,67 @@
441 dnl AC_DEFUN([AM_PROG_NM], [])
442 dnl AC_DEFUN([AC_PROG_NM], [])
443
444+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
445+# --------------------------------
446+# how to determine the name of the shared library
447+# associated with a specific link library.
448+# -- PORTME fill in with the dynamic library characteristics
449+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
450+[m4_require([_LT_DECL_EGREP])
451+m4_require([_LT_DECL_OBJDUMP])
452+m4_require([_LT_DECL_DLLTOOL])
453+AC_CACHE_CHECK([how to associate runtime and link libraries],
454+lt_cv_sharedlib_from_linklib_cmd,
455+[lt_cv_sharedlib_from_linklib_cmd='unknown'
456+
457+case $host_os in
458+cygwin* | mingw* | pw32* | cegcc*)
459+ # two different shell functions defined in ltmain.sh
460+ # decide which to use based on capabilities of $DLLTOOL
461+ case `$DLLTOOL --help 2>&1` in
462+ *--identify-strict*)
463+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
464+ ;;
465+ *)
466+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
467+ ;;
468+ esac
469+ ;;
470+*)
471+ # fallback: assume linklib IS sharedlib
472+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
473+ ;;
474+esac
475+])
476+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
477+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
478+
479+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
480+ [Command to associate shared and link libraries])
481+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
482+
483+
484+# _LT_PATH_MANIFEST_TOOL
485+# ----------------------
486+# locate the manifest tool
487+m4_defun([_LT_PATH_MANIFEST_TOOL],
488+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
489+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
490+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
491+ [lt_cv_path_mainfest_tool=no
492+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
493+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
494+ cat conftest.err >&AS_MESSAGE_LOG_FD
495+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
496+ lt_cv_path_mainfest_tool=yes
497+ fi
498+ rm -f conftest*])
499+if test "x$lt_cv_path_mainfest_tool" != xyes; then
500+ MANIFEST_TOOL=:
501+fi
502+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
503+])# _LT_PATH_MANIFEST_TOOL
504+
505
506 # LT_LIB_M
507 # --------
508@@ -3403,8 +3630,8 @@
509 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
510
511 # Transform an extracted symbol line into symbol name and symbol address
512-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
513-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
514+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
515+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
516
517 # Handle CRLF in mingw tool chain
518 opt_cr=
519@@ -3440,6 +3667,7 @@
520 else
521 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
522 fi
523+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
524
525 # Check to see that the pipe works correctly.
526 pipe_works=no
527@@ -3473,6 +3701,18 @@
528 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
529 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
530 cat <<_LT_EOF > conftest.$ac_ext
531+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
532+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
533+/* DATA imports from DLLs on WIN32 con't be const, because runtime
534+ relocations are performed -- see ld's documentation on pseudo-relocs. */
535+# define LT@&t@_DLSYM_CONST
536+#elif defined(__osf__)
537+/* This system does not cope well with relocations in const data. */
538+# define LT@&t@_DLSYM_CONST
539+#else
540+# define LT@&t@_DLSYM_CONST const
541+#endif
542+
543 #ifdef __cplusplus
544 extern "C" {
545 #endif
546@@ -3484,7 +3724,7 @@
547 cat <<_LT_EOF >> conftest.$ac_ext
548
549 /* The mapping between symbol names and symbols. */
550-const struct {
551+LT@&t@_DLSYM_CONST struct {
552 const char *name;
553 void *address;
554 }
555@@ -3510,15 +3750,15 @@
556 _LT_EOF
557 # Now try linking the two files.
558 mv conftest.$ac_objext conftstm.$ac_objext
559- lt_save_LIBS="$LIBS"
560- lt_save_CFLAGS="$CFLAGS"
561+ lt_globsym_save_LIBS=$LIBS
562+ lt_globsym_save_CFLAGS=$CFLAGS
563 LIBS="conftstm.$ac_objext"
564 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
565 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
566 pipe_works=yes
567 fi
568- LIBS="$lt_save_LIBS"
569- CFLAGS="$lt_save_CFLAGS"
570+ LIBS=$lt_globsym_save_LIBS
571+ CFLAGS=$lt_globsym_save_CFLAGS
572 else
573 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
574 fi
575@@ -3551,6 +3791,13 @@
576 AC_MSG_RESULT(ok)
577 fi
578
579+# Response file support.
580+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
581+ nm_file_list_spec='@'
582+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
583+ nm_file_list_spec='@'
584+fi
585+
586 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
587 [Take the output of nm and produce a listing of raw symbols and C names])
588 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
589@@ -3561,6 +3808,8 @@
590 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
591 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
592 [Transform the output of nm in a C name address pair when lib prefix is needed])
593+_LT_DECL([], [nm_file_list_spec], [1],
594+ [Specify filename containing input files for $NM])
595 ]) # _LT_CMD_GLOBAL_SYMBOLS
596
597
598@@ -3572,7 +3821,6 @@
599 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
600 _LT_TAGVAR(lt_prog_compiler_static, $1)=
601
602-AC_MSG_CHECKING([for $compiler option to produce PIC])
603 m4_if([$1], [CXX], [
604 # C++ specific cases for pic, static, wl, etc.
605 if test "$GXX" = yes; then
606@@ -3678,6 +3926,12 @@
607 ;;
608 esac
609 ;;
610+ mingw* | cygwin* | os2* | pw32* | cegcc*)
611+ # This hack is so that the source file can tell whether it is being
612+ # built for inclusion in a dll (and should export symbols for example).
613+ m4_if([$1], [GCJ], [],
614+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
615+ ;;
616 dgux*)
617 case $cc_basename in
618 ec++*)
619@@ -3830,7 +4084,7 @@
620 ;;
621 solaris*)
622 case $cc_basename in
623- CC*)
624+ CC* | sunCC*)
625 # Sun C++ 4.2, 5.x and Centerline C++
626 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
627 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
628@@ -4053,6 +4307,12 @@
629 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
630 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
631 ;;
632+ nagfor*)
633+ # NAG Fortran compiler
634+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
635+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
636+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
637+ ;;
638 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
639 # Portland Group compilers (*not* the Pentium gcc compiler,
640 # which looks to be a dead project)
641@@ -4115,7 +4375,7 @@
642 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
643 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
644 case $cc_basename in
645- f77* | f90* | f95*)
646+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
647 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
648 *)
649 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
650@@ -4172,9 +4432,11 @@
651 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
652 ;;
653 esac
654-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
655-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
656- [How to pass a linker flag through the compiler])
657+
658+AC_CACHE_CHECK([for $compiler option to produce PIC],
659+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
660+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
661+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
662
663 #
664 # Check to make sure the PIC flag actually works.
665@@ -4193,6 +4455,8 @@
666 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
667 [Additional compiler flags for building library objects])
668
669+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
670+ [How to pass a linker flag through the compiler])
671 #
672 # Check to make sure the static flag actually works.
673 #
674@@ -4213,6 +4477,7 @@
675 m4_defun([_LT_LINKER_SHLIBS],
676 [AC_REQUIRE([LT_PATH_LD])dnl
677 AC_REQUIRE([LT_PATH_NM])dnl
678+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
679 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
680 m4_require([_LT_DECL_EGREP])dnl
681 m4_require([_LT_DECL_SED])dnl
682@@ -4221,6 +4486,7 @@
683 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
684 m4_if([$1], [CXX], [
685 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
686+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
687 case $host_os in
688 aix[[4-9]]*)
689 # If we're using GNU nm, then we don't want the "-C" option.
690@@ -4235,15 +4501,20 @@
691 ;;
692 pw32*)
693 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
694- ;;
695+ ;;
696 cygwin* | mingw* | cegcc*)
697- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
698- ;;
699+ case $cc_basename in
700+ cl*) ;;
701+ *)
702+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
703+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
704+ ;;
705+ esac
706+ ;;
707 *)
708 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
709- ;;
710+ ;;
711 esac
712- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
713 ], [
714 runpath_var=
715 _LT_TAGVAR(allow_undefined_flag, $1)=
716@@ -4411,7 +4682,8 @@
717 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
718 _LT_TAGVAR(always_export_symbols, $1)=no
719 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
720- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
721+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
722+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
723
724 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
725 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
726@@ -4459,7 +4731,7 @@
727 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
728 && test "$tmp_diet" = no
729 then
730- tmp_addflag=
731+ tmp_addflag=' $pic_flag'
732 tmp_sharedflag='-shared'
733 case $cc_basename,$host_cpu in
734 pgcc*) # Portland Group C compiler
735@@ -4510,12 +4782,12 @@
736 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
737 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
738 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
739- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
740+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
741 if test "x$supports_anon_versioning" = xyes; then
742 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
743 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
744 echo "local: *; };" >> $output_objdir/$libname.ver~
745- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
746+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
747 fi
748 ;;
749 esac
750@@ -4529,8 +4801,8 @@
751 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
752 wlarc=
753 else
754- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
755- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
756+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
757+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
758 fi
759 ;;
760
761@@ -4548,8 +4820,8 @@
762
763 _LT_EOF
764 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
765- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
766- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
767+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
768+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
769 else
770 _LT_TAGVAR(ld_shlibs, $1)=no
771 fi
772@@ -4595,8 +4867,8 @@
773
774 *)
775 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
776- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
777- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
778+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
779+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
780 else
781 _LT_TAGVAR(ld_shlibs, $1)=no
782 fi
783@@ -4726,7 +4998,7 @@
784 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
785 # Determine the default libpath from the value encoded in an
786 # empty executable.
787- _LT_SYS_MODULE_PATH_AIX
788+ _LT_SYS_MODULE_PATH_AIX([$1])
789 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
790 _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"
791 else
792@@ -4737,7 +5009,7 @@
793 else
794 # Determine the default libpath from the value encoded in an
795 # empty executable.
796- _LT_SYS_MODULE_PATH_AIX
797+ _LT_SYS_MODULE_PATH_AIX([$1])
798 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
799 # Warning - without using the other run time loading flags,
800 # -berok will link without error, but may produce a broken library.
801@@ -4781,20 +5053,63 @@
802 # Microsoft Visual C++.
803 # hardcode_libdir_flag_spec is actually meaningless, as there is
804 # no search path for DLLs.
805- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
806- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
807- # Tell ltmain to make .lib files, not .a files.
808- libext=lib
809- # Tell ltmain to make .dll files, not .so files.
810- shrext_cmds=".dll"
811- # FIXME: Setting linknames here is a bad hack.
812- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
813- # The linker will automatically build a .lib file if we build a DLL.
814- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
815- # FIXME: Should let the user specify the lib program.
816- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
817- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
818- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
819+ case $cc_basename in
820+ cl*)
821+ # Native MSVC
822+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
823+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
824+ _LT_TAGVAR(always_export_symbols, $1)=yes
825+ _LT_TAGVAR(file_list_spec, $1)='@'
826+ # Tell ltmain to make .lib files, not .a files.
827+ libext=lib
828+ # Tell ltmain to make .dll files, not .so files.
829+ shrext_cmds=".dll"
830+ # FIXME: Setting linknames here is a bad hack.
831+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
832+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
833+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
834+ else
835+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
836+ fi~
837+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
838+ linknames='
839+ # The linker will not automatically build a static lib if we build a DLL.
840+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
841+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
842+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
843+ # Don't use ranlib
844+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
845+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
846+ lt_tool_outputfile="@TOOL_OUTPUT@"~
847+ case $lt_outputfile in
848+ *.exe|*.EXE) ;;
849+ *)
850+ lt_outputfile="$lt_outputfile.exe"
851+ lt_tool_outputfile="$lt_tool_outputfile.exe"
852+ ;;
853+ esac~
854+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
855+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
856+ $RM "$lt_outputfile.manifest";
857+ fi'
858+ ;;
859+ *)
860+ # Assume MSVC wrapper
861+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
862+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
863+ # Tell ltmain to make .lib files, not .a files.
864+ libext=lib
865+ # Tell ltmain to make .dll files, not .so files.
866+ shrext_cmds=".dll"
867+ # FIXME: Setting linknames here is a bad hack.
868+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
869+ # The linker will automatically build a .lib file if we build a DLL.
870+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
871+ # FIXME: Should let the user specify the lib program.
872+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
873+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
874+ ;;
875+ esac
876 ;;
877
878 darwin* | rhapsody*)
879@@ -4828,7 +5143,7 @@
880
881 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
882 freebsd* | dragonfly*)
883- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
884+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
885 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
886 _LT_TAGVAR(hardcode_direct, $1)=yes
887 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
888@@ -4836,7 +5151,7 @@
889
890 hpux9*)
891 if test "$GCC" = yes; then
892- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
893+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
894 else
895 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
896 fi
897@@ -4852,7 +5167,7 @@
898
899 hpux10*)
900 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
901- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
902+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
903 else
904 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
905 fi
906@@ -4876,10 +5191,10 @@
907 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
908 ;;
909 ia64*)
910- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
911+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
912 ;;
913 *)
914- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
915+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
916 ;;
917 esac
918 else
919@@ -4926,16 +5241,31 @@
920
921 irix5* | irix6* | nonstopux*)
922 if test "$GCC" = yes; then
923- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
924+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
925 # Try to use the -exported_symbol ld option, if it does not
926 # work, assume that -exports_file does not work either and
927 # implicitly export all symbols.
928- save_LDFLAGS="$LDFLAGS"
929- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
930- AC_LINK_IFELSE(int foo(void) {},
931- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
932- )
933- LDFLAGS="$save_LDFLAGS"
934+ # This should be the same for all languages, so no per-tag cache variable.
935+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
936+ [lt_cv_irix_exported_symbol],
937+ [save_LDFLAGS="$LDFLAGS"
938+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
939+ AC_LINK_IFELSE(
940+ [AC_LANG_SOURCE(
941+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
942+ [C++], [[int foo (void) { return 0; }]],
943+ [Fortran 77], [[
944+ subroutine foo
945+ end]],
946+ [Fortran], [[
947+ subroutine foo
948+ end]])])],
949+ [lt_cv_irix_exported_symbol=yes],
950+ [lt_cv_irix_exported_symbol=no])
951+ LDFLAGS="$save_LDFLAGS"])
952+ if test "$lt_cv_irix_exported_symbol" = yes; then
953+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
954+ fi
955 else
956 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
957 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
958@@ -5020,7 +5350,7 @@
959 osf4* | osf5*) # as osf3* with the addition of -msym flag
960 if test "$GCC" = yes; then
961 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
962- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
963+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
964 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
965 else
966 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
967@@ -5039,9 +5369,9 @@
968 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
969 if test "$GCC" = yes; then
970 wlarc='${wl}'
971- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
972+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
973 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
974- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
975+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
976 else
977 case `$CC -V 2>&1` in
978 *"Compilers 5.0"*)
979@@ -5313,8 +5643,6 @@
980 to runtime path list])
981 _LT_TAGDECL([], [link_all_deplibs], [0],
982 [Whether libtool must link a program against all its dependency libraries])
983-_LT_TAGDECL([], [fix_srcfile_path], [1],
984- [Fix the shell variable $srcfile for the compiler])
985 _LT_TAGDECL([], [always_export_symbols], [0],
986 [Set to "yes" if exported symbols are required])
987 _LT_TAGDECL([], [export_symbols_cmds], [2],
988@@ -5325,6 +5653,8 @@
989 [Symbols that must always be exported])
990 _LT_TAGDECL([], [prelink_cmds], [2],
991 [Commands necessary for linking programs (against libraries) with templates])
992+_LT_TAGDECL([], [postlink_cmds], [2],
993+ [Commands necessary for finishing linking programs])
994 _LT_TAGDECL([], [file_list_spec], [1],
995 [Specify filename containing input files])
996 dnl FIXME: Not yet implemented
997@@ -5426,6 +5756,7 @@
998 m4_defun([_LT_LANG_CXX_CONFIG],
999 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1000 m4_require([_LT_DECL_EGREP])dnl
1001+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
1002 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1003 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1004 (test "X$CXX" != "Xg++"))) ; then
1005@@ -5487,6 +5818,7 @@
1006
1007 # Allow CC to be a program name with arguments.
1008 lt_save_CC=$CC
1009+ lt_save_CFLAGS=$CFLAGS
1010 lt_save_LD=$LD
1011 lt_save_GCC=$GCC
1012 GCC=$GXX
1013@@ -5504,6 +5836,7 @@
1014 fi
1015 test -z "${LDCXX+set}" || LD=$LDCXX
1016 CC=${CXX-"c++"}
1017+ CFLAGS=$CXXFLAGS
1018 compiler=$CC
1019 _LT_TAGVAR(compiler, $1)=$CC
1020 _LT_CC_BASENAME([$compiler])
1021@@ -5525,8 +5858,8 @@
1022 # Check if GNU C++ uses GNU ld as the underlying linker, since the
1023 # archiving commands below assume that GNU ld is being used.
1024 if test "$with_gnu_ld" = yes; then
1025- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
1026- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1027+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
1028+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1029
1030 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1031 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
1032@@ -5667,7 +6000,7 @@
1033 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
1034 # Determine the default libpath from the value encoded in an empty
1035 # executable.
1036- _LT_SYS_MODULE_PATH_AIX
1037+ _LT_SYS_MODULE_PATH_AIX([$1])
1038 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1039
1040 _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"
1041@@ -5679,7 +6012,7 @@
1042 else
1043 # Determine the default libpath from the value encoded in an
1044 # empty executable.
1045- _LT_SYS_MODULE_PATH_AIX
1046+ _LT_SYS_MODULE_PATH_AIX([$1])
1047 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1048 # Warning - without using the other run time loading flags,
1049 # -berok will link without error, but may produce a broken library.
1050@@ -5721,29 +6054,75 @@
1051 ;;
1052
1053 cygwin* | mingw* | pw32* | cegcc*)
1054- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1055- # as there is no search path for DLLs.
1056- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1057- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1058- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1059- _LT_TAGVAR(always_export_symbols, $1)=no
1060- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1061-
1062- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1063- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1064- # If the export-symbols file already is a .def file (1st line
1065- # is EXPORTS), use it as is; otherwise, prepend...
1066- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1067- cp $export_symbols $output_objdir/$soname.def;
1068- else
1069- echo EXPORTS > $output_objdir/$soname.def;
1070- cat $export_symbols >> $output_objdir/$soname.def;
1071- fi~
1072- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1073- else
1074- _LT_TAGVAR(ld_shlibs, $1)=no
1075- fi
1076- ;;
1077+ case $GXX,$cc_basename in
1078+ ,cl* | no,cl*)
1079+ # Native MSVC
1080+ # hardcode_libdir_flag_spec is actually meaningless, as there is
1081+ # no search path for DLLs.
1082+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
1083+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1084+ _LT_TAGVAR(always_export_symbols, $1)=yes
1085+ _LT_TAGVAR(file_list_spec, $1)='@'
1086+ # Tell ltmain to make .lib files, not .a files.
1087+ libext=lib
1088+ # Tell ltmain to make .dll files, not .so files.
1089+ shrext_cmds=".dll"
1090+ # FIXME: Setting linknames here is a bad hack.
1091+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1092+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1093+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1094+ else
1095+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1096+ fi~
1097+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1098+ linknames='
1099+ # The linker will not automatically build a static lib if we build a DLL.
1100+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
1101+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1102+ # Don't use ranlib
1103+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
1104+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
1105+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1106+ case $lt_outputfile in
1107+ *.exe|*.EXE) ;;
1108+ *)
1109+ lt_outputfile="$lt_outputfile.exe"
1110+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1111+ ;;
1112+ esac~
1113+ func_to_tool_file "$lt_outputfile"~
1114+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1115+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1116+ $RM "$lt_outputfile.manifest";
1117+ fi'
1118+ ;;
1119+ *)
1120+ # g++
1121+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1122+ # as there is no search path for DLLs.
1123+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1124+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1125+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1126+ _LT_TAGVAR(always_export_symbols, $1)=no
1127+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1128+
1129+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1130+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1131+ # If the export-symbols file already is a .def file (1st line
1132+ # is EXPORTS), use it as is; otherwise, prepend...
1133+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1134+ cp $export_symbols $output_objdir/$soname.def;
1135+ else
1136+ echo EXPORTS > $output_objdir/$soname.def;
1137+ cat $export_symbols >> $output_objdir/$soname.def;
1138+ fi~
1139+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1140+ else
1141+ _LT_TAGVAR(ld_shlibs, $1)=no
1142+ fi
1143+ ;;
1144+ esac
1145+ ;;
1146 darwin* | rhapsody*)
1147 _LT_DARWIN_LINKER_FEATURES($1)
1148 ;;
1149@@ -5818,7 +6197,7 @@
1150 ;;
1151 *)
1152 if test "$GXX" = yes; then
1153- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1154+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1155 else
1156 # FIXME: insert proper C++ library support
1157 _LT_TAGVAR(ld_shlibs, $1)=no
1158@@ -5889,10 +6268,10 @@
1159 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1160 ;;
1161 ia64*)
1162- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1163+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1164 ;;
1165 *)
1166- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1167+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
1168 ;;
1169 esac
1170 fi
1171@@ -5933,9 +6312,9 @@
1172 *)
1173 if test "$GXX" = yes; then
1174 if test "$with_gnu_ld" = no; then
1175- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $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'
1176+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $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'
1177 else
1178- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
1179+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
1180 fi
1181 fi
1182 _LT_TAGVAR(link_all_deplibs, $1)=yes
1183@@ -6005,20 +6384,20 @@
1184 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
1185 rm -rf $tpldir~
1186 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
1187- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
1188+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
1189 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
1190 rm -rf $tpldir~
1191 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
1192- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
1193+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
1194 $RANLIB $oldlib'
1195 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
1196 rm -rf $tpldir~
1197 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1198- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1199+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1200 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
1201 rm -rf $tpldir~
1202 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
1203- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
1204+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
1205 ;;
1206 *) # Version 6 and above use weak symbols
1207 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1208@@ -6213,7 +6592,7 @@
1209 _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'
1210 ;;
1211 *)
1212- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1213+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1214 ;;
1215 esac
1216
1217@@ -6259,7 +6638,7 @@
1218
1219 solaris*)
1220 case $cc_basename in
1221- CC*)
1222+ CC* | sunCC*)
1223 # Sun C++ 4.2, 5.x and Centerline C++
1224 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
1225 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
1226@@ -6300,9 +6679,9 @@
1227 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
1228 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
1229 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
1230- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
1231+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
1232 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1233- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1234+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
1235
1236 # Commands to make compiler produce verbose output that lists
1237 # what "hidden" libraries, object files and flags are used when
1238@@ -6431,6 +6810,7 @@
1239 fi # test -n "$compiler"
1240
1241 CC=$lt_save_CC
1242+ CFLAGS=$lt_save_CFLAGS
1243 LDCXX=$LD
1244 LD=$lt_save_LD
1245 GCC=$lt_save_GCC
1246@@ -6445,6 +6825,29 @@
1247 ])# _LT_LANG_CXX_CONFIG
1248
1249
1250+# _LT_FUNC_STRIPNAME_CNF
1251+# ----------------------
1252+# func_stripname_cnf prefix suffix name
1253+# strip PREFIX and SUFFIX off of NAME.
1254+# PREFIX and SUFFIX must not contain globbing or regex special
1255+# characters, hashes, percent signs, but SUFFIX may contain a leading
1256+# dot (in which case that matches only a dot).
1257+#
1258+# This function is identical to the (non-XSI) version of func_stripname,
1259+# except this one can be used by m4 code that may be executed by configure,
1260+# rather than the libtool script.
1261+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
1262+AC_REQUIRE([_LT_DECL_SED])
1263+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
1264+func_stripname_cnf ()
1265+{
1266+ case ${2} in
1267+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1268+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1269+ esac
1270+} # func_stripname_cnf
1271+])# _LT_FUNC_STRIPNAME_CNF
1272+
1273 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
1274 # ---------------------------------
1275 # Figure out "hidden" library dependencies from verbose
1276@@ -6453,6 +6856,7 @@
1277 # objects, libraries and library flags.
1278 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
1279 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1280+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
1281 # Dependencies to place before and after the object being linked:
1282 _LT_TAGVAR(predep_objects, $1)=
1283 _LT_TAGVAR(postdep_objects, $1)=
1284@@ -6503,6 +6907,13 @@
1285 };
1286 _LT_EOF
1287 ])
1288+
1289+_lt_libdeps_save_CFLAGS=$CFLAGS
1290+case "$CC $CFLAGS " in #(
1291+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
1292+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
1293+esac
1294+
1295 dnl Parse the compiler output and extract the necessary
1296 dnl objects, libraries and library flags.
1297 if AC_TRY_EVAL(ac_compile); then
1298@@ -6514,7 +6925,7 @@
1299 pre_test_object_deps_done=no
1300
1301 for p in `eval "$output_verbose_link_cmd"`; do
1302- case $p in
1303+ case ${prev}${p} in
1304
1305 -L* | -R* | -l*)
1306 # Some compilers place space between "-{L,R}" and the path.
1307@@ -6523,13 +6934,22 @@
1308 test $p = "-R"; then
1309 prev=$p
1310 continue
1311- else
1312- prev=
1313 fi
1314
1315+ # Expand the sysroot to ease extracting the directories later.
1316+ if test -z "$prev"; then
1317+ case $p in
1318+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
1319+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
1320+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
1321+ esac
1322+ fi
1323+ case $p in
1324+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
1325+ esac
1326 if test "$pre_test_object_deps_done" = no; then
1327- case $p in
1328- -L* | -R*)
1329+ case ${prev} in
1330+ -L | -R)
1331 # Internal compiler library paths should come after those
1332 # provided the user. The postdeps already come after the
1333 # user supplied libs so there is no need to process them.
1334@@ -6549,8 +6969,10 @@
1335 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
1336 fi
1337 fi
1338+ prev=
1339 ;;
1340
1341+ *.lto.$objext) ;; # Ignore GCC LTO objects
1342 *.$objext)
1343 # This assumes that the test object file only shows up
1344 # once in the compiler output.
1345@@ -6586,6 +7008,7 @@
1346 fi
1347
1348 $RM -f confest.$objext
1349+CFLAGS=$_lt_libdeps_save_CFLAGS
1350
1351 # PORTME: override above test on systems where it is broken
1352 m4_if([$1], [CXX],
1353@@ -6622,7 +7045,7 @@
1354
1355 solaris*)
1356 case $cc_basename in
1357- CC*)
1358+ CC* | sunCC*)
1359 # The more standards-conforming stlport4 library is
1360 # incompatible with the Cstd library. Avoid specifying
1361 # it if it's in CXXFLAGS. Ignore libCrun as
1362@@ -6735,7 +7158,9 @@
1363 # Allow CC to be a program name with arguments.
1364 lt_save_CC="$CC"
1365 lt_save_GCC=$GCC
1366+ lt_save_CFLAGS=$CFLAGS
1367 CC=${F77-"f77"}
1368+ CFLAGS=$FFLAGS
1369 compiler=$CC
1370 _LT_TAGVAR(compiler, $1)=$CC
1371 _LT_CC_BASENAME([$compiler])
1372@@ -6789,6 +7214,7 @@
1373
1374 GCC=$lt_save_GCC
1375 CC="$lt_save_CC"
1376+ CFLAGS="$lt_save_CFLAGS"
1377 fi # test "$_lt_disable_F77" != yes
1378
1379 AC_LANG_POP
1380@@ -6865,7 +7291,9 @@
1381 # Allow CC to be a program name with arguments.
1382 lt_save_CC="$CC"
1383 lt_save_GCC=$GCC
1384+ lt_save_CFLAGS=$CFLAGS
1385 CC=${FC-"f95"}
1386+ CFLAGS=$FCFLAGS
1387 compiler=$CC
1388 GCC=$ac_cv_fc_compiler_gnu
1389
1390@@ -6921,7 +7349,8 @@
1391 fi # test -n "$compiler"
1392
1393 GCC=$lt_save_GCC
1394- CC="$lt_save_CC"
1395+ CC=$lt_save_CC
1396+ CFLAGS=$lt_save_CFLAGS
1397 fi # test "$_lt_disable_FC" != yes
1398
1399 AC_LANG_POP
1400@@ -6958,10 +7387,12 @@
1401 _LT_LINKER_BOILERPLATE
1402
1403 # Allow CC to be a program name with arguments.
1404-lt_save_CC="$CC"
1405+lt_save_CC=$CC
1406+lt_save_CFLAGS=$CFLAGS
1407 lt_save_GCC=$GCC
1408 GCC=yes
1409 CC=${GCJ-"gcj"}
1410+CFLAGS=$GCJFLAGS
1411 compiler=$CC
1412 _LT_TAGVAR(compiler, $1)=$CC
1413 _LT_TAGVAR(LD, $1)="$LD"
1414@@ -6992,7 +7423,8 @@
1415 AC_LANG_RESTORE
1416
1417 GCC=$lt_save_GCC
1418-CC="$lt_save_CC"
1419+CC=$lt_save_CC
1420+CFLAGS=$lt_save_CFLAGS
1421 ])# _LT_LANG_GCJ_CONFIG
1422
1423
1424@@ -7027,9 +7459,11 @@
1425
1426 # Allow CC to be a program name with arguments.
1427 lt_save_CC="$CC"
1428+lt_save_CFLAGS=$CFLAGS
1429 lt_save_GCC=$GCC
1430 GCC=
1431 CC=${RC-"windres"}
1432+CFLAGS=
1433 compiler=$CC
1434 _LT_TAGVAR(compiler, $1)=$CC
1435 _LT_CC_BASENAME([$compiler])
1436@@ -7042,7 +7476,8 @@
1437
1438 GCC=$lt_save_GCC
1439 AC_LANG_RESTORE
1440-CC="$lt_save_CC"
1441+CC=$lt_save_CC
1442+CFLAGS=$lt_save_CFLAGS
1443 ])# _LT_LANG_RC_CONFIG
1444
1445
1446@@ -7101,6 +7536,15 @@
1447 AC_SUBST([OBJDUMP])
1448 ])
1449
1450+# _LT_DECL_DLLTOOL
1451+# ----------------
1452+# Ensure DLLTOOL variable is set.
1453+m4_defun([_LT_DECL_DLLTOOL],
1454+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
1455+test -z "$DLLTOOL" && DLLTOOL=dlltool
1456+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
1457+AC_SUBST([DLLTOOL])
1458+])
1459
1460 # _LT_DECL_SED
1461 # ------------
1462@@ -7194,8 +7638,8 @@
1463 # Try some XSI features
1464 xsi_shell=no
1465 ( _lt_dummy="a/b/c"
1466- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
1467- = c,a/b,, \
1468+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
1469+ = c,a/b,b/c, \
1470 && eval 'test $(( 1 + 1 )) -eq 2 \
1471 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
1472 && xsi_shell=yes
1473@@ -7234,206 +7678,162 @@
1474 ])# _LT_CHECK_SHELL_FEATURES
1475
1476
1477-# _LT_PROG_XSI_SHELLFNS
1478-# ---------------------
1479-# Bourne and XSI compatible variants of some useful shell functions.
1480-m4_defun([_LT_PROG_XSI_SHELLFNS],
1481-[case $xsi_shell in
1482- yes)
1483- cat << \_LT_EOF >> "$cfgfile"
1484-
1485-# func_dirname file append nondir_replacement
1486-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1487-# otherwise set result to NONDIR_REPLACEMENT.
1488-func_dirname ()
1489-{
1490- case ${1} in
1491- */*) func_dirname_result="${1%/*}${2}" ;;
1492- * ) func_dirname_result="${3}" ;;
1493- esac
1494-}
1495-
1496-# func_basename file
1497-func_basename ()
1498-{
1499- func_basename_result="${1##*/}"
1500-}
1501-
1502-# func_dirname_and_basename file append nondir_replacement
1503-# perform func_basename and func_dirname in a single function
1504-# call:
1505-# dirname: Compute the dirname of FILE. If nonempty,
1506-# add APPEND to the result, otherwise set result
1507-# to NONDIR_REPLACEMENT.
1508-# value returned in "$func_dirname_result"
1509-# basename: Compute filename of FILE.
1510-# value retuned in "$func_basename_result"
1511-# Implementation must be kept synchronized with func_dirname
1512-# and func_basename. For efficiency, we do not delegate to
1513-# those functions but instead duplicate the functionality here.
1514-func_dirname_and_basename ()
1515-{
1516- case ${1} in
1517- */*) func_dirname_result="${1%/*}${2}" ;;
1518- * ) func_dirname_result="${3}" ;;
1519- esac
1520- func_basename_result="${1##*/}"
1521-}
1522-
1523-# func_stripname prefix suffix name
1524-# strip PREFIX and SUFFIX off of NAME.
1525-# PREFIX and SUFFIX must not contain globbing or regex special
1526-# characters, hashes, percent signs, but SUFFIX may contain a leading
1527-# dot (in which case that matches only a dot).
1528-func_stripname ()
1529-{
1530- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1531- # positional parameters, so assign one to ordinary parameter first.
1532- func_stripname_result=${3}
1533- func_stripname_result=${func_stripname_result#"${1}"}
1534- func_stripname_result=${func_stripname_result%"${2}"}
1535-}
1536-
1537-# func_opt_split
1538-func_opt_split ()
1539-{
1540- func_opt_split_opt=${1%%=*}
1541- func_opt_split_arg=${1#*=}
1542-}
1543-
1544-# func_lo2o object
1545-func_lo2o ()
1546-{
1547- case ${1} in
1548- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1549- *) func_lo2o_result=${1} ;;
1550- esac
1551-}
1552-
1553-# func_xform libobj-or-source
1554-func_xform ()
1555-{
1556- func_xform_result=${1%.*}.lo
1557-}
1558-
1559-# func_arith arithmetic-term...
1560-func_arith ()
1561-{
1562- func_arith_result=$(( $[*] ))
1563-}
1564-
1565-# func_len string
1566-# STRING may not start with a hyphen.
1567-func_len ()
1568-{
1569- func_len_result=${#1}
1570-}
1571-
1572-_LT_EOF
1573- ;;
1574- *) # Bourne compatible functions.
1575- cat << \_LT_EOF >> "$cfgfile"
1576-
1577-# func_dirname file append nondir_replacement
1578-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1579-# otherwise set result to NONDIR_REPLACEMENT.
1580-func_dirname ()
1581-{
1582- # Extract subdirectory from the argument.
1583- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1584- if test "X$func_dirname_result" = "X${1}"; then
1585- func_dirname_result="${3}"
1586- else
1587- func_dirname_result="$func_dirname_result${2}"
1588- fi
1589-}
1590-
1591-# func_basename file
1592-func_basename ()
1593-{
1594- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1595-}
1596+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
1597+# ------------------------------------------------------
1598+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
1599+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
1600+m4_defun([_LT_PROG_FUNCTION_REPLACE],
1601+[dnl {
1602+sed -e '/^$1 ()$/,/^} # $1 /c\
1603+$1 ()\
1604+{\
1605+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
1606+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
1607+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1608+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1609+test 0 -eq $? || _lt_function_replace_fail=:
1610+])
1611
1612-dnl func_dirname_and_basename
1613-dnl A portable version of this function is already defined in general.m4sh
1614-dnl so there is no need for it here.
1615
1616-# func_stripname prefix suffix name
1617-# strip PREFIX and SUFFIX off of NAME.
1618-# PREFIX and SUFFIX must not contain globbing or regex special
1619-# characters, hashes, percent signs, but SUFFIX may contain a leading
1620-# dot (in which case that matches only a dot).
1621-# func_strip_suffix prefix name
1622-func_stripname ()
1623-{
1624- case ${2} in
1625- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1626- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1627- esac
1628-}
1629+# _LT_PROG_REPLACE_SHELLFNS
1630+# -------------------------
1631+# Replace existing portable implementations of several shell functions with
1632+# equivalent extended shell implementations where those features are available..
1633+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
1634+[if test x"$xsi_shell" = xyes; then
1635+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
1636+ case ${1} in
1637+ */*) func_dirname_result="${1%/*}${2}" ;;
1638+ * ) func_dirname_result="${3}" ;;
1639+ esac])
1640+
1641+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
1642+ func_basename_result="${1##*/}"])
1643+
1644+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
1645+ case ${1} in
1646+ */*) func_dirname_result="${1%/*}${2}" ;;
1647+ * ) func_dirname_result="${3}" ;;
1648+ esac
1649+ func_basename_result="${1##*/}"])
1650
1651-# sed scripts:
1652-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
1653-my_sed_long_arg='1s/^-[[^=]]*=//'
1654+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
1655+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1656+ # positional parameters, so assign one to ordinary parameter first.
1657+ func_stripname_result=${3}
1658+ func_stripname_result=${func_stripname_result#"${1}"}
1659+ func_stripname_result=${func_stripname_result%"${2}"}])
1660+
1661+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
1662+ func_split_long_opt_name=${1%%=*}
1663+ func_split_long_opt_arg=${1#*=}])
1664+
1665+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
1666+ func_split_short_opt_arg=${1#??}
1667+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
1668+
1669+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
1670+ case ${1} in
1671+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1672+ *) func_lo2o_result=${1} ;;
1673+ esac])
1674
1675-# func_opt_split
1676-func_opt_split ()
1677-{
1678- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1679- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1680-}
1681+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
1682
1683-# func_lo2o object
1684-func_lo2o ()
1685-{
1686- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1687-}
1688+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
1689
1690-# func_xform libobj-or-source
1691-func_xform ()
1692-{
1693- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
1694-}
1695+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
1696+fi
1697
1698-# func_arith arithmetic-term...
1699-func_arith ()
1700-{
1701- func_arith_result=`expr "$[@]"`
1702-}
1703+if test x"$lt_shell_append" = xyes; then
1704+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
1705
1706-# func_len string
1707-# STRING may not start with a hyphen.
1708-func_len ()
1709-{
1710- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
1711-}
1712+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
1713+ func_quote_for_eval "${2}"
1714+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
1715+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
1716+
1717+ # Save a `func_append' function call where possible by direct use of '+='
1718+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1719+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1720+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1721+ test 0 -eq $? || _lt_function_replace_fail=:
1722+else
1723+ # Save a `func_append' function call even when '+=' is not available
1724+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1725+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1726+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1727+ test 0 -eq $? || _lt_function_replace_fail=:
1728+fi
1729
1730-_LT_EOF
1731-esac
1732+if test x"$_lt_function_replace_fail" = x":"; then
1733+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
1734+fi
1735+])
1736
1737-case $lt_shell_append in
1738- yes)
1739- cat << \_LT_EOF >> "$cfgfile"
1740-
1741-# func_append var value
1742-# Append VALUE to the end of shell variable VAR.
1743-func_append ()
1744-{
1745- eval "$[1]+=\$[2]"
1746-}
1747-_LT_EOF
1748+# _LT_PATH_CONVERSION_FUNCTIONS
1749+# -----------------------------
1750+# Determine which file name conversion functions should be used by
1751+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
1752+# for certain cross-compile configurations and native mingw.
1753+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
1754+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1755+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1756+AC_MSG_CHECKING([how to convert $build file names to $host format])
1757+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
1758+[case $host in
1759+ *-*-mingw* )
1760+ case $build in
1761+ *-*-mingw* ) # actually msys
1762+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
1763+ ;;
1764+ *-*-cygwin* )
1765+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
1766+ ;;
1767+ * ) # otherwise, assume *nix
1768+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
1769+ ;;
1770+ esac
1771 ;;
1772- *)
1773- cat << \_LT_EOF >> "$cfgfile"
1774-
1775-# func_append var value
1776-# Append VALUE to the end of shell variable VAR.
1777-func_append ()
1778-{
1779- eval "$[1]=\$$[1]\$[2]"
1780-}
1781-
1782-_LT_EOF
1783+ *-*-cygwin* )
1784+ case $build in
1785+ *-*-mingw* ) # actually msys
1786+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
1787+ ;;
1788+ *-*-cygwin* )
1789+ lt_cv_to_host_file_cmd=func_convert_file_noop
1790+ ;;
1791+ * ) # otherwise, assume *nix
1792+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
1793+ ;;
1794+ esac
1795 ;;
1796- esac
1797+ * ) # unhandled hosts (and "normal" native builds)
1798+ lt_cv_to_host_file_cmd=func_convert_file_noop
1799+ ;;
1800+esac
1801+])
1802+to_host_file_cmd=$lt_cv_to_host_file_cmd
1803+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
1804+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
1805+ [0], [convert $build file names to $host format])dnl
1806+
1807+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
1808+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
1809+[#assume ordinary cross tools, or native build.
1810+lt_cv_to_tool_file_cmd=func_convert_file_noop
1811+case $host in
1812+ *-*-mingw* )
1813+ case $build in
1814+ *-*-mingw* ) # actually msys
1815+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
1816+ ;;
1817+ esac
1818+ ;;
1819+esac
1820 ])
1821+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1822+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
1823+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
1824+ [0], [convert $build files to toolchain format])dnl
1825+])# _LT_PATH_CONVERSION_FUNCTIONS
1826Index: binutils-2.24/ltmain.sh
1827===================================================================
1828--- binutils-2.24.orig/ltmain.sh 2013-11-04 07:33:40.000000000 -0800
1829+++ binutils-2.24/ltmain.sh 2013-12-15 11:10:23.867118697 -0800
1830@@ -1,10 +1,9 @@
1831-# Generated from ltmain.m4sh.
1832
1833-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
1834+# libtool (GNU libtool) 2.4
1835 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
1836
1837 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
1838-# 2007, 2008, 2009 Free Software Foundation, Inc.
1839+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
1840 # This is free software; see the source for copying conditions. There is NO
1841 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1842
1843@@ -38,7 +37,6 @@
1844 # -n, --dry-run display commands without modifying any files
1845 # --features display basic configuration information and exit
1846 # --mode=MODE use operation mode MODE
1847-# --no-finish let install mode avoid finish commands
1848 # --preserve-dup-deps don't remove duplicate dependency libraries
1849 # --quiet, --silent don't print informational messages
1850 # --no-quiet, --no-silent
1851@@ -71,17 +69,19 @@
1852 # compiler: $LTCC
1853 # compiler flags: $LTCFLAGS
1854 # linker: $LD (gnu? $with_gnu_ld)
1855-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
1856+# $progname: (GNU libtool) 2.4
1857 # automake: $automake_version
1858 # autoconf: $autoconf_version
1859 #
1860 # Report bugs to <bug-libtool@gnu.org>.
1861+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
1862+# General help using GNU software: <http://www.gnu.org/gethelp/>.
1863
1864 PROGRAM=libtool
1865 PACKAGE=libtool
1866-VERSION=2.2.7a
1867-TIMESTAMP=" 1.3134 2009-11-29"
1868-package_revision=1.3134
1869+VERSION=2.4
1870+TIMESTAMP=""
1871+package_revision=1.3293
1872
1873 # Be Bourne compatible
1874 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1875@@ -106,9 +106,6 @@
1876 }
1877
1878 # NLS nuisances: We save the old values to restore during execute mode.
1879-# Only set LANG and LC_ALL to C if already set.
1880-# These must not be set unconditionally because not all systems understand
1881-# e.g. LANG=C (notably SCO).
1882 lt_user_locale=
1883 lt_safe_locale=
1884 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
1885@@ -121,15 +118,13 @@
1886 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
1887 fi"
1888 done
1889+LC_ALL=C
1890+LANGUAGE=C
1891+export LANGUAGE LC_ALL
1892
1893 $lt_unset CDPATH
1894
1895
1896-
1897-
1898-
1899-
1900-
1901 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
1902 # is ksh but when the shell is invoked as "sh" and the current value of
1903 # the _XPG environment variable is not equal to 1 (one), the special
1904@@ -140,7 +135,7 @@
1905
1906
1907 : ${CP="cp -f"}
1908-: ${ECHO=$as_echo}
1909+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
1910 : ${EGREP="/bin/grep -E"}
1911 : ${FGREP="/bin/grep -F"}
1912 : ${GREP="/bin/grep"}
1913@@ -149,7 +144,7 @@
1914 : ${MKDIR="mkdir"}
1915 : ${MV="mv -f"}
1916 : ${RM="rm -f"}
1917-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
1918+: ${SED="/bin/sed"}
1919 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
1920 : ${Xsed="$SED -e 1s/^X//"}
1921
1922@@ -169,6 +164,27 @@
1923 dirname="s,/[^/]*$,,"
1924 basename="s,^.*/,,"
1925
1926+# func_dirname file append nondir_replacement
1927+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1928+# otherwise set result to NONDIR_REPLACEMENT.
1929+func_dirname ()
1930+{
1931+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1932+ if test "X$func_dirname_result" = "X${1}"; then
1933+ func_dirname_result="${3}"
1934+ else
1935+ func_dirname_result="$func_dirname_result${2}"
1936+ fi
1937+} # func_dirname may be replaced by extended shell implementation
1938+
1939+
1940+# func_basename file
1941+func_basename ()
1942+{
1943+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1944+} # func_basename may be replaced by extended shell implementation
1945+
1946+
1947 # func_dirname_and_basename file append nondir_replacement
1948 # perform func_basename and func_dirname in a single function
1949 # call:
1950@@ -183,17 +199,31 @@
1951 # those functions but instead duplicate the functionality here.
1952 func_dirname_and_basename ()
1953 {
1954- # Extract subdirectory from the argument.
1955- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1956- if test "X$func_dirname_result" = "X${1}"; then
1957- func_dirname_result="${3}"
1958- else
1959- func_dirname_result="$func_dirname_result${2}"
1960- fi
1961- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1962-}
1963+ # Extract subdirectory from the argument.
1964+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
1965+ if test "X$func_dirname_result" = "X${1}"; then
1966+ func_dirname_result="${3}"
1967+ else
1968+ func_dirname_result="$func_dirname_result${2}"
1969+ fi
1970+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
1971+} # func_dirname_and_basename may be replaced by extended shell implementation
1972+
1973+
1974+# func_stripname prefix suffix name
1975+# strip PREFIX and SUFFIX off of NAME.
1976+# PREFIX and SUFFIX must not contain globbing or regex special
1977+# characters, hashes, percent signs, but SUFFIX may contain a leading
1978+# dot (in which case that matches only a dot).
1979+# func_strip_suffix prefix name
1980+func_stripname ()
1981+{
1982+ case ${2} in
1983+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1984+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1985+ esac
1986+} # func_stripname may be replaced by extended shell implementation
1987
1988-# Generated shell functions inserted here.
1989
1990 # These SED scripts presuppose an absolute path with a trailing slash.
1991 pathcar='s,^/\([^/]*\).*$,\1,'
1992@@ -376,6 +406,15 @@
1993 # Same as above, but do not quote variable references.
1994 double_quote_subst='s/\(["`\\]\)/\\\1/g'
1995
1996+# Sed substitution that turns a string into a regex matching for the
1997+# string literally.
1998+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
1999+
2000+# Sed substitution that converts a w32 file name or path
2001+# which contains forward slashes, into one that contains
2002+# (escaped) backslashes. A very naive implementation.
2003+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
2004+
2005 # Re-`\' parameter expansions in output of double_quote_subst that were
2006 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
2007 # in input to double_quote_subst, that '$' was protected from expansion.
2008@@ -404,7 +443,7 @@
2009 # name if it has been set yet.
2010 func_echo ()
2011 {
2012- $ECHO "$progname${mode+: }$mode: $*"
2013+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
2014 }
2015
2016 # func_verbose arg...
2017@@ -430,14 +469,14 @@
2018 # Echo program name prefixed message to standard error.
2019 func_error ()
2020 {
2021- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
2022+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
2023 }
2024
2025 # func_warning arg...
2026 # Echo program name prefixed warning message to standard error.
2027 func_warning ()
2028 {
2029- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
2030+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
2031
2032 # bash bug again:
2033 :
2034@@ -656,19 +695,35 @@
2035 fi
2036 }
2037
2038-
2039-
2040+# func_tr_sh
2041+# Turn $1 into a string suitable for a shell variable name.
2042+# Result is stored in $func_tr_sh_result. All characters
2043+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
2044+# if $1 begins with a digit, a '_' is prepended as well.
2045+func_tr_sh ()
2046+{
2047+ case $1 in
2048+ [0-9]* | *[!a-zA-Z0-9_]*)
2049+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
2050+ ;;
2051+ * )
2052+ func_tr_sh_result=$1
2053+ ;;
2054+ esac
2055+}
2056
2057
2058 # func_version
2059 # Echo version message to standard output and exit.
2060 func_version ()
2061 {
2062+ $opt_debug
2063+
2064 $SED -n '/(C)/!b go
2065 :more
2066 /\./!{
2067 N
2068- s/\n# //
2069+ s/\n# / /
2070 b more
2071 }
2072 :go
2073@@ -685,7 +740,9 @@
2074 # Echo short help message to standard output and exit.
2075 func_usage ()
2076 {
2077- $SED -n '/^# Usage:/,/^# *-h/ {
2078+ $opt_debug
2079+
2080+ $SED -n '/^# Usage:/,/^# *.*--help/ {
2081 s/^# //
2082 s/^# *$//
2083 s/\$progname/'$progname'/
2084@@ -701,7 +758,10 @@
2085 # unless 'noexit' is passed as argument.
2086 func_help ()
2087 {
2088+ $opt_debug
2089+
2090 $SED -n '/^# Usage:/,/# Report bugs to/ {
2091+ :print
2092 s/^# //
2093 s/^# *$//
2094 s*\$progname*'$progname'*
2095@@ -714,7 +774,11 @@
2096 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
2097 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
2098 p
2099- }' < "$progpath"
2100+ d
2101+ }
2102+ /^# .* home page:/b print
2103+ /^# General help using/b print
2104+ ' < "$progpath"
2105 ret=$?
2106 if test -z "$1"; then
2107 exit $ret
2108@@ -726,12 +790,39 @@
2109 # exit_cmd.
2110 func_missing_arg ()
2111 {
2112- func_error "missing argument for $1"
2113+ $opt_debug
2114+
2115+ func_error "missing argument for $1."
2116 exit_cmd=exit
2117 }
2118
2119-exit_cmd=:
2120
2121+# func_split_short_opt shortopt
2122+# Set func_split_short_opt_name and func_split_short_opt_arg shell
2123+# variables after splitting SHORTOPT after the 2nd character.
2124+func_split_short_opt ()
2125+{
2126+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
2127+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
2128+
2129+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
2130+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
2131+} # func_split_short_opt may be replaced by extended shell implementation
2132+
2133+
2134+# func_split_long_opt longopt
2135+# Set func_split_long_opt_name and func_split_long_opt_arg shell
2136+# variables after splitting LONGOPT at the `=' sign.
2137+func_split_long_opt ()
2138+{
2139+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
2140+ my_sed_long_arg='1s/^--[^=]*=//'
2141+
2142+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
2143+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
2144+} # func_split_long_opt may be replaced by extended shell implementation
2145+
2146+exit_cmd=:
2147
2148
2149
2150@@ -741,26 +832,64 @@
2151 magic_exe="%%%MAGIC EXE variable%%%"
2152
2153 # Global variables.
2154-# $mode is unset
2155 nonopt=
2156-execute_dlfiles=
2157 preserve_args=
2158 lo2o="s/\\.lo\$/.${objext}/"
2159 o2lo="s/\\.${objext}\$/.lo/"
2160 extracted_archives=
2161 extracted_serial=0
2162
2163-opt_dry_run=false
2164-opt_finish=:
2165-opt_duplicate_deps=false
2166-opt_silent=false
2167-opt_debug=:
2168-
2169 # If this variable is set in any of the actions, the command in it
2170 # will be execed at the end. This prevents here-documents from being
2171 # left over by shells.
2172 exec_cmd=
2173
2174+# func_append var value
2175+# Append VALUE to the end of shell variable VAR.
2176+func_append ()
2177+{
2178+ eval "${1}=\$${1}\${2}"
2179+} # func_append may be replaced by extended shell implementation
2180+
2181+# func_append_quoted var value
2182+# Quote VALUE and append to the end of shell variable VAR, separated
2183+# by a space.
2184+func_append_quoted ()
2185+{
2186+ func_quote_for_eval "${2}"
2187+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
2188+} # func_append_quoted may be replaced by extended shell implementation
2189+
2190+
2191+# func_arith arithmetic-term...
2192+func_arith ()
2193+{
2194+ func_arith_result=`expr "${@}"`
2195+} # func_arith may be replaced by extended shell implementation
2196+
2197+
2198+# func_len string
2199+# STRING may not start with a hyphen.
2200+func_len ()
2201+{
2202+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
2203+} # func_len may be replaced by extended shell implementation
2204+
2205+
2206+# func_lo2o object
2207+func_lo2o ()
2208+{
2209+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
2210+} # func_lo2o may be replaced by extended shell implementation
2211+
2212+
2213+# func_xform libobj-or-source
2214+func_xform ()
2215+{
2216+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
2217+} # func_xform may be replaced by extended shell implementation
2218+
2219+
2220 # func_fatal_configuration arg...
2221 # Echo program name prefixed message to standard error, followed by
2222 # a configuration failure hint, and exit.
2223@@ -850,130 +979,204 @@
2224 esac
2225 }
2226
2227-# Parse options once, thoroughly. This comes as soon as possible in
2228-# the script to make things like `libtool --version' happen quickly.
2229+# func_check_version_match
2230+# Ensure that we are using m4 macros, and libtool script from the same
2231+# release of libtool.
2232+func_check_version_match ()
2233 {
2234+ if test "$package_revision" != "$macro_revision"; then
2235+ if test "$VERSION" != "$macro_version"; then
2236+ if test -z "$macro_version"; then
2237+ cat >&2 <<_LT_EOF
2238+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2239+$progname: definition of this LT_INIT comes from an older release.
2240+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2241+$progname: and run autoconf again.
2242+_LT_EOF
2243+ else
2244+ cat >&2 <<_LT_EOF
2245+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2246+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2247+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2248+$progname: and run autoconf again.
2249+_LT_EOF
2250+ fi
2251+ else
2252+ cat >&2 <<_LT_EOF
2253+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2254+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2255+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2256+$progname: of $PACKAGE $VERSION and run autoconf again.
2257+_LT_EOF
2258+ fi
2259+
2260+ exit $EXIT_MISMATCH
2261+ fi
2262+}
2263+
2264+
2265+# Shorthand for --mode=foo, only valid as the first argument
2266+case $1 in
2267+clean|clea|cle|cl)
2268+ shift; set dummy --mode clean ${1+"$@"}; shift
2269+ ;;
2270+compile|compil|compi|comp|com|co|c)
2271+ shift; set dummy --mode compile ${1+"$@"}; shift
2272+ ;;
2273+execute|execut|execu|exec|exe|ex|e)
2274+ shift; set dummy --mode execute ${1+"$@"}; shift
2275+ ;;
2276+finish|finis|fini|fin|fi|f)
2277+ shift; set dummy --mode finish ${1+"$@"}; shift
2278+ ;;
2279+install|instal|insta|inst|ins|in|i)
2280+ shift; set dummy --mode install ${1+"$@"}; shift
2281+ ;;
2282+link|lin|li|l)
2283+ shift; set dummy --mode link ${1+"$@"}; shift
2284+ ;;
2285+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2286+ shift; set dummy --mode uninstall ${1+"$@"}; shift
2287+ ;;
2288+esac
2289
2290- # Shorthand for --mode=foo, only valid as the first argument
2291- case $1 in
2292- clean|clea|cle|cl)
2293- shift; set dummy --mode clean ${1+"$@"}; shift
2294- ;;
2295- compile|compil|compi|comp|com|co|c)
2296- shift; set dummy --mode compile ${1+"$@"}; shift
2297- ;;
2298- execute|execut|execu|exec|exe|ex|e)
2299- shift; set dummy --mode execute ${1+"$@"}; shift
2300- ;;
2301- finish|finis|fini|fin|fi|f)
2302- shift; set dummy --mode finish ${1+"$@"}; shift
2303- ;;
2304- install|instal|insta|inst|ins|in|i)
2305- shift; set dummy --mode install ${1+"$@"}; shift
2306- ;;
2307- link|lin|li|l)
2308- shift; set dummy --mode link ${1+"$@"}; shift
2309- ;;
2310- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
2311- shift; set dummy --mode uninstall ${1+"$@"}; shift
2312- ;;
2313- esac
2314
2315- # Parse non-mode specific arguments:
2316- while test "$#" -gt 0; do
2317+
2318+# Option defaults:
2319+opt_debug=:
2320+opt_dry_run=false
2321+opt_config=false
2322+opt_preserve_dup_deps=false
2323+opt_features=false
2324+opt_finish=false
2325+opt_help=false
2326+opt_help_all=false
2327+opt_silent=:
2328+opt_verbose=:
2329+opt_silent=false
2330+opt_verbose=false
2331+
2332+
2333+# Parse options once, thoroughly. This comes as soon as possible in the
2334+# script to make things like `--version' happen as quickly as we can.
2335+{
2336+ # this just eases exit handling
2337+ while test $# -gt 0; do
2338 opt="$1"
2339 shift
2340-
2341 case $opt in
2342- --config) func_config ;;
2343-
2344- --debug) preserve_args="$preserve_args $opt"
2345+ --debug|-x) opt_debug='set -x'
2346 func_echo "enabling shell trace mode"
2347- opt_debug='set -x'
2348 $opt_debug
2349 ;;
2350-
2351- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
2352- execute_dlfiles="$execute_dlfiles $1"
2353- shift
2354+ --dry-run|--dryrun|-n)
2355+ opt_dry_run=:
2356 ;;
2357-
2358- --dry-run | -n) opt_dry_run=: ;;
2359- --features) func_features ;;
2360- --finish) mode="finish" ;;
2361- --no-finish) opt_finish=false ;;
2362-
2363- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
2364- case $1 in
2365- # Valid mode arguments:
2366- clean) ;;
2367- compile) ;;
2368- execute) ;;
2369- finish) ;;
2370- install) ;;
2371- link) ;;
2372- relink) ;;
2373- uninstall) ;;
2374-
2375- # Catch anything else as an error
2376- *) func_error "invalid argument for $opt"
2377- exit_cmd=exit
2378- break
2379- ;;
2380- esac
2381-
2382- mode="$1"
2383+ --config)
2384+ opt_config=:
2385+func_config
2386+ ;;
2387+ --dlopen|-dlopen)
2388+ optarg="$1"
2389+ opt_dlopen="${opt_dlopen+$opt_dlopen
2390+}$optarg"
2391 shift
2392 ;;
2393-
2394 --preserve-dup-deps)
2395- opt_duplicate_deps=: ;;
2396-
2397- --quiet|--silent) preserve_args="$preserve_args $opt"
2398- opt_silent=:
2399- opt_verbose=false
2400+ opt_preserve_dup_deps=:
2401 ;;
2402-
2403- --no-quiet|--no-silent)
2404- preserve_args="$preserve_args $opt"
2405- opt_silent=false
2406+ --features)
2407+ opt_features=:
2408+func_features
2409 ;;
2410-
2411- --verbose| -v) preserve_args="$preserve_args $opt"
2412+ --finish)
2413+ opt_finish=:
2414+set dummy --mode finish ${1+"$@"}; shift
2415+ ;;
2416+ --help)
2417+ opt_help=:
2418+ ;;
2419+ --help-all)
2420+ opt_help_all=:
2421+opt_help=': help-all'
2422+ ;;
2423+ --mode)
2424+ test $# = 0 && func_missing_arg $opt && break
2425+ optarg="$1"
2426+ opt_mode="$optarg"
2427+case $optarg in
2428+ # Valid mode arguments:
2429+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
2430+
2431+ # Catch anything else as an error
2432+ *) func_error "invalid argument for $opt"
2433+ exit_cmd=exit
2434+ break
2435+ ;;
2436+esac
2437+ shift
2438+ ;;
2439+ --no-silent|--no-quiet)
2440 opt_silent=false
2441- opt_verbose=:
2442+func_append preserve_args " $opt"
2443 ;;
2444-
2445- --no-verbose) preserve_args="$preserve_args $opt"
2446+ --no-verbose)
2447 opt_verbose=false
2448+func_append preserve_args " $opt"
2449 ;;
2450-
2451- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
2452- preserve_args="$preserve_args $opt $1"
2453- func_enable_tag "$1" # tagname is set here
2454+ --silent|--quiet)
2455+ opt_silent=:
2456+func_append preserve_args " $opt"
2457+ opt_verbose=false
2458+ ;;
2459+ --verbose|-v)
2460+ opt_verbose=:
2461+func_append preserve_args " $opt"
2462+opt_silent=false
2463+ ;;
2464+ --tag)
2465+ test $# = 0 && func_missing_arg $opt && break
2466+ optarg="$1"
2467+ opt_tag="$optarg"
2468+func_append preserve_args " $opt $optarg"
2469+func_enable_tag "$optarg"
2470 shift
2471 ;;
2472
2473+ -\?|-h) func_usage ;;
2474+ --help) func_help ;;
2475+ --version) func_version ;;
2476+
2477 # Separate optargs to long options:
2478- -dlopen=*|--mode=*|--tag=*)
2479- func_opt_split "$opt"
2480- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
2481+ --*=*)
2482+ func_split_long_opt "$opt"
2483+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
2484 shift
2485 ;;
2486
2487- -\?|-h) func_usage ;;
2488- --help) opt_help=: ;;
2489- --help-all) opt_help=': help-all' ;;
2490- --version) func_version ;;
2491-
2492- -*) func_fatal_help "unrecognized option \`$opt'" ;;
2493-
2494- *) nonopt="$opt"
2495- break
2496+ # Separate non-argument short options:
2497+ -\?*|-h*|-n*|-v*)
2498+ func_split_short_opt "$opt"
2499+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
2500+ shift
2501 ;;
2502+
2503+ --) break ;;
2504+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
2505+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
2506 esac
2507 done
2508
2509+ # Validate options:
2510+
2511+ # save first non-option argument
2512+ if test "$#" -gt 0; then
2513+ nonopt="$opt"
2514+ shift
2515+ fi
2516+
2517+ # preserve --debug
2518+ test "$opt_debug" = : || func_append preserve_args " --debug"
2519
2520 case $host in
2521 *cygwin* | *mingw* | *pw32* | *cegcc*)
2522@@ -981,82 +1184,44 @@
2523 opt_duplicate_compiler_generated_deps=:
2524 ;;
2525 *)
2526- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
2527+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
2528 ;;
2529 esac
2530
2531- # Having warned about all mis-specified options, bail out if
2532- # anything was wrong.
2533- $exit_cmd $EXIT_FAILURE
2534-}
2535+ $opt_help || {
2536+ # Sanity checks first:
2537+ func_check_version_match
2538
2539-# func_check_version_match
2540-# Ensure that we are using m4 macros, and libtool script from the same
2541-# release of libtool.
2542-func_check_version_match ()
2543-{
2544- if test "$package_revision" != "$macro_revision"; then
2545- if test "$VERSION" != "$macro_version"; then
2546- if test -z "$macro_version"; then
2547- cat >&2 <<_LT_EOF
2548-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2549-$progname: definition of this LT_INIT comes from an older release.
2550-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2551-$progname: and run autoconf again.
2552-_LT_EOF
2553- else
2554- cat >&2 <<_LT_EOF
2555-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
2556-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
2557-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
2558-$progname: and run autoconf again.
2559-_LT_EOF
2560- fi
2561- else
2562- cat >&2 <<_LT_EOF
2563-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
2564-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
2565-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
2566-$progname: of $PACKAGE $VERSION and run autoconf again.
2567-_LT_EOF
2568+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2569+ func_fatal_configuration "not configured to build any kind of library"
2570 fi
2571
2572- exit $EXIT_MISMATCH
2573- fi
2574-}
2575-
2576+ # Darwin sucks
2577+ eval std_shrext=\"$shrext_cmds\"
2578
2579-## ----------- ##
2580-## Main. ##
2581-## ----------- ##
2582-
2583-$opt_help || {
2584- # Sanity checks first:
2585- func_check_version_match
2586-
2587- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
2588- func_fatal_configuration "not configured to build any kind of library"
2589- fi
2590+ # Only execute mode is allowed to have -dlopen flags.
2591+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
2592+ func_error "unrecognized option \`-dlopen'"
2593+ $ECHO "$help" 1>&2
2594+ exit $EXIT_FAILURE
2595+ fi
2596
2597- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
2598+ # Change the help message to a mode-specific one.
2599+ generic_help="$help"
2600+ help="Try \`$progname --help --mode=$opt_mode' for more information."
2601+ }
2602
2603
2604- # Darwin sucks
2605- eval "std_shrext=\"$shrext_cmds\""
2606+ # Bail if the options were screwed
2607+ $exit_cmd $EXIT_FAILURE
2608+}
2609
2610
2611- # Only execute mode is allowed to have -dlopen flags.
2612- if test -n "$execute_dlfiles" && test "$mode" != execute; then
2613- func_error "unrecognized option \`-dlopen'"
2614- $ECHO "$help" 1>&2
2615- exit $EXIT_FAILURE
2616- fi
2617
2618- # Change the help message to a mode-specific one.
2619- generic_help="$help"
2620- help="Try \`$progname --help --mode=$mode' for more information."
2621-}
2622
2623+## ----------- ##
2624+## Main. ##
2625+## ----------- ##
2626
2627 # func_lalib_p file
2628 # True iff FILE is a libtool `.la' library or `.lo' object file.
2629@@ -1121,12 +1286,9 @@
2630 # temporary ltwrapper_script.
2631 func_ltwrapper_scriptname ()
2632 {
2633- func_ltwrapper_scriptname_result=""
2634- if func_ltwrapper_executable_p "$1"; then
2635- func_dirname_and_basename "$1" "" "."
2636- func_stripname '' '.exe' "$func_basename_result"
2637- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2638- fi
2639+ func_dirname_and_basename "$1" "" "."
2640+ func_stripname '' '.exe' "$func_basename_result"
2641+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
2642 }
2643
2644 # func_ltwrapper_p file
2645@@ -1149,7 +1311,7 @@
2646 save_ifs=$IFS; IFS='~'
2647 for cmd in $1; do
2648 IFS=$save_ifs
2649- eval "cmd=\"$cmd\""
2650+ eval cmd=\"$cmd\"
2651 func_show_eval "$cmd" "${2-:}"
2652 done
2653 IFS=$save_ifs
2654@@ -1172,6 +1334,37 @@
2655 }
2656
2657
2658+# func_resolve_sysroot PATH
2659+# Replace a leading = in PATH with a sysroot. Store the result into
2660+# func_resolve_sysroot_result
2661+func_resolve_sysroot ()
2662+{
2663+ func_resolve_sysroot_result=$1
2664+ case $func_resolve_sysroot_result in
2665+ =*)
2666+ func_stripname '=' '' "$func_resolve_sysroot_result"
2667+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
2668+ ;;
2669+ esac
2670+}
2671+
2672+# func_replace_sysroot PATH
2673+# If PATH begins with the sysroot, replace it with = and
2674+# store the result into func_replace_sysroot_result.
2675+func_replace_sysroot ()
2676+{
2677+ case "$lt_sysroot:$1" in
2678+ ?*:"$lt_sysroot"*)
2679+ func_stripname "$lt_sysroot" '' "$1"
2680+ func_replace_sysroot_result="=$func_stripname_result"
2681+ ;;
2682+ *)
2683+ # Including no sysroot.
2684+ func_replace_sysroot_result=$1
2685+ ;;
2686+ esac
2687+}
2688+
2689 # func_infer_tag arg
2690 # Infer tagged configuration to use if any are available and
2691 # if one wasn't chosen via the "--tag" command line option.
2692@@ -1184,8 +1377,7 @@
2693 if test -n "$available_tags" && test -z "$tagname"; then
2694 CC_quoted=
2695 for arg in $CC; do
2696- func_quote_for_eval "$arg"
2697- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2698+ func_append_quoted CC_quoted "$arg"
2699 done
2700 CC_expanded=`func_echo_all $CC`
2701 CC_quoted_expanded=`func_echo_all $CC_quoted`
2702@@ -1204,8 +1396,7 @@
2703 CC_quoted=
2704 for arg in $CC; do
2705 # Double-quote args containing other shell metacharacters.
2706- func_quote_for_eval "$arg"
2707- CC_quoted="$CC_quoted $func_quote_for_eval_result"
2708+ func_append_quoted CC_quoted "$arg"
2709 done
2710 CC_expanded=`func_echo_all $CC`
2711 CC_quoted_expanded=`func_echo_all $CC_quoted`
2712@@ -1274,6 +1465,486 @@
2713 }
2714 }
2715
2716+
2717+##################################################
2718+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
2719+##################################################
2720+
2721+# func_convert_core_file_wine_to_w32 ARG
2722+# Helper function used by file name conversion functions when $build is *nix,
2723+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
2724+# correctly configured wine environment available, with the winepath program
2725+# in $build's $PATH.
2726+#
2727+# ARG is the $build file name to be converted to w32 format.
2728+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
2729+# be empty on error (or when ARG is empty)
2730+func_convert_core_file_wine_to_w32 ()
2731+{
2732+ $opt_debug
2733+ func_convert_core_file_wine_to_w32_result="$1"
2734+ if test -n "$1"; then
2735+ # Unfortunately, winepath does not exit with a non-zero error code, so we
2736+ # are forced to check the contents of stdout. On the other hand, if the
2737+ # command is not found, the shell will set an exit code of 127 and print
2738+ # *an error message* to stdout. So we must check for both error code of
2739+ # zero AND non-empty stdout, which explains the odd construction:
2740+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
2741+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
2742+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
2743+ $SED -e "$lt_sed_naive_backslashify"`
2744+ else
2745+ func_convert_core_file_wine_to_w32_result=
2746+ fi
2747+ fi
2748+}
2749+# end: func_convert_core_file_wine_to_w32
2750+
2751+
2752+# func_convert_core_path_wine_to_w32 ARG
2753+# Helper function used by path conversion functions when $build is *nix, and
2754+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
2755+# configured wine environment available, with the winepath program in $build's
2756+# $PATH. Assumes ARG has no leading or trailing path separator characters.
2757+#
2758+# ARG is path to be converted from $build format to win32.
2759+# Result is available in $func_convert_core_path_wine_to_w32_result.
2760+# Unconvertible file (directory) names in ARG are skipped; if no directory names
2761+# are convertible, then the result may be empty.
2762+func_convert_core_path_wine_to_w32 ()
2763+{
2764+ $opt_debug
2765+ # unfortunately, winepath doesn't convert paths, only file names
2766+ func_convert_core_path_wine_to_w32_result=""
2767+ if test -n "$1"; then
2768+ oldIFS=$IFS
2769+ IFS=:
2770+ for func_convert_core_path_wine_to_w32_f in $1; do
2771+ IFS=$oldIFS
2772+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
2773+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
2774+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
2775+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
2776+ else
2777+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
2778+ fi
2779+ fi
2780+ done
2781+ IFS=$oldIFS
2782+ fi
2783+}
2784+# end: func_convert_core_path_wine_to_w32
2785+
2786+
2787+# func_cygpath ARGS...
2788+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
2789+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
2790+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
2791+# (2), returns the Cygwin file name or path in func_cygpath_result (input
2792+# file name or path is assumed to be in w32 format, as previously converted
2793+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
2794+# or path in func_cygpath_result (input file name or path is assumed to be in
2795+# Cygwin format). Returns an empty string on error.
2796+#
2797+# ARGS are passed to cygpath, with the last one being the file name or path to
2798+# be converted.
2799+#
2800+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
2801+# environment variable; do not put it in $PATH.
2802+func_cygpath ()
2803+{
2804+ $opt_debug
2805+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
2806+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
2807+ if test "$?" -ne 0; then
2808+ # on failure, ensure result is empty
2809+ func_cygpath_result=
2810+ fi
2811+ else
2812+ func_cygpath_result=
2813+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
2814+ fi
2815+}
2816+#end: func_cygpath
2817+
2818+
2819+# func_convert_core_msys_to_w32 ARG
2820+# Convert file name or path ARG from MSYS format to w32 format. Return
2821+# result in func_convert_core_msys_to_w32_result.
2822+func_convert_core_msys_to_w32 ()
2823+{
2824+ $opt_debug
2825+ # awkward: cmd appends spaces to result
2826+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
2827+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
2828+}
2829+#end: func_convert_core_msys_to_w32
2830+
2831+
2832+# func_convert_file_check ARG1 ARG2
2833+# Verify that ARG1 (a file name in $build format) was converted to $host
2834+# format in ARG2. Otherwise, emit an error message, but continue (resetting
2835+# func_to_host_file_result to ARG1).
2836+func_convert_file_check ()
2837+{
2838+ $opt_debug
2839+ if test -z "$2" && test -n "$1" ; then
2840+ func_error "Could not determine host file name corresponding to"
2841+ func_error " \`$1'"
2842+ func_error "Continuing, but uninstalled executables may not work."
2843+ # Fallback:
2844+ func_to_host_file_result="$1"
2845+ fi
2846+}
2847+# end func_convert_file_check
2848+
2849+
2850+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
2851+# Verify that FROM_PATH (a path in $build format) was converted to $host
2852+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
2853+# func_to_host_file_result to a simplistic fallback value (see below).
2854+func_convert_path_check ()
2855+{
2856+ $opt_debug
2857+ if test -z "$4" && test -n "$3"; then
2858+ func_error "Could not determine the host path corresponding to"
2859+ func_error " \`$3'"
2860+ func_error "Continuing, but uninstalled executables may not work."
2861+ # Fallback. This is a deliberately simplistic "conversion" and
2862+ # should not be "improved". See libtool.info.
2863+ if test "x$1" != "x$2"; then
2864+ lt_replace_pathsep_chars="s|$1|$2|g"
2865+ func_to_host_path_result=`echo "$3" |
2866+ $SED -e "$lt_replace_pathsep_chars"`
2867+ else
2868+ func_to_host_path_result="$3"
2869+ fi
2870+ fi
2871+}
2872+# end func_convert_path_check
2873+
2874+
2875+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
2876+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
2877+# and appending REPL if ORIG matches BACKPAT.
2878+func_convert_path_front_back_pathsep ()
2879+{
2880+ $opt_debug
2881+ case $4 in
2882+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
2883+ ;;
2884+ esac
2885+ case $4 in
2886+ $2 ) func_append func_to_host_path_result "$3"
2887+ ;;
2888+ esac
2889+}
2890+# end func_convert_path_front_back_pathsep
2891+
2892+
2893+##################################################
2894+# $build to $host FILE NAME CONVERSION FUNCTIONS #
2895+##################################################
2896+# invoked via `$to_host_file_cmd ARG'
2897+#
2898+# In each case, ARG is the path to be converted from $build to $host format.
2899+# Result will be available in $func_to_host_file_result.
2900+
2901+
2902+# func_to_host_file ARG
2903+# Converts the file name ARG from $build format to $host format. Return result
2904+# in func_to_host_file_result.
2905+func_to_host_file ()
2906+{
2907+ $opt_debug
2908+ $to_host_file_cmd "$1"
2909+}
2910+# end func_to_host_file
2911+
2912+
2913+# func_to_tool_file ARG LAZY
2914+# converts the file name ARG from $build format to toolchain format. Return
2915+# result in func_to_tool_file_result. If the conversion in use is listed
2916+# in (the comma separated) LAZY, no conversion takes place.
2917+func_to_tool_file ()
2918+{
2919+ $opt_debug
2920+ case ,$2, in
2921+ *,"$to_tool_file_cmd",*)
2922+ func_to_tool_file_result=$1
2923+ ;;
2924+ *)
2925+ $to_tool_file_cmd "$1"
2926+ func_to_tool_file_result=$func_to_host_file_result
2927+ ;;
2928+ esac
2929+}
2930+# end func_to_tool_file
2931+
2932+
2933+# func_convert_file_noop ARG
2934+# Copy ARG to func_to_host_file_result.
2935+func_convert_file_noop ()
2936+{
2937+ func_to_host_file_result="$1"
2938+}
2939+# end func_convert_file_noop
2940+
2941+
2942+# func_convert_file_msys_to_w32 ARG
2943+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
2944+# conversion to w32 is not available inside the cwrapper. Returns result in
2945+# func_to_host_file_result.
2946+func_convert_file_msys_to_w32 ()
2947+{
2948+ $opt_debug
2949+ func_to_host_file_result="$1"
2950+ if test -n "$1"; then
2951+ func_convert_core_msys_to_w32 "$1"
2952+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
2953+ fi
2954+ func_convert_file_check "$1" "$func_to_host_file_result"
2955+}
2956+# end func_convert_file_msys_to_w32
2957+
2958+
2959+# func_convert_file_cygwin_to_w32 ARG
2960+# Convert file name ARG from Cygwin to w32 format. Returns result in
2961+# func_to_host_file_result.
2962+func_convert_file_cygwin_to_w32 ()
2963+{
2964+ $opt_debug
2965+ func_to_host_file_result="$1"
2966+ if test -n "$1"; then
2967+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
2968+ # LT_CYGPATH in this case.
2969+ func_to_host_file_result=`cygpath -m "$1"`
2970+ fi
2971+ func_convert_file_check "$1" "$func_to_host_file_result"
2972+}
2973+# end func_convert_file_cygwin_to_w32
2974+
2975+
2976+# func_convert_file_nix_to_w32 ARG
2977+# Convert file name ARG from *nix to w32 format. Requires a wine environment
2978+# and a working winepath. Returns result in func_to_host_file_result.
2979+func_convert_file_nix_to_w32 ()
2980+{
2981+ $opt_debug
2982+ func_to_host_file_result="$1"
2983+ if test -n "$1"; then
2984+ func_convert_core_file_wine_to_w32 "$1"
2985+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
2986+ fi
2987+ func_convert_file_check "$1" "$func_to_host_file_result"
2988+}
2989+# end func_convert_file_nix_to_w32
2990+
2991+
2992+# func_convert_file_msys_to_cygwin ARG
2993+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
2994+# Returns result in func_to_host_file_result.
2995+func_convert_file_msys_to_cygwin ()
2996+{
2997+ $opt_debug
2998+ func_to_host_file_result="$1"
2999+ if test -n "$1"; then
3000+ func_convert_core_msys_to_w32 "$1"
3001+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
3002+ func_to_host_file_result="$func_cygpath_result"
3003+ fi
3004+ func_convert_file_check "$1" "$func_to_host_file_result"
3005+}
3006+# end func_convert_file_msys_to_cygwin
3007+
3008+
3009+# func_convert_file_nix_to_cygwin ARG
3010+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
3011+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
3012+# in func_to_host_file_result.
3013+func_convert_file_nix_to_cygwin ()
3014+{
3015+ $opt_debug
3016+ func_to_host_file_result="$1"
3017+ if test -n "$1"; then
3018+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
3019+ func_convert_core_file_wine_to_w32 "$1"
3020+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
3021+ func_to_host_file_result="$func_cygpath_result"
3022+ fi
3023+ func_convert_file_check "$1" "$func_to_host_file_result"
3024+}
3025+# end func_convert_file_nix_to_cygwin
3026+
3027+
3028+#############################################
3029+# $build to $host PATH CONVERSION FUNCTIONS #
3030+#############################################
3031+# invoked via `$to_host_path_cmd ARG'
3032+#
3033+# In each case, ARG is the path to be converted from $build to $host format.
3034+# The result will be available in $func_to_host_path_result.
3035+#
3036+# Path separators are also converted from $build format to $host format. If
3037+# ARG begins or ends with a path separator character, it is preserved (but
3038+# converted to $host format) on output.
3039+#
3040+# All path conversion functions are named using the following convention:
3041+# file name conversion function : func_convert_file_X_to_Y ()
3042+# path conversion function : func_convert_path_X_to_Y ()
3043+# where, for any given $build/$host combination the 'X_to_Y' value is the
3044+# same. If conversion functions are added for new $build/$host combinations,
3045+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
3046+# will break.
3047+
3048+
3049+# func_init_to_host_path_cmd
3050+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
3051+# appropriate value, based on the value of $to_host_file_cmd.
3052+to_host_path_cmd=
3053+func_init_to_host_path_cmd ()
3054+{
3055+ $opt_debug
3056+ if test -z "$to_host_path_cmd"; then
3057+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
3058+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
3059+ fi
3060+}
3061+
3062+
3063+# func_to_host_path ARG
3064+# Converts the path ARG from $build format to $host format. Return result
3065+# in func_to_host_path_result.
3066+func_to_host_path ()
3067+{
3068+ $opt_debug
3069+ func_init_to_host_path_cmd
3070+ $to_host_path_cmd "$1"
3071+}
3072+# end func_to_host_path
3073+
3074+
3075+# func_convert_path_noop ARG
3076+# Copy ARG to func_to_host_path_result.
3077+func_convert_path_noop ()
3078+{
3079+ func_to_host_path_result="$1"
3080+}
3081+# end func_convert_path_noop
3082+
3083+
3084+# func_convert_path_msys_to_w32 ARG
3085+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
3086+# conversion to w32 is not available inside the cwrapper. Returns result in
3087+# func_to_host_path_result.
3088+func_convert_path_msys_to_w32 ()
3089+{
3090+ $opt_debug
3091+ func_to_host_path_result="$1"
3092+ if test -n "$1"; then
3093+ # Remove leading and trailing path separator characters from ARG. MSYS
3094+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
3095+ # and winepath ignores them completely.
3096+ func_stripname : : "$1"
3097+ func_to_host_path_tmp1=$func_stripname_result
3098+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3099+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
3100+ func_convert_path_check : ";" \
3101+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3102+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3103+ fi
3104+}
3105+# end func_convert_path_msys_to_w32
3106+
3107+
3108+# func_convert_path_cygwin_to_w32 ARG
3109+# Convert path ARG from Cygwin to w32 format. Returns result in
3110+# func_to_host_file_result.
3111+func_convert_path_cygwin_to_w32 ()
3112+{
3113+ $opt_debug
3114+ func_to_host_path_result="$1"
3115+ if test -n "$1"; then
3116+ # See func_convert_path_msys_to_w32:
3117+ func_stripname : : "$1"
3118+ func_to_host_path_tmp1=$func_stripname_result
3119+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
3120+ func_convert_path_check : ";" \
3121+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3122+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3123+ fi
3124+}
3125+# end func_convert_path_cygwin_to_w32
3126+
3127+
3128+# func_convert_path_nix_to_w32 ARG
3129+# Convert path ARG from *nix to w32 format. Requires a wine environment and
3130+# a working winepath. Returns result in func_to_host_file_result.
3131+func_convert_path_nix_to_w32 ()
3132+{
3133+ $opt_debug
3134+ func_to_host_path_result="$1"
3135+ if test -n "$1"; then
3136+ # See func_convert_path_msys_to_w32:
3137+ func_stripname : : "$1"
3138+ func_to_host_path_tmp1=$func_stripname_result
3139+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3140+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
3141+ func_convert_path_check : ";" \
3142+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3143+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
3144+ fi
3145+}
3146+# end func_convert_path_nix_to_w32
3147+
3148+
3149+# func_convert_path_msys_to_cygwin ARG
3150+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
3151+# Returns result in func_to_host_file_result.
3152+func_convert_path_msys_to_cygwin ()
3153+{
3154+ $opt_debug
3155+ func_to_host_path_result="$1"
3156+ if test -n "$1"; then
3157+ # See func_convert_path_msys_to_w32:
3158+ func_stripname : : "$1"
3159+ func_to_host_path_tmp1=$func_stripname_result
3160+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
3161+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
3162+ func_to_host_path_result="$func_cygpath_result"
3163+ func_convert_path_check : : \
3164+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3165+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3166+ fi
3167+}
3168+# end func_convert_path_msys_to_cygwin
3169+
3170+
3171+# func_convert_path_nix_to_cygwin ARG
3172+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
3173+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
3174+# func_to_host_file_result.
3175+func_convert_path_nix_to_cygwin ()
3176+{
3177+ $opt_debug
3178+ func_to_host_path_result="$1"
3179+ if test -n "$1"; then
3180+ # Remove leading and trailing path separator characters from
3181+ # ARG. msys behavior is inconsistent here, cygpath turns them
3182+ # into '.;' and ';.', and winepath ignores them completely.
3183+ func_stripname : : "$1"
3184+ func_to_host_path_tmp1=$func_stripname_result
3185+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
3186+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
3187+ func_to_host_path_result="$func_cygpath_result"
3188+ func_convert_path_check : : \
3189+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
3190+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
3191+ fi
3192+}
3193+# end func_convert_path_nix_to_cygwin
3194+
3195+
3196 # func_mode_compile arg...
3197 func_mode_compile ()
3198 {
3199@@ -1314,12 +1985,12 @@
3200 ;;
3201
3202 -pie | -fpie | -fPIE)
3203- pie_flag="$pie_flag $arg"
3204+ func_append pie_flag " $arg"
3205 continue
3206 ;;
3207
3208 -shared | -static | -prefer-pic | -prefer-non-pic)
3209- later="$later $arg"
3210+ func_append later " $arg"
3211 continue
3212 ;;
3213
3214@@ -1340,15 +2011,14 @@
3215 save_ifs="$IFS"; IFS=','
3216 for arg in $args; do
3217 IFS="$save_ifs"
3218- func_quote_for_eval "$arg"
3219- lastarg="$lastarg $func_quote_for_eval_result"
3220+ func_append_quoted lastarg "$arg"
3221 done
3222 IFS="$save_ifs"
3223 func_stripname ' ' '' "$lastarg"
3224 lastarg=$func_stripname_result
3225
3226 # Add the arguments to base_compile.
3227- base_compile="$base_compile $lastarg"
3228+ func_append base_compile " $lastarg"
3229 continue
3230 ;;
3231
3232@@ -1364,8 +2034,7 @@
3233 esac # case $arg_mode
3234
3235 # Aesthetically quote the previous argument.
3236- func_quote_for_eval "$lastarg"
3237- base_compile="$base_compile $func_quote_for_eval_result"
3238+ func_append_quoted base_compile "$lastarg"
3239 done # for arg
3240
3241 case $arg_mode in
3242@@ -1496,17 +2165,16 @@
3243 $opt_dry_run || $RM $removelist
3244 exit $EXIT_FAILURE
3245 fi
3246- removelist="$removelist $output_obj"
3247+ func_append removelist " $output_obj"
3248 $ECHO "$srcfile" > "$lockfile"
3249 fi
3250
3251 $opt_dry_run || $RM $removelist
3252- removelist="$removelist $lockfile"
3253+ func_append removelist " $lockfile"
3254 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
3255
3256- if test -n "$fix_srcfile_path"; then
3257- eval "srcfile=\"$fix_srcfile_path\""
3258- fi
3259+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
3260+ srcfile=$func_to_tool_file_result
3261 func_quote_for_eval "$srcfile"
3262 qsrcfile=$func_quote_for_eval_result
3263
3264@@ -1526,7 +2194,7 @@
3265
3266 if test -z "$output_obj"; then
3267 # Place PIC objects in $objdir
3268- command="$command -o $lobj"
3269+ func_append command " -o $lobj"
3270 fi
3271
3272 func_show_eval_locale "$command" \
3273@@ -1573,11 +2241,11 @@
3274 command="$base_compile $qsrcfile $pic_flag"
3275 fi
3276 if test "$compiler_c_o" = yes; then
3277- command="$command -o $obj"
3278+ func_append command " -o $obj"
3279 fi
3280
3281 # Suppress compiler output if we already did a PIC compilation.
3282- command="$command$suppress_output"
3283+ func_append command "$suppress_output"
3284 func_show_eval_locale "$command" \
3285 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
3286
3287@@ -1622,13 +2290,13 @@
3288 }
3289
3290 $opt_help || {
3291- test "$mode" = compile && func_mode_compile ${1+"$@"}
3292+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
3293 }
3294
3295 func_mode_help ()
3296 {
3297 # We need to display help for each of the modes.
3298- case $mode in
3299+ case $opt_mode in
3300 "")
3301 # Generic help is extracted from the usage comments
3302 # at the start of this file.
3303@@ -1659,8 +2327,8 @@
3304
3305 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
3306 -no-suppress do not suppress compiler output for multiple passes
3307- -prefer-pic try to building PIC objects only
3308- -prefer-non-pic try to building non-PIC objects only
3309+ -prefer-pic try to build PIC objects only
3310+ -prefer-non-pic try to build non-PIC objects only
3311 -shared do not build a \`.o' file suitable for static linking
3312 -static only build a \`.o' file suitable for static linking
3313 -Wc,FLAG pass FLAG directly to the compiler
3314@@ -1804,7 +2472,7 @@
3315 ;;
3316
3317 *)
3318- func_fatal_help "invalid operation mode \`$mode'"
3319+ func_fatal_help "invalid operation mode \`$opt_mode'"
3320 ;;
3321 esac
3322
3323@@ -1819,13 +2487,13 @@
3324 else
3325 {
3326 func_help noexit
3327- for mode in compile link execute install finish uninstall clean; do
3328+ for opt_mode in compile link execute install finish uninstall clean; do
3329 func_mode_help
3330 done
3331 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
3332 {
3333 func_help noexit
3334- for mode in compile link execute install finish uninstall clean; do
3335+ for opt_mode in compile link execute install finish uninstall clean; do
3336 echo
3337 func_mode_help
3338 done
3339@@ -1854,13 +2522,16 @@
3340 func_fatal_help "you must specify a COMMAND"
3341
3342 # Handle -dlopen flags immediately.
3343- for file in $execute_dlfiles; do
3344+ for file in $opt_dlopen; do
3345 test -f "$file" \
3346 || func_fatal_help "\`$file' is not a file"
3347
3348 dir=
3349 case $file in
3350 *.la)
3351+ func_resolve_sysroot "$file"
3352+ file=$func_resolve_sysroot_result
3353+
3354 # Check to see that this really is a libtool archive.
3355 func_lalib_unsafe_p "$file" \
3356 || func_fatal_help "\`$lib' is not a valid libtool archive"
3357@@ -1882,7 +2553,7 @@
3358 dir="$func_dirname_result"
3359
3360 if test -f "$dir/$objdir/$dlname"; then
3361- dir="$dir/$objdir"
3362+ func_append dir "/$objdir"
3363 else
3364 if test ! -f "$dir/$dlname"; then
3365 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
3366@@ -1907,10 +2578,10 @@
3367 test -n "$absdir" && dir="$absdir"
3368
3369 # Now add the directory to shlibpath_var.
3370- if eval test -z \"\$$shlibpath_var\"; then
3371- eval $shlibpath_var=\$dir
3372+ if eval "test -z \"\$$shlibpath_var\""; then
3373+ eval "$shlibpath_var=\"\$dir\""
3374 else
3375- eval $shlibpath_var=\$dir:\$$shlibpath_var
3376+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
3377 fi
3378 done
3379
3380@@ -1939,8 +2610,7 @@
3381 ;;
3382 esac
3383 # Quote arguments (to preserve shell metacharacters).
3384- func_quote_for_eval "$file"
3385- args="$args $func_quote_for_eval_result"
3386+ func_append_quoted args "$file"
3387 done
3388
3389 if test "X$opt_dry_run" = Xfalse; then
3390@@ -1972,22 +2642,59 @@
3391 fi
3392 }
3393
3394-test "$mode" = execute && func_mode_execute ${1+"$@"}
3395+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
3396
3397
3398 # func_mode_finish arg...
3399 func_mode_finish ()
3400 {
3401 $opt_debug
3402- libdirs="$nonopt"
3403+ libs=
3404+ libdirs=
3405 admincmds=
3406
3407- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3408- for dir
3409- do
3410- libdirs="$libdirs $dir"
3411- done
3412+ for opt in "$nonopt" ${1+"$@"}
3413+ do
3414+ if test -d "$opt"; then
3415+ func_append libdirs " $opt"
3416+
3417+ elif test -f "$opt"; then
3418+ if func_lalib_unsafe_p "$opt"; then
3419+ func_append libs " $opt"
3420+ else
3421+ func_warning "\`$opt' is not a valid libtool archive"
3422+ fi
3423+
3424+ else
3425+ func_fatal_error "invalid argument \`$opt'"
3426+ fi
3427+ done
3428+
3429+ if test -n "$libs"; then
3430+ if test -n "$lt_sysroot"; then
3431+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
3432+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
3433+ else
3434+ sysroot_cmd=
3435+ fi
3436+
3437+ # Remove sysroot references
3438+ if $opt_dry_run; then
3439+ for lib in $libs; do
3440+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
3441+ done
3442+ else
3443+ tmpdir=`func_mktempdir`
3444+ for lib in $libs; do
3445+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
3446+ > $tmpdir/tmp-la
3447+ mv -f $tmpdir/tmp-la $lib
3448+ done
3449+ ${RM}r "$tmpdir"
3450+ fi
3451+ fi
3452
3453+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3454 for libdir in $libdirs; do
3455 if test -n "$finish_cmds"; then
3456 # Do each command in the finish commands.
3457@@ -1997,7 +2704,7 @@
3458 if test -n "$finish_eval"; then
3459 # Do the single finish_eval.
3460 eval cmds=\"$finish_eval\"
3461- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
3462+ $opt_dry_run || eval "$cmds" || func_append admincmds "
3463 $cmds"
3464 fi
3465 done
3466@@ -2006,53 +2713,55 @@
3467 # Exit here if they wanted silent mode.
3468 $opt_silent && exit $EXIT_SUCCESS
3469
3470- echo "----------------------------------------------------------------------"
3471- echo "Libraries have been installed in:"
3472- for libdir in $libdirs; do
3473- $ECHO " $libdir"
3474- done
3475- echo
3476- echo "If you ever happen to want to link against installed libraries"
3477- echo "in a given directory, LIBDIR, you must either use libtool, and"
3478- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3479- echo "flag during linking and do at least one of the following:"
3480- if test -n "$shlibpath_var"; then
3481- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3482- echo " during execution"
3483- fi
3484- if test -n "$runpath_var"; then
3485- echo " - add LIBDIR to the \`$runpath_var' environment variable"
3486- echo " during linking"
3487- fi
3488- if test -n "$hardcode_libdir_flag_spec"; then
3489- libdir=LIBDIR
3490- eval "flag=\"$hardcode_libdir_flag_spec\""
3491+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
3492+ echo "----------------------------------------------------------------------"
3493+ echo "Libraries have been installed in:"
3494+ for libdir in $libdirs; do
3495+ $ECHO " $libdir"
3496+ done
3497+ echo
3498+ echo "If you ever happen to want to link against installed libraries"
3499+ echo "in a given directory, LIBDIR, you must either use libtool, and"
3500+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
3501+ echo "flag during linking and do at least one of the following:"
3502+ if test -n "$shlibpath_var"; then
3503+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
3504+ echo " during execution"
3505+ fi
3506+ if test -n "$runpath_var"; then
3507+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
3508+ echo " during linking"
3509+ fi
3510+ if test -n "$hardcode_libdir_flag_spec"; then
3511+ libdir=LIBDIR
3512+ eval flag=\"$hardcode_libdir_flag_spec\"
3513
3514- $ECHO " - use the \`$flag' linker flag"
3515- fi
3516- if test -n "$admincmds"; then
3517- $ECHO " - have your system administrator run these commands:$admincmds"
3518- fi
3519- if test -f /etc/ld.so.conf; then
3520- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3521- fi
3522- echo
3523+ $ECHO " - use the \`$flag' linker flag"
3524+ fi
3525+ if test -n "$admincmds"; then
3526+ $ECHO " - have your system administrator run these commands:$admincmds"
3527+ fi
3528+ if test -f /etc/ld.so.conf; then
3529+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
3530+ fi
3531+ echo
3532
3533- echo "See any operating system documentation about shared libraries for"
3534- case $host in
3535- solaris2.[6789]|solaris2.1[0-9])
3536- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3537- echo "pages."
3538- ;;
3539- *)
3540- echo "more information, such as the ld(1) and ld.so(8) manual pages."
3541- ;;
3542- esac
3543- echo "----------------------------------------------------------------------"
3544+ echo "See any operating system documentation about shared libraries for"
3545+ case $host in
3546+ solaris2.[6789]|solaris2.1[0-9])
3547+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
3548+ echo "pages."
3549+ ;;
3550+ *)
3551+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
3552+ ;;
3553+ esac
3554+ echo "----------------------------------------------------------------------"
3555+ fi
3556 exit $EXIT_SUCCESS
3557 }
3558
3559-test "$mode" = finish && func_mode_finish ${1+"$@"}
3560+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
3561
3562
3563 # func_mode_install arg...
3564@@ -2077,7 +2786,7 @@
3565 # The real first argument should be the name of the installation program.
3566 # Aesthetically quote it.
3567 func_quote_for_eval "$arg"
3568- install_prog="$install_prog$func_quote_for_eval_result"
3569+ func_append install_prog "$func_quote_for_eval_result"
3570 install_shared_prog=$install_prog
3571 case " $install_prog " in
3572 *[\\\ /]cp\ *) install_cp=: ;;
3573@@ -2097,7 +2806,7 @@
3574 do
3575 arg2=
3576 if test -n "$dest"; then
3577- files="$files $dest"
3578+ func_append files " $dest"
3579 dest=$arg
3580 continue
3581 fi
3582@@ -2135,11 +2844,11 @@
3583
3584 # Aesthetically quote the argument.
3585 func_quote_for_eval "$arg"
3586- install_prog="$install_prog $func_quote_for_eval_result"
3587+ func_append install_prog " $func_quote_for_eval_result"
3588 if test -n "$arg2"; then
3589 func_quote_for_eval "$arg2"
3590 fi
3591- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
3592+ func_append install_shared_prog " $func_quote_for_eval_result"
3593 done
3594
3595 test -z "$install_prog" && \
3596@@ -2151,7 +2860,7 @@
3597 if test -n "$install_override_mode" && $no_mode; then
3598 if $install_cp; then :; else
3599 func_quote_for_eval "$install_override_mode"
3600- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
3601+ func_append install_shared_prog " -m $func_quote_for_eval_result"
3602 fi
3603 fi
3604
3605@@ -2209,10 +2918,13 @@
3606 case $file in
3607 *.$libext)
3608 # Do the static libraries later.
3609- staticlibs="$staticlibs $file"
3610+ func_append staticlibs " $file"
3611 ;;
3612
3613 *.la)
3614+ func_resolve_sysroot "$file"
3615+ file=$func_resolve_sysroot_result
3616+
3617 # Check to see that this really is a libtool archive.
3618 func_lalib_unsafe_p "$file" \
3619 || func_fatal_help "\`$file' is not a valid libtool archive"
3620@@ -2226,23 +2938,30 @@
3621 if test "X$destdir" = "X$libdir"; then
3622 case "$current_libdirs " in
3623 *" $libdir "*) ;;
3624- *) current_libdirs="$current_libdirs $libdir" ;;
3625+ *) func_append current_libdirs " $libdir" ;;
3626 esac
3627 else
3628 # Note the libdir as a future libdir.
3629 case "$future_libdirs " in
3630 *" $libdir "*) ;;
3631- *) future_libdirs="$future_libdirs $libdir" ;;
3632+ *) func_append future_libdirs " $libdir" ;;
3633 esac
3634 fi
3635
3636 func_dirname "$file" "/" ""
3637 dir="$func_dirname_result"
3638- dir="$dir$objdir"
3639+ func_append dir "$objdir"
3640
3641 if test -n "$relink_command"; then
3642+ # Strip any trailing slash from the destination.
3643+ func_stripname '' '/' "$libdir"
3644+ destlibdir=$func_stripname_result
3645+
3646+ func_stripname '' '/' "$destdir"
3647+ s_destdir=$func_stripname_result
3648+
3649 # Determine the prefix the user has applied to our future dir.
3650- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
3651+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
3652
3653 # Don't allow the user to place us outside of our expected
3654 # location b/c this prevents finding dependent libraries that
3655@@ -2315,7 +3034,7 @@
3656 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
3657
3658 # Maybe install the static library, too.
3659- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
3660+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
3661 ;;
3662
3663 *.lo)
3664@@ -2503,7 +3222,7 @@
3665 test -n "$future_libdirs" && \
3666 func_warning "remember to run \`$progname --finish$future_libdirs'"
3667
3668- if test -n "$current_libdirs" && $opt_finish; then
3669+ if test -n "$current_libdirs"; then
3670 # Maybe just do a dry run.
3671 $opt_dry_run && current_libdirs=" -n$current_libdirs"
3672 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
3673@@ -2512,7 +3231,7 @@
3674 fi
3675 }
3676
3677-test "$mode" = install && func_mode_install ${1+"$@"}
3678+test "$opt_mode" = install && func_mode_install ${1+"$@"}
3679
3680
3681 # func_generate_dlsyms outputname originator pic_p
3682@@ -2559,6 +3278,18 @@
3683 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
3684 #endif
3685
3686+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
3687+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
3688+/* DATA imports from DLLs on WIN32 con't be const, because runtime
3689+ relocations are performed -- see ld's documentation on pseudo-relocs. */
3690+# define LT_DLSYM_CONST
3691+#elif defined(__osf__)
3692+/* This system does not cope well with relocations in const data. */
3693+# define LT_DLSYM_CONST
3694+#else
3695+# define LT_DLSYM_CONST const
3696+#endif
3697+
3698 /* External symbol declarations for the compiler. */\
3699 "
3700
3701@@ -2570,21 +3301,22 @@
3702 # Add our own program objects to the symbol list.
3703 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
3704 for progfile in $progfiles; do
3705- func_verbose "extracting global C symbols from \`$progfile'"
3706- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
3707+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
3708+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
3709+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
3710 done
3711
3712 if test -n "$exclude_expsyms"; then
3713 $opt_dry_run || {
3714- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
3715- $MV "$nlist"T "$nlist"
3716+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
3717+ eval '$MV "$nlist"T "$nlist"'
3718 }
3719 fi
3720
3721 if test -n "$export_symbols_regex"; then
3722 $opt_dry_run || {
3723- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
3724- $MV "$nlist"T "$nlist"
3725+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
3726+ eval '$MV "$nlist"T "$nlist"'
3727 }
3728 fi
3729
3730@@ -2593,23 +3325,23 @@
3731 export_symbols="$output_objdir/$outputname.exp"
3732 $opt_dry_run || {
3733 $RM $export_symbols
3734- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
3735+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
3736 case $host in
3737 *cygwin* | *mingw* | *cegcc* )
3738- echo EXPORTS > "$output_objdir/$outputname.def"
3739- cat "$export_symbols" >> "$output_objdir/$outputname.def"
3740+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3741+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
3742 ;;
3743 esac
3744 }
3745 else
3746 $opt_dry_run || {
3747- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
3748- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
3749- $MV "$nlist"T "$nlist"
3750+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
3751+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
3752+ eval '$MV "$nlist"T "$nlist"'
3753 case $host in
3754 *cygwin* | *mingw* | *cegcc* )
3755- echo EXPORTS > "$output_objdir/$outputname.def"
3756- cat "$nlist" >> "$output_objdir/$outputname.def"
3757+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
3758+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
3759 ;;
3760 esac
3761 }
3762@@ -2620,10 +3352,52 @@
3763 func_verbose "extracting global C symbols from \`$dlprefile'"
3764 func_basename "$dlprefile"
3765 name="$func_basename_result"
3766- $opt_dry_run || {
3767- $ECHO ": $name " >> "$nlist"
3768- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3769- }
3770+ case $host in
3771+ *cygwin* | *mingw* | *cegcc* )
3772+ # if an import library, we need to obtain dlname
3773+ if func_win32_import_lib_p "$dlprefile"; then
3774+ func_tr_sh "$dlprefile"
3775+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
3776+ dlprefile_dlbasename=""
3777+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
3778+ # Use subshell, to avoid clobbering current variable values
3779+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
3780+ if test -n "$dlprefile_dlname" ; then
3781+ func_basename "$dlprefile_dlname"
3782+ dlprefile_dlbasename="$func_basename_result"
3783+ else
3784+ # no lafile. user explicitly requested -dlpreopen <import library>.
3785+ $sharedlib_from_linklib_cmd "$dlprefile"
3786+ dlprefile_dlbasename=$sharedlib_from_linklib_result
3787+ fi
3788+ fi
3789+ $opt_dry_run || {
3790+ if test -n "$dlprefile_dlbasename" ; then
3791+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
3792+ else
3793+ func_warning "Could not compute DLL name from $name"
3794+ eval '$ECHO ": $name " >> "$nlist"'
3795+ fi
3796+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3797+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
3798+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
3799+ }
3800+ else # not an import lib
3801+ $opt_dry_run || {
3802+ eval '$ECHO ": $name " >> "$nlist"'
3803+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3804+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3805+ }
3806+ fi
3807+ ;;
3808+ *)
3809+ $opt_dry_run || {
3810+ eval '$ECHO ": $name " >> "$nlist"'
3811+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3812+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3813+ }
3814+ ;;
3815+ esac
3816 done
3817
3818 $opt_dry_run || {
3819@@ -2661,26 +3435,9 @@
3820 const char *name;
3821 void *address;
3822 } lt_dlsymlist;
3823-"
3824- case $host in
3825- *cygwin* | *mingw* | *cegcc* )
3826- echo >> "$output_objdir/$my_dlsyms" "\
3827-/* DATA imports from DLLs on WIN32 con't be const, because
3828- runtime relocations are performed -- see ld's documentation
3829- on pseudo-relocs. */"
3830- lt_dlsym_const= ;;
3831- *osf5*)
3832- echo >> "$output_objdir/$my_dlsyms" "\
3833-/* This system does not cope well with relocations in const data */"
3834- lt_dlsym_const= ;;
3835- *)
3836- lt_dlsym_const=const ;;
3837- esac
3838-
3839- echo >> "$output_objdir/$my_dlsyms" "\
3840-extern $lt_dlsym_const lt_dlsymlist
3841+extern LT_DLSYM_CONST lt_dlsymlist
3842 lt_${my_prefix}_LTX_preloaded_symbols[];
3843-$lt_dlsym_const lt_dlsymlist
3844+LT_DLSYM_CONST lt_dlsymlist
3845 lt_${my_prefix}_LTX_preloaded_symbols[] =
3846 {\
3847 { \"$my_originator\", (void *) 0 },"
3848@@ -2736,7 +3493,7 @@
3849 for arg in $LTCFLAGS; do
3850 case $arg in
3851 -pie | -fpie | -fPIE) ;;
3852- *) symtab_cflags="$symtab_cflags $arg" ;;
3853+ *) func_append symtab_cflags " $arg" ;;
3854 esac
3855 done
3856
3857@@ -2796,9 +3553,11 @@
3858 win32_libid_type="x86 archive import"
3859 ;;
3860 *ar\ archive*) # could be an import, or static
3861- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
3862- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3863- win32_nmres=`$NM -f posix -A "$1" |
3864+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
3865+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
3866+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3867+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3868+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
3869 $SED -n -e '
3870 1,100{
3871 / I /{
3872@@ -2827,6 +3586,131 @@
3873 $ECHO "$win32_libid_type"
3874 }
3875
3876+# func_cygming_dll_for_implib ARG
3877+#
3878+# Platform-specific function to extract the
3879+# name of the DLL associated with the specified
3880+# import library ARG.
3881+# Invoked by eval'ing the libtool variable
3882+# $sharedlib_from_linklib_cmd
3883+# Result is available in the variable
3884+# $sharedlib_from_linklib_result
3885+func_cygming_dll_for_implib ()
3886+{
3887+ $opt_debug
3888+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
3889+}
3890+
3891+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
3892+#
3893+# The is the core of a fallback implementation of a
3894+# platform-specific function to extract the name of the
3895+# DLL associated with the specified import library LIBNAME.
3896+#
3897+# SECTION_NAME is either .idata$6 or .idata$7, depending
3898+# on the platform and compiler that created the implib.
3899+#
3900+# Echos the name of the DLL associated with the
3901+# specified import library.
3902+func_cygming_dll_for_implib_fallback_core ()
3903+{
3904+ $opt_debug
3905+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
3906+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
3907+ $SED '/^Contents of section '"$match_literal"':/{
3908+ # Place marker at beginning of archive member dllname section
3909+ s/.*/====MARK====/
3910+ p
3911+ d
3912+ }
3913+ # These lines can sometimes be longer than 43 characters, but
3914+ # are always uninteresting
3915+ /:[ ]*file format pe[i]\{,1\}-/d
3916+ /^In archive [^:]*:/d
3917+ # Ensure marker is printed
3918+ /^====MARK====/p
3919+ # Remove all lines with less than 43 characters
3920+ /^.\{43\}/!d
3921+ # From remaining lines, remove first 43 characters
3922+ s/^.\{43\}//' |
3923+ $SED -n '
3924+ # Join marker and all lines until next marker into a single line
3925+ /^====MARK====/ b para
3926+ H
3927+ $ b para
3928+ b
3929+ :para
3930+ x
3931+ s/\n//g
3932+ # Remove the marker
3933+ s/^====MARK====//
3934+ # Remove trailing dots and whitespace
3935+ s/[\. \t]*$//
3936+ # Print
3937+ /./p' |
3938+ # we now have a list, one entry per line, of the stringified
3939+ # contents of the appropriate section of all members of the
3940+ # archive which possess that section. Heuristic: eliminate
3941+ # all those which have a first or second character that is
3942+ # a '.' (that is, objdump's representation of an unprintable
3943+ # character.) This should work for all archives with less than
3944+ # 0x302f exports -- but will fail for DLLs whose name actually
3945+ # begins with a literal '.' or a single character followed by
3946+ # a '.'.
3947+ #
3948+ # Of those that remain, print the first one.
3949+ $SED -e '/^\./d;/^.\./d;q'
3950+}
3951+
3952+# func_cygming_gnu_implib_p ARG
3953+# This predicate returns with zero status (TRUE) if
3954+# ARG is a GNU/binutils-style import library. Returns
3955+# with nonzero status (FALSE) otherwise.
3956+func_cygming_gnu_implib_p ()
3957+{
3958+ $opt_debug
3959+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3960+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
3961+ test -n "$func_cygming_gnu_implib_tmp"
3962+}
3963+
3964+# func_cygming_ms_implib_p ARG
3965+# This predicate returns with zero status (TRUE) if
3966+# ARG is an MS-style import library. Returns
3967+# with nonzero status (FALSE) otherwise.
3968+func_cygming_ms_implib_p ()
3969+{
3970+ $opt_debug
3971+ func_to_tool_file "$1" func_convert_file_msys_to_w32
3972+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
3973+ test -n "$func_cygming_ms_implib_tmp"
3974+}
3975+
3976+# func_cygming_dll_for_implib_fallback ARG
3977+# Platform-specific function to extract the
3978+# name of the DLL associated with the specified
3979+# import library ARG.
3980+#
3981+# This fallback implementation is for use when $DLLTOOL
3982+# does not support the --identify-strict option.
3983+# Invoked by eval'ing the libtool variable
3984+# $sharedlib_from_linklib_cmd
3985+# Result is available in the variable
3986+# $sharedlib_from_linklib_result
3987+func_cygming_dll_for_implib_fallback ()
3988+{
3989+ $opt_debug
3990+ if func_cygming_gnu_implib_p "$1" ; then
3991+ # binutils import library
3992+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
3993+ elif func_cygming_ms_implib_p "$1" ; then
3994+ # ms-generated import library
3995+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
3996+ else
3997+ # unknown
3998+ sharedlib_from_linklib_result=""
3999+ fi
4000+}
4001
4002
4003 # func_extract_an_archive dir oldlib
4004@@ -2917,7 +3801,7 @@
4005 darwin_file=
4006 darwin_files=
4007 for darwin_file in $darwin_filelist; do
4008- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
4009+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
4010 $LIPO -create -output "$darwin_file" $darwin_files
4011 done # $darwin_filelist
4012 $RM -rf unfat-$$
4013@@ -2932,7 +3816,7 @@
4014 func_extract_an_archive "$my_xdir" "$my_xabs"
4015 ;;
4016 esac
4017- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
4018+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
4019 done
4020
4021 func_extract_archives_result="$my_oldobjs"
4022@@ -3014,7 +3898,110 @@
4023 _LTECHO_EOF'
4024 }
4025 ECHO=\"$qECHO\"
4026- fi\
4027+ fi
4028+
4029+# Very basic option parsing. These options are (a) specific to
4030+# the libtool wrapper, (b) are identical between the wrapper
4031+# /script/ and the wrapper /executable/ which is used only on
4032+# windows platforms, and (c) all begin with the string "--lt-"
4033+# (application programs are unlikely to have options which match
4034+# this pattern).
4035+#
4036+# There are only two supported options: --lt-debug and
4037+# --lt-dump-script. There is, deliberately, no --lt-help.
4038+#
4039+# The first argument to this parsing function should be the
4040+# script's $0 value, followed by "$@".
4041+lt_option_debug=
4042+func_parse_lt_options ()
4043+{
4044+ lt_script_arg0=\$0
4045+ shift
4046+ for lt_opt
4047+ do
4048+ case \"\$lt_opt\" in
4049+ --lt-debug) lt_option_debug=1 ;;
4050+ --lt-dump-script)
4051+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
4052+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
4053+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
4054+ cat \"\$lt_dump_D/\$lt_dump_F\"
4055+ exit 0
4056+ ;;
4057+ --lt-*)
4058+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
4059+ exit 1
4060+ ;;
4061+ esac
4062+ done
4063+
4064+ # Print the debug banner immediately:
4065+ if test -n \"\$lt_option_debug\"; then
4066+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
4067+ fi
4068+}
4069+
4070+# Used when --lt-debug. Prints its arguments to stdout
4071+# (redirection is the responsibility of the caller)
4072+func_lt_dump_args ()
4073+{
4074+ lt_dump_args_N=1;
4075+ for lt_arg
4076+ do
4077+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
4078+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
4079+ done
4080+}
4081+
4082+# Core function for launching the target application
4083+func_exec_program_core ()
4084+{
4085+"
4086+ case $host in
4087+ # Backslashes separate directories on plain windows
4088+ *-*-mingw | *-*-os2* | *-cegcc*)
4089+ $ECHO "\
4090+ if test -n \"\$lt_option_debug\"; then
4091+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
4092+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4093+ fi
4094+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4095+"
4096+ ;;
4097+
4098+ *)
4099+ $ECHO "\
4100+ if test -n \"\$lt_option_debug\"; then
4101+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
4102+ func_lt_dump_args \${1+\"\$@\"} 1>&2
4103+ fi
4104+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
4105+"
4106+ ;;
4107+ esac
4108+ $ECHO "\
4109+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4110+ exit 1
4111+}
4112+
4113+# A function to encapsulate launching the target application
4114+# Strips options in the --lt-* namespace from \$@ and
4115+# launches target application with the remaining arguments.
4116+func_exec_program ()
4117+{
4118+ for lt_wr_arg
4119+ do
4120+ case \$lt_wr_arg in
4121+ --lt-*) ;;
4122+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
4123+ esac
4124+ shift
4125+ done
4126+ func_exec_program_core \${1+\"\$@\"}
4127+}
4128+
4129+ # Parse options
4130+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
4131
4132 # Find the directory that this script lives in.
4133 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
4134@@ -3078,7 +4065,7 @@
4135
4136 # relink executable if necessary
4137 if test -n \"\$relink_command\"; then
4138- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
4139+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
4140 else
4141 $ECHO \"\$relink_command_output\" >&2
4142 $RM \"\$progdir/\$file\"
4143@@ -3102,6 +4089,18 @@
4144
4145 if test -f \"\$progdir/\$program\"; then"
4146
4147+ # fixup the dll searchpath if we need to.
4148+ #
4149+ # Fix the DLL searchpath if we need to. Do this before prepending
4150+ # to shlibpath, because on Windows, both are PATH and uninstalled
4151+ # libraries must come first.
4152+ if test -n "$dllsearchpath"; then
4153+ $ECHO "\
4154+ # Add the dll search path components to the executable PATH
4155+ PATH=$dllsearchpath:\$PATH
4156+"
4157+ fi
4158+
4159 # Export our shlibpath_var if we have one.
4160 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4161 $ECHO "\
4162@@ -3116,35 +4115,10 @@
4163 "
4164 fi
4165
4166- # fixup the dll searchpath if we need to.
4167- if test -n "$dllsearchpath"; then
4168- $ECHO "\
4169- # Add the dll search path components to the executable PATH
4170- PATH=$dllsearchpath:\$PATH
4171-"
4172- fi
4173-
4174 $ECHO "\
4175 if test \"\$libtool_execute_magic\" != \"$magic\"; then
4176 # Run the actual program with our arguments.
4177-"
4178- case $host in
4179- # Backslashes separate directories on plain windows
4180- *-*-mingw | *-*-os2* | *-cegcc*)
4181- $ECHO "\
4182- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
4183-"
4184- ;;
4185-
4186- *)
4187- $ECHO "\
4188- exec \"\$progdir/\$program\" \${1+\"\$@\"}
4189-"
4190- ;;
4191- esac
4192- $ECHO "\
4193- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
4194- exit 1
4195+ func_exec_program \${1+\"\$@\"}
4196 fi
4197 else
4198 # The program doesn't exist.
4199@@ -3158,166 +4132,6 @@
4200 }
4201
4202
4203-# func_to_host_path arg
4204-#
4205-# Convert paths to host format when used with build tools.
4206-# Intended for use with "native" mingw (where libtool itself
4207-# is running under the msys shell), or in the following cross-
4208-# build environments:
4209-# $build $host
4210-# mingw (msys) mingw [e.g. native]
4211-# cygwin mingw
4212-# *nix + wine mingw
4213-# where wine is equipped with the `winepath' executable.
4214-# In the native mingw case, the (msys) shell automatically
4215-# converts paths for any non-msys applications it launches,
4216-# but that facility isn't available from inside the cwrapper.
4217-# Similar accommodations are necessary for $host mingw and
4218-# $build cygwin. Calling this function does no harm for other
4219-# $host/$build combinations not listed above.
4220-#
4221-# ARG is the path (on $build) that should be converted to
4222-# the proper representation for $host. The result is stored
4223-# in $func_to_host_path_result.
4224-func_to_host_path ()
4225-{
4226- func_to_host_path_result="$1"
4227- if test -n "$1"; then
4228- case $host in
4229- *mingw* )
4230- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4231- case $build in
4232- *mingw* ) # actually, msys
4233- # awkward: cmd appends spaces to result
4234- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
4235- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4236- ;;
4237- *cygwin* )
4238- func_to_host_path_result=`cygpath -w "$1" |
4239- $SED -e "$lt_sed_naive_backslashify"`
4240- ;;
4241- * )
4242- # Unfortunately, winepath does not exit with a non-zero
4243- # error code, so we are forced to check the contents of
4244- # stdout. On the other hand, if the command is not
4245- # found, the shell will set an exit code of 127 and print
4246- # *an error message* to stdout. So we must check for both
4247- # error code of zero AND non-empty stdout, which explains
4248- # the odd construction:
4249- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
4250- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
4251- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
4252- $SED -e "$lt_sed_naive_backslashify"`
4253- else
4254- # Allow warning below.
4255- func_to_host_path_result=
4256- fi
4257- ;;
4258- esac
4259- if test -z "$func_to_host_path_result" ; then
4260- func_error "Could not determine host path corresponding to"
4261- func_error " \`$1'"
4262- func_error "Continuing, but uninstalled executables may not work."
4263- # Fallback:
4264- func_to_host_path_result="$1"
4265- fi
4266- ;;
4267- esac
4268- fi
4269-}
4270-# end: func_to_host_path
4271-
4272-# func_to_host_pathlist arg
4273-#
4274-# Convert pathlists to host format when used with build tools.
4275-# See func_to_host_path(), above. This function supports the
4276-# following $build/$host combinations (but does no harm for
4277-# combinations not listed here):
4278-# $build $host
4279-# mingw (msys) mingw [e.g. native]
4280-# cygwin mingw
4281-# *nix + wine mingw
4282-#
4283-# Path separators are also converted from $build format to
4284-# $host format. If ARG begins or ends with a path separator
4285-# character, it is preserved (but converted to $host format)
4286-# on output.
4287-#
4288-# ARG is a pathlist (on $build) that should be converted to
4289-# the proper representation on $host. The result is stored
4290-# in $func_to_host_pathlist_result.
4291-func_to_host_pathlist ()
4292-{
4293- func_to_host_pathlist_result="$1"
4294- if test -n "$1"; then
4295- case $host in
4296- *mingw* )
4297- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
4298- # Remove leading and trailing path separator characters from
4299- # ARG. msys behavior is inconsistent here, cygpath turns them
4300- # into '.;' and ';.', and winepath ignores them completely.
4301- func_stripname : : "$1"
4302- func_to_host_pathlist_tmp1=$func_stripname_result
4303- case $build in
4304- *mingw* ) # Actually, msys.
4305- # Awkward: cmd appends spaces to result.
4306- func_to_host_pathlist_result=`
4307- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
4308- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
4309- ;;
4310- *cygwin* )
4311- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
4312- $SED -e "$lt_sed_naive_backslashify"`
4313- ;;
4314- * )
4315- # unfortunately, winepath doesn't convert pathlists
4316- func_to_host_pathlist_result=""
4317- func_to_host_pathlist_oldIFS=$IFS
4318- IFS=:
4319- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
4320- IFS=$func_to_host_pathlist_oldIFS
4321- if test -n "$func_to_host_pathlist_f" ; then
4322- func_to_host_path "$func_to_host_pathlist_f"
4323- if test -n "$func_to_host_path_result" ; then
4324- if test -z "$func_to_host_pathlist_result" ; then
4325- func_to_host_pathlist_result="$func_to_host_path_result"
4326- else
4327- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
4328- fi
4329- fi
4330- fi
4331- done
4332- IFS=$func_to_host_pathlist_oldIFS
4333- ;;
4334- esac
4335- if test -z "$func_to_host_pathlist_result"; then
4336- func_error "Could not determine the host path(s) corresponding to"
4337- func_error " \`$1'"
4338- func_error "Continuing, but uninstalled executables may not work."
4339- # Fallback. This may break if $1 contains DOS-style drive
4340- # specifications. The fix is not to complicate the expression
4341- # below, but for the user to provide a working wine installation
4342- # with winepath so that path translation in the cross-to-mingw
4343- # case works properly.
4344- lt_replace_pathsep_nix_to_dos="s|:|;|g"
4345- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
4346- $SED -e "$lt_replace_pathsep_nix_to_dos"`
4347- fi
4348- # Now, add the leading and trailing path separators back
4349- case "$1" in
4350- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
4351- ;;
4352- esac
4353- case "$1" in
4354- *: ) func_append func_to_host_pathlist_result ";"
4355- ;;
4356- esac
4357- ;;
4358- esac
4359- fi
4360-}
4361-# end: func_to_host_pathlist
4362-
4363 # func_emit_cwrapperexe_src
4364 # emit the source code for a wrapper executable on stdout
4365 # Must ONLY be called from within func_mode_link because
4366@@ -3334,10 +4148,6 @@
4367
4368 This wrapper executable should never be moved out of the build directory.
4369 If it is, it will not operate correctly.
4370-
4371- Currently, it simply execs the wrapper *script* "$SHELL $output",
4372- but could eventually absorb all of the scripts functionality and
4373- exec $objdir/$outputname directly.
4374 */
4375 EOF
4376 cat <<"EOF"
4377@@ -3462,22 +4272,13 @@
4378 if (stale) { free ((void *) stale); stale = 0; } \
4379 } while (0)
4380
4381-#undef LTWRAPPER_DEBUGPRINTF
4382-#if defined LT_DEBUGWRAPPER
4383-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
4384-static void
4385-ltwrapper_debugprintf (const char *fmt, ...)
4386-{
4387- va_list args;
4388- va_start (args, fmt);
4389- (void) vfprintf (stderr, fmt, args);
4390- va_end (args);
4391-}
4392+#if defined(LT_DEBUGWRAPPER)
4393+static int lt_debug = 1;
4394 #else
4395-# define LTWRAPPER_DEBUGPRINTF(args)
4396+static int lt_debug = 0;
4397 #endif
4398
4399-const char *program_name = NULL;
4400+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
4401
4402 void *xmalloc (size_t num);
4403 char *xstrdup (const char *string);
4404@@ -3487,7 +4288,10 @@
4405 int make_executable (const char *path);
4406 int check_executable (const char *path);
4407 char *strendzap (char *str, const char *pat);
4408-void lt_fatal (const char *message, ...);
4409+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
4410+void lt_fatal (const char *file, int line, const char *message, ...);
4411+static const char *nonnull (const char *s);
4412+static const char *nonempty (const char *s);
4413 void lt_setenv (const char *name, const char *value);
4414 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
4415 void lt_update_exe_path (const char *name, const char *value);
4416@@ -3497,14 +4301,14 @@
4417 EOF
4418
4419 cat <<EOF
4420-const char * MAGIC_EXE = "$magic_exe";
4421+volatile const char * MAGIC_EXE = "$magic_exe";
4422 const char * LIB_PATH_VARNAME = "$shlibpath_var";
4423 EOF
4424
4425 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4426- func_to_host_pathlist "$temp_rpath"
4427+ func_to_host_path "$temp_rpath"
4428 cat <<EOF
4429-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
4430+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
4431 EOF
4432 else
4433 cat <<"EOF"
4434@@ -3513,10 +4317,10 @@
4435 fi
4436
4437 if test -n "$dllsearchpath"; then
4438- func_to_host_pathlist "$dllsearchpath:"
4439+ func_to_host_path "$dllsearchpath:"
4440 cat <<EOF
4441 const char * EXE_PATH_VARNAME = "PATH";
4442-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
4443+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
4444 EOF
4445 else
4446 cat <<"EOF"
4447@@ -3539,12 +4343,10 @@
4448 cat <<"EOF"
4449
4450 #define LTWRAPPER_OPTION_PREFIX "--lt-"
4451-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
4452
4453-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
4454 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
4455-
4456 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
4457+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
4458
4459 int
4460 main (int argc, char *argv[])
4461@@ -3561,10 +4363,13 @@
4462 int i;
4463
4464 program_name = (char *) xstrdup (base_name (argv[0]));
4465- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
4466- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
4467+ newargz = XMALLOC (char *, argc + 1);
4468
4469- /* very simple arg parsing; don't want to rely on getopt */
4470+ /* very simple arg parsing; don't want to rely on getopt
4471+ * also, copy all non cwrapper options to newargz, except
4472+ * argz[0], which is handled differently
4473+ */
4474+ newargc=0;
4475 for (i = 1; i < argc; i++)
4476 {
4477 if (strcmp (argv[i], dumpscript_opt) == 0)
4478@@ -3581,21 +4386,54 @@
4479 lt_dump_script (stdout);
4480 return 0;
4481 }
4482+ if (strcmp (argv[i], debug_opt) == 0)
4483+ {
4484+ lt_debug = 1;
4485+ continue;
4486+ }
4487+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
4488+ {
4489+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4490+ namespace, but it is not one of the ones we know about and
4491+ have already dealt with, above (inluding dump-script), then
4492+ report an error. Otherwise, targets might begin to believe
4493+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4494+ namespace. The first time any user complains about this, we'll
4495+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4496+ or a configure.ac-settable value.
4497+ */
4498+ lt_fatal (__FILE__, __LINE__,
4499+ "unrecognized %s option: '%s'",
4500+ ltwrapper_option_prefix, argv[i]);
4501+ }
4502+ /* otherwise ... */
4503+ newargz[++newargc] = xstrdup (argv[i]);
4504 }
4505+ newargz[++newargc] = NULL;
4506+
4507+EOF
4508+ cat <<EOF
4509+ /* The GNU banner must be the first non-error debug message */
4510+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
4511+EOF
4512+ cat <<"EOF"
4513+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
4514+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
4515
4516- newargz = XMALLOC (char *, argc + 1);
4517 tmp_pathspec = find_executable (argv[0]);
4518 if (tmp_pathspec == NULL)
4519- lt_fatal ("Couldn't find %s", argv[0]);
4520- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
4521- tmp_pathspec));
4522+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
4523+ lt_debugprintf (__FILE__, __LINE__,
4524+ "(main) found exe (before symlink chase) at: %s\n",
4525+ tmp_pathspec);
4526
4527 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
4528- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
4529- actual_cwrapper_path));
4530+ lt_debugprintf (__FILE__, __LINE__,
4531+ "(main) found exe (after symlink chase) at: %s\n",
4532+ actual_cwrapper_path);
4533 XFREE (tmp_pathspec);
4534
4535- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
4536+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
4537 strendzap (actual_cwrapper_path, actual_cwrapper_name);
4538
4539 /* wrapper name transforms */
4540@@ -3613,8 +4451,9 @@
4541 target_name = tmp_pathspec;
4542 tmp_pathspec = 0;
4543
4544- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
4545- target_name));
4546+ lt_debugprintf (__FILE__, __LINE__,
4547+ "(main) libtool target name: %s\n",
4548+ target_name);
4549 EOF
4550
4551 cat <<EOF
4552@@ -3664,35 +4503,19 @@
4553
4554 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
4555 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
4556- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4557+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
4558+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
4559+ because on Windows, both *_VARNAMEs are PATH but uninstalled
4560+ libraries must come first. */
4561 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
4562+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
4563
4564- newargc=0;
4565- for (i = 1; i < argc; i++)
4566- {
4567- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
4568- {
4569- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
4570- namespace, but it is not one of the ones we know about and
4571- have already dealt with, above (inluding dump-script), then
4572- report an error. Otherwise, targets might begin to believe
4573- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
4574- namespace. The first time any user complains about this, we'll
4575- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
4576- or a configure.ac-settable value.
4577- */
4578- lt_fatal ("Unrecognized option in %s namespace: '%s'",
4579- ltwrapper_option_prefix, argv[i]);
4580- }
4581- /* otherwise ... */
4582- newargz[++newargc] = xstrdup (argv[i]);
4583- }
4584- newargz[++newargc] = NULL;
4585-
4586- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
4587+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
4588+ nonnull (lt_argv_zero));
4589 for (i = 0; i < newargc; i++)
4590 {
4591- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
4592+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
4593+ i, nonnull (newargz[i]));
4594 }
4595
4596 EOF
4597@@ -3706,7 +4529,9 @@
4598 if (rval == -1)
4599 {
4600 /* failed to start process */
4601- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
4602+ lt_debugprintf (__FILE__, __LINE__,
4603+ "(main) failed to launch target \"%s\": %s\n",
4604+ lt_argv_zero, nonnull (strerror (errno)));
4605 return 127;
4606 }
4607 return rval;
4608@@ -3728,7 +4553,7 @@
4609 {
4610 void *p = (void *) malloc (num);
4611 if (!p)
4612- lt_fatal ("Memory exhausted");
4613+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
4614
4615 return p;
4616 }
4617@@ -3762,8 +4587,8 @@
4618 {
4619 struct stat st;
4620
4621- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
4622- path ? (*path ? path : "EMPTY!") : "NULL!"));
4623+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
4624+ nonempty (path));
4625 if ((!path) || (!*path))
4626 return 0;
4627
4628@@ -3780,8 +4605,8 @@
4629 int rval = 0;
4630 struct stat st;
4631
4632- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
4633- path ? (*path ? path : "EMPTY!") : "NULL!"));
4634+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
4635+ nonempty (path));
4636 if ((!path) || (!*path))
4637 return 0;
4638
4639@@ -3807,8 +4632,8 @@
4640 int tmp_len;
4641 char *concat_name;
4642
4643- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
4644- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
4645+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
4646+ nonempty (wrapper));
4647
4648 if ((wrapper == NULL) || (*wrapper == '\0'))
4649 return NULL;
4650@@ -3861,7 +4686,8 @@
4651 {
4652 /* empty path: current directory */
4653 if (getcwd (tmp, LT_PATHMAX) == NULL)
4654- lt_fatal ("getcwd failed");
4655+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4656+ nonnull (strerror (errno)));
4657 tmp_len = strlen (tmp);
4658 concat_name =
4659 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4660@@ -3886,7 +4712,8 @@
4661 }
4662 /* Relative path | not found in path: prepend cwd */
4663 if (getcwd (tmp, LT_PATHMAX) == NULL)
4664- lt_fatal ("getcwd failed");
4665+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
4666+ nonnull (strerror (errno)));
4667 tmp_len = strlen (tmp);
4668 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
4669 memcpy (concat_name, tmp, tmp_len);
4670@@ -3912,8 +4739,9 @@
4671 int has_symlinks = 0;
4672 while (strlen (tmp_pathspec) && !has_symlinks)
4673 {
4674- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
4675- tmp_pathspec));
4676+ lt_debugprintf (__FILE__, __LINE__,
4677+ "checking path component for symlinks: %s\n",
4678+ tmp_pathspec);
4679 if (lstat (tmp_pathspec, &s) == 0)
4680 {
4681 if (S_ISLNK (s.st_mode) != 0)
4682@@ -3935,8 +4763,9 @@
4683 }
4684 else
4685 {
4686- char *errstr = strerror (errno);
4687- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
4688+ lt_fatal (__FILE__, __LINE__,
4689+ "error accessing file \"%s\": %s",
4690+ tmp_pathspec, nonnull (strerror (errno)));
4691 }
4692 }
4693 XFREE (tmp_pathspec);
4694@@ -3949,7 +4778,8 @@
4695 tmp_pathspec = realpath (pathspec, buf);
4696 if (tmp_pathspec == 0)
4697 {
4698- lt_fatal ("Could not follow symlinks for %s", pathspec);
4699+ lt_fatal (__FILE__, __LINE__,
4700+ "could not follow symlinks for %s", pathspec);
4701 }
4702 return xstrdup (tmp_pathspec);
4703 #endif
4704@@ -3975,11 +4805,25 @@
4705 return str;
4706 }
4707
4708+void
4709+lt_debugprintf (const char *file, int line, const char *fmt, ...)
4710+{
4711+ va_list args;
4712+ if (lt_debug)
4713+ {
4714+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
4715+ va_start (args, fmt);
4716+ (void) vfprintf (stderr, fmt, args);
4717+ va_end (args);
4718+ }
4719+}
4720+
4721 static void
4722-lt_error_core (int exit_status, const char *mode,
4723+lt_error_core (int exit_status, const char *file,
4724+ int line, const char *mode,
4725 const char *message, va_list ap)
4726 {
4727- fprintf (stderr, "%s: %s: ", program_name, mode);
4728+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
4729 vfprintf (stderr, message, ap);
4730 fprintf (stderr, ".\n");
4731
4732@@ -3988,20 +4832,32 @@
4733 }
4734
4735 void
4736-lt_fatal (const char *message, ...)
4737+lt_fatal (const char *file, int line, const char *message, ...)
4738 {
4739 va_list ap;
4740 va_start (ap, message);
4741- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
4742+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
4743 va_end (ap);
4744 }
4745
4746+static const char *
4747+nonnull (const char *s)
4748+{
4749+ return s ? s : "(null)";
4750+}
4751+
4752+static const char *
4753+nonempty (const char *s)
4754+{
4755+ return (s && !*s) ? "(empty)" : nonnull (s);
4756+}
4757+
4758 void
4759 lt_setenv (const char *name, const char *value)
4760 {
4761- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
4762- (name ? name : "<NULL>"),
4763- (value ? value : "<NULL>")));
4764+ lt_debugprintf (__FILE__, __LINE__,
4765+ "(lt_setenv) setting '%s' to '%s'\n",
4766+ nonnull (name), nonnull (value));
4767 {
4768 #ifdef HAVE_SETENV
4769 /* always make a copy, for consistency with !HAVE_SETENV */
4770@@ -4049,9 +4905,9 @@
4771 void
4772 lt_update_exe_path (const char *name, const char *value)
4773 {
4774- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4775- (name ? name : "<NULL>"),
4776- (value ? value : "<NULL>")));
4777+ lt_debugprintf (__FILE__, __LINE__,
4778+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
4779+ nonnull (name), nonnull (value));
4780
4781 if (name && *name && value && *value)
4782 {
4783@@ -4070,9 +4926,9 @@
4784 void
4785 lt_update_lib_path (const char *name, const char *value)
4786 {
4787- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4788- (name ? name : "<NULL>"),
4789- (value ? value : "<NULL>")));
4790+ lt_debugprintf (__FILE__, __LINE__,
4791+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
4792+ nonnull (name), nonnull (value));
4793
4794 if (name && *name && value && *value)
4795 {
4796@@ -4222,7 +5078,7 @@
4797 func_win32_import_lib_p ()
4798 {
4799 $opt_debug
4800- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
4801+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
4802 *import*) : ;;
4803 *) false ;;
4804 esac
4805@@ -4401,9 +5257,9 @@
4806 ;;
4807 *)
4808 if test "$prev" = dlfiles; then
4809- dlfiles="$dlfiles $arg"
4810+ func_append dlfiles " $arg"
4811 else
4812- dlprefiles="$dlprefiles $arg"
4813+ func_append dlprefiles " $arg"
4814 fi
4815 prev=
4816 continue
4817@@ -4427,7 +5283,7 @@
4818 *-*-darwin*)
4819 case "$deplibs " in
4820 *" $qarg.ltframework "*) ;;
4821- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
4822+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
4823 ;;
4824 esac
4825 ;;
4826@@ -4446,7 +5302,7 @@
4827 moreargs=
4828 for fil in `cat "$save_arg"`
4829 do
4830-# moreargs="$moreargs $fil"
4831+# func_append moreargs " $fil"
4832 arg=$fil
4833 # A libtool-controlled object.
4834
4835@@ -4475,7 +5331,7 @@
4836
4837 if test "$prev" = dlfiles; then
4838 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
4839- dlfiles="$dlfiles $pic_object"
4840+ func_append dlfiles " $pic_object"
4841 prev=
4842 continue
4843 else
4844@@ -4487,7 +5343,7 @@
4845 # CHECK ME: I think I busted this. -Ossama
4846 if test "$prev" = dlprefiles; then
4847 # Preload the old-style object.
4848- dlprefiles="$dlprefiles $pic_object"
4849+ func_append dlprefiles " $pic_object"
4850 prev=
4851 fi
4852
4853@@ -4557,12 +5413,12 @@
4854 if test "$prev" = rpath; then
4855 case "$rpath " in
4856 *" $arg "*) ;;
4857- *) rpath="$rpath $arg" ;;
4858+ *) func_append rpath " $arg" ;;
4859 esac
4860 else
4861 case "$xrpath " in
4862 *" $arg "*) ;;
4863- *) xrpath="$xrpath $arg" ;;
4864+ *) func_append xrpath " $arg" ;;
4865 esac
4866 fi
4867 prev=
4868@@ -4574,28 +5430,28 @@
4869 continue
4870 ;;
4871 weak)
4872- weak_libs="$weak_libs $arg"
4873+ func_append weak_libs " $arg"
4874 prev=
4875 continue
4876 ;;
4877 xcclinker)
4878- linker_flags="$linker_flags $qarg"
4879- compiler_flags="$compiler_flags $qarg"
4880+ func_append linker_flags " $qarg"
4881+ func_append compiler_flags " $qarg"
4882 prev=
4883 func_append compile_command " $qarg"
4884 func_append finalize_command " $qarg"
4885 continue
4886 ;;
4887 xcompiler)
4888- compiler_flags="$compiler_flags $qarg"
4889+ func_append compiler_flags " $qarg"
4890 prev=
4891 func_append compile_command " $qarg"
4892 func_append finalize_command " $qarg"
4893 continue
4894 ;;
4895 xlinker)
4896- linker_flags="$linker_flags $qarg"
4897- compiler_flags="$compiler_flags $wl$qarg"
4898+ func_append linker_flags " $qarg"
4899+ func_append compiler_flags " $wl$qarg"
4900 prev=
4901 func_append compile_command " $wl$qarg"
4902 func_append finalize_command " $wl$qarg"
4903@@ -4686,15 +5542,16 @@
4904 ;;
4905
4906 -L*)
4907- func_stripname '-L' '' "$arg"
4908- dir=$func_stripname_result
4909- if test -z "$dir"; then
4910+ func_stripname "-L" '' "$arg"
4911+ if test -z "$func_stripname_result"; then
4912 if test "$#" -gt 0; then
4913 func_fatal_error "require no space between \`-L' and \`$1'"
4914 else
4915 func_fatal_error "need path for \`-L' option"
4916 fi
4917 fi
4918+ func_resolve_sysroot "$func_stripname_result"
4919+ dir=$func_resolve_sysroot_result
4920 # We need an absolute path.
4921 case $dir in
4922 [\\/]* | [A-Za-z]:[\\/]*) ;;
4923@@ -4706,10 +5563,16 @@
4924 ;;
4925 esac
4926 case "$deplibs " in
4927- *" -L$dir "*) ;;
4928+ *" -L$dir "* | *" $arg "*)
4929+ # Will only happen for absolute or sysroot arguments
4930+ ;;
4931 *)
4932- deplibs="$deplibs -L$dir"
4933- lib_search_path="$lib_search_path $dir"
4934+ # Preserve sysroot, but never include relative directories
4935+ case $dir in
4936+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
4937+ *) func_append deplibs " -L$dir" ;;
4938+ esac
4939+ func_append lib_search_path " $dir"
4940 ;;
4941 esac
4942 case $host in
4943@@ -4718,12 +5581,12 @@
4944 case :$dllsearchpath: in
4945 *":$dir:"*) ;;
4946 ::) dllsearchpath=$dir;;
4947- *) dllsearchpath="$dllsearchpath:$dir";;
4948+ *) func_append dllsearchpath ":$dir";;
4949 esac
4950 case :$dllsearchpath: in
4951 *":$testbindir:"*) ;;
4952 ::) dllsearchpath=$testbindir;;
4953- *) dllsearchpath="$dllsearchpath:$testbindir";;
4954+ *) func_append dllsearchpath ":$testbindir";;
4955 esac
4956 ;;
4957 esac
4958@@ -4747,7 +5610,7 @@
4959 ;;
4960 *-*-rhapsody* | *-*-darwin1.[012])
4961 # Rhapsody C and math libraries are in the System framework
4962- deplibs="$deplibs System.ltframework"
4963+ func_append deplibs " System.ltframework"
4964 continue
4965 ;;
4966 *-*-sco3.2v5* | *-*-sco5v6*)
4967@@ -4758,9 +5621,6 @@
4968 # Compiler inserts libc in the correct place for threads to work
4969 test "X$arg" = "X-lc" && continue
4970 ;;
4971- *-*-linux*)
4972- test "X$arg" = "X-lc" && continue
4973- ;;
4974 esac
4975 elif test "X$arg" = "X-lc_r"; then
4976 case $host in
4977@@ -4770,7 +5630,7 @@
4978 ;;
4979 esac
4980 fi
4981- deplibs="$deplibs $arg"
4982+ func_append deplibs " $arg"
4983 continue
4984 ;;
4985
4986@@ -4782,8 +5642,8 @@
4987 # Tru64 UNIX uses -model [arg] to determine the layout of C++
4988 # classes, name mangling, and exception handling.
4989 # Darwin uses the -arch flag to determine output architecture.
4990- -model|-arch|-isysroot)
4991- compiler_flags="$compiler_flags $arg"
4992+ -model|-arch|-isysroot|--sysroot)
4993+ func_append compiler_flags " $arg"
4994 func_append compile_command " $arg"
4995 func_append finalize_command " $arg"
4996 prev=xcompiler
4997@@ -4791,12 +5651,12 @@
4998 ;;
4999
5000 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
5001- compiler_flags="$compiler_flags $arg"
5002+ func_append compiler_flags " $arg"
5003 func_append compile_command " $arg"
5004 func_append finalize_command " $arg"
5005 case "$new_inherited_linker_flags " in
5006 *" $arg "*) ;;
5007- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
5008+ * ) func_append new_inherited_linker_flags " $arg" ;;
5009 esac
5010 continue
5011 ;;
5012@@ -4863,13 +5723,17 @@
5013 # We need an absolute path.
5014 case $dir in
5015 [\\/]* | [A-Za-z]:[\\/]*) ;;
5016+ =*)
5017+ func_stripname '=' '' "$dir"
5018+ dir=$lt_sysroot$func_stripname_result
5019+ ;;
5020 *)
5021 func_fatal_error "only absolute run-paths are allowed"
5022 ;;
5023 esac
5024 case "$xrpath " in
5025 *" $dir "*) ;;
5026- *) xrpath="$xrpath $dir" ;;
5027+ *) func_append xrpath " $dir" ;;
5028 esac
5029 continue
5030 ;;
5031@@ -4922,8 +5786,8 @@
5032 for flag in $args; do
5033 IFS="$save_ifs"
5034 func_quote_for_eval "$flag"
5035- arg="$arg $func_quote_for_eval_result"
5036- compiler_flags="$compiler_flags $func_quote_for_eval_result"
5037+ func_append arg " $func_quote_for_eval_result"
5038+ func_append compiler_flags " $func_quote_for_eval_result"
5039 done
5040 IFS="$save_ifs"
5041 func_stripname ' ' '' "$arg"
5042@@ -4938,9 +5802,9 @@
5043 for flag in $args; do
5044 IFS="$save_ifs"
5045 func_quote_for_eval "$flag"
5046- arg="$arg $wl$func_quote_for_eval_result"
5047- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
5048- linker_flags="$linker_flags $func_quote_for_eval_result"
5049+ func_append arg " $wl$func_quote_for_eval_result"
5050+ func_append compiler_flags " $wl$func_quote_for_eval_result"
5051+ func_append linker_flags " $func_quote_for_eval_result"
5052 done
5053 IFS="$save_ifs"
5054 func_stripname ' ' '' "$arg"
5055@@ -4968,24 +5832,27 @@
5056 arg="$func_quote_for_eval_result"
5057 ;;
5058
5059- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
5060- # -r[0-9][0-9]* specifies the processor on the SGI compiler
5061- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
5062- # +DA*, +DD* enable 64-bit mode on the HP compiler
5063- # -q* pass through compiler args for the IBM compiler
5064- # -m*, -t[45]*, -txscale* pass through architecture-specific
5065- # compiler args for GCC
5066- # -F/path gives path to uninstalled frameworks, gcc on darwin
5067- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
5068- # @file GCC response files
5069- # -tp=* Portland pgcc target processor selection
5070+ # Flags to be passed through unchanged, with rationale:
5071+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
5072+ # -r[0-9][0-9]* specify processor for the SGI compiler
5073+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
5074+ # +DA*, +DD* enable 64-bit mode for the HP compiler
5075+ # -q* compiler args for the IBM compiler
5076+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
5077+ # -F/path path to uninstalled frameworks, gcc on darwin
5078+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
5079+ # @file GCC response files
5080+ # -tp=* Portland pgcc target processor selection
5081+ # --sysroot=* for sysroot support
5082+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
5083 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
5084- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
5085+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
5086+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
5087 func_quote_for_eval "$arg"
5088 arg="$func_quote_for_eval_result"
5089 func_append compile_command " $arg"
5090 func_append finalize_command " $arg"
5091- compiler_flags="$compiler_flags $arg"
5092+ func_append compiler_flags " $arg"
5093 continue
5094 ;;
5095
5096@@ -4997,7 +5864,7 @@
5097
5098 *.$objext)
5099 # A standard object.
5100- objs="$objs $arg"
5101+ func_append objs " $arg"
5102 ;;
5103
5104 *.lo)
5105@@ -5028,7 +5895,7 @@
5106
5107 if test "$prev" = dlfiles; then
5108 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
5109- dlfiles="$dlfiles $pic_object"
5110+ func_append dlfiles " $pic_object"
5111 prev=
5112 continue
5113 else
5114@@ -5040,7 +5907,7 @@
5115 # CHECK ME: I think I busted this. -Ossama
5116 if test "$prev" = dlprefiles; then
5117 # Preload the old-style object.
5118- dlprefiles="$dlprefiles $pic_object"
5119+ func_append dlprefiles " $pic_object"
5120 prev=
5121 fi
5122
5123@@ -5085,24 +5952,25 @@
5124
5125 *.$libext)
5126 # An archive.
5127- deplibs="$deplibs $arg"
5128- old_deplibs="$old_deplibs $arg"
5129+ func_append deplibs " $arg"
5130+ func_append old_deplibs " $arg"
5131 continue
5132 ;;
5133
5134 *.la)
5135 # A libtool-controlled library.
5136
5137+ func_resolve_sysroot "$arg"
5138 if test "$prev" = dlfiles; then
5139 # This library was specified with -dlopen.
5140- dlfiles="$dlfiles $arg"
5141+ func_append dlfiles " $func_resolve_sysroot_result"
5142 prev=
5143 elif test "$prev" = dlprefiles; then
5144 # The library was specified with -dlpreopen.
5145- dlprefiles="$dlprefiles $arg"
5146+ func_append dlprefiles " $func_resolve_sysroot_result"
5147 prev=
5148 else
5149- deplibs="$deplibs $arg"
5150+ func_append deplibs " $func_resolve_sysroot_result"
5151 fi
5152 continue
5153 ;;
5154@@ -5127,7 +5995,7 @@
5155 func_fatal_help "the \`$prevarg' option requires an argument"
5156
5157 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
5158- eval "arg=\"$export_dynamic_flag_spec\""
5159+ eval arg=\"$export_dynamic_flag_spec\"
5160 func_append compile_command " $arg"
5161 func_append finalize_command " $arg"
5162 fi
5163@@ -5144,11 +6012,13 @@
5164 else
5165 shlib_search_path=
5166 fi
5167- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
5168- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
5169+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
5170+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
5171
5172 func_dirname "$output" "/" ""
5173 output_objdir="$func_dirname_result$objdir"
5174+ func_to_tool_file "$output_objdir/"
5175+ tool_output_objdir=$func_to_tool_file_result
5176 # Create the object directory.
5177 func_mkdir_p "$output_objdir"
5178
5179@@ -5169,12 +6039,12 @@
5180 # Find all interdependent deplibs by searching for libraries
5181 # that are linked more than once (e.g. -la -lb -la)
5182 for deplib in $deplibs; do
5183- if $opt_duplicate_deps ; then
5184+ if $opt_preserve_dup_deps ; then
5185 case "$libs " in
5186- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5187+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5188 esac
5189 fi
5190- libs="$libs $deplib"
5191+ func_append libs " $deplib"
5192 done
5193
5194 if test "$linkmode" = lib; then
5195@@ -5187,9 +6057,9 @@
5196 if $opt_duplicate_compiler_generated_deps; then
5197 for pre_post_dep in $predeps $postdeps; do
5198 case "$pre_post_deps " in
5199- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
5200+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
5201 esac
5202- pre_post_deps="$pre_post_deps $pre_post_dep"
5203+ func_append pre_post_deps " $pre_post_dep"
5204 done
5205 fi
5206 pre_post_deps=
5207@@ -5256,8 +6126,9 @@
5208 for lib in $dlprefiles; do
5209 # Ignore non-libtool-libs
5210 dependency_libs=
5211+ func_resolve_sysroot "$lib"
5212 case $lib in
5213- *.la) func_source "$lib" ;;
5214+ *.la) func_source "$func_resolve_sysroot_result" ;;
5215 esac
5216
5217 # Collect preopened libtool deplibs, except any this library
5218@@ -5267,7 +6138,7 @@
5219 deplib_base=$func_basename_result
5220 case " $weak_libs " in
5221 *" $deplib_base "*) ;;
5222- *) deplibs="$deplibs $deplib" ;;
5223+ *) func_append deplibs " $deplib" ;;
5224 esac
5225 done
5226 done
5227@@ -5288,11 +6159,11 @@
5228 compile_deplibs="$deplib $compile_deplibs"
5229 finalize_deplibs="$deplib $finalize_deplibs"
5230 else
5231- compiler_flags="$compiler_flags $deplib"
5232+ func_append compiler_flags " $deplib"
5233 if test "$linkmode" = lib ; then
5234 case "$new_inherited_linker_flags " in
5235 *" $deplib "*) ;;
5236- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5237+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5238 esac
5239 fi
5240 fi
5241@@ -5377,7 +6248,7 @@
5242 if test "$linkmode" = lib ; then
5243 case "$new_inherited_linker_flags " in
5244 *" $deplib "*) ;;
5245- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
5246+ * ) func_append new_inherited_linker_flags " $deplib" ;;
5247 esac
5248 fi
5249 fi
5250@@ -5390,7 +6261,8 @@
5251 test "$pass" = conv && continue
5252 newdependency_libs="$deplib $newdependency_libs"
5253 func_stripname '-L' '' "$deplib"
5254- newlib_search_path="$newlib_search_path $func_stripname_result"
5255+ func_resolve_sysroot "$func_stripname_result"
5256+ func_append newlib_search_path " $func_resolve_sysroot_result"
5257 ;;
5258 prog)
5259 if test "$pass" = conv; then
5260@@ -5404,7 +6276,8 @@
5261 finalize_deplibs="$deplib $finalize_deplibs"
5262 fi
5263 func_stripname '-L' '' "$deplib"
5264- newlib_search_path="$newlib_search_path $func_stripname_result"
5265+ func_resolve_sysroot "$func_stripname_result"
5266+ func_append newlib_search_path " $func_resolve_sysroot_result"
5267 ;;
5268 *)
5269 func_warning "\`-L' is ignored for archives/objects"
5270@@ -5415,17 +6288,21 @@
5271 -R*)
5272 if test "$pass" = link; then
5273 func_stripname '-R' '' "$deplib"
5274- dir=$func_stripname_result
5275+ func_resolve_sysroot "$func_stripname_result"
5276+ dir=$func_resolve_sysroot_result
5277 # Make sure the xrpath contains only unique directories.
5278 case "$xrpath " in
5279 *" $dir "*) ;;
5280- *) xrpath="$xrpath $dir" ;;
5281+ *) func_append xrpath " $dir" ;;
5282 esac
5283 fi
5284 deplibs="$deplib $deplibs"
5285 continue
5286 ;;
5287- *.la) lib="$deplib" ;;
5288+ *.la)
5289+ func_resolve_sysroot "$deplib"
5290+ lib=$func_resolve_sysroot_result
5291+ ;;
5292 *.$libext)
5293 if test "$pass" = conv; then
5294 deplibs="$deplib $deplibs"
5295@@ -5488,11 +6365,11 @@
5296 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
5297 # If there is no dlopen support or we're linking statically,
5298 # we need to preload.
5299- newdlprefiles="$newdlprefiles $deplib"
5300+ func_append newdlprefiles " $deplib"
5301 compile_deplibs="$deplib $compile_deplibs"
5302 finalize_deplibs="$deplib $finalize_deplibs"
5303 else
5304- newdlfiles="$newdlfiles $deplib"
5305+ func_append newdlfiles " $deplib"
5306 fi
5307 fi
5308 continue
5309@@ -5538,7 +6415,7 @@
5310 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
5311 case " $new_inherited_linker_flags " in
5312 *" $tmp_inherited_linker_flag "*) ;;
5313- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
5314+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
5315 esac
5316 done
5317 fi
5318@@ -5546,8 +6423,8 @@
5319 if test "$linkmode,$pass" = "lib,link" ||
5320 test "$linkmode,$pass" = "prog,scan" ||
5321 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
5322- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
5323- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
5324+ test -n "$dlopen" && func_append dlfiles " $dlopen"
5325+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
5326 fi
5327
5328 if test "$pass" = conv; then
5329@@ -5558,20 +6435,20 @@
5330 func_fatal_error "cannot find name of link library for \`$lib'"
5331 fi
5332 # It is a libtool convenience library, so add in its objects.
5333- convenience="$convenience $ladir/$objdir/$old_library"
5334- old_convenience="$old_convenience $ladir/$objdir/$old_library"
5335+ func_append convenience " $ladir/$objdir/$old_library"
5336+ func_append old_convenience " $ladir/$objdir/$old_library"
5337 elif test "$linkmode" != prog && test "$linkmode" != lib; then
5338 func_fatal_error "\`$lib' is not a convenience library"
5339 fi
5340 tmp_libs=
5341 for deplib in $dependency_libs; do
5342 deplibs="$deplib $deplibs"
5343- if $opt_duplicate_deps ; then
5344+ if $opt_preserve_dup_deps ; then
5345 case "$tmp_libs " in
5346- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5347+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5348 esac
5349 fi
5350- tmp_libs="$tmp_libs $deplib"
5351+ func_append tmp_libs " $deplib"
5352 done
5353 continue
5354 fi # $pass = conv
5355@@ -5579,9 +6456,15 @@
5356
5357 # Get the name of the library we link against.
5358 linklib=
5359- for l in $old_library $library_names; do
5360- linklib="$l"
5361- done
5362+ if test -n "$old_library" &&
5363+ { test "$prefer_static_libs" = yes ||
5364+ test "$prefer_static_libs,$installed" = "built,no"; }; then
5365+ linklib=$old_library
5366+ else
5367+ for l in $old_library $library_names; do
5368+ linklib="$l"
5369+ done
5370+ fi
5371 if test -z "$linklib"; then
5372 func_fatal_error "cannot find name of link library for \`$lib'"
5373 fi
5374@@ -5598,9 +6481,9 @@
5375 # statically, we need to preload. We also need to preload any
5376 # dependent libraries so libltdl's deplib preloader doesn't
5377 # bomb out in the load deplibs phase.
5378- dlprefiles="$dlprefiles $lib $dependency_libs"
5379+ func_append dlprefiles " $lib $dependency_libs"
5380 else
5381- newdlfiles="$newdlfiles $lib"
5382+ func_append newdlfiles " $lib"
5383 fi
5384 continue
5385 fi # $pass = dlopen
5386@@ -5622,14 +6505,14 @@
5387
5388 # Find the relevant object directory and library name.
5389 if test "X$installed" = Xyes; then
5390- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5391+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5392 func_warning "library \`$lib' was moved."
5393 dir="$ladir"
5394 absdir="$abs_ladir"
5395 libdir="$abs_ladir"
5396 else
5397- dir="$libdir"
5398- absdir="$libdir"
5399+ dir="$lt_sysroot$libdir"
5400+ absdir="$lt_sysroot$libdir"
5401 fi
5402 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
5403 else
5404@@ -5637,12 +6520,12 @@
5405 dir="$ladir"
5406 absdir="$abs_ladir"
5407 # Remove this search path later
5408- notinst_path="$notinst_path $abs_ladir"
5409+ func_append notinst_path " $abs_ladir"
5410 else
5411 dir="$ladir/$objdir"
5412 absdir="$abs_ladir/$objdir"
5413 # Remove this search path later
5414- notinst_path="$notinst_path $abs_ladir"
5415+ func_append notinst_path " $abs_ladir"
5416 fi
5417 fi # $installed = yes
5418 func_stripname 'lib' '.la' "$laname"
5419@@ -5653,20 +6536,46 @@
5420 if test -z "$libdir" && test "$linkmode" = prog; then
5421 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
5422 fi
5423- # Prefer using a static library (so that no silly _DYNAMIC symbols
5424- # are required to link).
5425- if test -n "$old_library"; then
5426- newdlprefiles="$newdlprefiles $dir/$old_library"
5427- # Keep a list of preopened convenience libraries to check
5428- # that they are being used correctly in the link pass.
5429- test -z "$libdir" && \
5430- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
5431- # Otherwise, use the dlname, so that lt_dlopen finds it.
5432- elif test -n "$dlname"; then
5433- newdlprefiles="$newdlprefiles $dir/$dlname"
5434- else
5435- newdlprefiles="$newdlprefiles $dir/$linklib"
5436- fi
5437+ case "$host" in
5438+ # special handling for platforms with PE-DLLs.
5439+ *cygwin* | *mingw* | *cegcc* )
5440+ # Linker will automatically link against shared library if both
5441+ # static and shared are present. Therefore, ensure we extract
5442+ # symbols from the import library if a shared library is present
5443+ # (otherwise, the dlopen module name will be incorrect). We do
5444+ # this by putting the import library name into $newdlprefiles.
5445+ # We recover the dlopen module name by 'saving' the la file
5446+ # name in a special purpose variable, and (later) extracting the
5447+ # dlname from the la file.
5448+ if test -n "$dlname"; then
5449+ func_tr_sh "$dir/$linklib"
5450+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
5451+ func_append newdlprefiles " $dir/$linklib"
5452+ else
5453+ func_append newdlprefiles " $dir/$old_library"
5454+ # Keep a list of preopened convenience libraries to check
5455+ # that they are being used correctly in the link pass.
5456+ test -z "$libdir" && \
5457+ func_append dlpreconveniencelibs " $dir/$old_library"
5458+ fi
5459+ ;;
5460+ * )
5461+ # Prefer using a static library (so that no silly _DYNAMIC symbols
5462+ # are required to link).
5463+ if test -n "$old_library"; then
5464+ func_append newdlprefiles " $dir/$old_library"
5465+ # Keep a list of preopened convenience libraries to check
5466+ # that they are being used correctly in the link pass.
5467+ test -z "$libdir" && \
5468+ func_append dlpreconveniencelibs " $dir/$old_library"
5469+ # Otherwise, use the dlname, so that lt_dlopen finds it.
5470+ elif test -n "$dlname"; then
5471+ func_append newdlprefiles " $dir/$dlname"
5472+ else
5473+ func_append newdlprefiles " $dir/$linklib"
5474+ fi
5475+ ;;
5476+ esac
5477 fi # $pass = dlpreopen
5478
5479 if test -z "$libdir"; then
5480@@ -5684,7 +6593,7 @@
5481
5482
5483 if test "$linkmode" = prog && test "$pass" != link; then
5484- newlib_search_path="$newlib_search_path $ladir"
5485+ func_append newlib_search_path " $ladir"
5486 deplibs="$lib $deplibs"
5487
5488 linkalldeplibs=no
5489@@ -5697,7 +6606,8 @@
5490 for deplib in $dependency_libs; do
5491 case $deplib in
5492 -L*) func_stripname '-L' '' "$deplib"
5493- newlib_search_path="$newlib_search_path $func_stripname_result"
5494+ func_resolve_sysroot "$func_stripname_result"
5495+ func_append newlib_search_path " $func_resolve_sysroot_result"
5496 ;;
5497 esac
5498 # Need to link against all dependency_libs?
5499@@ -5708,12 +6618,12 @@
5500 # or/and link against static libraries
5501 newdependency_libs="$deplib $newdependency_libs"
5502 fi
5503- if $opt_duplicate_deps ; then
5504+ if $opt_preserve_dup_deps ; then
5505 case "$tmp_libs " in
5506- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5507+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5508 esac
5509 fi
5510- tmp_libs="$tmp_libs $deplib"
5511+ func_append tmp_libs " $deplib"
5512 done # for deplib
5513 continue
5514 fi # $linkmode = prog...
5515@@ -5728,7 +6638,7 @@
5516 # Make sure the rpath contains only unique directories.
5517 case "$temp_rpath:" in
5518 *"$absdir:"*) ;;
5519- *) temp_rpath="$temp_rpath$absdir:" ;;
5520+ *) func_append temp_rpath "$absdir:" ;;
5521 esac
5522 fi
5523
5524@@ -5740,7 +6650,7 @@
5525 *)
5526 case "$compile_rpath " in
5527 *" $absdir "*) ;;
5528- *) compile_rpath="$compile_rpath $absdir"
5529+ *) func_append compile_rpath " $absdir" ;;
5530 esac
5531 ;;
5532 esac
5533@@ -5749,7 +6659,7 @@
5534 *)
5535 case "$finalize_rpath " in
5536 *" $libdir "*) ;;
5537- *) finalize_rpath="$finalize_rpath $libdir"
5538+ *) func_append finalize_rpath " $libdir" ;;
5539 esac
5540 ;;
5541 esac
5542@@ -5774,12 +6684,12 @@
5543 case $host in
5544 *cygwin* | *mingw* | *cegcc*)
5545 # No point in relinking DLLs because paths are not encoded
5546- notinst_deplibs="$notinst_deplibs $lib"
5547+ func_append notinst_deplibs " $lib"
5548 need_relink=no
5549 ;;
5550 *)
5551 if test "$installed" = no; then
5552- notinst_deplibs="$notinst_deplibs $lib"
5553+ func_append notinst_deplibs " $lib"
5554 need_relink=yes
5555 fi
5556 ;;
5557@@ -5814,7 +6724,7 @@
5558 *)
5559 case "$compile_rpath " in
5560 *" $absdir "*) ;;
5561- *) compile_rpath="$compile_rpath $absdir"
5562+ *) func_append compile_rpath " $absdir" ;;
5563 esac
5564 ;;
5565 esac
5566@@ -5823,7 +6733,7 @@
5567 *)
5568 case "$finalize_rpath " in
5569 *" $libdir "*) ;;
5570- *) finalize_rpath="$finalize_rpath $libdir"
5571+ *) func_append finalize_rpath " $libdir" ;;
5572 esac
5573 ;;
5574 esac
5575@@ -5835,7 +6745,7 @@
5576 shift
5577 realname="$1"
5578 shift
5579- eval "libname=\"$libname_spec\""
5580+ libname=`eval "\\$ECHO \"$libname_spec\""`
5581 # use dlname if we got it. it's perfectly good, no?
5582 if test -n "$dlname"; then
5583 soname="$dlname"
5584@@ -5848,7 +6758,7 @@
5585 versuffix="-$major"
5586 ;;
5587 esac
5588- eval "soname=\"$soname_spec\""
5589+ eval soname=\"$soname_spec\"
5590 else
5591 soname="$realname"
5592 fi
5593@@ -5877,7 +6787,7 @@
5594 linklib=$newlib
5595 fi # test -n "$old_archive_from_expsyms_cmds"
5596
5597- if test "$linkmode" = prog || test "$mode" != relink; then
5598+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
5599 add_shlibpath=
5600 add_dir=
5601 add=
5602@@ -5933,7 +6843,7 @@
5603 if test -n "$inst_prefix_dir"; then
5604 case $libdir in
5605 [\\/]*)
5606- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5607+ func_append add_dir " -L$inst_prefix_dir$libdir"
5608 ;;
5609 esac
5610 fi
5611@@ -5955,7 +6865,7 @@
5612 if test -n "$add_shlibpath"; then
5613 case :$compile_shlibpath: in
5614 *":$add_shlibpath:"*) ;;
5615- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
5616+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
5617 esac
5618 fi
5619 if test "$linkmode" = prog; then
5620@@ -5969,13 +6879,13 @@
5621 test "$hardcode_shlibpath_var" = yes; then
5622 case :$finalize_shlibpath: in
5623 *":$libdir:"*) ;;
5624- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5625+ *) func_append finalize_shlibpath "$libdir:" ;;
5626 esac
5627 fi
5628 fi
5629 fi
5630
5631- if test "$linkmode" = prog || test "$mode" = relink; then
5632+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
5633 add_shlibpath=
5634 add_dir=
5635 add=
5636@@ -5989,7 +6899,7 @@
5637 elif test "$hardcode_shlibpath_var" = yes; then
5638 case :$finalize_shlibpath: in
5639 *":$libdir:"*) ;;
5640- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
5641+ *) func_append finalize_shlibpath "$libdir:" ;;
5642 esac
5643 add="-l$name"
5644 elif test "$hardcode_automatic" = yes; then
5645@@ -6001,12 +6911,12 @@
5646 fi
5647 else
5648 # We cannot seem to hardcode it, guess we'll fake it.
5649- add_dir="-L$libdir"
5650+ add_dir="-L$lt_sysroot$libdir"
5651 # Try looking first in the location we're being installed to.
5652 if test -n "$inst_prefix_dir"; then
5653 case $libdir in
5654 [\\/]*)
5655- add_dir="$add_dir -L$inst_prefix_dir$libdir"
5656+ func_append add_dir " -L$inst_prefix_dir$libdir"
5657 ;;
5658 esac
5659 fi
5660@@ -6083,27 +6993,33 @@
5661 temp_xrpath=$func_stripname_result
5662 case " $xrpath " in
5663 *" $temp_xrpath "*) ;;
5664- *) xrpath="$xrpath $temp_xrpath";;
5665+ *) func_append xrpath " $temp_xrpath";;
5666 esac;;
5667- *) temp_deplibs="$temp_deplibs $libdir";;
5668+ *) func_append temp_deplibs " $libdir";;
5669 esac
5670 done
5671 dependency_libs="$temp_deplibs"
5672 fi
5673
5674- newlib_search_path="$newlib_search_path $absdir"
5675+ func_append newlib_search_path " $absdir"
5676 # Link against this library
5677 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
5678 # ... and its dependency_libs
5679 tmp_libs=
5680 for deplib in $dependency_libs; do
5681 newdependency_libs="$deplib $newdependency_libs"
5682- if $opt_duplicate_deps ; then
5683+ case $deplib in
5684+ -L*) func_stripname '-L' '' "$deplib"
5685+ func_resolve_sysroot "$func_stripname_result";;
5686+ *) func_resolve_sysroot "$deplib" ;;
5687+ esac
5688+ if $opt_preserve_dup_deps ; then
5689 case "$tmp_libs " in
5690- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5691+ *" $func_resolve_sysroot_result "*)
5692+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
5693 esac
5694 fi
5695- tmp_libs="$tmp_libs $deplib"
5696+ func_append tmp_libs " $func_resolve_sysroot_result"
5697 done
5698
5699 if test "$link_all_deplibs" != no; then
5700@@ -6113,8 +7029,10 @@
5701 case $deplib in
5702 -L*) path="$deplib" ;;
5703 *.la)
5704+ func_resolve_sysroot "$deplib"
5705+ deplib=$func_resolve_sysroot_result
5706 func_dirname "$deplib" "" "."
5707- dir="$func_dirname_result"
5708+ dir=$func_dirname_result
5709 # We need an absolute path.
5710 case $dir in
5711 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
5712@@ -6130,7 +7048,7 @@
5713 case $host in
5714 *-*-darwin*)
5715 depdepl=
5716- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5717+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
5718 if test -n "$deplibrary_names" ; then
5719 for tmp in $deplibrary_names ; do
5720 depdepl=$tmp
5721@@ -6141,8 +7059,8 @@
5722 if test -z "$darwin_install_name"; then
5723 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
5724 fi
5725- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5726- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
5727+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
5728+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
5729 path=
5730 fi
5731 fi
5732@@ -6152,7 +7070,7 @@
5733 ;;
5734 esac
5735 else
5736- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5737+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5738 test -z "$libdir" && \
5739 func_fatal_error "\`$deplib' is not a valid libtool archive"
5740 test "$absdir" != "$libdir" && \
5741@@ -6192,7 +7110,7 @@
5742 for dir in $newlib_search_path; do
5743 case "$lib_search_path " in
5744 *" $dir "*) ;;
5745- *) lib_search_path="$lib_search_path $dir" ;;
5746+ *) func_append lib_search_path " $dir" ;;
5747 esac
5748 done
5749 newlib_search_path=
5750@@ -6205,7 +7123,7 @@
5751 fi
5752 for var in $vars dependency_libs; do
5753 # Add libraries to $var in reverse order
5754- eval tmp_libs=\$$var
5755+ eval tmp_libs=\"\$$var\"
5756 new_libs=
5757 for deplib in $tmp_libs; do
5758 # FIXME: Pedantically, this is the right thing to do, so
5759@@ -6250,13 +7168,13 @@
5760 -L*)
5761 case " $tmp_libs " in
5762 *" $deplib "*) ;;
5763- *) tmp_libs="$tmp_libs $deplib" ;;
5764+ *) func_append tmp_libs " $deplib" ;;
5765 esac
5766 ;;
5767- *) tmp_libs="$tmp_libs $deplib" ;;
5768+ *) func_append tmp_libs " $deplib" ;;
5769 esac
5770 done
5771- eval $var=\$tmp_libs
5772+ eval $var=\"$tmp_libs\"
5773 done # for var
5774 fi
5775 # Last step: remove runtime libs from dependency_libs
5776@@ -6269,7 +7187,7 @@
5777 ;;
5778 esac
5779 if test -n "$i" ; then
5780- tmp_libs="$tmp_libs $i"
5781+ func_append tmp_libs " $i"
5782 fi
5783 done
5784 dependency_libs=$tmp_libs
5785@@ -6310,7 +7228,7 @@
5786 # Now set the variables for building old libraries.
5787 build_libtool_libs=no
5788 oldlibs="$output"
5789- objs="$objs$old_deplibs"
5790+ func_append objs "$old_deplibs"
5791 ;;
5792
5793 lib)
5794@@ -6319,8 +7237,8 @@
5795 lib*)
5796 func_stripname 'lib' '.la' "$outputname"
5797 name=$func_stripname_result
5798- eval "shared_ext=\"$shrext_cmds\""
5799- eval "libname=\"$libname_spec\""
5800+ eval shared_ext=\"$shrext_cmds\"
5801+ eval libname=\"$libname_spec\"
5802 ;;
5803 *)
5804 test "$module" = no && \
5805@@ -6330,8 +7248,8 @@
5806 # Add the "lib" prefix for modules if required
5807 func_stripname '' '.la' "$outputname"
5808 name=$func_stripname_result
5809- eval "shared_ext=\"$shrext_cmds\""
5810- eval "libname=\"$libname_spec\""
5811+ eval shared_ext=\"$shrext_cmds\"
5812+ eval libname=\"$libname_spec\"
5813 else
5814 func_stripname '' '.la' "$outputname"
5815 libname=$func_stripname_result
5816@@ -6346,7 +7264,7 @@
5817 echo
5818 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
5819 $ECHO "*** objects $objs is not portable!"
5820- libobjs="$libobjs $objs"
5821+ func_append libobjs " $objs"
5822 fi
5823 fi
5824
5825@@ -6544,7 +7462,7 @@
5826 done
5827
5828 # Make executables depend on our current version.
5829- verstring="$verstring:${current}.0"
5830+ func_append verstring ":${current}.0"
5831 ;;
5832
5833 qnx)
5834@@ -6612,10 +7530,10 @@
5835 fi
5836
5837 func_generate_dlsyms "$libname" "$libname" "yes"
5838- libobjs="$libobjs $symfileobj"
5839+ func_append libobjs " $symfileobj"
5840 test "X$libobjs" = "X " && libobjs=
5841
5842- if test "$mode" != relink; then
5843+ if test "$opt_mode" != relink; then
5844 # Remove our outputs, but don't remove object files since they
5845 # may have been created when compiling PIC objects.
5846 removelist=
5847@@ -6631,7 +7549,7 @@
5848 continue
5849 fi
5850 fi
5851- removelist="$removelist $p"
5852+ func_append removelist " $p"
5853 ;;
5854 *) ;;
5855 esac
5856@@ -6642,7 +7560,7 @@
5857
5858 # Now set the variables for building old libraries.
5859 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
5860- oldlibs="$oldlibs $output_objdir/$libname.$libext"
5861+ func_append oldlibs " $output_objdir/$libname.$libext"
5862
5863 # Transform .lo files to .o files.
5864 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
5865@@ -6659,10 +7577,11 @@
5866 # If the user specified any rpath flags, then add them.
5867 temp_xrpath=
5868 for libdir in $xrpath; do
5869- temp_xrpath="$temp_xrpath -R$libdir"
5870+ func_replace_sysroot "$libdir"
5871+ func_append temp_xrpath " -R$func_replace_sysroot_result"
5872 case "$finalize_rpath " in
5873 *" $libdir "*) ;;
5874- *) finalize_rpath="$finalize_rpath $libdir" ;;
5875+ *) func_append finalize_rpath " $libdir" ;;
5876 esac
5877 done
5878 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
5879@@ -6676,7 +7595,7 @@
5880 for lib in $old_dlfiles; do
5881 case " $dlprefiles $dlfiles " in
5882 *" $lib "*) ;;
5883- *) dlfiles="$dlfiles $lib" ;;
5884+ *) func_append dlfiles " $lib" ;;
5885 esac
5886 done
5887
5888@@ -6686,7 +7605,7 @@
5889 for lib in $old_dlprefiles; do
5890 case "$dlprefiles " in
5891 *" $lib "*) ;;
5892- *) dlprefiles="$dlprefiles $lib" ;;
5893+ *) func_append dlprefiles " $lib" ;;
5894 esac
5895 done
5896
5897@@ -6698,7 +7617,7 @@
5898 ;;
5899 *-*-rhapsody* | *-*-darwin1.[012])
5900 # Rhapsody C library is in the System framework
5901- deplibs="$deplibs System.ltframework"
5902+ func_append deplibs " System.ltframework"
5903 ;;
5904 *-*-netbsd*)
5905 # Don't link with libc until the a.out ld.so is fixed.
5906@@ -6715,7 +7634,7 @@
5907 *)
5908 # Add libc to deplibs on all other systems if necessary.
5909 if test "$build_libtool_need_lc" = "yes"; then
5910- deplibs="$deplibs -lc"
5911+ func_append deplibs " -lc"
5912 fi
5913 ;;
5914 esac
5915@@ -6764,18 +7683,18 @@
5916 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5917 case " $predeps $postdeps " in
5918 *" $i "*)
5919- newdeplibs="$newdeplibs $i"
5920+ func_append newdeplibs " $i"
5921 i=""
5922 ;;
5923 esac
5924 fi
5925 if test -n "$i" ; then
5926- eval "libname=\"$libname_spec\""
5927- eval "deplib_matches=\"$library_names_spec\""
5928+ libname=`eval "\\$ECHO \"$libname_spec\""`
5929+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5930 set dummy $deplib_matches; shift
5931 deplib_match=$1
5932 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5933- newdeplibs="$newdeplibs $i"
5934+ func_append newdeplibs " $i"
5935 else
5936 droppeddeps=yes
5937 echo
5938@@ -6789,7 +7708,7 @@
5939 fi
5940 ;;
5941 *)
5942- newdeplibs="$newdeplibs $i"
5943+ func_append newdeplibs " $i"
5944 ;;
5945 esac
5946 done
5947@@ -6807,18 +7726,18 @@
5948 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5949 case " $predeps $postdeps " in
5950 *" $i "*)
5951- newdeplibs="$newdeplibs $i"
5952+ func_append newdeplibs " $i"
5953 i=""
5954 ;;
5955 esac
5956 fi
5957 if test -n "$i" ; then
5958- eval "libname=\"$libname_spec\""
5959- eval "deplib_matches=\"$library_names_spec\""
5960+ libname=`eval "\\$ECHO \"$libname_spec\""`
5961+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
5962 set dummy $deplib_matches; shift
5963 deplib_match=$1
5964 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
5965- newdeplibs="$newdeplibs $i"
5966+ func_append newdeplibs " $i"
5967 else
5968 droppeddeps=yes
5969 echo
5970@@ -6840,7 +7759,7 @@
5971 fi
5972 ;;
5973 *)
5974- newdeplibs="$newdeplibs $i"
5975+ func_append newdeplibs " $i"
5976 ;;
5977 esac
5978 done
5979@@ -6857,15 +7776,27 @@
5980 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
5981 case " $predeps $postdeps " in
5982 *" $a_deplib "*)
5983- newdeplibs="$newdeplibs $a_deplib"
5984+ func_append newdeplibs " $a_deplib"
5985 a_deplib=""
5986 ;;
5987 esac
5988 fi
5989 if test -n "$a_deplib" ; then
5990- eval "libname=\"$libname_spec\""
5991+ libname=`eval "\\$ECHO \"$libname_spec\""`
5992+ if test -n "$file_magic_glob"; then
5993+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
5994+ else
5995+ libnameglob=$libname
5996+ fi
5997+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
5998 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
5999- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6000+ if test "$want_nocaseglob" = yes; then
6001+ shopt -s nocaseglob
6002+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6003+ $nocaseglob
6004+ else
6005+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
6006+ fi
6007 for potent_lib in $potential_libs; do
6008 # Follow soft links.
6009 if ls -lLd "$potent_lib" 2>/dev/null |
6010@@ -6885,10 +7816,10 @@
6011 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
6012 esac
6013 done
6014- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
6015+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
6016 $SED -e 10q |
6017 $EGREP "$file_magic_regex" > /dev/null; then
6018- newdeplibs="$newdeplibs $a_deplib"
6019+ func_append newdeplibs " $a_deplib"
6020 a_deplib=""
6021 break 2
6022 fi
6023@@ -6913,7 +7844,7 @@
6024 ;;
6025 *)
6026 # Add a -L argument.
6027- newdeplibs="$newdeplibs $a_deplib"
6028+ func_append newdeplibs " $a_deplib"
6029 ;;
6030 esac
6031 done # Gone through all deplibs.
6032@@ -6929,20 +7860,20 @@
6033 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
6034 case " $predeps $postdeps " in
6035 *" $a_deplib "*)
6036- newdeplibs="$newdeplibs $a_deplib"
6037+ func_append newdeplibs " $a_deplib"
6038 a_deplib=""
6039 ;;
6040 esac
6041 fi
6042 if test -n "$a_deplib" ; then
6043- eval "libname=\"$libname_spec\""
6044+ libname=`eval "\\$ECHO \"$libname_spec\""`
6045 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
6046 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6047 for potent_lib in $potential_libs; do
6048 potlib="$potent_lib" # see symlink-check above in file_magic test
6049 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
6050 $EGREP "$match_pattern_regex" > /dev/null; then
6051- newdeplibs="$newdeplibs $a_deplib"
6052+ func_append newdeplibs " $a_deplib"
6053 a_deplib=""
6054 break 2
6055 fi
6056@@ -6967,7 +7898,7 @@
6057 ;;
6058 *)
6059 # Add a -L argument.
6060- newdeplibs="$newdeplibs $a_deplib"
6061+ func_append newdeplibs " $a_deplib"
6062 ;;
6063 esac
6064 done # Gone through all deplibs.
6065@@ -7071,7 +8002,7 @@
6066 *)
6067 case " $deplibs " in
6068 *" -L$path/$objdir "*)
6069- new_libs="$new_libs -L$path/$objdir" ;;
6070+ func_append new_libs " -L$path/$objdir" ;;
6071 esac
6072 ;;
6073 esac
6074@@ -7081,10 +8012,10 @@
6075 -L*)
6076 case " $new_libs " in
6077 *" $deplib "*) ;;
6078- *) new_libs="$new_libs $deplib" ;;
6079+ *) func_append new_libs " $deplib" ;;
6080 esac
6081 ;;
6082- *) new_libs="$new_libs $deplib" ;;
6083+ *) func_append new_libs " $deplib" ;;
6084 esac
6085 done
6086 deplibs="$new_libs"
6087@@ -7101,10 +8032,12 @@
6088 hardcode_libdirs=
6089 dep_rpath=
6090 rpath="$finalize_rpath"
6091- test "$mode" != relink && rpath="$compile_rpath$rpath"
6092+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
6093 for libdir in $rpath; do
6094 if test -n "$hardcode_libdir_flag_spec"; then
6095 if test -n "$hardcode_libdir_separator"; then
6096+ func_replace_sysroot "$libdir"
6097+ libdir=$func_replace_sysroot_result
6098 if test -z "$hardcode_libdirs"; then
6099 hardcode_libdirs="$libdir"
6100 else
6101@@ -7113,18 +8046,18 @@
6102 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6103 ;;
6104 *)
6105- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6106+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6107 ;;
6108 esac
6109 fi
6110 else
6111- eval "flag=\"$hardcode_libdir_flag_spec\""
6112- dep_rpath="$dep_rpath $flag"
6113+ eval flag=\"$hardcode_libdir_flag_spec\"
6114+ func_append dep_rpath " $flag"
6115 fi
6116 elif test -n "$runpath_var"; then
6117 case "$perm_rpath " in
6118 *" $libdir "*) ;;
6119- *) perm_rpath="$perm_rpath $libdir" ;;
6120+ *) func_apped perm_rpath " $libdir" ;;
6121 esac
6122 fi
6123 done
6124@@ -7133,40 +8066,38 @@
6125 test -n "$hardcode_libdirs"; then
6126 libdir="$hardcode_libdirs"
6127 if test -n "$hardcode_libdir_flag_spec_ld"; then
6128- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
6129+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
6130 else
6131- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
6132+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
6133 fi
6134 fi
6135 if test -n "$runpath_var" && test -n "$perm_rpath"; then
6136 # We should set the runpath_var.
6137 rpath=
6138 for dir in $perm_rpath; do
6139- rpath="$rpath$dir:"
6140+ func_append rpath "$dir:"
6141 done
6142- eval $runpath_var=\$rpath\$$runpath_var
6143- export $runpath_var
6144+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
6145 fi
6146 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
6147 fi
6148
6149 shlibpath="$finalize_shlibpath"
6150- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6151+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
6152 if test -n "$shlibpath"; then
6153- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
6154- export $shlibpath_var
6155+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
6156 fi
6157
6158 # Get the real and link names of the library.
6159- eval "shared_ext=\"$shrext_cmds\""
6160- eval "library_names=\"$library_names_spec\""
6161+ eval shared_ext=\"$shrext_cmds\"
6162+ eval library_names=\"$library_names_spec\"
6163 set dummy $library_names
6164 shift
6165 realname="$1"
6166 shift
6167
6168 if test -n "$soname_spec"; then
6169- eval "soname=\"$soname_spec\""
6170+ eval soname=\"$soname_spec\"
6171 else
6172 soname="$realname"
6173 fi
6174@@ -7178,7 +8109,7 @@
6175 linknames=
6176 for link
6177 do
6178- linknames="$linknames $link"
6179+ func_append linknames " $link"
6180 done
6181
6182 # Use standard objects if they are pic
6183@@ -7189,7 +8120,7 @@
6184 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6185 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
6186 export_symbols="$output_objdir/$libname.uexp"
6187- delfiles="$delfiles $export_symbols"
6188+ func_append delfiles " $export_symbols"
6189 fi
6190
6191 orig_export_symbols=
6192@@ -7220,13 +8151,45 @@
6193 $opt_dry_run || $RM $export_symbols
6194 cmds=$export_symbols_cmds
6195 save_ifs="$IFS"; IFS='~'
6196- for cmd in $cmds; do
6197+ for cmd1 in $cmds; do
6198 IFS="$save_ifs"
6199- eval "cmd=\"$cmd\""
6200- func_len " $cmd"
6201- len=$func_len_result
6202- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6203+ # Take the normal branch if the nm_file_list_spec branch
6204+ # doesn't work or if tool conversion is not needed.
6205+ case $nm_file_list_spec~$to_tool_file_cmd in
6206+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
6207+ try_normal_branch=yes
6208+ eval cmd=\"$cmd1\"
6209+ func_len " $cmd"
6210+ len=$func_len_result
6211+ ;;
6212+ *)
6213+ try_normal_branch=no
6214+ ;;
6215+ esac
6216+ if test "$try_normal_branch" = yes \
6217+ && { test "$len" -lt "$max_cmd_len" \
6218+ || test "$max_cmd_len" -le -1; }
6219+ then
6220+ func_show_eval "$cmd" 'exit $?'
6221+ skipped_export=false
6222+ elif test -n "$nm_file_list_spec"; then
6223+ func_basename "$output"
6224+ output_la=$func_basename_result
6225+ save_libobjs=$libobjs
6226+ save_output=$output
6227+ output=${output_objdir}/${output_la}.nm
6228+ func_to_tool_file "$output"
6229+ libobjs=$nm_file_list_spec$func_to_tool_file_result
6230+ func_append delfiles " $output"
6231+ func_verbose "creating $NM input file list: $output"
6232+ for obj in $save_libobjs; do
6233+ func_to_tool_file "$obj"
6234+ $ECHO "$func_to_tool_file_result"
6235+ done > "$output"
6236+ eval cmd=\"$cmd1\"
6237 func_show_eval "$cmd" 'exit $?'
6238+ output=$save_output
6239+ libobjs=$save_libobjs
6240 skipped_export=false
6241 else
6242 # The command line is too long to execute in one step.
6243@@ -7248,7 +8211,7 @@
6244 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6245 tmp_export_symbols="$export_symbols"
6246 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6247- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6248+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6249 fi
6250
6251 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
6252@@ -7260,7 +8223,7 @@
6253 # global variables. join(1) would be nice here, but unfortunately
6254 # isn't a blessed tool.
6255 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6256- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6257+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6258 export_symbols=$output_objdir/$libname.def
6259 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6260 fi
6261@@ -7270,7 +8233,7 @@
6262 case " $convenience " in
6263 *" $test_deplib "*) ;;
6264 *)
6265- tmp_deplibs="$tmp_deplibs $test_deplib"
6266+ func_append tmp_deplibs " $test_deplib"
6267 ;;
6268 esac
6269 done
6270@@ -7286,43 +8249,43 @@
6271 fi
6272 if test -n "$whole_archive_flag_spec"; then
6273 save_libobjs=$libobjs
6274- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6275+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6276 test "X$libobjs" = "X " && libobjs=
6277 else
6278 gentop="$output_objdir/${outputname}x"
6279- generated="$generated $gentop"
6280+ func_append generated " $gentop"
6281
6282 func_extract_archives $gentop $convenience
6283- libobjs="$libobjs $func_extract_archives_result"
6284+ func_append libobjs " $func_extract_archives_result"
6285 test "X$libobjs" = "X " && libobjs=
6286 fi
6287 fi
6288
6289 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
6290- eval "flag=\"$thread_safe_flag_spec\""
6291- linker_flags="$linker_flags $flag"
6292+ eval flag=\"$thread_safe_flag_spec\"
6293+ func_append linker_flags " $flag"
6294 fi
6295
6296 # Make a backup of the uninstalled library when relinking
6297- if test "$mode" = relink; then
6298- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
6299+ if test "$opt_mode" = relink; then
6300+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
6301 fi
6302
6303 # Do each of the archive commands.
6304 if test "$module" = yes && test -n "$module_cmds" ; then
6305 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
6306- eval "test_cmds=\"$module_expsym_cmds\""
6307+ eval test_cmds=\"$module_expsym_cmds\"
6308 cmds=$module_expsym_cmds
6309 else
6310- eval "test_cmds=\"$module_cmds\""
6311+ eval test_cmds=\"$module_cmds\"
6312 cmds=$module_cmds
6313 fi
6314 else
6315 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
6316- eval "test_cmds=\"$archive_expsym_cmds\""
6317+ eval test_cmds=\"$archive_expsym_cmds\"
6318 cmds=$archive_expsym_cmds
6319 else
6320- eval "test_cmds=\"$archive_cmds\""
6321+ eval test_cmds=\"$archive_cmds\"
6322 cmds=$archive_cmds
6323 fi
6324 fi
6325@@ -7366,10 +8329,13 @@
6326 echo 'INPUT (' > $output
6327 for obj in $save_libobjs
6328 do
6329- $ECHO "$obj" >> $output
6330+ func_to_tool_file "$obj"
6331+ $ECHO "$func_to_tool_file_result" >> $output
6332 done
6333 echo ')' >> $output
6334- delfiles="$delfiles $output"
6335+ func_append delfiles " $output"
6336+ func_to_tool_file "$output"
6337+ output=$func_to_tool_file_result
6338 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
6339 output=${output_objdir}/${output_la}.lnk
6340 func_verbose "creating linker input file list: $output"
6341@@ -7383,15 +8349,17 @@
6342 fi
6343 for obj
6344 do
6345- $ECHO "$obj" >> $output
6346+ func_to_tool_file "$obj"
6347+ $ECHO "$func_to_tool_file_result" >> $output
6348 done
6349- delfiles="$delfiles $output"
6350- output=$firstobj\"$file_list_spec$output\"
6351+ func_append delfiles " $output"
6352+ func_to_tool_file "$output"
6353+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
6354 else
6355 if test -n "$save_libobjs"; then
6356 func_verbose "creating reloadable object files..."
6357 output=$output_objdir/$output_la-${k}.$objext
6358- eval "test_cmds=\"$reload_cmds\""
6359+ eval test_cmds=\"$reload_cmds\"
6360 func_len " $test_cmds"
6361 len0=$func_len_result
6362 len=$len0
6363@@ -7411,12 +8379,12 @@
6364 if test "$k" -eq 1 ; then
6365 # The first file doesn't have a previous command to add.
6366 reload_objs=$objlist
6367- eval "concat_cmds=\"$reload_cmds\""
6368+ eval concat_cmds=\"$reload_cmds\"
6369 else
6370 # All subsequent reloadable object files will link in
6371 # the last one created.
6372 reload_objs="$objlist $last_robj"
6373- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
6374+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
6375 fi
6376 last_robj=$output_objdir/$output_la-${k}.$objext
6377 func_arith $k + 1
6378@@ -7433,11 +8401,11 @@
6379 # files will link in the last one created.
6380 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6381 reload_objs="$objlist $last_robj"
6382- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
6383+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
6384 if test -n "$last_robj"; then
6385- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
6386+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
6387 fi
6388- delfiles="$delfiles $output"
6389+ func_append delfiles " $output"
6390
6391 else
6392 output=
6393@@ -7450,9 +8418,9 @@
6394 libobjs=$output
6395 # Append the command to create the export file.
6396 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6397- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
6398+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
6399 if test -n "$last_robj"; then
6400- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
6401+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
6402 fi
6403 fi
6404
6405@@ -7471,7 +8439,7 @@
6406 lt_exit=$?
6407
6408 # Restore the uninstalled library and exit
6409- if test "$mode" = relink; then
6410+ if test "$opt_mode" = relink; then
6411 ( cd "$output_objdir" && \
6412 $RM "${realname}T" && \
6413 $MV "${realname}U" "$realname" )
6414@@ -7492,7 +8460,7 @@
6415 if test -n "$export_symbols" && test -n "$include_expsyms"; then
6416 tmp_export_symbols="$export_symbols"
6417 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
6418- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
6419+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
6420 fi
6421
6422 if test -n "$orig_export_symbols"; then
6423@@ -7504,7 +8472,7 @@
6424 # global variables. join(1) would be nice here, but unfortunately
6425 # isn't a blessed tool.
6426 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
6427- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
6428+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
6429 export_symbols=$output_objdir/$libname.def
6430 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
6431 fi
6432@@ -7515,7 +8483,7 @@
6433 output=$save_output
6434
6435 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
6436- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
6437+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
6438 test "X$libobjs" = "X " && libobjs=
6439 fi
6440 # Expand the library linking commands again to reset the
6441@@ -7539,23 +8507,23 @@
6442
6443 if test -n "$delfiles"; then
6444 # Append the command to remove temporary files to $cmds.
6445- eval "cmds=\"\$cmds~\$RM $delfiles\""
6446+ eval cmds=\"\$cmds~\$RM $delfiles\"
6447 fi
6448
6449 # Add any objects from preloaded convenience libraries
6450 if test -n "$dlprefiles"; then
6451 gentop="$output_objdir/${outputname}x"
6452- generated="$generated $gentop"
6453+ func_append generated " $gentop"
6454
6455 func_extract_archives $gentop $dlprefiles
6456- libobjs="$libobjs $func_extract_archives_result"
6457+ func_append libobjs " $func_extract_archives_result"
6458 test "X$libobjs" = "X " && libobjs=
6459 fi
6460
6461 save_ifs="$IFS"; IFS='~'
6462 for cmd in $cmds; do
6463 IFS="$save_ifs"
6464- eval "cmd=\"$cmd\""
6465+ eval cmd=\"$cmd\"
6466 $opt_silent || {
6467 func_quote_for_expand "$cmd"
6468 eval "func_echo $func_quote_for_expand_result"
6469@@ -7564,7 +8532,7 @@
6470 lt_exit=$?
6471
6472 # Restore the uninstalled library and exit
6473- if test "$mode" = relink; then
6474+ if test "$opt_mode" = relink; then
6475 ( cd "$output_objdir" && \
6476 $RM "${realname}T" && \
6477 $MV "${realname}U" "$realname" )
6478@@ -7576,8 +8544,8 @@
6479 IFS="$save_ifs"
6480
6481 # Restore the uninstalled library and exit
6482- if test "$mode" = relink; then
6483- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
6484+ if test "$opt_mode" = relink; then
6485+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
6486
6487 if test -n "$convenience"; then
6488 if test -z "$whole_archive_flag_spec"; then
6489@@ -7656,17 +8624,20 @@
6490
6491 if test -n "$convenience"; then
6492 if test -n "$whole_archive_flag_spec"; then
6493- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
6494+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
6495 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
6496 else
6497 gentop="$output_objdir/${obj}x"
6498- generated="$generated $gentop"
6499+ func_append generated " $gentop"
6500
6501 func_extract_archives $gentop $convenience
6502 reload_conv_objs="$reload_objs $func_extract_archives_result"
6503 fi
6504 fi
6505
6506+ # If we're not building shared, we need to use non_pic_objs
6507+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
6508+
6509 # Create the old-style object.
6510 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
6511
6512@@ -7690,7 +8661,7 @@
6513 # Create an invalid libtool object if no PIC, so that we don't
6514 # accidentally link it into a program.
6515 # $show "echo timestamp > $libobj"
6516- # $opt_dry_run || echo timestamp > $libobj || exit $?
6517+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
6518 exit $EXIT_SUCCESS
6519 fi
6520
6521@@ -7740,8 +8711,8 @@
6522 if test "$tagname" = CXX ; then
6523 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
6524 10.[0123])
6525- compile_command="$compile_command ${wl}-bind_at_load"
6526- finalize_command="$finalize_command ${wl}-bind_at_load"
6527+ func_append compile_command " ${wl}-bind_at_load"
6528+ func_append finalize_command " ${wl}-bind_at_load"
6529 ;;
6530 esac
6531 fi
6532@@ -7761,7 +8732,7 @@
6533 *)
6534 case " $compile_deplibs " in
6535 *" -L$path/$objdir "*)
6536- new_libs="$new_libs -L$path/$objdir" ;;
6537+ func_append new_libs " -L$path/$objdir" ;;
6538 esac
6539 ;;
6540 esac
6541@@ -7771,17 +8742,17 @@
6542 -L*)
6543 case " $new_libs " in
6544 *" $deplib "*) ;;
6545- *) new_libs="$new_libs $deplib" ;;
6546+ *) func_append new_libs " $deplib" ;;
6547 esac
6548 ;;
6549- *) new_libs="$new_libs $deplib" ;;
6550+ *) func_append new_libs " $deplib" ;;
6551 esac
6552 done
6553 compile_deplibs="$new_libs"
6554
6555
6556- compile_command="$compile_command $compile_deplibs"
6557- finalize_command="$finalize_command $finalize_deplibs"
6558+ func_append compile_command " $compile_deplibs"
6559+ func_append finalize_command " $finalize_deplibs"
6560
6561 if test -n "$rpath$xrpath"; then
6562 # If the user specified any rpath flags, then add them.
6563@@ -7789,7 +8760,7 @@
6564 # This is the magic to use -rpath.
6565 case "$finalize_rpath " in
6566 *" $libdir "*) ;;
6567- *) finalize_rpath="$finalize_rpath $libdir" ;;
6568+ *) func_append finalize_rpath " $libdir" ;;
6569 esac
6570 done
6571 fi
6572@@ -7808,18 +8779,18 @@
6573 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6574 ;;
6575 *)
6576- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6577+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6578 ;;
6579 esac
6580 fi
6581 else
6582- eval "flag=\"$hardcode_libdir_flag_spec\""
6583- rpath="$rpath $flag"
6584+ eval flag=\"$hardcode_libdir_flag_spec\"
6585+ func_append rpath " $flag"
6586 fi
6587 elif test -n "$runpath_var"; then
6588 case "$perm_rpath " in
6589 *" $libdir "*) ;;
6590- *) perm_rpath="$perm_rpath $libdir" ;;
6591+ *) func_append perm_rpath " $libdir" ;;
6592 esac
6593 fi
6594 case $host in
6595@@ -7828,12 +8799,12 @@
6596 case :$dllsearchpath: in
6597 *":$libdir:"*) ;;
6598 ::) dllsearchpath=$libdir;;
6599- *) dllsearchpath="$dllsearchpath:$libdir";;
6600+ *) func_append dllsearchpath ":$libdir";;
6601 esac
6602 case :$dllsearchpath: in
6603 *":$testbindir:"*) ;;
6604 ::) dllsearchpath=$testbindir;;
6605- *) dllsearchpath="$dllsearchpath:$testbindir";;
6606+ *) func_append dllsearchpath ":$testbindir";;
6607 esac
6608 ;;
6609 esac
6610@@ -7842,7 +8813,7 @@
6611 if test -n "$hardcode_libdir_separator" &&
6612 test -n "$hardcode_libdirs"; then
6613 libdir="$hardcode_libdirs"
6614- eval "rpath=\" $hardcode_libdir_flag_spec\""
6615+ eval rpath=\" $hardcode_libdir_flag_spec\"
6616 fi
6617 compile_rpath="$rpath"
6618
6619@@ -7859,18 +8830,18 @@
6620 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
6621 ;;
6622 *)
6623- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
6624+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
6625 ;;
6626 esac
6627 fi
6628 else
6629- eval "flag=\"$hardcode_libdir_flag_spec\""
6630- rpath="$rpath $flag"
6631+ eval flag=\"$hardcode_libdir_flag_spec\"
6632+ func_append rpath " $flag"
6633 fi
6634 elif test -n "$runpath_var"; then
6635 case "$finalize_perm_rpath " in
6636 *" $libdir "*) ;;
6637- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
6638+ *) func_append finalize_perm_rpath " $libdir" ;;
6639 esac
6640 fi
6641 done
6642@@ -7878,7 +8849,7 @@
6643 if test -n "$hardcode_libdir_separator" &&
6644 test -n "$hardcode_libdirs"; then
6645 libdir="$hardcode_libdirs"
6646- eval "rpath=\" $hardcode_libdir_flag_spec\""
6647+ eval rpath=\" $hardcode_libdir_flag_spec\"
6648 fi
6649 finalize_rpath="$rpath"
6650
6651@@ -7921,6 +8892,12 @@
6652 exit_status=0
6653 func_show_eval "$link_command" 'exit_status=$?'
6654
6655+ if test -n "$postlink_cmds"; then
6656+ func_to_tool_file "$output"
6657+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6658+ func_execute_cmds "$postlink_cmds" 'exit $?'
6659+ fi
6660+
6661 # Delete the generated files.
6662 if test -f "$output_objdir/${outputname}S.${objext}"; then
6663 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
6664@@ -7943,7 +8920,7 @@
6665 # We should set the runpath_var.
6666 rpath=
6667 for dir in $perm_rpath; do
6668- rpath="$rpath$dir:"
6669+ func_append rpath "$dir:"
6670 done
6671 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
6672 fi
6673@@ -7951,7 +8928,7 @@
6674 # We should set the runpath_var.
6675 rpath=
6676 for dir in $finalize_perm_rpath; do
6677- rpath="$rpath$dir:"
6678+ func_append rpath "$dir:"
6679 done
6680 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
6681 fi
6682@@ -7966,6 +8943,13 @@
6683 $opt_dry_run || $RM $output
6684 # Link the executable and exit
6685 func_show_eval "$link_command" 'exit $?'
6686+
6687+ if test -n "$postlink_cmds"; then
6688+ func_to_tool_file "$output"
6689+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6690+ func_execute_cmds "$postlink_cmds" 'exit $?'
6691+ fi
6692+
6693 exit $EXIT_SUCCESS
6694 fi
6695
6696@@ -7999,6 +8983,12 @@
6697
6698 func_show_eval "$link_command" 'exit $?'
6699
6700+ if test -n "$postlink_cmds"; then
6701+ func_to_tool_file "$output_objdir/$outputname"
6702+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
6703+ func_execute_cmds "$postlink_cmds" 'exit $?'
6704+ fi
6705+
6706 # Now create the wrapper script.
6707 func_verbose "creating $output"
6708
6709@@ -8096,7 +9086,7 @@
6710 else
6711 oldobjs="$old_deplibs $non_pic_objects"
6712 if test "$preload" = yes && test -f "$symfileobj"; then
6713- oldobjs="$oldobjs $symfileobj"
6714+ func_append oldobjs " $symfileobj"
6715 fi
6716 fi
6717 addlibs="$old_convenience"
6718@@ -8104,10 +9094,10 @@
6719
6720 if test -n "$addlibs"; then
6721 gentop="$output_objdir/${outputname}x"
6722- generated="$generated $gentop"
6723+ func_append generated " $gentop"
6724
6725 func_extract_archives $gentop $addlibs
6726- oldobjs="$oldobjs $func_extract_archives_result"
6727+ func_append oldobjs " $func_extract_archives_result"
6728 fi
6729
6730 # Do each command in the archive commands.
6731@@ -8118,10 +9108,10 @@
6732 # Add any objects from preloaded convenience libraries
6733 if test -n "$dlprefiles"; then
6734 gentop="$output_objdir/${outputname}x"
6735- generated="$generated $gentop"
6736+ func_append generated " $gentop"
6737
6738 func_extract_archives $gentop $dlprefiles
6739- oldobjs="$oldobjs $func_extract_archives_result"
6740+ func_append oldobjs " $func_extract_archives_result"
6741 fi
6742
6743 # POSIX demands no paths to be encoded in archives. We have
6744@@ -8139,7 +9129,7 @@
6745 else
6746 echo "copying selected object files to avoid basename conflicts..."
6747 gentop="$output_objdir/${outputname}x"
6748- generated="$generated $gentop"
6749+ func_append generated " $gentop"
6750 func_mkdir_p "$gentop"
6751 save_oldobjs=$oldobjs
6752 oldobjs=
6753@@ -8163,18 +9153,28 @@
6754 esac
6755 done
6756 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
6757- oldobjs="$oldobjs $gentop/$newobj"
6758+ func_append oldobjs " $gentop/$newobj"
6759 ;;
6760- *) oldobjs="$oldobjs $obj" ;;
6761+ *) func_append oldobjs " $obj" ;;
6762 esac
6763 done
6764 fi
6765- eval "cmds=\"$old_archive_cmds\""
6766+ eval cmds=\"$old_archive_cmds\"
6767
6768 func_len " $cmds"
6769 len=$func_len_result
6770 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
6771 cmds=$old_archive_cmds
6772+ elif test -n "$archiver_list_spec"; then
6773+ func_verbose "using command file archive linking..."
6774+ for obj in $oldobjs
6775+ do
6776+ func_to_tool_file "$obj"
6777+ $ECHO "$func_to_tool_file_result"
6778+ done > $output_objdir/$libname.libcmd
6779+ func_to_tool_file "$output_objdir/$libname.libcmd"
6780+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
6781+ cmds=$old_archive_cmds
6782 else
6783 # the command line is too long to link in one step, link in parts
6784 func_verbose "using piecewise archive linking..."
6785@@ -8189,7 +9189,7 @@
6786 do
6787 last_oldobj=$obj
6788 done
6789- eval "test_cmds=\"$old_archive_cmds\""
6790+ eval test_cmds=\"$old_archive_cmds\"
6791 func_len " $test_cmds"
6792 len0=$func_len_result
6793 len=$len0
6794@@ -8208,7 +9208,7 @@
6795 RANLIB=$save_RANLIB
6796 fi
6797 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
6798- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
6799+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
6800 objlist=
6801 len=$len0
6802 fi
6803@@ -8216,9 +9216,9 @@
6804 RANLIB=$save_RANLIB
6805 oldobjs=$objlist
6806 if test "X$oldobjs" = "X" ; then
6807- eval "cmds=\"\$concat_cmds\""
6808+ eval cmds=\"\$concat_cmds\"
6809 else
6810- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
6811+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
6812 fi
6813 fi
6814 fi
6815@@ -8268,12 +9268,23 @@
6816 *.la)
6817 func_basename "$deplib"
6818 name="$func_basename_result"
6819- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
6820+ func_resolve_sysroot "$deplib"
6821+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6822 test -z "$libdir" && \
6823 func_fatal_error "\`$deplib' is not a valid libtool archive"
6824- newdependency_libs="$newdependency_libs $libdir/$name"
6825+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
6826+ ;;
6827+ -L*)
6828+ func_stripname -L '' "$deplib"
6829+ func_replace_sysroot "$func_stripname_result"
6830+ func_append newdependency_libs " -L$func_replace_sysroot_result"
6831 ;;
6832- *) newdependency_libs="$newdependency_libs $deplib" ;;
6833+ -R*)
6834+ func_stripname -R '' "$deplib"
6835+ func_replace_sysroot "$func_stripname_result"
6836+ func_append newdependency_libs " -R$func_replace_sysroot_result"
6837+ ;;
6838+ *) func_append newdependency_libs " $deplib" ;;
6839 esac
6840 done
6841 dependency_libs="$newdependency_libs"
6842@@ -8284,12 +9295,14 @@
6843 *.la)
6844 func_basename "$lib"
6845 name="$func_basename_result"
6846- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6847+ func_resolve_sysroot "$lib"
6848+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6849+
6850 test -z "$libdir" && \
6851 func_fatal_error "\`$lib' is not a valid libtool archive"
6852- newdlfiles="$newdlfiles $libdir/$name"
6853+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
6854 ;;
6855- *) newdlfiles="$newdlfiles $lib" ;;
6856+ *) func_append newdlfiles " $lib" ;;
6857 esac
6858 done
6859 dlfiles="$newdlfiles"
6860@@ -8303,10 +9316,11 @@
6861 # the library:
6862 func_basename "$lib"
6863 name="$func_basename_result"
6864- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
6865+ func_resolve_sysroot "$lib"
6866+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
6867 test -z "$libdir" && \
6868 func_fatal_error "\`$lib' is not a valid libtool archive"
6869- newdlprefiles="$newdlprefiles $libdir/$name"
6870+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
6871 ;;
6872 esac
6873 done
6874@@ -8318,7 +9332,7 @@
6875 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6876 *) abs=`pwd`"/$lib" ;;
6877 esac
6878- newdlfiles="$newdlfiles $abs"
6879+ func_append newdlfiles " $abs"
6880 done
6881 dlfiles="$newdlfiles"
6882 newdlprefiles=
6883@@ -8327,7 +9341,7 @@
6884 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
6885 *) abs=`pwd`"/$lib" ;;
6886 esac
6887- newdlprefiles="$newdlprefiles $abs"
6888+ func_append newdlprefiles " $abs"
6889 done
6890 dlprefiles="$newdlprefiles"
6891 fi
6892@@ -8412,7 +9426,7 @@
6893 exit $EXIT_SUCCESS
6894 }
6895
6896-{ test "$mode" = link || test "$mode" = relink; } &&
6897+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
6898 func_mode_link ${1+"$@"}
6899
6900
6901@@ -8432,9 +9446,9 @@
6902 for arg
6903 do
6904 case $arg in
6905- -f) RM="$RM $arg"; rmforce=yes ;;
6906- -*) RM="$RM $arg" ;;
6907- *) files="$files $arg" ;;
6908+ -f) func_append RM " $arg"; rmforce=yes ;;
6909+ -*) func_append RM " $arg" ;;
6910+ *) func_append files " $arg" ;;
6911 esac
6912 done
6913
6914@@ -8443,24 +9457,23 @@
6915
6916 rmdirs=
6917
6918- origobjdir="$objdir"
6919 for file in $files; do
6920 func_dirname "$file" "" "."
6921 dir="$func_dirname_result"
6922 if test "X$dir" = X.; then
6923- objdir="$origobjdir"
6924+ odir="$objdir"
6925 else
6926- objdir="$dir/$origobjdir"
6927+ odir="$dir/$objdir"
6928 fi
6929 func_basename "$file"
6930 name="$func_basename_result"
6931- test "$mode" = uninstall && objdir="$dir"
6932+ test "$opt_mode" = uninstall && odir="$dir"
6933
6934- # Remember objdir for removal later, being careful to avoid duplicates
6935- if test "$mode" = clean; then
6936+ # Remember odir for removal later, being careful to avoid duplicates
6937+ if test "$opt_mode" = clean; then
6938 case " $rmdirs " in
6939- *" $objdir "*) ;;
6940- *) rmdirs="$rmdirs $objdir" ;;
6941+ *" $odir "*) ;;
6942+ *) func_append rmdirs " $odir" ;;
6943 esac
6944 fi
6945
6946@@ -8486,18 +9499,17 @@
6947
6948 # Delete the libtool libraries and symlinks.
6949 for n in $library_names; do
6950- rmfiles="$rmfiles $objdir/$n"
6951+ func_append rmfiles " $odir/$n"
6952 done
6953- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
6954+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
6955
6956- case "$mode" in
6957+ case "$opt_mode" in
6958 clean)
6959- case " $library_names " in
6960- # " " in the beginning catches empty $dlname
6961+ case " $library_names " in
6962 *" $dlname "*) ;;
6963- *) rmfiles="$rmfiles $objdir/$dlname" ;;
6964+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
6965 esac
6966- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
6967+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
6968 ;;
6969 uninstall)
6970 if test -n "$library_names"; then
6971@@ -8525,19 +9537,19 @@
6972 # Add PIC object to the list of files to remove.
6973 if test -n "$pic_object" &&
6974 test "$pic_object" != none; then
6975- rmfiles="$rmfiles $dir/$pic_object"
6976+ func_append rmfiles " $dir/$pic_object"
6977 fi
6978
6979 # Add non-PIC object to the list of files to remove.
6980 if test -n "$non_pic_object" &&
6981 test "$non_pic_object" != none; then
6982- rmfiles="$rmfiles $dir/$non_pic_object"
6983+ func_append rmfiles " $dir/$non_pic_object"
6984 fi
6985 fi
6986 ;;
6987
6988 *)
6989- if test "$mode" = clean ; then
6990+ if test "$opt_mode" = clean ; then
6991 noexename=$name
6992 case $file in
6993 *.exe)
6994@@ -8547,7 +9559,7 @@
6995 noexename=$func_stripname_result
6996 # $file with .exe has already been added to rmfiles,
6997 # add $file without .exe
6998- rmfiles="$rmfiles $file"
6999+ func_append rmfiles " $file"
7000 ;;
7001 esac
7002 # Do a test to see if this is a libtool program.
7003@@ -8556,7 +9568,7 @@
7004 func_ltwrapper_scriptname "$file"
7005 relink_command=
7006 func_source $func_ltwrapper_scriptname_result
7007- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
7008+ func_append rmfiles " $func_ltwrapper_scriptname_result"
7009 else
7010 relink_command=
7011 func_source $dir/$noexename
7012@@ -8564,12 +9576,12 @@
7013
7014 # note $name still contains .exe if it was in $file originally
7015 # as does the version of $file that was added into $rmfiles
7016- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
7017+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
7018 if test "$fast_install" = yes && test -n "$relink_command"; then
7019- rmfiles="$rmfiles $objdir/lt-$name"
7020+ func_append rmfiles " $odir/lt-$name"
7021 fi
7022 if test "X$noexename" != "X$name" ; then
7023- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
7024+ func_append rmfiles " $odir/lt-${noexename}.c"
7025 fi
7026 fi
7027 fi
7028@@ -8577,7 +9589,6 @@
7029 esac
7030 func_show_eval "$RM $rmfiles" 'exit_status=1'
7031 done
7032- objdir="$origobjdir"
7033
7034 # Try to remove the ${objdir}s in the directories where we deleted files
7035 for dir in $rmdirs; do
7036@@ -8589,16 +9600,16 @@
7037 exit $exit_status
7038 }
7039
7040-{ test "$mode" = uninstall || test "$mode" = clean; } &&
7041+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
7042 func_mode_uninstall ${1+"$@"}
7043
7044-test -z "$mode" && {
7045+test -z "$opt_mode" && {
7046 help="$generic_help"
7047 func_fatal_help "you must specify a MODE"
7048 }
7049
7050 test -z "$exec_cmd" && \
7051- func_fatal_help "invalid operation mode \`$mode'"
7052+ func_fatal_help "invalid operation mode \`$opt_mode'"
7053
7054 if test -n "$exec_cmd"; then
7055 eval exec "$exec_cmd"
7056Index: binutils-2.24/ltoptions.m4
7057===================================================================
7058--- binutils-2.24.orig/ltoptions.m4 2013-11-04 07:33:40.000000000 -0800
7059+++ binutils-2.24/ltoptions.m4 2013-12-15 11:10:23.867118697 -0800
7060@@ -8,7 +8,7 @@
7061 # unlimited permission to copy and/or distribute it, with or without
7062 # modifications, as long as this notice is preserved.
7063
7064-# serial 6 ltoptions.m4
7065+# serial 7 ltoptions.m4
7066
7067 # This is to help aclocal find these macros, as it can't see m4_define.
7068 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
7069Index: binutils-2.24/ltversion.m4
7070===================================================================
7071--- binutils-2.24.orig/ltversion.m4 2013-11-04 07:33:40.000000000 -0800
7072+++ binutils-2.24/ltversion.m4 2013-12-15 11:10:23.867118697 -0800
7073@@ -7,17 +7,17 @@
7074 # unlimited permission to copy and/or distribute it, with or without
7075 # modifications, as long as this notice is preserved.
7076
7077-# Generated from ltversion.in.
7078+# @configure_input@
7079
7080-# serial 3134 ltversion.m4
7081+# serial 3293 ltversion.m4
7082 # This file is part of GNU Libtool
7083
7084-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
7085-m4_define([LT_PACKAGE_REVISION], [1.3134])
7086+m4_define([LT_PACKAGE_VERSION], [2.4])
7087+m4_define([LT_PACKAGE_REVISION], [1.3293])
7088
7089 AC_DEFUN([LTVERSION_VERSION],
7090-[macro_version='2.2.7a'
7091-macro_revision='1.3134'
7092+[macro_version='2.4'
7093+macro_revision='1.3293'
7094 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
7095 _LT_DECL(, macro_revision, 0)
7096 ])
7097Index: binutils-2.24/lt~obsolete.m4
7098===================================================================
7099--- binutils-2.24.orig/lt~obsolete.m4 2013-11-04 07:33:40.000000000 -0800
7100+++ binutils-2.24/lt~obsolete.m4 2013-12-15 11:10:23.867118697 -0800
7101@@ -7,7 +7,7 @@
7102 # unlimited permission to copy and/or distribute it, with or without
7103 # modifications, as long as this notice is preserved.
7104
7105-# serial 4 lt~obsolete.m4
7106+# serial 5 lt~obsolete.m4
7107
7108 # These exist entirely to fool aclocal when bootstrapping libtool.
7109 #
7110Index: binutils-2.24/configure
7111===================================================================
7112--- binutils-2.24.orig/configure 2013-12-15 11:09:51.000000000 -0800
7113+++ binutils-2.24/configure 2013-12-15 11:10:23.870452030 -0800
7114@@ -7921,7 +7921,7 @@
7115 # For an installed makeinfo, we require it to be from texinfo 4.7 or
7116 # higher, else we use the "missing" dummy.
7117 if ${MAKEINFO} --version \
7118- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
7119+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4.[4-9]|4.[1-9][0-9]+|[5-9])' >/dev/null 2>&1; then
7120 :
7121 else
7122 MAKEINFO="$MISSING makeinfo"
7123Index: binutils-2.24/bfd/configure
7124===================================================================
7125--- binutils-2.24.orig/bfd/configure 2013-12-02 01:30:30.000000000 -0800
7126+++ binutils-2.24/bfd/configure 2013-12-15 11:10:23.870452030 -0800
7127@@ -668,6 +668,9 @@
7128 LIPO 33 LIPO
7129 NMEDIT 34 NMEDIT
7130 DSYMUTIL 35 DSYMUTIL
@@ -7134,7 +39,7 @@ Index: binutils-2.24/bfd/configure
7134 OBJDUMP 39 OBJDUMP
7135 LN_S 40 LN_S
7136 NM 41 NM
7137@@ -780,6 +783,7 @@ 42@@ -780,6 +783,7 @@ enable_static
7138 with_pic 43 with_pic
7139 enable_fast_install 44 enable_fast_install
7140 with_gnu_ld 45 with_gnu_ld
@@ -7142,7 +47,7 @@ Index: binutils-2.24/bfd/configure
7142 enable_libtool_lock 47 enable_libtool_lock
7143 enable_plugins 48 enable_plugins
7144 enable_largefile 49 enable_largefile
7145@@ -1456,6 +1460,8 @@ 50@@ -1456,6 +1460,8 @@ Optional Packages:
7146 --with-pic try to use only PIC/non-PIC objects [default=use 51 --with-pic try to use only PIC/non-PIC objects [default=use
7147 both] 52 both]
7148 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 53 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -7151,7 +56,7 @@ Index: binutils-2.24/bfd/configure
7151 --with-mmap try using mmap for BFD input files if available 56 --with-mmap try using mmap for BFD input files if available
7152 --with-separate-debug-dir=DIR 57 --with-separate-debug-dir=DIR
7153 Look for global separate debug info in DIR 58 Look for global separate debug info in DIR
7154@@ -5386,8 +5392,8 @@ 59@@ -5386,8 +5392,8 @@ esac
7155 60
7156 61
7157 62
@@ -7162,7 +67,7 @@ Index: binutils-2.24/bfd/configure
7162 67
7163 68
7164 69
7165@@ -5427,7 +5433,7 @@ 70@@ -5427,7 +5433,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7166 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7167 $as_echo_n "checking how to print strings... " >&6; } 72 $as_echo_n "checking how to print strings... " >&6; }
7168 # Test print first, because it will be a builtin if present. 73 # Test print first, because it will be a builtin if present.
@@ -7171,7 +76,7 @@ Index: binutils-2.24/bfd/configure
7171 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7172 ECHO='print -r --' 77 ECHO='print -r --'
7173 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7174@@ -6113,8 +6119,8 @@ 79@@ -6113,8 +6119,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7175 # Try some XSI features 80 # Try some XSI features
7176 xsi_shell=no 81 xsi_shell=no
7177 ( _lt_dummy="a/b/c" 82 ( _lt_dummy="a/b/c"
@@ -7182,7 +87,7 @@ Index: binutils-2.24/bfd/configure
7182 && eval 'test $(( 1 + 1 )) -eq 2 \ 87 && eval 'test $(( 1 + 1 )) -eq 2 \
7183 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7184 && xsi_shell=yes 89 && xsi_shell=yes
7185@@ -6163,6 +6169,80 @@ 90@@ -6163,6 +6169,80 @@ esac
7186 91
7187 92
7188 93
@@ -7263,7 +168,7 @@ Index: binutils-2.24/bfd/configure
7263 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7264 $as_echo_n "checking for $LD option to reload object files... " >&6; } 169 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7265 if test "${lt_cv_ld_reload_flag+set}" = set; then : 170 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7266@@ -6179,6 +6259,11 @@ 171@@ -6179,6 +6259,11 @@ case $reload_flag in
7267 esac 172 esac
7268 reload_cmds='$LD$reload_flag -o $output$reload_objs' 173 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7269 case $host_os in 174 case $host_os in
@@ -7275,7 +180,7 @@ Index: binutils-2.24/bfd/configure
7275 darwin*) 180 darwin*)
7276 if test "$GCC" = yes; then 181 if test "$GCC" = yes; then
7277 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7278@@ -6347,7 +6432,8 @@ 183@@ -6347,7 +6432,8 @@ mingw* | pw32*)
7279 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7280 lt_cv_file_magic_cmd='func_win32_libid' 185 lt_cv_file_magic_cmd='func_win32_libid'
7281 else 186 else
@@ -7285,7 +190,7 @@ Index: binutils-2.24/bfd/configure
7285 lt_cv_file_magic_cmd='$OBJDUMP -f' 190 lt_cv_file_magic_cmd='$OBJDUMP -f'
7286 fi 191 fi
7287 ;; 192 ;;
7288@@ -6501,6 +6587,21 @@ 193@@ -6501,6 +6587,21 @@ esac
7289 fi 194 fi
7290 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7291 $as_echo "$lt_cv_deplibs_check_method" >&6; } 196 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7307,7 +212,7 @@ Index: binutils-2.24/bfd/configure
7307 file_magic_cmd=$lt_cv_file_magic_cmd 212 file_magic_cmd=$lt_cv_file_magic_cmd
7308 deplibs_check_method=$lt_cv_deplibs_check_method 213 deplibs_check_method=$lt_cv_deplibs_check_method
7309 test -z "$deplibs_check_method" && deplibs_check_method=unknown 214 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7310@@ -6516,9 +6617,162 @@ 215@@ -6516,9 +6617,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7311 216
7312 217
7313 218
@@ -7472,7 +377,7 @@ Index: binutils-2.24/bfd/configure
7472 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7473 $as_echo_n "checking for $ac_word... " >&6; } 378 $as_echo_n "checking for $ac_word... " >&6; }
7474 if test "${ac_cv_prog_AR+set}" = set; then : 379 if test "${ac_cv_prog_AR+set}" = set; then :
7475@@ -6534,7 +6788,7 @@ 380@@ -6534,7 +6788,7 @@ do
7476 test -z "$as_dir" && as_dir=. 381 test -z "$as_dir" && as_dir=.
7477 for ac_exec_ext in '' $ac_executable_extensions; do 382 for ac_exec_ext in '' $ac_executable_extensions; do
7478 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 383 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -7481,7 +386,7 @@ Index: binutils-2.24/bfd/configure
7481 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7482 break 2 387 break 2
7483 fi 388 fi
7484@@ -6554,11 +6808,15 @@ 389@@ -6554,11 +6808,15 @@ $as_echo "no" >&6; }
7485 fi 390 fi
7486 391
7487 392
@@ -7500,7 +405,7 @@ Index: binutils-2.24/bfd/configure
7500 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7501 $as_echo_n "checking for $ac_word... " >&6; } 406 $as_echo_n "checking for $ac_word... " >&6; }
7502 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 407 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
7503@@ -6574,7 +6832,7 @@ 408@@ -6574,7 +6832,7 @@ do
7504 test -z "$as_dir" && as_dir=. 409 test -z "$as_dir" && as_dir=.
7505 for ac_exec_ext in '' $ac_executable_extensions; do 410 for ac_exec_ext in '' $ac_executable_extensions; do
7506 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 411 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -7509,7 +414,7 @@ Index: binutils-2.24/bfd/configure
7509 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 414 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7510 break 2 415 break 2
7511 fi 416 fi
7512@@ -6593,6 +6851,10 @@ 417@@ -6593,6 +6851,10 @@ else
7513 $as_echo "no" >&6; } 418 $as_echo "no" >&6; }
7514 fi 419 fi
7515 420
@@ -7520,7 +425,7 @@ Index: binutils-2.24/bfd/configure
7520 if test "x$ac_ct_AR" = x; then 425 if test "x$ac_ct_AR" = x; then
7521 AR="false" 426 AR="false"
7522 else 427 else
7523@@ -6604,16 +6866,72 @@ 428@@ -6604,16 +6866,72 @@ ac_tool_warned=yes ;;
7524 esac 429 esac
7525 AR=$ac_ct_AR 430 AR=$ac_ct_AR
7526 fi 431 fi
@@ -7542,7 +447,7 @@ Index: binutils-2.24/bfd/configure
7542+ 447+
7543+ 448+
7544+ 449+
7545 450+
7546+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 451+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
7547+$as_echo_n "checking for archiver @FILE support... " >&6; } 452+$as_echo_n "checking for archiver @FILE support... " >&6; }
7548+if test "${lt_cv_ar_at_file+set}" = set; then : 453+if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -7551,7 +456,7 @@ Index: binutils-2.24/bfd/configure
7551+ lt_cv_ar_at_file=no 456+ lt_cv_ar_at_file=no
7552+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 457+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7553+/* end confdefs.h. */ 458+/* end confdefs.h. */
7554 459+
7555+int 460+int
7556+main () 461+main ()
7557+{ 462+{
@@ -7584,11 +489,11 @@ Index: binutils-2.24/bfd/configure
7584 489
7585+fi 490+fi
7586+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 491+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7587+ 492
7588+fi 493+fi
7589+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 494+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
7590+$as_echo "$lt_cv_ar_at_file" >&6; } 495+$as_echo "$lt_cv_ar_at_file" >&6; }
7591+ 496
7592+if test "x$lt_cv_ar_at_file" = xno; then 497+if test "x$lt_cv_ar_at_file" = xno; then
7593+ archiver_list_spec= 498+ archiver_list_spec=
7594+else 499+else
@@ -7597,7 +502,7 @@ Index: binutils-2.24/bfd/configure
7597 502
7598 503
7599 504
7600@@ -6955,8 +7273,8 @@ 505@@ -6955,8 +7273,8 @@ esac
7601 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 506 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
7602 507
7603 # Transform an extracted symbol line into symbol name and symbol address 508 # Transform an extracted symbol line into symbol name and symbol address
@@ -7608,7 +513,7 @@ Index: binutils-2.24/bfd/configure
7608 513
7609 # Handle CRLF in mingw tool chain 514 # Handle CRLF in mingw tool chain
7610 opt_cr= 515 opt_cr=
7611@@ -6992,6 +7310,7 @@ 516@@ -6992,6 +7310,7 @@ for ac_symprfx in "" "_"; do
7612 else 517 else
7613 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 518 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
7614 fi 519 fi
@@ -7616,7 +521,7 @@ Index: binutils-2.24/bfd/configure
7616 521
7617 # Check to see that the pipe works correctly. 522 # Check to see that the pipe works correctly.
7618 pipe_works=no 523 pipe_works=no
7619@@ -7033,6 +7352,18 @@ 524@@ -7033,6 +7352,18 @@ _LT_EOF
7620 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 525 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
7621 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 526 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
7622 cat <<_LT_EOF > conftest.$ac_ext 527 cat <<_LT_EOF > conftest.$ac_ext
@@ -7635,7 +540,7 @@ Index: binutils-2.24/bfd/configure
7635 #ifdef __cplusplus 540 #ifdef __cplusplus
7636 extern "C" { 541 extern "C" {
7637 #endif 542 #endif
7638@@ -7044,7 +7375,7 @@ 543@@ -7044,7 +7375,7 @@ _LT_EOF
7639 cat <<_LT_EOF >> conftest.$ac_ext 544 cat <<_LT_EOF >> conftest.$ac_ext
7640 545
7641 /* The mapping between symbol names and symbols. */ 546 /* The mapping between symbol names and symbols. */
@@ -7644,7 +549,7 @@ Index: binutils-2.24/bfd/configure
7644 const char *name; 549 const char *name;
7645 void *address; 550 void *address;
7646 } 551 }
7647@@ -7070,8 +7401,8 @@ 552@@ -7070,8 +7401,8 @@ static const void *lt_preloaded_setup() {
7648 _LT_EOF 553 _LT_EOF
7649 # Now try linking the two files. 554 # Now try linking the two files.
7650 mv conftest.$ac_objext conftstm.$ac_objext 555 mv conftest.$ac_objext conftstm.$ac_objext
@@ -7655,7 +560,7 @@ Index: binutils-2.24/bfd/configure
7655 LIBS="conftstm.$ac_objext" 560 LIBS="conftstm.$ac_objext"
7656 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 561 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
7657 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 562 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7658@@ -7081,8 +7412,8 @@ 563@@ -7081,8 +7412,8 @@ _LT_EOF
7659 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 564 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
7660 pipe_works=yes 565 pipe_works=yes
7661 fi 566 fi
@@ -7666,7 +571,7 @@ Index: binutils-2.24/bfd/configure
7666 else 571 else
7667 echo "cannot find nm_test_func in $nlist" >&5 572 echo "cannot find nm_test_func in $nlist" >&5
7668 fi 573 fi
7669@@ -7119,6 +7450,20 @@ 574@@ -7119,6 +7450,16 @@ else
7670 $as_echo "ok" >&6; } 575 $as_echo "ok" >&6; }
7671 fi 576 fi
7672 577
@@ -7680,17 +585,15 @@ Index: binutils-2.24/bfd/configure
7680+ 585+
7681+ 586+
7682+ 587+
7683+
7684+
7685+
7686+
7687 588
7688 589
7689 590
7690@@ -7138,6 +7483,41 @@ 591@@ -7140,6 +7481,45 @@ fi
7691 592
7692 593
7693 594
595+
596+
7694+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 597+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
7695+$as_echo_n "checking for sysroot... " >&6; } 598+$as_echo_n "checking for sysroot... " >&6; }
7696+ 599+
@@ -7726,10 +629,12 @@ Index: binutils-2.24/bfd/configure
7726+ 629+
7727+ 630+
7728+ 631+
7729 632+
7730 633+
7731 # Check whether --enable-libtool-lock was given. 634 # Check whether --enable-libtool-lock was given.
7732@@ -7346,6 +7726,123 @@ 635 if test "${enable_libtool_lock+set}" = set; then :
636 enableval=$enable_libtool_lock;
637@@ -7346,6 +7726,123 @@ esac
7733 638
7734 need_locks="$enable_libtool_lock" 639 need_locks="$enable_libtool_lock"
7735 640
@@ -7853,7 +758,7 @@ Index: binutils-2.24/bfd/configure
7853 758
7854 case $host_os in 759 case $host_os in
7855 rhapsody* | darwin*) 760 rhapsody* | darwin*)
7856@@ -7909,6 +8406,8 @@ 761@@ -7909,6 +8406,8 @@ _LT_EOF
7857 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 762 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
7858 echo "$AR cru libconftest.a conftest.o" >&5 763 echo "$AR cru libconftest.a conftest.o" >&5
7859 $AR cru libconftest.a conftest.o 2>&5 764 $AR cru libconftest.a conftest.o 2>&5
@@ -7862,7 +767,7 @@ Index: binutils-2.24/bfd/configure
7862 cat > conftest.c << _LT_EOF 767 cat > conftest.c << _LT_EOF
7863 int main() { return 0;} 768 int main() { return 0;}
7864 _LT_EOF 769 _LT_EOF
7865@@ -8073,7 +8572,8 @@ 770@@ -8073,7 +8572,8 @@ fi
7866 LIBTOOL_DEPS="$ltmain" 771 LIBTOOL_DEPS="$ltmain"
7867 772
7868 # Always use our own libtool. 773 # Always use our own libtool.
@@ -7872,7 +777,7 @@ Index: binutils-2.24/bfd/configure
7872 777
7873 778
7874 779
7875@@ -8162,7 +8662,7 @@ 780@@ -8162,7 +8662,7 @@ aix3*)
7876 esac 781 esac
7877 782
7878 # Global variables: 783 # Global variables:
@@ -7881,7 +786,7 @@ Index: binutils-2.24/bfd/configure
7881 can_build_shared=yes 786 can_build_shared=yes
7882 787
7883 # All known linkers require a `.a' archive for static linking (except MSVC, 788 # All known linkers require a `.a' archive for static linking (except MSVC,
7884@@ -8460,8 +8960,6 @@ 789@@ -8460,8 +8960,6 @@ fi
7885 lt_prog_compiler_pic= 790 lt_prog_compiler_pic=
7886 lt_prog_compiler_static= 791 lt_prog_compiler_static=
7887 792
@@ -7890,7 +795,7 @@ Index: binutils-2.24/bfd/configure
7890 795
7891 if test "$GCC" = yes; then 796 if test "$GCC" = yes; then
7892 lt_prog_compiler_wl='-Wl,' 797 lt_prog_compiler_wl='-Wl,'
7893@@ -8627,6 +9125,12 @@ 798@@ -8627,6 +9125,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7894 lt_prog_compiler_pic='--shared' 799 lt_prog_compiler_pic='--shared'
7895 lt_prog_compiler_static='--static' 800 lt_prog_compiler_static='--static'
7896 ;; 801 ;;
@@ -7903,7 +808,7 @@ Index: binutils-2.24/bfd/configure
7903 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 808 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
7904 # Portland Group compilers (*not* the Pentium gcc compiler, 809 # Portland Group compilers (*not* the Pentium gcc compiler,
7905 # which looks to be a dead project) 810 # which looks to be a dead project)
7906@@ -8689,7 +9193,7 @@ 811@@ -8689,7 +9193,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7907 lt_prog_compiler_pic='-KPIC' 812 lt_prog_compiler_pic='-KPIC'
7908 lt_prog_compiler_static='-Bstatic' 813 lt_prog_compiler_static='-Bstatic'
7909 case $cc_basename in 814 case $cc_basename in
@@ -7912,7 +817,7 @@ Index: binutils-2.24/bfd/configure
7912 lt_prog_compiler_wl='-Qoption ld ';; 817 lt_prog_compiler_wl='-Qoption ld ';;
7913 *) 818 *)
7914 lt_prog_compiler_wl='-Wl,';; 819 lt_prog_compiler_wl='-Wl,';;
7915@@ -8746,13 +9250,17 @@ 820@@ -8746,13 +9250,17 @@ case $host_os in
7916 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 821 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
7917 ;; 822 ;;
7918 esac 823 esac
@@ -7936,7 +841,7 @@ Index: binutils-2.24/bfd/configure
7936 841
7937 # 842 #
7938 # Check to make sure the PIC flag actually works. 843 # Check to make sure the PIC flag actually works.
7939@@ -8813,6 +9321,11 @@ 844@@ -8813,6 +9321,11 @@ fi
7940 845
7941 846
7942 847
@@ -7948,7 +853,7 @@ Index: binutils-2.24/bfd/configure
7948 # 853 #
7949 # Check to make sure the static flag actually works. 854 # Check to make sure the static flag actually works.
7950 # 855 #
7951@@ -9163,7 +9676,8 @@ 856@@ -9163,7 +9676,8 @@ _LT_EOF
7952 allow_undefined_flag=unsupported 857 allow_undefined_flag=unsupported
7953 always_export_symbols=no 858 always_export_symbols=no
7954 enable_shared_with_static_runtimes=yes 859 enable_shared_with_static_runtimes=yes
@@ -7958,7 +863,7 @@ Index: binutils-2.24/bfd/configure
7958 863
7959 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 864 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
7960 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 865 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
7961@@ -9211,7 +9725,7 @@ 866@@ -9211,7 +9725,7 @@ _LT_EOF
7962 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ 867 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
7963 && test "$tmp_diet" = no 868 && test "$tmp_diet" = no
7964 then 869 then
@@ -7967,7 +872,7 @@ Index: binutils-2.24/bfd/configure
7967 tmp_sharedflag='-shared' 872 tmp_sharedflag='-shared'
7968 case $cc_basename,$host_cpu in 873 case $cc_basename,$host_cpu in
7969 pgcc*) # Portland Group C compiler 874 pgcc*) # Portland Group C compiler
7970@@ -9262,12 +9776,12 @@ 875@@ -9262,12 +9776,12 @@ _LT_EOF
7971 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 876 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
7972 hardcode_libdir_flag_spec= 877 hardcode_libdir_flag_spec=
7973 hardcode_libdir_flag_spec_ld='-rpath $libdir' 878 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -7982,7 +887,7 @@ Index: binutils-2.24/bfd/configure
7982 fi 887 fi
7983 ;; 888 ;;
7984 esac 889 esac
7985@@ -9281,8 +9795,8 @@ 890@@ -9281,8 +9795,8 @@ _LT_EOF
7986 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 891 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
7987 wlarc= 892 wlarc=
7988 else 893 else
@@ -7993,7 +898,7 @@ Index: binutils-2.24/bfd/configure
7993 fi 898 fi
7994 ;; 899 ;;
7995 900
7996@@ -9300,8 +9814,8 @@ 901@@ -9300,8 +9814,8 @@ _LT_EOF
7997 902
7998 _LT_EOF 903 _LT_EOF
7999 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 904 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8004,7 +909,7 @@ Index: binutils-2.24/bfd/configure
8004 else 909 else
8005 ld_shlibs=no 910 ld_shlibs=no
8006 fi 911 fi
8007@@ -9347,8 +9861,8 @@ 912@@ -9347,8 +9861,8 @@ _LT_EOF
8008 913
8009 *) 914 *)
8010 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 915 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8015,7 +920,7 @@ Index: binutils-2.24/bfd/configure
8015 else 920 else
8016 ld_shlibs=no 921 ld_shlibs=no
8017 fi 922 fi
8018@@ -9478,7 +9992,13 @@ 923@@ -9478,7 +9992,13 @@ _LT_EOF
8019 allow_undefined_flag='-berok' 924 allow_undefined_flag='-berok'
8020 # Determine the default libpath from the value encoded in an 925 # Determine the default libpath from the value encoded in an
8021 # empty executable. 926 # empty executable.
@@ -8030,7 +935,7 @@ Index: binutils-2.24/bfd/configure
8030 /* end confdefs.h. */ 935 /* end confdefs.h. */
8031 936
8032 int 937 int
8033@@ -9491,22 +10011,29 @@ 938@@ -9491,22 +10011,29 @@ main ()
8034 _ACEOF 939 _ACEOF
8035 if ac_fn_c_try_link "$LINENO"; then : 940 if ac_fn_c_try_link "$LINENO"; then :
8036 941
@@ -8073,7 +978,7 @@ Index: binutils-2.24/bfd/configure
8073 978
8074 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 979 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8075 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" 980 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"
8076@@ -9518,7 +10045,13 @@ 981@@ -9518,7 +10045,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8077 else 982 else
8078 # Determine the default libpath from the value encoded in an 983 # Determine the default libpath from the value encoded in an
8079 # empty executable. 984 # empty executable.
@@ -8088,7 +993,7 @@ Index: binutils-2.24/bfd/configure
8088 /* end confdefs.h. */ 993 /* end confdefs.h. */
8089 994
8090 int 995 int
8091@@ -9531,22 +10064,29 @@ 996@@ -9531,22 +10064,29 @@ main ()
8092 _ACEOF 997 _ACEOF
8093 if ac_fn_c_try_link "$LINENO"; then : 998 if ac_fn_c_try_link "$LINENO"; then :
8094 999
@@ -8131,7 +1036,7 @@ Index: binutils-2.24/bfd/configure
8131 1036
8132 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1037 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8133 # Warning - without using the other run time loading flags, 1038 # Warning - without using the other run time loading flags,
8134@@ -9591,20 +10131,63 @@ 1039@@ -9591,20 +10131,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8135 # Microsoft Visual C++. 1040 # Microsoft Visual C++.
8136 # hardcode_libdir_flag_spec is actually meaningless, as there is 1041 # hardcode_libdir_flag_spec is actually meaningless, as there is
8137 # no search path for DLLs. 1042 # no search path for DLLs.
@@ -8209,7 +1114,7 @@ Index: binutils-2.24/bfd/configure
8209 ;; 1114 ;;
8210 1115
8211 darwin* | rhapsody*) 1116 darwin* | rhapsody*)
8212@@ -9665,7 +10248,7 @@ 1117@@ -9665,7 +10248,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8213 1118
8214 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1119 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8215 freebsd* | dragonfly*) 1120 freebsd* | dragonfly*)
@@ -8218,7 +1123,7 @@ Index: binutils-2.24/bfd/configure
8218 hardcode_libdir_flag_spec='-R$libdir' 1123 hardcode_libdir_flag_spec='-R$libdir'
8219 hardcode_direct=yes 1124 hardcode_direct=yes
8220 hardcode_shlibpath_var=no 1125 hardcode_shlibpath_var=no
8221@@ -9673,7 +10256,7 @@ 1126@@ -9673,7 +10256,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8222 1127
8223 hpux9*) 1128 hpux9*)
8224 if test "$GCC" = yes; then 1129 if test "$GCC" = yes; then
@@ -8227,7 +1132,7 @@ Index: binutils-2.24/bfd/configure
8227 else 1132 else
8228 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' 1133 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'
8229 fi 1134 fi
8230@@ -9689,7 +10272,7 @@ 1135@@ -9689,7 +10272,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8231 1136
8232 hpux10*) 1137 hpux10*)
8233 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1138 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8236,7 +1141,7 @@ Index: binutils-2.24/bfd/configure
8236 else 1141 else
8237 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1142 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8238 fi 1143 fi
8239@@ -9713,10 +10296,10 @@ 1144@@ -9713,10 +10296,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8240 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1145 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8241 ;; 1146 ;;
8242 ia64*) 1147 ia64*)
@@ -8249,7 +1154,7 @@ Index: binutils-2.24/bfd/configure
8249 ;; 1154 ;;
8250 esac 1155 esac
8251 else 1156 else
8252@@ -9795,23 +10378,36 @@ 1157@@ -9795,23 +10378,36 @@ fi
8253 1158
8254 irix5* | irix6* | nonstopux*) 1159 irix5* | irix6* | nonstopux*)
8255 if test "$GCC" = yes; then 1160 if test "$GCC" = yes; then
@@ -8294,7 +1199,7 @@ Index: binutils-2.24/bfd/configure
8294 else 1199 else
8295 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' 1200 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'
8296 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' 1201 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'
8297@@ -9896,7 +10492,7 @@ 1202@@ -9896,7 +10492,7 @@ rm -f core conftest.err conftest.$ac_objext \
8298 osf4* | osf5*) # as osf3* with the addition of -msym flag 1203 osf4* | osf5*) # as osf3* with the addition of -msym flag
8299 if test "$GCC" = yes; then 1204 if test "$GCC" = yes; then
8300 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1205 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8303,7 +1208,7 @@ Index: binutils-2.24/bfd/configure
8303 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1208 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8304 else 1209 else
8305 allow_undefined_flag=' -expect_unresolved \*' 1210 allow_undefined_flag=' -expect_unresolved \*'
8306@@ -9915,9 +10511,9 @@ 1211@@ -9915,9 +10511,9 @@ rm -f core conftest.err conftest.$ac_objext \
8307 no_undefined_flag=' -z defs' 1212 no_undefined_flag=' -z defs'
8308 if test "$GCC" = yes; then 1213 if test "$GCC" = yes; then
8309 wlarc='${wl}' 1214 wlarc='${wl}'
@@ -8315,7 +1220,7 @@ Index: binutils-2.24/bfd/configure
8315 else 1220 else
8316 case `$CC -V 2>&1` in 1221 case `$CC -V 2>&1` in
8317 *"Compilers 5.0"*) 1222 *"Compilers 5.0"*)
8318@@ -10493,8 +11089,9 @@ 1223@@ -10493,8 +11089,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8319 need_version=no 1224 need_version=no
8320 need_lib_prefix=no 1225 need_lib_prefix=no
8321 1226
@@ -8327,7 +1232,7 @@ Index: binutils-2.24/bfd/configure
8327 library_names_spec='$libname.dll.a' 1232 library_names_spec='$libname.dll.a'
8328 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1233 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8329 postinstall_cmds='base_file=`basename \${file}`~ 1234 postinstall_cmds='base_file=`basename \${file}`~
8330@@ -10527,13 +11124,71 @@ 1235@@ -10527,13 +11124,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8331 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1236 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8332 ;; 1237 ;;
8333 esac 1238 esac
@@ -8400,7 +1305,7 @@ Index: binutils-2.24/bfd/configure
8400 # FIXME: first we should search . and the directory the executable is in 1305 # FIXME: first we should search . and the directory the executable is in
8401 shlibpath_var=PATH 1306 shlibpath_var=PATH
8402 ;; 1307 ;;
8403@@ -10625,7 +11280,7 @@ 1308@@ -10625,7 +11280,7 @@ haiku*)
8404 soname_spec='${libname}${release}${shared_ext}$major' 1309 soname_spec='${libname}${release}${shared_ext}$major'
8405 shlibpath_var=LIBRARY_PATH 1310 shlibpath_var=LIBRARY_PATH
8406 shlibpath_overrides_runpath=yes 1311 shlibpath_overrides_runpath=yes
@@ -8409,7 +1314,7 @@ Index: binutils-2.24/bfd/configure
8409 hardcode_into_libs=yes 1314 hardcode_into_libs=yes
8410 ;; 1315 ;;
8411 1316
8412@@ -11465,10 +12120,10 @@ 1317@@ -11465,10 +12120,10 @@ else
8413 /* When -fvisbility=hidden is used, assume the code has been annotated 1318 /* When -fvisbility=hidden is used, assume the code has been annotated
8414 correspondingly for the symbols needed. */ 1319 correspondingly for the symbols needed. */
8415 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1320 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -8422,7 +1327,7 @@ Index: binutils-2.24/bfd/configure
8422 int main () 1327 int main ()
8423 { 1328 {
8424 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1329 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8425@@ -11571,10 +12226,10 @@ 1330@@ -11571,10 +12226,10 @@ else
8426 /* When -fvisbility=hidden is used, assume the code has been annotated 1331 /* When -fvisbility=hidden is used, assume the code has been annotated
8427 correspondingly for the symbols needed. */ 1332 correspondingly for the symbols needed. */
8428 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1333 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -8435,7 +1340,7 @@ Index: binutils-2.24/bfd/configure
8435 int main () 1340 int main ()
8436 { 1341 {
8437 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1342 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8438@@ -15079,7 +15734,7 @@ 1343@@ -15163,7 +15818,7 @@ SHARED_LDFLAGS=
8439 if test "$enable_shared" = "yes"; then 1344 if test "$enable_shared" = "yes"; then
8440 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1345 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
8441 if test -n "$x"; then 1346 if test -n "$x"; then
@@ -8444,7 +1349,7 @@ Index: binutils-2.24/bfd/configure
8444 fi 1349 fi
8445 1350
8446 # More hacks to build DLLs on Windows. 1351 # More hacks to build DLLs on Windows.
8447@@ -16694,13 +17349,20 @@ 1352@@ -16780,13 +17435,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
8448 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1353 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
8449 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1354 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
8450 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1355 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -8465,7 +1370,7 @@ Index: binutils-2.24/bfd/configure
8465 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1370 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
8466 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1371 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
8467 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1372 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
8468@@ -16715,14 +17377,17 @@ 1373@@ -16801,14 +17463,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
8469 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1374 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
8470 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1375 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
8471 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"`' 1376 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"`'
@@ -8484,7 +1389,7 @@ Index: binutils-2.24/bfd/configure
8484 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1389 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
8485 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1390 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
8486 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1391 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
8487@@ -16755,12 +17420,12 @@ 1392@@ -16841,12 +17506,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
8488 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1393 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
8489 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1394 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
8490 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1395 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -8498,7 +1403,7 @@ Index: binutils-2.24/bfd/configure
8498 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1403 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
8499 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1404 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
8500 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1405 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
8501@@ -16815,8 +17480,13 @@ 1406@@ -16901,8 +17566,13 @@ reload_flag \
8502 OBJDUMP \ 1407 OBJDUMP \
8503 deplibs_check_method \ 1408 deplibs_check_method \
8504 file_magic_cmd \ 1409 file_magic_cmd \
@@ -8512,7 +1417,7 @@ Index: binutils-2.24/bfd/configure
8512 STRIP \ 1417 STRIP \
8513 RANLIB \ 1418 RANLIB \
8514 CC \ 1419 CC \
8515@@ -16826,12 +17496,14 @@ 1420@@ -16912,12 +17582,14 @@ lt_cv_sys_global_symbol_pipe \
8516 lt_cv_sys_global_symbol_to_cdecl \ 1421 lt_cv_sys_global_symbol_to_cdecl \
8517 lt_cv_sys_global_symbol_to_c_name_address \ 1422 lt_cv_sys_global_symbol_to_c_name_address \
8518 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1423 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -8528,7 +1433,7 @@ Index: binutils-2.24/bfd/configure
8528 DSYMUTIL \ 1433 DSYMUTIL \
8529 NMEDIT \ 1434 NMEDIT \
8530 LIPO \ 1435 LIPO \
8531@@ -16847,7 +17519,6 @@ 1436@@ -16933,7 +17605,6 @@ no_undefined_flag \
8532 hardcode_libdir_flag_spec \ 1437 hardcode_libdir_flag_spec \
8533 hardcode_libdir_flag_spec_ld \ 1438 hardcode_libdir_flag_spec_ld \
8534 hardcode_libdir_separator \ 1439 hardcode_libdir_separator \
@@ -8536,7 +1441,7 @@ Index: binutils-2.24/bfd/configure
8536 exclude_expsyms \ 1441 exclude_expsyms \
8537 include_expsyms \ 1442 include_expsyms \
8538 file_list_spec \ 1443 file_list_spec \
8539@@ -16883,6 +17554,7 @@ 1444@@ -16969,6 +17640,7 @@ module_cmds \
8540 module_expsym_cmds \ 1445 module_expsym_cmds \
8541 export_symbols_cmds \ 1446 export_symbols_cmds \
8542 prelink_cmds \ 1447 prelink_cmds \
@@ -8544,7 +1449,7 @@ Index: binutils-2.24/bfd/configure
8544 postinstall_cmds \ 1449 postinstall_cmds \
8545 postuninstall_cmds \ 1450 postuninstall_cmds \
8546 finish_cmds \ 1451 finish_cmds \
8547@@ -17662,7 +18334,8 @@ 1452@@ -17748,7 +18420,8 @@ $as_echo X"$file" |
8548 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1453 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
8549 # 1454 #
8550 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1455 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -8554,7 +1459,7 @@ Index: binutils-2.24/bfd/configure
8554 # Written by Gordon Matzigkeit, 1996 1459 # Written by Gordon Matzigkeit, 1996
8555 # 1460 #
8556 # This file is part of GNU Libtool. 1461 # This file is part of GNU Libtool.
8557@@ -17765,19 +18438,42 @@ 1462@@ -17851,19 +18524,42 @@ SP2NL=$lt_lt_SP2NL
8558 # turn newlines into spaces. 1463 # turn newlines into spaces.
8559 NL2SP=$lt_lt_NL2SP 1464 NL2SP=$lt_lt_NL2SP
8560 1465
@@ -8598,7 +1503,7 @@ Index: binutils-2.24/bfd/configure
8598 # A symbol stripping program. 1503 # A symbol stripping program.
8599 STRIP=$lt_STRIP 1504 STRIP=$lt_STRIP
8600 1505
8601@@ -17807,6 +18503,12 @@ 1506@@ -17893,6 +18589,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
8602 # Transform the output of nm in a C name address pair when lib prefix is needed. 1507 # Transform the output of nm in a C name address pair when lib prefix is needed.
8603 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1508 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
8604 1509
@@ -8611,7 +1516,7 @@ Index: binutils-2.24/bfd/configure
8611 # The name of the directory that contains temporary libtool files. 1516 # The name of the directory that contains temporary libtool files.
8612 objdir=$objdir 1517 objdir=$objdir
8613 1518
8614@@ -17816,6 +18518,9 @@ 1519@@ -17902,6 +18604,9 @@ MAGIC_CMD=$MAGIC_CMD
8615 # Must we lock files when doing compilation? 1520 # Must we lock files when doing compilation?
8616 need_locks=$lt_need_locks 1521 need_locks=$lt_need_locks
8617 1522
@@ -8621,7 +1526,7 @@ Index: binutils-2.24/bfd/configure
8621 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1526 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
8622 DSYMUTIL=$lt_DSYMUTIL 1527 DSYMUTIL=$lt_DSYMUTIL
8623 1528
8624@@ -17930,12 +18635,12 @@ 1529@@ -18016,12 +18721,12 @@ with_gcc=$GCC
8625 # Compiler flag to turn off builtin functions. 1530 # Compiler flag to turn off builtin functions.
8626 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1531 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
8627 1532
@@ -8637,7 +1542,7 @@ Index: binutils-2.24/bfd/configure
8637 # Compiler flag to prevent dynamic linking. 1542 # Compiler flag to prevent dynamic linking.
8638 link_static_flag=$lt_lt_prog_compiler_static 1543 link_static_flag=$lt_lt_prog_compiler_static
8639 1544
8640@@ -18022,9 +18727,6 @@ 1545@@ -18108,9 +18813,6 @@ inherit_rpath=$inherit_rpath
8641 # Whether libtool must link a program against all its dependency libraries. 1546 # Whether libtool must link a program against all its dependency libraries.
8642 link_all_deplibs=$link_all_deplibs 1547 link_all_deplibs=$link_all_deplibs
8643 1548
@@ -8647,7 +1552,7 @@ Index: binutils-2.24/bfd/configure
8647 # Set to "yes" if exported symbols are required. 1552 # Set to "yes" if exported symbols are required.
8648 always_export_symbols=$always_export_symbols 1553 always_export_symbols=$always_export_symbols
8649 1554
8650@@ -18040,6 +18742,9 @@ 1555@@ -18126,6 +18828,9 @@ include_expsyms=$lt_include_expsyms
8651 # Commands necessary for linking programs (against libraries) with templates. 1556 # Commands necessary for linking programs (against libraries) with templates.
8652 prelink_cmds=$lt_prelink_cmds 1557 prelink_cmds=$lt_prelink_cmds
8653 1558
@@ -8657,7 +1562,7 @@ Index: binutils-2.24/bfd/configure
8657 # Specify filename containing input files. 1562 # Specify filename containing input files.
8658 file_list_spec=$lt_file_list_spec 1563 file_list_spec=$lt_file_list_spec
8659 1564
8660@@ -18072,210 +18777,169 @@ 1565@@ -18158,210 +18863,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
8661 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1566 # if finds mixed CR/LF and LF-only lines. Since sed operates in
8662 # text mode, it properly converts lines to CR/LF. This bash problem 1567 # text mode, it properly converts lines to CR/LF. This bash problem
8663 # is reportedly fixed, but why not run on old versions too? 1568 # is reportedly fixed, but why not run on old versions too?
@@ -8859,9 +1764,15 @@ Index: binutils-2.24/bfd/configure
8859-_LT_EOF 1764-_LT_EOF
8860- ;; 1765- ;;
8861- esac 1766- esac
1767-
1768-
1769- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1770- || (rm -f "$cfgfile"; exit 1)
1771-
1772- mv -f "$cfgfile" "$ofile" ||
8862+ sed '$q' "$ltmain" >> "$cfgfile" \ 1773+ sed '$q' "$ltmain" >> "$cfgfile" \
8863+ || (rm -f "$cfgfile"; exit 1) 1774+ || (rm -f "$cfgfile"; exit 1)
8864 1775+
8865+ if test x"$xsi_shell" = xyes; then 1776+ if test x"$xsi_shell" = xyes; then
8866+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 1777+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
8867+func_dirname ()\ 1778+func_dirname ()\
@@ -9019,47 +1930,59 @@ Index: binutils-2.24/bfd/configure
9019+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 1930+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
9020+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 1931+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
9021+fi 1932+fi
9022 1933+
9023- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 1934+
9024- || (rm -f "$cfgfile"; exit 1)
9025
9026- mv -f "$cfgfile" "$ofile" ||
9027+ mv -f "$cfgfile" "$ofile" || 1935+ mv -f "$cfgfile" "$ofile" ||
9028 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 1936 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
9029 chmod +x "$ofile" 1937 chmod +x "$ofile"
9030 1938
9031Index: binutils-2.24/opcodes/configure 1939diff --git a/bfd/configure.ac b/bfd/configure.ac
9032=================================================================== 1940index ba98e39..88063cf 100644
9033--- binutils-2.24.orig/opcodes/configure 2013-11-04 07:33:40.000000000 -0800 1941--- a/bfd/configure.ac
9034+++ binutils-2.24/opcodes/configure 2013-12-15 11:10:23.873785364 -0800 1942+++ b/bfd/configure.ac
9035@@ -648,6 +648,9 @@ 1943@@ -564,7 +564,7 @@ changequote(,)dnl
1944 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1945 changequote([,])dnl
1946 if test -n "$x"; then
1947- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1948+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1949 fi
1950
1951 # More hacks to build DLLs on Windows.
1952diff --git a/binutils/configure b/binutils/configure
1953index be4b81c..6606a5f 100755
1954--- a/binutils/configure
1955+++ b/binutils/configure
1956@@ -655,8 +655,11 @@ OTOOL
9036 LIPO 1957 LIPO
9037 NMEDIT 1958 NMEDIT
9038 DSYMUTIL 1959 DSYMUTIL
9039+MANIFEST_TOOL 1960+MANIFEST_TOOL
1961 RANLIB
9040+ac_ct_AR 1962+ac_ct_AR
1963 AR
9041+DLLTOOL 1964+DLLTOOL
9042 OBJDUMP 1965 OBJDUMP
9043 LN_S 1966 LN_S
9044 NM 1967 NM
9045@@ -760,6 +763,7 @@ 1968@@ -767,6 +770,7 @@ enable_static
9046 with_pic 1969 with_pic
9047 enable_fast_install 1970 enable_fast_install
9048 with_gnu_ld 1971 with_gnu_ld
9049+with_libtool_sysroot 1972+with_libtool_sysroot
9050 enable_libtool_lock 1973 enable_libtool_lock
9051 enable_targets 1974 enable_plugins
9052 enable_werror 1975 enable_largefile
9053@@ -1418,6 +1422,8 @@ 1976@@ -1439,6 +1443,8 @@ Optional Packages:
9054 --with-pic try to use only PIC/non-PIC objects [default=use 1977 --with-pic try to use only PIC/non-PIC objects [default=use
9055 both] 1978 both]
9056 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1979 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
9057+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 1980+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
9058+ (or the compiler's sysroot if not specified). 1981+ (or the compiler's sysroot if not specified).
9059 1982 --with-zlib include zlib support (auto/yes/no) default=auto
9060 Some influential environment variables: 1983 --with-gnu-ld assume the C compiler uses GNU ld default=no
9061 CC C compiler command 1984 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
9062@@ -5113,8 +5119,8 @@ 1985@@ -5153,8 +5159,8 @@ esac
9063 1986
9064 1987
9065 1988
@@ -9070,7 +1993,7 @@ Index: binutils-2.24/opcodes/configure
9070 1993
9071 1994
9072 1995
9073@@ -5154,7 +5160,7 @@ 1996@@ -5194,7 +5200,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
9074 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 1997 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
9075 $as_echo_n "checking how to print strings... " >&6; } 1998 $as_echo_n "checking how to print strings... " >&6; }
9076 # Test print first, because it will be a builtin if present. 1999 # Test print first, because it will be a builtin if present.
@@ -9079,7 +2002,7 @@ Index: binutils-2.24/opcodes/configure
9079 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2002 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
9080 ECHO='print -r --' 2003 ECHO='print -r --'
9081 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
9082@@ -5840,8 +5846,8 @@ 2005@@ -5880,8 +5886,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
9083 # Try some XSI features 2006 # Try some XSI features
9084 xsi_shell=no 2007 xsi_shell=no
9085 ( _lt_dummy="a/b/c" 2008 ( _lt_dummy="a/b/c"
@@ -9090,7 +2013,7 @@ Index: binutils-2.24/opcodes/configure
9090 && eval 'test $(( 1 + 1 )) -eq 2 \ 2013 && eval 'test $(( 1 + 1 )) -eq 2 \
9091 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2014 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
9092 && xsi_shell=yes 2015 && xsi_shell=yes
9093@@ -5890,6 +5896,80 @@ 2016@@ -5930,6 +5936,80 @@ esac
9094 2017
9095 2018
9096 2019
@@ -9171,7 +2094,7 @@ Index: binutils-2.24/opcodes/configure
9171 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2094 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
9172 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2095 $as_echo_n "checking for $LD option to reload object files... " >&6; }
9173 if test "${lt_cv_ld_reload_flag+set}" = set; then : 2096 if test "${lt_cv_ld_reload_flag+set}" = set; then :
9174@@ -5906,6 +5986,11 @@ 2097@@ -5946,6 +6026,11 @@ case $reload_flag in
9175 esac 2098 esac
9176 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2099 reload_cmds='$LD$reload_flag -o $output$reload_objs'
9177 case $host_os in 2100 case $host_os in
@@ -9183,7 +2106,7 @@ Index: binutils-2.24/opcodes/configure
9183 darwin*) 2106 darwin*)
9184 if test "$GCC" = yes; then 2107 if test "$GCC" = yes; then
9185 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2108 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
9186@@ -6074,7 +6159,8 @@ 2109@@ -6114,7 +6199,8 @@ mingw* | pw32*)
9187 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2110 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
9188 lt_cv_file_magic_cmd='func_win32_libid' 2111 lt_cv_file_magic_cmd='func_win32_libid'
9189 else 2112 else
@@ -9193,7 +2116,7 @@ Index: binutils-2.24/opcodes/configure
9193 lt_cv_file_magic_cmd='$OBJDUMP -f' 2116 lt_cv_file_magic_cmd='$OBJDUMP -f'
9194 fi 2117 fi
9195 ;; 2118 ;;
9196@@ -6228,6 +6314,21 @@ 2119@@ -6268,6 +6354,21 @@ esac
9197 fi 2120 fi
9198 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2121 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
9199 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2122 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -9215,7 +2138,7 @@ Index: binutils-2.24/opcodes/configure
9215 file_magic_cmd=$lt_cv_file_magic_cmd 2138 file_magic_cmd=$lt_cv_file_magic_cmd
9216 deplibs_check_method=$lt_cv_deplibs_check_method 2139 deplibs_check_method=$lt_cv_deplibs_check_method
9217 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2140 test -z "$deplibs_check_method" && deplibs_check_method=unknown
9218@@ -6243,9 +6344,162 @@ 2141@@ -6283,9 +6384,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
9219 2142
9220 2143
9221 2144
@@ -9380,7 +2303,7 @@ Index: binutils-2.24/opcodes/configure
9380 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9381 $as_echo_n "checking for $ac_word... " >&6; } 2304 $as_echo_n "checking for $ac_word... " >&6; }
9382 if test "${ac_cv_prog_AR+set}" = set; then : 2305 if test "${ac_cv_prog_AR+set}" = set; then :
9383@@ -6261,7 +6515,7 @@ 2306@@ -6301,7 +6555,7 @@ do
9384 test -z "$as_dir" && as_dir=. 2307 test -z "$as_dir" && as_dir=.
9385 for ac_exec_ext in '' $ac_executable_extensions; do 2308 for ac_exec_ext in '' $ac_executable_extensions; do
9386 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2309 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -9389,7 +2312,7 @@ Index: binutils-2.24/opcodes/configure
9389 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2312 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9390 break 2 2313 break 2
9391 fi 2314 fi
9392@@ -6281,11 +6535,15 @@ 2315@@ -6321,11 +6575,15 @@ $as_echo "no" >&6; }
9393 fi 2316 fi
9394 2317
9395 2318
@@ -9408,7 +2331,7 @@ Index: binutils-2.24/opcodes/configure
9408 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9409 $as_echo_n "checking for $ac_word... " >&6; } 2332 $as_echo_n "checking for $ac_word... " >&6; }
9410 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 2333 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
9411@@ -6301,7 +6559,7 @@ 2334@@ -6341,7 +6599,7 @@ do
9412 test -z "$as_dir" && as_dir=. 2335 test -z "$as_dir" && as_dir=.
9413 for ac_exec_ext in '' $ac_executable_extensions; do 2336 for ac_exec_ext in '' $ac_executable_extensions; do
9414 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2337 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -9417,7 +2340,7 @@ Index: binutils-2.24/opcodes/configure
9417 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2340 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9418 break 2 2341 break 2
9419 fi 2342 fi
9420@@ -6320,6 +6578,10 @@ 2343@@ -6360,6 +6618,10 @@ else
9421 $as_echo "no" >&6; } 2344 $as_echo "no" >&6; }
9422 fi 2345 fi
9423 2346
@@ -9428,7 +2351,7 @@ Index: binutils-2.24/opcodes/configure
9428 if test "x$ac_ct_AR" = x; then 2351 if test "x$ac_ct_AR" = x; then
9429 AR="false" 2352 AR="false"
9430 else 2353 else
9431@@ -6331,12 +6593,11 @@ 2354@@ -6371,16 +6633,72 @@ ac_tool_warned=yes ;;
9432 esac 2355 esac
9433 AR=$ac_ct_AR 2356 AR=$ac_ct_AR
9434 fi 2357 fi
@@ -9441,13 +2364,16 @@ Index: binutils-2.24/opcodes/configure
9441+: ${AR=ar} 2364+: ${AR=ar}
9442+: ${AR_FLAGS=cru} 2365+: ${AR_FLAGS=cru}
9443+ 2366+
9444 2367+
9445 2368+
9446 2369+
9447@@ -6347,6 +6608,63 @@ 2370+
9448 2371+
9449 2372+
9450 2373+
2374+
2375+
2376+
9451+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 2377+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
9452+$as_echo_n "checking for archiver @FILE support... " >&6; } 2378+$as_echo_n "checking for archiver @FILE support... " >&6; }
9453+if test "${lt_cv_ar_at_file+set}" = set; then : 2379+if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -9460,7 +2386,7 @@ Index: binutils-2.24/opcodes/configure
9460+int 2386+int
9461+main () 2387+main ()
9462+{ 2388+{
9463+ 2389
9464+ ; 2390+ ;
9465+ return 0; 2391+ return 0;
9466+} 2392+}
@@ -9486,29 +2412,23 @@ Index: binutils-2.24/opcodes/configure
9486+ fi 2412+ fi
9487+ fi 2413+ fi
9488+ rm -f conftest.* libconftest.a 2414+ rm -f conftest.* libconftest.a
9489+ 2415
9490+fi 2416+fi
9491+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 2417+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9492+ 2418
9493+fi 2419+fi
9494+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 2420+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
9495+$as_echo "$lt_cv_ar_at_file" >&6; } 2421+$as_echo "$lt_cv_ar_at_file" >&6; }
9496+ 2422
9497+if test "x$lt_cv_ar_at_file" = xno; then 2423+if test "x$lt_cv_ar_at_file" = xno; then
9498+ archiver_list_spec= 2424+ archiver_list_spec=
9499+else 2425+else
9500+ archiver_list_spec=$lt_cv_ar_at_file 2426+ archiver_list_spec=$lt_cv_ar_at_file
9501+fi 2427+fi
9502+
9503+
9504+
9505+
9506+
9507+
9508 2428
9509 if test -n "$ac_tool_prefix"; then 2429
9510 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 2430
9511@@ -6682,8 +7000,8 @@ 2431@@ -6722,8 +7040,8 @@ esac
9512 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2432 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
9513 2433
9514 # Transform an extracted symbol line into symbol name and symbol address 2434 # Transform an extracted symbol line into symbol name and symbol address
@@ -9519,7 +2439,7 @@ Index: binutils-2.24/opcodes/configure
9519 2439
9520 # Handle CRLF in mingw tool chain 2440 # Handle CRLF in mingw tool chain
9521 opt_cr= 2441 opt_cr=
9522@@ -6719,6 +7037,7 @@ 2442@@ -6759,6 +7077,7 @@ for ac_symprfx in "" "_"; do
9523 else 2443 else
9524 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2444 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
9525 fi 2445 fi
@@ -9527,7 +2447,7 @@ Index: binutils-2.24/opcodes/configure
9527 2447
9528 # Check to see that the pipe works correctly. 2448 # Check to see that the pipe works correctly.
9529 pipe_works=no 2449 pipe_works=no
9530@@ -6760,6 +7079,18 @@ 2450@@ -6800,6 +7119,18 @@ _LT_EOF
9531 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2451 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
9532 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2452 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
9533 cat <<_LT_EOF > conftest.$ac_ext 2453 cat <<_LT_EOF > conftest.$ac_ext
@@ -9546,7 +2466,7 @@ Index: binutils-2.24/opcodes/configure
9546 #ifdef __cplusplus 2466 #ifdef __cplusplus
9547 extern "C" { 2467 extern "C" {
9548 #endif 2468 #endif
9549@@ -6771,7 +7102,7 @@ 2469@@ -6811,7 +7142,7 @@ _LT_EOF
9550 cat <<_LT_EOF >> conftest.$ac_ext 2470 cat <<_LT_EOF >> conftest.$ac_ext
9551 2471
9552 /* The mapping between symbol names and symbols. */ 2472 /* The mapping between symbol names and symbols. */
@@ -9555,7 +2475,7 @@ Index: binutils-2.24/opcodes/configure
9555 const char *name; 2475 const char *name;
9556 void *address; 2476 void *address;
9557 } 2477 }
9558@@ -6797,8 +7128,8 @@ 2478@@ -6837,8 +7168,8 @@ static const void *lt_preloaded_setup() {
9559 _LT_EOF 2479 _LT_EOF
9560 # Now try linking the two files. 2480 # Now try linking the two files.
9561 mv conftest.$ac_objext conftstm.$ac_objext 2481 mv conftest.$ac_objext conftstm.$ac_objext
@@ -9566,7 +2486,7 @@ Index: binutils-2.24/opcodes/configure
9566 LIBS="conftstm.$ac_objext" 2486 LIBS="conftstm.$ac_objext"
9567 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2487 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
9568 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2488 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
9569@@ -6808,8 +7139,8 @@ 2489@@ -6848,8 +7179,8 @@ _LT_EOF
9570 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2490 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
9571 pipe_works=yes 2491 pipe_works=yes
9572 fi 2492 fi
@@ -9577,7 +2497,7 @@ Index: binutils-2.24/opcodes/configure
9577 else 2497 else
9578 echo "cannot find nm_test_func in $nlist" >&5 2498 echo "cannot find nm_test_func in $nlist" >&5
9579 fi 2499 fi
9580@@ -6846,6 +7177,14 @@ 2500@@ -6886,6 +7217,20 @@ else
9581 $as_echo "ok" >&6; } 2501 $as_echo "ok" >&6; }
9582 fi 2502 fi
9583 2503
@@ -9589,17 +2509,19 @@ Index: binutils-2.24/opcodes/configure
9589+fi 2509+fi
9590+ 2510+
9591+ 2511+
2512+
2513+
2514+
2515+
2516+
2517+
9592 2518
9593 2519
9594 2520
9595@@ -6867,6 +7206,47 @@ 2521@@ -6905,6 +7250,41 @@ fi
9596 2522
9597 2523
9598 2524
9599+
9600+
9601+
9602+
9603+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 2525+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
9604+$as_echo_n "checking for sysroot... " >&6; } 2526+$as_echo_n "checking for sysroot... " >&6; }
9605+ 2527+
@@ -9635,12 +2557,10 @@ Index: binutils-2.24/opcodes/configure
9635+ 2557+
9636+ 2558+
9637+ 2559+
9638+ 2560
9639+ 2561
9640 # Check whether --enable-libtool-lock was given. 2562 # Check whether --enable-libtool-lock was given.
9641 if test "${enable_libtool_lock+set}" = set; then : 2563@@ -7113,6 +7493,123 @@ esac
9642 enableval=$enable_libtool_lock;
9643@@ -7073,6 +7453,123 @@
9644 2564
9645 need_locks="$enable_libtool_lock" 2565 need_locks="$enable_libtool_lock"
9646 2566
@@ -9764,7 +2684,7 @@ Index: binutils-2.24/opcodes/configure
9764 2684
9765 case $host_os in 2685 case $host_os in
9766 rhapsody* | darwin*) 2686 rhapsody* | darwin*)
9767@@ -7636,6 +8133,8 @@ 2687@@ -7676,6 +8173,8 @@ _LT_EOF
9768 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2688 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
9769 echo "$AR cru libconftest.a conftest.o" >&5 2689 echo "$AR cru libconftest.a conftest.o" >&5
9770 $AR cru libconftest.a conftest.o 2>&5 2690 $AR cru libconftest.a conftest.o 2>&5
@@ -9773,7 +2693,7 @@ Index: binutils-2.24/opcodes/configure
9773 cat > conftest.c << _LT_EOF 2693 cat > conftest.c << _LT_EOF
9774 int main() { return 0;} 2694 int main() { return 0;}
9775 _LT_EOF 2695 _LT_EOF
9776@@ -7801,7 +8300,8 @@ 2696@@ -7871,7 +8370,8 @@ fi
9777 LIBTOOL_DEPS="$ltmain" 2697 LIBTOOL_DEPS="$ltmain"
9778 2698
9779 # Always use our own libtool. 2699 # Always use our own libtool.
@@ -9783,7 +2703,7 @@ Index: binutils-2.24/opcodes/configure
9783 2703
9784 2704
9785 2705
9786@@ -7890,7 +8390,7 @@ 2706@@ -7960,7 +8460,7 @@ aix3*)
9787 esac 2707 esac
9788 2708
9789 # Global variables: 2709 # Global variables:
@@ -9792,7 +2712,7 @@ Index: binutils-2.24/opcodes/configure
9792 can_build_shared=yes 2712 can_build_shared=yes
9793 2713
9794 # All known linkers require a `.a' archive for static linking (except MSVC, 2714 # All known linkers require a `.a' archive for static linking (except MSVC,
9795@@ -8188,8 +8688,6 @@ 2715@@ -8258,8 +8758,6 @@ fi
9796 lt_prog_compiler_pic= 2716 lt_prog_compiler_pic=
9797 lt_prog_compiler_static= 2717 lt_prog_compiler_static=
9798 2718
@@ -9801,7 +2721,7 @@ Index: binutils-2.24/opcodes/configure
9801 2721
9802 if test "$GCC" = yes; then 2722 if test "$GCC" = yes; then
9803 lt_prog_compiler_wl='-Wl,' 2723 lt_prog_compiler_wl='-Wl,'
9804@@ -8355,6 +8853,12 @@ 2724@@ -8425,6 +8923,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9805 lt_prog_compiler_pic='--shared' 2725 lt_prog_compiler_pic='--shared'
9806 lt_prog_compiler_static='--static' 2726 lt_prog_compiler_static='--static'
9807 ;; 2727 ;;
@@ -9814,7 +2734,7 @@ Index: binutils-2.24/opcodes/configure
9814 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2734 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
9815 # Portland Group compilers (*not* the Pentium gcc compiler, 2735 # Portland Group compilers (*not* the Pentium gcc compiler,
9816 # which looks to be a dead project) 2736 # which looks to be a dead project)
9817@@ -8417,7 +8921,7 @@ 2737@@ -8487,7 +8991,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9818 lt_prog_compiler_pic='-KPIC' 2738 lt_prog_compiler_pic='-KPIC'
9819 lt_prog_compiler_static='-Bstatic' 2739 lt_prog_compiler_static='-Bstatic'
9820 case $cc_basename in 2740 case $cc_basename in
@@ -9823,7 +2743,7 @@ Index: binutils-2.24/opcodes/configure
9823 lt_prog_compiler_wl='-Qoption ld ';; 2743 lt_prog_compiler_wl='-Qoption ld ';;
9824 *) 2744 *)
9825 lt_prog_compiler_wl='-Wl,';; 2745 lt_prog_compiler_wl='-Wl,';;
9826@@ -8474,13 +8978,17 @@ 2746@@ -8544,13 +9048,17 @@ case $host_os in
9827 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2747 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
9828 ;; 2748 ;;
9829 esac 2749 esac
@@ -9847,7 +2767,7 @@ Index: binutils-2.24/opcodes/configure
9847 2767
9848 # 2768 #
9849 # Check to make sure the PIC flag actually works. 2769 # Check to make sure the PIC flag actually works.
9850@@ -8541,6 +9049,11 @@ 2770@@ -8611,6 +9119,11 @@ fi
9851 2771
9852 2772
9853 2773
@@ -9859,7 +2779,7 @@ Index: binutils-2.24/opcodes/configure
9859 # 2779 #
9860 # Check to make sure the static flag actually works. 2780 # Check to make sure the static flag actually works.
9861 # 2781 #
9862@@ -8891,7 +9404,8 @@ 2782@@ -8961,7 +9474,8 @@ _LT_EOF
9863 allow_undefined_flag=unsupported 2783 allow_undefined_flag=unsupported
9864 always_export_symbols=no 2784 always_export_symbols=no
9865 enable_shared_with_static_runtimes=yes 2785 enable_shared_with_static_runtimes=yes
@@ -9869,7 +2789,7 @@ Index: binutils-2.24/opcodes/configure
9869 2789
9870 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2790 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9871 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2791 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9872@@ -8939,7 +9453,7 @@ 2792@@ -9009,7 +9523,7 @@ _LT_EOF
9873 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ 2793 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
9874 && test "$tmp_diet" = no 2794 && test "$tmp_diet" = no
9875 then 2795 then
@@ -9878,7 +2798,7 @@ Index: binutils-2.24/opcodes/configure
9878 tmp_sharedflag='-shared' 2798 tmp_sharedflag='-shared'
9879 case $cc_basename,$host_cpu in 2799 case $cc_basename,$host_cpu in
9880 pgcc*) # Portland Group C compiler 2800 pgcc*) # Portland Group C compiler
9881@@ -8990,12 +9504,12 @@ 2801@@ -9060,12 +9574,12 @@ _LT_EOF
9882 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2802 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
9883 hardcode_libdir_flag_spec= 2803 hardcode_libdir_flag_spec=
9884 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2804 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -9893,7 +2813,7 @@ Index: binutils-2.24/opcodes/configure
9893 fi 2813 fi
9894 ;; 2814 ;;
9895 esac 2815 esac
9896@@ -9009,8 +9523,8 @@ 2816@@ -9079,8 +9593,8 @@ _LT_EOF
9897 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2817 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
9898 wlarc= 2818 wlarc=
9899 else 2819 else
@@ -9904,7 +2824,7 @@ Index: binutils-2.24/opcodes/configure
9904 fi 2824 fi
9905 ;; 2825 ;;
9906 2826
9907@@ -9028,8 +9542,8 @@ 2827@@ -9098,8 +9612,8 @@ _LT_EOF
9908 2828
9909 _LT_EOF 2829 _LT_EOF
9910 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2830 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -9915,7 +2835,7 @@ Index: binutils-2.24/opcodes/configure
9915 else 2835 else
9916 ld_shlibs=no 2836 ld_shlibs=no
9917 fi 2837 fi
9918@@ -9075,8 +9589,8 @@ 2838@@ -9145,8 +9659,8 @@ _LT_EOF
9919 2839
9920 *) 2840 *)
9921 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2841 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -9926,7 +2846,7 @@ Index: binutils-2.24/opcodes/configure
9926 else 2846 else
9927 ld_shlibs=no 2847 ld_shlibs=no
9928 fi 2848 fi
9929@@ -9206,7 +9720,13 @@ 2849@@ -9276,7 +9790,13 @@ _LT_EOF
9930 allow_undefined_flag='-berok' 2850 allow_undefined_flag='-berok'
9931 # Determine the default libpath from the value encoded in an 2851 # Determine the default libpath from the value encoded in an
9932 # empty executable. 2852 # empty executable.
@@ -9941,7 +2861,7 @@ Index: binutils-2.24/opcodes/configure
9941 /* end confdefs.h. */ 2861 /* end confdefs.h. */
9942 2862
9943 int 2863 int
9944@@ -9219,22 +9739,29 @@ 2864@@ -9289,22 +9809,29 @@ main ()
9945 _ACEOF 2865 _ACEOF
9946 if ac_fn_c_try_link "$LINENO"; then : 2866 if ac_fn_c_try_link "$LINENO"; then :
9947 2867
@@ -9984,7 +2904,7 @@ Index: binutils-2.24/opcodes/configure
9984 2904
9985 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2905 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
9986 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" 2906 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"
9987@@ -9246,7 +9773,13 @@ 2907@@ -9316,7 +9843,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9988 else 2908 else
9989 # Determine the default libpath from the value encoded in an 2909 # Determine the default libpath from the value encoded in an
9990 # empty executable. 2910 # empty executable.
@@ -9999,7 +2919,7 @@ Index: binutils-2.24/opcodes/configure
9999 /* end confdefs.h. */ 2919 /* end confdefs.h. */
10000 2920
10001 int 2921 int
10002@@ -9259,22 +9792,29 @@ 2922@@ -9329,22 +9862,29 @@ main ()
10003 _ACEOF 2923 _ACEOF
10004 if ac_fn_c_try_link "$LINENO"; then : 2924 if ac_fn_c_try_link "$LINENO"; then :
10005 2925
@@ -10042,7 +2962,7 @@ Index: binutils-2.24/opcodes/configure
10042 2962
10043 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2963 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
10044 # Warning - without using the other run time loading flags, 2964 # Warning - without using the other run time loading flags,
10045@@ -9319,20 +9859,63 @@ 2965@@ -9389,20 +9929,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10046 # Microsoft Visual C++. 2966 # Microsoft Visual C++.
10047 # hardcode_libdir_flag_spec is actually meaningless, as there is 2967 # hardcode_libdir_flag_spec is actually meaningless, as there is
10048 # no search path for DLLs. 2968 # no search path for DLLs.
@@ -10120,7 +3040,7 @@ Index: binutils-2.24/opcodes/configure
10120 ;; 3040 ;;
10121 3041
10122 darwin* | rhapsody*) 3042 darwin* | rhapsody*)
10123@@ -9393,7 +9976,7 @@ 3043@@ -9463,7 +10046,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10124 3044
10125 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3045 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
10126 freebsd* | dragonfly*) 3046 freebsd* | dragonfly*)
@@ -10129,7 +3049,7 @@ Index: binutils-2.24/opcodes/configure
10129 hardcode_libdir_flag_spec='-R$libdir' 3049 hardcode_libdir_flag_spec='-R$libdir'
10130 hardcode_direct=yes 3050 hardcode_direct=yes
10131 hardcode_shlibpath_var=no 3051 hardcode_shlibpath_var=no
10132@@ -9401,7 +9984,7 @@ 3052@@ -9471,7 +10054,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10133 3053
10134 hpux9*) 3054 hpux9*)
10135 if test "$GCC" = yes; then 3055 if test "$GCC" = yes; then
@@ -10138,7 +3058,7 @@ Index: binutils-2.24/opcodes/configure
10138 else 3058 else
10139 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' 3059 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'
10140 fi 3060 fi
10141@@ -9417,7 +10000,7 @@ 3061@@ -9487,7 +10070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10142 3062
10143 hpux10*) 3063 hpux10*)
10144 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3064 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -10147,7 +3067,7 @@ Index: binutils-2.24/opcodes/configure
10147 else 3067 else
10148 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3068 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
10149 fi 3069 fi
10150@@ -9441,10 +10024,10 @@ 3070@@ -9511,10 +10094,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10151 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3071 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10152 ;; 3072 ;;
10153 ia64*) 3073 ia64*)
@@ -10160,7 +3080,7 @@ Index: binutils-2.24/opcodes/configure
10160 ;; 3080 ;;
10161 esac 3081 esac
10162 else 3082 else
10163@@ -9523,23 +10106,36 @@ 3083@@ -9593,23 +10176,36 @@ fi
10164 3084
10165 irix5* | irix6* | nonstopux*) 3085 irix5* | irix6* | nonstopux*)
10166 if test "$GCC" = yes; then 3086 if test "$GCC" = yes; then
@@ -10205,7 +3125,7 @@ Index: binutils-2.24/opcodes/configure
10205 else 3125 else
10206 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' 3126 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'
10207 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' 3127 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'
10208@@ -9624,7 +10220,7 @@ 3128@@ -9694,7 +10290,7 @@ rm -f core conftest.err conftest.$ac_objext \
10209 osf4* | osf5*) # as osf3* with the addition of -msym flag 3129 osf4* | osf5*) # as osf3* with the addition of -msym flag
10210 if test "$GCC" = yes; then 3130 if test "$GCC" = yes; then
10211 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3131 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -10214,7 +3134,7 @@ Index: binutils-2.24/opcodes/configure
10214 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3134 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
10215 else 3135 else
10216 allow_undefined_flag=' -expect_unresolved \*' 3136 allow_undefined_flag=' -expect_unresolved \*'
10217@@ -9643,9 +10239,9 @@ 3137@@ -9713,9 +10309,9 @@ rm -f core conftest.err conftest.$ac_objext \
10218 no_undefined_flag=' -z defs' 3138 no_undefined_flag=' -z defs'
10219 if test "$GCC" = yes; then 3139 if test "$GCC" = yes; then
10220 wlarc='${wl}' 3140 wlarc='${wl}'
@@ -10226,7 +3146,7 @@ Index: binutils-2.24/opcodes/configure
10226 else 3146 else
10227 case `$CC -V 2>&1` in 3147 case `$CC -V 2>&1` in
10228 *"Compilers 5.0"*) 3148 *"Compilers 5.0"*)
10229@@ -10221,8 +10817,9 @@ 3149@@ -10291,8 +10887,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10230 need_version=no 3150 need_version=no
10231 need_lib_prefix=no 3151 need_lib_prefix=no
10232 3152
@@ -10238,7 +3158,7 @@ Index: binutils-2.24/opcodes/configure
10238 library_names_spec='$libname.dll.a' 3158 library_names_spec='$libname.dll.a'
10239 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3159 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10240 postinstall_cmds='base_file=`basename \${file}`~ 3160 postinstall_cmds='base_file=`basename \${file}`~
10241@@ -10255,13 +10852,71 @@ 3161@@ -10325,13 +10922,71 @@ cygwin* | mingw* | pw32* | cegcc*)
10242 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3162 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10243 ;; 3163 ;;
10244 esac 3164 esac
@@ -10311,7 +3231,7 @@ Index: binutils-2.24/opcodes/configure
10311 # FIXME: first we should search . and the directory the executable is in 3231 # FIXME: first we should search . and the directory the executable is in
10312 shlibpath_var=PATH 3232 shlibpath_var=PATH
10313 ;; 3233 ;;
10314@@ -10353,7 +11008,7 @@ 3234@@ -10423,7 +11078,7 @@ haiku*)
10315 soname_spec='${libname}${release}${shared_ext}$major' 3235 soname_spec='${libname}${release}${shared_ext}$major'
10316 shlibpath_var=LIBRARY_PATH 3236 shlibpath_var=LIBRARY_PATH
10317 shlibpath_overrides_runpath=yes 3237 shlibpath_overrides_runpath=yes
@@ -10320,7 +3240,7 @@ Index: binutils-2.24/opcodes/configure
10320 hardcode_into_libs=yes 3240 hardcode_into_libs=yes
10321 ;; 3241 ;;
10322 3242
10323@@ -11193,10 +11848,10 @@ 3243@@ -11263,10 +11918,10 @@ else
10324 /* When -fvisbility=hidden is used, assume the code has been annotated 3244 /* When -fvisbility=hidden is used, assume the code has been annotated
10325 correspondingly for the symbols needed. */ 3245 correspondingly for the symbols needed. */
10326 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3246 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -10333,7 +3253,7 @@ Index: binutils-2.24/opcodes/configure
10333 int main () 3253 int main ()
10334 { 3254 {
10335 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3255 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10336@@ -11299,10 +11954,10 @@ 3256@@ -11369,10 +12024,10 @@ else
10337 /* When -fvisbility=hidden is used, assume the code has been annotated 3257 /* When -fvisbility=hidden is used, assume the code has been annotated
10338 correspondingly for the symbols needed. */ 3258 correspondingly for the symbols needed. */
10339 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3259 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -10346,16 +3266,7 @@ Index: binutils-2.24/opcodes/configure
10346 int main () 3266 int main ()
10347 { 3267 {
10348 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3268 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10349@@ -12415,7 +13070,7 @@ 3269@@ -15373,13 +16028,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
10350 # since libbfd may not pull in the entirety of libiberty.
10351 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
10352 if test -n "$x"; then
10353- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
10354+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
10355 fi
10356
10357 case "${host}" in
10358@@ -13387,13 +14042,20 @@
10359 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3270 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
10360 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3271 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
10361 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3272 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -10376,7 +3287,7 @@ Index: binutils-2.24/opcodes/configure
10376 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3287 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
10377 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3288 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
10378 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3289 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
10379@@ -13408,14 +14070,17 @@ 3290@@ -15394,14 +16056,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
10380 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3291 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
10381 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3292 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
10382 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"`' 3293 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"`'
@@ -10395,7 +3306,7 @@ Index: binutils-2.24/opcodes/configure
10395 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3306 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
10396 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3307 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
10397 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3308 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
10398@@ -13448,12 +14113,12 @@ 3309@@ -15434,12 +16099,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
10399 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3310 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
10400 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3311 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
10401 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3312 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -10409,7 +3320,7 @@ Index: binutils-2.24/opcodes/configure
10409 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3320 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
10410 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3321 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
10411 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3322 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
10412@@ -13508,8 +14173,13 @@ 3323@@ -15494,8 +16159,13 @@ reload_flag \
10413 OBJDUMP \ 3324 OBJDUMP \
10414 deplibs_check_method \ 3325 deplibs_check_method \
10415 file_magic_cmd \ 3326 file_magic_cmd \
@@ -10423,7 +3334,7 @@ Index: binutils-2.24/opcodes/configure
10423 STRIP \ 3334 STRIP \
10424 RANLIB \ 3335 RANLIB \
10425 CC \ 3336 CC \
10426@@ -13519,12 +14189,14 @@ 3337@@ -15505,12 +16175,14 @@ lt_cv_sys_global_symbol_pipe \
10427 lt_cv_sys_global_symbol_to_cdecl \ 3338 lt_cv_sys_global_symbol_to_cdecl \
10428 lt_cv_sys_global_symbol_to_c_name_address \ 3339 lt_cv_sys_global_symbol_to_c_name_address \
10429 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3340 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -10439,7 +3350,7 @@ Index: binutils-2.24/opcodes/configure
10439 DSYMUTIL \ 3350 DSYMUTIL \
10440 NMEDIT \ 3351 NMEDIT \
10441 LIPO \ 3352 LIPO \
10442@@ -13540,7 +14212,6 @@ 3353@@ -15526,7 +16198,6 @@ no_undefined_flag \
10443 hardcode_libdir_flag_spec \ 3354 hardcode_libdir_flag_spec \
10444 hardcode_libdir_flag_spec_ld \ 3355 hardcode_libdir_flag_spec_ld \
10445 hardcode_libdir_separator \ 3356 hardcode_libdir_separator \
@@ -10447,7 +3358,7 @@ Index: binutils-2.24/opcodes/configure
10447 exclude_expsyms \ 3358 exclude_expsyms \
10448 include_expsyms \ 3359 include_expsyms \
10449 file_list_spec \ 3360 file_list_spec \
10450@@ -13576,6 +14247,7 @@ 3361@@ -15562,6 +16233,7 @@ module_cmds \
10451 module_expsym_cmds \ 3362 module_expsym_cmds \
10452 export_symbols_cmds \ 3363 export_symbols_cmds \
10453 prelink_cmds \ 3364 prelink_cmds \
@@ -10455,7 +3366,7 @@ Index: binutils-2.24/opcodes/configure
10455 postinstall_cmds \ 3366 postinstall_cmds \
10456 postuninstall_cmds \ 3367 postuninstall_cmds \
10457 finish_cmds \ 3368 finish_cmds \
10458@@ -14332,7 +15004,8 @@ 3369@@ -16319,7 +16991,8 @@ $as_echo X"$file" |
10459 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3370 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
10460 # 3371 #
10461 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3372 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -10465,7 +3376,7 @@ Index: binutils-2.24/opcodes/configure
10465 # Written by Gordon Matzigkeit, 1996 3376 # Written by Gordon Matzigkeit, 1996
10466 # 3377 #
10467 # This file is part of GNU Libtool. 3378 # This file is part of GNU Libtool.
10468@@ -14435,19 +15108,42 @@ 3379@@ -16422,19 +17095,42 @@ SP2NL=$lt_lt_SP2NL
10469 # turn newlines into spaces. 3380 # turn newlines into spaces.
10470 NL2SP=$lt_lt_NL2SP 3381 NL2SP=$lt_lt_NL2SP
10471 3382
@@ -10509,7 +3420,7 @@ Index: binutils-2.24/opcodes/configure
10509 # A symbol stripping program. 3420 # A symbol stripping program.
10510 STRIP=$lt_STRIP 3421 STRIP=$lt_STRIP
10511 3422
10512@@ -14477,6 +15173,12 @@ 3423@@ -16464,6 +17160,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
10513 # Transform the output of nm in a C name address pair when lib prefix is needed. 3424 # Transform the output of nm in a C name address pair when lib prefix is needed.
10514 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3425 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
10515 3426
@@ -10522,7 +3433,7 @@ Index: binutils-2.24/opcodes/configure
10522 # The name of the directory that contains temporary libtool files. 3433 # The name of the directory that contains temporary libtool files.
10523 objdir=$objdir 3434 objdir=$objdir
10524 3435
10525@@ -14486,6 +15188,9 @@ 3436@@ -16473,6 +17175,9 @@ MAGIC_CMD=$MAGIC_CMD
10526 # Must we lock files when doing compilation? 3437 # Must we lock files when doing compilation?
10527 need_locks=$lt_need_locks 3438 need_locks=$lt_need_locks
10528 3439
@@ -10532,7 +3443,7 @@ Index: binutils-2.24/opcodes/configure
10532 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3443 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
10533 DSYMUTIL=$lt_DSYMUTIL 3444 DSYMUTIL=$lt_DSYMUTIL
10534 3445
10535@@ -14600,12 +15305,12 @@ 3446@@ -16587,12 +17292,12 @@ with_gcc=$GCC
10536 # Compiler flag to turn off builtin functions. 3447 # Compiler flag to turn off builtin functions.
10537 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3448 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
10538 3449
@@ -10548,7 +3459,7 @@ Index: binutils-2.24/opcodes/configure
10548 # Compiler flag to prevent dynamic linking. 3459 # Compiler flag to prevent dynamic linking.
10549 link_static_flag=$lt_lt_prog_compiler_static 3460 link_static_flag=$lt_lt_prog_compiler_static
10550 3461
10551@@ -14692,9 +15397,6 @@ 3462@@ -16679,9 +17384,6 @@ inherit_rpath=$inherit_rpath
10552 # Whether libtool must link a program against all its dependency libraries. 3463 # Whether libtool must link a program against all its dependency libraries.
10553 link_all_deplibs=$link_all_deplibs 3464 link_all_deplibs=$link_all_deplibs
10554 3465
@@ -10558,7 +3469,7 @@ Index: binutils-2.24/opcodes/configure
10558 # Set to "yes" if exported symbols are required. 3469 # Set to "yes" if exported symbols are required.
10559 always_export_symbols=$always_export_symbols 3470 always_export_symbols=$always_export_symbols
10560 3471
10561@@ -14710,6 +15412,9 @@ 3472@@ -16697,6 +17399,9 @@ include_expsyms=$lt_include_expsyms
10562 # Commands necessary for linking programs (against libraries) with templates. 3473 # Commands necessary for linking programs (against libraries) with templates.
10563 prelink_cmds=$lt_prelink_cmds 3474 prelink_cmds=$lt_prelink_cmds
10564 3475
@@ -10568,7 +3479,7 @@ Index: binutils-2.24/opcodes/configure
10568 # Specify filename containing input files. 3479 # Specify filename containing input files.
10569 file_list_spec=$lt_file_list_spec 3480 file_list_spec=$lt_file_list_spec
10570 3481
10571@@ -14742,210 +15447,169 @@ 3482@@ -16729,210 +17434,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
10572 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3483 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10573 # text mode, it properly converts lines to CR/LF. This bash problem 3484 # text mode, it properly converts lines to CR/LF. This bash problem
10574 # is reportedly fixed, but why not run on old versions too? 3485 # is reportedly fixed, but why not run on old versions too?
@@ -10770,9 +3681,15 @@ Index: binutils-2.24/opcodes/configure
10770-_LT_EOF 3681-_LT_EOF
10771- ;; 3682- ;;
10772- esac 3683- esac
3684-
3685-
3686- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
3687- || (rm -f "$cfgfile"; exit 1)
3688-
3689- mv -f "$cfgfile" "$ofile" ||
10773+ sed '$q' "$ltmain" >> "$cfgfile" \ 3690+ sed '$q' "$ltmain" >> "$cfgfile" \
10774+ || (rm -f "$cfgfile"; exit 1) 3691+ || (rm -f "$cfgfile"; exit 1)
10775 3692+
10776+ if test x"$xsi_shell" = xyes; then 3693+ if test x"$xsi_shell" = xyes; then
10777+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 3694+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10778+func_dirname ()\ 3695+func_dirname ()\
@@ -10930,20 +3847,30 @@ Index: binutils-2.24/opcodes/configure
10930+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 3847+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10931+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 3848+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10932+fi 3849+fi
10933 3850+
10934- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 3851+
10935- || (rm -f "$cfgfile"; exit 1)
10936
10937- mv -f "$cfgfile" "$ofile" ||
10938+ mv -f "$cfgfile" "$ofile" || 3852+ mv -f "$cfgfile" "$ofile" ||
10939 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 3853 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10940 chmod +x "$ofile" 3854 chmod +x "$ofile"
10941 3855
10942Index: binutils-2.24/binutils/configure 3856diff --git a/configure b/configure
10943=================================================================== 3857index e9f2f13..cbccb18 100755
10944--- binutils-2.24.orig/binutils/configure 2013-11-04 07:33:37.000000000 -0800 3858--- a/configure
10945+++ binutils-2.24/binutils/configure 2013-12-15 11:10:23.877118697 -0800 3859+++ b/configure
10946@@ -655,8 +655,11 @@ 3860@@ -8041,7 +8041,7 @@ case " $build_configdirs " in
3861 # For an installed makeinfo, we require it to be from texinfo 4.7 or
3862 # higher, else we use the "missing" dummy.
3863 if ${MAKEINFO} --version \
3864- | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
3865+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4.[4-9]|4.[1-9][0-9]+|[5-9])' >/dev/null 2>&1; then
3866 :
3867 else
3868 MAKEINFO="$MISSING makeinfo"
3869diff --git a/gas/configure b/gas/configure
3870index e9ba550..074886f 100755
3871--- a/gas/configure
3872+++ b/gas/configure
3873@@ -645,8 +645,11 @@ OTOOL
10947 LIPO 3874 LIPO
10948 NMEDIT 3875 NMEDIT
10949 DSYMUTIL 3876 DSYMUTIL
@@ -10955,24 +3882,24 @@ Index: binutils-2.24/binutils/configure
10955 OBJDUMP 3882 OBJDUMP
10956 LN_S 3883 LN_S
10957 NM 3884 NM
10958@@ -769,6 +772,7 @@ 3885@@ -757,6 +760,7 @@ enable_static
10959 with_pic 3886 with_pic
10960 enable_fast_install 3887 enable_fast_install
10961 with_gnu_ld 3888 with_gnu_ld
10962+with_libtool_sysroot 3889+with_libtool_sysroot
10963 enable_libtool_lock 3890 enable_libtool_lock
10964 enable_targets 3891 enable_plugins
10965 enable_deterministic_archives 3892 enable_largefile
10966@@ -1434,6 +1438,8 @@ 3893@@ -1422,6 +1426,8 @@ Optional Packages:
10967 --with-pic try to use only PIC/non-PIC objects [default=use 3894 --with-pic try to use only PIC/non-PIC objects [default=use
10968 both] 3895 both]
10969 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 3896 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
10970+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 3897+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
10971+ (or the compiler's sysroot if not specified). 3898+ (or the compiler's sysroot if not specified).
10972 --with-zlib include zlib support (auto/yes/no) default=auto 3899 --with-zlib include zlib support (auto/yes/no) default=auto
10973 --with-gnu-ld assume the C compiler uses GNU ld default=no 3900
10974 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib 3901 Some influential environment variables:
10975@@ -5152,8 +5158,8 @@ 3902@@ -4901,8 +4907,8 @@ esac
10976 3903
10977 3904
10978 3905
@@ -10983,7 +3910,7 @@ Index: binutils-2.24/binutils/configure
10983 3910
10984 3911
10985 3912
10986@@ -5193,7 +5199,7 @@ 3913@@ -4942,7 +4948,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10987 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3914 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
10988 $as_echo_n "checking how to print strings... " >&6; } 3915 $as_echo_n "checking how to print strings... " >&6; }
10989 # Test print first, because it will be a builtin if present. 3916 # Test print first, because it will be a builtin if present.
@@ -10992,7 +3919,7 @@ Index: binutils-2.24/binutils/configure
10992 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3919 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10993 ECHO='print -r --' 3920 ECHO='print -r --'
10994 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3921 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10995@@ -5879,8 +5885,8 @@ 3922@@ -5628,8 +5634,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
10996 # Try some XSI features 3923 # Try some XSI features
10997 xsi_shell=no 3924 xsi_shell=no
10998 ( _lt_dummy="a/b/c" 3925 ( _lt_dummy="a/b/c"
@@ -11003,7 +3930,7 @@ Index: binutils-2.24/binutils/configure
11003 && eval 'test $(( 1 + 1 )) -eq 2 \ 3930 && eval 'test $(( 1 + 1 )) -eq 2 \
11004 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3931 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11005 && xsi_shell=yes 3932 && xsi_shell=yes
11006@@ -5929,6 +5935,80 @@ 3933@@ -5678,6 +5684,80 @@ esac
11007 3934
11008 3935
11009 3936
@@ -11084,7 +4011,7 @@ Index: binutils-2.24/binutils/configure
11084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4011 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
11085 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4012 $as_echo_n "checking for $LD option to reload object files... " >&6; }
11086 if test "${lt_cv_ld_reload_flag+set}" = set; then : 4013 if test "${lt_cv_ld_reload_flag+set}" = set; then :
11087@@ -5945,6 +6025,11 @@ 4014@@ -5694,6 +5774,11 @@ case $reload_flag in
11088 esac 4015 esac
11089 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4016 reload_cmds='$LD$reload_flag -o $output$reload_objs'
11090 case $host_os in 4017 case $host_os in
@@ -11096,7 +4023,7 @@ Index: binutils-2.24/binutils/configure
11096 darwin*) 4023 darwin*)
11097 if test "$GCC" = yes; then 4024 if test "$GCC" = yes; then
11098 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4025 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
11099@@ -6113,7 +6198,8 @@ 4026@@ -5862,7 +5947,8 @@ mingw* | pw32*)
11100 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4027 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
11101 lt_cv_file_magic_cmd='func_win32_libid' 4028 lt_cv_file_magic_cmd='func_win32_libid'
11102 else 4029 else
@@ -11106,7 +4033,7 @@ Index: binutils-2.24/binutils/configure
11106 lt_cv_file_magic_cmd='$OBJDUMP -f' 4033 lt_cv_file_magic_cmd='$OBJDUMP -f'
11107 fi 4034 fi
11108 ;; 4035 ;;
11109@@ -6267,6 +6353,21 @@ 4036@@ -6016,6 +6102,21 @@ esac
11110 fi 4037 fi
11111 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4038 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
11112 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4039 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -11128,7 +4055,7 @@ Index: binutils-2.24/binutils/configure
11128 file_magic_cmd=$lt_cv_file_magic_cmd 4055 file_magic_cmd=$lt_cv_file_magic_cmd
11129 deplibs_check_method=$lt_cv_deplibs_check_method 4056 deplibs_check_method=$lt_cv_deplibs_check_method
11130 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4057 test -z "$deplibs_check_method" && deplibs_check_method=unknown
11131@@ -6282,9 +6383,162 @@ 4058@@ -6031,9 +6132,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
11132 4059
11133 4060
11134 4061
@@ -11142,9 +4069,7 @@ Index: binutils-2.24/binutils/configure
11142+ 4069+
11143+ 4070+
11144+ 4071+
11145 if test -n "$ac_tool_prefix"; then 4072+if test -n "$ac_tool_prefix"; then
11146- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
11147-set dummy ${ac_tool_prefix}ar; ac_word=$2
11148+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 4073+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
11149+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 4074+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
11150+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4075+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -11285,7 +4210,9 @@ Index: binutils-2.24/binutils/configure
11285+ 4210+
11286+ 4211+
11287+ 4212+
11288+if test -n "$ac_tool_prefix"; then 4213 if test -n "$ac_tool_prefix"; then
4214- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4215-set dummy ${ac_tool_prefix}ar; ac_word=$2
11289+ for ac_prog in ar 4216+ for ac_prog in ar
11290+ do 4217+ do
11291+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 4218+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -11293,7 +4220,7 @@ Index: binutils-2.24/binutils/configure
11293 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4220 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11294 $as_echo_n "checking for $ac_word... " >&6; } 4221 $as_echo_n "checking for $ac_word... " >&6; }
11295 if test "${ac_cv_prog_AR+set}" = set; then : 4222 if test "${ac_cv_prog_AR+set}" = set; then :
11296@@ -6300,7 +6554,7 @@ 4223@@ -6049,7 +6303,7 @@ do
11297 test -z "$as_dir" && as_dir=. 4224 test -z "$as_dir" && as_dir=.
11298 for ac_exec_ext in '' $ac_executable_extensions; do 4225 for ac_exec_ext in '' $ac_executable_extensions; do
11299 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4226 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -11302,7 +4229,7 @@ Index: binutils-2.24/binutils/configure
11302 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4229 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11303 break 2 4230 break 2
11304 fi 4231 fi
11305@@ -6320,11 +6574,15 @@ 4232@@ -6069,11 +6323,15 @@ $as_echo "no" >&6; }
11306 fi 4233 fi
11307 4234
11308 4235
@@ -11321,7 +4248,7 @@ Index: binutils-2.24/binutils/configure
11321 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4248 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11322 $as_echo_n "checking for $ac_word... " >&6; } 4249 $as_echo_n "checking for $ac_word... " >&6; }
11323 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 4250 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
11324@@ -6340,7 +6598,7 @@ 4251@@ -6089,7 +6347,7 @@ do
11325 test -z "$as_dir" && as_dir=. 4252 test -z "$as_dir" && as_dir=.
11326 for ac_exec_ext in '' $ac_executable_extensions; do 4253 for ac_exec_ext in '' $ac_executable_extensions; do
11327 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 4254 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -11330,7 +4257,7 @@ Index: binutils-2.24/binutils/configure
11330 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4257 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11331 break 2 4258 break 2
11332 fi 4259 fi
11333@@ -6359,6 +6617,10 @@ 4260@@ -6108,6 +6366,10 @@ else
11334 $as_echo "no" >&6; } 4261 $as_echo "no" >&6; }
11335 fi 4262 fi
11336 4263
@@ -11341,7 +4268,7 @@ Index: binutils-2.24/binutils/configure
11341 if test "x$ac_ct_AR" = x; then 4268 if test "x$ac_ct_AR" = x; then
11342 AR="false" 4269 AR="false"
11343 else 4270 else
11344@@ -6370,12 +6632,10 @@ 4271@@ -6119,12 +6381,10 @@ ac_tool_warned=yes ;;
11345 esac 4272 esac
11346 AR=$ac_ct_AR 4273 AR=$ac_ct_AR
11347 fi 4274 fi
@@ -11356,7 +4283,7 @@ Index: binutils-2.24/binutils/configure
11356 4283
11357 4284
11358 4285
11359@@ -6387,6 +6647,64 @@ 4286@@ -6136,6 +6396,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
11360 4287
11361 4288
11362 4289
@@ -11421,7 +4348,7 @@ Index: binutils-2.24/binutils/configure
11421 if test -n "$ac_tool_prefix"; then 4348 if test -n "$ac_tool_prefix"; then
11422 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 4349 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
11423 set dummy ${ac_tool_prefix}strip; ac_word=$2 4350 set dummy ${ac_tool_prefix}strip; ac_word=$2
11424@@ -6721,8 +7039,8 @@ 4351@@ -6470,8 +6788,8 @@ esac
11425 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4352 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
11426 4353
11427 # Transform an extracted symbol line into symbol name and symbol address 4354 # Transform an extracted symbol line into symbol name and symbol address
@@ -11432,7 +4359,7 @@ Index: binutils-2.24/binutils/configure
11432 4359
11433 # Handle CRLF in mingw tool chain 4360 # Handle CRLF in mingw tool chain
11434 opt_cr= 4361 opt_cr=
11435@@ -6758,6 +7076,7 @@ 4362@@ -6507,6 +6825,7 @@ for ac_symprfx in "" "_"; do
11436 else 4363 else
11437 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4364 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
11438 fi 4365 fi
@@ -11440,7 +4367,7 @@ Index: binutils-2.24/binutils/configure
11440 4367
11441 # Check to see that the pipe works correctly. 4368 # Check to see that the pipe works correctly.
11442 pipe_works=no 4369 pipe_works=no
11443@@ -6799,6 +7118,18 @@ 4370@@ -6548,6 +6867,18 @@ _LT_EOF
11444 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4371 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
11445 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4372 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
11446 cat <<_LT_EOF > conftest.$ac_ext 4373 cat <<_LT_EOF > conftest.$ac_ext
@@ -11459,7 +4386,7 @@ Index: binutils-2.24/binutils/configure
11459 #ifdef __cplusplus 4386 #ifdef __cplusplus
11460 extern "C" { 4387 extern "C" {
11461 #endif 4388 #endif
11462@@ -6810,7 +7141,7 @@ 4389@@ -6559,7 +6890,7 @@ _LT_EOF
11463 cat <<_LT_EOF >> conftest.$ac_ext 4390 cat <<_LT_EOF >> conftest.$ac_ext
11464 4391
11465 /* The mapping between symbol names and symbols. */ 4392 /* The mapping between symbol names and symbols. */
@@ -11468,7 +4395,7 @@ Index: binutils-2.24/binutils/configure
11468 const char *name; 4395 const char *name;
11469 void *address; 4396 void *address;
11470 } 4397 }
11471@@ -6836,8 +7167,8 @@ 4398@@ -6585,8 +6916,8 @@ static const void *lt_preloaded_setup() {
11472 _LT_EOF 4399 _LT_EOF
11473 # Now try linking the two files. 4400 # Now try linking the two files.
11474 mv conftest.$ac_objext conftstm.$ac_objext 4401 mv conftest.$ac_objext conftstm.$ac_objext
@@ -11479,7 +4406,7 @@ Index: binutils-2.24/binutils/configure
11479 LIBS="conftstm.$ac_objext" 4406 LIBS="conftstm.$ac_objext"
11480 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4407 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
11481 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4408 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
11482@@ -6847,8 +7178,8 @@ 4409@@ -6596,8 +6927,8 @@ _LT_EOF
11483 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4410 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
11484 pipe_works=yes 4411 pipe_works=yes
11485 fi 4412 fi
@@ -11490,7 +4417,7 @@ Index: binutils-2.24/binutils/configure
11490 else 4417 else
11491 echo "cannot find nm_test_func in $nlist" >&5 4418 echo "cannot find nm_test_func in $nlist" >&5
11492 fi 4419 fi
11493@@ -6885,6 +7216,19 @@ 4420@@ -6634,6 +6965,21 @@ else
11494 $as_echo "ok" >&6; } 4421 $as_echo "ok" >&6; }
11495 fi 4422 fi
11496 4423
@@ -11507,10 +4434,12 @@ Index: binutils-2.24/binutils/configure
11507+ 4434+
11508+ 4435+
11509+ 4436+
4437+
4438+
11510 4439
11511 4440
11512 4441
11513@@ -6905,6 +7249,42 @@ 4442@@ -6652,6 +6998,40 @@ fi
11514 4443
11515 4444
11516 4445
@@ -11548,12 +4477,10 @@ Index: binutils-2.24/binutils/configure
11548+$as_echo "${lt_sysroot:-no}" >&6; } 4477+$as_echo "${lt_sysroot:-no}" >&6; }
11549+ 4478+
11550+ 4479+
11551+
11552+
11553 4480
11554 # Check whether --enable-libtool-lock was given. 4481
11555 if test "${enable_libtool_lock+set}" = set; then : 4482
11556@@ -7112,6 +7492,123 @@ 4483@@ -6861,6 +7241,123 @@ esac
11557 4484
11558 need_locks="$enable_libtool_lock" 4485 need_locks="$enable_libtool_lock"
11559 4486
@@ -11677,7 +4604,7 @@ Index: binutils-2.24/binutils/configure
11677 4604
11678 case $host_os in 4605 case $host_os in
11679 rhapsody* | darwin*) 4606 rhapsody* | darwin*)
11680@@ -7675,6 +8172,8 @@ 4607@@ -7424,6 +7921,8 @@ _LT_EOF
11681 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4608 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
11682 echo "$AR cru libconftest.a conftest.o" >&5 4609 echo "$AR cru libconftest.a conftest.o" >&5
11683 $AR cru libconftest.a conftest.o 2>&5 4610 $AR cru libconftest.a conftest.o 2>&5
@@ -11686,7 +4613,7 @@ Index: binutils-2.24/binutils/configure
11686 cat > conftest.c << _LT_EOF 4613 cat > conftest.c << _LT_EOF
11687 int main() { return 0;} 4614 int main() { return 0;}
11688 _LT_EOF 4615 _LT_EOF
11689@@ -7870,7 +8369,8 @@ 4616@@ -7619,7 +8118,8 @@ fi
11690 LIBTOOL_DEPS="$ltmain" 4617 LIBTOOL_DEPS="$ltmain"
11691 4618
11692 # Always use our own libtool. 4619 # Always use our own libtool.
@@ -11696,7 +4623,7 @@ Index: binutils-2.24/binutils/configure
11696 4623
11697 4624
11698 4625
11699@@ -7959,7 +8459,7 @@ 4626@@ -7708,7 +8208,7 @@ aix3*)
11700 esac 4627 esac
11701 4628
11702 # Global variables: 4629 # Global variables:
@@ -11705,7 +4632,7 @@ Index: binutils-2.24/binutils/configure
11705 can_build_shared=yes 4632 can_build_shared=yes
11706 4633
11707 # All known linkers require a `.a' archive for static linking (except MSVC, 4634 # All known linkers require a `.a' archive for static linking (except MSVC,
11708@@ -8257,8 +8757,6 @@ 4635@@ -8006,8 +8506,6 @@ fi
11709 lt_prog_compiler_pic= 4636 lt_prog_compiler_pic=
11710 lt_prog_compiler_static= 4637 lt_prog_compiler_static=
11711 4638
@@ -11714,7 +4641,7 @@ Index: binutils-2.24/binutils/configure
11714 4641
11715 if test "$GCC" = yes; then 4642 if test "$GCC" = yes; then
11716 lt_prog_compiler_wl='-Wl,' 4643 lt_prog_compiler_wl='-Wl,'
11717@@ -8424,6 +8922,12 @@ 4644@@ -8173,6 +8671,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11718 lt_prog_compiler_pic='--shared' 4645 lt_prog_compiler_pic='--shared'
11719 lt_prog_compiler_static='--static' 4646 lt_prog_compiler_static='--static'
11720 ;; 4647 ;;
@@ -11727,7 +4654,7 @@ Index: binutils-2.24/binutils/configure
11727 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4654 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11728 # Portland Group compilers (*not* the Pentium gcc compiler, 4655 # Portland Group compilers (*not* the Pentium gcc compiler,
11729 # which looks to be a dead project) 4656 # which looks to be a dead project)
11730@@ -8486,7 +8990,7 @@ 4657@@ -8235,7 +8739,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11731 lt_prog_compiler_pic='-KPIC' 4658 lt_prog_compiler_pic='-KPIC'
11732 lt_prog_compiler_static='-Bstatic' 4659 lt_prog_compiler_static='-Bstatic'
11733 case $cc_basename in 4660 case $cc_basename in
@@ -11736,7 +4663,7 @@ Index: binutils-2.24/binutils/configure
11736 lt_prog_compiler_wl='-Qoption ld ';; 4663 lt_prog_compiler_wl='-Qoption ld ';;
11737 *) 4664 *)
11738 lt_prog_compiler_wl='-Wl,';; 4665 lt_prog_compiler_wl='-Wl,';;
11739@@ -8543,13 +9047,17 @@ 4666@@ -8292,13 +8796,17 @@ case $host_os in
11740 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4667 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11741 ;; 4668 ;;
11742 esac 4669 esac
@@ -11760,7 +4687,7 @@ Index: binutils-2.24/binutils/configure
11760 4687
11761 # 4688 #
11762 # Check to make sure the PIC flag actually works. 4689 # Check to make sure the PIC flag actually works.
11763@@ -8610,6 +9118,11 @@ 4690@@ -8359,6 +8867,11 @@ fi
11764 4691
11765 4692
11766 4693
@@ -11772,7 +4699,7 @@ Index: binutils-2.24/binutils/configure
11772 # 4699 #
11773 # Check to make sure the static flag actually works. 4700 # Check to make sure the static flag actually works.
11774 # 4701 #
11775@@ -8960,7 +9473,8 @@ 4702@@ -8709,7 +9222,8 @@ _LT_EOF
11776 allow_undefined_flag=unsupported 4703 allow_undefined_flag=unsupported
11777 always_export_symbols=no 4704 always_export_symbols=no
11778 enable_shared_with_static_runtimes=yes 4705 enable_shared_with_static_runtimes=yes
@@ -11782,7 +4709,7 @@ Index: binutils-2.24/binutils/configure
11782 4709
11783 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4710 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11784 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4711 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11785@@ -9008,7 +9522,7 @@ 4712@@ -8757,7 +9271,7 @@ _LT_EOF
11786 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ 4713 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
11787 && test "$tmp_diet" = no 4714 && test "$tmp_diet" = no
11788 then 4715 then
@@ -11791,7 +4718,7 @@ Index: binutils-2.24/binutils/configure
11791 tmp_sharedflag='-shared' 4718 tmp_sharedflag='-shared'
11792 case $cc_basename,$host_cpu in 4719 case $cc_basename,$host_cpu in
11793 pgcc*) # Portland Group C compiler 4720 pgcc*) # Portland Group C compiler
11794@@ -9059,12 +9573,12 @@ 4721@@ -8808,12 +9322,12 @@ _LT_EOF
11795 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4722 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11796 hardcode_libdir_flag_spec= 4723 hardcode_libdir_flag_spec=
11797 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4724 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -11806,7 +4733,7 @@ Index: binutils-2.24/binutils/configure
11806 fi 4733 fi
11807 ;; 4734 ;;
11808 esac 4735 esac
11809@@ -9078,8 +9592,8 @@ 4736@@ -8827,8 +9341,8 @@ _LT_EOF
11810 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4737 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11811 wlarc= 4738 wlarc=
11812 else 4739 else
@@ -11817,7 +4744,7 @@ Index: binutils-2.24/binutils/configure
11817 fi 4744 fi
11818 ;; 4745 ;;
11819 4746
11820@@ -9097,8 +9611,8 @@ 4747@@ -8846,8 +9360,8 @@ _LT_EOF
11821 4748
11822 _LT_EOF 4749 _LT_EOF
11823 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4750 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11828,7 +4755,7 @@ Index: binutils-2.24/binutils/configure
11828 else 4755 else
11829 ld_shlibs=no 4756 ld_shlibs=no
11830 fi 4757 fi
11831@@ -9144,8 +9658,8 @@ 4758@@ -8893,8 +9407,8 @@ _LT_EOF
11832 4759
11833 *) 4760 *)
11834 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4761 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11839,7 +4766,7 @@ Index: binutils-2.24/binutils/configure
11839 else 4766 else
11840 ld_shlibs=no 4767 ld_shlibs=no
11841 fi 4768 fi
11842@@ -9275,7 +9789,13 @@ 4769@@ -9024,7 +9538,13 @@ _LT_EOF
11843 allow_undefined_flag='-berok' 4770 allow_undefined_flag='-berok'
11844 # Determine the default libpath from the value encoded in an 4771 # Determine the default libpath from the value encoded in an
11845 # empty executable. 4772 # empty executable.
@@ -11854,7 +4781,7 @@ Index: binutils-2.24/binutils/configure
11854 /* end confdefs.h. */ 4781 /* end confdefs.h. */
11855 4782
11856 int 4783 int
11857@@ -9288,22 +9808,29 @@ 4784@@ -9037,22 +9557,29 @@ main ()
11858 _ACEOF 4785 _ACEOF
11859 if ac_fn_c_try_link "$LINENO"; then : 4786 if ac_fn_c_try_link "$LINENO"; then :
11860 4787
@@ -11897,7 +4824,7 @@ Index: binutils-2.24/binutils/configure
11897 4824
11898 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4825 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11899 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" 4826 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11900@@ -9315,7 +9842,13 @@ 4827@@ -9064,7 +9591,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11901 else 4828 else
11902 # Determine the default libpath from the value encoded in an 4829 # Determine the default libpath from the value encoded in an
11903 # empty executable. 4830 # empty executable.
@@ -11912,7 +4839,7 @@ Index: binutils-2.24/binutils/configure
11912 /* end confdefs.h. */ 4839 /* end confdefs.h. */
11913 4840
11914 int 4841 int
11915@@ -9328,22 +9861,29 @@ 4842@@ -9077,22 +9610,29 @@ main ()
11916 _ACEOF 4843 _ACEOF
11917 if ac_fn_c_try_link "$LINENO"; then : 4844 if ac_fn_c_try_link "$LINENO"; then :
11918 4845
@@ -11955,7 +4882,7 @@ Index: binutils-2.24/binutils/configure
11955 4882
11956 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4883 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11957 # Warning - without using the other run time loading flags, 4884 # Warning - without using the other run time loading flags,
11958@@ -9388,20 +9928,63 @@ 4885@@ -9137,20 +9677,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11959 # Microsoft Visual C++. 4886 # Microsoft Visual C++.
11960 # hardcode_libdir_flag_spec is actually meaningless, as there is 4887 # hardcode_libdir_flag_spec is actually meaningless, as there is
11961 # no search path for DLLs. 4888 # no search path for DLLs.
@@ -12033,7 +4960,7 @@ Index: binutils-2.24/binutils/configure
12033 ;; 4960 ;;
12034 4961
12035 darwin* | rhapsody*) 4962 darwin* | rhapsody*)
12036@@ -9462,7 +10045,7 @@ 4963@@ -9211,7 +9794,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12037 4964
12038 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4965 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
12039 freebsd* | dragonfly*) 4966 freebsd* | dragonfly*)
@@ -12042,7 +4969,7 @@ Index: binutils-2.24/binutils/configure
12042 hardcode_libdir_flag_spec='-R$libdir' 4969 hardcode_libdir_flag_spec='-R$libdir'
12043 hardcode_direct=yes 4970 hardcode_direct=yes
12044 hardcode_shlibpath_var=no 4971 hardcode_shlibpath_var=no
12045@@ -9470,7 +10053,7 @@ 4972@@ -9219,7 +9802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12046 4973
12047 hpux9*) 4974 hpux9*)
12048 if test "$GCC" = yes; then 4975 if test "$GCC" = yes; then
@@ -12051,7 +4978,7 @@ Index: binutils-2.24/binutils/configure
12051 else 4978 else
12052 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' 4979 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
12053 fi 4980 fi
12054@@ -9486,7 +10069,7 @@ 4981@@ -9235,7 +9818,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12055 4982
12056 hpux10*) 4983 hpux10*)
12057 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4984 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -12060,7 +4987,7 @@ Index: binutils-2.24/binutils/configure
12060 else 4987 else
12061 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 4988 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
12062 fi 4989 fi
12063@@ -9510,10 +10093,10 @@ 4990@@ -9259,10 +9842,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
12064 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4991 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12065 ;; 4992 ;;
12066 ia64*) 4993 ia64*)
@@ -12073,7 +5000,7 @@ Index: binutils-2.24/binutils/configure
12073 ;; 5000 ;;
12074 esac 5001 esac
12075 else 5002 else
12076@@ -9592,23 +10175,36 @@ 5003@@ -9341,23 +9924,36 @@ fi
12077 5004
12078 irix5* | irix6* | nonstopux*) 5005 irix5* | irix6* | nonstopux*)
12079 if test "$GCC" = yes; then 5006 if test "$GCC" = yes; then
@@ -12118,7 +5045,7 @@ Index: binutils-2.24/binutils/configure
12118 else 5045 else
12119 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 5046 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
12120 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 5047 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
12121@@ -9693,7 +10289,7 @@ 5048@@ -9442,7 +10038,7 @@ rm -f core conftest.err conftest.$ac_objext \
12122 osf4* | osf5*) # as osf3* with the addition of -msym flag 5049 osf4* | osf5*) # as osf3* with the addition of -msym flag
12123 if test "$GCC" = yes; then 5050 if test "$GCC" = yes; then
12124 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5051 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -12127,7 +5054,7 @@ Index: binutils-2.24/binutils/configure
12127 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5054 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
12128 else 5055 else
12129 allow_undefined_flag=' -expect_unresolved \*' 5056 allow_undefined_flag=' -expect_unresolved \*'
12130@@ -9712,9 +10308,9 @@ 5057@@ -9461,9 +10057,9 @@ rm -f core conftest.err conftest.$ac_objext \
12131 no_undefined_flag=' -z defs' 5058 no_undefined_flag=' -z defs'
12132 if test "$GCC" = yes; then 5059 if test "$GCC" = yes; then
12133 wlarc='${wl}' 5060 wlarc='${wl}'
@@ -12139,7 +5066,7 @@ Index: binutils-2.24/binutils/configure
12139 else 5066 else
12140 case `$CC -V 2>&1` in 5067 case `$CC -V 2>&1` in
12141 *"Compilers 5.0"*) 5068 *"Compilers 5.0"*)
12142@@ -10290,8 +10886,9 @@ 5069@@ -10039,8 +10635,9 @@ cygwin* | mingw* | pw32* | cegcc*)
12143 need_version=no 5070 need_version=no
12144 need_lib_prefix=no 5071 need_lib_prefix=no
12145 5072
@@ -12151,7 +5078,7 @@ Index: binutils-2.24/binutils/configure
12151 library_names_spec='$libname.dll.a' 5078 library_names_spec='$libname.dll.a'
12152 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5079 # DLL is installed to $(libdir)/../bin by postinstall_cmds
12153 postinstall_cmds='base_file=`basename \${file}`~ 5080 postinstall_cmds='base_file=`basename \${file}`~
12154@@ -10324,13 +10921,71 @@ 5081@@ -10073,13 +10670,71 @@ cygwin* | mingw* | pw32* | cegcc*)
12155 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5082 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12156 ;; 5083 ;;
12157 esac 5084 esac
@@ -12224,7 +5151,7 @@ Index: binutils-2.24/binutils/configure
12224 # FIXME: first we should search . and the directory the executable is in 5151 # FIXME: first we should search . and the directory the executable is in
12225 shlibpath_var=PATH 5152 shlibpath_var=PATH
12226 ;; 5153 ;;
12227@@ -10422,7 +11077,7 @@ 5154@@ -10171,7 +10826,7 @@ haiku*)
12228 soname_spec='${libname}${release}${shared_ext}$major' 5155 soname_spec='${libname}${release}${shared_ext}$major'
12229 shlibpath_var=LIBRARY_PATH 5156 shlibpath_var=LIBRARY_PATH
12230 shlibpath_overrides_runpath=yes 5157 shlibpath_overrides_runpath=yes
@@ -12233,7 +5160,7 @@ Index: binutils-2.24/binutils/configure
12233 hardcode_into_libs=yes 5160 hardcode_into_libs=yes
12234 ;; 5161 ;;
12235 5162
12236@@ -11262,10 +11917,10 @@ 5163@@ -11011,10 +11666,10 @@ else
12237 /* When -fvisbility=hidden is used, assume the code has been annotated 5164 /* When -fvisbility=hidden is used, assume the code has been annotated
12238 correspondingly for the symbols needed. */ 5165 correspondingly for the symbols needed. */
12239 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5166 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -12246,7 +5173,7 @@ Index: binutils-2.24/binutils/configure
12246 int main () 5173 int main ()
12247 { 5174 {
12248 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5175 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12249@@ -11368,10 +12023,10 @@ 5176@@ -11117,10 +11772,10 @@ else
12250 /* When -fvisbility=hidden is used, assume the code has been annotated 5177 /* When -fvisbility=hidden is used, assume the code has been annotated
12251 correspondingly for the symbols needed. */ 5178 correspondingly for the symbols needed. */
12252 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5179 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -12259,7 +5186,7 @@ Index: binutils-2.24/binutils/configure
12259 int main () 5186 int main ()
12260 { 5187 {
12261 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5188 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12262@@ -14948,13 +15603,20 @@ 5189@@ -15274,13 +15929,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
12263 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5190 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
12264 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5191 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
12265 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5192 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -12280,7 +5207,7 @@ Index: binutils-2.24/binutils/configure
12280 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5207 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
12281 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5208 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
12282 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5209 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
12283@@ -14969,14 +15631,17 @@ 5210@@ -15295,14 +15957,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
12284 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5211 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
12285 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5212 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
12286 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"`' 5213 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"`'
@@ -12299,7 +5226,7 @@ Index: binutils-2.24/binutils/configure
12299 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5226 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
12300 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5227 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
12301 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5228 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
12302@@ -15009,12 +15674,12 @@ 5229@@ -15335,12 +16000,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
12303 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5230 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
12304 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5231 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
12305 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5232 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -12313,7 +5240,7 @@ Index: binutils-2.24/binutils/configure
12313 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5240 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
12314 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5241 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
12315 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5242 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
12316@@ -15069,8 +15734,13 @@ 5243@@ -15395,8 +16060,13 @@ reload_flag \
12317 OBJDUMP \ 5244 OBJDUMP \
12318 deplibs_check_method \ 5245 deplibs_check_method \
12319 file_magic_cmd \ 5246 file_magic_cmd \
@@ -12327,7 +5254,7 @@ Index: binutils-2.24/binutils/configure
12327 STRIP \ 5254 STRIP \
12328 RANLIB \ 5255 RANLIB \
12329 CC \ 5256 CC \
12330@@ -15080,12 +15750,14 @@ 5257@@ -15406,12 +16076,14 @@ lt_cv_sys_global_symbol_pipe \
12331 lt_cv_sys_global_symbol_to_cdecl \ 5258 lt_cv_sys_global_symbol_to_cdecl \
12332 lt_cv_sys_global_symbol_to_c_name_address \ 5259 lt_cv_sys_global_symbol_to_c_name_address \
12333 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5260 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -12343,7 +5270,7 @@ Index: binutils-2.24/binutils/configure
12343 DSYMUTIL \ 5270 DSYMUTIL \
12344 NMEDIT \ 5271 NMEDIT \
12345 LIPO \ 5272 LIPO \
12346@@ -15101,7 +15773,6 @@ 5273@@ -15427,7 +16099,6 @@ no_undefined_flag \
12347 hardcode_libdir_flag_spec \ 5274 hardcode_libdir_flag_spec \
12348 hardcode_libdir_flag_spec_ld \ 5275 hardcode_libdir_flag_spec_ld \
12349 hardcode_libdir_separator \ 5276 hardcode_libdir_separator \
@@ -12351,7 +5278,7 @@ Index: binutils-2.24/binutils/configure
12351 exclude_expsyms \ 5278 exclude_expsyms \
12352 include_expsyms \ 5279 include_expsyms \
12353 file_list_spec \ 5280 file_list_spec \
12354@@ -15137,6 +15808,7 @@ 5281@@ -15463,6 +16134,7 @@ module_cmds \
12355 module_expsym_cmds \ 5282 module_expsym_cmds \
12356 export_symbols_cmds \ 5283 export_symbols_cmds \
12357 prelink_cmds \ 5284 prelink_cmds \
@@ -12359,7 +5286,7 @@ Index: binutils-2.24/binutils/configure
12359 postinstall_cmds \ 5286 postinstall_cmds \
12360 postuninstall_cmds \ 5287 postuninstall_cmds \
12361 finish_cmds \ 5288 finish_cmds \
12362@@ -15894,7 +16566,8 @@ 5289@@ -16227,7 +16899,8 @@ $as_echo X"$file" |
12363 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5290 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
12364 # 5291 #
12365 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5292 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12369,7 +5296,7 @@ Index: binutils-2.24/binutils/configure
12369 # Written by Gordon Matzigkeit, 1996 5296 # Written by Gordon Matzigkeit, 1996
12370 # 5297 #
12371 # This file is part of GNU Libtool. 5298 # This file is part of GNU Libtool.
12372@@ -15997,19 +16670,42 @@ 5299@@ -16330,19 +17003,42 @@ SP2NL=$lt_lt_SP2NL
12373 # turn newlines into spaces. 5300 # turn newlines into spaces.
12374 NL2SP=$lt_lt_NL2SP 5301 NL2SP=$lt_lt_NL2SP
12375 5302
@@ -12413,7 +5340,7 @@ Index: binutils-2.24/binutils/configure
12413 # A symbol stripping program. 5340 # A symbol stripping program.
12414 STRIP=$lt_STRIP 5341 STRIP=$lt_STRIP
12415 5342
12416@@ -16039,6 +16735,12 @@ 5343@@ -16372,6 +17068,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
12417 # Transform the output of nm in a C name address pair when lib prefix is needed. 5344 # Transform the output of nm in a C name address pair when lib prefix is needed.
12418 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5345 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
12419 5346
@@ -12426,7 +5353,7 @@ Index: binutils-2.24/binutils/configure
12426 # The name of the directory that contains temporary libtool files. 5353 # The name of the directory that contains temporary libtool files.
12427 objdir=$objdir 5354 objdir=$objdir
12428 5355
12429@@ -16048,6 +16750,9 @@ 5356@@ -16381,6 +17083,9 @@ MAGIC_CMD=$MAGIC_CMD
12430 # Must we lock files when doing compilation? 5357 # Must we lock files when doing compilation?
12431 need_locks=$lt_need_locks 5358 need_locks=$lt_need_locks
12432 5359
@@ -12436,7 +5363,7 @@ Index: binutils-2.24/binutils/configure
12436 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5363 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
12437 DSYMUTIL=$lt_DSYMUTIL 5364 DSYMUTIL=$lt_DSYMUTIL
12438 5365
12439@@ -16162,12 +16867,12 @@ 5366@@ -16495,12 +17200,12 @@ with_gcc=$GCC
12440 # Compiler flag to turn off builtin functions. 5367 # Compiler flag to turn off builtin functions.
12441 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5368 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
12442 5369
@@ -12452,7 +5379,7 @@ Index: binutils-2.24/binutils/configure
12452 # Compiler flag to prevent dynamic linking. 5379 # Compiler flag to prevent dynamic linking.
12453 link_static_flag=$lt_lt_prog_compiler_static 5380 link_static_flag=$lt_lt_prog_compiler_static
12454 5381
12455@@ -16254,9 +16959,6 @@ 5382@@ -16587,9 +17292,6 @@ inherit_rpath=$inherit_rpath
12456 # Whether libtool must link a program against all its dependency libraries. 5383 # Whether libtool must link a program against all its dependency libraries.
12457 link_all_deplibs=$link_all_deplibs 5384 link_all_deplibs=$link_all_deplibs
12458 5385
@@ -12462,7 +5389,7 @@ Index: binutils-2.24/binutils/configure
12462 # Set to "yes" if exported symbols are required. 5389 # Set to "yes" if exported symbols are required.
12463 always_export_symbols=$always_export_symbols 5390 always_export_symbols=$always_export_symbols
12464 5391
12465@@ -16272,6 +16974,9 @@ 5392@@ -16605,6 +17307,9 @@ include_expsyms=$lt_include_expsyms
12466 # Commands necessary for linking programs (against libraries) with templates. 5393 # Commands necessary for linking programs (against libraries) with templates.
12467 prelink_cmds=$lt_prelink_cmds 5394 prelink_cmds=$lt_prelink_cmds
12468 5395
@@ -12472,7 +5399,7 @@ Index: binutils-2.24/binutils/configure
12472 # Specify filename containing input files. 5399 # Specify filename containing input files.
12473 file_list_spec=$lt_file_list_spec 5400 file_list_spec=$lt_file_list_spec
12474 5401
12475@@ -16304,210 +17009,169 @@ 5402@@ -16637,210 +17342,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
12476 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5403 # if finds mixed CR/LF and LF-only lines. Since sed operates in
12477 # text mode, it properly converts lines to CR/LF. This bash problem 5404 # text mode, it properly converts lines to CR/LF. This bash problem
12478 # is reportedly fixed, but why not run on old versions too? 5405 # is reportedly fixed, but why not run on old versions too?
@@ -12674,9 +5601,15 @@ Index: binutils-2.24/binutils/configure
12674-_LT_EOF 5601-_LT_EOF
12675- ;; 5602- ;;
12676- esac 5603- esac
5604-
5605-
5606- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
5607- || (rm -f "$cfgfile"; exit 1)
5608-
5609- mv -f "$cfgfile" "$ofile" ||
12677+ sed '$q' "$ltmain" >> "$cfgfile" \ 5610+ sed '$q' "$ltmain" >> "$cfgfile" \
12678+ || (rm -f "$cfgfile"; exit 1) 5611+ || (rm -f "$cfgfile"; exit 1)
12679 5612+
12680+ if test x"$xsi_shell" = xyes; then 5613+ if test x"$xsi_shell" = xyes; then
12681+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 5614+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
12682+func_dirname ()\ 5615+func_dirname ()\
@@ -12834,20 +5767,17 @@ Index: binutils-2.24/binutils/configure
12834+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 5767+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
12835+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 5768+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
12836+fi 5769+fi
12837 5770+
12838- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 5771+
12839- || (rm -f "$cfgfile"; exit 1)
12840
12841- mv -f "$cfgfile" "$ofile" ||
12842+ mv -f "$cfgfile" "$ofile" || 5772+ mv -f "$cfgfile" "$ofile" ||
12843 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 5773 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
12844 chmod +x "$ofile" 5774 chmod +x "$ofile"
12845 5775
12846Index: binutils-2.24/gas/configure 5776diff --git a/gprof/configure b/gprof/configure
12847=================================================================== 5777index 79961c5..c4f6ac9 100755
12848--- binutils-2.24.orig/gas/configure 2013-11-04 07:33:37.000000000 -0800 5778--- a/gprof/configure
12849+++ binutils-2.24/gas/configure 2013-12-15 11:10:23.880452030 -0800 5779+++ b/gprof/configure
12850@@ -645,8 +645,11 @@ 5780@@ -629,8 +629,11 @@ OTOOL
12851 LIPO 5781 LIPO
12852 NMEDIT 5782 NMEDIT
12853 DSYMUTIL 5783 DSYMUTIL
@@ -12859,24 +5789,24 @@ Index: binutils-2.24/gas/configure
12859 OBJDUMP 5789 OBJDUMP
12860 LN_S 5790 LN_S
12861 NM 5791 NM
12862@@ -759,6 +762,7 @@ 5792@@ -741,6 +744,7 @@ enable_static
12863 with_pic 5793 with_pic
12864 enable_fast_install 5794 enable_fast_install
12865 with_gnu_ld 5795 with_gnu_ld
12866+with_libtool_sysroot 5796+with_libtool_sysroot
12867 enable_libtool_lock 5797 enable_libtool_lock
12868 enable_targets 5798 enable_plugins
12869 enable_checking 5799 enable_largefile
12870@@ -1420,6 +1424,8 @@ 5800@@ -1399,6 +1403,8 @@ Optional Packages:
12871 --with-pic try to use only PIC/non-PIC objects [default=use 5801 --with-pic try to use only PIC/non-PIC objects [default=use
12872 both] 5802 both]
12873 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 5803 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
12874+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 5804+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
12875+ (or the compiler's sysroot if not specified). 5805+ (or the compiler's sysroot if not specified).
12876 --with-zlib include zlib support (auto/yes/no) default=auto
12877 5806
12878 Some influential environment variables: 5807 Some influential environment variables:
12879@@ -5135,8 +5141,8 @@ 5808 CC C compiler command
5809@@ -4831,8 +4837,8 @@ esac
12880 5810
12881 5811
12882 5812
@@ -12887,7 +5817,7 @@ Index: binutils-2.24/gas/configure
12887 5817
12888 5818
12889 5819
12890@@ -5176,7 +5182,7 @@ 5820@@ -4872,7 +4878,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
12891 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5821 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
12892 $as_echo_n "checking how to print strings... " >&6; } 5822 $as_echo_n "checking how to print strings... " >&6; }
12893 # Test print first, because it will be a builtin if present. 5823 # Test print first, because it will be a builtin if present.
@@ -12896,7 +5826,7 @@ Index: binutils-2.24/gas/configure
12896 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5826 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
12897 ECHO='print -r --' 5827 ECHO='print -r --'
12898 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5828 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
12899@@ -5862,8 +5868,8 @@ 5829@@ -5558,8 +5564,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
12900 # Try some XSI features 5830 # Try some XSI features
12901 xsi_shell=no 5831 xsi_shell=no
12902 ( _lt_dummy="a/b/c" 5832 ( _lt_dummy="a/b/c"
@@ -12907,7 +5837,7 @@ Index: binutils-2.24/gas/configure
12907 && eval 'test $(( 1 + 1 )) -eq 2 \ 5837 && eval 'test $(( 1 + 1 )) -eq 2 \
12908 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5838 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
12909 && xsi_shell=yes 5839 && xsi_shell=yes
12910@@ -5912,6 +5918,80 @@ 5840@@ -5608,6 +5614,80 @@ esac
12911 5841
12912 5842
12913 5843
@@ -12988,7 +5918,7 @@ Index: binutils-2.24/gas/configure
12988 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 5918 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
12989 $as_echo_n "checking for $LD option to reload object files... " >&6; } 5919 $as_echo_n "checking for $LD option to reload object files... " >&6; }
12990 if test "${lt_cv_ld_reload_flag+set}" = set; then : 5920 if test "${lt_cv_ld_reload_flag+set}" = set; then :
12991@@ -5928,6 +6008,11 @@ 5921@@ -5624,6 +5704,11 @@ case $reload_flag in
12992 esac 5922 esac
12993 reload_cmds='$LD$reload_flag -o $output$reload_objs' 5923 reload_cmds='$LD$reload_flag -o $output$reload_objs'
12994 case $host_os in 5924 case $host_os in
@@ -13000,7 +5930,7 @@ Index: binutils-2.24/gas/configure
13000 darwin*) 5930 darwin*)
13001 if test "$GCC" = yes; then 5931 if test "$GCC" = yes; then
13002 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 5932 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
13003@@ -6096,7 +6181,8 @@ 5933@@ -5792,7 +5877,8 @@ mingw* | pw32*)
13004 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 5934 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
13005 lt_cv_file_magic_cmd='func_win32_libid' 5935 lt_cv_file_magic_cmd='func_win32_libid'
13006 else 5936 else
@@ -13010,7 +5940,19 @@ Index: binutils-2.24/gas/configure
13010 lt_cv_file_magic_cmd='$OBJDUMP -f' 5940 lt_cv_file_magic_cmd='$OBJDUMP -f'
13011 fi 5941 fi
13012 ;; 5942 ;;
13013@@ -6250,6 +6336,21 @@ 5943@@ -5869,11 +5955,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5944 lt_cv_deplibs_check_method=pass_all
5945 ;;
5946
5947-linux-uclibc*)
5948- lt_cv_deplibs_check_method=pass_all
5949- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
5950- ;;
5951-
5952 netbsd*)
5953 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5954 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5955@@ -5951,6 +6032,21 @@ esac
13014 fi 5956 fi
13015 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5957 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
13016 $as_echo "$lt_cv_deplibs_check_method" >&6; } 5958 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -13032,7 +5974,7 @@ Index: binutils-2.24/gas/configure
13032 file_magic_cmd=$lt_cv_file_magic_cmd 5974 file_magic_cmd=$lt_cv_file_magic_cmd
13033 deplibs_check_method=$lt_cv_deplibs_check_method 5975 deplibs_check_method=$lt_cv_deplibs_check_method
13034 test -z "$deplibs_check_method" && deplibs_check_method=unknown 5976 test -z "$deplibs_check_method" && deplibs_check_method=unknown
13035@@ -6265,9 +6366,162 @@ 5977@@ -5966,9 +6062,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
13036 5978
13037 5979
13038 5980
@@ -13197,7 +6139,7 @@ Index: binutils-2.24/gas/configure
13197 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6139 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13198 $as_echo_n "checking for $ac_word... " >&6; } 6140 $as_echo_n "checking for $ac_word... " >&6; }
13199 if test "${ac_cv_prog_AR+set}" = set; then : 6141 if test "${ac_cv_prog_AR+set}" = set; then :
13200@@ -6283,7 +6537,7 @@ 6142@@ -5984,7 +6233,7 @@ do
13201 test -z "$as_dir" && as_dir=. 6143 test -z "$as_dir" && as_dir=.
13202 for ac_exec_ext in '' $ac_executable_extensions; do 6144 for ac_exec_ext in '' $ac_executable_extensions; do
13203 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6145 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -13206,7 +6148,7 @@ Index: binutils-2.24/gas/configure
13206 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6148 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13207 break 2 6149 break 2
13208 fi 6150 fi
13209@@ -6303,11 +6557,15 @@ 6151@@ -6004,11 +6253,15 @@ $as_echo "no" >&6; }
13210 fi 6152 fi
13211 6153
13212 6154
@@ -13225,7 +6167,7 @@ Index: binutils-2.24/gas/configure
13225 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6167 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13226 $as_echo_n "checking for $ac_word... " >&6; } 6168 $as_echo_n "checking for $ac_word... " >&6; }
13227 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 6169 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
13228@@ -6323,7 +6581,7 @@ 6170@@ -6024,7 +6277,7 @@ do
13229 test -z "$as_dir" && as_dir=. 6171 test -z "$as_dir" && as_dir=.
13230 for ac_exec_ext in '' $ac_executable_extensions; do 6172 for ac_exec_ext in '' $ac_executable_extensions; do
13231 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6173 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -13234,7 +6176,7 @@ Index: binutils-2.24/gas/configure
13234 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6176 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13235 break 2 6177 break 2
13236 fi 6178 fi
13237@@ -6342,6 +6600,10 @@ 6179@@ -6043,6 +6296,10 @@ else
13238 $as_echo "no" >&6; } 6180 $as_echo "no" >&6; }
13239 fi 6181 fi
13240 6182
@@ -13245,7 +6187,7 @@ Index: binutils-2.24/gas/configure
13245 if test "x$ac_ct_AR" = x; then 6187 if test "x$ac_ct_AR" = x; then
13246 AR="false" 6188 AR="false"
13247 else 6189 else
13248@@ -6353,16 +6615,72 @@ 6190@@ -6054,12 +6311,10 @@ ac_tool_warned=yes ;;
13249 esac 6191 esac
13250 AR=$ac_ct_AR 6192 AR=$ac_ct_AR
13251 fi 6193 fi
@@ -13257,17 +6199,13 @@ Index: binutils-2.24/gas/configure
13257-test -z "$AR_FLAGS" && AR_FLAGS=cru 6199-test -z "$AR_FLAGS" && AR_FLAGS=cru
13258+: ${AR=ar} 6200+: ${AR=ar}
13259+: ${AR_FLAGS=cru} 6201+: ${AR_FLAGS=cru}
13260+ 6202
13261+ 6203
13262+ 6204
13263+ 6205@@ -6071,6 +6326,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
13264+ 6206
13265+ 6207
13266+ 6208
13267+
13268+
13269+
13270+
13271+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 6209+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
13272+$as_echo_n "checking for archiver @FILE support... " >&6; } 6210+$as_echo_n "checking for archiver @FILE support... " >&6; }
13273+if test "${lt_cv_ar_at_file+set}" = set; then : 6211+if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -13280,7 +6218,7 @@ Index: binutils-2.24/gas/configure
13280+int 6218+int
13281+main () 6219+main ()
13282+{ 6220+{
13283 6221+
13284+ ; 6222+ ;
13285+ return 0; 6223+ return 0;
13286+} 6224+}
@@ -13306,23 +6244,30 @@ Index: binutils-2.24/gas/configure
13306+ fi 6244+ fi
13307+ fi 6245+ fi
13308+ rm -f conftest.* libconftest.a 6246+ rm -f conftest.* libconftest.a
13309 6247+
13310+fi 6248+fi
13311+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6249+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13312 6250+
13313+fi 6251+fi
13314+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 6252+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
13315+$as_echo "$lt_cv_ar_at_file" >&6; } 6253+$as_echo "$lt_cv_ar_at_file" >&6; }
13316 6254+
13317+if test "x$lt_cv_ar_at_file" = xno; then 6255+if test "x$lt_cv_ar_at_file" = xno; then
13318+ archiver_list_spec= 6256+ archiver_list_spec=
13319+else 6257+else
13320+ archiver_list_spec=$lt_cv_ar_at_file 6258+ archiver_list_spec=$lt_cv_ar_at_file
13321+fi 6259+fi
13322 6260+
13323 6261+
13324 6262+
13325@@ -6704,8 +7022,8 @@ 6263+
6264+
6265+
6266+
6267 if test -n "$ac_tool_prefix"; then
6268 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6269 set dummy ${ac_tool_prefix}strip; ac_word=$2
6270@@ -6405,8 +6718,8 @@ esac
13326 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6271 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
13327 6272
13328 # Transform an extracted symbol line into symbol name and symbol address 6273 # Transform an extracted symbol line into symbol name and symbol address
@@ -13333,7 +6278,7 @@ Index: binutils-2.24/gas/configure
13333 6278
13334 # Handle CRLF in mingw tool chain 6279 # Handle CRLF in mingw tool chain
13335 opt_cr= 6280 opt_cr=
13336@@ -6741,6 +7059,7 @@ 6281@@ -6442,6 +6755,7 @@ for ac_symprfx in "" "_"; do
13337 else 6282 else
13338 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6283 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
13339 fi 6284 fi
@@ -13341,7 +6286,7 @@ Index: binutils-2.24/gas/configure
13341 6286
13342 # Check to see that the pipe works correctly. 6287 # Check to see that the pipe works correctly.
13343 pipe_works=no 6288 pipe_works=no
13344@@ -6782,6 +7101,18 @@ 6289@@ -6483,6 +6797,18 @@ _LT_EOF
13345 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6290 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
13346 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6291 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
13347 cat <<_LT_EOF > conftest.$ac_ext 6292 cat <<_LT_EOF > conftest.$ac_ext
@@ -13360,7 +6305,7 @@ Index: binutils-2.24/gas/configure
13360 #ifdef __cplusplus 6305 #ifdef __cplusplus
13361 extern "C" { 6306 extern "C" {
13362 #endif 6307 #endif
13363@@ -6793,7 +7124,7 @@ 6308@@ -6494,7 +6820,7 @@ _LT_EOF
13364 cat <<_LT_EOF >> conftest.$ac_ext 6309 cat <<_LT_EOF >> conftest.$ac_ext
13365 6310
13366 /* The mapping between symbol names and symbols. */ 6311 /* The mapping between symbol names and symbols. */
@@ -13369,7 +6314,7 @@ Index: binutils-2.24/gas/configure
13369 const char *name; 6314 const char *name;
13370 void *address; 6315 void *address;
13371 } 6316 }
13372@@ -6819,8 +7150,8 @@ 6317@@ -6520,8 +6846,8 @@ static const void *lt_preloaded_setup() {
13373 _LT_EOF 6318 _LT_EOF
13374 # Now try linking the two files. 6319 # Now try linking the two files.
13375 mv conftest.$ac_objext conftstm.$ac_objext 6320 mv conftest.$ac_objext conftstm.$ac_objext
@@ -13380,7 +6325,7 @@ Index: binutils-2.24/gas/configure
13380 LIBS="conftstm.$ac_objext" 6325 LIBS="conftstm.$ac_objext"
13381 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6326 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
13382 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6327 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13383@@ -6830,8 +7161,8 @@ 6328@@ -6531,8 +6857,8 @@ _LT_EOF
13384 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6329 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
13385 pipe_works=yes 6330 pipe_works=yes
13386 fi 6331 fi
@@ -13391,7 +6336,7 @@ Index: binutils-2.24/gas/configure
13391 else 6336 else
13392 echo "cannot find nm_test_func in $nlist" >&5 6337 echo "cannot find nm_test_func in $nlist" >&5
13393 fi 6338 fi
13394@@ -6868,6 +7199,19 @@ 6339@@ -6569,6 +6895,18 @@ else
13395 $as_echo "ok" >&6; } 6340 $as_echo "ok" >&6; }
13396 fi 6341 fi
13397 6342
@@ -13407,11 +6352,10 @@ Index: binutils-2.24/gas/configure
13407+ 6352+
13408+ 6353+
13409+ 6354+
13410+
13411 6355
13412 6356
13413 6357
13414@@ -6888,6 +7232,42 @@ 6358@@ -6590,6 +6928,43 @@ fi
13415 6359
13416 6360
13417 6361
@@ -13451,10 +6395,11 @@ Index: binutils-2.24/gas/configure
13451+ 6395+
13452+ 6396+
13453+ 6397+
13454 6398+
13455 # Check whether --enable-libtool-lock was given. 6399 # Check whether --enable-libtool-lock was given.
13456 if test "${enable_libtool_lock+set}" = set; then : 6400 if test "${enable_libtool_lock+set}" = set; then :
13457@@ -7095,6 +7475,123 @@ 6401 enableval=$enable_libtool_lock;
6402@@ -6796,6 +7171,123 @@ esac
13458 6403
13459 need_locks="$enable_libtool_lock" 6404 need_locks="$enable_libtool_lock"
13460 6405
@@ -13578,7 +6523,7 @@ Index: binutils-2.24/gas/configure
13578 6523
13579 case $host_os in 6524 case $host_os in
13580 rhapsody* | darwin*) 6525 rhapsody* | darwin*)
13581@@ -7658,6 +8155,8 @@ 6526@@ -7359,6 +7851,8 @@ _LT_EOF
13582 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6527 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
13583 echo "$AR cru libconftest.a conftest.o" >&5 6528 echo "$AR cru libconftest.a conftest.o" >&5
13584 $AR cru libconftest.a conftest.o 2>&5 6529 $AR cru libconftest.a conftest.o 2>&5
@@ -13587,7 +6532,7 @@ Index: binutils-2.24/gas/configure
13587 cat > conftest.c << _LT_EOF 6532 cat > conftest.c << _LT_EOF
13588 int main() { return 0;} 6533 int main() { return 0;}
13589 _LT_EOF 6534 _LT_EOF
13590@@ -7853,7 +8352,8 @@ 6535@@ -7554,7 +8048,8 @@ fi
13591 LIBTOOL_DEPS="$ltmain" 6536 LIBTOOL_DEPS="$ltmain"
13592 6537
13593 # Always use our own libtool. 6538 # Always use our own libtool.
@@ -13597,7 +6542,7 @@ Index: binutils-2.24/gas/configure
13597 6542
13598 6543
13599 6544
13600@@ -7942,7 +8442,7 @@ 6545@@ -7643,7 +8138,7 @@ aix3*)
13601 esac 6546 esac
13602 6547
13603 # Global variables: 6548 # Global variables:
@@ -13606,7 +6551,7 @@ Index: binutils-2.24/gas/configure
13606 can_build_shared=yes 6551 can_build_shared=yes
13607 6552
13608 # All known linkers require a `.a' archive for static linking (except MSVC, 6553 # All known linkers require a `.a' archive for static linking (except MSVC,
13609@@ -8240,8 +8740,6 @@ 6554@@ -7941,8 +8436,6 @@ fi
13610 lt_prog_compiler_pic= 6555 lt_prog_compiler_pic=
13611 lt_prog_compiler_static= 6556 lt_prog_compiler_static=
13612 6557
@@ -13615,7 +6560,7 @@ Index: binutils-2.24/gas/configure
13615 6560
13616 if test "$GCC" = yes; then 6561 if test "$GCC" = yes; then
13617 lt_prog_compiler_wl='-Wl,' 6562 lt_prog_compiler_wl='-Wl,'
13618@@ -8407,6 +8905,12 @@ 6563@@ -8108,6 +8601,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13619 lt_prog_compiler_pic='--shared' 6564 lt_prog_compiler_pic='--shared'
13620 lt_prog_compiler_static='--static' 6565 lt_prog_compiler_static='--static'
13621 ;; 6566 ;;
@@ -13628,7 +6573,7 @@ Index: binutils-2.24/gas/configure
13628 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6573 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
13629 # Portland Group compilers (*not* the Pentium gcc compiler, 6574 # Portland Group compilers (*not* the Pentium gcc compiler,
13630 # which looks to be a dead project) 6575 # which looks to be a dead project)
13631@@ -8469,7 +8973,7 @@ 6576@@ -8170,7 +8669,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
13632 lt_prog_compiler_pic='-KPIC' 6577 lt_prog_compiler_pic='-KPIC'
13633 lt_prog_compiler_static='-Bstatic' 6578 lt_prog_compiler_static='-Bstatic'
13634 case $cc_basename in 6579 case $cc_basename in
@@ -13637,7 +6582,7 @@ Index: binutils-2.24/gas/configure
13637 lt_prog_compiler_wl='-Qoption ld ';; 6582 lt_prog_compiler_wl='-Qoption ld ';;
13638 *) 6583 *)
13639 lt_prog_compiler_wl='-Wl,';; 6584 lt_prog_compiler_wl='-Wl,';;
13640@@ -8526,13 +9030,17 @@ 6585@@ -8227,13 +8726,17 @@ case $host_os in
13641 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6586 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
13642 ;; 6587 ;;
13643 esac 6588 esac
@@ -13661,7 +6606,7 @@ Index: binutils-2.24/gas/configure
13661 6606
13662 # 6607 #
13663 # Check to make sure the PIC flag actually works. 6608 # Check to make sure the PIC flag actually works.
13664@@ -8593,6 +9101,11 @@ 6609@@ -8294,6 +8797,11 @@ fi
13665 6610
13666 6611
13667 6612
@@ -13673,7 +6618,7 @@ Index: binutils-2.24/gas/configure
13673 # 6618 #
13674 # Check to make sure the static flag actually works. 6619 # Check to make sure the static flag actually works.
13675 # 6620 #
13676@@ -8943,7 +9456,8 @@ 6621@@ -8644,7 +9152,8 @@ _LT_EOF
13677 allow_undefined_flag=unsupported 6622 allow_undefined_flag=unsupported
13678 always_export_symbols=no 6623 always_export_symbols=no
13679 enable_shared_with_static_runtimes=yes 6624 enable_shared_with_static_runtimes=yes
@@ -13683,7 +6628,7 @@ Index: binutils-2.24/gas/configure
13683 6628
13684 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6629 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
13685 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6630 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
13686@@ -8991,7 +9505,7 @@ 6631@@ -8692,7 +9201,7 @@ _LT_EOF
13687 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ 6632 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
13688 && test "$tmp_diet" = no 6633 && test "$tmp_diet" = no
13689 then 6634 then
@@ -13692,7 +6637,7 @@ Index: binutils-2.24/gas/configure
13692 tmp_sharedflag='-shared' 6637 tmp_sharedflag='-shared'
13693 case $cc_basename,$host_cpu in 6638 case $cc_basename,$host_cpu in
13694 pgcc*) # Portland Group C compiler 6639 pgcc*) # Portland Group C compiler
13695@@ -9042,12 +9556,12 @@ 6640@@ -8743,12 +9252,12 @@ _LT_EOF
13696 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6641 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
13697 hardcode_libdir_flag_spec= 6642 hardcode_libdir_flag_spec=
13698 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6643 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -13707,7 +6652,7 @@ Index: binutils-2.24/gas/configure
13707 fi 6652 fi
13708 ;; 6653 ;;
13709 esac 6654 esac
13710@@ -9061,8 +9575,8 @@ 6655@@ -8762,8 +9271,8 @@ _LT_EOF
13711 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6656 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
13712 wlarc= 6657 wlarc=
13713 else 6658 else
@@ -13718,7 +6663,7 @@ Index: binutils-2.24/gas/configure
13718 fi 6663 fi
13719 ;; 6664 ;;
13720 6665
13721@@ -9080,8 +9594,8 @@ 6666@@ -8781,8 +9290,8 @@ _LT_EOF
13722 6667
13723 _LT_EOF 6668 _LT_EOF
13724 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6669 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13729,7 +6674,7 @@ Index: binutils-2.24/gas/configure
13729 else 6674 else
13730 ld_shlibs=no 6675 ld_shlibs=no
13731 fi 6676 fi
13732@@ -9127,8 +9641,8 @@ 6677@@ -8828,8 +9337,8 @@ _LT_EOF
13733 6678
13734 *) 6679 *)
13735 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6680 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13740,7 +6685,7 @@ Index: binutils-2.24/gas/configure
13740 else 6685 else
13741 ld_shlibs=no 6686 ld_shlibs=no
13742 fi 6687 fi
13743@@ -9258,7 +9772,13 @@ 6688@@ -8959,7 +9468,13 @@ _LT_EOF
13744 allow_undefined_flag='-berok' 6689 allow_undefined_flag='-berok'
13745 # Determine the default libpath from the value encoded in an 6690 # Determine the default libpath from the value encoded in an
13746 # empty executable. 6691 # empty executable.
@@ -13755,7 +6700,7 @@ Index: binutils-2.24/gas/configure
13755 /* end confdefs.h. */ 6700 /* end confdefs.h. */
13756 6701
13757 int 6702 int
13758@@ -9271,22 +9791,29 @@ 6703@@ -8972,22 +9487,29 @@ main ()
13759 _ACEOF 6704 _ACEOF
13760 if ac_fn_c_try_link "$LINENO"; then : 6705 if ac_fn_c_try_link "$LINENO"; then :
13761 6706
@@ -13798,7 +6743,7 @@ Index: binutils-2.24/gas/configure
13798 6743
13799 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6744 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13800 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" 6745 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"
13801@@ -9298,7 +9825,13 @@ 6746@@ -8999,7 +9521,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13802 else 6747 else
13803 # Determine the default libpath from the value encoded in an 6748 # Determine the default libpath from the value encoded in an
13804 # empty executable. 6749 # empty executable.
@@ -13813,7 +6758,7 @@ Index: binutils-2.24/gas/configure
13813 /* end confdefs.h. */ 6758 /* end confdefs.h. */
13814 6759
13815 int 6760 int
13816@@ -9311,22 +9844,29 @@ 6761@@ -9012,22 +9540,29 @@ main ()
13817 _ACEOF 6762 _ACEOF
13818 if ac_fn_c_try_link "$LINENO"; then : 6763 if ac_fn_c_try_link "$LINENO"; then :
13819 6764
@@ -13856,7 +6801,7 @@ Index: binutils-2.24/gas/configure
13856 6801
13857 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6802 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
13858 # Warning - without using the other run time loading flags, 6803 # Warning - without using the other run time loading flags,
13859@@ -9371,20 +9911,63 @@ 6804@@ -9072,20 +9607,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13860 # Microsoft Visual C++. 6805 # Microsoft Visual C++.
13861 # hardcode_libdir_flag_spec is actually meaningless, as there is 6806 # hardcode_libdir_flag_spec is actually meaningless, as there is
13862 # no search path for DLLs. 6807 # no search path for DLLs.
@@ -13934,7 +6879,7 @@ Index: binutils-2.24/gas/configure
13934 ;; 6879 ;;
13935 6880
13936 darwin* | rhapsody*) 6881 darwin* | rhapsody*)
13937@@ -9445,7 +10028,7 @@ 6882@@ -9146,7 +9724,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13938 6883
13939 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 6884 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
13940 freebsd* | dragonfly*) 6885 freebsd* | dragonfly*)
@@ -13943,7 +6888,7 @@ Index: binutils-2.24/gas/configure
13943 hardcode_libdir_flag_spec='-R$libdir' 6888 hardcode_libdir_flag_spec='-R$libdir'
13944 hardcode_direct=yes 6889 hardcode_direct=yes
13945 hardcode_shlibpath_var=no 6890 hardcode_shlibpath_var=no
13946@@ -9453,7 +10036,7 @@ 6891@@ -9154,7 +9732,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13947 6892
13948 hpux9*) 6893 hpux9*)
13949 if test "$GCC" = yes; then 6894 if test "$GCC" = yes; then
@@ -13952,7 +6897,7 @@ Index: binutils-2.24/gas/configure
13952 else 6897 else
13953 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' 6898 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'
13954 fi 6899 fi
13955@@ -9469,7 +10052,7 @@ 6900@@ -9170,7 +9748,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13956 6901
13957 hpux10*) 6902 hpux10*)
13958 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 6903 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -13961,7 +6906,7 @@ Index: binutils-2.24/gas/configure
13961 else 6906 else
13962 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 6907 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
13963 fi 6908 fi
13964@@ -9493,10 +10076,10 @@ 6909@@ -9194,10 +9772,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
13965 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6910 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
13966 ;; 6911 ;;
13967 ia64*) 6912 ia64*)
@@ -13974,7 +6919,7 @@ Index: binutils-2.24/gas/configure
13974 ;; 6919 ;;
13975 esac 6920 esac
13976 else 6921 else
13977@@ -9575,23 +10158,36 @@ 6922@@ -9276,23 +9854,36 @@ fi
13978 6923
13979 irix5* | irix6* | nonstopux*) 6924 irix5* | irix6* | nonstopux*)
13980 if test "$GCC" = yes; then 6925 if test "$GCC" = yes; then
@@ -14019,7 +6964,7 @@ Index: binutils-2.24/gas/configure
14019 else 6964 else
14020 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' 6965 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'
14021 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' 6966 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'
14022@@ -9676,7 +10272,7 @@ 6967@@ -9377,7 +9968,7 @@ rm -f core conftest.err conftest.$ac_objext \
14023 osf4* | osf5*) # as osf3* with the addition of -msym flag 6968 osf4* | osf5*) # as osf3* with the addition of -msym flag
14024 if test "$GCC" = yes; then 6969 if test "$GCC" = yes; then
14025 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 6970 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -14028,7 +6973,7 @@ Index: binutils-2.24/gas/configure
14028 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 6973 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
14029 else 6974 else
14030 allow_undefined_flag=' -expect_unresolved \*' 6975 allow_undefined_flag=' -expect_unresolved \*'
14031@@ -9695,9 +10291,9 @@ 6976@@ -9396,9 +9987,9 @@ rm -f core conftest.err conftest.$ac_objext \
14032 no_undefined_flag=' -z defs' 6977 no_undefined_flag=' -z defs'
14033 if test "$GCC" = yes; then 6978 if test "$GCC" = yes; then
14034 wlarc='${wl}' 6979 wlarc='${wl}'
@@ -14040,7 +6985,7 @@ Index: binutils-2.24/gas/configure
14040 else 6985 else
14041 case `$CC -V 2>&1` in 6986 case `$CC -V 2>&1` in
14042 *"Compilers 5.0"*) 6987 *"Compilers 5.0"*)
14043@@ -10273,8 +10869,9 @@ 6988@@ -9974,8 +10565,9 @@ cygwin* | mingw* | pw32* | cegcc*)
14044 need_version=no 6989 need_version=no
14045 need_lib_prefix=no 6990 need_lib_prefix=no
14046 6991
@@ -14052,7 +6997,7 @@ Index: binutils-2.24/gas/configure
14052 library_names_spec='$libname.dll.a' 6997 library_names_spec='$libname.dll.a'
14053 # DLL is installed to $(libdir)/../bin by postinstall_cmds 6998 # DLL is installed to $(libdir)/../bin by postinstall_cmds
14054 postinstall_cmds='base_file=`basename \${file}`~ 6999 postinstall_cmds='base_file=`basename \${file}`~
14055@@ -10307,13 +10904,71 @@ 7000@@ -10008,13 +10600,71 @@ cygwin* | mingw* | pw32* | cegcc*)
14056 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 7001 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
14057 ;; 7002 ;;
14058 esac 7003 esac
@@ -14125,7 +7070,7 @@ Index: binutils-2.24/gas/configure
14125 # FIXME: first we should search . and the directory the executable is in 7070 # FIXME: first we should search . and the directory the executable is in
14126 shlibpath_var=PATH 7071 shlibpath_var=PATH
14127 ;; 7072 ;;
14128@@ -10405,7 +11060,7 @@ 7073@@ -10106,7 +10756,7 @@ haiku*)
14129 soname_spec='${libname}${release}${shared_ext}$major' 7074 soname_spec='${libname}${release}${shared_ext}$major'
14130 shlibpath_var=LIBRARY_PATH 7075 shlibpath_var=LIBRARY_PATH
14131 shlibpath_overrides_runpath=yes 7076 shlibpath_overrides_runpath=yes
@@ -14134,7 +7079,7 @@ Index: binutils-2.24/gas/configure
14134 hardcode_into_libs=yes 7079 hardcode_into_libs=yes
14135 ;; 7080 ;;
14136 7081
14137@@ -11245,10 +11900,10 @@ 7082@@ -10946,10 +11596,10 @@ else
14138 /* When -fvisbility=hidden is used, assume the code has been annotated 7083 /* When -fvisbility=hidden is used, assume the code has been annotated
14139 correspondingly for the symbols needed. */ 7084 correspondingly for the symbols needed. */
14140 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7085 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -14147,7 +7092,7 @@ Index: binutils-2.24/gas/configure
14147 int main () 7092 int main ()
14148 { 7093 {
14149 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7094 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14150@@ -11351,10 +12006,10 @@ 7095@@ -11052,10 +11702,10 @@ else
14151 /* When -fvisbility=hidden is used, assume the code has been annotated 7096 /* When -fvisbility=hidden is used, assume the code has been annotated
14152 correspondingly for the symbols needed. */ 7097 correspondingly for the symbols needed. */
14153 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7098 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -14160,7 +7105,7 @@ Index: binutils-2.24/gas/configure
14160 int main () 7105 int main ()
14161 { 7106 {
14162 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7107 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
14163@@ -15064,13 +15719,20 @@ 7108@@ -12924,13 +13574,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
14164 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7109 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
14165 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7110 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
14166 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7111 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -14181,7 +7126,7 @@ Index: binutils-2.24/gas/configure
14181 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7126 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
14182 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7127 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
14183 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7128 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
14184@@ -15085,14 +15747,17 @@ 7129@@ -12945,14 +13602,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
14185 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7130 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
14186 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7131 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
14187 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"`' 7132 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"`'
@@ -14200,7 +7145,7 @@ Index: binutils-2.24/gas/configure
14200 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7145 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
14201 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7146 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
14202 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7147 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
14203@@ -15125,12 +15790,12 @@ 7148@@ -12985,12 +13645,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
14204 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7149 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
14205 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7150 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
14206 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7151 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -14214,7 +7159,7 @@ Index: binutils-2.24/gas/configure
14214 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7159 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
14215 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7160 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
14216 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7161 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
14217@@ -15185,8 +15850,13 @@ 7162@@ -13045,8 +13705,13 @@ reload_flag \
14218 OBJDUMP \ 7163 OBJDUMP \
14219 deplibs_check_method \ 7164 deplibs_check_method \
14220 file_magic_cmd \ 7165 file_magic_cmd \
@@ -14228,7 +7173,7 @@ Index: binutils-2.24/gas/configure
14228 STRIP \ 7173 STRIP \
14229 RANLIB \ 7174 RANLIB \
14230 CC \ 7175 CC \
14231@@ -15196,12 +15866,14 @@ 7176@@ -13056,12 +13721,14 @@ lt_cv_sys_global_symbol_pipe \
14232 lt_cv_sys_global_symbol_to_cdecl \ 7177 lt_cv_sys_global_symbol_to_cdecl \
14233 lt_cv_sys_global_symbol_to_c_name_address \ 7178 lt_cv_sys_global_symbol_to_c_name_address \
14234 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7179 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -14244,7 +7189,7 @@ Index: binutils-2.24/gas/configure
14244 DSYMUTIL \ 7189 DSYMUTIL \
14245 NMEDIT \ 7190 NMEDIT \
14246 LIPO \ 7191 LIPO \
14247@@ -15217,7 +15889,6 @@ 7192@@ -13077,7 +13744,6 @@ no_undefined_flag \
14248 hardcode_libdir_flag_spec \ 7193 hardcode_libdir_flag_spec \
14249 hardcode_libdir_flag_spec_ld \ 7194 hardcode_libdir_flag_spec_ld \
14250 hardcode_libdir_separator \ 7195 hardcode_libdir_separator \
@@ -14252,7 +7197,7 @@ Index: binutils-2.24/gas/configure
14252 exclude_expsyms \ 7197 exclude_expsyms \
14253 include_expsyms \ 7198 include_expsyms \
14254 file_list_spec \ 7199 file_list_spec \
14255@@ -15253,6 +15924,7 @@ 7200@@ -13113,6 +13779,7 @@ module_cmds \
14256 module_expsym_cmds \ 7201 module_expsym_cmds \
14257 export_symbols_cmds \ 7202 export_symbols_cmds \
14258 prelink_cmds \ 7203 prelink_cmds \
@@ -14260,7 +7205,7 @@ Index: binutils-2.24/gas/configure
14260 postinstall_cmds \ 7205 postinstall_cmds \
14261 postuninstall_cmds \ 7206 postuninstall_cmds \
14262 finish_cmds \ 7207 finish_cmds \
14263@@ -16017,7 +16689,8 @@ 7208@@ -13869,7 +14536,8 @@ $as_echo X"$file" |
14264 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7209 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
14265 # 7210 #
14266 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7211 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -14270,7 +7215,7 @@ Index: binutils-2.24/gas/configure
14270 # Written by Gordon Matzigkeit, 1996 7215 # Written by Gordon Matzigkeit, 1996
14271 # 7216 #
14272 # This file is part of GNU Libtool. 7217 # This file is part of GNU Libtool.
14273@@ -16120,19 +16793,42 @@ 7218@@ -13972,19 +14640,42 @@ SP2NL=$lt_lt_SP2NL
14274 # turn newlines into spaces. 7219 # turn newlines into spaces.
14275 NL2SP=$lt_lt_NL2SP 7220 NL2SP=$lt_lt_NL2SP
14276 7221
@@ -14314,7 +7259,7 @@ Index: binutils-2.24/gas/configure
14314 # A symbol stripping program. 7259 # A symbol stripping program.
14315 STRIP=$lt_STRIP 7260 STRIP=$lt_STRIP
14316 7261
14317@@ -16162,6 +16858,12 @@ 7262@@ -14014,6 +14705,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
14318 # Transform the output of nm in a C name address pair when lib prefix is needed. 7263 # Transform the output of nm in a C name address pair when lib prefix is needed.
14319 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7264 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
14320 7265
@@ -14327,7 +7272,7 @@ Index: binutils-2.24/gas/configure
14327 # The name of the directory that contains temporary libtool files. 7272 # The name of the directory that contains temporary libtool files.
14328 objdir=$objdir 7273 objdir=$objdir
14329 7274
14330@@ -16171,6 +16873,9 @@ 7275@@ -14023,6 +14720,9 @@ MAGIC_CMD=$MAGIC_CMD
14331 # Must we lock files when doing compilation? 7276 # Must we lock files when doing compilation?
14332 need_locks=$lt_need_locks 7277 need_locks=$lt_need_locks
14333 7278
@@ -14337,7 +7282,7 @@ Index: binutils-2.24/gas/configure
14337 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7282 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
14338 DSYMUTIL=$lt_DSYMUTIL 7283 DSYMUTIL=$lt_DSYMUTIL
14339 7284
14340@@ -16285,12 +16990,12 @@ 7285@@ -14137,12 +14837,12 @@ with_gcc=$GCC
14341 # Compiler flag to turn off builtin functions. 7286 # Compiler flag to turn off builtin functions.
14342 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7287 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
14343 7288
@@ -14353,7 +7298,7 @@ Index: binutils-2.24/gas/configure
14353 # Compiler flag to prevent dynamic linking. 7298 # Compiler flag to prevent dynamic linking.
14354 link_static_flag=$lt_lt_prog_compiler_static 7299 link_static_flag=$lt_lt_prog_compiler_static
14355 7300
14356@@ -16377,9 +17082,6 @@ 7301@@ -14229,9 +14929,6 @@ inherit_rpath=$inherit_rpath
14357 # Whether libtool must link a program against all its dependency libraries. 7302 # Whether libtool must link a program against all its dependency libraries.
14358 link_all_deplibs=$link_all_deplibs 7303 link_all_deplibs=$link_all_deplibs
14359 7304
@@ -14363,7 +7308,7 @@ Index: binutils-2.24/gas/configure
14363 # Set to "yes" if exported symbols are required. 7308 # Set to "yes" if exported symbols are required.
14364 always_export_symbols=$always_export_symbols 7309 always_export_symbols=$always_export_symbols
14365 7310
14366@@ -16395,6 +17097,9 @@ 7311@@ -14247,6 +14944,9 @@ include_expsyms=$lt_include_expsyms
14367 # Commands necessary for linking programs (against libraries) with templates. 7312 # Commands necessary for linking programs (against libraries) with templates.
14368 prelink_cmds=$lt_prelink_cmds 7313 prelink_cmds=$lt_prelink_cmds
14369 7314
@@ -14373,7 +7318,7 @@ Index: binutils-2.24/gas/configure
14373 # Specify filename containing input files. 7318 # Specify filename containing input files.
14374 file_list_spec=$lt_file_list_spec 7319 file_list_spec=$lt_file_list_spec
14375 7320
14376@@ -16427,210 +17132,169 @@ 7321@@ -14279,210 +14979,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
14377 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7322 # if finds mixed CR/LF and LF-only lines. Since sed operates in
14378 # text mode, it properly converts lines to CR/LF. This bash problem 7323 # text mode, it properly converts lines to CR/LF. This bash problem
14379 # is reportedly fixed, but why not run on old versions too? 7324 # is reportedly fixed, but why not run on old versions too?
@@ -14575,9 +7520,15 @@ Index: binutils-2.24/gas/configure
14575-_LT_EOF 7520-_LT_EOF
14576- ;; 7521- ;;
14577- esac 7522- esac
7523-
7524-
7525- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
7526- || (rm -f "$cfgfile"; exit 1)
7527-
7528- mv -f "$cfgfile" "$ofile" ||
14578+ sed '$q' "$ltmain" >> "$cfgfile" \ 7529+ sed '$q' "$ltmain" >> "$cfgfile" \
14579+ || (rm -f "$cfgfile"; exit 1) 7530+ || (rm -f "$cfgfile"; exit 1)
14580 7531+
14581+ if test x"$xsi_shell" = xyes; then 7532+ if test x"$xsi_shell" = xyes; then
14582+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 7533+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
14583+func_dirname ()\ 7534+func_dirname ()\
@@ -14735,20 +7686,17 @@ Index: binutils-2.24/gas/configure
14735+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 7686+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
14736+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 7687+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
14737+fi 7688+fi
14738 7689+
14739- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 7690+
14740- || (rm -f "$cfgfile"; exit 1)
14741
14742- mv -f "$cfgfile" "$ofile" ||
14743+ mv -f "$cfgfile" "$ofile" || 7691+ mv -f "$cfgfile" "$ofile" ||
14744 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 7692 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
14745 chmod +x "$ofile" 7693 chmod +x "$ofile"
14746 7694
14747Index: binutils-2.24/gprof/configure 7695diff --git a/ld/configure b/ld/configure
14748=================================================================== 7696index 4408b0d..2fbaebf 100755
14749--- binutils-2.24.orig/gprof/configure 2013-12-15 11:09:51.443785606 -0800 7697--- a/ld/configure
14750+++ binutils-2.24/gprof/configure 2013-12-15 11:10:23.880452030 -0800 7698+++ b/ld/configure
14751@@ -629,8 +629,11 @@ 7699@@ -654,8 +654,11 @@ OTOOL
14752 LIPO 7700 LIPO
14753 NMEDIT 7701 NMEDIT
14754 DSYMUTIL 7702 DSYMUTIL
@@ -14760,24 +7708,24 @@ Index: binutils-2.24/gprof/configure
14760 OBJDUMP 7708 OBJDUMP
14761 LN_S 7709 LN_S
14762 NM 7710 NM
14763@@ -743,6 +746,7 @@ 7711@@ -776,6 +779,7 @@ enable_static
14764 with_pic 7712 with_pic
14765 enable_fast_install 7713 enable_fast_install
14766 with_gnu_ld 7714 with_gnu_ld
14767+with_libtool_sysroot 7715+with_libtool_sysroot
14768 enable_libtool_lock 7716 enable_libtool_lock
14769 enable_nls 7717 enable_plugins
14770 enable_maintainer_mode 7718 enable_largefile
14771@@ -1397,6 +1401,8 @@ 7719@@ -1453,6 +1457,8 @@ Optional Packages:
14772 --with-pic try to use only PIC/non-PIC objects [default=use 7720 --with-pic try to use only PIC/non-PIC objects [default=use
14773 both] 7721 both]
14774 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7722 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
14775+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 7723+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
14776+ (or the compiler's sysroot if not specified). 7724+ (or the compiler's sysroot if not specified).
14777 7725 --with-lib-path=dir1:dir2... set default LIB_PATH
14778 Some influential environment variables: 7726 --with-sysroot=DIR Search for usr/lib et al within DIR.
14779 CC C compiler command 7727 --with-zlib include zlib support (auto/yes/no) default=auto
14780@@ -5065,8 +5071,8 @@ 7728@@ -5645,8 +5651,8 @@ esac
14781 7729
14782 7730
14783 7731
@@ -14788,7 +7736,7 @@ Index: binutils-2.24/gprof/configure
14788 7736
14789 7737
14790 7738
14791@@ -5106,7 +5112,7 @@ 7739@@ -5686,7 +5692,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
14792 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7740 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
14793 $as_echo_n "checking how to print strings... " >&6; } 7741 $as_echo_n "checking how to print strings... " >&6; }
14794 # Test print first, because it will be a builtin if present. 7742 # Test print first, because it will be a builtin if present.
@@ -14797,7 +7745,7 @@ Index: binutils-2.24/gprof/configure
14797 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7745 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
14798 ECHO='print -r --' 7746 ECHO='print -r --'
14799 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7747 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
14800@@ -5792,8 +5798,8 @@ 7748@@ -6372,8 +6378,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
14801 # Try some XSI features 7749 # Try some XSI features
14802 xsi_shell=no 7750 xsi_shell=no
14803 ( _lt_dummy="a/b/c" 7751 ( _lt_dummy="a/b/c"
@@ -14808,7 +7756,7 @@ Index: binutils-2.24/gprof/configure
14808 && eval 'test $(( 1 + 1 )) -eq 2 \ 7756 && eval 'test $(( 1 + 1 )) -eq 2 \
14809 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7757 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
14810 && xsi_shell=yes 7758 && xsi_shell=yes
14811@@ -5842,6 +5848,80 @@ 7759@@ -6422,6 +6428,80 @@ esac
14812 7760
14813 7761
14814 7762
@@ -14889,7 +7837,7 @@ Index: binutils-2.24/gprof/configure
14889 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7837 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
14890 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7838 $as_echo_n "checking for $LD option to reload object files... " >&6; }
14891 if test "${lt_cv_ld_reload_flag+set}" = set; then : 7839 if test "${lt_cv_ld_reload_flag+set}" = set; then :
14892@@ -5858,6 +5938,11 @@ 7840@@ -6438,6 +6518,11 @@ case $reload_flag in
14893 esac 7841 esac
14894 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7842 reload_cmds='$LD$reload_flag -o $output$reload_objs'
14895 case $host_os in 7843 case $host_os in
@@ -14901,7 +7849,7 @@ Index: binutils-2.24/gprof/configure
14901 darwin*) 7849 darwin*)
14902 if test "$GCC" = yes; then 7850 if test "$GCC" = yes; then
14903 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7851 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
14904@@ -6026,7 +6111,8 @@ 7852@@ -6606,7 +6691,8 @@ mingw* | pw32*)
14905 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7853 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
14906 lt_cv_file_magic_cmd='func_win32_libid' 7854 lt_cv_file_magic_cmd='func_win32_libid'
14907 else 7855 else
@@ -14911,19 +7859,7 @@ Index: binutils-2.24/gprof/configure
14911 lt_cv_file_magic_cmd='$OBJDUMP -f' 7859 lt_cv_file_magic_cmd='$OBJDUMP -f'
14912 fi 7860 fi
14913 ;; 7861 ;;
14914@@ -6103,11 +6189,6 @@ 7862@@ -6760,6 +6846,21 @@ esac
14915 lt_cv_deplibs_check_method=pass_all
14916 ;;
14917
14918-linux-uclibc*)
14919- lt_cv_deplibs_check_method=pass_all
14920- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
14921- ;;
14922-
14923 netbsd*)
14924 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
14925 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
14926@@ -6185,6 +6266,21 @@
14927 fi 7863 fi
14928 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7864 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
14929 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7865 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -14945,7 +7881,7 @@ Index: binutils-2.24/gprof/configure
14945 file_magic_cmd=$lt_cv_file_magic_cmd 7881 file_magic_cmd=$lt_cv_file_magic_cmd
14946 deplibs_check_method=$lt_cv_deplibs_check_method 7882 deplibs_check_method=$lt_cv_deplibs_check_method
14947 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7883 test -z "$deplibs_check_method" && deplibs_check_method=unknown
14948@@ -6200,9 +6296,162 @@ 7884@@ -6775,9 +6876,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
14949 7885
14950 7886
14951 7887
@@ -14959,9 +7895,7 @@ Index: binutils-2.24/gprof/configure
14959+ 7895+
14960+ 7896+
14961+ 7897+
14962 if test -n "$ac_tool_prefix"; then 7898+if test -n "$ac_tool_prefix"; then
14963- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
14964-set dummy ${ac_tool_prefix}ar; ac_word=$2
14965+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 7899+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
14966+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 7900+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
14967+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7901+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -15102,7 +8036,9 @@ Index: binutils-2.24/gprof/configure
15102+ 8036+
15103+ 8037+
15104+ 8038+
15105+if test -n "$ac_tool_prefix"; then 8039 if test -n "$ac_tool_prefix"; then
8040- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
8041-set dummy ${ac_tool_prefix}ar; ac_word=$2
15106+ for ac_prog in ar 8042+ for ac_prog in ar
15107+ do 8043+ do
15108+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 8044+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -15110,7 +8046,7 @@ Index: binutils-2.24/gprof/configure
15110 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8046 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15111 $as_echo_n "checking for $ac_word... " >&6; } 8047 $as_echo_n "checking for $ac_word... " >&6; }
15112 if test "${ac_cv_prog_AR+set}" = set; then : 8048 if test "${ac_cv_prog_AR+set}" = set; then :
15113@@ -6218,7 +6467,7 @@ 8049@@ -6793,7 +7047,7 @@ do
15114 test -z "$as_dir" && as_dir=. 8050 test -z "$as_dir" && as_dir=.
15115 for ac_exec_ext in '' $ac_executable_extensions; do 8051 for ac_exec_ext in '' $ac_executable_extensions; do
15116 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8052 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -15119,7 +8055,7 @@ Index: binutils-2.24/gprof/configure
15119 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8055 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15120 break 2 8056 break 2
15121 fi 8057 fi
15122@@ -6238,11 +6487,15 @@ 8058@@ -6813,11 +7067,15 @@ $as_echo "no" >&6; }
15123 fi 8059 fi
15124 8060
15125 8061
@@ -15138,7 +8074,7 @@ Index: binutils-2.24/gprof/configure
15138 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8074 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15139 $as_echo_n "checking for $ac_word... " >&6; } 8075 $as_echo_n "checking for $ac_word... " >&6; }
15140 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 8076 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
15141@@ -6258,7 +6511,7 @@ 8077@@ -6833,7 +7091,7 @@ do
15142 test -z "$as_dir" && as_dir=. 8078 test -z "$as_dir" && as_dir=.
15143 for ac_exec_ext in '' $ac_executable_extensions; do 8079 for ac_exec_ext in '' $ac_executable_extensions; do
15144 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8080 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -15147,7 +8083,7 @@ Index: binutils-2.24/gprof/configure
15147 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8083 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15148 break 2 8084 break 2
15149 fi 8085 fi
15150@@ -6277,6 +6530,10 @@ 8086@@ -6852,6 +7110,10 @@ else
15151 $as_echo "no" >&6; } 8087 $as_echo "no" >&6; }
15152 fi 8088 fi
15153 8089
@@ -15158,7 +8094,7 @@ Index: binutils-2.24/gprof/configure
15158 if test "x$ac_ct_AR" = x; then 8094 if test "x$ac_ct_AR" = x; then
15159 AR="false" 8095 AR="false"
15160 else 8096 else
15161@@ -6288,16 +6545,72 @@ 8097@@ -6863,12 +7125,12 @@ ac_tool_warned=yes ;;
15162 esac 8098 esac
15163 AR=$ac_ct_AR 8099 AR=$ac_ct_AR
15164 fi 8100 fi
@@ -15172,15 +8108,13 @@ Index: binutils-2.24/gprof/configure
15172+: ${AR_FLAGS=cru} 8108+: ${AR_FLAGS=cru}
15173+ 8109+
15174+ 8110+
15175+ 8111
15176+ 8112
15177+ 8113
15178+ 8114@@ -6878,6 +7140,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
15179+ 8115
15180+ 8116
15181+ 8117
15182+
15183+
15184+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 8118+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
15185+$as_echo_n "checking for archiver @FILE support... " >&6; } 8119+$as_echo_n "checking for archiver @FILE support... " >&6; }
15186+if test "${lt_cv_ar_at_file+set}" = set; then : 8120+if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -15193,7 +8127,7 @@ Index: binutils-2.24/gprof/configure
15193+int 8127+int
15194+main () 8128+main ()
15195+{ 8129+{
15196 8130+
15197+ ; 8131+ ;
15198+ return 0; 8132+ return 0;
15199+} 8133+}
@@ -15219,23 +8153,28 @@ Index: binutils-2.24/gprof/configure
15219+ fi 8153+ fi
15220+ fi 8154+ fi
15221+ rm -f conftest.* libconftest.a 8155+ rm -f conftest.* libconftest.a
15222 8156+
15223+fi 8157+fi
15224+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 8158+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15225 8159+
15226+fi 8160+fi
15227+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 8161+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
15228+$as_echo "$lt_cv_ar_at_file" >&6; } 8162+$as_echo "$lt_cv_ar_at_file" >&6; }
15229 8163+
15230+if test "x$lt_cv_ar_at_file" = xno; then 8164+if test "x$lt_cv_ar_at_file" = xno; then
15231+ archiver_list_spec= 8165+ archiver_list_spec=
15232+else 8166+else
15233+ archiver_list_spec=$lt_cv_ar_at_file 8167+ archiver_list_spec=$lt_cv_ar_at_file
15234+fi 8168+fi
8169+
8170+
8171+
8172+
8173+
15235 8174
15236 8175
15237 8176 if test -n "$ac_tool_prefix"; then
15238@@ -6639,8 +6952,8 @@ 8177@@ -7214,8 +7532,8 @@ esac
15239 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8178 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
15240 8179
15241 # Transform an extracted symbol line into symbol name and symbol address 8180 # Transform an extracted symbol line into symbol name and symbol address
@@ -15246,7 +8185,7 @@ Index: binutils-2.24/gprof/configure
15246 8185
15247 # Handle CRLF in mingw tool chain 8186 # Handle CRLF in mingw tool chain
15248 opt_cr= 8187 opt_cr=
15249@@ -6676,6 +6989,7 @@ 8188@@ -7251,6 +7569,7 @@ for ac_symprfx in "" "_"; do
15250 else 8189 else
15251 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8190 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
15252 fi 8191 fi
@@ -15254,7 +8193,7 @@ Index: binutils-2.24/gprof/configure
15254 8193
15255 # Check to see that the pipe works correctly. 8194 # Check to see that the pipe works correctly.
15256 pipe_works=no 8195 pipe_works=no
15257@@ -6717,6 +7031,18 @@ 8196@@ -7292,6 +7611,18 @@ _LT_EOF
15258 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8197 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
15259 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8198 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
15260 cat <<_LT_EOF > conftest.$ac_ext 8199 cat <<_LT_EOF > conftest.$ac_ext
@@ -15273,7 +8212,7 @@ Index: binutils-2.24/gprof/configure
15273 #ifdef __cplusplus 8212 #ifdef __cplusplus
15274 extern "C" { 8213 extern "C" {
15275 #endif 8214 #endif
15276@@ -6728,7 +7054,7 @@ 8215@@ -7303,7 +7634,7 @@ _LT_EOF
15277 cat <<_LT_EOF >> conftest.$ac_ext 8216 cat <<_LT_EOF >> conftest.$ac_ext
15278 8217
15279 /* The mapping between symbol names and symbols. */ 8218 /* The mapping between symbol names and symbols. */
@@ -15282,7 +8221,7 @@ Index: binutils-2.24/gprof/configure
15282 const char *name; 8221 const char *name;
15283 void *address; 8222 void *address;
15284 } 8223 }
15285@@ -6754,8 +7080,8 @@ 8224@@ -7329,8 +7660,8 @@ static const void *lt_preloaded_setup() {
15286 _LT_EOF 8225 _LT_EOF
15287 # Now try linking the two files. 8226 # Now try linking the two files.
15288 mv conftest.$ac_objext conftstm.$ac_objext 8227 mv conftest.$ac_objext conftstm.$ac_objext
@@ -15293,7 +8232,7 @@ Index: binutils-2.24/gprof/configure
15293 LIBS="conftstm.$ac_objext" 8232 LIBS="conftstm.$ac_objext"
15294 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8233 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
15295 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8234 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
15296@@ -6765,8 +7091,8 @@ 8235@@ -7340,8 +7671,8 @@ _LT_EOF
15297 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8236 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
15298 pipe_works=yes 8237 pipe_works=yes
15299 fi 8238 fi
@@ -15304,7 +8243,7 @@ Index: binutils-2.24/gprof/configure
15304 else 8243 else
15305 echo "cannot find nm_test_func in $nlist" >&5 8244 echo "cannot find nm_test_func in $nlist" >&5
15306 fi 8245 fi
15307@@ -6803,6 +7129,17 @@ 8246@@ -7378,6 +7709,19 @@ else
15308 $as_echo "ok" >&6; } 8247 $as_echo "ok" >&6; }
15309 fi 8248 fi
15310 8249
@@ -15319,14 +8258,15 @@ Index: binutils-2.24/gprof/configure
15319+ 8258+
15320+ 8259+
15321+ 8260+
8261+
8262+
15322 8263
15323 8264
15324 8265
15325@@ -6824,6 +7161,44 @@ 8266@@ -7398,6 +7742,42 @@ fi
15326 8267
15327 8268
15328 8269
15329+
15330+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 8270+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
15331+$as_echo_n "checking for sysroot... " >&6; } 8271+$as_echo_n "checking for sysroot... " >&6; }
15332+ 8272+
@@ -15363,11 +8303,10 @@ Index: binutils-2.24/gprof/configure
15363+ 8303+
15364+ 8304+
15365+ 8305+
15366+ 8306
15367 # Check whether --enable-libtool-lock was given. 8307 # Check whether --enable-libtool-lock was given.
15368 if test "${enable_libtool_lock+set}" = set; then : 8308 if test "${enable_libtool_lock+set}" = set; then :
15369 enableval=$enable_libtool_lock; 8309@@ -7605,6 +7985,123 @@ esac
15370@@ -7030,6 +7405,123 @@
15371 8310
15372 need_locks="$enable_libtool_lock" 8311 need_locks="$enable_libtool_lock"
15373 8312
@@ -15491,7 +8430,7 @@ Index: binutils-2.24/gprof/configure
15491 8430
15492 case $host_os in 8431 case $host_os in
15493 rhapsody* | darwin*) 8432 rhapsody* | darwin*)
15494@@ -7593,6 +8085,8 @@ 8433@@ -8168,6 +8665,8 @@ _LT_EOF
15495 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8434 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
15496 echo "$AR cru libconftest.a conftest.o" >&5 8435 echo "$AR cru libconftest.a conftest.o" >&5
15497 $AR cru libconftest.a conftest.o 2>&5 8436 $AR cru libconftest.a conftest.o 2>&5
@@ -15500,7 +8439,24 @@ Index: binutils-2.24/gprof/configure
15500 cat > conftest.c << _LT_EOF 8439 cat > conftest.c << _LT_EOF
15501 int main() { return 0;} 8440 int main() { return 0;}
15502 _LT_EOF 8441 _LT_EOF
15503@@ -7788,7 +8282,8 @@ 8442@@ -8236,6 +8735,16 @@ done
8443
8444
8445
8446+func_stripname_cnf ()
8447+{
8448+ case ${2} in
8449+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
8450+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
8451+ esac
8452+} # func_stripname_cnf
8453+
8454+
8455+
8456
8457
8458 # Set options
8459@@ -8364,7 +8873,8 @@ fi
15504 LIBTOOL_DEPS="$ltmain" 8460 LIBTOOL_DEPS="$ltmain"
15505 8461
15506 # Always use our own libtool. 8462 # Always use our own libtool.
@@ -15510,7 +8466,7 @@ Index: binutils-2.24/gprof/configure
15510 8466
15511 8467
15512 8468
15513@@ -7877,7 +8372,7 @@ 8469@@ -8453,7 +8963,7 @@ aix3*)
15514 esac 8470 esac
15515 8471
15516 # Global variables: 8472 # Global variables:
@@ -15519,7 +8475,7 @@ Index: binutils-2.24/gprof/configure
15519 can_build_shared=yes 8475 can_build_shared=yes
15520 8476
15521 # All known linkers require a `.a' archive for static linking (except MSVC, 8477 # All known linkers require a `.a' archive for static linking (except MSVC,
15522@@ -8175,8 +8670,6 @@ 8478@@ -8751,8 +9261,6 @@ fi
15523 lt_prog_compiler_pic= 8479 lt_prog_compiler_pic=
15524 lt_prog_compiler_static= 8480 lt_prog_compiler_static=
15525 8481
@@ -15528,7 +8484,7 @@ Index: binutils-2.24/gprof/configure
15528 8484
15529 if test "$GCC" = yes; then 8485 if test "$GCC" = yes; then
15530 lt_prog_compiler_wl='-Wl,' 8486 lt_prog_compiler_wl='-Wl,'
15531@@ -8342,6 +8835,12 @@ 8487@@ -8918,6 +9426,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
15532 lt_prog_compiler_pic='--shared' 8488 lt_prog_compiler_pic='--shared'
15533 lt_prog_compiler_static='--static' 8489 lt_prog_compiler_static='--static'
15534 ;; 8490 ;;
@@ -15541,7 +8497,7 @@ Index: binutils-2.24/gprof/configure
15541 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8497 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
15542 # Portland Group compilers (*not* the Pentium gcc compiler, 8498 # Portland Group compilers (*not* the Pentium gcc compiler,
15543 # which looks to be a dead project) 8499 # which looks to be a dead project)
15544@@ -8404,7 +8903,7 @@ 8500@@ -8980,7 +9494,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
15545 lt_prog_compiler_pic='-KPIC' 8501 lt_prog_compiler_pic='-KPIC'
15546 lt_prog_compiler_static='-Bstatic' 8502 lt_prog_compiler_static='-Bstatic'
15547 case $cc_basename in 8503 case $cc_basename in
@@ -15550,7 +8506,7 @@ Index: binutils-2.24/gprof/configure
15550 lt_prog_compiler_wl='-Qoption ld ';; 8506 lt_prog_compiler_wl='-Qoption ld ';;
15551 *) 8507 *)
15552 lt_prog_compiler_wl='-Wl,';; 8508 lt_prog_compiler_wl='-Wl,';;
15553@@ -8461,13 +8960,17 @@ 8509@@ -9037,13 +9551,17 @@ case $host_os in
15554 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8510 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
15555 ;; 8511 ;;
15556 esac 8512 esac
@@ -15574,7 +8530,7 @@ Index: binutils-2.24/gprof/configure
15574 8530
15575 # 8531 #
15576 # Check to make sure the PIC flag actually works. 8532 # Check to make sure the PIC flag actually works.
15577@@ -8528,6 +9031,11 @@ 8533@@ -9104,6 +9622,11 @@ fi
15578 8534
15579 8535
15580 8536
@@ -15586,7 +8542,7 @@ Index: binutils-2.24/gprof/configure
15586 # 8542 #
15587 # Check to make sure the static flag actually works. 8543 # Check to make sure the static flag actually works.
15588 # 8544 #
15589@@ -8878,7 +9386,8 @@ 8545@@ -9454,7 +9977,8 @@ _LT_EOF
15590 allow_undefined_flag=unsupported 8546 allow_undefined_flag=unsupported
15591 always_export_symbols=no 8547 always_export_symbols=no
15592 enable_shared_with_static_runtimes=yes 8548 enable_shared_with_static_runtimes=yes
@@ -15596,7 +8552,7 @@ Index: binutils-2.24/gprof/configure
15596 8552
15597 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8553 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
15598 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8554 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
15599@@ -8926,7 +9435,7 @@ 8555@@ -9502,7 +10026,7 @@ _LT_EOF
15600 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ 8556 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
15601 && test "$tmp_diet" = no 8557 && test "$tmp_diet" = no
15602 then 8558 then
@@ -15605,7 +8561,7 @@ Index: binutils-2.24/gprof/configure
15605 tmp_sharedflag='-shared' 8561 tmp_sharedflag='-shared'
15606 case $cc_basename,$host_cpu in 8562 case $cc_basename,$host_cpu in
15607 pgcc*) # Portland Group C compiler 8563 pgcc*) # Portland Group C compiler
15608@@ -8977,12 +9486,12 @@ 8564@@ -9553,12 +10077,12 @@ _LT_EOF
15609 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8565 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
15610 hardcode_libdir_flag_spec= 8566 hardcode_libdir_flag_spec=
15611 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8567 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -15620,7 +8576,7 @@ Index: binutils-2.24/gprof/configure
15620 fi 8576 fi
15621 ;; 8577 ;;
15622 esac 8578 esac
15623@@ -8996,8 +9505,8 @@ 8579@@ -9572,8 +10096,8 @@ _LT_EOF
15624 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8580 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
15625 wlarc= 8581 wlarc=
15626 else 8582 else
@@ -15631,7 +8587,7 @@ Index: binutils-2.24/gprof/configure
15631 fi 8587 fi
15632 ;; 8588 ;;
15633 8589
15634@@ -9015,8 +9524,8 @@ 8590@@ -9591,8 +10115,8 @@ _LT_EOF
15635 8591
15636 _LT_EOF 8592 _LT_EOF
15637 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8593 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -15642,7 +8598,7 @@ Index: binutils-2.24/gprof/configure
15642 else 8598 else
15643 ld_shlibs=no 8599 ld_shlibs=no
15644 fi 8600 fi
15645@@ -9062,8 +9571,8 @@ 8601@@ -9638,8 +10162,8 @@ _LT_EOF
15646 8602
15647 *) 8603 *)
15648 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8604 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -15653,7 +8609,7 @@ Index: binutils-2.24/gprof/configure
15653 else 8609 else
15654 ld_shlibs=no 8610 ld_shlibs=no
15655 fi 8611 fi
15656@@ -9193,7 +9702,13 @@ 8612@@ -9769,7 +10293,13 @@ _LT_EOF
15657 allow_undefined_flag='-berok' 8613 allow_undefined_flag='-berok'
15658 # Determine the default libpath from the value encoded in an 8614 # Determine the default libpath from the value encoded in an
15659 # empty executable. 8615 # empty executable.
@@ -15668,7 +8624,7 @@ Index: binutils-2.24/gprof/configure
15668 /* end confdefs.h. */ 8624 /* end confdefs.h. */
15669 8625
15670 int 8626 int
15671@@ -9206,22 +9721,29 @@ 8627@@ -9782,22 +10312,29 @@ main ()
15672 _ACEOF 8628 _ACEOF
15673 if ac_fn_c_try_link "$LINENO"; then : 8629 if ac_fn_c_try_link "$LINENO"; then :
15674 8630
@@ -15711,7 +8667,7 @@ Index: binutils-2.24/gprof/configure
15711 8667
15712 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8668 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
15713 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" 8669 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"
15714@@ -9233,7 +9755,13 @@ 8670@@ -9809,7 +10346,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15715 else 8671 else
15716 # Determine the default libpath from the value encoded in an 8672 # Determine the default libpath from the value encoded in an
15717 # empty executable. 8673 # empty executable.
@@ -15726,7 +8682,7 @@ Index: binutils-2.24/gprof/configure
15726 /* end confdefs.h. */ 8682 /* end confdefs.h. */
15727 8683
15728 int 8684 int
15729@@ -9246,22 +9774,29 @@ 8685@@ -9822,22 +10365,29 @@ main ()
15730 _ACEOF 8686 _ACEOF
15731 if ac_fn_c_try_link "$LINENO"; then : 8687 if ac_fn_c_try_link "$LINENO"; then :
15732 8688
@@ -15769,10 +8725,11 @@ Index: binutils-2.24/gprof/configure
15769 8725
15770 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8726 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
15771 # Warning - without using the other run time loading flags, 8727 # Warning - without using the other run time loading flags,
15772@@ -9306,20 +9841,63 @@ 8728@@ -9881,21 +10431,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8729 # When not using gcc, we currently assume that we are using
15773 # Microsoft Visual C++. 8730 # Microsoft Visual C++.
15774 # hardcode_libdir_flag_spec is actually meaningless, as there is 8731 # hardcode_libdir_flag_spec is actually meaningless, as there is
15775 # no search path for DLLs. 8732- # no search path for DLLs.
15776- hardcode_libdir_flag_spec=' ' 8733- hardcode_libdir_flag_spec=' '
15777- allow_undefined_flag=unsupported 8734- allow_undefined_flag=unsupported
15778- # Tell ltmain to make .lib files, not .a files. 8735- # Tell ltmain to make .lib files, not .a files.
@@ -15787,6 +8744,7 @@ Index: binutils-2.24/gprof/configure
15787- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 8744- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
15788- fix_srcfile_path='`cygpath -w "$srcfile"`' 8745- fix_srcfile_path='`cygpath -w "$srcfile"`'
15789- enable_shared_with_static_runtimes=yes 8746- enable_shared_with_static_runtimes=yes
8747+ # no search path for DLLs.
15790+ case $cc_basename in 8748+ case $cc_basename in
15791+ cl*) 8749+ cl*)
15792+ # Native MSVC 8750+ # Native MSVC
@@ -15847,7 +8805,7 @@ Index: binutils-2.24/gprof/configure
15847 ;; 8805 ;;
15848 8806
15849 darwin* | rhapsody*) 8807 darwin* | rhapsody*)
15850@@ -9380,7 +9958,7 @@ 8808@@ -9956,7 +10549,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15851 8809
15852 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8810 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
15853 freebsd* | dragonfly*) 8811 freebsd* | dragonfly*)
@@ -15856,7 +8814,7 @@ Index: binutils-2.24/gprof/configure
15856 hardcode_libdir_flag_spec='-R$libdir' 8814 hardcode_libdir_flag_spec='-R$libdir'
15857 hardcode_direct=yes 8815 hardcode_direct=yes
15858 hardcode_shlibpath_var=no 8816 hardcode_shlibpath_var=no
15859@@ -9388,7 +9966,7 @@ 8817@@ -9964,7 +10557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15860 8818
15861 hpux9*) 8819 hpux9*)
15862 if test "$GCC" = yes; then 8820 if test "$GCC" = yes; then
@@ -15865,7 +8823,7 @@ Index: binutils-2.24/gprof/configure
15865 else 8823 else
15866 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' 8824 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'
15867 fi 8825 fi
15868@@ -9404,7 +9982,7 @@ 8826@@ -9980,7 +10573,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15869 8827
15870 hpux10*) 8828 hpux10*)
15871 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8829 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -15874,7 +8832,7 @@ Index: binutils-2.24/gprof/configure
15874 else 8832 else
15875 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8833 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
15876 fi 8834 fi
15877@@ -9428,10 +10006,10 @@ 8835@@ -10004,10 +10597,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15878 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8836 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
15879 ;; 8837 ;;
15880 ia64*) 8838 ia64*)
@@ -15887,7 +8845,7 @@ Index: binutils-2.24/gprof/configure
15887 ;; 8845 ;;
15888 esac 8846 esac
15889 else 8847 else
15890@@ -9510,23 +10088,36 @@ 8848@@ -10086,23 +10679,36 @@ fi
15891 8849
15892 irix5* | irix6* | nonstopux*) 8850 irix5* | irix6* | nonstopux*)
15893 if test "$GCC" = yes; then 8851 if test "$GCC" = yes; then
@@ -15932,7 +8890,7 @@ Index: binutils-2.24/gprof/configure
15932 else 8890 else
15933 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' 8891 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'
15934 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' 8892 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'
15935@@ -9611,7 +10202,7 @@ 8893@@ -10187,7 +10793,7 @@ rm -f core conftest.err conftest.$ac_objext \
15936 osf4* | osf5*) # as osf3* with the addition of -msym flag 8894 osf4* | osf5*) # as osf3* with the addition of -msym flag
15937 if test "$GCC" = yes; then 8895 if test "$GCC" = yes; then
15938 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8896 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15941,7 +8899,7 @@ Index: binutils-2.24/gprof/configure
15941 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8899 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
15942 else 8900 else
15943 allow_undefined_flag=' -expect_unresolved \*' 8901 allow_undefined_flag=' -expect_unresolved \*'
15944@@ -9630,9 +10221,9 @@ 8902@@ -10206,9 +10812,9 @@ rm -f core conftest.err conftest.$ac_objext \
15945 no_undefined_flag=' -z defs' 8903 no_undefined_flag=' -z defs'
15946 if test "$GCC" = yes; then 8904 if test "$GCC" = yes; then
15947 wlarc='${wl}' 8905 wlarc='${wl}'
@@ -15953,7 +8911,7 @@ Index: binutils-2.24/gprof/configure
15953 else 8911 else
15954 case `$CC -V 2>&1` in 8912 case `$CC -V 2>&1` in
15955 *"Compilers 5.0"*) 8913 *"Compilers 5.0"*)
15956@@ -10208,8 +10799,9 @@ 8914@@ -10784,8 +11390,9 @@ cygwin* | mingw* | pw32* | cegcc*)
15957 need_version=no 8915 need_version=no
15958 need_lib_prefix=no 8916 need_lib_prefix=no
15959 8917
@@ -15965,7 +8923,7 @@ Index: binutils-2.24/gprof/configure
15965 library_names_spec='$libname.dll.a' 8923 library_names_spec='$libname.dll.a'
15966 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8924 # DLL is installed to $(libdir)/../bin by postinstall_cmds
15967 postinstall_cmds='base_file=`basename \${file}`~ 8925 postinstall_cmds='base_file=`basename \${file}`~
15968@@ -10242,13 +10834,71 @@ 8926@@ -10818,13 +11425,71 @@ cygwin* | mingw* | pw32* | cegcc*)
15969 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8927 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
15970 ;; 8928 ;;
15971 esac 8929 esac
@@ -16038,7 +8996,7 @@ Index: binutils-2.24/gprof/configure
16038 # FIXME: first we should search . and the directory the executable is in 8996 # FIXME: first we should search . and the directory the executable is in
16039 shlibpath_var=PATH 8997 shlibpath_var=PATH
16040 ;; 8998 ;;
16041@@ -10340,7 +10990,7 @@ 8999@@ -10916,7 +11581,7 @@ haiku*)
16042 soname_spec='${libname}${release}${shared_ext}$major' 9000 soname_spec='${libname}${release}${shared_ext}$major'
16043 shlibpath_var=LIBRARY_PATH 9001 shlibpath_var=LIBRARY_PATH
16044 shlibpath_overrides_runpath=yes 9002 shlibpath_overrides_runpath=yes
@@ -16047,7 +9005,16 @@ Index: binutils-2.24/gprof/configure
16047 hardcode_into_libs=yes 9005 hardcode_into_libs=yes
16048 ;; 9006 ;;
16049 9007
16050@@ -11180,10 +11830,10 @@ 9008@@ -11712,7 +12377,7 @@ else
9009 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9010 lt_status=$lt_dlunknown
9011 cat > conftest.$ac_ext <<_LT_EOF
9012-#line 11715 "configure"
9013+#line $LINENO "configure"
9014 #include "confdefs.h"
9015
9016 #if HAVE_DLFCN_H
9017@@ -11756,10 +12421,10 @@ else
16051 /* When -fvisbility=hidden is used, assume the code has been annotated 9018 /* When -fvisbility=hidden is used, assume the code has been annotated
16052 correspondingly for the symbols needed. */ 9019 correspondingly for the symbols needed. */
16053 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9020 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -16060,7 +9027,16 @@ Index: binutils-2.24/gprof/configure
16060 int main () 9027 int main ()
16061 { 9028 {
16062 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9029 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
16063@@ -11286,10 +11936,10 @@ 9030@@ -11818,7 +12483,7 @@ else
9031 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9032 lt_status=$lt_dlunknown
9033 cat > conftest.$ac_ext <<_LT_EOF
9034-#line 11821 "configure"
9035+#line $LINENO "configure"
9036 #include "confdefs.h"
9037
9038 #if HAVE_DLFCN_H
9039@@ -11862,10 +12527,10 @@ else
16064 /* When -fvisbility=hidden is used, assume the code has been annotated 9040 /* When -fvisbility=hidden is used, assume the code has been annotated
16065 correspondingly for the symbols needed. */ 9041 correspondingly for the symbols needed. */
16066 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9042 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -16073,7 +9049,612 @@ Index: binutils-2.24/gprof/configure
16073 int main () 9049 int main ()
16074 { 9050 {
16075 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9051 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
16076@@ -12831,13 +13481,20 @@ 9052@@ -12257,6 +12922,7 @@ $RM -r conftest*
9053
9054 # Allow CC to be a program name with arguments.
9055 lt_save_CC=$CC
9056+ lt_save_CFLAGS=$CFLAGS
9057 lt_save_LD=$LD
9058 lt_save_GCC=$GCC
9059 GCC=$GXX
9060@@ -12274,6 +12940,7 @@ $RM -r conftest*
9061 fi
9062 test -z "${LDCXX+set}" || LD=$LDCXX
9063 CC=${CXX-"c++"}
9064+ CFLAGS=$CXXFLAGS
9065 compiler=$CC
9066 compiler_CXX=$CC
9067 for cc_temp in $compiler""; do
9068@@ -12413,8 +13080,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
9069 # Check if GNU C++ uses GNU ld as the underlying linker, since the
9070 # archiving commands below assume that GNU ld is being used.
9071 if test "$with_gnu_ld" = yes; then
9072- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
9073- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9074+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
9075+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9076
9077 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
9078 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
9079@@ -12556,7 +13223,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9080 allow_undefined_flag_CXX='-berok'
9081 # Determine the default libpath from the value encoded in an empty
9082 # executable.
9083- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9084+ if test "${lt_cv_aix_libpath+set}" = set; then
9085+ aix_libpath=$lt_cv_aix_libpath
9086+else
9087+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
9088+ $as_echo_n "(cached) " >&6
9089+else
9090+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9091 /* end confdefs.h. */
9092
9093 int
9094@@ -12569,22 +13242,29 @@ main ()
9095 _ACEOF
9096 if ac_fn_cxx_try_link "$LINENO"; then :
9097
9098-lt_aix_libpath_sed='
9099- /Import File Strings/,/^$/ {
9100- /^0/ {
9101- s/^0 *\(.*\)$/\1/
9102- p
9103- }
9104- }'
9105-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9106-# Check for a 64-bit object if we didn't find anything.
9107-if test -z "$aix_libpath"; then
9108- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9109-fi
9110+ lt_aix_libpath_sed='
9111+ /Import File Strings/,/^$/ {
9112+ /^0/ {
9113+ s/^0 *\([^ ]*\) *$/\1/
9114+ p
9115+ }
9116+ }'
9117+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9118+ # Check for a 64-bit object if we didn't find anything.
9119+ if test -z "$lt_cv_aix_libpath__CXX"; then
9120+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9121+ fi
9122 fi
9123 rm -f core conftest.err conftest.$ac_objext \
9124 conftest$ac_exeext conftest.$ac_ext
9125-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9126+ if test -z "$lt_cv_aix_libpath__CXX"; then
9127+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9128+ fi
9129+
9130+fi
9131+
9132+ aix_libpath=$lt_cv_aix_libpath__CXX
9133+fi
9134
9135 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9136
9137@@ -12597,7 +13277,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9138 else
9139 # Determine the default libpath from the value encoded in an
9140 # empty executable.
9141- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9142+ if test "${lt_cv_aix_libpath+set}" = set; then
9143+ aix_libpath=$lt_cv_aix_libpath
9144+else
9145+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
9146+ $as_echo_n "(cached) " >&6
9147+else
9148+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9149 /* end confdefs.h. */
9150
9151 int
9152@@ -12610,22 +13296,29 @@ main ()
9153 _ACEOF
9154 if ac_fn_cxx_try_link "$LINENO"; then :
9155
9156-lt_aix_libpath_sed='
9157- /Import File Strings/,/^$/ {
9158- /^0/ {
9159- s/^0 *\(.*\)$/\1/
9160- p
9161- }
9162- }'
9163-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9164-# Check for a 64-bit object if we didn't find anything.
9165-if test -z "$aix_libpath"; then
9166- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9167-fi
9168+ lt_aix_libpath_sed='
9169+ /Import File Strings/,/^$/ {
9170+ /^0/ {
9171+ s/^0 *\([^ ]*\) *$/\1/
9172+ p
9173+ }
9174+ }'
9175+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9176+ # Check for a 64-bit object if we didn't find anything.
9177+ if test -z "$lt_cv_aix_libpath__CXX"; then
9178+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9179+ fi
9180 fi
9181 rm -f core conftest.err conftest.$ac_objext \
9182 conftest$ac_exeext conftest.$ac_ext
9183-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9184+ if test -z "$lt_cv_aix_libpath__CXX"; then
9185+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
9186+ fi
9187+
9188+fi
9189+
9190+ aix_libpath=$lt_cv_aix_libpath__CXX
9191+fi
9192
9193 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
9194 # Warning - without using the other run time loading flags,
9195@@ -12668,29 +13361,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9196 ;;
9197
9198 cygwin* | mingw* | pw32* | cegcc*)
9199- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9200- # as there is no search path for DLLs.
9201- hardcode_libdir_flag_spec_CXX='-L$libdir'
9202- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9203- allow_undefined_flag_CXX=unsupported
9204- always_export_symbols_CXX=no
9205- enable_shared_with_static_runtimes_CXX=yes
9206-
9207- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9208- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9209- # If the export-symbols file already is a .def file (1st line
9210- # is EXPORTS), use it as is; otherwise, prepend...
9211- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9212- cp $export_symbols $output_objdir/$soname.def;
9213- else
9214- echo EXPORTS > $output_objdir/$soname.def;
9215- cat $export_symbols >> $output_objdir/$soname.def;
9216- fi~
9217- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9218- else
9219- ld_shlibs_CXX=no
9220- fi
9221- ;;
9222+ case $GXX,$cc_basename in
9223+ ,cl* | no,cl*)
9224+ # Native MSVC
9225+ # hardcode_libdir_flag_spec is actually meaningless, as there is
9226+ # no search path for DLLs.
9227+ hardcode_libdir_flag_spec_CXX=' '
9228+ allow_undefined_flag_CXX=unsupported
9229+ always_export_symbols_CXX=yes
9230+ file_list_spec_CXX='@'
9231+ # Tell ltmain to make .lib files, not .a files.
9232+ libext=lib
9233+ # Tell ltmain to make .dll files, not .so files.
9234+ shrext_cmds=".dll"
9235+ # FIXME: Setting linknames here is a bad hack.
9236+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
9237+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9238+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
9239+ else
9240+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
9241+ fi~
9242+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
9243+ linknames='
9244+ # The linker will not automatically build a static lib if we build a DLL.
9245+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
9246+ enable_shared_with_static_runtimes_CXX=yes
9247+ # Don't use ranlib
9248+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
9249+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
9250+ lt_tool_outputfile="@TOOL_OUTPUT@"~
9251+ case $lt_outputfile in
9252+ *.exe|*.EXE) ;;
9253+ *)
9254+ lt_outputfile="$lt_outputfile.exe"
9255+ lt_tool_outputfile="$lt_tool_outputfile.exe"
9256+ ;;
9257+ esac~
9258+ func_to_tool_file "$lt_outputfile"~
9259+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
9260+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
9261+ $RM "$lt_outputfile.manifest";
9262+ fi'
9263+ ;;
9264+ *)
9265+ # g++
9266+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
9267+ # as there is no search path for DLLs.
9268+ hardcode_libdir_flag_spec_CXX='-L$libdir'
9269+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
9270+ allow_undefined_flag_CXX=unsupported
9271+ always_export_symbols_CXX=no
9272+ enable_shared_with_static_runtimes_CXX=yes
9273+
9274+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
9275+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9276+ # If the export-symbols file already is a .def file (1st line
9277+ # is EXPORTS), use it as is; otherwise, prepend...
9278+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
9279+ cp $export_symbols $output_objdir/$soname.def;
9280+ else
9281+ echo EXPORTS > $output_objdir/$soname.def;
9282+ cat $export_symbols >> $output_objdir/$soname.def;
9283+ fi~
9284+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
9285+ else
9286+ ld_shlibs_CXX=no
9287+ fi
9288+ ;;
9289+ esac
9290+ ;;
9291 darwin* | rhapsody*)
9292
9293
9294@@ -12796,7 +13535,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9295 ;;
9296 *)
9297 if test "$GXX" = yes; then
9298- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
9299+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
9300 else
9301 # FIXME: insert proper C++ library support
9302 ld_shlibs_CXX=no
9303@@ -12867,10 +13606,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9304 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9305 ;;
9306 ia64*)
9307- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9308+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9309 ;;
9310 *)
9311- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9312+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9313 ;;
9314 esac
9315 fi
9316@@ -12911,9 +13650,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9317 *)
9318 if test "$GXX" = yes; then
9319 if test "$with_gnu_ld" = no; then
9320- archive_cmds_CXX='$CC -shared -nostdlib $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'
9321+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $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'
9322 else
9323- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
9324+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
9325 fi
9326 fi
9327 link_all_deplibs_CXX=yes
9328@@ -12983,20 +13722,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9329 prelink_cmds_CXX='tpldir=Template.dir~
9330 rm -rf $tpldir~
9331 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
9332- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
9333+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
9334 old_archive_cmds_CXX='tpldir=Template.dir~
9335 rm -rf $tpldir~
9336 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
9337- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
9338+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
9339 $RANLIB $oldlib'
9340 archive_cmds_CXX='tpldir=Template.dir~
9341 rm -rf $tpldir~
9342 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9343- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9344+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9345 archive_expsym_cmds_CXX='tpldir=Template.dir~
9346 rm -rf $tpldir~
9347 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
9348- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9349+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
9350 ;;
9351 *) # Version 6 and above use weak symbols
9352 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
9353@@ -13191,7 +13930,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9354 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'
9355 ;;
9356 *)
9357- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9358+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9359 ;;
9360 esac
9361
9362@@ -13237,7 +13976,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9363
9364 solaris*)
9365 case $cc_basename in
9366- CC*)
9367+ CC* | sunCC*)
9368 # Sun C++ 4.2, 5.x and Centerline C++
9369 archive_cmds_need_lc_CXX=yes
9370 no_undefined_flag_CXX=' -zdefs'
9371@@ -13278,9 +14017,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9372 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9373 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
9374 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
9375- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9376+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9377 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
9378- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9379+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
9380
9381 # Commands to make compiler produce verbose output that lists
9382 # what "hidden" libraries, object files and flags are used when
9383@@ -13415,6 +14154,13 @@ private:
9384 };
9385 _LT_EOF
9386
9387+
9388+_lt_libdeps_save_CFLAGS=$CFLAGS
9389+case "$CC $CFLAGS " in #(
9390+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
9391+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
9392+esac
9393+
9394 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9395 (eval $ac_compile) 2>&5
9396 ac_status=$?
9397@@ -13428,7 +14174,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9398 pre_test_object_deps_done=no
9399
9400 for p in `eval "$output_verbose_link_cmd"`; do
9401- case $p in
9402+ case ${prev}${p} in
9403
9404 -L* | -R* | -l*)
9405 # Some compilers place space between "-{L,R}" and the path.
9406@@ -13437,13 +14183,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9407 test $p = "-R"; then
9408 prev=$p
9409 continue
9410- else
9411- prev=
9412 fi
9413
9414+ # Expand the sysroot to ease extracting the directories later.
9415+ if test -z "$prev"; then
9416+ case $p in
9417+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
9418+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
9419+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
9420+ esac
9421+ fi
9422+ case $p in
9423+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
9424+ esac
9425 if test "$pre_test_object_deps_done" = no; then
9426- case $p in
9427- -L* | -R*)
9428+ case ${prev} in
9429+ -L | -R)
9430 # Internal compiler library paths should come after those
9431 # provided the user. The postdeps already come after the
9432 # user supplied libs so there is no need to process them.
9433@@ -13463,8 +14218,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9434 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
9435 fi
9436 fi
9437+ prev=
9438 ;;
9439
9440+ *.lto.$objext) ;; # Ignore GCC LTO objects
9441 *.$objext)
9442 # This assumes that the test object file only shows up
9443 # once in the compiler output.
9444@@ -13500,6 +14257,7 @@ else
9445 fi
9446
9447 $RM -f confest.$objext
9448+CFLAGS=$_lt_libdeps_save_CFLAGS
9449
9450 # PORTME: override above test on systems where it is broken
9451 case $host_os in
9452@@ -13535,7 +14293,7 @@ linux*)
9453
9454 solaris*)
9455 case $cc_basename in
9456- CC*)
9457+ CC* | sunCC*)
9458 # The more standards-conforming stlport4 library is
9459 # incompatible with the Cstd library. Avoid specifying
9460 # it if it's in CXXFLAGS. Ignore libCrun as
9461@@ -13600,8 +14358,6 @@ fi
9462 lt_prog_compiler_pic_CXX=
9463 lt_prog_compiler_static_CXX=
9464
9465-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9466-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9467
9468 # C++ specific cases for pic, static, wl, etc.
9469 if test "$GXX" = yes; then
9470@@ -13706,6 +14462,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9471 ;;
9472 esac
9473 ;;
9474+ mingw* | cygwin* | os2* | pw32* | cegcc*)
9475+ # This hack is so that the source file can tell whether it is being
9476+ # built for inclusion in a dll (and should export symbols for example).
9477+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
9478+ ;;
9479 dgux*)
9480 case $cc_basename in
9481 ec++*)
9482@@ -13858,7 +14619,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9483 ;;
9484 solaris*)
9485 case $cc_basename in
9486- CC*)
9487+ CC* | sunCC*)
9488 # Sun C++ 4.2, 5.x and Centerline C++
9489 lt_prog_compiler_pic_CXX='-KPIC'
9490 lt_prog_compiler_static_CXX='-Bstatic'
9491@@ -13923,10 +14684,17 @@ case $host_os in
9492 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
9493 ;;
9494 esac
9495-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
9496-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
9497-
9498
9499+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
9500+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
9501+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then :
9502+ $as_echo_n "(cached) " >&6
9503+else
9504+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
9505+fi
9506+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
9507+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
9508+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
9509
9510 #
9511 # Check to make sure the PIC flag actually works.
9512@@ -13984,6 +14752,8 @@ fi
9513
9514
9515
9516+
9517+
9518 #
9519 # Check to make sure the static flag actually works.
9520 #
9521@@ -14161,6 +14931,7 @@ fi
9522 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9523
9524 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9525+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9526 case $host_os in
9527 aix[4-9]*)
9528 # If we're using GNU nm, then we don't want the "-C" option.
9529@@ -14175,15 +14946,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9530 ;;
9531 pw32*)
9532 export_symbols_cmds_CXX="$ltdll_cmds"
9533- ;;
9534+ ;;
9535 cygwin* | mingw* | cegcc*)
9536- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
9537- ;;
9538+ case $cc_basename in
9539+ cl*) ;;
9540+ *)
9541+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
9542+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
9543+ ;;
9544+ esac
9545+ ;;
9546 *)
9547 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
9548- ;;
9549+ ;;
9550 esac
9551- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
9552
9553 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
9554 $as_echo "$ld_shlibs_CXX" >&6; }
9555@@ -14446,8 +15222,9 @@ cygwin* | mingw* | pw32* | cegcc*)
9556 need_version=no
9557 need_lib_prefix=no
9558
9559- case $GCC,$host_os in
9560- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9561+ case $GCC,$cc_basename in
9562+ yes,*)
9563+ # gcc
9564 library_names_spec='$libname.dll.a'
9565 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9566 postinstall_cmds='base_file=`basename \${file}`~
9567@@ -14479,13 +15256,71 @@ cygwin* | mingw* | pw32* | cegcc*)
9568 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9569 ;;
9570 esac
9571+ dynamic_linker='Win32 ld.exe'
9572+ ;;
9573+
9574+ *,cl*)
9575+ # Native MSVC
9576+ libname_spec='$name'
9577+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9578+ library_names_spec='${libname}.dll.lib'
9579+
9580+ case $build_os in
9581+ mingw*)
9582+ sys_lib_search_path_spec=
9583+ lt_save_ifs=$IFS
9584+ IFS=';'
9585+ for lt_path in $LIB
9586+ do
9587+ IFS=$lt_save_ifs
9588+ # Let DOS variable expansion print the short 8.3 style file name.
9589+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
9590+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
9591+ done
9592+ IFS=$lt_save_ifs
9593+ # Convert to MSYS style.
9594+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
9595+ ;;
9596+ cygwin*)
9597+ # Convert to unix form, then to dos form, then back to unix form
9598+ # but this time dos style (no spaces!) so that the unix form looks
9599+ # like /cygdrive/c/PROGRA~1:/cygdr...
9600+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
9601+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
9602+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9603+ ;;
9604+ *)
9605+ sys_lib_search_path_spec="$LIB"
9606+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
9607+ # It is most probably a Windows format PATH.
9608+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
9609+ else
9610+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
9611+ fi
9612+ # FIXME: find the short name or the path components, as spaces are
9613+ # common. (e.g. "Program Files" -> "PROGRA~1")
9614+ ;;
9615+ esac
9616+
9617+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
9618+ postinstall_cmds='base_file=`basename \${file}`~
9619+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
9620+ dldir=$destdir/`dirname \$dlpath`~
9621+ test -d \$dldir || mkdir -p \$dldir~
9622+ $install_prog $dir/$dlname \$dldir/$dlname'
9623+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
9624+ dlpath=$dir/\$dldll~
9625+ $RM \$dlpath'
9626+ shlibpath_overrides_runpath=yes
9627+ dynamic_linker='Win32 link.exe'
9628 ;;
9629
9630 *)
9631+ # Assume MSVC wrapper
9632 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
9633+ dynamic_linker='Win32 ld.exe'
9634 ;;
9635 esac
9636- dynamic_linker='Win32 ld.exe'
9637 # FIXME: first we should search . and the directory the executable is in
9638 shlibpath_var=PATH
9639 ;;
9640@@ -14576,7 +15411,7 @@ haiku*)
9641 soname_spec='${libname}${release}${shared_ext}$major'
9642 shlibpath_var=LIBRARY_PATH
9643 shlibpath_overrides_runpath=yes
9644- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9645+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9646 hardcode_into_libs=yes
9647 ;;
9648
9649@@ -15035,6 +15870,7 @@ fi
9650 fi # test -n "$compiler"
9651
9652 CC=$lt_save_CC
9653+ CFLAGS=$lt_save_CFLAGS
9654 LDCXX=$LD
9655 LD=$lt_save_LD
9656 GCC=$lt_save_GCC
9657@@ -17807,13 +18643,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
16077 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9658 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
16078 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9659 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
16079 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9660 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -16094,7 +9675,7 @@ Index: binutils-2.24/gprof/configure
16094 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9675 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
16095 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9676 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
16096 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9677 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
16097@@ -12852,14 +13509,17 @@ 9678@@ -17828,14 +18671,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
16098 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9679 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
16099 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9680 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
16100 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"`' 9681 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"`'
@@ -16113,7 +9694,7 @@ Index: binutils-2.24/gprof/configure
16113 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9694 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
16114 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9695 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
16115 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9696 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
16116@@ -12892,12 +13552,12 @@ 9697@@ -17868,12 +18714,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
16117 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9698 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
16118 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9699 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
16119 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9700 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -16127,7 +9708,31 @@ Index: binutils-2.24/gprof/configure
16127 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9708 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
16128 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9709 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
16129 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9710 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
16130@@ -12952,8 +13612,13 @@ 9711@@ -17912,8 +18758,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
9712 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
9713 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
9714 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
9715-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9716 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
9717+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
9718 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
9719 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
9720 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
9721@@ -17940,12 +18786,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
9722 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
9723 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
9724 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
9725-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
9726 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
9727 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9728 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9729 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
9730 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9731+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
9732 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
9733 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
9734 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
9735@@ -17983,8 +18829,13 @@ reload_flag \
16131 OBJDUMP \ 9736 OBJDUMP \
16132 deplibs_check_method \ 9737 deplibs_check_method \
16133 file_magic_cmd \ 9738 file_magic_cmd \
@@ -16141,7 +9746,7 @@ Index: binutils-2.24/gprof/configure
16141 STRIP \ 9746 STRIP \
16142 RANLIB \ 9747 RANLIB \
16143 CC \ 9748 CC \
16144@@ -12963,12 +13628,14 @@ 9749@@ -17994,12 +18845,14 @@ lt_cv_sys_global_symbol_pipe \
16145 lt_cv_sys_global_symbol_to_cdecl \ 9750 lt_cv_sys_global_symbol_to_cdecl \
16146 lt_cv_sys_global_symbol_to_c_name_address \ 9751 lt_cv_sys_global_symbol_to_c_name_address \
16147 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9752 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -16157,7 +9762,7 @@ Index: binutils-2.24/gprof/configure
16157 DSYMUTIL \ 9762 DSYMUTIL \
16158 NMEDIT \ 9763 NMEDIT \
16159 LIPO \ 9764 LIPO \
16160@@ -12984,7 +13651,6 @@ 9765@@ -18015,7 +18868,6 @@ no_undefined_flag \
16161 hardcode_libdir_flag_spec \ 9766 hardcode_libdir_flag_spec \
16162 hardcode_libdir_flag_spec_ld \ 9767 hardcode_libdir_flag_spec_ld \
16163 hardcode_libdir_separator \ 9768 hardcode_libdir_separator \
@@ -16165,7 +9770,25 @@ Index: binutils-2.24/gprof/configure
16165 exclude_expsyms \ 9770 exclude_expsyms \
16166 include_expsyms \ 9771 include_expsyms \
16167 file_list_spec \ 9772 file_list_spec \
16168@@ -13020,6 +13686,7 @@ 9773@@ -18037,8 +18889,8 @@ LD_CXX \
9774 reload_flag_CXX \
9775 compiler_CXX \
9776 lt_prog_compiler_no_builtin_flag_CXX \
9777-lt_prog_compiler_wl_CXX \
9778 lt_prog_compiler_pic_CXX \
9779+lt_prog_compiler_wl_CXX \
9780 lt_prog_compiler_static_CXX \
9781 lt_cv_prog_compiler_c_o_CXX \
9782 export_dynamic_flag_spec_CXX \
9783@@ -18050,7 +18902,6 @@ no_undefined_flag_CXX \
9784 hardcode_libdir_flag_spec_CXX \
9785 hardcode_libdir_flag_spec_ld_CXX \
9786 hardcode_libdir_separator_CXX \
9787-fix_srcfile_path_CXX \
9788 exclude_expsyms_CXX \
9789 include_expsyms_CXX \
9790 file_list_spec_CXX \
9791@@ -18084,6 +18935,7 @@ module_cmds \
16169 module_expsym_cmds \ 9792 module_expsym_cmds \
16170 export_symbols_cmds \ 9793 export_symbols_cmds \
16171 prelink_cmds \ 9794 prelink_cmds \
@@ -16173,7 +9796,17 @@ Index: binutils-2.24/gprof/configure
16173 postinstall_cmds \ 9796 postinstall_cmds \
16174 postuninstall_cmds \ 9797 postuninstall_cmds \
16175 finish_cmds \ 9798 finish_cmds \
16176@@ -13776,7 +14443,8 @@ 9799@@ -18098,7 +18950,8 @@ archive_expsym_cmds_CXX \
9800 module_cmds_CXX \
9801 module_expsym_cmds_CXX \
9802 export_symbols_cmds_CXX \
9803-prelink_cmds_CXX; do
9804+prelink_cmds_CXX \
9805+postlink_cmds_CXX; do
9806 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
9807 *[\\\\\\\`\\"\\\$]*)
9808 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
9809@@ -18891,7 +19744,8 @@ $as_echo X"$file" |
16177 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9810 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
16178 # 9811 #
16179 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9812 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -16183,7 +9816,7 @@ Index: binutils-2.24/gprof/configure
16183 # Written by Gordon Matzigkeit, 1996 9816 # Written by Gordon Matzigkeit, 1996
16184 # 9817 #
16185 # This file is part of GNU Libtool. 9818 # This file is part of GNU Libtool.
16186@@ -13879,19 +14547,42 @@ 9819@@ -18994,19 +19848,42 @@ SP2NL=$lt_lt_SP2NL
16187 # turn newlines into spaces. 9820 # turn newlines into spaces.
16188 NL2SP=$lt_lt_NL2SP 9821 NL2SP=$lt_lt_NL2SP
16189 9822
@@ -16227,7 +9860,7 @@ Index: binutils-2.24/gprof/configure
16227 # A symbol stripping program. 9860 # A symbol stripping program.
16228 STRIP=$lt_STRIP 9861 STRIP=$lt_STRIP
16229 9862
16230@@ -13921,6 +14612,12 @@ 9863@@ -19036,6 +19913,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
16231 # Transform the output of nm in a C name address pair when lib prefix is needed. 9864 # Transform the output of nm in a C name address pair when lib prefix is needed.
16232 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9865 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
16233 9866
@@ -16240,7 +9873,7 @@ Index: binutils-2.24/gprof/configure
16240 # The name of the directory that contains temporary libtool files. 9873 # The name of the directory that contains temporary libtool files.
16241 objdir=$objdir 9874 objdir=$objdir
16242 9875
16243@@ -13930,6 +14627,9 @@ 9876@@ -19045,6 +19928,9 @@ MAGIC_CMD=$MAGIC_CMD
16244 # Must we lock files when doing compilation? 9877 # Must we lock files when doing compilation?
16245 need_locks=$lt_need_locks 9878 need_locks=$lt_need_locks
16246 9879
@@ -16250,7 +9883,7 @@ Index: binutils-2.24/gprof/configure
16250 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9883 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
16251 DSYMUTIL=$lt_DSYMUTIL 9884 DSYMUTIL=$lt_DSYMUTIL
16252 9885
16253@@ -14044,12 +14744,12 @@ 9886@@ -19159,12 +20045,12 @@ with_gcc=$GCC
16254 # Compiler flag to turn off builtin functions. 9887 # Compiler flag to turn off builtin functions.
16255 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9888 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
16256 9889
@@ -16266,7 +9899,7 @@ Index: binutils-2.24/gprof/configure
16266 # Compiler flag to prevent dynamic linking. 9899 # Compiler flag to prevent dynamic linking.
16267 link_static_flag=$lt_lt_prog_compiler_static 9900 link_static_flag=$lt_lt_prog_compiler_static
16268 9901
16269@@ -14136,9 +14836,6 @@ 9902@@ -19251,9 +20137,6 @@ inherit_rpath=$inherit_rpath
16270 # Whether libtool must link a program against all its dependency libraries. 9903 # Whether libtool must link a program against all its dependency libraries.
16271 link_all_deplibs=$link_all_deplibs 9904 link_all_deplibs=$link_all_deplibs
16272 9905
@@ -16276,7 +9909,7 @@ Index: binutils-2.24/gprof/configure
16276 # Set to "yes" if exported symbols are required. 9909 # Set to "yes" if exported symbols are required.
16277 always_export_symbols=$always_export_symbols 9910 always_export_symbols=$always_export_symbols
16278 9911
16279@@ -14154,6 +14851,9 @@ 9912@@ -19269,6 +20152,9 @@ include_expsyms=$lt_include_expsyms
16280 # Commands necessary for linking programs (against libraries) with templates. 9913 # Commands necessary for linking programs (against libraries) with templates.
16281 prelink_cmds=$lt_prelink_cmds 9914 prelink_cmds=$lt_prelink_cmds
16282 9915
@@ -16286,7 +9919,7 @@ Index: binutils-2.24/gprof/configure
16286 # Specify filename containing input files. 9919 # Specify filename containing input files.
16287 file_list_spec=$lt_file_list_spec 9920 file_list_spec=$lt_file_list_spec
16288 9921
16289@@ -14186,210 +14886,169 @@ 9922@@ -19315,210 +20201,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
16290 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9923 # if finds mixed CR/LF and LF-only lines. Since sed operates in
16291 # text mode, it properly converts lines to CR/LF. This bash problem 9924 # text mode, it properly converts lines to CR/LF. This bash problem
16292 # is reportedly fixed, but why not run on old versions too? 9925 # is reportedly fixed, but why not run on old versions too?
@@ -16488,9 +10121,15 @@ Index: binutils-2.24/gprof/configure
16488-_LT_EOF 10121-_LT_EOF
16489- ;; 10122- ;;
16490- esac 10123- esac
10124-
10125-
10126- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10127- || (rm -f "$cfgfile"; exit 1)
10128-
10129- mv -f "$cfgfile" "$ofile" ||
16491+ sed '$q' "$ltmain" >> "$cfgfile" \ 10130+ sed '$q' "$ltmain" >> "$cfgfile" \
16492+ || (rm -f "$cfgfile"; exit 1) 10131+ || (rm -f "$cfgfile"; exit 1)
16493 10132+
16494+ if test x"$xsi_shell" = xyes; then 10133+ if test x"$xsi_shell" = xyes; then
16495+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 10134+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
16496+func_dirname ()\ 10135+func_dirname ()\
@@ -16648,49 +10287,7183 @@ Index: binutils-2.24/gprof/configure
16648+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 10287+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
16649+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 10288+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
16650+fi 10289+fi
10290+
10291+
10292+ mv -f "$cfgfile" "$ofile" ||
10293 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10294 chmod +x "$ofile"
16651 10295
16652- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 10296@@ -19546,12 +20391,12 @@ with_gcc=$GCC_CXX
10297 # Compiler flag to turn off builtin functions.
10298 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
10299
10300-# How to pass a linker flag through the compiler.
10301-wl=$lt_lt_prog_compiler_wl_CXX
10302-
10303 # Additional compiler flags for building library objects.
10304 pic_flag=$lt_lt_prog_compiler_pic_CXX
10305
10306+# How to pass a linker flag through the compiler.
10307+wl=$lt_lt_prog_compiler_wl_CXX
10308+
10309 # Compiler flag to prevent dynamic linking.
10310 link_static_flag=$lt_lt_prog_compiler_static_CXX
10311
10312@@ -19638,9 +20483,6 @@ inherit_rpath=$inherit_rpath_CXX
10313 # Whether libtool must link a program against all its dependency libraries.
10314 link_all_deplibs=$link_all_deplibs_CXX
10315
10316-# Fix the shell variable \$srcfile for the compiler.
10317-fix_srcfile_path=$lt_fix_srcfile_path_CXX
10318-
10319 # Set to "yes" if exported symbols are required.
10320 always_export_symbols=$always_export_symbols_CXX
10321
10322@@ -19656,6 +20498,9 @@ include_expsyms=$lt_include_expsyms_CXX
10323 # Commands necessary for linking programs (against libraries) with templates.
10324 prelink_cmds=$lt_prelink_cmds_CXX
10325
10326+# Commands necessary for finishing linking programs.
10327+postlink_cmds=$lt_postlink_cmds_CXX
10328+
10329 # Specify filename containing input files.
10330 file_list_spec=$lt_file_list_spec_CXX
10331
10332diff --git a/libtool.m4 b/libtool.m4
10333index 797468f..02b15b3 100644
10334--- a/libtool.m4
10335+++ b/libtool.m4
10336@@ -1,7 +1,8 @@
10337 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
10338 #
10339 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10340-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10341+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10342+# Inc.
10343 # Written by Gordon Matzigkeit, 1996
10344 #
10345 # This file is free software; the Free Software Foundation gives
10346@@ -10,7 +11,8 @@
10347
10348 m4_define([_LT_COPYING], [dnl
10349 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
10350-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10351+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
10352+# Inc.
10353 # Written by Gordon Matzigkeit, 1996
10354 #
10355 # This file is part of GNU Libtool.
10356@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
10357 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
10358 ])
10359
10360-# serial 56 LT_INIT
10361+# serial 57 LT_INIT
10362
10363
10364 # LT_PREREQ(VERSION)
10365@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
10366 LIBTOOL_DEPS="$ltmain"
10367
10368 # Always use our own libtool.
10369-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
10370+LIBTOOL='$(SHELL) $(top_builddir)'
10371+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
10372 AC_SUBST(LIBTOOL)dnl
10373
10374 _LT_SETUP
10375@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
10376 dnl
10377 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
10378 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
10379+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
10380 m4_require([_LT_CMD_RELOAD])dnl
10381 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
10382+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
10383 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
10384 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
10385+m4_require([_LT_WITH_SYSROOT])dnl
10386
10387 _LT_CONFIG_LIBTOOL_INIT([
10388 # See if we are running on zsh, and set the options which allow our
10389@@ -199,7 +205,7 @@ aix3*)
10390 esac
10391
10392 # Global variables:
10393-ofile=libtool
10394+ofile=${host_alias}-libtool
10395 can_build_shared=yes
10396
10397 # All known linkers require a `.a' archive for static linking (except MSVC,
10398@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
10399 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
10400 configured by $[0], generated by m4_PACKAGE_STRING.
10401
10402-Copyright (C) 2009 Free Software Foundation, Inc.
10403+Copyright (C) 2010 Free Software Foundation, Inc.
10404 This config.lt script is free software; the Free Software Foundation
10405 gives unlimited permision to copy, distribute and modify it."
10406
10407@@ -746,15 +752,12 @@ _LT_EOF
10408 # if finds mixed CR/LF and LF-only lines. Since sed operates in
10409 # text mode, it properly converts lines to CR/LF. This bash problem
10410 # is reportedly fixed, but why not run on old versions too?
10411- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
16653- || (rm -f "$cfgfile"; exit 1) 10412- || (rm -f "$cfgfile"; exit 1)
10413+ sed '$q' "$ltmain" >> "$cfgfile" \
10414+ || (rm -f "$cfgfile"; exit 1)
16654 10415
10416- _LT_PROG_XSI_SHELLFNS
10417+ _LT_PROG_REPLACE_SHELLFNS
10418
10419- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
10420- || (rm -f "$cfgfile"; exit 1)
10421-
16655- mv -f "$cfgfile" "$ofile" || 10422- mv -f "$cfgfile" "$ofile" ||
16656+ mv -f "$cfgfile" "$ofile" || 10423+ mv -f "$cfgfile" "$ofile" ||
16657 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10424 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
16658 chmod +x "$ofile" 10425 chmod +x "$ofile"
10426 ],
10427@@ -980,6 +983,8 @@ _LT_EOF
10428 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
10429 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
10430 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
10431+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
10432+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
10433 cat > conftest.c << _LT_EOF
10434 int main() { return 0;}
10435 _LT_EOF
10436@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
10437 fi
10438 ])
16659 10439
16660Index: binutils-2.24/ld/configure 10440-# _LT_SYS_MODULE_PATH_AIX
16661=================================================================== 10441-# -----------------------
16662--- binutils-2.24.orig/ld/configure 2013-11-04 07:33:39.000000000 -0800 10442+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
16663+++ binutils-2.24/ld/configure 2013-12-15 11:12:06.120451266 -0800 10443+# ----------------------------------
16664@@ -654,8 +654,11 @@ OTOOL 10444 # Links a minimal program and checks the executable
10445 # for the system default hardcoded library path. In most cases,
10446 # this is /usr/lib:/lib, but when the MPI compilers are used
10447 # the location of the communication and MPI libs are included too.
10448 # If we don't find anything, use the default library path according
10449 # to the aix ld manual.
10450+# Store the results from the different compilers for each TAGNAME.
10451+# Allow to override them for all tags through lt_cv_aix_libpath.
10452 m4_defun([_LT_SYS_MODULE_PATH_AIX],
10453 [m4_require([_LT_DECL_SED])dnl
10454-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
10455-lt_aix_libpath_sed='
10456- /Import File Strings/,/^$/ {
10457- /^0/ {
10458- s/^0 *\(.*\)$/\1/
10459- p
10460- }
10461- }'
10462-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10463-# Check for a 64-bit object if we didn't find anything.
10464-if test -z "$aix_libpath"; then
10465- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10466-fi],[])
10467-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10468+if test "${lt_cv_aix_libpath+set}" = set; then
10469+ aix_libpath=$lt_cv_aix_libpath
10470+else
10471+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
10472+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
10473+ lt_aix_libpath_sed='[
10474+ /Import File Strings/,/^$/ {
10475+ /^0/ {
10476+ s/^0 *\([^ ]*\) *$/\1/
10477+ p
10478+ }
10479+ }]'
10480+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10481+ # Check for a 64-bit object if we didn't find anything.
10482+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10483+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
10484+ fi],[])
10485+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
10486+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
10487+ fi
10488+ ])
10489+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
10490+fi
10491 ])# _LT_SYS_MODULE_PATH_AIX
10492
10493
10494@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
10495
10496 AC_MSG_CHECKING([how to print strings])
10497 # Test print first, because it will be a builtin if present.
10498-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
10499+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
10500 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
10501 ECHO='print -r --'
10502 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
10503@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
10504 ])# _LT_PROG_ECHO_BACKSLASH
10505
10506
10507+# _LT_WITH_SYSROOT
10508+# ----------------
10509+AC_DEFUN([_LT_WITH_SYSROOT],
10510+[AC_MSG_CHECKING([for sysroot])
10511+AC_ARG_WITH([libtool-sysroot],
10512+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
10513+ (or the compiler's sysroot if not specified).],
10514+[], [with_libtool_sysroot=no])
10515+
10516+dnl lt_sysroot will always be passed unquoted. We quote it here
10517+dnl in case the user passed a directory name.
10518+lt_sysroot=
10519+case ${with_libtool_sysroot} in #(
10520+ yes)
10521+ if test "$GCC" = yes; then
10522+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
10523+ fi
10524+ ;; #(
10525+ /*)
10526+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
10527+ ;; #(
10528+ no|'')
10529+ ;; #(
10530+ *)
10531+ AC_MSG_RESULT([${with_libtool_sysroot}])
10532+ AC_MSG_ERROR([The sysroot must be an absolute path.])
10533+ ;;
10534+esac
10535+
10536+ AC_MSG_RESULT([${lt_sysroot:-no}])
10537+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
10538+[dependent libraries, and in which our libraries should be installed.])])
10539+
10540 # _LT_ENABLE_LOCK
10541 # ---------------
10542 m4_defun([_LT_ENABLE_LOCK],
10543@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"
10544 ])# _LT_ENABLE_LOCK
10545
10546
10547+# _LT_PROG_AR
10548+# -----------
10549+m4_defun([_LT_PROG_AR],
10550+[AC_CHECK_TOOLS(AR, [ar], false)
10551+: ${AR=ar}
10552+: ${AR_FLAGS=cru}
10553+_LT_DECL([], [AR], [1], [The archiver])
10554+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
10555+
10556+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
10557+ [lt_cv_ar_at_file=no
10558+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
10559+ [echo conftest.$ac_objext > conftest.lst
10560+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
10561+ AC_TRY_EVAL([lt_ar_try])
10562+ if test "$ac_status" -eq 0; then
10563+ # Ensure the archiver fails upon bogus file names.
10564+ rm -f conftest.$ac_objext libconftest.a
10565+ AC_TRY_EVAL([lt_ar_try])
10566+ if test "$ac_status" -ne 0; then
10567+ lt_cv_ar_at_file=@
10568+ fi
10569+ fi
10570+ rm -f conftest.* libconftest.a
10571+ ])
10572+ ])
10573+
10574+if test "x$lt_cv_ar_at_file" = xno; then
10575+ archiver_list_spec=
10576+else
10577+ archiver_list_spec=$lt_cv_ar_at_file
10578+fi
10579+_LT_DECL([], [archiver_list_spec], [1],
10580+ [How to feed a file listing to the archiver])
10581+])# _LT_PROG_AR
10582+
10583+
10584 # _LT_CMD_OLD_ARCHIVE
10585 # -------------------
10586 m4_defun([_LT_CMD_OLD_ARCHIVE],
10587-[AC_CHECK_TOOL(AR, ar, false)
10588-test -z "$AR" && AR=ar
10589-test -z "$AR_FLAGS" && AR_FLAGS=cru
10590-_LT_DECL([], [AR], [1], [The archiver])
10591-_LT_DECL([], [AR_FLAGS], [1])
10592+[_LT_PROG_AR
10593
10594 AC_CHECK_TOOL(STRIP, strip, :)
10595 test -z "$STRIP" && STRIP=:
10596@@ -1623,7 +1705,7 @@ else
10597 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10598 lt_status=$lt_dlunknown
10599 cat > conftest.$ac_ext <<_LT_EOF
10600-[#line __oline__ "configure"
10601+[#line $LINENO "configure"
10602 #include "confdefs.h"
10603
10604 #if HAVE_DLFCN_H
10605@@ -1667,10 +1749,10 @@ else
10606 /* When -fvisbility=hidden is used, assume the code has been annotated
10607 correspondingly for the symbols needed. */
10608 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10609-void fnord () __attribute__((visibility("default")));
10610+int fnord () __attribute__((visibility("default")));
10611 #endif
10612
10613-void fnord () { int i=42; }
10614+int fnord () { return 42; }
10615 int main ()
10616 {
10617 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10618@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)
10619 need_version=no
10620 need_lib_prefix=no
10621
10622- case $GCC,$host_os in
10623- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
10624+ case $GCC,$cc_basename in
10625+ yes,*)
10626+ # gcc
10627 library_names_spec='$libname.dll.a'
10628 # DLL is installed to $(libdir)/../bin by postinstall_cmds
10629 postinstall_cmds='base_file=`basename \${file}`~
10630@@ -2244,13 +2327,71 @@ m4_if([$1], [],[
10631 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10632 ;;
10633 esac
10634+ dynamic_linker='Win32 ld.exe'
10635+ ;;
10636+
10637+ *,cl*)
10638+ # Native MSVC
10639+ libname_spec='$name'
10640+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
10641+ library_names_spec='${libname}.dll.lib'
10642+
10643+ case $build_os in
10644+ mingw*)
10645+ sys_lib_search_path_spec=
10646+ lt_save_ifs=$IFS
10647+ IFS=';'
10648+ for lt_path in $LIB
10649+ do
10650+ IFS=$lt_save_ifs
10651+ # Let DOS variable expansion print the short 8.3 style file name.
10652+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
10653+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
10654+ done
10655+ IFS=$lt_save_ifs
10656+ # Convert to MSYS style.
10657+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
10658+ ;;
10659+ cygwin*)
10660+ # Convert to unix form, then to dos form, then back to unix form
10661+ # but this time dos style (no spaces!) so that the unix form looks
10662+ # like /cygdrive/c/PROGRA~1:/cygdr...
10663+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
10664+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
10665+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10666+ ;;
10667+ *)
10668+ sys_lib_search_path_spec="$LIB"
10669+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
10670+ # It is most probably a Windows format PATH.
10671+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10672+ else
10673+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10674+ fi
10675+ # FIXME: find the short name or the path components, as spaces are
10676+ # common. (e.g. "Program Files" -> "PROGRA~1")
10677+ ;;
10678+ esac
10679+
10680+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
10681+ postinstall_cmds='base_file=`basename \${file}`~
10682+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
10683+ dldir=$destdir/`dirname \$dlpath`~
10684+ test -d \$dldir || mkdir -p \$dldir~
10685+ $install_prog $dir/$dlname \$dldir/$dlname'
10686+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
10687+ dlpath=$dir/\$dldll~
10688+ $RM \$dlpath'
10689+ shlibpath_overrides_runpath=yes
10690+ dynamic_linker='Win32 link.exe'
10691 ;;
10692
10693 *)
10694+ # Assume MSVC wrapper
10695 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
10696+ dynamic_linker='Win32 ld.exe'
10697 ;;
10698 esac
10699- dynamic_linker='Win32 ld.exe'
10700 # FIXME: first we should search . and the directory the executable is in
10701 shlibpath_var=PATH
10702 ;;
10703@@ -2342,7 +2483,7 @@ haiku*)
10704 soname_spec='${libname}${release}${shared_ext}$major'
10705 shlibpath_var=LIBRARY_PATH
10706 shlibpath_overrides_runpath=yes
10707- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
10708+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10709 hardcode_into_libs=yes
10710 ;;
10711
10712@@ -2950,6 +3091,11 @@ case $reload_flag in
10713 esac
10714 reload_cmds='$LD$reload_flag -o $output$reload_objs'
10715 case $host_os in
10716+ cygwin* | mingw* | pw32* | cegcc*)
10717+ if test "$GCC" != yes; then
10718+ reload_cmds=false
10719+ fi
10720+ ;;
10721 darwin*)
10722 if test "$GCC" = yes; then
10723 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
10724@@ -3016,7 +3162,8 @@ mingw* | pw32*)
10725 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
10726 lt_cv_file_magic_cmd='func_win32_libid'
10727 else
10728- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
10729+ # Keep this pattern in sync with the one in func_win32_libid.
10730+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
10731 lt_cv_file_magic_cmd='$OBJDUMP -f'
10732 fi
10733 ;;
10734@@ -3167,6 +3314,21 @@ tpf*)
10735 ;;
10736 esac
10737 ])
10738+
10739+file_magic_glob=
10740+want_nocaseglob=no
10741+if test "$build" = "$host"; then
10742+ case $host_os in
10743+ mingw* | pw32*)
10744+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
10745+ want_nocaseglob=yes
10746+ else
10747+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
10748+ fi
10749+ ;;
10750+ esac
10751+fi
10752+
10753 file_magic_cmd=$lt_cv_file_magic_cmd
10754 deplibs_check_method=$lt_cv_deplibs_check_method
10755 test -z "$deplibs_check_method" && deplibs_check_method=unknown
10756@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
10757 _LT_DECL([], [deplibs_check_method], [1],
10758 [Method to check whether dependent libraries are shared objects])
10759 _LT_DECL([], [file_magic_cmd], [1],
10760- [Command to use when deplibs_check_method == "file_magic"])
10761+ [Command to use when deplibs_check_method = "file_magic"])
10762+_LT_DECL([], [file_magic_glob], [1],
10763+ [How to find potential files when deplibs_check_method = "file_magic"])
10764+_LT_DECL([], [want_nocaseglob], [1],
10765+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
10766 ])# _LT_CHECK_MAGIC_METHOD
10767
10768
10769@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:
10770 dnl AC_DEFUN([AM_PROG_NM], [])
10771 dnl AC_DEFUN([AC_PROG_NM], [])
10772
10773+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10774+# --------------------------------
10775+# how to determine the name of the shared library
10776+# associated with a specific link library.
10777+# -- PORTME fill in with the dynamic library characteristics
10778+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
10779+[m4_require([_LT_DECL_EGREP])
10780+m4_require([_LT_DECL_OBJDUMP])
10781+m4_require([_LT_DECL_DLLTOOL])
10782+AC_CACHE_CHECK([how to associate runtime and link libraries],
10783+lt_cv_sharedlib_from_linklib_cmd,
10784+[lt_cv_sharedlib_from_linklib_cmd='unknown'
10785+
10786+case $host_os in
10787+cygwin* | mingw* | pw32* | cegcc*)
10788+ # two different shell functions defined in ltmain.sh
10789+ # decide which to use based on capabilities of $DLLTOOL
10790+ case `$DLLTOOL --help 2>&1` in
10791+ *--identify-strict*)
10792+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
10793+ ;;
10794+ *)
10795+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
10796+ ;;
10797+ esac
10798+ ;;
10799+*)
10800+ # fallback: assume linklib IS sharedlib
10801+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
10802+ ;;
10803+esac
10804+])
10805+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
10806+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
10807+
10808+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
10809+ [Command to associate shared and link libraries])
10810+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
10811+
10812+
10813+# _LT_PATH_MANIFEST_TOOL
10814+# ----------------------
10815+# locate the manifest tool
10816+m4_defun([_LT_PATH_MANIFEST_TOOL],
10817+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
10818+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
10819+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
10820+ [lt_cv_path_mainfest_tool=no
10821+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
10822+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
10823+ cat conftest.err >&AS_MESSAGE_LOG_FD
10824+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
10825+ lt_cv_path_mainfest_tool=yes
10826+ fi
10827+ rm -f conftest*])
10828+if test "x$lt_cv_path_mainfest_tool" != xyes; then
10829+ MANIFEST_TOOL=:
10830+fi
10831+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
10832+])# _LT_PATH_MANIFEST_TOOL
10833+
10834
10835 # LT_LIB_M
10836 # --------
10837@@ -3403,8 +3630,8 @@ esac
10838 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
10839
10840 # Transform an extracted symbol line into symbol name and symbol address
10841-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10842-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
10843+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
10844+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
10845
10846 # Handle CRLF in mingw tool chain
10847 opt_cr=
10848@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do
10849 else
10850 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10851 fi
10852+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
10853
10854 # Check to see that the pipe works correctly.
10855 pipe_works=no
10856@@ -3473,6 +3701,18 @@ _LT_EOF
10857 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
10858 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
10859 cat <<_LT_EOF > conftest.$ac_ext
10860+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
10861+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
10862+/* DATA imports from DLLs on WIN32 con't be const, because runtime
10863+ relocations are performed -- see ld's documentation on pseudo-relocs. */
10864+# define LT@&t@_DLSYM_CONST
10865+#elif defined(__osf__)
10866+/* This system does not cope well with relocations in const data. */
10867+# define LT@&t@_DLSYM_CONST
10868+#else
10869+# define LT@&t@_DLSYM_CONST const
10870+#endif
10871+
10872 #ifdef __cplusplus
10873 extern "C" {
10874 #endif
10875@@ -3484,7 +3724,7 @@ _LT_EOF
10876 cat <<_LT_EOF >> conftest.$ac_ext
10877
10878 /* The mapping between symbol names and symbols. */
10879-const struct {
10880+LT@&t@_DLSYM_CONST struct {
10881 const char *name;
10882 void *address;
10883 }
10884@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() {
10885 _LT_EOF
10886 # Now try linking the two files.
10887 mv conftest.$ac_objext conftstm.$ac_objext
10888- lt_save_LIBS="$LIBS"
10889- lt_save_CFLAGS="$CFLAGS"
10890+ lt_globsym_save_LIBS=$LIBS
10891+ lt_globsym_save_CFLAGS=$CFLAGS
10892 LIBS="conftstm.$ac_objext"
10893 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
10894 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
10895 pipe_works=yes
10896 fi
10897- LIBS="$lt_save_LIBS"
10898- CFLAGS="$lt_save_CFLAGS"
10899+ LIBS=$lt_globsym_save_LIBS
10900+ CFLAGS=$lt_globsym_save_CFLAGS
10901 else
10902 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
10903 fi
10904@@ -3551,6 +3791,13 @@ else
10905 AC_MSG_RESULT(ok)
10906 fi
10907
10908+# Response file support.
10909+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
10910+ nm_file_list_spec='@'
10911+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
10912+ nm_file_list_spec='@'
10913+fi
10914+
10915 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
10916 [Take the output of nm and produce a listing of raw symbols and C names])
10917 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
10918@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address],
10919 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
10920 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
10921 [Transform the output of nm in a C name address pair when lib prefix is needed])
10922+_LT_DECL([], [nm_file_list_spec], [1],
10923+ [Specify filename containing input files for $NM])
10924 ]) # _LT_CMD_GLOBAL_SYMBOLS
10925
10926
10927@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
10928 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
10929 _LT_TAGVAR(lt_prog_compiler_static, $1)=
10930
10931-AC_MSG_CHECKING([for $compiler option to produce PIC])
10932 m4_if([$1], [CXX], [
10933 # C++ specific cases for pic, static, wl, etc.
10934 if test "$GXX" = yes; then
10935@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [
10936 ;;
10937 esac
10938 ;;
10939+ mingw* | cygwin* | os2* | pw32* | cegcc*)
10940+ # This hack is so that the source file can tell whether it is being
10941+ # built for inclusion in a dll (and should export symbols for example).
10942+ m4_if([$1], [GCJ], [],
10943+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
10944+ ;;
10945 dgux*)
10946 case $cc_basename in
10947 ec++*)
10948@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [
10949 ;;
10950 solaris*)
10951 case $cc_basename in
10952- CC*)
10953+ CC* | sunCC*)
10954 # Sun C++ 4.2, 5.x and Centerline C++
10955 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10956 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10957@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [
10958 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
10959 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
10960 ;;
10961+ nagfor*)
10962+ # NAG Fortran compiler
10963+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
10964+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
10965+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10966+ ;;
10967 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
10968 # Portland Group compilers (*not* the Pentium gcc compiler,
10969 # which looks to be a dead project)
10970@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [
10971 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10972 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10973 case $cc_basename in
10974- f77* | f90* | f95*)
10975+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
10976 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
10977 *)
10978 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
10979@@ -4172,9 +4432,11 @@ case $host_os in
10980 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
10981 ;;
10982 esac
10983-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10984-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10985- [How to pass a linker flag through the compiler])
10986+
10987+AC_CACHE_CHECK([for $compiler option to produce PIC],
10988+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
10989+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
10990+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
10991
10992 #
10993 # Check to make sure the PIC flag actually works.
10994@@ -4193,6 +4455,8 @@ fi
10995 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
10996 [Additional compiler flags for building library objects])
10997
10998+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
10999+ [How to pass a linker flag through the compiler])
11000 #
11001 # Check to make sure the static flag actually works.
11002 #
11003@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
11004 m4_defun([_LT_LINKER_SHLIBS],
11005 [AC_REQUIRE([LT_PATH_LD])dnl
11006 AC_REQUIRE([LT_PATH_NM])dnl
11007+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
11008 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11009 m4_require([_LT_DECL_EGREP])dnl
11010 m4_require([_LT_DECL_SED])dnl
11011@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl
11012 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
11013 m4_if([$1], [CXX], [
11014 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
11015+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
11016 case $host_os in
11017 aix[[4-9]]*)
11018 # If we're using GNU nm, then we don't want the "-C" option.
11019@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [
11020 ;;
11021 pw32*)
11022 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
11023- ;;
11024+ ;;
11025 cygwin* | mingw* | cegcc*)
11026- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
11027- ;;
11028+ case $cc_basename in
11029+ cl*) ;;
11030+ *)
11031+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
11032+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
11033+ ;;
11034+ esac
11035+ ;;
11036 *)
11037 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
11038- ;;
11039+ ;;
11040 esac
11041- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
11042 ], [
11043 runpath_var=
11044 _LT_TAGVAR(allow_undefined_flag, $1)=
11045@@ -4411,7 +4682,8 @@ _LT_EOF
11046 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11047 _LT_TAGVAR(always_export_symbols, $1)=no
11048 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11049- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
11050+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
11051+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
11052
11053 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11054 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11055@@ -4459,7 +4731,7 @@ _LT_EOF
11056 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
11057 && test "$tmp_diet" = no
11058 then
11059- tmp_addflag=
11060+ tmp_addflag=' $pic_flag'
11061 tmp_sharedflag='-shared'
11062 case $cc_basename,$host_cpu in
11063 pgcc*) # Portland Group C compiler
11064@@ -4510,12 +4782,12 @@ _LT_EOF
11065 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
11066 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
11067 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
11068- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11069+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11070 if test "x$supports_anon_versioning" = xyes; then
11071 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
11072 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11073 echo "local: *; };" >> $output_objdir/$libname.ver~
11074- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11075+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11076 fi
11077 ;;
11078 esac
11079@@ -4529,8 +4801,8 @@ _LT_EOF
11080 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11081 wlarc=
11082 else
11083- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11084- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11085+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11086+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11087 fi
11088 ;;
11089
11090@@ -4548,8 +4820,8 @@ _LT_EOF
11091
11092 _LT_EOF
11093 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11094- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11095- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11096+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11097+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11098 else
11099 _LT_TAGVAR(ld_shlibs, $1)=no
11100 fi
11101@@ -4595,8 +4867,8 @@ _LT_EOF
11102
11103 *)
11104 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11105- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11106- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11107+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11108+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11109 else
11110 _LT_TAGVAR(ld_shlibs, $1)=no
11111 fi
11112@@ -4726,7 +4998,7 @@ _LT_EOF
11113 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11114 # Determine the default libpath from the value encoded in an
11115 # empty executable.
11116- _LT_SYS_MODULE_PATH_AIX
11117+ _LT_SYS_MODULE_PATH_AIX([$1])
11118 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11119 _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"
11120 else
11121@@ -4737,7 +5009,7 @@ _LT_EOF
11122 else
11123 # Determine the default libpath from the value encoded in an
11124 # empty executable.
11125- _LT_SYS_MODULE_PATH_AIX
11126+ _LT_SYS_MODULE_PATH_AIX([$1])
11127 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11128 # Warning - without using the other run time loading flags,
11129 # -berok will link without error, but may produce a broken library.
11130@@ -4781,20 +5053,63 @@ _LT_EOF
11131 # Microsoft Visual C++.
11132 # hardcode_libdir_flag_spec is actually meaningless, as there is
11133 # no search path for DLLs.
11134- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11135- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11136- # Tell ltmain to make .lib files, not .a files.
11137- libext=lib
11138- # Tell ltmain to make .dll files, not .so files.
11139- shrext_cmds=".dll"
11140- # FIXME: Setting linknames here is a bad hack.
11141- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11142- # The linker will automatically build a .lib file if we build a DLL.
11143- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11144- # FIXME: Should let the user specify the lib program.
11145- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11146- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
11147- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11148+ case $cc_basename in
11149+ cl*)
11150+ # Native MSVC
11151+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11152+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11153+ _LT_TAGVAR(always_export_symbols, $1)=yes
11154+ _LT_TAGVAR(file_list_spec, $1)='@'
11155+ # Tell ltmain to make .lib files, not .a files.
11156+ libext=lib
11157+ # Tell ltmain to make .dll files, not .so files.
11158+ shrext_cmds=".dll"
11159+ # FIXME: Setting linknames here is a bad hack.
11160+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11161+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11162+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11163+ else
11164+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11165+ fi~
11166+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11167+ linknames='
11168+ # The linker will not automatically build a static lib if we build a DLL.
11169+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11170+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11171+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
11172+ # Don't use ranlib
11173+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11174+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11175+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11176+ case $lt_outputfile in
11177+ *.exe|*.EXE) ;;
11178+ *)
11179+ lt_outputfile="$lt_outputfile.exe"
11180+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11181+ ;;
11182+ esac~
11183+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11184+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11185+ $RM "$lt_outputfile.manifest";
11186+ fi'
11187+ ;;
11188+ *)
11189+ # Assume MSVC wrapper
11190+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11191+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11192+ # Tell ltmain to make .lib files, not .a files.
11193+ libext=lib
11194+ # Tell ltmain to make .dll files, not .so files.
11195+ shrext_cmds=".dll"
11196+ # FIXME: Setting linknames here is a bad hack.
11197+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
11198+ # The linker will automatically build a .lib file if we build a DLL.
11199+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11200+ # FIXME: Should let the user specify the lib program.
11201+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
11202+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11203+ ;;
11204+ esac
11205 ;;
11206
11207 darwin* | rhapsody*)
11208@@ -4828,7 +5143,7 @@ _LT_EOF
11209
11210 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
11211 freebsd* | dragonfly*)
11212- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
11213+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
11214 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
11215 _LT_TAGVAR(hardcode_direct, $1)=yes
11216 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
11217@@ -4836,7 +5151,7 @@ _LT_EOF
11218
11219 hpux9*)
11220 if test "$GCC" = yes; then
11221- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11222+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11223 else
11224 _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11225 fi
11226@@ -4852,7 +5167,7 @@ _LT_EOF
11227
11228 hpux10*)
11229 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
11230- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11231+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11232 else
11233 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
11234 fi
11235@@ -4876,10 +5191,10 @@ _LT_EOF
11236 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11237 ;;
11238 ia64*)
11239- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11240+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11241 ;;
11242 *)
11243- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11244+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11245 ;;
11246 esac
11247 else
11248@@ -4926,16 +5241,31 @@ _LT_EOF
11249
11250 irix5* | irix6* | nonstopux*)
11251 if test "$GCC" = yes; then
11252- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11253+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11254 # Try to use the -exported_symbol ld option, if it does not
11255 # work, assume that -exports_file does not work either and
11256 # implicitly export all symbols.
11257- save_LDFLAGS="$LDFLAGS"
11258- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11259- AC_LINK_IFELSE(int foo(void) {},
11260- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
11261- )
11262- LDFLAGS="$save_LDFLAGS"
11263+ # This should be the same for all languages, so no per-tag cache variable.
11264+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
11265+ [lt_cv_irix_exported_symbol],
11266+ [save_LDFLAGS="$LDFLAGS"
11267+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11268+ AC_LINK_IFELSE(
11269+ [AC_LANG_SOURCE(
11270+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
11271+ [C++], [[int foo (void) { return 0; }]],
11272+ [Fortran 77], [[
11273+ subroutine foo
11274+ end]],
11275+ [Fortran], [[
11276+ subroutine foo
11277+ end]])])],
11278+ [lt_cv_irix_exported_symbol=yes],
11279+ [lt_cv_irix_exported_symbol=no])
11280+ LDFLAGS="$save_LDFLAGS"])
11281+ if test "$lt_cv_irix_exported_symbol" = yes; then
11282+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
11283+ fi
11284 else
11285 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
11286 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
11287@@ -5020,7 +5350,7 @@ _LT_EOF
11288 osf4* | osf5*) # as osf3* with the addition of -msym flag
11289 if test "$GCC" = yes; then
11290 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
11291- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11292+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11293 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
11294 else
11295 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
11296@@ -5039,9 +5369,9 @@ _LT_EOF
11297 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
11298 if test "$GCC" = yes; then
11299 wlarc='${wl}'
11300- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11301+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
11302 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11303- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11304+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11305 else
11306 case `$CC -V 2>&1` in
11307 *"Compilers 5.0"*)
11308@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
11309 to runtime path list])
11310 _LT_TAGDECL([], [link_all_deplibs], [0],
11311 [Whether libtool must link a program against all its dependency libraries])
11312-_LT_TAGDECL([], [fix_srcfile_path], [1],
11313- [Fix the shell variable $srcfile for the compiler])
11314 _LT_TAGDECL([], [always_export_symbols], [0],
11315 [Set to "yes" if exported symbols are required])
11316 _LT_TAGDECL([], [export_symbols_cmds], [2],
11317@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
11318 [Symbols that must always be exported])
11319 _LT_TAGDECL([], [prelink_cmds], [2],
11320 [Commands necessary for linking programs (against libraries) with templates])
11321+_LT_TAGDECL([], [postlink_cmds], [2],
11322+ [Commands necessary for finishing linking programs])
11323 _LT_TAGDECL([], [file_list_spec], [1],
11324 [Specify filename containing input files])
11325 dnl FIXME: Not yet implemented
11326@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"
11327 m4_defun([_LT_LANG_CXX_CONFIG],
11328 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11329 m4_require([_LT_DECL_EGREP])dnl
11330+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
11331 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11332 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11333 (test "X$CXX" != "Xg++"))) ; then
11334@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11335
11336 # Allow CC to be a program name with arguments.
11337 lt_save_CC=$CC
11338+ lt_save_CFLAGS=$CFLAGS
11339 lt_save_LD=$LD
11340 lt_save_GCC=$GCC
11341 GCC=$GXX
11342@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11343 fi
11344 test -z "${LDCXX+set}" || LD=$LDCXX
11345 CC=${CXX-"c++"}
11346+ CFLAGS=$CXXFLAGS
11347 compiler=$CC
11348 _LT_TAGVAR(compiler, $1)=$CC
11349 _LT_CC_BASENAME([$compiler])
11350@@ -5525,8 +5858,8 @@ if test "$_lt_caught_CXX_error" != yes; then
11351 # Check if GNU C++ uses GNU ld as the underlying linker, since the
11352 # archiving commands below assume that GNU ld is being used.
11353 if test "$with_gnu_ld" = yes; then
11354- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
11355- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11356+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
11357+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11358
11359 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
11360 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
11361@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11362 _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
11363 # Determine the default libpath from the value encoded in an empty
11364 # executable.
11365- _LT_SYS_MODULE_PATH_AIX
11366+ _LT_SYS_MODULE_PATH_AIX([$1])
11367 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11368
11369 _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"
11370@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11371 else
11372 # Determine the default libpath from the value encoded in an
11373 # empty executable.
11374- _LT_SYS_MODULE_PATH_AIX
11375+ _LT_SYS_MODULE_PATH_AIX([$1])
11376 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
11377 # Warning - without using the other run time loading flags,
11378 # -berok will link without error, but may produce a broken library.
11379@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then
11380 ;;
11381
11382 cygwin* | mingw* | pw32* | cegcc*)
11383- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11384- # as there is no search path for DLLs.
11385- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11386- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11387- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11388- _LT_TAGVAR(always_export_symbols, $1)=no
11389- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11390-
11391- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11392- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11393- # If the export-symbols file already is a .def file (1st line
11394- # is EXPORTS), use it as is; otherwise, prepend...
11395- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11396- cp $export_symbols $output_objdir/$soname.def;
11397- else
11398- echo EXPORTS > $output_objdir/$soname.def;
11399- cat $export_symbols >> $output_objdir/$soname.def;
11400- fi~
11401- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11402- else
11403- _LT_TAGVAR(ld_shlibs, $1)=no
11404- fi
11405- ;;
11406+ case $GXX,$cc_basename in
11407+ ,cl* | no,cl*)
11408+ # Native MSVC
11409+ # hardcode_libdir_flag_spec is actually meaningless, as there is
11410+ # no search path for DLLs.
11411+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
11412+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11413+ _LT_TAGVAR(always_export_symbols, $1)=yes
11414+ _LT_TAGVAR(file_list_spec, $1)='@'
11415+ # Tell ltmain to make .lib files, not .a files.
11416+ libext=lib
11417+ # Tell ltmain to make .dll files, not .so files.
11418+ shrext_cmds=".dll"
11419+ # FIXME: Setting linknames here is a bad hack.
11420+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
11421+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11422+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
11423+ else
11424+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
11425+ fi~
11426+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
11427+ linknames='
11428+ # The linker will not automatically build a static lib if we build a DLL.
11429+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
11430+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11431+ # Don't use ranlib
11432+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
11433+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
11434+ lt_tool_outputfile="@TOOL_OUTPUT@"~
11435+ case $lt_outputfile in
11436+ *.exe|*.EXE) ;;
11437+ *)
11438+ lt_outputfile="$lt_outputfile.exe"
11439+ lt_tool_outputfile="$lt_tool_outputfile.exe"
11440+ ;;
11441+ esac~
11442+ func_to_tool_file "$lt_outputfile"~
11443+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
11444+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
11445+ $RM "$lt_outputfile.manifest";
11446+ fi'
11447+ ;;
11448+ *)
11449+ # g++
11450+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11451+ # as there is no search path for DLLs.
11452+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11453+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
11454+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
11455+ _LT_TAGVAR(always_export_symbols, $1)=no
11456+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11457+
11458+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11459+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11460+ # If the export-symbols file already is a .def file (1st line
11461+ # is EXPORTS), use it as is; otherwise, prepend...
11462+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11463+ cp $export_symbols $output_objdir/$soname.def;
11464+ else
11465+ echo EXPORTS > $output_objdir/$soname.def;
11466+ cat $export_symbols >> $output_objdir/$soname.def;
11467+ fi~
11468+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11469+ else
11470+ _LT_TAGVAR(ld_shlibs, $1)=no
11471+ fi
11472+ ;;
11473+ esac
11474+ ;;
11475 darwin* | rhapsody*)
11476 _LT_DARWIN_LINKER_FEATURES($1)
11477 ;;
11478@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11479 ;;
11480 *)
11481 if test "$GXX" = yes; then
11482- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11483+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
11484 else
11485 # FIXME: insert proper C++ library support
11486 _LT_TAGVAR(ld_shlibs, $1)=no
11487@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then
11488 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11489 ;;
11490 ia64*)
11491- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11492+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11493 ;;
11494 *)
11495- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11496+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11497 ;;
11498 esac
11499 fi
11500@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11501 *)
11502 if test "$GXX" = yes; then
11503 if test "$with_gnu_ld" = no; then
11504- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $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'
11505+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $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'
11506 else
11507- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
11508+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
11509 fi
11510 fi
11511 _LT_TAGVAR(link_all_deplibs, $1)=yes
11512@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then
11513 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
11514 rm -rf $tpldir~
11515 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
11516- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
11517+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
11518 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
11519 rm -rf $tpldir~
11520 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
11521- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
11522+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
11523 $RANLIB $oldlib'
11524 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
11525 rm -rf $tpldir~
11526 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11527- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11528+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11529 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
11530 rm -rf $tpldir~
11531 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11532- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
11533+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
11534 ;;
11535 *) # Version 6 and above use weak symbols
11536 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11537@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11538 _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'
11539 ;;
11540 *)
11541- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11542+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11543 ;;
11544 esac
11545
11546@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11547
11548 solaris*)
11549 case $cc_basename in
11550- CC*)
11551+ CC* | sunCC*)
11552 # Sun C++ 4.2, 5.x and Centerline C++
11553 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
11554 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
11555@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then
11556 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11557 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
11558 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
11559- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11560+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
11561 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
11562- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11563+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
11564
11565 # Commands to make compiler produce verbose output that lists
11566 # what "hidden" libraries, object files and flags are used when
11567@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
11568 fi # test -n "$compiler"
11569
11570 CC=$lt_save_CC
11571+ CFLAGS=$lt_save_CFLAGS
11572 LDCXX=$LD
11573 LD=$lt_save_LD
11574 GCC=$lt_save_GCC
11575@@ -6445,6 +6825,29 @@ AC_LANG_POP
11576 ])# _LT_LANG_CXX_CONFIG
11577
11578
11579+# _LT_FUNC_STRIPNAME_CNF
11580+# ----------------------
11581+# func_stripname_cnf prefix suffix name
11582+# strip PREFIX and SUFFIX off of NAME.
11583+# PREFIX and SUFFIX must not contain globbing or regex special
11584+# characters, hashes, percent signs, but SUFFIX may contain a leading
11585+# dot (in which case that matches only a dot).
11586+#
11587+# This function is identical to the (non-XSI) version of func_stripname,
11588+# except this one can be used by m4 code that may be executed by configure,
11589+# rather than the libtool script.
11590+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
11591+AC_REQUIRE([_LT_DECL_SED])
11592+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
11593+func_stripname_cnf ()
11594+{
11595+ case ${2} in
11596+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11597+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11598+ esac
11599+} # func_stripname_cnf
11600+])# _LT_FUNC_STRIPNAME_CNF
11601+
11602 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
11603 # ---------------------------------
11604 # Figure out "hidden" library dependencies from verbose
11605@@ -6453,6 +6856,7 @@ AC_LANG_POP
11606 # objects, libraries and library flags.
11607 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
11608 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
11609+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
11610 # Dependencies to place before and after the object being linked:
11611 _LT_TAGVAR(predep_objects, $1)=
11612 _LT_TAGVAR(postdep_objects, $1)=
11613@@ -6503,6 +6907,13 @@ public class foo {
11614 };
11615 _LT_EOF
11616 ])
11617+
11618+_lt_libdeps_save_CFLAGS=$CFLAGS
11619+case "$CC $CFLAGS " in #(
11620+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
11621+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
11622+esac
11623+
11624 dnl Parse the compiler output and extract the necessary
11625 dnl objects, libraries and library flags.
11626 if AC_TRY_EVAL(ac_compile); then
11627@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then
11628 pre_test_object_deps_done=no
11629
11630 for p in `eval "$output_verbose_link_cmd"`; do
11631- case $p in
11632+ case ${prev}${p} in
11633
11634 -L* | -R* | -l*)
11635 # Some compilers place space between "-{L,R}" and the path.
11636@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then
11637 test $p = "-R"; then
11638 prev=$p
11639 continue
11640- else
11641- prev=
11642 fi
11643
11644+ # Expand the sysroot to ease extracting the directories later.
11645+ if test -z "$prev"; then
11646+ case $p in
11647+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
11648+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
11649+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
11650+ esac
11651+ fi
11652+ case $p in
11653+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
11654+ esac
11655 if test "$pre_test_object_deps_done" = no; then
11656- case $p in
11657- -L* | -R*)
11658+ case ${prev} in
11659+ -L | -R)
11660 # Internal compiler library paths should come after those
11661 # provided the user. The postdeps already come after the
11662 # user supplied libs so there is no need to process them.
11663@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then
11664 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
11665 fi
11666 fi
11667+ prev=
11668 ;;
11669
11670+ *.lto.$objext) ;; # Ignore GCC LTO objects
11671 *.$objext)
11672 # This assumes that the test object file only shows up
11673 # once in the compiler output.
11674@@ -6586,6 +7008,7 @@ else
11675 fi
11676
11677 $RM -f confest.$objext
11678+CFLAGS=$_lt_libdeps_save_CFLAGS
11679
11680 # PORTME: override above test on systems where it is broken
11681 m4_if([$1], [CXX],
11682@@ -6622,7 +7045,7 @@ linux*)
11683
11684 solaris*)
11685 case $cc_basename in
11686- CC*)
11687+ CC* | sunCC*)
11688 # The more standards-conforming stlport4 library is
11689 # incompatible with the Cstd library. Avoid specifying
11690 # it if it's in CXXFLAGS. Ignore libCrun as
11691@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then
11692 # Allow CC to be a program name with arguments.
11693 lt_save_CC="$CC"
11694 lt_save_GCC=$GCC
11695+ lt_save_CFLAGS=$CFLAGS
11696 CC=${F77-"f77"}
11697+ CFLAGS=$FFLAGS
11698 compiler=$CC
11699 _LT_TAGVAR(compiler, $1)=$CC
11700 _LT_CC_BASENAME([$compiler])
11701@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then
11702
11703 GCC=$lt_save_GCC
11704 CC="$lt_save_CC"
11705+ CFLAGS="$lt_save_CFLAGS"
11706 fi # test "$_lt_disable_F77" != yes
11707
11708 AC_LANG_POP
11709@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then
11710 # Allow CC to be a program name with arguments.
11711 lt_save_CC="$CC"
11712 lt_save_GCC=$GCC
11713+ lt_save_CFLAGS=$CFLAGS
11714 CC=${FC-"f95"}
11715+ CFLAGS=$FCFLAGS
11716 compiler=$CC
11717 GCC=$ac_cv_fc_compiler_gnu
11718
11719@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then
11720 fi # test -n "$compiler"
11721
11722 GCC=$lt_save_GCC
11723- CC="$lt_save_CC"
11724+ CC=$lt_save_CC
11725+ CFLAGS=$lt_save_CFLAGS
11726 fi # test "$_lt_disable_FC" != yes
11727
11728 AC_LANG_POP
11729@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE
11730 _LT_LINKER_BOILERPLATE
11731
11732 # Allow CC to be a program name with arguments.
11733-lt_save_CC="$CC"
11734+lt_save_CC=$CC
11735+lt_save_CFLAGS=$CFLAGS
11736 lt_save_GCC=$GCC
11737 GCC=yes
11738 CC=${GCJ-"gcj"}
11739+CFLAGS=$GCJFLAGS
11740 compiler=$CC
11741 _LT_TAGVAR(compiler, $1)=$CC
11742 _LT_TAGVAR(LD, $1)="$LD"
11743@@ -6992,7 +7423,8 @@ fi
11744 AC_LANG_RESTORE
11745
11746 GCC=$lt_save_GCC
11747-CC="$lt_save_CC"
11748+CC=$lt_save_CC
11749+CFLAGS=$lt_save_CFLAGS
11750 ])# _LT_LANG_GCJ_CONFIG
11751
11752
11753@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE
11754
11755 # Allow CC to be a program name with arguments.
11756 lt_save_CC="$CC"
11757+lt_save_CFLAGS=$CFLAGS
11758 lt_save_GCC=$GCC
11759 GCC=
11760 CC=${RC-"windres"}
11761+CFLAGS=
11762 compiler=$CC
11763 _LT_TAGVAR(compiler, $1)=$CC
11764 _LT_CC_BASENAME([$compiler])
11765@@ -7042,7 +7476,8 @@ fi
11766
11767 GCC=$lt_save_GCC
11768 AC_LANG_RESTORE
11769-CC="$lt_save_CC"
11770+CC=$lt_save_CC
11771+CFLAGS=$lt_save_CFLAGS
11772 ])# _LT_LANG_RC_CONFIG
11773
11774
11775@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
11776 AC_SUBST([OBJDUMP])
11777 ])
11778
11779+# _LT_DECL_DLLTOOL
11780+# ----------------
11781+# Ensure DLLTOOL variable is set.
11782+m4_defun([_LT_DECL_DLLTOOL],
11783+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
11784+test -z "$DLLTOOL" && DLLTOOL=dlltool
11785+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
11786+AC_SUBST([DLLTOOL])
11787+])
11788
11789 # _LT_DECL_SED
11790 # ------------
11791@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
11792 # Try some XSI features
11793 xsi_shell=no
11794 ( _lt_dummy="a/b/c"
11795- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
11796- = c,a/b,, \
11797+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
11798+ = c,a/b,b/c, \
11799 && eval 'test $(( 1 + 1 )) -eq 2 \
11800 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
11801 && xsi_shell=yes
11802@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
11803 ])# _LT_CHECK_SHELL_FEATURES
11804
11805
11806-# _LT_PROG_XSI_SHELLFNS
11807-# ---------------------
11808-# Bourne and XSI compatible variants of some useful shell functions.
11809-m4_defun([_LT_PROG_XSI_SHELLFNS],
11810-[case $xsi_shell in
11811- yes)
11812- cat << \_LT_EOF >> "$cfgfile"
11813-
11814-# func_dirname file append nondir_replacement
11815-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11816-# otherwise set result to NONDIR_REPLACEMENT.
11817-func_dirname ()
11818-{
11819- case ${1} in
11820- */*) func_dirname_result="${1%/*}${2}" ;;
11821- * ) func_dirname_result="${3}" ;;
11822- esac
11823-}
11824-
11825-# func_basename file
11826-func_basename ()
11827-{
11828- func_basename_result="${1##*/}"
11829-}
11830-
11831-# func_dirname_and_basename file append nondir_replacement
11832-# perform func_basename and func_dirname in a single function
11833-# call:
11834-# dirname: Compute the dirname of FILE. If nonempty,
11835-# add APPEND to the result, otherwise set result
11836-# to NONDIR_REPLACEMENT.
11837-# value returned in "$func_dirname_result"
11838-# basename: Compute filename of FILE.
11839-# value retuned in "$func_basename_result"
11840-# Implementation must be kept synchronized with func_dirname
11841-# and func_basename. For efficiency, we do not delegate to
11842-# those functions but instead duplicate the functionality here.
11843-func_dirname_and_basename ()
11844-{
11845- case ${1} in
11846- */*) func_dirname_result="${1%/*}${2}" ;;
11847- * ) func_dirname_result="${3}" ;;
11848- esac
11849- func_basename_result="${1##*/}"
11850-}
11851-
11852-# func_stripname prefix suffix name
11853-# strip PREFIX and SUFFIX off of NAME.
11854-# PREFIX and SUFFIX must not contain globbing or regex special
11855-# characters, hashes, percent signs, but SUFFIX may contain a leading
11856-# dot (in which case that matches only a dot).
11857-func_stripname ()
11858-{
11859- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11860- # positional parameters, so assign one to ordinary parameter first.
11861- func_stripname_result=${3}
11862- func_stripname_result=${func_stripname_result#"${1}"}
11863- func_stripname_result=${func_stripname_result%"${2}"}
11864-}
11865-
11866-# func_opt_split
11867-func_opt_split ()
11868-{
11869- func_opt_split_opt=${1%%=*}
11870- func_opt_split_arg=${1#*=}
11871-}
11872-
11873-# func_lo2o object
11874-func_lo2o ()
11875-{
11876- case ${1} in
11877- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11878- *) func_lo2o_result=${1} ;;
11879- esac
11880-}
11881-
11882-# func_xform libobj-or-source
11883-func_xform ()
11884-{
11885- func_xform_result=${1%.*}.lo
11886-}
11887-
11888-# func_arith arithmetic-term...
11889-func_arith ()
11890-{
11891- func_arith_result=$(( $[*] ))
11892-}
11893-
11894-# func_len string
11895-# STRING may not start with a hyphen.
11896-func_len ()
11897-{
11898- func_len_result=${#1}
11899-}
11900+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
11901+# ------------------------------------------------------
11902+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
11903+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
11904+m4_defun([_LT_PROG_FUNCTION_REPLACE],
11905+[dnl {
11906+sed -e '/^$1 ()$/,/^} # $1 /c\
11907+$1 ()\
11908+{\
11909+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
11910+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
11911+ && mv -f "$cfgfile.tmp" "$cfgfile" \
11912+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
11913+test 0 -eq $? || _lt_function_replace_fail=:
11914+])
11915
11916-_LT_EOF
11917- ;;
11918- *) # Bourne compatible functions.
11919- cat << \_LT_EOF >> "$cfgfile"
11920
11921-# func_dirname file append nondir_replacement
11922-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
11923-# otherwise set result to NONDIR_REPLACEMENT.
11924-func_dirname ()
11925-{
11926- # Extract subdirectory from the argument.
11927- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
11928- if test "X$func_dirname_result" = "X${1}"; then
11929- func_dirname_result="${3}"
11930- else
11931- func_dirname_result="$func_dirname_result${2}"
11932- fi
11933-}
11934+# _LT_PROG_REPLACE_SHELLFNS
11935+# -------------------------
11936+# Replace existing portable implementations of several shell functions with
11937+# equivalent extended shell implementations where those features are available..
11938+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
11939+[if test x"$xsi_shell" = xyes; then
11940+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
11941+ case ${1} in
11942+ */*) func_dirname_result="${1%/*}${2}" ;;
11943+ * ) func_dirname_result="${3}" ;;
11944+ esac])
11945+
11946+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
11947+ func_basename_result="${1##*/}"])
11948+
11949+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
11950+ case ${1} in
11951+ */*) func_dirname_result="${1%/*}${2}" ;;
11952+ * ) func_dirname_result="${3}" ;;
11953+ esac
11954+ func_basename_result="${1##*/}"])
11955
11956-# func_basename file
11957-func_basename ()
11958-{
11959- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
11960-}
11961+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
11962+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
11963+ # positional parameters, so assign one to ordinary parameter first.
11964+ func_stripname_result=${3}
11965+ func_stripname_result=${func_stripname_result#"${1}"}
11966+ func_stripname_result=${func_stripname_result%"${2}"}])
11967
11968-dnl func_dirname_and_basename
11969-dnl A portable version of this function is already defined in general.m4sh
11970-dnl so there is no need for it here.
11971+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
11972+ func_split_long_opt_name=${1%%=*}
11973+ func_split_long_opt_arg=${1#*=}])
11974
11975-# func_stripname prefix suffix name
11976-# strip PREFIX and SUFFIX off of NAME.
11977-# PREFIX and SUFFIX must not contain globbing or regex special
11978-# characters, hashes, percent signs, but SUFFIX may contain a leading
11979-# dot (in which case that matches only a dot).
11980-# func_strip_suffix prefix name
11981-func_stripname ()
11982-{
11983- case ${2} in
11984- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
11985- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
11986- esac
11987-}
11988+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
11989+ func_split_short_opt_arg=${1#??}
11990+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
11991
11992-# sed scripts:
11993-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
11994-my_sed_long_arg='1s/^-[[^=]]*=//'
11995+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
11996+ case ${1} in
11997+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
11998+ *) func_lo2o_result=${1} ;;
11999+ esac])
12000
12001-# func_opt_split
12002-func_opt_split ()
12003-{
12004- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
12005- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
12006-}
12007+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
12008
12009-# func_lo2o object
12010-func_lo2o ()
12011-{
12012- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12013-}
12014+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
12015
12016-# func_xform libobj-or-source
12017-func_xform ()
12018-{
12019- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
12020-}
12021+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
12022+fi
12023
12024-# func_arith arithmetic-term...
12025-func_arith ()
12026-{
12027- func_arith_result=`expr "$[@]"`
12028-}
12029+if test x"$lt_shell_append" = xyes; then
12030+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
12031
12032-# func_len string
12033-# STRING may not start with a hyphen.
12034-func_len ()
12035-{
12036- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
12037-}
12038+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
12039+ func_quote_for_eval "${2}"
12040+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
12041+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
12042
12043-_LT_EOF
12044-esac
12045+ # Save a `func_append' function call where possible by direct use of '+='
12046+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
12047+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12048+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12049+ test 0 -eq $? || _lt_function_replace_fail=:
12050+else
12051+ # Save a `func_append' function call even when '+=' is not available
12052+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
12053+ && mv -f "$cfgfile.tmp" "$cfgfile" \
12054+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
12055+ test 0 -eq $? || _lt_function_replace_fail=:
12056+fi
12057
12058-case $lt_shell_append in
12059- yes)
12060- cat << \_LT_EOF >> "$cfgfile"
12061+if test x"$_lt_function_replace_fail" = x":"; then
12062+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
12063+fi
12064+])
12065
12066-# func_append var value
12067-# Append VALUE to the end of shell variable VAR.
12068-func_append ()
12069-{
12070- eval "$[1]+=\$[2]"
12071-}
12072-_LT_EOF
12073+# _LT_PATH_CONVERSION_FUNCTIONS
12074+# -----------------------------
12075+# Determine which file name conversion functions should be used by
12076+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
12077+# for certain cross-compile configurations and native mingw.
12078+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
12079+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
12080+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
12081+AC_MSG_CHECKING([how to convert $build file names to $host format])
12082+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
12083+[case $host in
12084+ *-*-mingw* )
12085+ case $build in
12086+ *-*-mingw* ) # actually msys
12087+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
12088+ ;;
12089+ *-*-cygwin* )
12090+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
12091+ ;;
12092+ * ) # otherwise, assume *nix
12093+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
12094+ ;;
12095+ esac
12096 ;;
12097- *)
12098- cat << \_LT_EOF >> "$cfgfile"
12099-
12100-# func_append var value
12101-# Append VALUE to the end of shell variable VAR.
12102-func_append ()
12103-{
12104- eval "$[1]=\$$[1]\$[2]"
12105-}
12106-
12107-_LT_EOF
12108+ *-*-cygwin* )
12109+ case $build in
12110+ *-*-mingw* ) # actually msys
12111+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
12112+ ;;
12113+ *-*-cygwin* )
12114+ lt_cv_to_host_file_cmd=func_convert_file_noop
12115+ ;;
12116+ * ) # otherwise, assume *nix
12117+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
12118+ ;;
12119+ esac
12120 ;;
12121- esac
12122+ * ) # unhandled hosts (and "normal" native builds)
12123+ lt_cv_to_host_file_cmd=func_convert_file_noop
12124+ ;;
12125+esac
12126+])
12127+to_host_file_cmd=$lt_cv_to_host_file_cmd
12128+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
12129+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
12130+ [0], [convert $build file names to $host format])dnl
12131+
12132+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
12133+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
12134+[#assume ordinary cross tools, or native build.
12135+lt_cv_to_tool_file_cmd=func_convert_file_noop
12136+case $host in
12137+ *-*-mingw* )
12138+ case $build in
12139+ *-*-mingw* ) # actually msys
12140+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
12141+ ;;
12142+ esac
12143+ ;;
12144+esac
12145 ])
12146+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
12147+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
12148+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
12149+ [0], [convert $build files to toolchain format])dnl
12150+])# _LT_PATH_CONVERSION_FUNCTIONS
12151diff --git a/ltmain.sh b/ltmain.sh
12152index 9503ec8..70e856e 100644
12153--- a/ltmain.sh
12154+++ b/ltmain.sh
12155@@ -1,10 +1,9 @@
12156-# Generated from ltmain.m4sh.
12157
12158-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
12159+# libtool (GNU libtool) 2.4
12160 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
12161
12162 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
12163-# 2007, 2008, 2009 Free Software Foundation, Inc.
12164+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
12165 # This is free software; see the source for copying conditions. There is NO
12166 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12167
12168@@ -38,7 +37,6 @@
12169 # -n, --dry-run display commands without modifying any files
12170 # --features display basic configuration information and exit
12171 # --mode=MODE use operation mode MODE
12172-# --no-finish let install mode avoid finish commands
12173 # --preserve-dup-deps don't remove duplicate dependency libraries
12174 # --quiet, --silent don't print informational messages
12175 # --no-quiet, --no-silent
12176@@ -71,17 +69,19 @@
12177 # compiler: $LTCC
12178 # compiler flags: $LTCFLAGS
12179 # linker: $LD (gnu? $with_gnu_ld)
12180-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
12181+# $progname: (GNU libtool) 2.4
12182 # automake: $automake_version
12183 # autoconf: $autoconf_version
12184 #
12185 # Report bugs to <bug-libtool@gnu.org>.
12186+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
12187+# General help using GNU software: <http://www.gnu.org/gethelp/>.
12188
12189 PROGRAM=libtool
12190 PACKAGE=libtool
12191-VERSION=2.2.7a
12192-TIMESTAMP=" 1.3134 2009-11-29"
12193-package_revision=1.3134
12194+VERSION=2.4
12195+TIMESTAMP=""
12196+package_revision=1.3293
12197
12198 # Be Bourne compatible
12199 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
12200@@ -106,9 +106,6 @@ _LTECHO_EOF'
12201 }
12202
12203 # NLS nuisances: We save the old values to restore during execute mode.
12204-# Only set LANG and LC_ALL to C if already set.
12205-# These must not be set unconditionally because not all systems understand
12206-# e.g. LANG=C (notably SCO).
12207 lt_user_locale=
12208 lt_safe_locale=
12209 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
12210@@ -121,15 +118,13 @@ do
12211 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
12212 fi"
12213 done
12214+LC_ALL=C
12215+LANGUAGE=C
12216+export LANGUAGE LC_ALL
12217
12218 $lt_unset CDPATH
12219
12220
12221-
12222-
12223-
12224-
12225-
12226 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
12227 # is ksh but when the shell is invoked as "sh" and the current value of
12228 # the _XPG environment variable is not equal to 1 (one), the special
12229@@ -140,7 +135,7 @@ progpath="$0"
12230
12231
12232 : ${CP="cp -f"}
12233-: ${ECHO=$as_echo}
12234+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
12235 : ${EGREP="/bin/grep -E"}
12236 : ${FGREP="/bin/grep -F"}
12237 : ${GREP="/bin/grep"}
12238@@ -149,7 +144,7 @@ progpath="$0"
12239 : ${MKDIR="mkdir"}
12240 : ${MV="mv -f"}
12241 : ${RM="rm -f"}
12242-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
12243+: ${SED="/bin/sed"}
12244 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
12245 : ${Xsed="$SED -e 1s/^X//"}
12246
12247@@ -169,6 +164,27 @@ IFS=" $lt_nl"
12248 dirname="s,/[^/]*$,,"
12249 basename="s,^.*/,,"
12250
12251+# func_dirname file append nondir_replacement
12252+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
12253+# otherwise set result to NONDIR_REPLACEMENT.
12254+func_dirname ()
12255+{
12256+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12257+ if test "X$func_dirname_result" = "X${1}"; then
12258+ func_dirname_result="${3}"
12259+ else
12260+ func_dirname_result="$func_dirname_result${2}"
12261+ fi
12262+} # func_dirname may be replaced by extended shell implementation
12263+
12264+
12265+# func_basename file
12266+func_basename ()
12267+{
12268+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12269+} # func_basename may be replaced by extended shell implementation
12270+
12271+
12272 # func_dirname_and_basename file append nondir_replacement
12273 # perform func_basename and func_dirname in a single function
12274 # call:
12275@@ -183,17 +199,31 @@ basename="s,^.*/,,"
12276 # those functions but instead duplicate the functionality here.
12277 func_dirname_and_basename ()
12278 {
12279- # Extract subdirectory from the argument.
12280- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12281- if test "X$func_dirname_result" = "X${1}"; then
12282- func_dirname_result="${3}"
12283- else
12284- func_dirname_result="$func_dirname_result${2}"
12285- fi
12286- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12287-}
12288+ # Extract subdirectory from the argument.
12289+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
12290+ if test "X$func_dirname_result" = "X${1}"; then
12291+ func_dirname_result="${3}"
12292+ else
12293+ func_dirname_result="$func_dirname_result${2}"
12294+ fi
12295+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
12296+} # func_dirname_and_basename may be replaced by extended shell implementation
12297+
12298+
12299+# func_stripname prefix suffix name
12300+# strip PREFIX and SUFFIX off of NAME.
12301+# PREFIX and SUFFIX must not contain globbing or regex special
12302+# characters, hashes, percent signs, but SUFFIX may contain a leading
12303+# dot (in which case that matches only a dot).
12304+# func_strip_suffix prefix name
12305+func_stripname ()
12306+{
12307+ case ${2} in
12308+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12309+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12310+ esac
12311+} # func_stripname may be replaced by extended shell implementation
12312
12313-# Generated shell functions inserted here.
12314
12315 # These SED scripts presuppose an absolute path with a trailing slash.
12316 pathcar='s,^/\([^/]*\).*$,\1,'
12317@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
12318 # Same as above, but do not quote variable references.
12319 double_quote_subst='s/\(["`\\]\)/\\\1/g'
12320
12321+# Sed substitution that turns a string into a regex matching for the
12322+# string literally.
12323+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
12324+
12325+# Sed substitution that converts a w32 file name or path
12326+# which contains forward slashes, into one that contains
12327+# (escaped) backslashes. A very naive implementation.
12328+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
12329+
12330 # Re-`\' parameter expansions in output of double_quote_subst that were
12331 # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
12332 # in input to double_quote_subst, that '$' was protected from expansion.
12333@@ -404,7 +443,7 @@ opt_warning=:
12334 # name if it has been set yet.
12335 func_echo ()
12336 {
12337- $ECHO "$progname${mode+: }$mode: $*"
12338+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
12339 }
12340
12341 # func_verbose arg...
12342@@ -430,14 +469,14 @@ func_echo_all ()
12343 # Echo program name prefixed message to standard error.
12344 func_error ()
12345 {
12346- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
12347+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
12348 }
12349
12350 # func_warning arg...
12351 # Echo program name prefixed warning message to standard error.
12352 func_warning ()
12353 {
12354- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
12355+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
12356
12357 # bash bug again:
12358 :
12359@@ -656,19 +695,35 @@ func_show_eval_locale ()
12360 fi
12361 }
12362
12363-
12364-
12365+# func_tr_sh
12366+# Turn $1 into a string suitable for a shell variable name.
12367+# Result is stored in $func_tr_sh_result. All characters
12368+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
12369+# if $1 begins with a digit, a '_' is prepended as well.
12370+func_tr_sh ()
12371+{
12372+ case $1 in
12373+ [0-9]* | *[!a-zA-Z0-9_]*)
12374+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
12375+ ;;
12376+ * )
12377+ func_tr_sh_result=$1
12378+ ;;
12379+ esac
12380+}
12381
12382
12383 # func_version
12384 # Echo version message to standard output and exit.
12385 func_version ()
12386 {
12387+ $opt_debug
12388+
12389 $SED -n '/(C)/!b go
12390 :more
12391 /\./!{
12392 N
12393- s/\n# //
12394+ s/\n# / /
12395 b more
12396 }
12397 :go
12398@@ -685,7 +740,9 @@ func_version ()
12399 # Echo short help message to standard output and exit.
12400 func_usage ()
12401 {
12402- $SED -n '/^# Usage:/,/^# *-h/ {
12403+ $opt_debug
12404+
12405+ $SED -n '/^# Usage:/,/^# *.*--help/ {
12406 s/^# //
12407 s/^# *$//
12408 s/\$progname/'$progname'/
12409@@ -701,7 +758,10 @@ func_usage ()
12410 # unless 'noexit' is passed as argument.
12411 func_help ()
12412 {
12413+ $opt_debug
12414+
12415 $SED -n '/^# Usage:/,/# Report bugs to/ {
12416+ :print
12417 s/^# //
12418 s/^# *$//
12419 s*\$progname*'$progname'*
12420@@ -714,7 +774,11 @@ func_help ()
12421 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
12422 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
12423 p
12424- }' < "$progpath"
12425+ d
12426+ }
12427+ /^# .* home page:/b print
12428+ /^# General help using/b print
12429+ ' < "$progpath"
12430 ret=$?
12431 if test -z "$1"; then
12432 exit $ret
12433@@ -726,12 +790,39 @@ func_help ()
12434 # exit_cmd.
12435 func_missing_arg ()
12436 {
12437- func_error "missing argument for $1"
12438+ $opt_debug
12439+
12440+ func_error "missing argument for $1."
12441 exit_cmd=exit
12442 }
12443
12444-exit_cmd=:
12445
12446+# func_split_short_opt shortopt
12447+# Set func_split_short_opt_name and func_split_short_opt_arg shell
12448+# variables after splitting SHORTOPT after the 2nd character.
12449+func_split_short_opt ()
12450+{
12451+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
12452+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
12453+
12454+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
12455+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
12456+} # func_split_short_opt may be replaced by extended shell implementation
12457+
12458+
12459+# func_split_long_opt longopt
12460+# Set func_split_long_opt_name and func_split_long_opt_arg shell
12461+# variables after splitting LONGOPT at the `=' sign.
12462+func_split_long_opt ()
12463+{
12464+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
12465+ my_sed_long_arg='1s/^--[^=]*=//'
12466+
12467+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
12468+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
12469+} # func_split_long_opt may be replaced by extended shell implementation
12470+
12471+exit_cmd=:
12472
12473
12474
12475@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
12476 magic_exe="%%%MAGIC EXE variable%%%"
12477
12478 # Global variables.
12479-# $mode is unset
12480 nonopt=
12481-execute_dlfiles=
12482 preserve_args=
12483 lo2o="s/\\.lo\$/.${objext}/"
12484 o2lo="s/\\.${objext}\$/.lo/"
12485 extracted_archives=
12486 extracted_serial=0
12487
12488-opt_dry_run=false
12489-opt_finish=:
12490-opt_duplicate_deps=false
12491-opt_silent=false
12492-opt_debug=:
12493-
12494 # If this variable is set in any of the actions, the command in it
12495 # will be execed at the end. This prevents here-documents from being
12496 # left over by shells.
12497 exec_cmd=
12498
12499+# func_append var value
12500+# Append VALUE to the end of shell variable VAR.
12501+func_append ()
12502+{
12503+ eval "${1}=\$${1}\${2}"
12504+} # func_append may be replaced by extended shell implementation
12505+
12506+# func_append_quoted var value
12507+# Quote VALUE and append to the end of shell variable VAR, separated
12508+# by a space.
12509+func_append_quoted ()
12510+{
12511+ func_quote_for_eval "${2}"
12512+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
12513+} # func_append_quoted may be replaced by extended shell implementation
12514+
12515+
12516+# func_arith arithmetic-term...
12517+func_arith ()
12518+{
12519+ func_arith_result=`expr "${@}"`
12520+} # func_arith may be replaced by extended shell implementation
12521+
12522+
12523+# func_len string
12524+# STRING may not start with a hyphen.
12525+func_len ()
12526+{
12527+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
12528+} # func_len may be replaced by extended shell implementation
12529+
12530+
12531+# func_lo2o object
12532+func_lo2o ()
12533+{
12534+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12535+} # func_lo2o may be replaced by extended shell implementation
12536+
12537+
12538+# func_xform libobj-or-source
12539+func_xform ()
12540+{
12541+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12542+} # func_xform may be replaced by extended shell implementation
12543+
12544+
12545 # func_fatal_configuration arg...
12546 # Echo program name prefixed message to standard error, followed by
12547 # a configuration failure hint, and exit.
12548@@ -850,130 +979,204 @@ func_enable_tag ()
12549 esac
12550 }
12551
12552-# Parse options once, thoroughly. This comes as soon as possible in
12553-# the script to make things like `libtool --version' happen quickly.
12554+# func_check_version_match
12555+# Ensure that we are using m4 macros, and libtool script from the same
12556+# release of libtool.
12557+func_check_version_match ()
12558 {
12559+ if test "$package_revision" != "$macro_revision"; then
12560+ if test "$VERSION" != "$macro_version"; then
12561+ if test -z "$macro_version"; then
12562+ cat >&2 <<_LT_EOF
12563+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12564+$progname: definition of this LT_INIT comes from an older release.
12565+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12566+$progname: and run autoconf again.
12567+_LT_EOF
12568+ else
12569+ cat >&2 <<_LT_EOF
12570+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12571+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12572+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12573+$progname: and run autoconf again.
12574+_LT_EOF
12575+ fi
12576+ else
12577+ cat >&2 <<_LT_EOF
12578+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12579+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12580+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12581+$progname: of $PACKAGE $VERSION and run autoconf again.
12582+_LT_EOF
12583+ fi
12584
12585- # Shorthand for --mode=foo, only valid as the first argument
12586- case $1 in
12587- clean|clea|cle|cl)
12588- shift; set dummy --mode clean ${1+"$@"}; shift
12589- ;;
12590- compile|compil|compi|comp|com|co|c)
12591- shift; set dummy --mode compile ${1+"$@"}; shift
12592- ;;
12593- execute|execut|execu|exec|exe|ex|e)
12594- shift; set dummy --mode execute ${1+"$@"}; shift
12595- ;;
12596- finish|finis|fini|fin|fi|f)
12597- shift; set dummy --mode finish ${1+"$@"}; shift
12598- ;;
12599- install|instal|insta|inst|ins|in|i)
12600- shift; set dummy --mode install ${1+"$@"}; shift
12601- ;;
12602- link|lin|li|l)
12603- shift; set dummy --mode link ${1+"$@"}; shift
12604- ;;
12605- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12606- shift; set dummy --mode uninstall ${1+"$@"}; shift
12607- ;;
12608- esac
12609+ exit $EXIT_MISMATCH
12610+ fi
12611+}
12612+
12613+
12614+# Shorthand for --mode=foo, only valid as the first argument
12615+case $1 in
12616+clean|clea|cle|cl)
12617+ shift; set dummy --mode clean ${1+"$@"}; shift
12618+ ;;
12619+compile|compil|compi|comp|com|co|c)
12620+ shift; set dummy --mode compile ${1+"$@"}; shift
12621+ ;;
12622+execute|execut|execu|exec|exe|ex|e)
12623+ shift; set dummy --mode execute ${1+"$@"}; shift
12624+ ;;
12625+finish|finis|fini|fin|fi|f)
12626+ shift; set dummy --mode finish ${1+"$@"}; shift
12627+ ;;
12628+install|instal|insta|inst|ins|in|i)
12629+ shift; set dummy --mode install ${1+"$@"}; shift
12630+ ;;
12631+link|lin|li|l)
12632+ shift; set dummy --mode link ${1+"$@"}; shift
12633+ ;;
12634+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
12635+ shift; set dummy --mode uninstall ${1+"$@"}; shift
12636+ ;;
12637+esac
12638
12639- # Parse non-mode specific arguments:
12640- while test "$#" -gt 0; do
12641+
12642+
12643+# Option defaults:
12644+opt_debug=:
12645+opt_dry_run=false
12646+opt_config=false
12647+opt_preserve_dup_deps=false
12648+opt_features=false
12649+opt_finish=false
12650+opt_help=false
12651+opt_help_all=false
12652+opt_silent=:
12653+opt_verbose=:
12654+opt_silent=false
12655+opt_verbose=false
12656+
12657+
12658+# Parse options once, thoroughly. This comes as soon as possible in the
12659+# script to make things like `--version' happen as quickly as we can.
12660+{
12661+ # this just eases exit handling
12662+ while test $# -gt 0; do
12663 opt="$1"
12664 shift
12665-
12666 case $opt in
12667- --config) func_config ;;
12668-
12669- --debug) preserve_args="$preserve_args $opt"
12670+ --debug|-x) opt_debug='set -x'
12671 func_echo "enabling shell trace mode"
12672- opt_debug='set -x'
12673 $opt_debug
12674 ;;
12675-
12676- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
12677- execute_dlfiles="$execute_dlfiles $1"
12678- shift
12679+ --dry-run|--dryrun|-n)
12680+ opt_dry_run=:
12681 ;;
12682-
12683- --dry-run | -n) opt_dry_run=: ;;
12684- --features) func_features ;;
12685- --finish) mode="finish" ;;
12686- --no-finish) opt_finish=false ;;
12687-
12688- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
12689- case $1 in
12690- # Valid mode arguments:
12691- clean) ;;
12692- compile) ;;
12693- execute) ;;
12694- finish) ;;
12695- install) ;;
12696- link) ;;
12697- relink) ;;
12698- uninstall) ;;
12699-
12700- # Catch anything else as an error
12701- *) func_error "invalid argument for $opt"
12702- exit_cmd=exit
12703- break
12704- ;;
12705- esac
12706-
12707- mode="$1"
12708+ --config)
12709+ opt_config=:
12710+func_config
12711+ ;;
12712+ --dlopen|-dlopen)
12713+ optarg="$1"
12714+ opt_dlopen="${opt_dlopen+$opt_dlopen
12715+}$optarg"
12716 shift
12717 ;;
12718-
12719 --preserve-dup-deps)
12720- opt_duplicate_deps=: ;;
12721-
12722- --quiet|--silent) preserve_args="$preserve_args $opt"
12723- opt_silent=:
12724- opt_verbose=false
12725+ opt_preserve_dup_deps=:
12726 ;;
12727-
12728- --no-quiet|--no-silent)
12729- preserve_args="$preserve_args $opt"
12730- opt_silent=false
12731+ --features)
12732+ opt_features=:
12733+func_features
12734 ;;
12735-
12736- --verbose| -v) preserve_args="$preserve_args $opt"
12737+ --finish)
12738+ opt_finish=:
12739+set dummy --mode finish ${1+"$@"}; shift
12740+ ;;
12741+ --help)
12742+ opt_help=:
12743+ ;;
12744+ --help-all)
12745+ opt_help_all=:
12746+opt_help=': help-all'
12747+ ;;
12748+ --mode)
12749+ test $# = 0 && func_missing_arg $opt && break
12750+ optarg="$1"
12751+ opt_mode="$optarg"
12752+case $optarg in
12753+ # Valid mode arguments:
12754+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
12755+
12756+ # Catch anything else as an error
12757+ *) func_error "invalid argument for $opt"
12758+ exit_cmd=exit
12759+ break
12760+ ;;
12761+esac
12762+ shift
12763+ ;;
12764+ --no-silent|--no-quiet)
12765 opt_silent=false
12766- opt_verbose=:
12767+func_append preserve_args " $opt"
12768 ;;
12769-
12770- --no-verbose) preserve_args="$preserve_args $opt"
12771+ --no-verbose)
12772 opt_verbose=false
12773+func_append preserve_args " $opt"
12774 ;;
12775-
12776- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
12777- preserve_args="$preserve_args $opt $1"
12778- func_enable_tag "$1" # tagname is set here
12779+ --silent|--quiet)
12780+ opt_silent=:
12781+func_append preserve_args " $opt"
12782+ opt_verbose=false
12783+ ;;
12784+ --verbose|-v)
12785+ opt_verbose=:
12786+func_append preserve_args " $opt"
12787+opt_silent=false
12788+ ;;
12789+ --tag)
12790+ test $# = 0 && func_missing_arg $opt && break
12791+ optarg="$1"
12792+ opt_tag="$optarg"
12793+func_append preserve_args " $opt $optarg"
12794+func_enable_tag "$optarg"
12795 shift
12796 ;;
12797
12798+ -\?|-h) func_usage ;;
12799+ --help) func_help ;;
12800+ --version) func_version ;;
12801+
12802 # Separate optargs to long options:
12803- -dlopen=*|--mode=*|--tag=*)
12804- func_opt_split "$opt"
12805- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
12806+ --*=*)
12807+ func_split_long_opt "$opt"
12808+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
12809 shift
12810 ;;
12811
12812- -\?|-h) func_usage ;;
12813- --help) opt_help=: ;;
12814- --help-all) opt_help=': help-all' ;;
12815- --version) func_version ;;
12816-
12817- -*) func_fatal_help "unrecognized option \`$opt'" ;;
12818-
12819- *) nonopt="$opt"
12820- break
12821+ # Separate non-argument short options:
12822+ -\?*|-h*|-n*|-v*)
12823+ func_split_short_opt "$opt"
12824+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
12825+ shift
12826 ;;
12827+
12828+ --) break ;;
12829+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
12830+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
12831 esac
12832 done
12833
12834+ # Validate options:
12835+
12836+ # save first non-option argument
12837+ if test "$#" -gt 0; then
12838+ nonopt="$opt"
12839+ shift
12840+ fi
12841+
12842+ # preserve --debug
12843+ test "$opt_debug" = : || func_append preserve_args " --debug"
12844
12845 case $host in
12846 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
12847@@ -981,82 +1184,44 @@ func_enable_tag ()
12848 opt_duplicate_compiler_generated_deps=:
12849 ;;
12850 *)
12851- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
12852+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
12853 ;;
12854 esac
12855
12856- # Having warned about all mis-specified options, bail out if
12857- # anything was wrong.
12858- $exit_cmd $EXIT_FAILURE
12859-}
12860+ $opt_help || {
12861+ # Sanity checks first:
12862+ func_check_version_match
12863
12864-# func_check_version_match
12865-# Ensure that we are using m4 macros, and libtool script from the same
12866-# release of libtool.
12867-func_check_version_match ()
12868-{
12869- if test "$package_revision" != "$macro_revision"; then
12870- if test "$VERSION" != "$macro_version"; then
12871- if test -z "$macro_version"; then
12872- cat >&2 <<_LT_EOF
12873-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12874-$progname: definition of this LT_INIT comes from an older release.
12875-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12876-$progname: and run autoconf again.
12877-_LT_EOF
12878- else
12879- cat >&2 <<_LT_EOF
12880-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
12881-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
12882-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
12883-$progname: and run autoconf again.
12884-_LT_EOF
12885- fi
12886- else
12887- cat >&2 <<_LT_EOF
12888-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
12889-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
12890-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
12891-$progname: of $PACKAGE $VERSION and run autoconf again.
12892-_LT_EOF
12893+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12894+ func_fatal_configuration "not configured to build any kind of library"
12895 fi
12896
12897- exit $EXIT_MISMATCH
12898- fi
12899-}
12900-
12901+ # Darwin sucks
12902+ eval std_shrext=\"$shrext_cmds\"
12903
12904-## ----------- ##
12905-## Main. ##
12906-## ----------- ##
12907-
12908-$opt_help || {
12909- # Sanity checks first:
12910- func_check_version_match
12911-
12912- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
12913- func_fatal_configuration "not configured to build any kind of library"
12914- fi
12915+ # Only execute mode is allowed to have -dlopen flags.
12916+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
12917+ func_error "unrecognized option \`-dlopen'"
12918+ $ECHO "$help" 1>&2
12919+ exit $EXIT_FAILURE
12920+ fi
12921
12922- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
12923+ # Change the help message to a mode-specific one.
12924+ generic_help="$help"
12925+ help="Try \`$progname --help --mode=$opt_mode' for more information."
12926+ }
12927
12928
12929- # Darwin sucks
12930- eval "std_shrext=\"$shrext_cmds\""
12931+ # Bail if the options were screwed
12932+ $exit_cmd $EXIT_FAILURE
12933+}
12934
12935
12936- # Only execute mode is allowed to have -dlopen flags.
12937- if test -n "$execute_dlfiles" && test "$mode" != execute; then
12938- func_error "unrecognized option \`-dlopen'"
12939- $ECHO "$help" 1>&2
12940- exit $EXIT_FAILURE
12941- fi
12942
12943- # Change the help message to a mode-specific one.
12944- generic_help="$help"
12945- help="Try \`$progname --help --mode=$mode' for more information."
12946-}
12947
12948+## ----------- ##
12949+## Main. ##
12950+## ----------- ##
12951
12952 # func_lalib_p file
12953 # True iff FILE is a libtool `.la' library or `.lo' object file.
12954@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
12955 # temporary ltwrapper_script.
12956 func_ltwrapper_scriptname ()
12957 {
12958- func_ltwrapper_scriptname_result=""
12959- if func_ltwrapper_executable_p "$1"; then
12960- func_dirname_and_basename "$1" "" "."
12961- func_stripname '' '.exe' "$func_basename_result"
12962- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12963- fi
12964+ func_dirname_and_basename "$1" "" "."
12965+ func_stripname '' '.exe' "$func_basename_result"
12966+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
12967 }
12968
12969 # func_ltwrapper_p file
12970@@ -1149,7 +1311,7 @@ func_execute_cmds ()
12971 save_ifs=$IFS; IFS='~'
12972 for cmd in $1; do
12973 IFS=$save_ifs
12974- eval "cmd=\"$cmd\""
12975+ eval cmd=\"$cmd\"
12976 func_show_eval "$cmd" "${2-:}"
12977 done
12978 IFS=$save_ifs
12979@@ -1172,6 +1334,37 @@ func_source ()
12980 }
12981
12982
12983+# func_resolve_sysroot PATH
12984+# Replace a leading = in PATH with a sysroot. Store the result into
12985+# func_resolve_sysroot_result
12986+func_resolve_sysroot ()
12987+{
12988+ func_resolve_sysroot_result=$1
12989+ case $func_resolve_sysroot_result in
12990+ =*)
12991+ func_stripname '=' '' "$func_resolve_sysroot_result"
12992+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
12993+ ;;
12994+ esac
12995+}
12996+
12997+# func_replace_sysroot PATH
12998+# If PATH begins with the sysroot, replace it with = and
12999+# store the result into func_replace_sysroot_result.
13000+func_replace_sysroot ()
13001+{
13002+ case "$lt_sysroot:$1" in
13003+ ?*:"$lt_sysroot"*)
13004+ func_stripname "$lt_sysroot" '' "$1"
13005+ func_replace_sysroot_result="=$func_stripname_result"
13006+ ;;
13007+ *)
13008+ # Including no sysroot.
13009+ func_replace_sysroot_result=$1
13010+ ;;
13011+ esac
13012+}
13013+
13014 # func_infer_tag arg
13015 # Infer tagged configuration to use if any are available and
13016 # if one wasn't chosen via the "--tag" command line option.
13017@@ -1184,8 +1377,7 @@ func_infer_tag ()
13018 if test -n "$available_tags" && test -z "$tagname"; then
13019 CC_quoted=
13020 for arg in $CC; do
13021- func_quote_for_eval "$arg"
13022- CC_quoted="$CC_quoted $func_quote_for_eval_result"
13023+ func_append_quoted CC_quoted "$arg"
13024 done
13025 CC_expanded=`func_echo_all $CC`
13026 CC_quoted_expanded=`func_echo_all $CC_quoted`
13027@@ -1204,8 +1396,7 @@ func_infer_tag ()
13028 CC_quoted=
13029 for arg in $CC; do
13030 # Double-quote args containing other shell metacharacters.
13031- func_quote_for_eval "$arg"
13032- CC_quoted="$CC_quoted $func_quote_for_eval_result"
13033+ func_append_quoted CC_quoted "$arg"
13034 done
13035 CC_expanded=`func_echo_all $CC`
13036 CC_quoted_expanded=`func_echo_all $CC_quoted`
13037@@ -1274,6 +1465,486 @@ EOF
13038 }
13039 }
13040
13041+
13042+##################################################
13043+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
13044+##################################################
13045+
13046+# func_convert_core_file_wine_to_w32 ARG
13047+# Helper function used by file name conversion functions when $build is *nix,
13048+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
13049+# correctly configured wine environment available, with the winepath program
13050+# in $build's $PATH.
13051+#
13052+# ARG is the $build file name to be converted to w32 format.
13053+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
13054+# be empty on error (or when ARG is empty)
13055+func_convert_core_file_wine_to_w32 ()
13056+{
13057+ $opt_debug
13058+ func_convert_core_file_wine_to_w32_result="$1"
13059+ if test -n "$1"; then
13060+ # Unfortunately, winepath does not exit with a non-zero error code, so we
13061+ # are forced to check the contents of stdout. On the other hand, if the
13062+ # command is not found, the shell will set an exit code of 127 and print
13063+ # *an error message* to stdout. So we must check for both error code of
13064+ # zero AND non-empty stdout, which explains the odd construction:
13065+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
13066+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
13067+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
13068+ $SED -e "$lt_sed_naive_backslashify"`
13069+ else
13070+ func_convert_core_file_wine_to_w32_result=
13071+ fi
13072+ fi
13073+}
13074+# end: func_convert_core_file_wine_to_w32
13075+
13076+
13077+# func_convert_core_path_wine_to_w32 ARG
13078+# Helper function used by path conversion functions when $build is *nix, and
13079+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
13080+# configured wine environment available, with the winepath program in $build's
13081+# $PATH. Assumes ARG has no leading or trailing path separator characters.
13082+#
13083+# ARG is path to be converted from $build format to win32.
13084+# Result is available in $func_convert_core_path_wine_to_w32_result.
13085+# Unconvertible file (directory) names in ARG are skipped; if no directory names
13086+# are convertible, then the result may be empty.
13087+func_convert_core_path_wine_to_w32 ()
13088+{
13089+ $opt_debug
13090+ # unfortunately, winepath doesn't convert paths, only file names
13091+ func_convert_core_path_wine_to_w32_result=""
13092+ if test -n "$1"; then
13093+ oldIFS=$IFS
13094+ IFS=:
13095+ for func_convert_core_path_wine_to_w32_f in $1; do
13096+ IFS=$oldIFS
13097+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
13098+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
13099+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
13100+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
13101+ else
13102+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
13103+ fi
13104+ fi
13105+ done
13106+ IFS=$oldIFS
13107+ fi
13108+}
13109+# end: func_convert_core_path_wine_to_w32
13110+
13111+
13112+# func_cygpath ARGS...
13113+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
13114+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
13115+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
13116+# (2), returns the Cygwin file name or path in func_cygpath_result (input
13117+# file name or path is assumed to be in w32 format, as previously converted
13118+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
13119+# or path in func_cygpath_result (input file name or path is assumed to be in
13120+# Cygwin format). Returns an empty string on error.
13121+#
13122+# ARGS are passed to cygpath, with the last one being the file name or path to
13123+# be converted.
13124+#
13125+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
13126+# environment variable; do not put it in $PATH.
13127+func_cygpath ()
13128+{
13129+ $opt_debug
13130+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
13131+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
13132+ if test "$?" -ne 0; then
13133+ # on failure, ensure result is empty
13134+ func_cygpath_result=
13135+ fi
13136+ else
13137+ func_cygpath_result=
13138+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
13139+ fi
13140+}
13141+#end: func_cygpath
13142+
13143+
13144+# func_convert_core_msys_to_w32 ARG
13145+# Convert file name or path ARG from MSYS format to w32 format. Return
13146+# result in func_convert_core_msys_to_w32_result.
13147+func_convert_core_msys_to_w32 ()
13148+{
13149+ $opt_debug
13150+ # awkward: cmd appends spaces to result
13151+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
13152+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
13153+}
13154+#end: func_convert_core_msys_to_w32
13155+
13156+
13157+# func_convert_file_check ARG1 ARG2
13158+# Verify that ARG1 (a file name in $build format) was converted to $host
13159+# format in ARG2. Otherwise, emit an error message, but continue (resetting
13160+# func_to_host_file_result to ARG1).
13161+func_convert_file_check ()
13162+{
13163+ $opt_debug
13164+ if test -z "$2" && test -n "$1" ; then
13165+ func_error "Could not determine host file name corresponding to"
13166+ func_error " \`$1'"
13167+ func_error "Continuing, but uninstalled executables may not work."
13168+ # Fallback:
13169+ func_to_host_file_result="$1"
13170+ fi
13171+}
13172+# end func_convert_file_check
13173+
13174+
13175+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
13176+# Verify that FROM_PATH (a path in $build format) was converted to $host
13177+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
13178+# func_to_host_file_result to a simplistic fallback value (see below).
13179+func_convert_path_check ()
13180+{
13181+ $opt_debug
13182+ if test -z "$4" && test -n "$3"; then
13183+ func_error "Could not determine the host path corresponding to"
13184+ func_error " \`$3'"
13185+ func_error "Continuing, but uninstalled executables may not work."
13186+ # Fallback. This is a deliberately simplistic "conversion" and
13187+ # should not be "improved". See libtool.info.
13188+ if test "x$1" != "x$2"; then
13189+ lt_replace_pathsep_chars="s|$1|$2|g"
13190+ func_to_host_path_result=`echo "$3" |
13191+ $SED -e "$lt_replace_pathsep_chars"`
13192+ else
13193+ func_to_host_path_result="$3"
13194+ fi
13195+ fi
13196+}
13197+# end func_convert_path_check
13198+
13199+
13200+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
13201+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
13202+# and appending REPL if ORIG matches BACKPAT.
13203+func_convert_path_front_back_pathsep ()
13204+{
13205+ $opt_debug
13206+ case $4 in
13207+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
13208+ ;;
13209+ esac
13210+ case $4 in
13211+ $2 ) func_append func_to_host_path_result "$3"
13212+ ;;
13213+ esac
13214+}
13215+# end func_convert_path_front_back_pathsep
13216+
13217+
13218+##################################################
13219+# $build to $host FILE NAME CONVERSION FUNCTIONS #
13220+##################################################
13221+# invoked via `$to_host_file_cmd ARG'
13222+#
13223+# In each case, ARG is the path to be converted from $build to $host format.
13224+# Result will be available in $func_to_host_file_result.
13225+
13226+
13227+# func_to_host_file ARG
13228+# Converts the file name ARG from $build format to $host format. Return result
13229+# in func_to_host_file_result.
13230+func_to_host_file ()
13231+{
13232+ $opt_debug
13233+ $to_host_file_cmd "$1"
13234+}
13235+# end func_to_host_file
13236+
13237+
13238+# func_to_tool_file ARG LAZY
13239+# converts the file name ARG from $build format to toolchain format. Return
13240+# result in func_to_tool_file_result. If the conversion in use is listed
13241+# in (the comma separated) LAZY, no conversion takes place.
13242+func_to_tool_file ()
13243+{
13244+ $opt_debug
13245+ case ,$2, in
13246+ *,"$to_tool_file_cmd",*)
13247+ func_to_tool_file_result=$1
13248+ ;;
13249+ *)
13250+ $to_tool_file_cmd "$1"
13251+ func_to_tool_file_result=$func_to_host_file_result
13252+ ;;
13253+ esac
13254+}
13255+# end func_to_tool_file
13256+
13257+
13258+# func_convert_file_noop ARG
13259+# Copy ARG to func_to_host_file_result.
13260+func_convert_file_noop ()
13261+{
13262+ func_to_host_file_result="$1"
13263+}
13264+# end func_convert_file_noop
13265+
13266+
13267+# func_convert_file_msys_to_w32 ARG
13268+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
13269+# conversion to w32 is not available inside the cwrapper. Returns result in
13270+# func_to_host_file_result.
13271+func_convert_file_msys_to_w32 ()
13272+{
13273+ $opt_debug
13274+ func_to_host_file_result="$1"
13275+ if test -n "$1"; then
13276+ func_convert_core_msys_to_w32 "$1"
13277+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
13278+ fi
13279+ func_convert_file_check "$1" "$func_to_host_file_result"
13280+}
13281+# end func_convert_file_msys_to_w32
13282+
13283+
13284+# func_convert_file_cygwin_to_w32 ARG
13285+# Convert file name ARG from Cygwin to w32 format. Returns result in
13286+# func_to_host_file_result.
13287+func_convert_file_cygwin_to_w32 ()
13288+{
13289+ $opt_debug
13290+ func_to_host_file_result="$1"
13291+ if test -n "$1"; then
13292+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
13293+ # LT_CYGPATH in this case.
13294+ func_to_host_file_result=`cygpath -m "$1"`
13295+ fi
13296+ func_convert_file_check "$1" "$func_to_host_file_result"
13297+}
13298+# end func_convert_file_cygwin_to_w32
13299+
13300+
13301+# func_convert_file_nix_to_w32 ARG
13302+# Convert file name ARG from *nix to w32 format. Requires a wine environment
13303+# and a working winepath. Returns result in func_to_host_file_result.
13304+func_convert_file_nix_to_w32 ()
13305+{
13306+ $opt_debug
13307+ func_to_host_file_result="$1"
13308+ if test -n "$1"; then
13309+ func_convert_core_file_wine_to_w32 "$1"
13310+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
13311+ fi
13312+ func_convert_file_check "$1" "$func_to_host_file_result"
13313+}
13314+# end func_convert_file_nix_to_w32
13315+
13316+
13317+# func_convert_file_msys_to_cygwin ARG
13318+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13319+# Returns result in func_to_host_file_result.
13320+func_convert_file_msys_to_cygwin ()
13321+{
13322+ $opt_debug
13323+ func_to_host_file_result="$1"
13324+ if test -n "$1"; then
13325+ func_convert_core_msys_to_w32 "$1"
13326+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
13327+ func_to_host_file_result="$func_cygpath_result"
13328+ fi
13329+ func_convert_file_check "$1" "$func_to_host_file_result"
13330+}
13331+# end func_convert_file_msys_to_cygwin
13332+
13333+
13334+# func_convert_file_nix_to_cygwin ARG
13335+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
13336+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
13337+# in func_to_host_file_result.
13338+func_convert_file_nix_to_cygwin ()
13339+{
13340+ $opt_debug
13341+ func_to_host_file_result="$1"
13342+ if test -n "$1"; then
13343+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
13344+ func_convert_core_file_wine_to_w32 "$1"
13345+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
13346+ func_to_host_file_result="$func_cygpath_result"
13347+ fi
13348+ func_convert_file_check "$1" "$func_to_host_file_result"
13349+}
13350+# end func_convert_file_nix_to_cygwin
13351+
13352+
13353+#############################################
13354+# $build to $host PATH CONVERSION FUNCTIONS #
13355+#############################################
13356+# invoked via `$to_host_path_cmd ARG'
13357+#
13358+# In each case, ARG is the path to be converted from $build to $host format.
13359+# The result will be available in $func_to_host_path_result.
13360+#
13361+# Path separators are also converted from $build format to $host format. If
13362+# ARG begins or ends with a path separator character, it is preserved (but
13363+# converted to $host format) on output.
13364+#
13365+# All path conversion functions are named using the following convention:
13366+# file name conversion function : func_convert_file_X_to_Y ()
13367+# path conversion function : func_convert_path_X_to_Y ()
13368+# where, for any given $build/$host combination the 'X_to_Y' value is the
13369+# same. If conversion functions are added for new $build/$host combinations,
13370+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
13371+# will break.
13372+
13373+
13374+# func_init_to_host_path_cmd
13375+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
13376+# appropriate value, based on the value of $to_host_file_cmd.
13377+to_host_path_cmd=
13378+func_init_to_host_path_cmd ()
13379+{
13380+ $opt_debug
13381+ if test -z "$to_host_path_cmd"; then
13382+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
13383+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
13384+ fi
13385+}
13386+
13387+
13388+# func_to_host_path ARG
13389+# Converts the path ARG from $build format to $host format. Return result
13390+# in func_to_host_path_result.
13391+func_to_host_path ()
13392+{
13393+ $opt_debug
13394+ func_init_to_host_path_cmd
13395+ $to_host_path_cmd "$1"
13396+}
13397+# end func_to_host_path
13398+
13399+
13400+# func_convert_path_noop ARG
13401+# Copy ARG to func_to_host_path_result.
13402+func_convert_path_noop ()
13403+{
13404+ func_to_host_path_result="$1"
13405+}
13406+# end func_convert_path_noop
13407+
13408+
13409+# func_convert_path_msys_to_w32 ARG
13410+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
13411+# conversion to w32 is not available inside the cwrapper. Returns result in
13412+# func_to_host_path_result.
13413+func_convert_path_msys_to_w32 ()
13414+{
13415+ $opt_debug
13416+ func_to_host_path_result="$1"
13417+ if test -n "$1"; then
13418+ # Remove leading and trailing path separator characters from ARG. MSYS
13419+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
13420+ # and winepath ignores them completely.
13421+ func_stripname : : "$1"
13422+ func_to_host_path_tmp1=$func_stripname_result
13423+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13424+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
13425+ func_convert_path_check : ";" \
13426+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13427+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13428+ fi
13429+}
13430+# end func_convert_path_msys_to_w32
13431+
13432+
13433+# func_convert_path_cygwin_to_w32 ARG
13434+# Convert path ARG from Cygwin to w32 format. Returns result in
13435+# func_to_host_file_result.
13436+func_convert_path_cygwin_to_w32 ()
13437+{
13438+ $opt_debug
13439+ func_to_host_path_result="$1"
13440+ if test -n "$1"; then
13441+ # See func_convert_path_msys_to_w32:
13442+ func_stripname : : "$1"
13443+ func_to_host_path_tmp1=$func_stripname_result
13444+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
13445+ func_convert_path_check : ";" \
13446+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13447+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13448+ fi
13449+}
13450+# end func_convert_path_cygwin_to_w32
13451+
13452+
13453+# func_convert_path_nix_to_w32 ARG
13454+# Convert path ARG from *nix to w32 format. Requires a wine environment and
13455+# a working winepath. Returns result in func_to_host_file_result.
13456+func_convert_path_nix_to_w32 ()
13457+{
13458+ $opt_debug
13459+ func_to_host_path_result="$1"
13460+ if test -n "$1"; then
13461+ # See func_convert_path_msys_to_w32:
13462+ func_stripname : : "$1"
13463+ func_to_host_path_tmp1=$func_stripname_result
13464+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13465+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
13466+ func_convert_path_check : ";" \
13467+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13468+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
13469+ fi
13470+}
13471+# end func_convert_path_nix_to_w32
13472+
13473+
13474+# func_convert_path_msys_to_cygwin ARG
13475+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
13476+# Returns result in func_to_host_file_result.
13477+func_convert_path_msys_to_cygwin ()
13478+{
13479+ $opt_debug
13480+ func_to_host_path_result="$1"
13481+ if test -n "$1"; then
13482+ # See func_convert_path_msys_to_w32:
13483+ func_stripname : : "$1"
13484+ func_to_host_path_tmp1=$func_stripname_result
13485+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
13486+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
13487+ func_to_host_path_result="$func_cygpath_result"
13488+ func_convert_path_check : : \
13489+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13490+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13491+ fi
13492+}
13493+# end func_convert_path_msys_to_cygwin
13494+
13495+
13496+# func_convert_path_nix_to_cygwin ARG
13497+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
13498+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
13499+# func_to_host_file_result.
13500+func_convert_path_nix_to_cygwin ()
13501+{
13502+ $opt_debug
13503+ func_to_host_path_result="$1"
13504+ if test -n "$1"; then
13505+ # Remove leading and trailing path separator characters from
13506+ # ARG. msys behavior is inconsistent here, cygpath turns them
13507+ # into '.;' and ';.', and winepath ignores them completely.
13508+ func_stripname : : "$1"
13509+ func_to_host_path_tmp1=$func_stripname_result
13510+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
13511+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
13512+ func_to_host_path_result="$func_cygpath_result"
13513+ func_convert_path_check : : \
13514+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
13515+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
13516+ fi
13517+}
13518+# end func_convert_path_nix_to_cygwin
13519+
13520+
13521 # func_mode_compile arg...
13522 func_mode_compile ()
13523 {
13524@@ -1314,12 +1985,12 @@ func_mode_compile ()
13525 ;;
13526
13527 -pie | -fpie | -fPIE)
13528- pie_flag="$pie_flag $arg"
13529+ func_append pie_flag " $arg"
13530 continue
13531 ;;
13532
13533 -shared | -static | -prefer-pic | -prefer-non-pic)
13534- later="$later $arg"
13535+ func_append later " $arg"
13536 continue
13537 ;;
13538
13539@@ -1340,15 +2011,14 @@ func_mode_compile ()
13540 save_ifs="$IFS"; IFS=','
13541 for arg in $args; do
13542 IFS="$save_ifs"
13543- func_quote_for_eval "$arg"
13544- lastarg="$lastarg $func_quote_for_eval_result"
13545+ func_append_quoted lastarg "$arg"
13546 done
13547 IFS="$save_ifs"
13548 func_stripname ' ' '' "$lastarg"
13549 lastarg=$func_stripname_result
13550
13551 # Add the arguments to base_compile.
13552- base_compile="$base_compile $lastarg"
13553+ func_append base_compile " $lastarg"
13554 continue
13555 ;;
13556
13557@@ -1364,8 +2034,7 @@ func_mode_compile ()
13558 esac # case $arg_mode
13559
13560 # Aesthetically quote the previous argument.
13561- func_quote_for_eval "$lastarg"
13562- base_compile="$base_compile $func_quote_for_eval_result"
13563+ func_append_quoted base_compile "$lastarg"
13564 done # for arg
13565
13566 case $arg_mode in
13567@@ -1496,17 +2165,16 @@ compiler."
13568 $opt_dry_run || $RM $removelist
13569 exit $EXIT_FAILURE
13570 fi
13571- removelist="$removelist $output_obj"
13572+ func_append removelist " $output_obj"
13573 $ECHO "$srcfile" > "$lockfile"
13574 fi
13575
13576 $opt_dry_run || $RM $removelist
13577- removelist="$removelist $lockfile"
13578+ func_append removelist " $lockfile"
13579 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
13580
13581- if test -n "$fix_srcfile_path"; then
13582- eval "srcfile=\"$fix_srcfile_path\""
13583- fi
13584+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
13585+ srcfile=$func_to_tool_file_result
13586 func_quote_for_eval "$srcfile"
13587 qsrcfile=$func_quote_for_eval_result
13588
13589@@ -1526,7 +2194,7 @@ compiler."
13590
13591 if test -z "$output_obj"; then
13592 # Place PIC objects in $objdir
13593- command="$command -o $lobj"
13594+ func_append command " -o $lobj"
13595 fi
13596
13597 func_show_eval_locale "$command" \
13598@@ -1573,11 +2241,11 @@ compiler."
13599 command="$base_compile $qsrcfile $pic_flag"
13600 fi
13601 if test "$compiler_c_o" = yes; then
13602- command="$command -o $obj"
13603+ func_append command " -o $obj"
13604 fi
13605
13606 # Suppress compiler output if we already did a PIC compilation.
13607- command="$command$suppress_output"
13608+ func_append command "$suppress_output"
13609 func_show_eval_locale "$command" \
13610 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
13611
13612@@ -1622,13 +2290,13 @@ compiler."
13613 }
13614
13615 $opt_help || {
13616- test "$mode" = compile && func_mode_compile ${1+"$@"}
13617+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
13618 }
13619
13620 func_mode_help ()
13621 {
13622 # We need to display help for each of the modes.
13623- case $mode in
13624+ case $opt_mode in
13625 "")
13626 # Generic help is extracted from the usage comments
13627 # at the start of this file.
13628@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
13629
13630 -o OUTPUT-FILE set the output file name to OUTPUT-FILE
13631 -no-suppress do not suppress compiler output for multiple passes
13632- -prefer-pic try to building PIC objects only
13633- -prefer-non-pic try to building non-PIC objects only
13634+ -prefer-pic try to build PIC objects only
13635+ -prefer-non-pic try to build non-PIC objects only
13636 -shared do not build a \`.o' file suitable for static linking
13637 -static only build a \`.o' file suitable for static linking
13638 -Wc,FLAG pass FLAG directly to the compiler
13639@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
13640 ;;
13641
13642 *)
13643- func_fatal_help "invalid operation mode \`$mode'"
13644+ func_fatal_help "invalid operation mode \`$opt_mode'"
13645 ;;
13646 esac
13647
13648@@ -1819,13 +2487,13 @@ if $opt_help; then
13649 else
13650 {
13651 func_help noexit
13652- for mode in compile link execute install finish uninstall clean; do
13653+ for opt_mode in compile link execute install finish uninstall clean; do
13654 func_mode_help
13655 done
13656 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
13657 {
13658 func_help noexit
13659- for mode in compile link execute install finish uninstall clean; do
13660+ for opt_mode in compile link execute install finish uninstall clean; do
13661 echo
13662 func_mode_help
13663 done
13664@@ -1854,13 +2522,16 @@ func_mode_execute ()
13665 func_fatal_help "you must specify a COMMAND"
13666
13667 # Handle -dlopen flags immediately.
13668- for file in $execute_dlfiles; do
13669+ for file in $opt_dlopen; do
13670 test -f "$file" \
13671 || func_fatal_help "\`$file' is not a file"
13672
13673 dir=
13674 case $file in
13675 *.la)
13676+ func_resolve_sysroot "$file"
13677+ file=$func_resolve_sysroot_result
13678+
13679 # Check to see that this really is a libtool archive.
13680 func_lalib_unsafe_p "$file" \
13681 || func_fatal_help "\`$lib' is not a valid libtool archive"
13682@@ -1882,7 +2553,7 @@ func_mode_execute ()
13683 dir="$func_dirname_result"
13684
13685 if test -f "$dir/$objdir/$dlname"; then
13686- dir="$dir/$objdir"
13687+ func_append dir "/$objdir"
13688 else
13689 if test ! -f "$dir/$dlname"; then
13690 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
13691@@ -1907,10 +2578,10 @@ func_mode_execute ()
13692 test -n "$absdir" && dir="$absdir"
13693
13694 # Now add the directory to shlibpath_var.
13695- if eval test -z \"\$$shlibpath_var\"; then
13696- eval $shlibpath_var=\$dir
13697+ if eval "test -z \"\$$shlibpath_var\""; then
13698+ eval "$shlibpath_var=\"\$dir\""
13699 else
13700- eval $shlibpath_var=\$dir:\$$shlibpath_var
13701+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
13702 fi
13703 done
13704
13705@@ -1939,8 +2610,7 @@ func_mode_execute ()
13706 ;;
13707 esac
13708 # Quote arguments (to preserve shell metacharacters).
13709- func_quote_for_eval "$file"
13710- args="$args $func_quote_for_eval_result"
13711+ func_append_quoted args "$file"
13712 done
13713
13714 if test "X$opt_dry_run" = Xfalse; then
13715@@ -1972,22 +2642,59 @@ func_mode_execute ()
13716 fi
13717 }
13718
13719-test "$mode" = execute && func_mode_execute ${1+"$@"}
13720+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
13721
13722
13723 # func_mode_finish arg...
13724 func_mode_finish ()
13725 {
13726 $opt_debug
13727- libdirs="$nonopt"
13728+ libs=
13729+ libdirs=
13730 admincmds=
13731
13732- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13733- for dir
13734- do
13735- libdirs="$libdirs $dir"
13736- done
13737+ for opt in "$nonopt" ${1+"$@"}
13738+ do
13739+ if test -d "$opt"; then
13740+ func_append libdirs " $opt"
13741
13742+ elif test -f "$opt"; then
13743+ if func_lalib_unsafe_p "$opt"; then
13744+ func_append libs " $opt"
13745+ else
13746+ func_warning "\`$opt' is not a valid libtool archive"
13747+ fi
13748+
13749+ else
13750+ func_fatal_error "invalid argument \`$opt'"
13751+ fi
13752+ done
13753+
13754+ if test -n "$libs"; then
13755+ if test -n "$lt_sysroot"; then
13756+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
13757+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
13758+ else
13759+ sysroot_cmd=
13760+ fi
13761+
13762+ # Remove sysroot references
13763+ if $opt_dry_run; then
13764+ for lib in $libs; do
13765+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
13766+ done
13767+ else
13768+ tmpdir=`func_mktempdir`
13769+ for lib in $libs; do
13770+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
13771+ > $tmpdir/tmp-la
13772+ mv -f $tmpdir/tmp-la $lib
13773+ done
13774+ ${RM}r "$tmpdir"
13775+ fi
13776+ fi
13777+
13778+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13779 for libdir in $libdirs; do
13780 if test -n "$finish_cmds"; then
13781 # Do each command in the finish commands.
13782@@ -1997,7 +2704,7 @@ func_mode_finish ()
13783 if test -n "$finish_eval"; then
13784 # Do the single finish_eval.
13785 eval cmds=\"$finish_eval\"
13786- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
13787+ $opt_dry_run || eval "$cmds" || func_append admincmds "
13788 $cmds"
13789 fi
13790 done
13791@@ -2006,53 +2713,55 @@ func_mode_finish ()
13792 # Exit here if they wanted silent mode.
13793 $opt_silent && exit $EXIT_SUCCESS
13794
13795- echo "----------------------------------------------------------------------"
13796- echo "Libraries have been installed in:"
13797- for libdir in $libdirs; do
13798- $ECHO " $libdir"
13799- done
13800- echo
13801- echo "If you ever happen to want to link against installed libraries"
13802- echo "in a given directory, LIBDIR, you must either use libtool, and"
13803- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13804- echo "flag during linking and do at least one of the following:"
13805- if test -n "$shlibpath_var"; then
13806- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13807- echo " during execution"
13808- fi
13809- if test -n "$runpath_var"; then
13810- echo " - add LIBDIR to the \`$runpath_var' environment variable"
13811- echo " during linking"
13812- fi
13813- if test -n "$hardcode_libdir_flag_spec"; then
13814- libdir=LIBDIR
13815- eval "flag=\"$hardcode_libdir_flag_spec\""
13816+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
13817+ echo "----------------------------------------------------------------------"
13818+ echo "Libraries have been installed in:"
13819+ for libdir in $libdirs; do
13820+ $ECHO " $libdir"
13821+ done
13822+ echo
13823+ echo "If you ever happen to want to link against installed libraries"
13824+ echo "in a given directory, LIBDIR, you must either use libtool, and"
13825+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
13826+ echo "flag during linking and do at least one of the following:"
13827+ if test -n "$shlibpath_var"; then
13828+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
13829+ echo " during execution"
13830+ fi
13831+ if test -n "$runpath_var"; then
13832+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
13833+ echo " during linking"
13834+ fi
13835+ if test -n "$hardcode_libdir_flag_spec"; then
13836+ libdir=LIBDIR
13837+ eval flag=\"$hardcode_libdir_flag_spec\"
13838
13839- $ECHO " - use the \`$flag' linker flag"
13840- fi
13841- if test -n "$admincmds"; then
13842- $ECHO " - have your system administrator run these commands:$admincmds"
13843- fi
13844- if test -f /etc/ld.so.conf; then
13845- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13846- fi
13847- echo
13848+ $ECHO " - use the \`$flag' linker flag"
13849+ fi
13850+ if test -n "$admincmds"; then
13851+ $ECHO " - have your system administrator run these commands:$admincmds"
13852+ fi
13853+ if test -f /etc/ld.so.conf; then
13854+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
13855+ fi
13856+ echo
13857
13858- echo "See any operating system documentation about shared libraries for"
13859- case $host in
13860- solaris2.[6789]|solaris2.1[0-9])
13861- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13862- echo "pages."
13863- ;;
13864- *)
13865- echo "more information, such as the ld(1) and ld.so(8) manual pages."
13866- ;;
13867- esac
13868- echo "----------------------------------------------------------------------"
13869+ echo "See any operating system documentation about shared libraries for"
13870+ case $host in
13871+ solaris2.[6789]|solaris2.1[0-9])
13872+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
13873+ echo "pages."
13874+ ;;
13875+ *)
13876+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
13877+ ;;
13878+ esac
13879+ echo "----------------------------------------------------------------------"
13880+ fi
13881 exit $EXIT_SUCCESS
13882 }
13883
13884-test "$mode" = finish && func_mode_finish ${1+"$@"}
13885+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
13886
13887
13888 # func_mode_install arg...
13889@@ -2077,7 +2786,7 @@ func_mode_install ()
13890 # The real first argument should be the name of the installation program.
13891 # Aesthetically quote it.
13892 func_quote_for_eval "$arg"
13893- install_prog="$install_prog$func_quote_for_eval_result"
13894+ func_append install_prog "$func_quote_for_eval_result"
13895 install_shared_prog=$install_prog
13896 case " $install_prog " in
13897 *[\\\ /]cp\ *) install_cp=: ;;
13898@@ -2097,7 +2806,7 @@ func_mode_install ()
13899 do
13900 arg2=
13901 if test -n "$dest"; then
13902- files="$files $dest"
13903+ func_append files " $dest"
13904 dest=$arg
13905 continue
13906 fi
13907@@ -2135,11 +2844,11 @@ func_mode_install ()
13908
13909 # Aesthetically quote the argument.
13910 func_quote_for_eval "$arg"
13911- install_prog="$install_prog $func_quote_for_eval_result"
13912+ func_append install_prog " $func_quote_for_eval_result"
13913 if test -n "$arg2"; then
13914 func_quote_for_eval "$arg2"
13915 fi
13916- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
13917+ func_append install_shared_prog " $func_quote_for_eval_result"
13918 done
13919
13920 test -z "$install_prog" && \
13921@@ -2151,7 +2860,7 @@ func_mode_install ()
13922 if test -n "$install_override_mode" && $no_mode; then
13923 if $install_cp; then :; else
13924 func_quote_for_eval "$install_override_mode"
13925- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
13926+ func_append install_shared_prog " -m $func_quote_for_eval_result"
13927 fi
13928 fi
13929
13930@@ -2209,10 +2918,13 @@ func_mode_install ()
13931 case $file in
13932 *.$libext)
13933 # Do the static libraries later.
13934- staticlibs="$staticlibs $file"
13935+ func_append staticlibs " $file"
13936 ;;
13937
13938 *.la)
13939+ func_resolve_sysroot "$file"
13940+ file=$func_resolve_sysroot_result
13941+
13942 # Check to see that this really is a libtool archive.
13943 func_lalib_unsafe_p "$file" \
13944 || func_fatal_help "\`$file' is not a valid libtool archive"
13945@@ -2226,23 +2938,30 @@ func_mode_install ()
13946 if test "X$destdir" = "X$libdir"; then
13947 case "$current_libdirs " in
13948 *" $libdir "*) ;;
13949- *) current_libdirs="$current_libdirs $libdir" ;;
13950+ *) func_append current_libdirs " $libdir" ;;
13951 esac
13952 else
13953 # Note the libdir as a future libdir.
13954 case "$future_libdirs " in
13955 *" $libdir "*) ;;
13956- *) future_libdirs="$future_libdirs $libdir" ;;
13957+ *) func_append future_libdirs " $libdir" ;;
13958 esac
13959 fi
13960
13961 func_dirname "$file" "/" ""
13962 dir="$func_dirname_result"
13963- dir="$dir$objdir"
13964+ func_append dir "$objdir"
13965
13966 if test -n "$relink_command"; then
13967+ # Strip any trailing slash from the destination.
13968+ func_stripname '' '/' "$libdir"
13969+ destlibdir=$func_stripname_result
13970+
13971+ func_stripname '' '/' "$destdir"
13972+ s_destdir=$func_stripname_result
13973+
13974 # Determine the prefix the user has applied to our future dir.
13975- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
13976+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
13977
13978 # Don't allow the user to place us outside of our expected
13979 # location b/c this prevents finding dependent libraries that
13980@@ -2315,7 +3034,7 @@ func_mode_install ()
13981 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
13982
13983 # Maybe install the static library, too.
13984- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
13985+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
13986 ;;
13987
13988 *.lo)
13989@@ -2503,7 +3222,7 @@ func_mode_install ()
13990 test -n "$future_libdirs" && \
13991 func_warning "remember to run \`$progname --finish$future_libdirs'"
13992
13993- if test -n "$current_libdirs" && $opt_finish; then
13994+ if test -n "$current_libdirs"; then
13995 # Maybe just do a dry run.
13996 $opt_dry_run && current_libdirs=" -n$current_libdirs"
13997 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
13998@@ -2512,7 +3231,7 @@ func_mode_install ()
13999 fi
14000 }
14001
14002-test "$mode" = install && func_mode_install ${1+"$@"}
14003+test "$opt_mode" = install && func_mode_install ${1+"$@"}
14004
14005
14006 # func_generate_dlsyms outputname originator pic_p
14007@@ -2559,6 +3278,18 @@ extern \"C\" {
14008 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
14009 #endif
14010
14011+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
14012+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
14013+/* DATA imports from DLLs on WIN32 con't be const, because runtime
14014+ relocations are performed -- see ld's documentation on pseudo-relocs. */
14015+# define LT_DLSYM_CONST
14016+#elif defined(__osf__)
14017+/* This system does not cope well with relocations in const data. */
14018+# define LT_DLSYM_CONST
14019+#else
14020+# define LT_DLSYM_CONST const
14021+#endif
14022+
14023 /* External symbol declarations for the compiler. */\
14024 "
14025
14026@@ -2570,21 +3301,22 @@ extern \"C\" {
14027 # Add our own program objects to the symbol list.
14028 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
14029 for progfile in $progfiles; do
14030- func_verbose "extracting global C symbols from \`$progfile'"
14031- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
14032+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
14033+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
14034+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
14035 done
14036
14037 if test -n "$exclude_expsyms"; then
14038 $opt_dry_run || {
14039- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
14040- $MV "$nlist"T "$nlist"
14041+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
14042+ eval '$MV "$nlist"T "$nlist"'
14043 }
14044 fi
14045
14046 if test -n "$export_symbols_regex"; then
14047 $opt_dry_run || {
14048- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
14049- $MV "$nlist"T "$nlist"
14050+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
14051+ eval '$MV "$nlist"T "$nlist"'
14052 }
14053 fi
14054
14055@@ -2593,23 +3325,23 @@ extern \"C\" {
14056 export_symbols="$output_objdir/$outputname.exp"
14057 $opt_dry_run || {
14058 $RM $export_symbols
14059- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
14060+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
14061 case $host in
14062 *cygwin* | *mingw* | *cegcc* )
14063- echo EXPORTS > "$output_objdir/$outputname.def"
14064- cat "$export_symbols" >> "$output_objdir/$outputname.def"
14065+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
14066+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
14067 ;;
14068 esac
14069 }
14070 else
14071 $opt_dry_run || {
14072- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
14073- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
14074- $MV "$nlist"T "$nlist"
14075+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
14076+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
14077+ eval '$MV "$nlist"T "$nlist"'
14078 case $host in
14079 *cygwin* | *mingw* | *cegcc* )
14080- echo EXPORTS > "$output_objdir/$outputname.def"
14081- cat "$nlist" >> "$output_objdir/$outputname.def"
14082+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
14083+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
14084 ;;
14085 esac
14086 }
14087@@ -2620,10 +3352,52 @@ extern \"C\" {
14088 func_verbose "extracting global C symbols from \`$dlprefile'"
14089 func_basename "$dlprefile"
14090 name="$func_basename_result"
14091- $opt_dry_run || {
14092- $ECHO ": $name " >> "$nlist"
14093- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14094- }
14095+ case $host in
14096+ *cygwin* | *mingw* | *cegcc* )
14097+ # if an import library, we need to obtain dlname
14098+ if func_win32_import_lib_p "$dlprefile"; then
14099+ func_tr_sh "$dlprefile"
14100+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
14101+ dlprefile_dlbasename=""
14102+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
14103+ # Use subshell, to avoid clobbering current variable values
14104+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
14105+ if test -n "$dlprefile_dlname" ; then
14106+ func_basename "$dlprefile_dlname"
14107+ dlprefile_dlbasename="$func_basename_result"
14108+ else
14109+ # no lafile. user explicitly requested -dlpreopen <import library>.
14110+ $sharedlib_from_linklib_cmd "$dlprefile"
14111+ dlprefile_dlbasename=$sharedlib_from_linklib_result
14112+ fi
14113+ fi
14114+ $opt_dry_run || {
14115+ if test -n "$dlprefile_dlbasename" ; then
14116+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
14117+ else
14118+ func_warning "Could not compute DLL name from $name"
14119+ eval '$ECHO ": $name " >> "$nlist"'
14120+ fi
14121+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14122+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
14123+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
14124+ }
14125+ else # not an import lib
14126+ $opt_dry_run || {
14127+ eval '$ECHO ": $name " >> "$nlist"'
14128+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14129+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14130+ }
14131+ fi
14132+ ;;
14133+ *)
14134+ $opt_dry_run || {
14135+ eval '$ECHO ": $name " >> "$nlist"'
14136+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
14137+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
14138+ }
14139+ ;;
14140+ esac
14141 done
14142
14143 $opt_dry_run || {
14144@@ -2661,26 +3435,9 @@ typedef struct {
14145 const char *name;
14146 void *address;
14147 } lt_dlsymlist;
14148-"
14149- case $host in
14150- *cygwin* | *mingw* | *cegcc* )
14151- echo >> "$output_objdir/$my_dlsyms" "\
14152-/* DATA imports from DLLs on WIN32 con't be const, because
14153- runtime relocations are performed -- see ld's documentation
14154- on pseudo-relocs. */"
14155- lt_dlsym_const= ;;
14156- *osf5*)
14157- echo >> "$output_objdir/$my_dlsyms" "\
14158-/* This system does not cope well with relocations in const data */"
14159- lt_dlsym_const= ;;
14160- *)
14161- lt_dlsym_const=const ;;
14162- esac
14163-
14164- echo >> "$output_objdir/$my_dlsyms" "\
14165-extern $lt_dlsym_const lt_dlsymlist
14166+extern LT_DLSYM_CONST lt_dlsymlist
14167 lt_${my_prefix}_LTX_preloaded_symbols[];
14168-$lt_dlsym_const lt_dlsymlist
14169+LT_DLSYM_CONST lt_dlsymlist
14170 lt_${my_prefix}_LTX_preloaded_symbols[] =
14171 {\
14172 { \"$my_originator\", (void *) 0 },"
14173@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
14174 for arg in $LTCFLAGS; do
14175 case $arg in
14176 -pie | -fpie | -fPIE) ;;
14177- *) symtab_cflags="$symtab_cflags $arg" ;;
14178+ *) func_append symtab_cflags " $arg" ;;
14179 esac
14180 done
14181
14182@@ -2796,9 +3553,11 @@ func_win32_libid ()
14183 win32_libid_type="x86 archive import"
14184 ;;
14185 *ar\ archive*) # could be an import, or static
14186- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
14187- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14188- win32_nmres=`$NM -f posix -A "$1" |
14189+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
14190+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
14191+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
14192+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14193+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
14194 $SED -n -e '
14195 1,100{
14196 / I /{
14197@@ -2827,6 +3586,131 @@ func_win32_libid ()
14198 $ECHO "$win32_libid_type"
14199 }
14200
14201+# func_cygming_dll_for_implib ARG
14202+#
14203+# Platform-specific function to extract the
14204+# name of the DLL associated with the specified
14205+# import library ARG.
14206+# Invoked by eval'ing the libtool variable
14207+# $sharedlib_from_linklib_cmd
14208+# Result is available in the variable
14209+# $sharedlib_from_linklib_result
14210+func_cygming_dll_for_implib ()
14211+{
14212+ $opt_debug
14213+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
14214+}
14215+
14216+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
14217+#
14218+# The is the core of a fallback implementation of a
14219+# platform-specific function to extract the name of the
14220+# DLL associated with the specified import library LIBNAME.
14221+#
14222+# SECTION_NAME is either .idata$6 or .idata$7, depending
14223+# on the platform and compiler that created the implib.
14224+#
14225+# Echos the name of the DLL associated with the
14226+# specified import library.
14227+func_cygming_dll_for_implib_fallback_core ()
14228+{
14229+ $opt_debug
14230+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
14231+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
14232+ $SED '/^Contents of section '"$match_literal"':/{
14233+ # Place marker at beginning of archive member dllname section
14234+ s/.*/====MARK====/
14235+ p
14236+ d
14237+ }
14238+ # These lines can sometimes be longer than 43 characters, but
14239+ # are always uninteresting
14240+ /:[ ]*file format pe[i]\{,1\}-/d
14241+ /^In archive [^:]*:/d
14242+ # Ensure marker is printed
14243+ /^====MARK====/p
14244+ # Remove all lines with less than 43 characters
14245+ /^.\{43\}/!d
14246+ # From remaining lines, remove first 43 characters
14247+ s/^.\{43\}//' |
14248+ $SED -n '
14249+ # Join marker and all lines until next marker into a single line
14250+ /^====MARK====/ b para
14251+ H
14252+ $ b para
14253+ b
14254+ :para
14255+ x
14256+ s/\n//g
14257+ # Remove the marker
14258+ s/^====MARK====//
14259+ # Remove trailing dots and whitespace
14260+ s/[\. \t]*$//
14261+ # Print
14262+ /./p' |
14263+ # we now have a list, one entry per line, of the stringified
14264+ # contents of the appropriate section of all members of the
14265+ # archive which possess that section. Heuristic: eliminate
14266+ # all those which have a first or second character that is
14267+ # a '.' (that is, objdump's representation of an unprintable
14268+ # character.) This should work for all archives with less than
14269+ # 0x302f exports -- but will fail for DLLs whose name actually
14270+ # begins with a literal '.' or a single character followed by
14271+ # a '.'.
14272+ #
14273+ # Of those that remain, print the first one.
14274+ $SED -e '/^\./d;/^.\./d;q'
14275+}
14276+
14277+# func_cygming_gnu_implib_p ARG
14278+# This predicate returns with zero status (TRUE) if
14279+# ARG is a GNU/binutils-style import library. Returns
14280+# with nonzero status (FALSE) otherwise.
14281+func_cygming_gnu_implib_p ()
14282+{
14283+ $opt_debug
14284+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14285+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
14286+ test -n "$func_cygming_gnu_implib_tmp"
14287+}
14288+
14289+# func_cygming_ms_implib_p ARG
14290+# This predicate returns with zero status (TRUE) if
14291+# ARG is an MS-style import library. Returns
14292+# with nonzero status (FALSE) otherwise.
14293+func_cygming_ms_implib_p ()
14294+{
14295+ $opt_debug
14296+ func_to_tool_file "$1" func_convert_file_msys_to_w32
14297+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
14298+ test -n "$func_cygming_ms_implib_tmp"
14299+}
14300+
14301+# func_cygming_dll_for_implib_fallback ARG
14302+# Platform-specific function to extract the
14303+# name of the DLL associated with the specified
14304+# import library ARG.
14305+#
14306+# This fallback implementation is for use when $DLLTOOL
14307+# does not support the --identify-strict option.
14308+# Invoked by eval'ing the libtool variable
14309+# $sharedlib_from_linklib_cmd
14310+# Result is available in the variable
14311+# $sharedlib_from_linklib_result
14312+func_cygming_dll_for_implib_fallback ()
14313+{
14314+ $opt_debug
14315+ if func_cygming_gnu_implib_p "$1" ; then
14316+ # binutils import library
14317+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
14318+ elif func_cygming_ms_implib_p "$1" ; then
14319+ # ms-generated import library
14320+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
14321+ else
14322+ # unknown
14323+ sharedlib_from_linklib_result=""
14324+ fi
14325+}
14326
14327
14328 # func_extract_an_archive dir oldlib
14329@@ -2917,7 +3801,7 @@ func_extract_archives ()
14330 darwin_file=
14331 darwin_files=
14332 for darwin_file in $darwin_filelist; do
14333- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
14334+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
14335 $LIPO -create -output "$darwin_file" $darwin_files
14336 done # $darwin_filelist
14337 $RM -rf unfat-$$
14338@@ -2932,7 +3816,7 @@ func_extract_archives ()
14339 func_extract_an_archive "$my_xdir" "$my_xabs"
14340 ;;
14341 esac
14342- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
14343+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
14344 done
14345
14346 func_extract_archives_result="$my_oldobjs"
14347@@ -3014,7 +3898,110 @@ func_fallback_echo ()
14348 _LTECHO_EOF'
14349 }
14350 ECHO=\"$qECHO\"
14351- fi\
14352+ fi
14353+
14354+# Very basic option parsing. These options are (a) specific to
14355+# the libtool wrapper, (b) are identical between the wrapper
14356+# /script/ and the wrapper /executable/ which is used only on
14357+# windows platforms, and (c) all begin with the string "--lt-"
14358+# (application programs are unlikely to have options which match
14359+# this pattern).
14360+#
14361+# There are only two supported options: --lt-debug and
14362+# --lt-dump-script. There is, deliberately, no --lt-help.
14363+#
14364+# The first argument to this parsing function should be the
14365+# script's $0 value, followed by "$@".
14366+lt_option_debug=
14367+func_parse_lt_options ()
14368+{
14369+ lt_script_arg0=\$0
14370+ shift
14371+ for lt_opt
14372+ do
14373+ case \"\$lt_opt\" in
14374+ --lt-debug) lt_option_debug=1 ;;
14375+ --lt-dump-script)
14376+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
14377+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
14378+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
14379+ cat \"\$lt_dump_D/\$lt_dump_F\"
14380+ exit 0
14381+ ;;
14382+ --lt-*)
14383+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
14384+ exit 1
14385+ ;;
14386+ esac
14387+ done
14388+
14389+ # Print the debug banner immediately:
14390+ if test -n \"\$lt_option_debug\"; then
14391+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
14392+ fi
14393+}
14394+
14395+# Used when --lt-debug. Prints its arguments to stdout
14396+# (redirection is the responsibility of the caller)
14397+func_lt_dump_args ()
14398+{
14399+ lt_dump_args_N=1;
14400+ for lt_arg
14401+ do
14402+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
14403+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
14404+ done
14405+}
14406+
14407+# Core function for launching the target application
14408+func_exec_program_core ()
14409+{
14410+"
14411+ case $host in
14412+ # Backslashes separate directories on plain windows
14413+ *-*-mingw | *-*-os2* | *-cegcc*)
14414+ $ECHO "\
14415+ if test -n \"\$lt_option_debug\"; then
14416+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
14417+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14418+ fi
14419+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14420+"
14421+ ;;
14422+
14423+ *)
14424+ $ECHO "\
14425+ if test -n \"\$lt_option_debug\"; then
14426+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
14427+ func_lt_dump_args \${1+\"\$@\"} 1>&2
14428+ fi
14429+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
14430+"
14431+ ;;
14432+ esac
14433+ $ECHO "\
14434+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14435+ exit 1
14436+}
14437+
14438+# A function to encapsulate launching the target application
14439+# Strips options in the --lt-* namespace from \$@ and
14440+# launches target application with the remaining arguments.
14441+func_exec_program ()
14442+{
14443+ for lt_wr_arg
14444+ do
14445+ case \$lt_wr_arg in
14446+ --lt-*) ;;
14447+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
14448+ esac
14449+ shift
14450+ done
14451+ func_exec_program_core \${1+\"\$@\"}
14452+}
14453+
14454+ # Parse options
14455+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
14456
14457 # Find the directory that this script lives in.
14458 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
14459@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
14460
14461 # relink executable if necessary
14462 if test -n \"\$relink_command\"; then
14463- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
14464+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
14465 else
14466 $ECHO \"\$relink_command_output\" >&2
14467 $RM \"\$progdir/\$file\"
14468@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
14469
14470 if test -f \"\$progdir/\$program\"; then"
14471
14472+ # fixup the dll searchpath if we need to.
14473+ #
14474+ # Fix the DLL searchpath if we need to. Do this before prepending
14475+ # to shlibpath, because on Windows, both are PATH and uninstalled
14476+ # libraries must come first.
14477+ if test -n "$dllsearchpath"; then
14478+ $ECHO "\
14479+ # Add the dll search path components to the executable PATH
14480+ PATH=$dllsearchpath:\$PATH
14481+"
14482+ fi
14483+
14484 # Export our shlibpath_var if we have one.
14485 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14486 $ECHO "\
14487@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
14488 "
14489 fi
14490
14491- # fixup the dll searchpath if we need to.
14492- if test -n "$dllsearchpath"; then
14493- $ECHO "\
14494- # Add the dll search path components to the executable PATH
14495- PATH=$dllsearchpath:\$PATH
14496-"
14497- fi
14498-
14499 $ECHO "\
14500 if test \"\$libtool_execute_magic\" != \"$magic\"; then
14501 # Run the actual program with our arguments.
14502-"
14503- case $host in
14504- # Backslashes separate directories on plain windows
14505- *-*-mingw | *-*-os2* | *-cegcc*)
14506- $ECHO "\
14507- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
14508-"
14509- ;;
14510-
14511- *)
14512- $ECHO "\
14513- exec \"\$progdir/\$program\" \${1+\"\$@\"}
14514-"
14515- ;;
14516- esac
14517- $ECHO "\
14518- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
14519- exit 1
14520+ func_exec_program \${1+\"\$@\"}
14521 fi
14522 else
14523 # The program doesn't exist.
14524@@ -3158,166 +4132,6 @@ fi\
14525 }
14526
14527
14528-# func_to_host_path arg
14529-#
14530-# Convert paths to host format when used with build tools.
14531-# Intended for use with "native" mingw (where libtool itself
14532-# is running under the msys shell), or in the following cross-
14533-# build environments:
14534-# $build $host
14535-# mingw (msys) mingw [e.g. native]
14536-# cygwin mingw
14537-# *nix + wine mingw
14538-# where wine is equipped with the `winepath' executable.
14539-# In the native mingw case, the (msys) shell automatically
14540-# converts paths for any non-msys applications it launches,
14541-# but that facility isn't available from inside the cwrapper.
14542-# Similar accommodations are necessary for $host mingw and
14543-# $build cygwin. Calling this function does no harm for other
14544-# $host/$build combinations not listed above.
14545-#
14546-# ARG is the path (on $build) that should be converted to
14547-# the proper representation for $host. The result is stored
14548-# in $func_to_host_path_result.
14549-func_to_host_path ()
14550-{
14551- func_to_host_path_result="$1"
14552- if test -n "$1"; then
14553- case $host in
14554- *mingw* )
14555- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14556- case $build in
14557- *mingw* ) # actually, msys
14558- # awkward: cmd appends spaces to result
14559- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
14560- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14561- ;;
14562- *cygwin* )
14563- func_to_host_path_result=`cygpath -w "$1" |
14564- $SED -e "$lt_sed_naive_backslashify"`
14565- ;;
14566- * )
14567- # Unfortunately, winepath does not exit with a non-zero
14568- # error code, so we are forced to check the contents of
14569- # stdout. On the other hand, if the command is not
14570- # found, the shell will set an exit code of 127 and print
14571- # *an error message* to stdout. So we must check for both
14572- # error code of zero AND non-empty stdout, which explains
14573- # the odd construction:
14574- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
14575- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
14576- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
14577- $SED -e "$lt_sed_naive_backslashify"`
14578- else
14579- # Allow warning below.
14580- func_to_host_path_result=
14581- fi
14582- ;;
14583- esac
14584- if test -z "$func_to_host_path_result" ; then
14585- func_error "Could not determine host path corresponding to"
14586- func_error " \`$1'"
14587- func_error "Continuing, but uninstalled executables may not work."
14588- # Fallback:
14589- func_to_host_path_result="$1"
14590- fi
14591- ;;
14592- esac
14593- fi
14594-}
14595-# end: func_to_host_path
14596-
14597-# func_to_host_pathlist arg
14598-#
14599-# Convert pathlists to host format when used with build tools.
14600-# See func_to_host_path(), above. This function supports the
14601-# following $build/$host combinations (but does no harm for
14602-# combinations not listed here):
14603-# $build $host
14604-# mingw (msys) mingw [e.g. native]
14605-# cygwin mingw
14606-# *nix + wine mingw
14607-#
14608-# Path separators are also converted from $build format to
14609-# $host format. If ARG begins or ends with a path separator
14610-# character, it is preserved (but converted to $host format)
14611-# on output.
14612-#
14613-# ARG is a pathlist (on $build) that should be converted to
14614-# the proper representation on $host. The result is stored
14615-# in $func_to_host_pathlist_result.
14616-func_to_host_pathlist ()
14617-{
14618- func_to_host_pathlist_result="$1"
14619- if test -n "$1"; then
14620- case $host in
14621- *mingw* )
14622- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
14623- # Remove leading and trailing path separator characters from
14624- # ARG. msys behavior is inconsistent here, cygpath turns them
14625- # into '.;' and ';.', and winepath ignores them completely.
14626- func_stripname : : "$1"
14627- func_to_host_pathlist_tmp1=$func_stripname_result
14628- case $build in
14629- *mingw* ) # Actually, msys.
14630- # Awkward: cmd appends spaces to result.
14631- func_to_host_pathlist_result=`
14632- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
14633- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
14634- ;;
14635- *cygwin* )
14636- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
14637- $SED -e "$lt_sed_naive_backslashify"`
14638- ;;
14639- * )
14640- # unfortunately, winepath doesn't convert pathlists
14641- func_to_host_pathlist_result=""
14642- func_to_host_pathlist_oldIFS=$IFS
14643- IFS=:
14644- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
14645- IFS=$func_to_host_pathlist_oldIFS
14646- if test -n "$func_to_host_pathlist_f" ; then
14647- func_to_host_path "$func_to_host_pathlist_f"
14648- if test -n "$func_to_host_path_result" ; then
14649- if test -z "$func_to_host_pathlist_result" ; then
14650- func_to_host_pathlist_result="$func_to_host_path_result"
14651- else
14652- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
14653- fi
14654- fi
14655- fi
14656- done
14657- IFS=$func_to_host_pathlist_oldIFS
14658- ;;
14659- esac
14660- if test -z "$func_to_host_pathlist_result"; then
14661- func_error "Could not determine the host path(s) corresponding to"
14662- func_error " \`$1'"
14663- func_error "Continuing, but uninstalled executables may not work."
14664- # Fallback. This may break if $1 contains DOS-style drive
14665- # specifications. The fix is not to complicate the expression
14666- # below, but for the user to provide a working wine installation
14667- # with winepath so that path translation in the cross-to-mingw
14668- # case works properly.
14669- lt_replace_pathsep_nix_to_dos="s|:|;|g"
14670- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
14671- $SED -e "$lt_replace_pathsep_nix_to_dos"`
14672- fi
14673- # Now, add the leading and trailing path separators back
14674- case "$1" in
14675- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
14676- ;;
14677- esac
14678- case "$1" in
14679- *: ) func_append func_to_host_pathlist_result ";"
14680- ;;
14681- esac
14682- ;;
14683- esac
14684- fi
14685-}
14686-# end: func_to_host_pathlist
14687-
14688 # func_emit_cwrapperexe_src
14689 # emit the source code for a wrapper executable on stdout
14690 # Must ONLY be called from within func_mode_link because
14691@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
14692
14693 This wrapper executable should never be moved out of the build directory.
14694 If it is, it will not operate correctly.
14695-
14696- Currently, it simply execs the wrapper *script* "$SHELL $output",
14697- but could eventually absorb all of the scripts functionality and
14698- exec $objdir/$outputname directly.
14699 */
14700 EOF
14701 cat <<"EOF"
14702@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
14703 if (stale) { free ((void *) stale); stale = 0; } \
14704 } while (0)
14705
14706-#undef LTWRAPPER_DEBUGPRINTF
14707-#if defined LT_DEBUGWRAPPER
14708-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
14709-static void
14710-ltwrapper_debugprintf (const char *fmt, ...)
14711-{
14712- va_list args;
14713- va_start (args, fmt);
14714- (void) vfprintf (stderr, fmt, args);
14715- va_end (args);
14716-}
14717+#if defined(LT_DEBUGWRAPPER)
14718+static int lt_debug = 1;
14719 #else
14720-# define LTWRAPPER_DEBUGPRINTF(args)
14721+static int lt_debug = 0;
14722 #endif
14723
14724-const char *program_name = NULL;
14725+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
14726
14727 void *xmalloc (size_t num);
14728 char *xstrdup (const char *string);
14729@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
14730 int make_executable (const char *path);
14731 int check_executable (const char *path);
14732 char *strendzap (char *str, const char *pat);
14733-void lt_fatal (const char *message, ...);
14734+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
14735+void lt_fatal (const char *file, int line, const char *message, ...);
14736+static const char *nonnull (const char *s);
14737+static const char *nonempty (const char *s);
14738 void lt_setenv (const char *name, const char *value);
14739 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
14740 void lt_update_exe_path (const char *name, const char *value);
14741@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
14742 EOF
14743
14744 cat <<EOF
14745-const char * MAGIC_EXE = "$magic_exe";
14746+volatile const char * MAGIC_EXE = "$magic_exe";
14747 const char * LIB_PATH_VARNAME = "$shlibpath_var";
14748 EOF
14749
14750 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
14751- func_to_host_pathlist "$temp_rpath"
14752+ func_to_host_path "$temp_rpath"
14753 cat <<EOF
14754-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
14755+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
14756 EOF
14757 else
14758 cat <<"EOF"
14759@@ -3513,10 +4317,10 @@ EOF
14760 fi
14761
14762 if test -n "$dllsearchpath"; then
14763- func_to_host_pathlist "$dllsearchpath:"
14764+ func_to_host_path "$dllsearchpath:"
14765 cat <<EOF
14766 const char * EXE_PATH_VARNAME = "PATH";
14767-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
14768+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
14769 EOF
14770 else
14771 cat <<"EOF"
14772@@ -3539,12 +4343,10 @@ EOF
14773 cat <<"EOF"
14774
14775 #define LTWRAPPER_OPTION_PREFIX "--lt-"
14776-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
14777
14778-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
14779 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
14780-
14781 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
14782+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
14783
14784 int
14785 main (int argc, char *argv[])
14786@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
14787 int i;
14788
14789 program_name = (char *) xstrdup (base_name (argv[0]));
14790- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
14791- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
14792+ newargz = XMALLOC (char *, argc + 1);
14793
14794- /* very simple arg parsing; don't want to rely on getopt */
14795+ /* very simple arg parsing; don't want to rely on getopt
14796+ * also, copy all non cwrapper options to newargz, except
14797+ * argz[0], which is handled differently
14798+ */
14799+ newargc=0;
14800 for (i = 1; i < argc; i++)
14801 {
14802 if (strcmp (argv[i], dumpscript_opt) == 0)
14803@@ -3581,21 +4386,54 @@ EOF
14804 lt_dump_script (stdout);
14805 return 0;
14806 }
14807+ if (strcmp (argv[i], debug_opt) == 0)
14808+ {
14809+ lt_debug = 1;
14810+ continue;
14811+ }
14812+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
14813+ {
14814+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14815+ namespace, but it is not one of the ones we know about and
14816+ have already dealt with, above (inluding dump-script), then
14817+ report an error. Otherwise, targets might begin to believe
14818+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14819+ namespace. The first time any user complains about this, we'll
14820+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14821+ or a configure.ac-settable value.
14822+ */
14823+ lt_fatal (__FILE__, __LINE__,
14824+ "unrecognized %s option: '%s'",
14825+ ltwrapper_option_prefix, argv[i]);
14826+ }
14827+ /* otherwise ... */
14828+ newargz[++newargc] = xstrdup (argv[i]);
14829 }
14830+ newargz[++newargc] = NULL;
14831+
14832+EOF
14833+ cat <<EOF
14834+ /* The GNU banner must be the first non-error debug message */
14835+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
14836+EOF
14837+ cat <<"EOF"
14838+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
14839+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
14840
14841- newargz = XMALLOC (char *, argc + 1);
14842 tmp_pathspec = find_executable (argv[0]);
14843 if (tmp_pathspec == NULL)
14844- lt_fatal ("Couldn't find %s", argv[0]);
14845- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
14846- tmp_pathspec));
14847+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
14848+ lt_debugprintf (__FILE__, __LINE__,
14849+ "(main) found exe (before symlink chase) at: %s\n",
14850+ tmp_pathspec);
14851
14852 actual_cwrapper_path = chase_symlinks (tmp_pathspec);
14853- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
14854- actual_cwrapper_path));
14855+ lt_debugprintf (__FILE__, __LINE__,
14856+ "(main) found exe (after symlink chase) at: %s\n",
14857+ actual_cwrapper_path);
14858 XFREE (tmp_pathspec);
14859
14860- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
14861+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
14862 strendzap (actual_cwrapper_path, actual_cwrapper_name);
14863
14864 /* wrapper name transforms */
14865@@ -3613,8 +4451,9 @@ EOF
14866 target_name = tmp_pathspec;
14867 tmp_pathspec = 0;
14868
14869- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
14870- target_name));
14871+ lt_debugprintf (__FILE__, __LINE__,
14872+ "(main) libtool target name: %s\n",
14873+ target_name);
14874 EOF
14875
14876 cat <<EOF
14877@@ -3664,35 +4503,19 @@ EOF
14878
14879 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
14880 lt_setenv ("DUALCASE", "1"); /* for MSK sh */
14881- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14882+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
14883+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
14884+ because on Windows, both *_VARNAMEs are PATH but uninstalled
14885+ libraries must come first. */
14886 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
14887+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
14888
14889- newargc=0;
14890- for (i = 1; i < argc; i++)
14891- {
14892- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
14893- {
14894- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
14895- namespace, but it is not one of the ones we know about and
14896- have already dealt with, above (inluding dump-script), then
14897- report an error. Otherwise, targets might begin to believe
14898- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
14899- namespace. The first time any user complains about this, we'll
14900- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
14901- or a configure.ac-settable value.
14902- */
14903- lt_fatal ("Unrecognized option in %s namespace: '%s'",
14904- ltwrapper_option_prefix, argv[i]);
14905- }
14906- /* otherwise ... */
14907- newargz[++newargc] = xstrdup (argv[i]);
14908- }
14909- newargz[++newargc] = NULL;
14910-
14911- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
14912+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
14913+ nonnull (lt_argv_zero));
14914 for (i = 0; i < newargc; i++)
14915 {
14916- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
14917+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
14918+ i, nonnull (newargz[i]));
14919 }
14920
14921 EOF
14922@@ -3706,7 +4529,9 @@ EOF
14923 if (rval == -1)
14924 {
14925 /* failed to start process */
14926- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
14927+ lt_debugprintf (__FILE__, __LINE__,
14928+ "(main) failed to launch target \"%s\": %s\n",
14929+ lt_argv_zero, nonnull (strerror (errno)));
14930 return 127;
14931 }
14932 return rval;
14933@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
14934 {
14935 void *p = (void *) malloc (num);
14936 if (!p)
14937- lt_fatal ("Memory exhausted");
14938+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
14939
14940 return p;
14941 }
14942@@ -3762,8 +4587,8 @@ check_executable (const char *path)
14943 {
14944 struct stat st;
14945
14946- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
14947- path ? (*path ? path : "EMPTY!") : "NULL!"));
14948+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
14949+ nonempty (path));
14950 if ((!path) || (!*path))
14951 return 0;
14952
14953@@ -3780,8 +4605,8 @@ make_executable (const char *path)
14954 int rval = 0;
14955 struct stat st;
14956
14957- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
14958- path ? (*path ? path : "EMPTY!") : "NULL!"));
14959+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
14960+ nonempty (path));
14961 if ((!path) || (!*path))
14962 return 0;
14963
14964@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
14965 int tmp_len;
14966 char *concat_name;
14967
14968- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
14969- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
14970+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
14971+ nonempty (wrapper));
14972
14973 if ((wrapper == NULL) || (*wrapper == '\0'))
14974 return NULL;
14975@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
14976 {
14977 /* empty path: current directory */
14978 if (getcwd (tmp, LT_PATHMAX) == NULL)
14979- lt_fatal ("getcwd failed");
14980+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14981+ nonnull (strerror (errno)));
14982 tmp_len = strlen (tmp);
14983 concat_name =
14984 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14985@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
14986 }
14987 /* Relative path | not found in path: prepend cwd */
14988 if (getcwd (tmp, LT_PATHMAX) == NULL)
14989- lt_fatal ("getcwd failed");
14990+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
14991+ nonnull (strerror (errno)));
14992 tmp_len = strlen (tmp);
14993 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
14994 memcpy (concat_name, tmp, tmp_len);
14995@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
14996 int has_symlinks = 0;
14997 while (strlen (tmp_pathspec) && !has_symlinks)
14998 {
14999- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
15000- tmp_pathspec));
15001+ lt_debugprintf (__FILE__, __LINE__,
15002+ "checking path component for symlinks: %s\n",
15003+ tmp_pathspec);
15004 if (lstat (tmp_pathspec, &s) == 0)
15005 {
15006 if (S_ISLNK (s.st_mode) != 0)
15007@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
15008 }
15009 else
15010 {
15011- char *errstr = strerror (errno);
15012- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
15013+ lt_fatal (__FILE__, __LINE__,
15014+ "error accessing file \"%s\": %s",
15015+ tmp_pathspec, nonnull (strerror (errno)));
15016 }
15017 }
15018 XFREE (tmp_pathspec);
15019@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
15020 tmp_pathspec = realpath (pathspec, buf);
15021 if (tmp_pathspec == 0)
15022 {
15023- lt_fatal ("Could not follow symlinks for %s", pathspec);
15024+ lt_fatal (__FILE__, __LINE__,
15025+ "could not follow symlinks for %s", pathspec);
15026 }
15027 return xstrdup (tmp_pathspec);
15028 #endif
15029@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
15030 return str;
15031 }
15032
15033+void
15034+lt_debugprintf (const char *file, int line, const char *fmt, ...)
15035+{
15036+ va_list args;
15037+ if (lt_debug)
15038+ {
15039+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
15040+ va_start (args, fmt);
15041+ (void) vfprintf (stderr, fmt, args);
15042+ va_end (args);
15043+ }
15044+}
15045+
15046 static void
15047-lt_error_core (int exit_status, const char *mode,
15048+lt_error_core (int exit_status, const char *file,
15049+ int line, const char *mode,
15050 const char *message, va_list ap)
15051 {
15052- fprintf (stderr, "%s: %s: ", program_name, mode);
15053+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
15054 vfprintf (stderr, message, ap);
15055 fprintf (stderr, ".\n");
15056
15057@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
15058 }
15059
15060 void
15061-lt_fatal (const char *message, ...)
15062+lt_fatal (const char *file, int line, const char *message, ...)
15063 {
15064 va_list ap;
15065 va_start (ap, message);
15066- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
15067+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
15068 va_end (ap);
15069 }
15070
15071+static const char *
15072+nonnull (const char *s)
15073+{
15074+ return s ? s : "(null)";
15075+}
15076+
15077+static const char *
15078+nonempty (const char *s)
15079+{
15080+ return (s && !*s) ? "(empty)" : nonnull (s);
15081+}
15082+
15083 void
15084 lt_setenv (const char *name, const char *value)
15085 {
15086- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
15087- (name ? name : "<NULL>"),
15088- (value ? value : "<NULL>")));
15089+ lt_debugprintf (__FILE__, __LINE__,
15090+ "(lt_setenv) setting '%s' to '%s'\n",
15091+ nonnull (name), nonnull (value));
15092 {
15093 #ifdef HAVE_SETENV
15094 /* always make a copy, for consistency with !HAVE_SETENV */
15095@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
15096 void
15097 lt_update_exe_path (const char *name, const char *value)
15098 {
15099- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
15100- (name ? name : "<NULL>"),
15101- (value ? value : "<NULL>")));
15102+ lt_debugprintf (__FILE__, __LINE__,
15103+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
15104+ nonnull (name), nonnull (value));
15105
15106 if (name && *name && value && *value)
15107 {
15108@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
15109 void
15110 lt_update_lib_path (const char *name, const char *value)
15111 {
15112- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15113- (name ? name : "<NULL>"),
15114- (value ? value : "<NULL>")));
15115+ lt_debugprintf (__FILE__, __LINE__,
15116+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
15117+ nonnull (name), nonnull (value));
15118
15119 if (name && *name && value && *value)
15120 {
15121@@ -4222,7 +5078,7 @@ EOF
15122 func_win32_import_lib_p ()
15123 {
15124 $opt_debug
15125- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
15126+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
15127 *import*) : ;;
15128 *) false ;;
15129 esac
15130@@ -4401,9 +5257,9 @@ func_mode_link ()
15131 ;;
15132 *)
15133 if test "$prev" = dlfiles; then
15134- dlfiles="$dlfiles $arg"
15135+ func_append dlfiles " $arg"
15136 else
15137- dlprefiles="$dlprefiles $arg"
15138+ func_append dlprefiles " $arg"
15139 fi
15140 prev=
15141 continue
15142@@ -4427,7 +5283,7 @@ func_mode_link ()
15143 *-*-darwin*)
15144 case "$deplibs " in
15145 *" $qarg.ltframework "*) ;;
15146- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
15147+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
15148 ;;
15149 esac
15150 ;;
15151@@ -4446,7 +5302,7 @@ func_mode_link ()
15152 moreargs=
15153 for fil in `cat "$save_arg"`
15154 do
15155-# moreargs="$moreargs $fil"
15156+# func_append moreargs " $fil"
15157 arg=$fil
15158 # A libtool-controlled object.
15159
15160@@ -4475,7 +5331,7 @@ func_mode_link ()
15161
15162 if test "$prev" = dlfiles; then
15163 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15164- dlfiles="$dlfiles $pic_object"
15165+ func_append dlfiles " $pic_object"
15166 prev=
15167 continue
15168 else
15169@@ -4487,7 +5343,7 @@ func_mode_link ()
15170 # CHECK ME: I think I busted this. -Ossama
15171 if test "$prev" = dlprefiles; then
15172 # Preload the old-style object.
15173- dlprefiles="$dlprefiles $pic_object"
15174+ func_append dlprefiles " $pic_object"
15175 prev=
15176 fi
15177
15178@@ -4557,12 +5413,12 @@ func_mode_link ()
15179 if test "$prev" = rpath; then
15180 case "$rpath " in
15181 *" $arg "*) ;;
15182- *) rpath="$rpath $arg" ;;
15183+ *) func_append rpath " $arg" ;;
15184 esac
15185 else
15186 case "$xrpath " in
15187 *" $arg "*) ;;
15188- *) xrpath="$xrpath $arg" ;;
15189+ *) func_append xrpath " $arg" ;;
15190 esac
15191 fi
15192 prev=
15193@@ -4574,28 +5430,28 @@ func_mode_link ()
15194 continue
15195 ;;
15196 weak)
15197- weak_libs="$weak_libs $arg"
15198+ func_append weak_libs " $arg"
15199 prev=
15200 continue
15201 ;;
15202 xcclinker)
15203- linker_flags="$linker_flags $qarg"
15204- compiler_flags="$compiler_flags $qarg"
15205+ func_append linker_flags " $qarg"
15206+ func_append compiler_flags " $qarg"
15207 prev=
15208 func_append compile_command " $qarg"
15209 func_append finalize_command " $qarg"
15210 continue
15211 ;;
15212 xcompiler)
15213- compiler_flags="$compiler_flags $qarg"
15214+ func_append compiler_flags " $qarg"
15215 prev=
15216 func_append compile_command " $qarg"
15217 func_append finalize_command " $qarg"
15218 continue
15219 ;;
15220 xlinker)
15221- linker_flags="$linker_flags $qarg"
15222- compiler_flags="$compiler_flags $wl$qarg"
15223+ func_append linker_flags " $qarg"
15224+ func_append compiler_flags " $wl$qarg"
15225 prev=
15226 func_append compile_command " $wl$qarg"
15227 func_append finalize_command " $wl$qarg"
15228@@ -4686,15 +5542,16 @@ func_mode_link ()
15229 ;;
15230
15231 -L*)
15232- func_stripname '-L' '' "$arg"
15233- dir=$func_stripname_result
15234- if test -z "$dir"; then
15235+ func_stripname "-L" '' "$arg"
15236+ if test -z "$func_stripname_result"; then
15237 if test "$#" -gt 0; then
15238 func_fatal_error "require no space between \`-L' and \`$1'"
15239 else
15240 func_fatal_error "need path for \`-L' option"
15241 fi
15242 fi
15243+ func_resolve_sysroot "$func_stripname_result"
15244+ dir=$func_resolve_sysroot_result
15245 # We need an absolute path.
15246 case $dir in
15247 [\\/]* | [A-Za-z]:[\\/]*) ;;
15248@@ -4706,10 +5563,16 @@ func_mode_link ()
15249 ;;
15250 esac
15251 case "$deplibs " in
15252- *" -L$dir "*) ;;
15253+ *" -L$dir "* | *" $arg "*)
15254+ # Will only happen for absolute or sysroot arguments
15255+ ;;
15256 *)
15257- deplibs="$deplibs -L$dir"
15258- lib_search_path="$lib_search_path $dir"
15259+ # Preserve sysroot, but never include relative directories
15260+ case $dir in
15261+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
15262+ *) func_append deplibs " -L$dir" ;;
15263+ esac
15264+ func_append lib_search_path " $dir"
15265 ;;
15266 esac
15267 case $host in
15268@@ -4718,12 +5581,12 @@ func_mode_link ()
15269 case :$dllsearchpath: in
15270 *":$dir:"*) ;;
15271 ::) dllsearchpath=$dir;;
15272- *) dllsearchpath="$dllsearchpath:$dir";;
15273+ *) func_append dllsearchpath ":$dir";;
15274 esac
15275 case :$dllsearchpath: in
15276 *":$testbindir:"*) ;;
15277 ::) dllsearchpath=$testbindir;;
15278- *) dllsearchpath="$dllsearchpath:$testbindir";;
15279+ *) func_append dllsearchpath ":$testbindir";;
15280 esac
15281 ;;
15282 esac
15283@@ -4747,7 +5610,7 @@ func_mode_link ()
15284 ;;
15285 *-*-rhapsody* | *-*-darwin1.[012])
15286 # Rhapsody C and math libraries are in the System framework
15287- deplibs="$deplibs System.ltframework"
15288+ func_append deplibs " System.ltframework"
15289 continue
15290 ;;
15291 *-*-sco3.2v5* | *-*-sco5v6*)
15292@@ -4758,9 +5621,6 @@ func_mode_link ()
15293 # Compiler inserts libc in the correct place for threads to work
15294 test "X$arg" = "X-lc" && continue
15295 ;;
15296- *-*-linux*)
15297- test "X$arg" = "X-lc" && continue
15298- ;;
15299 esac
15300 elif test "X$arg" = "X-lc_r"; then
15301 case $host in
15302@@ -4770,7 +5630,7 @@ func_mode_link ()
15303 ;;
15304 esac
15305 fi
15306- deplibs="$deplibs $arg"
15307+ func_append deplibs " $arg"
15308 continue
15309 ;;
15310
15311@@ -4782,8 +5642,8 @@ func_mode_link ()
15312 # Tru64 UNIX uses -model [arg] to determine the layout of C++
15313 # classes, name mangling, and exception handling.
15314 # Darwin uses the -arch flag to determine output architecture.
15315- -model|-arch|-isysroot)
15316- compiler_flags="$compiler_flags $arg"
15317+ -model|-arch|-isysroot|--sysroot)
15318+ func_append compiler_flags " $arg"
15319 func_append compile_command " $arg"
15320 func_append finalize_command " $arg"
15321 prev=xcompiler
15322@@ -4791,12 +5651,12 @@ func_mode_link ()
15323 ;;
15324
15325 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
15326- compiler_flags="$compiler_flags $arg"
15327+ func_append compiler_flags " $arg"
15328 func_append compile_command " $arg"
15329 func_append finalize_command " $arg"
15330 case "$new_inherited_linker_flags " in
15331 *" $arg "*) ;;
15332- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
15333+ * ) func_append new_inherited_linker_flags " $arg" ;;
15334 esac
15335 continue
15336 ;;
15337@@ -4863,13 +5723,17 @@ func_mode_link ()
15338 # We need an absolute path.
15339 case $dir in
15340 [\\/]* | [A-Za-z]:[\\/]*) ;;
15341+ =*)
15342+ func_stripname '=' '' "$dir"
15343+ dir=$lt_sysroot$func_stripname_result
15344+ ;;
15345 *)
15346 func_fatal_error "only absolute run-paths are allowed"
15347 ;;
15348 esac
15349 case "$xrpath " in
15350 *" $dir "*) ;;
15351- *) xrpath="$xrpath $dir" ;;
15352+ *) func_append xrpath " $dir" ;;
15353 esac
15354 continue
15355 ;;
15356@@ -4922,8 +5786,8 @@ func_mode_link ()
15357 for flag in $args; do
15358 IFS="$save_ifs"
15359 func_quote_for_eval "$flag"
15360- arg="$arg $func_quote_for_eval_result"
15361- compiler_flags="$compiler_flags $func_quote_for_eval_result"
15362+ func_append arg " $func_quote_for_eval_result"
15363+ func_append compiler_flags " $func_quote_for_eval_result"
15364 done
15365 IFS="$save_ifs"
15366 func_stripname ' ' '' "$arg"
15367@@ -4938,9 +5802,9 @@ func_mode_link ()
15368 for flag in $args; do
15369 IFS="$save_ifs"
15370 func_quote_for_eval "$flag"
15371- arg="$arg $wl$func_quote_for_eval_result"
15372- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
15373- linker_flags="$linker_flags $func_quote_for_eval_result"
15374+ func_append arg " $wl$func_quote_for_eval_result"
15375+ func_append compiler_flags " $wl$func_quote_for_eval_result"
15376+ func_append linker_flags " $func_quote_for_eval_result"
15377 done
15378 IFS="$save_ifs"
15379 func_stripname ' ' '' "$arg"
15380@@ -4968,24 +5832,27 @@ func_mode_link ()
15381 arg="$func_quote_for_eval_result"
15382 ;;
15383
15384- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
15385- # -r[0-9][0-9]* specifies the processor on the SGI compiler
15386- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
15387- # +DA*, +DD* enable 64-bit mode on the HP compiler
15388- # -q* pass through compiler args for the IBM compiler
15389- # -m*, -t[45]*, -txscale* pass through architecture-specific
15390- # compiler args for GCC
15391- # -F/path gives path to uninstalled frameworks, gcc on darwin
15392- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
15393- # @file GCC response files
15394- # -tp=* Portland pgcc target processor selection
15395+ # Flags to be passed through unchanged, with rationale:
15396+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
15397+ # -r[0-9][0-9]* specify processor for the SGI compiler
15398+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
15399+ # +DA*, +DD* enable 64-bit mode for the HP compiler
15400+ # -q* compiler args for the IBM compiler
15401+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
15402+ # -F/path path to uninstalled frameworks, gcc on darwin
15403+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
15404+ # @file GCC response files
15405+ # -tp=* Portland pgcc target processor selection
15406+ # --sysroot=* for sysroot support
15407+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
15408 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
15409- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
15410+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
15411+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
15412 func_quote_for_eval "$arg"
15413 arg="$func_quote_for_eval_result"
15414 func_append compile_command " $arg"
15415 func_append finalize_command " $arg"
15416- compiler_flags="$compiler_flags $arg"
15417+ func_append compiler_flags " $arg"
15418 continue
15419 ;;
15420
15421@@ -4997,7 +5864,7 @@ func_mode_link ()
15422
15423 *.$objext)
15424 # A standard object.
15425- objs="$objs $arg"
15426+ func_append objs " $arg"
15427 ;;
15428
15429 *.lo)
15430@@ -5028,7 +5895,7 @@ func_mode_link ()
15431
15432 if test "$prev" = dlfiles; then
15433 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
15434- dlfiles="$dlfiles $pic_object"
15435+ func_append dlfiles " $pic_object"
15436 prev=
15437 continue
15438 else
15439@@ -5040,7 +5907,7 @@ func_mode_link ()
15440 # CHECK ME: I think I busted this. -Ossama
15441 if test "$prev" = dlprefiles; then
15442 # Preload the old-style object.
15443- dlprefiles="$dlprefiles $pic_object"
15444+ func_append dlprefiles " $pic_object"
15445 prev=
15446 fi
15447
15448@@ -5085,24 +5952,25 @@ func_mode_link ()
15449
15450 *.$libext)
15451 # An archive.
15452- deplibs="$deplibs $arg"
15453- old_deplibs="$old_deplibs $arg"
15454+ func_append deplibs " $arg"
15455+ func_append old_deplibs " $arg"
15456 continue
15457 ;;
15458
15459 *.la)
15460 # A libtool-controlled library.
15461
15462+ func_resolve_sysroot "$arg"
15463 if test "$prev" = dlfiles; then
15464 # This library was specified with -dlopen.
15465- dlfiles="$dlfiles $arg"
15466+ func_append dlfiles " $func_resolve_sysroot_result"
15467 prev=
15468 elif test "$prev" = dlprefiles; then
15469 # The library was specified with -dlpreopen.
15470- dlprefiles="$dlprefiles $arg"
15471+ func_append dlprefiles " $func_resolve_sysroot_result"
15472 prev=
15473 else
15474- deplibs="$deplibs $arg"
15475+ func_append deplibs " $func_resolve_sysroot_result"
15476 fi
15477 continue
15478 ;;
15479@@ -5127,7 +5995,7 @@ func_mode_link ()
15480 func_fatal_help "the \`$prevarg' option requires an argument"
15481
15482 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
15483- eval "arg=\"$export_dynamic_flag_spec\""
15484+ eval arg=\"$export_dynamic_flag_spec\"
15485 func_append compile_command " $arg"
15486 func_append finalize_command " $arg"
15487 fi
15488@@ -5144,11 +6012,13 @@ func_mode_link ()
15489 else
15490 shlib_search_path=
15491 fi
15492- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
15493- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
15494+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
15495+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
15496
15497 func_dirname "$output" "/" ""
15498 output_objdir="$func_dirname_result$objdir"
15499+ func_to_tool_file "$output_objdir/"
15500+ tool_output_objdir=$func_to_tool_file_result
15501 # Create the object directory.
15502 func_mkdir_p "$output_objdir"
15503
15504@@ -5169,12 +6039,12 @@ func_mode_link ()
15505 # Find all interdependent deplibs by searching for libraries
15506 # that are linked more than once (e.g. -la -lb -la)
15507 for deplib in $deplibs; do
15508- if $opt_duplicate_deps ; then
15509+ if $opt_preserve_dup_deps ; then
15510 case "$libs " in
15511- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15512+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15513 esac
15514 fi
15515- libs="$libs $deplib"
15516+ func_append libs " $deplib"
15517 done
15518
15519 if test "$linkmode" = lib; then
15520@@ -5187,9 +6057,9 @@ func_mode_link ()
15521 if $opt_duplicate_compiler_generated_deps; then
15522 for pre_post_dep in $predeps $postdeps; do
15523 case "$pre_post_deps " in
15524- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
15525+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
15526 esac
15527- pre_post_deps="$pre_post_deps $pre_post_dep"
15528+ func_append pre_post_deps " $pre_post_dep"
15529 done
15530 fi
15531 pre_post_deps=
15532@@ -5256,8 +6126,9 @@ func_mode_link ()
15533 for lib in $dlprefiles; do
15534 # Ignore non-libtool-libs
15535 dependency_libs=
15536+ func_resolve_sysroot "$lib"
15537 case $lib in
15538- *.la) func_source "$lib" ;;
15539+ *.la) func_source "$func_resolve_sysroot_result" ;;
15540 esac
15541
15542 # Collect preopened libtool deplibs, except any this library
15543@@ -5267,7 +6138,7 @@ func_mode_link ()
15544 deplib_base=$func_basename_result
15545 case " $weak_libs " in
15546 *" $deplib_base "*) ;;
15547- *) deplibs="$deplibs $deplib" ;;
15548+ *) func_append deplibs " $deplib" ;;
15549 esac
15550 done
15551 done
15552@@ -5288,11 +6159,11 @@ func_mode_link ()
15553 compile_deplibs="$deplib $compile_deplibs"
15554 finalize_deplibs="$deplib $finalize_deplibs"
15555 else
15556- compiler_flags="$compiler_flags $deplib"
15557+ func_append compiler_flags " $deplib"
15558 if test "$linkmode" = lib ; then
15559 case "$new_inherited_linker_flags " in
15560 *" $deplib "*) ;;
15561- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15562+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15563 esac
15564 fi
15565 fi
15566@@ -5377,7 +6248,7 @@ func_mode_link ()
15567 if test "$linkmode" = lib ; then
15568 case "$new_inherited_linker_flags " in
15569 *" $deplib "*) ;;
15570- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
15571+ * ) func_append new_inherited_linker_flags " $deplib" ;;
15572 esac
15573 fi
15574 fi
15575@@ -5390,7 +6261,8 @@ func_mode_link ()
15576 test "$pass" = conv && continue
15577 newdependency_libs="$deplib $newdependency_libs"
15578 func_stripname '-L' '' "$deplib"
15579- newlib_search_path="$newlib_search_path $func_stripname_result"
15580+ func_resolve_sysroot "$func_stripname_result"
15581+ func_append newlib_search_path " $func_resolve_sysroot_result"
15582 ;;
15583 prog)
15584 if test "$pass" = conv; then
15585@@ -5404,7 +6276,8 @@ func_mode_link ()
15586 finalize_deplibs="$deplib $finalize_deplibs"
15587 fi
15588 func_stripname '-L' '' "$deplib"
15589- newlib_search_path="$newlib_search_path $func_stripname_result"
15590+ func_resolve_sysroot "$func_stripname_result"
15591+ func_append newlib_search_path " $func_resolve_sysroot_result"
15592 ;;
15593 *)
15594 func_warning "\`-L' is ignored for archives/objects"
15595@@ -5415,17 +6288,21 @@ func_mode_link ()
15596 -R*)
15597 if test "$pass" = link; then
15598 func_stripname '-R' '' "$deplib"
15599- dir=$func_stripname_result
15600+ func_resolve_sysroot "$func_stripname_result"
15601+ dir=$func_resolve_sysroot_result
15602 # Make sure the xrpath contains only unique directories.
15603 case "$xrpath " in
15604 *" $dir "*) ;;
15605- *) xrpath="$xrpath $dir" ;;
15606+ *) func_append xrpath " $dir" ;;
15607 esac
15608 fi
15609 deplibs="$deplib $deplibs"
15610 continue
15611 ;;
15612- *.la) lib="$deplib" ;;
15613+ *.la)
15614+ func_resolve_sysroot "$deplib"
15615+ lib=$func_resolve_sysroot_result
15616+ ;;
15617 *.$libext)
15618 if test "$pass" = conv; then
15619 deplibs="$deplib $deplibs"
15620@@ -5488,11 +6365,11 @@ func_mode_link ()
15621 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
15622 # If there is no dlopen support or we're linking statically,
15623 # we need to preload.
15624- newdlprefiles="$newdlprefiles $deplib"
15625+ func_append newdlprefiles " $deplib"
15626 compile_deplibs="$deplib $compile_deplibs"
15627 finalize_deplibs="$deplib $finalize_deplibs"
15628 else
15629- newdlfiles="$newdlfiles $deplib"
15630+ func_append newdlfiles " $deplib"
15631 fi
15632 fi
15633 continue
15634@@ -5538,7 +6415,7 @@ func_mode_link ()
15635 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
15636 case " $new_inherited_linker_flags " in
15637 *" $tmp_inherited_linker_flag "*) ;;
15638- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
15639+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
15640 esac
15641 done
15642 fi
15643@@ -5546,8 +6423,8 @@ func_mode_link ()
15644 if test "$linkmode,$pass" = "lib,link" ||
15645 test "$linkmode,$pass" = "prog,scan" ||
15646 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
15647- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
15648- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
15649+ test -n "$dlopen" && func_append dlfiles " $dlopen"
15650+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
15651 fi
15652
15653 if test "$pass" = conv; then
15654@@ -5558,20 +6435,20 @@ func_mode_link ()
15655 func_fatal_error "cannot find name of link library for \`$lib'"
15656 fi
15657 # It is a libtool convenience library, so add in its objects.
15658- convenience="$convenience $ladir/$objdir/$old_library"
15659- old_convenience="$old_convenience $ladir/$objdir/$old_library"
15660+ func_append convenience " $ladir/$objdir/$old_library"
15661+ func_append old_convenience " $ladir/$objdir/$old_library"
15662 elif test "$linkmode" != prog && test "$linkmode" != lib; then
15663 func_fatal_error "\`$lib' is not a convenience library"
15664 fi
15665 tmp_libs=
15666 for deplib in $dependency_libs; do
15667 deplibs="$deplib $deplibs"
15668- if $opt_duplicate_deps ; then
15669+ if $opt_preserve_dup_deps ; then
15670 case "$tmp_libs " in
15671- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15672+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15673 esac
15674 fi
15675- tmp_libs="$tmp_libs $deplib"
15676+ func_append tmp_libs " $deplib"
15677 done
15678 continue
15679 fi # $pass = conv
15680@@ -5579,9 +6456,15 @@ func_mode_link ()
15681
15682 # Get the name of the library we link against.
15683 linklib=
15684- for l in $old_library $library_names; do
15685- linklib="$l"
15686- done
15687+ if test -n "$old_library" &&
15688+ { test "$prefer_static_libs" = yes ||
15689+ test "$prefer_static_libs,$installed" = "built,no"; }; then
15690+ linklib=$old_library
15691+ else
15692+ for l in $old_library $library_names; do
15693+ linklib="$l"
15694+ done
15695+ fi
15696 if test -z "$linklib"; then
15697 func_fatal_error "cannot find name of link library for \`$lib'"
15698 fi
15699@@ -5598,9 +6481,9 @@ func_mode_link ()
15700 # statically, we need to preload. We also need to preload any
15701 # dependent libraries so libltdl's deplib preloader doesn't
15702 # bomb out in the load deplibs phase.
15703- dlprefiles="$dlprefiles $lib $dependency_libs"
15704+ func_append dlprefiles " $lib $dependency_libs"
15705 else
15706- newdlfiles="$newdlfiles $lib"
15707+ func_append newdlfiles " $lib"
15708 fi
15709 continue
15710 fi # $pass = dlopen
15711@@ -5622,14 +6505,14 @@ func_mode_link ()
15712
15713 # Find the relevant object directory and library name.
15714 if test "X$installed" = Xyes; then
15715- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15716+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
15717 func_warning "library \`$lib' was moved."
15718 dir="$ladir"
15719 absdir="$abs_ladir"
15720 libdir="$abs_ladir"
15721 else
15722- dir="$libdir"
15723- absdir="$libdir"
15724+ dir="$lt_sysroot$libdir"
15725+ absdir="$lt_sysroot$libdir"
15726 fi
15727 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
15728 else
15729@@ -5637,12 +6520,12 @@ func_mode_link ()
15730 dir="$ladir"
15731 absdir="$abs_ladir"
15732 # Remove this search path later
15733- notinst_path="$notinst_path $abs_ladir"
15734+ func_append notinst_path " $abs_ladir"
15735 else
15736 dir="$ladir/$objdir"
15737 absdir="$abs_ladir/$objdir"
15738 # Remove this search path later
15739- notinst_path="$notinst_path $abs_ladir"
15740+ func_append notinst_path " $abs_ladir"
15741 fi
15742 fi # $installed = yes
15743 func_stripname 'lib' '.la' "$laname"
15744@@ -5653,20 +6536,46 @@ func_mode_link ()
15745 if test -z "$libdir" && test "$linkmode" = prog; then
15746 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
15747 fi
15748- # Prefer using a static library (so that no silly _DYNAMIC symbols
15749- # are required to link).
15750- if test -n "$old_library"; then
15751- newdlprefiles="$newdlprefiles $dir/$old_library"
15752- # Keep a list of preopened convenience libraries to check
15753- # that they are being used correctly in the link pass.
15754- test -z "$libdir" && \
15755- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
15756- # Otherwise, use the dlname, so that lt_dlopen finds it.
15757- elif test -n "$dlname"; then
15758- newdlprefiles="$newdlprefiles $dir/$dlname"
15759- else
15760- newdlprefiles="$newdlprefiles $dir/$linklib"
15761- fi
15762+ case "$host" in
15763+ # special handling for platforms with PE-DLLs.
15764+ *cygwin* | *mingw* | *cegcc* )
15765+ # Linker will automatically link against shared library if both
15766+ # static and shared are present. Therefore, ensure we extract
15767+ # symbols from the import library if a shared library is present
15768+ # (otherwise, the dlopen module name will be incorrect). We do
15769+ # this by putting the import library name into $newdlprefiles.
15770+ # We recover the dlopen module name by 'saving' the la file
15771+ # name in a special purpose variable, and (later) extracting the
15772+ # dlname from the la file.
15773+ if test -n "$dlname"; then
15774+ func_tr_sh "$dir/$linklib"
15775+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
15776+ func_append newdlprefiles " $dir/$linklib"
15777+ else
15778+ func_append newdlprefiles " $dir/$old_library"
15779+ # Keep a list of preopened convenience libraries to check
15780+ # that they are being used correctly in the link pass.
15781+ test -z "$libdir" && \
15782+ func_append dlpreconveniencelibs " $dir/$old_library"
15783+ fi
15784+ ;;
15785+ * )
15786+ # Prefer using a static library (so that no silly _DYNAMIC symbols
15787+ # are required to link).
15788+ if test -n "$old_library"; then
15789+ func_append newdlprefiles " $dir/$old_library"
15790+ # Keep a list of preopened convenience libraries to check
15791+ # that they are being used correctly in the link pass.
15792+ test -z "$libdir" && \
15793+ func_append dlpreconveniencelibs " $dir/$old_library"
15794+ # Otherwise, use the dlname, so that lt_dlopen finds it.
15795+ elif test -n "$dlname"; then
15796+ func_append newdlprefiles " $dir/$dlname"
15797+ else
15798+ func_append newdlprefiles " $dir/$linklib"
15799+ fi
15800+ ;;
15801+ esac
15802 fi # $pass = dlpreopen
15803
15804 if test -z "$libdir"; then
15805@@ -5684,7 +6593,7 @@ func_mode_link ()
15806
15807
15808 if test "$linkmode" = prog && test "$pass" != link; then
15809- newlib_search_path="$newlib_search_path $ladir"
15810+ func_append newlib_search_path " $ladir"
15811 deplibs="$lib $deplibs"
15812
15813 linkalldeplibs=no
15814@@ -5697,7 +6606,8 @@ func_mode_link ()
15815 for deplib in $dependency_libs; do
15816 case $deplib in
15817 -L*) func_stripname '-L' '' "$deplib"
15818- newlib_search_path="$newlib_search_path $func_stripname_result"
15819+ func_resolve_sysroot "$func_stripname_result"
15820+ func_append newlib_search_path " $func_resolve_sysroot_result"
15821 ;;
15822 esac
15823 # Need to link against all dependency_libs?
15824@@ -5708,12 +6618,12 @@ func_mode_link ()
15825 # or/and link against static libraries
15826 newdependency_libs="$deplib $newdependency_libs"
15827 fi
15828- if $opt_duplicate_deps ; then
15829+ if $opt_preserve_dup_deps ; then
15830 case "$tmp_libs " in
15831- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
15832+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
15833 esac
15834 fi
15835- tmp_libs="$tmp_libs $deplib"
15836+ func_append tmp_libs " $deplib"
15837 done # for deplib
15838 continue
15839 fi # $linkmode = prog...
15840@@ -5728,7 +6638,7 @@ func_mode_link ()
15841 # Make sure the rpath contains only unique directories.
15842 case "$temp_rpath:" in
15843 *"$absdir:"*) ;;
15844- *) temp_rpath="$temp_rpath$absdir:" ;;
15845+ *) func_append temp_rpath "$absdir:" ;;
15846 esac
15847 fi
15848
15849@@ -5740,7 +6650,7 @@ func_mode_link ()
15850 *)
15851 case "$compile_rpath " in
15852 *" $absdir "*) ;;
15853- *) compile_rpath="$compile_rpath $absdir"
15854+ *) func_append compile_rpath " $absdir" ;;
15855 esac
15856 ;;
15857 esac
15858@@ -5749,7 +6659,7 @@ func_mode_link ()
15859 *)
15860 case "$finalize_rpath " in
15861 *" $libdir "*) ;;
15862- *) finalize_rpath="$finalize_rpath $libdir"
15863+ *) func_append finalize_rpath " $libdir" ;;
15864 esac
15865 ;;
15866 esac
15867@@ -5774,12 +6684,12 @@ func_mode_link ()
15868 case $host in
15869 *cygwin* | *mingw* | *cegcc*)
15870 # No point in relinking DLLs because paths are not encoded
15871- notinst_deplibs="$notinst_deplibs $lib"
15872+ func_append notinst_deplibs " $lib"
15873 need_relink=no
15874 ;;
15875 *)
15876 if test "$installed" = no; then
15877- notinst_deplibs="$notinst_deplibs $lib"
15878+ func_append notinst_deplibs " $lib"
15879 need_relink=yes
15880 fi
15881 ;;
15882@@ -5814,7 +6724,7 @@ func_mode_link ()
15883 *)
15884 case "$compile_rpath " in
15885 *" $absdir "*) ;;
15886- *) compile_rpath="$compile_rpath $absdir"
15887+ *) func_append compile_rpath " $absdir" ;;
15888 esac
15889 ;;
15890 esac
15891@@ -5823,7 +6733,7 @@ func_mode_link ()
15892 *)
15893 case "$finalize_rpath " in
15894 *" $libdir "*) ;;
15895- *) finalize_rpath="$finalize_rpath $libdir"
15896+ *) func_append finalize_rpath " $libdir" ;;
15897 esac
15898 ;;
15899 esac
15900@@ -5835,7 +6745,7 @@ func_mode_link ()
15901 shift
15902 realname="$1"
15903 shift
15904- eval "libname=\"$libname_spec\""
15905+ libname=`eval "\\$ECHO \"$libname_spec\""`
15906 # use dlname if we got it. it's perfectly good, no?
15907 if test -n "$dlname"; then
15908 soname="$dlname"
15909@@ -5848,7 +6758,7 @@ func_mode_link ()
15910 versuffix="-$major"
15911 ;;
15912 esac
15913- eval "soname=\"$soname_spec\""
15914+ eval soname=\"$soname_spec\"
15915 else
15916 soname="$realname"
15917 fi
15918@@ -5877,7 +6787,7 @@ func_mode_link ()
15919 linklib=$newlib
15920 fi # test -n "$old_archive_from_expsyms_cmds"
15921
15922- if test "$linkmode" = prog || test "$mode" != relink; then
15923+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
15924 add_shlibpath=
15925 add_dir=
15926 add=
15927@@ -5933,7 +6843,7 @@ func_mode_link ()
15928 if test -n "$inst_prefix_dir"; then
15929 case $libdir in
15930 [\\/]*)
15931- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15932+ func_append add_dir " -L$inst_prefix_dir$libdir"
15933 ;;
15934 esac
15935 fi
15936@@ -5955,7 +6865,7 @@ func_mode_link ()
15937 if test -n "$add_shlibpath"; then
15938 case :$compile_shlibpath: in
15939 *":$add_shlibpath:"*) ;;
15940- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
15941+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
15942 esac
15943 fi
15944 if test "$linkmode" = prog; then
15945@@ -5969,13 +6879,13 @@ func_mode_link ()
15946 test "$hardcode_shlibpath_var" = yes; then
15947 case :$finalize_shlibpath: in
15948 *":$libdir:"*) ;;
15949- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15950+ *) func_append finalize_shlibpath "$libdir:" ;;
15951 esac
15952 fi
15953 fi
15954 fi
15955
15956- if test "$linkmode" = prog || test "$mode" = relink; then
15957+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
15958 add_shlibpath=
15959 add_dir=
15960 add=
15961@@ -5989,7 +6899,7 @@ func_mode_link ()
15962 elif test "$hardcode_shlibpath_var" = yes; then
15963 case :$finalize_shlibpath: in
15964 *":$libdir:"*) ;;
15965- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
15966+ *) func_append finalize_shlibpath "$libdir:" ;;
15967 esac
15968 add="-l$name"
15969 elif test "$hardcode_automatic" = yes; then
15970@@ -6001,12 +6911,12 @@ func_mode_link ()
15971 fi
15972 else
15973 # We cannot seem to hardcode it, guess we'll fake it.
15974- add_dir="-L$libdir"
15975+ add_dir="-L$lt_sysroot$libdir"
15976 # Try looking first in the location we're being installed to.
15977 if test -n "$inst_prefix_dir"; then
15978 case $libdir in
15979 [\\/]*)
15980- add_dir="$add_dir -L$inst_prefix_dir$libdir"
15981+ func_append add_dir " -L$inst_prefix_dir$libdir"
15982 ;;
15983 esac
15984 fi
15985@@ -6083,27 +6993,33 @@ func_mode_link ()
15986 temp_xrpath=$func_stripname_result
15987 case " $xrpath " in
15988 *" $temp_xrpath "*) ;;
15989- *) xrpath="$xrpath $temp_xrpath";;
15990+ *) func_append xrpath " $temp_xrpath";;
15991 esac;;
15992- *) temp_deplibs="$temp_deplibs $libdir";;
15993+ *) func_append temp_deplibs " $libdir";;
15994 esac
15995 done
15996 dependency_libs="$temp_deplibs"
15997 fi
15998
15999- newlib_search_path="$newlib_search_path $absdir"
16000+ func_append newlib_search_path " $absdir"
16001 # Link against this library
16002 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
16003 # ... and its dependency_libs
16004 tmp_libs=
16005 for deplib in $dependency_libs; do
16006 newdependency_libs="$deplib $newdependency_libs"
16007- if $opt_duplicate_deps ; then
16008+ case $deplib in
16009+ -L*) func_stripname '-L' '' "$deplib"
16010+ func_resolve_sysroot "$func_stripname_result";;
16011+ *) func_resolve_sysroot "$deplib" ;;
16012+ esac
16013+ if $opt_preserve_dup_deps ; then
16014 case "$tmp_libs " in
16015- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
16016+ *" $func_resolve_sysroot_result "*)
16017+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
16018 esac
16019 fi
16020- tmp_libs="$tmp_libs $deplib"
16021+ func_append tmp_libs " $func_resolve_sysroot_result"
16022 done
16023
16024 if test "$link_all_deplibs" != no; then
16025@@ -6113,8 +7029,10 @@ func_mode_link ()
16026 case $deplib in
16027 -L*) path="$deplib" ;;
16028 *.la)
16029+ func_resolve_sysroot "$deplib"
16030+ deplib=$func_resolve_sysroot_result
16031 func_dirname "$deplib" "" "."
16032- dir="$func_dirname_result"
16033+ dir=$func_dirname_result
16034 # We need an absolute path.
16035 case $dir in
16036 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
16037@@ -6130,7 +7048,7 @@ func_mode_link ()
16038 case $host in
16039 *-*-darwin*)
16040 depdepl=
16041- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
16042+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
16043 if test -n "$deplibrary_names" ; then
16044 for tmp in $deplibrary_names ; do
16045 depdepl=$tmp
16046@@ -6141,8 +7059,8 @@ func_mode_link ()
16047 if test -z "$darwin_install_name"; then
16048 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
16049 fi
16050- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
16051- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
16052+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
16053+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
16054 path=
16055 fi
16056 fi
16057@@ -6152,7 +7070,7 @@ func_mode_link ()
16058 ;;
16059 esac
16060 else
16061- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
16062+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
16063 test -z "$libdir" && \
16064 func_fatal_error "\`$deplib' is not a valid libtool archive"
16065 test "$absdir" != "$libdir" && \
16066@@ -6192,7 +7110,7 @@ func_mode_link ()
16067 for dir in $newlib_search_path; do
16068 case "$lib_search_path " in
16069 *" $dir "*) ;;
16070- *) lib_search_path="$lib_search_path $dir" ;;
16071+ *) func_append lib_search_path " $dir" ;;
16072 esac
16073 done
16074 newlib_search_path=
16075@@ -6205,7 +7123,7 @@ func_mode_link ()
16076 fi
16077 for var in $vars dependency_libs; do
16078 # Add libraries to $var in reverse order
16079- eval tmp_libs=\$$var
16080+ eval tmp_libs=\"\$$var\"
16081 new_libs=
16082 for deplib in $tmp_libs; do
16083 # FIXME: Pedantically, this is the right thing to do, so
16084@@ -6250,13 +7168,13 @@ func_mode_link ()
16085 -L*)
16086 case " $tmp_libs " in
16087 *" $deplib "*) ;;
16088- *) tmp_libs="$tmp_libs $deplib" ;;
16089+ *) func_append tmp_libs " $deplib" ;;
16090 esac
16091 ;;
16092- *) tmp_libs="$tmp_libs $deplib" ;;
16093+ *) func_append tmp_libs " $deplib" ;;
16094 esac
16095 done
16096- eval $var=\$tmp_libs
16097+ eval $var=\"$tmp_libs\"
16098 done # for var
16099 fi
16100 # Last step: remove runtime libs from dependency_libs
16101@@ -6269,7 +7187,7 @@ func_mode_link ()
16102 ;;
16103 esac
16104 if test -n "$i" ; then
16105- tmp_libs="$tmp_libs $i"
16106+ func_append tmp_libs " $i"
16107 fi
16108 done
16109 dependency_libs=$tmp_libs
16110@@ -6310,7 +7228,7 @@ func_mode_link ()
16111 # Now set the variables for building old libraries.
16112 build_libtool_libs=no
16113 oldlibs="$output"
16114- objs="$objs$old_deplibs"
16115+ func_append objs "$old_deplibs"
16116 ;;
16117
16118 lib)
16119@@ -6319,8 +7237,8 @@ func_mode_link ()
16120 lib*)
16121 func_stripname 'lib' '.la' "$outputname"
16122 name=$func_stripname_result
16123- eval "shared_ext=\"$shrext_cmds\""
16124- eval "libname=\"$libname_spec\""
16125+ eval shared_ext=\"$shrext_cmds\"
16126+ eval libname=\"$libname_spec\"
16127 ;;
16128 *)
16129 test "$module" = no && \
16130@@ -6330,8 +7248,8 @@ func_mode_link ()
16131 # Add the "lib" prefix for modules if required
16132 func_stripname '' '.la' "$outputname"
16133 name=$func_stripname_result
16134- eval "shared_ext=\"$shrext_cmds\""
16135- eval "libname=\"$libname_spec\""
16136+ eval shared_ext=\"$shrext_cmds\"
16137+ eval libname=\"$libname_spec\"
16138 else
16139 func_stripname '' '.la' "$outputname"
16140 libname=$func_stripname_result
16141@@ -6346,7 +7264,7 @@ func_mode_link ()
16142 echo
16143 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
16144 $ECHO "*** objects $objs is not portable!"
16145- libobjs="$libobjs $objs"
16146+ func_append libobjs " $objs"
16147 fi
16148 fi
16149
16150@@ -6544,7 +7462,7 @@ func_mode_link ()
16151 done
16152
16153 # Make executables depend on our current version.
16154- verstring="$verstring:${current}.0"
16155+ func_append verstring ":${current}.0"
16156 ;;
16157
16158 qnx)
16159@@ -6612,10 +7530,10 @@ func_mode_link ()
16160 fi
16161
16162 func_generate_dlsyms "$libname" "$libname" "yes"
16163- libobjs="$libobjs $symfileobj"
16164+ func_append libobjs " $symfileobj"
16165 test "X$libobjs" = "X " && libobjs=
16166
16167- if test "$mode" != relink; then
16168+ if test "$opt_mode" != relink; then
16169 # Remove our outputs, but don't remove object files since they
16170 # may have been created when compiling PIC objects.
16171 removelist=
16172@@ -6631,7 +7549,7 @@ func_mode_link ()
16173 continue
16174 fi
16175 fi
16176- removelist="$removelist $p"
16177+ func_append removelist " $p"
16178 ;;
16179 *) ;;
16180 esac
16181@@ -6642,7 +7560,7 @@ func_mode_link ()
16182
16183 # Now set the variables for building old libraries.
16184 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
16185- oldlibs="$oldlibs $output_objdir/$libname.$libext"
16186+ func_append oldlibs " $output_objdir/$libname.$libext"
16187
16188 # Transform .lo files to .o files.
16189 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
16190@@ -6659,10 +7577,11 @@ func_mode_link ()
16191 # If the user specified any rpath flags, then add them.
16192 temp_xrpath=
16193 for libdir in $xrpath; do
16194- temp_xrpath="$temp_xrpath -R$libdir"
16195+ func_replace_sysroot "$libdir"
16196+ func_append temp_xrpath " -R$func_replace_sysroot_result"
16197 case "$finalize_rpath " in
16198 *" $libdir "*) ;;
16199- *) finalize_rpath="$finalize_rpath $libdir" ;;
16200+ *) func_append finalize_rpath " $libdir" ;;
16201 esac
16202 done
16203 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
16204@@ -6676,7 +7595,7 @@ func_mode_link ()
16205 for lib in $old_dlfiles; do
16206 case " $dlprefiles $dlfiles " in
16207 *" $lib "*) ;;
16208- *) dlfiles="$dlfiles $lib" ;;
16209+ *) func_append dlfiles " $lib" ;;
16210 esac
16211 done
16212
16213@@ -6686,7 +7605,7 @@ func_mode_link ()
16214 for lib in $old_dlprefiles; do
16215 case "$dlprefiles " in
16216 *" $lib "*) ;;
16217- *) dlprefiles="$dlprefiles $lib" ;;
16218+ *) func_append dlprefiles " $lib" ;;
16219 esac
16220 done
16221
16222@@ -6698,7 +7617,7 @@ func_mode_link ()
16223 ;;
16224 *-*-rhapsody* | *-*-darwin1.[012])
16225 # Rhapsody C library is in the System framework
16226- deplibs="$deplibs System.ltframework"
16227+ func_append deplibs " System.ltframework"
16228 ;;
16229 *-*-netbsd*)
16230 # Don't link with libc until the a.out ld.so is fixed.
16231@@ -6715,7 +7634,7 @@ func_mode_link ()
16232 *)
16233 # Add libc to deplibs on all other systems if necessary.
16234 if test "$build_libtool_need_lc" = "yes"; then
16235- deplibs="$deplibs -lc"
16236+ func_append deplibs " -lc"
16237 fi
16238 ;;
16239 esac
16240@@ -6764,18 +7683,18 @@ EOF
16241 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16242 case " $predeps $postdeps " in
16243 *" $i "*)
16244- newdeplibs="$newdeplibs $i"
16245+ func_append newdeplibs " $i"
16246 i=""
16247 ;;
16248 esac
16249 fi
16250 if test -n "$i" ; then
16251- eval "libname=\"$libname_spec\""
16252- eval "deplib_matches=\"$library_names_spec\""
16253+ libname=`eval "\\$ECHO \"$libname_spec\""`
16254+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16255 set dummy $deplib_matches; shift
16256 deplib_match=$1
16257 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16258- newdeplibs="$newdeplibs $i"
16259+ func_append newdeplibs " $i"
16260 else
16261 droppeddeps=yes
16262 echo
16263@@ -6789,7 +7708,7 @@ EOF
16264 fi
16265 ;;
16266 *)
16267- newdeplibs="$newdeplibs $i"
16268+ func_append newdeplibs " $i"
16269 ;;
16270 esac
16271 done
16272@@ -6807,18 +7726,18 @@ EOF
16273 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16274 case " $predeps $postdeps " in
16275 *" $i "*)
16276- newdeplibs="$newdeplibs $i"
16277+ func_append newdeplibs " $i"
16278 i=""
16279 ;;
16280 esac
16281 fi
16282 if test -n "$i" ; then
16283- eval "libname=\"$libname_spec\""
16284- eval "deplib_matches=\"$library_names_spec\""
16285+ libname=`eval "\\$ECHO \"$libname_spec\""`
16286+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
16287 set dummy $deplib_matches; shift
16288 deplib_match=$1
16289 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
16290- newdeplibs="$newdeplibs $i"
16291+ func_append newdeplibs " $i"
16292 else
16293 droppeddeps=yes
16294 echo
16295@@ -6840,7 +7759,7 @@ EOF
16296 fi
16297 ;;
16298 *)
16299- newdeplibs="$newdeplibs $i"
16300+ func_append newdeplibs " $i"
16301 ;;
16302 esac
16303 done
16304@@ -6857,15 +7776,27 @@ EOF
16305 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16306 case " $predeps $postdeps " in
16307 *" $a_deplib "*)
16308- newdeplibs="$newdeplibs $a_deplib"
16309+ func_append newdeplibs " $a_deplib"
16310 a_deplib=""
16311 ;;
16312 esac
16313 fi
16314 if test -n "$a_deplib" ; then
16315- eval "libname=\"$libname_spec\""
16316+ libname=`eval "\\$ECHO \"$libname_spec\""`
16317+ if test -n "$file_magic_glob"; then
16318+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
16319+ else
16320+ libnameglob=$libname
16321+ fi
16322+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
16323 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16324- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16325+ if test "$want_nocaseglob" = yes; then
16326+ shopt -s nocaseglob
16327+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16328+ $nocaseglob
16329+ else
16330+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
16331+ fi
16332 for potent_lib in $potential_libs; do
16333 # Follow soft links.
16334 if ls -lLd "$potent_lib" 2>/dev/null |
16335@@ -6885,10 +7816,10 @@ EOF
16336 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
16337 esac
16338 done
16339- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
16340+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
16341 $SED -e 10q |
16342 $EGREP "$file_magic_regex" > /dev/null; then
16343- newdeplibs="$newdeplibs $a_deplib"
16344+ func_append newdeplibs " $a_deplib"
16345 a_deplib=""
16346 break 2
16347 fi
16348@@ -6913,7 +7844,7 @@ EOF
16349 ;;
16350 *)
16351 # Add a -L argument.
16352- newdeplibs="$newdeplibs $a_deplib"
16353+ func_append newdeplibs " $a_deplib"
16354 ;;
16355 esac
16356 done # Gone through all deplibs.
16357@@ -6929,20 +7860,20 @@ EOF
16358 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
16359 case " $predeps $postdeps " in
16360 *" $a_deplib "*)
16361- newdeplibs="$newdeplibs $a_deplib"
16362+ func_append newdeplibs " $a_deplib"
16363 a_deplib=""
16364 ;;
16365 esac
16366 fi
16367 if test -n "$a_deplib" ; then
16368- eval "libname=\"$libname_spec\""
16369+ libname=`eval "\\$ECHO \"$libname_spec\""`
16370 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
16371 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
16372 for potent_lib in $potential_libs; do
16373 potlib="$potent_lib" # see symlink-check above in file_magic test
16374 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
16375 $EGREP "$match_pattern_regex" > /dev/null; then
16376- newdeplibs="$newdeplibs $a_deplib"
16377+ func_append newdeplibs " $a_deplib"
16378 a_deplib=""
16379 break 2
16380 fi
16381@@ -6967,7 +7898,7 @@ EOF
16382 ;;
16383 *)
16384 # Add a -L argument.
16385- newdeplibs="$newdeplibs $a_deplib"
16386+ func_append newdeplibs " $a_deplib"
16387 ;;
16388 esac
16389 done # Gone through all deplibs.
16390@@ -7071,7 +8002,7 @@ EOF
16391 *)
16392 case " $deplibs " in
16393 *" -L$path/$objdir "*)
16394- new_libs="$new_libs -L$path/$objdir" ;;
16395+ func_append new_libs " -L$path/$objdir" ;;
16396 esac
16397 ;;
16398 esac
16399@@ -7081,10 +8012,10 @@ EOF
16400 -L*)
16401 case " $new_libs " in
16402 *" $deplib "*) ;;
16403- *) new_libs="$new_libs $deplib" ;;
16404+ *) func_append new_libs " $deplib" ;;
16405 esac
16406 ;;
16407- *) new_libs="$new_libs $deplib" ;;
16408+ *) func_append new_libs " $deplib" ;;
16409 esac
16410 done
16411 deplibs="$new_libs"
16412@@ -7101,10 +8032,12 @@ EOF
16413 hardcode_libdirs=
16414 dep_rpath=
16415 rpath="$finalize_rpath"
16416- test "$mode" != relink && rpath="$compile_rpath$rpath"
16417+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16418 for libdir in $rpath; do
16419 if test -n "$hardcode_libdir_flag_spec"; then
16420 if test -n "$hardcode_libdir_separator"; then
16421+ func_replace_sysroot "$libdir"
16422+ libdir=$func_replace_sysroot_result
16423 if test -z "$hardcode_libdirs"; then
16424 hardcode_libdirs="$libdir"
16425 else
16426@@ -7113,18 +8046,18 @@ EOF
16427 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16428 ;;
16429 *)
16430- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16431+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16432 ;;
16433 esac
16434 fi
16435 else
16436- eval "flag=\"$hardcode_libdir_flag_spec\""
16437- dep_rpath="$dep_rpath $flag"
16438+ eval flag=\"$hardcode_libdir_flag_spec\"
16439+ func_append dep_rpath " $flag"
16440 fi
16441 elif test -n "$runpath_var"; then
16442 case "$perm_rpath " in
16443 *" $libdir "*) ;;
16444- *) perm_rpath="$perm_rpath $libdir" ;;
16445+ *) func_apped perm_rpath " $libdir" ;;
16446 esac
16447 fi
16448 done
16449@@ -7133,40 +8066,38 @@ EOF
16450 test -n "$hardcode_libdirs"; then
16451 libdir="$hardcode_libdirs"
16452 if test -n "$hardcode_libdir_flag_spec_ld"; then
16453- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
16454+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
16455 else
16456- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
16457+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
16458 fi
16459 fi
16460 if test -n "$runpath_var" && test -n "$perm_rpath"; then
16461 # We should set the runpath_var.
16462 rpath=
16463 for dir in $perm_rpath; do
16464- rpath="$rpath$dir:"
16465+ func_append rpath "$dir:"
16466 done
16467- eval $runpath_var=\$rpath\$$runpath_var
16468- export $runpath_var
16469+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
16470 fi
16471 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
16472 fi
16473
16474 shlibpath="$finalize_shlibpath"
16475- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16476+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
16477 if test -n "$shlibpath"; then
16478- eval $shlibpath_var=\$shlibpath\$$shlibpath_var
16479- export $shlibpath_var
16480+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
16481 fi
16482
16483 # Get the real and link names of the library.
16484- eval "shared_ext=\"$shrext_cmds\""
16485- eval "library_names=\"$library_names_spec\""
16486+ eval shared_ext=\"$shrext_cmds\"
16487+ eval library_names=\"$library_names_spec\"
16488 set dummy $library_names
16489 shift
16490 realname="$1"
16491 shift
16492
16493 if test -n "$soname_spec"; then
16494- eval "soname=\"$soname_spec\""
16495+ eval soname=\"$soname_spec\"
16496 else
16497 soname="$realname"
16498 fi
16499@@ -7178,7 +8109,7 @@ EOF
16500 linknames=
16501 for link
16502 do
16503- linknames="$linknames $link"
16504+ func_append linknames " $link"
16505 done
16506
16507 # Use standard objects if they are pic
16508@@ -7189,7 +8120,7 @@ EOF
16509 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16510 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
16511 export_symbols="$output_objdir/$libname.uexp"
16512- delfiles="$delfiles $export_symbols"
16513+ func_append delfiles " $export_symbols"
16514 fi
16515
16516 orig_export_symbols=
16517@@ -7220,13 +8151,45 @@ EOF
16518 $opt_dry_run || $RM $export_symbols
16519 cmds=$export_symbols_cmds
16520 save_ifs="$IFS"; IFS='~'
16521- for cmd in $cmds; do
16522+ for cmd1 in $cmds; do
16523 IFS="$save_ifs"
16524- eval "cmd=\"$cmd\""
16525- func_len " $cmd"
16526- len=$func_len_result
16527- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
16528+ # Take the normal branch if the nm_file_list_spec branch
16529+ # doesn't work or if tool conversion is not needed.
16530+ case $nm_file_list_spec~$to_tool_file_cmd in
16531+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
16532+ try_normal_branch=yes
16533+ eval cmd=\"$cmd1\"
16534+ func_len " $cmd"
16535+ len=$func_len_result
16536+ ;;
16537+ *)
16538+ try_normal_branch=no
16539+ ;;
16540+ esac
16541+ if test "$try_normal_branch" = yes \
16542+ && { test "$len" -lt "$max_cmd_len" \
16543+ || test "$max_cmd_len" -le -1; }
16544+ then
16545+ func_show_eval "$cmd" 'exit $?'
16546+ skipped_export=false
16547+ elif test -n "$nm_file_list_spec"; then
16548+ func_basename "$output"
16549+ output_la=$func_basename_result
16550+ save_libobjs=$libobjs
16551+ save_output=$output
16552+ output=${output_objdir}/${output_la}.nm
16553+ func_to_tool_file "$output"
16554+ libobjs=$nm_file_list_spec$func_to_tool_file_result
16555+ func_append delfiles " $output"
16556+ func_verbose "creating $NM input file list: $output"
16557+ for obj in $save_libobjs; do
16558+ func_to_tool_file "$obj"
16559+ $ECHO "$func_to_tool_file_result"
16560+ done > "$output"
16561+ eval cmd=\"$cmd1\"
16562 func_show_eval "$cmd" 'exit $?'
16563+ output=$save_output
16564+ libobjs=$save_libobjs
16565 skipped_export=false
16566 else
16567 # The command line is too long to execute in one step.
16568@@ -7248,7 +8211,7 @@ EOF
16569 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16570 tmp_export_symbols="$export_symbols"
16571 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16572- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16573+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16574 fi
16575
16576 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
16577@@ -7260,7 +8223,7 @@ EOF
16578 # global variables. join(1) would be nice here, but unfortunately
16579 # isn't a blessed tool.
16580 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16581- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16582+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16583 export_symbols=$output_objdir/$libname.def
16584 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16585 fi
16586@@ -7270,7 +8233,7 @@ EOF
16587 case " $convenience " in
16588 *" $test_deplib "*) ;;
16589 *)
16590- tmp_deplibs="$tmp_deplibs $test_deplib"
16591+ func_append tmp_deplibs " $test_deplib"
16592 ;;
16593 esac
16594 done
16595@@ -7286,43 +8249,43 @@ EOF
16596 fi
16597 if test -n "$whole_archive_flag_spec"; then
16598 save_libobjs=$libobjs
16599- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16600+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16601 test "X$libobjs" = "X " && libobjs=
16602 else
16603 gentop="$output_objdir/${outputname}x"
16604- generated="$generated $gentop"
16605+ func_append generated " $gentop"
16606
16607 func_extract_archives $gentop $convenience
16608- libobjs="$libobjs $func_extract_archives_result"
16609+ func_append libobjs " $func_extract_archives_result"
16610 test "X$libobjs" = "X " && libobjs=
16611 fi
16612 fi
16613
16614 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
16615- eval "flag=\"$thread_safe_flag_spec\""
16616- linker_flags="$linker_flags $flag"
16617+ eval flag=\"$thread_safe_flag_spec\"
16618+ func_append linker_flags " $flag"
16619 fi
16620
16621 # Make a backup of the uninstalled library when relinking
16622- if test "$mode" = relink; then
16623- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
16624+ if test "$opt_mode" = relink; then
16625+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
16626 fi
16627
16628 # Do each of the archive commands.
16629 if test "$module" = yes && test -n "$module_cmds" ; then
16630 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
16631- eval "test_cmds=\"$module_expsym_cmds\""
16632+ eval test_cmds=\"$module_expsym_cmds\"
16633 cmds=$module_expsym_cmds
16634 else
16635- eval "test_cmds=\"$module_cmds\""
16636+ eval test_cmds=\"$module_cmds\"
16637 cmds=$module_cmds
16638 fi
16639 else
16640 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
16641- eval "test_cmds=\"$archive_expsym_cmds\""
16642+ eval test_cmds=\"$archive_expsym_cmds\"
16643 cmds=$archive_expsym_cmds
16644 else
16645- eval "test_cmds=\"$archive_cmds\""
16646+ eval test_cmds=\"$archive_cmds\"
16647 cmds=$archive_cmds
16648 fi
16649 fi
16650@@ -7366,10 +8329,13 @@ EOF
16651 echo 'INPUT (' > $output
16652 for obj in $save_libobjs
16653 do
16654- $ECHO "$obj" >> $output
16655+ func_to_tool_file "$obj"
16656+ $ECHO "$func_to_tool_file_result" >> $output
16657 done
16658 echo ')' >> $output
16659- delfiles="$delfiles $output"
16660+ func_append delfiles " $output"
16661+ func_to_tool_file "$output"
16662+ output=$func_to_tool_file_result
16663 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
16664 output=${output_objdir}/${output_la}.lnk
16665 func_verbose "creating linker input file list: $output"
16666@@ -7383,15 +8349,17 @@ EOF
16667 fi
16668 for obj
16669 do
16670- $ECHO "$obj" >> $output
16671+ func_to_tool_file "$obj"
16672+ $ECHO "$func_to_tool_file_result" >> $output
16673 done
16674- delfiles="$delfiles $output"
16675- output=$firstobj\"$file_list_spec$output\"
16676+ func_append delfiles " $output"
16677+ func_to_tool_file "$output"
16678+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
16679 else
16680 if test -n "$save_libobjs"; then
16681 func_verbose "creating reloadable object files..."
16682 output=$output_objdir/$output_la-${k}.$objext
16683- eval "test_cmds=\"$reload_cmds\""
16684+ eval test_cmds=\"$reload_cmds\"
16685 func_len " $test_cmds"
16686 len0=$func_len_result
16687 len=$len0
16688@@ -7411,12 +8379,12 @@ EOF
16689 if test "$k" -eq 1 ; then
16690 # The first file doesn't have a previous command to add.
16691 reload_objs=$objlist
16692- eval "concat_cmds=\"$reload_cmds\""
16693+ eval concat_cmds=\"$reload_cmds\"
16694 else
16695 # All subsequent reloadable object files will link in
16696 # the last one created.
16697 reload_objs="$objlist $last_robj"
16698- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
16699+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
16700 fi
16701 last_robj=$output_objdir/$output_la-${k}.$objext
16702 func_arith $k + 1
16703@@ -7433,11 +8401,11 @@ EOF
16704 # files will link in the last one created.
16705 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16706 reload_objs="$objlist $last_robj"
16707- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
16708+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
16709 if test -n "$last_robj"; then
16710- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
16711+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
16712 fi
16713- delfiles="$delfiles $output"
16714+ func_append delfiles " $output"
16715
16716 else
16717 output=
16718@@ -7450,9 +8418,9 @@ EOF
16719 libobjs=$output
16720 # Append the command to create the export file.
16721 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
16722- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
16723+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
16724 if test -n "$last_robj"; then
16725- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
16726+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
16727 fi
16728 fi
16729
16730@@ -7471,7 +8439,7 @@ EOF
16731 lt_exit=$?
16732
16733 # Restore the uninstalled library and exit
16734- if test "$mode" = relink; then
16735+ if test "$opt_mode" = relink; then
16736 ( cd "$output_objdir" && \
16737 $RM "${realname}T" && \
16738 $MV "${realname}U" "$realname" )
16739@@ -7492,7 +8460,7 @@ EOF
16740 if test -n "$export_symbols" && test -n "$include_expsyms"; then
16741 tmp_export_symbols="$export_symbols"
16742 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
16743- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
16744+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
16745 fi
16746
16747 if test -n "$orig_export_symbols"; then
16748@@ -7504,7 +8472,7 @@ EOF
16749 # global variables. join(1) would be nice here, but unfortunately
16750 # isn't a blessed tool.
16751 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
16752- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
16753+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
16754 export_symbols=$output_objdir/$libname.def
16755 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
16756 fi
16757@@ -7515,7 +8483,7 @@ EOF
16758 output=$save_output
16759
16760 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
16761- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
16762+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
16763 test "X$libobjs" = "X " && libobjs=
16764 fi
16765 # Expand the library linking commands again to reset the
16766@@ -7539,23 +8507,23 @@ EOF
16767
16768 if test -n "$delfiles"; then
16769 # Append the command to remove temporary files to $cmds.
16770- eval "cmds=\"\$cmds~\$RM $delfiles\""
16771+ eval cmds=\"\$cmds~\$RM $delfiles\"
16772 fi
16773
16774 # Add any objects from preloaded convenience libraries
16775 if test -n "$dlprefiles"; then
16776 gentop="$output_objdir/${outputname}x"
16777- generated="$generated $gentop"
16778+ func_append generated " $gentop"
16779
16780 func_extract_archives $gentop $dlprefiles
16781- libobjs="$libobjs $func_extract_archives_result"
16782+ func_append libobjs " $func_extract_archives_result"
16783 test "X$libobjs" = "X " && libobjs=
16784 fi
16785
16786 save_ifs="$IFS"; IFS='~'
16787 for cmd in $cmds; do
16788 IFS="$save_ifs"
16789- eval "cmd=\"$cmd\""
16790+ eval cmd=\"$cmd\"
16791 $opt_silent || {
16792 func_quote_for_expand "$cmd"
16793 eval "func_echo $func_quote_for_expand_result"
16794@@ -7564,7 +8532,7 @@ EOF
16795 lt_exit=$?
16796
16797 # Restore the uninstalled library and exit
16798- if test "$mode" = relink; then
16799+ if test "$opt_mode" = relink; then
16800 ( cd "$output_objdir" && \
16801 $RM "${realname}T" && \
16802 $MV "${realname}U" "$realname" )
16803@@ -7576,8 +8544,8 @@ EOF
16804 IFS="$save_ifs"
16805
16806 # Restore the uninstalled library and exit
16807- if test "$mode" = relink; then
16808- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
16809+ if test "$opt_mode" = relink; then
16810+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
16811
16812 if test -n "$convenience"; then
16813 if test -z "$whole_archive_flag_spec"; then
16814@@ -7656,17 +8624,20 @@ EOF
16815
16816 if test -n "$convenience"; then
16817 if test -n "$whole_archive_flag_spec"; then
16818- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
16819+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
16820 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
16821 else
16822 gentop="$output_objdir/${obj}x"
16823- generated="$generated $gentop"
16824+ func_append generated " $gentop"
16825
16826 func_extract_archives $gentop $convenience
16827 reload_conv_objs="$reload_objs $func_extract_archives_result"
16828 fi
16829 fi
16830
16831+ # If we're not building shared, we need to use non_pic_objs
16832+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
16833+
16834 # Create the old-style object.
16835 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
16836
16837@@ -7690,7 +8661,7 @@ EOF
16838 # Create an invalid libtool object if no PIC, so that we don't
16839 # accidentally link it into a program.
16840 # $show "echo timestamp > $libobj"
16841- # $opt_dry_run || echo timestamp > $libobj || exit $?
16842+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
16843 exit $EXIT_SUCCESS
16844 fi
16845
16846@@ -7740,8 +8711,8 @@ EOF
16847 if test "$tagname" = CXX ; then
16848 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
16849 10.[0123])
16850- compile_command="$compile_command ${wl}-bind_at_load"
16851- finalize_command="$finalize_command ${wl}-bind_at_load"
16852+ func_append compile_command " ${wl}-bind_at_load"
16853+ func_append finalize_command " ${wl}-bind_at_load"
16854 ;;
16855 esac
16856 fi
16857@@ -7761,7 +8732,7 @@ EOF
16858 *)
16859 case " $compile_deplibs " in
16860 *" -L$path/$objdir "*)
16861- new_libs="$new_libs -L$path/$objdir" ;;
16862+ func_append new_libs " -L$path/$objdir" ;;
16863 esac
16864 ;;
16865 esac
16866@@ -7771,17 +8742,17 @@ EOF
16867 -L*)
16868 case " $new_libs " in
16869 *" $deplib "*) ;;
16870- *) new_libs="$new_libs $deplib" ;;
16871+ *) func_append new_libs " $deplib" ;;
16872 esac
16873 ;;
16874- *) new_libs="$new_libs $deplib" ;;
16875+ *) func_append new_libs " $deplib" ;;
16876 esac
16877 done
16878 compile_deplibs="$new_libs"
16879
16880
16881- compile_command="$compile_command $compile_deplibs"
16882- finalize_command="$finalize_command $finalize_deplibs"
16883+ func_append compile_command " $compile_deplibs"
16884+ func_append finalize_command " $finalize_deplibs"
16885
16886 if test -n "$rpath$xrpath"; then
16887 # If the user specified any rpath flags, then add them.
16888@@ -7789,7 +8760,7 @@ EOF
16889 # This is the magic to use -rpath.
16890 case "$finalize_rpath " in
16891 *" $libdir "*) ;;
16892- *) finalize_rpath="$finalize_rpath $libdir" ;;
16893+ *) func_append finalize_rpath " $libdir" ;;
16894 esac
16895 done
16896 fi
16897@@ -7808,18 +8779,18 @@ EOF
16898 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16899 ;;
16900 *)
16901- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16902+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16903 ;;
16904 esac
16905 fi
16906 else
16907- eval "flag=\"$hardcode_libdir_flag_spec\""
16908- rpath="$rpath $flag"
16909+ eval flag=\"$hardcode_libdir_flag_spec\"
16910+ func_append rpath " $flag"
16911 fi
16912 elif test -n "$runpath_var"; then
16913 case "$perm_rpath " in
16914 *" $libdir "*) ;;
16915- *) perm_rpath="$perm_rpath $libdir" ;;
16916+ *) func_append perm_rpath " $libdir" ;;
16917 esac
16918 fi
16919 case $host in
16920@@ -7828,12 +8799,12 @@ EOF
16921 case :$dllsearchpath: in
16922 *":$libdir:"*) ;;
16923 ::) dllsearchpath=$libdir;;
16924- *) dllsearchpath="$dllsearchpath:$libdir";;
16925+ *) func_append dllsearchpath ":$libdir";;
16926 esac
16927 case :$dllsearchpath: in
16928 *":$testbindir:"*) ;;
16929 ::) dllsearchpath=$testbindir;;
16930- *) dllsearchpath="$dllsearchpath:$testbindir";;
16931+ *) func_append dllsearchpath ":$testbindir";;
16932 esac
16933 ;;
16934 esac
16935@@ -7842,7 +8813,7 @@ EOF
16936 if test -n "$hardcode_libdir_separator" &&
16937 test -n "$hardcode_libdirs"; then
16938 libdir="$hardcode_libdirs"
16939- eval "rpath=\" $hardcode_libdir_flag_spec\""
16940+ eval rpath=\" $hardcode_libdir_flag_spec\"
16941 fi
16942 compile_rpath="$rpath"
16943
16944@@ -7859,18 +8830,18 @@ EOF
16945 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
16946 ;;
16947 *)
16948- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
16949+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
16950 ;;
16951 esac
16952 fi
16953 else
16954- eval "flag=\"$hardcode_libdir_flag_spec\""
16955- rpath="$rpath $flag"
16956+ eval flag=\"$hardcode_libdir_flag_spec\"
16957+ func_append rpath " $flag"
16958 fi
16959 elif test -n "$runpath_var"; then
16960 case "$finalize_perm_rpath " in
16961 *" $libdir "*) ;;
16962- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
16963+ *) func_append finalize_perm_rpath " $libdir" ;;
16964 esac
16965 fi
16966 done
16967@@ -7878,7 +8849,7 @@ EOF
16968 if test -n "$hardcode_libdir_separator" &&
16969 test -n "$hardcode_libdirs"; then
16970 libdir="$hardcode_libdirs"
16971- eval "rpath=\" $hardcode_libdir_flag_spec\""
16972+ eval rpath=\" $hardcode_libdir_flag_spec\"
16973 fi
16974 finalize_rpath="$rpath"
16975
16976@@ -7921,6 +8892,12 @@ EOF
16977 exit_status=0
16978 func_show_eval "$link_command" 'exit_status=$?'
16979
16980+ if test -n "$postlink_cmds"; then
16981+ func_to_tool_file "$output"
16982+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
16983+ func_execute_cmds "$postlink_cmds" 'exit $?'
16984+ fi
16985+
16986 # Delete the generated files.
16987 if test -f "$output_objdir/${outputname}S.${objext}"; then
16988 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
16989@@ -7943,7 +8920,7 @@ EOF
16990 # We should set the runpath_var.
16991 rpath=
16992 for dir in $perm_rpath; do
16993- rpath="$rpath$dir:"
16994+ func_append rpath "$dir:"
16995 done
16996 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
16997 fi
16998@@ -7951,7 +8928,7 @@ EOF
16999 # We should set the runpath_var.
17000 rpath=
17001 for dir in $finalize_perm_rpath; do
17002- rpath="$rpath$dir:"
17003+ func_append rpath "$dir:"
17004 done
17005 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
17006 fi
17007@@ -7966,6 +8943,13 @@ EOF
17008 $opt_dry_run || $RM $output
17009 # Link the executable and exit
17010 func_show_eval "$link_command" 'exit $?'
17011+
17012+ if test -n "$postlink_cmds"; then
17013+ func_to_tool_file "$output"
17014+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
17015+ func_execute_cmds "$postlink_cmds" 'exit $?'
17016+ fi
17017+
17018 exit $EXIT_SUCCESS
17019 fi
17020
17021@@ -7999,6 +8983,12 @@ EOF
17022
17023 func_show_eval "$link_command" 'exit $?'
17024
17025+ if test -n "$postlink_cmds"; then
17026+ func_to_tool_file "$output_objdir/$outputname"
17027+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
17028+ func_execute_cmds "$postlink_cmds" 'exit $?'
17029+ fi
17030+
17031 # Now create the wrapper script.
17032 func_verbose "creating $output"
17033
17034@@ -8096,7 +9086,7 @@ EOF
17035 else
17036 oldobjs="$old_deplibs $non_pic_objects"
17037 if test "$preload" = yes && test -f "$symfileobj"; then
17038- oldobjs="$oldobjs $symfileobj"
17039+ func_append oldobjs " $symfileobj"
17040 fi
17041 fi
17042 addlibs="$old_convenience"
17043@@ -8104,10 +9094,10 @@ EOF
17044
17045 if test -n "$addlibs"; then
17046 gentop="$output_objdir/${outputname}x"
17047- generated="$generated $gentop"
17048+ func_append generated " $gentop"
17049
17050 func_extract_archives $gentop $addlibs
17051- oldobjs="$oldobjs $func_extract_archives_result"
17052+ func_append oldobjs " $func_extract_archives_result"
17053 fi
17054
17055 # Do each command in the archive commands.
17056@@ -8118,10 +9108,10 @@ EOF
17057 # Add any objects from preloaded convenience libraries
17058 if test -n "$dlprefiles"; then
17059 gentop="$output_objdir/${outputname}x"
17060- generated="$generated $gentop"
17061+ func_append generated " $gentop"
17062
17063 func_extract_archives $gentop $dlprefiles
17064- oldobjs="$oldobjs $func_extract_archives_result"
17065+ func_append oldobjs " $func_extract_archives_result"
17066 fi
17067
17068 # POSIX demands no paths to be encoded in archives. We have
17069@@ -8139,7 +9129,7 @@ EOF
17070 else
17071 echo "copying selected object files to avoid basename conflicts..."
17072 gentop="$output_objdir/${outputname}x"
17073- generated="$generated $gentop"
17074+ func_append generated " $gentop"
17075 func_mkdir_p "$gentop"
17076 save_oldobjs=$oldobjs
17077 oldobjs=
17078@@ -8163,18 +9153,28 @@ EOF
17079 esac
17080 done
17081 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
17082- oldobjs="$oldobjs $gentop/$newobj"
17083+ func_append oldobjs " $gentop/$newobj"
17084 ;;
17085- *) oldobjs="$oldobjs $obj" ;;
17086+ *) func_append oldobjs " $obj" ;;
17087 esac
17088 done
17089 fi
17090- eval "cmds=\"$old_archive_cmds\""
17091+ eval cmds=\"$old_archive_cmds\"
17092
17093 func_len " $cmds"
17094 len=$func_len_result
17095 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
17096 cmds=$old_archive_cmds
17097+ elif test -n "$archiver_list_spec"; then
17098+ func_verbose "using command file archive linking..."
17099+ for obj in $oldobjs
17100+ do
17101+ func_to_tool_file "$obj"
17102+ $ECHO "$func_to_tool_file_result"
17103+ done > $output_objdir/$libname.libcmd
17104+ func_to_tool_file "$output_objdir/$libname.libcmd"
17105+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
17106+ cmds=$old_archive_cmds
17107 else
17108 # the command line is too long to link in one step, link in parts
17109 func_verbose "using piecewise archive linking..."
17110@@ -8189,7 +9189,7 @@ EOF
17111 do
17112 last_oldobj=$obj
17113 done
17114- eval "test_cmds=\"$old_archive_cmds\""
17115+ eval test_cmds=\"$old_archive_cmds\"
17116 func_len " $test_cmds"
17117 len0=$func_len_result
17118 len=$len0
17119@@ -8208,7 +9208,7 @@ EOF
17120 RANLIB=$save_RANLIB
17121 fi
17122 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
17123- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
17124+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
17125 objlist=
17126 len=$len0
17127 fi
17128@@ -8216,9 +9216,9 @@ EOF
17129 RANLIB=$save_RANLIB
17130 oldobjs=$objlist
17131 if test "X$oldobjs" = "X" ; then
17132- eval "cmds=\"\$concat_cmds\""
17133+ eval cmds=\"\$concat_cmds\"
17134 else
17135- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
17136+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
17137 fi
17138 fi
17139 fi
17140@@ -8268,12 +9268,23 @@ EOF
17141 *.la)
17142 func_basename "$deplib"
17143 name="$func_basename_result"
17144- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
17145+ func_resolve_sysroot "$deplib"
17146+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17147 test -z "$libdir" && \
17148 func_fatal_error "\`$deplib' is not a valid libtool archive"
17149- newdependency_libs="$newdependency_libs $libdir/$name"
17150+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
17151+ ;;
17152+ -L*)
17153+ func_stripname -L '' "$deplib"
17154+ func_replace_sysroot "$func_stripname_result"
17155+ func_append newdependency_libs " -L$func_replace_sysroot_result"
17156 ;;
17157- *) newdependency_libs="$newdependency_libs $deplib" ;;
17158+ -R*)
17159+ func_stripname -R '' "$deplib"
17160+ func_replace_sysroot "$func_stripname_result"
17161+ func_append newdependency_libs " -R$func_replace_sysroot_result"
17162+ ;;
17163+ *) func_append newdependency_libs " $deplib" ;;
17164 esac
17165 done
17166 dependency_libs="$newdependency_libs"
17167@@ -8284,12 +9295,14 @@ EOF
17168 *.la)
17169 func_basename "$lib"
17170 name="$func_basename_result"
17171- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17172+ func_resolve_sysroot "$lib"
17173+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17174+
17175 test -z "$libdir" && \
17176 func_fatal_error "\`$lib' is not a valid libtool archive"
17177- newdlfiles="$newdlfiles $libdir/$name"
17178+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
17179 ;;
17180- *) newdlfiles="$newdlfiles $lib" ;;
17181+ *) func_append newdlfiles " $lib" ;;
17182 esac
17183 done
17184 dlfiles="$newdlfiles"
17185@@ -8303,10 +9316,11 @@ EOF
17186 # the library:
17187 func_basename "$lib"
17188 name="$func_basename_result"
17189- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
17190+ func_resolve_sysroot "$lib"
17191+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17192 test -z "$libdir" && \
17193 func_fatal_error "\`$lib' is not a valid libtool archive"
17194- newdlprefiles="$newdlprefiles $libdir/$name"
17195+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
17196 ;;
17197 esac
17198 done
17199@@ -8318,7 +9332,7 @@ EOF
17200 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17201 *) abs=`pwd`"/$lib" ;;
17202 esac
17203- newdlfiles="$newdlfiles $abs"
17204+ func_append newdlfiles " $abs"
17205 done
17206 dlfiles="$newdlfiles"
17207 newdlprefiles=
17208@@ -8327,7 +9341,7 @@ EOF
17209 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
17210 *) abs=`pwd`"/$lib" ;;
17211 esac
17212- newdlprefiles="$newdlprefiles $abs"
17213+ func_append newdlprefiles " $abs"
17214 done
17215 dlprefiles="$newdlprefiles"
17216 fi
17217@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
17218 exit $EXIT_SUCCESS
17219 }
17220
17221-{ test "$mode" = link || test "$mode" = relink; } &&
17222+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
17223 func_mode_link ${1+"$@"}
17224
17225
17226@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
17227 for arg
17228 do
17229 case $arg in
17230- -f) RM="$RM $arg"; rmforce=yes ;;
17231- -*) RM="$RM $arg" ;;
17232- *) files="$files $arg" ;;
17233+ -f) func_append RM " $arg"; rmforce=yes ;;
17234+ -*) func_append RM " $arg" ;;
17235+ *) func_append files " $arg" ;;
17236 esac
17237 done
17238
17239@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
17240
17241 rmdirs=
17242
17243- origobjdir="$objdir"
17244 for file in $files; do
17245 func_dirname "$file" "" "."
17246 dir="$func_dirname_result"
17247 if test "X$dir" = X.; then
17248- objdir="$origobjdir"
17249+ odir="$objdir"
17250 else
17251- objdir="$dir/$origobjdir"
17252+ odir="$dir/$objdir"
17253 fi
17254 func_basename "$file"
17255 name="$func_basename_result"
17256- test "$mode" = uninstall && objdir="$dir"
17257+ test "$opt_mode" = uninstall && odir="$dir"
17258
17259- # Remember objdir for removal later, being careful to avoid duplicates
17260- if test "$mode" = clean; then
17261+ # Remember odir for removal later, being careful to avoid duplicates
17262+ if test "$opt_mode" = clean; then
17263 case " $rmdirs " in
17264- *" $objdir "*) ;;
17265- *) rmdirs="$rmdirs $objdir" ;;
17266+ *" $odir "*) ;;
17267+ *) func_append rmdirs " $odir" ;;
17268 esac
17269 fi
17270
17271@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
17272
17273 # Delete the libtool libraries and symlinks.
17274 for n in $library_names; do
17275- rmfiles="$rmfiles $objdir/$n"
17276+ func_append rmfiles " $odir/$n"
17277 done
17278- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
17279+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
17280
17281- case "$mode" in
17282+ case "$opt_mode" in
17283 clean)
17284- case " $library_names " in
17285- # " " in the beginning catches empty $dlname
17286+ case " $library_names " in
17287 *" $dlname "*) ;;
17288- *) rmfiles="$rmfiles $objdir/$dlname" ;;
17289+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
17290 esac
17291- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
17292+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
17293 ;;
17294 uninstall)
17295 if test -n "$library_names"; then
17296@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
17297 # Add PIC object to the list of files to remove.
17298 if test -n "$pic_object" &&
17299 test "$pic_object" != none; then
17300- rmfiles="$rmfiles $dir/$pic_object"
17301+ func_append rmfiles " $dir/$pic_object"
17302 fi
17303
17304 # Add non-PIC object to the list of files to remove.
17305 if test -n "$non_pic_object" &&
17306 test "$non_pic_object" != none; then
17307- rmfiles="$rmfiles $dir/$non_pic_object"
17308+ func_append rmfiles " $dir/$non_pic_object"
17309 fi
17310 fi
17311 ;;
17312
17313 *)
17314- if test "$mode" = clean ; then
17315+ if test "$opt_mode" = clean ; then
17316 noexename=$name
17317 case $file in
17318 *.exe)
17319@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
17320 noexename=$func_stripname_result
17321 # $file with .exe has already been added to rmfiles,
17322 # add $file without .exe
17323- rmfiles="$rmfiles $file"
17324+ func_append rmfiles " $file"
17325 ;;
17326 esac
17327 # Do a test to see if this is a libtool program.
17328@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
17329 func_ltwrapper_scriptname "$file"
17330 relink_command=
17331 func_source $func_ltwrapper_scriptname_result
17332- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
17333+ func_append rmfiles " $func_ltwrapper_scriptname_result"
17334 else
17335 relink_command=
17336 func_source $dir/$noexename
17337@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
17338
17339 # note $name still contains .exe if it was in $file originally
17340 # as does the version of $file that was added into $rmfiles
17341- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
17342+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
17343 if test "$fast_install" = yes && test -n "$relink_command"; then
17344- rmfiles="$rmfiles $objdir/lt-$name"
17345+ func_append rmfiles " $odir/lt-$name"
17346 fi
17347 if test "X$noexename" != "X$name" ; then
17348- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
17349+ func_append rmfiles " $odir/lt-${noexename}.c"
17350 fi
17351 fi
17352 fi
17353@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
17354 esac
17355 func_show_eval "$RM $rmfiles" 'exit_status=1'
17356 done
17357- objdir="$origobjdir"
17358
17359 # Try to remove the ${objdir}s in the directories where we deleted files
17360 for dir in $rmdirs; do
17361@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
17362 exit $exit_status
17363 }
17364
17365-{ test "$mode" = uninstall || test "$mode" = clean; } &&
17366+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
17367 func_mode_uninstall ${1+"$@"}
17368
17369-test -z "$mode" && {
17370+test -z "$opt_mode" && {
17371 help="$generic_help"
17372 func_fatal_help "you must specify a MODE"
17373 }
17374
17375 test -z "$exec_cmd" && \
17376- func_fatal_help "invalid operation mode \`$mode'"
17377+ func_fatal_help "invalid operation mode \`$opt_mode'"
17378
17379 if test -n "$exec_cmd"; then
17380 eval exec "$exec_cmd"
17381diff --git a/ltoptions.m4 b/ltoptions.m4
17382index 5ef12ce..17cfd51 100644
17383--- a/ltoptions.m4
17384+++ b/ltoptions.m4
17385@@ -8,7 +8,7 @@
17386 # unlimited permission to copy and/or distribute it, with or without
17387 # modifications, as long as this notice is preserved.
17388
17389-# serial 6 ltoptions.m4
17390+# serial 7 ltoptions.m4
17391
17392 # This is to help aclocal find these macros, as it can't see m4_define.
17393 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
17394diff --git a/ltversion.m4 b/ltversion.m4
17395index bf87f77..9c7b5d4 100644
17396--- a/ltversion.m4
17397+++ b/ltversion.m4
17398@@ -7,17 +7,17 @@
17399 # unlimited permission to copy and/or distribute it, with or without
17400 # modifications, as long as this notice is preserved.
17401
17402-# Generated from ltversion.in.
17403+# @configure_input@
17404
17405-# serial 3134 ltversion.m4
17406+# serial 3293 ltversion.m4
17407 # This file is part of GNU Libtool
17408
17409-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
17410-m4_define([LT_PACKAGE_REVISION], [1.3134])
17411+m4_define([LT_PACKAGE_VERSION], [2.4])
17412+m4_define([LT_PACKAGE_REVISION], [1.3293])
17413
17414 AC_DEFUN([LTVERSION_VERSION],
17415-[macro_version='2.2.7a'
17416-macro_revision='1.3134'
17417+[macro_version='2.4'
17418+macro_revision='1.3293'
17419 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
17420 _LT_DECL(, macro_revision, 0)
17421 ])
17422diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
17423index bf92b5e..c573da9 100644
17424--- a/lt~obsolete.m4
17425+++ b/lt~obsolete.m4
17426@@ -7,7 +7,7 @@
17427 # unlimited permission to copy and/or distribute it, with or without
17428 # modifications, as long as this notice is preserved.
17429
17430-# serial 4 lt~obsolete.m4
17431+# serial 5 lt~obsolete.m4
17432
17433 # These exist entirely to fool aclocal when bootstrapping libtool.
17434 #
17435diff --git a/opcodes/configure b/opcodes/configure
17436index c9c04ce..31141d9 100755
17437--- a/opcodes/configure
17438+++ b/opcodes/configure
17439@@ -648,6 +648,9 @@ OTOOL
16665 LIPO 17440 LIPO
16666 NMEDIT 17441 NMEDIT
16667 DSYMUTIL 17442 DSYMUTIL
16668+MANIFEST_TOOL 17443+MANIFEST_TOOL
16669 RANLIB
16670+ac_ct_AR 17444+ac_ct_AR
16671 AR
16672+DLLTOOL 17445+DLLTOOL
16673 OBJDUMP 17446 OBJDUMP
16674 LN_S 17447 LN_S
16675 NM 17448 NM
16676@@ -776,6 +779,7 @@ enable_static 17449@@ -760,6 +763,7 @@ enable_static
16677 with_pic 17450 with_pic
16678 enable_fast_install 17451 enable_fast_install
16679 with_gnu_ld 17452 with_gnu_ld
16680+with_libtool_sysroot 17453+with_libtool_sysroot
16681 enable_libtool_lock 17454 enable_libtool_lock
16682 enable_plugins 17455 enable_targets
16683 enable_largefile 17456 enable_werror
16684@@ -1453,6 +1457,8 @@ Optional Packages: 17457@@ -1420,6 +1424,8 @@ Optional Packages:
16685 --with-pic try to use only PIC/non-PIC objects [default=use 17458 --with-pic try to use only PIC/non-PIC objects [default=use
16686 both] 17459 both]
16687 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 17460 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
16688+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 17461+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
16689+ (or the compiler's sysroot if not specified). 17462+ (or the compiler's sysroot if not specified).
16690 --with-lib-path=dir1:dir2... set default LIB_PATH 17463
16691 --with-sysroot=DIR Search for usr/lib et al within DIR. 17464 Some influential environment variables:
16692 --with-zlib include zlib support (auto/yes/no) default=auto 17465 CC C compiler command
16693@@ -5645,8 +5651,8 @@ esac 17466@@ -5110,8 +5116,8 @@ esac
16694 17467
16695 17468
16696 17469
@@ -16701,7 +17474,7 @@ Index: binutils-2.24/ld/configure
16701 17474
16702 17475
16703 17476
16704@@ -5686,7 +5692,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 17477@@ -5151,7 +5157,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
16705 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 17478 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
16706 $as_echo_n "checking how to print strings... " >&6; } 17479 $as_echo_n "checking how to print strings... " >&6; }
16707 # Test print first, because it will be a builtin if present. 17480 # Test print first, because it will be a builtin if present.
@@ -16710,7 +17483,7 @@ Index: binutils-2.24/ld/configure
16710 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 17483 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
16711 ECHO='print -r --' 17484 ECHO='print -r --'
16712 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 17485 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
16713@@ -6372,8 +6378,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 17486@@ -5837,8 +5843,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
16714 # Try some XSI features 17487 # Try some XSI features
16715 xsi_shell=no 17488 xsi_shell=no
16716 ( _lt_dummy="a/b/c" 17489 ( _lt_dummy="a/b/c"
@@ -16721,7 +17494,7 @@ Index: binutils-2.24/ld/configure
16721 && eval 'test $(( 1 + 1 )) -eq 2 \ 17494 && eval 'test $(( 1 + 1 )) -eq 2 \
16722 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 17495 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
16723 && xsi_shell=yes 17496 && xsi_shell=yes
16724@@ -6422,6 +6428,80 @@ esac 17497@@ -5887,6 +5893,80 @@ esac
16725 17498
16726 17499
16727 17500
@@ -16802,7 +17575,7 @@ Index: binutils-2.24/ld/configure
16802 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 17575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
16803 $as_echo_n "checking for $LD option to reload object files... " >&6; } 17576 $as_echo_n "checking for $LD option to reload object files... " >&6; }
16804 if test "${lt_cv_ld_reload_flag+set}" = set; then : 17577 if test "${lt_cv_ld_reload_flag+set}" = set; then :
16805@@ -6438,6 +6518,11 @@ case $reload_flag in 17578@@ -5903,6 +5983,11 @@ case $reload_flag in
16806 esac 17579 esac
16807 reload_cmds='$LD$reload_flag -o $output$reload_objs' 17580 reload_cmds='$LD$reload_flag -o $output$reload_objs'
16808 case $host_os in 17581 case $host_os in
@@ -16814,7 +17587,7 @@ Index: binutils-2.24/ld/configure
16814 darwin*) 17587 darwin*)
16815 if test "$GCC" = yes; then 17588 if test "$GCC" = yes; then
16816 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 17589 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
16817@@ -6606,7 +6691,8 @@ mingw* | pw32*) 17590@@ -6071,7 +6156,8 @@ mingw* | pw32*)
16818 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 17591 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
16819 lt_cv_file_magic_cmd='func_win32_libid' 17592 lt_cv_file_magic_cmd='func_win32_libid'
16820 else 17593 else
@@ -16824,7 +17597,7 @@ Index: binutils-2.24/ld/configure
16824 lt_cv_file_magic_cmd='$OBJDUMP -f' 17597 lt_cv_file_magic_cmd='$OBJDUMP -f'
16825 fi 17598 fi
16826 ;; 17599 ;;
16827@@ -6760,6 +6846,21 @@ esac 17600@@ -6225,6 +6311,21 @@ esac
16828 fi 17601 fi
16829 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 17602 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
16830 $as_echo "$lt_cv_deplibs_check_method" >&6; } 17603 $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -16846,7 +17619,7 @@ Index: binutils-2.24/ld/configure
16846 file_magic_cmd=$lt_cv_file_magic_cmd 17619 file_magic_cmd=$lt_cv_file_magic_cmd
16847 deplibs_check_method=$lt_cv_deplibs_check_method 17620 deplibs_check_method=$lt_cv_deplibs_check_method
16848 test -z "$deplibs_check_method" && deplibs_check_method=unknown 17621 test -z "$deplibs_check_method" && deplibs_check_method=unknown
16849@@ -6775,9 +6876,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 17622@@ -6240,9 +6341,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
16850 17623
16851 17624
16852 17625
@@ -16860,7 +17633,9 @@ Index: binutils-2.24/ld/configure
16860+ 17633+
16861+ 17634+
16862+ 17635+
16863+if test -n "$ac_tool_prefix"; then 17636 if test -n "$ac_tool_prefix"; then
17637- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17638-set dummy ${ac_tool_prefix}ar; ac_word=$2
16864+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 17639+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
16865+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 17640+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
16866+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17641+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -17001,9 +17776,7 @@ Index: binutils-2.24/ld/configure
17001+ 17776+
17002+ 17777+
17003+ 17778+
17004 if test -n "$ac_tool_prefix"; then 17779+if test -n "$ac_tool_prefix"; then
17005- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
17006-set dummy ${ac_tool_prefix}ar; ac_word=$2
17007+ for ac_prog in ar 17780+ for ac_prog in ar
17008+ do 17781+ do
17009+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 17782+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -17011,7 +17784,7 @@ Index: binutils-2.24/ld/configure
17011 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17784 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17012 $as_echo_n "checking for $ac_word... " >&6; } 17785 $as_echo_n "checking for $ac_word... " >&6; }
17013 if test "${ac_cv_prog_AR+set}" = set; then : 17786 if test "${ac_cv_prog_AR+set}" = set; then :
17014@@ -6793,7 +7047,7 @@ do 17787@@ -6258,7 +6512,7 @@ do
17015 test -z "$as_dir" && as_dir=. 17788 test -z "$as_dir" && as_dir=.
17016 for ac_exec_ext in '' $ac_executable_extensions; do 17789 for ac_exec_ext in '' $ac_executable_extensions; do
17017 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 17790 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -17020,7 +17793,7 @@ Index: binutils-2.24/ld/configure
17020 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17793 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17021 break 2 17794 break 2
17022 fi 17795 fi
17023@@ -6813,11 +7067,15 @@ $as_echo "no" >&6; } 17796@@ -6278,11 +6532,15 @@ $as_echo "no" >&6; }
17024 fi 17797 fi
17025 17798
17026 17799
@@ -17039,7 +17812,7 @@ Index: binutils-2.24/ld/configure
17039 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 17812 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17040 $as_echo_n "checking for $ac_word... " >&6; } 17813 $as_echo_n "checking for $ac_word... " >&6; }
17041 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 17814 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17042@@ -6833,7 +7091,7 @@ do 17815@@ -6298,7 +6556,7 @@ do
17043 test -z "$as_dir" && as_dir=. 17816 test -z "$as_dir" && as_dir=.
17044 for ac_exec_ext in '' $ac_executable_extensions; do 17817 for ac_exec_ext in '' $ac_executable_extensions; do
17045 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 17818 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -17048,7 +17821,7 @@ Index: binutils-2.24/ld/configure
17048 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 17821 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17049 break 2 17822 break 2
17050 fi 17823 fi
17051@@ -6852,6 +7110,10 @@ else 17824@@ -6317,6 +6575,10 @@ else
17052 $as_echo "no" >&6; } 17825 $as_echo "no" >&6; }
17053 fi 17826 fi
17054 17827
@@ -17059,7 +17832,7 @@ Index: binutils-2.24/ld/configure
17059 if test "x$ac_ct_AR" = x; then 17832 if test "x$ac_ct_AR" = x; then
17060 AR="false" 17833 AR="false"
17061 else 17834 else
17062@@ -6863,12 +7125,12 @@ ac_tool_warned=yes ;; 17835@@ -6328,16 +6590,72 @@ ac_tool_warned=yes ;;
17063 esac 17836 esac
17064 AR=$ac_ct_AR 17837 AR=$ac_ct_AR
17065 fi 17838 fi
@@ -17073,13 +17846,15 @@ Index: binutils-2.24/ld/configure
17073+: ${AR_FLAGS=cru} 17846+: ${AR_FLAGS=cru}
17074+ 17847+
17075+ 17848+
17076 17849+
17077 17850+
17078 17851+
17079@@ -6878,6 +7140,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 17852+
17080 17853+
17081 17854+
17082 17855+
17856+
17857+
17083+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 17858+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17084+$as_echo_n "checking for archiver @FILE support... " >&6; } 17859+$as_echo_n "checking for archiver @FILE support... " >&6; }
17085+if test "${lt_cv_ar_at_file+set}" = set; then : 17860+if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -17092,7 +17867,7 @@ Index: binutils-2.24/ld/configure
17092+int 17867+int
17093+main () 17868+main ()
17094+{ 17869+{
17095+ 17870
17096+ ; 17871+ ;
17097+ return 0; 17872+ return 0;
17098+} 17873+}
@@ -17118,28 +17893,23 @@ Index: binutils-2.24/ld/configure
17118+ fi 17893+ fi
17119+ fi 17894+ fi
17120+ rm -f conftest.* libconftest.a 17895+ rm -f conftest.* libconftest.a
17121+ 17896
17122+fi 17897+fi
17123+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 17898+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17124+ 17899
17125+fi 17900+fi
17126+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 17901+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17127+$as_echo "$lt_cv_ar_at_file" >&6; } 17902+$as_echo "$lt_cv_ar_at_file" >&6; }
17128+ 17903
17129+if test "x$lt_cv_ar_at_file" = xno; then 17904+if test "x$lt_cv_ar_at_file" = xno; then
17130+ archiver_list_spec= 17905+ archiver_list_spec=
17131+else 17906+else
17132+ archiver_list_spec=$lt_cv_ar_at_file 17907+ archiver_list_spec=$lt_cv_ar_at_file
17133+fi 17908+fi
17134+
17135+
17136+
17137+
17138+
17139 17909
17140 17910
17141 if test -n "$ac_tool_prefix"; then 17911
17142@@ -7214,8 +7532,8 @@ esac 17912@@ -6679,8 +6997,8 @@ esac
17143 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 17913 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17144 17914
17145 # Transform an extracted symbol line into symbol name and symbol address 17915 # Transform an extracted symbol line into symbol name and symbol address
@@ -17150,7 +17920,7 @@ Index: binutils-2.24/ld/configure
17150 17920
17151 # Handle CRLF in mingw tool chain 17921 # Handle CRLF in mingw tool chain
17152 opt_cr= 17922 opt_cr=
17153@@ -7251,6 +7569,7 @@ for ac_symprfx in "" "_"; do 17923@@ -6716,6 +7034,7 @@ for ac_symprfx in "" "_"; do
17154 else 17924 else
17155 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 17925 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17156 fi 17926 fi
@@ -17158,7 +17928,7 @@ Index: binutils-2.24/ld/configure
17158 17928
17159 # Check to see that the pipe works correctly. 17929 # Check to see that the pipe works correctly.
17160 pipe_works=no 17930 pipe_works=no
17161@@ -7292,6 +7611,18 @@ _LT_EOF 17931@@ -6757,6 +7076,18 @@ _LT_EOF
17162 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 17932 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17163 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 17933 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17164 cat <<_LT_EOF > conftest.$ac_ext 17934 cat <<_LT_EOF > conftest.$ac_ext
@@ -17177,7 +17947,7 @@ Index: binutils-2.24/ld/configure
17177 #ifdef __cplusplus 17947 #ifdef __cplusplus
17178 extern "C" { 17948 extern "C" {
17179 #endif 17949 #endif
17180@@ -7303,7 +7634,7 @@ _LT_EOF 17950@@ -6768,7 +7099,7 @@ _LT_EOF
17181 cat <<_LT_EOF >> conftest.$ac_ext 17951 cat <<_LT_EOF >> conftest.$ac_ext
17182 17952
17183 /* The mapping between symbol names and symbols. */ 17953 /* The mapping between symbol names and symbols. */
@@ -17186,7 +17956,7 @@ Index: binutils-2.24/ld/configure
17186 const char *name; 17956 const char *name;
17187 void *address; 17957 void *address;
17188 } 17958 }
17189@@ -7329,8 +7660,8 @@ static const void *lt_preloaded_setup() { 17959@@ -6794,8 +7125,8 @@ static const void *lt_preloaded_setup() {
17190 _LT_EOF 17960 _LT_EOF
17191 # Now try linking the two files. 17961 # Now try linking the two files.
17192 mv conftest.$ac_objext conftstm.$ac_objext 17962 mv conftest.$ac_objext conftstm.$ac_objext
@@ -17197,7 +17967,7 @@ Index: binutils-2.24/ld/configure
17197 LIBS="conftstm.$ac_objext" 17967 LIBS="conftstm.$ac_objext"
17198 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 17968 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17199 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 17969 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17200@@ -7340,8 +7671,8 @@ _LT_EOF 17970@@ -6805,8 +7136,8 @@ _LT_EOF
17201 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 17971 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17202 pipe_works=yes 17972 pipe_works=yes
17203 fi 17973 fi
@@ -17208,7 +17978,7 @@ Index: binutils-2.24/ld/configure
17208 else 17978 else
17209 echo "cannot find nm_test_func in $nlist" >&5 17979 echo "cannot find nm_test_func in $nlist" >&5
17210 fi 17980 fi
17211@@ -7378,6 +7709,19 @@ else 17981@@ -6843,6 +7174,16 @@ else
17212 $as_echo "ok" >&6; } 17982 $as_echo "ok" >&6; }
17213 fi 17983 fi
17214 17984
@@ -17222,16 +17992,15 @@ Index: binutils-2.24/ld/configure
17222+ 17992+
17223+ 17993+
17224+ 17994+
17225+
17226+
17227+
17228 17995
17229 17996
17230 17997
17231@@ -7398,6 +7742,42 @@ fi 17998@@ -6864,6 +7205,45 @@ fi
17232 17999
17233 18000
17234 18001
18002+
18003+
17235+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 18004+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
17236+$as_echo_n "checking for sysroot... " >&6; } 18005+$as_echo_n "checking for sysroot... " >&6; }
17237+ 18006+
@@ -17268,10 +18037,11 @@ Index: binutils-2.24/ld/configure
17268+ 18037+
17269+ 18038+
17270+ 18039+
17271 18040+
17272 # Check whether --enable-libtool-lock was given. 18041 # Check whether --enable-libtool-lock was given.
17273 if test "${enable_libtool_lock+set}" = set; then : 18042 if test "${enable_libtool_lock+set}" = set; then :
17274@@ -7605,6 +7985,123 @@ esac 18043 enableval=$enable_libtool_lock;
18044@@ -7070,6 +7450,123 @@ esac
17275 18045
17276 need_locks="$enable_libtool_lock" 18046 need_locks="$enable_libtool_lock"
17277 18047
@@ -17395,7 +18165,7 @@ Index: binutils-2.24/ld/configure
17395 18165
17396 case $host_os in 18166 case $host_os in
17397 rhapsody* | darwin*) 18167 rhapsody* | darwin*)
17398@@ -8168,6 +8665,8 @@ _LT_EOF 18168@@ -7633,6 +8130,8 @@ _LT_EOF
17399 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 18169 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
17400 echo "$AR cru libconftest.a conftest.o" >&5 18170 echo "$AR cru libconftest.a conftest.o" >&5
17401 $AR cru libconftest.a conftest.o 2>&5 18171 $AR cru libconftest.a conftest.o 2>&5
@@ -17404,24 +18174,7 @@ Index: binutils-2.24/ld/configure
17404 cat > conftest.c << _LT_EOF 18174 cat > conftest.c << _LT_EOF
17405 int main() { return 0;} 18175 int main() { return 0;}
17406 _LT_EOF 18176 _LT_EOF
17407@@ -8236,6 +8735,16 @@ done 18177@@ -7798,7 +8297,8 @@ fi
17408
17409
17410
17411+func_stripname_cnf ()
17412+{
17413+ case ${2} in
17414+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
17415+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
17416+ esac
17417+} # func_stripname_cnf
17418+
17419+
17420+
17421
17422
17423 # Set options
17424@@ -8364,7 +8873,8 @@ fi
17425 LIBTOOL_DEPS="$ltmain" 18178 LIBTOOL_DEPS="$ltmain"
17426 18179
17427 # Always use our own libtool. 18180 # Always use our own libtool.
@@ -17431,7 +18184,7 @@ Index: binutils-2.24/ld/configure
17431 18184
17432 18185
17433 18186
17434@@ -8453,7 +8963,7 @@ aix3*) 18187@@ -7887,7 +8387,7 @@ aix3*)
17435 esac 18188 esac
17436 18189
17437 # Global variables: 18190 # Global variables:
@@ -17440,7 +18193,7 @@ Index: binutils-2.24/ld/configure
17440 can_build_shared=yes 18193 can_build_shared=yes
17441 18194
17442 # All known linkers require a `.a' archive for static linking (except MSVC, 18195 # All known linkers require a `.a' archive for static linking (except MSVC,
17443@@ -8751,8 +9261,6 @@ fi 18196@@ -8185,8 +8685,6 @@ fi
17444 lt_prog_compiler_pic= 18197 lt_prog_compiler_pic=
17445 lt_prog_compiler_static= 18198 lt_prog_compiler_static=
17446 18199
@@ -17449,7 +18202,7 @@ Index: binutils-2.24/ld/configure
17449 18202
17450 if test "$GCC" = yes; then 18203 if test "$GCC" = yes; then
17451 lt_prog_compiler_wl='-Wl,' 18204 lt_prog_compiler_wl='-Wl,'
17452@@ -8918,6 +9426,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18205@@ -8352,6 +8850,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17453 lt_prog_compiler_pic='--shared' 18206 lt_prog_compiler_pic='--shared'
17454 lt_prog_compiler_static='--static' 18207 lt_prog_compiler_static='--static'
17455 ;; 18208 ;;
@@ -17462,7 +18215,7 @@ Index: binutils-2.24/ld/configure
17462 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 18215 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
17463 # Portland Group compilers (*not* the Pentium gcc compiler, 18216 # Portland Group compilers (*not* the Pentium gcc compiler,
17464 # which looks to be a dead project) 18217 # which looks to be a dead project)
17465@@ -8980,7 +9494,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 18218@@ -8414,7 +8918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
17466 lt_prog_compiler_pic='-KPIC' 18219 lt_prog_compiler_pic='-KPIC'
17467 lt_prog_compiler_static='-Bstatic' 18220 lt_prog_compiler_static='-Bstatic'
17468 case $cc_basename in 18221 case $cc_basename in
@@ -17471,7 +18224,7 @@ Index: binutils-2.24/ld/configure
17471 lt_prog_compiler_wl='-Qoption ld ';; 18224 lt_prog_compiler_wl='-Qoption ld ';;
17472 *) 18225 *)
17473 lt_prog_compiler_wl='-Wl,';; 18226 lt_prog_compiler_wl='-Wl,';;
17474@@ -9037,13 +9551,17 @@ case $host_os in 18227@@ -8471,13 +8975,17 @@ case $host_os in
17475 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 18228 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
17476 ;; 18229 ;;
17477 esac 18230 esac
@@ -17495,7 +18248,7 @@ Index: binutils-2.24/ld/configure
17495 18248
17496 # 18249 #
17497 # Check to make sure the PIC flag actually works. 18250 # Check to make sure the PIC flag actually works.
17498@@ -9104,6 +9622,11 @@ fi 18251@@ -8538,6 +9046,11 @@ fi
17499 18252
17500 18253
17501 18254
@@ -17507,7 +18260,7 @@ Index: binutils-2.24/ld/configure
17507 # 18260 #
17508 # Check to make sure the static flag actually works. 18261 # Check to make sure the static flag actually works.
17509 # 18262 #
17510@@ -9454,7 +9977,8 @@ _LT_EOF 18263@@ -8888,7 +9401,8 @@ _LT_EOF
17511 allow_undefined_flag=unsupported 18264 allow_undefined_flag=unsupported
17512 always_export_symbols=no 18265 always_export_symbols=no
17513 enable_shared_with_static_runtimes=yes 18266 enable_shared_with_static_runtimes=yes
@@ -17517,7 +18270,7 @@ Index: binutils-2.24/ld/configure
17517 18270
17518 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 18271 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
17519 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 18272 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17520@@ -9502,7 +10026,7 @@ _LT_EOF 18273@@ -8936,7 +9450,7 @@ _LT_EOF
17521 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ 18274 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
17522 && test "$tmp_diet" = no 18275 && test "$tmp_diet" = no
17523 then 18276 then
@@ -17526,7 +18279,7 @@ Index: binutils-2.24/ld/configure
17526 tmp_sharedflag='-shared' 18279 tmp_sharedflag='-shared'
17527 case $cc_basename,$host_cpu in 18280 case $cc_basename,$host_cpu in
17528 pgcc*) # Portland Group C compiler 18281 pgcc*) # Portland Group C compiler
17529@@ -9553,12 +10077,12 @@ _LT_EOF 18282@@ -8987,12 +9501,12 @@ _LT_EOF
17530 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 18283 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
17531 hardcode_libdir_flag_spec= 18284 hardcode_libdir_flag_spec=
17532 hardcode_libdir_flag_spec_ld='-rpath $libdir' 18285 hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -17541,7 +18294,7 @@ Index: binutils-2.24/ld/configure
17541 fi 18294 fi
17542 ;; 18295 ;;
17543 esac 18296 esac
17544@@ -9572,8 +10096,8 @@ _LT_EOF 18297@@ -9006,8 +9520,8 @@ _LT_EOF
17545 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 18298 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17546 wlarc= 18299 wlarc=
17547 else 18300 else
@@ -17552,7 +18305,7 @@ Index: binutils-2.24/ld/configure
17552 fi 18305 fi
17553 ;; 18306 ;;
17554 18307
17555@@ -9591,8 +10115,8 @@ _LT_EOF 18308@@ -9025,8 +9539,8 @@ _LT_EOF
17556 18309
17557 _LT_EOF 18310 _LT_EOF
17558 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18311 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17563,7 +18316,7 @@ Index: binutils-2.24/ld/configure
17563 else 18316 else
17564 ld_shlibs=no 18317 ld_shlibs=no
17565 fi 18318 fi
17566@@ -9638,8 +10162,8 @@ _LT_EOF 18319@@ -9072,8 +9586,8 @@ _LT_EOF
17567 18320
17568 *) 18321 *)
17569 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 18322 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17574,7 +18327,7 @@ Index: binutils-2.24/ld/configure
17574 else 18327 else
17575 ld_shlibs=no 18328 ld_shlibs=no
17576 fi 18329 fi
17577@@ -9769,7 +10293,13 @@ _LT_EOF 18330@@ -9203,7 +9717,13 @@ _LT_EOF
17578 allow_undefined_flag='-berok' 18331 allow_undefined_flag='-berok'
17579 # Determine the default libpath from the value encoded in an 18332 # Determine the default libpath from the value encoded in an
17580 # empty executable. 18333 # empty executable.
@@ -17589,7 +18342,7 @@ Index: binutils-2.24/ld/configure
17589 /* end confdefs.h. */ 18342 /* end confdefs.h. */
17590 18343
17591 int 18344 int
17592@@ -9782,22 +10312,29 @@ main () 18345@@ -9216,22 +9736,29 @@ main ()
17593 _ACEOF 18346 _ACEOF
17594 if ac_fn_c_try_link "$LINENO"; then : 18347 if ac_fn_c_try_link "$LINENO"; then :
17595 18348
@@ -17632,7 +18385,7 @@ Index: binutils-2.24/ld/configure
17632 18385
17633 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18386 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17634 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" 18387 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
17635@@ -9809,7 +10346,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18388@@ -9243,7 +9770,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17636 else 18389 else
17637 # Determine the default libpath from the value encoded in an 18390 # Determine the default libpath from the value encoded in an
17638 # empty executable. 18391 # empty executable.
@@ -17647,7 +18400,7 @@ Index: binutils-2.24/ld/configure
17647 /* end confdefs.h. */ 18400 /* end confdefs.h. */
17648 18401
17649 int 18402 int
17650@@ -9822,22 +10365,29 @@ main () 18403@@ -9256,22 +9789,29 @@ main ()
17651 _ACEOF 18404 _ACEOF
17652 if ac_fn_c_try_link "$LINENO"; then : 18405 if ac_fn_c_try_link "$LINENO"; then :
17653 18406
@@ -17690,11 +18443,10 @@ Index: binutils-2.24/ld/configure
17690 18443
17691 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 18444 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
17692 # Warning - without using the other run time loading flags, 18445 # Warning - without using the other run time loading flags,
17693@@ -9881,21 +10431,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18446@@ -9316,20 +9856,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17694 # When not using gcc, we currently assume that we are using
17695 # Microsoft Visual C++. 18447 # Microsoft Visual C++.
17696 # hardcode_libdir_flag_spec is actually meaningless, as there is 18448 # hardcode_libdir_flag_spec is actually meaningless, as there is
17697- # no search path for DLLs. 18449 # no search path for DLLs.
17698- hardcode_libdir_flag_spec=' ' 18450- hardcode_libdir_flag_spec=' '
17699- allow_undefined_flag=unsupported 18451- allow_undefined_flag=unsupported
17700- # Tell ltmain to make .lib files, not .a files. 18452- # Tell ltmain to make .lib files, not .a files.
@@ -17709,7 +18461,6 @@ Index: binutils-2.24/ld/configure
17709- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 18461- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
17710- fix_srcfile_path='`cygpath -w "$srcfile"`' 18462- fix_srcfile_path='`cygpath -w "$srcfile"`'
17711- enable_shared_with_static_runtimes=yes 18463- enable_shared_with_static_runtimes=yes
17712+ # no search path for DLLs.
17713+ case $cc_basename in 18464+ case $cc_basename in
17714+ cl*) 18465+ cl*)
17715+ # Native MSVC 18466+ # Native MSVC
@@ -17770,7 +18521,7 @@ Index: binutils-2.24/ld/configure
17770 ;; 18521 ;;
17771 18522
17772 darwin* | rhapsody*) 18523 darwin* | rhapsody*)
17773@@ -9956,7 +10549,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18524@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17774 18525
17775 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 18526 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
17776 freebsd* | dragonfly*) 18527 freebsd* | dragonfly*)
@@ -17779,7 +18530,7 @@ Index: binutils-2.24/ld/configure
17779 hardcode_libdir_flag_spec='-R$libdir' 18530 hardcode_libdir_flag_spec='-R$libdir'
17780 hardcode_direct=yes 18531 hardcode_direct=yes
17781 hardcode_shlibpath_var=no 18532 hardcode_shlibpath_var=no
17782@@ -9964,7 +10557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18533@@ -9398,7 +9981,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17783 18534
17784 hpux9*) 18535 hpux9*)
17785 if test "$GCC" = yes; then 18536 if test "$GCC" = yes; then
@@ -17788,7 +18539,7 @@ Index: binutils-2.24/ld/configure
17788 else 18539 else
17789 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' 18540 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
17790 fi 18541 fi
17791@@ -9980,7 +10573,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18542@@ -9414,7 +9997,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17792 18543
17793 hpux10*) 18544 hpux10*)
17794 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 18545 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -17797,7 +18548,7 @@ Index: binutils-2.24/ld/configure
17797 else 18548 else
17798 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 18549 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
17799 fi 18550 fi
17800@@ -10004,10 +10597,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 18551@@ -9438,10 +10021,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17801 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 18552 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
17802 ;; 18553 ;;
17803 ia64*) 18554 ia64*)
@@ -17810,7 +18561,7 @@ Index: binutils-2.24/ld/configure
17810 ;; 18561 ;;
17811 esac 18562 esac
17812 else 18563 else
17813@@ -10086,23 +10679,36 @@ fi 18564@@ -9520,23 +10103,36 @@ fi
17814 18565
17815 irix5* | irix6* | nonstopux*) 18566 irix5* | irix6* | nonstopux*)
17816 if test "$GCC" = yes; then 18567 if test "$GCC" = yes; then
@@ -17855,7 +18606,7 @@ Index: binutils-2.24/ld/configure
17855 else 18606 else
17856 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' 18607 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
17857 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' 18608 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
17858@@ -10187,7 +10793,7 @@ rm -f core conftest.err conftest.$ac_objext \ 18609@@ -9621,7 +10217,7 @@ rm -f core conftest.err conftest.$ac_objext \
17859 osf4* | osf5*) # as osf3* with the addition of -msym flag 18610 osf4* | osf5*) # as osf3* with the addition of -msym flag
17860 if test "$GCC" = yes; then 18611 if test "$GCC" = yes; then
17861 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 18612 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -17864,7 +18615,7 @@ Index: binutils-2.24/ld/configure
17864 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 18615 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
17865 else 18616 else
17866 allow_undefined_flag=' -expect_unresolved \*' 18617 allow_undefined_flag=' -expect_unresolved \*'
17867@@ -10206,9 +10812,9 @@ rm -f core conftest.err conftest.$ac_objext \ 18618@@ -9640,9 +10236,9 @@ rm -f core conftest.err conftest.$ac_objext \
17868 no_undefined_flag=' -z defs' 18619 no_undefined_flag=' -z defs'
17869 if test "$GCC" = yes; then 18620 if test "$GCC" = yes; then
17870 wlarc='${wl}' 18621 wlarc='${wl}'
@@ -17876,7 +18627,7 @@ Index: binutils-2.24/ld/configure
17876 else 18627 else
17877 case `$CC -V 2>&1` in 18628 case `$CC -V 2>&1` in
17878 *"Compilers 5.0"*) 18629 *"Compilers 5.0"*)
17879@@ -10784,8 +11390,9 @@ cygwin* | mingw* | pw32* | cegcc*) 18630@@ -10218,8 +10814,9 @@ cygwin* | mingw* | pw32* | cegcc*)
17880 need_version=no 18631 need_version=no
17881 need_lib_prefix=no 18632 need_lib_prefix=no
17882 18633
@@ -17888,7 +18639,7 @@ Index: binutils-2.24/ld/configure
17888 library_names_spec='$libname.dll.a' 18639 library_names_spec='$libname.dll.a'
17889 # DLL is installed to $(libdir)/../bin by postinstall_cmds 18640 # DLL is installed to $(libdir)/../bin by postinstall_cmds
17890 postinstall_cmds='base_file=`basename \${file}`~ 18641 postinstall_cmds='base_file=`basename \${file}`~
17891@@ -10818,13 +11425,71 @@ cygwin* | mingw* | pw32* | cegcc*) 18642@@ -10252,13 +10849,71 @@ cygwin* | mingw* | pw32* | cegcc*)
17892 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 18643 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
17893 ;; 18644 ;;
17894 esac 18645 esac
@@ -17961,7 +18712,7 @@ Index: binutils-2.24/ld/configure
17961 # FIXME: first we should search . and the directory the executable is in 18712 # FIXME: first we should search . and the directory the executable is in
17962 shlibpath_var=PATH 18713 shlibpath_var=PATH
17963 ;; 18714 ;;
17964@@ -10916,7 +11581,7 @@ haiku*) 18715@@ -10350,7 +11005,7 @@ haiku*)
17965 soname_spec='${libname}${release}${shared_ext}$major' 18716 soname_spec='${libname}${release}${shared_ext}$major'
17966 shlibpath_var=LIBRARY_PATH 18717 shlibpath_var=LIBRARY_PATH
17967 shlibpath_overrides_runpath=yes 18718 shlibpath_overrides_runpath=yes
@@ -17970,16 +18721,7 @@ Index: binutils-2.24/ld/configure
17970 hardcode_into_libs=yes 18721 hardcode_into_libs=yes
17971 ;; 18722 ;;
17972 18723
17973@@ -11712,7 +12377,7 @@ else 18724@@ -11190,10 +11845,10 @@ else
17974 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
17975 lt_status=$lt_dlunknown
17976 cat > conftest.$ac_ext <<_LT_EOF
17977-#line 11715 "configure"
17978+#line $LINENO "configure"
17979 #include "confdefs.h"
17980
17981 #if HAVE_DLFCN_H
17982@@ -11756,10 +12421,10 @@ else
17983 /* When -fvisbility=hidden is used, assume the code has been annotated 18725 /* When -fvisbility=hidden is used, assume the code has been annotated
17984 correspondingly for the symbols needed. */ 18726 correspondingly for the symbols needed. */
17985 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 18727 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -17992,16 +18734,7 @@ Index: binutils-2.24/ld/configure
17992 int main () 18734 int main ()
17993 { 18735 {
17994 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 18736 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
17995@@ -11818,7 +12483,7 @@ else 18737@@ -11296,10 +11951,10 @@ else
17996 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
17997 lt_status=$lt_dlunknown
17998 cat > conftest.$ac_ext <<_LT_EOF
17999-#line 11821 "configure"
18000+#line $LINENO "configure"
18001 #include "confdefs.h"
18002
18003 #if HAVE_DLFCN_H
18004@@ -11862,10 +12527,10 @@ else
18005 /* When -fvisbility=hidden is used, assume the code has been annotated 18738 /* When -fvisbility=hidden is used, assume the code has been annotated
18006 correspondingly for the symbols needed. */ 18739 correspondingly for the symbols needed. */
18007 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 18740 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -18014,612 +18747,16 @@ Index: binutils-2.24/ld/configure
18014 int main () 18747 int main ()
18015 { 18748 {
18016 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 18749 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18017@@ -12257,6 +12922,7 @@ $RM -r conftest* 18750@@ -12450,7 +13105,7 @@ if test "$enable_shared" = "yes"; then
18018 18751 # since libbfd may not pull in the entirety of libiberty.
18019 # Allow CC to be a program name with arguments. 18752 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18020 lt_save_CC=$CC 18753 if test -n "$x"; then
18021+ lt_save_CFLAGS=$CFLAGS 18754- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18022 lt_save_LD=$LD 18755+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18023 lt_save_GCC=$GCC
18024 GCC=$GXX
18025@@ -12274,6 +12940,7 @@ $RM -r conftest*
18026 fi 18756 fi
18027 test -z "${LDCXX+set}" || LD=$LDCXX
18028 CC=${CXX-"c++"}
18029+ CFLAGS=$CXXFLAGS
18030 compiler=$CC
18031 compiler_CXX=$CC
18032 for cc_temp in $compiler""; do
18033@@ -12413,8 +13080,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
18034 # Check if GNU C++ uses GNU ld as the underlying linker, since the
18035 # archiving commands below assume that GNU ld is being used.
18036 if test "$with_gnu_ld" = yes; then
18037- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
18038- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18039+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
18040+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18041
18042 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
18043 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
18044@@ -12556,7 +13223,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
18045 allow_undefined_flag_CXX='-berok'
18046 # Determine the default libpath from the value encoded in an empty
18047 # executable.
18048- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18049+ if test "${lt_cv_aix_libpath+set}" = set; then
18050+ aix_libpath=$lt_cv_aix_libpath
18051+else
18052+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
18053+ $as_echo_n "(cached) " >&6
18054+else
18055+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18056 /* end confdefs.h. */
18057
18058 int
18059@@ -12569,22 +13242,29 @@ main ()
18060 _ACEOF
18061 if ac_fn_cxx_try_link "$LINENO"; then :
18062
18063-lt_aix_libpath_sed='
18064- /Import File Strings/,/^$/ {
18065- /^0/ {
18066- s/^0 *\(.*\)$/\1/
18067- p
18068- }
18069- }'
18070-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18071-# Check for a 64-bit object if we didn't find anything.
18072-if test -z "$aix_libpath"; then
18073- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18074-fi
18075+ lt_aix_libpath_sed='
18076+ /Import File Strings/,/^$/ {
18077+ /^0/ {
18078+ s/^0 *\([^ ]*\) *$/\1/
18079+ p
18080+ }
18081+ }'
18082+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18083+ # Check for a 64-bit object if we didn't find anything.
18084+ if test -z "$lt_cv_aix_libpath__CXX"; then
18085+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18086+ fi
18087 fi
18088 rm -f core conftest.err conftest.$ac_objext \
18089 conftest$ac_exeext conftest.$ac_ext
18090-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18091+ if test -z "$lt_cv_aix_libpath__CXX"; then
18092+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
18093+ fi
18094+
18095+fi
18096+
18097+ aix_libpath=$lt_cv_aix_libpath__CXX
18098+fi
18099
18100 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
18101
18102@@ -12597,7 +13277,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18103 else
18104 # Determine the default libpath from the value encoded in an
18105 # empty executable.
18106- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18107+ if test "${lt_cv_aix_libpath+set}" = set; then
18108+ aix_libpath=$lt_cv_aix_libpath
18109+else
18110+ if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
18111+ $as_echo_n "(cached) " >&6
18112+else
18113+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18114 /* end confdefs.h. */
18115
18116 int
18117@@ -12610,22 +13296,29 @@ main ()
18118 _ACEOF
18119 if ac_fn_cxx_try_link "$LINENO"; then :
18120
18121-lt_aix_libpath_sed='
18122- /Import File Strings/,/^$/ {
18123- /^0/ {
18124- s/^0 *\(.*\)$/\1/
18125- p
18126- }
18127- }'
18128-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18129-# Check for a 64-bit object if we didn't find anything.
18130-if test -z "$aix_libpath"; then
18131- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18132-fi
18133+ lt_aix_libpath_sed='
18134+ /Import File Strings/,/^$/ {
18135+ /^0/ {
18136+ s/^0 *\([^ ]*\) *$/\1/
18137+ p
18138+ }
18139+ }'
18140+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18141+ # Check for a 64-bit object if we didn't find anything.
18142+ if test -z "$lt_cv_aix_libpath__CXX"; then
18143+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18144+ fi
18145 fi
18146 rm -f core conftest.err conftest.$ac_objext \
18147 conftest$ac_exeext conftest.$ac_ext
18148-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18149+ if test -z "$lt_cv_aix_libpath__CXX"; then
18150+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
18151+ fi
18152+
18153+fi
18154+
18155+ aix_libpath=$lt_cv_aix_libpath__CXX
18156+fi
18157 18757
18158 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 18758 case "${host}" in
18159 # Warning - without using the other run time loading flags, 18759@@ -13422,13 +14077,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18160@@ -12668,29 +13361,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18161 ;;
18162
18163 cygwin* | mingw* | pw32* | cegcc*)
18164- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
18165- # as there is no search path for DLLs.
18166- hardcode_libdir_flag_spec_CXX='-L$libdir'
18167- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
18168- allow_undefined_flag_CXX=unsupported
18169- always_export_symbols_CXX=no
18170- enable_shared_with_static_runtimes_CXX=yes
18171-
18172- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18173- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18174- # If the export-symbols file already is a .def file (1st line
18175- # is EXPORTS), use it as is; otherwise, prepend...
18176- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18177- cp $export_symbols $output_objdir/$soname.def;
18178- else
18179- echo EXPORTS > $output_objdir/$soname.def;
18180- cat $export_symbols >> $output_objdir/$soname.def;
18181- fi~
18182- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18183- else
18184- ld_shlibs_CXX=no
18185- fi
18186- ;;
18187+ case $GXX,$cc_basename in
18188+ ,cl* | no,cl*)
18189+ # Native MSVC
18190+ # hardcode_libdir_flag_spec is actually meaningless, as there is
18191+ # no search path for DLLs.
18192+ hardcode_libdir_flag_spec_CXX=' '
18193+ allow_undefined_flag_CXX=unsupported
18194+ always_export_symbols_CXX=yes
18195+ file_list_spec_CXX='@'
18196+ # Tell ltmain to make .lib files, not .a files.
18197+ libext=lib
18198+ # Tell ltmain to make .dll files, not .so files.
18199+ shrext_cmds=".dll"
18200+ # FIXME: Setting linknames here is a bad hack.
18201+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
18202+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18203+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
18204+ else
18205+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
18206+ fi~
18207+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
18208+ linknames='
18209+ # The linker will not automatically build a static lib if we build a DLL.
18210+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
18211+ enable_shared_with_static_runtimes_CXX=yes
18212+ # Don't use ranlib
18213+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
18214+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
18215+ lt_tool_outputfile="@TOOL_OUTPUT@"~
18216+ case $lt_outputfile in
18217+ *.exe|*.EXE) ;;
18218+ *)
18219+ lt_outputfile="$lt_outputfile.exe"
18220+ lt_tool_outputfile="$lt_tool_outputfile.exe"
18221+ ;;
18222+ esac~
18223+ func_to_tool_file "$lt_outputfile"~
18224+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
18225+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
18226+ $RM "$lt_outputfile.manifest";
18227+ fi'
18228+ ;;
18229+ *)
18230+ # g++
18231+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
18232+ # as there is no search path for DLLs.
18233+ hardcode_libdir_flag_spec_CXX='-L$libdir'
18234+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
18235+ allow_undefined_flag_CXX=unsupported
18236+ always_export_symbols_CXX=no
18237+ enable_shared_with_static_runtimes_CXX=yes
18238+
18239+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18240+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18241+ # If the export-symbols file already is a .def file (1st line
18242+ # is EXPORTS), use it as is; otherwise, prepend...
18243+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18244+ cp $export_symbols $output_objdir/$soname.def;
18245+ else
18246+ echo EXPORTS > $output_objdir/$soname.def;
18247+ cat $export_symbols >> $output_objdir/$soname.def;
18248+ fi~
18249+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18250+ else
18251+ ld_shlibs_CXX=no
18252+ fi
18253+ ;;
18254+ esac
18255+ ;;
18256 darwin* | rhapsody*)
18257
18258
18259@@ -12796,7 +13535,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18260 ;;
18261 *)
18262 if test "$GXX" = yes; then
18263- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
18264+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
18265 else
18266 # FIXME: insert proper C++ library support
18267 ld_shlibs_CXX=no
18268@@ -12867,10 +13606,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18269 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
18270 ;;
18271 ia64*)
18272- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
18273+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
18274 ;;
18275 *)
18276- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
18277+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
18278 ;;
18279 esac
18280 fi
18281@@ -12911,9 +13650,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18282 *)
18283 if test "$GXX" = yes; then
18284 if test "$with_gnu_ld" = no; then
18285- archive_cmds_CXX='$CC -shared -nostdlib $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'
18286+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $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'
18287 else
18288- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
18289+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
18290 fi
18291 fi
18292 link_all_deplibs_CXX=yes
18293@@ -12983,20 +13722,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18294 prelink_cmds_CXX='tpldir=Template.dir~
18295 rm -rf $tpldir~
18296 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
18297- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
18298+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
18299 old_archive_cmds_CXX='tpldir=Template.dir~
18300 rm -rf $tpldir~
18301 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
18302- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
18303+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
18304 $RANLIB $oldlib'
18305 archive_cmds_CXX='tpldir=Template.dir~
18306 rm -rf $tpldir~
18307 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
18308- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
18309+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
18310 archive_expsym_cmds_CXX='tpldir=Template.dir~
18311 rm -rf $tpldir~
18312 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
18313- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
18314+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
18315 ;;
18316 *) # Version 6 and above use weak symbols
18317 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
18318@@ -13191,7 +13930,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18319 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'
18320 ;;
18321 *)
18322- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
18323+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
18324 ;;
18325 esac
18326
18327@@ -13237,7 +13976,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18328
18329 solaris*)
18330 case $cc_basename in
18331- CC*)
18332+ CC* | sunCC*)
18333 # Sun C++ 4.2, 5.x and Centerline C++
18334 archive_cmds_need_lc_CXX=yes
18335 no_undefined_flag_CXX=' -zdefs'
18336@@ -13278,9 +14017,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18337 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
18338 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
18339 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
18340- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
18341+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
18342 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
18343- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
18344+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
18345
18346 # Commands to make compiler produce verbose output that lists
18347 # what "hidden" libraries, object files and flags are used when
18348@@ -13415,6 +14154,13 @@ private:
18349 };
18350 _LT_EOF
18351
18352+
18353+_lt_libdeps_save_CFLAGS=$CFLAGS
18354+case "$CC $CFLAGS " in #(
18355+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
18356+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
18357+esac
18358+
18359 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
18360 (eval $ac_compile) 2>&5
18361 ac_status=$?
18362@@ -13428,7 +14174,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
18363 pre_test_object_deps_done=no
18364
18365 for p in `eval "$output_verbose_link_cmd"`; do
18366- case $p in
18367+ case ${prev}${p} in
18368
18369 -L* | -R* | -l*)
18370 # Some compilers place space between "-{L,R}" and the path.
18371@@ -13437,13 +14183,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
18372 test $p = "-R"; then
18373 prev=$p
18374 continue
18375- else
18376- prev=
18377 fi
18378
18379+ # Expand the sysroot to ease extracting the directories later.
18380+ if test -z "$prev"; then
18381+ case $p in
18382+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
18383+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
18384+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
18385+ esac
18386+ fi
18387+ case $p in
18388+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
18389+ esac
18390 if test "$pre_test_object_deps_done" = no; then
18391- case $p in
18392- -L* | -R*)
18393+ case ${prev} in
18394+ -L | -R)
18395 # Internal compiler library paths should come after those
18396 # provided the user. The postdeps already come after the
18397 # user supplied libs so there is no need to process them.
18398@@ -13463,8 +14218,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
18399 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
18400 fi
18401 fi
18402+ prev=
18403 ;;
18404
18405+ *.lto.$objext) ;; # Ignore GCC LTO objects
18406 *.$objext)
18407 # This assumes that the test object file only shows up
18408 # once in the compiler output.
18409@@ -13500,6 +14257,7 @@ else
18410 fi
18411
18412 $RM -f confest.$objext
18413+CFLAGS=$_lt_libdeps_save_CFLAGS
18414
18415 # PORTME: override above test on systems where it is broken
18416 case $host_os in
18417@@ -13535,7 +14293,7 @@ linux*)
18418
18419 solaris*)
18420 case $cc_basename in
18421- CC*)
18422+ CC* | sunCC*)
18423 # The more standards-conforming stlport4 library is
18424 # incompatible with the Cstd library. Avoid specifying
18425 # it if it's in CXXFLAGS. Ignore libCrun as
18426@@ -13600,8 +14358,6 @@ fi
18427 lt_prog_compiler_pic_CXX=
18428 lt_prog_compiler_static_CXX=
18429
18430-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18431-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18432
18433 # C++ specific cases for pic, static, wl, etc.
18434 if test "$GXX" = yes; then
18435@@ -13706,6 +14462,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18436 ;;
18437 esac
18438 ;;
18439+ mingw* | cygwin* | os2* | pw32* | cegcc*)
18440+ # This hack is so that the source file can tell whether it is being
18441+ # built for inclusion in a dll (and should export symbols for example).
18442+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
18443+ ;;
18444 dgux*)
18445 case $cc_basename in
18446 ec++*)
18447@@ -13858,7 +14619,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18448 ;;
18449 solaris*)
18450 case $cc_basename in
18451- CC*)
18452+ CC* | sunCC*)
18453 # Sun C++ 4.2, 5.x and Centerline C++
18454 lt_prog_compiler_pic_CXX='-KPIC'
18455 lt_prog_compiler_static_CXX='-Bstatic'
18456@@ -13923,10 +14684,17 @@ case $host_os in
18457 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
18458 ;;
18459 esac
18460-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
18461-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
18462-
18463
18464+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18465+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18466+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then :
18467+ $as_echo_n "(cached) " >&6
18468+else
18469+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
18470+fi
18471+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
18472+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
18473+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
18474
18475 #
18476 # Check to make sure the PIC flag actually works.
18477@@ -13984,6 +14752,8 @@ fi
18478
18479
18480
18481+
18482+
18483 #
18484 # Check to make sure the static flag actually works.
18485 #
18486@@ -14161,6 +14931,7 @@ fi
18487 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
18488
18489 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
18490+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
18491 case $host_os in
18492 aix[4-9]*)
18493 # If we're using GNU nm, then we don't want the "-C" option.
18494@@ -14175,15 +14946,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
18495 ;;
18496 pw32*)
18497 export_symbols_cmds_CXX="$ltdll_cmds"
18498- ;;
18499+ ;;
18500 cygwin* | mingw* | cegcc*)
18501- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
18502- ;;
18503+ case $cc_basename in
18504+ cl*) ;;
18505+ *)
18506+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
18507+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
18508+ ;;
18509+ esac
18510+ ;;
18511 *)
18512 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
18513- ;;
18514+ ;;
18515 esac
18516- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
18517
18518 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
18519 $as_echo "$ld_shlibs_CXX" >&6; }
18520@@ -14446,8 +15222,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18521 need_version=no
18522 need_lib_prefix=no
18523
18524- case $GCC,$host_os in
18525- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
18526+ case $GCC,$cc_basename in
18527+ yes,*)
18528+ # gcc
18529 library_names_spec='$libname.dll.a'
18530 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18531 postinstall_cmds='base_file=`basename \${file}`~
18532@@ -14479,13 +15256,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18533 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18534 ;;
18535 esac
18536+ dynamic_linker='Win32 ld.exe'
18537+ ;;
18538+
18539+ *,cl*)
18540+ # Native MSVC
18541+ libname_spec='$name'
18542+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18543+ library_names_spec='${libname}.dll.lib'
18544+
18545+ case $build_os in
18546+ mingw*)
18547+ sys_lib_search_path_spec=
18548+ lt_save_ifs=$IFS
18549+ IFS=';'
18550+ for lt_path in $LIB
18551+ do
18552+ IFS=$lt_save_ifs
18553+ # Let DOS variable expansion print the short 8.3 style file name.
18554+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
18555+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
18556+ done
18557+ IFS=$lt_save_ifs
18558+ # Convert to MSYS style.
18559+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
18560+ ;;
18561+ cygwin*)
18562+ # Convert to unix form, then to dos form, then back to unix form
18563+ # but this time dos style (no spaces!) so that the unix form looks
18564+ # like /cygdrive/c/PROGRA~1:/cygdr...
18565+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18566+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18567+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18568+ ;;
18569+ *)
18570+ sys_lib_search_path_spec="$LIB"
18571+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18572+ # It is most probably a Windows format PATH.
18573+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18574+ else
18575+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18576+ fi
18577+ # FIXME: find the short name or the path components, as spaces are
18578+ # common. (e.g. "Program Files" -> "PROGRA~1")
18579+ ;;
18580+ esac
18581+
18582+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18583+ postinstall_cmds='base_file=`basename \${file}`~
18584+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18585+ dldir=$destdir/`dirname \$dlpath`~
18586+ test -d \$dldir || mkdir -p \$dldir~
18587+ $install_prog $dir/$dlname \$dldir/$dlname'
18588+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18589+ dlpath=$dir/\$dldll~
18590+ $RM \$dlpath'
18591+ shlibpath_overrides_runpath=yes
18592+ dynamic_linker='Win32 link.exe'
18593 ;;
18594
18595 *)
18596+ # Assume MSVC wrapper
18597 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18598+ dynamic_linker='Win32 ld.exe'
18599 ;;
18600 esac
18601- dynamic_linker='Win32 ld.exe'
18602 # FIXME: first we should search . and the directory the executable is in
18603 shlibpath_var=PATH
18604 ;;
18605@@ -14576,7 +15411,7 @@ haiku*)
18606 soname_spec='${libname}${release}${shared_ext}$major'
18607 shlibpath_var=LIBRARY_PATH
18608 shlibpath_overrides_runpath=yes
18609- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18610+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18611 hardcode_into_libs=yes
18612 ;;
18613
18614@@ -15035,6 +15870,7 @@ fi
18615 fi # test -n "$compiler"
18616
18617 CC=$lt_save_CC
18618+ CFLAGS=$lt_save_CFLAGS
18619 LDCXX=$LD
18620 LD=$lt_save_LD
18621 GCC=$lt_save_GCC
18622@@ -17807,13 +18643,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18623 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 18760 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18624 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 18761 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18625 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 18762 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -18640,7 +18777,7 @@ Index: binutils-2.24/ld/configure
18640 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 18777 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18641 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 18778 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18642 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 18779 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18643@@ -17828,14 +18671,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 18780@@ -13443,14 +14105,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18644 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 18781 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
18645 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 18782 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
18646 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"`' 18783 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"`'
@@ -18659,7 +18796,7 @@ Index: binutils-2.24/ld/configure
18659 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 18796 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18660 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 18797 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18661 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 18798 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18662@@ -17868,12 +18714,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 18799@@ -13483,12 +14148,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18663 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 18800 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18664 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 18801 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18665 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 18802 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -18673,31 +18810,7 @@ Index: binutils-2.24/ld/configure
18673 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 18810 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18674 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 18811 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18675 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 18812 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18676@@ -17912,8 +18758,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 18813@@ -13543,8 +14208,13 @@ reload_flag \
18677 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
18678 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
18679 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
18680-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
18681 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
18682+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
18683 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
18684 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
18685 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
18686@@ -17940,12 +18786,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
18687 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
18688 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
18689 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
18690-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
18691 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
18692 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
18693 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
18694 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
18695 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
18696+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
18697 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
18698 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
18699 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
18700@@ -17983,8 +18829,13 @@ reload_flag \
18701 OBJDUMP \ 18814 OBJDUMP \
18702 deplibs_check_method \ 18815 deplibs_check_method \
18703 file_magic_cmd \ 18816 file_magic_cmd \
@@ -18711,7 +18824,7 @@ Index: binutils-2.24/ld/configure
18711 STRIP \ 18824 STRIP \
18712 RANLIB \ 18825 RANLIB \
18713 CC \ 18826 CC \
18714@@ -17994,12 +18845,14 @@ lt_cv_sys_global_symbol_pipe \ 18827@@ -13554,12 +14224,14 @@ lt_cv_sys_global_symbol_pipe \
18715 lt_cv_sys_global_symbol_to_cdecl \ 18828 lt_cv_sys_global_symbol_to_cdecl \
18716 lt_cv_sys_global_symbol_to_c_name_address \ 18829 lt_cv_sys_global_symbol_to_c_name_address \
18717 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 18830 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -18727,7 +18840,7 @@ Index: binutils-2.24/ld/configure
18727 DSYMUTIL \ 18840 DSYMUTIL \
18728 NMEDIT \ 18841 NMEDIT \
18729 LIPO \ 18842 LIPO \
18730@@ -18015,7 +18868,6 @@ no_undefined_flag \ 18843@@ -13575,7 +14247,6 @@ no_undefined_flag \
18731 hardcode_libdir_flag_spec \ 18844 hardcode_libdir_flag_spec \
18732 hardcode_libdir_flag_spec_ld \ 18845 hardcode_libdir_flag_spec_ld \
18733 hardcode_libdir_separator \ 18846 hardcode_libdir_separator \
@@ -18735,25 +18848,7 @@ Index: binutils-2.24/ld/configure
18735 exclude_expsyms \ 18848 exclude_expsyms \
18736 include_expsyms \ 18849 include_expsyms \
18737 file_list_spec \ 18850 file_list_spec \
18738@@ -18037,8 +18889,8 @@ LD_CXX \ 18851@@ -13611,6 +14282,7 @@ module_cmds \
18739 reload_flag_CXX \
18740 compiler_CXX \
18741 lt_prog_compiler_no_builtin_flag_CXX \
18742-lt_prog_compiler_wl_CXX \
18743 lt_prog_compiler_pic_CXX \
18744+lt_prog_compiler_wl_CXX \
18745 lt_prog_compiler_static_CXX \
18746 lt_cv_prog_compiler_c_o_CXX \
18747 export_dynamic_flag_spec_CXX \
18748@@ -18050,7 +18902,6 @@ no_undefined_flag_CXX \
18749 hardcode_libdir_flag_spec_CXX \
18750 hardcode_libdir_flag_spec_ld_CXX \
18751 hardcode_libdir_separator_CXX \
18752-fix_srcfile_path_CXX \
18753 exclude_expsyms_CXX \
18754 include_expsyms_CXX \
18755 file_list_spec_CXX \
18756@@ -18084,6 +18935,7 @@ module_cmds \
18757 module_expsym_cmds \ 18852 module_expsym_cmds \
18758 export_symbols_cmds \ 18853 export_symbols_cmds \
18759 prelink_cmds \ 18854 prelink_cmds \
@@ -18761,17 +18856,7 @@ Index: binutils-2.24/ld/configure
18761 postinstall_cmds \ 18856 postinstall_cmds \
18762 postuninstall_cmds \ 18857 postuninstall_cmds \
18763 finish_cmds \ 18858 finish_cmds \
18764@@ -18098,7 +18950,8 @@ archive_expsym_cmds_CXX \ 18859@@ -14367,7 +15039,8 @@ $as_echo X"$file" |
18765 module_cmds_CXX \
18766 module_expsym_cmds_CXX \
18767 export_symbols_cmds_CXX \
18768-prelink_cmds_CXX; do
18769+prelink_cmds_CXX \
18770+postlink_cmds_CXX; do
18771 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
18772 *[\\\\\\\`\\"\\\$]*)
18773 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
18774@@ -18891,7 +19744,8 @@ $as_echo X"$file" |
18775 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 18860 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18776 # 18861 #
18777 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 18862 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -18781,7 +18866,7 @@ Index: binutils-2.24/ld/configure
18781 # Written by Gordon Matzigkeit, 1996 18866 # Written by Gordon Matzigkeit, 1996
18782 # 18867 #
18783 # This file is part of GNU Libtool. 18868 # This file is part of GNU Libtool.
18784@@ -18994,19 +19848,42 @@ SP2NL=$lt_lt_SP2NL 18869@@ -14470,19 +15143,42 @@ SP2NL=$lt_lt_SP2NL
18785 # turn newlines into spaces. 18870 # turn newlines into spaces.
18786 NL2SP=$lt_lt_NL2SP 18871 NL2SP=$lt_lt_NL2SP
18787 18872
@@ -18825,7 +18910,7 @@ Index: binutils-2.24/ld/configure
18825 # A symbol stripping program. 18910 # A symbol stripping program.
18826 STRIP=$lt_STRIP 18911 STRIP=$lt_STRIP
18827 18912
18828@@ -19036,6 +19913,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 18913@@ -14512,6 +15208,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18829 # Transform the output of nm in a C name address pair when lib prefix is needed. 18914 # Transform the output of nm in a C name address pair when lib prefix is needed.
18830 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 18915 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18831 18916
@@ -18838,7 +18923,7 @@ Index: binutils-2.24/ld/configure
18838 # The name of the directory that contains temporary libtool files. 18923 # The name of the directory that contains temporary libtool files.
18839 objdir=$objdir 18924 objdir=$objdir
18840 18925
18841@@ -19045,6 +19928,9 @@ MAGIC_CMD=$MAGIC_CMD 18926@@ -14521,6 +15223,9 @@ MAGIC_CMD=$MAGIC_CMD
18842 # Must we lock files when doing compilation? 18927 # Must we lock files when doing compilation?
18843 need_locks=$lt_need_locks 18928 need_locks=$lt_need_locks
18844 18929
@@ -18848,7 +18933,7 @@ Index: binutils-2.24/ld/configure
18848 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 18933 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18849 DSYMUTIL=$lt_DSYMUTIL 18934 DSYMUTIL=$lt_DSYMUTIL
18850 18935
18851@@ -19159,12 +20045,12 @@ with_gcc=$GCC 18936@@ -14635,12 +15340,12 @@ with_gcc=$GCC
18852 # Compiler flag to turn off builtin functions. 18937 # Compiler flag to turn off builtin functions.
18853 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 18938 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18854 18939
@@ -18864,7 +18949,7 @@ Index: binutils-2.24/ld/configure
18864 # Compiler flag to prevent dynamic linking. 18949 # Compiler flag to prevent dynamic linking.
18865 link_static_flag=$lt_lt_prog_compiler_static 18950 link_static_flag=$lt_lt_prog_compiler_static
18866 18951
18867@@ -19251,9 +20137,6 @@ inherit_rpath=$inherit_rpath 18952@@ -14727,9 +15432,6 @@ inherit_rpath=$inherit_rpath
18868 # Whether libtool must link a program against all its dependency libraries. 18953 # Whether libtool must link a program against all its dependency libraries.
18869 link_all_deplibs=$link_all_deplibs 18954 link_all_deplibs=$link_all_deplibs
18870 18955
@@ -18874,7 +18959,7 @@ Index: binutils-2.24/ld/configure
18874 # Set to "yes" if exported symbols are required. 18959 # Set to "yes" if exported symbols are required.
18875 always_export_symbols=$always_export_symbols 18960 always_export_symbols=$always_export_symbols
18876 18961
18877@@ -19269,6 +20152,9 @@ include_expsyms=$lt_include_expsyms 18962@@ -14745,6 +15447,9 @@ include_expsyms=$lt_include_expsyms
18878 # Commands necessary for linking programs (against libraries) with templates. 18963 # Commands necessary for linking programs (against libraries) with templates.
18879 prelink_cmds=$lt_prelink_cmds 18964 prelink_cmds=$lt_prelink_cmds
18880 18965
@@ -18884,7 +18969,7 @@ Index: binutils-2.24/ld/configure
18884 # Specify filename containing input files. 18969 # Specify filename containing input files.
18885 file_list_spec=$lt_file_list_spec 18970 file_list_spec=$lt_file_list_spec
18886 18971
18887@@ -19315,210 +20201,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 18972@@ -14777,210 +15482,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18888 # if finds mixed CR/LF and LF-only lines. Since sed operates in 18973 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18889 # text mode, it properly converts lines to CR/LF. This bash problem 18974 # text mode, it properly converts lines to CR/LF. This bash problem
18890 # is reportedly fixed, but why not run on old versions too? 18975 # is reportedly fixed, but why not run on old versions too?
@@ -19258,60 +19343,11 @@ Index: binutils-2.24/ld/configure
19258 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 19343 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19259 chmod +x "$ofile" 19344 chmod +x "$ofile"
19260 19345
19261@@ -19546,12 +20391,12 @@ with_gcc=$GCC_CXX 19346diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19262 # Compiler flag to turn off builtin functions. 19347index b93e855..43ba976 100644
19263 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 19348--- a/opcodes/configure.ac
19264 19349+++ b/opcodes/configure.ac
19265-# How to pass a linker flag through the compiler. 19350@@ -167,7 +167,7 @@ changequote(,)dnl
19266-wl=$lt_lt_prog_compiler_wl_CXX
19267-
19268 # Additional compiler flags for building library objects.
19269 pic_flag=$lt_lt_prog_compiler_pic_CXX
19270
19271+# How to pass a linker flag through the compiler.
19272+wl=$lt_lt_prog_compiler_wl_CXX
19273+
19274 # Compiler flag to prevent dynamic linking.
19275 link_static_flag=$lt_lt_prog_compiler_static_CXX
19276
19277@@ -19638,9 +20483,6 @@ inherit_rpath=$inherit_rpath_CXX
19278 # Whether libtool must link a program against all its dependency libraries.
19279 link_all_deplibs=$link_all_deplibs_CXX
19280
19281-# Fix the shell variable \$srcfile for the compiler.
19282-fix_srcfile_path=$lt_fix_srcfile_path_CXX
19283-
19284 # Set to "yes" if exported symbols are required.
19285 always_export_symbols=$always_export_symbols_CXX
19286
19287@@ -19656,6 +20498,9 @@ include_expsyms=$lt_include_expsyms_CXX
19288 # Commands necessary for linking programs (against libraries) with templates.
19289 prelink_cmds=$lt_prelink_cmds_CXX
19290
19291+# Commands necessary for finishing linking programs.
19292+postlink_cmds=$lt_postlink_cmds_CXX
19293+
19294 # Specify filename containing input files.
19295 file_list_spec=$lt_file_list_spec_CXX
19296
19297Index: binutils-2.24/bfd/configure.ac
19298===================================================================
19299--- binutils-2.24.orig/bfd/configure.ac 2013-12-02 01:30:28.000000000 -0800
19300+++ binutils-2.24/bfd/configure.ac 2013-12-15 11:10:23.887118697 -0800
19301@@ -568,7 +568,7 @@
19302 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19303 changequote([,])dnl
19304 if test -n "$x"; then
19305- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
19306+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
19307 fi
19308
19309 # More hacks to build DLLs on Windows.
19310Index: binutils-2.24/opcodes/configure.ac
19311===================================================================
19312--- binutils-2.24.orig/opcodes/configure.ac 2013-11-04 07:33:40.000000000 -0800
19313+++ binutils-2.24/opcodes/configure.ac 2013-12-15 11:10:23.887118697 -0800
19314@@ -162,7 +162,7 @@
19315 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 19351 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19316 changequote([,])dnl 19352 changequote([,])dnl
19317 if test -n "$x"; then 19353 if test -n "$x"; then
@@ -19320,3 +19356,6 @@ Index: binutils-2.24/opcodes/configure.ac
19320 fi 19356 fi
19321 19357
19322 case "${host}" in 19358 case "${host}" in
19359--
193602.1.4
19361
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
new file mode 100644
index 0000000000..a037634ccf
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
@@ -0,0 +1,35 @@
1From 743f42aaecb1ab89eba0eaf5e88ed67bbf3ba304 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:37:10 +0000
4Subject: [PATCH 07/13] Add the armv5e architecture to binutils
5
6Binutils has a comment that indicates it is supposed to match gcc for
7all of the support "-march=" settings, but it was lacking the armv5e setting.
8This was a simple way to add it, as thumb instructions shouldn't be generated
9by the compiler anyway.
10
11Upstream-Status: Denied
12Upstream maintainer indicated that we should not be using armv5e, even
13though it is a legal archicture defined by our gcc.
14
15Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 gas/config/tc-arm.c | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
22index 2db6c2d..ab48168 100644
23--- a/gas/config/tc-arm.c
24+++ b/gas/config/tc-arm.c
25@@ -24463,6 +24463,7 @@ static const struct arm_arch_option_table arm_archs[] =
26 ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA),
27 ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA),
28 ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP),
29+ ARM_ARCH_OPT ("armv5e", ARM_ARCH_V5TE, FPU_ARCH_VFP),
30 ARM_ARCH_OPT ("armv5t", ARM_ARCH_V5T, FPU_ARCH_VFP),
31 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP),
32 ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP),
33--
342.1.4
35
diff --git a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
new file mode 100644
index 0000000000..0ae68fcd7e
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -0,0 +1,35 @@
1From 4d3a9f6db604055348332b56889d466c058fa5f3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:39:01 +0000
4Subject: [PATCH 08/13] don't let the distro compiler point to the wrong
5 installation location
6
7Thanks to RP for helping find the source code causing the issue.
8
92010/08/13
10Nitin A Kamble <nitin.a.kamble@intel.com>
11
12Upstream-Status: Inappropriate [embedded specific]
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 libiberty/Makefile.in | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
20index 9b87720..ff43f53 100644
21--- a/libiberty/Makefile.in
22+++ b/libiberty/Makefile.in
23@@ -361,7 +361,8 @@ install-strip: install
24 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
25 # default multilib, so we have to take CFLAGS into account as well,
26 # since it will be passed the multilib flags.
27-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
28+#MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
29+MULTIOSDIR = ""
30 install_to_libdir: all
31 if test -n "${target_header_dir}"; then \
32 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
33--
342.1.4
35
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
index eb540766dc..f800796d9a 100644
--- a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
@@ -1,4 +1,8 @@
1Upstream-Status: Inappropriate [distribution: codesourcery] 1From e02e119b278c3f404e97669e7180cac944134c91 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:41:04 +0000
4Subject: [PATCH 09/13] Upstream-Status: Inappropriate [distribution:
5 codesourcery]
2 6
3Patch originally created by Mark Hatle, forward-ported to 7Patch originally created by Mark Hatle, forward-ported to
4binutils 2.21 by Scott Garman. 8binutils 2.21 by Scott Garman.
@@ -51,11 +55,23 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
51 55
52Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 56Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
53Signed-off-by: Scott Garman <scott.a.garman@intel.com> 57Signed-off-by: Scott Garman <scott.a.garman@intel.com>
58Signed-off-by: Khem Raj <raj.khem@gmail.com>
59---
60 ld/config.in | 3 +++
61 ld/configure | 14 ++++++++++++++
62 ld/configure.ac | 10 ++++++++++
63 ld/ld.h | 8 ++++++++
64 ld/ld.texinfo | 12 ++++++++++++
65 ld/ldfile.c | 17 +++++++++++++++++
66 ld/ldlex.h | 2 ++
67 ld/ldmain.c | 2 ++
68 ld/lexsup.c | 16 ++++++++++++++++
69 9 files changed, 84 insertions(+)
54 70
55Index: binutils-2.24/ld/config.in 71diff --git a/ld/config.in b/ld/config.in
56=================================================================== 72index 2ab4844..766d23c 100644
57--- binutils-2.24.orig/ld/config.in 2013-12-15 11:46:17.000000000 -0800 73--- a/ld/config.in
58+++ binutils-2.24/ld/config.in 2013-12-15 11:46:59.810435651 -0800 74+++ b/ld/config.in
59@@ -11,6 +11,9 @@ 75@@ -11,6 +11,9 @@
60 language is requested. */ 76 language is requested. */
61 #undef ENABLE_NLS 77 #undef ENABLE_NLS
@@ -66,11 +82,11 @@ Index: binutils-2.24/ld/config.in
66 /* Additional extension a shared object might have. */ 82 /* Additional extension a shared object might have. */
67 #undef EXTRA_SHLIB_EXTENSION 83 #undef EXTRA_SHLIB_EXTENSION
68 84
69Index: binutils-2.24/ld/configure 85diff --git a/ld/configure b/ld/configure
70=================================================================== 86index 2fbaebf..5726a08 100755
71--- binutils-2.24.orig/ld/configure 2013-12-15 11:46:17.000000000 -0800 87--- a/ld/configure
72+++ binutils-2.24/ld/configure 2013-12-15 11:46:59.810435651 -0800 88+++ b/ld/configure
73@@ -777,6 +777,7 @@ 89@@ -787,6 +787,7 @@ with_lib_path
74 enable_targets 90 enable_targets
75 enable_64_bit_bfd 91 enable_64_bit_bfd
76 with_sysroot 92 with_sysroot
@@ -78,8 +94,8 @@ Index: binutils-2.24/ld/configure
78 enable_gold 94 enable_gold
79 enable_got 95 enable_got
80 enable_werror 96 enable_werror
81@@ -1433,6 +1434,8 @@ 97@@ -1443,6 +1444,8 @@ Optional Features:
82 (and sometimes confusing) to the casual installer 98 --disable-largefile omit support for large files
83 --enable-targets alternative target configurations 99 --enable-targets alternative target configurations
84 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) 100 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
85+ --enable-poison-system-directories 101+ --enable-poison-system-directories
@@ -87,7 +103,7 @@ Index: binutils-2.24/ld/configure
87 --enable-gold[=ARG] build gold [ARG={default,yes,no}] 103 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
88 --enable-got=<type> GOT handling scheme (target, single, negative, 104 --enable-got=<type> GOT handling scheme (target, single, negative,
89 multigot) 105 multigot)
90@@ -4345,7 +4348,18 @@ 106@@ -16323,7 +16326,18 @@ else
91 fi 107 fi
92 108
93 109
@@ -106,11 +122,11 @@ Index: binutils-2.24/ld/configure
106 122
107 # Check whether --enable-got was given. 123 # Check whether --enable-got was given.
108 if test "${enable_got+set}" = set; then : 124 if test "${enable_got+set}" = set; then :
109Index: binutils-2.24/ld/configure.ac 125diff --git a/ld/configure.ac b/ld/configure.ac
110=================================================================== 126index 1bddfc9..e9edb7f 100644
111--- binutils-2.24.orig/ld/configure.ac 2013-12-15 11:46:17.000000000 -0800 127--- a/ld/configure.ac
112+++ binutils-2.24/ld/configure.ac 2013-12-15 11:46:59.810435651 -0800 128+++ b/ld/configure.ac
113@@ -87,6 +87,16 @@ 129@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
114 AC_SUBST(TARGET_SYSTEM_ROOT) 130 AC_SUBST(TARGET_SYSTEM_ROOT)
115 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) 131 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
116 132
@@ -127,39 +143,11 @@ Index: binutils-2.24/ld/configure.ac
127 dnl Use --enable-gold to decide if this linker should be the default. 143 dnl Use --enable-gold to decide if this linker should be the default.
128 dnl "install_as_default" is set to false if gold is the default linker. 144 dnl "install_as_default" is set to false if gold is the default linker.
129 dnl "installed_linker" is the installed BFD linker name. 145 dnl "installed_linker" is the installed BFD linker name.
130Index: binutils-2.24/ld/ldfile.c 146diff --git a/ld/ld.h b/ld/ld.h
131=================================================================== 147index f773ce7..adba0f6 100644
132--- binutils-2.24.orig/ld/ldfile.c 2013-12-15 11:46:17.000000000 -0800 148--- a/ld/ld.h
133+++ binutils-2.24/ld/ldfile.c 2013-12-15 11:46:59.813768989 -0800 149+++ b/ld/ld.h
134@@ -116,6 +116,23 @@ 150@@ -161,6 +161,14 @@ typedef struct {
135 new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
136 else
137 new_dirs->name = xstrdup (name);
138+
139+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
140+ if (command_line.poison_system_directories
141+ && ((!strncmp (name, "/lib", 4))
142+ || (!strncmp (name, "/usr/lib", 8))
143+ || (!strncmp (name, "/usr/local/lib", 14))
144+ || (!strncmp (name, "/usr/X11R6/lib", 14))))
145+ {
146+ if (command_line.error_poison_system_directories)
147+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
148+ "cross-compilation\n"), name);
149+ else
150+ einfo (_("%P: warning: library search path \"%s\" is unsafe for "
151+ "cross-compilation\n"), name);
152+ }
153+#endif
154+
155 }
156
157 /* Try to open a BFD for a lang_input_statement. */
158Index: binutils-2.24/ld/ld.h
159===================================================================
160--- binutils-2.24.orig/ld/ld.h 2013-12-15 11:46:17.000000000 -0800
161+++ binutils-2.24/ld/ld.h 2013-12-15 11:46:59.813768989 -0800
162@@ -180,6 +180,14 @@
163 /* If TRUE we'll just print the default output on stdout. */ 151 /* If TRUE we'll just print the default output on stdout. */
164 bfd_boolean print_output_format; 152 bfd_boolean print_output_format;
165 153
@@ -174,24 +162,11 @@ Index: binutils-2.24/ld/ld.h
174 /* Big or little endian as set on command line. */ 162 /* Big or little endian as set on command line. */
175 enum endian_enum endian; 163 enum endian_enum endian;
176 164
177Index: binutils-2.24/ld/ldmain.c 165diff --git a/ld/ld.texinfo b/ld/ld.texinfo
178=================================================================== 166index 502582c..dae168a 100644
179--- binutils-2.24.orig/ld/ldmain.c 2013-12-15 11:46:17.000000000 -0800 167--- a/ld/ld.texinfo
180+++ binutils-2.24/ld/ldmain.c 2013-12-15 11:48:12.087101740 -0800 168+++ b/ld/ld.texinfo
181@@ -266,6 +266,8 @@ 169@@ -2212,6 +2212,18 @@ string identifying the original linked file does not change.
182 command_line.warn_mismatch = TRUE;
183 command_line.warn_search_mismatch = TRUE;
184 command_line.check_section_addresses = -1;
185+ command_line.poison_system_directories = TRUE;
186+ command_line.error_poison_system_directories = FALSE;
187
188 /* We initialize DEMANGLING based on the environment variable
189 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
190Index: binutils-2.24/ld/ld.texinfo
191===================================================================
192--- binutils-2.24.orig/ld/ld.texinfo 2013-12-15 11:46:17.000000000 -0800
193+++ binutils-2.24/ld/ld.texinfo 2013-12-15 11:46:59.813768989 -0800
194@@ -2175,6 +2175,18 @@
195 170
196 Passing @code{none} for @var{style} disables the setting from any 171 Passing @code{none} for @var{style} disables the setting from any
197 @code{--build-id} options earlier on the command line. 172 @code{--build-id} options earlier on the command line.
@@ -210,10 +185,64 @@ Index: binutils-2.24/ld/ld.texinfo
210 @end table 185 @end table
211 186
212 @c man end 187 @c man end
213Index: binutils-2.24/ld/lexsup.c 188diff --git a/ld/ldfile.c b/ld/ldfile.c
214=================================================================== 189index 782ed7f..19a9ab4 100644
215--- binutils-2.24.orig/ld/lexsup.c 2013-12-15 11:46:17.000000000 -0800 190--- a/ld/ldfile.c
216+++ binutils-2.24/ld/lexsup.c 2013-12-15 11:49:28.950434490 -0800 191+++ b/ld/ldfile.c
192@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
193 new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
194 else
195 new_dirs->name = xstrdup (name);
196+
197+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
198+ if (command_line.poison_system_directories
199+ && ((!strncmp (name, "/lib", 4))
200+ || (!strncmp (name, "/usr/lib", 8))
201+ || (!strncmp (name, "/usr/local/lib", 14))
202+ || (!strncmp (name, "/usr/X11R6/lib", 14))))
203+ {
204+ if (command_line.error_poison_system_directories)
205+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
206+ "cross-compilation\n"), name);
207+ else
208+ einfo (_("%P: warning: library search path \"%s\" is unsafe for "
209+ "cross-compilation\n"), name);
210+ }
211+#endif
212+
213 }
214
215 /* Try to open a BFD for a lang_input_statement. */
216diff --git a/ld/ldlex.h b/ld/ldlex.h
217index e3e9b24..29487a3 100644
218--- a/ld/ldlex.h
219+++ b/ld/ldlex.h
220@@ -140,6 +140,8 @@ enum option_values
221 OPTION_IGNORE_UNRESOLVED_SYMBOL,
222 OPTION_PUSH_STATE,
223 OPTION_POP_STATE,
224+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
225+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
226 };
227
228 /* The initial parser states. */
229diff --git a/ld/ldmain.c b/ld/ldmain.c
230index 818d108..54c49f2 100644
231--- a/ld/ldmain.c
232+++ b/ld/ldmain.c
233@@ -266,6 +266,8 @@ main (int argc, char **argv)
234 command_line.warn_mismatch = TRUE;
235 command_line.warn_search_mismatch = TRUE;
236 command_line.check_section_addresses = -1;
237+ command_line.poison_system_directories = TRUE;
238+ command_line.error_poison_system_directories = FALSE;
239
240 /* We initialize DEMANGLING based on the environment variable
241 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
242diff --git a/ld/lexsup.c b/ld/lexsup.c
243index 4812c97..21b49df 100644
244--- a/ld/lexsup.c
245+++ b/ld/lexsup.c
217@@ -513,6 +513,14 @@ static const struct ld_option ld_options[] = 246@@ -513,6 +513,14 @@ static const struct ld_option ld_options[] =
218 { {"pop-state", no_argument, NULL, OPTION_POP_STATE}, 247 { {"pop-state", no_argument, NULL, OPTION_POP_STATE},
219 '\0', NULL, N_("Pop state of flags governing input file handling"), 248 '\0', NULL, N_("Pop state of flags governing input file handling"),
@@ -244,16 +273,6 @@ Index: binutils-2.24/ld/lexsup.c
244 } 273 }
245 } 274 }
246 275
247Index: binutils-2.24/ld/ldlex.h 276--
248=================================================================== 2772.1.4
249--- binutils-2.24.orig/ld/ldlex.h 2013-12-15 11:46:17.000000000 -0800 278
250+++ binutils-2.24/ld/ldlex.h 2013-12-15 11:47:43.230435299 -0800
251@@ -140,6 +140,8 @@ enum option_values
252 OPTION_IGNORE_UNRESOLVED_SYMBOL,
253 OPTION_PUSH_STATE,
254 OPTION_POP_STATE,
255+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
256+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
257 };
258
259 /* The initial parser states. */
diff --git a/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index 4fcffa471e..5451e743d7 100644
--- a/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,17 +1,27 @@
1Upstream-Status: Inappropriate [embedded specific] 1From edbee9a68e1c2e11c059668aa1d13001d9f3de06 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:42:38 +0000
4Subject: [PATCH 10/13] Fix rpath in libtool when sysroot is enabled
2 5
3Enabling sysroot support in libtool exposed a bug where the final 6Enabling sysroot support in libtool exposed a bug where the final
4library had an RPATH encoded into it which still pointed to the 7library had an RPATH encoded into it which still pointed to the
5sysroot. This works around the issue until it gets sorted out 8sysroot. This works around the issue until it gets sorted out
6upstream. 9upstream.
7 10
8Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org> 11Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org>
12
13Upstream-Status: Inappropriate [embedded specific]
14
9Signed-off-by: Scott Garman <scott.a.garman@intel.com> 15Signed-off-by: Scott Garman <scott.a.garman@intel.com>
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 ltmain.sh | 10 ++++++++--
19 1 file changed, 8 insertions(+), 2 deletions(-)
10 20
11Index: binutils-2.22/ltmain.sh 21diff --git a/ltmain.sh b/ltmain.sh
12=================================================================== 22index 70e856e..11ee684 100644
13--- binutils-2.22.orig/ltmain.sh 23--- a/ltmain.sh
14+++ binutils-2.22/ltmain.sh 24+++ b/ltmain.sh
15@@ -8035,9 +8035,11 @@ EOF 25@@ -8035,9 +8035,11 @@ EOF
16 test "$opt_mode" != relink && rpath="$compile_rpath$rpath" 26 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
17 for libdir in $rpath; do 27 for libdir in $rpath; do
@@ -37,3 +47,6 @@ Index: binutils-2.22/ltmain.sh
37 if test -n "$hardcode_libdir_separator"; then 47 if test -n "$hardcode_libdir_separator"; then
38 if test -z "$hardcode_libdirs"; then 48 if test -z "$hardcode_libdirs"; then
39 hardcode_libdirs="$libdir" 49 hardcode_libdirs="$libdir"
50--
512.1.4
52
diff --git a/meta/recipes-devtools/binutils/binutils/mips64-default-ld-emulation.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
index e668faa6e8..d9d57eee44 100644
--- a/meta/recipes-devtools/binutils/binutils/mips64-default-ld-emulation.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
@@ -1,15 +1,22 @@
1for mips64*-*-linux we change the default emulations to be 1From 2a5e8813d3c5db3e2b7d9dfa2ab27cccd5111e53 Mon Sep 17 00:00:00 2001
2N64 instead of N32 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:44:14 +0000
4Subject: [PATCH 11/13] Change default emulation for mips64*-*-linux
5
6we change the default emulations to be N64 instead of N32
3 7
4Upstream-Status: Inappropriate [ OE configuration Specific] 8Upstream-Status: Inappropriate [ OE configuration Specific]
5 9
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 bfd/config.bfd | 8 ++++----
13 ld/configure.tgt | 8 ++++----
14 2 files changed, 8 insertions(+), 8 deletions(-)
7 15
8Index: binutils-2.24/bfd/config.bfd 16diff --git a/bfd/config.bfd b/bfd/config.bfd
9=================================================================== 17index 7bcb92a..03d2c6f 100644
10--- binutils-2.24.orig/bfd/config.bfd 2013-11-04 07:33:37.000000000 -0800 18--- a/bfd/config.bfd
11+++ binutils-2.24/bfd/config.bfd 2013-12-15 11:54:57.113765374 -0800 19+++ b/bfd/config.bfd
12Index: binutils-2.24/ld/configure.tgt
13@@ -1062,12 +1062,12 @@ case "${targ}" in 20@@ -1062,12 +1062,12 @@ case "${targ}" in
14 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" 21 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
15 ;; 22 ;;
@@ -27,10 +34,11 @@ Index: binutils-2.24/ld/configure.tgt
27 ;; 34 ;;
28 mips*el-*-linux*) 35 mips*el-*-linux*)
29 targ_defvec=mips_elf32_trad_le_vec 36 targ_defvec=mips_elf32_trad_le_vec
30=================================================================== 37diff --git a/ld/configure.tgt b/ld/configure.tgt
31--- binutils-2.24.orig/ld/configure.tgt 2013-11-26 03:37:33.000000000 -0800 38index 24e36d1..740b2ea 100644
32+++ binutils-2.24/ld/configure.tgt 2013-12-15 11:50:52.273766155 -0800 39--- a/ld/configure.tgt
33@@ -471,11 +471,11 @@ 40+++ b/ld/configure.tgt
41@@ -476,11 +476,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks
34 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks 42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
35 targ_extra_emuls="elf32elmipvxworks" ;; 43 targ_extra_emuls="elf32elmipvxworks" ;;
36 mips*-*-windiss) targ_emul=elf32mipswindiss ;; 44 mips*-*-windiss) targ_emul=elf32mipswindiss ;;
@@ -46,3 +54,6 @@ Index: binutils-2.24/ld/configure.tgt
46 targ_extra_libpath=$targ_extra_emuls ;; 54 targ_extra_libpath=$targ_extra_emuls ;;
47 mips*el-*-linux-*) targ_emul=elf32ltsmip 55 mips*el-*-linux-*) targ_emul=elf32ltsmip
48 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" 56 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
57--
582.1.4
59
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
index b03bb28237..c56ff915b4 100644
--- a/meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
@@ -1,5 +1,7 @@
1Upstream-Status: Unknown 1From 448329ea097447aee73d050045295c5a0ae8519e Mon Sep 17 00:00:00 2001
2Signed-off-by: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:51:05 +0000
4Subject: [PATCH 12/13] Add XLP instructions support
3 5
4From 26adb06ce515aadfec08ce13109b4b98287f677b Mon Sep 17 00:00:00 2001 6From 26adb06ce515aadfec08ce13109b4b98287f677b Mon Sep 17 00:00:00 2001
5From: Nebu Philips <nphilips@netlogicmicro.com> 7From: Nebu Philips <nphilips@netlogicmicro.com>
@@ -26,6 +28,27 @@ Netlogic. Also, update vendor name to NLM wherever applicable.
26 opcodes/mips-opc.c | 33 +++++++++++++++++++++------------ 28 opcodes/mips-opc.c | 33 +++++++++++++++++++++------------
27 15 files changed, 65 insertions(+), 25 deletions(-) 29 15 files changed, 65 insertions(+), 25 deletions(-)
28 30
31Upstream-Status: Pending
32
33Signed-off-by: Khem Raj <raj.khem@gmail.com>
34---
35 bfd/aoutx.h | 1 +
36 bfd/archures.c | 1 +
37 bfd/bfd-in2.h | 1 +
38 bfd/config.bfd | 5 +++++
39 bfd/cpu-mips.c | 6 ++++--
40 bfd/elfxx-mips.c | 8 ++++++++
41 binutils/readelf.c | 1 +
42 gas/config/tc-mips.c | 4 +++-
43 gas/configure | 3 +++
44 gas/configure.tgt | 2 +-
45 include/elf/mips.h | 1 +
46 include/opcode/mips.h | 10 ++++++++--
47 ld/configure.tgt | 2 ++
48 opcodes/mips-dis.c | 12 +++++-------
49 opcodes/mips-opc.c | 33 +++++++++++++++++++++------------
50 15 files changed, 65 insertions(+), 25 deletions(-)
51
29diff --git a/bfd/aoutx.h b/bfd/aoutx.h 52diff --git a/bfd/aoutx.h b/bfd/aoutx.h
30index 9385a98..a88df99 100644 53index 9385a98..a88df99 100644
31--- a/bfd/aoutx.h 54--- a/bfd/aoutx.h
@@ -63,7 +86,7 @@ index c7a2bb5..413b773 100644
63 #define bfd_mach_mipsisa32r2 33 86 #define bfd_mach_mipsisa32r2 33
64 #define bfd_mach_mipsisa32r3 34 87 #define bfd_mach_mipsisa32r3 34
65diff --git a/bfd/config.bfd b/bfd/config.bfd 88diff --git a/bfd/config.bfd b/bfd/config.bfd
66index 03d2c6f..91cedb8 100644 89index 03d2c6f..27086db 100644
67--- a/bfd/config.bfd 90--- a/bfd/config.bfd
68+++ b/bfd/config.bfd 91+++ b/bfd/config.bfd
69@@ -1041,6 +1041,11 @@ case "${targ}" in 92@@ -1041,6 +1041,11 @@ case "${targ}" in
@@ -103,7 +126,7 @@ index b617aaa..19a99d1 100644
103 126
104 /* The default architecture is mips:3000, but with a machine number of 127 /* The default architecture is mips:3000, but with a machine number of
105diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c 128diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
106index a0cc26e..672d5b3 100644 129index 0df7abf..d268e86 100644
107--- a/bfd/elfxx-mips.c 130--- a/bfd/elfxx-mips.c
108+++ b/bfd/elfxx-mips.c 131+++ b/bfd/elfxx-mips.c
109@@ -6608,6 +6608,9 @@ _bfd_elf_mips_mach (flagword flags) 132@@ -6608,6 +6608,9 @@ _bfd_elf_mips_mach (flagword flags)
@@ -127,7 +150,7 @@ index a0cc26e..672d5b3 100644
127 case bfd_mach_mipsisa32: 150 case bfd_mach_mipsisa32:
128 val = E_MIPS_ARCH_32; 151 val = E_MIPS_ARCH_32;
129 break; 152 break;
130@@ -14753,6 +14760,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = 153@@ -14765,6 +14772,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
131 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon }, 154 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
132 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 }, 155 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
133 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 }, 156 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 },
@@ -177,7 +200,7 @@ index c3e3e2a..8d64344 100644
177 /* End marker */ 200 /* End marker */
178 { NULL, 0, 0, 0, 0 } 201 { NULL, 0, 0, 0, 0 }
179diff --git a/gas/configure b/gas/configure 202diff --git a/gas/configure b/gas/configure
180index 9529f1a..63bba5b 100755 203index 074886f..8091f2f 100755
181--- a/gas/configure 204--- a/gas/configure
182+++ b/gas/configure 205+++ b/gas/configure
183@@ -12808,6 +12808,9 @@ _ACEOF 206@@ -12808,6 +12808,9 @@ _ACEOF
@@ -191,7 +214,7 @@ index 9529f1a..63bba5b 100755
191 mips_cpu=r3900 214 mips_cpu=r3900
192 ;; 215 ;;
193diff --git a/gas/configure.tgt b/gas/configure.tgt 216diff --git a/gas/configure.tgt b/gas/configure.tgt
194index 05546ca..bb859d6 100644 217index 1d92f55..06e8b4f 100644
195--- a/gas/configure.tgt 218--- a/gas/configure.tgt
196+++ b/gas/configure.tgt 219+++ b/gas/configure.tgt
197@@ -332,7 +332,7 @@ case ${generic_target} in 220@@ -332,7 +332,7 @@ case ${generic_target} in
@@ -204,7 +227,7 @@ index 05546ca..bb859d6 100644
204 mips-*-openbsd*) fmt=elf em=tmips ;; 227 mips-*-openbsd*) fmt=elf em=tmips ;;
205 228
206diff --git a/include/elf/mips.h b/include/elf/mips.h 229diff --git a/include/elf/mips.h b/include/elf/mips.h
207index 2ed6acd..899b1e5 100644 230index 2ed6acd..e541f50 100644
208--- a/include/elf/mips.h 231--- a/include/elf/mips.h
209+++ b/include/elf/mips.h 232+++ b/include/elf/mips.h
210@@ -285,6 +285,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) 233@@ -285,6 +285,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
@@ -287,7 +310,7 @@ index 1eb1d45..d6881af 100644
287 /* This entry, mips16, is here only for ISA/processor selection; do 310 /* This entry, mips16, is here only for ISA/processor selection; do
288 not print its name. */ 311 not print its name. */
289diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c 312diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
290index 2c3bbad..86eb95b 100644 313index 2c3bbad..9785a7e 100644
291--- a/opcodes/mips-opc.c 314--- a/opcodes/mips-opc.c
292+++ b/opcodes/mips-opc.c 315+++ b/opcodes/mips-opc.c
293@@ -319,7 +319,8 @@ decode_mips_operand (const char *p) 316@@ -319,7 +319,8 @@ decode_mips_operand (const char *p)
@@ -331,8 +354,7 @@ index 2c3bbad..86eb95b 100644
331 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, 354 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
332 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, 355 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
333 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, 356 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },
334@@ -1079,6 +1083,8 @@ const struct mips_opcode mips_builtin_opcodes[] = 357@@ -1080,6 +1084,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
335 /* dmtc2 is at the bottom of the table. */
336 /* dmfc3 is at the bottom of the table. */ 358 /* dmfc3 is at the bottom of the table. */
337 /* dmtc3 is at the bottom of the table. */ 359 /* dmtc3 is at the bottom of the table. */
338 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 360 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
@@ -340,6 +362,7 @@ index 2c3bbad..86eb95b 100644
340+{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, 362+{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },
341 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, 363 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
342 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, 364 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
365 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },
343@@ -1229,9 +1235,9 @@ const struct mips_opcode mips_builtin_opcodes[] = 366@@ -1229,9 +1235,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
344 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, 367 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
345 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, 368 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
@@ -400,3 +423,6 @@ index 2c3bbad..86eb95b 100644
400 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 423 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
401 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, 424 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
402 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, 425 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },
426--
4272.1.4
428
diff --git a/meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch b/meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
index a47faef352..aee01c0b41 100644
--- a/meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
+++ b/meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
@@ -1,8 +1,8 @@
1From 54583eb23233b5369372ae41768655693d0584ef Mon Sep 17 00:00:00 2001 1From 8e8f77ec2b6262e7d10af54700c340173d957267 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 27 Feb 2015 09:05:49 +0000 3Date: Fri, 27 Feb 2015 09:05:49 +0000
4Subject: [PATCH] Fix an internal error in do_print_to_mapfile seen with gold 4Subject: [PATCH 13/13] Fix an internal error in do_print_to_mapfile seen with
5 on arm 5 gold on arm
6 6
7This is due to missing implementation of do_print_to_mapfile for 7This is due to missing implementation of do_print_to_mapfile for
8atrributea section (ARM.attributes), it started to show up after fix 8atrributea section (ARM.attributes), it started to show up after fix
@@ -12,12 +12,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 12
13Upstream-Status: Submitted 13Upstream-Status: Submitted
14--- 14---
15 gold/ChangeLog | 5 +++++
16 gold/attributes.h | 4 ++++ 15 gold/attributes.h | 4 ++++
17 2 files changed, 9 insertions(+) 16 1 file changed, 4 insertions(+)
18 17
19diff --git a/gold/attributes.h b/gold/attributes.h 18diff --git a/gold/attributes.h b/gold/attributes.h
20index c0b171f..6e3ab8c 100644 19index 2aa7a78..3d126e6 100644
21--- a/gold/attributes.h 20--- a/gold/attributes.h
22+++ b/gold/attributes.h 21+++ b/gold/attributes.h
23@@ -387,6 +387,10 @@ class Output_attributes_section_data : public Output_section_data 22@@ -387,6 +387,10 @@ class Output_attributes_section_data : public Output_section_data
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch b/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
deleted file mode 100644
index 97ad6dffba..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Add the armv5e architecture to binutils
2
3Binutils has a comment that indicates it is supposed to match gcc for all of
4the support "-march=" settings, but it was lacking the armv5e setting. This
5was a simple way to add it, as thumb instructions shouldn't be generated by
6the compiler anyway.
7
8Upstream-Status: Denied
9Upstream maintainer indicated that we should not be using armv5e, even though
10it is a legal archicture defined by our gcc.
11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13
14Index: binutils-2.22.90/gas/config/tc-arm.c
15===================================================================
16--- binutils-2.22.90.orig/gas/config/tc-arm.c 2012-07-24 09:38:32.000000000 -0700
17+++ binutils-2.22.90/gas/config/tc-arm.c 2012-08-07 23:41:59.822564075 -0700
18@@ -23162,6 +23162,7 @@
19 ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA),
20 ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA),
21 ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP),
22+ ARM_ARCH_OPT ("armv5e", ARM_ARCH_V5TE, FPU_ARCH_VFP),
23 ARM_ARCH_OPT ("armv5t", ARM_ARCH_V5T, FPU_ARCH_VFP),
24 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP),
25 ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP),
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch
deleted file mode 100644
index b5a25c2389..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Upstream-Status: Pending
2
3Index: binutils-2.22/configure
4===================================================================
5--- binutils-2.22.orig/configure
6+++ binutils-2.22/configure
7@@ -3130,7 +3130,7 @@ case "${target}" in
8 ;;
9 s390-*-* | s390x-*-*)
10 ;;
11- sh-*-* | sh[34]*-*-*)
12+ sh*-*-* | sh[34]*-*-*)
13 ;;
14 sh64-*-* | sh5*-*-*)
15 ;;
16@@ -3570,7 +3570,7 @@ case "${target}" in
17 mips*-*-*)
18 noconfigdirs="$noconfigdirs gprof"
19 ;;
20- sh-*-* | sh64-*-*)
21+ sh*-*-* | sh64-*-*)
22 case "${target}" in
23 sh*-*-elf)
24 ;;
25Index: binutils-2.22/gprof/configure
26===================================================================
27--- binutils-2.22.orig/gprof/configure
28+++ binutils-2.22/gprof/configure
29@@ -6103,6 +6103,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
30 lt_cv_deplibs_check_method=pass_all
31 ;;
32
33+linux-uclibc*)
34+ lt_cv_deplibs_check_method=pass_all
35+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
36+ ;;
37+
38 netbsd*)
39 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
40 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch
deleted file mode 100644
index c6e1efcea0..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1#!/bin/sh -e
2## 001_ld_makefile_patch.dpatch
3##
4## All lines beginning with `## DP:' are a description of the patch.
5## DP: Description: correct where ld scripts are installed
6## DP: Author: Chris Chimelis <chris@debian.org>
7## DP: Upstream status: N/A
8## DP: Date: ??
9
10if [ $# -ne 1 ]; then
11 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
12 exit 1
13fi
14
15[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
16patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
17
18case "$1" in
19 -patch) patch $patch_opts -p1 < $0;;
20 -unpatch) patch $patch_opts -p1 -R < $0;;
21 *)
22 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
23 exit 1;;
24esac
25
26exit 0
27Upstream-Status: Inappropriate [debian patch]
28
29@DPATCH@
30Index: binutils-2.22/ld/Makefile.am
31===================================================================
32--- binutils-2.22.orig/ld/Makefile.am
33+++ binutils-2.22/ld/Makefile.am
34@@ -37,7 +37,7 @@ endif
35 # We put the scripts in the directory $(scriptdir)/ldscripts.
36 # We can't put the scripts in $(datadir) because the SEARCH_DIR
37 # directives need to be different for native and cross linkers.
38-scriptdir = $(tooldir)/lib
39+scriptdir = $(libdir)
40
41 EMUL = @EMUL@
42 EMULATION_OFILES = @EMULATION_OFILES@
43Index: binutils-2.22/ld/Makefile.in
44===================================================================
45--- binutils-2.22.orig/ld/Makefile.in
46+++ binutils-2.22/ld/Makefile.in
47@@ -366,7 +366,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
48 # We put the scripts in the directory $(scriptdir)/ldscripts.
49 # We can't put the scripts in $(datadir) because the SEARCH_DIR
50 # directives need to be different for native and cross linkers.
51-scriptdir = $(tooldir)/lib
52+scriptdir = $(libdir)
53 BASEDIR = $(srcdir)/..
54 BFDDIR = $(BASEDIR)/bfd
55 INCDIR = $(BASEDIR)/include
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch
deleted file mode 100644
index 47bd8ff109..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1#!/bin/sh -e
2## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
3##
4## All lines beginning with `## DP:' are a description of the patch.
5## DP: Specify which filename is causing an error if the filename is a
6## DP: directory. (#45832)
7
8if [ $# -ne 1 ]; then
9 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
10 exit 1
11fi
12
13[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
14patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
15
16case "$1" in
17 -patch) patch $patch_opts -p1 < $0;;
18 -unpatch) patch $patch_opts -p1 -R < $0;;
19 *)
20 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
21 exit 1;;
22esac
23
24exit 0
25Upstream-Status: Inappropriate [debian patch]
26
27@DPATCH@
28Index: binutils-2.22/bfd/opncls.c
29===================================================================
30--- binutils-2.22.orig/bfd/opncls.c
31+++ binutils-2.22/bfd/opncls.c
32@@ -197,6 +197,13 @@ bfd_fopen (const char *filename, const c
33 {
34 bfd *nbfd;
35 const bfd_target *target_vec;
36+ struct stat s;
37+
38+ if (stat (filename, &s) == 0)
39+ if (S_ISDIR(s.st_mode)) {
40+ bfd_set_error (bfd_error_file_not_recognized);
41+ return NULL;
42+ }
43
44 nbfd = _bfd_new_bfd ();
45 if (nbfd == NULL)
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
deleted file mode 100644
index d31f80cd3d..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1#!/bin/sh -e
2## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
3##
4## All lines beginning with `## DP:' are a description of the patch.
5## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
6## DP: cases where -rpath isn't specified. (#151024)
7
8if [ $# -ne 1 ]; then
9 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
10 exit 1
11fi
12
13[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
14patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
15
16case "$1" in
17 -patch) patch $patch_opts -p1 < $0;;
18 -unpatch) patch $patch_opts -p1 -R < $0;;
19 *)
20 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
21 exit 1;;
22esac
23
24exit 0
25Upstream-Status: Inappropriate [debian patch]
26
27@DPATCH@
28Index: binutils-2.22/ld/emultempl/elf32.em
29===================================================================
30--- binutils-2.22.orig/ld/emultempl/elf32.em
31+++ binutils-2.22/ld/emultempl/elf32.em
32@@ -1273,6 +1273,8 @@ fragment <<EOF
33 && command_line.rpath == NULL)
34 {
35 lib_path = (const char *) getenv ("LD_RUN_PATH");
36+ if ((lib_path) && (strlen (lib_path) == 0))
37+ lib_path = NULL;
38 if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
39 force))
40 break;
41@@ -1500,6 +1502,8 @@ gld${EMULATION_NAME}_before_allocation (
42 rpath = command_line.rpath;
43 if (rpath == NULL)
44 rpath = (const char *) getenv ("LD_RUN_PATH");
45+ if ((rpath) && (strlen (rpath) == 0))
46+ rpath = NULL;
47
48 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
49 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch
deleted file mode 100644
index 3869faff0e..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Source: Khem Raj <raj.khem@gmail.com>
2Disposition: submit upstream.
3Upstream-Status: Pending
4
5Description:
6
7We do not need to have the libtool patch anymore for binutils after
8libtool has been updated upstream it include support for it. However
9for building gas natively on uclibc systems we have to link it with
10-lm so that it picks up missing symbols.
11
12/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_from_double':
13floatformat.c:(.text+0x1ec): undefined reference to `frexp'
14floatformat.c:(.text+0x2f8): undefined reference to `ldexp'
15/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_to_double':
16floatformat.c:(.text+0x38a): undefined reference to `ldexp'
17floatformat.c:(.text+0x3d2): undefined reference to `ldexp'
18floatformat.c:(.text+0x43e): undefined reference to `ldexp' floatformat.c:(.text+0x4e2): undefined reference to `ldexp'
19collect2: ld returned 1 exit status
20make[4]: *** [as-new] Error 1
21
22Index: binutils-2.22/gas/configure.tgt
23===================================================================
24--- binutils-2.22.orig/gas/configure.tgt
25+++ binutils-2.22/gas/configure.tgt
26@@ -428,6 +428,12 @@ case ${generic_target} in
27 *-*-netware) fmt=elf em=netware ;;
28 esac
29
30+case ${generic_target} in
31+ arm-*-*uclibc*)
32+ need_libm=yes
33+ ;;
34+esac
35+
36 case ${cpu_type} in
37 alpha | arm | i386 | ia64 | microblaze | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
38 bfd_gas=yes
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uninitialised-warning.patch b/meta/recipes-devtools/binutils/binutils/binutils-uninitialised-warning.patch
deleted file mode 100644
index 2feb80c4d2..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uninitialised-warning.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From f9c316c4d75be236bbaa8464ef803ed2d3859d6d Mon Sep 17 00:00:00 2001
2From: H.J. Lu <hjl.tools@gmail.com>
3Date: Wed, 15 Jan 2014 07:43:19 -0800
4Subject: [PATCH 1/1] Silence uninitialized warning on ehdr_start_save
5
6Older GCC, like 4.1/4.2, will issue an uninitialized warning on
7ehdr_start_save. This patch silences by using
8
9struct bfd_link_hash_entry ehdr_start_save = ehdr_start_save;
10
11 * emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation):
12 Silence uninitialized warning on ehdr_start_save with older
13 GCC.
14
15Upstream-Status: Backport
16---
17 ld/ChangeLog | 6 ++++++
18 ld/emultempl/elf32.em | 2 +-
19 2 files changed, 7 insertions(+), 1 deletions(-)
20
21#diff --git a/ld/ChangeLog b/ld/ChangeLog
22#index eaa6b93..91055de 100644
23#--- a/ld/ChangeLog
24#+++ b/ld/ChangeLog
25#@@ -1,3 +1,9 @@
26#+2014-01-15 H.J. Lu <hongjiu.lu@intel.com>
27#+
28#+ * emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation):
29#+ Silence uninitialized warning on ehdr_start_save with older
30#+ GCC.
31#+
32# 2014-01-15 Alan Modra <amodra@gmail.com>
33#
34# * emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation): Define
35diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
36index 13f86f0..569c7f7 100644
37--- a/ld/emultempl/elf32.em
38+++ b/ld/emultempl/elf32.em
39@@ -1481,7 +1481,7 @@ gld${EMULATION_NAME}_before_allocation (void)
40 asection *sinterp;
41 bfd *abfd;
42 struct elf_link_hash_entry *ehdr_start = NULL;
43- struct bfd_link_hash_entry ehdr_start_save;
44+ struct bfd_link_hash_entry ehdr_start_save = ehdr_start_save;
45
46 if (is_elf_hash_table (link_info.hash))
47 {
48--
491.7.1
50
diff --git a/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch b/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch
deleted file mode 100644
index 6e732fbd0a..0000000000
--- a/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3don't let the distro compiler point to the wrong installation location
4
5Thanks to RP for helping find the source code causing the issue.
6
72010/08/13
8Nitin A Kamble <nitin.a.kamble@intel.com>
9Index: binutils-2.22/libiberty/Makefile.in
10===================================================================
11--- binutils-2.22.orig/libiberty/Makefile.in
12+++ binutils-2.22/libiberty/Makefile.in
13@@ -350,7 +350,8 @@ install-strip: install
14 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
15 # default multilib, so we have to take CFLAGS into account as well,
16 # since it will be passed the multilib flags.
17-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
18+#MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
19+MULTIOSDIR = ""
20 install_to_libdir: all
21 ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
22 $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n