summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/layer.conf6
-rw-r--r--recipes-devtools/binutils/binutils-2.25.1.inc46
-rw-r--r--recipes-devtools/binutils/binutils-cross-canadian.inc29
-rw-r--r--recipes-devtools/binutils/binutils-cross-canadian_2.25.1.bb3
-rw-r--r--recipes-devtools/binutils/binutils-cross.inc30
-rw-r--r--recipes-devtools/binutils/binutils-cross_2.25.1.bb3
-rw-r--r--recipes-devtools/binutils/binutils-crosssdk_2.25.1.bb13
-rw-r--r--recipes-devtools/binutils/binutils.inc151
-rw-r--r--recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch62
-rw-r--r--recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch56
-rw-r--r--recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch42
-rw-r--r--recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch41
-rw-r--r--recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch52
-rw-r--r--recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch19361
-rw-r--r--recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch35
-rw-r--r--recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch35
-rw-r--r--recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch278
-rw-r--r--recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch52
-rw-r--r--recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch59
-rw-r--r--recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch434
-rw-r--r--recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch35
-rw-r--r--recipes-devtools/binutils/binutils/0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch25
-rw-r--r--recipes-devtools/binutils/binutils/0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch131
-rw-r--r--recipes-devtools/binutils/binutils/0016-This-patch-adds-IFUNC-support-for-arm-gold-backend.patch1004
-rw-r--r--recipes-devtools/binutils/binutils/add-thunderx-support-for-gas.patch33
-rw-r--r--recipes-devtools/binutils/binutils/binutils-octeon3.patch272
-rw-r--r--recipes-devtools/binutils/binutils_2.25.1.bb39
27 files changed, 0 insertions, 22327 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 3c1a72f..d2e366f 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,9 +11,3 @@ BBFILE_COLLECTIONS += "enea-bsp-ppc"
11BBFILE_PATTERN_enea-bsp-ppc = "^${LAYERDIR}/" 11BBFILE_PATTERN_enea-bsp-ppc = "^${LAYERDIR}/"
12BBFILE_PRIORITY_enea-bsp-ppc = "6" 12BBFILE_PRIORITY_enea-bsp-ppc = "6"
13LAYERDEPENDS_enea-bsp-ppc = "enea-bsp-common freescale-layer" 13LAYERDEPENDS_enea-bsp-ppc = "enea-bsp-common freescale-layer"
14
15PREFERRED_VERSION_binutils_e500mc = "2.25.1"
16PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}_e500mc = "2.25.1"
17PREFERRED_VERSION_binutils-cross-${TARGET_ARCH}_e500mc = "2.25.1"
18PREFERRED_VERSION_binutils-crosssdk-${SDK_ARCH}_e500mc = "2.25.1"
19PREFERRED_VERSION_binutils-native_e500mc = "2.25.1"
diff --git a/recipes-devtools/binutils/binutils-2.25.1.inc b/recipes-devtools/binutils/binutils-2.25.1.inc
deleted file mode 100644
index dc23c4d..0000000
--- a/recipes-devtools/binutils/binutils-2.25.1.inc
+++ /dev/null
@@ -1,46 +0,0 @@
1LIC_FILES_CHKSUM="\
2 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
3 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\
4 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\
5 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6\
6 file://gas/COPYING;md5=d32239bcb673463ab874e80d47fae504\
7 file://include/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
8 file://include/COPYING3;md5=d32239bcb673463ab874e80d47fae504\
9 file://libiberty/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7\
10 file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
11 "
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
19UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
20
21SRCREV = "2bd25930221dea4bf33c13a89c111514491440e2"
22SRC_URI = "\
23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
24 file://0002-configure-widen-the-regexp-for-SH-architectures.patch \
25 file://0003-Point-scripts-location-to-libdir.patch \
26 file://0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
27 file://0005-Explicitly-link-with-libm-on-uclibc.patch \
28 file://0006-Use-libtool-2.4.patch \
29 file://0007-Add-the-armv5e-architecture-to-binutils.patch \
30 file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
31 file://0009-Upstream-Status-Inappropriate-distribution-codesourc.patch \
32 file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
33 file://0011-Change-default-emulation-for-mips64-linux.patch \
34 file://0012-Add-XLP-instructions-support.patch \
35 file://0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch \
36 file://0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch \
37 file://0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch \
38 file://0016-This-patch-adds-IFUNC-support-for-arm-gold-backend.patch \
39 file://binutils-octeon3.patch \
40 file://add-thunderx-support-for-gas.patch \
41 "
42S = "${WORKDIR}/git"
43
44do_configure_prepend () {
45 rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim
46}
diff --git a/recipes-devtools/binutils/binutils-cross-canadian.inc b/recipes-devtools/binutils/binutils-cross-canadian.inc
deleted file mode 100644
index ae14642..0000000
--- a/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ /dev/null
@@ -1,29 +0,0 @@
1inherit cross-canadian
2
3SUMMARY = "GNU binary utilities (cross-canadian for ${TARGET_ARCH} target)"
4PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}"
5BPN = "binutils"
6
7DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex"
8EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \
9 "
10
11# We have to point binutils at a sysroot but we don't need to rebuild if this changes
12# e.g. we switch between different machines with different tunes.
13EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH"
14
15do_install () {
16 autotools_do_install
17
18 # We're not interested in the libs or headers, these would come from the
19 # nativesdk or target version of the binutils recipe
20 rm -rf ${D}${prefix}/${TARGET_SYS}
21 rm -f ${D}${libdir}/libbfd*
22 rm -f ${D}${libdir}/libiberty*
23 rm -f ${D}${libdir}/libopcodes*
24 rm -f ${D}${includedir}/*.h
25
26 cross_canadian_bindirlinks
27}
28
29BBCLASSEXTEND = ""
diff --git a/recipes-devtools/binutils/binutils-cross-canadian_2.25.1.bb b/recipes-devtools/binutils/binutils-cross-canadian_2.25.1.bb
deleted file mode 100644
index 5dbaa03..0000000
--- a/recipes-devtools/binutils/binutils-cross-canadian_2.25.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require binutils.inc
2require binutils-${PV}.inc
3require binutils-cross-canadian.inc
diff --git a/recipes-devtools/binutils/binutils-cross.inc b/recipes-devtools/binutils/binutils-cross.inc
deleted file mode 100644
index fd3d801..0000000
--- a/recipes-devtools/binutils/binutils-cross.inc
+++ /dev/null
@@ -1,30 +0,0 @@
1inherit cross
2PROVIDES = "virtual/${TARGET_PREFIX}binutils"
3
4PN = "binutils-cross-${TARGET_ARCH}"
5BPN = "binutils"
6
7INHIBIT_DEFAULT_DEPS = "1"
8INHIBIT_AUTOTOOLS_DEPS = "1"
9
10EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_TARGET} \
11 --disable-install-libbfd \
12 --enable-poison-system-directories \
13 "
14do_install () {
15 oe_runmake 'DESTDIR=${D}' install
16
17 # We don't really need these, so we'll remove them...
18 rm -rf ${D}${STAGING_DIR_NATIVE}${libdir_native}/libiberty.a
19 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}
20 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/ldscripts
21 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/info
22 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/locale
23 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/man
24 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/share || :
25 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}/gcc-lib || :
26 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64/gcc-lib || :
27 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir} || :
28 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || :
29 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || :
30}
diff --git a/recipes-devtools/binutils/binutils-cross_2.25.1.bb b/recipes-devtools/binutils/binutils-cross_2.25.1.bb
deleted file mode 100644
index fbd1f7d..0000000
--- a/recipes-devtools/binutils/binutils-cross_2.25.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require binutils.inc
2require binutils-${PV}.inc
3require binutils-cross.inc
diff --git a/recipes-devtools/binutils/binutils-crosssdk_2.25.1.bb b/recipes-devtools/binutils/binutils-crosssdk_2.25.1.bb
deleted file mode 100644
index 788106f..0000000
--- a/recipes-devtools/binutils/binutils-crosssdk_2.25.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require binutils-cross_${PV}.bb
2
3inherit crosssdk
4
5PN = "binutils-crosssdk-${TARGET_ARCH}"
6
7PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
8
9SRC_URI += "file://0001-Generate-relocatable-SDKs.patch"
10
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
13}
diff --git a/recipes-devtools/binutils/binutils.inc b/recipes-devtools/binutils/binutils.inc
deleted file mode 100644
index 79e2a12..0000000
--- a/recipes-devtools/binutils/binutils.inc
+++ /dev/null
@@ -1,151 +0,0 @@
1SUMMARY = "GNU binary utilities"
2DESCRIPTION = "The GNU Binutils are a collection of binary tools. \
3The main ones are ld (GNU Linker), and as (GNU Assembler). This \
4package also includes addition tools such as addr2line (Converts \
5addresses into filenames and line numbers), ar (utility for creating, \
6modifying and extracting archives), nm (list symbols in object \
7files), objcopy (copy and translate object files), objdump (Display \
8object information), and other tools and related libraries."
9HOMEPAGE = "http://www.gnu.org/software/binutils/"
10BUGTRACKER = "http://sourceware.org/bugzilla/"
11SECTION = "devel"
12LICENSE = "GPLv3"
13
14DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native"
15
16inherit autotools gettext multilib_header texinfo
17
18FILES_${PN} = " \
19 ${bindir}/${TARGET_PREFIX}* \
20 ${libdir}/lib*-*.so \
21 ${prefix}/${TARGET_SYS}/bin/* \
22 ${bindir}/embedspu"
23
24RPROVIDES_${PN} += "${PN}-symlinks"
25
26FILES_${PN}-dev = " \
27 ${includedir} \
28 ${libdir}/*.la \
29 ${libdir}/libbfd.so \
30 ${libdir}/libopcodes.so"
31
32# Rather than duplicating multiple entries for these, make one
33# list and reuse it.
34
35USE_ALTERNATIVES_FOR = " \
36 addr2line \
37 ar \
38 as \
39 c++filt \
40 elfedit \
41 gprof \
42 ld \
43 ld.bfd \
44 ld.gold dwp \
45 nm \
46 objcopy \
47 objdump \
48 ranlib \
49 readelf \
50 size \
51 strings \
52 strip \
53"
54
55python do_package_prepend() {
56 make_alts = d.getVar("USE_ALTERNATIVES_FOR", True) or ""
57 prefix = d.getVar("TARGET_PREFIX", True)
58 bindir = d.getVar("bindir", True)
59 for alt in make_alts.split():
60 d.setVarFlag('ALTERNATIVE_TARGET', alt, bindir + "/" + prefix + alt)
61 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt, bindir + "/" + alt)
62}
63
64B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
65
66EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
67 --disable-werror \
68 --enable-plugins \
69 ${LDGOLD} \
70 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
71
72LDGOLD_class-native = ""
73LDGOLD_class-crosssdk = ""
74LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default', d)}"
75
76# This is necessary due to a bug in the binutils Makefiles
77# EXTRA_OEMAKE = "configure-build-libiberty all"
78
79export AR = "${HOST_PREFIX}ar"
80export AS = "${HOST_PREFIX}as"
81export LD = "${HOST_PREFIX}ld"
82export NM = "${HOST_PREFIX}nm"
83export RANLIB = "${HOST_PREFIX}ranlib"
84export OBJCOPY = "${HOST_PREFIX}objcopy"
85export OBJDUMP = "${HOST_PREFIX}objdump"
86
87export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
88export AS_FOR_TARGET = "${TARGET_PREFIX}as"
89export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
90export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
91export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
92
93export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
94export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
95
96# autotools.bbclass sets the _FOR_BUILD variables, but for some reason we need
97# to unset LD_LIBRARY_PATH.
98export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
99
100MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}"
101do_configure[vardeps] += "MULTIARCH"
102do_configure () {
103 (cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
104 oe_runconf
105#
106# must prime config.cache to ensure the build of libiberty
107#
108 mkdir -p ${B}/build-${BUILD_SYS}
109 for i in ${CONFIG_SITE}; do
110 cat $i >> ${B}/build-${BUILD_SYS}/config.cache || true
111 done
112}
113
114do_install () {
115 autotools_do_install
116
117 # We don't really need these, so we'll remove them...
118 rm -rf ${D}${libdir}/ldscripts
119
120 # Fix the /usr/${TARGET_SYS}/bin/* links
121 for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
122 rm -f $l
123 ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
124 | tr -s / \
125 | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
126 done
127
128 # Install the libiberty header
129 install -d ${D}${includedir}
130 install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
131 install -m 644 ${S}/include/libiberty.h ${D}${includedir}
132
133 cd ${D}${bindir}
134
135 # Symlinks for ease of running these on the native target
136 for p in ${TARGET_PREFIX}* ; do
137 ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,`
138 done
139
140 for alt in ${USE_ALTERNATIVES_FOR}; do
141 rm -f ${D}${bindir}/$alt
142 done
143
144 oe_multilib_header bfd.h
145}
146
147inherit update-alternatives
148
149ALTERNATIVE_PRIORITY = "100"
150
151ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}"
diff --git a/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch b/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
deleted file mode 100644
index 1e80c1f..0000000
--- a/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
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.
10
11Upstream-Status: Inappropriate [SDK specific]
12
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(-)
19
20diff --git a/ld/genscripts.sh b/ld/genscripts.sh
21index 499607a..075dd04 100755
22--- a/ld/genscripts.sh
23+++ b/ld/genscripts.sh
24@@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
25 LD_FLAG=r
26 DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
27 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
28+PARTIAL_LINKING=" "
29 ( echo "/* Script for ld -r: link without relocation */"
30 . ${CUSTOMIZER_SCRIPT}
31 . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
32@@ -285,10 +286,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
33 LD_FLAG=u
34 DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
35 CONSTRUCTING=" "
36+PARTIAL_LINKING=" "
37 ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */"
38 . ${CUSTOMIZER_SCRIPT}
39 . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
40 ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu
41+unset PARTIAL_LINKING
42
43 LD_FLAG=
44 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
45diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
46index 4368fd9..9f01e8c 100644
47--- a/ld/scripttempl/elf.sc
48+++ b/ld/scripttempl/elf.sc
49@@ -131,8 +131,8 @@ if test -n "${COMMONPAGESIZE}"; then
50 DATA_SEGMENT_END=". = DATA_SEGMENT_END (.);"
51 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
52 fi
53-if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then
54- INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }"
55+if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}${PARTIAL_LINKING}"; then
56+ INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp); . = 0x1000; }"
57 fi
58 if test -z "$PLT"; then
59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"
60--
612.1.4
62
diff --git a/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch b/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
deleted file mode 100644
index 34e21d1..0000000
--- a/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
+++ /dev/null
@@ -1,56 +0,0 @@
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/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch b/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
deleted file mode 100644
index f5ce767..0000000
--- a/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
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/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
deleted file mode 100644
index e3cd2a4..0000000
--- a/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ /dev/null
@@ -1,41 +0,0 @@
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/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch b/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
deleted file mode 100644
index 9bbd93e..0000000
--- a/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
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/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
deleted file mode 100644
index 62967ef..0000000
--- a/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
+++ /dev/null
@@ -1,19361 +0,0 @@
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
5
6So we can get libtool sysroot support
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 bfd/configure | 1320 +++++++++++++++++------
13 bfd/configure.ac | 2 +-
14 binutils/configure | 1318 +++++++++++++++++------
15 configure | 2 +-
16 gas/configure | 1318 +++++++++++++++++------
17 gprof/configure | 1323 +++++++++++++++++------
18 ld/configure | 1701 +++++++++++++++++++++--------
19 libtool.m4 | 1086 +++++++++++++------
20 ltmain.sh | 2925 +++++++++++++++++++++++++++++++++-----------------
21 ltoptions.m4 | 2 +-
22 ltversion.m4 | 12 +-
23 lt~obsolete.m4 | 2 +-
24 opcodes/configure | 1320 +++++++++++++++++------
25 opcodes/configure.ac | 2 +-
26 14 files changed, 8952 insertions(+), 3381 deletions(-)
27
28diff --git a/bfd/configure b/bfd/configure
29index 85e6b82..3d3dd88 100755
30--- a/bfd/configure
31+++ b/bfd/configure
32@@ -668,6 +668,9 @@ OTOOL
33 LIPO
34 NMEDIT
35 DSYMUTIL
36+MANIFEST_TOOL
37+ac_ct_AR
38+DLLTOOL
39 OBJDUMP
40 LN_S
41 NM
42@@ -780,6 +783,7 @@ enable_static
43 with_pic
44 enable_fast_install
45 with_gnu_ld
46+with_libtool_sysroot
47 enable_libtool_lock
48 enable_plugins
49 enable_largefile
50@@ -1456,6 +1460,8 @@ Optional Packages:
51 --with-pic try to use only PIC/non-PIC objects [default=use
52 both]
53 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
54+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
55+ (or the compiler's sysroot if not specified).
56 --with-mmap try using mmap for BFD input files if available
57 --with-separate-debug-dir=DIR
58 Look for global separate debug info in DIR
59@@ -5386,8 +5392,8 @@ esac
60
61
62
63-macro_version='2.2.7a'
64-macro_revision='1.3134'
65+macro_version='2.4'
66+macro_revision='1.3293'
67
68
69
70@@ -5427,7 +5433,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
72 $as_echo_n "checking how to print strings... " >&6; }
73 # Test print first, because it will be a builtin if present.
74-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
75+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
76 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
77 ECHO='print -r --'
78 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
79@@ -6113,8 +6119,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
80 # Try some XSI features
81 xsi_shell=no
82 ( _lt_dummy="a/b/c"
83- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
84- = c,a/b,, \
85+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
86+ = c,a/b,b/c, \
87 && eval 'test $(( 1 + 1 )) -eq 2 \
88 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
89 && xsi_shell=yes
90@@ -6163,6 +6169,80 @@ esac
91
92
93
94+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
95+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
96+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
97+ $as_echo_n "(cached) " >&6
98+else
99+ case $host in
100+ *-*-mingw* )
101+ case $build in
102+ *-*-mingw* ) # actually msys
103+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
104+ ;;
105+ *-*-cygwin* )
106+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
107+ ;;
108+ * ) # otherwise, assume *nix
109+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
110+ ;;
111+ esac
112+ ;;
113+ *-*-cygwin* )
114+ case $build in
115+ *-*-mingw* ) # actually msys
116+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
117+ ;;
118+ *-*-cygwin* )
119+ lt_cv_to_host_file_cmd=func_convert_file_noop
120+ ;;
121+ * ) # otherwise, assume *nix
122+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
123+ ;;
124+ esac
125+ ;;
126+ * ) # unhandled hosts (and "normal" native builds)
127+ lt_cv_to_host_file_cmd=func_convert_file_noop
128+ ;;
129+esac
130+
131+fi
132+
133+to_host_file_cmd=$lt_cv_to_host_file_cmd
134+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
135+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
136+
137+
138+
139+
140+
141+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
142+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
143+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
144+ $as_echo_n "(cached) " >&6
145+else
146+ #assume ordinary cross tools, or native build.
147+lt_cv_to_tool_file_cmd=func_convert_file_noop
148+case $host in
149+ *-*-mingw* )
150+ case $build in
151+ *-*-mingw* ) # actually msys
152+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
153+ ;;
154+ esac
155+ ;;
156+esac
157+
158+fi
159+
160+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
161+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
162+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
163+
164+
165+
166+
167+
168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
169 $as_echo_n "checking for $LD option to reload object files... " >&6; }
170 if test "${lt_cv_ld_reload_flag+set}" = set; then :
171@@ -6179,6 +6259,11 @@ case $reload_flag in
172 esac
173 reload_cmds='$LD$reload_flag -o $output$reload_objs'
174 case $host_os in
175+ cygwin* | mingw* | pw32* | cegcc*)
176+ if test "$GCC" != yes; then
177+ reload_cmds=false
178+ fi
179+ ;;
180 darwin*)
181 if test "$GCC" = yes; then
182 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
183@@ -6347,7 +6432,8 @@ mingw* | pw32*)
184 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
185 lt_cv_file_magic_cmd='func_win32_libid'
186 else
187- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
188+ # Keep this pattern in sync with the one in func_win32_libid.
189+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
190 lt_cv_file_magic_cmd='$OBJDUMP -f'
191 fi
192 ;;
193@@ -6501,6 +6587,21 @@ esac
194 fi
195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
196 $as_echo "$lt_cv_deplibs_check_method" >&6; }
197+
198+file_magic_glob=
199+want_nocaseglob=no
200+if test "$build" = "$host"; then
201+ case $host_os in
202+ mingw* | pw32*)
203+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
204+ want_nocaseglob=yes
205+ else
206+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
207+ fi
208+ ;;
209+ esac
210+fi
211+
212 file_magic_cmd=$lt_cv_file_magic_cmd
213 deplibs_check_method=$lt_cv_deplibs_check_method
214 test -z "$deplibs_check_method" && deplibs_check_method=unknown
215@@ -6516,9 +6617,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
216
217
218
219+
220+
221+
222+
223+
224+
225+
226+
227+
228+
229 if test -n "$ac_tool_prefix"; then
230- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
231-set dummy ${ac_tool_prefix}ar; ac_word=$2
232+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
233+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
234+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
235+$as_echo_n "checking for $ac_word... " >&6; }
236+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
237+ $as_echo_n "(cached) " >&6
238+else
239+ if test -n "$DLLTOOL"; then
240+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
241+else
242+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
243+for as_dir in $PATH
244+do
245+ IFS=$as_save_IFS
246+ test -z "$as_dir" && as_dir=.
247+ for ac_exec_ext in '' $ac_executable_extensions; do
248+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
249+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
250+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
251+ break 2
252+ fi
253+done
254+ done
255+IFS=$as_save_IFS
256+
257+fi
258+fi
259+DLLTOOL=$ac_cv_prog_DLLTOOL
260+if test -n "$DLLTOOL"; then
261+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
262+$as_echo "$DLLTOOL" >&6; }
263+else
264+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
265+$as_echo "no" >&6; }
266+fi
267+
268+
269+fi
270+if test -z "$ac_cv_prog_DLLTOOL"; then
271+ ac_ct_DLLTOOL=$DLLTOOL
272+ # Extract the first word of "dlltool", so it can be a program name with args.
273+set dummy dlltool; ac_word=$2
274+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
275+$as_echo_n "checking for $ac_word... " >&6; }
276+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
277+ $as_echo_n "(cached) " >&6
278+else
279+ if test -n "$ac_ct_DLLTOOL"; then
280+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
281+else
282+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
283+for as_dir in $PATH
284+do
285+ IFS=$as_save_IFS
286+ test -z "$as_dir" && as_dir=.
287+ for ac_exec_ext in '' $ac_executable_extensions; do
288+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
289+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
290+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
291+ break 2
292+ fi
293+done
294+ done
295+IFS=$as_save_IFS
296+
297+fi
298+fi
299+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
300+if test -n "$ac_ct_DLLTOOL"; then
301+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
302+$as_echo "$ac_ct_DLLTOOL" >&6; }
303+else
304+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
305+$as_echo "no" >&6; }
306+fi
307+
308+ if test "x$ac_ct_DLLTOOL" = x; then
309+ DLLTOOL="false"
310+ else
311+ case $cross_compiling:$ac_tool_warned in
312+yes:)
313+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
314+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
315+ac_tool_warned=yes ;;
316+esac
317+ DLLTOOL=$ac_ct_DLLTOOL
318+ fi
319+else
320+ DLLTOOL="$ac_cv_prog_DLLTOOL"
321+fi
322+
323+test -z "$DLLTOOL" && DLLTOOL=dlltool
324+
325+
326+
327+
328+
329+
330+
331+
332+
333+
334+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
335+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
336+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
337+ $as_echo_n "(cached) " >&6
338+else
339+ lt_cv_sharedlib_from_linklib_cmd='unknown'
340+
341+case $host_os in
342+cygwin* | mingw* | pw32* | cegcc*)
343+ # two different shell functions defined in ltmain.sh
344+ # decide which to use based on capabilities of $DLLTOOL
345+ case `$DLLTOOL --help 2>&1` in
346+ *--identify-strict*)
347+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
348+ ;;
349+ *)
350+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
351+ ;;
352+ esac
353+ ;;
354+*)
355+ # fallback: assume linklib IS sharedlib
356+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
357+ ;;
358+esac
359+
360+fi
361+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
362+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
363+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
364+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
365+
366+
367+
368+
369+
370+
371+
372+if test -n "$ac_tool_prefix"; then
373+ for ac_prog in ar
374+ do
375+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
376+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
378 $as_echo_n "checking for $ac_word... " >&6; }
379 if test "${ac_cv_prog_AR+set}" = set; then :
380@@ -6534,7 +6788,7 @@ do
381 test -z "$as_dir" && as_dir=.
382 for ac_exec_ext in '' $ac_executable_extensions; do
383 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
384- ac_cv_prog_AR="${ac_tool_prefix}ar"
385+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
387 break 2
388 fi
389@@ -6554,11 +6808,15 @@ $as_echo "no" >&6; }
390 fi
391
392
393+ test -n "$AR" && break
394+ done
395 fi
396-if test -z "$ac_cv_prog_AR"; then
397+if test -z "$AR"; then
398 ac_ct_AR=$AR
399- # Extract the first word of "ar", so it can be a program name with args.
400-set dummy ar; ac_word=$2
401+ for ac_prog in ar
402+do
403+ # Extract the first word of "$ac_prog", so it can be a program name with args.
404+set dummy $ac_prog; ac_word=$2
405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
406 $as_echo_n "checking for $ac_word... " >&6; }
407 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
408@@ -6574,7 +6832,7 @@ do
409 test -z "$as_dir" && as_dir=.
410 for ac_exec_ext in '' $ac_executable_extensions; do
411 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
412- ac_cv_prog_ac_ct_AR="ar"
413+ ac_cv_prog_ac_ct_AR="$ac_prog"
414 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
415 break 2
416 fi
417@@ -6593,6 +6851,10 @@ else
418 $as_echo "no" >&6; }
419 fi
420
421+
422+ test -n "$ac_ct_AR" && break
423+done
424+
425 if test "x$ac_ct_AR" = x; then
426 AR="false"
427 else
428@@ -6604,16 +6866,72 @@ ac_tool_warned=yes ;;
429 esac
430 AR=$ac_ct_AR
431 fi
432-else
433- AR="$ac_cv_prog_AR"
434 fi
435
436-test -z "$AR" && AR=ar
437-test -z "$AR_FLAGS" && AR_FLAGS=cru
438+: ${AR=ar}
439+: ${AR_FLAGS=cru}
440+
441+
442+
443+
444+
445+
446+
447+
448+
449+
450+
451+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
452+$as_echo_n "checking for archiver @FILE support... " >&6; }
453+if test "${lt_cv_ar_at_file+set}" = set; then :
454+ $as_echo_n "(cached) " >&6
455+else
456+ lt_cv_ar_at_file=no
457+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
458+/* end confdefs.h. */
459+
460+int
461+main ()
462+{
463
464+ ;
465+ return 0;
466+}
467+_ACEOF
468+if ac_fn_c_try_compile "$LINENO"; then :
469+ echo conftest.$ac_objext > conftest.lst
470+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
471+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
472+ (eval $lt_ar_try) 2>&5
473+ ac_status=$?
474+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
475+ test $ac_status = 0; }
476+ if test "$ac_status" -eq 0; then
477+ # Ensure the archiver fails upon bogus file names.
478+ rm -f conftest.$ac_objext libconftest.a
479+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
480+ (eval $lt_ar_try) 2>&5
481+ ac_status=$?
482+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
483+ test $ac_status = 0; }
484+ if test "$ac_status" -ne 0; then
485+ lt_cv_ar_at_file=@
486+ fi
487+ fi
488+ rm -f conftest.* libconftest.a
489
490+fi
491+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
492
493+fi
494+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
495+$as_echo "$lt_cv_ar_at_file" >&6; }
496
497+if test "x$lt_cv_ar_at_file" = xno; then
498+ archiver_list_spec=
499+else
500+ archiver_list_spec=$lt_cv_ar_at_file
501+fi
502
503
504
505@@ -6955,8 +7273,8 @@ esac
506 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
507
508 # Transform an extracted symbol line into symbol name and symbol address
509-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
510-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'"
511+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
512+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'"
513
514 # Handle CRLF in mingw tool chain
515 opt_cr=
516@@ -6992,6 +7310,7 @@ for ac_symprfx in "" "_"; do
517 else
518 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
519 fi
520+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
521
522 # Check to see that the pipe works correctly.
523 pipe_works=no
524@@ -7033,6 +7352,18 @@ _LT_EOF
525 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
526 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
527 cat <<_LT_EOF > conftest.$ac_ext
528+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
529+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
530+/* DATA imports from DLLs on WIN32 con't be const, because runtime
531+ relocations are performed -- see ld's documentation on pseudo-relocs. */
532+# define LT_DLSYM_CONST
533+#elif defined(__osf__)
534+/* This system does not cope well with relocations in const data. */
535+# define LT_DLSYM_CONST
536+#else
537+# define LT_DLSYM_CONST const
538+#endif
539+
540 #ifdef __cplusplus
541 extern "C" {
542 #endif
543@@ -7044,7 +7375,7 @@ _LT_EOF
544 cat <<_LT_EOF >> conftest.$ac_ext
545
546 /* The mapping between symbol names and symbols. */
547-const struct {
548+LT_DLSYM_CONST struct {
549 const char *name;
550 void *address;
551 }
552@@ -7070,8 +7401,8 @@ static const void *lt_preloaded_setup() {
553 _LT_EOF
554 # Now try linking the two files.
555 mv conftest.$ac_objext conftstm.$ac_objext
556- lt_save_LIBS="$LIBS"
557- lt_save_CFLAGS="$CFLAGS"
558+ lt_globsym_save_LIBS=$LIBS
559+ lt_globsym_save_CFLAGS=$CFLAGS
560 LIBS="conftstm.$ac_objext"
561 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
562 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
563@@ -7081,8 +7412,8 @@ _LT_EOF
564 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
565 pipe_works=yes
566 fi
567- LIBS="$lt_save_LIBS"
568- CFLAGS="$lt_save_CFLAGS"
569+ LIBS=$lt_globsym_save_LIBS
570+ CFLAGS=$lt_globsym_save_CFLAGS
571 else
572 echo "cannot find nm_test_func in $nlist" >&5
573 fi
574@@ -7119,6 +7450,16 @@ else
575 $as_echo "ok" >&6; }
576 fi
577
578+# Response file support.
579+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
580+ nm_file_list_spec='@'
581+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
582+ nm_file_list_spec='@'
583+fi
584+
585+
586+
587+
588
589
590
591@@ -7140,6 +7481,45 @@ fi
592
593
594
595+
596+
597+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
598+$as_echo_n "checking for sysroot... " >&6; }
599+
600+# Check whether --with-libtool-sysroot was given.
601+if test "${with_libtool_sysroot+set}" = set; then :
602+ withval=$with_libtool_sysroot;
603+else
604+ with_libtool_sysroot=no
605+fi
606+
607+
608+lt_sysroot=
609+case ${with_libtool_sysroot} in #(
610+ yes)
611+ if test "$GCC" = yes; then
612+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
613+ fi
614+ ;; #(
615+ /*)
616+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
617+ ;; #(
618+ no|'')
619+ ;; #(
620+ *)
621+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
622+$as_echo "${with_libtool_sysroot}" >&6; }
623+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
624+ ;;
625+esac
626+
627+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
628+$as_echo "${lt_sysroot:-no}" >&6; }
629+
630+
631+
632+
633+
634 # Check whether --enable-libtool-lock was given.
635 if test "${enable_libtool_lock+set}" = set; then :
636 enableval=$enable_libtool_lock;
637@@ -7346,6 +7726,123 @@ esac
638
639 need_locks="$enable_libtool_lock"
640
641+if test -n "$ac_tool_prefix"; then
642+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
643+set dummy ${ac_tool_prefix}mt; ac_word=$2
644+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
645+$as_echo_n "checking for $ac_word... " >&6; }
646+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
647+ $as_echo_n "(cached) " >&6
648+else
649+ if test -n "$MANIFEST_TOOL"; then
650+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
651+else
652+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
653+for as_dir in $PATH
654+do
655+ IFS=$as_save_IFS
656+ test -z "$as_dir" && as_dir=.
657+ for ac_exec_ext in '' $ac_executable_extensions; do
658+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
659+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
660+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
661+ break 2
662+ fi
663+done
664+ done
665+IFS=$as_save_IFS
666+
667+fi
668+fi
669+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
670+if test -n "$MANIFEST_TOOL"; then
671+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
672+$as_echo "$MANIFEST_TOOL" >&6; }
673+else
674+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
675+$as_echo "no" >&6; }
676+fi
677+
678+
679+fi
680+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
681+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
682+ # Extract the first word of "mt", so it can be a program name with args.
683+set dummy mt; ac_word=$2
684+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
685+$as_echo_n "checking for $ac_word... " >&6; }
686+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
687+ $as_echo_n "(cached) " >&6
688+else
689+ if test -n "$ac_ct_MANIFEST_TOOL"; then
690+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
691+else
692+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
693+for as_dir in $PATH
694+do
695+ IFS=$as_save_IFS
696+ test -z "$as_dir" && as_dir=.
697+ for ac_exec_ext in '' $ac_executable_extensions; do
698+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
699+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
700+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
701+ break 2
702+ fi
703+done
704+ done
705+IFS=$as_save_IFS
706+
707+fi
708+fi
709+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
710+if test -n "$ac_ct_MANIFEST_TOOL"; then
711+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
712+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
713+else
714+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
715+$as_echo "no" >&6; }
716+fi
717+
718+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
719+ MANIFEST_TOOL=":"
720+ else
721+ case $cross_compiling:$ac_tool_warned in
722+yes:)
723+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
724+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
725+ac_tool_warned=yes ;;
726+esac
727+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
728+ fi
729+else
730+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
731+fi
732+
733+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
734+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
735+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
736+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
737+ $as_echo_n "(cached) " >&6
738+else
739+ lt_cv_path_mainfest_tool=no
740+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
741+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
742+ cat conftest.err >&5
743+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
744+ lt_cv_path_mainfest_tool=yes
745+ fi
746+ rm -f conftest*
747+fi
748+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
749+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
750+if test "x$lt_cv_path_mainfest_tool" != xyes; then
751+ MANIFEST_TOOL=:
752+fi
753+
754+
755+
756+
757+
758
759 case $host_os in
760 rhapsody* | darwin*)
761@@ -7909,6 +8406,8 @@ _LT_EOF
762 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
763 echo "$AR cru libconftest.a conftest.o" >&5
764 $AR cru libconftest.a conftest.o 2>&5
765+ echo "$RANLIB libconftest.a" >&5
766+ $RANLIB libconftest.a 2>&5
767 cat > conftest.c << _LT_EOF
768 int main() { return 0;}
769 _LT_EOF
770@@ -8073,7 +8572,8 @@ fi
771 LIBTOOL_DEPS="$ltmain"
772
773 # Always use our own libtool.
774-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
775+LIBTOOL='$(SHELL) $(top_builddir)'
776+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
777
778
779
780@@ -8162,7 +8662,7 @@ aix3*)
781 esac
782
783 # Global variables:
784-ofile=libtool
785+ofile=${host_alias}-libtool
786 can_build_shared=yes
787
788 # All known linkers require a `.a' archive for static linking (except MSVC,
789@@ -8460,8 +8960,6 @@ fi
790 lt_prog_compiler_pic=
791 lt_prog_compiler_static=
792
793-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
794-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
795
796 if test "$GCC" = yes; then
797 lt_prog_compiler_wl='-Wl,'
798@@ -8627,6 +9125,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
799 lt_prog_compiler_pic='--shared'
800 lt_prog_compiler_static='--static'
801 ;;
802+ nagfor*)
803+ # NAG Fortran compiler
804+ lt_prog_compiler_wl='-Wl,-Wl,,'
805+ lt_prog_compiler_pic='-PIC'
806+ lt_prog_compiler_static='-Bstatic'
807+ ;;
808 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
809 # Portland Group compilers (*not* the Pentium gcc compiler,
810 # which looks to be a dead project)
811@@ -8689,7 +9193,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
812 lt_prog_compiler_pic='-KPIC'
813 lt_prog_compiler_static='-Bstatic'
814 case $cc_basename in
815- f77* | f90* | f95*)
816+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
817 lt_prog_compiler_wl='-Qoption ld ';;
818 *)
819 lt_prog_compiler_wl='-Wl,';;
820@@ -8746,13 +9250,17 @@ case $host_os in
821 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
822 ;;
823 esac
824-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
825-$as_echo "$lt_prog_compiler_pic" >&6; }
826-
827-
828-
829-
830
831+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
832+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
833+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
834+ $as_echo_n "(cached) " >&6
835+else
836+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
837+fi
838+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
839+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
840+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
841
842 #
843 # Check to make sure the PIC flag actually works.
844@@ -8813,6 +9321,11 @@ fi
845
846
847
848+
849+
850+
851+
852+
853 #
854 # Check to make sure the static flag actually works.
855 #
856@@ -9163,7 +9676,8 @@ _LT_EOF
857 allow_undefined_flag=unsupported
858 always_export_symbols=no
859 enable_shared_with_static_runtimes=yes
860- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
861+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
862+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
863
864 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
865 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
866@@ -9211,7 +9725,7 @@ _LT_EOF
867 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
868 && test "$tmp_diet" = no
869 then
870- tmp_addflag=
871+ tmp_addflag=' $pic_flag'
872 tmp_sharedflag='-shared'
873 case $cc_basename,$host_cpu in
874 pgcc*) # Portland Group C compiler
875@@ -9262,12 +9776,12 @@ _LT_EOF
876 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
877 hardcode_libdir_flag_spec=
878 hardcode_libdir_flag_spec_ld='-rpath $libdir'
879- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
880+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
881 if test "x$supports_anon_versioning" = xyes; then
882 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
883 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
884 echo "local: *; };" >> $output_objdir/$libname.ver~
885- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
886+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
887 fi
888 ;;
889 esac
890@@ -9281,8 +9795,8 @@ _LT_EOF
891 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
892 wlarc=
893 else
894- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
895- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
896+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
897+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
898 fi
899 ;;
900
901@@ -9300,8 +9814,8 @@ _LT_EOF
902
903 _LT_EOF
904 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
905- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
906- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
907+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
908+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
909 else
910 ld_shlibs=no
911 fi
912@@ -9347,8 +9861,8 @@ _LT_EOF
913
914 *)
915 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
916- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
917- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
918+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
919+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
920 else
921 ld_shlibs=no
922 fi
923@@ -9478,7 +9992,13 @@ _LT_EOF
924 allow_undefined_flag='-berok'
925 # Determine the default libpath from the value encoded in an
926 # empty executable.
927- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
928+ if test "${lt_cv_aix_libpath+set}" = set; then
929+ aix_libpath=$lt_cv_aix_libpath
930+else
931+ if test "${lt_cv_aix_libpath_+set}" = set; then :
932+ $as_echo_n "(cached) " >&6
933+else
934+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
935 /* end confdefs.h. */
936
937 int
938@@ -9491,22 +10011,29 @@ main ()
939 _ACEOF
940 if ac_fn_c_try_link "$LINENO"; then :
941
942-lt_aix_libpath_sed='
943- /Import File Strings/,/^$/ {
944- /^0/ {
945- s/^0 *\(.*\)$/\1/
946- p
947- }
948- }'
949-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
950-# Check for a 64-bit object if we didn't find anything.
951-if test -z "$aix_libpath"; then
952- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
953-fi
954+ lt_aix_libpath_sed='
955+ /Import File Strings/,/^$/ {
956+ /^0/ {
957+ s/^0 *\([^ ]*\) *$/\1/
958+ p
959+ }
960+ }'
961+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
962+ # Check for a 64-bit object if we didn't find anything.
963+ if test -z "$lt_cv_aix_libpath_"; then
964+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
965+ fi
966 fi
967 rm -f core conftest.err conftest.$ac_objext \
968 conftest$ac_exeext conftest.$ac_ext
969-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
970+ if test -z "$lt_cv_aix_libpath_"; then
971+ lt_cv_aix_libpath_="/usr/lib:/lib"
972+ fi
973+
974+fi
975+
976+ aix_libpath=$lt_cv_aix_libpath_
977+fi
978
979 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
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"
981@@ -9518,7 +10045,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
982 else
983 # Determine the default libpath from the value encoded in an
984 # empty executable.
985- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
986+ if test "${lt_cv_aix_libpath+set}" = set; then
987+ aix_libpath=$lt_cv_aix_libpath
988+else
989+ if test "${lt_cv_aix_libpath_+set}" = set; then :
990+ $as_echo_n "(cached) " >&6
991+else
992+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
993 /* end confdefs.h. */
994
995 int
996@@ -9531,22 +10064,29 @@ main ()
997 _ACEOF
998 if ac_fn_c_try_link "$LINENO"; then :
999
1000-lt_aix_libpath_sed='
1001- /Import File Strings/,/^$/ {
1002- /^0/ {
1003- s/^0 *\(.*\)$/\1/
1004- p
1005- }
1006- }'
1007-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1008-# Check for a 64-bit object if we didn't find anything.
1009-if test -z "$aix_libpath"; then
1010- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1011-fi
1012+ lt_aix_libpath_sed='
1013+ /Import File Strings/,/^$/ {
1014+ /^0/ {
1015+ s/^0 *\([^ ]*\) *$/\1/
1016+ p
1017+ }
1018+ }'
1019+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1020+ # Check for a 64-bit object if we didn't find anything.
1021+ if test -z "$lt_cv_aix_libpath_"; then
1022+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1023+ fi
1024 fi
1025 rm -f core conftest.err conftest.$ac_objext \
1026 conftest$ac_exeext conftest.$ac_ext
1027-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1028+ if test -z "$lt_cv_aix_libpath_"; then
1029+ lt_cv_aix_libpath_="/usr/lib:/lib"
1030+ fi
1031+
1032+fi
1033+
1034+ aix_libpath=$lt_cv_aix_libpath_
1035+fi
1036
1037 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1038 # Warning - without using the other run time loading flags,
1039@@ -9591,20 +10131,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1040 # Microsoft Visual C++.
1041 # hardcode_libdir_flag_spec is actually meaningless, as there is
1042 # no search path for DLLs.
1043- hardcode_libdir_flag_spec=' '
1044- allow_undefined_flag=unsupported
1045- # Tell ltmain to make .lib files, not .a files.
1046- libext=lib
1047- # Tell ltmain to make .dll files, not .so files.
1048- shrext_cmds=".dll"
1049- # FIXME: Setting linknames here is a bad hack.
1050- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1051- # The linker will automatically build a .lib file if we build a DLL.
1052- old_archive_from_new_cmds='true'
1053- # FIXME: Should let the user specify the lib program.
1054- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1055- fix_srcfile_path='`cygpath -w "$srcfile"`'
1056- enable_shared_with_static_runtimes=yes
1057+ case $cc_basename in
1058+ cl*)
1059+ # Native MSVC
1060+ hardcode_libdir_flag_spec=' '
1061+ allow_undefined_flag=unsupported
1062+ always_export_symbols=yes
1063+ file_list_spec='@'
1064+ # Tell ltmain to make .lib files, not .a files.
1065+ libext=lib
1066+ # Tell ltmain to make .dll files, not .so files.
1067+ shrext_cmds=".dll"
1068+ # FIXME: Setting linknames here is a bad hack.
1069+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
1070+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1071+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
1072+ else
1073+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
1074+ fi~
1075+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
1076+ linknames='
1077+ # The linker will not automatically build a static lib if we build a DLL.
1078+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
1079+ enable_shared_with_static_runtimes=yes
1080+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
1081+ # Don't use ranlib
1082+ old_postinstall_cmds='chmod 644 $oldlib'
1083+ postlink_cmds='lt_outputfile="@OUTPUT@"~
1084+ lt_tool_outputfile="@TOOL_OUTPUT@"~
1085+ case $lt_outputfile in
1086+ *.exe|*.EXE) ;;
1087+ *)
1088+ lt_outputfile="$lt_outputfile.exe"
1089+ lt_tool_outputfile="$lt_tool_outputfile.exe"
1090+ ;;
1091+ esac~
1092+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
1093+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
1094+ $RM "$lt_outputfile.manifest";
1095+ fi'
1096+ ;;
1097+ *)
1098+ # Assume MSVC wrapper
1099+ hardcode_libdir_flag_spec=' '
1100+ allow_undefined_flag=unsupported
1101+ # Tell ltmain to make .lib files, not .a files.
1102+ libext=lib
1103+ # Tell ltmain to make .dll files, not .so files.
1104+ shrext_cmds=".dll"
1105+ # FIXME: Setting linknames here is a bad hack.
1106+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
1107+ # The linker will automatically build a .lib file if we build a DLL.
1108+ old_archive_from_new_cmds='true'
1109+ # FIXME: Should let the user specify the lib program.
1110+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
1111+ enable_shared_with_static_runtimes=yes
1112+ ;;
1113+ esac
1114 ;;
1115
1116 darwin* | rhapsody*)
1117@@ -9665,7 +10248,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1118
1119 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1120 freebsd* | dragonfly*)
1121- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1122+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1123 hardcode_libdir_flag_spec='-R$libdir'
1124 hardcode_direct=yes
1125 hardcode_shlibpath_var=no
1126@@ -9673,7 +10256,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1127
1128 hpux9*)
1129 if test "$GCC" = yes; then
1130- archive_cmds='$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'
1131+ archive_cmds='$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'
1132 else
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'
1134 fi
1135@@ -9689,7 +10272,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1136
1137 hpux10*)
1138 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
1139- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1140+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1141 else
1142 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
1143 fi
1144@@ -9713,10 +10296,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1145 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1146 ;;
1147 ia64*)
1148- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1149+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
1150 ;;
1151 *)
1152- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1153+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1154 ;;
1155 esac
1156 else
1157@@ -9795,23 +10378,36 @@ fi
1158
1159 irix5* | irix6* | nonstopux*)
1160 if test "$GCC" = yes; then
1161- archive_cmds='$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'
1162+ archive_cmds='$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'
1163 # Try to use the -exported_symbol ld option, if it does not
1164 # work, assume that -exports_file does not work either and
1165 # implicitly export all symbols.
1166- save_LDFLAGS="$LDFLAGS"
1167- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1168- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1169+ # This should be the same for all languages, so no per-tag cache variable.
1170+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
1171+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
1172+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
1173+ $as_echo_n "(cached) " >&6
1174+else
1175+ save_LDFLAGS="$LDFLAGS"
1176+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
1177+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1178 /* end confdefs.h. */
1179-int foo(void) {}
1180+int foo (void) { return 0; }
1181 _ACEOF
1182 if ac_fn_c_try_link "$LINENO"; then :
1183- archive_expsym_cmds='$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'
1184-
1185+ lt_cv_irix_exported_symbol=yes
1186+else
1187+ lt_cv_irix_exported_symbol=no
1188 fi
1189 rm -f core conftest.err conftest.$ac_objext \
1190 conftest$ac_exeext conftest.$ac_ext
1191- LDFLAGS="$save_LDFLAGS"
1192+ LDFLAGS="$save_LDFLAGS"
1193+fi
1194+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
1195+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
1196+ if test "$lt_cv_irix_exported_symbol" = yes; then
1197+ archive_expsym_cmds='$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'
1198+ fi
1199 else
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'
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'
1202@@ -9896,7 +10492,7 @@ rm -f core conftest.err conftest.$ac_objext \
1203 osf4* | osf5*) # as osf3* with the addition of -msym flag
1204 if test "$GCC" = yes; then
1205 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
1206- archive_cmds='$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'
1207+ archive_cmds='$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'
1208 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1209 else
1210 allow_undefined_flag=' -expect_unresolved \*'
1211@@ -9915,9 +10511,9 @@ rm -f core conftest.err conftest.$ac_objext \
1212 no_undefined_flag=' -z defs'
1213 if test "$GCC" = yes; then
1214 wlarc='${wl}'
1215- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1216+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1217 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
1218- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
1219+ $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'
1220 else
1221 case `$CC -V 2>&1` in
1222 *"Compilers 5.0"*)
1223@@ -10493,8 +11089,9 @@ cygwin* | mingw* | pw32* | cegcc*)
1224 need_version=no
1225 need_lib_prefix=no
1226
1227- case $GCC,$host_os in
1228- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
1229+ case $GCC,$cc_basename in
1230+ yes,*)
1231+ # gcc
1232 library_names_spec='$libname.dll.a'
1233 # DLL is installed to $(libdir)/../bin by postinstall_cmds
1234 postinstall_cmds='base_file=`basename \${file}`~
1235@@ -10527,13 +11124,71 @@ cygwin* | mingw* | pw32* | cegcc*)
1236 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1237 ;;
1238 esac
1239+ dynamic_linker='Win32 ld.exe'
1240+ ;;
1241+
1242+ *,cl*)
1243+ # Native MSVC
1244+ libname_spec='$name'
1245+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1246+ library_names_spec='${libname}.dll.lib'
1247+
1248+ case $build_os in
1249+ mingw*)
1250+ sys_lib_search_path_spec=
1251+ lt_save_ifs=$IFS
1252+ IFS=';'
1253+ for lt_path in $LIB
1254+ do
1255+ IFS=$lt_save_ifs
1256+ # Let DOS variable expansion print the short 8.3 style file name.
1257+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
1258+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
1259+ done
1260+ IFS=$lt_save_ifs
1261+ # Convert to MSYS style.
1262+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
1263+ ;;
1264+ cygwin*)
1265+ # Convert to unix form, then to dos form, then back to unix form
1266+ # but this time dos style (no spaces!) so that the unix form looks
1267+ # like /cygdrive/c/PROGRA~1:/cygdr...
1268+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
1269+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
1270+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1271+ ;;
1272+ *)
1273+ sys_lib_search_path_spec="$LIB"
1274+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
1275+ # It is most probably a Windows format PATH.
1276+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1277+ else
1278+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1279+ fi
1280+ # FIXME: find the short name or the path components, as spaces are
1281+ # common. (e.g. "Program Files" -> "PROGRA~1")
1282+ ;;
1283+ esac
1284+
1285+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
1286+ postinstall_cmds='base_file=`basename \${file}`~
1287+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
1288+ dldir=$destdir/`dirname \$dlpath`~
1289+ test -d \$dldir || mkdir -p \$dldir~
1290+ $install_prog $dir/$dlname \$dldir/$dlname'
1291+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1292+ dlpath=$dir/\$dldll~
1293+ $RM \$dlpath'
1294+ shlibpath_overrides_runpath=yes
1295+ dynamic_linker='Win32 link.exe'
1296 ;;
1297
1298 *)
1299+ # Assume MSVC wrapper
1300 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
1301+ dynamic_linker='Win32 ld.exe'
1302 ;;
1303 esac
1304- dynamic_linker='Win32 ld.exe'
1305 # FIXME: first we should search . and the directory the executable is in
1306 shlibpath_var=PATH
1307 ;;
1308@@ -10625,7 +11280,7 @@ haiku*)
1309 soname_spec='${libname}${release}${shared_ext}$major'
1310 shlibpath_var=LIBRARY_PATH
1311 shlibpath_overrides_runpath=yes
1312- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
1313+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1314 hardcode_into_libs=yes
1315 ;;
1316
1317@@ -11465,10 +12120,10 @@ else
1318 /* When -fvisbility=hidden is used, assume the code has been annotated
1319 correspondingly for the symbols needed. */
1320 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1321-void fnord () __attribute__((visibility("default")));
1322+int fnord () __attribute__((visibility("default")));
1323 #endif
1324
1325-void fnord () { int i=42; }
1326+int fnord () { return 42; }
1327 int main ()
1328 {
1329 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1330@@ -11571,10 +12226,10 @@ else
1331 /* When -fvisbility=hidden is used, assume the code has been annotated
1332 correspondingly for the symbols needed. */
1333 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1334-void fnord () __attribute__((visibility("default")));
1335+int fnord () __attribute__((visibility("default")));
1336 #endif
1337
1338-void fnord () { int i=42; }
1339+int fnord () { return 42; }
1340 int main ()
1341 {
1342 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1343@@ -15163,7 +15818,7 @@ SHARED_LDFLAGS=
1344 if test "$enable_shared" = "yes"; then
1345 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
1346 if test -n "$x"; then
1347- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
1348+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
1349 fi
1350
1351 # More hacks to build DLLs on Windows.
1352@@ -16780,13 +17435,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
1353 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
1354 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
1355 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
1356+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
1357+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
1358 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
1359 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
1360 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
1361 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
1362 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
1363+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
1364+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
1365+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
1366+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
1367 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
1368 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
1369+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
1370 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
1371 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
1372 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
1373@@ -16801,14 +17463,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
1374 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $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"`'
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"`'
1377+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
1378+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
1379 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
1380 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
1381 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
1382-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1383 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
1384+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
1385 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
1386 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
1387 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
1388+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
1389 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
1390 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
1391 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
1392@@ -16841,12 +17506,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
1393 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
1394 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
1395 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
1396-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
1397 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
1398 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
1399 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
1400 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
1401 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
1402+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
1403 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
1404 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
1405 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
1406@@ -16901,8 +17566,13 @@ reload_flag \
1407 OBJDUMP \
1408 deplibs_check_method \
1409 file_magic_cmd \
1410+file_magic_glob \
1411+want_nocaseglob \
1412+DLLTOOL \
1413+sharedlib_from_linklib_cmd \
1414 AR \
1415 AR_FLAGS \
1416+archiver_list_spec \
1417 STRIP \
1418 RANLIB \
1419 CC \
1420@@ -16912,12 +17582,14 @@ lt_cv_sys_global_symbol_pipe \
1421 lt_cv_sys_global_symbol_to_cdecl \
1422 lt_cv_sys_global_symbol_to_c_name_address \
1423 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
1424+nm_file_list_spec \
1425 lt_prog_compiler_no_builtin_flag \
1426-lt_prog_compiler_wl \
1427 lt_prog_compiler_pic \
1428+lt_prog_compiler_wl \
1429 lt_prog_compiler_static \
1430 lt_cv_prog_compiler_c_o \
1431 need_locks \
1432+MANIFEST_TOOL \
1433 DSYMUTIL \
1434 NMEDIT \
1435 LIPO \
1436@@ -16933,7 +17605,6 @@ no_undefined_flag \
1437 hardcode_libdir_flag_spec \
1438 hardcode_libdir_flag_spec_ld \
1439 hardcode_libdir_separator \
1440-fix_srcfile_path \
1441 exclude_expsyms \
1442 include_expsyms \
1443 file_list_spec \
1444@@ -16969,6 +17640,7 @@ module_cmds \
1445 module_expsym_cmds \
1446 export_symbols_cmds \
1447 prelink_cmds \
1448+postlink_cmds \
1449 postinstall_cmds \
1450 postuninstall_cmds \
1451 finish_cmds \
1452@@ -17748,7 +18420,8 @@ $as_echo X"$file" |
1453 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1454 #
1455 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1456-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1457+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1458+# Inc.
1459 # Written by Gordon Matzigkeit, 1996
1460 #
1461 # This file is part of GNU Libtool.
1462@@ -17851,19 +18524,42 @@ SP2NL=$lt_lt_SP2NL
1463 # turn newlines into spaces.
1464 NL2SP=$lt_lt_NL2SP
1465
1466+# convert \$build file names to \$host format.
1467+to_host_file_cmd=$lt_cv_to_host_file_cmd
1468+
1469+# convert \$build files to toolchain format.
1470+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
1471+
1472 # An object symbol dumper.
1473 OBJDUMP=$lt_OBJDUMP
1474
1475 # Method to check whether dependent libraries are shared objects.
1476 deplibs_check_method=$lt_deplibs_check_method
1477
1478-# Command to use when deplibs_check_method == "file_magic".
1479+# Command to use when deplibs_check_method = "file_magic".
1480 file_magic_cmd=$lt_file_magic_cmd
1481
1482+# How to find potential files when deplibs_check_method = "file_magic".
1483+file_magic_glob=$lt_file_magic_glob
1484+
1485+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
1486+want_nocaseglob=$lt_want_nocaseglob
1487+
1488+# DLL creation program.
1489+DLLTOOL=$lt_DLLTOOL
1490+
1491+# Command to associate shared and link libraries.
1492+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
1493+
1494 # The archiver.
1495 AR=$lt_AR
1496+
1497+# Flags to create an archive.
1498 AR_FLAGS=$lt_AR_FLAGS
1499
1500+# How to feed a file listing to the archiver.
1501+archiver_list_spec=$lt_archiver_list_spec
1502+
1503 # A symbol stripping program.
1504 STRIP=$lt_STRIP
1505
1506@@ -17893,6 +18589,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
1507 # Transform the output of nm in a C name address pair when lib prefix is needed.
1508 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
1509
1510+# Specify filename containing input files for \$NM.
1511+nm_file_list_spec=$lt_nm_file_list_spec
1512+
1513+# The root where to search for dependent libraries,and in which our libraries should be installed.
1514+lt_sysroot=$lt_sysroot
1515+
1516 # The name of the directory that contains temporary libtool files.
1517 objdir=$objdir
1518
1519@@ -17902,6 +18604,9 @@ MAGIC_CMD=$MAGIC_CMD
1520 # Must we lock files when doing compilation?
1521 need_locks=$lt_need_locks
1522
1523+# Manifest tool.
1524+MANIFEST_TOOL=$lt_MANIFEST_TOOL
1525+
1526 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
1527 DSYMUTIL=$lt_DSYMUTIL
1528
1529@@ -18016,12 +18721,12 @@ with_gcc=$GCC
1530 # Compiler flag to turn off builtin functions.
1531 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
1532
1533-# How to pass a linker flag through the compiler.
1534-wl=$lt_lt_prog_compiler_wl
1535-
1536 # Additional compiler flags for building library objects.
1537 pic_flag=$lt_lt_prog_compiler_pic
1538
1539+# How to pass a linker flag through the compiler.
1540+wl=$lt_lt_prog_compiler_wl
1541+
1542 # Compiler flag to prevent dynamic linking.
1543 link_static_flag=$lt_lt_prog_compiler_static
1544
1545@@ -18108,9 +18813,6 @@ inherit_rpath=$inherit_rpath
1546 # Whether libtool must link a program against all its dependency libraries.
1547 link_all_deplibs=$link_all_deplibs
1548
1549-# Fix the shell variable \$srcfile for the compiler.
1550-fix_srcfile_path=$lt_fix_srcfile_path
1551-
1552 # Set to "yes" if exported symbols are required.
1553 always_export_symbols=$always_export_symbols
1554
1555@@ -18126,6 +18828,9 @@ include_expsyms=$lt_include_expsyms
1556 # Commands necessary for linking programs (against libraries) with templates.
1557 prelink_cmds=$lt_prelink_cmds
1558
1559+# Commands necessary for finishing linking programs.
1560+postlink_cmds=$lt_postlink_cmds
1561+
1562 # Specify filename containing input files.
1563 file_list_spec=$lt_file_list_spec
1564
1565@@ -18158,210 +18863,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
1566 # if finds mixed CR/LF and LF-only lines. Since sed operates in
1567 # text mode, it properly converts lines to CR/LF. This bash problem
1568 # is reportedly fixed, but why not run on old versions too?
1569- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1570- || (rm -f "$cfgfile"; exit 1)
1571-
1572- case $xsi_shell in
1573- yes)
1574- cat << \_LT_EOF >> "$cfgfile"
1575-
1576-# func_dirname file append nondir_replacement
1577-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1578-# otherwise set result to NONDIR_REPLACEMENT.
1579-func_dirname ()
1580-{
1581- case ${1} in
1582- */*) func_dirname_result="${1%/*}${2}" ;;
1583- * ) func_dirname_result="${3}" ;;
1584- esac
1585-}
1586-
1587-# func_basename file
1588-func_basename ()
1589-{
1590- func_basename_result="${1##*/}"
1591-}
1592-
1593-# func_dirname_and_basename file append nondir_replacement
1594-# perform func_basename and func_dirname in a single function
1595-# call:
1596-# dirname: Compute the dirname of FILE. If nonempty,
1597-# add APPEND to the result, otherwise set result
1598-# to NONDIR_REPLACEMENT.
1599-# value returned in "$func_dirname_result"
1600-# basename: Compute filename of FILE.
1601-# value retuned in "$func_basename_result"
1602-# Implementation must be kept synchronized with func_dirname
1603-# and func_basename. For efficiency, we do not delegate to
1604-# those functions but instead duplicate the functionality here.
1605-func_dirname_and_basename ()
1606-{
1607- case ${1} in
1608- */*) func_dirname_result="${1%/*}${2}" ;;
1609- * ) func_dirname_result="${3}" ;;
1610- esac
1611- func_basename_result="${1##*/}"
1612-}
1613-
1614-# func_stripname prefix suffix name
1615-# strip PREFIX and SUFFIX off of NAME.
1616-# PREFIX and SUFFIX must not contain globbing or regex special
1617-# characters, hashes, percent signs, but SUFFIX may contain a leading
1618-# dot (in which case that matches only a dot).
1619-func_stripname ()
1620-{
1621- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
1622- # positional parameters, so assign one to ordinary parameter first.
1623- func_stripname_result=${3}
1624- func_stripname_result=${func_stripname_result#"${1}"}
1625- func_stripname_result=${func_stripname_result%"${2}"}
1626-}
1627-
1628-# func_opt_split
1629-func_opt_split ()
1630-{
1631- func_opt_split_opt=${1%%=*}
1632- func_opt_split_arg=${1#*=}
1633-}
1634-
1635-# func_lo2o object
1636-func_lo2o ()
1637-{
1638- case ${1} in
1639- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
1640- *) func_lo2o_result=${1} ;;
1641- esac
1642-}
1643-
1644-# func_xform libobj-or-source
1645-func_xform ()
1646-{
1647- func_xform_result=${1%.*}.lo
1648-}
1649-
1650-# func_arith arithmetic-term...
1651-func_arith ()
1652-{
1653- func_arith_result=$(( $* ))
1654-}
1655-
1656-# func_len string
1657-# STRING may not start with a hyphen.
1658-func_len ()
1659-{
1660- func_len_result=${#1}
1661-}
1662-
1663-_LT_EOF
1664- ;;
1665- *) # Bourne compatible functions.
1666- cat << \_LT_EOF >> "$cfgfile"
1667-
1668-# func_dirname file append nondir_replacement
1669-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
1670-# otherwise set result to NONDIR_REPLACEMENT.
1671-func_dirname ()
1672-{
1673- # Extract subdirectory from the argument.
1674- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
1675- if test "X$func_dirname_result" = "X${1}"; then
1676- func_dirname_result="${3}"
1677- else
1678- func_dirname_result="$func_dirname_result${2}"
1679- fi
1680-}
1681-
1682-# func_basename file
1683-func_basename ()
1684-{
1685- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
1686-}
1687-
1688-
1689-# func_stripname prefix suffix name
1690-# strip PREFIX and SUFFIX off of NAME.
1691-# PREFIX and SUFFIX must not contain globbing or regex special
1692-# characters, hashes, percent signs, but SUFFIX may contain a leading
1693-# dot (in which case that matches only a dot).
1694-# func_strip_suffix prefix name
1695-func_stripname ()
1696-{
1697- case ${2} in
1698- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
1699- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
1700- esac
1701-}
1702-
1703-# sed scripts:
1704-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
1705-my_sed_long_arg='1s/^-[^=]*=//'
1706-
1707-# func_opt_split
1708-func_opt_split ()
1709-{
1710- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
1711- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
1712-}
1713-
1714-# func_lo2o object
1715-func_lo2o ()
1716-{
1717- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
1718-}
1719-
1720-# func_xform libobj-or-source
1721-func_xform ()
1722-{
1723- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
1724-}
1725-
1726-# func_arith arithmetic-term...
1727-func_arith ()
1728-{
1729- func_arith_result=`expr "$@"`
1730-}
1731-
1732-# func_len string
1733-# STRING may not start with a hyphen.
1734-func_len ()
1735-{
1736- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
1737-}
1738-
1739-_LT_EOF
1740-esac
1741-
1742-case $lt_shell_append in
1743- yes)
1744- cat << \_LT_EOF >> "$cfgfile"
1745-
1746-# func_append var value
1747-# Append VALUE to the end of shell variable VAR.
1748-func_append ()
1749-{
1750- eval "$1+=\$2"
1751-}
1752-_LT_EOF
1753- ;;
1754- *)
1755- cat << \_LT_EOF >> "$cfgfile"
1756-
1757-# func_append var value
1758-# Append VALUE to the end of shell variable VAR.
1759-func_append ()
1760-{
1761- eval "$1=\$$1\$2"
1762-}
1763-
1764-_LT_EOF
1765- ;;
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" ||
1773+ sed '$q' "$ltmain" >> "$cfgfile" \
1774+ || (rm -f "$cfgfile"; exit 1)
1775+
1776+ if test x"$xsi_shell" = xyes; then
1777+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
1778+func_dirname ()\
1779+{\
1780+\ case ${1} in\
1781+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1782+\ * ) func_dirname_result="${3}" ;;\
1783+\ esac\
1784+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
1785+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1786+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1787+test 0 -eq $? || _lt_function_replace_fail=:
1788+
1789+
1790+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
1791+func_basename ()\
1792+{\
1793+\ func_basename_result="${1##*/}"\
1794+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
1795+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1796+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1797+test 0 -eq $? || _lt_function_replace_fail=:
1798+
1799+
1800+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
1801+func_dirname_and_basename ()\
1802+{\
1803+\ case ${1} in\
1804+\ */*) func_dirname_result="${1%/*}${2}" ;;\
1805+\ * ) func_dirname_result="${3}" ;;\
1806+\ esac\
1807+\ func_basename_result="${1##*/}"\
1808+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
1809+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1810+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1811+test 0 -eq $? || _lt_function_replace_fail=:
1812+
1813+
1814+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
1815+func_stripname ()\
1816+{\
1817+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
1818+\ # positional parameters, so assign one to ordinary parameter first.\
1819+\ func_stripname_result=${3}\
1820+\ func_stripname_result=${func_stripname_result#"${1}"}\
1821+\ func_stripname_result=${func_stripname_result%"${2}"}\
1822+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
1823+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1824+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1825+test 0 -eq $? || _lt_function_replace_fail=:
1826+
1827+
1828+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
1829+func_split_long_opt ()\
1830+{\
1831+\ func_split_long_opt_name=${1%%=*}\
1832+\ func_split_long_opt_arg=${1#*=}\
1833+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
1834+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1835+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1836+test 0 -eq $? || _lt_function_replace_fail=:
1837+
1838+
1839+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
1840+func_split_short_opt ()\
1841+{\
1842+\ func_split_short_opt_arg=${1#??}\
1843+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
1844+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
1845+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1846+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1847+test 0 -eq $? || _lt_function_replace_fail=:
1848+
1849+
1850+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
1851+func_lo2o ()\
1852+{\
1853+\ case ${1} in\
1854+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
1855+\ *) func_lo2o_result=${1} ;;\
1856+\ esac\
1857+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
1858+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1859+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1860+test 0 -eq $? || _lt_function_replace_fail=:
1861+
1862+
1863+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
1864+func_xform ()\
1865+{\
1866+ func_xform_result=${1%.*}.lo\
1867+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
1868+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1869+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1870+test 0 -eq $? || _lt_function_replace_fail=:
1871+
1872+
1873+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
1874+func_arith ()\
1875+{\
1876+ func_arith_result=$(( $* ))\
1877+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
1878+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1879+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1880+test 0 -eq $? || _lt_function_replace_fail=:
1881+
1882+
1883+ sed -e '/^func_len ()$/,/^} # func_len /c\
1884+func_len ()\
1885+{\
1886+ func_len_result=${#1}\
1887+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
1888+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1889+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1890+test 0 -eq $? || _lt_function_replace_fail=:
1891+
1892+fi
1893+
1894+if test x"$lt_shell_append" = xyes; then
1895+ sed -e '/^func_append ()$/,/^} # func_append /c\
1896+func_append ()\
1897+{\
1898+ eval "${1}+=\\${2}"\
1899+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
1900+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1901+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1902+test 0 -eq $? || _lt_function_replace_fail=:
1903+
1904+
1905+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
1906+func_append_quoted ()\
1907+{\
1908+\ func_quote_for_eval "${2}"\
1909+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
1910+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
1911+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1912+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1913+test 0 -eq $? || _lt_function_replace_fail=:
1914+
1915+
1916+ # Save a `func_append' function call where possible by direct use of '+='
1917+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
1918+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1919+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1920+ test 0 -eq $? || _lt_function_replace_fail=:
1921+else
1922+ # Save a `func_append' function call even when '+=' is not available
1923+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
1924+ && mv -f "$cfgfile.tmp" "$cfgfile" \
1925+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
1926+ test 0 -eq $? || _lt_function_replace_fail=:
1927+fi
1928+
1929+if test x"$_lt_function_replace_fail" = x":"; then
1930+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
1931+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
1932+fi
1933+
1934+
1935+ mv -f "$cfgfile" "$ofile" ||
1936 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1937 chmod +x "$ofile"
1938
1939diff --git a/bfd/configure.ac b/bfd/configure.ac
1940index ba98e39..88063cf 100644
1941--- a/bfd/configure.ac
1942+++ b/bfd/configure.ac
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
1957 LIPO
1958 NMEDIT
1959 DSYMUTIL
1960+MANIFEST_TOOL
1961 RANLIB
1962+ac_ct_AR
1963 AR
1964+DLLTOOL
1965 OBJDUMP
1966 LN_S
1967 NM
1968@@ -767,6 +770,7 @@ enable_static
1969 with_pic
1970 enable_fast_install
1971 with_gnu_ld
1972+with_libtool_sysroot
1973 enable_libtool_lock
1974 enable_plugins
1975 enable_largefile
1976@@ -1439,6 +1443,8 @@ Optional Packages:
1977 --with-pic try to use only PIC/non-PIC objects [default=use
1978 both]
1979 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1980+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
1981+ (or the compiler's sysroot if not specified).
1982 --with-zlib include zlib support (auto/yes/no) default=auto
1983 --with-gnu-ld assume the C compiler uses GNU ld default=no
1984 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1985@@ -5153,8 +5159,8 @@ esac
1986
1987
1988
1989-macro_version='2.2.7a'
1990-macro_revision='1.3134'
1991+macro_version='2.4'
1992+macro_revision='1.3293'
1993
1994
1995
1996@@ -5194,7 +5200,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1997 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
1998 $as_echo_n "checking how to print strings... " >&6; }
1999 # Test print first, because it will be a builtin if present.
2000-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
2001+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
2002 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2003 ECHO='print -r --'
2004 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2005@@ -5880,8 +5886,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
2006 # Try some XSI features
2007 xsi_shell=no
2008 ( _lt_dummy="a/b/c"
2009- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
2010- = c,a/b,, \
2011+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
2012+ = c,a/b,b/c, \
2013 && eval 'test $(( 1 + 1 )) -eq 2 \
2014 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
2015 && xsi_shell=yes
2016@@ -5930,6 +5936,80 @@ esac
2017
2018
2019
2020+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
2021+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
2022+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
2023+ $as_echo_n "(cached) " >&6
2024+else
2025+ case $host in
2026+ *-*-mingw* )
2027+ case $build in
2028+ *-*-mingw* ) # actually msys
2029+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
2030+ ;;
2031+ *-*-cygwin* )
2032+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
2033+ ;;
2034+ * ) # otherwise, assume *nix
2035+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
2036+ ;;
2037+ esac
2038+ ;;
2039+ *-*-cygwin* )
2040+ case $build in
2041+ *-*-mingw* ) # actually msys
2042+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
2043+ ;;
2044+ *-*-cygwin* )
2045+ lt_cv_to_host_file_cmd=func_convert_file_noop
2046+ ;;
2047+ * ) # otherwise, assume *nix
2048+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
2049+ ;;
2050+ esac
2051+ ;;
2052+ * ) # unhandled hosts (and "normal" native builds)
2053+ lt_cv_to_host_file_cmd=func_convert_file_noop
2054+ ;;
2055+esac
2056+
2057+fi
2058+
2059+to_host_file_cmd=$lt_cv_to_host_file_cmd
2060+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
2061+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
2062+
2063+
2064+
2065+
2066+
2067+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
2068+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
2069+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
2070+ $as_echo_n "(cached) " >&6
2071+else
2072+ #assume ordinary cross tools, or native build.
2073+lt_cv_to_tool_file_cmd=func_convert_file_noop
2074+case $host in
2075+ *-*-mingw* )
2076+ case $build in
2077+ *-*-mingw* ) # actually msys
2078+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
2079+ ;;
2080+ esac
2081+ ;;
2082+esac
2083+
2084+fi
2085+
2086+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
2087+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
2088+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
2089+
2090+
2091+
2092+
2093+
2094 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
2095 $as_echo_n "checking for $LD option to reload object files... " >&6; }
2096 if test "${lt_cv_ld_reload_flag+set}" = set; then :
2097@@ -5946,6 +6026,11 @@ case $reload_flag in
2098 esac
2099 reload_cmds='$LD$reload_flag -o $output$reload_objs'
2100 case $host_os in
2101+ cygwin* | mingw* | pw32* | cegcc*)
2102+ if test "$GCC" != yes; then
2103+ reload_cmds=false
2104+ fi
2105+ ;;
2106 darwin*)
2107 if test "$GCC" = yes; then
2108 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
2109@@ -6114,7 +6199,8 @@ mingw* | pw32*)
2110 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2111 lt_cv_file_magic_cmd='func_win32_libid'
2112 else
2113- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2114+ # Keep this pattern in sync with the one in func_win32_libid.
2115+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
2116 lt_cv_file_magic_cmd='$OBJDUMP -f'
2117 fi
2118 ;;
2119@@ -6268,6 +6354,21 @@ esac
2120 fi
2121 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
2122 $as_echo "$lt_cv_deplibs_check_method" >&6; }
2123+
2124+file_magic_glob=
2125+want_nocaseglob=no
2126+if test "$build" = "$host"; then
2127+ case $host_os in
2128+ mingw* | pw32*)
2129+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
2130+ want_nocaseglob=yes
2131+ else
2132+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
2133+ fi
2134+ ;;
2135+ esac
2136+fi
2137+
2138 file_magic_cmd=$lt_cv_file_magic_cmd
2139 deplibs_check_method=$lt_cv_deplibs_check_method
2140 test -z "$deplibs_check_method" && deplibs_check_method=unknown
2141@@ -6283,9 +6384,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
2142
2143
2144
2145+
2146+
2147+
2148+
2149+
2150+
2151+
2152+
2153+
2154+
2155 if test -n "$ac_tool_prefix"; then
2156- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2157-set dummy ${ac_tool_prefix}ar; ac_word=$2
2158+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
2159+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
2160+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2161+$as_echo_n "checking for $ac_word... " >&6; }
2162+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
2163+ $as_echo_n "(cached) " >&6
2164+else
2165+ if test -n "$DLLTOOL"; then
2166+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
2167+else
2168+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2169+for as_dir in $PATH
2170+do
2171+ IFS=$as_save_IFS
2172+ test -z "$as_dir" && as_dir=.
2173+ for ac_exec_ext in '' $ac_executable_extensions; do
2174+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2175+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
2176+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2177+ break 2
2178+ fi
2179+done
2180+ done
2181+IFS=$as_save_IFS
2182+
2183+fi
2184+fi
2185+DLLTOOL=$ac_cv_prog_DLLTOOL
2186+if test -n "$DLLTOOL"; then
2187+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
2188+$as_echo "$DLLTOOL" >&6; }
2189+else
2190+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2191+$as_echo "no" >&6; }
2192+fi
2193+
2194+
2195+fi
2196+if test -z "$ac_cv_prog_DLLTOOL"; then
2197+ ac_ct_DLLTOOL=$DLLTOOL
2198+ # Extract the first word of "dlltool", so it can be a program name with args.
2199+set dummy dlltool; ac_word=$2
2200+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2201+$as_echo_n "checking for $ac_word... " >&6; }
2202+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
2203+ $as_echo_n "(cached) " >&6
2204+else
2205+ if test -n "$ac_ct_DLLTOOL"; then
2206+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
2207+else
2208+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2209+for as_dir in $PATH
2210+do
2211+ IFS=$as_save_IFS
2212+ test -z "$as_dir" && as_dir=.
2213+ for ac_exec_ext in '' $ac_executable_extensions; do
2214+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2215+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
2216+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2217+ break 2
2218+ fi
2219+done
2220+ done
2221+IFS=$as_save_IFS
2222+
2223+fi
2224+fi
2225+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
2226+if test -n "$ac_ct_DLLTOOL"; then
2227+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
2228+$as_echo "$ac_ct_DLLTOOL" >&6; }
2229+else
2230+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2231+$as_echo "no" >&6; }
2232+fi
2233+
2234+ if test "x$ac_ct_DLLTOOL" = x; then
2235+ DLLTOOL="false"
2236+ else
2237+ case $cross_compiling:$ac_tool_warned in
2238+yes:)
2239+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2240+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2241+ac_tool_warned=yes ;;
2242+esac
2243+ DLLTOOL=$ac_ct_DLLTOOL
2244+ fi
2245+else
2246+ DLLTOOL="$ac_cv_prog_DLLTOOL"
2247+fi
2248+
2249+test -z "$DLLTOOL" && DLLTOOL=dlltool
2250+
2251+
2252+
2253+
2254+
2255+
2256+
2257+
2258+
2259+
2260+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
2261+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
2262+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
2263+ $as_echo_n "(cached) " >&6
2264+else
2265+ lt_cv_sharedlib_from_linklib_cmd='unknown'
2266+
2267+case $host_os in
2268+cygwin* | mingw* | pw32* | cegcc*)
2269+ # two different shell functions defined in ltmain.sh
2270+ # decide which to use based on capabilities of $DLLTOOL
2271+ case `$DLLTOOL --help 2>&1` in
2272+ *--identify-strict*)
2273+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
2274+ ;;
2275+ *)
2276+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
2277+ ;;
2278+ esac
2279+ ;;
2280+*)
2281+ # fallback: assume linklib IS sharedlib
2282+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
2283+ ;;
2284+esac
2285+
2286+fi
2287+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
2288+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
2289+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
2290+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
2291+
2292+
2293+
2294+
2295+
2296+
2297+
2298+if test -n "$ac_tool_prefix"; then
2299+ for ac_prog in ar
2300+ do
2301+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2302+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2304 $as_echo_n "checking for $ac_word... " >&6; }
2305 if test "${ac_cv_prog_AR+set}" = set; then :
2306@@ -6301,7 +6555,7 @@ do
2307 test -z "$as_dir" && as_dir=.
2308 for ac_exec_ext in '' $ac_executable_extensions; do
2309 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2310- ac_cv_prog_AR="${ac_tool_prefix}ar"
2311+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
2312 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2313 break 2
2314 fi
2315@@ -6321,11 +6575,15 @@ $as_echo "no" >&6; }
2316 fi
2317
2318
2319+ test -n "$AR" && break
2320+ done
2321 fi
2322-if test -z "$ac_cv_prog_AR"; then
2323+if test -z "$AR"; then
2324 ac_ct_AR=$AR
2325- # Extract the first word of "ar", so it can be a program name with args.
2326-set dummy ar; ac_word=$2
2327+ for ac_prog in ar
2328+do
2329+ # Extract the first word of "$ac_prog", so it can be a program name with args.
2330+set dummy $ac_prog; ac_word=$2
2331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2332 $as_echo_n "checking for $ac_word... " >&6; }
2333 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
2334@@ -6341,7 +6599,7 @@ do
2335 test -z "$as_dir" && as_dir=.
2336 for ac_exec_ext in '' $ac_executable_extensions; do
2337 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2338- ac_cv_prog_ac_ct_AR="ar"
2339+ ac_cv_prog_ac_ct_AR="$ac_prog"
2340 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2341 break 2
2342 fi
2343@@ -6360,6 +6618,10 @@ else
2344 $as_echo "no" >&6; }
2345 fi
2346
2347+
2348+ test -n "$ac_ct_AR" && break
2349+done
2350+
2351 if test "x$ac_ct_AR" = x; then
2352 AR="false"
2353 else
2354@@ -6371,16 +6633,72 @@ ac_tool_warned=yes ;;
2355 esac
2356 AR=$ac_ct_AR
2357 fi
2358-else
2359- AR="$ac_cv_prog_AR"
2360 fi
2361
2362-test -z "$AR" && AR=ar
2363-test -z "$AR_FLAGS" && AR_FLAGS=cru
2364+: ${AR=ar}
2365+: ${AR_FLAGS=cru}
2366+
2367+
2368+
2369+
2370+
2371+
2372+
2373+
2374+
2375+
2376+
2377+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
2378+$as_echo_n "checking for archiver @FILE support... " >&6; }
2379+if test "${lt_cv_ar_at_file+set}" = set; then :
2380+ $as_echo_n "(cached) " >&6
2381+else
2382+ lt_cv_ar_at_file=no
2383+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2384+/* end confdefs.h. */
2385+
2386+int
2387+main ()
2388+{
2389
2390+ ;
2391+ return 0;
2392+}
2393+_ACEOF
2394+if ac_fn_c_try_compile "$LINENO"; then :
2395+ echo conftest.$ac_objext > conftest.lst
2396+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
2397+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2398+ (eval $lt_ar_try) 2>&5
2399+ ac_status=$?
2400+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2401+ test $ac_status = 0; }
2402+ if test "$ac_status" -eq 0; then
2403+ # Ensure the archiver fails upon bogus file names.
2404+ rm -f conftest.$ac_objext libconftest.a
2405+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
2406+ (eval $lt_ar_try) 2>&5
2407+ ac_status=$?
2408+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2409+ test $ac_status = 0; }
2410+ if test "$ac_status" -ne 0; then
2411+ lt_cv_ar_at_file=@
2412+ fi
2413+ fi
2414+ rm -f conftest.* libconftest.a
2415
2416+fi
2417+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2418
2419+fi
2420+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
2421+$as_echo "$lt_cv_ar_at_file" >&6; }
2422
2423+if test "x$lt_cv_ar_at_file" = xno; then
2424+ archiver_list_spec=
2425+else
2426+ archiver_list_spec=$lt_cv_ar_at_file
2427+fi
2428
2429
2430
2431@@ -6722,8 +7040,8 @@ esac
2432 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
2433
2434 # Transform an extracted symbol line into symbol name and symbol address
2435-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2436-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'"
2437+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
2438+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'"
2439
2440 # Handle CRLF in mingw tool chain
2441 opt_cr=
2442@@ -6759,6 +7077,7 @@ for ac_symprfx in "" "_"; do
2443 else
2444 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
2445 fi
2446+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
2447
2448 # Check to see that the pipe works correctly.
2449 pipe_works=no
2450@@ -6800,6 +7119,18 @@ _LT_EOF
2451 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
2452 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
2453 cat <<_LT_EOF > conftest.$ac_ext
2454+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
2455+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
2456+/* DATA imports from DLLs on WIN32 con't be const, because runtime
2457+ relocations are performed -- see ld's documentation on pseudo-relocs. */
2458+# define LT_DLSYM_CONST
2459+#elif defined(__osf__)
2460+/* This system does not cope well with relocations in const data. */
2461+# define LT_DLSYM_CONST
2462+#else
2463+# define LT_DLSYM_CONST const
2464+#endif
2465+
2466 #ifdef __cplusplus
2467 extern "C" {
2468 #endif
2469@@ -6811,7 +7142,7 @@ _LT_EOF
2470 cat <<_LT_EOF >> conftest.$ac_ext
2471
2472 /* The mapping between symbol names and symbols. */
2473-const struct {
2474+LT_DLSYM_CONST struct {
2475 const char *name;
2476 void *address;
2477 }
2478@@ -6837,8 +7168,8 @@ static const void *lt_preloaded_setup() {
2479 _LT_EOF
2480 # Now try linking the two files.
2481 mv conftest.$ac_objext conftstm.$ac_objext
2482- lt_save_LIBS="$LIBS"
2483- lt_save_CFLAGS="$CFLAGS"
2484+ lt_globsym_save_LIBS=$LIBS
2485+ lt_globsym_save_CFLAGS=$CFLAGS
2486 LIBS="conftstm.$ac_objext"
2487 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
2488 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
2489@@ -6848,8 +7179,8 @@ _LT_EOF
2490 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
2491 pipe_works=yes
2492 fi
2493- LIBS="$lt_save_LIBS"
2494- CFLAGS="$lt_save_CFLAGS"
2495+ LIBS=$lt_globsym_save_LIBS
2496+ CFLAGS=$lt_globsym_save_CFLAGS
2497 else
2498 echo "cannot find nm_test_func in $nlist" >&5
2499 fi
2500@@ -6886,6 +7217,20 @@ else
2501 $as_echo "ok" >&6; }
2502 fi
2503
2504+# Response file support.
2505+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
2506+ nm_file_list_spec='@'
2507+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
2508+ nm_file_list_spec='@'
2509+fi
2510+
2511+
2512+
2513+
2514+
2515+
2516+
2517+
2518
2519
2520
2521@@ -6905,6 +7250,41 @@ fi
2522
2523
2524
2525+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
2526+$as_echo_n "checking for sysroot... " >&6; }
2527+
2528+# Check whether --with-libtool-sysroot was given.
2529+if test "${with_libtool_sysroot+set}" = set; then :
2530+ withval=$with_libtool_sysroot;
2531+else
2532+ with_libtool_sysroot=no
2533+fi
2534+
2535+
2536+lt_sysroot=
2537+case ${with_libtool_sysroot} in #(
2538+ yes)
2539+ if test "$GCC" = yes; then
2540+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
2541+ fi
2542+ ;; #(
2543+ /*)
2544+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
2545+ ;; #(
2546+ no|'')
2547+ ;; #(
2548+ *)
2549+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
2550+$as_echo "${with_libtool_sysroot}" >&6; }
2551+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
2552+ ;;
2553+esac
2554+
2555+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
2556+$as_echo "${lt_sysroot:-no}" >&6; }
2557+
2558+
2559+
2560
2561
2562 # Check whether --enable-libtool-lock was given.
2563@@ -7113,6 +7493,123 @@ esac
2564
2565 need_locks="$enable_libtool_lock"
2566
2567+if test -n "$ac_tool_prefix"; then
2568+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
2569+set dummy ${ac_tool_prefix}mt; ac_word=$2
2570+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2571+$as_echo_n "checking for $ac_word... " >&6; }
2572+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
2573+ $as_echo_n "(cached) " >&6
2574+else
2575+ if test -n "$MANIFEST_TOOL"; then
2576+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
2577+else
2578+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2579+for as_dir in $PATH
2580+do
2581+ IFS=$as_save_IFS
2582+ test -z "$as_dir" && as_dir=.
2583+ for ac_exec_ext in '' $ac_executable_extensions; do
2584+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2585+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
2586+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2587+ break 2
2588+ fi
2589+done
2590+ done
2591+IFS=$as_save_IFS
2592+
2593+fi
2594+fi
2595+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
2596+if test -n "$MANIFEST_TOOL"; then
2597+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
2598+$as_echo "$MANIFEST_TOOL" >&6; }
2599+else
2600+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2601+$as_echo "no" >&6; }
2602+fi
2603+
2604+
2605+fi
2606+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
2607+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
2608+ # Extract the first word of "mt", so it can be a program name with args.
2609+set dummy mt; ac_word=$2
2610+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2611+$as_echo_n "checking for $ac_word... " >&6; }
2612+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
2613+ $as_echo_n "(cached) " >&6
2614+else
2615+ if test -n "$ac_ct_MANIFEST_TOOL"; then
2616+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
2617+else
2618+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2619+for as_dir in $PATH
2620+do
2621+ IFS=$as_save_IFS
2622+ test -z "$as_dir" && as_dir=.
2623+ for ac_exec_ext in '' $ac_executable_extensions; do
2624+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2625+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
2626+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2627+ break 2
2628+ fi
2629+done
2630+ done
2631+IFS=$as_save_IFS
2632+
2633+fi
2634+fi
2635+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
2636+if test -n "$ac_ct_MANIFEST_TOOL"; then
2637+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
2638+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
2639+else
2640+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2641+$as_echo "no" >&6; }
2642+fi
2643+
2644+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
2645+ MANIFEST_TOOL=":"
2646+ else
2647+ case $cross_compiling:$ac_tool_warned in
2648+yes:)
2649+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2650+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2651+ac_tool_warned=yes ;;
2652+esac
2653+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
2654+ fi
2655+else
2656+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
2657+fi
2658+
2659+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
2660+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
2661+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
2662+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
2663+ $as_echo_n "(cached) " >&6
2664+else
2665+ lt_cv_path_mainfest_tool=no
2666+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
2667+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
2668+ cat conftest.err >&5
2669+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
2670+ lt_cv_path_mainfest_tool=yes
2671+ fi
2672+ rm -f conftest*
2673+fi
2674+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
2675+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
2676+if test "x$lt_cv_path_mainfest_tool" != xyes; then
2677+ MANIFEST_TOOL=:
2678+fi
2679+
2680+
2681+
2682+
2683+
2684
2685 case $host_os in
2686 rhapsody* | darwin*)
2687@@ -7676,6 +8173,8 @@ _LT_EOF
2688 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
2689 echo "$AR cru libconftest.a conftest.o" >&5
2690 $AR cru libconftest.a conftest.o 2>&5
2691+ echo "$RANLIB libconftest.a" >&5
2692+ $RANLIB libconftest.a 2>&5
2693 cat > conftest.c << _LT_EOF
2694 int main() { return 0;}
2695 _LT_EOF
2696@@ -7871,7 +8370,8 @@ fi
2697 LIBTOOL_DEPS="$ltmain"
2698
2699 # Always use our own libtool.
2700-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2701+LIBTOOL='$(SHELL) $(top_builddir)'
2702+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
2703
2704
2705
2706@@ -7960,7 +8460,7 @@ aix3*)
2707 esac
2708
2709 # Global variables:
2710-ofile=libtool
2711+ofile=${host_alias}-libtool
2712 can_build_shared=yes
2713
2714 # All known linkers require a `.a' archive for static linking (except MSVC,
2715@@ -8258,8 +8758,6 @@ fi
2716 lt_prog_compiler_pic=
2717 lt_prog_compiler_static=
2718
2719-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2720-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2721
2722 if test "$GCC" = yes; then
2723 lt_prog_compiler_wl='-Wl,'
2724@@ -8425,6 +8923,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2725 lt_prog_compiler_pic='--shared'
2726 lt_prog_compiler_static='--static'
2727 ;;
2728+ nagfor*)
2729+ # NAG Fortran compiler
2730+ lt_prog_compiler_wl='-Wl,-Wl,,'
2731+ lt_prog_compiler_pic='-PIC'
2732+ lt_prog_compiler_static='-Bstatic'
2733+ ;;
2734 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
2735 # Portland Group compilers (*not* the Pentium gcc compiler,
2736 # which looks to be a dead project)
2737@@ -8487,7 +8991,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2738 lt_prog_compiler_pic='-KPIC'
2739 lt_prog_compiler_static='-Bstatic'
2740 case $cc_basename in
2741- f77* | f90* | f95*)
2742+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
2743 lt_prog_compiler_wl='-Qoption ld ';;
2744 *)
2745 lt_prog_compiler_wl='-Wl,';;
2746@@ -8544,13 +9048,17 @@ case $host_os in
2747 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
2748 ;;
2749 esac
2750-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
2751-$as_echo "$lt_prog_compiler_pic" >&6; }
2752-
2753-
2754-
2755-
2756
2757+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
2758+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
2759+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
2760+ $as_echo_n "(cached) " >&6
2761+else
2762+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
2763+fi
2764+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
2765+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
2766+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
2767
2768 #
2769 # Check to make sure the PIC flag actually works.
2770@@ -8611,6 +9119,11 @@ fi
2771
2772
2773
2774+
2775+
2776+
2777+
2778+
2779 #
2780 # Check to make sure the static flag actually works.
2781 #
2782@@ -8961,7 +9474,8 @@ _LT_EOF
2783 allow_undefined_flag=unsupported
2784 always_export_symbols=no
2785 enable_shared_with_static_runtimes=yes
2786- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
2787+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
2788+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
2789
2790 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2791 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2792@@ -9009,7 +9523,7 @@ _LT_EOF
2793 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
2794 && test "$tmp_diet" = no
2795 then
2796- tmp_addflag=
2797+ tmp_addflag=' $pic_flag'
2798 tmp_sharedflag='-shared'
2799 case $cc_basename,$host_cpu in
2800 pgcc*) # Portland Group C compiler
2801@@ -9060,12 +9574,12 @@ _LT_EOF
2802 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
2803 hardcode_libdir_flag_spec=
2804 hardcode_libdir_flag_spec_ld='-rpath $libdir'
2805- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
2806+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
2807 if test "x$supports_anon_versioning" = xyes; then
2808 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
2809 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
2810 echo "local: *; };" >> $output_objdir/$libname.ver~
2811- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2812+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
2813 fi
2814 ;;
2815 esac
2816@@ -9079,8 +9593,8 @@ _LT_EOF
2817 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2818 wlarc=
2819 else
2820- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2821- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2822+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2823+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2824 fi
2825 ;;
2826
2827@@ -9098,8 +9612,8 @@ _LT_EOF
2828
2829 _LT_EOF
2830 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2831- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2832- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2833+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2834+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2835 else
2836 ld_shlibs=no
2837 fi
2838@@ -9145,8 +9659,8 @@ _LT_EOF
2839
2840 *)
2841 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2842- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2843- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2844+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2845+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2846 else
2847 ld_shlibs=no
2848 fi
2849@@ -9276,7 +9790,13 @@ _LT_EOF
2850 allow_undefined_flag='-berok'
2851 # Determine the default libpath from the value encoded in an
2852 # empty executable.
2853- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2854+ if test "${lt_cv_aix_libpath+set}" = set; then
2855+ aix_libpath=$lt_cv_aix_libpath
2856+else
2857+ if test "${lt_cv_aix_libpath_+set}" = set; then :
2858+ $as_echo_n "(cached) " >&6
2859+else
2860+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2861 /* end confdefs.h. */
2862
2863 int
2864@@ -9289,22 +9809,29 @@ main ()
2865 _ACEOF
2866 if ac_fn_c_try_link "$LINENO"; then :
2867
2868-lt_aix_libpath_sed='
2869- /Import File Strings/,/^$/ {
2870- /^0/ {
2871- s/^0 *\(.*\)$/\1/
2872- p
2873- }
2874- }'
2875-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2876-# Check for a 64-bit object if we didn't find anything.
2877-if test -z "$aix_libpath"; then
2878- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2879-fi
2880+ lt_aix_libpath_sed='
2881+ /Import File Strings/,/^$/ {
2882+ /^0/ {
2883+ s/^0 *\([^ ]*\) *$/\1/
2884+ p
2885+ }
2886+ }'
2887+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2888+ # Check for a 64-bit object if we didn't find anything.
2889+ if test -z "$lt_cv_aix_libpath_"; then
2890+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2891+ fi
2892 fi
2893 rm -f core conftest.err conftest.$ac_objext \
2894 conftest$ac_exeext conftest.$ac_ext
2895-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2896+ if test -z "$lt_cv_aix_libpath_"; then
2897+ lt_cv_aix_libpath_="/usr/lib:/lib"
2898+ fi
2899+
2900+fi
2901+
2902+ aix_libpath=$lt_cv_aix_libpath_
2903+fi
2904
2905 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
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"
2907@@ -9316,7 +9843,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2908 else
2909 # Determine the default libpath from the value encoded in an
2910 # empty executable.
2911- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2912+ if test "${lt_cv_aix_libpath+set}" = set; then
2913+ aix_libpath=$lt_cv_aix_libpath
2914+else
2915+ if test "${lt_cv_aix_libpath_+set}" = set; then :
2916+ $as_echo_n "(cached) " >&6
2917+else
2918+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2919 /* end confdefs.h. */
2920
2921 int
2922@@ -9329,22 +9862,29 @@ main ()
2923 _ACEOF
2924 if ac_fn_c_try_link "$LINENO"; then :
2925
2926-lt_aix_libpath_sed='
2927- /Import File Strings/,/^$/ {
2928- /^0/ {
2929- s/^0 *\(.*\)$/\1/
2930- p
2931- }
2932- }'
2933-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2934-# Check for a 64-bit object if we didn't find anything.
2935-if test -z "$aix_libpath"; then
2936- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2937-fi
2938+ lt_aix_libpath_sed='
2939+ /Import File Strings/,/^$/ {
2940+ /^0/ {
2941+ s/^0 *\([^ ]*\) *$/\1/
2942+ p
2943+ }
2944+ }'
2945+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2946+ # Check for a 64-bit object if we didn't find anything.
2947+ if test -z "$lt_cv_aix_libpath_"; then
2948+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2949+ fi
2950 fi
2951 rm -f core conftest.err conftest.$ac_objext \
2952 conftest$ac_exeext conftest.$ac_ext
2953-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2954+ if test -z "$lt_cv_aix_libpath_"; then
2955+ lt_cv_aix_libpath_="/usr/lib:/lib"
2956+ fi
2957+
2958+fi
2959+
2960+ aix_libpath=$lt_cv_aix_libpath_
2961+fi
2962
2963 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
2964 # Warning - without using the other run time loading flags,
2965@@ -9389,20 +9929,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2966 # Microsoft Visual C++.
2967 # hardcode_libdir_flag_spec is actually meaningless, as there is
2968 # no search path for DLLs.
2969- hardcode_libdir_flag_spec=' '
2970- allow_undefined_flag=unsupported
2971- # Tell ltmain to make .lib files, not .a files.
2972- libext=lib
2973- # Tell ltmain to make .dll files, not .so files.
2974- shrext_cmds=".dll"
2975- # FIXME: Setting linknames here is a bad hack.
2976- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2977- # The linker will automatically build a .lib file if we build a DLL.
2978- old_archive_from_new_cmds='true'
2979- # FIXME: Should let the user specify the lib program.
2980- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
2981- fix_srcfile_path='`cygpath -w "$srcfile"`'
2982- enable_shared_with_static_runtimes=yes
2983+ case $cc_basename in
2984+ cl*)
2985+ # Native MSVC
2986+ hardcode_libdir_flag_spec=' '
2987+ allow_undefined_flag=unsupported
2988+ always_export_symbols=yes
2989+ file_list_spec='@'
2990+ # Tell ltmain to make .lib files, not .a files.
2991+ libext=lib
2992+ # Tell ltmain to make .dll files, not .so files.
2993+ shrext_cmds=".dll"
2994+ # FIXME: Setting linknames here is a bad hack.
2995+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
2996+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2997+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
2998+ else
2999+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
3000+ fi~
3001+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
3002+ linknames='
3003+ # The linker will not automatically build a static lib if we build a DLL.
3004+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
3005+ enable_shared_with_static_runtimes=yes
3006+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
3007+ # Don't use ranlib
3008+ old_postinstall_cmds='chmod 644 $oldlib'
3009+ postlink_cmds='lt_outputfile="@OUTPUT@"~
3010+ lt_tool_outputfile="@TOOL_OUTPUT@"~
3011+ case $lt_outputfile in
3012+ *.exe|*.EXE) ;;
3013+ *)
3014+ lt_outputfile="$lt_outputfile.exe"
3015+ lt_tool_outputfile="$lt_tool_outputfile.exe"
3016+ ;;
3017+ esac~
3018+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
3019+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
3020+ $RM "$lt_outputfile.manifest";
3021+ fi'
3022+ ;;
3023+ *)
3024+ # Assume MSVC wrapper
3025+ hardcode_libdir_flag_spec=' '
3026+ allow_undefined_flag=unsupported
3027+ # Tell ltmain to make .lib files, not .a files.
3028+ libext=lib
3029+ # Tell ltmain to make .dll files, not .so files.
3030+ shrext_cmds=".dll"
3031+ # FIXME: Setting linknames here is a bad hack.
3032+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
3033+ # The linker will automatically build a .lib file if we build a DLL.
3034+ old_archive_from_new_cmds='true'
3035+ # FIXME: Should let the user specify the lib program.
3036+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
3037+ enable_shared_with_static_runtimes=yes
3038+ ;;
3039+ esac
3040 ;;
3041
3042 darwin* | rhapsody*)
3043@@ -9463,7 +10046,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3044
3045 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
3046 freebsd* | dragonfly*)
3047- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
3048+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
3049 hardcode_libdir_flag_spec='-R$libdir'
3050 hardcode_direct=yes
3051 hardcode_shlibpath_var=no
3052@@ -9471,7 +10054,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3053
3054 hpux9*)
3055 if test "$GCC" = yes; then
3056- archive_cmds='$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'
3057+ archive_cmds='$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'
3058 else
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'
3060 fi
3061@@ -9487,7 +10070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3062
3063 hpux10*)
3064 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
3065- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3066+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3067 else
3068 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
3069 fi
3070@@ -9511,10 +10094,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3071 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3072 ;;
3073 ia64*)
3074- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3075+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
3076 ;;
3077 *)
3078- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3079+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
3080 ;;
3081 esac
3082 else
3083@@ -9593,23 +10176,36 @@ fi
3084
3085 irix5* | irix6* | nonstopux*)
3086 if test "$GCC" = yes; then
3087- archive_cmds='$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'
3088+ archive_cmds='$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'
3089 # Try to use the -exported_symbol ld option, if it does not
3090 # work, assume that -exports_file does not work either and
3091 # implicitly export all symbols.
3092- save_LDFLAGS="$LDFLAGS"
3093- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3094- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3095+ # This should be the same for all languages, so no per-tag cache variable.
3096+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
3097+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
3098+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
3099+ $as_echo_n "(cached) " >&6
3100+else
3101+ save_LDFLAGS="$LDFLAGS"
3102+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
3103+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3104 /* end confdefs.h. */
3105-int foo(void) {}
3106+int foo (void) { return 0; }
3107 _ACEOF
3108 if ac_fn_c_try_link "$LINENO"; then :
3109- archive_expsym_cmds='$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'
3110-
3111+ lt_cv_irix_exported_symbol=yes
3112+else
3113+ lt_cv_irix_exported_symbol=no
3114 fi
3115 rm -f core conftest.err conftest.$ac_objext \
3116 conftest$ac_exeext conftest.$ac_ext
3117- LDFLAGS="$save_LDFLAGS"
3118+ LDFLAGS="$save_LDFLAGS"
3119+fi
3120+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
3121+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
3122+ if test "$lt_cv_irix_exported_symbol" = yes; then
3123+ archive_expsym_cmds='$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'
3124+ fi
3125 else
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'
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'
3128@@ -9694,7 +10290,7 @@ rm -f core conftest.err conftest.$ac_objext \
3129 osf4* | osf5*) # as osf3* with the addition of -msym flag
3130 if test "$GCC" = yes; then
3131 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
3132- archive_cmds='$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'
3133+ archive_cmds='$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'
3134 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
3135 else
3136 allow_undefined_flag=' -expect_unresolved \*'
3137@@ -9713,9 +10309,9 @@ rm -f core conftest.err conftest.$ac_objext \
3138 no_undefined_flag=' -z defs'
3139 if test "$GCC" = yes; then
3140 wlarc='${wl}'
3141- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3142+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
3143 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
3144- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
3145+ $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'
3146 else
3147 case `$CC -V 2>&1` in
3148 *"Compilers 5.0"*)
3149@@ -10291,8 +10887,9 @@ cygwin* | mingw* | pw32* | cegcc*)
3150 need_version=no
3151 need_lib_prefix=no
3152
3153- case $GCC,$host_os in
3154- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
3155+ case $GCC,$cc_basename in
3156+ yes,*)
3157+ # gcc
3158 library_names_spec='$libname.dll.a'
3159 # DLL is installed to $(libdir)/../bin by postinstall_cmds
3160 postinstall_cmds='base_file=`basename \${file}`~
3161@@ -10325,13 +10922,71 @@ cygwin* | mingw* | pw32* | cegcc*)
3162 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3163 ;;
3164 esac
3165+ dynamic_linker='Win32 ld.exe'
3166+ ;;
3167+
3168+ *,cl*)
3169+ # Native MSVC
3170+ libname_spec='$name'
3171+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
3172+ library_names_spec='${libname}.dll.lib'
3173+
3174+ case $build_os in
3175+ mingw*)
3176+ sys_lib_search_path_spec=
3177+ lt_save_ifs=$IFS
3178+ IFS=';'
3179+ for lt_path in $LIB
3180+ do
3181+ IFS=$lt_save_ifs
3182+ # Let DOS variable expansion print the short 8.3 style file name.
3183+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
3184+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
3185+ done
3186+ IFS=$lt_save_ifs
3187+ # Convert to MSYS style.
3188+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
3189+ ;;
3190+ cygwin*)
3191+ # Convert to unix form, then to dos form, then back to unix form
3192+ # but this time dos style (no spaces!) so that the unix form looks
3193+ # like /cygdrive/c/PROGRA~1:/cygdr...
3194+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
3195+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
3196+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3197+ ;;
3198+ *)
3199+ sys_lib_search_path_spec="$LIB"
3200+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
3201+ # It is most probably a Windows format PATH.
3202+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3203+ else
3204+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3205+ fi
3206+ # FIXME: find the short name or the path components, as spaces are
3207+ # common. (e.g. "Program Files" -> "PROGRA~1")
3208+ ;;
3209+ esac
3210+
3211+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
3212+ postinstall_cmds='base_file=`basename \${file}`~
3213+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
3214+ dldir=$destdir/`dirname \$dlpath`~
3215+ test -d \$dldir || mkdir -p \$dldir~
3216+ $install_prog $dir/$dlname \$dldir/$dlname'
3217+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3218+ dlpath=$dir/\$dldll~
3219+ $RM \$dlpath'
3220+ shlibpath_overrides_runpath=yes
3221+ dynamic_linker='Win32 link.exe'
3222 ;;
3223
3224 *)
3225+ # Assume MSVC wrapper
3226 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
3227+ dynamic_linker='Win32 ld.exe'
3228 ;;
3229 esac
3230- dynamic_linker='Win32 ld.exe'
3231 # FIXME: first we should search . and the directory the executable is in
3232 shlibpath_var=PATH
3233 ;;
3234@@ -10423,7 +11078,7 @@ haiku*)
3235 soname_spec='${libname}${release}${shared_ext}$major'
3236 shlibpath_var=LIBRARY_PATH
3237 shlibpath_overrides_runpath=yes
3238- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
3239+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
3240 hardcode_into_libs=yes
3241 ;;
3242
3243@@ -11263,10 +11918,10 @@ else
3244 /* When -fvisbility=hidden is used, assume the code has been annotated
3245 correspondingly for the symbols needed. */
3246 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3247-void fnord () __attribute__((visibility("default")));
3248+int fnord () __attribute__((visibility("default")));
3249 #endif
3250
3251-void fnord () { int i=42; }
3252+int fnord () { return 42; }
3253 int main ()
3254 {
3255 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3256@@ -11369,10 +12024,10 @@ else
3257 /* When -fvisbility=hidden is used, assume the code has been annotated
3258 correspondingly for the symbols needed. */
3259 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
3260-void fnord () __attribute__((visibility("default")));
3261+int fnord () __attribute__((visibility("default")));
3262 #endif
3263
3264-void fnord () { int i=42; }
3265+int fnord () { return 42; }
3266 int main ()
3267 {
3268 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
3269@@ -15373,13 +16028,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
3270 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
3271 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
3272 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
3273+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
3274+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
3275 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
3276 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
3277 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
3278 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
3279 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
3280+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
3281+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
3282+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
3283+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
3284 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
3285 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
3286+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
3287 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
3288 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
3289 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
3290@@ -15394,14 +16056,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
3291 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $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"`'
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"`'
3294+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
3295+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
3296 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
3297 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
3298 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
3299-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3300 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
3301+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
3302 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
3303 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
3304 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
3305+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
3306 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
3307 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
3308 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
3309@@ -15434,12 +16099,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
3310 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
3311 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
3312 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
3313-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
3314 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
3315 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
3316 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
3317 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
3318 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
3319+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
3320 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
3321 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
3322 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
3323@@ -15494,8 +16159,13 @@ reload_flag \
3324 OBJDUMP \
3325 deplibs_check_method \
3326 file_magic_cmd \
3327+file_magic_glob \
3328+want_nocaseglob \
3329+DLLTOOL \
3330+sharedlib_from_linklib_cmd \
3331 AR \
3332 AR_FLAGS \
3333+archiver_list_spec \
3334 STRIP \
3335 RANLIB \
3336 CC \
3337@@ -15505,12 +16175,14 @@ lt_cv_sys_global_symbol_pipe \
3338 lt_cv_sys_global_symbol_to_cdecl \
3339 lt_cv_sys_global_symbol_to_c_name_address \
3340 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
3341+nm_file_list_spec \
3342 lt_prog_compiler_no_builtin_flag \
3343-lt_prog_compiler_wl \
3344 lt_prog_compiler_pic \
3345+lt_prog_compiler_wl \
3346 lt_prog_compiler_static \
3347 lt_cv_prog_compiler_c_o \
3348 need_locks \
3349+MANIFEST_TOOL \
3350 DSYMUTIL \
3351 NMEDIT \
3352 LIPO \
3353@@ -15526,7 +16198,6 @@ no_undefined_flag \
3354 hardcode_libdir_flag_spec \
3355 hardcode_libdir_flag_spec_ld \
3356 hardcode_libdir_separator \
3357-fix_srcfile_path \
3358 exclude_expsyms \
3359 include_expsyms \
3360 file_list_spec \
3361@@ -15562,6 +16233,7 @@ module_cmds \
3362 module_expsym_cmds \
3363 export_symbols_cmds \
3364 prelink_cmds \
3365+postlink_cmds \
3366 postinstall_cmds \
3367 postuninstall_cmds \
3368 finish_cmds \
3369@@ -16319,7 +16991,8 @@ $as_echo X"$file" |
3370 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
3371 #
3372 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
3373-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
3374+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
3375+# Inc.
3376 # Written by Gordon Matzigkeit, 1996
3377 #
3378 # This file is part of GNU Libtool.
3379@@ -16422,19 +17095,42 @@ SP2NL=$lt_lt_SP2NL
3380 # turn newlines into spaces.
3381 NL2SP=$lt_lt_NL2SP
3382
3383+# convert \$build file names to \$host format.
3384+to_host_file_cmd=$lt_cv_to_host_file_cmd
3385+
3386+# convert \$build files to toolchain format.
3387+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3388+
3389 # An object symbol dumper.
3390 OBJDUMP=$lt_OBJDUMP
3391
3392 # Method to check whether dependent libraries are shared objects.
3393 deplibs_check_method=$lt_deplibs_check_method
3394
3395-# Command to use when deplibs_check_method == "file_magic".
3396+# Command to use when deplibs_check_method = "file_magic".
3397 file_magic_cmd=$lt_file_magic_cmd
3398
3399+# How to find potential files when deplibs_check_method = "file_magic".
3400+file_magic_glob=$lt_file_magic_glob
3401+
3402+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
3403+want_nocaseglob=$lt_want_nocaseglob
3404+
3405+# DLL creation program.
3406+DLLTOOL=$lt_DLLTOOL
3407+
3408+# Command to associate shared and link libraries.
3409+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
3410+
3411 # The archiver.
3412 AR=$lt_AR
3413+
3414+# Flags to create an archive.
3415 AR_FLAGS=$lt_AR_FLAGS
3416
3417+# How to feed a file listing to the archiver.
3418+archiver_list_spec=$lt_archiver_list_spec
3419+
3420 # A symbol stripping program.
3421 STRIP=$lt_STRIP
3422
3423@@ -16464,6 +17160,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
3424 # Transform the output of nm in a C name address pair when lib prefix is needed.
3425 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
3426
3427+# Specify filename containing input files for \$NM.
3428+nm_file_list_spec=$lt_nm_file_list_spec
3429+
3430+# The root where to search for dependent libraries,and in which our libraries should be installed.
3431+lt_sysroot=$lt_sysroot
3432+
3433 # The name of the directory that contains temporary libtool files.
3434 objdir=$objdir
3435
3436@@ -16473,6 +17175,9 @@ MAGIC_CMD=$MAGIC_CMD
3437 # Must we lock files when doing compilation?
3438 need_locks=$lt_need_locks
3439
3440+# Manifest tool.
3441+MANIFEST_TOOL=$lt_MANIFEST_TOOL
3442+
3443 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
3444 DSYMUTIL=$lt_DSYMUTIL
3445
3446@@ -16587,12 +17292,12 @@ with_gcc=$GCC
3447 # Compiler flag to turn off builtin functions.
3448 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
3449
3450-# How to pass a linker flag through the compiler.
3451-wl=$lt_lt_prog_compiler_wl
3452-
3453 # Additional compiler flags for building library objects.
3454 pic_flag=$lt_lt_prog_compiler_pic
3455
3456+# How to pass a linker flag through the compiler.
3457+wl=$lt_lt_prog_compiler_wl
3458+
3459 # Compiler flag to prevent dynamic linking.
3460 link_static_flag=$lt_lt_prog_compiler_static
3461
3462@@ -16679,9 +17384,6 @@ inherit_rpath=$inherit_rpath
3463 # Whether libtool must link a program against all its dependency libraries.
3464 link_all_deplibs=$link_all_deplibs
3465
3466-# Fix the shell variable \$srcfile for the compiler.
3467-fix_srcfile_path=$lt_fix_srcfile_path
3468-
3469 # Set to "yes" if exported symbols are required.
3470 always_export_symbols=$always_export_symbols
3471
3472@@ -16697,6 +17399,9 @@ include_expsyms=$lt_include_expsyms
3473 # Commands necessary for linking programs (against libraries) with templates.
3474 prelink_cmds=$lt_prelink_cmds
3475
3476+# Commands necessary for finishing linking programs.
3477+postlink_cmds=$lt_postlink_cmds
3478+
3479 # Specify filename containing input files.
3480 file_list_spec=$lt_file_list_spec
3481
3482@@ -16729,210 +17434,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
3483 # if finds mixed CR/LF and LF-only lines. Since sed operates in
3484 # text mode, it properly converts lines to CR/LF. This bash problem
3485 # is reportedly fixed, but why not run on old versions too?
3486- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
3487- || (rm -f "$cfgfile"; exit 1)
3488-
3489- case $xsi_shell in
3490- yes)
3491- cat << \_LT_EOF >> "$cfgfile"
3492-
3493-# func_dirname file append nondir_replacement
3494-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3495-# otherwise set result to NONDIR_REPLACEMENT.
3496-func_dirname ()
3497-{
3498- case ${1} in
3499- */*) func_dirname_result="${1%/*}${2}" ;;
3500- * ) func_dirname_result="${3}" ;;
3501- esac
3502-}
3503-
3504-# func_basename file
3505-func_basename ()
3506-{
3507- func_basename_result="${1##*/}"
3508-}
3509-
3510-# func_dirname_and_basename file append nondir_replacement
3511-# perform func_basename and func_dirname in a single function
3512-# call:
3513-# dirname: Compute the dirname of FILE. If nonempty,
3514-# add APPEND to the result, otherwise set result
3515-# to NONDIR_REPLACEMENT.
3516-# value returned in "$func_dirname_result"
3517-# basename: Compute filename of FILE.
3518-# value retuned in "$func_basename_result"
3519-# Implementation must be kept synchronized with func_dirname
3520-# and func_basename. For efficiency, we do not delegate to
3521-# those functions but instead duplicate the functionality here.
3522-func_dirname_and_basename ()
3523-{
3524- case ${1} in
3525- */*) func_dirname_result="${1%/*}${2}" ;;
3526- * ) func_dirname_result="${3}" ;;
3527- esac
3528- func_basename_result="${1##*/}"
3529-}
3530-
3531-# func_stripname prefix suffix name
3532-# strip PREFIX and SUFFIX off of NAME.
3533-# PREFIX and SUFFIX must not contain globbing or regex special
3534-# characters, hashes, percent signs, but SUFFIX may contain a leading
3535-# dot (in which case that matches only a dot).
3536-func_stripname ()
3537-{
3538- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3539- # positional parameters, so assign one to ordinary parameter first.
3540- func_stripname_result=${3}
3541- func_stripname_result=${func_stripname_result#"${1}"}
3542- func_stripname_result=${func_stripname_result%"${2}"}
3543-}
3544-
3545-# func_opt_split
3546-func_opt_split ()
3547-{
3548- func_opt_split_opt=${1%%=*}
3549- func_opt_split_arg=${1#*=}
3550-}
3551-
3552-# func_lo2o object
3553-func_lo2o ()
3554-{
3555- case ${1} in
3556- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3557- *) func_lo2o_result=${1} ;;
3558- esac
3559-}
3560-
3561-# func_xform libobj-or-source
3562-func_xform ()
3563-{
3564- func_xform_result=${1%.*}.lo
3565-}
3566-
3567-# func_arith arithmetic-term...
3568-func_arith ()
3569-{
3570- func_arith_result=$(( $* ))
3571-}
3572-
3573-# func_len string
3574-# STRING may not start with a hyphen.
3575-func_len ()
3576-{
3577- func_len_result=${#1}
3578-}
3579-
3580-_LT_EOF
3581- ;;
3582- *) # Bourne compatible functions.
3583- cat << \_LT_EOF >> "$cfgfile"
3584-
3585-# func_dirname file append nondir_replacement
3586-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3587-# otherwise set result to NONDIR_REPLACEMENT.
3588-func_dirname ()
3589-{
3590- # Extract subdirectory from the argument.
3591- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
3592- if test "X$func_dirname_result" = "X${1}"; then
3593- func_dirname_result="${3}"
3594- else
3595- func_dirname_result="$func_dirname_result${2}"
3596- fi
3597-}
3598-
3599-# func_basename file
3600-func_basename ()
3601-{
3602- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
3603-}
3604-
3605-
3606-# func_stripname prefix suffix name
3607-# strip PREFIX and SUFFIX off of NAME.
3608-# PREFIX and SUFFIX must not contain globbing or regex special
3609-# characters, hashes, percent signs, but SUFFIX may contain a leading
3610-# dot (in which case that matches only a dot).
3611-# func_strip_suffix prefix name
3612-func_stripname ()
3613-{
3614- case ${2} in
3615- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
3616- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
3617- esac
3618-}
3619-
3620-# sed scripts:
3621-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
3622-my_sed_long_arg='1s/^-[^=]*=//'
3623-
3624-# func_opt_split
3625-func_opt_split ()
3626-{
3627- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
3628- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
3629-}
3630-
3631-# func_lo2o object
3632-func_lo2o ()
3633-{
3634- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
3635-}
3636-
3637-# func_xform libobj-or-source
3638-func_xform ()
3639-{
3640- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
3641-}
3642-
3643-# func_arith arithmetic-term...
3644-func_arith ()
3645-{
3646- func_arith_result=`expr "$@"`
3647-}
3648-
3649-# func_len string
3650-# STRING may not start with a hyphen.
3651-func_len ()
3652-{
3653- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
3654-}
3655-
3656-_LT_EOF
3657-esac
3658-
3659-case $lt_shell_append in
3660- yes)
3661- cat << \_LT_EOF >> "$cfgfile"
3662-
3663-# func_append var value
3664-# Append VALUE to the end of shell variable VAR.
3665-func_append ()
3666-{
3667- eval "$1+=\$2"
3668-}
3669-_LT_EOF
3670- ;;
3671- *)
3672- cat << \_LT_EOF >> "$cfgfile"
3673-
3674-# func_append var value
3675-# Append VALUE to the end of shell variable VAR.
3676-func_append ()
3677-{
3678- eval "$1=\$$1\$2"
3679-}
3680-
3681-_LT_EOF
3682- ;;
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" ||
3690+ sed '$q' "$ltmain" >> "$cfgfile" \
3691+ || (rm -f "$cfgfile"; exit 1)
3692+
3693+ if test x"$xsi_shell" = xyes; then
3694+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
3695+func_dirname ()\
3696+{\
3697+\ case ${1} in\
3698+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3699+\ * ) func_dirname_result="${3}" ;;\
3700+\ esac\
3701+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
3702+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3703+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3704+test 0 -eq $? || _lt_function_replace_fail=:
3705+
3706+
3707+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
3708+func_basename ()\
3709+{\
3710+\ func_basename_result="${1##*/}"\
3711+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
3712+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3713+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3714+test 0 -eq $? || _lt_function_replace_fail=:
3715+
3716+
3717+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
3718+func_dirname_and_basename ()\
3719+{\
3720+\ case ${1} in\
3721+\ */*) func_dirname_result="${1%/*}${2}" ;;\
3722+\ * ) func_dirname_result="${3}" ;;\
3723+\ esac\
3724+\ func_basename_result="${1##*/}"\
3725+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
3726+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3727+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3728+test 0 -eq $? || _lt_function_replace_fail=:
3729+
3730+
3731+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
3732+func_stripname ()\
3733+{\
3734+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
3735+\ # positional parameters, so assign one to ordinary parameter first.\
3736+\ func_stripname_result=${3}\
3737+\ func_stripname_result=${func_stripname_result#"${1}"}\
3738+\ func_stripname_result=${func_stripname_result%"${2}"}\
3739+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
3740+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3741+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3742+test 0 -eq $? || _lt_function_replace_fail=:
3743+
3744+
3745+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
3746+func_split_long_opt ()\
3747+{\
3748+\ func_split_long_opt_name=${1%%=*}\
3749+\ func_split_long_opt_arg=${1#*=}\
3750+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
3751+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3752+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3753+test 0 -eq $? || _lt_function_replace_fail=:
3754+
3755+
3756+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
3757+func_split_short_opt ()\
3758+{\
3759+\ func_split_short_opt_arg=${1#??}\
3760+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
3761+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
3762+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3763+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3764+test 0 -eq $? || _lt_function_replace_fail=:
3765+
3766+
3767+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
3768+func_lo2o ()\
3769+{\
3770+\ case ${1} in\
3771+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
3772+\ *) func_lo2o_result=${1} ;;\
3773+\ esac\
3774+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
3775+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3776+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3777+test 0 -eq $? || _lt_function_replace_fail=:
3778+
3779+
3780+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
3781+func_xform ()\
3782+{\
3783+ func_xform_result=${1%.*}.lo\
3784+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
3785+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3786+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3787+test 0 -eq $? || _lt_function_replace_fail=:
3788+
3789+
3790+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
3791+func_arith ()\
3792+{\
3793+ func_arith_result=$(( $* ))\
3794+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
3795+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3796+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3797+test 0 -eq $? || _lt_function_replace_fail=:
3798+
3799+
3800+ sed -e '/^func_len ()$/,/^} # func_len /c\
3801+func_len ()\
3802+{\
3803+ func_len_result=${#1}\
3804+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
3805+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3806+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3807+test 0 -eq $? || _lt_function_replace_fail=:
3808+
3809+fi
3810+
3811+if test x"$lt_shell_append" = xyes; then
3812+ sed -e '/^func_append ()$/,/^} # func_append /c\
3813+func_append ()\
3814+{\
3815+ eval "${1}+=\\${2}"\
3816+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
3817+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3818+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3819+test 0 -eq $? || _lt_function_replace_fail=:
3820+
3821+
3822+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
3823+func_append_quoted ()\
3824+{\
3825+\ func_quote_for_eval "${2}"\
3826+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
3827+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
3828+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3829+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3830+test 0 -eq $? || _lt_function_replace_fail=:
3831+
3832+
3833+ # Save a `func_append' function call where possible by direct use of '+='
3834+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
3835+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3836+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3837+ test 0 -eq $? || _lt_function_replace_fail=:
3838+else
3839+ # Save a `func_append' function call even when '+=' is not available
3840+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
3841+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3842+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3843+ test 0 -eq $? || _lt_function_replace_fail=:
3844+fi
3845+
3846+if test x"$_lt_function_replace_fail" = x":"; then
3847+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
3848+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
3849+fi
3850+
3851+
3852+ mv -f "$cfgfile" "$ofile" ||
3853 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
3854 chmod +x "$ofile"
3855
3856diff --git a/configure b/configure
3857index e9f2f13..cbccb18 100755
3858--- a/configure
3859+++ b/configure
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
3874 LIPO
3875 NMEDIT
3876 DSYMUTIL
3877+MANIFEST_TOOL
3878 RANLIB
3879+ac_ct_AR
3880 AR
3881+DLLTOOL
3882 OBJDUMP
3883 LN_S
3884 NM
3885@@ -757,6 +760,7 @@ enable_static
3886 with_pic
3887 enable_fast_install
3888 with_gnu_ld
3889+with_libtool_sysroot
3890 enable_libtool_lock
3891 enable_plugins
3892 enable_largefile
3893@@ -1422,6 +1426,8 @@ Optional Packages:
3894 --with-pic try to use only PIC/non-PIC objects [default=use
3895 both]
3896 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
3897+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
3898+ (or the compiler's sysroot if not specified).
3899 --with-zlib include zlib support (auto/yes/no) default=auto
3900
3901 Some influential environment variables:
3902@@ -4901,8 +4907,8 @@ esac
3903
3904
3905
3906-macro_version='2.2.7a'
3907-macro_revision='1.3134'
3908+macro_version='2.4'
3909+macro_revision='1.3293'
3910
3911
3912
3913@@ -4942,7 +4948,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3914 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3915 $as_echo_n "checking how to print strings... " >&6; }
3916 # Test print first, because it will be a builtin if present.
3917-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
3918+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3919 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3920 ECHO='print -r --'
3921 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3922@@ -5628,8 +5634,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
3923 # Try some XSI features
3924 xsi_shell=no
3925 ( _lt_dummy="a/b/c"
3926- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
3927- = c,a/b,, \
3928+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
3929+ = c,a/b,b/c, \
3930 && eval 'test $(( 1 + 1 )) -eq 2 \
3931 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3932 && xsi_shell=yes
3933@@ -5678,6 +5684,80 @@ esac
3934
3935
3936
3937+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
3938+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
3939+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
3940+ $as_echo_n "(cached) " >&6
3941+else
3942+ case $host in
3943+ *-*-mingw* )
3944+ case $build in
3945+ *-*-mingw* ) # actually msys
3946+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
3947+ ;;
3948+ *-*-cygwin* )
3949+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
3950+ ;;
3951+ * ) # otherwise, assume *nix
3952+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
3953+ ;;
3954+ esac
3955+ ;;
3956+ *-*-cygwin* )
3957+ case $build in
3958+ *-*-mingw* ) # actually msys
3959+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
3960+ ;;
3961+ *-*-cygwin* )
3962+ lt_cv_to_host_file_cmd=func_convert_file_noop
3963+ ;;
3964+ * ) # otherwise, assume *nix
3965+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
3966+ ;;
3967+ esac
3968+ ;;
3969+ * ) # unhandled hosts (and "normal" native builds)
3970+ lt_cv_to_host_file_cmd=func_convert_file_noop
3971+ ;;
3972+esac
3973+
3974+fi
3975+
3976+to_host_file_cmd=$lt_cv_to_host_file_cmd
3977+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
3978+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
3979+
3980+
3981+
3982+
3983+
3984+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
3985+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
3986+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
3987+ $as_echo_n "(cached) " >&6
3988+else
3989+ #assume ordinary cross tools, or native build.
3990+lt_cv_to_tool_file_cmd=func_convert_file_noop
3991+case $host in
3992+ *-*-mingw* )
3993+ case $build in
3994+ *-*-mingw* ) # actually msys
3995+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
3996+ ;;
3997+ esac
3998+ ;;
3999+esac
4000+
4001+fi
4002+
4003+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
4004+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
4005+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
4006+
4007+
4008+
4009+
4010+
4011 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
4012 $as_echo_n "checking for $LD option to reload object files... " >&6; }
4013 if test "${lt_cv_ld_reload_flag+set}" = set; then :
4014@@ -5694,6 +5774,11 @@ case $reload_flag in
4015 esac
4016 reload_cmds='$LD$reload_flag -o $output$reload_objs'
4017 case $host_os in
4018+ cygwin* | mingw* | pw32* | cegcc*)
4019+ if test "$GCC" != yes; then
4020+ reload_cmds=false
4021+ fi
4022+ ;;
4023 darwin*)
4024 if test "$GCC" = yes; then
4025 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
4026@@ -5862,7 +5947,8 @@ mingw* | pw32*)
4027 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4028 lt_cv_file_magic_cmd='func_win32_libid'
4029 else
4030- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
4031+ # Keep this pattern in sync with the one in func_win32_libid.
4032+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
4033 lt_cv_file_magic_cmd='$OBJDUMP -f'
4034 fi
4035 ;;
4036@@ -6016,6 +6102,21 @@ esac
4037 fi
4038 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
4039 $as_echo "$lt_cv_deplibs_check_method" >&6; }
4040+
4041+file_magic_glob=
4042+want_nocaseglob=no
4043+if test "$build" = "$host"; then
4044+ case $host_os in
4045+ mingw* | pw32*)
4046+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
4047+ want_nocaseglob=yes
4048+ else
4049+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
4050+ fi
4051+ ;;
4052+ esac
4053+fi
4054+
4055 file_magic_cmd=$lt_cv_file_magic_cmd
4056 deplibs_check_method=$lt_cv_deplibs_check_method
4057 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4058@@ -6031,9 +6132,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
4059
4060
4061
4062+
4063+
4064+
4065+
4066+
4067+
4068+
4069+
4070+
4071+
4072+if test -n "$ac_tool_prefix"; then
4073+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4074+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4075+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4076+$as_echo_n "checking for $ac_word... " >&6; }
4077+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
4078+ $as_echo_n "(cached) " >&6
4079+else
4080+ if test -n "$DLLTOOL"; then
4081+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
4082+else
4083+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4084+for as_dir in $PATH
4085+do
4086+ IFS=$as_save_IFS
4087+ test -z "$as_dir" && as_dir=.
4088+ for ac_exec_ext in '' $ac_executable_extensions; do
4089+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4090+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
4091+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4092+ break 2
4093+ fi
4094+done
4095+ done
4096+IFS=$as_save_IFS
4097+
4098+fi
4099+fi
4100+DLLTOOL=$ac_cv_prog_DLLTOOL
4101+if test -n "$DLLTOOL"; then
4102+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
4103+$as_echo "$DLLTOOL" >&6; }
4104+else
4105+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4106+$as_echo "no" >&6; }
4107+fi
4108+
4109+
4110+fi
4111+if test -z "$ac_cv_prog_DLLTOOL"; then
4112+ ac_ct_DLLTOOL=$DLLTOOL
4113+ # Extract the first word of "dlltool", so it can be a program name with args.
4114+set dummy dlltool; ac_word=$2
4115+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4116+$as_echo_n "checking for $ac_word... " >&6; }
4117+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
4118+ $as_echo_n "(cached) " >&6
4119+else
4120+ if test -n "$ac_ct_DLLTOOL"; then
4121+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
4122+else
4123+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4124+for as_dir in $PATH
4125+do
4126+ IFS=$as_save_IFS
4127+ test -z "$as_dir" && as_dir=.
4128+ for ac_exec_ext in '' $ac_executable_extensions; do
4129+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4130+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
4131+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4132+ break 2
4133+ fi
4134+done
4135+ done
4136+IFS=$as_save_IFS
4137+
4138+fi
4139+fi
4140+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
4141+if test -n "$ac_ct_DLLTOOL"; then
4142+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
4143+$as_echo "$ac_ct_DLLTOOL" >&6; }
4144+else
4145+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4146+$as_echo "no" >&6; }
4147+fi
4148+
4149+ if test "x$ac_ct_DLLTOOL" = x; then
4150+ DLLTOOL="false"
4151+ else
4152+ case $cross_compiling:$ac_tool_warned in
4153+yes:)
4154+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4155+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4156+ac_tool_warned=yes ;;
4157+esac
4158+ DLLTOOL=$ac_ct_DLLTOOL
4159+ fi
4160+else
4161+ DLLTOOL="$ac_cv_prog_DLLTOOL"
4162+fi
4163+
4164+test -z "$DLLTOOL" && DLLTOOL=dlltool
4165+
4166+
4167+
4168+
4169+
4170+
4171+
4172+
4173+
4174+
4175+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
4176+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
4177+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
4178+ $as_echo_n "(cached) " >&6
4179+else
4180+ lt_cv_sharedlib_from_linklib_cmd='unknown'
4181+
4182+case $host_os in
4183+cygwin* | mingw* | pw32* | cegcc*)
4184+ # two different shell functions defined in ltmain.sh
4185+ # decide which to use based on capabilities of $DLLTOOL
4186+ case `$DLLTOOL --help 2>&1` in
4187+ *--identify-strict*)
4188+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
4189+ ;;
4190+ *)
4191+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
4192+ ;;
4193+ esac
4194+ ;;
4195+*)
4196+ # fallback: assume linklib IS sharedlib
4197+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
4198+ ;;
4199+esac
4200+
4201+fi
4202+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
4203+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
4204+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
4205+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
4206+
4207+
4208+
4209+
4210+
4211+
4212+
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
4216+ for ac_prog in ar
4217+ do
4218+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4219+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4220 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4221 $as_echo_n "checking for $ac_word... " >&6; }
4222 if test "${ac_cv_prog_AR+set}" = set; then :
4223@@ -6049,7 +6303,7 @@ do
4224 test -z "$as_dir" && as_dir=.
4225 for ac_exec_ext in '' $ac_executable_extensions; do
4226 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4227- ac_cv_prog_AR="${ac_tool_prefix}ar"
4228+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4229 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4230 break 2
4231 fi
4232@@ -6069,11 +6323,15 @@ $as_echo "no" >&6; }
4233 fi
4234
4235
4236+ test -n "$AR" && break
4237+ done
4238 fi
4239-if test -z "$ac_cv_prog_AR"; then
4240+if test -z "$AR"; then
4241 ac_ct_AR=$AR
4242- # Extract the first word of "ar", so it can be a program name with args.
4243-set dummy ar; ac_word=$2
4244+ for ac_prog in ar
4245+do
4246+ # Extract the first word of "$ac_prog", so it can be a program name with args.
4247+set dummy $ac_prog; ac_word=$2
4248 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4249 $as_echo_n "checking for $ac_word... " >&6; }
4250 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
4251@@ -6089,7 +6347,7 @@ do
4252 test -z "$as_dir" && as_dir=.
4253 for ac_exec_ext in '' $ac_executable_extensions; do
4254 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4255- ac_cv_prog_ac_ct_AR="ar"
4256+ ac_cv_prog_ac_ct_AR="$ac_prog"
4257 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4258 break 2
4259 fi
4260@@ -6108,6 +6366,10 @@ else
4261 $as_echo "no" >&6; }
4262 fi
4263
4264+
4265+ test -n "$ac_ct_AR" && break
4266+done
4267+
4268 if test "x$ac_ct_AR" = x; then
4269 AR="false"
4270 else
4271@@ -6119,12 +6381,10 @@ ac_tool_warned=yes ;;
4272 esac
4273 AR=$ac_ct_AR
4274 fi
4275-else
4276- AR="$ac_cv_prog_AR"
4277 fi
4278
4279-test -z "$AR" && AR=ar
4280-test -z "$AR_FLAGS" && AR_FLAGS=cru
4281+: ${AR=ar}
4282+: ${AR_FLAGS=cru}
4283
4284
4285
4286@@ -6136,6 +6396,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
4287
4288
4289
4290+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
4291+$as_echo_n "checking for archiver @FILE support... " >&6; }
4292+if test "${lt_cv_ar_at_file+set}" = set; then :
4293+ $as_echo_n "(cached) " >&6
4294+else
4295+ lt_cv_ar_at_file=no
4296+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4297+/* end confdefs.h. */
4298+
4299+int
4300+main ()
4301+{
4302+
4303+ ;
4304+ return 0;
4305+}
4306+_ACEOF
4307+if ac_fn_c_try_compile "$LINENO"; then :
4308+ echo conftest.$ac_objext > conftest.lst
4309+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
4310+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4311+ (eval $lt_ar_try) 2>&5
4312+ ac_status=$?
4313+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4314+ test $ac_status = 0; }
4315+ if test "$ac_status" -eq 0; then
4316+ # Ensure the archiver fails upon bogus file names.
4317+ rm -f conftest.$ac_objext libconftest.a
4318+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
4319+ (eval $lt_ar_try) 2>&5
4320+ ac_status=$?
4321+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4322+ test $ac_status = 0; }
4323+ if test "$ac_status" -ne 0; then
4324+ lt_cv_ar_at_file=@
4325+ fi
4326+ fi
4327+ rm -f conftest.* libconftest.a
4328+
4329+fi
4330+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4331+
4332+fi
4333+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
4334+$as_echo "$lt_cv_ar_at_file" >&6; }
4335+
4336+if test "x$lt_cv_ar_at_file" = xno; then
4337+ archiver_list_spec=
4338+else
4339+ archiver_list_spec=$lt_cv_ar_at_file
4340+fi
4341+
4342+
4343+
4344+
4345+
4346+
4347+
4348 if test -n "$ac_tool_prefix"; then
4349 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4350 set dummy ${ac_tool_prefix}strip; ac_word=$2
4351@@ -6470,8 +6788,8 @@ esac
4352 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4353
4354 # Transform an extracted symbol line into symbol name and symbol address
4355-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4356-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'"
4357+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
4358+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'"
4359
4360 # Handle CRLF in mingw tool chain
4361 opt_cr=
4362@@ -6507,6 +6825,7 @@ for ac_symprfx in "" "_"; do
4363 else
4364 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4365 fi
4366+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
4367
4368 # Check to see that the pipe works correctly.
4369 pipe_works=no
4370@@ -6548,6 +6867,18 @@ _LT_EOF
4371 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4372 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4373 cat <<_LT_EOF > conftest.$ac_ext
4374+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
4375+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
4376+/* DATA imports from DLLs on WIN32 con't be const, because runtime
4377+ relocations are performed -- see ld's documentation on pseudo-relocs. */
4378+# define LT_DLSYM_CONST
4379+#elif defined(__osf__)
4380+/* This system does not cope well with relocations in const data. */
4381+# define LT_DLSYM_CONST
4382+#else
4383+# define LT_DLSYM_CONST const
4384+#endif
4385+
4386 #ifdef __cplusplus
4387 extern "C" {
4388 #endif
4389@@ -6559,7 +6890,7 @@ _LT_EOF
4390 cat <<_LT_EOF >> conftest.$ac_ext
4391
4392 /* The mapping between symbol names and symbols. */
4393-const struct {
4394+LT_DLSYM_CONST struct {
4395 const char *name;
4396 void *address;
4397 }
4398@@ -6585,8 +6916,8 @@ static const void *lt_preloaded_setup() {
4399 _LT_EOF
4400 # Now try linking the two files.
4401 mv conftest.$ac_objext conftstm.$ac_objext
4402- lt_save_LIBS="$LIBS"
4403- lt_save_CFLAGS="$CFLAGS"
4404+ lt_globsym_save_LIBS=$LIBS
4405+ lt_globsym_save_CFLAGS=$CFLAGS
4406 LIBS="conftstm.$ac_objext"
4407 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4408 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4409@@ -6596,8 +6927,8 @@ _LT_EOF
4410 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4411 pipe_works=yes
4412 fi
4413- LIBS="$lt_save_LIBS"
4414- CFLAGS="$lt_save_CFLAGS"
4415+ LIBS=$lt_globsym_save_LIBS
4416+ CFLAGS=$lt_globsym_save_CFLAGS
4417 else
4418 echo "cannot find nm_test_func in $nlist" >&5
4419 fi
4420@@ -6634,6 +6965,21 @@ else
4421 $as_echo "ok" >&6; }
4422 fi
4423
4424+# Response file support.
4425+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
4426+ nm_file_list_spec='@'
4427+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
4428+ nm_file_list_spec='@'
4429+fi
4430+
4431+
4432+
4433+
4434+
4435+
4436+
4437+
4438+
4439
4440
4441
4442@@ -6652,6 +6998,40 @@ fi
4443
4444
4445
4446+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
4447+$as_echo_n "checking for sysroot... " >&6; }
4448+
4449+# Check whether --with-libtool-sysroot was given.
4450+if test "${with_libtool_sysroot+set}" = set; then :
4451+ withval=$with_libtool_sysroot;
4452+else
4453+ with_libtool_sysroot=no
4454+fi
4455+
4456+
4457+lt_sysroot=
4458+case ${with_libtool_sysroot} in #(
4459+ yes)
4460+ if test "$GCC" = yes; then
4461+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
4462+ fi
4463+ ;; #(
4464+ /*)
4465+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
4466+ ;; #(
4467+ no|'')
4468+ ;; #(
4469+ *)
4470+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
4471+$as_echo "${with_libtool_sysroot}" >&6; }
4472+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
4473+ ;;
4474+esac
4475+
4476+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
4477+$as_echo "${lt_sysroot:-no}" >&6; }
4478+
4479+
4480
4481
4482
4483@@ -6861,6 +7241,123 @@ esac
4484
4485 need_locks="$enable_libtool_lock"
4486
4487+if test -n "$ac_tool_prefix"; then
4488+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
4489+set dummy ${ac_tool_prefix}mt; ac_word=$2
4490+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4491+$as_echo_n "checking for $ac_word... " >&6; }
4492+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
4493+ $as_echo_n "(cached) " >&6
4494+else
4495+ if test -n "$MANIFEST_TOOL"; then
4496+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
4497+else
4498+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4499+for as_dir in $PATH
4500+do
4501+ IFS=$as_save_IFS
4502+ test -z "$as_dir" && as_dir=.
4503+ for ac_exec_ext in '' $ac_executable_extensions; do
4504+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4505+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
4506+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4507+ break 2
4508+ fi
4509+done
4510+ done
4511+IFS=$as_save_IFS
4512+
4513+fi
4514+fi
4515+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
4516+if test -n "$MANIFEST_TOOL"; then
4517+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
4518+$as_echo "$MANIFEST_TOOL" >&6; }
4519+else
4520+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4521+$as_echo "no" >&6; }
4522+fi
4523+
4524+
4525+fi
4526+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
4527+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
4528+ # Extract the first word of "mt", so it can be a program name with args.
4529+set dummy mt; ac_word=$2
4530+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4531+$as_echo_n "checking for $ac_word... " >&6; }
4532+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
4533+ $as_echo_n "(cached) " >&6
4534+else
4535+ if test -n "$ac_ct_MANIFEST_TOOL"; then
4536+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
4537+else
4538+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4539+for as_dir in $PATH
4540+do
4541+ IFS=$as_save_IFS
4542+ test -z "$as_dir" && as_dir=.
4543+ for ac_exec_ext in '' $ac_executable_extensions; do
4544+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4545+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
4546+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4547+ break 2
4548+ fi
4549+done
4550+ done
4551+IFS=$as_save_IFS
4552+
4553+fi
4554+fi
4555+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
4556+if test -n "$ac_ct_MANIFEST_TOOL"; then
4557+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
4558+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
4559+else
4560+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4561+$as_echo "no" >&6; }
4562+fi
4563+
4564+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
4565+ MANIFEST_TOOL=":"
4566+ else
4567+ case $cross_compiling:$ac_tool_warned in
4568+yes:)
4569+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4570+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4571+ac_tool_warned=yes ;;
4572+esac
4573+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
4574+ fi
4575+else
4576+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
4577+fi
4578+
4579+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
4580+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
4581+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
4582+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
4583+ $as_echo_n "(cached) " >&6
4584+else
4585+ lt_cv_path_mainfest_tool=no
4586+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
4587+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
4588+ cat conftest.err >&5
4589+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
4590+ lt_cv_path_mainfest_tool=yes
4591+ fi
4592+ rm -f conftest*
4593+fi
4594+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
4595+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
4596+if test "x$lt_cv_path_mainfest_tool" != xyes; then
4597+ MANIFEST_TOOL=:
4598+fi
4599+
4600+
4601+
4602+
4603+
4604
4605 case $host_os in
4606 rhapsody* | darwin*)
4607@@ -7424,6 +7921,8 @@ _LT_EOF
4608 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
4609 echo "$AR cru libconftest.a conftest.o" >&5
4610 $AR cru libconftest.a conftest.o 2>&5
4611+ echo "$RANLIB libconftest.a" >&5
4612+ $RANLIB libconftest.a 2>&5
4613 cat > conftest.c << _LT_EOF
4614 int main() { return 0;}
4615 _LT_EOF
4616@@ -7619,7 +8118,8 @@ fi
4617 LIBTOOL_DEPS="$ltmain"
4618
4619 # Always use our own libtool.
4620-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
4621+LIBTOOL='$(SHELL) $(top_builddir)'
4622+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
4623
4624
4625
4626@@ -7708,7 +8208,7 @@ aix3*)
4627 esac
4628
4629 # Global variables:
4630-ofile=libtool
4631+ofile=${host_alias}-libtool
4632 can_build_shared=yes
4633
4634 # All known linkers require a `.a' archive for static linking (except MSVC,
4635@@ -8006,8 +8506,6 @@ fi
4636 lt_prog_compiler_pic=
4637 lt_prog_compiler_static=
4638
4639-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4640-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4641
4642 if test "$GCC" = yes; then
4643 lt_prog_compiler_wl='-Wl,'
4644@@ -8173,6 +8671,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4645 lt_prog_compiler_pic='--shared'
4646 lt_prog_compiler_static='--static'
4647 ;;
4648+ nagfor*)
4649+ # NAG Fortran compiler
4650+ lt_prog_compiler_wl='-Wl,-Wl,,'
4651+ lt_prog_compiler_pic='-PIC'
4652+ lt_prog_compiler_static='-Bstatic'
4653+ ;;
4654 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4655 # Portland Group compilers (*not* the Pentium gcc compiler,
4656 # which looks to be a dead project)
4657@@ -8235,7 +8739,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4658 lt_prog_compiler_pic='-KPIC'
4659 lt_prog_compiler_static='-Bstatic'
4660 case $cc_basename in
4661- f77* | f90* | f95*)
4662+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4663 lt_prog_compiler_wl='-Qoption ld ';;
4664 *)
4665 lt_prog_compiler_wl='-Wl,';;
4666@@ -8292,13 +8796,17 @@ case $host_os in
4667 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
4668 ;;
4669 esac
4670-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
4671-$as_echo "$lt_prog_compiler_pic" >&6; }
4672-
4673-
4674-
4675-
4676
4677+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
4678+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4679+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
4680+ $as_echo_n "(cached) " >&6
4681+else
4682+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
4683+fi
4684+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
4685+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
4686+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
4687
4688 #
4689 # Check to make sure the PIC flag actually works.
4690@@ -8359,6 +8867,11 @@ fi
4691
4692
4693
4694+
4695+
4696+
4697+
4698+
4699 #
4700 # Check to make sure the static flag actually works.
4701 #
4702@@ -8709,7 +9222,8 @@ _LT_EOF
4703 allow_undefined_flag=unsupported
4704 always_export_symbols=no
4705 enable_shared_with_static_runtimes=yes
4706- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4707+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
4708+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
4709
4710 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4711 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
4712@@ -8757,7 +9271,7 @@ _LT_EOF
4713 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
4714 && test "$tmp_diet" = no
4715 then
4716- tmp_addflag=
4717+ tmp_addflag=' $pic_flag'
4718 tmp_sharedflag='-shared'
4719 case $cc_basename,$host_cpu in
4720 pgcc*) # Portland Group C compiler
4721@@ -8808,12 +9322,12 @@ _LT_EOF
4722 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
4723 hardcode_libdir_flag_spec=
4724 hardcode_libdir_flag_spec_ld='-rpath $libdir'
4725- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4726+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4727 if test "x$supports_anon_versioning" = xyes; then
4728 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
4729 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4730 echo "local: *; };" >> $output_objdir/$libname.ver~
4731- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4732+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4733 fi
4734 ;;
4735 esac
4736@@ -8827,8 +9341,8 @@ _LT_EOF
4737 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4738 wlarc=
4739 else
4740- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4741- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4742+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4743+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4744 fi
4745 ;;
4746
4747@@ -8846,8 +9360,8 @@ _LT_EOF
4748
4749 _LT_EOF
4750 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4751- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4752- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4753+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4754+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4755 else
4756 ld_shlibs=no
4757 fi
4758@@ -8893,8 +9407,8 @@ _LT_EOF
4759
4760 *)
4761 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4762- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4763- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4764+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4765+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4766 else
4767 ld_shlibs=no
4768 fi
4769@@ -9024,7 +9538,13 @@ _LT_EOF
4770 allow_undefined_flag='-berok'
4771 # Determine the default libpath from the value encoded in an
4772 # empty executable.
4773- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4774+ if test "${lt_cv_aix_libpath+set}" = set; then
4775+ aix_libpath=$lt_cv_aix_libpath
4776+else
4777+ if test "${lt_cv_aix_libpath_+set}" = set; then :
4778+ $as_echo_n "(cached) " >&6
4779+else
4780+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4781 /* end confdefs.h. */
4782
4783 int
4784@@ -9037,22 +9557,29 @@ main ()
4785 _ACEOF
4786 if ac_fn_c_try_link "$LINENO"; then :
4787
4788-lt_aix_libpath_sed='
4789- /Import File Strings/,/^$/ {
4790- /^0/ {
4791- s/^0 *\(.*\)$/\1/
4792- p
4793- }
4794- }'
4795-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4796-# Check for a 64-bit object if we didn't find anything.
4797-if test -z "$aix_libpath"; then
4798- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4799-fi
4800+ lt_aix_libpath_sed='
4801+ /Import File Strings/,/^$/ {
4802+ /^0/ {
4803+ s/^0 *\([^ ]*\) *$/\1/
4804+ p
4805+ }
4806+ }'
4807+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4808+ # Check for a 64-bit object if we didn't find anything.
4809+ if test -z "$lt_cv_aix_libpath_"; then
4810+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4811+ fi
4812 fi
4813 rm -f core conftest.err conftest.$ac_objext \
4814 conftest$ac_exeext conftest.$ac_ext
4815-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4816+ if test -z "$lt_cv_aix_libpath_"; then
4817+ lt_cv_aix_libpath_="/usr/lib:/lib"
4818+ fi
4819+
4820+fi
4821+
4822+ aix_libpath=$lt_cv_aix_libpath_
4823+fi
4824
4825 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
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"
4827@@ -9064,7 +9591,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4828 else
4829 # Determine the default libpath from the value encoded in an
4830 # empty executable.
4831- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4832+ if test "${lt_cv_aix_libpath+set}" = set; then
4833+ aix_libpath=$lt_cv_aix_libpath
4834+else
4835+ if test "${lt_cv_aix_libpath_+set}" = set; then :
4836+ $as_echo_n "(cached) " >&6
4837+else
4838+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4839 /* end confdefs.h. */
4840
4841 int
4842@@ -9077,22 +9610,29 @@ main ()
4843 _ACEOF
4844 if ac_fn_c_try_link "$LINENO"; then :
4845
4846-lt_aix_libpath_sed='
4847- /Import File Strings/,/^$/ {
4848- /^0/ {
4849- s/^0 *\(.*\)$/\1/
4850- p
4851- }
4852- }'
4853-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4854-# Check for a 64-bit object if we didn't find anything.
4855-if test -z "$aix_libpath"; then
4856- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4857-fi
4858+ lt_aix_libpath_sed='
4859+ /Import File Strings/,/^$/ {
4860+ /^0/ {
4861+ s/^0 *\([^ ]*\) *$/\1/
4862+ p
4863+ }
4864+ }'
4865+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4866+ # Check for a 64-bit object if we didn't find anything.
4867+ if test -z "$lt_cv_aix_libpath_"; then
4868+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
4869+ fi
4870 fi
4871 rm -f core conftest.err conftest.$ac_objext \
4872 conftest$ac_exeext conftest.$ac_ext
4873-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4874+ if test -z "$lt_cv_aix_libpath_"; then
4875+ lt_cv_aix_libpath_="/usr/lib:/lib"
4876+ fi
4877+
4878+fi
4879+
4880+ aix_libpath=$lt_cv_aix_libpath_
4881+fi
4882
4883 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
4884 # Warning - without using the other run time loading flags,
4885@@ -9137,20 +9677,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4886 # Microsoft Visual C++.
4887 # hardcode_libdir_flag_spec is actually meaningless, as there is
4888 # no search path for DLLs.
4889- hardcode_libdir_flag_spec=' '
4890- allow_undefined_flag=unsupported
4891- # Tell ltmain to make .lib files, not .a files.
4892- libext=lib
4893- # Tell ltmain to make .dll files, not .so files.
4894- shrext_cmds=".dll"
4895- # FIXME: Setting linknames here is a bad hack.
4896- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4897- # The linker will automatically build a .lib file if we build a DLL.
4898- old_archive_from_new_cmds='true'
4899- # FIXME: Should let the user specify the lib program.
4900- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4901- fix_srcfile_path='`cygpath -w "$srcfile"`'
4902- enable_shared_with_static_runtimes=yes
4903+ case $cc_basename in
4904+ cl*)
4905+ # Native MSVC
4906+ hardcode_libdir_flag_spec=' '
4907+ allow_undefined_flag=unsupported
4908+ always_export_symbols=yes
4909+ file_list_spec='@'
4910+ # Tell ltmain to make .lib files, not .a files.
4911+ libext=lib
4912+ # Tell ltmain to make .dll files, not .so files.
4913+ shrext_cmds=".dll"
4914+ # FIXME: Setting linknames here is a bad hack.
4915+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
4916+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
4917+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
4918+ else
4919+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
4920+ fi~
4921+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
4922+ linknames='
4923+ # The linker will not automatically build a static lib if we build a DLL.
4924+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
4925+ enable_shared_with_static_runtimes=yes
4926+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
4927+ # Don't use ranlib
4928+ old_postinstall_cmds='chmod 644 $oldlib'
4929+ postlink_cmds='lt_outputfile="@OUTPUT@"~
4930+ lt_tool_outputfile="@TOOL_OUTPUT@"~
4931+ case $lt_outputfile in
4932+ *.exe|*.EXE) ;;
4933+ *)
4934+ lt_outputfile="$lt_outputfile.exe"
4935+ lt_tool_outputfile="$lt_tool_outputfile.exe"
4936+ ;;
4937+ esac~
4938+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
4939+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
4940+ $RM "$lt_outputfile.manifest";
4941+ fi'
4942+ ;;
4943+ *)
4944+ # Assume MSVC wrapper
4945+ hardcode_libdir_flag_spec=' '
4946+ allow_undefined_flag=unsupported
4947+ # Tell ltmain to make .lib files, not .a files.
4948+ libext=lib
4949+ # Tell ltmain to make .dll files, not .so files.
4950+ shrext_cmds=".dll"
4951+ # FIXME: Setting linknames here is a bad hack.
4952+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4953+ # The linker will automatically build a .lib file if we build a DLL.
4954+ old_archive_from_new_cmds='true'
4955+ # FIXME: Should let the user specify the lib program.
4956+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
4957+ enable_shared_with_static_runtimes=yes
4958+ ;;
4959+ esac
4960 ;;
4961
4962 darwin* | rhapsody*)
4963@@ -9211,7 +9794,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4964
4965 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
4966 freebsd* | dragonfly*)
4967- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
4968+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
4969 hardcode_libdir_flag_spec='-R$libdir'
4970 hardcode_direct=yes
4971 hardcode_shlibpath_var=no
4972@@ -9219,7 +9802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4973
4974 hpux9*)
4975 if test "$GCC" = yes; then
4976- archive_cmds='$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'
4977+ archive_cmds='$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'
4978 else
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'
4980 fi
4981@@ -9235,7 +9818,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4982
4983 hpux10*)
4984 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4985- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4986+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4987 else
4988 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4989 fi
4990@@ -9259,10 +9842,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
4991 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4992 ;;
4993 ia64*)
4994- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4995+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4996 ;;
4997 *)
4998- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4999+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5000 ;;
5001 esac
5002 else
5003@@ -9341,23 +9924,36 @@ fi
5004
5005 irix5* | irix6* | nonstopux*)
5006 if test "$GCC" = yes; then
5007- archive_cmds='$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'
5008+ archive_cmds='$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'
5009 # Try to use the -exported_symbol ld option, if it does not
5010 # work, assume that -exports_file does not work either and
5011 # implicitly export all symbols.
5012- save_LDFLAGS="$LDFLAGS"
5013- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5014- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5015+ # This should be the same for all languages, so no per-tag cache variable.
5016+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
5017+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
5018+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
5019+ $as_echo_n "(cached) " >&6
5020+else
5021+ save_LDFLAGS="$LDFLAGS"
5022+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5023+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5024 /* end confdefs.h. */
5025-int foo(void) {}
5026+int foo (void) { return 0; }
5027 _ACEOF
5028 if ac_fn_c_try_link "$LINENO"; then :
5029- archive_expsym_cmds='$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'
5030-
5031+ lt_cv_irix_exported_symbol=yes
5032+else
5033+ lt_cv_irix_exported_symbol=no
5034 fi
5035 rm -f core conftest.err conftest.$ac_objext \
5036 conftest$ac_exeext conftest.$ac_ext
5037- LDFLAGS="$save_LDFLAGS"
5038+ LDFLAGS="$save_LDFLAGS"
5039+fi
5040+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
5041+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
5042+ if test "$lt_cv_irix_exported_symbol" = yes; then
5043+ archive_expsym_cmds='$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'
5044+ fi
5045 else
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'
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'
5048@@ -9442,7 +10038,7 @@ rm -f core conftest.err conftest.$ac_objext \
5049 osf4* | osf5*) # as osf3* with the addition of -msym flag
5050 if test "$GCC" = yes; then
5051 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
5052- archive_cmds='$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'
5053+ archive_cmds='$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'
5054 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5055 else
5056 allow_undefined_flag=' -expect_unresolved \*'
5057@@ -9461,9 +10057,9 @@ rm -f core conftest.err conftest.$ac_objext \
5058 no_undefined_flag=' -z defs'
5059 if test "$GCC" = yes; then
5060 wlarc='${wl}'
5061- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5062+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5063 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5064- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5065+ $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'
5066 else
5067 case `$CC -V 2>&1` in
5068 *"Compilers 5.0"*)
5069@@ -10039,8 +10635,9 @@ cygwin* | mingw* | pw32* | cegcc*)
5070 need_version=no
5071 need_lib_prefix=no
5072
5073- case $GCC,$host_os in
5074- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
5075+ case $GCC,$cc_basename in
5076+ yes,*)
5077+ # gcc
5078 library_names_spec='$libname.dll.a'
5079 # DLL is installed to $(libdir)/../bin by postinstall_cmds
5080 postinstall_cmds='base_file=`basename \${file}`~
5081@@ -10073,13 +10670,71 @@ cygwin* | mingw* | pw32* | cegcc*)
5082 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5083 ;;
5084 esac
5085+ dynamic_linker='Win32 ld.exe'
5086+ ;;
5087+
5088+ *,cl*)
5089+ # Native MSVC
5090+ libname_spec='$name'
5091+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
5092+ library_names_spec='${libname}.dll.lib'
5093+
5094+ case $build_os in
5095+ mingw*)
5096+ sys_lib_search_path_spec=
5097+ lt_save_ifs=$IFS
5098+ IFS=';'
5099+ for lt_path in $LIB
5100+ do
5101+ IFS=$lt_save_ifs
5102+ # Let DOS variable expansion print the short 8.3 style file name.
5103+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
5104+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
5105+ done
5106+ IFS=$lt_save_ifs
5107+ # Convert to MSYS style.
5108+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
5109+ ;;
5110+ cygwin*)
5111+ # Convert to unix form, then to dos form, then back to unix form
5112+ # but this time dos style (no spaces!) so that the unix form looks
5113+ # like /cygdrive/c/PROGRA~1:/cygdr...
5114+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
5115+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
5116+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5117+ ;;
5118+ *)
5119+ sys_lib_search_path_spec="$LIB"
5120+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
5121+ # It is most probably a Windows format PATH.
5122+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5123+ else
5124+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5125+ fi
5126+ # FIXME: find the short name or the path components, as spaces are
5127+ # common. (e.g. "Program Files" -> "PROGRA~1")
5128+ ;;
5129+ esac
5130+
5131+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
5132+ postinstall_cmds='base_file=`basename \${file}`~
5133+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
5134+ dldir=$destdir/`dirname \$dlpath`~
5135+ test -d \$dldir || mkdir -p \$dldir~
5136+ $install_prog $dir/$dlname \$dldir/$dlname'
5137+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5138+ dlpath=$dir/\$dldll~
5139+ $RM \$dlpath'
5140+ shlibpath_overrides_runpath=yes
5141+ dynamic_linker='Win32 link.exe'
5142 ;;
5143
5144 *)
5145+ # Assume MSVC wrapper
5146 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
5147+ dynamic_linker='Win32 ld.exe'
5148 ;;
5149 esac
5150- dynamic_linker='Win32 ld.exe'
5151 # FIXME: first we should search . and the directory the executable is in
5152 shlibpath_var=PATH
5153 ;;
5154@@ -10171,7 +10826,7 @@ haiku*)
5155 soname_spec='${libname}${release}${shared_ext}$major'
5156 shlibpath_var=LIBRARY_PATH
5157 shlibpath_overrides_runpath=yes
5158- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
5159+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
5160 hardcode_into_libs=yes
5161 ;;
5162
5163@@ -11011,10 +11666,10 @@ else
5164 /* When -fvisbility=hidden is used, assume the code has been annotated
5165 correspondingly for the symbols needed. */
5166 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5167-void fnord () __attribute__((visibility("default")));
5168+int fnord () __attribute__((visibility("default")));
5169 #endif
5170
5171-void fnord () { int i=42; }
5172+int fnord () { return 42; }
5173 int main ()
5174 {
5175 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5176@@ -11117,10 +11772,10 @@ else
5177 /* When -fvisbility=hidden is used, assume the code has been annotated
5178 correspondingly for the symbols needed. */
5179 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
5180-void fnord () __attribute__((visibility("default")));
5181+int fnord () __attribute__((visibility("default")));
5182 #endif
5183
5184-void fnord () { int i=42; }
5185+int fnord () { return 42; }
5186 int main ()
5187 {
5188 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
5189@@ -15274,13 +15929,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
5190 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
5191 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
5192 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
5193+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
5194+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
5195 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
5196 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
5197 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
5198 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
5199 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
5200+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
5201+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
5202+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
5203+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
5204 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
5205 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
5206+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
5207 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
5208 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
5209 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
5210@@ -15295,14 +15957,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
5211 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $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"`'
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"`'
5214+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
5215+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
5216 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
5217 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
5218 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
5219-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5220 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
5221+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
5222 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
5223 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
5224 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
5225+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
5226 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
5227 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
5228 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
5229@@ -15335,12 +16000,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
5230 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
5231 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
5232 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
5233-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
5234 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
5235 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
5236 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
5237 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
5238 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
5239+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
5240 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
5241 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
5242 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
5243@@ -15395,8 +16060,13 @@ reload_flag \
5244 OBJDUMP \
5245 deplibs_check_method \
5246 file_magic_cmd \
5247+file_magic_glob \
5248+want_nocaseglob \
5249+DLLTOOL \
5250+sharedlib_from_linklib_cmd \
5251 AR \
5252 AR_FLAGS \
5253+archiver_list_spec \
5254 STRIP \
5255 RANLIB \
5256 CC \
5257@@ -15406,12 +16076,14 @@ lt_cv_sys_global_symbol_pipe \
5258 lt_cv_sys_global_symbol_to_cdecl \
5259 lt_cv_sys_global_symbol_to_c_name_address \
5260 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
5261+nm_file_list_spec \
5262 lt_prog_compiler_no_builtin_flag \
5263-lt_prog_compiler_wl \
5264 lt_prog_compiler_pic \
5265+lt_prog_compiler_wl \
5266 lt_prog_compiler_static \
5267 lt_cv_prog_compiler_c_o \
5268 need_locks \
5269+MANIFEST_TOOL \
5270 DSYMUTIL \
5271 NMEDIT \
5272 LIPO \
5273@@ -15427,7 +16099,6 @@ no_undefined_flag \
5274 hardcode_libdir_flag_spec \
5275 hardcode_libdir_flag_spec_ld \
5276 hardcode_libdir_separator \
5277-fix_srcfile_path \
5278 exclude_expsyms \
5279 include_expsyms \
5280 file_list_spec \
5281@@ -15463,6 +16134,7 @@ module_cmds \
5282 module_expsym_cmds \
5283 export_symbols_cmds \
5284 prelink_cmds \
5285+postlink_cmds \
5286 postinstall_cmds \
5287 postuninstall_cmds \
5288 finish_cmds \
5289@@ -16227,7 +16899,8 @@ $as_echo X"$file" |
5290 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
5291 #
5292 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5293-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5294+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5295+# Inc.
5296 # Written by Gordon Matzigkeit, 1996
5297 #
5298 # This file is part of GNU Libtool.
5299@@ -16330,19 +17003,42 @@ SP2NL=$lt_lt_SP2NL
5300 # turn newlines into spaces.
5301 NL2SP=$lt_lt_NL2SP
5302
5303+# convert \$build file names to \$host format.
5304+to_host_file_cmd=$lt_cv_to_host_file_cmd
5305+
5306+# convert \$build files to toolchain format.
5307+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5308+
5309 # An object symbol dumper.
5310 OBJDUMP=$lt_OBJDUMP
5311
5312 # Method to check whether dependent libraries are shared objects.
5313 deplibs_check_method=$lt_deplibs_check_method
5314
5315-# Command to use when deplibs_check_method == "file_magic".
5316+# Command to use when deplibs_check_method = "file_magic".
5317 file_magic_cmd=$lt_file_magic_cmd
5318
5319+# How to find potential files when deplibs_check_method = "file_magic".
5320+file_magic_glob=$lt_file_magic_glob
5321+
5322+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
5323+want_nocaseglob=$lt_want_nocaseglob
5324+
5325+# DLL creation program.
5326+DLLTOOL=$lt_DLLTOOL
5327+
5328+# Command to associate shared and link libraries.
5329+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
5330+
5331 # The archiver.
5332 AR=$lt_AR
5333+
5334+# Flags to create an archive.
5335 AR_FLAGS=$lt_AR_FLAGS
5336
5337+# How to feed a file listing to the archiver.
5338+archiver_list_spec=$lt_archiver_list_spec
5339+
5340 # A symbol stripping program.
5341 STRIP=$lt_STRIP
5342
5343@@ -16372,6 +17068,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
5344 # Transform the output of nm in a C name address pair when lib prefix is needed.
5345 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
5346
5347+# Specify filename containing input files for \$NM.
5348+nm_file_list_spec=$lt_nm_file_list_spec
5349+
5350+# The root where to search for dependent libraries,and in which our libraries should be installed.
5351+lt_sysroot=$lt_sysroot
5352+
5353 # The name of the directory that contains temporary libtool files.
5354 objdir=$objdir
5355
5356@@ -16381,6 +17083,9 @@ MAGIC_CMD=$MAGIC_CMD
5357 # Must we lock files when doing compilation?
5358 need_locks=$lt_need_locks
5359
5360+# Manifest tool.
5361+MANIFEST_TOOL=$lt_MANIFEST_TOOL
5362+
5363 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
5364 DSYMUTIL=$lt_DSYMUTIL
5365
5366@@ -16495,12 +17200,12 @@ with_gcc=$GCC
5367 # Compiler flag to turn off builtin functions.
5368 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
5369
5370-# How to pass a linker flag through the compiler.
5371-wl=$lt_lt_prog_compiler_wl
5372-
5373 # Additional compiler flags for building library objects.
5374 pic_flag=$lt_lt_prog_compiler_pic
5375
5376+# How to pass a linker flag through the compiler.
5377+wl=$lt_lt_prog_compiler_wl
5378+
5379 # Compiler flag to prevent dynamic linking.
5380 link_static_flag=$lt_lt_prog_compiler_static
5381
5382@@ -16587,9 +17292,6 @@ inherit_rpath=$inherit_rpath
5383 # Whether libtool must link a program against all its dependency libraries.
5384 link_all_deplibs=$link_all_deplibs
5385
5386-# Fix the shell variable \$srcfile for the compiler.
5387-fix_srcfile_path=$lt_fix_srcfile_path
5388-
5389 # Set to "yes" if exported symbols are required.
5390 always_export_symbols=$always_export_symbols
5391
5392@@ -16605,6 +17307,9 @@ include_expsyms=$lt_include_expsyms
5393 # Commands necessary for linking programs (against libraries) with templates.
5394 prelink_cmds=$lt_prelink_cmds
5395
5396+# Commands necessary for finishing linking programs.
5397+postlink_cmds=$lt_postlink_cmds
5398+
5399 # Specify filename containing input files.
5400 file_list_spec=$lt_file_list_spec
5401
5402@@ -16637,210 +17342,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
5403 # if finds mixed CR/LF and LF-only lines. Since sed operates in
5404 # text mode, it properly converts lines to CR/LF. This bash problem
5405 # is reportedly fixed, but why not run on old versions too?
5406- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
5407- || (rm -f "$cfgfile"; exit 1)
5408-
5409- case $xsi_shell in
5410- yes)
5411- cat << \_LT_EOF >> "$cfgfile"
5412-
5413-# func_dirname file append nondir_replacement
5414-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5415-# otherwise set result to NONDIR_REPLACEMENT.
5416-func_dirname ()
5417-{
5418- case ${1} in
5419- */*) func_dirname_result="${1%/*}${2}" ;;
5420- * ) func_dirname_result="${3}" ;;
5421- esac
5422-}
5423-
5424-# func_basename file
5425-func_basename ()
5426-{
5427- func_basename_result="${1##*/}"
5428-}
5429-
5430-# func_dirname_and_basename file append nondir_replacement
5431-# perform func_basename and func_dirname in a single function
5432-# call:
5433-# dirname: Compute the dirname of FILE. If nonempty,
5434-# add APPEND to the result, otherwise set result
5435-# to NONDIR_REPLACEMENT.
5436-# value returned in "$func_dirname_result"
5437-# basename: Compute filename of FILE.
5438-# value retuned in "$func_basename_result"
5439-# Implementation must be kept synchronized with func_dirname
5440-# and func_basename. For efficiency, we do not delegate to
5441-# those functions but instead duplicate the functionality here.
5442-func_dirname_and_basename ()
5443-{
5444- case ${1} in
5445- */*) func_dirname_result="${1%/*}${2}" ;;
5446- * ) func_dirname_result="${3}" ;;
5447- esac
5448- func_basename_result="${1##*/}"
5449-}
5450-
5451-# func_stripname prefix suffix name
5452-# strip PREFIX and SUFFIX off of NAME.
5453-# PREFIX and SUFFIX must not contain globbing or regex special
5454-# characters, hashes, percent signs, but SUFFIX may contain a leading
5455-# dot (in which case that matches only a dot).
5456-func_stripname ()
5457-{
5458- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
5459- # positional parameters, so assign one to ordinary parameter first.
5460- func_stripname_result=${3}
5461- func_stripname_result=${func_stripname_result#"${1}"}
5462- func_stripname_result=${func_stripname_result%"${2}"}
5463-}
5464-
5465-# func_opt_split
5466-func_opt_split ()
5467-{
5468- func_opt_split_opt=${1%%=*}
5469- func_opt_split_arg=${1#*=}
5470-}
5471-
5472-# func_lo2o object
5473-func_lo2o ()
5474-{
5475- case ${1} in
5476- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
5477- *) func_lo2o_result=${1} ;;
5478- esac
5479-}
5480-
5481-# func_xform libobj-or-source
5482-func_xform ()
5483-{
5484- func_xform_result=${1%.*}.lo
5485-}
5486-
5487-# func_arith arithmetic-term...
5488-func_arith ()
5489-{
5490- func_arith_result=$(( $* ))
5491-}
5492-
5493-# func_len string
5494-# STRING may not start with a hyphen.
5495-func_len ()
5496-{
5497- func_len_result=${#1}
5498-}
5499-
5500-_LT_EOF
5501- ;;
5502- *) # Bourne compatible functions.
5503- cat << \_LT_EOF >> "$cfgfile"
5504-
5505-# func_dirname file append nondir_replacement
5506-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
5507-# otherwise set result to NONDIR_REPLACEMENT.
5508-func_dirname ()
5509-{
5510- # Extract subdirectory from the argument.
5511- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
5512- if test "X$func_dirname_result" = "X${1}"; then
5513- func_dirname_result="${3}"
5514- else
5515- func_dirname_result="$func_dirname_result${2}"
5516- fi
5517-}
5518-
5519-# func_basename file
5520-func_basename ()
5521-{
5522- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
5523-}
5524-
5525-
5526-# func_stripname prefix suffix name
5527-# strip PREFIX and SUFFIX off of NAME.
5528-# PREFIX and SUFFIX must not contain globbing or regex special
5529-# characters, hashes, percent signs, but SUFFIX may contain a leading
5530-# dot (in which case that matches only a dot).
5531-# func_strip_suffix prefix name
5532-func_stripname ()
5533-{
5534- case ${2} in
5535- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
5536- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
5537- esac
5538-}
5539-
5540-# sed scripts:
5541-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
5542-my_sed_long_arg='1s/^-[^=]*=//'
5543-
5544-# func_opt_split
5545-func_opt_split ()
5546-{
5547- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
5548- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
5549-}
5550-
5551-# func_lo2o object
5552-func_lo2o ()
5553-{
5554- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
5555-}
5556-
5557-# func_xform libobj-or-source
5558-func_xform ()
5559-{
5560- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
5561-}
5562-
5563-# func_arith arithmetic-term...
5564-func_arith ()
5565-{
5566- func_arith_result=`expr "$@"`
5567-}
5568-
5569-# func_len string
5570-# STRING may not start with a hyphen.
5571-func_len ()
5572-{
5573- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
5574-}
5575-
5576-_LT_EOF
5577-esac
5578-
5579-case $lt_shell_append in
5580- yes)
5581- cat << \_LT_EOF >> "$cfgfile"
5582-
5583-# func_append var value
5584-# Append VALUE to the end of shell variable VAR.
5585-func_append ()
5586-{
5587- eval "$1+=\$2"
5588-}
5589-_LT_EOF
5590- ;;
5591- *)
5592- cat << \_LT_EOF >> "$cfgfile"
5593-
5594-# func_append var value
5595-# Append VALUE to the end of shell variable VAR.
5596-func_append ()
5597-{
5598- eval "$1=\$$1\$2"
5599-}
5600-
5601-_LT_EOF
5602- ;;
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" ||
5610+ sed '$q' "$ltmain" >> "$cfgfile" \
5611+ || (rm -f "$cfgfile"; exit 1)
5612+
5613+ if test x"$xsi_shell" = xyes; then
5614+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
5615+func_dirname ()\
5616+{\
5617+\ case ${1} in\
5618+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5619+\ * ) func_dirname_result="${3}" ;;\
5620+\ esac\
5621+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
5622+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5623+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5624+test 0 -eq $? || _lt_function_replace_fail=:
5625+
5626+
5627+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
5628+func_basename ()\
5629+{\
5630+\ func_basename_result="${1##*/}"\
5631+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
5632+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5633+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5634+test 0 -eq $? || _lt_function_replace_fail=:
5635+
5636+
5637+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
5638+func_dirname_and_basename ()\
5639+{\
5640+\ case ${1} in\
5641+\ */*) func_dirname_result="${1%/*}${2}" ;;\
5642+\ * ) func_dirname_result="${3}" ;;\
5643+\ esac\
5644+\ func_basename_result="${1##*/}"\
5645+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
5646+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5647+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5648+test 0 -eq $? || _lt_function_replace_fail=:
5649+
5650+
5651+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
5652+func_stripname ()\
5653+{\
5654+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
5655+\ # positional parameters, so assign one to ordinary parameter first.\
5656+\ func_stripname_result=${3}\
5657+\ func_stripname_result=${func_stripname_result#"${1}"}\
5658+\ func_stripname_result=${func_stripname_result%"${2}"}\
5659+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
5660+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5661+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5662+test 0 -eq $? || _lt_function_replace_fail=:
5663+
5664+
5665+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
5666+func_split_long_opt ()\
5667+{\
5668+\ func_split_long_opt_name=${1%%=*}\
5669+\ func_split_long_opt_arg=${1#*=}\
5670+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
5671+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5672+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5673+test 0 -eq $? || _lt_function_replace_fail=:
5674+
5675+
5676+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
5677+func_split_short_opt ()\
5678+{\
5679+\ func_split_short_opt_arg=${1#??}\
5680+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
5681+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
5682+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5683+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5684+test 0 -eq $? || _lt_function_replace_fail=:
5685+
5686+
5687+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
5688+func_lo2o ()\
5689+{\
5690+\ case ${1} in\
5691+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
5692+\ *) func_lo2o_result=${1} ;;\
5693+\ esac\
5694+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
5695+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5696+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5697+test 0 -eq $? || _lt_function_replace_fail=:
5698+
5699+
5700+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
5701+func_xform ()\
5702+{\
5703+ func_xform_result=${1%.*}.lo\
5704+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
5705+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5706+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5707+test 0 -eq $? || _lt_function_replace_fail=:
5708+
5709+
5710+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
5711+func_arith ()\
5712+{\
5713+ func_arith_result=$(( $* ))\
5714+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
5715+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5716+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5717+test 0 -eq $? || _lt_function_replace_fail=:
5718+
5719+
5720+ sed -e '/^func_len ()$/,/^} # func_len /c\
5721+func_len ()\
5722+{\
5723+ func_len_result=${#1}\
5724+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
5725+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5726+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5727+test 0 -eq $? || _lt_function_replace_fail=:
5728+
5729+fi
5730+
5731+if test x"$lt_shell_append" = xyes; then
5732+ sed -e '/^func_append ()$/,/^} # func_append /c\
5733+func_append ()\
5734+{\
5735+ eval "${1}+=\\${2}"\
5736+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
5737+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5738+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5739+test 0 -eq $? || _lt_function_replace_fail=:
5740+
5741+
5742+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
5743+func_append_quoted ()\
5744+{\
5745+\ func_quote_for_eval "${2}"\
5746+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
5747+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
5748+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5749+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5750+test 0 -eq $? || _lt_function_replace_fail=:
5751+
5752+
5753+ # Save a `func_append' function call where possible by direct use of '+='
5754+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
5755+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5756+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5757+ test 0 -eq $? || _lt_function_replace_fail=:
5758+else
5759+ # Save a `func_append' function call even when '+=' is not available
5760+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
5761+ && mv -f "$cfgfile.tmp" "$cfgfile" \
5762+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
5763+ test 0 -eq $? || _lt_function_replace_fail=:
5764+fi
5765+
5766+if test x"$_lt_function_replace_fail" = x":"; then
5767+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
5768+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
5769+fi
5770+
5771+
5772+ mv -f "$cfgfile" "$ofile" ||
5773 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
5774 chmod +x "$ofile"
5775
5776diff --git a/gprof/configure b/gprof/configure
5777index 79961c5..c4f6ac9 100755
5778--- a/gprof/configure
5779+++ b/gprof/configure
5780@@ -629,8 +629,11 @@ OTOOL
5781 LIPO
5782 NMEDIT
5783 DSYMUTIL
5784+MANIFEST_TOOL
5785 RANLIB
5786+ac_ct_AR
5787 AR
5788+DLLTOOL
5789 OBJDUMP
5790 LN_S
5791 NM
5792@@ -741,6 +744,7 @@ enable_static
5793 with_pic
5794 enable_fast_install
5795 with_gnu_ld
5796+with_libtool_sysroot
5797 enable_libtool_lock
5798 enable_plugins
5799 enable_largefile
5800@@ -1399,6 +1403,8 @@ Optional Packages:
5801 --with-pic try to use only PIC/non-PIC objects [default=use
5802 both]
5803 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
5804+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
5805+ (or the compiler's sysroot if not specified).
5806
5807 Some influential environment variables:
5808 CC C compiler command
5809@@ -4831,8 +4837,8 @@ esac
5810
5811
5812
5813-macro_version='2.2.7a'
5814-macro_revision='1.3134'
5815+macro_version='2.4'
5816+macro_revision='1.3293'
5817
5818
5819
5820@@ -4872,7 +4878,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
5821 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
5822 $as_echo_n "checking how to print strings... " >&6; }
5823 # Test print first, because it will be a builtin if present.
5824-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
5825+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
5826 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
5827 ECHO='print -r --'
5828 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
5829@@ -5558,8 +5564,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
5830 # Try some XSI features
5831 xsi_shell=no
5832 ( _lt_dummy="a/b/c"
5833- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
5834- = c,a/b,, \
5835+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
5836+ = c,a/b,b/c, \
5837 && eval 'test $(( 1 + 1 )) -eq 2 \
5838 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
5839 && xsi_shell=yes
5840@@ -5608,6 +5614,80 @@ esac
5841
5842
5843
5844+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
5845+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
5846+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
5847+ $as_echo_n "(cached) " >&6
5848+else
5849+ case $host in
5850+ *-*-mingw* )
5851+ case $build in
5852+ *-*-mingw* ) # actually msys
5853+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
5854+ ;;
5855+ *-*-cygwin* )
5856+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
5857+ ;;
5858+ * ) # otherwise, assume *nix
5859+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
5860+ ;;
5861+ esac
5862+ ;;
5863+ *-*-cygwin* )
5864+ case $build in
5865+ *-*-mingw* ) # actually msys
5866+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
5867+ ;;
5868+ *-*-cygwin* )
5869+ lt_cv_to_host_file_cmd=func_convert_file_noop
5870+ ;;
5871+ * ) # otherwise, assume *nix
5872+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
5873+ ;;
5874+ esac
5875+ ;;
5876+ * ) # unhandled hosts (and "normal" native builds)
5877+ lt_cv_to_host_file_cmd=func_convert_file_noop
5878+ ;;
5879+esac
5880+
5881+fi
5882+
5883+to_host_file_cmd=$lt_cv_to_host_file_cmd
5884+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
5885+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
5886+
5887+
5888+
5889+
5890+
5891+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
5892+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
5893+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
5894+ $as_echo_n "(cached) " >&6
5895+else
5896+ #assume ordinary cross tools, or native build.
5897+lt_cv_to_tool_file_cmd=func_convert_file_noop
5898+case $host in
5899+ *-*-mingw* )
5900+ case $build in
5901+ *-*-mingw* ) # actually msys
5902+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
5903+ ;;
5904+ esac
5905+ ;;
5906+esac
5907+
5908+fi
5909+
5910+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
5911+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
5912+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
5913+
5914+
5915+
5916+
5917+
5918 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
5919 $as_echo_n "checking for $LD option to reload object files... " >&6; }
5920 if test "${lt_cv_ld_reload_flag+set}" = set; then :
5921@@ -5624,6 +5704,11 @@ case $reload_flag in
5922 esac
5923 reload_cmds='$LD$reload_flag -o $output$reload_objs'
5924 case $host_os in
5925+ cygwin* | mingw* | pw32* | cegcc*)
5926+ if test "$GCC" != yes; then
5927+ reload_cmds=false
5928+ fi
5929+ ;;
5930 darwin*)
5931 if test "$GCC" = yes; then
5932 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5933@@ -5792,7 +5877,8 @@ mingw* | pw32*)
5934 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5935 lt_cv_file_magic_cmd='func_win32_libid'
5936 else
5937- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5938+ # Keep this pattern in sync with the one in func_win32_libid.
5939+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
5940 lt_cv_file_magic_cmd='$OBJDUMP -f'
5941 fi
5942 ;;
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
5956 fi
5957 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
5958 $as_echo "$lt_cv_deplibs_check_method" >&6; }
5959+
5960+file_magic_glob=
5961+want_nocaseglob=no
5962+if test "$build" = "$host"; then
5963+ case $host_os in
5964+ mingw* | pw32*)
5965+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
5966+ want_nocaseglob=yes
5967+ else
5968+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
5969+ fi
5970+ ;;
5971+ esac
5972+fi
5973+
5974 file_magic_cmd=$lt_cv_file_magic_cmd
5975 deplibs_check_method=$lt_cv_deplibs_check_method
5976 test -z "$deplibs_check_method" && deplibs_check_method=unknown
5977@@ -5966,9 +6062,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
5978
5979
5980
5981+
5982+
5983+
5984+
5985+
5986+
5987+
5988+
5989+
5990+
5991+if test -n "$ac_tool_prefix"; then
5992+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
5993+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
5994+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5995+$as_echo_n "checking for $ac_word... " >&6; }
5996+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
5997+ $as_echo_n "(cached) " >&6
5998+else
5999+ if test -n "$DLLTOOL"; then
6000+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
6001+else
6002+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6003+for as_dir in $PATH
6004+do
6005+ IFS=$as_save_IFS
6006+ test -z "$as_dir" && as_dir=.
6007+ for ac_exec_ext in '' $ac_executable_extensions; do
6008+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6009+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6010+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6011+ break 2
6012+ fi
6013+done
6014+ done
6015+IFS=$as_save_IFS
6016+
6017+fi
6018+fi
6019+DLLTOOL=$ac_cv_prog_DLLTOOL
6020+if test -n "$DLLTOOL"; then
6021+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
6022+$as_echo "$DLLTOOL" >&6; }
6023+else
6024+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6025+$as_echo "no" >&6; }
6026+fi
6027+
6028+
6029+fi
6030+if test -z "$ac_cv_prog_DLLTOOL"; then
6031+ ac_ct_DLLTOOL=$DLLTOOL
6032+ # Extract the first word of "dlltool", so it can be a program name with args.
6033+set dummy dlltool; ac_word=$2
6034+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6035+$as_echo_n "checking for $ac_word... " >&6; }
6036+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
6037+ $as_echo_n "(cached) " >&6
6038+else
6039+ if test -n "$ac_ct_DLLTOOL"; then
6040+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
6041+else
6042+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6043+for as_dir in $PATH
6044+do
6045+ IFS=$as_save_IFS
6046+ test -z "$as_dir" && as_dir=.
6047+ for ac_exec_ext in '' $ac_executable_extensions; do
6048+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6049+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6050+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6051+ break 2
6052+ fi
6053+done
6054+ done
6055+IFS=$as_save_IFS
6056+
6057+fi
6058+fi
6059+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
6060+if test -n "$ac_ct_DLLTOOL"; then
6061+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
6062+$as_echo "$ac_ct_DLLTOOL" >&6; }
6063+else
6064+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6065+$as_echo "no" >&6; }
6066+fi
6067+
6068+ if test "x$ac_ct_DLLTOOL" = x; then
6069+ DLLTOOL="false"
6070+ else
6071+ case $cross_compiling:$ac_tool_warned in
6072+yes:)
6073+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6074+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6075+ac_tool_warned=yes ;;
6076+esac
6077+ DLLTOOL=$ac_ct_DLLTOOL
6078+ fi
6079+else
6080+ DLLTOOL="$ac_cv_prog_DLLTOOL"
6081+fi
6082+
6083+test -z "$DLLTOOL" && DLLTOOL=dlltool
6084+
6085+
6086+
6087+
6088+
6089+
6090+
6091+
6092+
6093+
6094+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
6095+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
6096+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
6097+ $as_echo_n "(cached) " >&6
6098+else
6099+ lt_cv_sharedlib_from_linklib_cmd='unknown'
6100+
6101+case $host_os in
6102+cygwin* | mingw* | pw32* | cegcc*)
6103+ # two different shell functions defined in ltmain.sh
6104+ # decide which to use based on capabilities of $DLLTOOL
6105+ case `$DLLTOOL --help 2>&1` in
6106+ *--identify-strict*)
6107+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
6108+ ;;
6109+ *)
6110+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
6111+ ;;
6112+ esac
6113+ ;;
6114+*)
6115+ # fallback: assume linklib IS sharedlib
6116+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
6117+ ;;
6118+esac
6119+
6120+fi
6121+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
6122+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
6123+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
6124+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6125+
6126+
6127+
6128+
6129+
6130+
6131+
6132 if test -n "$ac_tool_prefix"; then
6133- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6134-set dummy ${ac_tool_prefix}ar; ac_word=$2
6135+ for ac_prog in ar
6136+ do
6137+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6138+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6139 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6140 $as_echo_n "checking for $ac_word... " >&6; }
6141 if test "${ac_cv_prog_AR+set}" = set; then :
6142@@ -5984,7 +6233,7 @@ do
6143 test -z "$as_dir" && as_dir=.
6144 for ac_exec_ext in '' $ac_executable_extensions; do
6145 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6146- ac_cv_prog_AR="${ac_tool_prefix}ar"
6147+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6148 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6149 break 2
6150 fi
6151@@ -6004,11 +6253,15 @@ $as_echo "no" >&6; }
6152 fi
6153
6154
6155+ test -n "$AR" && break
6156+ done
6157 fi
6158-if test -z "$ac_cv_prog_AR"; then
6159+if test -z "$AR"; then
6160 ac_ct_AR=$AR
6161- # Extract the first word of "ar", so it can be a program name with args.
6162-set dummy ar; ac_word=$2
6163+ for ac_prog in ar
6164+do
6165+ # Extract the first word of "$ac_prog", so it can be a program name with args.
6166+set dummy $ac_prog; ac_word=$2
6167 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6168 $as_echo_n "checking for $ac_word... " >&6; }
6169 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
6170@@ -6024,7 +6277,7 @@ do
6171 test -z "$as_dir" && as_dir=.
6172 for ac_exec_ext in '' $ac_executable_extensions; do
6173 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6174- ac_cv_prog_ac_ct_AR="ar"
6175+ ac_cv_prog_ac_ct_AR="$ac_prog"
6176 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6177 break 2
6178 fi
6179@@ -6043,6 +6296,10 @@ else
6180 $as_echo "no" >&6; }
6181 fi
6182
6183+
6184+ test -n "$ac_ct_AR" && break
6185+done
6186+
6187 if test "x$ac_ct_AR" = x; then
6188 AR="false"
6189 else
6190@@ -6054,12 +6311,10 @@ ac_tool_warned=yes ;;
6191 esac
6192 AR=$ac_ct_AR
6193 fi
6194-else
6195- AR="$ac_cv_prog_AR"
6196 fi
6197
6198-test -z "$AR" && AR=ar
6199-test -z "$AR_FLAGS" && AR_FLAGS=cru
6200+: ${AR=ar}
6201+: ${AR_FLAGS=cru}
6202
6203
6204
6205@@ -6071,6 +6326,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
6206
6207
6208
6209+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
6210+$as_echo_n "checking for archiver @FILE support... " >&6; }
6211+if test "${lt_cv_ar_at_file+set}" = set; then :
6212+ $as_echo_n "(cached) " >&6
6213+else
6214+ lt_cv_ar_at_file=no
6215+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6216+/* end confdefs.h. */
6217+
6218+int
6219+main ()
6220+{
6221+
6222+ ;
6223+ return 0;
6224+}
6225+_ACEOF
6226+if ac_fn_c_try_compile "$LINENO"; then :
6227+ echo conftest.$ac_objext > conftest.lst
6228+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
6229+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6230+ (eval $lt_ar_try) 2>&5
6231+ ac_status=$?
6232+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6233+ test $ac_status = 0; }
6234+ if test "$ac_status" -eq 0; then
6235+ # Ensure the archiver fails upon bogus file names.
6236+ rm -f conftest.$ac_objext libconftest.a
6237+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
6238+ (eval $lt_ar_try) 2>&5
6239+ ac_status=$?
6240+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6241+ test $ac_status = 0; }
6242+ if test "$ac_status" -ne 0; then
6243+ lt_cv_ar_at_file=@
6244+ fi
6245+ fi
6246+ rm -f conftest.* libconftest.a
6247+
6248+fi
6249+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6250+
6251+fi
6252+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
6253+$as_echo "$lt_cv_ar_at_file" >&6; }
6254+
6255+if test "x$lt_cv_ar_at_file" = xno; then
6256+ archiver_list_spec=
6257+else
6258+ archiver_list_spec=$lt_cv_ar_at_file
6259+fi
6260+
6261+
6262+
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
6271 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
6272
6273 # Transform an extracted symbol line into symbol name and symbol address
6274-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6275-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'"
6276+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
6277+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'"
6278
6279 # Handle CRLF in mingw tool chain
6280 opt_cr=
6281@@ -6442,6 +6755,7 @@ for ac_symprfx in "" "_"; do
6282 else
6283 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
6284 fi
6285+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
6286
6287 # Check to see that the pipe works correctly.
6288 pipe_works=no
6289@@ -6483,6 +6797,18 @@ _LT_EOF
6290 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
6291 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
6292 cat <<_LT_EOF > conftest.$ac_ext
6293+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
6294+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
6295+/* DATA imports from DLLs on WIN32 con't be const, because runtime
6296+ relocations are performed -- see ld's documentation on pseudo-relocs. */
6297+# define LT_DLSYM_CONST
6298+#elif defined(__osf__)
6299+/* This system does not cope well with relocations in const data. */
6300+# define LT_DLSYM_CONST
6301+#else
6302+# define LT_DLSYM_CONST const
6303+#endif
6304+
6305 #ifdef __cplusplus
6306 extern "C" {
6307 #endif
6308@@ -6494,7 +6820,7 @@ _LT_EOF
6309 cat <<_LT_EOF >> conftest.$ac_ext
6310
6311 /* The mapping between symbol names and symbols. */
6312-const struct {
6313+LT_DLSYM_CONST struct {
6314 const char *name;
6315 void *address;
6316 }
6317@@ -6520,8 +6846,8 @@ static const void *lt_preloaded_setup() {
6318 _LT_EOF
6319 # Now try linking the two files.
6320 mv conftest.$ac_objext conftstm.$ac_objext
6321- lt_save_LIBS="$LIBS"
6322- lt_save_CFLAGS="$CFLAGS"
6323+ lt_globsym_save_LIBS=$LIBS
6324+ lt_globsym_save_CFLAGS=$CFLAGS
6325 LIBS="conftstm.$ac_objext"
6326 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
6327 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6328@@ -6531,8 +6857,8 @@ _LT_EOF
6329 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
6330 pipe_works=yes
6331 fi
6332- LIBS="$lt_save_LIBS"
6333- CFLAGS="$lt_save_CFLAGS"
6334+ LIBS=$lt_globsym_save_LIBS
6335+ CFLAGS=$lt_globsym_save_CFLAGS
6336 else
6337 echo "cannot find nm_test_func in $nlist" >&5
6338 fi
6339@@ -6569,6 +6895,18 @@ else
6340 $as_echo "ok" >&6; }
6341 fi
6342
6343+# Response file support.
6344+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
6345+ nm_file_list_spec='@'
6346+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
6347+ nm_file_list_spec='@'
6348+fi
6349+
6350+
6351+
6352+
6353+
6354+
6355
6356
6357
6358@@ -6590,6 +6928,43 @@ fi
6359
6360
6361
6362+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
6363+$as_echo_n "checking for sysroot... " >&6; }
6364+
6365+# Check whether --with-libtool-sysroot was given.
6366+if test "${with_libtool_sysroot+set}" = set; then :
6367+ withval=$with_libtool_sysroot;
6368+else
6369+ with_libtool_sysroot=no
6370+fi
6371+
6372+
6373+lt_sysroot=
6374+case ${with_libtool_sysroot} in #(
6375+ yes)
6376+ if test "$GCC" = yes; then
6377+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
6378+ fi
6379+ ;; #(
6380+ /*)
6381+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
6382+ ;; #(
6383+ no|'')
6384+ ;; #(
6385+ *)
6386+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
6387+$as_echo "${with_libtool_sysroot}" >&6; }
6388+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
6389+ ;;
6390+esac
6391+
6392+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
6393+$as_echo "${lt_sysroot:-no}" >&6; }
6394+
6395+
6396+
6397+
6398+
6399 # Check whether --enable-libtool-lock was given.
6400 if test "${enable_libtool_lock+set}" = set; then :
6401 enableval=$enable_libtool_lock;
6402@@ -6796,6 +7171,123 @@ esac
6403
6404 need_locks="$enable_libtool_lock"
6405
6406+if test -n "$ac_tool_prefix"; then
6407+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
6408+set dummy ${ac_tool_prefix}mt; ac_word=$2
6409+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6410+$as_echo_n "checking for $ac_word... " >&6; }
6411+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
6412+ $as_echo_n "(cached) " >&6
6413+else
6414+ if test -n "$MANIFEST_TOOL"; then
6415+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
6416+else
6417+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6418+for as_dir in $PATH
6419+do
6420+ IFS=$as_save_IFS
6421+ test -z "$as_dir" && as_dir=.
6422+ for ac_exec_ext in '' $ac_executable_extensions; do
6423+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6424+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6425+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6426+ break 2
6427+ fi
6428+done
6429+ done
6430+IFS=$as_save_IFS
6431+
6432+fi
6433+fi
6434+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
6435+if test -n "$MANIFEST_TOOL"; then
6436+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
6437+$as_echo "$MANIFEST_TOOL" >&6; }
6438+else
6439+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6440+$as_echo "no" >&6; }
6441+fi
6442+
6443+
6444+fi
6445+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
6446+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
6447+ # Extract the first word of "mt", so it can be a program name with args.
6448+set dummy mt; ac_word=$2
6449+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6450+$as_echo_n "checking for $ac_word... " >&6; }
6451+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
6452+ $as_echo_n "(cached) " >&6
6453+else
6454+ if test -n "$ac_ct_MANIFEST_TOOL"; then
6455+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
6456+else
6457+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6458+for as_dir in $PATH
6459+do
6460+ IFS=$as_save_IFS
6461+ test -z "$as_dir" && as_dir=.
6462+ for ac_exec_ext in '' $ac_executable_extensions; do
6463+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6464+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6465+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6466+ break 2
6467+ fi
6468+done
6469+ done
6470+IFS=$as_save_IFS
6471+
6472+fi
6473+fi
6474+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
6475+if test -n "$ac_ct_MANIFEST_TOOL"; then
6476+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
6477+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
6478+else
6479+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6480+$as_echo "no" >&6; }
6481+fi
6482+
6483+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
6484+ MANIFEST_TOOL=":"
6485+ else
6486+ case $cross_compiling:$ac_tool_warned in
6487+yes:)
6488+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6489+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6490+ac_tool_warned=yes ;;
6491+esac
6492+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
6493+ fi
6494+else
6495+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
6496+fi
6497+
6498+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
6499+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
6500+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
6501+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
6502+ $as_echo_n "(cached) " >&6
6503+else
6504+ lt_cv_path_mainfest_tool=no
6505+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
6506+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
6507+ cat conftest.err >&5
6508+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
6509+ lt_cv_path_mainfest_tool=yes
6510+ fi
6511+ rm -f conftest*
6512+fi
6513+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
6514+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
6515+if test "x$lt_cv_path_mainfest_tool" != xyes; then
6516+ MANIFEST_TOOL=:
6517+fi
6518+
6519+
6520+
6521+
6522+
6523
6524 case $host_os in
6525 rhapsody* | darwin*)
6526@@ -7359,6 +7851,8 @@ _LT_EOF
6527 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
6528 echo "$AR cru libconftest.a conftest.o" >&5
6529 $AR cru libconftest.a conftest.o 2>&5
6530+ echo "$RANLIB libconftest.a" >&5
6531+ $RANLIB libconftest.a 2>&5
6532 cat > conftest.c << _LT_EOF
6533 int main() { return 0;}
6534 _LT_EOF
6535@@ -7554,7 +8048,8 @@ fi
6536 LIBTOOL_DEPS="$ltmain"
6537
6538 # Always use our own libtool.
6539-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
6540+LIBTOOL='$(SHELL) $(top_builddir)'
6541+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
6542
6543
6544
6545@@ -7643,7 +8138,7 @@ aix3*)
6546 esac
6547
6548 # Global variables:
6549-ofile=libtool
6550+ofile=${host_alias}-libtool
6551 can_build_shared=yes
6552
6553 # All known linkers require a `.a' archive for static linking (except MSVC,
6554@@ -7941,8 +8436,6 @@ fi
6555 lt_prog_compiler_pic=
6556 lt_prog_compiler_static=
6557
6558-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6559-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6560
6561 if test "$GCC" = yes; then
6562 lt_prog_compiler_wl='-Wl,'
6563@@ -8108,6 +8601,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6564 lt_prog_compiler_pic='--shared'
6565 lt_prog_compiler_static='--static'
6566 ;;
6567+ nagfor*)
6568+ # NAG Fortran compiler
6569+ lt_prog_compiler_wl='-Wl,-Wl,,'
6570+ lt_prog_compiler_pic='-PIC'
6571+ lt_prog_compiler_static='-Bstatic'
6572+ ;;
6573 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
6574 # Portland Group compilers (*not* the Pentium gcc compiler,
6575 # which looks to be a dead project)
6576@@ -8170,7 +8669,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6577 lt_prog_compiler_pic='-KPIC'
6578 lt_prog_compiler_static='-Bstatic'
6579 case $cc_basename in
6580- f77* | f90* | f95*)
6581+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
6582 lt_prog_compiler_wl='-Qoption ld ';;
6583 *)
6584 lt_prog_compiler_wl='-Wl,';;
6585@@ -8227,13 +8726,17 @@ case $host_os in
6586 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
6587 ;;
6588 esac
6589-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
6590-$as_echo "$lt_prog_compiler_pic" >&6; }
6591-
6592-
6593-
6594-
6595
6596+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
6597+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
6598+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
6599+ $as_echo_n "(cached) " >&6
6600+else
6601+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
6602+fi
6603+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
6604+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
6605+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
6606
6607 #
6608 # Check to make sure the PIC flag actually works.
6609@@ -8294,6 +8797,11 @@ fi
6610
6611
6612
6613+
6614+
6615+
6616+
6617+
6618 #
6619 # Check to make sure the static flag actually works.
6620 #
6621@@ -8644,7 +9152,8 @@ _LT_EOF
6622 allow_undefined_flag=unsupported
6623 always_export_symbols=no
6624 enable_shared_with_static_runtimes=yes
6625- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6626+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
6627+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
6628
6629 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6630 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
6631@@ -8692,7 +9201,7 @@ _LT_EOF
6632 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
6633 && test "$tmp_diet" = no
6634 then
6635- tmp_addflag=
6636+ tmp_addflag=' $pic_flag'
6637 tmp_sharedflag='-shared'
6638 case $cc_basename,$host_cpu in
6639 pgcc*) # Portland Group C compiler
6640@@ -8743,12 +9252,12 @@ _LT_EOF
6641 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
6642 hardcode_libdir_flag_spec=
6643 hardcode_libdir_flag_spec_ld='-rpath $libdir'
6644- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
6645+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6646 if test "x$supports_anon_versioning" = xyes; then
6647 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
6648 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6649 echo "local: *; };" >> $output_objdir/$libname.ver~
6650- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6651+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6652 fi
6653 ;;
6654 esac
6655@@ -8762,8 +9271,8 @@ _LT_EOF
6656 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
6657 wlarc=
6658 else
6659- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6660- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6661+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6662+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6663 fi
6664 ;;
6665
6666@@ -8781,8 +9290,8 @@ _LT_EOF
6667
6668 _LT_EOF
6669 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6670- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6671- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6672+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6673+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6674 else
6675 ld_shlibs=no
6676 fi
6677@@ -8828,8 +9337,8 @@ _LT_EOF
6678
6679 *)
6680 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
6681- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6682- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6683+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6684+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6685 else
6686 ld_shlibs=no
6687 fi
6688@@ -8959,7 +9468,13 @@ _LT_EOF
6689 allow_undefined_flag='-berok'
6690 # Determine the default libpath from the value encoded in an
6691 # empty executable.
6692- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6693+ if test "${lt_cv_aix_libpath+set}" = set; then
6694+ aix_libpath=$lt_cv_aix_libpath
6695+else
6696+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6697+ $as_echo_n "(cached) " >&6
6698+else
6699+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6700 /* end confdefs.h. */
6701
6702 int
6703@@ -8972,22 +9487,29 @@ main ()
6704 _ACEOF
6705 if ac_fn_c_try_link "$LINENO"; then :
6706
6707-lt_aix_libpath_sed='
6708- /Import File Strings/,/^$/ {
6709- /^0/ {
6710- s/^0 *\(.*\)$/\1/
6711- p
6712- }
6713- }'
6714-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6715-# Check for a 64-bit object if we didn't find anything.
6716-if test -z "$aix_libpath"; then
6717- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6718-fi
6719+ lt_aix_libpath_sed='
6720+ /Import File Strings/,/^$/ {
6721+ /^0/ {
6722+ s/^0 *\([^ ]*\) *$/\1/
6723+ p
6724+ }
6725+ }'
6726+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6727+ # Check for a 64-bit object if we didn't find anything.
6728+ if test -z "$lt_cv_aix_libpath_"; then
6729+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6730+ fi
6731 fi
6732 rm -f core conftest.err conftest.$ac_objext \
6733 conftest$ac_exeext conftest.$ac_ext
6734-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6735+ if test -z "$lt_cv_aix_libpath_"; then
6736+ lt_cv_aix_libpath_="/usr/lib:/lib"
6737+ fi
6738+
6739+fi
6740+
6741+ aix_libpath=$lt_cv_aix_libpath_
6742+fi
6743
6744 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
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"
6746@@ -8999,7 +9521,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6747 else
6748 # Determine the default libpath from the value encoded in an
6749 # empty executable.
6750- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6751+ if test "${lt_cv_aix_libpath+set}" = set; then
6752+ aix_libpath=$lt_cv_aix_libpath
6753+else
6754+ if test "${lt_cv_aix_libpath_+set}" = set; then :
6755+ $as_echo_n "(cached) " >&6
6756+else
6757+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6758 /* end confdefs.h. */
6759
6760 int
6761@@ -9012,22 +9540,29 @@ main ()
6762 _ACEOF
6763 if ac_fn_c_try_link "$LINENO"; then :
6764
6765-lt_aix_libpath_sed='
6766- /Import File Strings/,/^$/ {
6767- /^0/ {
6768- s/^0 *\(.*\)$/\1/
6769- p
6770- }
6771- }'
6772-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6773-# Check for a 64-bit object if we didn't find anything.
6774-if test -z "$aix_libpath"; then
6775- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6776-fi
6777+ lt_aix_libpath_sed='
6778+ /Import File Strings/,/^$/ {
6779+ /^0/ {
6780+ s/^0 *\([^ ]*\) *$/\1/
6781+ p
6782+ }
6783+ }'
6784+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6785+ # Check for a 64-bit object if we didn't find anything.
6786+ if test -z "$lt_cv_aix_libpath_"; then
6787+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
6788+ fi
6789 fi
6790 rm -f core conftest.err conftest.$ac_objext \
6791 conftest$ac_exeext conftest.$ac_ext
6792-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6793+ if test -z "$lt_cv_aix_libpath_"; then
6794+ lt_cv_aix_libpath_="/usr/lib:/lib"
6795+ fi
6796+
6797+fi
6798+
6799+ aix_libpath=$lt_cv_aix_libpath_
6800+fi
6801
6802 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
6803 # Warning - without using the other run time loading flags,
6804@@ -9072,20 +9607,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6805 # Microsoft Visual C++.
6806 # hardcode_libdir_flag_spec is actually meaningless, as there is
6807 # no search path for DLLs.
6808- hardcode_libdir_flag_spec=' '
6809- allow_undefined_flag=unsupported
6810- # Tell ltmain to make .lib files, not .a files.
6811- libext=lib
6812- # Tell ltmain to make .dll files, not .so files.
6813- shrext_cmds=".dll"
6814- # FIXME: Setting linknames here is a bad hack.
6815- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6816- # The linker will automatically build a .lib file if we build a DLL.
6817- old_archive_from_new_cmds='true'
6818- # FIXME: Should let the user specify the lib program.
6819- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6820- fix_srcfile_path='`cygpath -w "$srcfile"`'
6821- enable_shared_with_static_runtimes=yes
6822+ case $cc_basename in
6823+ cl*)
6824+ # Native MSVC
6825+ hardcode_libdir_flag_spec=' '
6826+ allow_undefined_flag=unsupported
6827+ always_export_symbols=yes
6828+ file_list_spec='@'
6829+ # Tell ltmain to make .lib files, not .a files.
6830+ libext=lib
6831+ # Tell ltmain to make .dll files, not .so files.
6832+ shrext_cmds=".dll"
6833+ # FIXME: Setting linknames here is a bad hack.
6834+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6835+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6836+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6837+ else
6838+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6839+ fi~
6840+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6841+ linknames='
6842+ # The linker will not automatically build a static lib if we build a DLL.
6843+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
6844+ enable_shared_with_static_runtimes=yes
6845+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
6846+ # Don't use ranlib
6847+ old_postinstall_cmds='chmod 644 $oldlib'
6848+ postlink_cmds='lt_outputfile="@OUTPUT@"~
6849+ lt_tool_outputfile="@TOOL_OUTPUT@"~
6850+ case $lt_outputfile in
6851+ *.exe|*.EXE) ;;
6852+ *)
6853+ lt_outputfile="$lt_outputfile.exe"
6854+ lt_tool_outputfile="$lt_tool_outputfile.exe"
6855+ ;;
6856+ esac~
6857+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6858+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6859+ $RM "$lt_outputfile.manifest";
6860+ fi'
6861+ ;;
6862+ *)
6863+ # Assume MSVC wrapper
6864+ hardcode_libdir_flag_spec=' '
6865+ allow_undefined_flag=unsupported
6866+ # Tell ltmain to make .lib files, not .a files.
6867+ libext=lib
6868+ # Tell ltmain to make .dll files, not .so files.
6869+ shrext_cmds=".dll"
6870+ # FIXME: Setting linknames here is a bad hack.
6871+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6872+ # The linker will automatically build a .lib file if we build a DLL.
6873+ old_archive_from_new_cmds='true'
6874+ # FIXME: Should let the user specify the lib program.
6875+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
6876+ enable_shared_with_static_runtimes=yes
6877+ ;;
6878+ esac
6879 ;;
6880
6881 darwin* | rhapsody*)
6882@@ -9146,7 +9724,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6883
6884 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
6885 freebsd* | dragonfly*)
6886- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
6887+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
6888 hardcode_libdir_flag_spec='-R$libdir'
6889 hardcode_direct=yes
6890 hardcode_shlibpath_var=no
6891@@ -9154,7 +9732,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6892
6893 hpux9*)
6894 if test "$GCC" = yes; then
6895- archive_cmds='$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'
6896+ archive_cmds='$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'
6897 else
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'
6899 fi
6900@@ -9170,7 +9748,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6901
6902 hpux10*)
6903 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6904- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6905+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6906 else
6907 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
6908 fi
6909@@ -9194,10 +9772,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
6910 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6911 ;;
6912 ia64*)
6913- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6914+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6915 ;;
6916 *)
6917- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6918+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6919 ;;
6920 esac
6921 else
6922@@ -9276,23 +9854,36 @@ fi
6923
6924 irix5* | irix6* | nonstopux*)
6925 if test "$GCC" = yes; then
6926- archive_cmds='$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'
6927+ archive_cmds='$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'
6928 # Try to use the -exported_symbol ld option, if it does not
6929 # work, assume that -exports_file does not work either and
6930 # implicitly export all symbols.
6931- save_LDFLAGS="$LDFLAGS"
6932- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6933- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6934+ # This should be the same for all languages, so no per-tag cache variable.
6935+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
6936+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
6937+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
6938+ $as_echo_n "(cached) " >&6
6939+else
6940+ save_LDFLAGS="$LDFLAGS"
6941+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6942+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6943 /* end confdefs.h. */
6944-int foo(void) {}
6945+int foo (void) { return 0; }
6946 _ACEOF
6947 if ac_fn_c_try_link "$LINENO"; then :
6948- archive_expsym_cmds='$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'
6949-
6950+ lt_cv_irix_exported_symbol=yes
6951+else
6952+ lt_cv_irix_exported_symbol=no
6953 fi
6954 rm -f core conftest.err conftest.$ac_objext \
6955 conftest$ac_exeext conftest.$ac_ext
6956- LDFLAGS="$save_LDFLAGS"
6957+ LDFLAGS="$save_LDFLAGS"
6958+fi
6959+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
6960+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
6961+ if test "$lt_cv_irix_exported_symbol" = yes; then
6962+ archive_expsym_cmds='$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'
6963+ fi
6964 else
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'
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'
6967@@ -9377,7 +9968,7 @@ rm -f core conftest.err conftest.$ac_objext \
6968 osf4* | osf5*) # as osf3* with the addition of -msym flag
6969 if test "$GCC" = yes; then
6970 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
6971- archive_cmds='$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'
6972+ archive_cmds='$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'
6973 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
6974 else
6975 allow_undefined_flag=' -expect_unresolved \*'
6976@@ -9396,9 +9987,9 @@ rm -f core conftest.err conftest.$ac_objext \
6977 no_undefined_flag=' -z defs'
6978 if test "$GCC" = yes; then
6979 wlarc='${wl}'
6980- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6981+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
6982 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6983- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
6984+ $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'
6985 else
6986 case `$CC -V 2>&1` in
6987 *"Compilers 5.0"*)
6988@@ -9974,8 +10565,9 @@ cygwin* | mingw* | pw32* | cegcc*)
6989 need_version=no
6990 need_lib_prefix=no
6991
6992- case $GCC,$host_os in
6993- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
6994+ case $GCC,$cc_basename in
6995+ yes,*)
6996+ # gcc
6997 library_names_spec='$libname.dll.a'
6998 # DLL is installed to $(libdir)/../bin by postinstall_cmds
6999 postinstall_cmds='base_file=`basename \${file}`~
7000@@ -10008,13 +10600,71 @@ cygwin* | mingw* | pw32* | cegcc*)
7001 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7002 ;;
7003 esac
7004+ dynamic_linker='Win32 ld.exe'
7005+ ;;
7006+
7007+ *,cl*)
7008+ # Native MSVC
7009+ libname_spec='$name'
7010+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
7011+ library_names_spec='${libname}.dll.lib'
7012+
7013+ case $build_os in
7014+ mingw*)
7015+ sys_lib_search_path_spec=
7016+ lt_save_ifs=$IFS
7017+ IFS=';'
7018+ for lt_path in $LIB
7019+ do
7020+ IFS=$lt_save_ifs
7021+ # Let DOS variable expansion print the short 8.3 style file name.
7022+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
7023+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
7024+ done
7025+ IFS=$lt_save_ifs
7026+ # Convert to MSYS style.
7027+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
7028+ ;;
7029+ cygwin*)
7030+ # Convert to unix form, then to dos form, then back to unix form
7031+ # but this time dos style (no spaces!) so that the unix form looks
7032+ # like /cygdrive/c/PROGRA~1:/cygdr...
7033+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
7034+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
7035+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7036+ ;;
7037+ *)
7038+ sys_lib_search_path_spec="$LIB"
7039+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
7040+ # It is most probably a Windows format PATH.
7041+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
7042+ else
7043+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
7044+ fi
7045+ # FIXME: find the short name or the path components, as spaces are
7046+ # common. (e.g. "Program Files" -> "PROGRA~1")
7047+ ;;
7048+ esac
7049+
7050+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
7051+ postinstall_cmds='base_file=`basename \${file}`~
7052+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
7053+ dldir=$destdir/`dirname \$dlpath`~
7054+ test -d \$dldir || mkdir -p \$dldir~
7055+ $install_prog $dir/$dlname \$dldir/$dlname'
7056+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
7057+ dlpath=$dir/\$dldll~
7058+ $RM \$dlpath'
7059+ shlibpath_overrides_runpath=yes
7060+ dynamic_linker='Win32 link.exe'
7061 ;;
7062
7063 *)
7064+ # Assume MSVC wrapper
7065 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
7066+ dynamic_linker='Win32 ld.exe'
7067 ;;
7068 esac
7069- dynamic_linker='Win32 ld.exe'
7070 # FIXME: first we should search . and the directory the executable is in
7071 shlibpath_var=PATH
7072 ;;
7073@@ -10106,7 +10756,7 @@ haiku*)
7074 soname_spec='${libname}${release}${shared_ext}$major'
7075 shlibpath_var=LIBRARY_PATH
7076 shlibpath_overrides_runpath=yes
7077- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
7078+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
7079 hardcode_into_libs=yes
7080 ;;
7081
7082@@ -10946,10 +11596,10 @@ else
7083 /* When -fvisbility=hidden is used, assume the code has been annotated
7084 correspondingly for the symbols needed. */
7085 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7086-void fnord () __attribute__((visibility("default")));
7087+int fnord () __attribute__((visibility("default")));
7088 #endif
7089
7090-void fnord () { int i=42; }
7091+int fnord () { return 42; }
7092 int main ()
7093 {
7094 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7095@@ -11052,10 +11702,10 @@ else
7096 /* When -fvisbility=hidden is used, assume the code has been annotated
7097 correspondingly for the symbols needed. */
7098 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
7099-void fnord () __attribute__((visibility("default")));
7100+int fnord () __attribute__((visibility("default")));
7101 #endif
7102
7103-void fnord () { int i=42; }
7104+int fnord () { return 42; }
7105 int main ()
7106 {
7107 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
7108@@ -12924,13 +13574,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
7109 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
7110 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
7111 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
7112+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
7113+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
7114 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
7115 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
7116 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
7117 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
7118 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
7119+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
7120+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
7121+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
7122+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
7123 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
7124 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
7125+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
7126 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
7127 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
7128 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
7129@@ -12945,14 +13602,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
7130 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $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"`'
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"`'
7133+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
7134+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
7135 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
7136 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
7137 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
7138-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7139 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
7140+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
7141 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
7142 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
7143 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
7144+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
7145 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
7146 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
7147 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
7148@@ -12985,12 +13645,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
7149 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
7150 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
7151 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
7152-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
7153 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
7154 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
7155 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
7156 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
7157 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
7158+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
7159 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
7160 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
7161 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
7162@@ -13045,8 +13705,13 @@ reload_flag \
7163 OBJDUMP \
7164 deplibs_check_method \
7165 file_magic_cmd \
7166+file_magic_glob \
7167+want_nocaseglob \
7168+DLLTOOL \
7169+sharedlib_from_linklib_cmd \
7170 AR \
7171 AR_FLAGS \
7172+archiver_list_spec \
7173 STRIP \
7174 RANLIB \
7175 CC \
7176@@ -13056,12 +13721,14 @@ lt_cv_sys_global_symbol_pipe \
7177 lt_cv_sys_global_symbol_to_cdecl \
7178 lt_cv_sys_global_symbol_to_c_name_address \
7179 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
7180+nm_file_list_spec \
7181 lt_prog_compiler_no_builtin_flag \
7182-lt_prog_compiler_wl \
7183 lt_prog_compiler_pic \
7184+lt_prog_compiler_wl \
7185 lt_prog_compiler_static \
7186 lt_cv_prog_compiler_c_o \
7187 need_locks \
7188+MANIFEST_TOOL \
7189 DSYMUTIL \
7190 NMEDIT \
7191 LIPO \
7192@@ -13077,7 +13744,6 @@ no_undefined_flag \
7193 hardcode_libdir_flag_spec \
7194 hardcode_libdir_flag_spec_ld \
7195 hardcode_libdir_separator \
7196-fix_srcfile_path \
7197 exclude_expsyms \
7198 include_expsyms \
7199 file_list_spec \
7200@@ -13113,6 +13779,7 @@ module_cmds \
7201 module_expsym_cmds \
7202 export_symbols_cmds \
7203 prelink_cmds \
7204+postlink_cmds \
7205 postinstall_cmds \
7206 postuninstall_cmds \
7207 finish_cmds \
7208@@ -13869,7 +14536,8 @@ $as_echo X"$file" |
7209 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
7210 #
7211 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
7212-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
7213+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
7214+# Inc.
7215 # Written by Gordon Matzigkeit, 1996
7216 #
7217 # This file is part of GNU Libtool.
7218@@ -13972,19 +14640,42 @@ SP2NL=$lt_lt_SP2NL
7219 # turn newlines into spaces.
7220 NL2SP=$lt_lt_NL2SP
7221
7222+# convert \$build file names to \$host format.
7223+to_host_file_cmd=$lt_cv_to_host_file_cmd
7224+
7225+# convert \$build files to toolchain format.
7226+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7227+
7228 # An object symbol dumper.
7229 OBJDUMP=$lt_OBJDUMP
7230
7231 # Method to check whether dependent libraries are shared objects.
7232 deplibs_check_method=$lt_deplibs_check_method
7233
7234-# Command to use when deplibs_check_method == "file_magic".
7235+# Command to use when deplibs_check_method = "file_magic".
7236 file_magic_cmd=$lt_file_magic_cmd
7237
7238+# How to find potential files when deplibs_check_method = "file_magic".
7239+file_magic_glob=$lt_file_magic_glob
7240+
7241+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
7242+want_nocaseglob=$lt_want_nocaseglob
7243+
7244+# DLL creation program.
7245+DLLTOOL=$lt_DLLTOOL
7246+
7247+# Command to associate shared and link libraries.
7248+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
7249+
7250 # The archiver.
7251 AR=$lt_AR
7252+
7253+# Flags to create an archive.
7254 AR_FLAGS=$lt_AR_FLAGS
7255
7256+# How to feed a file listing to the archiver.
7257+archiver_list_spec=$lt_archiver_list_spec
7258+
7259 # A symbol stripping program.
7260 STRIP=$lt_STRIP
7261
7262@@ -14014,6 +14705,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
7263 # Transform the output of nm in a C name address pair when lib prefix is needed.
7264 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
7265
7266+# Specify filename containing input files for \$NM.
7267+nm_file_list_spec=$lt_nm_file_list_spec
7268+
7269+# The root where to search for dependent libraries,and in which our libraries should be installed.
7270+lt_sysroot=$lt_sysroot
7271+
7272 # The name of the directory that contains temporary libtool files.
7273 objdir=$objdir
7274
7275@@ -14023,6 +14720,9 @@ MAGIC_CMD=$MAGIC_CMD
7276 # Must we lock files when doing compilation?
7277 need_locks=$lt_need_locks
7278
7279+# Manifest tool.
7280+MANIFEST_TOOL=$lt_MANIFEST_TOOL
7281+
7282 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
7283 DSYMUTIL=$lt_DSYMUTIL
7284
7285@@ -14137,12 +14837,12 @@ with_gcc=$GCC
7286 # Compiler flag to turn off builtin functions.
7287 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
7288
7289-# How to pass a linker flag through the compiler.
7290-wl=$lt_lt_prog_compiler_wl
7291-
7292 # Additional compiler flags for building library objects.
7293 pic_flag=$lt_lt_prog_compiler_pic
7294
7295+# How to pass a linker flag through the compiler.
7296+wl=$lt_lt_prog_compiler_wl
7297+
7298 # Compiler flag to prevent dynamic linking.
7299 link_static_flag=$lt_lt_prog_compiler_static
7300
7301@@ -14229,9 +14929,6 @@ inherit_rpath=$inherit_rpath
7302 # Whether libtool must link a program against all its dependency libraries.
7303 link_all_deplibs=$link_all_deplibs
7304
7305-# Fix the shell variable \$srcfile for the compiler.
7306-fix_srcfile_path=$lt_fix_srcfile_path
7307-
7308 # Set to "yes" if exported symbols are required.
7309 always_export_symbols=$always_export_symbols
7310
7311@@ -14247,6 +14944,9 @@ include_expsyms=$lt_include_expsyms
7312 # Commands necessary for linking programs (against libraries) with templates.
7313 prelink_cmds=$lt_prelink_cmds
7314
7315+# Commands necessary for finishing linking programs.
7316+postlink_cmds=$lt_postlink_cmds
7317+
7318 # Specify filename containing input files.
7319 file_list_spec=$lt_file_list_spec
7320
7321@@ -14279,210 +14979,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
7322 # if finds mixed CR/LF and LF-only lines. Since sed operates in
7323 # text mode, it properly converts lines to CR/LF. This bash problem
7324 # is reportedly fixed, but why not run on old versions too?
7325- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
7326- || (rm -f "$cfgfile"; exit 1)
7327-
7328- case $xsi_shell in
7329- yes)
7330- cat << \_LT_EOF >> "$cfgfile"
7331-
7332-# func_dirname file append nondir_replacement
7333-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7334-# otherwise set result to NONDIR_REPLACEMENT.
7335-func_dirname ()
7336-{
7337- case ${1} in
7338- */*) func_dirname_result="${1%/*}${2}" ;;
7339- * ) func_dirname_result="${3}" ;;
7340- esac
7341-}
7342-
7343-# func_basename file
7344-func_basename ()
7345-{
7346- func_basename_result="${1##*/}"
7347-}
7348-
7349-# func_dirname_and_basename file append nondir_replacement
7350-# perform func_basename and func_dirname in a single function
7351-# call:
7352-# dirname: Compute the dirname of FILE. If nonempty,
7353-# add APPEND to the result, otherwise set result
7354-# to NONDIR_REPLACEMENT.
7355-# value returned in "$func_dirname_result"
7356-# basename: Compute filename of FILE.
7357-# value retuned in "$func_basename_result"
7358-# Implementation must be kept synchronized with func_dirname
7359-# and func_basename. For efficiency, we do not delegate to
7360-# those functions but instead duplicate the functionality here.
7361-func_dirname_and_basename ()
7362-{
7363- case ${1} in
7364- */*) func_dirname_result="${1%/*}${2}" ;;
7365- * ) func_dirname_result="${3}" ;;
7366- esac
7367- func_basename_result="${1##*/}"
7368-}
7369-
7370-# func_stripname prefix suffix name
7371-# strip PREFIX and SUFFIX off of NAME.
7372-# PREFIX and SUFFIX must not contain globbing or regex special
7373-# characters, hashes, percent signs, but SUFFIX may contain a leading
7374-# dot (in which case that matches only a dot).
7375-func_stripname ()
7376-{
7377- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7378- # positional parameters, so assign one to ordinary parameter first.
7379- func_stripname_result=${3}
7380- func_stripname_result=${func_stripname_result#"${1}"}
7381- func_stripname_result=${func_stripname_result%"${2}"}
7382-}
7383-
7384-# func_opt_split
7385-func_opt_split ()
7386-{
7387- func_opt_split_opt=${1%%=*}
7388- func_opt_split_arg=${1#*=}
7389-}
7390-
7391-# func_lo2o object
7392-func_lo2o ()
7393-{
7394- case ${1} in
7395- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7396- *) func_lo2o_result=${1} ;;
7397- esac
7398-}
7399-
7400-# func_xform libobj-or-source
7401-func_xform ()
7402-{
7403- func_xform_result=${1%.*}.lo
7404-}
7405-
7406-# func_arith arithmetic-term...
7407-func_arith ()
7408-{
7409- func_arith_result=$(( $* ))
7410-}
7411-
7412-# func_len string
7413-# STRING may not start with a hyphen.
7414-func_len ()
7415-{
7416- func_len_result=${#1}
7417-}
7418-
7419-_LT_EOF
7420- ;;
7421- *) # Bourne compatible functions.
7422- cat << \_LT_EOF >> "$cfgfile"
7423-
7424-# func_dirname file append nondir_replacement
7425-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
7426-# otherwise set result to NONDIR_REPLACEMENT.
7427-func_dirname ()
7428-{
7429- # Extract subdirectory from the argument.
7430- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7431- if test "X$func_dirname_result" = "X${1}"; then
7432- func_dirname_result="${3}"
7433- else
7434- func_dirname_result="$func_dirname_result${2}"
7435- fi
7436-}
7437-
7438-# func_basename file
7439-func_basename ()
7440-{
7441- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7442-}
7443-
7444-
7445-# func_stripname prefix suffix name
7446-# strip PREFIX and SUFFIX off of NAME.
7447-# PREFIX and SUFFIX must not contain globbing or regex special
7448-# characters, hashes, percent signs, but SUFFIX may contain a leading
7449-# dot (in which case that matches only a dot).
7450-# func_strip_suffix prefix name
7451-func_stripname ()
7452-{
7453- case ${2} in
7454- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7455- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7456- esac
7457-}
7458-
7459-# sed scripts:
7460-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
7461-my_sed_long_arg='1s/^-[^=]*=//'
7462-
7463-# func_opt_split
7464-func_opt_split ()
7465-{
7466- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7467- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7468-}
7469-
7470-# func_lo2o object
7471-func_lo2o ()
7472-{
7473- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7474-}
7475-
7476-# func_xform libobj-or-source
7477-func_xform ()
7478-{
7479- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
7480-}
7481-
7482-# func_arith arithmetic-term...
7483-func_arith ()
7484-{
7485- func_arith_result=`expr "$@"`
7486-}
7487-
7488-# func_len string
7489-# STRING may not start with a hyphen.
7490-func_len ()
7491-{
7492- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
7493-}
7494-
7495-_LT_EOF
7496-esac
7497-
7498-case $lt_shell_append in
7499- yes)
7500- cat << \_LT_EOF >> "$cfgfile"
7501-
7502-# func_append var value
7503-# Append VALUE to the end of shell variable VAR.
7504-func_append ()
7505-{
7506- eval "$1+=\$2"
7507-}
7508-_LT_EOF
7509- ;;
7510- *)
7511- cat << \_LT_EOF >> "$cfgfile"
7512-
7513-# func_append var value
7514-# Append VALUE to the end of shell variable VAR.
7515-func_append ()
7516-{
7517- eval "$1=\$$1\$2"
7518-}
7519-
7520-_LT_EOF
7521- ;;
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" ||
7529+ sed '$q' "$ltmain" >> "$cfgfile" \
7530+ || (rm -f "$cfgfile"; exit 1)
7531+
7532+ if test x"$xsi_shell" = xyes; then
7533+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
7534+func_dirname ()\
7535+{\
7536+\ case ${1} in\
7537+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7538+\ * ) func_dirname_result="${3}" ;;\
7539+\ esac\
7540+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
7541+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7542+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7543+test 0 -eq $? || _lt_function_replace_fail=:
7544+
7545+
7546+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
7547+func_basename ()\
7548+{\
7549+\ func_basename_result="${1##*/}"\
7550+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
7551+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7552+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7553+test 0 -eq $? || _lt_function_replace_fail=:
7554+
7555+
7556+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
7557+func_dirname_and_basename ()\
7558+{\
7559+\ case ${1} in\
7560+\ */*) func_dirname_result="${1%/*}${2}" ;;\
7561+\ * ) func_dirname_result="${3}" ;;\
7562+\ esac\
7563+\ func_basename_result="${1##*/}"\
7564+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
7565+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7566+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7567+test 0 -eq $? || _lt_function_replace_fail=:
7568+
7569+
7570+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
7571+func_stripname ()\
7572+{\
7573+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
7574+\ # positional parameters, so assign one to ordinary parameter first.\
7575+\ func_stripname_result=${3}\
7576+\ func_stripname_result=${func_stripname_result#"${1}"}\
7577+\ func_stripname_result=${func_stripname_result%"${2}"}\
7578+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
7579+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7580+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7581+test 0 -eq $? || _lt_function_replace_fail=:
7582+
7583+
7584+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
7585+func_split_long_opt ()\
7586+{\
7587+\ func_split_long_opt_name=${1%%=*}\
7588+\ func_split_long_opt_arg=${1#*=}\
7589+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
7590+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7591+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7592+test 0 -eq $? || _lt_function_replace_fail=:
7593+
7594+
7595+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
7596+func_split_short_opt ()\
7597+{\
7598+\ func_split_short_opt_arg=${1#??}\
7599+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
7600+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
7601+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7602+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7603+test 0 -eq $? || _lt_function_replace_fail=:
7604+
7605+
7606+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
7607+func_lo2o ()\
7608+{\
7609+\ case ${1} in\
7610+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
7611+\ *) func_lo2o_result=${1} ;;\
7612+\ esac\
7613+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
7614+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7615+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7616+test 0 -eq $? || _lt_function_replace_fail=:
7617+
7618+
7619+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
7620+func_xform ()\
7621+{\
7622+ func_xform_result=${1%.*}.lo\
7623+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
7624+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7625+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7626+test 0 -eq $? || _lt_function_replace_fail=:
7627+
7628+
7629+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
7630+func_arith ()\
7631+{\
7632+ func_arith_result=$(( $* ))\
7633+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
7634+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7635+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7636+test 0 -eq $? || _lt_function_replace_fail=:
7637+
7638+
7639+ sed -e '/^func_len ()$/,/^} # func_len /c\
7640+func_len ()\
7641+{\
7642+ func_len_result=${#1}\
7643+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
7644+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7645+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7646+test 0 -eq $? || _lt_function_replace_fail=:
7647+
7648+fi
7649+
7650+if test x"$lt_shell_append" = xyes; then
7651+ sed -e '/^func_append ()$/,/^} # func_append /c\
7652+func_append ()\
7653+{\
7654+ eval "${1}+=\\${2}"\
7655+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
7656+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7657+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7658+test 0 -eq $? || _lt_function_replace_fail=:
7659+
7660+
7661+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
7662+func_append_quoted ()\
7663+{\
7664+\ func_quote_for_eval "${2}"\
7665+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
7666+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
7667+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7668+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7669+test 0 -eq $? || _lt_function_replace_fail=:
7670+
7671+
7672+ # Save a `func_append' function call where possible by direct use of '+='
7673+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7674+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7675+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7676+ test 0 -eq $? || _lt_function_replace_fail=:
7677+else
7678+ # Save a `func_append' function call even when '+=' is not available
7679+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7680+ && mv -f "$cfgfile.tmp" "$cfgfile" \
7681+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7682+ test 0 -eq $? || _lt_function_replace_fail=:
7683+fi
7684+
7685+if test x"$_lt_function_replace_fail" = x":"; then
7686+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
7687+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
7688+fi
7689+
7690+
7691+ mv -f "$cfgfile" "$ofile" ||
7692 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
7693 chmod +x "$ofile"
7694
7695diff --git a/ld/configure b/ld/configure
7696index 4408b0d..2fbaebf 100755
7697--- a/ld/configure
7698+++ b/ld/configure
7699@@ -654,8 +654,11 @@ OTOOL
7700 LIPO
7701 NMEDIT
7702 DSYMUTIL
7703+MANIFEST_TOOL
7704 RANLIB
7705+ac_ct_AR
7706 AR
7707+DLLTOOL
7708 OBJDUMP
7709 LN_S
7710 NM
7711@@ -776,6 +779,7 @@ enable_static
7712 with_pic
7713 enable_fast_install
7714 with_gnu_ld
7715+with_libtool_sysroot
7716 enable_libtool_lock
7717 enable_plugins
7718 enable_largefile
7719@@ -1453,6 +1457,8 @@ Optional Packages:
7720 --with-pic try to use only PIC/non-PIC objects [default=use
7721 both]
7722 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
7723+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
7724+ (or the compiler's sysroot if not specified).
7725 --with-lib-path=dir1:dir2... set default LIB_PATH
7726 --with-sysroot=DIR Search for usr/lib et al within DIR.
7727 --with-zlib include zlib support (auto/yes/no) default=auto
7728@@ -5645,8 +5651,8 @@ esac
7729
7730
7731
7732-macro_version='2.2.7a'
7733-macro_revision='1.3134'
7734+macro_version='2.4'
7735+macro_revision='1.3293'
7736
7737
7738
7739@@ -5686,7 +5692,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7740 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7741 $as_echo_n "checking how to print strings... " >&6; }
7742 # Test print first, because it will be a builtin if present.
7743-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
7744+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7745 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7746 ECHO='print -r --'
7747 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7748@@ -6372,8 +6378,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
7749 # Try some XSI features
7750 xsi_shell=no
7751 ( _lt_dummy="a/b/c"
7752- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7753- = c,a/b,, \
7754+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7755+ = c,a/b,b/c, \
7756 && eval 'test $(( 1 + 1 )) -eq 2 \
7757 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7758 && xsi_shell=yes
7759@@ -6422,6 +6428,80 @@ esac
7760
7761
7762
7763+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
7764+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
7765+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
7766+ $as_echo_n "(cached) " >&6
7767+else
7768+ case $host in
7769+ *-*-mingw* )
7770+ case $build in
7771+ *-*-mingw* ) # actually msys
7772+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7773+ ;;
7774+ *-*-cygwin* )
7775+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7776+ ;;
7777+ * ) # otherwise, assume *nix
7778+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7779+ ;;
7780+ esac
7781+ ;;
7782+ *-*-cygwin* )
7783+ case $build in
7784+ *-*-mingw* ) # actually msys
7785+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7786+ ;;
7787+ *-*-cygwin* )
7788+ lt_cv_to_host_file_cmd=func_convert_file_noop
7789+ ;;
7790+ * ) # otherwise, assume *nix
7791+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7792+ ;;
7793+ esac
7794+ ;;
7795+ * ) # unhandled hosts (and "normal" native builds)
7796+ lt_cv_to_host_file_cmd=func_convert_file_noop
7797+ ;;
7798+esac
7799+
7800+fi
7801+
7802+to_host_file_cmd=$lt_cv_to_host_file_cmd
7803+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
7804+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
7805+
7806+
7807+
7808+
7809+
7810+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
7811+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
7812+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
7813+ $as_echo_n "(cached) " >&6
7814+else
7815+ #assume ordinary cross tools, or native build.
7816+lt_cv_to_tool_file_cmd=func_convert_file_noop
7817+case $host in
7818+ *-*-mingw* )
7819+ case $build in
7820+ *-*-mingw* ) # actually msys
7821+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7822+ ;;
7823+ esac
7824+ ;;
7825+esac
7826+
7827+fi
7828+
7829+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7830+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
7831+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
7832+
7833+
7834+
7835+
7836+
7837 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
7838 $as_echo_n "checking for $LD option to reload object files... " >&6; }
7839 if test "${lt_cv_ld_reload_flag+set}" = set; then :
7840@@ -6438,6 +6518,11 @@ case $reload_flag in
7841 esac
7842 reload_cmds='$LD$reload_flag -o $output$reload_objs'
7843 case $host_os in
7844+ cygwin* | mingw* | pw32* | cegcc*)
7845+ if test "$GCC" != yes; then
7846+ reload_cmds=false
7847+ fi
7848+ ;;
7849 darwin*)
7850 if test "$GCC" = yes; then
7851 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
7852@@ -6606,7 +6691,8 @@ mingw* | pw32*)
7853 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7854 lt_cv_file_magic_cmd='func_win32_libid'
7855 else
7856- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7857+ # Keep this pattern in sync with the one in func_win32_libid.
7858+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
7859 lt_cv_file_magic_cmd='$OBJDUMP -f'
7860 fi
7861 ;;
7862@@ -6760,6 +6846,21 @@ esac
7863 fi
7864 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
7865 $as_echo "$lt_cv_deplibs_check_method" >&6; }
7866+
7867+file_magic_glob=
7868+want_nocaseglob=no
7869+if test "$build" = "$host"; then
7870+ case $host_os in
7871+ mingw* | pw32*)
7872+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
7873+ want_nocaseglob=yes
7874+ else
7875+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
7876+ fi
7877+ ;;
7878+ esac
7879+fi
7880+
7881 file_magic_cmd=$lt_cv_file_magic_cmd
7882 deplibs_check_method=$lt_cv_deplibs_check_method
7883 test -z "$deplibs_check_method" && deplibs_check_method=unknown
7884@@ -6775,9 +6876,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
7885
7886
7887
7888+
7889+
7890+
7891+
7892+
7893+
7894+
7895+
7896+
7897+
7898+if test -n "$ac_tool_prefix"; then
7899+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
7900+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
7901+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7902+$as_echo_n "checking for $ac_word... " >&6; }
7903+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
7904+ $as_echo_n "(cached) " >&6
7905+else
7906+ if test -n "$DLLTOOL"; then
7907+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
7908+else
7909+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7910+for as_dir in $PATH
7911+do
7912+ IFS=$as_save_IFS
7913+ test -z "$as_dir" && as_dir=.
7914+ for ac_exec_ext in '' $ac_executable_extensions; do
7915+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7916+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
7917+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7918+ break 2
7919+ fi
7920+done
7921+ done
7922+IFS=$as_save_IFS
7923+
7924+fi
7925+fi
7926+DLLTOOL=$ac_cv_prog_DLLTOOL
7927+if test -n "$DLLTOOL"; then
7928+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
7929+$as_echo "$DLLTOOL" >&6; }
7930+else
7931+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7932+$as_echo "no" >&6; }
7933+fi
7934+
7935+
7936+fi
7937+if test -z "$ac_cv_prog_DLLTOOL"; then
7938+ ac_ct_DLLTOOL=$DLLTOOL
7939+ # Extract the first word of "dlltool", so it can be a program name with args.
7940+set dummy dlltool; ac_word=$2
7941+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7942+$as_echo_n "checking for $ac_word... " >&6; }
7943+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
7944+ $as_echo_n "(cached) " >&6
7945+else
7946+ if test -n "$ac_ct_DLLTOOL"; then
7947+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
7948+else
7949+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7950+for as_dir in $PATH
7951+do
7952+ IFS=$as_save_IFS
7953+ test -z "$as_dir" && as_dir=.
7954+ for ac_exec_ext in '' $ac_executable_extensions; do
7955+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7956+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
7957+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7958+ break 2
7959+ fi
7960+done
7961+ done
7962+IFS=$as_save_IFS
7963+
7964+fi
7965+fi
7966+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
7967+if test -n "$ac_ct_DLLTOOL"; then
7968+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
7969+$as_echo "$ac_ct_DLLTOOL" >&6; }
7970+else
7971+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7972+$as_echo "no" >&6; }
7973+fi
7974+
7975+ if test "x$ac_ct_DLLTOOL" = x; then
7976+ DLLTOOL="false"
7977+ else
7978+ case $cross_compiling:$ac_tool_warned in
7979+yes:)
7980+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7981+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7982+ac_tool_warned=yes ;;
7983+esac
7984+ DLLTOOL=$ac_ct_DLLTOOL
7985+ fi
7986+else
7987+ DLLTOOL="$ac_cv_prog_DLLTOOL"
7988+fi
7989+
7990+test -z "$DLLTOOL" && DLLTOOL=dlltool
7991+
7992+
7993+
7994+
7995+
7996+
7997+
7998+
7999+
8000+
8001+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
8002+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
8003+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
8004+ $as_echo_n "(cached) " >&6
8005+else
8006+ lt_cv_sharedlib_from_linklib_cmd='unknown'
8007+
8008+case $host_os in
8009+cygwin* | mingw* | pw32* | cegcc*)
8010+ # two different shell functions defined in ltmain.sh
8011+ # decide which to use based on capabilities of $DLLTOOL
8012+ case `$DLLTOOL --help 2>&1` in
8013+ *--identify-strict*)
8014+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
8015+ ;;
8016+ *)
8017+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
8018+ ;;
8019+ esac
8020+ ;;
8021+*)
8022+ # fallback: assume linklib IS sharedlib
8023+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
8024+ ;;
8025+esac
8026+
8027+fi
8028+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
8029+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
8030+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
8031+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
8032+
8033+
8034+
8035+
8036+
8037+
8038+
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
8042+ for ac_prog in ar
8043+ do
8044+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8045+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8046 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8047 $as_echo_n "checking for $ac_word... " >&6; }
8048 if test "${ac_cv_prog_AR+set}" = set; then :
8049@@ -6793,7 +7047,7 @@ do
8050 test -z "$as_dir" && as_dir=.
8051 for ac_exec_ext in '' $ac_executable_extensions; do
8052 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8053- ac_cv_prog_AR="${ac_tool_prefix}ar"
8054+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
8055 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8056 break 2
8057 fi
8058@@ -6813,11 +7067,15 @@ $as_echo "no" >&6; }
8059 fi
8060
8061
8062+ test -n "$AR" && break
8063+ done
8064 fi
8065-if test -z "$ac_cv_prog_AR"; then
8066+if test -z "$AR"; then
8067 ac_ct_AR=$AR
8068- # Extract the first word of "ar", so it can be a program name with args.
8069-set dummy ar; ac_word=$2
8070+ for ac_prog in ar
8071+do
8072+ # Extract the first word of "$ac_prog", so it can be a program name with args.
8073+set dummy $ac_prog; ac_word=$2
8074 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8075 $as_echo_n "checking for $ac_word... " >&6; }
8076 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
8077@@ -6833,7 +7091,7 @@ do
8078 test -z "$as_dir" && as_dir=.
8079 for ac_exec_ext in '' $ac_executable_extensions; do
8080 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8081- ac_cv_prog_ac_ct_AR="ar"
8082+ ac_cv_prog_ac_ct_AR="$ac_prog"
8083 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8084 break 2
8085 fi
8086@@ -6852,6 +7110,10 @@ else
8087 $as_echo "no" >&6; }
8088 fi
8089
8090+
8091+ test -n "$ac_ct_AR" && break
8092+done
8093+
8094 if test "x$ac_ct_AR" = x; then
8095 AR="false"
8096 else
8097@@ -6863,12 +7125,12 @@ ac_tool_warned=yes ;;
8098 esac
8099 AR=$ac_ct_AR
8100 fi
8101-else
8102- AR="$ac_cv_prog_AR"
8103 fi
8104
8105-test -z "$AR" && AR=ar
8106-test -z "$AR_FLAGS" && AR_FLAGS=cru
8107+: ${AR=ar}
8108+: ${AR_FLAGS=cru}
8109+
8110+
8111
8112
8113
8114@@ -6878,6 +7140,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
8115
8116
8117
8118+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
8119+$as_echo_n "checking for archiver @FILE support... " >&6; }
8120+if test "${lt_cv_ar_at_file+set}" = set; then :
8121+ $as_echo_n "(cached) " >&6
8122+else
8123+ lt_cv_ar_at_file=no
8124+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8125+/* end confdefs.h. */
8126+
8127+int
8128+main ()
8129+{
8130+
8131+ ;
8132+ return 0;
8133+}
8134+_ACEOF
8135+if ac_fn_c_try_compile "$LINENO"; then :
8136+ echo conftest.$ac_objext > conftest.lst
8137+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
8138+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8139+ (eval $lt_ar_try) 2>&5
8140+ ac_status=$?
8141+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8142+ test $ac_status = 0; }
8143+ if test "$ac_status" -eq 0; then
8144+ # Ensure the archiver fails upon bogus file names.
8145+ rm -f conftest.$ac_objext libconftest.a
8146+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
8147+ (eval $lt_ar_try) 2>&5
8148+ ac_status=$?
8149+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8150+ test $ac_status = 0; }
8151+ if test "$ac_status" -ne 0; then
8152+ lt_cv_ar_at_file=@
8153+ fi
8154+ fi
8155+ rm -f conftest.* libconftest.a
8156+
8157+fi
8158+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8159+
8160+fi
8161+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
8162+$as_echo "$lt_cv_ar_at_file" >&6; }
8163+
8164+if test "x$lt_cv_ar_at_file" = xno; then
8165+ archiver_list_spec=
8166+else
8167+ archiver_list_spec=$lt_cv_ar_at_file
8168+fi
8169+
8170+
8171+
8172+
8173+
8174
8175
8176 if test -n "$ac_tool_prefix"; then
8177@@ -7214,8 +7532,8 @@ esac
8178 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
8179
8180 # Transform an extracted symbol line into symbol name and symbol address
8181-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8182-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'"
8183+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
8184+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'"
8185
8186 # Handle CRLF in mingw tool chain
8187 opt_cr=
8188@@ -7251,6 +7569,7 @@ for ac_symprfx in "" "_"; do
8189 else
8190 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
8191 fi
8192+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
8193
8194 # Check to see that the pipe works correctly.
8195 pipe_works=no
8196@@ -7292,6 +7611,18 @@ _LT_EOF
8197 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
8198 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
8199 cat <<_LT_EOF > conftest.$ac_ext
8200+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
8201+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
8202+/* DATA imports from DLLs on WIN32 con't be const, because runtime
8203+ relocations are performed -- see ld's documentation on pseudo-relocs. */
8204+# define LT_DLSYM_CONST
8205+#elif defined(__osf__)
8206+/* This system does not cope well with relocations in const data. */
8207+# define LT_DLSYM_CONST
8208+#else
8209+# define LT_DLSYM_CONST const
8210+#endif
8211+
8212 #ifdef __cplusplus
8213 extern "C" {
8214 #endif
8215@@ -7303,7 +7634,7 @@ _LT_EOF
8216 cat <<_LT_EOF >> conftest.$ac_ext
8217
8218 /* The mapping between symbol names and symbols. */
8219-const struct {
8220+LT_DLSYM_CONST struct {
8221 const char *name;
8222 void *address;
8223 }
8224@@ -7329,8 +7660,8 @@ static const void *lt_preloaded_setup() {
8225 _LT_EOF
8226 # Now try linking the two files.
8227 mv conftest.$ac_objext conftstm.$ac_objext
8228- lt_save_LIBS="$LIBS"
8229- lt_save_CFLAGS="$CFLAGS"
8230+ lt_globsym_save_LIBS=$LIBS
8231+ lt_globsym_save_CFLAGS=$CFLAGS
8232 LIBS="conftstm.$ac_objext"
8233 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
8234 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
8235@@ -7340,8 +7671,8 @@ _LT_EOF
8236 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
8237 pipe_works=yes
8238 fi
8239- LIBS="$lt_save_LIBS"
8240- CFLAGS="$lt_save_CFLAGS"
8241+ LIBS=$lt_globsym_save_LIBS
8242+ CFLAGS=$lt_globsym_save_CFLAGS
8243 else
8244 echo "cannot find nm_test_func in $nlist" >&5
8245 fi
8246@@ -7378,6 +7709,19 @@ else
8247 $as_echo "ok" >&6; }
8248 fi
8249
8250+# Response file support.
8251+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
8252+ nm_file_list_spec='@'
8253+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
8254+ nm_file_list_spec='@'
8255+fi
8256+
8257+
8258+
8259+
8260+
8261+
8262+
8263
8264
8265
8266@@ -7398,6 +7742,42 @@ fi
8267
8268
8269
8270+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
8271+$as_echo_n "checking for sysroot... " >&6; }
8272+
8273+# Check whether --with-libtool-sysroot was given.
8274+if test "${with_libtool_sysroot+set}" = set; then :
8275+ withval=$with_libtool_sysroot;
8276+else
8277+ with_libtool_sysroot=no
8278+fi
8279+
8280+
8281+lt_sysroot=
8282+case ${with_libtool_sysroot} in #(
8283+ yes)
8284+ if test "$GCC" = yes; then
8285+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
8286+ fi
8287+ ;; #(
8288+ /*)
8289+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
8290+ ;; #(
8291+ no|'')
8292+ ;; #(
8293+ *)
8294+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
8295+$as_echo "${with_libtool_sysroot}" >&6; }
8296+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
8297+ ;;
8298+esac
8299+
8300+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
8301+$as_echo "${lt_sysroot:-no}" >&6; }
8302+
8303+
8304+
8305+
8306
8307 # Check whether --enable-libtool-lock was given.
8308 if test "${enable_libtool_lock+set}" = set; then :
8309@@ -7605,6 +7985,123 @@ esac
8310
8311 need_locks="$enable_libtool_lock"
8312
8313+if test -n "$ac_tool_prefix"; then
8314+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
8315+set dummy ${ac_tool_prefix}mt; ac_word=$2
8316+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8317+$as_echo_n "checking for $ac_word... " >&6; }
8318+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
8319+ $as_echo_n "(cached) " >&6
8320+else
8321+ if test -n "$MANIFEST_TOOL"; then
8322+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
8323+else
8324+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8325+for as_dir in $PATH
8326+do
8327+ IFS=$as_save_IFS
8328+ test -z "$as_dir" && as_dir=.
8329+ for ac_exec_ext in '' $ac_executable_extensions; do
8330+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8331+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
8332+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8333+ break 2
8334+ fi
8335+done
8336+ done
8337+IFS=$as_save_IFS
8338+
8339+fi
8340+fi
8341+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
8342+if test -n "$MANIFEST_TOOL"; then
8343+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
8344+$as_echo "$MANIFEST_TOOL" >&6; }
8345+else
8346+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8347+$as_echo "no" >&6; }
8348+fi
8349+
8350+
8351+fi
8352+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
8353+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
8354+ # Extract the first word of "mt", so it can be a program name with args.
8355+set dummy mt; ac_word=$2
8356+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8357+$as_echo_n "checking for $ac_word... " >&6; }
8358+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
8359+ $as_echo_n "(cached) " >&6
8360+else
8361+ if test -n "$ac_ct_MANIFEST_TOOL"; then
8362+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
8363+else
8364+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8365+for as_dir in $PATH
8366+do
8367+ IFS=$as_save_IFS
8368+ test -z "$as_dir" && as_dir=.
8369+ for ac_exec_ext in '' $ac_executable_extensions; do
8370+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8371+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
8372+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8373+ break 2
8374+ fi
8375+done
8376+ done
8377+IFS=$as_save_IFS
8378+
8379+fi
8380+fi
8381+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
8382+if test -n "$ac_ct_MANIFEST_TOOL"; then
8383+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
8384+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
8385+else
8386+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8387+$as_echo "no" >&6; }
8388+fi
8389+
8390+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
8391+ MANIFEST_TOOL=":"
8392+ else
8393+ case $cross_compiling:$ac_tool_warned in
8394+yes:)
8395+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8396+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8397+ac_tool_warned=yes ;;
8398+esac
8399+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
8400+ fi
8401+else
8402+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
8403+fi
8404+
8405+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
8406+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
8407+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
8408+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
8409+ $as_echo_n "(cached) " >&6
8410+else
8411+ lt_cv_path_mainfest_tool=no
8412+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
8413+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
8414+ cat conftest.err >&5
8415+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
8416+ lt_cv_path_mainfest_tool=yes
8417+ fi
8418+ rm -f conftest*
8419+fi
8420+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
8421+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
8422+if test "x$lt_cv_path_mainfest_tool" != xyes; then
8423+ MANIFEST_TOOL=:
8424+fi
8425+
8426+
8427+
8428+
8429+
8430
8431 case $host_os in
8432 rhapsody* | darwin*)
8433@@ -8168,6 +8665,8 @@ _LT_EOF
8434 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
8435 echo "$AR cru libconftest.a conftest.o" >&5
8436 $AR cru libconftest.a conftest.o 2>&5
8437+ echo "$RANLIB libconftest.a" >&5
8438+ $RANLIB libconftest.a 2>&5
8439 cat > conftest.c << _LT_EOF
8440 int main() { return 0;}
8441 _LT_EOF
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
8460 LIBTOOL_DEPS="$ltmain"
8461
8462 # Always use our own libtool.
8463-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
8464+LIBTOOL='$(SHELL) $(top_builddir)'
8465+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
8466
8467
8468
8469@@ -8453,7 +8963,7 @@ aix3*)
8470 esac
8471
8472 # Global variables:
8473-ofile=libtool
8474+ofile=${host_alias}-libtool
8475 can_build_shared=yes
8476
8477 # All known linkers require a `.a' archive for static linking (except MSVC,
8478@@ -8751,8 +9261,6 @@ fi
8479 lt_prog_compiler_pic=
8480 lt_prog_compiler_static=
8481
8482-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8483-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8484
8485 if test "$GCC" = yes; then
8486 lt_prog_compiler_wl='-Wl,'
8487@@ -8918,6 +9426,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8488 lt_prog_compiler_pic='--shared'
8489 lt_prog_compiler_static='--static'
8490 ;;
8491+ nagfor*)
8492+ # NAG Fortran compiler
8493+ lt_prog_compiler_wl='-Wl,-Wl,,'
8494+ lt_prog_compiler_pic='-PIC'
8495+ lt_prog_compiler_static='-Bstatic'
8496+ ;;
8497 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
8498 # Portland Group compilers (*not* the Pentium gcc compiler,
8499 # which looks to be a dead project)
8500@@ -8980,7 +9494,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8501 lt_prog_compiler_pic='-KPIC'
8502 lt_prog_compiler_static='-Bstatic'
8503 case $cc_basename in
8504- f77* | f90* | f95*)
8505+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
8506 lt_prog_compiler_wl='-Qoption ld ';;
8507 *)
8508 lt_prog_compiler_wl='-Wl,';;
8509@@ -9037,13 +9551,17 @@ case $host_os in
8510 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8511 ;;
8512 esac
8513-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8514-$as_echo "$lt_prog_compiler_pic" >&6; }
8515-
8516-
8517-
8518-
8519
8520+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8521+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8522+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
8523+ $as_echo_n "(cached) " >&6
8524+else
8525+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
8526+fi
8527+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
8528+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
8529+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
8530
8531 #
8532 # Check to make sure the PIC flag actually works.
8533@@ -9104,6 +9622,11 @@ fi
8534
8535
8536
8537+
8538+
8539+
8540+
8541+
8542 #
8543 # Check to make sure the static flag actually works.
8544 #
8545@@ -9454,7 +9977,8 @@ _LT_EOF
8546 allow_undefined_flag=unsupported
8547 always_export_symbols=no
8548 enable_shared_with_static_runtimes=yes
8549- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8550+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
8551+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
8552
8553 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
8554 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8555@@ -9502,7 +10026,7 @@ _LT_EOF
8556 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
8557 && test "$tmp_diet" = no
8558 then
8559- tmp_addflag=
8560+ tmp_addflag=' $pic_flag'
8561 tmp_sharedflag='-shared'
8562 case $cc_basename,$host_cpu in
8563 pgcc*) # Portland Group C compiler
8564@@ -9553,12 +10077,12 @@ _LT_EOF
8565 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
8566 hardcode_libdir_flag_spec=
8567 hardcode_libdir_flag_spec_ld='-rpath $libdir'
8568- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
8569+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
8570 if test "x$supports_anon_versioning" = xyes; then
8571 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
8572 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
8573 echo "local: *; };" >> $output_objdir/$libname.ver~
8574- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8575+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
8576 fi
8577 ;;
8578 esac
8579@@ -9572,8 +10096,8 @@ _LT_EOF
8580 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8581 wlarc=
8582 else
8583- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8584- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8585+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8586+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8587 fi
8588 ;;
8589
8590@@ -9591,8 +10115,8 @@ _LT_EOF
8591
8592 _LT_EOF
8593 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8594- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8595- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8596+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8597+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8598 else
8599 ld_shlibs=no
8600 fi
8601@@ -9638,8 +10162,8 @@ _LT_EOF
8602
8603 *)
8604 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
8605- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8606- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8607+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8608+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8609 else
8610 ld_shlibs=no
8611 fi
8612@@ -9769,7 +10293,13 @@ _LT_EOF
8613 allow_undefined_flag='-berok'
8614 # Determine the default libpath from the value encoded in an
8615 # empty executable.
8616- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8617+ if test "${lt_cv_aix_libpath+set}" = set; then
8618+ aix_libpath=$lt_cv_aix_libpath
8619+else
8620+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8621+ $as_echo_n "(cached) " >&6
8622+else
8623+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8624 /* end confdefs.h. */
8625
8626 int
8627@@ -9782,22 +10312,29 @@ main ()
8628 _ACEOF
8629 if ac_fn_c_try_link "$LINENO"; then :
8630
8631-lt_aix_libpath_sed='
8632- /Import File Strings/,/^$/ {
8633- /^0/ {
8634- s/^0 *\(.*\)$/\1/
8635- p
8636- }
8637- }'
8638-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8639-# Check for a 64-bit object if we didn't find anything.
8640-if test -z "$aix_libpath"; then
8641- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8642-fi
8643+ lt_aix_libpath_sed='
8644+ /Import File Strings/,/^$/ {
8645+ /^0/ {
8646+ s/^0 *\([^ ]*\) *$/\1/
8647+ p
8648+ }
8649+ }'
8650+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8651+ # Check for a 64-bit object if we didn't find anything.
8652+ if test -z "$lt_cv_aix_libpath_"; then
8653+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8654+ fi
8655 fi
8656 rm -f core conftest.err conftest.$ac_objext \
8657 conftest$ac_exeext conftest.$ac_ext
8658-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8659+ if test -z "$lt_cv_aix_libpath_"; then
8660+ lt_cv_aix_libpath_="/usr/lib:/lib"
8661+ fi
8662+
8663+fi
8664+
8665+ aix_libpath=$lt_cv_aix_libpath_
8666+fi
8667
8668 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
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"
8670@@ -9809,7 +10346,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8671 else
8672 # Determine the default libpath from the value encoded in an
8673 # empty executable.
8674- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8675+ if test "${lt_cv_aix_libpath+set}" = set; then
8676+ aix_libpath=$lt_cv_aix_libpath
8677+else
8678+ if test "${lt_cv_aix_libpath_+set}" = set; then :
8679+ $as_echo_n "(cached) " >&6
8680+else
8681+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8682 /* end confdefs.h. */
8683
8684 int
8685@@ -9822,22 +10365,29 @@ main ()
8686 _ACEOF
8687 if ac_fn_c_try_link "$LINENO"; then :
8688
8689-lt_aix_libpath_sed='
8690- /Import File Strings/,/^$/ {
8691- /^0/ {
8692- s/^0 *\(.*\)$/\1/
8693- p
8694- }
8695- }'
8696-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8697-# Check for a 64-bit object if we didn't find anything.
8698-if test -z "$aix_libpath"; then
8699- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8700-fi
8701+ lt_aix_libpath_sed='
8702+ /Import File Strings/,/^$/ {
8703+ /^0/ {
8704+ s/^0 *\([^ ]*\) *$/\1/
8705+ p
8706+ }
8707+ }'
8708+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8709+ # Check for a 64-bit object if we didn't find anything.
8710+ if test -z "$lt_cv_aix_libpath_"; then
8711+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
8712+ fi
8713 fi
8714 rm -f core conftest.err conftest.$ac_objext \
8715 conftest$ac_exeext conftest.$ac_ext
8716-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8717+ if test -z "$lt_cv_aix_libpath_"; then
8718+ lt_cv_aix_libpath_="/usr/lib:/lib"
8719+ fi
8720+
8721+fi
8722+
8723+ aix_libpath=$lt_cv_aix_libpath_
8724+fi
8725
8726 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
8727 # Warning - without using the other run time loading flags,
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
8730 # Microsoft Visual C++.
8731 # hardcode_libdir_flag_spec is actually meaningless, as there is
8732- # no search path for DLLs.
8733- hardcode_libdir_flag_spec=' '
8734- allow_undefined_flag=unsupported
8735- # Tell ltmain to make .lib files, not .a files.
8736- libext=lib
8737- # Tell ltmain to make .dll files, not .so files.
8738- shrext_cmds=".dll"
8739- # FIXME: Setting linknames here is a bad hack.
8740- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8741- # The linker will automatically build a .lib file if we build a DLL.
8742- old_archive_from_new_cmds='true'
8743- # FIXME: Should let the user specify the lib program.
8744- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8745- fix_srcfile_path='`cygpath -w "$srcfile"`'
8746- enable_shared_with_static_runtimes=yes
8747+ # no search path for DLLs.
8748+ case $cc_basename in
8749+ cl*)
8750+ # Native MSVC
8751+ hardcode_libdir_flag_spec=' '
8752+ allow_undefined_flag=unsupported
8753+ always_export_symbols=yes
8754+ file_list_spec='@'
8755+ # Tell ltmain to make .lib files, not .a files.
8756+ libext=lib
8757+ # Tell ltmain to make .dll files, not .so files.
8758+ shrext_cmds=".dll"
8759+ # FIXME: Setting linknames here is a bad hack.
8760+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
8761+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8762+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
8763+ else
8764+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
8765+ fi~
8766+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
8767+ linknames='
8768+ # The linker will not automatically build a static lib if we build a DLL.
8769+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
8770+ enable_shared_with_static_runtimes=yes
8771+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
8772+ # Don't use ranlib
8773+ old_postinstall_cmds='chmod 644 $oldlib'
8774+ postlink_cmds='lt_outputfile="@OUTPUT@"~
8775+ lt_tool_outputfile="@TOOL_OUTPUT@"~
8776+ case $lt_outputfile in
8777+ *.exe|*.EXE) ;;
8778+ *)
8779+ lt_outputfile="$lt_outputfile.exe"
8780+ lt_tool_outputfile="$lt_tool_outputfile.exe"
8781+ ;;
8782+ esac~
8783+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
8784+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
8785+ $RM "$lt_outputfile.manifest";
8786+ fi'
8787+ ;;
8788+ *)
8789+ # Assume MSVC wrapper
8790+ hardcode_libdir_flag_spec=' '
8791+ allow_undefined_flag=unsupported
8792+ # Tell ltmain to make .lib files, not .a files.
8793+ libext=lib
8794+ # Tell ltmain to make .dll files, not .so files.
8795+ shrext_cmds=".dll"
8796+ # FIXME: Setting linknames here is a bad hack.
8797+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
8798+ # The linker will automatically build a .lib file if we build a DLL.
8799+ old_archive_from_new_cmds='true'
8800+ # FIXME: Should let the user specify the lib program.
8801+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
8802+ enable_shared_with_static_runtimes=yes
8803+ ;;
8804+ esac
8805 ;;
8806
8807 darwin* | rhapsody*)
8808@@ -9956,7 +10549,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8809
8810 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
8811 freebsd* | dragonfly*)
8812- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
8813+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
8814 hardcode_libdir_flag_spec='-R$libdir'
8815 hardcode_direct=yes
8816 hardcode_shlibpath_var=no
8817@@ -9964,7 +10557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8818
8819 hpux9*)
8820 if test "$GCC" = yes; then
8821- archive_cmds='$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'
8822+ archive_cmds='$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'
8823 else
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'
8825 fi
8826@@ -9980,7 +10573,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8827
8828 hpux10*)
8829 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
8830- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8831+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8832 else
8833 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
8834 fi
8835@@ -10004,10 +10597,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8836 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8837 ;;
8838 ia64*)
8839- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8840+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8841 ;;
8842 *)
8843- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8844+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
8845 ;;
8846 esac
8847 else
8848@@ -10086,23 +10679,36 @@ fi
8849
8850 irix5* | irix6* | nonstopux*)
8851 if test "$GCC" = yes; then
8852- archive_cmds='$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'
8853+ archive_cmds='$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'
8854 # Try to use the -exported_symbol ld option, if it does not
8855 # work, assume that -exports_file does not work either and
8856 # implicitly export all symbols.
8857- save_LDFLAGS="$LDFLAGS"
8858- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8859- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8860+ # This should be the same for all languages, so no per-tag cache variable.
8861+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
8862+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
8863+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
8864+ $as_echo_n "(cached) " >&6
8865+else
8866+ save_LDFLAGS="$LDFLAGS"
8867+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
8868+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8869 /* end confdefs.h. */
8870-int foo(void) {}
8871+int foo (void) { return 0; }
8872 _ACEOF
8873 if ac_fn_c_try_link "$LINENO"; then :
8874- archive_expsym_cmds='$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'
8875-
8876+ lt_cv_irix_exported_symbol=yes
8877+else
8878+ lt_cv_irix_exported_symbol=no
8879 fi
8880 rm -f core conftest.err conftest.$ac_objext \
8881 conftest$ac_exeext conftest.$ac_ext
8882- LDFLAGS="$save_LDFLAGS"
8883+ LDFLAGS="$save_LDFLAGS"
8884+fi
8885+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
8886+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
8887+ if test "$lt_cv_irix_exported_symbol" = yes; then
8888+ archive_expsym_cmds='$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'
8889+ fi
8890 else
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'
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'
8893@@ -10187,7 +10793,7 @@ rm -f core conftest.err conftest.$ac_objext \
8894 osf4* | osf5*) # as osf3* with the addition of -msym flag
8895 if test "$GCC" = yes; then
8896 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
8897- archive_cmds='$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'
8898+ archive_cmds='$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'
8899 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
8900 else
8901 allow_undefined_flag=' -expect_unresolved \*'
8902@@ -10206,9 +10812,9 @@ rm -f core conftest.err conftest.$ac_objext \
8903 no_undefined_flag=' -z defs'
8904 if test "$GCC" = yes; then
8905 wlarc='${wl}'
8906- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8907+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8908 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
8909- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
8910+ $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'
8911 else
8912 case `$CC -V 2>&1` in
8913 *"Compilers 5.0"*)
8914@@ -10784,8 +11390,9 @@ cygwin* | mingw* | pw32* | cegcc*)
8915 need_version=no
8916 need_lib_prefix=no
8917
8918- case $GCC,$host_os in
8919- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
8920+ case $GCC,$cc_basename in
8921+ yes,*)
8922+ # gcc
8923 library_names_spec='$libname.dll.a'
8924 # DLL is installed to $(libdir)/../bin by postinstall_cmds
8925 postinstall_cmds='base_file=`basename \${file}`~
8926@@ -10818,13 +11425,71 @@ cygwin* | mingw* | pw32* | cegcc*)
8927 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8928 ;;
8929 esac
8930+ dynamic_linker='Win32 ld.exe'
8931+ ;;
8932+
8933+ *,cl*)
8934+ # Native MSVC
8935+ libname_spec='$name'
8936+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
8937+ library_names_spec='${libname}.dll.lib'
8938+
8939+ case $build_os in
8940+ mingw*)
8941+ sys_lib_search_path_spec=
8942+ lt_save_ifs=$IFS
8943+ IFS=';'
8944+ for lt_path in $LIB
8945+ do
8946+ IFS=$lt_save_ifs
8947+ # Let DOS variable expansion print the short 8.3 style file name.
8948+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
8949+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
8950+ done
8951+ IFS=$lt_save_ifs
8952+ # Convert to MSYS style.
8953+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
8954+ ;;
8955+ cygwin*)
8956+ # Convert to unix form, then to dos form, then back to unix form
8957+ # but this time dos style (no spaces!) so that the unix form looks
8958+ # like /cygdrive/c/PROGRA~1:/cygdr...
8959+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
8960+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
8961+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8962+ ;;
8963+ *)
8964+ sys_lib_search_path_spec="$LIB"
8965+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
8966+ # It is most probably a Windows format PATH.
8967+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
8968+ else
8969+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
8970+ fi
8971+ # FIXME: find the short name or the path components, as spaces are
8972+ # common. (e.g. "Program Files" -> "PROGRA~1")
8973+ ;;
8974+ esac
8975+
8976+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
8977+ postinstall_cmds='base_file=`basename \${file}`~
8978+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
8979+ dldir=$destdir/`dirname \$dlpath`~
8980+ test -d \$dldir || mkdir -p \$dldir~
8981+ $install_prog $dir/$dlname \$dldir/$dlname'
8982+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
8983+ dlpath=$dir/\$dldll~
8984+ $RM \$dlpath'
8985+ shlibpath_overrides_runpath=yes
8986+ dynamic_linker='Win32 link.exe'
8987 ;;
8988
8989 *)
8990+ # Assume MSVC wrapper
8991 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
8992+ dynamic_linker='Win32 ld.exe'
8993 ;;
8994 esac
8995- dynamic_linker='Win32 ld.exe'
8996 # FIXME: first we should search . and the directory the executable is in
8997 shlibpath_var=PATH
8998 ;;
8999@@ -10916,7 +11581,7 @@ haiku*)
9000 soname_spec='${libname}${release}${shared_ext}$major'
9001 shlibpath_var=LIBRARY_PATH
9002 shlibpath_overrides_runpath=yes
9003- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
9004+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
9005 hardcode_into_libs=yes
9006 ;;
9007
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
9018 /* When -fvisbility=hidden is used, assume the code has been annotated
9019 correspondingly for the symbols needed. */
9020 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9021-void fnord () __attribute__((visibility("default")));
9022+int fnord () __attribute__((visibility("default")));
9023 #endif
9024
9025-void fnord () { int i=42; }
9026+int fnord () { return 42; }
9027 int main ()
9028 {
9029 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
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
9040 /* When -fvisbility=hidden is used, assume the code has been annotated
9041 correspondingly for the symbols needed. */
9042 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
9043-void fnord () __attribute__((visibility("default")));
9044+int fnord () __attribute__((visibility("default")));
9045 #endif
9046
9047-void fnord () { int i=42; }
9048+int fnord () { return 42; }
9049 int main ()
9050 {
9051 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
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"`'
9658 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
9659 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
9660 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
9661+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
9662+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
9663 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
9664 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
9665 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
9666 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
9667 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
9668+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
9669+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
9670+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
9671+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
9672 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
9673 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
9674+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
9675 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
9676 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
9677 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
9678@@ -17828,14 +18671,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
9679 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $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"`'
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"`'
9682+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
9683+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
9684 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
9685 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
9686 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
9687-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9688 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
9689+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
9690 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
9691 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
9692 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
9693+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
9694 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
9695 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
9696 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
9697@@ -17868,12 +18714,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
9698 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
9699 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
9700 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
9701-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
9702 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
9703 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
9704 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
9705 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
9706 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
9707+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
9708 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
9709 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
9710 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
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 \
9736 OBJDUMP \
9737 deplibs_check_method \
9738 file_magic_cmd \
9739+file_magic_glob \
9740+want_nocaseglob \
9741+DLLTOOL \
9742+sharedlib_from_linklib_cmd \
9743 AR \
9744 AR_FLAGS \
9745+archiver_list_spec \
9746 STRIP \
9747 RANLIB \
9748 CC \
9749@@ -17994,12 +18845,14 @@ lt_cv_sys_global_symbol_pipe \
9750 lt_cv_sys_global_symbol_to_cdecl \
9751 lt_cv_sys_global_symbol_to_c_name_address \
9752 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
9753+nm_file_list_spec \
9754 lt_prog_compiler_no_builtin_flag \
9755-lt_prog_compiler_wl \
9756 lt_prog_compiler_pic \
9757+lt_prog_compiler_wl \
9758 lt_prog_compiler_static \
9759 lt_cv_prog_compiler_c_o \
9760 need_locks \
9761+MANIFEST_TOOL \
9762 DSYMUTIL \
9763 NMEDIT \
9764 LIPO \
9765@@ -18015,7 +18868,6 @@ no_undefined_flag \
9766 hardcode_libdir_flag_spec \
9767 hardcode_libdir_flag_spec_ld \
9768 hardcode_libdir_separator \
9769-fix_srcfile_path \
9770 exclude_expsyms \
9771 include_expsyms \
9772 file_list_spec \
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 \
9792 module_expsym_cmds \
9793 export_symbols_cmds \
9794 prelink_cmds \
9795+postlink_cmds \
9796 postinstall_cmds \
9797 postuninstall_cmds \
9798 finish_cmds \
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" |
9810 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9811 #
9812 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
9813-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
9814+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
9815+# Inc.
9816 # Written by Gordon Matzigkeit, 1996
9817 #
9818 # This file is part of GNU Libtool.
9819@@ -18994,19 +19848,42 @@ SP2NL=$lt_lt_SP2NL
9820 # turn newlines into spaces.
9821 NL2SP=$lt_lt_NL2SP
9822
9823+# convert \$build file names to \$host format.
9824+to_host_file_cmd=$lt_cv_to_host_file_cmd
9825+
9826+# convert \$build files to toolchain format.
9827+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
9828+
9829 # An object symbol dumper.
9830 OBJDUMP=$lt_OBJDUMP
9831
9832 # Method to check whether dependent libraries are shared objects.
9833 deplibs_check_method=$lt_deplibs_check_method
9834
9835-# Command to use when deplibs_check_method == "file_magic".
9836+# Command to use when deplibs_check_method = "file_magic".
9837 file_magic_cmd=$lt_file_magic_cmd
9838
9839+# How to find potential files when deplibs_check_method = "file_magic".
9840+file_magic_glob=$lt_file_magic_glob
9841+
9842+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
9843+want_nocaseglob=$lt_want_nocaseglob
9844+
9845+# DLL creation program.
9846+DLLTOOL=$lt_DLLTOOL
9847+
9848+# Command to associate shared and link libraries.
9849+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
9850+
9851 # The archiver.
9852 AR=$lt_AR
9853+
9854+# Flags to create an archive.
9855 AR_FLAGS=$lt_AR_FLAGS
9856
9857+# How to feed a file listing to the archiver.
9858+archiver_list_spec=$lt_archiver_list_spec
9859+
9860 # A symbol stripping program.
9861 STRIP=$lt_STRIP
9862
9863@@ -19036,6 +19913,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
9864 # Transform the output of nm in a C name address pair when lib prefix is needed.
9865 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
9866
9867+# Specify filename containing input files for \$NM.
9868+nm_file_list_spec=$lt_nm_file_list_spec
9869+
9870+# The root where to search for dependent libraries,and in which our libraries should be installed.
9871+lt_sysroot=$lt_sysroot
9872+
9873 # The name of the directory that contains temporary libtool files.
9874 objdir=$objdir
9875
9876@@ -19045,6 +19928,9 @@ MAGIC_CMD=$MAGIC_CMD
9877 # Must we lock files when doing compilation?
9878 need_locks=$lt_need_locks
9879
9880+# Manifest tool.
9881+MANIFEST_TOOL=$lt_MANIFEST_TOOL
9882+
9883 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
9884 DSYMUTIL=$lt_DSYMUTIL
9885
9886@@ -19159,12 +20045,12 @@ with_gcc=$GCC
9887 # Compiler flag to turn off builtin functions.
9888 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
9889
9890-# How to pass a linker flag through the compiler.
9891-wl=$lt_lt_prog_compiler_wl
9892-
9893 # Additional compiler flags for building library objects.
9894 pic_flag=$lt_lt_prog_compiler_pic
9895
9896+# How to pass a linker flag through the compiler.
9897+wl=$lt_lt_prog_compiler_wl
9898+
9899 # Compiler flag to prevent dynamic linking.
9900 link_static_flag=$lt_lt_prog_compiler_static
9901
9902@@ -19251,9 +20137,6 @@ inherit_rpath=$inherit_rpath
9903 # Whether libtool must link a program against all its dependency libraries.
9904 link_all_deplibs=$link_all_deplibs
9905
9906-# Fix the shell variable \$srcfile for the compiler.
9907-fix_srcfile_path=$lt_fix_srcfile_path
9908-
9909 # Set to "yes" if exported symbols are required.
9910 always_export_symbols=$always_export_symbols
9911
9912@@ -19269,6 +20152,9 @@ include_expsyms=$lt_include_expsyms
9913 # Commands necessary for linking programs (against libraries) with templates.
9914 prelink_cmds=$lt_prelink_cmds
9915
9916+# Commands necessary for finishing linking programs.
9917+postlink_cmds=$lt_postlink_cmds
9918+
9919 # Specify filename containing input files.
9920 file_list_spec=$lt_file_list_spec
9921
9922@@ -19315,210 +20201,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
9923 # if finds mixed CR/LF and LF-only lines. Since sed operates in
9924 # text mode, it properly converts lines to CR/LF. This bash problem
9925 # is reportedly fixed, but why not run on old versions too?
9926- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
9927- || (rm -f "$cfgfile"; exit 1)
9928-
9929- case $xsi_shell in
9930- yes)
9931- cat << \_LT_EOF >> "$cfgfile"
9932-
9933-# func_dirname file append nondir_replacement
9934-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
9935-# otherwise set result to NONDIR_REPLACEMENT.
9936-func_dirname ()
9937-{
9938- case ${1} in
9939- */*) func_dirname_result="${1%/*}${2}" ;;
9940- * ) func_dirname_result="${3}" ;;
9941- esac
9942-}
9943-
9944-# func_basename file
9945-func_basename ()
9946-{
9947- func_basename_result="${1##*/}"
9948-}
9949-
9950-# func_dirname_and_basename file append nondir_replacement
9951-# perform func_basename and func_dirname in a single function
9952-# call:
9953-# dirname: Compute the dirname of FILE. If nonempty,
9954-# add APPEND to the result, otherwise set result
9955-# to NONDIR_REPLACEMENT.
9956-# value returned in "$func_dirname_result"
9957-# basename: Compute filename of FILE.
9958-# value retuned in "$func_basename_result"
9959-# Implementation must be kept synchronized with func_dirname
9960-# and func_basename. For efficiency, we do not delegate to
9961-# those functions but instead duplicate the functionality here.
9962-func_dirname_and_basename ()
9963-{
9964- case ${1} in
9965- */*) func_dirname_result="${1%/*}${2}" ;;
9966- * ) func_dirname_result="${3}" ;;
9967- esac
9968- func_basename_result="${1##*/}"
9969-}
9970-
9971-# func_stripname prefix suffix name
9972-# strip PREFIX and SUFFIX off of NAME.
9973-# PREFIX and SUFFIX must not contain globbing or regex special
9974-# characters, hashes, percent signs, but SUFFIX may contain a leading
9975-# dot (in which case that matches only a dot).
9976-func_stripname ()
9977-{
9978- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
9979- # positional parameters, so assign one to ordinary parameter first.
9980- func_stripname_result=${3}
9981- func_stripname_result=${func_stripname_result#"${1}"}
9982- func_stripname_result=${func_stripname_result%"${2}"}
9983-}
9984-
9985-# func_opt_split
9986-func_opt_split ()
9987-{
9988- func_opt_split_opt=${1%%=*}
9989- func_opt_split_arg=${1#*=}
9990-}
9991-
9992-# func_lo2o object
9993-func_lo2o ()
9994-{
9995- case ${1} in
9996- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
9997- *) func_lo2o_result=${1} ;;
9998- esac
9999-}
10000-
10001-# func_xform libobj-or-source
10002-func_xform ()
10003-{
10004- func_xform_result=${1%.*}.lo
10005-}
10006-
10007-# func_arith arithmetic-term...
10008-func_arith ()
10009-{
10010- func_arith_result=$(( $* ))
10011-}
10012-
10013-# func_len string
10014-# STRING may not start with a hyphen.
10015-func_len ()
10016-{
10017- func_len_result=${#1}
10018-}
10019-
10020-_LT_EOF
10021- ;;
10022- *) # Bourne compatible functions.
10023- cat << \_LT_EOF >> "$cfgfile"
10024-
10025-# func_dirname file append nondir_replacement
10026-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
10027-# otherwise set result to NONDIR_REPLACEMENT.
10028-func_dirname ()
10029-{
10030- # Extract subdirectory from the argument.
10031- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
10032- if test "X$func_dirname_result" = "X${1}"; then
10033- func_dirname_result="${3}"
10034- else
10035- func_dirname_result="$func_dirname_result${2}"
10036- fi
10037-}
10038-
10039-# func_basename file
10040-func_basename ()
10041-{
10042- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
10043-}
10044-
10045-
10046-# func_stripname prefix suffix name
10047-# strip PREFIX and SUFFIX off of NAME.
10048-# PREFIX and SUFFIX must not contain globbing or regex special
10049-# characters, hashes, percent signs, but SUFFIX may contain a leading
10050-# dot (in which case that matches only a dot).
10051-# func_strip_suffix prefix name
10052-func_stripname ()
10053-{
10054- case ${2} in
10055- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
10056- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
10057- esac
10058-}
10059-
10060-# sed scripts:
10061-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
10062-my_sed_long_arg='1s/^-[^=]*=//'
10063-
10064-# func_opt_split
10065-func_opt_split ()
10066-{
10067- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
10068- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
10069-}
10070-
10071-# func_lo2o object
10072-func_lo2o ()
10073-{
10074- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
10075-}
10076-
10077-# func_xform libobj-or-source
10078-func_xform ()
10079-{
10080- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
10081-}
10082-
10083-# func_arith arithmetic-term...
10084-func_arith ()
10085-{
10086- func_arith_result=`expr "$@"`
10087-}
10088-
10089-# func_len string
10090-# STRING may not start with a hyphen.
10091-func_len ()
10092-{
10093- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
10094-}
10095-
10096-_LT_EOF
10097-esac
10098-
10099-case $lt_shell_append in
10100- yes)
10101- cat << \_LT_EOF >> "$cfgfile"
10102-
10103-# func_append var value
10104-# Append VALUE to the end of shell variable VAR.
10105-func_append ()
10106-{
10107- eval "$1+=\$2"
10108-}
10109-_LT_EOF
10110- ;;
10111- *)
10112- cat << \_LT_EOF >> "$cfgfile"
10113-
10114-# func_append var value
10115-# Append VALUE to the end of shell variable VAR.
10116-func_append ()
10117-{
10118- eval "$1=\$$1\$2"
10119-}
10120-
10121-_LT_EOF
10122- ;;
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" ||
10130+ sed '$q' "$ltmain" >> "$cfgfile" \
10131+ || (rm -f "$cfgfile"; exit 1)
10132+
10133+ if test x"$xsi_shell" = xyes; then
10134+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
10135+func_dirname ()\
10136+{\
10137+\ case ${1} in\
10138+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10139+\ * ) func_dirname_result="${3}" ;;\
10140+\ esac\
10141+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
10142+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10143+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10144+test 0 -eq $? || _lt_function_replace_fail=:
10145+
10146+
10147+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
10148+func_basename ()\
10149+{\
10150+\ func_basename_result="${1##*/}"\
10151+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
10152+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10153+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10154+test 0 -eq $? || _lt_function_replace_fail=:
10155+
10156+
10157+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
10158+func_dirname_and_basename ()\
10159+{\
10160+\ case ${1} in\
10161+\ */*) func_dirname_result="${1%/*}${2}" ;;\
10162+\ * ) func_dirname_result="${3}" ;;\
10163+\ esac\
10164+\ func_basename_result="${1##*/}"\
10165+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
10166+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10167+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10168+test 0 -eq $? || _lt_function_replace_fail=:
10169+
10170+
10171+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
10172+func_stripname ()\
10173+{\
10174+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
10175+\ # positional parameters, so assign one to ordinary parameter first.\
10176+\ func_stripname_result=${3}\
10177+\ func_stripname_result=${func_stripname_result#"${1}"}\
10178+\ func_stripname_result=${func_stripname_result%"${2}"}\
10179+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
10180+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10181+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10182+test 0 -eq $? || _lt_function_replace_fail=:
10183+
10184+
10185+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
10186+func_split_long_opt ()\
10187+{\
10188+\ func_split_long_opt_name=${1%%=*}\
10189+\ func_split_long_opt_arg=${1#*=}\
10190+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
10191+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10192+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10193+test 0 -eq $? || _lt_function_replace_fail=:
10194+
10195+
10196+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
10197+func_split_short_opt ()\
10198+{\
10199+\ func_split_short_opt_arg=${1#??}\
10200+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
10201+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
10202+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10203+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10204+test 0 -eq $? || _lt_function_replace_fail=:
10205+
10206+
10207+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
10208+func_lo2o ()\
10209+{\
10210+\ case ${1} in\
10211+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
10212+\ *) func_lo2o_result=${1} ;;\
10213+\ esac\
10214+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
10215+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10216+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10217+test 0 -eq $? || _lt_function_replace_fail=:
10218+
10219+
10220+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
10221+func_xform ()\
10222+{\
10223+ func_xform_result=${1%.*}.lo\
10224+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
10225+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10226+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10227+test 0 -eq $? || _lt_function_replace_fail=:
10228+
10229+
10230+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
10231+func_arith ()\
10232+{\
10233+ func_arith_result=$(( $* ))\
10234+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
10235+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10236+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10237+test 0 -eq $? || _lt_function_replace_fail=:
10238+
10239+
10240+ sed -e '/^func_len ()$/,/^} # func_len /c\
10241+func_len ()\
10242+{\
10243+ func_len_result=${#1}\
10244+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
10245+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10246+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10247+test 0 -eq $? || _lt_function_replace_fail=:
10248+
10249+fi
10250+
10251+if test x"$lt_shell_append" = xyes; then
10252+ sed -e '/^func_append ()$/,/^} # func_append /c\
10253+func_append ()\
10254+{\
10255+ eval "${1}+=\\${2}"\
10256+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
10257+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10258+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10259+test 0 -eq $? || _lt_function_replace_fail=:
10260+
10261+
10262+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
10263+func_append_quoted ()\
10264+{\
10265+\ func_quote_for_eval "${2}"\
10266+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
10267+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
10268+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10269+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10270+test 0 -eq $? || _lt_function_replace_fail=:
10271+
10272+
10273+ # Save a `func_append' function call where possible by direct use of '+='
10274+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
10275+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10276+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10277+ test 0 -eq $? || _lt_function_replace_fail=:
10278+else
10279+ # Save a `func_append' function call even when '+=' is not available
10280+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
10281+ && mv -f "$cfgfile.tmp" "$cfgfile" \
10282+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
10283+ test 0 -eq $? || _lt_function_replace_fail=:
10284+fi
10285+
10286+if test x"$_lt_function_replace_fail" = x":"; then
10287+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
10288+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
10289+fi
10290+
10291+
10292+ mv -f "$cfgfile" "$ofile" ||
10293 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10294 chmod +x "$ofile"
10295
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" \
10412- || (rm -f "$cfgfile"; exit 1)
10413+ sed '$q' "$ltmain" >> "$cfgfile" \
10414+ || (rm -f "$cfgfile"; exit 1)
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-
10422- mv -f "$cfgfile" "$ofile" ||
10423+ mv -f "$cfgfile" "$ofile" ||
10424 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
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 ])
10439
10440-# _LT_SYS_MODULE_PATH_AIX
10441-# -----------------------
10442+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
10443+# ----------------------------------
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
17440 LIPO
17441 NMEDIT
17442 DSYMUTIL
17443+MANIFEST_TOOL
17444+ac_ct_AR
17445+DLLTOOL
17446 OBJDUMP
17447 LN_S
17448 NM
17449@@ -760,6 +763,7 @@ enable_static
17450 with_pic
17451 enable_fast_install
17452 with_gnu_ld
17453+with_libtool_sysroot
17454 enable_libtool_lock
17455 enable_targets
17456 enable_werror
17457@@ -1420,6 +1424,8 @@ Optional Packages:
17458 --with-pic try to use only PIC/non-PIC objects [default=use
17459 both]
17460 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
17461+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
17462+ (or the compiler's sysroot if not specified).
17463
17464 Some influential environment variables:
17465 CC C compiler command
17466@@ -5110,8 +5116,8 @@ esac
17467
17468
17469
17470-macro_version='2.2.7a'
17471-macro_revision='1.3134'
17472+macro_version='2.4'
17473+macro_revision='1.3293'
17474
17475
17476
17477@@ -5151,7 +5157,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
17478 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
17479 $as_echo_n "checking how to print strings... " >&6; }
17480 # Test print first, because it will be a builtin if present.
17481-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
17482+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
17483 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
17484 ECHO='print -r --'
17485 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
17486@@ -5837,8 +5843,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
17487 # Try some XSI features
17488 xsi_shell=no
17489 ( _lt_dummy="a/b/c"
17490- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
17491- = c,a/b,, \
17492+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
17493+ = c,a/b,b/c, \
17494 && eval 'test $(( 1 + 1 )) -eq 2 \
17495 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
17496 && xsi_shell=yes
17497@@ -5887,6 +5893,80 @@ esac
17498
17499
17500
17501+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
17502+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
17503+if test "${lt_cv_to_host_file_cmd+set}" = set; then :
17504+ $as_echo_n "(cached) " >&6
17505+else
17506+ case $host in
17507+ *-*-mingw* )
17508+ case $build in
17509+ *-*-mingw* ) # actually msys
17510+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
17511+ ;;
17512+ *-*-cygwin* )
17513+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
17514+ ;;
17515+ * ) # otherwise, assume *nix
17516+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
17517+ ;;
17518+ esac
17519+ ;;
17520+ *-*-cygwin* )
17521+ case $build in
17522+ *-*-mingw* ) # actually msys
17523+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
17524+ ;;
17525+ *-*-cygwin* )
17526+ lt_cv_to_host_file_cmd=func_convert_file_noop
17527+ ;;
17528+ * ) # otherwise, assume *nix
17529+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
17530+ ;;
17531+ esac
17532+ ;;
17533+ * ) # unhandled hosts (and "normal" native builds)
17534+ lt_cv_to_host_file_cmd=func_convert_file_noop
17535+ ;;
17536+esac
17537+
17538+fi
17539+
17540+to_host_file_cmd=$lt_cv_to_host_file_cmd
17541+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
17542+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
17543+
17544+
17545+
17546+
17547+
17548+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
17549+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
17550+if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
17551+ $as_echo_n "(cached) " >&6
17552+else
17553+ #assume ordinary cross tools, or native build.
17554+lt_cv_to_tool_file_cmd=func_convert_file_noop
17555+case $host in
17556+ *-*-mingw* )
17557+ case $build in
17558+ *-*-mingw* ) # actually msys
17559+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
17560+ ;;
17561+ esac
17562+ ;;
17563+esac
17564+
17565+fi
17566+
17567+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
17568+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
17569+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
17570+
17571+
17572+
17573+
17574+
17575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
17576 $as_echo_n "checking for $LD option to reload object files... " >&6; }
17577 if test "${lt_cv_ld_reload_flag+set}" = set; then :
17578@@ -5903,6 +5983,11 @@ case $reload_flag in
17579 esac
17580 reload_cmds='$LD$reload_flag -o $output$reload_objs'
17581 case $host_os in
17582+ cygwin* | mingw* | pw32* | cegcc*)
17583+ if test "$GCC" != yes; then
17584+ reload_cmds=false
17585+ fi
17586+ ;;
17587 darwin*)
17588 if test "$GCC" = yes; then
17589 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
17590@@ -6071,7 +6156,8 @@ mingw* | pw32*)
17591 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
17592 lt_cv_file_magic_cmd='func_win32_libid'
17593 else
17594- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
17595+ # Keep this pattern in sync with the one in func_win32_libid.
17596+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
17597 lt_cv_file_magic_cmd='$OBJDUMP -f'
17598 fi
17599 ;;
17600@@ -6225,6 +6311,21 @@ esac
17601 fi
17602 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
17603 $as_echo "$lt_cv_deplibs_check_method" >&6; }
17604+
17605+file_magic_glob=
17606+want_nocaseglob=no
17607+if test "$build" = "$host"; then
17608+ case $host_os in
17609+ mingw* | pw32*)
17610+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
17611+ want_nocaseglob=yes
17612+ else
17613+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
17614+ fi
17615+ ;;
17616+ esac
17617+fi
17618+
17619 file_magic_cmd=$lt_cv_file_magic_cmd
17620 deplibs_check_method=$lt_cv_deplibs_check_method
17621 test -z "$deplibs_check_method" && deplibs_check_method=unknown
17622@@ -6240,9 +6341,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
17623
17624
17625
17626+
17627+
17628+
17629+
17630+
17631+
17632+
17633+
17634+
17635+
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
17639+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
17640+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
17641+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17642+$as_echo_n "checking for $ac_word... " >&6; }
17643+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
17644+ $as_echo_n "(cached) " >&6
17645+else
17646+ if test -n "$DLLTOOL"; then
17647+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
17648+else
17649+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17650+for as_dir in $PATH
17651+do
17652+ IFS=$as_save_IFS
17653+ test -z "$as_dir" && as_dir=.
17654+ for ac_exec_ext in '' $ac_executable_extensions; do
17655+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17656+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
17657+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17658+ break 2
17659+ fi
17660+done
17661+ done
17662+IFS=$as_save_IFS
17663+
17664+fi
17665+fi
17666+DLLTOOL=$ac_cv_prog_DLLTOOL
17667+if test -n "$DLLTOOL"; then
17668+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
17669+$as_echo "$DLLTOOL" >&6; }
17670+else
17671+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17672+$as_echo "no" >&6; }
17673+fi
17674+
17675+
17676+fi
17677+if test -z "$ac_cv_prog_DLLTOOL"; then
17678+ ac_ct_DLLTOOL=$DLLTOOL
17679+ # Extract the first word of "dlltool", so it can be a program name with args.
17680+set dummy dlltool; ac_word=$2
17681+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17682+$as_echo_n "checking for $ac_word... " >&6; }
17683+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
17684+ $as_echo_n "(cached) " >&6
17685+else
17686+ if test -n "$ac_ct_DLLTOOL"; then
17687+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
17688+else
17689+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
17690+for as_dir in $PATH
17691+do
17692+ IFS=$as_save_IFS
17693+ test -z "$as_dir" && as_dir=.
17694+ for ac_exec_ext in '' $ac_executable_extensions; do
17695+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17696+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
17697+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17698+ break 2
17699+ fi
17700+done
17701+ done
17702+IFS=$as_save_IFS
17703+
17704+fi
17705+fi
17706+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
17707+if test -n "$ac_ct_DLLTOOL"; then
17708+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
17709+$as_echo "$ac_ct_DLLTOOL" >&6; }
17710+else
17711+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17712+$as_echo "no" >&6; }
17713+fi
17714+
17715+ if test "x$ac_ct_DLLTOOL" = x; then
17716+ DLLTOOL="false"
17717+ else
17718+ case $cross_compiling:$ac_tool_warned in
17719+yes:)
17720+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17721+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17722+ac_tool_warned=yes ;;
17723+esac
17724+ DLLTOOL=$ac_ct_DLLTOOL
17725+ fi
17726+else
17727+ DLLTOOL="$ac_cv_prog_DLLTOOL"
17728+fi
17729+
17730+test -z "$DLLTOOL" && DLLTOOL=dlltool
17731+
17732+
17733+
17734+
17735+
17736+
17737+
17738+
17739+
17740+
17741+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
17742+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
17743+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
17744+ $as_echo_n "(cached) " >&6
17745+else
17746+ lt_cv_sharedlib_from_linklib_cmd='unknown'
17747+
17748+case $host_os in
17749+cygwin* | mingw* | pw32* | cegcc*)
17750+ # two different shell functions defined in ltmain.sh
17751+ # decide which to use based on capabilities of $DLLTOOL
17752+ case `$DLLTOOL --help 2>&1` in
17753+ *--identify-strict*)
17754+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
17755+ ;;
17756+ *)
17757+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
17758+ ;;
17759+ esac
17760+ ;;
17761+*)
17762+ # fallback: assume linklib IS sharedlib
17763+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
17764+ ;;
17765+esac
17766+
17767+fi
17768+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
17769+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
17770+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
17771+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
17772+
17773+
17774+
17775+
17776+
17777+
17778+
17779+if test -n "$ac_tool_prefix"; then
17780+ for ac_prog in ar
17781+ do
17782+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17783+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17784 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17785 $as_echo_n "checking for $ac_word... " >&6; }
17786 if test "${ac_cv_prog_AR+set}" = set; then :
17787@@ -6258,7 +6512,7 @@ do
17788 test -z "$as_dir" && as_dir=.
17789 for ac_exec_ext in '' $ac_executable_extensions; do
17790 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17791- ac_cv_prog_AR="${ac_tool_prefix}ar"
17792+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
17793 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17794 break 2
17795 fi
17796@@ -6278,11 +6532,15 @@ $as_echo "no" >&6; }
17797 fi
17798
17799
17800+ test -n "$AR" && break
17801+ done
17802 fi
17803-if test -z "$ac_cv_prog_AR"; then
17804+if test -z "$AR"; then
17805 ac_ct_AR=$AR
17806- # Extract the first word of "ar", so it can be a program name with args.
17807-set dummy ar; ac_word=$2
17808+ for ac_prog in ar
17809+do
17810+ # Extract the first word of "$ac_prog", so it can be a program name with args.
17811+set dummy $ac_prog; ac_word=$2
17812 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17813 $as_echo_n "checking for $ac_word... " >&6; }
17814 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
17815@@ -6298,7 +6556,7 @@ do
17816 test -z "$as_dir" && as_dir=.
17817 for ac_exec_ext in '' $ac_executable_extensions; do
17818 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
17819- ac_cv_prog_ac_ct_AR="ar"
17820+ ac_cv_prog_ac_ct_AR="$ac_prog"
17821 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
17822 break 2
17823 fi
17824@@ -6317,6 +6575,10 @@ else
17825 $as_echo "no" >&6; }
17826 fi
17827
17828+
17829+ test -n "$ac_ct_AR" && break
17830+done
17831+
17832 if test "x$ac_ct_AR" = x; then
17833 AR="false"
17834 else
17835@@ -6328,16 +6590,72 @@ ac_tool_warned=yes ;;
17836 esac
17837 AR=$ac_ct_AR
17838 fi
17839-else
17840- AR="$ac_cv_prog_AR"
17841 fi
17842
17843-test -z "$AR" && AR=ar
17844-test -z "$AR_FLAGS" && AR_FLAGS=cru
17845+: ${AR=ar}
17846+: ${AR_FLAGS=cru}
17847+
17848+
17849+
17850+
17851+
17852+
17853+
17854+
17855+
17856+
17857+
17858+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
17859+$as_echo_n "checking for archiver @FILE support... " >&6; }
17860+if test "${lt_cv_ar_at_file+set}" = set; then :
17861+ $as_echo_n "(cached) " >&6
17862+else
17863+ lt_cv_ar_at_file=no
17864+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17865+/* end confdefs.h. */
17866+
17867+int
17868+main ()
17869+{
17870
17871+ ;
17872+ return 0;
17873+}
17874+_ACEOF
17875+if ac_fn_c_try_compile "$LINENO"; then :
17876+ echo conftest.$ac_objext > conftest.lst
17877+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
17878+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17879+ (eval $lt_ar_try) 2>&5
17880+ ac_status=$?
17881+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17882+ test $ac_status = 0; }
17883+ if test "$ac_status" -eq 0; then
17884+ # Ensure the archiver fails upon bogus file names.
17885+ rm -f conftest.$ac_objext libconftest.a
17886+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
17887+ (eval $lt_ar_try) 2>&5
17888+ ac_status=$?
17889+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17890+ test $ac_status = 0; }
17891+ if test "$ac_status" -ne 0; then
17892+ lt_cv_ar_at_file=@
17893+ fi
17894+ fi
17895+ rm -f conftest.* libconftest.a
17896
17897+fi
17898+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17899
17900+fi
17901+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
17902+$as_echo "$lt_cv_ar_at_file" >&6; }
17903
17904+if test "x$lt_cv_ar_at_file" = xno; then
17905+ archiver_list_spec=
17906+else
17907+ archiver_list_spec=$lt_cv_ar_at_file
17908+fi
17909
17910
17911
17912@@ -6679,8 +6997,8 @@ esac
17913 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
17914
17915 # Transform an extracted symbol line into symbol name and symbol address
17916-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17917-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'"
17918+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
17919+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'"
17920
17921 # Handle CRLF in mingw tool chain
17922 opt_cr=
17923@@ -6716,6 +7034,7 @@ for ac_symprfx in "" "_"; do
17924 else
17925 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
17926 fi
17927+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
17928
17929 # Check to see that the pipe works correctly.
17930 pipe_works=no
17931@@ -6757,6 +7076,18 @@ _LT_EOF
17932 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
17933 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
17934 cat <<_LT_EOF > conftest.$ac_ext
17935+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
17936+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
17937+/* DATA imports from DLLs on WIN32 con't be const, because runtime
17938+ relocations are performed -- see ld's documentation on pseudo-relocs. */
17939+# define LT_DLSYM_CONST
17940+#elif defined(__osf__)
17941+/* This system does not cope well with relocations in const data. */
17942+# define LT_DLSYM_CONST
17943+#else
17944+# define LT_DLSYM_CONST const
17945+#endif
17946+
17947 #ifdef __cplusplus
17948 extern "C" {
17949 #endif
17950@@ -6768,7 +7099,7 @@ _LT_EOF
17951 cat <<_LT_EOF >> conftest.$ac_ext
17952
17953 /* The mapping between symbol names and symbols. */
17954-const struct {
17955+LT_DLSYM_CONST struct {
17956 const char *name;
17957 void *address;
17958 }
17959@@ -6794,8 +7125,8 @@ static const void *lt_preloaded_setup() {
17960 _LT_EOF
17961 # Now try linking the two files.
17962 mv conftest.$ac_objext conftstm.$ac_objext
17963- lt_save_LIBS="$LIBS"
17964- lt_save_CFLAGS="$CFLAGS"
17965+ lt_globsym_save_LIBS=$LIBS
17966+ lt_globsym_save_CFLAGS=$CFLAGS
17967 LIBS="conftstm.$ac_objext"
17968 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
17969 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
17970@@ -6805,8 +7136,8 @@ _LT_EOF
17971 test $ac_status = 0; } && test -s conftest${ac_exeext}; then
17972 pipe_works=yes
17973 fi
17974- LIBS="$lt_save_LIBS"
17975- CFLAGS="$lt_save_CFLAGS"
17976+ LIBS=$lt_globsym_save_LIBS
17977+ CFLAGS=$lt_globsym_save_CFLAGS
17978 else
17979 echo "cannot find nm_test_func in $nlist" >&5
17980 fi
17981@@ -6843,6 +7174,16 @@ else
17982 $as_echo "ok" >&6; }
17983 fi
17984
17985+# Response file support.
17986+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
17987+ nm_file_list_spec='@'
17988+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
17989+ nm_file_list_spec='@'
17990+fi
17991+
17992+
17993+
17994+
17995
17996
17997
17998@@ -6864,6 +7205,45 @@ fi
17999
18000
18001
18002+
18003+
18004+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
18005+$as_echo_n "checking for sysroot... " >&6; }
18006+
18007+# Check whether --with-libtool-sysroot was given.
18008+if test "${with_libtool_sysroot+set}" = set; then :
18009+ withval=$with_libtool_sysroot;
18010+else
18011+ with_libtool_sysroot=no
18012+fi
18013+
18014+
18015+lt_sysroot=
18016+case ${with_libtool_sysroot} in #(
18017+ yes)
18018+ if test "$GCC" = yes; then
18019+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
18020+ fi
18021+ ;; #(
18022+ /*)
18023+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
18024+ ;; #(
18025+ no|'')
18026+ ;; #(
18027+ *)
18028+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
18029+$as_echo "${with_libtool_sysroot}" >&6; }
18030+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5
18031+ ;;
18032+esac
18033+
18034+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
18035+$as_echo "${lt_sysroot:-no}" >&6; }
18036+
18037+
18038+
18039+
18040+
18041 # Check whether --enable-libtool-lock was given.
18042 if test "${enable_libtool_lock+set}" = set; then :
18043 enableval=$enable_libtool_lock;
18044@@ -7070,6 +7450,123 @@ esac
18045
18046 need_locks="$enable_libtool_lock"
18047
18048+if test -n "$ac_tool_prefix"; then
18049+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
18050+set dummy ${ac_tool_prefix}mt; ac_word=$2
18051+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18052+$as_echo_n "checking for $ac_word... " >&6; }
18053+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
18054+ $as_echo_n "(cached) " >&6
18055+else
18056+ if test -n "$MANIFEST_TOOL"; then
18057+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
18058+else
18059+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18060+for as_dir in $PATH
18061+do
18062+ IFS=$as_save_IFS
18063+ test -z "$as_dir" && as_dir=.
18064+ for ac_exec_ext in '' $ac_executable_extensions; do
18065+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18066+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
18067+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18068+ break 2
18069+ fi
18070+done
18071+ done
18072+IFS=$as_save_IFS
18073+
18074+fi
18075+fi
18076+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
18077+if test -n "$MANIFEST_TOOL"; then
18078+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
18079+$as_echo "$MANIFEST_TOOL" >&6; }
18080+else
18081+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18082+$as_echo "no" >&6; }
18083+fi
18084+
18085+
18086+fi
18087+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
18088+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
18089+ # Extract the first word of "mt", so it can be a program name with args.
18090+set dummy mt; ac_word=$2
18091+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18092+$as_echo_n "checking for $ac_word... " >&6; }
18093+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
18094+ $as_echo_n "(cached) " >&6
18095+else
18096+ if test -n "$ac_ct_MANIFEST_TOOL"; then
18097+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
18098+else
18099+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18100+for as_dir in $PATH
18101+do
18102+ IFS=$as_save_IFS
18103+ test -z "$as_dir" && as_dir=.
18104+ for ac_exec_ext in '' $ac_executable_extensions; do
18105+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18106+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
18107+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18108+ break 2
18109+ fi
18110+done
18111+ done
18112+IFS=$as_save_IFS
18113+
18114+fi
18115+fi
18116+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
18117+if test -n "$ac_ct_MANIFEST_TOOL"; then
18118+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
18119+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
18120+else
18121+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18122+$as_echo "no" >&6; }
18123+fi
18124+
18125+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
18126+ MANIFEST_TOOL=":"
18127+ else
18128+ case $cross_compiling:$ac_tool_warned in
18129+yes:)
18130+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18131+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18132+ac_tool_warned=yes ;;
18133+esac
18134+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
18135+ fi
18136+else
18137+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
18138+fi
18139+
18140+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
18141+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
18142+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
18143+if test "${lt_cv_path_mainfest_tool+set}" = set; then :
18144+ $as_echo_n "(cached) " >&6
18145+else
18146+ lt_cv_path_mainfest_tool=no
18147+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
18148+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
18149+ cat conftest.err >&5
18150+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
18151+ lt_cv_path_mainfest_tool=yes
18152+ fi
18153+ rm -f conftest*
18154+fi
18155+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
18156+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
18157+if test "x$lt_cv_path_mainfest_tool" != xyes; then
18158+ MANIFEST_TOOL=:
18159+fi
18160+
18161+
18162+
18163+
18164+
18165
18166 case $host_os in
18167 rhapsody* | darwin*)
18168@@ -7633,6 +8130,8 @@ _LT_EOF
18169 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
18170 echo "$AR cru libconftest.a conftest.o" >&5
18171 $AR cru libconftest.a conftest.o 2>&5
18172+ echo "$RANLIB libconftest.a" >&5
18173+ $RANLIB libconftest.a 2>&5
18174 cat > conftest.c << _LT_EOF
18175 int main() { return 0;}
18176 _LT_EOF
18177@@ -7798,7 +8297,8 @@ fi
18178 LIBTOOL_DEPS="$ltmain"
18179
18180 # Always use our own libtool.
18181-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
18182+LIBTOOL='$(SHELL) $(top_builddir)'
18183+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
18184
18185
18186
18187@@ -7887,7 +8387,7 @@ aix3*)
18188 esac
18189
18190 # Global variables:
18191-ofile=libtool
18192+ofile=${host_alias}-libtool
18193 can_build_shared=yes
18194
18195 # All known linkers require a `.a' archive for static linking (except MSVC,
18196@@ -8185,8 +8685,6 @@ fi
18197 lt_prog_compiler_pic=
18198 lt_prog_compiler_static=
18199
18200-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18201-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18202
18203 if test "$GCC" = yes; then
18204 lt_prog_compiler_wl='-Wl,'
18205@@ -8352,6 +8850,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18206 lt_prog_compiler_pic='--shared'
18207 lt_prog_compiler_static='--static'
18208 ;;
18209+ nagfor*)
18210+ # NAG Fortran compiler
18211+ lt_prog_compiler_wl='-Wl,-Wl,,'
18212+ lt_prog_compiler_pic='-PIC'
18213+ lt_prog_compiler_static='-Bstatic'
18214+ ;;
18215 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
18216 # Portland Group compilers (*not* the Pentium gcc compiler,
18217 # which looks to be a dead project)
18218@@ -8414,7 +8918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18219 lt_prog_compiler_pic='-KPIC'
18220 lt_prog_compiler_static='-Bstatic'
18221 case $cc_basename in
18222- f77* | f90* | f95*)
18223+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
18224 lt_prog_compiler_wl='-Qoption ld ';;
18225 *)
18226 lt_prog_compiler_wl='-Wl,';;
18227@@ -8471,13 +8975,17 @@ case $host_os in
18228 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
18229 ;;
18230 esac
18231-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
18232-$as_echo "$lt_prog_compiler_pic" >&6; }
18233-
18234-
18235-
18236-
18237
18238+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
18239+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
18240+if test "${lt_cv_prog_compiler_pic+set}" = set; then :
18241+ $as_echo_n "(cached) " >&6
18242+else
18243+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
18244+fi
18245+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
18246+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
18247+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
18248
18249 #
18250 # Check to make sure the PIC flag actually works.
18251@@ -8538,6 +9046,11 @@ fi
18252
18253
18254
18255+
18256+
18257+
18258+
18259+
18260 #
18261 # Check to make sure the static flag actually works.
18262 #
18263@@ -8888,7 +9401,8 @@ _LT_EOF
18264 allow_undefined_flag=unsupported
18265 always_export_symbols=no
18266 enable_shared_with_static_runtimes=yes
18267- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18268+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
18269+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
18270
18271 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
18272 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18273@@ -8936,7 +9450,7 @@ _LT_EOF
18274 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
18275 && test "$tmp_diet" = no
18276 then
18277- tmp_addflag=
18278+ tmp_addflag=' $pic_flag'
18279 tmp_sharedflag='-shared'
18280 case $cc_basename,$host_cpu in
18281 pgcc*) # Portland Group C compiler
18282@@ -8987,12 +9501,12 @@ _LT_EOF
18283 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
18284 hardcode_libdir_flag_spec=
18285 hardcode_libdir_flag_spec_ld='-rpath $libdir'
18286- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
18287+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
18288 if test "x$supports_anon_versioning" = xyes; then
18289 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
18290 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
18291 echo "local: *; };" >> $output_objdir/$libname.ver~
18292- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18293+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
18294 fi
18295 ;;
18296 esac
18297@@ -9006,8 +9520,8 @@ _LT_EOF
18298 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18299 wlarc=
18300 else
18301- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18302- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18303+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18304+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18305 fi
18306 ;;
18307
18308@@ -9025,8 +9539,8 @@ _LT_EOF
18309
18310 _LT_EOF
18311 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18312- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18313- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18314+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18315+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18316 else
18317 ld_shlibs=no
18318 fi
18319@@ -9072,8 +9586,8 @@ _LT_EOF
18320
18321 *)
18322 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
18323- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18324- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18325+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18326+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
18327 else
18328 ld_shlibs=no
18329 fi
18330@@ -9203,7 +9717,13 @@ _LT_EOF
18331 allow_undefined_flag='-berok'
18332 # Determine the default libpath from the value encoded in an
18333 # empty executable.
18334- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18335+ if test "${lt_cv_aix_libpath+set}" = set; then
18336+ aix_libpath=$lt_cv_aix_libpath
18337+else
18338+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18339+ $as_echo_n "(cached) " >&6
18340+else
18341+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18342 /* end confdefs.h. */
18343
18344 int
18345@@ -9216,22 +9736,29 @@ main ()
18346 _ACEOF
18347 if ac_fn_c_try_link "$LINENO"; then :
18348
18349-lt_aix_libpath_sed='
18350- /Import File Strings/,/^$/ {
18351- /^0/ {
18352- s/^0 *\(.*\)$/\1/
18353- p
18354- }
18355- }'
18356-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18357-# Check for a 64-bit object if we didn't find anything.
18358-if test -z "$aix_libpath"; then
18359- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18360-fi
18361+ lt_aix_libpath_sed='
18362+ /Import File Strings/,/^$/ {
18363+ /^0/ {
18364+ s/^0 *\([^ ]*\) *$/\1/
18365+ p
18366+ }
18367+ }'
18368+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18369+ # Check for a 64-bit object if we didn't find anything.
18370+ if test -z "$lt_cv_aix_libpath_"; then
18371+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18372+ fi
18373 fi
18374 rm -f core conftest.err conftest.$ac_objext \
18375 conftest$ac_exeext conftest.$ac_ext
18376-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18377+ if test -z "$lt_cv_aix_libpath_"; then
18378+ lt_cv_aix_libpath_="/usr/lib:/lib"
18379+ fi
18380+
18381+fi
18382+
18383+ aix_libpath=$lt_cv_aix_libpath_
18384+fi
18385
18386 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18387 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
18388@@ -9243,7 +9770,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18389 else
18390 # Determine the default libpath from the value encoded in an
18391 # empty executable.
18392- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18393+ if test "${lt_cv_aix_libpath+set}" = set; then
18394+ aix_libpath=$lt_cv_aix_libpath
18395+else
18396+ if test "${lt_cv_aix_libpath_+set}" = set; then :
18397+ $as_echo_n "(cached) " >&6
18398+else
18399+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18400 /* end confdefs.h. */
18401
18402 int
18403@@ -9256,22 +9789,29 @@ main ()
18404 _ACEOF
18405 if ac_fn_c_try_link "$LINENO"; then :
18406
18407-lt_aix_libpath_sed='
18408- /Import File Strings/,/^$/ {
18409- /^0/ {
18410- s/^0 *\(.*\)$/\1/
18411- p
18412- }
18413- }'
18414-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18415-# Check for a 64-bit object if we didn't find anything.
18416-if test -z "$aix_libpath"; then
18417- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18418-fi
18419+ lt_aix_libpath_sed='
18420+ /Import File Strings/,/^$/ {
18421+ /^0/ {
18422+ s/^0 *\([^ ]*\) *$/\1/
18423+ p
18424+ }
18425+ }'
18426+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18427+ # Check for a 64-bit object if we didn't find anything.
18428+ if test -z "$lt_cv_aix_libpath_"; then
18429+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18430+ fi
18431 fi
18432 rm -f core conftest.err conftest.$ac_objext \
18433 conftest$ac_exeext conftest.$ac_ext
18434-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18435+ if test -z "$lt_cv_aix_libpath_"; then
18436+ lt_cv_aix_libpath_="/usr/lib:/lib"
18437+ fi
18438+
18439+fi
18440+
18441+ aix_libpath=$lt_cv_aix_libpath_
18442+fi
18443
18444 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
18445 # Warning - without using the other run time loading flags,
18446@@ -9316,20 +9856,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18447 # Microsoft Visual C++.
18448 # hardcode_libdir_flag_spec is actually meaningless, as there is
18449 # no search path for DLLs.
18450- hardcode_libdir_flag_spec=' '
18451- allow_undefined_flag=unsupported
18452- # Tell ltmain to make .lib files, not .a files.
18453- libext=lib
18454- # Tell ltmain to make .dll files, not .so files.
18455- shrext_cmds=".dll"
18456- # FIXME: Setting linknames here is a bad hack.
18457- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18458- # The linker will automatically build a .lib file if we build a DLL.
18459- old_archive_from_new_cmds='true'
18460- # FIXME: Should let the user specify the lib program.
18461- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18462- fix_srcfile_path='`cygpath -w "$srcfile"`'
18463- enable_shared_with_static_runtimes=yes
18464+ case $cc_basename in
18465+ cl*)
18466+ # Native MSVC
18467+ hardcode_libdir_flag_spec=' '
18468+ allow_undefined_flag=unsupported
18469+ always_export_symbols=yes
18470+ file_list_spec='@'
18471+ # Tell ltmain to make .lib files, not .a files.
18472+ libext=lib
18473+ # Tell ltmain to make .dll files, not .so files.
18474+ shrext_cmds=".dll"
18475+ # FIXME: Setting linknames here is a bad hack.
18476+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
18477+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
18478+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
18479+ else
18480+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
18481+ fi~
18482+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
18483+ linknames='
18484+ # The linker will not automatically build a static lib if we build a DLL.
18485+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
18486+ enable_shared_with_static_runtimes=yes
18487+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18488+ # Don't use ranlib
18489+ old_postinstall_cmds='chmod 644 $oldlib'
18490+ postlink_cmds='lt_outputfile="@OUTPUT@"~
18491+ lt_tool_outputfile="@TOOL_OUTPUT@"~
18492+ case $lt_outputfile in
18493+ *.exe|*.EXE) ;;
18494+ *)
18495+ lt_outputfile="$lt_outputfile.exe"
18496+ lt_tool_outputfile="$lt_tool_outputfile.exe"
18497+ ;;
18498+ esac~
18499+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
18500+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
18501+ $RM "$lt_outputfile.manifest";
18502+ fi'
18503+ ;;
18504+ *)
18505+ # Assume MSVC wrapper
18506+ hardcode_libdir_flag_spec=' '
18507+ allow_undefined_flag=unsupported
18508+ # Tell ltmain to make .lib files, not .a files.
18509+ libext=lib
18510+ # Tell ltmain to make .dll files, not .so files.
18511+ shrext_cmds=".dll"
18512+ # FIXME: Setting linknames here is a bad hack.
18513+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
18514+ # The linker will automatically build a .lib file if we build a DLL.
18515+ old_archive_from_new_cmds='true'
18516+ # FIXME: Should let the user specify the lib program.
18517+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
18518+ enable_shared_with_static_runtimes=yes
18519+ ;;
18520+ esac
18521 ;;
18522
18523 darwin* | rhapsody*)
18524@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18525
18526 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18527 freebsd* | dragonfly*)
18528- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
18529+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18530 hardcode_libdir_flag_spec='-R$libdir'
18531 hardcode_direct=yes
18532 hardcode_shlibpath_var=no
18533@@ -9398,7 +9981,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18534
18535 hpux9*)
18536 if test "$GCC" = yes; then
18537- archive_cmds='$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'
18538+ archive_cmds='$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'
18539 else
18540 archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
18541 fi
18542@@ -9414,7 +9997,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18543
18544 hpux10*)
18545 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
18546- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18547+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18548 else
18549 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
18550 fi
18551@@ -9438,10 +10021,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18552 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18553 ;;
18554 ia64*)
18555- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18556+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
18557 ;;
18558 *)
18559- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18560+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
18561 ;;
18562 esac
18563 else
18564@@ -9520,23 +10103,36 @@ fi
18565
18566 irix5* | irix6* | nonstopux*)
18567 if test "$GCC" = yes; then
18568- archive_cmds='$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'
18569+ archive_cmds='$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'
18570 # Try to use the -exported_symbol ld option, if it does not
18571 # work, assume that -exports_file does not work either and
18572 # implicitly export all symbols.
18573- save_LDFLAGS="$LDFLAGS"
18574- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18575- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18576+ # This should be the same for all languages, so no per-tag cache variable.
18577+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
18578+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
18579+if test "${lt_cv_irix_exported_symbol+set}" = set; then :
18580+ $as_echo_n "(cached) " >&6
18581+else
18582+ save_LDFLAGS="$LDFLAGS"
18583+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
18584+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18585 /* end confdefs.h. */
18586-int foo(void) {}
18587+int foo (void) { return 0; }
18588 _ACEOF
18589 if ac_fn_c_try_link "$LINENO"; then :
18590- archive_expsym_cmds='$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'
18591-
18592+ lt_cv_irix_exported_symbol=yes
18593+else
18594+ lt_cv_irix_exported_symbol=no
18595 fi
18596 rm -f core conftest.err conftest.$ac_objext \
18597 conftest$ac_exeext conftest.$ac_ext
18598- LDFLAGS="$save_LDFLAGS"
18599+ LDFLAGS="$save_LDFLAGS"
18600+fi
18601+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
18602+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
18603+ if test "$lt_cv_irix_exported_symbol" = yes; then
18604+ archive_expsym_cmds='$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'
18605+ fi
18606 else
18607 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
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'
18609@@ -9621,7 +10217,7 @@ rm -f core conftest.err conftest.$ac_objext \
18610 osf4* | osf5*) # as osf3* with the addition of -msym flag
18611 if test "$GCC" = yes; then
18612 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
18613- archive_cmds='$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'
18614+ archive_cmds='$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'
18615 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
18616 else
18617 allow_undefined_flag=' -expect_unresolved \*'
18618@@ -9640,9 +10236,9 @@ rm -f core conftest.err conftest.$ac_objext \
18619 no_undefined_flag=' -z defs'
18620 if test "$GCC" = yes; then
18621 wlarc='${wl}'
18622- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18623+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
18624 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
18625- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
18626+ $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'
18627 else
18628 case `$CC -V 2>&1` in
18629 *"Compilers 5.0"*)
18630@@ -10218,8 +10814,9 @@ cygwin* | mingw* | pw32* | cegcc*)
18631 need_version=no
18632 need_lib_prefix=no
18633
18634- case $GCC,$host_os in
18635- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
18636+ case $GCC,$cc_basename in
18637+ yes,*)
18638+ # gcc
18639 library_names_spec='$libname.dll.a'
18640 # DLL is installed to $(libdir)/../bin by postinstall_cmds
18641 postinstall_cmds='base_file=`basename \${file}`~
18642@@ -10252,13 +10849,71 @@ cygwin* | mingw* | pw32* | cegcc*)
18643 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18644 ;;
18645 esac
18646+ dynamic_linker='Win32 ld.exe'
18647+ ;;
18648+
18649+ *,cl*)
18650+ # Native MSVC
18651+ libname_spec='$name'
18652+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
18653+ library_names_spec='${libname}.dll.lib'
18654+
18655+ case $build_os in
18656+ mingw*)
18657+ sys_lib_search_path_spec=
18658+ lt_save_ifs=$IFS
18659+ IFS=';'
18660+ for lt_path in $LIB
18661+ do
18662+ IFS=$lt_save_ifs
18663+ # Let DOS variable expansion print the short 8.3 style file name.
18664+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
18665+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
18666+ done
18667+ IFS=$lt_save_ifs
18668+ # Convert to MSYS style.
18669+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
18670+ ;;
18671+ cygwin*)
18672+ # Convert to unix form, then to dos form, then back to unix form
18673+ # but this time dos style (no spaces!) so that the unix form looks
18674+ # like /cygdrive/c/PROGRA~1:/cygdr...
18675+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
18676+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
18677+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18678+ ;;
18679+ *)
18680+ sys_lib_search_path_spec="$LIB"
18681+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
18682+ # It is most probably a Windows format PATH.
18683+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18684+ else
18685+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18686+ fi
18687+ # FIXME: find the short name or the path components, as spaces are
18688+ # common. (e.g. "Program Files" -> "PROGRA~1")
18689+ ;;
18690+ esac
18691+
18692+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
18693+ postinstall_cmds='base_file=`basename \${file}`~
18694+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
18695+ dldir=$destdir/`dirname \$dlpath`~
18696+ test -d \$dldir || mkdir -p \$dldir~
18697+ $install_prog $dir/$dlname \$dldir/$dlname'
18698+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
18699+ dlpath=$dir/\$dldll~
18700+ $RM \$dlpath'
18701+ shlibpath_overrides_runpath=yes
18702+ dynamic_linker='Win32 link.exe'
18703 ;;
18704
18705 *)
18706+ # Assume MSVC wrapper
18707 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
18708+ dynamic_linker='Win32 ld.exe'
18709 ;;
18710 esac
18711- dynamic_linker='Win32 ld.exe'
18712 # FIXME: first we should search . and the directory the executable is in
18713 shlibpath_var=PATH
18714 ;;
18715@@ -10350,7 +11005,7 @@ haiku*)
18716 soname_spec='${libname}${release}${shared_ext}$major'
18717 shlibpath_var=LIBRARY_PATH
18718 shlibpath_overrides_runpath=yes
18719- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
18720+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
18721 hardcode_into_libs=yes
18722 ;;
18723
18724@@ -11190,10 +11845,10 @@ else
18725 /* When -fvisbility=hidden is used, assume the code has been annotated
18726 correspondingly for the symbols needed. */
18727 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18728-void fnord () __attribute__((visibility("default")));
18729+int fnord () __attribute__((visibility("default")));
18730 #endif
18731
18732-void fnord () { int i=42; }
18733+int fnord () { return 42; }
18734 int main ()
18735 {
18736 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18737@@ -11296,10 +11951,10 @@ else
18738 /* When -fvisbility=hidden is used, assume the code has been annotated
18739 correspondingly for the symbols needed. */
18740 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
18741-void fnord () __attribute__((visibility("default")));
18742+int fnord () __attribute__((visibility("default")));
18743 #endif
18744
18745-void fnord () { int i=42; }
18746+int fnord () { return 42; }
18747 int main ()
18748 {
18749 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
18750@@ -12450,7 +13105,7 @@ if test "$enable_shared" = "yes"; then
18751 # since libbfd may not pull in the entirety of libiberty.
18752 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
18753 if test -n "$x"; then
18754- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
18755+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
18756 fi
18757
18758 case "${host}" in
18759@@ -13422,13 +14077,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
18760 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
18761 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
18762 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
18763+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
18764+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
18765 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
18766 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
18767 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
18768 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
18769 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
18770+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
18771+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
18772+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
18773+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
18774 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
18775 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
18776+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
18777 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
18778 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
18779 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
18780@@ -13443,14 +14105,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
18781 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $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"`'
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"`'
18784+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
18785+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
18786 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
18787 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
18788 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
18789-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18790 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
18791+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
18792 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
18793 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
18794 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
18795+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
18796 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
18797 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
18798 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
18799@@ -13483,12 +14148,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
18800 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
18801 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
18802 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
18803-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
18804 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
18805 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
18806 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
18807 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
18808 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
18809+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
18810 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
18811 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
18812 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
18813@@ -13543,8 +14208,13 @@ reload_flag \
18814 OBJDUMP \
18815 deplibs_check_method \
18816 file_magic_cmd \
18817+file_magic_glob \
18818+want_nocaseglob \
18819+DLLTOOL \
18820+sharedlib_from_linklib_cmd \
18821 AR \
18822 AR_FLAGS \
18823+archiver_list_spec \
18824 STRIP \
18825 RANLIB \
18826 CC \
18827@@ -13554,12 +14224,14 @@ lt_cv_sys_global_symbol_pipe \
18828 lt_cv_sys_global_symbol_to_cdecl \
18829 lt_cv_sys_global_symbol_to_c_name_address \
18830 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
18831+nm_file_list_spec \
18832 lt_prog_compiler_no_builtin_flag \
18833-lt_prog_compiler_wl \
18834 lt_prog_compiler_pic \
18835+lt_prog_compiler_wl \
18836 lt_prog_compiler_static \
18837 lt_cv_prog_compiler_c_o \
18838 need_locks \
18839+MANIFEST_TOOL \
18840 DSYMUTIL \
18841 NMEDIT \
18842 LIPO \
18843@@ -13575,7 +14247,6 @@ no_undefined_flag \
18844 hardcode_libdir_flag_spec \
18845 hardcode_libdir_flag_spec_ld \
18846 hardcode_libdir_separator \
18847-fix_srcfile_path \
18848 exclude_expsyms \
18849 include_expsyms \
18850 file_list_spec \
18851@@ -13611,6 +14282,7 @@ module_cmds \
18852 module_expsym_cmds \
18853 export_symbols_cmds \
18854 prelink_cmds \
18855+postlink_cmds \
18856 postinstall_cmds \
18857 postuninstall_cmds \
18858 finish_cmds \
18859@@ -14367,7 +15039,8 @@ $as_echo X"$file" |
18860 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18861 #
18862 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
18863-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
18864+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
18865+# Inc.
18866 # Written by Gordon Matzigkeit, 1996
18867 #
18868 # This file is part of GNU Libtool.
18869@@ -14470,19 +15143,42 @@ SP2NL=$lt_lt_SP2NL
18870 # turn newlines into spaces.
18871 NL2SP=$lt_lt_NL2SP
18872
18873+# convert \$build file names to \$host format.
18874+to_host_file_cmd=$lt_cv_to_host_file_cmd
18875+
18876+# convert \$build files to toolchain format.
18877+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
18878+
18879 # An object symbol dumper.
18880 OBJDUMP=$lt_OBJDUMP
18881
18882 # Method to check whether dependent libraries are shared objects.
18883 deplibs_check_method=$lt_deplibs_check_method
18884
18885-# Command to use when deplibs_check_method == "file_magic".
18886+# Command to use when deplibs_check_method = "file_magic".
18887 file_magic_cmd=$lt_file_magic_cmd
18888
18889+# How to find potential files when deplibs_check_method = "file_magic".
18890+file_magic_glob=$lt_file_magic_glob
18891+
18892+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
18893+want_nocaseglob=$lt_want_nocaseglob
18894+
18895+# DLL creation program.
18896+DLLTOOL=$lt_DLLTOOL
18897+
18898+# Command to associate shared and link libraries.
18899+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
18900+
18901 # The archiver.
18902 AR=$lt_AR
18903+
18904+# Flags to create an archive.
18905 AR_FLAGS=$lt_AR_FLAGS
18906
18907+# How to feed a file listing to the archiver.
18908+archiver_list_spec=$lt_archiver_list_spec
18909+
18910 # A symbol stripping program.
18911 STRIP=$lt_STRIP
18912
18913@@ -14512,6 +15208,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
18914 # Transform the output of nm in a C name address pair when lib prefix is needed.
18915 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
18916
18917+# Specify filename containing input files for \$NM.
18918+nm_file_list_spec=$lt_nm_file_list_spec
18919+
18920+# The root where to search for dependent libraries,and in which our libraries should be installed.
18921+lt_sysroot=$lt_sysroot
18922+
18923 # The name of the directory that contains temporary libtool files.
18924 objdir=$objdir
18925
18926@@ -14521,6 +15223,9 @@ MAGIC_CMD=$MAGIC_CMD
18927 # Must we lock files when doing compilation?
18928 need_locks=$lt_need_locks
18929
18930+# Manifest tool.
18931+MANIFEST_TOOL=$lt_MANIFEST_TOOL
18932+
18933 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
18934 DSYMUTIL=$lt_DSYMUTIL
18935
18936@@ -14635,12 +15340,12 @@ with_gcc=$GCC
18937 # Compiler flag to turn off builtin functions.
18938 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
18939
18940-# How to pass a linker flag through the compiler.
18941-wl=$lt_lt_prog_compiler_wl
18942-
18943 # Additional compiler flags for building library objects.
18944 pic_flag=$lt_lt_prog_compiler_pic
18945
18946+# How to pass a linker flag through the compiler.
18947+wl=$lt_lt_prog_compiler_wl
18948+
18949 # Compiler flag to prevent dynamic linking.
18950 link_static_flag=$lt_lt_prog_compiler_static
18951
18952@@ -14727,9 +15432,6 @@ inherit_rpath=$inherit_rpath
18953 # Whether libtool must link a program against all its dependency libraries.
18954 link_all_deplibs=$link_all_deplibs
18955
18956-# Fix the shell variable \$srcfile for the compiler.
18957-fix_srcfile_path=$lt_fix_srcfile_path
18958-
18959 # Set to "yes" if exported symbols are required.
18960 always_export_symbols=$always_export_symbols
18961
18962@@ -14745,6 +15447,9 @@ include_expsyms=$lt_include_expsyms
18963 # Commands necessary for linking programs (against libraries) with templates.
18964 prelink_cmds=$lt_prelink_cmds
18965
18966+# Commands necessary for finishing linking programs.
18967+postlink_cmds=$lt_postlink_cmds
18968+
18969 # Specify filename containing input files.
18970 file_list_spec=$lt_file_list_spec
18971
18972@@ -14777,210 +15482,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
18973 # if finds mixed CR/LF and LF-only lines. Since sed operates in
18974 # text mode, it properly converts lines to CR/LF. This bash problem
18975 # is reportedly fixed, but why not run on old versions too?
18976- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
18977- || (rm -f "$cfgfile"; exit 1)
18978-
18979- case $xsi_shell in
18980- yes)
18981- cat << \_LT_EOF >> "$cfgfile"
18982-
18983-# func_dirname file append nondir_replacement
18984-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
18985-# otherwise set result to NONDIR_REPLACEMENT.
18986-func_dirname ()
18987-{
18988- case ${1} in
18989- */*) func_dirname_result="${1%/*}${2}" ;;
18990- * ) func_dirname_result="${3}" ;;
18991- esac
18992-}
18993-
18994-# func_basename file
18995-func_basename ()
18996-{
18997- func_basename_result="${1##*/}"
18998-}
18999-
19000-# func_dirname_and_basename file append nondir_replacement
19001-# perform func_basename and func_dirname in a single function
19002-# call:
19003-# dirname: Compute the dirname of FILE. If nonempty,
19004-# add APPEND to the result, otherwise set result
19005-# to NONDIR_REPLACEMENT.
19006-# value returned in "$func_dirname_result"
19007-# basename: Compute filename of FILE.
19008-# value retuned in "$func_basename_result"
19009-# Implementation must be kept synchronized with func_dirname
19010-# and func_basename. For efficiency, we do not delegate to
19011-# those functions but instead duplicate the functionality here.
19012-func_dirname_and_basename ()
19013-{
19014- case ${1} in
19015- */*) func_dirname_result="${1%/*}${2}" ;;
19016- * ) func_dirname_result="${3}" ;;
19017- esac
19018- func_basename_result="${1##*/}"
19019-}
19020-
19021-# func_stripname prefix suffix name
19022-# strip PREFIX and SUFFIX off of NAME.
19023-# PREFIX and SUFFIX must not contain globbing or regex special
19024-# characters, hashes, percent signs, but SUFFIX may contain a leading
19025-# dot (in which case that matches only a dot).
19026-func_stripname ()
19027-{
19028- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
19029- # positional parameters, so assign one to ordinary parameter first.
19030- func_stripname_result=${3}
19031- func_stripname_result=${func_stripname_result#"${1}"}
19032- func_stripname_result=${func_stripname_result%"${2}"}
19033-}
19034-
19035-# func_opt_split
19036-func_opt_split ()
19037-{
19038- func_opt_split_opt=${1%%=*}
19039- func_opt_split_arg=${1#*=}
19040-}
19041-
19042-# func_lo2o object
19043-func_lo2o ()
19044-{
19045- case ${1} in
19046- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
19047- *) func_lo2o_result=${1} ;;
19048- esac
19049-}
19050-
19051-# func_xform libobj-or-source
19052-func_xform ()
19053-{
19054- func_xform_result=${1%.*}.lo
19055-}
19056-
19057-# func_arith arithmetic-term...
19058-func_arith ()
19059-{
19060- func_arith_result=$(( $* ))
19061-}
19062-
19063-# func_len string
19064-# STRING may not start with a hyphen.
19065-func_len ()
19066-{
19067- func_len_result=${#1}
19068-}
19069-
19070-_LT_EOF
19071- ;;
19072- *) # Bourne compatible functions.
19073- cat << \_LT_EOF >> "$cfgfile"
19074-
19075-# func_dirname file append nondir_replacement
19076-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
19077-# otherwise set result to NONDIR_REPLACEMENT.
19078-func_dirname ()
19079-{
19080- # Extract subdirectory from the argument.
19081- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
19082- if test "X$func_dirname_result" = "X${1}"; then
19083- func_dirname_result="${3}"
19084- else
19085- func_dirname_result="$func_dirname_result${2}"
19086- fi
19087-}
19088-
19089-# func_basename file
19090-func_basename ()
19091-{
19092- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
19093-}
19094-
19095-
19096-# func_stripname prefix suffix name
19097-# strip PREFIX and SUFFIX off of NAME.
19098-# PREFIX and SUFFIX must not contain globbing or regex special
19099-# characters, hashes, percent signs, but SUFFIX may contain a leading
19100-# dot (in which case that matches only a dot).
19101-# func_strip_suffix prefix name
19102-func_stripname ()
19103-{
19104- case ${2} in
19105- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
19106- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
19107- esac
19108-}
19109-
19110-# sed scripts:
19111-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
19112-my_sed_long_arg='1s/^-[^=]*=//'
19113-
19114-# func_opt_split
19115-func_opt_split ()
19116-{
19117- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
19118- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
19119-}
19120-
19121-# func_lo2o object
19122-func_lo2o ()
19123-{
19124- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
19125-}
19126-
19127-# func_xform libobj-or-source
19128-func_xform ()
19129-{
19130- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
19131-}
19132-
19133-# func_arith arithmetic-term...
19134-func_arith ()
19135-{
19136- func_arith_result=`expr "$@"`
19137-}
19138-
19139-# func_len string
19140-# STRING may not start with a hyphen.
19141-func_len ()
19142-{
19143- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
19144-}
19145-
19146-_LT_EOF
19147-esac
19148-
19149-case $lt_shell_append in
19150- yes)
19151- cat << \_LT_EOF >> "$cfgfile"
19152-
19153-# func_append var value
19154-# Append VALUE to the end of shell variable VAR.
19155-func_append ()
19156-{
19157- eval "$1+=\$2"
19158-}
19159-_LT_EOF
19160- ;;
19161- *)
19162- cat << \_LT_EOF >> "$cfgfile"
19163-
19164-# func_append var value
19165-# Append VALUE to the end of shell variable VAR.
19166-func_append ()
19167-{
19168- eval "$1=\$$1\$2"
19169-}
19170-
19171-_LT_EOF
19172- ;;
19173- esac
19174-
19175-
19176- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
19177- || (rm -f "$cfgfile"; exit 1)
19178-
19179- mv -f "$cfgfile" "$ofile" ||
19180+ sed '$q' "$ltmain" >> "$cfgfile" \
19181+ || (rm -f "$cfgfile"; exit 1)
19182+
19183+ if test x"$xsi_shell" = xyes; then
19184+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
19185+func_dirname ()\
19186+{\
19187+\ case ${1} in\
19188+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19189+\ * ) func_dirname_result="${3}" ;;\
19190+\ esac\
19191+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
19192+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19193+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19194+test 0 -eq $? || _lt_function_replace_fail=:
19195+
19196+
19197+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
19198+func_basename ()\
19199+{\
19200+\ func_basename_result="${1##*/}"\
19201+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
19202+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19203+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19204+test 0 -eq $? || _lt_function_replace_fail=:
19205+
19206+
19207+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
19208+func_dirname_and_basename ()\
19209+{\
19210+\ case ${1} in\
19211+\ */*) func_dirname_result="${1%/*}${2}" ;;\
19212+\ * ) func_dirname_result="${3}" ;;\
19213+\ esac\
19214+\ func_basename_result="${1##*/}"\
19215+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
19216+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19217+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19218+test 0 -eq $? || _lt_function_replace_fail=:
19219+
19220+
19221+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
19222+func_stripname ()\
19223+{\
19224+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
19225+\ # positional parameters, so assign one to ordinary parameter first.\
19226+\ func_stripname_result=${3}\
19227+\ func_stripname_result=${func_stripname_result#"${1}"}\
19228+\ func_stripname_result=${func_stripname_result%"${2}"}\
19229+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
19230+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19231+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19232+test 0 -eq $? || _lt_function_replace_fail=:
19233+
19234+
19235+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
19236+func_split_long_opt ()\
19237+{\
19238+\ func_split_long_opt_name=${1%%=*}\
19239+\ func_split_long_opt_arg=${1#*=}\
19240+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
19241+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19242+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19243+test 0 -eq $? || _lt_function_replace_fail=:
19244+
19245+
19246+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
19247+func_split_short_opt ()\
19248+{\
19249+\ func_split_short_opt_arg=${1#??}\
19250+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
19251+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
19252+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19253+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19254+test 0 -eq $? || _lt_function_replace_fail=:
19255+
19256+
19257+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
19258+func_lo2o ()\
19259+{\
19260+\ case ${1} in\
19261+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
19262+\ *) func_lo2o_result=${1} ;;\
19263+\ esac\
19264+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
19265+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19266+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19267+test 0 -eq $? || _lt_function_replace_fail=:
19268+
19269+
19270+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
19271+func_xform ()\
19272+{\
19273+ func_xform_result=${1%.*}.lo\
19274+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
19275+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19276+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19277+test 0 -eq $? || _lt_function_replace_fail=:
19278+
19279+
19280+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
19281+func_arith ()\
19282+{\
19283+ func_arith_result=$(( $* ))\
19284+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
19285+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19286+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19287+test 0 -eq $? || _lt_function_replace_fail=:
19288+
19289+
19290+ sed -e '/^func_len ()$/,/^} # func_len /c\
19291+func_len ()\
19292+{\
19293+ func_len_result=${#1}\
19294+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
19295+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19296+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19297+test 0 -eq $? || _lt_function_replace_fail=:
19298+
19299+fi
19300+
19301+if test x"$lt_shell_append" = xyes; then
19302+ sed -e '/^func_append ()$/,/^} # func_append /c\
19303+func_append ()\
19304+{\
19305+ eval "${1}+=\\${2}"\
19306+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
19307+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19308+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19309+test 0 -eq $? || _lt_function_replace_fail=:
19310+
19311+
19312+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
19313+func_append_quoted ()\
19314+{\
19315+\ func_quote_for_eval "${2}"\
19316+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
19317+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
19318+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19319+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19320+test 0 -eq $? || _lt_function_replace_fail=:
19321+
19322+
19323+ # Save a `func_append' function call where possible by direct use of '+='
19324+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
19325+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19326+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19327+ test 0 -eq $? || _lt_function_replace_fail=:
19328+else
19329+ # Save a `func_append' function call even when '+=' is not available
19330+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
19331+ && mv -f "$cfgfile.tmp" "$cfgfile" \
19332+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
19333+ test 0 -eq $? || _lt_function_replace_fail=:
19334+fi
19335+
19336+if test x"$_lt_function_replace_fail" = x":"; then
19337+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
19338+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
19339+fi
19340+
19341+
19342+ mv -f "$cfgfile" "$ofile" ||
19343 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
19344 chmod +x "$ofile"
19345
19346diff --git a/opcodes/configure.ac b/opcodes/configure.ac
19347index b93e855..43ba976 100644
19348--- a/opcodes/configure.ac
19349+++ b/opcodes/configure.ac
19350@@ -167,7 +167,7 @@ changequote(,)dnl
19351 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
19352 changequote([,])dnl
19353 if test -n "$x"; then
19354- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
19355+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
19356 fi
19357
19358 case "${host}" in
19359--
193602.1.4
19361
diff --git a/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
deleted file mode 100644
index a037634..0000000
--- a/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
+++ /dev/null
@@ -1,35 +0,0 @@
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/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
deleted file mode 100644
index 0ae68fc..0000000
--- a/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
+++ /dev/null
@@ -1,35 +0,0 @@
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/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch b/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
deleted file mode 100644
index f800796..0000000
--- a/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
+++ /dev/null
@@ -1,278 +0,0 @@
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]
6
7Patch originally created by Mark Hatle, forward-ported to
8binutils 2.21 by Scott Garman.
9
10purpose: warn for uses of system directories when cross linking
11
12Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
13
142008-07-02 Joseph Myers <joseph@codesourcery.com>
15
16 ld/
17 * ld.h (args_type): Add error_poison_system_directories.
18 * ld.texinfo (--error-poison-system-directories): Document.
19 * ldfile.c (ldfile_add_library_path): Check
20 command_line.error_poison_system_directories.
21 * ldmain.c (main): Initialize
22 command_line.error_poison_system_directories.
23 * lexsup.c (enum option_values): Add
24 OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
25 (ld_options): Add --error-poison-system-directories.
26 (parse_args): Handle new option.
27
282007-06-13 Joseph Myers <joseph@codesourcery.com>
29
30 ld/
31 * config.in: Regenerate.
32 * ld.h (args_type): Add poison_system_directories.
33 * ld.texinfo (--no-poison-system-directories): Document.
34 * ldfile.c (ldfile_add_library_path): Check
35 command_line.poison_system_directories.
36 * ldmain.c (main): Initialize
37 command_line.poison_system_directories.
38 * lexsup.c (enum option_values): Add
39 OPTION_NO_POISON_SYSTEM_DIRECTORIES.
40 (ld_options): Add --no-poison-system-directories.
41 (parse_args): Handle new option.
42
432007-04-20 Joseph Myers <joseph@codesourcery.com>
44
45 Merge from Sourcery G++ binutils 2.17:
46
47 2007-03-20 Joseph Myers <joseph@codesourcery.com>
48 Based on patch by Mark Hatle <mark.hatle@windriver.com>.
49 ld/
50 * configure.in (--enable-poison-system-directories): New option.
51 * configure, config.in: Regenerate.
52 * ldfile.c (ldfile_add_library_path): If
53 ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
54 /usr/lib, /usr/local/lib or /usr/X11R6/lib.
55
56Signed-off-by: Mark Hatle <mark.hatle@windriver.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(+)
70
71diff --git a/ld/config.in b/ld/config.in
72index 2ab4844..766d23c 100644
73--- a/ld/config.in
74+++ b/ld/config.in
75@@ -11,6 +11,9 @@
76 language is requested. */
77 #undef ENABLE_NLS
78
79+/* Define to warn for use of native system library directories */
80+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
81+
82 /* Additional extension a shared object might have. */
83 #undef EXTRA_SHLIB_EXTENSION
84
85diff --git a/ld/configure b/ld/configure
86index 2fbaebf..5726a08 100755
87--- a/ld/configure
88+++ b/ld/configure
89@@ -787,6 +787,7 @@ with_lib_path
90 enable_targets
91 enable_64_bit_bfd
92 with_sysroot
93+enable_poison_system_directories
94 enable_gold
95 enable_got
96 enable_werror
97@@ -1443,6 +1444,8 @@ Optional Features:
98 --disable-largefile omit support for large files
99 --enable-targets alternative target configurations
100 --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
101+ --enable-poison-system-directories
102+ warn for use of native system library directories
103 --enable-gold[=ARG] build gold [ARG={default,yes,no}]
104 --enable-got=<type> GOT handling scheme (target, single, negative,
105 multigot)
106@@ -16323,7 +16326,18 @@ else
107 fi
108
109
110+# Check whether --enable-poison-system-directories was given.
111+if test "${enable_poison_system_directories+set}" = set; then :
112+ enableval=$enable_poison_system_directories;
113+else
114+ enable_poison_system_directories=no
115+fi
116+
117+if test "x${enable_poison_system_directories}" = "xyes"; then
118
119+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
120+
121+fi
122
123 # Check whether --enable-got was given.
124 if test "${enable_got+set}" = set; then :
125diff --git a/ld/configure.ac b/ld/configure.ac
126index 1bddfc9..e9edb7f 100644
127--- a/ld/configure.ac
128+++ b/ld/configure.ac
129@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
130 AC_SUBST(TARGET_SYSTEM_ROOT)
131 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
132
133+AC_ARG_ENABLE([poison-system-directories],
134+ AS_HELP_STRING([--enable-poison-system-directories],
135+ [warn for use of native system library directories]),,
136+ [enable_poison_system_directories=no])
137+if test "x${enable_poison_system_directories}" = "xyes"; then
138+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
139+ [1],
140+ [Define to warn for use of native system library directories])
141+fi
142+
143 dnl Use --enable-gold to decide if this linker should be the default.
144 dnl "install_as_default" is set to false if gold is the default linker.
145 dnl "installed_linker" is the installed BFD linker name.
146diff --git a/ld/ld.h b/ld/ld.h
147index f773ce7..adba0f6 100644
148--- a/ld/ld.h
149+++ b/ld/ld.h
150@@ -161,6 +161,14 @@ typedef struct {
151 /* If TRUE we'll just print the default output on stdout. */
152 bfd_boolean print_output_format;
153
154+ /* If TRUE (the default) warn for uses of system directories when
155+ cross linking. */
156+ bfd_boolean poison_system_directories;
157+
158+ /* If TRUE (default FALSE) give an error for uses of system
159+ directories when cross linking instead of a warning. */
160+ bfd_boolean error_poison_system_directories;
161+
162 /* Big or little endian as set on command line. */
163 enum endian_enum endian;
164
165diff --git a/ld/ld.texinfo b/ld/ld.texinfo
166index 502582c..dae168a 100644
167--- a/ld/ld.texinfo
168+++ b/ld/ld.texinfo
169@@ -2212,6 +2212,18 @@ string identifying the original linked file does not change.
170
171 Passing @code{none} for @var{style} disables the setting from any
172 @code{--build-id} options earlier on the command line.
173+
174+@kindex --no-poison-system-directories
175+@item --no-poison-system-directories
176+Do not warn for @option{-L} options using system directories such as
177+@file{/usr/lib} when cross linking. This option is intended for use
178+in chroot environments when such directories contain the correct
179+libraries for the target system rather than the host.
180+
181+@kindex --error-poison-system-directories
182+@item --error-poison-system-directories
183+Give an error instead of a warning for @option{-L} options using
184+system directories when cross linking.
185 @end table
186
187 @c man end
188diff --git a/ld/ldfile.c b/ld/ldfile.c
189index 782ed7f..19a9ab4 100644
190--- a/ld/ldfile.c
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
246@@ -513,6 +513,14 @@ static const struct ld_option ld_options[] =
247 { {"pop-state", no_argument, NULL, OPTION_POP_STATE},
248 '\0', NULL, N_("Pop state of flags governing input file handling"),
249 TWO_DASHES },
250+ { {"no-poison-system-directories", no_argument, NULL,
251+ OPTION_NO_POISON_SYSTEM_DIRECTORIES},
252+ '\0', NULL, N_("Do not warn for -L options using system directories"),
253+ TWO_DASHES },
254+ { {"error-poison-system-directories", no_argument, NULL,
255+ + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
256+ '\0', NULL, N_("Give an error for -L options using system directories"),
257+ TWO_DASHES },
258 };
259
260 #define OPTION_COUNT ARRAY_SIZE (ld_options)
261@@ -1474,6 +1482,14 @@ parse_args (unsigned argc, char **argv)
262 free (oldp);
263 }
264 break;
265+
266+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
267+ command_line.poison_system_directories = FALSE;
268+ break;
269+
270+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
271+ command_line.error_poison_system_directories = TRUE;
272+ break;
273 }
274 }
275
276--
2772.1.4
278
diff --git a/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
deleted file mode 100644
index 5451e74..0000000
--- a/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
+++ /dev/null
@@ -1,52 +0,0 @@
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
5
6Enabling sysroot support in libtool exposed a bug where the final
7library had an RPATH encoded into it which still pointed to the
8sysroot. This works around the issue until it gets sorted out
9upstream.
10
11Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org>
12
13Upstream-Status: Inappropriate [embedded specific]
14
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(-)
20
21diff --git a/ltmain.sh b/ltmain.sh
22index 70e856e..11ee684 100644
23--- a/ltmain.sh
24+++ b/ltmain.sh
25@@ -8035,9 +8035,11 @@ EOF
26 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
27 for libdir in $rpath; do
28 if test -n "$hardcode_libdir_flag_spec"; then
29+ func_replace_sysroot "$libdir"
30+ libdir=$func_replace_sysroot_result
31+ func_stripname '=' '' "$libdir"
32+ libdir=$func_stripname_result
33 if test -n "$hardcode_libdir_separator"; then
34- func_replace_sysroot "$libdir"
35- libdir=$func_replace_sysroot_result
36 if test -z "$hardcode_libdirs"; then
37 hardcode_libdirs="$libdir"
38 else
39@@ -8770,6 +8772,10 @@ EOF
40 hardcode_libdirs=
41 for libdir in $compile_rpath $finalize_rpath; do
42 if test -n "$hardcode_libdir_flag_spec"; then
43+ func_replace_sysroot "$libdir"
44+ libdir=$func_replace_sysroot_result
45+ func_stripname '=' '' "$libdir"
46+ libdir=$func_stripname_result
47 if test -n "$hardcode_libdir_separator"; then
48 if test -z "$hardcode_libdirs"; then
49 hardcode_libdirs="$libdir"
50--
512.1.4
52
diff --git a/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
deleted file mode 100644
index d9d57ee..0000000
--- a/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From 2a5e8813d3c5db3e2b7d9dfa2ab27cccd5111e53 Mon Sep 17 00:00:00 2001
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
7
8Upstream-Status: Inappropriate [ OE configuration Specific]
9
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(-)
15
16diff --git a/bfd/config.bfd b/bfd/config.bfd
17index 7bcb92a..03d2c6f 100644
18--- a/bfd/config.bfd
19+++ b/bfd/config.bfd
20@@ -1062,12 +1062,12 @@ case "${targ}" in
21 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
22 ;;
23 mips64*el-*-linux*)
24- targ_defvec=mips_elf32_ntrad_le_vec
25- targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
26+ targ_defvec=mips_elf64_trad_le_vec
27+ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec"
28 ;;
29 mips64*-*-linux*)
30- targ_defvec=mips_elf32_ntrad_be_vec
31- targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
32+ targ_defvec=mips_elf64_trad_be_vec
33+ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_be_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
34 ;;
35 mips*el-*-linux*)
36 targ_defvec=mips_elf32_trad_le_vec
37diff --git a/ld/configure.tgt b/ld/configure.tgt
38index 24e36d1..740b2ea 100644
39--- a/ld/configure.tgt
40+++ b/ld/configure.tgt
41@@ -476,11 +476,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks
42 mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
43 targ_extra_emuls="elf32elmipvxworks" ;;
44 mips*-*-windiss) targ_emul=elf32mipswindiss ;;
45-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32
46- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
47+mips64*el-*-linux-*) targ_emul=elf64ltsmip
48+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
49 targ_extra_libpath=$targ_extra_emuls ;;
50-mips64*-*-linux-*) targ_emul=elf32btsmipn32
51- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
52+mips64*-*-linux-*) targ_emul=elf64btsmip
53+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
54 targ_extra_libpath=$targ_extra_emuls ;;
55 mips*el-*-linux-*) targ_emul=elf32ltsmip
56 targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
57--
582.1.4
59
diff --git a/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch b/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
deleted file mode 100644
index ecc37cc..0000000
--- a/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
+++ /dev/null
@@ -1,434 +0,0 @@
1From 448329ea097447aee73d050045295c5a0ae8519e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:51:05 +0000
4Subject: [PATCH 12/13] Add XLP instructions support
5
6From 26adb06ce515aadfec08ce13109b4b98287f677b Mon Sep 17 00:00:00 2001
7From: Nebu Philips <nphilips@netlogicmicro.com>
8Date: Fri, 30 Jul 2010 15:10:03 -0700
9Subject: [PATCH] Add support for Netlogic XLP
10
11Using the mipsisa64r2nlm target, add support for XLP from
12Netlogic. Also, update vendor name to NLM wherever applicable.
13---
14 bfd/aoutx.h | 1 +
15 bfd/archures.c | 1 +
16 bfd/bfd-in2.h | 1 +
17 bfd/config.bfd | 5 +++++
18 bfd/cpu-mips.c | 6 ++++--
19 bfd/elfxx-mips.c | 8 ++++++++
20 binutils/readelf.c | 1 +
21 gas/config/tc-mips.c | 4 +++-
22 gas/configure | 3 +++
23 gas/configure.tgt | 2 +-
24 include/elf/mips.h | 1 +
25 include/opcode/mips.h | 10 ++++++++--
26 ld/configure.tgt | 2 ++
27 opcodes/mips-dis.c | 12 +++++-------
28 opcodes/mips-opc.c | 33 +++++++++++++++++++++------------
29 15 files changed, 65 insertions(+), 25 deletions(-)
30
31Upstream-Status: Pending
32
33Signed-off-by: Khem Raj <raj.khem@gmail.com>
34
35Use 0x00000080 for INSN_XLP, the value 0x00000040 has already been assigned
36to INSN_OCTEON3
37
38Signed-off-by: Baoshan Pang <baoshan.pang@windriver.com>
39Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
40---
41 bfd/aoutx.h | 1 +
42 bfd/archures.c | 1 +
43 bfd/bfd-in2.h | 1 +
44 bfd/config.bfd | 5 +++++
45 bfd/cpu-mips.c | 6 ++++--
46 bfd/elfxx-mips.c | 8 ++++++++
47 binutils/readelf.c | 1 +
48 gas/config/tc-mips.c | 4 +++-
49 gas/configure | 3 +++
50 gas/configure.tgt | 2 +-
51 include/elf/mips.h | 1 +
52 include/opcode/mips.h | 10 ++++++++--
53 ld/configure.tgt | 2 ++
54 opcodes/mips-dis.c | 12 +++++-------
55 opcodes/mips-opc.c | 33 +++++++++++++++++++++------------
56 15 files changed, 65 insertions(+), 25 deletions(-)
57
58diff --git a/bfd/aoutx.h b/bfd/aoutx.h
59index 9385a98..a88df99 100644
60--- a/bfd/aoutx.h
61+++ b/bfd/aoutx.h
62@@ -802,6 +802,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
63 case bfd_mach_mipsisa64r6:
64 case bfd_mach_mips_sb1:
65 case bfd_mach_mips_xlr:
66+ case bfd_mach_mips_xlp:
67 /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */
68 arch_flags = M_MIPS2;
69 break;
70diff --git a/bfd/archures.c b/bfd/archures.c
71index c9fd6c8..547bd09 100644
72--- a/bfd/archures.c
73+++ b/bfd/archures.c
74@@ -180,6 +180,7 @@ DESCRIPTION
75 .#define bfd_mach_mips_octeonp 6601
76 .#define bfd_mach_mips_octeon2 6502
77 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *}
78+.#define bfd_mach_mips_xlp 887680 {* decimal 'XLP' *}
79 .#define bfd_mach_mipsisa32 32
80 .#define bfd_mach_mipsisa32r2 33
81 .#define bfd_mach_mipsisa32r3 34
82diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
83index c7a2bb5..413b773 100644
84--- a/bfd/bfd-in2.h
85+++ b/bfd/bfd-in2.h
86@@ -1967,6 +1967,7 @@ enum bfd_architecture
87 #define bfd_mach_mips_octeonp 6601
88 #define bfd_mach_mips_octeon2 6502
89 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */
90+#define bfd_mach_mips_xlp 887680 /* decimal 'XLP' */
91 #define bfd_mach_mipsisa32 32
92 #define bfd_mach_mipsisa32r2 33
93 #define bfd_mach_mipsisa32r3 34
94diff --git a/bfd/config.bfd b/bfd/config.bfd
95index 03d2c6f..27086db 100644
96--- a/bfd/config.bfd
97+++ b/bfd/config.bfd
98@@ -1041,6 +1041,11 @@ case "${targ}" in
99 targ_defvec=mips_elf32_le_vec
100 targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
101 ;;
102+ mipsisa64*-*-elf*)
103+ targ_defvec=mips_elf32_trad_be_vec
104+ targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
105+ want64=true
106+ ;;
107 mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks | mips*-*-windiss)
108 targ_defvec=mips_elf32_be_vec
109 targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
110diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
111index b617aaa..19a99d1 100644
112--- a/bfd/cpu-mips.c
113+++ b/bfd/cpu-mips.c
114@@ -103,7 +103,8 @@ enum
115 I_mipsocteonp,
116 I_mipsocteon2,
117 I_xlr,
118- I_micromips
119+ I_micromips,
120+ I_xlp
121 };
122
123 #define NN(index) (&arch_info_struct[(index) + 1])
124@@ -153,7 +154,8 @@ static const bfd_arch_info_type arch_info_struct[] =
125 N (64, 64, bfd_mach_mips_octeonp,"mips:octeon+", FALSE, NN(I_mipsocteonp)),
126 N (64, 64, bfd_mach_mips_octeon2,"mips:octeon2", FALSE, NN(I_mipsocteon2)),
127 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)),
128- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0)
129+ N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,NN(I_micromips)),
130+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, 0)
131 };
132
133 /* The default architecture is mips:3000, but with a machine number of
134diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
135index 0df7abf..d268e86 100644
136--- a/bfd/elfxx-mips.c
137+++ b/bfd/elfxx-mips.c
138@@ -6608,6 +6608,9 @@ _bfd_elf_mips_mach (flagword flags)
139 case E_MIPS_MACH_XLR:
140 return bfd_mach_mips_xlr;
141
142+ case E_MIPS_MACH_XLP:
143+ return bfd_mach_mips_xlp;
144+
145 default:
146 switch (flags & EF_MIPS_ARCH)
147 {
148@@ -11878,6 +11881,10 @@ mips_set_isa_flags (bfd *abfd)
149 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2;
150 break;
151
152+ case bfd_mach_mips_xlp:
153+ val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_XLP;
154+ break;
155+
156 case bfd_mach_mipsisa32:
157 val = E_MIPS_ARCH_32;
158 break;
159@@ -14765,6 +14772,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
160 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
161 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
162 { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 },
163+ { bfd_mach_mips_xlp, bfd_mach_mipsisa64r2 },
164
165 /* MIPS64 extensions. */
166 { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },
167diff --git a/binutils/readelf.c b/binutils/readelf.c
168index 0c00b2f..6e9d5e4 100644
169--- a/binutils/readelf.c
170+++ b/binutils/readelf.c
171@@ -2898,6 +2898,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
172 case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break;
173 case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break;
174 case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break;
175+ case E_MIPS_MACH_XLP: strcat (buf, ", xlp"); break;
176 case 0:
177 /* We simply ignore the field in this case to avoid confusion:
178 MIPS ELF does not specify EF_MIPS_MACH, it is a GNU
179diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
180index c3e3e2a..8d64344 100644
181--- a/gas/config/tc-mips.c
182+++ b/gas/config/tc-mips.c
183@@ -551,6 +551,7 @@ static int mips_32bitmode = 0;
184 || mips_opts.arch == CPU_RM7000 \
185 || mips_opts.arch == CPU_VR5500 \
186 || mips_opts.micromips \
187+ || mips_opts.arch == CPU_XLP \
188 )
189
190 /* Whether the processor uses hardware interlocks to protect reads
191@@ -580,6 +581,7 @@ static int mips_32bitmode = 0;
192 && mips_opts.isa != ISA_MIPS3) \
193 || mips_opts.arch == CPU_R4300 \
194 || mips_opts.micromips \
195+ || mips_opts.arch == CPU_XLP \
196 )
197
198 /* Whether the processor uses hardware interlocks to protect reads
199@@ -18682,7 +18684,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
200 /* Broadcom XLP.
201 XLP is mostly like XLR, with the prominent exception that it is
202 MIPS64R2 rather than MIPS64. */
203- { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR },
204+ { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLP },
205
206 /* End marker */
207 { NULL, 0, 0, 0, 0 }
208diff --git a/gas/configure b/gas/configure
209index 074886f..8091f2f 100755
210--- a/gas/configure
211+++ b/gas/configure
212@@ -12808,6 +12808,9 @@ _ACEOF
213 mipsisa64r6 | mipsisa64r6el)
214 mips_cpu=mips64r6
215 ;;
216+ mipsisa64r2nlm | mipsisa64r2nlmel)
217+ mips_cpu=xlp
218+ ;;
219 mipstx39 | mipstx39el)
220 mips_cpu=r3900
221 ;;
222diff --git a/gas/configure.tgt b/gas/configure.tgt
223index 1d92f55..06e8b4f 100644
224--- a/gas/configure.tgt
225+++ b/gas/configure.tgt
226@@ -332,7 +332,7 @@ case ${generic_target} in
227 mips-*-sysv4*MP* | mips-*-gnu*) fmt=elf em=tmips ;;
228 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
229 fmt=elf em=tmips ;;
230- mips-*-elf* | mips-*-rtems*) fmt=elf ;;
231+ mips-*-elf* | mips-*-rtems*) fmt=elf em=tmips ;;
232 mips-*-netbsd*) fmt=elf em=tmips ;;
233 mips-*-openbsd*) fmt=elf em=tmips ;;
234
235diff --git a/include/elf/mips.h b/include/elf/mips.h
236index 2ed6acd..e541f50 100644
237--- a/include/elf/mips.h
238+++ b/include/elf/mips.h
239@@ -285,6 +285,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
240 #define E_MIPS_MACH_SB1 0x008a0000
241 #define E_MIPS_MACH_OCTEON 0x008b0000
242 #define E_MIPS_MACH_XLR 0x008c0000
243+#define E_MIPS_MACH_XLP 0x008f0000
244 #define E_MIPS_MACH_OCTEON2 0x008d0000
245 #define E_MIPS_MACH_OCTEON3 0x008e0000
246 #define E_MIPS_MACH_5400 0x00910000
247diff --git a/include/opcode/mips.h b/include/opcode/mips.h
248index ef26167..ef53ec6 100644
249--- a/include/opcode/mips.h
250+++ b/include/opcode/mips.h
251@@ -1227,8 +1227,10 @@ static const unsigned int mips_isa_table[] = {
252 #define INSN_LOONGSON_2F 0x80000000
253 /* Loongson 3A. */
254 #define INSN_LOONGSON_3A 0x00000400
255-/* RMI Xlr instruction */
256-#define INSN_XLR 0x00000020
257+/* Netlogic Xlr instruction */
258+#define INSN_XLR 0x00000020
259+/* Netlogic XlP instruction */
260+#define INSN_XLP 0x00000080
261
262 /* DSP ASE */
263 #define ASE_DSP 0x00000001
264@@ -1324,6 +1326,7 @@ static const unsigned int mips_isa_table[] = {
265 #define CPU_OCTEONP 6601
266 #define CPU_OCTEON2 6502
267 #define CPU_XLR 887682 /* decimal 'XLR' */
268+#define CPU_XLP 887680 /* decimal 'XLP' */
269
270 /* Return true if the given CPU is included in INSN_* mask MASK. */
271
272@@ -1398,6 +1401,9 @@ cpu_is_member (int cpu, unsigned int mask)
273 return ((mask & INSN_ISA_MASK) == INSN_ISA32R6)
274 || ((mask & INSN_ISA_MASK) == INSN_ISA64R6);
275
276+ case CPU_XLP:
277+ return (mask & INSN_XLP) != 0;
278+
279 default:
280 return FALSE;
281 }
282diff --git a/ld/configure.tgt b/ld/configure.tgt
283index 740b2ea..4df13a7 100644
284--- a/ld/configure.tgt
285+++ b/ld/configure.tgt
286@@ -462,6 +462,8 @@ mips*el-sde-elf*) targ_emul=elf32ltsmip
287 mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*)
288 targ_emul=elf32btsmip
289 targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;;
290+mipsisa64*-*-elf*) targ_emul=elf32btsmip
291+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;;
292 mips64*el-ps2-elf*) targ_emul=elf32lr5900n32
293 targ_extra_emuls="elf32lr5900"
294 targ_extra_libpath=$targ_extra_emuls ;;
295diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
296index 1eb1d45..d6881af 100644
297--- a/opcodes/mips-dis.c
298+++ b/opcodes/mips-dis.c
299@@ -655,13 +655,11 @@ const struct mips_arch_choice mips_arch_choices[] =
300 mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
301 mips_cp1_names_mips3264, mips_hwr_names_numeric },
302
303- /* XLP is mostly like XLR, with the prominent exception it is being
304- MIPS64R2. */
305- { "xlp", 1, bfd_mach_mips_xlr, CPU_XLR,
306- ISA_MIPS64R2 | INSN_XLR, 0,
307- mips_cp0_names_xlr,
308- mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
309- mips_cp1_names_mips3264, mips_hwr_names_numeric },
310+ { "xlp", 1, bfd_mach_mips_xlp, CPU_XLP,
311+ ISA_MIPS64R2 | INSN_XLP, 0,
312+ mips_cp0_names_mips3264r2,
313+ mips_cp0sel_names_mips3264r2, ARRAY_SIZE (mips_cp0sel_names_mips3264r2),
314+ mips_hwr_names_mips3264r2 },
315
316 /* This entry, mips16, is here only for ISA/processor selection; do
317 not print its name. */
318diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
319index 2c3bbad..9785a7e 100644
320--- a/opcodes/mips-opc.c
321+++ b/opcodes/mips-opc.c
322@@ -319,7 +319,8 @@ decode_mips_operand (const char *p)
323 #define IOCT (INSN_OCTEON | INSN_OCTEONP | INSN_OCTEON2)
324 #define IOCTP (INSN_OCTEONP | INSN_OCTEON2)
325 #define IOCT2 INSN_OCTEON2
326-#define XLR INSN_XLR
327+#define XLR INSN_XLR
328+#define XLP INSN_XLP
329 #define IVIRT ASE_VIRT
330 #define IVIRT64 ASE_VIRT64
331
332@@ -956,6 +957,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
333 {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
334 {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 },
335 {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 },
336+{"crc", "d,s,t", 0x7000001c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },
337 /* ctc0 is at the bottom of the table. */
338 {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
339 {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 },
340@@ -988,12 +990,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
341 {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 },
342 {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 },
343 {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 },
344-{"daddwc", "d,s,t", 0x70000038, 0xfc0007ff, WR_1|RD_2|RD_3|WR_C0|RD_C0, 0, XLR, 0, 0 },
345+{"daddwc", "d,s,t", 0x70000038, 0xfc0007ff, WR_1|RD_2|RD_3|WR_C0|RD_C0, 0, XLR|XLP, 0, 0 },
346 {"dbreak", "", 0x7000003f, 0xffffffff, 0, 0, N5, 0, 0 },
347 {"dclo", "d,s", 0x00000053, 0xfc1f07ff, WR_1|RD_2, 0, I69, 0, 0 },
348 {"dclo", "U,s", 0x70000025, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, I69 },
349 {"dclz", "d,s", 0x00000052, 0xfc1f07ff, WR_1|RD_2, 0, I69, 0, 0 },
350 {"dclz", "U,s", 0x70000024, 0xfc0007ff, WR_1|RD_2, 0, I64|N55, 0, I69 },
351+{"dcrc", "d,s,t", 0x7000001d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },
352 /* dctr and dctw are used on the r5000. */
353 {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
354 {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 },
355@@ -1065,6 +1068,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
356 {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 },
357 {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
358 {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 },
359+{"dmfur", "t,d", 0x7000001e, 0xffe007ff, WR_1, 0, XLP, 0, 0 },
360 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 },
361 {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 },
362 {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE },
363@@ -1080,6 +1084,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
364 /* dmfc3 is at the bottom of the table. */
365 /* dmtc3 is at the bottom of the table. */
366 {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
367+{"dmtur", "t,d", 0x7000001f, 0xffe007ff, RD_1, 0, XLP, 0, 0 },
368+{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 },
369 {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 },
370 {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 },
371 {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 },
372@@ -1229,9 +1235,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
373 {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 },
374 {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 },
375 {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 },
376-{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 },
377-{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 },
378-{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 },
379+{"ldaddw", "t,b", 0x70000010, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
380+{"ldaddwu", "t,b", 0x70000011, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
381+{"ldaddd", "t,b", 0x70000012, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
382 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
383 {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF },
384 {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF },
385@@ -1396,7 +1402,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
386 {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 },
387 {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 },
388 {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 },
389-{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1|RD_2, 0, XLR, 0, 0 },
390+{"mfcr", "t,s", 0x70000018, 0xfc00ffff, WR_1, 0, XLR|XLP, 0, 0 },
391 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 },
392 {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 },
393 {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 },
394@@ -1441,10 +1447,13 @@ const struct mips_opcode mips_builtin_opcodes[] =
395 /* move is at the top of the table. */
396 {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 },
397 {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 },
398+{"msgsnds", "d,t", 0x4a000001, 0xffe007ff, WR_1|RD_2|RD_C0|WR_C0, 0, XLP, 0, 0 },
399 {"msgld", "", 0, (int) M_MSGLD, INSN_MACRO, 0, XLR, 0, 0 },
400 {"msgld", "t", 0, (int) M_MSGLD_T, INSN_MACRO, 0, XLR, 0, 0 },
401-{"msgwait", "", 0, (int) M_MSGWAIT, INSN_MACRO, 0, XLR, 0, 0 },
402-{"msgwait", "t", 0, (int) M_MSGWAIT_T,INSN_MACRO, 0, XLR, 0, 0 },
403+{"msglds", "d,t", 0x4a000002, 0xffe007ff, WR_1|RD_2|RD_C0|WR_C0, 0, XLP, 0, 0 },
404+{"msgwait", "", 0, (int) M_MSGWAIT, INSN_MACRO, 0, XLR|XLP, 0, 0 },
405+{"msgwait", "t", 0, (int) M_MSGWAIT_T,INSN_MACRO, 0, XLR|XLP, 0, 0 },
406+{"msgsync", "", 0x4a000004, 0xffffffff,0, 0, XLP, 0, 0 },
407 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 },
408 {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 },
409 {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 },
410@@ -1494,7 +1503,7 @@ const struct mips_opcode mips_builtin_opcodes[] =
411 {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 },
412 {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 },
413 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },
414-{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1|RD_2, 0, XLR, 0, 0 },
415+{"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1, 0, XLR|XLP, 0, 0 },
416 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
417 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
418 {"mtm2", "s", 0x7000000d, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
419@@ -1924,9 +1933,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
420 {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37},
421 {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 },
422 {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 },
423-{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 },
424-{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 },
425-{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|LM|SM, 0, XLR, 0, 0 },
426+{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
427+{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
428+{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 },
429 {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
430 {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 },
431 {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 },
432--
4332.1.4
434
diff --git a/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch b/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
deleted file mode 100644
index aee01c0..0000000
--- a/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 8e8f77ec2b6262e7d10af54700c340173d957267 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 27 Feb 2015 09:05:49 +0000
4Subject: [PATCH 13/13] Fix an internal error in do_print_to_mapfile seen with
5 gold on arm
6
7This is due to missing implementation of do_print_to_mapfile for
8atrributea section (ARM.attributes), it started to show up after fix
9for PR gold/16980 was installed
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13Upstream-Status: Submitted
14---
15 gold/attributes.h | 4 ++++
16 1 file changed, 4 insertions(+)
17
18diff --git a/gold/attributes.h b/gold/attributes.h
19index 2aa7a78..3d126e6 100644
20--- a/gold/attributes.h
21+++ b/gold/attributes.h
22@@ -387,6 +387,10 @@ class Output_attributes_section_data : public Output_section_data
23 { }
24
25 protected:
26+ // Write to a map file.
27+ void
28+ do_print_to_mapfile(Mapfile* mapfile) const
29+ { mapfile->print_output_data(this, _("** attributes")); }
30 // Write the data to the output file.
31 void
32 do_write(Output_file*);
33--
342.1.4
35
diff --git a/recipes-devtools/binutils/binutils/0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch b/recipes-devtools/binutils/binutils/0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch
deleted file mode 100644
index e024302..0000000
--- a/recipes-devtools/binutils/binutils/0014-gold-arm-Skip-pic-check-for-R_ARM_REL32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From ebe26d855452d07e0152bd78d4966475d2de1de8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 5 Mar 2015 07:30:31 +0000
4Subject: [PATCH] gold/arm: Skip pic check for R_ARM_REL32
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 gold/arm.cc | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/gold/arm.cc b/gold/arm.cc
12index 6c472bb..fb80435 100644
13--- a/gold/arm.cc
14+++ b/gold/arm.cc
15@@ -7829,6 +7829,7 @@ Target_arm<big_endian>::Scan::check_non_pic(Relobj* object,
16 case elfcpp::R_ARM_TLS_DTPMOD32:
17 case elfcpp::R_ARM_TLS_DTPOFF32:
18 case elfcpp::R_ARM_TLS_TPOFF32:
19+ case elfcpp::R_ARM_REL32:
20 return;
21
22 default:
23--
242.1.4
25
diff --git a/recipes-devtools/binutils/binutils/0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch b/recipes-devtools/binutils/binutils/0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch
deleted file mode 100644
index ee49c38..0000000
--- a/recipes-devtools/binutils/binutils/0015-Fix-dynamic-list-so-that-symbols-not-in-the-list-are.patch
+++ /dev/null
@@ -1,131 +0,0 @@
1From e9c1bdad269c0c3352eebcc9481ed65144001b0b Mon Sep 17 00:00:00 2001
2From: Cary Coutant <ccoutant@google.com>
3Date: Mon, 16 Feb 2015 22:15:12 -0800
4Subject: [PATCH] Fix --dynamic-list so that symbols not in the list are still
5 exported.
6
7In PR 13577, the complaint was that -Bsymbolic was overriding the binding
8behavior for symbols listed in the --dynamic-list by setting the DT_SYMBOLIC
9tag in the dynamic table. In reading the Gnu ld manual, I decided that
10--dynamic-list should be mutually exclusive of -Bsymbolic, and modified
11gold so that --dynamic-list would treat symbols listed as preemptible,
12and all other symbols as internally bound. I was wrong.
13
14PR 16992 shows that with --dynamic-list (and not -Bsymbolic), a symbol
15not listed in the dynamic list is being internally bound within the
16shared library, but because it's still in the dynamic symbol table, we
17expose it to a COPY relocation, and things go really bad from there.
18
19(I can reproduce the same failure, simply by turning on -Bsymbolic-functions
20with the Gnu linker. Even though the symbol is bound internally, it's
21still exported to the dynamic symbol table, and is exposed to a COPY
22relocation.)
23
24I've backed out part of the fix for PR 13577, and -Bsymbolic (or
25-Bsymbolic-functions) can now be used with --dynamic-list, but if the
26two are used together, we do not set DT_SYMBOLIC or DF_SYMBOLIC
27(this matches Gnu ld behavior). We now treat symbols listed in the
28dynamic list as premptible, but we do not automatically treat symbols
29not listed there as non-premptible.
30
31gold/
32 PR gold/13577
33 PR gold/16992
34 * layout.cc (Layout::finish_dynamic_section): Don't set DT_SYMBOLIC or
35 DF_SYMBOLIC if --dynamic-list option is used.
36 * options.cc (General_options::finalize): --dynamic-list is not
37 mutually exclusive with -Bsymbolic.
38 * symtab.h (Symbol::is_preemptible): Don't exclude dynamic symbols not
39 listed in --dynamic-list.
40 * testsuite/Makefile.am (dynamic_list_lib2.so): Add
41 -Bsymbolic-functions.
42 * testsuite/Makefile.in: Regenerate.
43---
44Upstream-Status: Backport
45
46 gold/ChangeLog | 14 ++++++++++++++
47 gold/layout.cc | 3 ++-
48 gold/options.cc | 7 -------
49 gold/symtab.h | 6 ++----
50 gold/testsuite/Makefile.am | 2 +-
51 gold/testsuite/Makefile.in | 2 +-
52 6 files changed, 20 insertions(+), 14 deletions(-)
53
54diff --git a/gold/layout.cc b/gold/layout.cc
55index bcdaac8..7836640 100644
56--- a/gold/layout.cc
57+++ b/gold/layout.cc
58@@ -4873,7 +4873,8 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
59 flags |= elfcpp::DF_STATIC_TLS;
60 if (parameters->options().origin())
61 flags |= elfcpp::DF_ORIGIN;
62- if (parameters->options().Bsymbolic())
63+ if (parameters->options().Bsymbolic()
64+ && !parameters->options().have_dynamic_list())
65 {
66 flags |= elfcpp::DF_SYMBOLIC;
67 // Add DT_SYMBOLIC for compatibility with older loaders.
68diff --git a/gold/options.cc b/gold/options.cc
69index 7eb8f27..7f1f69e 100644
70--- a/gold/options.cc
71+++ b/gold/options.cc
72@@ -1200,13 +1200,6 @@ General_options::finalize()
73 // in the path, as appropriate.
74 this->add_sysroot();
75
76- // --dynamic-list overrides -Bsymbolic and -Bsymbolic-functions.
77- if (this->have_dynamic_list())
78- {
79- this->set_Bsymbolic(false);
80- this->set_Bsymbolic_functions(false);
81- }
82-
83 // Now that we've normalized the options, check for contradictory ones.
84 if (this->shared() && this->is_static())
85 gold_fatal(_("-shared and -static are incompatible"));
86diff --git a/gold/symtab.h b/gold/symtab.h
87index aa0cb68..9413360 100644
88--- a/gold/symtab.h
89+++ b/gold/symtab.h
90@@ -604,10 +604,8 @@ class Symbol
91 if (parameters->options().in_dynamic_list(this->name()))
92 return true;
93
94- // If the user used -Bsymbolic or provided a --dynamic-list script,
95- // then nothing (else) is preemptible.
96- if (parameters->options().Bsymbolic()
97- || parameters->options().have_dynamic_list())
98+ // If the user used -Bsymbolic, then nothing (else) is preemptible.
99+ if (parameters->options().Bsymbolic())
100 return false;
101
102 // If the user used -Bsymbolic-functions, then functions are not
103diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
104index f767c21..7b73f9d 100644
105--- a/gold/testsuite/Makefile.am
106+++ b/gold/testsuite/Makefile.am
107@@ -1518,7 +1518,7 @@ dynamic_list_lib1.o: dynamic_list_lib1.cc
108 $(CXXCOMPILE) -c -fpic -o $@ $<
109
110 dynamic_list_lib2.so: gcctestdir/ld dynamic_list_lib2.o $(srcdir)/dynamic_list_2.t
111- $(CXXLINK) -Bgcctestdir/ -shared -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o
112+ $(CXXLINK) -Bgcctestdir/ -shared -Wl,-Bsymbolic-functions -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o
113 dynamic_list_lib2.o: dynamic_list_lib2.cc
114 $(CXXCOMPILE) -c -fpic -o $@ $<
115
116diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
117index 217e472..b4ae3fd 100644
118--- a/gold/testsuite/Makefile.in
119+++ b/gold/testsuite/Makefile.in
120@@ -5319,7 +5319,7 @@ uninstall-am:
121 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $<
122
123 @GCC_TRUE@@NATIVE_LINKER_TRUE@dynamic_list_lib2.so: gcctestdir/ld dynamic_list_lib2.o $(srcdir)/dynamic_list_2.t
124-@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -shared -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o
125+@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -shared -Wl,-Bsymbolic-functions -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o
126 @GCC_TRUE@@NATIVE_LINKER_TRUE@dynamic_list_lib2.o: dynamic_list_lib2.cc
127 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $<
128
129--
1301.9.1
131
diff --git a/recipes-devtools/binutils/binutils/0016-This-patch-adds-IFUNC-support-for-arm-gold-backend.patch b/recipes-devtools/binutils/binutils/0016-This-patch-adds-IFUNC-support-for-arm-gold-backend.patch
deleted file mode 100644
index dcac308..0000000
--- a/recipes-devtools/binutils/binutils/0016-This-patch-adds-IFUNC-support-for-arm-gold-backend.patch
+++ /dev/null
@@ -1,1004 +0,0 @@
1From b780c9e06cabe6d8e301aaf46f33f116f3224021 Mon Sep 17 00:00:00 2001
2From: Han Shen <shenhan@google.com>
3Date: Thu, 29 Jan 2015 10:00:46 -0800
4Subject: [PATCH] This patch adds IFUNC support for arm gold backend.
5
6This is a feature required in chromeos arm development work.
7
8Tested:
91) Built passed all-gold on x86_64 machine
102) Tested with basic gold aarch64 ifunc unittests -
11 a) global ifunc, statically/non-statically linked
12 b) local ifunc, statically/non-statically linked
13 c) global/local, other shared library routine mixed,
14 statically/non-statically linked
15 d) arm/thumb mode ifunc
16 e) linking chrome browser passed
17---
18Upstream-Status: Backport
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20
21 elfcpp/arm.h | 5 +-
22 gold/aarch64.cc | 2 +-
23 gold/arm.cc | 593 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
24 gold/output.h | 11 ++
25 4 files changed, 561 insertions(+), 50 deletions(-)
26
27diff --git a/elfcpp/arm.h b/elfcpp/arm.h
28index 8c6b6bf..1c13dc9 100644
29--- a/elfcpp/arm.h
30+++ b/elfcpp/arm.h
31@@ -192,11 +192,12 @@ enum
32 R_ARM_PRIVATE_14 = 126,
33 R_ARM_PRIVATE_15 = 127,
34 R_ARM_ME_TOO = 128, // Obsolete
35- R_ARM_THM_TLS_DESCSEQ16 = 129,// Static Thumb16
36+ R_ARM_THM_TLS_DESCSEQ16 = 129,// Static Thumb16
37 R_ARM_THM_TLS_DESCSEQ32 = 130,// Static Thumb32
38 // 131 - 139 Unallocated
39 // 140 - 159 Dynamic Reserved for future allocation
40- // 160 - 255 Unallocated
41+ R_ARM_IRELATIVE = 160, // Dynamic
42+ // 161 - 255 Unallocated
43 };
44
45 // e_flags values used for ARM. We only support flags defined in AAELF.
46diff --git a/gold/aarch64.cc b/gold/aarch64.cc
47index afb9024..7fbbdbd 100644
48--- a/gold/aarch64.cc
49+++ b/gold/aarch64.cc
50@@ -1226,7 +1226,7 @@ class Output_data_plt_aarch64 : public Output_section_data
51 // The number of PLT entries.
52 unsigned int count_;
53
54- // Number of PLT entries with R_X86_64_IRELATIVE relocs. These
55+ // Number of PLT entries with R_AARCH64_IRELATIVE relocs. These
56 // follow the regular PLT entries.
57 unsigned int irelative_count_;
58
59diff --git a/gold/arm.cc b/gold/arm.cc
60index 6c472bb..8719cc9 100644
61--- a/gold/arm.cc
62+++ b/gold/arm.cc
63@@ -2119,8 +2119,8 @@ class Target_arm : public Sized_target<32, big_endian>
64
65 Target_arm(const Target::Target_info* info = &arm_info)
66 : Sized_target<32, big_endian>(info),
67- got_(NULL), plt_(NULL), got_plt_(NULL), rel_dyn_(NULL),
68- copy_relocs_(elfcpp::R_ARM_COPY),
69+ got_(NULL), plt_(NULL), got_plt_(NULL), got_irelative_(NULL),
70+ rel_dyn_(NULL), rel_irelative_(NULL), copy_relocs_(elfcpp::R_ARM_COPY),
71 got_mod_index_offset_(-1U), tls_base_symbol_defined_(false),
72 stub_tables_(), stub_factory_(Stub_factory::get_instance()),
73 should_force_pic_veneer_(false),
74@@ -2258,6 +2258,18 @@ class Target_arm : public Sized_target<32, big_endian>
75 uint64_t
76 do_dynsym_value(const Symbol*) const;
77
78+ // Return the plt address for globals. Since we have irelative plt entries,
79+ // address calculation is not as straightforward as plt_address + plt_offset.
80+ uint64_t
81+ do_plt_address_for_global(const Symbol* gsym) const
82+ { return this->plt_section()->address_for_global(gsym); }
83+
84+ // Return the plt address for locals. Since we have irelative plt entries,
85+ // address calculation is not as straightforward as plt_address + plt_offset.
86+ uint64_t
87+ do_plt_address_for_local(const Relobj* relobj, unsigned int symndx) const
88+ { return this->plt_section()->address_for_local(relobj, symndx); }
89+
90 // Relocate a section.
91 void
92 relocate_section(const Relocate_info<32, big_endian>*,
93@@ -2357,6 +2369,10 @@ class Target_arm : public Sized_target<32, big_endian>
94 unsigned int
95 plt_entry_size() const;
96
97+ // Get the section to use for IRELATIVE relocations, create it if necessary.
98+ Reloc_section*
99+ rel_irelative_section(Layout*);
100+
101 // Map platform-specific reloc types
102 static unsigned int
103 get_real_reloc_type(unsigned int r_type);
104@@ -2448,8 +2464,11 @@ class Target_arm : public Sized_target<32, big_endian>
105 protected:
106 // Make the PLT-generator object.
107 Output_data_plt_arm<big_endian>*
108- make_data_plt(Layout* layout, Output_data_space* got_plt)
109- { return this->do_make_data_plt(layout, got_plt); }
110+ make_data_plt(Layout* layout,
111+ Arm_output_data_got<big_endian>* got,
112+ Output_data_space* got_plt,
113+ Output_data_space* got_irelative)
114+ { return this->do_make_data_plt(layout, got, got_plt, got_irelative); }
115
116 // Make an ELF object.
117 Object*
118@@ -2530,9 +2549,14 @@ class Target_arm : public Sized_target<32, big_endian>
119 do_define_standard_symbols(Symbol_table*, Layout*);
120
121 virtual Output_data_plt_arm<big_endian>*
122- do_make_data_plt(Layout* layout, Output_data_space* got_plt)
123+ do_make_data_plt(Layout* layout,
124+ Arm_output_data_got<big_endian>* got,
125+ Output_data_space* got_plt,
126+ Output_data_space* got_irelative)
127 {
128- return new Output_data_plt_arm_standard<big_endian>(layout, got_plt);
129+ gold_assert(got_plt != NULL && got_irelative != NULL);
130+ return new Output_data_plt_arm_standard<big_endian>(
131+ layout, got, got_plt, got_irelative);
132 }
133
134 private:
135@@ -2602,6 +2626,9 @@ class Target_arm : public Sized_target<32, big_endian>
136 if (sym->is_undefined() && !parameters->options().shared())
137 return false;
138
139+ if (sym->type() == elfcpp::STT_GNU_IFUNC)
140+ return true;
141+
142 return (!parameters->doing_static_link()
143 && (sym->type() == elfcpp::STT_FUNC
144 || sym->type() == elfcpp::STT_ARM_TFUNC)
145@@ -2613,6 +2640,11 @@ class Target_arm : public Sized_target<32, big_endian>
146 inline bool
147 possible_function_pointer_reloc(unsigned int r_type);
148
149+ // Whether a plt entry is needed for ifunc.
150+ bool
151+ reloc_needs_plt_for_ifunc(Sized_relobj_file<32, big_endian>*,
152+ unsigned int r_type);
153+
154 // Whether we have issued an error about a non-PIC compilation.
155 bool issued_non_pic_error_;
156 };
157@@ -2718,10 +2750,20 @@ class Target_arm : public Sized_target<32, big_endian>
158 return this->got_plt_;
159 }
160
161+ // Create the PLT section.
162+ void
163+ make_plt_section(Symbol_table* symtab, Layout* layout);
164+
165 // Create a PLT entry for a global symbol.
166 void
167 make_plt_entry(Symbol_table*, Layout*, Symbol*);
168
169+ // Create a PLT entry for a local STT_GNU_IFUNC symbol.
170+ void
171+ make_local_ifunc_plt_entry(Symbol_table*, Layout*,
172+ Sized_relobj_file<32, big_endian>* relobj,
173+ unsigned int local_sym_index);
174+
175 // Define the _TLS_MODULE_BASE_ symbol in the TLS segment.
176 void
177 define_tls_base_symbol(Symbol_table*, Layout*);
178@@ -2903,8 +2945,12 @@ class Target_arm : public Sized_target<32, big_endian>
179 Output_data_plt_arm<big_endian>* plt_;
180 // The GOT PLT section.
181 Output_data_space* got_plt_;
182+ // The GOT section for IRELATIVE relocations.
183+ Output_data_space* got_irelative_;
184 // The dynamic reloc section.
185 Reloc_section* rel_dyn_;
186+ // The section to use for IRELATIVE relocs.
187+ Reloc_section* rel_irelative_;
188 // Relocs saved to avoid a COPY reloc.
189 Copy_relocs<elfcpp::SHT_REL, 32, big_endian> copy_relocs_;
190 // Offset of the GOT entry for the TLS module index.
191@@ -4244,6 +4290,15 @@ Target_arm<big_endian>::got_section(Symbol_table* symtab, Layout* layout)
192 elfcpp::STB_LOCAL,
193 elfcpp::STV_HIDDEN, 0,
194 false, false);
195+
196+ // If there are any IRELATIVE relocations, they get GOT entries
197+ // in .got.plt after the jump slot entries.
198+ this->got_irelative_ = new Output_data_space(4, "** GOT IRELATIVE PLT");
199+ layout->add_output_section_data(".got", elfcpp::SHT_PROGBITS,
200+ (elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE),
201+ this->got_irelative_,
202+ got_order, is_got_relro);
203+
204 }
205 return this->got_;
206 }
207@@ -4257,14 +4312,43 @@ Target_arm<big_endian>::rel_dyn_section(Layout* layout)
208 if (this->rel_dyn_ == NULL)
209 {
210 gold_assert(layout != NULL);
211+ // Create both relocation sections in the same place, so as to ensure
212+ // their relative order in the output section.
213 this->rel_dyn_ = new Reloc_section(parameters->options().combreloc());
214+ this->rel_irelative_ = new Reloc_section(false);
215 layout->add_output_section_data(".rel.dyn", elfcpp::SHT_REL,
216 elfcpp::SHF_ALLOC, this->rel_dyn_,
217 ORDER_DYNAMIC_RELOCS, false);
218+ layout->add_output_section_data(".rel.dyn", elfcpp::SHT_REL,
219+ elfcpp::SHF_ALLOC, this->rel_irelative_,
220+ ORDER_DYNAMIC_RELOCS, false);
221 }
222 return this->rel_dyn_;
223 }
224
225+
226+// Get the section to use for IRELATIVE relocs, creating it if necessary. These
227+// go in .rela.dyn, but only after all other dynamic relocations. They need to
228+// follow the other dynamic relocations so that they can refer to global
229+// variables initialized by those relocs.
230+
231+template<bool big_endian>
232+typename Target_arm<big_endian>::Reloc_section*
233+Target_arm<big_endian>::rel_irelative_section(Layout* layout)
234+{
235+ if (this->rel_irelative_ == NULL)
236+ {
237+ // Delegate the creation to rel_dyn_section so as to ensure their order in
238+ // the output section.
239+ this->rel_dyn_section(layout);
240+ gold_assert(this->rel_irelative_ != NULL
241+ && (this->rel_dyn_->output_section()
242+ == this->rel_irelative_->output_section()));
243+ }
244+ return this->rel_irelative_;
245+}
246+
247+
248 // Insn_template methods.
249
250 // Return byte size of an instruction template.
251@@ -7221,24 +7305,80 @@ template<bool big_endian>
252 class Output_data_plt_arm : public Output_section_data
253 {
254 public:
255+ // Unlike aarch64, which records symbol value in "addend" field of relocations
256+ // and could be done at the same time an IRelative reloc is created for the
257+ // symbol, arm puts the symbol value into "GOT" table, which, however, is
258+ // issued later in Output_data_plt_arm::do_write(). So we have a struct here
259+ // to keep necessary symbol information for later use in do_write. We usually
260+ // have only a very limited number of ifuncs, so the extra data required here
261+ // is also limited.
262+
263+ struct IRelative_data
264+ {
265+ IRelative_data(Sized_symbol<32>* sized_symbol)
266+ : symbol_is_global_(true)
267+ {
268+ u_.global = sized_symbol;
269+ }
270+
271+ IRelative_data(Sized_relobj_file<32, big_endian>* relobj,
272+ unsigned int index)
273+ : symbol_is_global_(false)
274+ {
275+ u_.local.relobj = relobj;
276+ u_.local.index = index;
277+ }
278+
279+ union
280+ {
281+ Sized_symbol<32>* global;
282+
283+ struct
284+ {
285+ Sized_relobj_file<32, big_endian>* relobj;
286+ unsigned int index;
287+ } local;
288+ } u_;
289+
290+ bool symbol_is_global_;
291+ };
292+
293 typedef Output_data_reloc<elfcpp::SHT_REL, true, 32, big_endian>
294 Reloc_section;
295
296- Output_data_plt_arm(Layout*, uint64_t addralign, Output_data_space*);
297+ Output_data_plt_arm(Layout* layout, uint64_t addralign,
298+ Arm_output_data_got<big_endian>* got,
299+ Output_data_space* got_plt,
300+ Output_data_space* got_irelative);
301
302 // Add an entry to the PLT.
303 void
304- add_entry(Symbol* gsym);
305+ add_entry(Symbol_table* symtab, Layout* layout, Symbol* gsym);
306+
307+ // Add the relocation for a plt entry.
308+ void
309+ add_relocation(Symbol_table* symtab, Layout* layout,
310+ Symbol* gsym, unsigned int got_offset);
311+
312+ // Add an entry to the PLT for a local STT_GNU_IFUNC symbol.
313+ unsigned int
314+ add_local_ifunc_entry(Symbol_table* symtab, Layout*,
315+ Sized_relobj_file<32, big_endian>* relobj,
316+ unsigned int local_sym_index);
317
318 // Return the .rel.plt section data.
319 const Reloc_section*
320 rel_plt() const
321 { return this->rel_; }
322
323+ // Return the PLT relocation container for IRELATIVE.
324+ Reloc_section*
325+ rel_irelative(Symbol_table*, Layout*);
326+
327 // Return the number of PLT entries.
328 unsigned int
329 entry_count() const
330- { return this->count_; }
331+ { return this->count_ + this->irelative_count_; }
332
333 // Return the offset of the first non-reserved PLT entry.
334 unsigned int
335@@ -7250,6 +7390,14 @@ class Output_data_plt_arm : public Output_section_data
336 get_plt_entry_size() const
337 { return this->do_get_plt_entry_size(); }
338
339+ // Return the PLT address for globals.
340+ uint32_t
341+ address_for_global(const Symbol*) const;
342+
343+ // Return the PLT address for locals.
344+ uint32_t
345+ address_for_local(const Relobj*, unsigned int symndx) const;
346+
347 protected:
348 // Fill in the first PLT entry.
349 void
350@@ -7298,19 +7446,37 @@ class Output_data_plt_arm : public Output_section_data
351 set_final_data_size()
352 {
353 this->set_data_size(this->first_plt_entry_offset()
354- + this->count_ * this->get_plt_entry_size());
355+ + ((this->count_ + this->irelative_count_)
356+ * this->get_plt_entry_size()));
357 }
358
359 // Write out the PLT data.
360 void
361 do_write(Output_file*);
362
363+ // Record irelative symbol data.
364+ void insert_irelative_data(const IRelative_data& idata)
365+ { irelative_data_vec_.push_back(idata); }
366+
367 // The reloc section.
368 Reloc_section* rel_;
369+ // The IRELATIVE relocs, if necessary. These must follow the
370+ // regular PLT relocations.
371+ Reloc_section* irelative_rel_;
372+ // The .got section.
373+ Arm_output_data_got<big_endian>* got_;
374 // The .got.plt section.
375 Output_data_space* got_plt_;
376+ // The part of the .got.plt section used for IRELATIVE relocs.
377+ Output_data_space* got_irelative_;
378 // The number of PLT entries.
379 unsigned int count_;
380+ // Number of PLT entries with R_ARM_IRELATIVE relocs. These
381+ // follow the regular PLT entries.
382+ unsigned int irelative_count_;
383+ // Vector for irelative data.
384+ typedef std::vector<IRelative_data> IRelative_data_vec;
385+ IRelative_data_vec irelative_data_vec_;
386 };
387
388 // Create the PLT section. The ordinary .got section is an argument,
389@@ -7318,10 +7484,14 @@ class Output_data_plt_arm : public Output_section_data
390 // section just for PLT entries.
391
392 template<bool big_endian>
393-Output_data_plt_arm<big_endian>::Output_data_plt_arm(Layout* layout,
394- uint64_t addralign,
395- Output_data_space* got_plt)
396- : Output_section_data(addralign), got_plt_(got_plt), count_(0)
397+Output_data_plt_arm<big_endian>::Output_data_plt_arm(
398+ Layout* layout, uint64_t addralign,
399+ Arm_output_data_got<big_endian>* got,
400+ Output_data_space* got_plt,
401+ Output_data_space* got_irelative)
402+ : Output_section_data(addralign), irelative_rel_(NULL),
403+ got_(got), got_plt_(got_plt), got_irelative_(got_irelative),
404+ count_(0), irelative_count_(0)
405 {
406 this->rel_ = new Reloc_section(false);
407 layout->add_output_section_data(".rel.plt", elfcpp::SHT_REL,
408@@ -7340,40 +7510,210 @@ Output_data_plt_arm<big_endian>::do_adjust_output_section(Output_section* os)
409
410 template<bool big_endian>
411 void
412-Output_data_plt_arm<big_endian>::add_entry(Symbol* gsym)
413+Output_data_plt_arm<big_endian>::add_entry(Symbol_table* symtab,
414+ Layout* layout,
415+ Symbol* gsym)
416 {
417 gold_assert(!gsym->has_plt_offset());
418
419- // Note that when setting the PLT offset we skip the initial
420- // reserved PLT entry.
421- gsym->set_plt_offset((this->count_) * this->get_plt_entry_size()
422- + this->first_plt_entry_offset());
423+ unsigned int* entry_count;
424+ Output_section_data_build* got;
425+
426+ // We have 2 different types of plt entry here, normal and ifunc.
427+
428+ // For normal plt, the offset begins with first_plt_entry_offset(20), and the
429+ // 1st entry offset would be 20, the second 32, third 44 ... etc.
430+
431+ // For ifunc plt, the offset begins with 0. So the first offset would 0,
432+ // second 12, third 24 ... etc.
433+
434+ // IFunc plt entries *always* come after *normal* plt entries.
435+
436+ // Notice, when computing the plt address of a certain symbol, "plt_address +
437+ // plt_offset" is no longer correct. Use target->plt_address_for_global() or
438+ // target->plt_address_for_local() instead.
439+
440+ int begin_offset = 0;
441+ if (gsym->type() == elfcpp::STT_GNU_IFUNC
442+ && gsym->can_use_relative_reloc(false))
443+ {
444+ entry_count = &this->irelative_count_;
445+ got = this->got_irelative_;
446+ // For irelative plt entries, offset is relative to the end of normal plt
447+ // entries, so it starts from 0.
448+ begin_offset = 0;
449+ // Record symbol information.
450+ this->insert_irelative_data(
451+ IRelative_data(symtab->get_sized_symbol<32>(gsym)));
452+ }
453+ else
454+ {
455+ entry_count = &this->count_;
456+ got = this->got_plt_;
457+ // Note that for normal plt entries, when setting the PLT offset we skip
458+ // the initial reserved PLT entry.
459+ begin_offset = this->first_plt_entry_offset();
460+ }
461+
462+ gsym->set_plt_offset(begin_offset
463+ + (*entry_count) * this->get_plt_entry_size());
464
465- ++this->count_;
466+ ++(*entry_count);
467
468- section_offset_type got_offset = this->got_plt_->current_data_size();
469+ section_offset_type got_offset = got->current_data_size();
470
471 // Every PLT entry needs a GOT entry which points back to the PLT
472 // entry (this will be changed by the dynamic linker, normally
473 // lazily when the function is called).
474- this->got_plt_->set_current_data_size(got_offset + 4);
475+ got->set_current_data_size(got_offset + 4);
476
477 // Every PLT entry needs a reloc.
478- gsym->set_needs_dynsym_entry();
479- this->rel_->add_global(gsym, elfcpp::R_ARM_JUMP_SLOT, this->got_plt_,
480- got_offset);
481+ this->add_relocation(symtab, layout, gsym, got_offset);
482
483 // Note that we don't need to save the symbol. The contents of the
484 // PLT are independent of which symbols are used. The symbols only
485 // appear in the relocations.
486 }
487
488+// Add an entry to the PLT for a local STT_GNU_IFUNC symbol. Return
489+// the PLT offset.
490+
491+template<bool big_endian>
492+unsigned int
493+Output_data_plt_arm<big_endian>::add_local_ifunc_entry(
494+ Symbol_table* symtab,
495+ Layout* layout,
496+ Sized_relobj_file<32, big_endian>* relobj,
497+ unsigned int local_sym_index)
498+{
499+ this->insert_irelative_data(IRelative_data(relobj, local_sym_index));
500+
501+ // Notice, when computingthe plt entry address, "plt_address + plt_offset" is
502+ // no longer correct. Use target->plt_address_for_local() instead.
503+ unsigned int plt_offset = this->irelative_count_ * this->get_plt_entry_size();
504+ ++this->irelative_count_;
505+
506+ section_offset_type got_offset = this->got_irelative_->current_data_size();
507+
508+ // Every PLT entry needs a GOT entry which points back to the PLT
509+ // entry.
510+ this->got_irelative_->set_current_data_size(got_offset + 4);
511+
512+
513+ // Every PLT entry needs a reloc.
514+ Reloc_section* rel = this->rel_irelative(symtab, layout);
515+ rel->add_symbolless_local_addend(relobj, local_sym_index,
516+ elfcpp::R_ARM_IRELATIVE,
517+ this->got_irelative_, got_offset);
518+ return plt_offset;
519+}
520+
521+
522+// Add the relocation for a PLT entry.
523+
524+template<bool big_endian>
525+void
526+Output_data_plt_arm<big_endian>::add_relocation(
527+ Symbol_table* symtab, Layout* layout, Symbol* gsym, unsigned int got_offset)
528+{
529+ if (gsym->type() == elfcpp::STT_GNU_IFUNC
530+ && gsym->can_use_relative_reloc(false))
531+ {
532+ Reloc_section* rel = this->rel_irelative(symtab, layout);
533+ rel->add_symbolless_global_addend(gsym, elfcpp::R_ARM_IRELATIVE,
534+ this->got_irelative_, got_offset);
535+ }
536+ else
537+ {
538+ gsym->set_needs_dynsym_entry();
539+ this->rel_->add_global(gsym, elfcpp::R_ARM_JUMP_SLOT, this->got_plt_,
540+ got_offset);
541+ }
542+}
543+
544+
545+// Create the irelative relocation data.
546+
547+template<bool big_endian>
548+typename Output_data_plt_arm<big_endian>::Reloc_section*
549+Output_data_plt_arm<big_endian>::rel_irelative(Symbol_table* symtab,
550+ Layout* layout)
551+{
552+ if (this->irelative_rel_ == NULL)
553+ {
554+ // Since irelative relocations goes into 'rel.dyn', we delegate the
555+ // creation of irelative_rel_ to where rel_dyn section gets created.
556+ Target_arm<big_endian>* arm_target =
557+ Target_arm<big_endian>::default_target();
558+ this->irelative_rel_ = arm_target->rel_irelative_section(layout);
559+
560+ // Make sure we have a place for the TLSDESC relocations, in
561+ // case we see any later on.
562+ // this->rel_tlsdesc(layout);
563+ if (parameters->doing_static_link())
564+ {
565+ // A statically linked executable will only have a .rel.plt section to
566+ // hold R_ARM_IRELATIVE relocs for STT_GNU_IFUNC symbols. The library
567+ // will use these symbols to locate the IRELATIVE relocs at program
568+ // startup time.
569+ symtab->define_in_output_data("__rel_iplt_start", NULL,
570+ Symbol_table::PREDEFINED,
571+ this->irelative_rel_, 0, 0,
572+ elfcpp::STT_NOTYPE, elfcpp::STB_GLOBAL,
573+ elfcpp::STV_HIDDEN, 0, false, true);
574+ symtab->define_in_output_data("__rel_iplt_end", NULL,
575+ Symbol_table::PREDEFINED,
576+ this->irelative_rel_, 0, 0,
577+ elfcpp::STT_NOTYPE, elfcpp::STB_GLOBAL,
578+ elfcpp::STV_HIDDEN, 0, true, true);
579+ }
580+ }
581+ return this->irelative_rel_;
582+}
583+
584+
585+// Return the PLT address for a global symbol.
586+
587+template<bool big_endian>
588+uint32_t
589+Output_data_plt_arm<big_endian>::address_for_global(const Symbol* gsym) const
590+{
591+ uint64_t begin_offset = 0;
592+ if (gsym->type() == elfcpp::STT_GNU_IFUNC
593+ && gsym->can_use_relative_reloc(false))
594+ {
595+ begin_offset = (this->first_plt_entry_offset() +
596+ this->count_ * this->get_plt_entry_size());
597+ }
598+ return this->address() + begin_offset + gsym->plt_offset();
599+}
600+
601+
602+// Return the PLT address for a local symbol. These are always
603+// IRELATIVE relocs.
604+
605+template<bool big_endian>
606+uint32_t
607+Output_data_plt_arm<big_endian>::address_for_local(
608+ const Relobj* object,
609+ unsigned int r_sym) const
610+{
611+ return (this->address()
612+ + this->first_plt_entry_offset()
613+ + this->count_ * this->get_plt_entry_size()
614+ + object->local_plt_offset(r_sym));
615+}
616+
617+
618 template<bool big_endian>
619 class Output_data_plt_arm_standard : public Output_data_plt_arm<big_endian>
620 {
621 public:
622- Output_data_plt_arm_standard(Layout* layout, Output_data_space* got_plt)
623- : Output_data_plt_arm<big_endian>(layout, 4, got_plt)
624+ Output_data_plt_arm_standard(Layout* layout,
625+ Arm_output_data_got<big_endian>* got,
626+ Output_data_space* got_plt,
627+ Output_data_space* got_irelative)
628+ : Output_data_plt_arm<big_endian>(layout, 4, got, got_plt, got_irelative)
629 { }
630
631 protected:
632@@ -7485,8 +7825,11 @@ Output_data_plt_arm<big_endian>::do_write(Output_file* of)
633 unsigned char* const oview = of->get_output_view(offset, oview_size);
634
635 const off_t got_file_offset = this->got_plt_->offset();
636+ gold_assert(got_file_offset + this->got_plt_->data_size()
637+ == this->got_irelative_->offset());
638 const section_size_type got_size =
639- convert_to_section_size_type(this->got_plt_->data_size());
640+ convert_to_section_size_type(this->got_plt_->data_size()
641+ + this->got_irelative_->data_size());
642 unsigned char* const got_view = of->get_output_view(got_file_offset,
643 got_size);
644 unsigned char* pov = oview;
645@@ -7505,7 +7848,8 @@ Output_data_plt_arm<big_endian>::do_write(Output_file* of)
646
647 unsigned int plt_offset = this->first_plt_entry_offset();
648 unsigned int got_offset = 12;
649- const unsigned int count = this->count_;
650+ const unsigned int count = this->count_ + this->irelative_count_;
651+ gold_assert(this->irelative_count_ == this->irelative_data_vec_.size());
652 for (unsigned int i = 0;
653 i < count;
654 ++i,
655@@ -7518,8 +7862,33 @@ Output_data_plt_arm<big_endian>::do_write(Output_file* of)
656 this->fill_plt_entry(pov, got_address, plt_address,
657 got_offset, plt_offset);
658
659- // Set the entry in the GOT.
660- elfcpp::Swap<32, big_endian>::writeval(got_pov, plt_address);
661+ Arm_address value;
662+ if (i < this->count_)
663+ {
664+ // For non-irelative got entries, the value is the beginning of plt.
665+ value = plt_address;
666+ }
667+ else
668+ {
669+ // For irelative got entries, the value is the (global/local) symbol
670+ // address.
671+ const IRelative_data& idata =
672+ this->irelative_data_vec_[i - this->count_];
673+ if (idata.symbol_is_global_)
674+ {
675+ // Set the entry in the GOT for irelative symbols. The content is
676+ // the address of the ifunc, not the address of plt start.
677+ const Sized_symbol<32>* sized_symbol = idata.u_.global;
678+ gold_assert(sized_symbol->type() == elfcpp::STT_GNU_IFUNC);
679+ value = sized_symbol->value();
680+ }
681+ else
682+ {
683+ value = idata.u_.local.relobj->local_symbol_value(
684+ idata.u_.local.index, 0);
685+ }
686+ }
687+ elfcpp::Swap<32, big_endian>::writeval(got_pov, value);
688 }
689
690 gold_assert(static_cast<section_size_type>(pov - oview) == oview_size);
691@@ -7529,6 +7898,7 @@ Output_data_plt_arm<big_endian>::do_write(Output_file* of)
692 of->write_output_view(got_file_offset, got_size, got_view);
693 }
694
695+
696 // Create a PLT entry for a global symbol.
697
698 template<bool big_endian>
699@@ -7540,20 +7910,58 @@ Target_arm<big_endian>::make_plt_entry(Symbol_table* symtab, Layout* layout,
700 return;
701
702 if (this->plt_ == NULL)
703+ this->make_plt_section(symtab, layout);
704+
705+ this->plt_->add_entry(symtab, layout, gsym);
706+}
707+
708+
709+// Create the PLT section.
710+template<bool big_endian>
711+void
712+Target_arm<big_endian>::make_plt_section(
713+ Symbol_table* symtab, Layout* layout)
714+{
715+ if (this->plt_ == NULL)
716 {
717- // Create the GOT sections first.
718+ // Create the GOT section first.
719 this->got_section(symtab, layout);
720
721- this->plt_ = this->make_data_plt(layout, this->got_plt_);
722+ // GOT for irelatives is create along with got.plt.
723+ gold_assert(this->got_ != NULL
724+ && this->got_plt_ != NULL
725+ && this->got_irelative_ != NULL);
726+ this->plt_ = this->make_data_plt(layout, this->got_, this->got_plt_,
727+ this->got_irelative_);
728
729 layout->add_output_section_data(".plt", elfcpp::SHT_PROGBITS,
730 (elfcpp::SHF_ALLOC
731 | elfcpp::SHF_EXECINSTR),
732 this->plt_, ORDER_PLT, false);
733 }
734- this->plt_->add_entry(gsym);
735 }
736
737+
738+// Make a PLT entry for a local STT_GNU_IFUNC symbol.
739+
740+template<bool big_endian>
741+void
742+Target_arm<big_endian>::make_local_ifunc_plt_entry(
743+ Symbol_table* symtab, Layout* layout,
744+ Sized_relobj_file<32, big_endian>* relobj,
745+ unsigned int local_sym_index)
746+{
747+ if (relobj->local_has_plt_offset(local_sym_index))
748+ return;
749+ if (this->plt_ == NULL)
750+ this->make_plt_section(symtab, layout);
751+ unsigned int plt_offset = this->plt_->add_local_ifunc_entry(symtab, layout,
752+ relobj,
753+ local_sym_index);
754+ relobj->set_local_plt_offset(local_sym_index, plt_offset);
755+}
756+
757+
758 // Return the number of entries in the PLT.
759
760 template<bool big_endian>
761@@ -7823,6 +8231,7 @@ Target_arm<big_endian>::Scan::check_non_pic(Relobj* object,
762 case elfcpp::R_ARM_JUMP_SLOT:
763 case elfcpp::R_ARM_ABS32:
764 case elfcpp::R_ARM_ABS32_NOI:
765+ case elfcpp::R_ARM_IRELATIVE:
766 case elfcpp::R_ARM_PC24:
767 // FIXME: The following 3 types are not supported by Android's dynamic
768 // linker.
769@@ -7853,6 +8262,27 @@ Target_arm<big_endian>::Scan::check_non_pic(Relobj* object,
770 }
771 }
772
773+
774+// Return whether we need to make a PLT entry for a relocation of the
775+// given type against a STT_GNU_IFUNC symbol.
776+
777+template<bool big_endian>
778+bool
779+Target_arm<big_endian>::Scan::reloc_needs_plt_for_ifunc(
780+ Sized_relobj_file<32, big_endian>* object,
781+ unsigned int r_type)
782+{
783+ int flags = Scan::get_reference_flags(r_type);
784+ if (flags & Symbol::TLS_REF)
785+ {
786+ gold_error(_("%s: unsupported TLS reloc %u for IFUNC symbol"),
787+ object->name().c_str(), r_type);
788+ return false;
789+ }
790+ return flags != 0;
791+}
792+
793+
794 // Scan a relocation for a local symbol.
795 // FIXME: This only handles a subset of relocation types used by Android
796 // on ARM v5te devices.
797@@ -7874,6 +8304,15 @@ Target_arm<big_endian>::Scan::local(Symbol_table* symtab,
798 return;
799
800 r_type = get_real_reloc_type(r_type);
801+
802+ // A local STT_GNU_IFUNC symbol may require a PLT entry.
803+ bool is_ifunc = lsym.get_st_type() == elfcpp::STT_GNU_IFUNC;
804+ if (is_ifunc && this->reloc_needs_plt_for_ifunc(object, r_type))
805+ {
806+ unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
807+ target->make_local_ifunc_plt_entry(symtab, layout, object, r_sym);
808+ }
809+
810 switch (r_type)
811 {
812 case elfcpp::R_ARM_NONE:
813@@ -7898,7 +8337,7 @@ Target_arm<big_endian>::Scan::local(Symbol_table* symtab,
814 // we need to add check_non_pic(object, r_type) here.
815 rel_dyn->add_local_relative(object, r_sym, elfcpp::R_ARM_RELATIVE,
816 output_section, data_shndx,
817- reloc.get_r_offset());
818+ reloc.get_r_offset(), is_ifunc);
819 }
820 break;
821
822@@ -8265,6 +8704,11 @@ Target_arm<big_endian>::Scan::global(Symbol_table* symtab,
823 && strcmp(gsym->name(), "_GLOBAL_OFFSET_TABLE_") == 0)
824 target->got_section(symtab, layout);
825
826+ // A STT_GNU_IFUNC symbol may require a PLT entry.
827+ if (gsym->type() == elfcpp::STT_GNU_IFUNC
828+ && this->reloc_needs_plt_for_ifunc(object, r_type))
829+ target->make_plt_entry(symtab, layout, gsym);
830+
831 r_type = get_real_reloc_type(r_type);
832 switch (r_type)
833 {
834@@ -8309,6 +8753,24 @@ Target_arm<big_endian>::Scan::global(Symbol_table* symtab,
835 }
836 else if ((r_type == elfcpp::R_ARM_ABS32
837 || r_type == elfcpp::R_ARM_ABS32_NOI)
838+ && gsym->type() == elfcpp::STT_GNU_IFUNC
839+ && gsym->can_use_relative_reloc(false)
840+ && !gsym->is_from_dynobj()
841+ && !gsym->is_undefined()
842+ && !gsym->is_preemptible())
843+ {
844+ // Use an IRELATIVE reloc for a locally defined STT_GNU_IFUNC
845+ // symbol. This makes a function address in a PIE executable
846+ // match the address in a shared library that it links against.
847+ Reloc_section* rel_irelative =
848+ target->rel_irelative_section(layout);
849+ unsigned int r_type = elfcpp::R_ARM_IRELATIVE;
850+ rel_irelative->add_symbolless_global_addend(
851+ gsym, r_type, output_section, object,
852+ data_shndx, reloc.get_r_offset());
853+ }
854+ else if ((r_type == elfcpp::R_ARM_ABS32
855+ || r_type == elfcpp::R_ARM_ABS32_NOI)
856 && gsym->can_use_relative_reloc(false))
857 {
858 Reloc_section* rel_dyn = target->rel_dyn_section(layout);
859@@ -8442,7 +8904,13 @@ Target_arm<big_endian>::Scan::global(Symbol_table* symtab,
860 Arm_output_data_got<big_endian>* got =
861 target->got_section(symtab, layout);
862 if (gsym->final_value_is_known())
863- got->add_global(gsym, GOT_TYPE_STANDARD);
864+ {
865+ // For a STT_GNU_IFUNC symbol we want the PLT address.
866+ if (gsym->type() == elfcpp::STT_GNU_IFUNC)
867+ got->add_global_plt(gsym, GOT_TYPE_STANDARD);
868+ else
869+ got->add_global(gsym, GOT_TYPE_STANDARD);
870+ }
871 else
872 {
873 // If this symbol is not fully resolved, we need to add a
874@@ -8452,12 +8920,29 @@ Target_arm<big_endian>::Scan::global(Symbol_table* symtab,
875 || gsym->is_undefined()
876 || gsym->is_preemptible()
877 || (gsym->visibility() == elfcpp::STV_PROTECTED
878- && parameters->options().shared()))
879+ && parameters->options().shared())
880+ || (gsym->type() == elfcpp::STT_GNU_IFUNC
881+ && parameters->options().output_is_position_independent()))
882 got->add_global_with_rel(gsym, GOT_TYPE_STANDARD,
883 rel_dyn, elfcpp::R_ARM_GLOB_DAT);
884 else
885 {
886- if (got->add_global(gsym, GOT_TYPE_STANDARD))
887+ // For a STT_GNU_IFUNC symbol we want to write the PLT
888+ // offset into the GOT, so that function pointer
889+ // comparisons work correctly.
890+ bool is_new;
891+ if (gsym->type() != elfcpp::STT_GNU_IFUNC)
892+ is_new = got->add_global(gsym, GOT_TYPE_STANDARD);
893+ else
894+ {
895+ is_new = got->add_global_plt(gsym, GOT_TYPE_STANDARD);
896+ // Tell the dynamic linker to use the PLT address
897+ // when resolving relocations.
898+ if (gsym->is_from_dynobj()
899+ && !parameters->options().shared())
900+ gsym->set_needs_dynsym_value();
901+ }
902+ if (is_new)
903 rel_dyn->add_global_relative(
904 gsym, elfcpp::R_ARM_RELATIVE, got,
905 gsym->got_offset(GOT_TYPE_STANDARD));
906@@ -8919,8 +9404,7 @@ Target_arm<big_endian>::Relocate::relocate(
907 if (gsym->use_plt_offset(Scan::get_reference_flags(r_type)))
908 {
909 // This uses a PLT, change the symbol value.
910- symval.set_output_value(target->plt_section()->address()
911- + gsym->plt_offset());
912+ symval.set_output_value(target->plt_address_for_global(gsym));
913 psymval = &symval;
914 }
915 else if (gsym->is_weak_undefined())
916@@ -8958,6 +9442,13 @@ Target_arm<big_endian>::Relocate::relocate(
917 elfcpp::Elf_types<32>::Elf_WXword r_info = rel.get_r_info();
918 unsigned int r_sym = elfcpp::elf_r_sym<32>(r_info);
919 thumb_bit = object->local_symbol_is_thumb_function(r_sym) ? 1 : 0;
920+
921+ if (psymval->is_ifunc_symbol() && object->local_has_plt_offset(r_sym))
922+ {
923+ symval.set_output_value(
924+ target->plt_address_for_local(object, r_sym));
925+ psymval = &symval;
926+ }
927 }
928 }
929 else
930@@ -9936,7 +10427,7 @@ uint64_t
931 Target_arm<big_endian>::do_dynsym_value(const Symbol* gsym) const
932 {
933 gold_assert(gsym->is_from_dynobj() && gsym->has_plt_offset());
934- return this->plt_section()->address() + gsym->plt_offset();
935+ return this->plt_address_for_global(gsym);
936 }
937
938 // Map platform-specific relocs to real relocs
939@@ -11083,8 +11574,7 @@ Target_arm<big_endian>::scan_reloc_for_stub(
940 if (gsym->use_plt_offset(Scan::get_reference_flags(r_type)))
941 {
942 // This uses a PLT, change the symbol value.
943- symval.set_output_value(this->plt_section()->address()
944- + gsym->plt_offset());
945+ symval.set_output_value(this->plt_address_for_global(gsym));
946 psymval = &symval;
947 target_is_thumb = false;
948 }
949@@ -12187,8 +12677,13 @@ class Target_arm_nacl : public Target_arm<big_endian>
950
951 protected:
952 virtual Output_data_plt_arm<big_endian>*
953- do_make_data_plt(Layout* layout, Output_data_space* got_plt)
954- { return new Output_data_plt_arm_nacl<big_endian>(layout, got_plt); }
955+ do_make_data_plt(
956+ Layout* layout,
957+ Arm_output_data_got<big_endian>* got,
958+ Output_data_space* got_plt,
959+ Output_data_space* got_irelative)
960+ { return new Output_data_plt_arm_nacl<big_endian>(
961+ layout, got, got_plt, got_irelative); }
962
963 private:
964 static const Target::Target_info arm_nacl_info;
965@@ -12225,8 +12720,12 @@ template<bool big_endian>
966 class Output_data_plt_arm_nacl : public Output_data_plt_arm<big_endian>
967 {
968 public:
969- Output_data_plt_arm_nacl(Layout* layout, Output_data_space* got_plt)
970- : Output_data_plt_arm<big_endian>(layout, 16, got_plt)
971+ Output_data_plt_arm_nacl(
972+ Layout* layout,
973+ Arm_output_data_got<big_endian>* got,
974+ Output_data_space* got_plt,
975+ Output_data_space* got_irelative)
976+ : Output_data_plt_arm<big_endian>(layout, 16, got, got_plt, got_irelative)
977 { }
978
979 protected:
980diff --git a/gold/output.h b/gold/output.h
981index ba0cdaa..599c2b7 100644
982--- a/gold/output.h
983+++ b/gold/output.h
984@@ -1714,6 +1714,17 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
985 address, true, true, false, false));
986 }
987
988+ void
989+ add_local_relative(Sized_relobj<size, big_endian>* relobj,
990+ unsigned int local_sym_index, unsigned int type,
991+ Output_data* od, unsigned int shndx, Address address,
992+ bool use_plt_offset)
993+ {
994+ this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
995+ address, true, true, false,
996+ use_plt_offset));
997+ }
998+
999 // Add a local relocation which does not use a symbol for the relocation,
1000 // but which gets its addend from a symbol.
1001
1002--
10032.7.0
1004
diff --git a/recipes-devtools/binutils/binutils/add-thunderx-support-for-gas.patch b/recipes-devtools/binutils/binutils/add-thunderx-support-for-gas.patch
deleted file mode 100644
index 0f6875e..0000000
--- a/recipes-devtools/binutils/binutils/add-thunderx-support-for-gas.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Add thunderx support to gas
2
3Upstream-Status: Submitted [https://sourceware.org/ml/binutils/2014-10/msg00170.html]
4
5Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
6
7Author: Andrew Pinski <apinski@cavium.com>
8Date: Mon, 20 Oct 2014 11:42:58 -0700
9
10 This patch adds -mcpu=thunderx support to gas.
11
12diff -Naurp git_org/gas/config/tc-aarch64.c git/gas/config/tc-aarch64.c
13--- git_org/gas/config/tc-aarch64.c 2015-09-07 02:13:51.988973523 -0700
14+++ git/gas/config/tc-aarch64.c 2015-09-07 02:15:21.705981540 -0700
15@@ -7206,6 +7206,7 @@ static const struct aarch64_cpu_option_t
16 AARCH64_FEATURE_CRC), "Cortex-A57"},
17 {"cortex-a72", AARCH64_FEATURE (AARCH64_ARCH_V8,
18 AARCH64_FEATURE_CRC), "Cortex-A72"},
19+ {"thunderx", AARCH64_ARCH_V8, "Cavium ThunderX"},
20 {"exynos-m1", AARCH64_FEATURE (AARCH64_ARCH_V8,
21 AARCH64_FEATURE_CRC | AARCH64_FEATURE_CRYPTO),
22 "Samsung Exynos M1"},
23diff -Naurp git_org/gas/doc/c-aarch64.texi git/gas/doc/c-aarch64.texi
24--- git_org/gas/doc/c-aarch64.texi 2015-09-07 02:13:51.969973522 -0700
25+++ git/gas/doc/c-aarch64.texi 2015-09-07 02:16:03.364985262 -0700
26@@ -58,6 +58,7 @@ on the target processor. The following
27 @code{cortex-a53},
28 @code{cortex-a57},
29 @code{cortex-a72},
30+@code{thunderx},
31 @code{exynos-m1},
32 @code{xgene1},
33 and
diff --git a/recipes-devtools/binutils/binutils/binutils-octeon3.patch b/recipes-devtools/binutils/binutils/binutils-octeon3.patch
deleted file mode 100644
index 4e8c69f..0000000
--- a/recipes-devtools/binutils/binutils/binutils-octeon3.patch
+++ /dev/null
@@ -1,272 +0,0 @@
1Upstream-Status: Backport
2
3https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=2c62985659da21a3fe16062d211a7158f79ad2e9
4
5Signed-off-By: Armin Kuster <akuster@mvista.com>
6
7Index: git/bfd/archures.c
8===================================================================
9--- git.orig/bfd/archures.c
10+++ git/bfd/archures.c
11@@ -179,6 +179,7 @@ DESCRIPTION
12 .#define bfd_mach_mips_octeon 6501
13 .#define bfd_mach_mips_octeonp 6601
14 .#define bfd_mach_mips_octeon2 6502
15+.#define bfd_mach_mips_octeon3 6503
16 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *}
17 .#define bfd_mach_mips_xlp 887680 {* decimal 'XLP' *}
18 .#define bfd_mach_mipsisa32 32
19Index: git/bfd/bfd-in2.h
20===================================================================
21--- git.orig/bfd/bfd-in2.h
22+++ git/bfd/bfd-in2.h
23@@ -1969,6 +1969,7 @@ enum bfd_architecture
24 #define bfd_mach_mips_octeon 6501
25 #define bfd_mach_mips_octeonp 6601
26 #define bfd_mach_mips_octeon2 6502
27+#define bfd_mach_mips_octeon3 6503
28 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */
29 #define bfd_mach_mips_xlp 887680 /* decimal 'XLP' */
30 #define bfd_mach_mipsisa32 32
31Index: git/bfd/cpu-mips.c
32===================================================================
33--- git.orig/bfd/cpu-mips.c
34+++ git/bfd/cpu-mips.c
35@@ -102,6 +102,7 @@ enum
36 I_mipsocteon,
37 I_mipsocteonp,
38 I_mipsocteon2,
39+ I_mipsocteon3,
40 I_xlr,
41 I_micromips,
42 I_xlp
43@@ -153,6 +154,7 @@ static const bfd_arch_info_type arch_inf
44 N (64, 64, bfd_mach_mips_octeon,"mips:octeon", FALSE, NN(I_mipsocteon)),
45 N (64, 64, bfd_mach_mips_octeonp,"mips:octeon+", FALSE, NN(I_mipsocteonp)),
46 N (64, 64, bfd_mach_mips_octeon2,"mips:octeon2", FALSE, NN(I_mipsocteon2)),
47+ N (64, 64, bfd_mach_mips_octeon3,"mips:octeon3", FALSE, NN(I_mipsocteon3)),
48 N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)),
49 N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,NN(I_micromips)),
50 N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, 0)
51Index: git/bfd/elfxx-mips.c
52===================================================================
53--- git.orig/bfd/elfxx-mips.c
54+++ git/bfd/elfxx-mips.c
55@@ -6604,6 +6604,9 @@ _bfd_elf_mips_mach (flagword flags)
56 case E_MIPS_MACH_LS3A:
57 return bfd_mach_mips_loongson_3a;
58
59+ case E_MIPS_MACH_OCTEON3:
60+ return bfd_mach_mips_octeon3;
61+
62 case E_MIPS_MACH_OCTEON2:
63 return bfd_mach_mips_octeon2;
64
65@@ -11878,6 +11881,10 @@ mips_set_isa_flags (bfd *abfd)
66 val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON;
67 break;
68
69+ case bfd_mach_mips_octeon3:
70+ val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON3;
71+ break;
72+
73 case bfd_mach_mips_xlr:
74 val = E_MIPS_ARCH_64 | E_MIPS_MACH_XLR;
75 break;
76@@ -14773,6 +14780,7 @@ struct mips_mach_extension
77 static const struct mips_mach_extension mips_mach_extensions[] =
78 {
79 /* MIPS64r2 extensions. */
80+ { bfd_mach_mips_octeon3, bfd_mach_mips_octeon2 },
81 { bfd_mach_mips_octeon2, bfd_mach_mips_octeonp },
82 { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
83 { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
84Index: git/gas/config/tc-mips.c
85===================================================================
86--- git.orig/gas/config/tc-mips.c
87+++ git/gas/config/tc-mips.c
88@@ -306,7 +306,7 @@ static unsigned int file_ase_explicit;
89 unsigned long mips_gprmask;
90 unsigned long mips_cprmask[4];
91
92-/* True if any MIPS16 code was produced. */
93+/* 2True if any MIPS16 code was produced. */
94 static int file_ase_mips16;
95
96 #define ISA_SUPPORTS_MIPS16E (mips_opts.isa == ISA_MIPS32 \
97@@ -510,7 +510,8 @@ static int mips_32bitmode = 0;
98 #define CPU_HAS_ROR(CPU) CPU_HAS_DROR (CPU)
99
100 /* True if CPU is in the Octeon family */
101-#define CPU_IS_OCTEON(CPU) ((CPU) == CPU_OCTEON || (CPU) == CPU_OCTEONP || (CPU) == CPU_OCTEON2)
102+#define CPU_IS_OCTEON(CPU) ((CPU) == CPU_OCTEON || (CPU) == CPU_OCTEONP \
103+ || (CPU) == CPU_OCTEON2 || (CPU) == CPU_OCTEON3)
104
105 /* True if CPU has seq/sne and seqi/snei instructions. */
106 #define CPU_HAS_SEQ(CPU) (CPU_IS_OCTEON (CPU))
107@@ -18677,6 +18678,7 @@ static const struct mips_cpu_info mips_c
108 { "octeon", 0, 0, ISA_MIPS64R2, CPU_OCTEON },
109 { "octeon+", 0, 0, ISA_MIPS64R2, CPU_OCTEONP },
110 { "octeon2", 0, 0, ISA_MIPS64R2, CPU_OCTEON2 },
111+ { "octeon3", 0, ASE_VIRT | ASE_VIRT64, ISA_MIPS64R2, CPU_OCTEON3 },
112
113 /* RMI Xlr */
114 { "xlr", 0, 0, ISA_MIPS64, CPU_XLR },
115Index: git/gas/doc/c-mips.texi
116===================================================================
117--- git.orig/gas/doc/c-mips.texi
118+++ git/gas/doc/c-mips.texi
119@@ -382,6 +382,7 @@ loongson3a,
120 octeon,
121 octeon+,
122 octeon2,
123+octeon3,
124 xlr,
125 xlp
126 @end quotation
127Index: git/gas/testsuite/gas/mips/mips.exp
128===================================================================
129--- git.orig/gas/testsuite/gas/mips/mips.exp
130+++ git/gas/testsuite/gas/mips/mips.exp
131@@ -1102,6 +1102,7 @@ if { [istarget mips*-*-vxworks*] } {
132 run_list_test_arches "octeon-ill" [mips_arch_list_matching octeon]
133 run_dump_test_arches "octeon-pref" [mips_arch_list_matching octeon]
134 run_dump_test_arches "octeon2" [mips_arch_list_matching octeon2]
135+ run_dump_test_arches "octeon3" [mips_arch_list_matching octeon3]
136
137 run_dump_test "smartmips"
138 run_dump_test_arches "mips32-dsp" [mips_arch_list_matching mips32r2 \
139Index: git/gas/testsuite/gas/mips/octeon3.d
140===================================================================
141--- /dev/null
142+++ git/gas/testsuite/gas/mips/octeon3.d
143@@ -0,0 +1,20 @@
144+#objdump: -d -r --show-raw-insn
145+#name: MIPS octeon3 instructions
146+
147+.*: +file format .*mips.*
148+
149+Disassembly of section .text:
150+
151+[0-9a-f]+ <foo>:
152+.*: 71ec0008 mtm0 t3,t0
153+.*: 71a40008 mtm0 t1,a0
154+.*: 7083000c mtm1 a0,v1
155+.*: 70e1000c mtm1 a3,at
156+.*: 7022000d mtm2 at,v0
157+.*: 7083000c mtm1 a0,v1
158+.*: 70a20009 mtp0 a1,v0
159+.*: 70c40009 mtp0 a2,a0
160+.*: 7083000a mtp1 a0,v1
161+.*: 70e1000a mtp1 a3,at
162+.*: 7022000b mtp2 at,v0
163+.*: 7083000a mtp1 a0,v1
164Index: git/gas/testsuite/gas/mips/octeon3.s
165===================================================================
166--- /dev/null
167+++ git/gas/testsuite/gas/mips/octeon3.s
168@@ -0,0 +1,22 @@
169++ .text
170+ .set noreorder
171+ .set noat
172+
173+foo:
174+ mtm0 $15,$12
175+ mtm0 $13,$4
176+
177+ mtm1 $4,$3
178+ mtm1 $7,$1
179+
180+ mtm2 $1,$2
181+ mtm1 $4,$3
182+
183+ mtp0 $5,$2
184+ mtp0 $6,$4
185+
186+ mtp1 $4,$3
187+ mtp1 $7,$1
188+
189+ mtp2 $1,$2
190+ mtp1 $4,$3
191Index: git/include/opcode/mips.h
192===================================================================
193--- git.orig/include/opcode/mips.h
194+++ git/include/opcode/mips.h
195@@ -1196,6 +1196,7 @@ static const unsigned int mips_isa_table
196 #define INSN_OCTEON 0x00000800
197 #define INSN_OCTEONP 0x00000200
198 #define INSN_OCTEON2 0x00000100
199+#define INSN_OCTEON3 0x00000040
200
201 /* MIPS R5900 instruction */
202 #define INSN_5900 0x00004000
203@@ -1325,6 +1326,7 @@ static const unsigned int mips_isa_table
204 #define CPU_OCTEON 6501
205 #define CPU_OCTEONP 6601
206 #define CPU_OCTEON2 6502
207+#define CPU_OCTEON3 6503
208 #define CPU_XLR 887682 /* decimal 'XLR' */
209 #define CPU_XLP 887680 /* decimal 'XLP' */
210
211@@ -1391,6 +1393,9 @@ cpu_is_member (int cpu, unsigned int mas
212 case CPU_OCTEON2:
213 return (mask & INSN_OCTEON2) != 0;
214
215+ case CPU_OCTEON3:
216+ return (mask & INSN_OCTEON3) != 0;
217+
218 case CPU_XLR:
219 return (mask & INSN_XLR) != 0;
220
221Index: git/opcodes/mips-dis.c
222===================================================================
223--- git.orig/opcodes/mips-dis.c
224+++ git/opcodes/mips-dis.c
225@@ -649,6 +649,11 @@ const struct mips_arch_choice mips_arch_
226 ISA_MIPS64R2 | INSN_OCTEON2, 0, mips_cp0_names_numeric,
227 NULL, 0, mips_cp1_names_mips3264, mips_hwr_names_numeric },
228
229+ { "octeon3", 1, bfd_mach_mips_octeon3, CPU_OCTEON3,
230+ ISA_MIPS64R2 | INSN_OCTEON3, ASE_VIRT | ASE_VIRT64,
231+ mips_cp0_names_numeric,
232+ NULL, 0, mips_cp1_names_mips3264, mips_hwr_names_numeric },
233+
234 { "xlr", 1, bfd_mach_mips_xlr, CPU_XLR,
235 ISA_MIPS64 | INSN_XLR, 0,
236 mips_cp0_names_xlr,
237Index: git/opcodes/mips-opc.c
238===================================================================
239--- git.orig/opcodes/mips-opc.c
240+++ git/opcodes/mips-opc.c
241@@ -316,9 +316,10 @@ decode_mips_operand (const char *p)
242 #define N5 (INSN_5400 | INSN_5500)
243 #define N54 INSN_5400
244 #define N55 INSN_5500
245-#define IOCT (INSN_OCTEON | INSN_OCTEONP | INSN_OCTEON2)
246-#define IOCTP (INSN_OCTEONP | INSN_OCTEON2)
247-#define IOCT2 INSN_OCTEON2
248+#define IOCT (INSN_OCTEON | INSN_OCTEONP | INSN_OCTEON2 | INSN_OCTEON3)
249+#define IOCTP (INSN_OCTEONP | INSN_OCTEON2 | INSN_OCTEON3)
250+#define IOCT2 (INSN_OCTEON2 | INSN_OCTEON3)
251+#define IOCT3 INSN_OCTEON3
252 #define XLR INSN_XLR
253 #define XLP INSN_XLP
254 #define IVIRT ASE_VIRT
255@@ -1505,11 +1506,17 @@ const struct mips_opcode mips_builtin_op
256 {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 },
257 {"mtcr", "t,s", 0x70000019, 0xfc00ffff, RD_1, 0, XLR|XLP, 0, 0 },
258 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
259+{"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
260 {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
261+{"mtm1", "s,t", 0x7000000c, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
262 {"mtm2", "s", 0x7000000d, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
263+{"mtm2", "s,t", 0x7000000d, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
264 {"mtp0", "s", 0x70000009, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
265+{"mtp0", "s,t", 0x70000009, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
266 {"mtp1", "s", 0x7000000a, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
267+{"mtp1", "s,t", 0x7000000a, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
268 {"mtp2", "s", 0x7000000b, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 },
269+{"mtp2", "s,t", 0x7000000b, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 },
270 {"mtsa", "s", 0x00000029, 0xfc1fffff, RD_1, 0, EE, 0, 0 },
271 {"mtsab", "s,j", 0x04180000, 0xfc1f0000, RD_1, 0, EE, 0, 0 },
272 {"mtsah", "s,j", 0x04190000, 0xfc1f0000, RD_1, 0, EE, 0, 0 },
diff --git a/recipes-devtools/binutils/binutils_2.25.1.bb b/recipes-devtools/binutils/binutils_2.25.1.bb
deleted file mode 100644
index 6f42671..0000000
--- a/recipes-devtools/binutils/binutils_2.25.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
1require binutils.inc
2require binutils-${PV}.inc
3
4DEPENDS += "flex bison zlib"
5
6EXTRA_OECONF += "--with-sysroot=/ \
7 --enable-install-libbfd \
8 --enable-install-libiberty \
9 --enable-shared \
10 "
11
12EXTRA_OECONF_class-native = "--enable-targets=all \
13 --enable-64-bit-bfd \
14 --enable-install-libiberty \
15 --enable-install-libbfd"
16
17do_install_class-native () {
18 autotools_do_install
19
20 # Install the libiberty header
21 install -d ${D}${includedir}
22 install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
23 install -m 644 ${S}/include/libiberty.h ${D}${includedir}
24
25 # We only want libiberty, libbfd and libopcodes
26 rm -rf ${D}${bindir}
27 rm -rf ${D}${prefix}/${TARGET_SYS}
28 rm -rf ${D}${prefix}/lib/ldscripts
29 rm -rf ${D}${prefix}/share/info
30 rm -rf ${D}${prefix}/share/locale
31 rm -rf ${D}${prefix}/share/man
32 rmdir ${D}${prefix}/share || :
33 rmdir ${D}/${libdir}/gcc-lib || :
34 rmdir ${D}/${libdir}64/gcc-lib || :
35 rmdir ${D}/${libdir} || :
36 rmdir ${D}/${libdir}64 || :
37}
38
39BBCLASSEXTEND = "native nativesdk"