binutils: Switch to using binutils stable/2.25 branch

We have a lot of patches on top of 2.25 release that we need
its easier/cleaner to use the git src instead of tarball and use
the latest on the 2.25 branch

Additionally, drop binutils-uclibc-300-006_better_file_error.patch
since it has been redone with
https://sourceware.org/ml/binutils/2006-10/msg00337.html upstream

git'ify the patches against upstream repos for better maintainance

Change-Id: I572c9bb49f60853e7ade4e8f63ab77b7e41476c5
(From OE-Core rev: 3c7fe424f850af70989ad682dd9c5be70cd02ca5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

24 files changed, 9045 insertions, 9011 deletions

diff --git a/meta/recipes-devtools/binutils/binutils-2.25.inc b/meta/recipes-devtools/binutils/binutils-2.25.inc
index d9075b61f4..6f76530445 100644
--- a/meta/recipes-devtools/binutils/binutils-2.25.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.25.inc
@@ -10,22 +10,30 @@ LIC_FILES_CHKSUM="\
     file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
     "
 
+def binutils_branch_version(d):
+    pvsplit = d.getVar('PV', True).split('.')
+    return pvsplit[0] + "_" + pvsplit[1]
+
+BINUPV = "${@binutils_branch_version(d)}"
+
+SRCREV = "f2df1e49400f9e2d8d63a5d0fec9bf8c5c2b3342"
 SRC_URI = "\
-     ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-uclibc-100-uclibc-conf.patch \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
-     file://binutils-uclibc-300-006_better_file_error.patch \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
-     file://binutils-uclibc-gas-needs-libm.patch \
-     file://libtool-2.4-update.patch \
-     file://libiberty_path_fix.patch \
-     file://binutils-poison.patch \
-     file://libtool-rpath-fix.patch \
-     file://binutils-armv5e.patch \
-     file://mips64-default-ld-emulation.patch \
-     file://binutils-xlp-support.patch \
-     file://0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch \
+     git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
+     file://0002-configure-widen-the-regexp-for-SH-architectures.patch \
+     file://0003-Point-scripts-location-to-libdir.patch \
+     file://0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
+     file://0005-Explicitly-link-with-libm-on-uclibc.patch \
+     file://0006-Use-libtool-2.4.patch \
+     file://0007-Add-the-armv5e-architecture-to-binutils.patch \
+     file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
+     file://0009-Upstream-Status-Inappropriate-distribution-codesourc.patch \
+     file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
+     file://0011-Change-default-emulation-for-mips64-linux.patch \
+     file://0012-Add-XLP-instructions-support.patch \
+     file://0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch \
      "
-SRC_URI[md5sum] = "d9f3303f802a5b6b0bb73a335ab89d66"
-SRC_URI[sha256sum] = "22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923"
+S  = "${WORKDIR}/git"
 
+do_configure_prepend () {
+        rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim
+}
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb
index b6d9a215e1..788106f9e7 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb
@@ -6,7 +6,7 @@ PN = "binutils-crosssdk-${TARGET_ARCH}"
 
 PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
 
-SRC_URI += "file://relocatable_sdk.patch"
+SRC_URI += "file://0001-Generate-relocatable-SDKs.patch"
 
 do_configure_prepend () {
         sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
diff --git a/meta/recipes-devtools/binutils/binutils/0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch b/meta/recipes-devtools/binutils/binutils/0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch
deleted file mode 100644
index f786b176f2..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Backport
-
-From 0a09fb4a09e80c36fa3ef763ae276fd13d272a36 Mon Sep 17 00:00:00 2001
-From: Hans-Peter Nilsson <hp@bitrange.com>
-Date: Sat, 1 Feb 2014 01:11:28 +0100
-Subject: [PATCH] Fix MMIX build breakage from bfd_set_section_vma change.
-
-        * emultempl/mmix-elfnmmo.em (mmix_after_allocation): Fix typo in
-        call to bfd_set_section_vma exposed by recent bfd_set_section_vma
-        change.
----
- ld/ChangeLog                 |    6 ++++++
- ld/emultempl/mmix-elfnmmo.em |    2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/ld/emultempl/mmix-elfnmmo.em b/ld/emultempl/mmix-elfnmmo.em
-index 0059792..5e9781a 100644
---- a/ld/emultempl/mmix-elfnmmo.em
-+++ b/ld/emultempl/mmix-elfnmmo.em
-@@ -102,7 +102,7 @@ mmix_after_allocation (void)
-      This section is only present when there are register symbols.  */
-   sec = bfd_get_section_by_name (link_info.output_bfd, MMIX_REG_SECTION_NAME);
-   if (sec != NULL)
--    bfd_set_section_vma (abfd, sec, 0);
-+    bfd_set_section_vma (sec->owner, sec, 0);
- 
-   if (!_bfd_mmix_after_linker_allocation (link_info.output_bfd, &link_info))
-     {
--- 
-1.7.10.4
-
diff --git a/meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch b/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
index 7408c31aad..1e80c1f791 100644
--- a/meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch
+++ b/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch
@@ -1,17 +1,27 @@
-Upstream-Status: Inappropriate [SDK specific]
+From f71ecf251f84b4bbc9b7a832d5cd4a8bae95d83b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:58:54 +0000
+Subject: [PATCH 01/13] Generate relocatable SDKs
+
+This patch will modify the ELF linker scripts so that the crosssdk
+linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries
+will be relocated, at SDK install time, the interpreter path can be easily
+changed by the relocating script.
 
-This patch will modify the ELF linker scripts so that the crosssdk linker will
-generate binaries with a 4096 bytes PT_INTERP section. When the binaries will
-be relocated, at SDK install time, the interpreter path can be easily changed
-by the relocating script.
+Upstream-Status: Inappropriate [SDK specific]
 
 Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ld/genscripts.sh      | 3 +++
+ ld/scripttempl/elf.sc | 4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
 
-Index: binutils_git/ld/genscripts.sh
-===================================================================
---- binutils_git.orig/ld/genscripts.sh  2012-11-21 11:58:23.325441925 +0200
-+++ binutils_git/ld/genscripts.sh       2012-11-21 12:03:42.106815400 +0200
-@@ -290,6 +290,7 @@
+diff --git a/ld/genscripts.sh b/ld/genscripts.sh
+index 499607a..075dd04 100755
+--- a/ld/genscripts.sh
++++ b/ld/genscripts.sh
+@@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
  LD_FLAG=r
  DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
  DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
@@ -19,7 +29,7 @@ Index: binutils_git/ld/genscripts.sh
  ( echo "/* Script for ld -r: link without relocation */"
    . ${CUSTOMIZER_SCRIPT}
    . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
-@@ -298,10 +299,12 @@
+@@ -285,10 +286,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
  LD_FLAG=u
  DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
  CONSTRUCTING=" "
@@ -32,11 +42,11 @@ Index: binutils_git/ld/genscripts.sh
  
  LD_FLAG=
  DATA_ALIGNMENT=${DATA_ALIGNMENT_}
-Index: binutils_git/ld/scripttempl/elf.sc
-===================================================================
---- binutils_git.orig/ld/scripttempl/elf.sc     2012-11-21 12:02:26.800377384 +0200
-+++ binutils_git/ld/scripttempl/elf.sc  2012-11-21 12:04:16.166109621 +0200
-@@ -124,8 +124,8 @@
+diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
+index 4368fd9..9f01e8c 100644
+--- a/ld/scripttempl/elf.sc
++++ b/ld/scripttempl/elf.sc
+@@ -131,8 +131,8 @@ if test -n "${COMMONPAGESIZE}"; then
    DATA_SEGMENT_END=". = DATA_SEGMENT_END (.);"
    DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
  fi
@@ -47,3 +57,6 @@ Index: binutils_git/ld/scripttempl/elf.sc
  fi
  if test -z "$PLT"; then
    IPLT=".iplt         ${RELOCATING-0} : { *(.iplt) }"
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
new file mode 100644
index 0000000000..34e21d144d
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch
@@ -0,0 +1,56 @@
+From dfbcfb0d71765b337e63562299a943043928d2d2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:07:33 +0000
+Subject: [PATCH 02/13] configure: widen the regexp for SH architectures
+
+gprof needs to know about uclibc
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure       | 4 ++--
+ gprof/configure | 5 +++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 87677bc..e9f2f13 100755
+--- a/configure
++++ b/configure
+@@ -3341,7 +3341,7 @@ case "${target}" in
+     ;;
+   s390-*-* | s390x-*-*)
+     ;;
+-  sh-*-* | sh[34]*-*-*)
++  sh*-*-* | sh[34]*-*-*)
+     ;;
+   sh64-*-* | sh5*-*-*)
+     ;;
+@@ -3812,7 +3812,7 @@ case "${target}" in
+   or1k*-*-*)
+     noconfigdirs="$noconfigdirs gdb"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+diff --git a/gprof/configure b/gprof/configure
+index b09c8fb..79961c5 100755
+--- a/gprof/configure
++++ b/gprof/configure
+@@ -5869,6 +5869,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++  ;;
++
+ netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
new file mode 100644
index 0000000000..f5ce7674d4
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch
@@ -0,0 +1,42 @@
+From dfb1412da67bbfe3e993d107d0b5e392f44141ab Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:09:58 +0000
+Subject: [PATCH 03/13] Point scripts location to libdir
+
+Upstream-Status: Inappropriate [debian patch]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ld/Makefile.am | 2 +-
+ ld/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ld/Makefile.am b/ld/Makefile.am
+index 9575f1f..84df0bf 100644
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -54,7 +54,7 @@ endif
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff --git a/ld/Makefile.in b/ld/Makefile.in
+index 9f56ca1..272860f 100644
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
new file mode 100644
index 0000000000..e3cd2a4d64
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -0,0 +1,41 @@
+From 3126608b8c95a792ade56cf62a531d935d391c50 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:27:17 +0000
+Subject: [PATCH 04/13] Only generate an RPATH entry if LD_RUN_PATH is not
+ empty
+
+for cases where -rpath isn't specified. debian (#151024)
+
+Upstream-Status: Pending
+
+Signed-off-by: Chris Chimelis <chris@debian.org>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ld/emultempl/elf32.em | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index 36dee8e..07bea52 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1198,6 +1198,8 @@ fragment <<EOF
+              && command_line.rpath == NULL)
+            {
+              lib_path = (const char *) getenv ("LD_RUN_PATH");
++             if ((lib_path) && (strlen (lib_path) == 0))
++                 lib_path = NULL;
+              if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+                                                      force))
+                break;
+@@ -1461,6 +1463,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++    rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch b/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
new file mode 100644
index 0000000000..9bbd93e972
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch
@@ -0,0 +1,52 @@
+From f1703bcc7a5c507e471e2630b5a2de129100315a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:32:49 +0000
+Subject: [PATCH 05/13] Explicitly link with libm on uclibc
+
+Description:
+
+We do not need to have the libtool patch anymore for binutils after
+libtool has been updated upstream it include support for it. However
+for building gas natively on uclibc systems we have to link it with
+-lm so that it picks up missing symbols.
+
+/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o):
+In function `floatformat_from_double':
+floatformat.c:(.text+0x1ec): undefined reference to `frexp'
+floatformat.c:(.text+0x2f8): undefined reference to `ldexp'
+/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o):
+In function `floatformat_to_double':
+floatformat.c:(.text+0x38a): undefined reference to `ldexp'
+floatformat.c:(.text+0x3d2): undefined reference to `ldexp'
+floatformat.c:(.text+0x43e): undefined reference to `ldexp'
+floatformat.c:(.text+0x4e2): undefined reference to `ldexp'
+collect2: ld returned 1 exit status
+make[4]: *** [as-new] Error 1
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gas/configure.tgt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gas/configure.tgt b/gas/configure.tgt
+index 9abc768..1d92f55 100644
+--- a/gas/configure.tgt
++++ b/gas/configure.tgt
+@@ -477,6 +477,12 @@ case ${generic_target} in
+   *-*-netware)                         fmt=elf em=netware ;;
+ esac
+ 
++case ${generic_target} in
++  arm-*-*uclibc*)
++    need_libm=yes
++    ;;
++esac
++
+ case ${cpu_type} in
+   aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | sparc | z80 | z8k)
+     bfd_gas=yes
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
index 9aaecd9443..62967efb19 100644
--- a/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch
+++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
@@ -1,7130 +1,35 @@
-Upstream-Status: Inappropriate [embedded specific]
+From 03eb9b4fe583e88a22fd8c25b43fbd9bafe21af6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:34:41 +0000
+Subject: [PATCH 06/13] Use libtool 2.4
 
-Index: binutils-2.24/libtool.m4
-===================================================================
---- binutils-2.24.orig/libtool.m4       2013-11-04 07:33:40.000000000 -0800
-+++ binutils-2.24/libtool.m4    2013-12-15 11:10:23.863785363 -0800
-@@ -1,7 +1,8 @@
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- #
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-+#                 Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- # This file is free software; the Free Software Foundation gives
-@@ -10,7 +11,8 @@
- 
- m4_define([_LT_COPYING], [dnl
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-+#                 Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- #   This file is part of GNU Libtool.
-@@ -37,7 +39,7 @@
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ])
- 
--# serial 56 LT_INIT
-+# serial 57 LT_INIT
- 
- 
- # LT_PREREQ(VERSION)
-@@ -92,7 +94,8 @@
- LIBTOOL_DEPS="$ltmain"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)'
-+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
- AC_SUBST(LIBTOOL)dnl
- 
- _LT_SETUP
-@@ -166,10 +169,13 @@
- dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
- m4_require([_LT_CMD_RELOAD])dnl
- m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
- m4_require([_LT_CMD_OLD_ARCHIVE])dnl
- m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_WITH_SYSROOT])dnl
- 
- _LT_CONFIG_LIBTOOL_INIT([
- # See if we are running on zsh, and set the options which allow our
-@@ -199,7 +205,7 @@
- esac
- 
- # Global variables:
--ofile=libtool
-+ofile=${host_alias}-libtool
- can_build_shared=yes
- 
- # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -632,7 +638,7 @@
- m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
- configured by $[0], generated by m4_PACKAGE_STRING.
- 
--Copyright (C) 2009 Free Software Foundation, Inc.
-+Copyright (C) 2010 Free Software Foundation, Inc.
- This config.lt script is free software; the Free Software Foundation
- gives unlimited permision to copy, distribute and modify it."
- 
-@@ -746,15 +752,12 @@
-   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-   # text mode, it properly converts lines to CR/LF.  This bash problem
-   # is reportedly fixed, but why not run on old versions too?
--  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
-+  sed '$q' "$ltmain" >> "$cfgfile" \
-+     || (rm -f "$cfgfile"; exit 1)
- 
--  _LT_PROG_XSI_SHELLFNS
-+  _LT_PROG_REPLACE_SHELLFNS
- 
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
--
--  mv -f "$cfgfile" "$ofile" ||
-+   mv -f "$cfgfile" "$ofile" ||
-     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-   chmod +x "$ofile"
- ],
-@@ -980,6 +983,8 @@
-       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-       echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-       $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-       cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
-@@ -1069,30 +1074,41 @@
-   fi
- ])
- 
--# _LT_SYS_MODULE_PATH_AIX
--# -----------------------
-+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-+# ----------------------------------
- # Links a minimal program and checks the executable
- # for the system default hardcoded library path. In most cases,
- # this is /usr/lib:/lib, but when the MPI compilers are used
- # the location of the communication and MPI libs are included too.
- # If we don't find anything, use the default library path according
- # to the aix ld manual.
-+# Store the results from the different compilers for each TAGNAME.
-+# Allow to override them for all tags through lt_cv_aix_libpath.
- m4_defun([_LT_SYS_MODULE_PATH_AIX],
- [m4_require([_LT_DECL_SED])dnl
--AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--       /^0/ {
--           s/^0  *\(.*\)$/\1/
--           p
--       }
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi],[])
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+if test "${lt_cv_aix_libpath+set}" = set; then
-+  aix_libpath=$lt_cv_aix_libpath
-+else
-+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-+  lt_aix_libpath_sed='[
-+      /Import File Strings/,/^$/ {
-+         /^0/ {
-+             s/^0  *\([^ ]*\) *$/\1/
-+             p
-+         }
-+      }]'
-+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  # Check for a 64-bit object if we didn't find anything.
-+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  fi],[])
-+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-+  fi
-+  ])
-+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-+fi
- ])# _LT_SYS_MODULE_PATH_AIX
- 
- 
-@@ -1117,7 +1133,7 @@
- 
- AC_MSG_CHECKING([how to print strings])
- # Test print first, because it will be a builtin if present.
--if test "X`print -r -- -n 2>/dev/null`" = X-n && \
-+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-    test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-   ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-@@ -1161,6 +1177,39 @@
- ])# _LT_PROG_ECHO_BACKSLASH
- 
- 
-+# _LT_WITH_SYSROOT
-+# ----------------
-+AC_DEFUN([_LT_WITH_SYSROOT],
-+[AC_MSG_CHECKING([for sysroot])
-+AC_ARG_WITH([libtool-sysroot],
-+[  --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
-+                        (or the compiler's sysroot if not specified).],
-+[], [with_libtool_sysroot=no])
-+
-+dnl lt_sysroot will always be passed unquoted.  We quote it here
-+dnl in case the user passed a directory name.
-+lt_sysroot=
-+case ${with_libtool_sysroot} in #(
-+ yes)
-+   if test "$GCC" = yes; then
-+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-+   fi
-+   ;; #(
-+ /*)
-+   lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
-+   ;; #(
-+ no|'')
-+   ;; #(
-+ *)
-+   AC_MSG_RESULT([${with_libtool_sysroot}])
-+   AC_MSG_ERROR([The sysroot must be an absolute path.])
-+   ;;
-+esac
-+
-+ AC_MSG_RESULT([${lt_sysroot:-no}])
-+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-+[dependent libraries, and in which our libraries should be installed.])])
-+
- # _LT_ENABLE_LOCK
- # ---------------
- m4_defun([_LT_ENABLE_LOCK],
-@@ -1320,14 +1369,47 @@
- ])# _LT_ENABLE_LOCK
- 
- 
-+# _LT_PROG_AR
-+# -----------
-+m4_defun([_LT_PROG_AR],
-+[AC_CHECK_TOOLS(AR, [ar], false)
-+: ${AR=ar}
-+: ${AR_FLAGS=cru}
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-+
-+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-+  [lt_cv_ar_at_file=no
-+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-+     [echo conftest.$ac_objext > conftest.lst
-+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-+      AC_TRY_EVAL([lt_ar_try])
-+      if test "$ac_status" -eq 0; then
-+       # Ensure the archiver fails upon bogus file names.
-+       rm -f conftest.$ac_objext libconftest.a
-+       AC_TRY_EVAL([lt_ar_try])
-+       if test "$ac_status" -ne 0; then
-+          lt_cv_ar_at_file=@
-+        fi
-+      fi
-+      rm -f conftest.* libconftest.a
-+     ])
-+  ])
-+
-+if test "x$lt_cv_ar_at_file" = xno; then
-+  archiver_list_spec=
-+else
-+  archiver_list_spec=$lt_cv_ar_at_file
-+fi
-+_LT_DECL([], [archiver_list_spec], [1],
-+  [How to feed a file listing to the archiver])
-+])# _LT_PROG_AR
-+
-+
- # _LT_CMD_OLD_ARCHIVE
- # -------------------
- m4_defun([_LT_CMD_OLD_ARCHIVE],
--[AC_CHECK_TOOL(AR, ar, false)
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--_LT_DECL([], [AR], [1], [The archiver])
--_LT_DECL([], [AR_FLAGS], [1])
-+[_LT_PROG_AR
- 
- AC_CHECK_TOOL(STRIP, strip, :)
- test -z "$STRIP" && STRIP=:
-@@ -1623,7 +1705,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--[#line __oline__ "configure"
-+[#line $LINENO "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -1667,10 +1749,10 @@
- /* When -fvisbility=hidden is used, assume the code has been annotated
-    correspondingly for the symbols needed.  */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
--void fnord () __attribute__((visibility("default")));
-+int fnord () __attribute__((visibility("default")));
- #endif
- 
--void fnord () { int i=42; }
-+int fnord () { return 42; }
- int main ()
- {
-   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -2210,8 +2292,9 @@
-   need_version=no
-   need_lib_prefix=no
- 
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+  case $GCC,$cc_basename in
-+  yes,*)
-+    # gcc
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -2244,13 +2327,71 @@
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-+    dynamic_linker='Win32 ld.exe'
-+    ;;
-+
-+  *,cl*)
-+    # Native MSVC
-+    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
-+
-+    case $build_os in
-+    mingw*)
-+      sys_lib_search_path_spec=
-+      lt_save_ifs=$IFS
-+      IFS=';'
-+      for lt_path in $LIB
-+      do
-+        IFS=$lt_save_ifs
-+        # Let DOS variable expansion print the short 8.3 style file name.
-+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-+      done
-+      IFS=$lt_save_ifs
-+      # Convert to MSYS style.
-+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-+      ;;
-+    cygwin*)
-+      # Convert to unix form, then to dos form, then back to unix form
-+      # but this time dos style (no spaces!) so that the unix form looks
-+      # like /cygdrive/c/PROGRA~1:/cygdr...
-+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      ;;
-+    *)
-+      sys_lib_search_path_spec="$LIB"
-+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      # FIXME: find the short name or the path components, as spaces are
-+      # common. (e.g. "Program Files" -> "PROGRA~1")
-+      ;;
-+    esac
-+
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+    dynamic_linker='Win32 link.exe'
-     ;;
- 
-   *)
-+    # Assume MSVC wrapper
-     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    dynamic_linker='Win32 ld.exe'
-     ;;
-   esac
--  dynamic_linker='Win32 ld.exe'
-   # FIXME: first we should search . and the directory the executable is in
-   shlibpath_var=PATH
-   ;;
-@@ -2342,7 +2483,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
--  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-   hardcode_into_libs=yes
-   ;;
- 
-@@ -2950,6 +3091,11 @@
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    if test "$GCC" != yes; then
-+      reload_cmds=false
-+    fi
-+    ;;
-   darwin*)
-     if test "$GCC" = yes; then
-       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -3016,7 +3162,8 @@
-     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
--    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    # Keep this pattern in sync with the one in func_win32_libid.
-+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-     lt_cv_file_magic_cmd='$OBJDUMP -f'
-   fi
-   ;;
-@@ -3167,6 +3314,21 @@
-   ;;
- esac
- ])
-+
-+file_magic_glob=
-+want_nocaseglob=no
-+if test "$build" = "$host"; then
-+  case $host_os in
-+  mingw* | pw32*)
-+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-+      want_nocaseglob=yes
-+    else
-+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-+    fi
-+    ;;
-+  esac
-+fi
-+
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -3174,7 +3336,11 @@
- _LT_DECL([], [deplibs_check_method], [1],
-     [Method to check whether dependent libraries are shared objects])
- _LT_DECL([], [file_magic_cmd], [1],
--    [Command to use when deplibs_check_method == "file_magic"])
-+    [Command to use when deplibs_check_method = "file_magic"])
-+_LT_DECL([], [file_magic_glob], [1],
-+    [How to find potential files when deplibs_check_method = "file_magic"])
-+_LT_DECL([], [want_nocaseglob], [1],
-+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
- ])# _LT_CHECK_MAGIC_METHOD
- 
- 
-@@ -3277,6 +3443,67 @@
- dnl AC_DEFUN([AM_PROG_NM], [])
- dnl AC_DEFUN([AC_PROG_NM], [])
- 
-+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-+# --------------------------------
-+# how to determine the name of the shared library
-+# associated with a specific link library.
-+#  -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+m4_require([_LT_DECL_DLLTOOL])
-+AC_CACHE_CHECK([how to associate runtime and link libraries],
-+lt_cv_sharedlib_from_linklib_cmd,
-+[lt_cv_sharedlib_from_linklib_cmd='unknown'
-+
-+case $host_os in
-+cygwin* | mingw* | pw32* | cegcc*)
-+  # two different shell functions defined in ltmain.sh
-+  # decide which to use based on capabilities of $DLLTOOL
-+  case `$DLLTOOL --help 2>&1` in
-+  *--identify-strict*)
-+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-+    ;;
-+  *)
-+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-+    ;;
-+  esac
-+  ;;
-+*)
-+  # fallback: assume linklib IS sharedlib
-+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-+  ;;
-+esac
-+])
-+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-+
-+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-+    [Command to associate shared and link libraries])
-+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-+
-+
-+# _LT_PATH_MANIFEST_TOOL
-+# ----------------------
-+# locate the manifest tool
-+m4_defun([_LT_PATH_MANIFEST_TOOL],
-+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-+  [lt_cv_path_mainfest_tool=no
-+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-+  cat conftest.err >&AS_MESSAGE_LOG_FD
-+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-+    lt_cv_path_mainfest_tool=yes
-+  fi
-+  rm -f conftest*])
-+if test "x$lt_cv_path_mainfest_tool" != xyes; then
-+  MANIFEST_TOOL=:
-+fi
-+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-+])# _LT_PATH_MANIFEST_TOOL
-+
- 
- # LT_LIB_M
- # --------
-@@ -3403,8 +3630,8 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- 
- # Transform an extracted symbol line into symbol name and symbol address
--lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
--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'"
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+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'"
- 
- # Handle CRLF in mingw tool chain
- opt_cr=
-@@ -3440,6 +3667,7 @@
-   else
-     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[    ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-   fi
-+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -3473,6 +3701,18 @@
-       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-        if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-          cat <<_LT_EOF > conftest.$ac_ext
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-+# define LT@&t@_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data.  */
-+# define LT@&t@_DLSYM_CONST
-+#else
-+# define LT@&t@_DLSYM_CONST const
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -3484,7 +3724,7 @@
-          cat <<_LT_EOF >> conftest.$ac_ext
- 
- /* The mapping between symbol names and symbols.  */
--const struct {
-+LT@&t@_DLSYM_CONST struct {
-   const char *name;
-   void       *address;
- }
-@@ -3510,15 +3750,15 @@
- _LT_EOF
-          # Now try linking the two files.
-          mv conftest.$ac_objext conftstm.$ac_objext
--         lt_save_LIBS="$LIBS"
--         lt_save_CFLAGS="$CFLAGS"
-+         lt_globsym_save_LIBS=$LIBS
-+         lt_globsym_save_CFLAGS=$CFLAGS
-          LIBS="conftstm.$ac_objext"
-          CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-          if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-            pipe_works=yes
-          fi
--         LIBS="$lt_save_LIBS"
--         CFLAGS="$lt_save_CFLAGS"
-+         LIBS=$lt_globsym_save_LIBS
-+         CFLAGS=$lt_globsym_save_CFLAGS
-        else
-          echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-        fi
-@@ -3551,6 +3791,13 @@
-   AC_MSG_RESULT(ok)
- fi
- 
-+# Response file support.
-+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+  nm_file_list_spec='@'
-+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-+  nm_file_list_spec='@'
-+fi
-+
- _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-     [Take the output of nm and produce a listing of raw symbols and C names])
- _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-@@ -3561,6 +3808,8 @@
- _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-     [Transform the output of nm in a C name address pair when lib prefix is needed])
-+_LT_DECL([], [nm_file_list_spec], [1],
-+    [Specify filename containing input files for $NM])
- ]) # _LT_CMD_GLOBAL_SYMBOLS
- 
- 
-@@ -3572,7 +3821,6 @@
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- 
--AC_MSG_CHECKING([for $compiler option to produce PIC])
- m4_if([$1], [CXX], [
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -3678,6 +3926,12 @@
-          ;;
-        esac
-        ;;
-+      mingw* | cygwin* | os2* | pw32* | cegcc*)
-+       # This hack is so that the source file can tell whether it is being
-+       # built for inclusion in a dll (and should export symbols for example).
-+       m4_if([$1], [GCJ], [],
-+         [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+       ;;
-       dgux*)
-        case $cc_basename in
-          ec++*)
-@@ -3830,7 +4084,7 @@
-        ;;
-       solaris*)
-        case $cc_basename in
--         CC*)
-+         CC* | sunCC*)
-            # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-            _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4053,6 +4307,12 @@
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-        ;;
-+      nagfor*)
-+       # NAG Fortran compiler
-+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+       ;;
-       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
-        # which looks to be a dead project)
-@@ -4115,7 +4375,7 @@
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       case $cc_basename in
--      f77* | f90* | f95*)
-+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-       *)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4172,9 +4432,11 @@
-     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-     ;;
- esac
--AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
--_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
--       [How to pass a linker flag through the compiler])
-+
-+AC_CACHE_CHECK([for $compiler option to produce PIC],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
- 
- #
- # Check to make sure the PIC flag actually works.
-@@ -4193,6 +4455,8 @@
- _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-        [Additional compiler flags for building library objects])
- 
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+       [How to pass a linker flag through the compiler])
- #
- # Check to make sure the static flag actually works.
- #
-@@ -4213,6 +4477,7 @@
- m4_defun([_LT_LINKER_SHLIBS],
- [AC_REQUIRE([LT_PATH_LD])dnl
- AC_REQUIRE([LT_PATH_NM])dnl
-+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_DECL_EGREP])dnl
- m4_require([_LT_DECL_SED])dnl
-@@ -4221,6 +4486,7 @@
- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- m4_if([$1], [CXX], [
-   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-   case $host_os in
-   aix[[4-9]]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-@@ -4235,15 +4501,20 @@
-     ;;
-   pw32*)
-     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
--  ;;
-+    ;;
-   cygwin* | mingw* | cegcc*)
--    _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'
--  ;;
-+    case $cc_basename in
-+    cl*) ;;
-+    *)
-+      _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'
-+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-+      ;;
-+    esac
-+    ;;
-   *)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
-+    ;;
-   esac
--  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- ], [
-   runpath_var=
-   _LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -4411,7 +4682,8 @@
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_TAGVAR(always_export_symbols, $1)=no
-       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _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'
-+      _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'
-+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
- 
-       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-         _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'
-@@ -4459,7 +4731,7 @@
-       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-         && test "$tmp_diet" = no
-       then
--       tmp_addflag=
-+       tmp_addflag=' $pic_flag'
-        tmp_sharedflag='-shared'
-        case $cc_basename,$host_cpu in
-         pgcc*)                         # Portland Group C compiler
-@@ -4510,12 +4782,12 @@
-          _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-          _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
--         _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+         _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-          if test "x$supports_anon_versioning" = xyes; then
-            _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
--             $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+             $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-          fi
-          ;;
-        esac
-@@ -4529,8 +4801,8 @@
-        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-        wlarc=
-       else
--       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--       _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'
-+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+       _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'
-       fi
-       ;;
- 
-@@ -4548,8 +4820,8 @@
- 
- _LT_EOF
-       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--       _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'
-+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+       _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'
-       else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-@@ -4595,8 +4867,8 @@
- 
-     *)
-       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--       _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'
-+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+       _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'
-       else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-@@ -4726,7 +4998,7 @@
-        _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-         # Determine the default libpath from the value encoded in an
-         # empty executable.
--        _LT_SYS_MODULE_PATH_AIX
-+        _LT_SYS_MODULE_PATH_AIX([$1])
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-         _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"
-       else
-@@ -4737,7 +5009,7 @@
-        else
-         # Determine the default libpath from the value encoded in an
-         # empty executable.
--        _LT_SYS_MODULE_PATH_AIX
-+        _LT_SYS_MODULE_PATH_AIX([$1])
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-          # Warning - without using the other run time loading flags,
-          # -berok will link without error, but may produce a broken library.
-@@ -4781,20 +5053,63 @@
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      # Tell ltmain to make .lib files, not .a files.
--      libext=lib
--      # Tell ltmain to make .dll files, not .so files.
--      shrext_cmds=".dll"
--      # FIXME: Setting linknames here is a bad hack.
--      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
--      # FIXME: Should let the user specify the lib program.
--      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
--      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
--      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      case $cc_basename in
-+      cl*)
-+       # Native MSVC
-+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+       _LT_TAGVAR(always_export_symbols, $1)=yes
-+       _LT_TAGVAR(file_list_spec, $1)='@'
-+       # Tell ltmain to make .lib files, not .a files.
-+       libext=lib
-+       # Tell ltmain to make .dll files, not .so files.
-+       shrext_cmds=".dll"
-+       # FIXME: Setting linknames here is a bad hack.
-+       _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+       _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+           sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+         else
-+           sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+         fi~
-+         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+         linknames='
-+       # The linker will not automatically build a static lib if we build a DLL.
-+       # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+       _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'
-+       # Don't use ranlib
-+       _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-+       _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+         lt_tool_outputfile="@TOOL_OUTPUT@"~
-+         case $lt_outputfile in
-+           *.exe|*.EXE) ;;
-+           *)
-+             lt_outputfile="$lt_outputfile.exe"
-+             lt_tool_outputfile="$lt_tool_outputfile.exe"
-+             ;;
-+         esac~
-+         if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+           $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+           $RM "$lt_outputfile.manifest";
-+         fi'
-+       ;;
-+      *)
-+       # Assume MSVC wrapper
-+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+       # Tell ltmain to make .lib files, not .a files.
-+       libext=lib
-+       # Tell ltmain to make .dll files, not .so files.
-+       shrext_cmds=".dll"
-+       # FIXME: Setting linknames here is a bad hack.
-+       _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+       # The linker will automatically build a .lib file if we build a DLL.
-+       _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+       # FIXME: Should let the user specify the lib program.
-+       _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+       ;;
-+      esac
-       ;;
- 
-     darwin* | rhapsody*)
-@@ -4828,7 +5143,7 @@
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | dragonfly*)
--      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_TAGVAR(hardcode_direct, $1)=yes
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4836,7 +5151,7 @@
- 
-     hpux9*)
-       if test "$GCC" = yes; then
--       _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'
-+       _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'
-       else
-        _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'
-       fi
-@@ -4852,7 +5167,7 @@
- 
-     hpux10*)
-       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
--       _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-       else
-        _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-       fi
-@@ -4876,10 +5191,10 @@
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-          ;;
-        ia64*)
--         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-          ;;
-        *)
--         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-          ;;
-        esac
-       else
-@@ -4926,16 +5241,31 @@
- 
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
--       _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'
-+       _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'
-        # Try to use the -exported_symbol ld option, if it does not
-        # work, assume that -exports_file does not work either and
-        # implicitly export all symbols.
--        save_LDFLAGS="$LDFLAGS"
--        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
--        AC_LINK_IFELSE(int foo(void) {},
--          _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'
--        )
--        LDFLAGS="$save_LDFLAGS"
-+       # This should be the same for all languages, so no per-tag cache variable.
-+       AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-+         [lt_cv_irix_exported_symbol],
-+         [save_LDFLAGS="$LDFLAGS"
-+          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+          AC_LINK_IFELSE(
-+            [AC_LANG_SOURCE(
-+               [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-+                             [C++], [[int foo (void) { return 0; }]],
-+                             [Fortran 77], [[
-+      subroutine foo
-+      end]],
-+                             [Fortran], [[
-+      subroutine foo
-+      end]])])],
-+             [lt_cv_irix_exported_symbol=yes],
-+             [lt_cv_irix_exported_symbol=no])
-+           LDFLAGS="$save_LDFLAGS"])
-+       if test "$lt_cv_irix_exported_symbol" = yes; then
-+          _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'
-+       fi
-       else
-        _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'
-        _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'
-@@ -5020,7 +5350,7 @@
-     osf4* | osf5*)     # as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
-        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--       _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'
-+       _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'
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-       else
-        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -5039,9 +5369,9 @@
-       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-       if test "$GCC" = yes; then
-        wlarc='${wl}'
--       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--         $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+         $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'
-       else
-        case `$CC -V 2>&1` in
-        *"Compilers 5.0"*)
-@@ -5313,8 +5643,6 @@
-     to runtime path list])
- _LT_TAGDECL([], [link_all_deplibs], [0],
-     [Whether libtool must link a program against all its dependency libraries])
--_LT_TAGDECL([], [fix_srcfile_path], [1],
--    [Fix the shell variable $srcfile for the compiler])
- _LT_TAGDECL([], [always_export_symbols], [0],
-     [Set to "yes" if exported symbols are required])
- _LT_TAGDECL([], [export_symbols_cmds], [2],
-@@ -5325,6 +5653,8 @@
-     [Symbols that must always be exported])
- _LT_TAGDECL([], [prelink_cmds], [2],
-     [Commands necessary for linking programs (against libraries) with templates])
-+_LT_TAGDECL([], [postlink_cmds], [2],
-+    [Commands necessary for finishing linking programs])
- _LT_TAGDECL([], [file_list_spec], [1],
-     [Specify filename containing input files])
- dnl FIXME: Not yet implemented
-@@ -5426,6 +5756,7 @@
- m4_defun([_LT_LANG_CXX_CONFIG],
- [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-     (test "X$CXX" != "Xg++"))) ; then
-@@ -5487,6 +5818,7 @@
- 
-   # Allow CC to be a program name with arguments.
-   lt_save_CC=$CC
-+  lt_save_CFLAGS=$CFLAGS
-   lt_save_LD=$LD
-   lt_save_GCC=$GCC
-   GCC=$GXX
-@@ -5504,6 +5836,7 @@
-   fi
-   test -z "${LDCXX+set}" || LD=$LDCXX
-   CC=${CXX-"c++"}
-+  CFLAGS=$CXXFLAGS
-   compiler=$CC
-   _LT_TAGVAR(compiler, $1)=$CC
-   _LT_CC_BASENAME([$compiler])
-@@ -5525,8 +5858,8 @@
-       # Check if GNU C++ uses GNU ld as the underlying linker, since the
-       # archiving commands below assume that GNU ld is being used.
-       if test "$with_gnu_ld" = yes; then
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        _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'
-+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _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'
- 
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5667,7 +6000,7 @@
-           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-           # Determine the default libpath from the value encoded in an empty
-           # executable.
--          _LT_SYS_MODULE_PATH_AIX
-+          _LT_SYS_MODULE_PATH_AIX([$1])
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
-           _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"
-@@ -5679,7 +6012,7 @@
-           else
-            # Determine the default libpath from the value encoded in an
-            # empty executable.
--           _LT_SYS_MODULE_PATH_AIX
-+           _LT_SYS_MODULE_PATH_AIX([$1])
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-            # Warning - without using the other run time loading flags,
-            # -berok will link without error, but may produce a broken library.
-@@ -5721,29 +6054,75 @@
-         ;;
- 
-       cygwin* | mingw* | pw32* | cegcc*)
--        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--        # as there is no search path for DLLs.
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
--        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--        _LT_TAGVAR(always_export_symbols, $1)=no
--        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--
--        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
--          _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'
--          # If the export-symbols file already is a .def file (1st line
--          # is EXPORTS), use it as is; otherwise, prepend...
--          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--           cp $export_symbols $output_objdir/$soname.def;
--          else
--           echo EXPORTS > $output_objdir/$soname.def;
--           cat $export_symbols >> $output_objdir/$soname.def;
--          fi~
--          $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'
--        else
--          _LT_TAGVAR(ld_shlibs, $1)=no
--        fi
--        ;;
-+       case $GXX,$cc_basename in
-+       ,cl* | no,cl*)
-+         # Native MSVC
-+         # hardcode_libdir_flag_spec is actually meaningless, as there is
-+         # no search path for DLLs.
-+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+         _LT_TAGVAR(always_export_symbols, $1)=yes
-+         _LT_TAGVAR(file_list_spec, $1)='@'
-+         # Tell ltmain to make .lib files, not .a files.
-+         libext=lib
-+         # Tell ltmain to make .dll files, not .so files.
-+         shrext_cmds=".dll"
-+         # FIXME: Setting linknames here is a bad hack.
-+         _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+         _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+             $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+           else
-+             $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+           fi~
-+           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+           linknames='
-+         # The linker will not automatically build a static lib if we build a DLL.
-+         # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+         # Don't use ranlib
-+         _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-+         _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+           lt_tool_outputfile="@TOOL_OUTPUT@"~
-+           case $lt_outputfile in
-+             *.exe|*.EXE) ;;
-+             *)
-+               lt_outputfile="$lt_outputfile.exe"
-+               lt_tool_outputfile="$lt_tool_outputfile.exe"
-+               ;;
-+           esac~
-+           func_to_tool_file "$lt_outputfile"~
-+           if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+             $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+             $RM "$lt_outputfile.manifest";
-+           fi'
-+         ;;
-+       *)
-+         # g++
-+         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+         # as there is no search path for DLLs.
-+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-+         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+         _LT_TAGVAR(always_export_symbols, $1)=no
-+         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+         if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+           _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'
-+           # If the export-symbols file already is a .def file (1st line
-+           # is EXPORTS), use it as is; otherwise, prepend...
-+           _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+             cp $export_symbols $output_objdir/$soname.def;
-+           else
-+             echo EXPORTS > $output_objdir/$soname.def;
-+             cat $export_symbols >> $output_objdir/$soname.def;
-+           fi~
-+           $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'
-+         else
-+           _LT_TAGVAR(ld_shlibs, $1)=no
-+         fi
-+         ;;
-+       esac
-+       ;;
-       darwin* | rhapsody*)
-         _LT_DARWIN_LINKER_FEATURES($1)
-        ;;
-@@ -5818,7 +6197,7 @@
-             ;;
-           *)
-             if test "$GXX" = yes; then
--              _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'
-+              _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'
-             else
-               # FIXME: insert proper C++ library support
-               _LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5889,10 +6268,10 @@
-                    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                    ;;
-                  ia64*)
--                   _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'
-+                   _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'
-                    ;;
-                  *)
--                   _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'
-+                   _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'
-                    ;;
-                esac
-              fi
-@@ -5933,9 +6312,9 @@
-           *)
-            if test "$GXX" = yes; then
-              if test "$with_gnu_ld" = no; then
--               _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'
-+               _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'
-              else
--               _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'
-+               _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'
-              fi
-            fi
-            _LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -6005,20 +6384,20 @@
-              _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--               compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-              _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-                $RANLIB $oldlib'
-              _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-              _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--               $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'
-+               $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'
-              ;;
-            *) # Version 6 and above use weak symbols
-              _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-@@ -6213,7 +6592,7 @@
-                  _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'
-                  ;;
-                *)
--                 _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'
-+                 _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'
-                  ;;
-              esac
- 
-@@ -6259,7 +6638,7 @@
- 
-       solaris*)
-         case $cc_basename in
--          CC*)
-+          CC* | sunCC*)
-            # Sun C++ 4.2, 5.x and Centerline C++
-             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-            _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6300,9 +6679,9 @@
-            if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-              _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-              if $CC --version | $GREP -v '^2\.7' > /dev/null; then
--               _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+               _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'
-                _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--                 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+                 $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- 
-                # Commands to make compiler produce verbose output that lists
-                # what "hidden" libraries, object files and flags are used when
-@@ -6431,6 +6810,7 @@
-   fi # test -n "$compiler"
- 
-   CC=$lt_save_CC
-+  CFLAGS=$lt_save_CFLAGS
-   LDCXX=$LD
-   LD=$lt_save_LD
-   GCC=$lt_save_GCC
-@@ -6445,6 +6825,29 @@
- ])# _LT_LANG_CXX_CONFIG
- 
- 
-+# _LT_FUNC_STRIPNAME_CNF
-+# ----------------------
-+# func_stripname_cnf prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+#
-+# This function is identical to the (non-XSI) version of func_stripname,
-+# except this one can be used by m4 code that may be executed by configure,
-+# rather than the libtool script.
-+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-+AC_REQUIRE([_LT_DECL_SED])
-+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-+func_stripname_cnf ()
-+{
-+  case ${2} in
-+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+  esac
-+} # func_stripname_cnf
-+])# _LT_FUNC_STRIPNAME_CNF
-+
- # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
- # ---------------------------------
- # Figure out "hidden" library dependencies from verbose
-@@ -6453,6 +6856,7 @@
- # objects, libraries and library flags.
- m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
- [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
- # Dependencies to place before and after the object being linked:
- _LT_TAGVAR(predep_objects, $1)=
- _LT_TAGVAR(postdep_objects, $1)=
-@@ -6503,6 +6907,13 @@
- };
- _LT_EOF
- ])
-+
-+_lt_libdeps_save_CFLAGS=$CFLAGS
-+case "$CC $CFLAGS " in #(
-+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-+esac
-+
- dnl Parse the compiler output and extract the necessary
- dnl objects, libraries and library flags.
- if AC_TRY_EVAL(ac_compile); then
-@@ -6514,7 +6925,7 @@
-   pre_test_object_deps_done=no
- 
-   for p in `eval "$output_verbose_link_cmd"`; do
--    case $p in
-+    case ${prev}${p} in
- 
-     -L* | -R* | -l*)
-        # Some compilers place space between "-{L,R}" and the path.
-@@ -6523,13 +6934,22 @@
-           test $p = "-R"; then
-         prev=$p
-         continue
--       else
--        prev=
-        fi
- 
-+       # Expand the sysroot to ease extracting the directories later.
-+       if test -z "$prev"; then
-+         case $p in
-+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-+         esac
-+       fi
-+       case $p in
-+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-+       esac
-        if test "$pre_test_object_deps_done" = no; then
--        case $p in
--        -L* | -R*)
-+        case ${prev} in
-+        -L | -R)
-           # Internal compiler library paths should come after those
-           # provided the user.  The postdeps already come after the
-           # user supplied libs so there is no need to process them.
-@@ -6549,8 +6969,10 @@
-           _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-         fi
-        fi
-+       prev=
-        ;;
- 
-+    *.lto.$objext) ;; # Ignore GCC LTO objects
-     *.$objext)
-        # This assumes that the test object file only shows up
-        # once in the compiler output.
-@@ -6586,6 +7008,7 @@
- fi
- 
- $RM -f confest.$objext
-+CFLAGS=$_lt_libdeps_save_CFLAGS
- 
- # PORTME: override above test on systems where it is broken
- m4_if([$1], [CXX],
-@@ -6622,7 +7045,7 @@
- 
- solaris*)
-   case $cc_basename in
--  CC*)
-+  CC* | sunCC*)
-     # The more standards-conforming stlport4 library is
-     # incompatible with the Cstd library. Avoid specifying
-     # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -6735,7 +7158,9 @@
-   # Allow CC to be a program name with arguments.
-   lt_save_CC="$CC"
-   lt_save_GCC=$GCC
-+  lt_save_CFLAGS=$CFLAGS
-   CC=${F77-"f77"}
-+  CFLAGS=$FFLAGS
-   compiler=$CC
-   _LT_TAGVAR(compiler, $1)=$CC
-   _LT_CC_BASENAME([$compiler])
-@@ -6789,6 +7214,7 @@
- 
-   GCC=$lt_save_GCC
-   CC="$lt_save_CC"
-+  CFLAGS="$lt_save_CFLAGS"
- fi # test "$_lt_disable_F77" != yes
- 
- AC_LANG_POP
-@@ -6865,7 +7291,9 @@
-   # Allow CC to be a program name with arguments.
-   lt_save_CC="$CC"
-   lt_save_GCC=$GCC
-+  lt_save_CFLAGS=$CFLAGS
-   CC=${FC-"f95"}
-+  CFLAGS=$FCFLAGS
-   compiler=$CC
-   GCC=$ac_cv_fc_compiler_gnu
- 
-@@ -6921,7 +7349,8 @@
-   fi # test -n "$compiler"
- 
-   GCC=$lt_save_GCC
--  CC="$lt_save_CC"
-+  CC=$lt_save_CC
-+  CFLAGS=$lt_save_CFLAGS
- fi # test "$_lt_disable_FC" != yes
- 
- AC_LANG_POP
-@@ -6958,10 +7387,12 @@
- _LT_LINKER_BOILERPLATE
- 
- # Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
-+lt_save_CC=$CC
-+lt_save_CFLAGS=$CFLAGS
- lt_save_GCC=$GCC
- GCC=yes
- CC=${GCJ-"gcj"}
-+CFLAGS=$GCJFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_TAGVAR(LD, $1)="$LD"
-@@ -6992,7 +7423,8 @@
- AC_LANG_RESTORE
- 
- GCC=$lt_save_GCC
--CC="$lt_save_CC"
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
- ])# _LT_LANG_GCJ_CONFIG
- 
- 
-@@ -7027,9 +7459,11 @@
- 
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
-+lt_save_CFLAGS=$CFLAGS
- lt_save_GCC=$GCC
- GCC=
- CC=${RC-"windres"}
-+CFLAGS=
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-@@ -7042,7 +7476,8 @@
- 
- GCC=$lt_save_GCC
- AC_LANG_RESTORE
--CC="$lt_save_CC"
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
- ])# _LT_LANG_RC_CONFIG
- 
- 
-@@ -7101,6 +7536,15 @@
- AC_SUBST([OBJDUMP])
- ])
- 
-+# _LT_DECL_DLLTOOL
-+# ----------------
-+# Ensure DLLTOOL variable is set.
-+m4_defun([_LT_DECL_DLLTOOL],
-+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-+AC_SUBST([DLLTOOL])
-+])
- 
- # _LT_DECL_SED
- # ------------
-@@ -7194,8 +7638,8 @@
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
--  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
--      = c,a/b,, \
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,b/c, \
-     && eval 'test $(( 1 + 1 )) -eq 2 \
-     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-   && xsi_shell=yes
-@@ -7234,206 +7678,162 @@
- ])# _LT_CHECK_SHELL_FEATURES
- 
- 
--# _LT_PROG_XSI_SHELLFNS
--# ---------------------
--# Bourne and XSI compatible variants of some useful shell functions.
--m4_defun([_LT_PROG_XSI_SHELLFNS],
--[case $xsi_shell in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--}
--
--# func_basename file
--func_basename ()
--{
--  func_basename_result="${1##*/}"
--}
--
--# func_dirname_and_basename file append nondir_replacement
--# perform func_basename and func_dirname in a single function
--# call:
--#   dirname:  Compute the dirname of FILE.  If nonempty,
--#             add APPEND to the result, otherwise set result
--#             to NONDIR_REPLACEMENT.
--#             value returned in "$func_dirname_result"
--#   basename: Compute filename of FILE.
--#             value retuned in "$func_basename_result"
--# Implementation must be kept synchronized with func_dirname
--# and func_basename. For efficiency, we do not delegate to
--# those functions but instead duplicate the functionality here.
--func_dirname_and_basename ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--  func_basename_result="${1##*/}"
--}
--
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--func_stripname ()
--{
--  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
--  # positional parameters, so assign one to ordinary parameter first.
--  func_stripname_result=${3}
--  func_stripname_result=${func_stripname_result#"${1}"}
--  func_stripname_result=${func_stripname_result%"${2}"}
--}
--
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=${1%%=*}
--  func_opt_split_arg=${1#*=}
--}
--
--# func_lo2o object
--func_lo2o ()
--{
--  case ${1} in
--    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
--    *)    func_lo2o_result=${1} ;;
--  esac
--}
--
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=${1%.*}.lo
--}
--
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=$(( $[*] ))
--}
--
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=${#1}
--}
--
--_LT_EOF
--    ;;
--  *) # Bourne compatible functions.
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--  # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
--  if test "X$func_dirname_result" = "X${1}"; then
--    func_dirname_result="${3}"
--  else
--    func_dirname_result="$func_dirname_result${2}"
--  fi
--}
--
--# func_basename file
--func_basename ()
--{
--  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
--}
-+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-+# ------------------------------------------------------
-+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-+m4_defun([_LT_PROG_FUNCTION_REPLACE],
-+[dnl {
-+sed -e '/^$1 ()$/,/^} # $1 /c\
-+$1 ()\
-+{\
-+m4_bpatsubsts([$2], [$], [\\], [^\([    ]\)], [\\\1])
-+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+])
- 
--dnl func_dirname_and_basename
--dnl A portable version of this function is already defined in general.m4sh
--dnl so there is no need for it here.
- 
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--# func_strip_suffix prefix name
--func_stripname ()
--{
--  case ${2} in
--    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
--    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
--  esac
--}
-+# _LT_PROG_REPLACE_SHELLFNS
-+# -------------------------
-+# Replace existing portable implementations of several shell functions with
-+# equivalent extended shell implementations where those features are available..
-+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-+[if test x"$xsi_shell" = xyes; then
-+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-+    case ${1} in
-+      */*) func_dirname_result="${1%/*}${2}" ;;
-+      *  ) func_dirname_result="${3}" ;;
-+    esac])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-+    func_basename_result="${1##*/}"])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-+    case ${1} in
-+      */*) func_dirname_result="${1%/*}${2}" ;;
-+      *  ) func_dirname_result="${3}" ;;
-+    esac
-+    func_basename_result="${1##*/}"])
- 
--# sed scripts:
--my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
--my_sed_long_arg='1s/^-[[^=]]*=//'
-+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+    # positional parameters, so assign one to ordinary parameter first.
-+    func_stripname_result=${3}
-+    func_stripname_result=${func_stripname_result#"${1}"}
-+    func_stripname_result=${func_stripname_result%"${2}"}])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-+    func_split_long_opt_name=${1%%=*}
-+    func_split_long_opt_arg=${1#*=}])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-+    func_split_short_opt_arg=${1#??}
-+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-+    case ${1} in
-+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+      *)    func_lo2o_result=${1} ;;
-+    esac])
- 
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
--  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
- 
--# func_lo2o object
--func_lo2o ()
--{
--  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
- 
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-+fi
- 
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=`expr "$[@]"`
--}
-+if test x"$lt_shell_append" = xyes; then
-+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
- 
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-+    func_quote_for_eval "${2}"
-+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-+
-+  # Save a `func_append' function call where possible by direct use of '+='
-+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+else
-+  # Save a `func_append' function call even when '+=' is not available
-+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+fi
- 
--_LT_EOF
--esac
-+if test x"$_lt_function_replace_fail" = x":"; then
-+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-+fi
-+])
- 
--case $lt_shell_append in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]+=\$[2]"
--}
--_LT_EOF
-+# _LT_PATH_CONVERSION_FUNCTIONS
-+# -----------------------------
-+# Determine which file name conversion functions should be used by
-+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-+# for certain cross-compile configurations and native mingw.
-+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_MSG_CHECKING([how to convert $build file names to $host format])
-+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-+[case $host in
-+  *-*-mingw* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-+        ;;
-+      *-*-cygwin* )
-+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-+        ;;
-+      * ) # otherwise, assume *nix
-+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-+        ;;
-+    esac
-     ;;
--  *)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]=\$$[1]\$[2]"
--}
--
--_LT_EOF
-+  *-*-cygwin* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-+        ;;
-+      *-*-cygwin* )
-+        lt_cv_to_host_file_cmd=func_convert_file_noop
-+        ;;
-+      * ) # otherwise, assume *nix
-+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-+        ;;
-+    esac
-     ;;
--  esac
-+  * ) # unhandled hosts (and "normal" native builds)
-+    lt_cv_to_host_file_cmd=func_convert_file_noop
-+    ;;
-+esac
-+])
-+to_host_file_cmd=$lt_cv_to_host_file_cmd
-+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-+         [0], [convert $build file names to $host format])dnl
-+
-+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-+[#assume ordinary cross tools, or native build.
-+lt_cv_to_tool_file_cmd=func_convert_file_noop
-+case $host in
-+  *-*-mingw* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-+        ;;
-+    esac
-+    ;;
-+esac
- ])
-+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-+         [0], [convert $build files to toolchain format])dnl
-+])# _LT_PATH_CONVERSION_FUNCTIONS
-Index: binutils-2.24/ltmain.sh
-===================================================================
---- binutils-2.24.orig/ltmain.sh        2013-11-04 07:33:40.000000000 -0800
-+++ binutils-2.24/ltmain.sh     2013-12-15 11:10:23.867118697 -0800
-@@ -1,10 +1,9 @@
--# Generated from ltmain.m4sh.
- 
--# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
-+# libtool (GNU libtool) 2.4
- # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
--# 2007, 2008, 2009 Free Software Foundation, Inc.
-+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
- # This is free software; see the source for copying conditions.  There is NO
- # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
-@@ -38,7 +37,6 @@
- #   -n, --dry-run            display commands without modifying any files
- #       --features           display basic configuration information and exit
- #       --mode=MODE          use operation mode MODE
--#       --no-finish          let install mode avoid finish commands
- #       --preserve-dup-deps  don't remove duplicate dependency libraries
- #       --quiet, --silent    don't print informational messages
- #       --no-quiet, --no-silent
-@@ -71,17 +69,19 @@
- #         compiler:            $LTCC
- #         compiler flags:              $LTCFLAGS
- #         linker:              $LD (gnu? $with_gnu_ld)
--#         $progname:   (GNU libtool 1.3134 2009-11-29) 2.2.7a
-+#         $progname:   (GNU libtool) 2.4
- #         automake:    $automake_version
- #         autoconf:    $autoconf_version
- #
- # Report bugs to <bug-libtool@gnu.org>.
-+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-+# General help using GNU software: <http://www.gnu.org/gethelp/>.
- 
- PROGRAM=libtool
- PACKAGE=libtool
--VERSION=2.2.7a
--TIMESTAMP=" 1.3134 2009-11-29"
--package_revision=1.3134
-+VERSION=2.4
-+TIMESTAMP=""
-+package_revision=1.3293
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -106,9 +106,6 @@
- }
- 
- # NLS nuisances: We save the old values to restore during execute mode.
--# Only set LANG and LC_ALL to C if already set.
--# These must not be set unconditionally because not all systems understand
--# e.g. LANG=C (notably SCO).
- lt_user_locale=
- lt_safe_locale=
- for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -121,15 +118,13 @@
-          lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-        fi"
- done
-+LC_ALL=C
-+LANGUAGE=C
-+export LANGUAGE LC_ALL
- 
- $lt_unset CDPATH
- 
- 
--
--
--
--
--
- # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
- # is ksh but when the shell is invoked as "sh" and the current value of
- # the _XPG environment variable is not equal to 1 (one), the special
-@@ -140,7 +135,7 @@
- 
- 
- : ${CP="cp -f"}
--: ${ECHO=$as_echo}
-+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
- : ${EGREP="/bin/grep -E"}
- : ${FGREP="/bin/grep -F"}
- : ${GREP="/bin/grep"}
-@@ -149,7 +144,7 @@
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
--: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
-+: ${SED="/bin/sed"}
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
- 
-@@ -169,6 +164,27 @@
- dirname="s,/[^/]*$,,"
- basename="s,^.*/,,"
- 
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-+    if test "X$func_dirname_result" = "X${1}"; then
-+      func_dirname_result="${3}"
-+    else
-+      func_dirname_result="$func_dirname_result${2}"
-+    fi
-+} # func_dirname may be replaced by extended shell implementation
-+
-+
-+# func_basename file
-+func_basename ()
-+{
-+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-+} # func_basename may be replaced by extended shell implementation
-+
-+
- # func_dirname_and_basename file append nondir_replacement
- # perform func_basename and func_dirname in a single function
- # call:
-@@ -183,17 +199,31 @@
- # those functions but instead duplicate the functionality here.
- func_dirname_and_basename ()
- {
--  # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
--  if test "X$func_dirname_result" = "X${1}"; then
--    func_dirname_result="${3}"
--  else
--    func_dirname_result="$func_dirname_result${2}"
--  fi
--  func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
--}
-+    # Extract subdirectory from the argument.
-+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-+    if test "X$func_dirname_result" = "X${1}"; then
-+      func_dirname_result="${3}"
-+    else
-+      func_dirname_result="$func_dirname_result${2}"
-+    fi
-+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-+} # func_dirname_and_basename may be replaced by extended shell implementation
-+
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+    case ${2} in
-+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+    esac
-+} # func_stripname may be replaced by extended shell implementation
- 
--# Generated shell functions inserted here.
- 
- # These SED scripts presuppose an absolute path with a trailing slash.
- pathcar='s,^/\([^/]*\).*$,\1,'
-@@ -376,6 +406,15 @@
- # Same as above, but do not quote variable references.
- double_quote_subst='s/\(["`\\]\)/\\\1/g'
- 
-+# Sed substitution that turns a string into a regex matching for the
-+# string literally.
-+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-+
-+# Sed substitution that converts a w32 file name or path
-+# which contains forward slashes, into one that contains
-+# (escaped) backslashes.  A very naive implementation.
-+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+
- # Re-`\' parameter expansions in output of double_quote_subst that were
- # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
- # in input to double_quote_subst, that '$' was protected from expansion.
-@@ -404,7 +443,7 @@
- # name if it has been set yet.
- func_echo ()
- {
--    $ECHO "$progname${mode+: }$mode: $*"
-+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
- }
- 
- # func_verbose arg...
-@@ -430,14 +469,14 @@
- # Echo program name prefixed message to standard error.
- func_error ()
- {
--    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
- }
- 
- # func_warning arg...
- # Echo program name prefixed warning message to standard error.
- func_warning ()
- {
--    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
- 
-     # bash bug again:
-     :
-@@ -656,19 +695,35 @@
-     fi
- }
- 
--
--
-+# func_tr_sh
-+# Turn $1 into a string suitable for a shell variable name.
-+# Result is stored in $func_tr_sh_result.  All characters
-+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-+# if $1 begins with a digit, a '_' is prepended as well.
-+func_tr_sh ()
-+{
-+  case $1 in
-+  [0-9]* | *[!a-zA-Z0-9_]*)
-+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-+    ;;
-+  * )
-+    func_tr_sh_result=$1
-+    ;;
-+  esac
-+}
- 
- 
- # func_version
- # Echo version message to standard output and exit.
- func_version ()
- {
-+    $opt_debug
-+
-     $SED -n '/(C)/!b go
-        :more
-        /\./!{
-          N
--         s/\n# //
-+         s/\n# / /
-          b more
-        }
-        :go
-@@ -685,7 +740,9 @@
- # Echo short help message to standard output and exit.
- func_usage ()
- {
--    $SED -n '/^# Usage:/,/^#  *-h/ {
-+    $opt_debug
-+
-+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-         s/^# //
-        s/^# *$//
-        s/\$progname/'$progname'/
-@@ -701,7 +758,10 @@
- # unless 'noexit' is passed as argument.
- func_help ()
- {
-+    $opt_debug
-+
-     $SED -n '/^# Usage:/,/# Report bugs to/ {
-+       :print
-         s/^# //
-        s/^# *$//
-        s*\$progname*'$progname'*
-@@ -714,7 +774,11 @@
-        s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-        s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-        p
--     }' < "$progpath"
-+       d
-+     }
-+     /^# .* home page:/b print
-+     /^# General help using/b print
-+     ' < "$progpath"
-     ret=$?
-     if test -z "$1"; then
-       exit $ret
-@@ -726,12 +790,39 @@
- # exit_cmd.
- func_missing_arg ()
- {
--    func_error "missing argument for $1"
-+    $opt_debug
-+
-+    func_error "missing argument for $1."
-     exit_cmd=exit
- }
- 
--exit_cmd=:
- 
-+# func_split_short_opt shortopt
-+# Set func_split_short_opt_name and func_split_short_opt_arg shell
-+# variables after splitting SHORTOPT after the 2nd character.
-+func_split_short_opt ()
-+{
-+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-+
-+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-+} # func_split_short_opt may be replaced by extended shell implementation
-+
-+
-+# func_split_long_opt longopt
-+# Set func_split_long_opt_name and func_split_long_opt_arg shell
-+# variables after splitting LONGOPT at the `=' sign.
-+func_split_long_opt ()
-+{
-+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-+    my_sed_long_arg='1s/^--[^=]*=//'
-+
-+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-+} # func_split_long_opt may be replaced by extended shell implementation
-+
-+exit_cmd=:
- 
- 
- 
-@@ -741,26 +832,64 @@
- magic_exe="%%%MAGIC EXE variable%%%"
- 
- # Global variables.
--# $mode is unset
- nonopt=
--execute_dlfiles=
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- extracted_archives=
- extracted_serial=0
- 
--opt_dry_run=false
--opt_finish=:
--opt_duplicate_deps=false
--opt_silent=false
--opt_debug=:
--
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end.  This prevents here-documents from being
- # left over by shells.
- exec_cmd=
- 
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+    eval "${1}=\$${1}\${2}"
-+} # func_append may be replaced by extended shell implementation
-+
-+# func_append_quoted var value
-+# Quote VALUE and append to the end of shell variable VAR, separated
-+# by a space.
-+func_append_quoted ()
-+{
-+    func_quote_for_eval "${2}"
-+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-+} # func_append_quoted may be replaced by extended shell implementation
-+
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+    func_arith_result=`expr "${@}"`
-+} # func_arith may be replaced by extended shell implementation
-+
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-+} # func_len may be replaced by extended shell implementation
-+
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-+} # func_lo2o may be replaced by extended shell implementation
-+
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-+} # func_xform may be replaced by extended shell implementation
-+
-+
- # func_fatal_configuration arg...
- # Echo program name prefixed message to standard error, followed by
- # a configuration failure hint, and exit.
-@@ -850,130 +979,204 @@
-   esac
- }
- 
--# Parse options once, thoroughly.  This comes as soon as possible in
--# the script to make things like `libtool --version' happen quickly.
-+# func_check_version_match
-+# Ensure that we are using m4 macros, and libtool script from the same
-+# release of libtool.
-+func_check_version_match ()
- {
-+  if test "$package_revision" != "$macro_revision"; then
-+    if test "$VERSION" != "$macro_version"; then
-+      if test -z "$macro_version"; then
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from an older release.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      else
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      fi
-+    else
-+      cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-+$progname: of $PACKAGE $VERSION and run autoconf again.
-+_LT_EOF
-+    fi
-+
-+    exit $EXIT_MISMATCH
-+  fi
-+}
-+
-+
-+# Shorthand for --mode=foo, only valid as the first argument
-+case $1 in
-+clean|clea|cle|cl)
-+  shift; set dummy --mode clean ${1+"$@"}; shift
-+  ;;
-+compile|compil|compi|comp|com|co|c)
-+  shift; set dummy --mode compile ${1+"$@"}; shift
-+  ;;
-+execute|execut|execu|exec|exe|ex|e)
-+  shift; set dummy --mode execute ${1+"$@"}; shift
-+  ;;
-+finish|finis|fini|fin|fi|f)
-+  shift; set dummy --mode finish ${1+"$@"}; shift
-+  ;;
-+install|instal|insta|inst|ins|in|i)
-+  shift; set dummy --mode install ${1+"$@"}; shift
-+  ;;
-+link|lin|li|l)
-+  shift; set dummy --mode link ${1+"$@"}; shift
-+  ;;
-+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-+  shift; set dummy --mode uninstall ${1+"$@"}; shift
-+  ;;
-+esac
- 
--  # Shorthand for --mode=foo, only valid as the first argument
--  case $1 in
--  clean|clea|cle|cl)
--    shift; set dummy --mode clean ${1+"$@"}; shift
--    ;;
--  compile|compil|compi|comp|com|co|c)
--    shift; set dummy --mode compile ${1+"$@"}; shift
--    ;;
--  execute|execut|execu|exec|exe|ex|e)
--    shift; set dummy --mode execute ${1+"$@"}; shift
--    ;;
--  finish|finis|fini|fin|fi|f)
--    shift; set dummy --mode finish ${1+"$@"}; shift
--    ;;
--  install|instal|insta|inst|ins|in|i)
--    shift; set dummy --mode install ${1+"$@"}; shift
--    ;;
--  link|lin|li|l)
--    shift; set dummy --mode link ${1+"$@"}; shift
--    ;;
--  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
--    shift; set dummy --mode uninstall ${1+"$@"}; shift
--    ;;
--  esac
- 
--  # Parse non-mode specific arguments:
--  while test "$#" -gt 0; do
-+
-+# Option defaults:
-+opt_debug=:
-+opt_dry_run=false
-+opt_config=false
-+opt_preserve_dup_deps=false
-+opt_features=false
-+opt_finish=false
-+opt_help=false
-+opt_help_all=false
-+opt_silent=:
-+opt_verbose=:
-+opt_silent=false
-+opt_verbose=false
-+
-+
-+# Parse options once, thoroughly.  This comes as soon as possible in the
-+# script to make things like `--version' happen as quickly as we can.
-+{
-+  # this just eases exit handling
-+  while test $# -gt 0; do
-     opt="$1"
-     shift
--
-     case $opt in
--      --config)                func_config                                     ;;
--
--      --debug)         preserve_args="$preserve_args $opt"
-+      --debug|-x)      opt_debug='set -x'
-                        func_echo "enabling shell trace mode"
--                       opt_debug='set -x'
-                        $opt_debug
-                        ;;
--
--      -dlopen)         test "$#" -eq 0 && func_missing_arg "$opt" && break
--                       execute_dlfiles="$execute_dlfiles $1"
--                       shift
-+      --dry-run|--dryrun|-n)
-+                       opt_dry_run=:
-                        ;;
--
--      --dry-run | -n)  opt_dry_run=:                                   ;;
--      --features)       func_features                                  ;;
--      --finish)                mode="finish"                                   ;;
--      --no-finish)     opt_finish=false                                ;;
--
--      --mode)          test "$#" -eq 0 && func_missing_arg "$opt" && break
--                       case $1 in
--                         # Valid mode arguments:
--                         clean)        ;;
--                         compile)      ;;
--                         execute)      ;;
--                         finish)       ;;
--                         install)      ;;
--                         link)         ;;
--                         relink)       ;;
--                         uninstall)    ;;
--
--                         # Catch anything else as an error
--                         *) func_error "invalid argument for $opt"
--                            exit_cmd=exit
--                            break
--                            ;;
--                       esac
--
--                       mode="$1"
-+      --config)
-+                       opt_config=:
-+func_config
-+                       ;;
-+      --dlopen|-dlopen)
-+                       optarg="$1"
-+                       opt_dlopen="${opt_dlopen+$opt_dlopen
-+}$optarg"
-                        shift
-                        ;;
--
-       --preserve-dup-deps)
--                       opt_duplicate_deps=:                            ;;
--
--      --quiet|--silent)        preserve_args="$preserve_args $opt"
--                       opt_silent=:
--                       opt_verbose=false
-+                       opt_preserve_dup_deps=:
-                        ;;
--
--      --no-quiet|--no-silent)
--                       preserve_args="$preserve_args $opt"
--                       opt_silent=false
-+      --features)
-+                       opt_features=:
-+func_features
-                        ;;
--
--      --verbose| -v)   preserve_args="$preserve_args $opt"
-+      --finish)
-+                       opt_finish=:
-+set dummy --mode finish ${1+"$@"}; shift
-+                       ;;
-+      --help)
-+                       opt_help=:
-+                       ;;
-+      --help-all)
-+                       opt_help_all=:
-+opt_help=': help-all'
-+                       ;;
-+      --mode)
-+                       test $# = 0 && func_missing_arg $opt && break
-+                       optarg="$1"
-+                       opt_mode="$optarg"
-+case $optarg in
-+  # Valid mode arguments:
-+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-+
-+  # Catch anything else as an error
-+  *) func_error "invalid argument for $opt"
-+     exit_cmd=exit
-+     break
-+     ;;
-+esac
-+                       shift
-+                       ;;
-+      --no-silent|--no-quiet)
-                        opt_silent=false
--                       opt_verbose=:
-+func_append preserve_args " $opt"
-                        ;;
--
--      --no-verbose)    preserve_args="$preserve_args $opt"
-+      --no-verbose)
-                        opt_verbose=false
-+func_append preserve_args " $opt"
-                        ;;
--
--      --tag)           test "$#" -eq 0 && func_missing_arg "$opt" && break
--                       preserve_args="$preserve_args $opt $1"
--                       func_enable_tag "$1"    # tagname is set here
-+      --silent|--quiet)
-+                       opt_silent=:
-+func_append preserve_args " $opt"
-+        opt_verbose=false
-+                       ;;
-+      --verbose|-v)
-+                       opt_verbose=:
-+func_append preserve_args " $opt"
-+opt_silent=false
-+                       ;;
-+      --tag)
-+                       test $# = 0 && func_missing_arg $opt && break
-+                       optarg="$1"
-+                       opt_tag="$optarg"
-+func_append preserve_args " $opt $optarg"
-+func_enable_tag "$optarg"
-                        shift
-                        ;;
- 
-+      -\?|-h)          func_usage                              ;;
-+      --help)          func_help                               ;;
-+      --version)       func_version                            ;;
-+
-       # Separate optargs to long options:
--      -dlopen=*|--mode=*|--tag=*)
--                       func_opt_split "$opt"
--                       set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-+      --*=*)
-+                       func_split_long_opt "$opt"
-+                       set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-                        shift
-                        ;;
- 
--      -\?|-h)          func_usage                                      ;;
--      --help)          opt_help=:                                      ;;
--      --help-all)      opt_help=': help-all'                           ;;
--      --version)       func_version                                    ;;
--
--      -*)              func_fatal_help "unrecognized option \`$opt'"   ;;
--
--      *)               nonopt="$opt"
--                       break
-+      # Separate non-argument short options:
-+      -\?*|-h*|-n*|-v*)
-+                       func_split_short_opt "$opt"
-+                       set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-+                       shift
-                        ;;
-+
-+      --)              break                                   ;;
-+      -*)              func_fatal_help "unrecognized option \`$opt'" ;;
-+      *)               set dummy "$opt" ${1+"$@"};     shift; break  ;;
-     esac
-   done
- 
-+  # Validate options:
-+
-+  # save first non-option argument
-+  if test "$#" -gt 0; then
-+    nonopt="$opt"
-+    shift
-+  fi
-+
-+  # preserve --debug
-+  test "$opt_debug" = : || func_append preserve_args " --debug"
- 
-   case $host in
-     *cygwin* | *mingw* | *pw32* | *cegcc*)
-@@ -981,82 +1184,44 @@
-       opt_duplicate_compiler_generated_deps=:
-       ;;
-     *)
--      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-       ;;
-   esac
- 
--  # Having warned about all mis-specified options, bail out if
--  # anything was wrong.
--  $exit_cmd $EXIT_FAILURE
--}
-+  $opt_help || {
-+    # Sanity checks first:
-+    func_check_version_match
- 
--# func_check_version_match
--# Ensure that we are using m4 macros, and libtool script from the same
--# release of libtool.
--func_check_version_match ()
--{
--  if test "$package_revision" != "$macro_revision"; then
--    if test "$VERSION" != "$macro_version"; then
--      if test -z "$macro_version"; then
--        cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from an older release.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
--      else
--        cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
--      fi
--    else
--      cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
--$progname: but the definition of this LT_INIT comes from revision $macro_revision.
--$progname: You should recreate aclocal.m4 with macros from revision $package_revision
--$progname: of $PACKAGE $VERSION and run autoconf again.
--_LT_EOF
-+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+      func_fatal_configuration "not configured to build any kind of library"
-     fi
- 
--    exit $EXIT_MISMATCH
--  fi
--}
--
-+    # Darwin sucks
-+    eval std_shrext=\"$shrext_cmds\"
- 
--## ----------- ##
--##    Main.    ##
--## ----------- ##
--
--$opt_help || {
--  # Sanity checks first:
--  func_check_version_match
--
--  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
--    func_fatal_configuration "not configured to build any kind of library"
--  fi
-+    # Only execute mode is allowed to have -dlopen flags.
-+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-+      func_error "unrecognized option \`-dlopen'"
-+      $ECHO "$help" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
- 
--  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-+    # Change the help message to a mode-specific one.
-+    generic_help="$help"
-+    help="Try \`$progname --help --mode=$opt_mode' for more information."
-+  }
- 
- 
--  # Darwin sucks
--  eval "std_shrext=\"$shrext_cmds\""
-+  # Bail if the options were screwed
-+  $exit_cmd $EXIT_FAILURE
-+}
- 
- 
--  # Only execute mode is allowed to have -dlopen flags.
--  if test -n "$execute_dlfiles" && test "$mode" != execute; then
--    func_error "unrecognized option \`-dlopen'"
--    $ECHO "$help" 1>&2
--    exit $EXIT_FAILURE
--  fi
- 
--  # Change the help message to a mode-specific one.
--  generic_help="$help"
--  help="Try \`$progname --help --mode=$mode' for more information."
--}
- 
-+## ----------- ##
-+##    Main.    ##
-+## ----------- ##
- 
- # func_lalib_p file
- # True iff FILE is a libtool `.la' library or `.lo' object file.
-@@ -1121,12 +1286,9 @@
- # temporary ltwrapper_script.
- func_ltwrapper_scriptname ()
- {
--    func_ltwrapper_scriptname_result=""
--    if func_ltwrapper_executable_p "$1"; then
--       func_dirname_and_basename "$1" "" "."
--       func_stripname '' '.exe' "$func_basename_result"
--       func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
--    fi
-+    func_dirname_and_basename "$1" "" "."
-+    func_stripname '' '.exe' "$func_basename_result"
-+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- }
- 
- # func_ltwrapper_p file
-@@ -1149,7 +1311,7 @@
-     save_ifs=$IFS; IFS='~'
-     for cmd in $1; do
-       IFS=$save_ifs
--      eval "cmd=\"$cmd\""
-+      eval cmd=\"$cmd\"
-       func_show_eval "$cmd" "${2-:}"
-     done
-     IFS=$save_ifs
-@@ -1172,6 +1334,37 @@
- }
- 
- 
-+# func_resolve_sysroot PATH
-+# Replace a leading = in PATH with a sysroot.  Store the result into
-+# func_resolve_sysroot_result
-+func_resolve_sysroot ()
-+{
-+  func_resolve_sysroot_result=$1
-+  case $func_resolve_sysroot_result in
-+  =*)
-+    func_stripname '=' '' "$func_resolve_sysroot_result"
-+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-+    ;;
-+  esac
-+}
-+
-+# func_replace_sysroot PATH
-+# If PATH begins with the sysroot, replace it with = and
-+# store the result into func_replace_sysroot_result.
-+func_replace_sysroot ()
-+{
-+  case "$lt_sysroot:$1" in
-+  ?*:"$lt_sysroot"*)
-+    func_stripname "$lt_sysroot" '' "$1"
-+    func_replace_sysroot_result="=$func_stripname_result"
-+    ;;
-+  *)
-+    # Including no sysroot.
-+    func_replace_sysroot_result=$1
-+    ;;
-+  esac
-+}
-+
- # func_infer_tag arg
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
-@@ -1184,8 +1377,7 @@
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
--        func_quote_for_eval "$arg"
--       CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+       func_append_quoted CC_quoted "$arg"
-       done
-       CC_expanded=`func_echo_all $CC`
-       CC_quoted_expanded=`func_echo_all $CC_quoted`
-@@ -1204,8 +1396,7 @@
-            CC_quoted=
-            for arg in $CC; do
-              # Double-quote args containing other shell metacharacters.
--             func_quote_for_eval "$arg"
--             CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+             func_append_quoted CC_quoted "$arg"
-            done
-            CC_expanded=`func_echo_all $CC`
-            CC_quoted_expanded=`func_echo_all $CC_quoted`
-@@ -1274,6 +1465,486 @@
-     }
- }
- 
-+
-+##################################################
-+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-+##################################################
-+
-+# func_convert_core_file_wine_to_w32 ARG
-+# Helper function used by file name conversion functions when $build is *nix,
-+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-+# correctly configured wine environment available, with the winepath program
-+# in $build's $PATH.
-+#
-+# ARG is the $build file name to be converted to w32 format.
-+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-+# be empty on error (or when ARG is empty)
-+func_convert_core_file_wine_to_w32 ()
-+{
-+  $opt_debug
-+  func_convert_core_file_wine_to_w32_result="$1"
-+  if test -n "$1"; then
-+    # Unfortunately, winepath does not exit with a non-zero error code, so we
-+    # are forced to check the contents of stdout. On the other hand, if the
-+    # command is not found, the shell will set an exit code of 127 and print
-+    # *an error message* to stdout. So we must check for both error code of
-+    # zero AND non-empty stdout, which explains the odd construction:
-+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-+        $SED -e "$lt_sed_naive_backslashify"`
-+    else
-+      func_convert_core_file_wine_to_w32_result=
-+    fi
-+  fi
-+}
-+# end: func_convert_core_file_wine_to_w32
-+
-+
-+# func_convert_core_path_wine_to_w32 ARG
-+# Helper function used by path conversion functions when $build is *nix, and
-+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-+# configured wine environment available, with the winepath program in $build's
-+# $PATH. Assumes ARG has no leading or trailing path separator characters.
-+#
-+# ARG is path to be converted from $build format to win32.
-+# Result is available in $func_convert_core_path_wine_to_w32_result.
-+# Unconvertible file (directory) names in ARG are skipped; if no directory names
-+# are convertible, then the result may be empty.
-+func_convert_core_path_wine_to_w32 ()
-+{
-+  $opt_debug
-+  # unfortunately, winepath doesn't convert paths, only file names
-+  func_convert_core_path_wine_to_w32_result=""
-+  if test -n "$1"; then
-+    oldIFS=$IFS
-+    IFS=:
-+    for func_convert_core_path_wine_to_w32_f in $1; do
-+      IFS=$oldIFS
-+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-+        else
-+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-+        fi
-+      fi
-+    done
-+    IFS=$oldIFS
-+  fi
-+}
-+# end: func_convert_core_path_wine_to_w32
-+
-+
-+# func_cygpath ARGS...
-+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-+# (2), returns the Cygwin file name or path in func_cygpath_result (input
-+# file name or path is assumed to be in w32 format, as previously converted
-+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-+# or path in func_cygpath_result (input file name or path is assumed to be in
-+# Cygwin format). Returns an empty string on error.
-+#
-+# ARGS are passed to cygpath, with the last one being the file name or path to
-+# be converted.
-+#
-+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-+# environment variable; do not put it in $PATH.
-+func_cygpath ()
-+{
-+  $opt_debug
-+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-+    if test "$?" -ne 0; then
-+      # on failure, ensure result is empty
-+      func_cygpath_result=
-+    fi
-+  else
-+    func_cygpath_result=
-+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-+  fi
-+}
-+#end: func_cygpath
-+
-+
-+# func_convert_core_msys_to_w32 ARG
-+# Convert file name or path ARG from MSYS format to w32 format.  Return
-+# result in func_convert_core_msys_to_w32_result.
-+func_convert_core_msys_to_w32 ()
-+{
-+  $opt_debug
-+  # awkward: cmd appends spaces to result
-+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-+}
-+#end: func_convert_core_msys_to_w32
-+
-+
-+# func_convert_file_check ARG1 ARG2
-+# Verify that ARG1 (a file name in $build format) was converted to $host
-+# format in ARG2. Otherwise, emit an error message, but continue (resetting
-+# func_to_host_file_result to ARG1).
-+func_convert_file_check ()
-+{
-+  $opt_debug
-+  if test -z "$2" && test -n "$1" ; then
-+    func_error "Could not determine host file name corresponding to"
-+    func_error "  \`$1'"
-+    func_error "Continuing, but uninstalled executables may not work."
-+    # Fallback:
-+    func_to_host_file_result="$1"
-+  fi
-+}
-+# end func_convert_file_check
-+
-+
-+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-+# Verify that FROM_PATH (a path in $build format) was converted to $host
-+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-+# func_to_host_file_result to a simplistic fallback value (see below).
-+func_convert_path_check ()
-+{
-+  $opt_debug
-+  if test -z "$4" && test -n "$3"; then
-+    func_error "Could not determine the host path corresponding to"
-+    func_error "  \`$3'"
-+    func_error "Continuing, but uninstalled executables may not work."
-+    # Fallback.  This is a deliberately simplistic "conversion" and
-+    # should not be "improved".  See libtool.info.
-+    if test "x$1" != "x$2"; then
-+      lt_replace_pathsep_chars="s|$1|$2|g"
-+      func_to_host_path_result=`echo "$3" |
-+        $SED -e "$lt_replace_pathsep_chars"`
-+    else
-+      func_to_host_path_result="$3"
-+    fi
-+  fi
-+}
-+# end func_convert_path_check
-+
-+
-+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-+# and appending REPL if ORIG matches BACKPAT.
-+func_convert_path_front_back_pathsep ()
-+{
-+  $opt_debug
-+  case $4 in
-+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-+    ;;
-+  esac
-+  case $4 in
-+  $2 ) func_append func_to_host_path_result "$3"
-+    ;;
-+  esac
-+}
-+# end func_convert_path_front_back_pathsep
-+
-+
-+##################################################
-+# $build to $host FILE NAME CONVERSION FUNCTIONS #
-+##################################################
-+# invoked via `$to_host_file_cmd ARG'
-+#
-+# In each case, ARG is the path to be converted from $build to $host format.
-+# Result will be available in $func_to_host_file_result.
-+
-+
-+# func_to_host_file ARG
-+# Converts the file name ARG from $build format to $host format. Return result
-+# in func_to_host_file_result.
-+func_to_host_file ()
-+{
-+  $opt_debug
-+  $to_host_file_cmd "$1"
-+}
-+# end func_to_host_file
-+
-+
-+# func_to_tool_file ARG LAZY
-+# converts the file name ARG from $build format to toolchain format. Return
-+# result in func_to_tool_file_result.  If the conversion in use is listed
-+# in (the comma separated) LAZY, no conversion takes place.
-+func_to_tool_file ()
-+{
-+  $opt_debug
-+  case ,$2, in
-+    *,"$to_tool_file_cmd",*)
-+      func_to_tool_file_result=$1
-+      ;;
-+    *)
-+      $to_tool_file_cmd "$1"
-+      func_to_tool_file_result=$func_to_host_file_result
-+      ;;
-+  esac
-+}
-+# end func_to_tool_file
-+
-+
-+# func_convert_file_noop ARG
-+# Copy ARG to func_to_host_file_result.
-+func_convert_file_noop ()
-+{
-+  func_to_host_file_result="$1"
-+}
-+# end func_convert_file_noop
-+
-+
-+# func_convert_file_msys_to_w32 ARG
-+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-+# conversion to w32 is not available inside the cwrapper.  Returns result in
-+# func_to_host_file_result.
-+func_convert_file_msys_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_msys_to_w32 "$1"
-+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_msys_to_w32
-+
-+
-+# func_convert_file_cygwin_to_w32 ARG
-+# Convert file name ARG from Cygwin to w32 format.  Returns result in
-+# func_to_host_file_result.
-+func_convert_file_cygwin_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-+    # LT_CYGPATH in this case.
-+    func_to_host_file_result=`cygpath -m "$1"`
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_cygwin_to_w32
-+
-+
-+# func_convert_file_nix_to_w32 ARG
-+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-+# and a working winepath. Returns result in func_to_host_file_result.
-+func_convert_file_nix_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_file_wine_to_w32 "$1"
-+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_nix_to_w32
-+
-+
-+# func_convert_file_msys_to_cygwin ARG
-+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-+# Returns result in func_to_host_file_result.
-+func_convert_file_msys_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_msys_to_w32 "$1"
-+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-+    func_to_host_file_result="$func_cygpath_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_msys_to_cygwin
-+
-+
-+# func_convert_file_nix_to_cygwin ARG
-+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-+# in func_to_host_file_result.
-+func_convert_file_nix_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-+    func_convert_core_file_wine_to_w32 "$1"
-+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-+    func_to_host_file_result="$func_cygpath_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_nix_to_cygwin
-+
-+
-+#############################################
-+# $build to $host PATH CONVERSION FUNCTIONS #
-+#############################################
-+# invoked via `$to_host_path_cmd ARG'
-+#
-+# In each case, ARG is the path to be converted from $build to $host format.
-+# The result will be available in $func_to_host_path_result.
-+#
-+# Path separators are also converted from $build format to $host format.  If
-+# ARG begins or ends with a path separator character, it is preserved (but
-+# converted to $host format) on output.
-+#
-+# All path conversion functions are named using the following convention:
-+#   file name conversion function    : func_convert_file_X_to_Y ()
-+#   path conversion function         : func_convert_path_X_to_Y ()
-+# where, for any given $build/$host combination the 'X_to_Y' value is the
-+# same.  If conversion functions are added for new $build/$host combinations,
-+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-+# will break.
-+
-+
-+# func_init_to_host_path_cmd
-+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-+# appropriate value, based on the value of $to_host_file_cmd.
-+to_host_path_cmd=
-+func_init_to_host_path_cmd ()
-+{
-+  $opt_debug
-+  if test -z "$to_host_path_cmd"; then
-+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-+  fi
-+}
-+
-+
-+# func_to_host_path ARG
-+# Converts the path ARG from $build format to $host format. Return result
-+# in func_to_host_path_result.
-+func_to_host_path ()
-+{
-+  $opt_debug
-+  func_init_to_host_path_cmd
-+  $to_host_path_cmd "$1"
-+}
-+# end func_to_host_path
-+
-+
-+# func_convert_path_noop ARG
-+# Copy ARG to func_to_host_path_result.
-+func_convert_path_noop ()
-+{
-+  func_to_host_path_result="$1"
-+}
-+# end func_convert_path_noop
-+
-+
-+# func_convert_path_msys_to_w32 ARG
-+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-+# conversion to w32 is not available inside the cwrapper.  Returns result in
-+# func_to_host_path_result.
-+func_convert_path_msys_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # Remove leading and trailing path separator characters from ARG.  MSYS
-+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-+    # and winepath ignores them completely.
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_msys_to_w32
-+
-+
-+# func_convert_path_cygwin_to_w32 ARG
-+# Convert path ARG from Cygwin to w32 format.  Returns result in
-+# func_to_host_file_result.
-+func_convert_path_cygwin_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_cygwin_to_w32
-+
-+
-+# func_convert_path_nix_to_w32 ARG
-+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-+# a working winepath.  Returns result in func_to_host_file_result.
-+func_convert_path_nix_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_nix_to_w32
-+
-+
-+# func_convert_path_msys_to_cygwin ARG
-+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-+# Returns result in func_to_host_file_result.
-+func_convert_path_msys_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-+    func_to_host_path_result="$func_cygpath_result"
-+    func_convert_path_check : : \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-+  fi
-+}
-+# end func_convert_path_msys_to_cygwin
-+
-+
-+# func_convert_path_nix_to_cygwin ARG
-+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-+# func_to_host_file_result.
-+func_convert_path_nix_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # Remove leading and trailing path separator characters from
-+    # ARG. msys behavior is inconsistent here, cygpath turns them
-+    # into '.;' and ';.', and winepath ignores them completely.
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-+    func_to_host_path_result="$func_cygpath_result"
-+    func_convert_path_check : : \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-+  fi
-+}
-+# end func_convert_path_nix_to_cygwin
-+
-+
- # func_mode_compile arg...
- func_mode_compile ()
- {
-@@ -1314,12 +1985,12 @@
-          ;;
- 
-        -pie | -fpie | -fPIE)
--          pie_flag="$pie_flag $arg"
-+          func_append pie_flag " $arg"
-          continue
-          ;;
- 
-        -shared | -static | -prefer-pic | -prefer-non-pic)
--         later="$later $arg"
-+         func_append later " $arg"
-          continue
-          ;;
- 
-@@ -1340,15 +2011,14 @@
-          save_ifs="$IFS"; IFS=','
-          for arg in $args; do
-            IFS="$save_ifs"
--           func_quote_for_eval "$arg"
--           lastarg="$lastarg $func_quote_for_eval_result"
-+           func_append_quoted lastarg "$arg"
-          done
-          IFS="$save_ifs"
-          func_stripname ' ' '' "$lastarg"
-          lastarg=$func_stripname_result
- 
-          # Add the arguments to base_compile.
--         base_compile="$base_compile $lastarg"
-+         func_append base_compile " $lastarg"
-          continue
-          ;;
- 
-@@ -1364,8 +2034,7 @@
-       esac    #  case $arg_mode
- 
-       # Aesthetically quote the previous argument.
--      func_quote_for_eval "$lastarg"
--      base_compile="$base_compile $func_quote_for_eval_result"
-+      func_append_quoted base_compile "$lastarg"
-     done # for arg
- 
-     case $arg_mode in
-@@ -1496,17 +2165,16 @@
-        $opt_dry_run || $RM $removelist
-        exit $EXIT_FAILURE
-       fi
--      removelist="$removelist $output_obj"
-+      func_append removelist " $output_obj"
-       $ECHO "$srcfile" > "$lockfile"
-     fi
- 
-     $opt_dry_run || $RM $removelist
--    removelist="$removelist $lockfile"
-+    func_append removelist " $lockfile"
-     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- 
--    if test -n "$fix_srcfile_path"; then
--      eval "srcfile=\"$fix_srcfile_path\""
--    fi
-+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-+    srcfile=$func_to_tool_file_result
-     func_quote_for_eval "$srcfile"
-     qsrcfile=$func_quote_for_eval_result
- 
-@@ -1526,7 +2194,7 @@
- 
-       if test -z "$output_obj"; then
-        # Place PIC objects in $objdir
--       command="$command -o $lobj"
-+       func_append command " -o $lobj"
-       fi
- 
-       func_show_eval_locale "$command" \
-@@ -1573,11 +2241,11 @@
-        command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
--       command="$command -o $obj"
-+       func_append command " -o $obj"
-       fi
- 
-       # Suppress compiler output if we already did a PIC compilation.
--      command="$command$suppress_output"
-+      func_append command "$suppress_output"
-       func_show_eval_locale "$command" \
-         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- 
-@@ -1622,13 +2290,13 @@
- }
- 
- $opt_help || {
--  test "$mode" = compile && func_mode_compile ${1+"$@"}
-+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
- }
- 
- func_mode_help ()
- {
-     # We need to display help for each of the modes.
--    case $mode in
-+    case $opt_mode in
-       "")
-         # Generic help is extracted from the usage comments
-         # at the start of this file.
-@@ -1659,8 +2327,8 @@
- 
-   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-   -no-suppress      do not suppress compiler output for multiple passes
--  -prefer-pic       try to building PIC objects only
--  -prefer-non-pic   try to building non-PIC objects only
-+  -prefer-pic       try to build PIC objects only
-+  -prefer-non-pic   try to build non-PIC objects only
-   -shared           do not build a \`.o' file suitable for static linking
-   -static           only build a \`.o' file suitable for static linking
-   -Wc,FLAG          pass FLAG directly to the compiler
-@@ -1804,7 +2472,7 @@
-         ;;
- 
-       *)
--        func_fatal_help "invalid operation mode \`$mode'"
-+        func_fatal_help "invalid operation mode \`$opt_mode'"
-         ;;
-     esac
- 
-@@ -1819,13 +2487,13 @@
-   else
-     {
-       func_help noexit
--      for mode in compile link execute install finish uninstall clean; do
-+      for opt_mode in compile link execute install finish uninstall clean; do
-        func_mode_help
-       done
-     } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-     {
-       func_help noexit
--      for mode in compile link execute install finish uninstall clean; do
-+      for opt_mode in compile link execute install finish uninstall clean; do
-        echo
-        func_mode_help
-       done
-@@ -1854,13 +2522,16 @@
-       func_fatal_help "you must specify a COMMAND"
- 
-     # Handle -dlopen flags immediately.
--    for file in $execute_dlfiles; do
-+    for file in $opt_dlopen; do
-       test -f "$file" \
-        || func_fatal_help "\`$file' is not a file"
- 
-       dir=
-       case $file in
-       *.la)
-+       func_resolve_sysroot "$file"
-+       file=$func_resolve_sysroot_result
-+
-        # Check to see that this really is a libtool archive.
-        func_lalib_unsafe_p "$file" \
-          || func_fatal_help "\`$lib' is not a valid libtool archive"
-@@ -1882,7 +2553,7 @@
-        dir="$func_dirname_result"
- 
-        if test -f "$dir/$objdir/$dlname"; then
--         dir="$dir/$objdir"
-+         func_append dir "/$objdir"
-        else
-          if test ! -f "$dir/$dlname"; then
-            func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-@@ -1907,10 +2578,10 @@
-       test -n "$absdir" && dir="$absdir"
- 
-       # Now add the directory to shlibpath_var.
--      if eval test -z \"\$$shlibpath_var\"; then
--       eval $shlibpath_var=\$dir
-+      if eval "test -z \"\$$shlibpath_var\""; then
-+       eval "$shlibpath_var=\"\$dir\""
-       else
--       eval $shlibpath_var=\$dir:\$$shlibpath_var
-+       eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-       fi
-     done
- 
-@@ -1939,8 +2610,7 @@
-        ;;
-       esac
-       # Quote arguments (to preserve shell metacharacters).
--      func_quote_for_eval "$file"
--      args="$args $func_quote_for_eval_result"
-+      func_append_quoted args "$file"
-     done
- 
-     if test "X$opt_dry_run" = Xfalse; then
-@@ -1972,22 +2642,59 @@
-     fi
- }
- 
--test "$mode" = execute && func_mode_execute ${1+"$@"}
-+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
- 
- 
- # func_mode_finish arg...
- func_mode_finish ()
- {
-     $opt_debug
--    libdirs="$nonopt"
-+    libs=
-+    libdirs=
-     admincmds=
- 
--    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
--      for dir
--      do
--       libdirs="$libdirs $dir"
--      done
-+    for opt in "$nonopt" ${1+"$@"}
-+    do
-+      if test -d "$opt"; then
-+       func_append libdirs " $opt"
-+
-+      elif test -f "$opt"; then
-+       if func_lalib_unsafe_p "$opt"; then
-+         func_append libs " $opt"
-+       else
-+         func_warning "\`$opt' is not a valid libtool archive"
-+       fi
-+
-+      else
-+       func_fatal_error "invalid argument \`$opt'"
-+      fi
-+    done
-+
-+    if test -n "$libs"; then
-+      if test -n "$lt_sysroot"; then
-+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-+      else
-+        sysroot_cmd=
-+      fi
-+
-+      # Remove sysroot references
-+      if $opt_dry_run; then
-+        for lib in $libs; do
-+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-+        done
-+      else
-+        tmpdir=`func_mktempdir`
-+        for lib in $libs; do
-+         sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-+           > $tmpdir/tmp-la
-+         mv -f $tmpdir/tmp-la $lib
-+       done
-+        ${RM}r "$tmpdir"
-+      fi
-+    fi
- 
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-       for libdir in $libdirs; do
-        if test -n "$finish_cmds"; then
-          # Do each command in the finish commands.
-@@ -1997,7 +2704,7 @@
-        if test -n "$finish_eval"; then
-          # Do the single finish_eval.
-          eval cmds=\"$finish_eval\"
--         $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-+         $opt_dry_run || eval "$cmds" || func_append admincmds "
-        $cmds"
-        fi
-       done
-@@ -2006,53 +2713,55 @@
-     # Exit here if they wanted silent mode.
-     $opt_silent && exit $EXIT_SUCCESS
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      $ECHO "   $libdir"
--    done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval "flag=\"$hardcode_libdir_flag_spec\""
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      echo "----------------------------------------------------------------------"
-+      echo "Libraries have been installed in:"
-+      for libdir in $libdirs; do
-+       $ECHO "   $libdir"
-+      done
-+      echo
-+      echo "If you ever happen to want to link against installed libraries"
-+      echo "in a given directory, LIBDIR, you must either use libtool, and"
-+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+      echo "flag during linking and do at least one of the following:"
-+      if test -n "$shlibpath_var"; then
-+       echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+       echo "     during execution"
-+      fi
-+      if test -n "$runpath_var"; then
-+       echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-+       echo "     during linking"
-+      fi
-+      if test -n "$hardcode_libdir_flag_spec"; then
-+       libdir=LIBDIR
-+       eval flag=\"$hardcode_libdir_flag_spec\"
- 
--      $ECHO "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      $ECHO "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    echo
-+       $ECHO "   - use the \`$flag' linker flag"
-+      fi
-+      if test -n "$admincmds"; then
-+       $ECHO "   - have your system administrator run these commands:$admincmds"
-+      fi
-+      if test -f /etc/ld.so.conf; then
-+       echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+      fi
-+      echo
- 
--    echo "See any operating system documentation about shared libraries for"
--    case $host in
--      solaris2.[6789]|solaris2.1[0-9])
--        echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
--       echo "pages."
--       ;;
--      *)
--        echo "more information, such as the ld(1) and ld.so(8) manual pages."
--        ;;
--    esac
--    echo "----------------------------------------------------------------------"
-+      echo "See any operating system documentation about shared libraries for"
-+      case $host in
-+       solaris2.[6789]|solaris2.1[0-9])
-+         echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+         echo "pages."
-+         ;;
-+       *)
-+         echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+         ;;
-+      esac
-+      echo "----------------------------------------------------------------------"
-+    fi
-     exit $EXIT_SUCCESS
- }
- 
--test "$mode" = finish && func_mode_finish ${1+"$@"}
-+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
- 
- 
- # func_mode_install arg...
-@@ -2077,7 +2786,7 @@
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     func_quote_for_eval "$arg"
--    install_prog="$install_prog$func_quote_for_eval_result"
-+    func_append install_prog "$func_quote_for_eval_result"
-     install_shared_prog=$install_prog
-     case " $install_prog " in
-       *[\\\ /]cp\ *) install_cp=: ;;
-@@ -2097,7 +2806,7 @@
-     do
-       arg2=
-       if test -n "$dest"; then
--       files="$files $dest"
-+       func_append files " $dest"
-        dest=$arg
-        continue
-       fi
-@@ -2135,11 +2844,11 @@
- 
-       # Aesthetically quote the argument.
-       func_quote_for_eval "$arg"
--      install_prog="$install_prog $func_quote_for_eval_result"
-+      func_append install_prog " $func_quote_for_eval_result"
-       if test -n "$arg2"; then
-        func_quote_for_eval "$arg2"
-       fi
--      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
-+      func_append install_shared_prog " $func_quote_for_eval_result"
-     done
- 
-     test -z "$install_prog" && \
-@@ -2151,7 +2860,7 @@
-     if test -n "$install_override_mode" && $no_mode; then
-       if $install_cp; then :; else
-        func_quote_for_eval "$install_override_mode"
--       install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
-+       func_append install_shared_prog " -m $func_quote_for_eval_result"
-       fi
-     fi
- 
-@@ -2209,10 +2918,13 @@
-       case $file in
-       *.$libext)
-        # Do the static libraries later.
--       staticlibs="$staticlibs $file"
-+       func_append staticlibs " $file"
-        ;;
- 
-       *.la)
-+       func_resolve_sysroot "$file"
-+       file=$func_resolve_sysroot_result
-+
-        # Check to see that this really is a libtool archive.
-        func_lalib_unsafe_p "$file" \
-          || func_fatal_help "\`$file' is not a valid libtool archive"
-@@ -2226,23 +2938,30 @@
-        if test "X$destdir" = "X$libdir"; then
-          case "$current_libdirs " in
-          *" $libdir "*) ;;
--         *) current_libdirs="$current_libdirs $libdir" ;;
-+         *) func_append current_libdirs " $libdir" ;;
-          esac
-        else
-          # Note the libdir as a future libdir.
-          case "$future_libdirs " in
-          *" $libdir "*) ;;
--         *) future_libdirs="$future_libdirs $libdir" ;;
-+         *) func_append future_libdirs " $libdir" ;;
-          esac
-        fi
- 
-        func_dirname "$file" "/" ""
-        dir="$func_dirname_result"
--       dir="$dir$objdir"
-+       func_append dir "$objdir"
- 
-        if test -n "$relink_command"; then
-+      # Strip any trailing slash from the destination.
-+      func_stripname '' '/' "$libdir"
-+      destlibdir=$func_stripname_result
-+
-+      func_stripname '' '/' "$destdir"
-+      s_destdir=$func_stripname_result
-+
-          # Determine the prefix the user has applied to our future dir.
--         inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-+         inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
- 
-          # Don't allow the user to place us outside of our expected
-          # location b/c this prevents finding dependent libraries that
-@@ -2315,7 +3034,7 @@
-        func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
- 
-        # Maybe install the static library, too.
--       test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-+       test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-        ;;
- 
-       *.lo)
-@@ -2503,7 +3222,7 @@
-     test -n "$future_libdirs" && \
-       func_warning "remember to run \`$progname --finish$future_libdirs'"
- 
--    if test -n "$current_libdirs" && $opt_finish; then
-+    if test -n "$current_libdirs"; then
-       # Maybe just do a dry run.
-       $opt_dry_run && current_libdirs=" -n$current_libdirs"
-       exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-@@ -2512,7 +3231,7 @@
-     fi
- }
- 
--test "$mode" = install && func_mode_install ${1+"$@"}
-+test "$opt_mode" = install && func_mode_install ${1+"$@"}
- 
- 
- # func_generate_dlsyms outputname originator pic_p
-@@ -2559,6 +3278,18 @@
- #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
- #endif
- 
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-+# define LT_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data.  */
-+# define LT_DLSYM_CONST
-+#else
-+# define LT_DLSYM_CONST const
-+#endif
-+
- /* External symbol declarations for the compiler. */\
- "
- 
-@@ -2570,21 +3301,22 @@
-          # Add our own program objects to the symbol list.
-          progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-          for progfile in $progfiles; do
--           func_verbose "extracting global C symbols from \`$progfile'"
--           $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-+           func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-+           func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-+           $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-          done
- 
-          if test -n "$exclude_expsyms"; then
-            $opt_dry_run || {
--             $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
--             $MV "$nlist"T "$nlist"
-+             eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+             eval '$MV "$nlist"T "$nlist"'
-            }
-          fi
- 
-          if test -n "$export_symbols_regex"; then
-            $opt_dry_run || {
--             $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
--             $MV "$nlist"T "$nlist"
-+             eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+             eval '$MV "$nlist"T "$nlist"'
-            }
-          fi
- 
-@@ -2593,23 +3325,23 @@
-            export_symbols="$output_objdir/$outputname.exp"
-            $opt_dry_run || {
-              $RM $export_symbols
--             ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
-+             eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* | *cegcc* )
--                echo EXPORTS > "$output_objdir/$outputname.def"
--                cat "$export_symbols" >> "$output_objdir/$outputname.def"
-+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-            }
-          else
-            $opt_dry_run || {
--             ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
--             $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
--             $MV "$nlist"T "$nlist"
-+             eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+             eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-+             eval '$MV "$nlist"T "$nlist"'
-              case $host in
-                *cygwin* | *mingw* | *cegcc* )
--                 echo EXPORTS > "$output_objdir/$outputname.def"
--                 cat "$nlist" >> "$output_objdir/$outputname.def"
-+                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+                 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                  ;;
-              esac
-            }
-@@ -2620,10 +3352,52 @@
-          func_verbose "extracting global C symbols from \`$dlprefile'"
-          func_basename "$dlprefile"
-          name="$func_basename_result"
--         $opt_dry_run || {
--           $ECHO ": $name " >> "$nlist"
--           eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
--         }
-+          case $host in
-+           *cygwin* | *mingw* | *cegcc* )
-+             # if an import library, we need to obtain dlname
-+             if func_win32_import_lib_p "$dlprefile"; then
-+               func_tr_sh "$dlprefile"
-+               eval "curr_lafile=\$libfile_$func_tr_sh_result"
-+               dlprefile_dlbasename=""
-+               if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-+                 # Use subshell, to avoid clobbering current variable values
-+                 dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-+                 if test -n "$dlprefile_dlname" ; then
-+                   func_basename "$dlprefile_dlname"
-+                   dlprefile_dlbasename="$func_basename_result"
-+                 else
-+                   # no lafile. user explicitly requested -dlpreopen <import library>.
-+                   $sharedlib_from_linklib_cmd "$dlprefile"
-+                   dlprefile_dlbasename=$sharedlib_from_linklib_result
-+                 fi
-+               fi
-+               $opt_dry_run || {
-+                 if test -n "$dlprefile_dlbasename" ; then
-+                   eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-+                 else
-+                   func_warning "Could not compute DLL name from $name"
-+                   eval '$ECHO ": $name " >> "$nlist"'
-+                 fi
-+                 func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-+                   $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-+               }
-+             else # not an import lib
-+               $opt_dry_run || {
-+                 eval '$ECHO ": $name " >> "$nlist"'
-+                 func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+               }
-+             fi
-+           ;;
-+           *)
-+             $opt_dry_run || {
-+               eval '$ECHO ": $name " >> "$nlist"'
-+               func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+               eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+             }
-+           ;;
-+          esac
-        done
- 
-        $opt_dry_run || {
-@@ -2661,26 +3435,9 @@
-   const char *name;
-   void *address;
- } lt_dlsymlist;
--"
--         case $host in
--         *cygwin* | *mingw* | *cegcc* )
--           echo >> "$output_objdir/$my_dlsyms" "\
--/* DATA imports from DLLs on WIN32 con't be const, because
--   runtime relocations are performed -- see ld's documentation
--   on pseudo-relocs.  */"
--           lt_dlsym_const= ;;
--         *osf5*)
--           echo >> "$output_objdir/$my_dlsyms" "\
--/* This system does not cope well with relocations in const data */"
--           lt_dlsym_const= ;;
--         *)
--           lt_dlsym_const=const ;;
--         esac
--
--         echo >> "$output_objdir/$my_dlsyms" "\
--extern $lt_dlsym_const lt_dlsymlist
-+extern LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[];
--$lt_dlsym_const lt_dlsymlist
-+LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[] =
- {\
-   { \"$my_originator\", (void *) 0 },"
-@@ -2736,7 +3493,7 @@
-        for arg in $LTCFLAGS; do
-          case $arg in
-          -pie | -fpie | -fPIE) ;;
--         *) symtab_cflags="$symtab_cflags $arg" ;;
-+         *) func_append symtab_cflags " $arg" ;;
-          esac
-        done
- 
-@@ -2796,9 +3553,11 @@
-     win32_libid_type="x86 archive import"
-     ;;
-   *ar\ archive*) # could be an import, or static
--    if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
--       $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
--      win32_nmres=`$NM -f posix -A "$1" |
-+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-+      func_to_tool_file "$1" func_convert_file_msys_to_w32
-+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-        $SED -n -e '
-            1,100{
-                / I /{
-@@ -2827,6 +3586,131 @@
-   $ECHO "$win32_libid_type"
- }
- 
-+# func_cygming_dll_for_implib ARG
-+#
-+# Platform-specific function to extract the
-+# name of the DLL associated with the specified
-+# import library ARG.
-+# Invoked by eval'ing the libtool variable
-+#    $sharedlib_from_linklib_cmd
-+# Result is available in the variable
-+#    $sharedlib_from_linklib_result
-+func_cygming_dll_for_implib ()
-+{
-+  $opt_debug
-+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-+}
-+
-+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-+#
-+# The is the core of a fallback implementation of a
-+# platform-specific function to extract the name of the
-+# DLL associated with the specified import library LIBNAME.
-+#
-+# SECTION_NAME is either .idata$6 or .idata$7, depending
-+# on the platform and compiler that created the implib.
-+#
-+# Echos the name of the DLL associated with the
-+# specified import library.
-+func_cygming_dll_for_implib_fallback_core ()
-+{
-+  $opt_debug
-+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-+    $SED '/^Contents of section '"$match_literal"':/{
-+      # Place marker at beginning of archive member dllname section
-+      s/.*/====MARK====/
-+      p
-+      d
-+    }
-+    # These lines can sometimes be longer than 43 characters, but
-+    # are always uninteresting
-+    /:[         ]*file format pe[i]\{,1\}-/d
-+    /^In archive [^:]*:/d
-+    # Ensure marker is printed
-+    /^====MARK====/p
-+    # Remove all lines with less than 43 characters
-+    /^.\{43\}/!d
-+    # From remaining lines, remove first 43 characters
-+    s/^.\{43\}//' |
-+    $SED -n '
-+      # Join marker and all lines until next marker into a single line
-+      /^====MARK====/ b para
-+      H
-+      $ b para
-+      b
-+      :para
-+      x
-+      s/\n//g
-+      # Remove the marker
-+      s/^====MARK====//
-+      # Remove trailing dots and whitespace
-+      s/[\. \t]*$//
-+      # Print
-+      /./p' |
-+    # we now have a list, one entry per line, of the stringified
-+    # contents of the appropriate section of all members of the
-+    # archive which possess that section. Heuristic: eliminate
-+    # all those which have a first or second character that is
-+    # a '.' (that is, objdump's representation of an unprintable
-+    # character.) This should work for all archives with less than
-+    # 0x302f exports -- but will fail for DLLs whose name actually
-+    # begins with a literal '.' or a single character followed by
-+    # a '.'.
-+    #
-+    # Of those that remain, print the first one.
-+    $SED -e '/^\./d;/^.\./d;q'
-+}
-+
-+# func_cygming_gnu_implib_p ARG
-+# This predicate returns with zero status (TRUE) if
-+# ARG is a GNU/binutils-style import library. Returns
-+# with nonzero status (FALSE) otherwise.
-+func_cygming_gnu_implib_p ()
-+{
-+  $opt_debug
-+  func_to_tool_file "$1" func_convert_file_msys_to_w32
-+  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)$'`
-+  test -n "$func_cygming_gnu_implib_tmp"
-+}
-+
-+# func_cygming_ms_implib_p ARG
-+# This predicate returns with zero status (TRUE) if
-+# ARG is an MS-style import library. Returns
-+# with nonzero status (FALSE) otherwise.
-+func_cygming_ms_implib_p ()
-+{
-+  $opt_debug
-+  func_to_tool_file "$1" func_convert_file_msys_to_w32
-+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-+  test -n "$func_cygming_ms_implib_tmp"
-+}
-+
-+# func_cygming_dll_for_implib_fallback ARG
-+# Platform-specific function to extract the
-+# name of the DLL associated with the specified
-+# import library ARG.
-+#
-+# This fallback implementation is for use when $DLLTOOL
-+# does not support the --identify-strict option.
-+# Invoked by eval'ing the libtool variable
-+#    $sharedlib_from_linklib_cmd
-+# Result is available in the variable
-+#    $sharedlib_from_linklib_result
-+func_cygming_dll_for_implib_fallback ()
-+{
-+  $opt_debug
-+  if func_cygming_gnu_implib_p "$1" ; then
-+    # binutils import library
-+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-+  elif func_cygming_ms_implib_p "$1" ; then
-+    # ms-generated import library
-+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-+  else
-+    # unknown
-+    sharedlib_from_linklib_result=""
-+  fi
-+}
- 
- 
- # func_extract_an_archive dir oldlib
-@@ -2917,7 +3801,7 @@
-            darwin_file=
-            darwin_files=
-            for darwin_file in $darwin_filelist; do
--             darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+             darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-              $LIPO -create -output "$darwin_file" $darwin_files
-            done # $darwin_filelist
-            $RM -rf unfat-$$
-@@ -2932,7 +3816,7 @@
-         func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-       esac
--      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-     done
- 
-     func_extract_archives_result="$my_oldobjs"
-@@ -3014,7 +3898,110 @@
- _LTECHO_EOF'
- }
-     ECHO=\"$qECHO\"
--  fi\
-+  fi
-+
-+# Very basic option parsing. These options are (a) specific to
-+# the libtool wrapper, (b) are identical between the wrapper
-+# /script/ and the wrapper /executable/ which is used only on
-+# windows platforms, and (c) all begin with the string "--lt-"
-+# (application programs are unlikely to have options which match
-+# this pattern).
-+#
-+# There are only two supported options: --lt-debug and
-+# --lt-dump-script. There is, deliberately, no --lt-help.
-+#
-+# The first argument to this parsing function should be the
-+# script's $0 value, followed by "$@".
-+lt_option_debug=
-+func_parse_lt_options ()
-+{
-+  lt_script_arg0=\$0
-+  shift
-+  for lt_opt
-+  do
-+    case \"\$lt_opt\" in
-+    --lt-debug) lt_option_debug=1 ;;
-+    --lt-dump-script)
-+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-+        cat \"\$lt_dump_D/\$lt_dump_F\"
-+        exit 0
-+      ;;
-+    --lt-*)
-+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-+        exit 1
-+      ;;
-+    esac
-+  done
-+
-+  # Print the debug banner immediately:
-+  if test -n \"\$lt_option_debug\"; then
-+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-+  fi
-+}
-+
-+# Used when --lt-debug. Prints its arguments to stdout
-+# (redirection is the responsibility of the caller)
-+func_lt_dump_args ()
-+{
-+  lt_dump_args_N=1;
-+  for lt_arg
-+  do
-+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-+  done
-+}
-+
-+# Core function for launching the target application
-+func_exec_program_core ()
-+{
-+"
-+  case $host in
-+  # Backslashes separate directories on plain windows
-+  *-*-mingw | *-*-os2* | *-cegcc*)
-+    $ECHO "\
-+      if test -n \"\$lt_option_debug\"; then
-+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-+        func_lt_dump_args \${1+\"\$@\"} 1>&2
-+      fi
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
-+    ;;
-+
-+  *)
-+    $ECHO "\
-+      if test -n \"\$lt_option_debug\"; then
-+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-+        func_lt_dump_args \${1+\"\$@\"} 1>&2
-+      fi
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
-+    ;;
-+  esac
-+  $ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-+      exit 1
-+}
-+
-+# A function to encapsulate launching the target application
-+# Strips options in the --lt-* namespace from \$@ and
-+# launches target application with the remaining arguments.
-+func_exec_program ()
-+{
-+  for lt_wr_arg
-+  do
-+    case \$lt_wr_arg in
-+    --lt-*) ;;
-+    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-+    esac
-+    shift
-+  done
-+  func_exec_program_core \${1+\"\$@\"}
-+}
-+
-+  # Parse options
-+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
- 
-   # Find the directory that this script lives in.
-   thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-@@ -3078,7 +4065,7 @@
- 
-     # relink executable if necessary
-     if test -n \"\$relink_command\"; then
--      if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
-+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-       else
-        $ECHO \"\$relink_command_output\" >&2
-        $RM \"\$progdir/\$file\"
-@@ -3102,6 +4089,18 @@
- 
-   if test -f \"\$progdir/\$program\"; then"
- 
-+       # fixup the dll searchpath if we need to.
-+       #
-+       # Fix the DLL searchpath if we need to.  Do this before prepending
-+       # to shlibpath, because on Windows, both are PATH and uninstalled
-+       # libraries must come first.
-+       if test -n "$dllsearchpath"; then
-+         $ECHO "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+       fi
-+
-        # Export our shlibpath_var if we have one.
-        if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-          $ECHO "\
-@@ -3116,35 +4115,10 @@
- "
-        fi
- 
--       # fixup the dll searchpath if we need to.
--       if test -n "$dllsearchpath"; then
--         $ECHO "\
--    # Add the dll search path components to the executable PATH
--    PATH=$dllsearchpath:\$PATH
--"
--       fi
--
-        $ECHO "\
-     if test \"\$libtool_execute_magic\" != \"$magic\"; then
-       # Run the actual program with our arguments.
--"
--       case $host in
--       # Backslashes separate directories on plain windows
--       *-*-mingw | *-*-os2* | *-cegcc*)
--         $ECHO "\
--      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
--"
--         ;;
--
--       *)
--         $ECHO "\
--      exec \"\$progdir/\$program\" \${1+\"\$@\"}
--"
--         ;;
--       esac
--       $ECHO "\
--      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
--      exit 1
-+      func_exec_program \${1+\"\$@\"}
-     fi
-   else
-     # The program doesn't exist.
-@@ -3158,166 +4132,6 @@
- }
- 
- 
--# func_to_host_path arg
--#
--# Convert paths to host format when used with build tools.
--# Intended for use with "native" mingw (where libtool itself
--# is running under the msys shell), or in the following cross-
--# build environments:
--#    $build          $host
--#    mingw (msys)    mingw  [e.g. native]
--#    cygwin          mingw
--#    *nix + wine     mingw
--# where wine is equipped with the `winepath' executable.
--# In the native mingw case, the (msys) shell automatically
--# converts paths for any non-msys applications it launches,
--# but that facility isn't available from inside the cwrapper.
--# Similar accommodations are necessary for $host mingw and
--# $build cygwin.  Calling this function does no harm for other
--# $host/$build combinations not listed above.
--#
--# ARG is the path (on $build) that should be converted to
--# the proper representation for $host. The result is stored
--# in $func_to_host_path_result.
--func_to_host_path ()
--{
--  func_to_host_path_result="$1"
--  if test -n "$1"; then
--    case $host in
--      *mingw* )
--        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
--        case $build in
--          *mingw* ) # actually, msys
--            # awkward: cmd appends spaces to result
--            func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
--              $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
--            ;;
--          *cygwin* )
--            func_to_host_path_result=`cygpath -w "$1" |
--             $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          * )
--            # Unfortunately, winepath does not exit with a non-zero
--            # error code, so we are forced to check the contents of
--            # stdout. On the other hand, if the command is not
--            # found, the shell will set an exit code of 127 and print
--            # *an error message* to stdout. So we must check for both
--            # error code of zero AND non-empty stdout, which explains
--            # the odd construction:
--            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
--            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
--              func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
--                $SED -e "$lt_sed_naive_backslashify"`
--            else
--              # Allow warning below.
--              func_to_host_path_result=
--            fi
--            ;;
--        esac
--        if test -z "$func_to_host_path_result" ; then
--          func_error "Could not determine host path corresponding to"
--          func_error "  \`$1'"
--          func_error "Continuing, but uninstalled executables may not work."
--          # Fallback:
--          func_to_host_path_result="$1"
--        fi
--        ;;
--    esac
--  fi
--}
--# end: func_to_host_path
--
--# func_to_host_pathlist arg
--#
--# Convert pathlists to host format when used with build tools.
--# See func_to_host_path(), above. This function supports the
--# following $build/$host combinations (but does no harm for
--# combinations not listed here):
--#    $build          $host
--#    mingw (msys)    mingw  [e.g. native]
--#    cygwin          mingw
--#    *nix + wine     mingw
--#
--# Path separators are also converted from $build format to
--# $host format. If ARG begins or ends with a path separator
--# character, it is preserved (but converted to $host format)
--# on output.
--#
--# ARG is a pathlist (on $build) that should be converted to
--# the proper representation on $host. The result is stored
--# in $func_to_host_pathlist_result.
--func_to_host_pathlist ()
--{
--  func_to_host_pathlist_result="$1"
--  if test -n "$1"; then
--    case $host in
--      *mingw* )
--        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
--        # Remove leading and trailing path separator characters from
--        # ARG. msys behavior is inconsistent here, cygpath turns them
--        # into '.;' and ';.', and winepath ignores them completely.
--       func_stripname : : "$1"
--        func_to_host_pathlist_tmp1=$func_stripname_result
--        case $build in
--          *mingw* ) # Actually, msys.
--            # Awkward: cmd appends spaces to result.
--            func_to_host_pathlist_result=`
--             ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
--             $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
--            ;;
--          *cygwin* )
--            func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          * )
--            # unfortunately, winepath doesn't convert pathlists
--            func_to_host_pathlist_result=""
--            func_to_host_pathlist_oldIFS=$IFS
--            IFS=:
--            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
--              IFS=$func_to_host_pathlist_oldIFS
--              if test -n "$func_to_host_pathlist_f" ; then
--                func_to_host_path "$func_to_host_pathlist_f"
--                if test -n "$func_to_host_path_result" ; then
--                  if test -z "$func_to_host_pathlist_result" ; then
--                    func_to_host_pathlist_result="$func_to_host_path_result"
--                  else
--                    func_append func_to_host_pathlist_result ";$func_to_host_path_result"
--                  fi
--                fi
--              fi
--            done
--            IFS=$func_to_host_pathlist_oldIFS
--            ;;
--        esac
--        if test -z "$func_to_host_pathlist_result"; then
--          func_error "Could not determine the host path(s) corresponding to"
--          func_error "  \`$1'"
--          func_error "Continuing, but uninstalled executables may not work."
--          # Fallback. This may break if $1 contains DOS-style drive
--          # specifications. The fix is not to complicate the expression
--          # below, but for the user to provide a working wine installation
--          # with winepath so that path translation in the cross-to-mingw
--          # case works properly.
--          lt_replace_pathsep_nix_to_dos="s|:|;|g"
--          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
--            $SED -e "$lt_replace_pathsep_nix_to_dos"`
--        fi
--        # Now, add the leading and trailing path separators back
--        case "$1" in
--          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
--            ;;
--        esac
--        case "$1" in
--          *: ) func_append func_to_host_pathlist_result ";"
--            ;;
--        esac
--        ;;
--    esac
--  fi
--}
--# end: func_to_host_pathlist
--
- # func_emit_cwrapperexe_src
- # emit the source code for a wrapper executable on stdout
- # Must ONLY be called from within func_mode_link because
-@@ -3334,10 +4148,6 @@
- 
-    This wrapper executable should never be moved out of the build directory.
-    If it is, it will not operate correctly.
--
--   Currently, it simply execs the wrapper *script* "$SHELL $output",
--   but could eventually absorb all of the scripts functionality and
--   exec $objdir/$outputname directly.
- */
- EOF
-            cat <<"EOF"
-@@ -3462,22 +4272,13 @@
-   if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
- 
--#undef LTWRAPPER_DEBUGPRINTF
--#if defined LT_DEBUGWRAPPER
--# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
--static void
--ltwrapper_debugprintf (const char *fmt, ...)
--{
--    va_list args;
--    va_start (args, fmt);
--    (void) vfprintf (stderr, fmt, args);
--    va_end (args);
--}
-+#if defined(LT_DEBUGWRAPPER)
-+static int lt_debug = 1;
- #else
--# define LTWRAPPER_DEBUGPRINTF(args)
-+static int lt_debug = 0;
- #endif
- 
--const char *program_name = NULL;
-+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
- 
- void *xmalloc (size_t num);
- char *xstrdup (const char *string);
-@@ -3487,7 +4288,10 @@
- int make_executable (const char *path);
- int check_executable (const char *path);
- char *strendzap (char *str, const char *pat);
--void lt_fatal (const char *message, ...);
-+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-+void lt_fatal (const char *file, int line, const char *message, ...);
-+static const char *nonnull (const char *s);
-+static const char *nonempty (const char *s);
- void lt_setenv (const char *name, const char *value);
- char *lt_extend_str (const char *orig_value, const char *add, int to_end);
- void lt_update_exe_path (const char *name, const char *value);
-@@ -3497,14 +4301,14 @@
- EOF
- 
-            cat <<EOF
--const char * MAGIC_EXE = "$magic_exe";
-+volatile const char * MAGIC_EXE = "$magic_exe";
- const char * LIB_PATH_VARNAME = "$shlibpath_var";
- EOF
- 
-            if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
--              func_to_host_pathlist "$temp_rpath"
-+              func_to_host_path "$temp_rpath"
-              cat <<EOF
--const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
- EOF
-            else
-              cat <<"EOF"
-@@ -3513,10 +4317,10 @@
-            fi
- 
-            if test -n "$dllsearchpath"; then
--              func_to_host_pathlist "$dllsearchpath:"
-+              func_to_host_path "$dllsearchpath:"
-              cat <<EOF
- const char * EXE_PATH_VARNAME = "PATH";
--const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
- EOF
-            else
-              cat <<"EOF"
-@@ -3539,12 +4343,10 @@
-            cat <<"EOF"
- 
- #define LTWRAPPER_OPTION_PREFIX         "--lt-"
--#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
- 
--static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
- static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
--
- static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
- 
- int
- main (int argc, char *argv[])
-@@ -3561,10 +4363,13 @@
-   int i;
- 
-   program_name = (char *) xstrdup (base_name (argv[0]));
--  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
--  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-+  newargz = XMALLOC (char *, argc + 1);
- 
--  /* very simple arg parsing; don't want to rely on getopt */
-+  /* very simple arg parsing; don't want to rely on getopt
-+   * also, copy all non cwrapper options to newargz, except
-+   * argz[0], which is handled differently
-+   */
-+  newargc=0;
-   for (i = 1; i < argc; i++)
-     {
-       if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3581,21 +4386,54 @@
-          lt_dump_script (stdout);
-          return 0;
-        }
-+      if (strcmp (argv[i], debug_opt) == 0)
-+       {
-+          lt_debug = 1;
-+          continue;
-+       }
-+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-+        {
-+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+             namespace, but it is not one of the ones we know about and
-+             have already dealt with, above (inluding dump-script), then
-+             report an error. Otherwise, targets might begin to believe
-+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+             namespace. The first time any user complains about this, we'll
-+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+             or a configure.ac-settable value.
-+           */
-+          lt_fatal (__FILE__, __LINE__,
-+                   "unrecognized %s option: '%s'",
-+                    ltwrapper_option_prefix, argv[i]);
-+        }
-+      /* otherwise ... */
-+      newargz[++newargc] = xstrdup (argv[i]);
-     }
-+  newargz[++newargc] = NULL;
-+
-+EOF
-+           cat <<EOF
-+  /* The GNU banner must be the first non-error debug message */
-+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-+EOF
-+           cat <<"EOF"
-+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- 
--  newargz = XMALLOC (char *, argc + 1);
-   tmp_pathspec = find_executable (argv[0]);
-   if (tmp_pathspec == NULL)
--    lt_fatal ("Couldn't find %s", argv[0]);
--  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
--                         tmp_pathspec));
-+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-+  lt_debugprintf (__FILE__, __LINE__,
-+                  "(main) found exe (before symlink chase) at: %s\n",
-+                 tmp_pathspec);
- 
-   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
--  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
--                         actual_cwrapper_path));
-+  lt_debugprintf (__FILE__, __LINE__,
-+                  "(main) found exe (after symlink chase) at: %s\n",
-+                 actual_cwrapper_path);
-   XFREE (tmp_pathspec);
- 
--  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-   strendzap (actual_cwrapper_path, actual_cwrapper_name);
- 
-   /* wrapper name transforms */
-@@ -3613,8 +4451,9 @@
-   target_name = tmp_pathspec;
-   tmp_pathspec = 0;
- 
--  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
--                         target_name));
-+  lt_debugprintf (__FILE__, __LINE__,
-+                 "(main) libtool target name: %s\n",
-+                 target_name);
- EOF
- 
-            cat <<EOF
-@@ -3664,35 +4503,19 @@
- 
-   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
--  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-+     because on Windows, both *_VARNAMEs are PATH but uninstalled
-+     libraries must come first. */
-   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- 
--  newargc=0;
--  for (i = 1; i < argc; i++)
--    {
--      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
--        {
--          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
--             namespace, but it is not one of the ones we know about and
--             have already dealt with, above (inluding dump-script), then
--             report an error. Otherwise, targets might begin to believe
--             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
--             namespace. The first time any user complains about this, we'll
--             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
--             or a configure.ac-settable value.
--           */
--          lt_fatal ("Unrecognized option in %s namespace: '%s'",
--                    ltwrapper_option_prefix, argv[i]);
--        }
--      /* otherwise ... */
--      newargz[++newargc] = xstrdup (argv[i]);
--    }
--  newargz[++newargc] = NULL;
--
--  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-+                 nonnull (lt_argv_zero));
-   for (i = 0; i < newargc; i++)
-     {
--      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-+                     i, nonnull (newargz[i]));
-     }
- 
- EOF
-@@ -3706,7 +4529,9 @@
-   if (rval == -1)
-     {
-       /* failed to start process */
--      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-+      lt_debugprintf (__FILE__, __LINE__,
-+                     "(main) failed to launch target \"%s\": %s\n",
-+                     lt_argv_zero, nonnull (strerror (errno)));
-       return 127;
-     }
-   return rval;
-@@ -3728,7 +4553,7 @@
- {
-   void *p = (void *) malloc (num);
-   if (!p)
--    lt_fatal ("Memory exhausted");
-+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
- 
-   return p;
- }
-@@ -3762,8 +4587,8 @@
- {
-   struct stat st;
- 
--  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
--                         path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-+                  nonempty (path));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -3780,8 +4605,8 @@
-   int rval = 0;
-   struct stat st;
- 
--  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
--                         path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-+                  nonempty (path));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -3807,8 +4632,8 @@
-   int tmp_len;
-   char *concat_name;
- 
--  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
--                         wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-+                  nonempty (wrapper));
- 
-   if ((wrapper == NULL) || (*wrapper == '\0'))
-     return NULL;
-@@ -3861,7 +4686,8 @@
-                {
-                  /* empty path: current directory */
-                  if (getcwd (tmp, LT_PATHMAX) == NULL)
--                   lt_fatal ("getcwd failed");
-+                   lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-+                              nonnull (strerror (errno)));
-                  tmp_len = strlen (tmp);
-                  concat_name =
-                    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3886,7 +4712,8 @@
-     }
-   /* Relative path | not found in path: prepend cwd */
-   if (getcwd (tmp, LT_PATHMAX) == NULL)
--    lt_fatal ("getcwd failed");
-+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-+              nonnull (strerror (errno)));
-   tmp_len = strlen (tmp);
-   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-   memcpy (concat_name, tmp, tmp_len);
-@@ -3912,8 +4739,9 @@
-   int has_symlinks = 0;
-   while (strlen (tmp_pathspec) && !has_symlinks)
-     {
--      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
--                             tmp_pathspec));
-+      lt_debugprintf (__FILE__, __LINE__,
-+                     "checking path component for symlinks: %s\n",
-+                     tmp_pathspec);
-       if (lstat (tmp_pathspec, &s) == 0)
-        {
-          if (S_ISLNK (s.st_mode) != 0)
-@@ -3935,8 +4763,9 @@
-        }
-       else
-        {
--         char *errstr = strerror (errno);
--         lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-+         lt_fatal (__FILE__, __LINE__,
-+                   "error accessing file \"%s\": %s",
-+                   tmp_pathspec, nonnull (strerror (errno)));
-        }
-     }
-   XFREE (tmp_pathspec);
-@@ -3949,7 +4778,8 @@
-   tmp_pathspec = realpath (pathspec, buf);
-   if (tmp_pathspec == 0)
-     {
--      lt_fatal ("Could not follow symlinks for %s", pathspec);
-+      lt_fatal (__FILE__, __LINE__,
-+               "could not follow symlinks for %s", pathspec);
-     }
-   return xstrdup (tmp_pathspec);
- #endif
-@@ -3975,11 +4805,25 @@
-   return str;
- }
- 
-+void
-+lt_debugprintf (const char *file, int line, const char *fmt, ...)
-+{
-+  va_list args;
-+  if (lt_debug)
-+    {
-+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-+      va_start (args, fmt);
-+      (void) vfprintf (stderr, fmt, args);
-+      va_end (args);
-+    }
-+}
-+
- static void
--lt_error_core (int exit_status, const char *mode,
-+lt_error_core (int exit_status, const char *file,
-+              int line, const char *mode,
-               const char *message, va_list ap)
- {
--  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-   vfprintf (stderr, message, ap);
-   fprintf (stderr, ".\n");
- 
-@@ -3988,20 +4832,32 @@
- }
- 
- void
--lt_fatal (const char *message, ...)
-+lt_fatal (const char *file, int line, const char *message, ...)
- {
-   va_list ap;
-   va_start (ap, message);
--  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-   va_end (ap);
- }
- 
-+static const char *
-+nonnull (const char *s)
-+{
-+  return s ? s : "(null)";
-+}
-+
-+static const char *
-+nonempty (const char *s)
-+{
-+  return (s && !*s) ? "(empty)" : nonnull (s);
-+}
-+
- void
- lt_setenv (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+                 "(lt_setenv) setting '%s' to '%s'\n",
-+                  nonnull (name), nonnull (value));
-   {
- #ifdef HAVE_SETENV
-     /* always make a copy, for consistency with !HAVE_SETENV */
-@@ -4049,9 +4905,9 @@
- void
- lt_update_exe_path (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+                 "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+                  nonnull (name), nonnull (value));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4070,9 +4926,9 @@
- void
- lt_update_lib_path (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+                 "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+                  nonnull (name), nonnull (value));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4222,7 +5078,7 @@
- func_win32_import_lib_p ()
- {
-     $opt_debug
--    case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
-+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-     *import*) : ;;
-     *) false ;;
-     esac
-@@ -4401,9 +5257,9 @@
-            ;;
-          *)
-            if test "$prev" = dlfiles; then
--             dlfiles="$dlfiles $arg"
-+             func_append dlfiles " $arg"
-            else
--             dlprefiles="$dlprefiles $arg"
-+             func_append dlprefiles " $arg"
-            fi
-            prev=
-            continue
-@@ -4427,7 +5283,7 @@
-            *-*-darwin*)
-              case "$deplibs " in
-                *" $qarg.ltframework "*) ;;
--               *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-+               *) func_append deplibs " $qarg.ltframework" # this is fixed later
-                   ;;
-              esac
-              ;;
-@@ -4446,7 +5302,7 @@
-            moreargs=
-            for fil in `cat "$save_arg"`
-            do
--#            moreargs="$moreargs $fil"
-+#            func_append moreargs " $fil"
-              arg=$fil
-              # A libtool-controlled object.
- 
-@@ -4475,7 +5331,7 @@
- 
-                  if test "$prev" = dlfiles; then
-                    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--                     dlfiles="$dlfiles $pic_object"
-+                     func_append dlfiles " $pic_object"
-                      prev=
-                      continue
-                    else
-@@ -4487,7 +5343,7 @@
-                  # CHECK ME:  I think I busted this.  -Ossama
-                  if test "$prev" = dlprefiles; then
-                    # Preload the old-style object.
--                   dlprefiles="$dlprefiles $pic_object"
-+                   func_append dlprefiles " $pic_object"
-                    prev=
-                  fi
- 
-@@ -4557,12 +5413,12 @@
-          if test "$prev" = rpath; then
-            case "$rpath " in
-            *" $arg "*) ;;
--           *) rpath="$rpath $arg" ;;
-+           *) func_append rpath " $arg" ;;
-            esac
-          else
-            case "$xrpath " in
-            *" $arg "*) ;;
--           *) xrpath="$xrpath $arg" ;;
-+           *) func_append xrpath " $arg" ;;
-            esac
-          fi
-          prev=
-@@ -4574,28 +5430,28 @@
-          continue
-          ;;
-        weak)
--         weak_libs="$weak_libs $arg"
-+         func_append weak_libs " $arg"
-          prev=
-          continue
-          ;;
-        xcclinker)
--         linker_flags="$linker_flags $qarg"
--         compiler_flags="$compiler_flags $qarg"
-+         func_append linker_flags " $qarg"
-+         func_append compiler_flags " $qarg"
-          prev=
-          func_append compile_command " $qarg"
-          func_append finalize_command " $qarg"
-          continue
-          ;;
-        xcompiler)
--         compiler_flags="$compiler_flags $qarg"
-+         func_append compiler_flags " $qarg"
-          prev=
-          func_append compile_command " $qarg"
-          func_append finalize_command " $qarg"
-          continue
-          ;;
-        xlinker)
--         linker_flags="$linker_flags $qarg"
--         compiler_flags="$compiler_flags $wl$qarg"
-+         func_append linker_flags " $qarg"
-+         func_append compiler_flags " $wl$qarg"
-          prev=
-          func_append compile_command " $wl$qarg"
-          func_append finalize_command " $wl$qarg"
-@@ -4686,15 +5542,16 @@
-        ;;
- 
-       -L*)
--       func_stripname '-L' '' "$arg"
--       dir=$func_stripname_result
--       if test -z "$dir"; then
-+       func_stripname "-L" '' "$arg"
-+       if test -z "$func_stripname_result"; then
-          if test "$#" -gt 0; then
-            func_fatal_error "require no space between \`-L' and \`$1'"
-          else
-            func_fatal_error "need path for \`-L' option"
-          fi
-        fi
-+       func_resolve_sysroot "$func_stripname_result"
-+       dir=$func_resolve_sysroot_result
-        # We need an absolute path.
-        case $dir in
-        [\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -4706,10 +5563,16 @@
-          ;;
-        esac
-        case "$deplibs " in
--       *" -L$dir "*) ;;
-+       *" -L$dir "* | *" $arg "*)
-+         # Will only happen for absolute or sysroot arguments
-+         ;;
-        *)
--         deplibs="$deplibs -L$dir"
--         lib_search_path="$lib_search_path $dir"
-+         # Preserve sysroot, but never include relative directories
-+         case $dir in
-+           [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-+           *) func_append deplibs " -L$dir" ;;
-+         esac
-+         func_append lib_search_path " $dir"
-          ;;
-        esac
-        case $host in
-@@ -4718,12 +5581,12 @@
-          case :$dllsearchpath: in
-          *":$dir:"*) ;;
-          ::) dllsearchpath=$dir;;
--         *) dllsearchpath="$dllsearchpath:$dir";;
-+         *) func_append dllsearchpath ":$dir";;
-          esac
-          case :$dllsearchpath: in
-          *":$testbindir:"*) ;;
-          ::) dllsearchpath=$testbindir;;
--         *) dllsearchpath="$dllsearchpath:$testbindir";;
-+         *) func_append dllsearchpath ":$testbindir";;
-          esac
-          ;;
-        esac
-@@ -4747,7 +5610,7 @@
-            ;;
-          *-*-rhapsody* | *-*-darwin1.[012])
-            # Rhapsody C and math libraries are in the System framework
--           deplibs="$deplibs System.ltframework"
-+           func_append deplibs " System.ltframework"
-            continue
-            ;;
-          *-*-sco3.2v5* | *-*-sco5v6*)
-@@ -4758,9 +5621,6 @@
-            # Compiler inserts libc in the correct place for threads to work
-            test "X$arg" = "X-lc" && continue
-            ;;
--         *-*-linux*)
--           test "X$arg" = "X-lc" && continue
--           ;;
-          esac
-        elif test "X$arg" = "X-lc_r"; then
-         case $host in
-@@ -4770,7 +5630,7 @@
-           ;;
-         esac
-        fi
--       deplibs="$deplibs $arg"
-+       func_append deplibs " $arg"
-        continue
-        ;;
- 
-@@ -4782,8 +5642,8 @@
-       # Tru64 UNIX uses -model [arg] to determine the layout of C++
-       # classes, name mangling, and exception handling.
-       # Darwin uses the -arch flag to determine output architecture.
--      -model|-arch|-isysroot)
--       compiler_flags="$compiler_flags $arg"
-+      -model|-arch|-isysroot|--sysroot)
-+       func_append compiler_flags " $arg"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        prev=xcompiler
-@@ -4791,12 +5651,12 @@
-        ;;
- 
-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
--       compiler_flags="$compiler_flags $arg"
-+       func_append compiler_flags " $arg"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        case "$new_inherited_linker_flags " in
-            *" $arg "*) ;;
--           * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-+           * ) func_append new_inherited_linker_flags " $arg" ;;
-        esac
-        continue
-        ;;
-@@ -4863,13 +5723,17 @@
-        # We need an absolute path.
-        case $dir in
-        [\\/]* | [A-Za-z]:[\\/]*) ;;
-+       =*)
-+         func_stripname '=' '' "$dir"
-+         dir=$lt_sysroot$func_stripname_result
-+         ;;
-        *)
-          func_fatal_error "only absolute run-paths are allowed"
-          ;;
-        esac
-        case "$xrpath " in
-        *" $dir "*) ;;
--       *) xrpath="$xrpath $dir" ;;
-+       *) func_append xrpath " $dir" ;;
-        esac
-        continue
-        ;;
-@@ -4922,8 +5786,8 @@
-        for flag in $args; do
-          IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--         arg="$arg $func_quote_for_eval_result"
--         compiler_flags="$compiler_flags $func_quote_for_eval_result"
-+         func_append arg " $func_quote_for_eval_result"
-+         func_append compiler_flags " $func_quote_for_eval_result"
-        done
-        IFS="$save_ifs"
-        func_stripname ' ' '' "$arg"
-@@ -4938,9 +5802,9 @@
-        for flag in $args; do
-          IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--         arg="$arg $wl$func_quote_for_eval_result"
--         compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
--         linker_flags="$linker_flags $func_quote_for_eval_result"
-+         func_append arg " $wl$func_quote_for_eval_result"
-+         func_append compiler_flags " $wl$func_quote_for_eval_result"
-+         func_append linker_flags " $func_quote_for_eval_result"
-        done
-        IFS="$save_ifs"
-        func_stripname ' ' '' "$arg"
-@@ -4968,24 +5832,27 @@
-        arg="$func_quote_for_eval_result"
-        ;;
- 
--      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
--      # -r[0-9][0-9]* specifies the processor on the SGI compiler
--      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
--      # +DA*, +DD* enable 64-bit mode on the HP compiler
--      # -q* pass through compiler args for the IBM compiler
--      # -m*, -t[45]*, -txscale* pass through architecture-specific
--      # compiler args for GCC
--      # -F/path gives path to uninstalled frameworks, gcc on darwin
--      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
--      # @file GCC response files
--      # -tp=* Portland pgcc target processor selection
-+      # Flags to be passed through unchanged, with rationale:
-+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-+      # -r[0-9][0-9]*        specify processor for the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-+      # -q*                  compiler args for the IBM compiler
-+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-+      # -F/path              path to uninstalled frameworks, gcc on darwin
-+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-+      # @file                GCC response files
-+      # -tp=*                Portland pgcc target processor selection
-+      # --sysroot=*          for sysroot support
-+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-         func_quote_for_eval "$arg"
-        arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-         func_append finalize_command " $arg"
--        compiler_flags="$compiler_flags $arg"
-+        func_append compiler_flags " $arg"
-         continue
-         ;;
- 
-@@ -4997,7 +5864,7 @@
- 
-       *.$objext)
-        # A standard object.
--       objs="$objs $arg"
-+       func_append objs " $arg"
-        ;;
- 
-       *.lo)
-@@ -5028,7 +5895,7 @@
- 
-            if test "$prev" = dlfiles; then
-              if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--               dlfiles="$dlfiles $pic_object"
-+               func_append dlfiles " $pic_object"
-                prev=
-                continue
-              else
-@@ -5040,7 +5907,7 @@
-            # CHECK ME:  I think I busted this.  -Ossama
-            if test "$prev" = dlprefiles; then
-              # Preload the old-style object.
--             dlprefiles="$dlprefiles $pic_object"
-+             func_append dlprefiles " $pic_object"
-              prev=
-            fi
- 
-@@ -5085,24 +5952,25 @@
- 
-       *.$libext)
-        # An archive.
--       deplibs="$deplibs $arg"
--       old_deplibs="$old_deplibs $arg"
-+       func_append deplibs " $arg"
-+       func_append old_deplibs " $arg"
-        continue
-        ;;
- 
-       *.la)
-        # A libtool-controlled library.
- 
-+       func_resolve_sysroot "$arg"
-        if test "$prev" = dlfiles; then
-          # This library was specified with -dlopen.
--         dlfiles="$dlfiles $arg"
-+         func_append dlfiles " $func_resolve_sysroot_result"
-          prev=
-        elif test "$prev" = dlprefiles; then
-          # The library was specified with -dlpreopen.
--         dlprefiles="$dlprefiles $arg"
-+         func_append dlprefiles " $func_resolve_sysroot_result"
-          prev=
-        else
--         deplibs="$deplibs $arg"
-+         func_append deplibs " $func_resolve_sysroot_result"
-        fi
-        continue
-        ;;
-@@ -5127,7 +5995,7 @@
-       func_fatal_help "the \`$prevarg' option requires an argument"
- 
-     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
--      eval "arg=\"$export_dynamic_flag_spec\""
-+      eval arg=\"$export_dynamic_flag_spec\"
-       func_append compile_command " $arg"
-       func_append finalize_command " $arg"
-     fi
-@@ -5144,11 +6012,13 @@
-     else
-       shlib_search_path=
-     fi
--    eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
--    eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
-+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
- 
-     func_dirname "$output" "/" ""
-     output_objdir="$func_dirname_result$objdir"
-+    func_to_tool_file "$output_objdir/"
-+    tool_output_objdir=$func_to_tool_file_result
-     # Create the object directory.
-     func_mkdir_p "$output_objdir"
- 
-@@ -5169,12 +6039,12 @@
-     # Find all interdependent deplibs by searching for libraries
-     # that are linked more than once (e.g. -la -lb -la)
-     for deplib in $deplibs; do
--      if $opt_duplicate_deps ; then
-+      if $opt_preserve_dup_deps ; then
-        case "$libs " in
--       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+       *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-        esac
-       fi
--      libs="$libs $deplib"
-+      func_append libs " $deplib"
-     done
- 
-     if test "$linkmode" = lib; then
-@@ -5187,9 +6057,9 @@
-       if $opt_duplicate_compiler_generated_deps; then
-        for pre_post_dep in $predeps $postdeps; do
-          case "$pre_post_deps " in
--         *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+         *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-          esac
--         pre_post_deps="$pre_post_deps $pre_post_dep"
-+         func_append pre_post_deps " $pre_post_dep"
-        done
-       fi
-       pre_post_deps=
-@@ -5256,8 +6126,9 @@
-        for lib in $dlprefiles; do
-          # Ignore non-libtool-libs
-          dependency_libs=
-+         func_resolve_sysroot "$lib"
-          case $lib in
--         *.la) func_source "$lib" ;;
-+         *.la) func_source "$func_resolve_sysroot_result" ;;
-          esac
- 
-          # Collect preopened libtool deplibs, except any this library
-@@ -5267,7 +6138,7 @@
-             deplib_base=$func_basename_result
-            case " $weak_libs " in
-            *" $deplib_base "*) ;;
--           *) deplibs="$deplibs $deplib" ;;
-+           *) func_append deplibs " $deplib" ;;
-            esac
-          done
-        done
-@@ -5288,11 +6159,11 @@
-            compile_deplibs="$deplib $compile_deplibs"
-            finalize_deplibs="$deplib $finalize_deplibs"
-          else
--           compiler_flags="$compiler_flags $deplib"
-+           func_append compiler_flags " $deplib"
-            if test "$linkmode" = lib ; then
-                case "$new_inherited_linker_flags " in
-                    *" $deplib "*) ;;
--                   * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+                   * ) func_append new_inherited_linker_flags " $deplib" ;;
-                esac
-            fi
-          fi
-@@ -5377,7 +6248,7 @@
-            if test "$linkmode" = lib ; then
-                case "$new_inherited_linker_flags " in
-                    *" $deplib "*) ;;
--                   * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+                   * ) func_append new_inherited_linker_flags " $deplib" ;;
-                esac
-            fi
-          fi
-@@ -5390,7 +6261,8 @@
-            test "$pass" = conv && continue
-            newdependency_libs="$deplib $newdependency_libs"
-            func_stripname '-L' '' "$deplib"
--           newlib_search_path="$newlib_search_path $func_stripname_result"
-+           func_resolve_sysroot "$func_stripname_result"
-+           func_append newlib_search_path " $func_resolve_sysroot_result"
-            ;;
-          prog)
-            if test "$pass" = conv; then
-@@ -5404,7 +6276,8 @@
-              finalize_deplibs="$deplib $finalize_deplibs"
-            fi
-            func_stripname '-L' '' "$deplib"
--           newlib_search_path="$newlib_search_path $func_stripname_result"
-+           func_resolve_sysroot "$func_stripname_result"
-+           func_append newlib_search_path " $func_resolve_sysroot_result"
-            ;;
-          *)
-            func_warning "\`-L' is ignored for archives/objects"
-@@ -5415,17 +6288,21 @@
-        -R*)
-          if test "$pass" = link; then
-            func_stripname '-R' '' "$deplib"
--           dir=$func_stripname_result
-+           func_resolve_sysroot "$func_stripname_result"
-+           dir=$func_resolve_sysroot_result
-            # Make sure the xrpath contains only unique directories.
-            case "$xrpath " in
-            *" $dir "*) ;;
--           *) xrpath="$xrpath $dir" ;;
-+           *) func_append xrpath " $dir" ;;
-            esac
-          fi
-          deplibs="$deplib $deplibs"
-          continue
-          ;;
--       *.la) lib="$deplib" ;;
-+       *.la)
-+         func_resolve_sysroot "$deplib"
-+         lib=$func_resolve_sysroot_result
-+         ;;
-        *.$libext)
-          if test "$pass" = conv; then
-            deplibs="$deplib $deplibs"
-@@ -5488,11 +6365,11 @@
-            if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-              # If there is no dlopen support or we're linking statically,
-              # we need to preload.
--             newdlprefiles="$newdlprefiles $deplib"
-+             func_append newdlprefiles " $deplib"
-              compile_deplibs="$deplib $compile_deplibs"
-              finalize_deplibs="$deplib $finalize_deplibs"
-            else
--             newdlfiles="$newdlfiles $deplib"
-+             func_append newdlfiles " $deplib"
-            fi
-          fi
-          continue
-@@ -5538,7 +6415,7 @@
-          for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-            case " $new_inherited_linker_flags " in
-              *" $tmp_inherited_linker_flag "*) ;;
--             *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-+             *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-            esac
-          done
-        fi
-@@ -5546,8 +6423,8 @@
-        if test "$linkmode,$pass" = "lib,link" ||
-           test "$linkmode,$pass" = "prog,scan" ||
-           { test "$linkmode" != prog && test "$linkmode" != lib; }; then
--         test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
--         test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+         test -n "$dlopen" && func_append dlfiles " $dlopen"
-+         test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-        fi
- 
-        if test "$pass" = conv; then
-@@ -5558,20 +6435,20 @@
-              func_fatal_error "cannot find name of link library for \`$lib'"
-            fi
-            # It is a libtool convenience library, so add in its objects.
--           convenience="$convenience $ladir/$objdir/$old_library"
--           old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+           func_append convenience " $ladir/$objdir/$old_library"
-+           func_append old_convenience " $ladir/$objdir/$old_library"
-          elif test "$linkmode" != prog && test "$linkmode" != lib; then
-            func_fatal_error "\`$lib' is not a convenience library"
-          fi
-          tmp_libs=
-          for deplib in $dependency_libs; do
-            deplibs="$deplib $deplibs"
--           if $opt_duplicate_deps ; then
-+           if $opt_preserve_dup_deps ; then
-              case "$tmp_libs " in
--             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+             *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-              esac
-            fi
--           tmp_libs="$tmp_libs $deplib"
-+           func_append tmp_libs " $deplib"
-          done
-          continue
-        fi # $pass = conv
-@@ -5579,9 +6456,15 @@
- 
-        # Get the name of the library we link against.
-        linklib=
--       for l in $old_library $library_names; do
--         linklib="$l"
--       done
-+       if test -n "$old_library" &&
-+          { test "$prefer_static_libs" = yes ||
-+            test "$prefer_static_libs,$installed" = "built,no"; }; then
-+         linklib=$old_library
-+       else
-+         for l in $old_library $library_names; do
-+           linklib="$l"
-+         done
-+       fi
-        if test -z "$linklib"; then
-          func_fatal_error "cannot find name of link library for \`$lib'"
-        fi
-@@ -5598,9 +6481,9 @@
-            # statically, we need to preload.  We also need to preload any
-            # dependent libraries so libltdl's deplib preloader doesn't
-            # bomb out in the load deplibs phase.
--           dlprefiles="$dlprefiles $lib $dependency_libs"
-+           func_append dlprefiles " $lib $dependency_libs"
-          else
--           newdlfiles="$newdlfiles $lib"
-+           func_append newdlfiles " $lib"
-          fi
-          continue
-        fi # $pass = dlopen
-@@ -5622,14 +6505,14 @@
- 
-        # Find the relevant object directory and library name.
-        if test "X$installed" = Xyes; then
--         if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+         if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-            func_warning "library \`$lib' was moved."
-            dir="$ladir"
-            absdir="$abs_ladir"
-            libdir="$abs_ladir"
-          else
--           dir="$libdir"
--           absdir="$libdir"
-+           dir="$lt_sysroot$libdir"
-+           absdir="$lt_sysroot$libdir"
-          fi
-          test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-        else
-@@ -5637,12 +6520,12 @@
-            dir="$ladir"
-            absdir="$abs_ladir"
-            # Remove this search path later
--           notinst_path="$notinst_path $abs_ladir"
-+           func_append notinst_path " $abs_ladir"
-          else
-            dir="$ladir/$objdir"
-            absdir="$abs_ladir/$objdir"
-            # Remove this search path later
--           notinst_path="$notinst_path $abs_ladir"
-+           func_append notinst_path " $abs_ladir"
-          fi
-        fi # $installed = yes
-        func_stripname 'lib' '.la' "$laname"
-@@ -5653,20 +6536,46 @@
-          if test -z "$libdir" && test "$linkmode" = prog; then
-            func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-          fi
--         # Prefer using a static library (so that no silly _DYNAMIC symbols
--         # are required to link).
--         if test -n "$old_library"; then
--           newdlprefiles="$newdlprefiles $dir/$old_library"
--           # Keep a list of preopened convenience libraries to check
--           # that they are being used correctly in the link pass.
--           test -z "$libdir" && \
--               dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
--         # Otherwise, use the dlname, so that lt_dlopen finds it.
--         elif test -n "$dlname"; then
--           newdlprefiles="$newdlprefiles $dir/$dlname"
--         else
--           newdlprefiles="$newdlprefiles $dir/$linklib"
--         fi
-+         case "$host" in
-+           # special handling for platforms with PE-DLLs.
-+           *cygwin* | *mingw* | *cegcc* )
-+             # Linker will automatically link against shared library if both
-+             # static and shared are present.  Therefore, ensure we extract
-+             # symbols from the import library if a shared library is present
-+             # (otherwise, the dlopen module name will be incorrect).  We do
-+             # this by putting the import library name into $newdlprefiles.
-+             # We recover the dlopen module name by 'saving' the la file
-+             # name in a special purpose variable, and (later) extracting the
-+             # dlname from the la file.
-+             if test -n "$dlname"; then
-+               func_tr_sh "$dir/$linklib"
-+               eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-+               func_append newdlprefiles " $dir/$linklib"
-+             else
-+               func_append newdlprefiles " $dir/$old_library"
-+               # Keep a list of preopened convenience libraries to check
-+               # that they are being used correctly in the link pass.
-+               test -z "$libdir" && \
-+                 func_append dlpreconveniencelibs " $dir/$old_library"
-+             fi
-+           ;;
-+           * )
-+             # Prefer using a static library (so that no silly _DYNAMIC symbols
-+             # are required to link).
-+             if test -n "$old_library"; then
-+               func_append newdlprefiles " $dir/$old_library"
-+               # Keep a list of preopened convenience libraries to check
-+               # that they are being used correctly in the link pass.
-+               test -z "$libdir" && \
-+                 func_append dlpreconveniencelibs " $dir/$old_library"
-+             # Otherwise, use the dlname, so that lt_dlopen finds it.
-+             elif test -n "$dlname"; then
-+               func_append newdlprefiles " $dir/$dlname"
-+             else
-+               func_append newdlprefiles " $dir/$linklib"
-+             fi
-+           ;;
-+         esac
-        fi # $pass = dlpreopen
- 
-        if test -z "$libdir"; then
-@@ -5684,7 +6593,7 @@
- 
- 
-        if test "$linkmode" = prog && test "$pass" != link; then
--         newlib_search_path="$newlib_search_path $ladir"
-+         func_append newlib_search_path " $ladir"
-          deplibs="$lib $deplibs"
- 
-          linkalldeplibs=no
-@@ -5697,7 +6606,8 @@
-          for deplib in $dependency_libs; do
-            case $deplib in
-            -L*) func_stripname '-L' '' "$deplib"
--                newlib_search_path="$newlib_search_path $func_stripname_result"
-+                func_resolve_sysroot "$func_stripname_result"
-+                func_append newlib_search_path " $func_resolve_sysroot_result"
-                 ;;
-            esac
-            # Need to link against all dependency_libs?
-@@ -5708,12 +6618,12 @@
-              # or/and link against static libraries
-              newdependency_libs="$deplib $newdependency_libs"
-            fi
--           if $opt_duplicate_deps ; then
-+           if $opt_preserve_dup_deps ; then
-              case "$tmp_libs " in
--             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+             *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-              esac
-            fi
--           tmp_libs="$tmp_libs $deplib"
-+           func_append tmp_libs " $deplib"
-          done # for deplib
-          continue
-        fi # $linkmode = prog...
-@@ -5728,7 +6638,7 @@
-              # Make sure the rpath contains only unique directories.
-              case "$temp_rpath:" in
-              *"$absdir:"*) ;;
--             *) temp_rpath="$temp_rpath$absdir:" ;;
-+             *) func_append temp_rpath "$absdir:" ;;
-              esac
-            fi
- 
-@@ -5740,7 +6650,7 @@
-            *)
-              case "$compile_rpath " in
-              *" $absdir "*) ;;
--             *) compile_rpath="$compile_rpath $absdir"
-+             *) func_append compile_rpath " $absdir" ;;
-              esac
-              ;;
-            esac
-@@ -5749,7 +6659,7 @@
-            *)
-              case "$finalize_rpath " in
-              *" $libdir "*) ;;
--             *) finalize_rpath="$finalize_rpath $libdir"
-+             *) func_append finalize_rpath " $libdir" ;;
-              esac
-              ;;
-            esac
-@@ -5774,12 +6684,12 @@
-          case $host in
-          *cygwin* | *mingw* | *cegcc*)
-              # No point in relinking DLLs because paths are not encoded
--             notinst_deplibs="$notinst_deplibs $lib"
-+             func_append notinst_deplibs " $lib"
-              need_relink=no
-            ;;
-          *)
-            if test "$installed" = no; then
--             notinst_deplibs="$notinst_deplibs $lib"
-+             func_append notinst_deplibs " $lib"
-              need_relink=yes
-            fi
-            ;;
-@@ -5814,7 +6724,7 @@
-            *)
-              case "$compile_rpath " in
-              *" $absdir "*) ;;
--             *) compile_rpath="$compile_rpath $absdir"
-+             *) func_append compile_rpath " $absdir" ;;
-              esac
-              ;;
-            esac
-@@ -5823,7 +6733,7 @@
-            *)
-              case "$finalize_rpath " in
-              *" $libdir "*) ;;
--             *) finalize_rpath="$finalize_rpath $libdir"
-+             *) func_append finalize_rpath " $libdir" ;;
-              esac
-              ;;
-            esac
-@@ -5835,7 +6745,7 @@
-            shift
-            realname="$1"
-            shift
--           eval "libname=\"$libname_spec\""
-+           libname=`eval "\\$ECHO \"$libname_spec\""`
-            # use dlname if we got it. it's perfectly good, no?
-            if test -n "$dlname"; then
-              soname="$dlname"
-@@ -5848,7 +6758,7 @@
-                versuffix="-$major"
-                ;;
-              esac
--             eval "soname=\"$soname_spec\""
-+             eval soname=\"$soname_spec\"
-            else
-              soname="$realname"
-            fi
-@@ -5877,7 +6787,7 @@
-            linklib=$newlib
-          fi # test -n "$old_archive_from_expsyms_cmds"
- 
--         if test "$linkmode" = prog || test "$mode" != relink; then
-+         if test "$linkmode" = prog || test "$opt_mode" != relink; then
-            add_shlibpath=
-            add_dir=
-            add=
-@@ -5933,7 +6843,7 @@
-                if test -n "$inst_prefix_dir"; then
-                  case $libdir in
-                    [\\/]*)
--                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+                     func_append add_dir " -L$inst_prefix_dir$libdir"
-                      ;;
-                  esac
-                fi
-@@ -5955,7 +6865,7 @@
-            if test -n "$add_shlibpath"; then
-              case :$compile_shlibpath: in
-              *":$add_shlibpath:"*) ;;
--             *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+             *) func_append compile_shlibpath "$add_shlibpath:" ;;
-              esac
-            fi
-            if test "$linkmode" = prog; then
-@@ -5969,13 +6879,13 @@
-                 test "$hardcode_shlibpath_var" = yes; then
-                case :$finalize_shlibpath: in
-                *":$libdir:"*) ;;
--               *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+               *) func_append finalize_shlibpath "$libdir:" ;;
-                esac
-              fi
-            fi
-          fi
- 
--         if test "$linkmode" = prog || test "$mode" = relink; then
-+         if test "$linkmode" = prog || test "$opt_mode" = relink; then
-            add_shlibpath=
-            add_dir=
-            add=
-@@ -5989,7 +6899,7 @@
-            elif test "$hardcode_shlibpath_var" = yes; then
-              case :$finalize_shlibpath: in
-              *":$libdir:"*) ;;
--             *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+             *) func_append finalize_shlibpath "$libdir:" ;;
-              esac
-              add="-l$name"
-            elif test "$hardcode_automatic" = yes; then
-@@ -6001,12 +6911,12 @@
-              fi
-            else
-              # We cannot seem to hardcode it, guess we'll fake it.
--             add_dir="-L$libdir"
-+             add_dir="-L$lt_sysroot$libdir"
-              # Try looking first in the location we're being installed to.
-              if test -n "$inst_prefix_dir"; then
-                case $libdir in
-                  [\\/]*)
--                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+                   func_append add_dir " -L$inst_prefix_dir$libdir"
-                    ;;
-                esac
-              fi
-@@ -6083,27 +6993,33 @@
-                   temp_xrpath=$func_stripname_result
-                   case " $xrpath " in
-                   *" $temp_xrpath "*) ;;
--                  *) xrpath="$xrpath $temp_xrpath";;
-+                  *) func_append xrpath " $temp_xrpath";;
-                   esac;;
--             *) temp_deplibs="$temp_deplibs $libdir";;
-+             *) func_append temp_deplibs " $libdir";;
-              esac
-            done
-            dependency_libs="$temp_deplibs"
-          fi
- 
--         newlib_search_path="$newlib_search_path $absdir"
-+         func_append newlib_search_path " $absdir"
-          # Link against this library
-          test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-          # ... and its dependency_libs
-          tmp_libs=
-          for deplib in $dependency_libs; do
-            newdependency_libs="$deplib $newdependency_libs"
--           if $opt_duplicate_deps ; then
-+           case $deplib in
-+              -L*) func_stripname '-L' '' "$deplib"
-+                   func_resolve_sysroot "$func_stripname_result";;
-+              *) func_resolve_sysroot "$deplib" ;;
-+            esac
-+           if $opt_preserve_dup_deps ; then
-              case "$tmp_libs " in
--             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+             *" $func_resolve_sysroot_result "*)
-+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-              esac
-            fi
--           tmp_libs="$tmp_libs $deplib"
-+           func_append tmp_libs " $func_resolve_sysroot_result"
-          done
- 
-          if test "$link_all_deplibs" != no; then
-@@ -6113,8 +7029,10 @@
-              case $deplib in
-              -L*) path="$deplib" ;;
-              *.la)
-+               func_resolve_sysroot "$deplib"
-+               deplib=$func_resolve_sysroot_result
-                func_dirname "$deplib" "" "."
--               dir="$func_dirname_result"
-+               dir=$func_dirname_result
-                # We need an absolute path.
-                case $dir in
-                [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-@@ -6130,7 +7048,7 @@
-                case $host in
-                *-*-darwin*)
-                  depdepl=
--                 deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+                 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-                  if test -n "$deplibrary_names" ; then
-                    for tmp in $deplibrary_names ; do
-                      depdepl=$tmp
-@@ -6141,8 +7059,8 @@
-                       if test -z "$darwin_install_name"; then
-                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                       fi
--                     compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
--                     linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-+                     func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-+                     func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
-                      path=
-                    fi
-                  fi
-@@ -6152,7 +7070,7 @@
-                  ;;
-                esac
-                else
--                 libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-                  test -z "$libdir" && \
-                    func_fatal_error "\`$deplib' is not a valid libtool archive"
-                  test "$absdir" != "$libdir" && \
-@@ -6192,7 +7110,7 @@
-          for dir in $newlib_search_path; do
-            case "$lib_search_path " in
-            *" $dir "*) ;;
--           *) lib_search_path="$lib_search_path $dir" ;;
-+           *) func_append lib_search_path " $dir" ;;
-            esac
-          done
-          newlib_search_path=
-@@ -6205,7 +7123,7 @@
-        fi
-        for var in $vars dependency_libs; do
-          # Add libraries to $var in reverse order
--         eval tmp_libs=\$$var
-+         eval tmp_libs=\"\$$var\"
-          new_libs=
-          for deplib in $tmp_libs; do
-            # FIXME: Pedantically, this is the right thing to do, so
-@@ -6250,13 +7168,13 @@
-            -L*)
-              case " $tmp_libs " in
-              *" $deplib "*) ;;
--             *) tmp_libs="$tmp_libs $deplib" ;;
-+             *) func_append tmp_libs " $deplib" ;;
-              esac
-              ;;
--           *) tmp_libs="$tmp_libs $deplib" ;;
-+           *) func_append tmp_libs " $deplib" ;;
-            esac
-          done
--         eval $var=\$tmp_libs
-+         eval $var=\"$tmp_libs\"
-        done # for var
-       fi
-       # Last step: remove runtime libs from dependency_libs
-@@ -6269,7 +7187,7 @@
-          ;;
-        esac
-        if test -n "$i" ; then
--         tmp_libs="$tmp_libs $i"
-+         func_append tmp_libs " $i"
-        fi
-       done
-       dependency_libs=$tmp_libs
-@@ -6310,7 +7228,7 @@
-       # Now set the variables for building old libraries.
-       build_libtool_libs=no
-       oldlibs="$output"
--      objs="$objs$old_deplibs"
-+      func_append objs "$old_deplibs"
-       ;;
- 
-     lib)
-@@ -6319,8 +7237,8 @@
-       lib*)
-        func_stripname 'lib' '.la' "$outputname"
-        name=$func_stripname_result
--       eval "shared_ext=\"$shrext_cmds\""
--       eval "libname=\"$libname_spec\""
-+       eval shared_ext=\"$shrext_cmds\"
-+       eval libname=\"$libname_spec\"
-        ;;
-       *)
-        test "$module" = no && \
-@@ -6330,8 +7248,8 @@
-          # Add the "lib" prefix for modules if required
-          func_stripname '' '.la' "$outputname"
-          name=$func_stripname_result
--         eval "shared_ext=\"$shrext_cmds\""
--         eval "libname=\"$libname_spec\""
-+         eval shared_ext=\"$shrext_cmds\"
-+         eval libname=\"$libname_spec\"
-        else
-          func_stripname '' '.la' "$outputname"
-          libname=$func_stripname_result
-@@ -6346,7 +7264,7 @@
-          echo
-          $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-          $ECHO "*** objects $objs is not portable!"
--         libobjs="$libobjs $objs"
-+         func_append libobjs " $objs"
-        fi
-       fi
- 
-@@ -6544,7 +7462,7 @@
-          done
- 
-          # Make executables depend on our current version.
--         verstring="$verstring:${current}.0"
-+         func_append verstring ":${current}.0"
-          ;;
- 
-        qnx)
-@@ -6612,10 +7530,10 @@
-       fi
- 
-       func_generate_dlsyms "$libname" "$libname" "yes"
--      libobjs="$libobjs $symfileobj"
-+      func_append libobjs " $symfileobj"
-       test "X$libobjs" = "X " && libobjs=
- 
--      if test "$mode" != relink; then
-+      if test "$opt_mode" != relink; then
-        # Remove our outputs, but don't remove object files since they
-        # may have been created when compiling PIC objects.
-        removelist=
-@@ -6631,7 +7549,7 @@
-                   continue
-                 fi
-               fi
--              removelist="$removelist $p"
-+              func_append removelist " $p"
-               ;;
-            *) ;;
-          esac
-@@ -6642,7 +7560,7 @@
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--       oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+       func_append oldlibs " $output_objdir/$libname.$libext"
- 
-        # Transform .lo files to .o files.
-        oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-@@ -6659,10 +7577,11 @@
-        # If the user specified any rpath flags, then add them.
-        temp_xrpath=
-        for libdir in $xrpath; do
--         temp_xrpath="$temp_xrpath -R$libdir"
-+         func_replace_sysroot "$libdir"
-+         func_append temp_xrpath " -R$func_replace_sysroot_result"
-          case "$finalize_rpath " in
-          *" $libdir "*) ;;
--         *) finalize_rpath="$finalize_rpath $libdir" ;;
-+         *) func_append finalize_rpath " $libdir" ;;
-          esac
-        done
-        if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-@@ -6676,7 +7595,7 @@
-       for lib in $old_dlfiles; do
-        case " $dlprefiles $dlfiles " in
-        *" $lib "*) ;;
--       *) dlfiles="$dlfiles $lib" ;;
-+       *) func_append dlfiles " $lib" ;;
-        esac
-       done
- 
-@@ -6686,7 +7605,7 @@
-       for lib in $old_dlprefiles; do
-        case "$dlprefiles " in
-        *" $lib "*) ;;
--       *) dlprefiles="$dlprefiles $lib" ;;
-+       *) func_append dlprefiles " $lib" ;;
-        esac
-       done
- 
-@@ -6698,7 +7617,7 @@
-            ;;
-          *-*-rhapsody* | *-*-darwin1.[012])
-            # Rhapsody C library is in the System framework
--           deplibs="$deplibs System.ltframework"
-+           func_append deplibs " System.ltframework"
-            ;;
-          *-*-netbsd*)
-            # Don't link with libc until the a.out ld.so is fixed.
-@@ -6715,7 +7634,7 @@
-          *)
-            # Add libc to deplibs on all other systems if necessary.
-            if test "$build_libtool_need_lc" = "yes"; then
--             deplibs="$deplibs -lc"
-+             func_append deplibs " -lc"
-            fi
-            ;;
-          esac
-@@ -6764,18 +7683,18 @@
-                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                  case " $predeps $postdeps " in
-                  *" $i "*)
--                   newdeplibs="$newdeplibs $i"
-+                   func_append newdeplibs " $i"
-                    i=""
-                    ;;
-                  esac
-                fi
-                if test -n "$i" ; then
--                 eval "libname=\"$libname_spec\""
--                 eval "deplib_matches=\"$library_names_spec\""
-+                 libname=`eval "\\$ECHO \"$libname_spec\""`
-+                 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-                  set dummy $deplib_matches; shift
-                  deplib_match=$1
-                  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--                   newdeplibs="$newdeplibs $i"
-+                   func_append newdeplibs " $i"
-                  else
-                    droppeddeps=yes
-                    echo
-@@ -6789,7 +7708,7 @@
-                fi
-                ;;
-              *)
--               newdeplibs="$newdeplibs $i"
-+               func_append newdeplibs " $i"
-                ;;
-              esac
-            done
-@@ -6807,18 +7726,18 @@
-                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                    case " $predeps $postdeps " in
-                    *" $i "*)
--                     newdeplibs="$newdeplibs $i"
-+                     func_append newdeplibs " $i"
-                      i=""
-                      ;;
-                    esac
-                  fi
-                  if test -n "$i" ; then
--                   eval "libname=\"$libname_spec\""
--                   eval "deplib_matches=\"$library_names_spec\""
-+                   libname=`eval "\\$ECHO \"$libname_spec\""`
-+                   deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-                    set dummy $deplib_matches; shift
-                    deplib_match=$1
-                    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--                     newdeplibs="$newdeplibs $i"
-+                     func_append newdeplibs " $i"
-                    else
-                      droppeddeps=yes
-                      echo
-@@ -6840,7 +7759,7 @@
-                fi
-                ;;
-              *)
--               newdeplibs="$newdeplibs $i"
-+               func_append newdeplibs " $i"
-                ;;
-              esac
-            done
-@@ -6857,15 +7776,27 @@
-              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                case " $predeps $postdeps " in
-                *" $a_deplib "*)
--                 newdeplibs="$newdeplibs $a_deplib"
-+                 func_append newdeplibs " $a_deplib"
-                  a_deplib=""
-                  ;;
-                esac
-              fi
-              if test -n "$a_deplib" ; then
--               eval "libname=\"$libname_spec\""
-+               libname=`eval "\\$ECHO \"$libname_spec\""`
-+               if test -n "$file_magic_glob"; then
-+                 libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-+               else
-+                 libnameglob=$libname
-+               fi
-+               test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
-                for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
--                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+                 if test "$want_nocaseglob" = yes; then
-+                   shopt -s nocaseglob
-+                   potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-+                   $nocaseglob
-+                 else
-+                   potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-+                 fi
-                  for potent_lib in $potential_libs; do
-                      # Follow soft links.
-                      if ls -lLd "$potent_lib" 2>/dev/null |
-@@ -6885,10 +7816,10 @@
-                        *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-                        esac
-                      done
--                     if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
-+                     if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-                         $SED -e 10q |
-                         $EGREP "$file_magic_regex" > /dev/null; then
--                       newdeplibs="$newdeplibs $a_deplib"
-+                       func_append newdeplibs " $a_deplib"
-                        a_deplib=""
-                        break 2
-                      fi
-@@ -6913,7 +7844,7 @@
-              ;;
-            *)
-              # Add a -L argument.
--             newdeplibs="$newdeplibs $a_deplib"
-+             func_append newdeplibs " $a_deplib"
-              ;;
-            esac
-          done # Gone through all deplibs.
-@@ -6929,20 +7860,20 @@
-              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                case " $predeps $postdeps " in
-                *" $a_deplib "*)
--                 newdeplibs="$newdeplibs $a_deplib"
-+                 func_append newdeplibs " $a_deplib"
-                  a_deplib=""
-                  ;;
-                esac
-              fi
-              if test -n "$a_deplib" ; then
--               eval "libname=\"$libname_spec\""
-+               libname=`eval "\\$ECHO \"$libname_spec\""`
-                for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-                  for potent_lib in $potential_libs; do
-                    potlib="$potent_lib" # see symlink-check above in file_magic test
-                    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-                       $EGREP "$match_pattern_regex" > /dev/null; then
--                     newdeplibs="$newdeplibs $a_deplib"
-+                     func_append newdeplibs " $a_deplib"
-                      a_deplib=""
-                      break 2
-                    fi
-@@ -6967,7 +7898,7 @@
-              ;;
-            *)
-              # Add a -L argument.
--             newdeplibs="$newdeplibs $a_deplib"
-+             func_append newdeplibs " $a_deplib"
-              ;;
-            esac
-          done # Gone through all deplibs.
-@@ -7071,7 +8002,7 @@
-        *)
-          case " $deplibs " in
-          *" -L$path/$objdir "*)
--           new_libs="$new_libs -L$path/$objdir" ;;
-+           func_append new_libs " -L$path/$objdir" ;;
-          esac
-          ;;
-        esac
-@@ -7081,10 +8012,10 @@
-        -L*)
-          case " $new_libs " in
-          *" $deplib "*) ;;
--         *) new_libs="$new_libs $deplib" ;;
-+         *) func_append new_libs " $deplib" ;;
-          esac
-          ;;
--       *) new_libs="$new_libs $deplib" ;;
-+       *) func_append new_libs " $deplib" ;;
-        esac
-       done
-       deplibs="$new_libs"
-@@ -7101,10 +8032,12 @@
-          hardcode_libdirs=
-          dep_rpath=
-          rpath="$finalize_rpath"
--         test "$mode" != relink && rpath="$compile_rpath$rpath"
-+         test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-          for libdir in $rpath; do
-            if test -n "$hardcode_libdir_flag_spec"; then
-              if test -n "$hardcode_libdir_separator"; then
-+               func_replace_sysroot "$libdir"
-+               libdir=$func_replace_sysroot_result
-                if test -z "$hardcode_libdirs"; then
-                  hardcode_libdirs="$libdir"
-                else
-@@ -7113,18 +8046,18 @@
-                  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-                    ;;
-                  *)
--                   hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+                   func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-                    ;;
-                  esac
-                fi
-              else
--               eval "flag=\"$hardcode_libdir_flag_spec\""
--               dep_rpath="$dep_rpath $flag"
-+               eval flag=\"$hardcode_libdir_flag_spec\"
-+               func_append dep_rpath " $flag"
-              fi
-            elif test -n "$runpath_var"; then
-              case "$perm_rpath " in
-              *" $libdir "*) ;;
--             *) perm_rpath="$perm_rpath $libdir" ;;
-+             *) func_apped perm_rpath " $libdir" ;;
-              esac
-            fi
-          done
-@@ -7133,40 +8066,38 @@
-             test -n "$hardcode_libdirs"; then
-            libdir="$hardcode_libdirs"
-            if test -n "$hardcode_libdir_flag_spec_ld"; then
--             eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
-+             eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-            else
--             eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-+             eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-            fi
-          fi
-          if test -n "$runpath_var" && test -n "$perm_rpath"; then
-            # We should set the runpath_var.
-            rpath=
-            for dir in $perm_rpath; do
--             rpath="$rpath$dir:"
-+             func_append rpath "$dir:"
-            done
--           eval $runpath_var=\$rpath\$$runpath_var
--           export $runpath_var
-+           eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-          fi
-          test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-        fi
- 
-        shlibpath="$finalize_shlibpath"
--       test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+       test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-        if test -n "$shlibpath"; then
--         eval $shlibpath_var=\$shlibpath\$$shlibpath_var
--         export $shlibpath_var
-+         eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-        fi
- 
-        # Get the real and link names of the library.
--       eval "shared_ext=\"$shrext_cmds\""
--       eval "library_names=\"$library_names_spec\""
-+       eval shared_ext=\"$shrext_cmds\"
-+       eval library_names=\"$library_names_spec\"
-        set dummy $library_names
-        shift
-        realname="$1"
-        shift
- 
-        if test -n "$soname_spec"; then
--         eval "soname=\"$soname_spec\""
-+         eval soname=\"$soname_spec\"
-        else
-          soname="$realname"
-        fi
-@@ -7178,7 +8109,7 @@
-        linknames=
-        for link
-        do
--         linknames="$linknames $link"
-+         func_append linknames " $link"
-        done
- 
-        # Use standard objects if they are pic
-@@ -7189,7 +8120,7 @@
-        if test -n "$export_symbols" && test -n "$include_expsyms"; then
-          $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-          export_symbols="$output_objdir/$libname.uexp"
--         delfiles="$delfiles $export_symbols"
-+         func_append delfiles " $export_symbols"
-        fi
- 
-        orig_export_symbols=
-@@ -7220,13 +8151,45 @@
-            $opt_dry_run || $RM $export_symbols
-            cmds=$export_symbols_cmds
-            save_ifs="$IFS"; IFS='~'
--           for cmd in $cmds; do
-+           for cmd1 in $cmds; do
-              IFS="$save_ifs"
--             eval "cmd=\"$cmd\""
--             func_len " $cmd"
--             len=$func_len_result
--             if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+             # Take the normal branch if the nm_file_list_spec branch
-+             # doesn't work or if tool conversion is not needed.
-+             case $nm_file_list_spec~$to_tool_file_cmd in
-+               *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-+                 try_normal_branch=yes
-+                 eval cmd=\"$cmd1\"
-+                 func_len " $cmd"
-+                 len=$func_len_result
-+                 ;;
-+               *)
-+                 try_normal_branch=no
-+                 ;;
-+             esac
-+             if test "$try_normal_branch" = yes \
-+                && { test "$len" -lt "$max_cmd_len" \
-+                     || test "$max_cmd_len" -le -1; }
-+             then
-+               func_show_eval "$cmd" 'exit $?'
-+               skipped_export=false
-+             elif test -n "$nm_file_list_spec"; then
-+               func_basename "$output"
-+               output_la=$func_basename_result
-+               save_libobjs=$libobjs
-+               save_output=$output
-+               output=${output_objdir}/${output_la}.nm
-+               func_to_tool_file "$output"
-+               libobjs=$nm_file_list_spec$func_to_tool_file_result
-+               func_append delfiles " $output"
-+               func_verbose "creating $NM input file list: $output"
-+               for obj in $save_libobjs; do
-+                 func_to_tool_file "$obj"
-+                 $ECHO "$func_to_tool_file_result"
-+               done > "$output"
-+               eval cmd=\"$cmd1\"
-                func_show_eval "$cmd" 'exit $?'
-+               output=$save_output
-+               libobjs=$save_libobjs
-                skipped_export=false
-              else
-                # The command line is too long to execute in one step.
-@@ -7248,7 +8211,7 @@
-        if test -n "$export_symbols" && test -n "$include_expsyms"; then
-          tmp_export_symbols="$export_symbols"
-          test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--         $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
-+         $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-        fi
- 
-        if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7260,7 +8223,7 @@
-          # global variables. join(1) would be nice here, but unfortunately
-          # isn't a blessed tool.
-          $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
--         delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+         func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-          export_symbols=$output_objdir/$libname.def
-          $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-        fi
-@@ -7270,7 +8233,7 @@
-          case " $convenience " in
-          *" $test_deplib "*) ;;
-          *)
--           tmp_deplibs="$tmp_deplibs $test_deplib"
-+           func_append tmp_deplibs " $test_deplib"
-            ;;
-          esac
-        done
-@@ -7286,43 +8249,43 @@
-          fi
-          if test -n "$whole_archive_flag_spec"; then
-            save_libobjs=$libobjs
--           eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
-+           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-            test "X$libobjs" = "X " && libobjs=
-          else
-            gentop="$output_objdir/${outputname}x"
--           generated="$generated $gentop"
-+           func_append generated " $gentop"
- 
-            func_extract_archives $gentop $convenience
--           libobjs="$libobjs $func_extract_archives_result"
-+           func_append libobjs " $func_extract_archives_result"
-            test "X$libobjs" = "X " && libobjs=
-          fi
-        fi
- 
-        if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
--         eval "flag=\"$thread_safe_flag_spec\""
--         linker_flags="$linker_flags $flag"
-+         eval flag=\"$thread_safe_flag_spec\"
-+         func_append linker_flags " $flag"
-        fi
- 
-        # Make a backup of the uninstalled library when relinking
--       if test "$mode" = relink; then
--         $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
-+       if test "$opt_mode" = relink; then
-+         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-        fi
- 
-        # Do each of the archive commands.
-        if test "$module" = yes && test -n "$module_cmds" ; then
-          if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
--           eval "test_cmds=\"$module_expsym_cmds\""
-+           eval test_cmds=\"$module_expsym_cmds\"
-            cmds=$module_expsym_cmds
-          else
--           eval "test_cmds=\"$module_cmds\""
-+           eval test_cmds=\"$module_cmds\"
-            cmds=$module_cmds
-          fi
-        else
-          if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
--           eval "test_cmds=\"$archive_expsym_cmds\""
-+           eval test_cmds=\"$archive_expsym_cmds\"
-            cmds=$archive_expsym_cmds
-          else
--           eval "test_cmds=\"$archive_cmds\""
-+           eval test_cmds=\"$archive_cmds\"
-            cmds=$archive_cmds
-          fi
-        fi
-@@ -7366,10 +8329,13 @@
-            echo 'INPUT (' > $output
-            for obj in $save_libobjs
-            do
--             $ECHO "$obj" >> $output
-+             func_to_tool_file "$obj"
-+             $ECHO "$func_to_tool_file_result" >> $output
-            done
-            echo ')' >> $output
--           delfiles="$delfiles $output"
-+           func_append delfiles " $output"
-+           func_to_tool_file "$output"
-+           output=$func_to_tool_file_result
-          elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-            output=${output_objdir}/${output_la}.lnk
-            func_verbose "creating linker input file list: $output"
-@@ -7383,15 +8349,17 @@
-            fi
-            for obj
-            do
--             $ECHO "$obj" >> $output
-+             func_to_tool_file "$obj"
-+             $ECHO "$func_to_tool_file_result" >> $output
-            done
--           delfiles="$delfiles $output"
--           output=$firstobj\"$file_list_spec$output\"
-+           func_append delfiles " $output"
-+           func_to_tool_file "$output"
-+           output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-          else
-            if test -n "$save_libobjs"; then
-              func_verbose "creating reloadable object files..."
-              output=$output_objdir/$output_la-${k}.$objext
--             eval "test_cmds=\"$reload_cmds\""
-+             eval test_cmds=\"$reload_cmds\"
-              func_len " $test_cmds"
-              len0=$func_len_result
-              len=$len0
-@@ -7411,12 +8379,12 @@
-                  if test "$k" -eq 1 ; then
-                    # The first file doesn't have a previous command to add.
-                    reload_objs=$objlist
--                   eval "concat_cmds=\"$reload_cmds\""
-+                   eval concat_cmds=\"$reload_cmds\"
-                  else
-                    # All subsequent reloadable object files will link in
-                    # the last one created.
-                    reload_objs="$objlist $last_robj"
--                   eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
-+                   eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-                  fi
-                  last_robj=$output_objdir/$output_la-${k}.$objext
-                  func_arith $k + 1
-@@ -7433,11 +8401,11 @@
-              # files will link in the last one created.
-              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-              reload_objs="$objlist $last_robj"
--             eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
-+             eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-              if test -n "$last_robj"; then
--               eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
-+               eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-              fi
--             delfiles="$delfiles $output"
-+             func_append delfiles " $output"
- 
-            else
-              output=
-@@ -7450,9 +8418,9 @@
-              libobjs=$output
-              # Append the command to create the export file.
-              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
--             eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
-+             eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-              if test -n "$last_robj"; then
--               eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
-+               eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-              fi
-            fi
- 
-@@ -7471,7 +8439,7 @@
-                lt_exit=$?
- 
-                # Restore the uninstalled library and exit
--               if test "$mode" = relink; then
-+               if test "$opt_mode" = relink; then
-                  ( cd "$output_objdir" && \
-                    $RM "${realname}T" && \
-                    $MV "${realname}U" "$realname" )
-@@ -7492,7 +8460,7 @@
-            if test -n "$export_symbols" && test -n "$include_expsyms"; then
-              tmp_export_symbols="$export_symbols"
-              test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--             $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
-+             $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-            fi
- 
-            if test -n "$orig_export_symbols"; then
-@@ -7504,7 +8472,7 @@
-              # global variables. join(1) would be nice here, but unfortunately
-              # isn't a blessed tool.
-              $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
--             delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+             func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-              export_symbols=$output_objdir/$libname.def
-              $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-            fi
-@@ -7515,7 +8483,7 @@
-          output=$save_output
- 
-          if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
--           eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
-+           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-            test "X$libobjs" = "X " && libobjs=
-          fi
-          # Expand the library linking commands again to reset the
-@@ -7539,23 +8507,23 @@
- 
-        if test -n "$delfiles"; then
-          # Append the command to remove temporary files to $cmds.
--         eval "cmds=\"\$cmds~\$RM $delfiles\""
-+         eval cmds=\"\$cmds~\$RM $delfiles\"
-        fi
- 
-        # Add any objects from preloaded convenience libraries
-        if test -n "$dlprefiles"; then
-          gentop="$output_objdir/${outputname}x"
--         generated="$generated $gentop"
-+         func_append generated " $gentop"
- 
-          func_extract_archives $gentop $dlprefiles
--         libobjs="$libobjs $func_extract_archives_result"
-+         func_append libobjs " $func_extract_archives_result"
-          test "X$libobjs" = "X " && libobjs=
-        fi
- 
-        save_ifs="$IFS"; IFS='~'
-        for cmd in $cmds; do
-          IFS="$save_ifs"
--         eval "cmd=\"$cmd\""
-+         eval cmd=\"$cmd\"
-          $opt_silent || {
-            func_quote_for_expand "$cmd"
-            eval "func_echo $func_quote_for_expand_result"
-@@ -7564,7 +8532,7 @@
-            lt_exit=$?
- 
-            # Restore the uninstalled library and exit
--           if test "$mode" = relink; then
-+           if test "$opt_mode" = relink; then
-              ( cd "$output_objdir" && \
-                $RM "${realname}T" && \
-                $MV "${realname}U" "$realname" )
-@@ -7576,8 +8544,8 @@
-        IFS="$save_ifs"
- 
-        # Restore the uninstalled library and exit
--       if test "$mode" = relink; then
--         $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
-+       if test "$opt_mode" = relink; then
-+         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
- 
-          if test -n "$convenience"; then
-            if test -z "$whole_archive_flag_spec"; then
-@@ -7656,17 +8624,20 @@
- 
-       if test -n "$convenience"; then
-        if test -n "$whole_archive_flag_spec"; then
--         eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
-+         eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-          reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-        else
-          gentop="$output_objdir/${obj}x"
--         generated="$generated $gentop"
-+         func_append generated " $gentop"
- 
-          func_extract_archives $gentop $convenience
-          reload_conv_objs="$reload_objs $func_extract_archives_result"
-        fi
-       fi
- 
-+      # If we're not building shared, we need to use non_pic_objs
-+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-+
-       # Create the old-style object.
-       reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- 
-@@ -7690,7 +8661,7 @@
-        # Create an invalid libtool object if no PIC, so that we don't
-        # accidentally link it into a program.
-        # $show "echo timestamp > $libobj"
--       # $opt_dry_run || echo timestamp > $libobj || exit $?
-+       # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-        exit $EXIT_SUCCESS
-       fi
- 
-@@ -7740,8 +8711,8 @@
-        if test "$tagname" = CXX ; then
-          case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-            10.[0123])
--             compile_command="$compile_command ${wl}-bind_at_load"
--             finalize_command="$finalize_command ${wl}-bind_at_load"
-+             func_append compile_command " ${wl}-bind_at_load"
-+             func_append finalize_command " ${wl}-bind_at_load"
-            ;;
-          esac
-        fi
-@@ -7761,7 +8732,7 @@
-        *)
-          case " $compile_deplibs " in
-          *" -L$path/$objdir "*)
--           new_libs="$new_libs -L$path/$objdir" ;;
-+           func_append new_libs " -L$path/$objdir" ;;
-          esac
-          ;;
-        esac
-@@ -7771,17 +8742,17 @@
-        -L*)
-          case " $new_libs " in
-          *" $deplib "*) ;;
--         *) new_libs="$new_libs $deplib" ;;
-+         *) func_append new_libs " $deplib" ;;
-          esac
-          ;;
--       *) new_libs="$new_libs $deplib" ;;
-+       *) func_append new_libs " $deplib" ;;
-        esac
-       done
-       compile_deplibs="$new_libs"
- 
- 
--      compile_command="$compile_command $compile_deplibs"
--      finalize_command="$finalize_command $finalize_deplibs"
-+      func_append compile_command " $compile_deplibs"
-+      func_append finalize_command " $finalize_deplibs"
- 
-       if test -n "$rpath$xrpath"; then
-        # If the user specified any rpath flags, then add them.
-@@ -7789,7 +8760,7 @@
-          # This is the magic to use -rpath.
-          case "$finalize_rpath " in
-          *" $libdir "*) ;;
--         *) finalize_rpath="$finalize_rpath $libdir" ;;
-+         *) func_append finalize_rpath " $libdir" ;;
-          esac
-        done
-       fi
-@@ -7808,18 +8779,18 @@
-              *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-                ;;
-              *)
--               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+               func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-                ;;
-              esac
-            fi
-          else
--           eval "flag=\"$hardcode_libdir_flag_spec\""
--           rpath="$rpath $flag"
-+           eval flag=\"$hardcode_libdir_flag_spec\"
-+           func_append rpath " $flag"
-          fi
-        elif test -n "$runpath_var"; then
-          case "$perm_rpath " in
-          *" $libdir "*) ;;
--         *) perm_rpath="$perm_rpath $libdir" ;;
-+         *) func_append perm_rpath " $libdir" ;;
-          esac
-        fi
-        case $host in
-@@ -7828,12 +8799,12 @@
-          case :$dllsearchpath: in
-          *":$libdir:"*) ;;
-          ::) dllsearchpath=$libdir;;
--         *) dllsearchpath="$dllsearchpath:$libdir";;
-+         *) func_append dllsearchpath ":$libdir";;
-          esac
-          case :$dllsearchpath: in
-          *":$testbindir:"*) ;;
-          ::) dllsearchpath=$testbindir;;
--         *) dllsearchpath="$dllsearchpath:$testbindir";;
-+         *) func_append dllsearchpath ":$testbindir";;
-          esac
-          ;;
-        esac
-@@ -7842,7 +8813,7 @@
-       if test -n "$hardcode_libdir_separator" &&
-         test -n "$hardcode_libdirs"; then
-        libdir="$hardcode_libdirs"
--       eval "rpath=\" $hardcode_libdir_flag_spec\""
-+       eval rpath=\" $hardcode_libdir_flag_spec\"
-       fi
-       compile_rpath="$rpath"
- 
-@@ -7859,18 +8830,18 @@
-              *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-                ;;
-              *)
--               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+               func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-                ;;
-              esac
-            fi
-          else
--           eval "flag=\"$hardcode_libdir_flag_spec\""
--           rpath="$rpath $flag"
-+           eval flag=\"$hardcode_libdir_flag_spec\"
-+           func_append rpath " $flag"
-          fi
-        elif test -n "$runpath_var"; then
-          case "$finalize_perm_rpath " in
-          *" $libdir "*) ;;
--         *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+         *) func_append finalize_perm_rpath " $libdir" ;;
-          esac
-        fi
-       done
-@@ -7878,7 +8849,7 @@
-       if test -n "$hardcode_libdir_separator" &&
-         test -n "$hardcode_libdirs"; then
-        libdir="$hardcode_libdirs"
--       eval "rpath=\" $hardcode_libdir_flag_spec\""
-+       eval rpath=\" $hardcode_libdir_flag_spec\"
-       fi
-       finalize_rpath="$rpath"
- 
-@@ -7921,6 +8892,12 @@
-        exit_status=0
-        func_show_eval "$link_command" 'exit_status=$?'
- 
-+       if test -n "$postlink_cmds"; then
-+         func_to_tool_file "$output"
-+         postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-+         func_execute_cmds "$postlink_cmds" 'exit $?'
-+       fi
-+
-        # Delete the generated files.
-        if test -f "$output_objdir/${outputname}S.${objext}"; then
-          func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -7943,7 +8920,7 @@
-          # We should set the runpath_var.
-          rpath=
-          for dir in $perm_rpath; do
--           rpath="$rpath$dir:"
-+           func_append rpath "$dir:"
-          done
-          compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-        fi
-@@ -7951,7 +8928,7 @@
-          # We should set the runpath_var.
-          rpath=
-          for dir in $finalize_perm_rpath; do
--           rpath="$rpath$dir:"
-+           func_append rpath "$dir:"
-          done
-          finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-        fi
-@@ -7966,6 +8943,13 @@
-        $opt_dry_run || $RM $output
-        # Link the executable and exit
-        func_show_eval "$link_command" 'exit $?'
-+
-+       if test -n "$postlink_cmds"; then
-+         func_to_tool_file "$output"
-+         postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-+         func_execute_cmds "$postlink_cmds" 'exit $?'
-+       fi
-+
-        exit $EXIT_SUCCESS
-       fi
- 
-@@ -7999,6 +8983,12 @@
- 
-       func_show_eval "$link_command" 'exit $?'
- 
-+      if test -n "$postlink_cmds"; then
-+       func_to_tool_file "$output_objdir/$outputname"
-+       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'`
-+       func_execute_cmds "$postlink_cmds" 'exit $?'
-+      fi
-+
-       # Now create the wrapper script.
-       func_verbose "creating $output"
- 
-@@ -8096,7 +9086,7 @@
-        else
-          oldobjs="$old_deplibs $non_pic_objects"
-          if test "$preload" = yes && test -f "$symfileobj"; then
--           oldobjs="$oldobjs $symfileobj"
-+           func_append oldobjs " $symfileobj"
-          fi
-        fi
-        addlibs="$old_convenience"
-@@ -8104,10 +9094,10 @@
- 
-       if test -n "$addlibs"; then
-        gentop="$output_objdir/${outputname}x"
--       generated="$generated $gentop"
-+       func_append generated " $gentop"
- 
-        func_extract_archives $gentop $addlibs
--       oldobjs="$oldobjs $func_extract_archives_result"
-+       func_append oldobjs " $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-@@ -8118,10 +9108,10 @@
-        # Add any objects from preloaded convenience libraries
-        if test -n "$dlprefiles"; then
-          gentop="$output_objdir/${outputname}x"
--         generated="$generated $gentop"
-+         func_append generated " $gentop"
- 
-          func_extract_archives $gentop $dlprefiles
--         oldobjs="$oldobjs $func_extract_archives_result"
-+         func_append oldobjs " $func_extract_archives_result"
-        fi
- 
-        # POSIX demands no paths to be encoded in archives.  We have
-@@ -8139,7 +9129,7 @@
-        else
-          echo "copying selected object files to avoid basename conflicts..."
-          gentop="$output_objdir/${outputname}x"
--         generated="$generated $gentop"
-+         func_append generated " $gentop"
-          func_mkdir_p "$gentop"
-          save_oldobjs=$oldobjs
-          oldobjs=
-@@ -8163,18 +9153,28 @@
-                esac
-              done
-              func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
--             oldobjs="$oldobjs $gentop/$newobj"
-+             func_append oldobjs " $gentop/$newobj"
-              ;;
--           *) oldobjs="$oldobjs $obj" ;;
-+           *) func_append oldobjs " $obj" ;;
-            esac
-          done
-        fi
--       eval "cmds=\"$old_archive_cmds\""
-+       eval cmds=\"$old_archive_cmds\"
- 
-        func_len " $cmds"
-        len=$func_len_result
-        if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-          cmds=$old_archive_cmds
-+       elif test -n "$archiver_list_spec"; then
-+         func_verbose "using command file archive linking..."
-+         for obj in $oldobjs
-+         do
-+           func_to_tool_file "$obj"
-+           $ECHO "$func_to_tool_file_result"
-+         done > $output_objdir/$libname.libcmd
-+         func_to_tool_file "$output_objdir/$libname.libcmd"
-+         oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-+         cmds=$old_archive_cmds
-        else
-          # the command line is too long to link in one step, link in parts
-          func_verbose "using piecewise archive linking..."
-@@ -8189,7 +9189,7 @@
-          do
-            last_oldobj=$obj
-          done
--         eval "test_cmds=\"$old_archive_cmds\""
-+         eval test_cmds=\"$old_archive_cmds\"
-          func_len " $test_cmds"
-          len0=$func_len_result
-          len=$len0
-@@ -8208,7 +9208,7 @@
-                RANLIB=$save_RANLIB
-              fi
-              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
--             eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
-+             eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-              objlist=
-              len=$len0
-            fi
-@@ -8216,9 +9216,9 @@
-          RANLIB=$save_RANLIB
-          oldobjs=$objlist
-          if test "X$oldobjs" = "X" ; then
--           eval "cmds=\"\$concat_cmds\""
-+           eval cmds=\"\$concat_cmds\"
-          else
--           eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
-+           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-          fi
-        fi
-       fi
-@@ -8268,12 +9268,23 @@
-              *.la)
-                func_basename "$deplib"
-                name="$func_basename_result"
--               libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+               func_resolve_sysroot "$deplib"
-+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-                test -z "$libdir" && \
-                  func_fatal_error "\`$deplib' is not a valid libtool archive"
--               newdependency_libs="$newdependency_libs $libdir/$name"
-+               func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-+               ;;
-+             -L*)
-+               func_stripname -L '' "$deplib"
-+               func_replace_sysroot "$func_stripname_result"
-+               func_append newdependency_libs " -L$func_replace_sysroot_result"
-                ;;
--             *) newdependency_libs="$newdependency_libs $deplib" ;;
-+             -R*)
-+               func_stripname -R '' "$deplib"
-+               func_replace_sysroot "$func_stripname_result"
-+               func_append newdependency_libs " -R$func_replace_sysroot_result"
-+               ;;
-+             *) func_append newdependency_libs " $deplib" ;;
-              esac
-            done
-            dependency_libs="$newdependency_libs"
-@@ -8284,12 +9295,14 @@
-              *.la)
-                func_basename "$lib"
-                name="$func_basename_result"
--               libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+               func_resolve_sysroot "$lib"
-+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-+
-                test -z "$libdir" && \
-                  func_fatal_error "\`$lib' is not a valid libtool archive"
--               newdlfiles="$newdlfiles $libdir/$name"
-+               func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-                ;;
--             *) newdlfiles="$newdlfiles $lib" ;;
-+             *) func_append newdlfiles " $lib" ;;
-              esac
-            done
-            dlfiles="$newdlfiles"
-@@ -8303,10 +9316,11 @@
-                # the library:
-                func_basename "$lib"
-                name="$func_basename_result"
--               libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+               func_resolve_sysroot "$lib"
-+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-                test -z "$libdir" && \
-                  func_fatal_error "\`$lib' is not a valid libtool archive"
--               newdlprefiles="$newdlprefiles $libdir/$name"
-+               func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-                ;;
-              esac
-            done
-@@ -8318,7 +9332,7 @@
-                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-                *) abs=`pwd`"/$lib" ;;
-              esac
--             newdlfiles="$newdlfiles $abs"
-+             func_append newdlfiles " $abs"
-            done
-            dlfiles="$newdlfiles"
-            newdlprefiles=
-@@ -8327,7 +9341,7 @@
-                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-                *) abs=`pwd`"/$lib" ;;
-              esac
--             newdlprefiles="$newdlprefiles $abs"
-+             func_append newdlprefiles " $abs"
-            done
-            dlprefiles="$newdlprefiles"
-          fi
-@@ -8412,7 +9426,7 @@
-     exit $EXIT_SUCCESS
- }
- 
--{ test "$mode" = link || test "$mode" = relink; } &&
-+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-     func_mode_link ${1+"$@"}
- 
- 
-@@ -8432,9 +9446,9 @@
-     for arg
-     do
-       case $arg in
--      -f) RM="$RM $arg"; rmforce=yes ;;
--      -*) RM="$RM $arg" ;;
--      *) files="$files $arg" ;;
-+      -f) func_append RM " $arg"; rmforce=yes ;;
-+      -*) func_append RM " $arg" ;;
-+      *) func_append files " $arg" ;;
-       esac
-     done
- 
-@@ -8443,24 +9457,23 @@
- 
-     rmdirs=
- 
--    origobjdir="$objdir"
-     for file in $files; do
-       func_dirname "$file" "" "."
-       dir="$func_dirname_result"
-       if test "X$dir" = X.; then
--       objdir="$origobjdir"
-+       odir="$objdir"
-       else
--       objdir="$dir/$origobjdir"
-+       odir="$dir/$objdir"
-       fi
-       func_basename "$file"
-       name="$func_basename_result"
--      test "$mode" = uninstall && objdir="$dir"
-+      test "$opt_mode" = uninstall && odir="$dir"
- 
--      # Remember objdir for removal later, being careful to avoid duplicates
--      if test "$mode" = clean; then
-+      # Remember odir for removal later, being careful to avoid duplicates
-+      if test "$opt_mode" = clean; then
-        case " $rmdirs " in
--         *" $objdir "*) ;;
--         *) rmdirs="$rmdirs $objdir" ;;
-+         *" $odir "*) ;;
-+         *) func_append rmdirs " $odir" ;;
-        esac
-       fi
- 
-@@ -8486,18 +9499,17 @@
- 
-          # Delete the libtool libraries and symlinks.
-          for n in $library_names; do
--           rmfiles="$rmfiles $objdir/$n"
-+           func_append rmfiles " $odir/$n"
-          done
--         test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+         test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- 
--         case "$mode" in
-+         case "$opt_mode" in
-          clean)
--           case "  $library_names " in
--           # "  " in the beginning catches empty $dlname
-+           case " $library_names " in
-            *" $dlname "*) ;;
--           *) rmfiles="$rmfiles $objdir/$dlname" ;;
-+           *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-            esac
--           test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+           test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-            ;;
-          uninstall)
-            if test -n "$library_names"; then
-@@ -8525,19 +9537,19 @@
-          # Add PIC object to the list of files to remove.
-          if test -n "$pic_object" &&
-             test "$pic_object" != none; then
--           rmfiles="$rmfiles $dir/$pic_object"
-+           func_append rmfiles " $dir/$pic_object"
-          fi
- 
-          # Add non-PIC object to the list of files to remove.
-          if test -n "$non_pic_object" &&
-             test "$non_pic_object" != none; then
--           rmfiles="$rmfiles $dir/$non_pic_object"
-+           func_append rmfiles " $dir/$non_pic_object"
-          fi
-        fi
-        ;;
- 
-       *)
--       if test "$mode" = clean ; then
-+       if test "$opt_mode" = clean ; then
-          noexename=$name
-          case $file in
-          *.exe)
-@@ -8547,7 +9559,7 @@
-            noexename=$func_stripname_result
-            # $file with .exe has already been added to rmfiles,
-            # add $file without .exe
--           rmfiles="$rmfiles $file"
-+           func_append rmfiles " $file"
-            ;;
-          esac
-          # Do a test to see if this is a libtool program.
-@@ -8556,7 +9568,7 @@
-              func_ltwrapper_scriptname "$file"
-              relink_command=
-              func_source $func_ltwrapper_scriptname_result
--             rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-+             func_append rmfiles " $func_ltwrapper_scriptname_result"
-            else
-              relink_command=
-              func_source $dir/$noexename
-@@ -8564,12 +9576,12 @@
- 
-            # note $name still contains .exe if it was in $file originally
-            # as does the version of $file that was added into $rmfiles
--           rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+           func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-            if test "$fast_install" = yes && test -n "$relink_command"; then
--             rmfiles="$rmfiles $objdir/lt-$name"
-+             func_append rmfiles " $odir/lt-$name"
-            fi
-            if test "X$noexename" != "X$name" ; then
--             rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-+             func_append rmfiles " $odir/lt-${noexename}.c"
-            fi
-          fi
-        fi
-@@ -8577,7 +9589,6 @@
-       esac
-       func_show_eval "$RM $rmfiles" 'exit_status=1'
-     done
--    objdir="$origobjdir"
- 
-     # Try to remove the ${objdir}s in the directories where we deleted files
-     for dir in $rmdirs; do
-@@ -8589,16 +9600,16 @@
-     exit $exit_status
- }
- 
--{ test "$mode" = uninstall || test "$mode" = clean; } &&
-+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-     func_mode_uninstall ${1+"$@"}
- 
--test -z "$mode" && {
-+test -z "$opt_mode" && {
-   help="$generic_help"
-   func_fatal_help "you must specify a MODE"
- }
- 
- test -z "$exec_cmd" && \
--  func_fatal_help "invalid operation mode \`$mode'"
-+  func_fatal_help "invalid operation mode \`$opt_mode'"
- 
- if test -n "$exec_cmd"; then
-   eval exec "$exec_cmd"
-Index: binutils-2.24/ltoptions.m4
-===================================================================
---- binutils-2.24.orig/ltoptions.m4     2013-11-04 07:33:40.000000000 -0800
-+++ binutils-2.24/ltoptions.m4  2013-12-15 11:10:23.867118697 -0800
-@@ -8,7 +8,7 @@
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
- 
--# serial 6 ltoptions.m4
-+# serial 7 ltoptions.m4
- 
- # This is to help aclocal find these macros, as it can't see m4_define.
- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-Index: binutils-2.24/ltversion.m4
-===================================================================
---- binutils-2.24.orig/ltversion.m4     2013-11-04 07:33:40.000000000 -0800
-+++ binutils-2.24/ltversion.m4  2013-12-15 11:10:23.867118697 -0800
-@@ -7,17 +7,17 @@
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
- 
--# Generated from ltversion.in.
-+# @configure_input@
- 
--# serial 3134 ltversion.m4
-+# serial 3293 ltversion.m4
- # This file is part of GNU Libtool
- 
--m4_define([LT_PACKAGE_VERSION], [2.2.7a])
--m4_define([LT_PACKAGE_REVISION], [1.3134])
-+m4_define([LT_PACKAGE_VERSION], [2.4])
-+m4_define([LT_PACKAGE_REVISION], [1.3293])
- 
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.7a'
--macro_revision='1.3134'
-+[macro_version='2.4'
-+macro_revision='1.3293'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
-Index: binutils-2.24/lt~obsolete.m4
-===================================================================
---- binutils-2.24.orig/lt~obsolete.m4   2013-11-04 07:33:40.000000000 -0800
-+++ binutils-2.24/lt~obsolete.m4        2013-12-15 11:10:23.867118697 -0800
-@@ -7,7 +7,7 @@
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
- 
--# serial 4 lt~obsolete.m4
-+# serial 5 lt~obsolete.m4
- 
- # These exist entirely to fool aclocal when bootstrapping libtool.
- #
-Index: binutils-2.24/configure
-===================================================================
---- binutils-2.24.orig/configure        2013-12-15 11:09:51.000000000 -0800
-+++ binutils-2.24/configure     2013-12-15 11:10:23.870452030 -0800
-@@ -7921,7 +7921,7 @@
-     # For an installed makeinfo, we require it to be from texinfo 4.7 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*([1-3][0-9]|4.[4-9]|4.[1-9][0-9]+|[5-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-Index: binutils-2.24/bfd/configure
-===================================================================
---- binutils-2.24.orig/bfd/configure    2013-12-02 01:30:30.000000000 -0800
-+++ binutils-2.24/bfd/configure 2013-12-15 11:10:23.870452030 -0800
-@@ -668,6 +668,9 @@
+So we can get libtool sysroot support
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ bfd/configure        | 1320 +++++++++++++++++------
+ bfd/configure.ac     |    2 +-
+ binutils/configure   | 1318 +++++++++++++++++------
+ configure            |    2 +-
+ gas/configure        | 1318 +++++++++++++++++------
+ gprof/configure      | 1323 +++++++++++++++++------
+ ld/configure         | 1701 +++++++++++++++++++++--------
+ libtool.m4           | 1086 +++++++++++++------
+ ltmain.sh            | 2925 +++++++++++++++++++++++++++++++++-----------------
+ ltoptions.m4         |    2 +-
+ ltversion.m4         |   12 +-
+ lt~obsolete.m4       |    2 +-
+ opcodes/configure    | 1320 +++++++++++++++++------
+ opcodes/configure.ac |    2 +-
+ 14 files changed, 8952 insertions(+), 3381 deletions(-)
+
+diff --git a/bfd/configure b/bfd/configure
+index 85e6b82..3d3dd88 100755
+--- a/bfd/configure
++++ b/bfd/configure
+@@ -668,6 +668,9 @@ OTOOL
  LIPO
  NMEDIT
  DSYMUTIL
@@ -7134,7 +39,7 @@ Index: binutils-2.24/bfd/configure
  OBJDUMP
  LN_S
  NM
-@@ -780,6 +783,7 @@
+@@ -780,6 +783,7 @@ enable_static
  with_pic
  enable_fast_install
  with_gnu_ld
@@ -7142,7 +47,7 @@ Index: binutils-2.24/bfd/configure
  enable_libtool_lock
  enable_plugins
  enable_largefile
-@@ -1456,6 +1460,8 @@
+@@ -1456,6 +1460,8 @@ Optional Packages:
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
@@ -7151,7 +56,7 @@ Index: binutils-2.24/bfd/configure
    --with-mmap             try using mmap for BFD input files if available
    --with-separate-debug-dir=DIR
                            Look for global separate debug info in DIR
-@@ -5386,8 +5392,8 @@
+@@ -5386,8 +5392,8 @@ esac
  
  
  
@@ -7162,7 +67,7 @@ Index: binutils-2.24/bfd/configure
  
  
  
-@@ -5427,7 +5433,7 @@
+@@ -5427,7 +5433,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  $as_echo_n "checking how to print strings... " >&6; }
  # Test print first, because it will be a builtin if present.
@@ -7171,7 +76,7 @@ Index: binutils-2.24/bfd/configure
     test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
    ECHO='print -r --'
  elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-@@ -6113,8 +6119,8 @@
+@@ -6113,8 +6119,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  # Try some XSI features
  xsi_shell=no
  ( _lt_dummy="a/b/c"
@@ -7182,7 +87,7 @@ Index: binutils-2.24/bfd/configure
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
-@@ -6163,6 +6169,80 @@
+@@ -6163,6 +6169,80 @@ esac
  
  
  
@@ -7263,7 +168,7 @@ Index: binutils-2.24/bfd/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  $as_echo_n "checking for $LD option to reload object files... " >&6; }
  if test "${lt_cv_ld_reload_flag+set}" = set; then :
-@@ -6179,6 +6259,11 @@
+@@ -6179,6 +6259,11 @@ case $reload_flag in
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  case $host_os in
@@ -7275,7 +180,7 @@ Index: binutils-2.24/bfd/configure
    darwin*)
      if test "$GCC" = yes; then
        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -6347,7 +6432,8 @@
+@@ -6347,7 +6432,8 @@ mingw* | pw32*)
      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
      lt_cv_file_magic_cmd='func_win32_libid'
    else
@@ -7285,7 +190,7 @@ Index: binutils-2.24/bfd/configure
      lt_cv_file_magic_cmd='$OBJDUMP -f'
    fi
    ;;
-@@ -6501,6 +6587,21 @@
+@@ -6501,6 +6587,21 @@ esac
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -7307,7 +212,7 @@ Index: binutils-2.24/bfd/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6516,9 +6617,162 @@
+@@ -6516,9 +6617,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
  
  
@@ -7472,7 +377,7 @@ Index: binutils-2.24/bfd/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then :
-@@ -6534,7 +6788,7 @@
+@@ -6534,7 +6788,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -7481,7 +386,7 @@ Index: binutils-2.24/bfd/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6554,11 +6808,15 @@
+@@ -6554,11 +6808,15 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -7500,7 +405,7 @@ Index: binutils-2.24/bfd/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-@@ -6574,7 +6832,7 @@
+@@ -6574,7 +6832,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -7509,7 +414,7 @@ Index: binutils-2.24/bfd/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6593,6 +6851,10 @@
+@@ -6593,6 +6851,10 @@ else
  $as_echo "no" >&6; }
  fi
  
@@ -7520,7 +425,7 @@ Index: binutils-2.24/bfd/configure
    if test "x$ac_ct_AR" = x; then
      AR="false"
    else
-@@ -6604,16 +6866,72 @@
+@@ -6604,16 +6866,72 @@ ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
    fi
@@ -7542,7 +447,7 @@ Index: binutils-2.24/bfd/configure
 +
 +
 +
- 
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 +$as_echo_n "checking for archiver @FILE support... " >&6; }
 +if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -7551,7 +456,7 @@ Index: binutils-2.24/bfd/configure
 +  lt_cv_ar_at_file=no
 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
++
 +int
 +main ()
 +{
@@ -7584,11 +489,11 @@ Index: binutils-2.24/bfd/configure
  
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 +$as_echo "$lt_cv_ar_at_file" >&6; }
-+
+ 
 +if test "x$lt_cv_ar_at_file" = xno; then
 +  archiver_list_spec=
 +else
@@ -7597,7 +502,7 @@ Index: binutils-2.24/bfd/configure
  
  
  
-@@ -6955,8 +7273,8 @@
+@@ -6955,8 +7273,8 @@ esac
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
  # Transform an extracted symbol line into symbol name and symbol address
@@ -7608,7 +513,7 @@ Index: binutils-2.24/bfd/configure
  
  # Handle CRLF in mingw tool chain
  opt_cr=
-@@ -6992,6 +7310,7 @@
+@@ -6992,6 +7310,7 @@ for ac_symprfx in "" "_"; do
    else
      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
    fi
@@ -7616,7 +521,7 @@ Index: binutils-2.24/bfd/configure
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -7033,6 +7352,18 @@
+@@ -7033,6 +7352,18 @@ _LT_EOF
        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
         if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
           cat <<_LT_EOF > conftest.$ac_ext
@@ -7635,7 +540,7 @@ Index: binutils-2.24/bfd/configure
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -7044,7 +7375,7 @@
+@@ -7044,7 +7375,7 @@ _LT_EOF
           cat <<_LT_EOF >> conftest.$ac_ext
  
  /* The mapping between symbol names and symbols.  */
@@ -7644,7 +549,7 @@ Index: binutils-2.24/bfd/configure
    const char *name;
    void       *address;
  }
-@@ -7070,8 +7401,8 @@
+@@ -7070,8 +7401,8 @@ static const void *lt_preloaded_setup() {
  _LT_EOF
           # Now try linking the two files.
           mv conftest.$ac_objext conftstm.$ac_objext
@@ -7655,7 +560,7 @@ Index: binutils-2.24/bfd/configure
           LIBS="conftstm.$ac_objext"
           CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
           if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -7081,8 +7412,8 @@
+@@ -7081,8 +7412,8 @@ _LT_EOF
    test $ac_status = 0; } && test -s conftest${ac_exeext}; then
             pipe_works=yes
           fi
@@ -7666,7 +571,7 @@ Index: binutils-2.24/bfd/configure
         else
           echo "cannot find nm_test_func in $nlist" >&5
         fi
-@@ -7119,6 +7450,20 @@
+@@ -7119,6 +7450,16 @@ else
  $as_echo "ok" >&6; }
  fi
  
@@ -7680,17 +585,15 @@ Index: binutils-2.24/bfd/configure
 +
 +
 +
-+
-+
-+
-+
  
  
  
-@@ -7138,6 +7483,41 @@
+@@ -7140,6 +7481,45 @@ fi
  
  
  
++
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 +$as_echo_n "checking for sysroot... " >&6; }
 +
@@ -7726,10 +629,12 @@ Index: binutils-2.24/bfd/configure
 +
 +
 +
- 
- 
++
++
  # Check whether --enable-libtool-lock was given.
-@@ -7346,6 +7726,123 @@
+ if test "${enable_libtool_lock+set}" = set; then :
+   enableval=$enable_libtool_lock;
+@@ -7346,6 +7726,123 @@ esac
  
  need_locks="$enable_libtool_lock"
  
@@ -7853,7 +758,7 @@ Index: binutils-2.24/bfd/configure
  
    case $host_os in
      rhapsody* | darwin*)
-@@ -7909,6 +8406,8 @@
+@@ -7909,6 +8406,8 @@ _LT_EOF
        $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
        echo "$AR cru libconftest.a conftest.o" >&5
        $AR cru libconftest.a conftest.o 2>&5
@@ -7862,7 +767,7 @@ Index: binutils-2.24/bfd/configure
        cat > conftest.c << _LT_EOF
  int main() { return 0;}
  _LT_EOF
-@@ -8073,7 +8572,8 @@
+@@ -8073,7 +8572,8 @@ fi
  LIBTOOL_DEPS="$ltmain"
  
  # Always use our own libtool.
@@ -7872,7 +777,7 @@ Index: binutils-2.24/bfd/configure
  
  
  
-@@ -8162,7 +8662,7 @@
+@@ -8162,7 +8662,7 @@ aix3*)
  esac
  
  # Global variables:
@@ -7881,7 +786,7 @@ Index: binutils-2.24/bfd/configure
  can_build_shared=yes
  
  # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -8460,8 +8960,6 @@
+@@ -8460,8 +8960,6 @@ fi
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -7890,7 +795,7 @@ Index: binutils-2.24/bfd/configure
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -8627,6 +9125,12 @@
+@@ -8627,6 +9125,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         lt_prog_compiler_pic='--shared'
         lt_prog_compiler_static='--static'
         ;;
@@ -7903,7 +808,7 @@ Index: binutils-2.24/bfd/configure
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          # Portland Group compilers (*not* the Pentium gcc compiler,
         # which looks to be a dead project)
-@@ -8689,7 +9193,7 @@
+@@ -8689,7 +9193,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -7912,7 +817,7 @@ Index: binutils-2.24/bfd/configure
         lt_prog_compiler_wl='-Qoption ld ';;
        *)
         lt_prog_compiler_wl='-Wl,';;
-@@ -8746,13 +9250,17 @@
+@@ -8746,13 +9250,17 @@ case $host_os in
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -7936,7 +841,7 @@ Index: binutils-2.24/bfd/configure
  
  #
  # Check to make sure the PIC flag actually works.
-@@ -8813,6 +9321,11 @@
+@@ -8813,6 +9321,11 @@ fi
  
  
  
@@ -7948,7 +853,7 @@ Index: binutils-2.24/bfd/configure
  #
  # Check to make sure the static flag actually works.
  #
-@@ -9163,7 +9676,8 @@
+@@ -9163,7 +9676,8 @@ _LT_EOF
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -7958,7 +863,7 @@ Index: binutils-2.24/bfd/configure
  
        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9211,7 +9725,7 @@
+@@ -9211,7 +9725,7 @@ _LT_EOF
        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
          && test "$tmp_diet" = no
        then
@@ -7967,7 +872,7 @@ Index: binutils-2.24/bfd/configure
         tmp_sharedflag='-shared'
         case $cc_basename,$host_cpu in
          pgcc*)                         # Portland Group C compiler
-@@ -9262,12 +9776,12 @@
+@@ -9262,12 +9776,12 @@ _LT_EOF
           whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
           hardcode_libdir_flag_spec=
           hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -7982,7 +887,7 @@ Index: binutils-2.24/bfd/configure
           fi
           ;;
         esac
-@@ -9281,8 +9795,8 @@
+@@ -9281,8 +9795,8 @@ _LT_EOF
         archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
         wlarc=
        else
@@ -7993,7 +898,7 @@ Index: binutils-2.24/bfd/configure
        fi
        ;;
  
-@@ -9300,8 +9814,8 @@
+@@ -9300,8 +9814,8 @@ _LT_EOF
  
  _LT_EOF
        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8004,7 +909,7 @@ Index: binutils-2.24/bfd/configure
        else
         ld_shlibs=no
        fi
-@@ -9347,8 +9861,8 @@
+@@ -9347,8 +9861,8 @@ _LT_EOF
  
      *)
        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -8015,7 +920,7 @@ Index: binutils-2.24/bfd/configure
        else
         ld_shlibs=no
        fi
-@@ -9478,7 +9992,13 @@
+@@ -9478,7 +9992,13 @@ _LT_EOF
         allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -8030,7 +935,7 @@ Index: binutils-2.24/bfd/configure
  /* end confdefs.h.  */
  
  int
-@@ -9491,22 +10011,29 @@
+@@ -9491,22 +10011,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -8073,7 +978,7 @@ Index: binutils-2.24/bfd/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
          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"
-@@ -9518,7 +10045,13 @@
+@@ -9518,7 +10045,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         else
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -8088,7 +993,7 @@ Index: binutils-2.24/bfd/configure
  /* end confdefs.h.  */
  
  int
-@@ -9531,22 +10064,29 @@
+@@ -9531,22 +10064,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -8131,7 +1036,7 @@ Index: binutils-2.24/bfd/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
           # Warning - without using the other run time loading flags,
-@@ -9591,20 +10131,63 @@
+@@ -9591,20 +10131,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
@@ -8209,7 +1114,7 @@ Index: binutils-2.24/bfd/configure
        ;;
  
      darwin* | rhapsody*)
-@@ -9665,7 +10248,7 @@
+@@ -9665,7 +10248,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
@@ -8218,7 +1123,7 @@ Index: binutils-2.24/bfd/configure
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9673,7 +10256,7 @@
+@@ -9673,7 +10256,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -8227,7 +1132,7 @@ Index: binutils-2.24/bfd/configure
        else
         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'
        fi
-@@ -9689,7 +10272,7 @@
+@@ -9689,7 +10272,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux10*)
        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -8236,7 +1141,7 @@ Index: binutils-2.24/bfd/configure
        else
         archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -9713,10 +10296,10 @@
+@@ -9713,10 +10296,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
           archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
           ;;
         ia64*)
@@ -8249,7 +1154,7 @@ Index: binutils-2.24/bfd/configure
           ;;
         esac
        else
-@@ -9795,23 +10378,36 @@
+@@ -9795,23 +10378,36 @@ fi
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -8294,7 +1199,7 @@ Index: binutils-2.24/bfd/configure
        else
         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'
         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'
-@@ -9896,7 +10492,7 @@
+@@ -9896,7 +10492,7 @@ rm -f core conftest.err conftest.$ac_objext \
      osf4* | osf5*)     # as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
         allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -8303,7 +1208,7 @@ Index: binutils-2.24/bfd/configure
         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
         allow_undefined_flag=' -expect_unresolved \*'
-@@ -9915,9 +10511,9 @@
+@@ -9915,9 +10511,9 @@ rm -f core conftest.err conftest.$ac_objext \
        no_undefined_flag=' -z defs'
        if test "$GCC" = yes; then
         wlarc='${wl}'
@@ -8315,7 +1220,7 @@ Index: binutils-2.24/bfd/configure
        else
         case `$CC -V 2>&1` in
         *"Compilers 5.0"*)
-@@ -10493,8 +11089,9 @@
+@@ -10493,8 +11089,9 @@ cygwin* | mingw* | pw32* | cegcc*)
    need_version=no
    need_lib_prefix=no
  
@@ -8327,7 +1232,7 @@ Index: binutils-2.24/bfd/configure
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -10527,13 +11124,71 @@
+@@ -10527,13 +11124,71 @@ cygwin* | mingw* | pw32* | cegcc*)
        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
        ;;
      esac
@@ -8400,7 +1305,7 @@ Index: binutils-2.24/bfd/configure
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
    ;;
-@@ -10625,7 +11280,7 @@
+@@ -10625,7 +11280,7 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -8409,7 +1314,7 @@ Index: binutils-2.24/bfd/configure
    hardcode_into_libs=yes
    ;;
  
-@@ -11465,10 +12120,10 @@
+@@ -11465,10 +12120,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -8422,7 +1327,7 @@ Index: binutils-2.24/bfd/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11571,10 +12226,10 @@
+@@ -11571,10 +12226,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -8435,7 +1340,7 @@ Index: binutils-2.24/bfd/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -15079,7 +15734,7 @@
+@@ -15163,7 +15818,7 @@ SHARED_LDFLAGS=
  if test "$enable_shared" = "yes"; then
    x=`sed -n -e 's/^[   ]*PICFLAG[      ]*=[    ]*//p' < ../libiberty/Makefile | sed -n '$p'`
    if test -n "$x"; then
@@ -8444,7 +1349,7 @@ Index: binutils-2.24/bfd/configure
    fi
  
  # More hacks to build DLLs on Windows.
-@@ -16694,13 +17349,20 @@
+@@ -16780,13 +17435,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -8465,7 +1370,7 @@ Index: binutils-2.24/bfd/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -16715,14 +17377,17 @@
+@@ -16801,14 +17463,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -8484,7 +1389,7 @@ Index: binutils-2.24/bfd/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -16755,12 +17420,12 @@
+@@ -16841,12 +17506,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -8498,7 +1403,7 @@ Index: binutils-2.24/bfd/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -16815,8 +17480,13 @@
+@@ -16901,8 +17566,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -8512,7 +1417,7 @@ Index: binutils-2.24/bfd/configure
  STRIP \
  RANLIB \
  CC \
-@@ -16826,12 +17496,14 @@
+@@ -16912,12 +17582,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -8528,7 +1433,7 @@ Index: binutils-2.24/bfd/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -16847,7 +17519,6 @@
+@@ -16933,7 +17605,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -8536,7 +1441,7 @@ Index: binutils-2.24/bfd/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -16883,6 +17554,7 @@
+@@ -16969,6 +17640,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -8544,7 +1449,7 @@ Index: binutils-2.24/bfd/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -17662,7 +18334,8 @@
+@@ -17748,7 +18420,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -8554,7 +1459,7 @@ Index: binutils-2.24/bfd/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -17765,19 +18438,42 @@
+@@ -17851,19 +18524,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -8598,7 +1503,7 @@ Index: binutils-2.24/bfd/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -17807,6 +18503,12 @@
+@@ -17893,6 +18589,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -8611,7 +1516,7 @@ Index: binutils-2.24/bfd/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -17816,6 +18518,9 @@
+@@ -17902,6 +18604,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -8621,7 +1526,7 @@ Index: binutils-2.24/bfd/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -17930,12 +18635,12 @@
+@@ -18016,12 +18721,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -8637,7 +1542,7 @@ Index: binutils-2.24/bfd/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -18022,9 +18727,6 @@
+@@ -18108,9 +18813,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -8647,7 +1552,7 @@ Index: binutils-2.24/bfd/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -18040,6 +18742,9 @@
+@@ -18126,6 +18828,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -8657,7 +1562,7 @@ Index: binutils-2.24/bfd/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -18072,210 +18777,169 @@
+@@ -18158,210 +18863,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -8859,9 +1764,15 @@ Index: binutils-2.24/bfd/configure
 -_LT_EOF
 -    ;;
 -  esac
+-
+-
+-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+-    || (rm -f "$cfgfile"; exit 1)
+-
+-  mv -f "$cfgfile" "$ofile" ||
 +  sed '$q' "$ltmain" >> "$cfgfile" \
 +     || (rm -f "$cfgfile"; exit 1)
- 
++
 +  if test x"$xsi_shell" = xyes; then
 +  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
 +func_dirname ()\
@@ -9019,47 +1930,59 @@ Index: binutils-2.24/bfd/configure
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
 +fi
- 
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
- 
--  mv -f "$cfgfile" "$ofile" ||
++
++
 +   mv -f "$cfgfile" "$ofile" ||
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.24/opcodes/configure
-===================================================================
---- binutils-2.24.orig/opcodes/configure        2013-11-04 07:33:40.000000000 -0800
-+++ binutils-2.24/opcodes/configure     2013-12-15 11:10:23.873785364 -0800
-@@ -648,6 +648,9 @@
+diff --git a/bfd/configure.ac b/bfd/configure.ac
+index ba98e39..88063cf 100644
+--- a/bfd/configure.ac
++++ b/bfd/configure.ac
+@@ -564,7 +564,7 @@ changequote(,)dnl
+   x=`sed -n -e 's/^[   ]*PICFLAG[      ]*=[    ]*//p' < ../libiberty/Makefile | sed -n '$p'`
+ changequote([,])dnl
+   if test -n "$x"; then
+-    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
++    SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
+   fi
+ 
+ # More hacks to build DLLs on Windows.
+diff --git a/binutils/configure b/binutils/configure
+index be4b81c..6606a5f 100755
+--- a/binutils/configure
++++ b/binutils/configure
+@@ -655,8 +655,11 @@ OTOOL
  LIPO
  NMEDIT
  DSYMUTIL
 +MANIFEST_TOOL
+ RANLIB
 +ac_ct_AR
+ AR
 +DLLTOOL
  OBJDUMP
  LN_S
  NM
-@@ -760,6 +763,7 @@
+@@ -767,6 +770,7 @@ enable_static
  with_pic
  enable_fast_install
  with_gnu_ld
 +with_libtool_sysroot
  enable_libtool_lock
- enable_targets
- enable_werror
-@@ -1418,6 +1422,8 @@
+ enable_plugins
+ enable_largefile
+@@ -1439,6 +1443,8 @@ Optional Packages:
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
 +  --with-libtool-sysroot=DIR Search for dependent libraries within DIR
 +                        (or the compiler's sysroot if not specified).
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -5113,8 +5119,8 @@
+   --with-zlib             include zlib support (auto/yes/no) default=auto
+   --with-gnu-ld           assume the C compiler uses GNU ld default=no
+   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+@@ -5153,8 +5159,8 @@ esac
  
  
  
@@ -9070,7 +1993,7 @@ Index: binutils-2.24/opcodes/configure
  
  
  
-@@ -5154,7 +5160,7 @@
+@@ -5194,7 +5200,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  $as_echo_n "checking how to print strings... " >&6; }
  # Test print first, because it will be a builtin if present.
@@ -9079,7 +2002,7 @@ Index: binutils-2.24/opcodes/configure
     test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
    ECHO='print -r --'
  elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-@@ -5840,8 +5846,8 @@
+@@ -5880,8 +5886,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  # Try some XSI features
  xsi_shell=no
  ( _lt_dummy="a/b/c"
@@ -9090,7 +2013,7 @@ Index: binutils-2.24/opcodes/configure
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
-@@ -5890,6 +5896,80 @@
+@@ -5930,6 +5936,80 @@ esac
  
  
  
@@ -9171,7 +2094,7 @@ Index: binutils-2.24/opcodes/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  $as_echo_n "checking for $LD option to reload object files... " >&6; }
  if test "${lt_cv_ld_reload_flag+set}" = set; then :
-@@ -5906,6 +5986,11 @@
+@@ -5946,6 +6026,11 @@ case $reload_flag in
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  case $host_os in
@@ -9183,7 +2106,7 @@ Index: binutils-2.24/opcodes/configure
    darwin*)
      if test "$GCC" = yes; then
        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -6074,7 +6159,8 @@
+@@ -6114,7 +6199,8 @@ mingw* | pw32*)
      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
      lt_cv_file_magic_cmd='func_win32_libid'
    else
@@ -9193,7 +2116,7 @@ Index: binutils-2.24/opcodes/configure
      lt_cv_file_magic_cmd='$OBJDUMP -f'
    fi
    ;;
-@@ -6228,6 +6314,21 @@
+@@ -6268,6 +6354,21 @@ esac
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -9215,7 +2138,7 @@ Index: binutils-2.24/opcodes/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6243,9 +6344,162 @@
+@@ -6283,9 +6384,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
  
  
@@ -9380,7 +2303,7 @@ Index: binutils-2.24/opcodes/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then :
-@@ -6261,7 +6515,7 @@
+@@ -6301,7 +6555,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -9389,7 +2312,7 @@ Index: binutils-2.24/opcodes/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6281,11 +6535,15 @@
+@@ -6321,11 +6575,15 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -9408,7 +2331,7 @@ Index: binutils-2.24/opcodes/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-@@ -6301,7 +6559,7 @@
+@@ -6341,7 +6599,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -9417,7 +2340,7 @@ Index: binutils-2.24/opcodes/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6320,6 +6578,10 @@
+@@ -6360,6 +6618,10 @@ else
  $as_echo "no" >&6; }
  fi
  
@@ -9428,7 +2351,7 @@ Index: binutils-2.24/opcodes/configure
    if test "x$ac_ct_AR" = x; then
      AR="false"
    else
-@@ -6331,12 +6593,11 @@
+@@ -6371,16 +6633,72 @@ ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
    fi
@@ -9441,13 +2364,16 @@ Index: binutils-2.24/opcodes/configure
 +: ${AR=ar}
 +: ${AR_FLAGS=cru}
 +
- 
- 
- 
-@@ -6347,6 +6608,63 @@
- 
- 
- 
++
++
++
++
++
++
++
++
++
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 +$as_echo_n "checking for archiver @FILE support... " >&6; }
 +if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -9460,7 +2386,7 @@ Index: binutils-2.24/opcodes/configure
 +int
 +main ()
 +{
-+
+ 
 +  ;
 +  return 0;
 +}
@@ -9486,29 +2412,23 @@ Index: binutils-2.24/opcodes/configure
 +        fi
 +      fi
 +      rm -f conftest.* libconftest.a
-+
+ 
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 +$as_echo "$lt_cv_ar_at_file" >&6; }
-+
+ 
 +if test "x$lt_cv_ar_at_file" = xno; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
 +fi
-+
-+
-+
-+
-+
-+
  
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-@@ -6682,8 +7000,8 @@
+ 
+ 
+@@ -6722,8 +7040,8 @@ esac
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
  # Transform an extracted symbol line into symbol name and symbol address
@@ -9519,7 +2439,7 @@ Index: binutils-2.24/opcodes/configure
  
  # Handle CRLF in mingw tool chain
  opt_cr=
-@@ -6719,6 +7037,7 @@
+@@ -6759,6 +7077,7 @@ for ac_symprfx in "" "_"; do
    else
      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
    fi
@@ -9527,7 +2447,7 @@ Index: binutils-2.24/opcodes/configure
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -6760,6 +7079,18 @@
+@@ -6800,6 +7119,18 @@ _LT_EOF
        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
         if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
           cat <<_LT_EOF > conftest.$ac_ext
@@ -9546,7 +2466,7 @@ Index: binutils-2.24/opcodes/configure
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -6771,7 +7102,7 @@
+@@ -6811,7 +7142,7 @@ _LT_EOF
           cat <<_LT_EOF >> conftest.$ac_ext
  
  /* The mapping between symbol names and symbols.  */
@@ -9555,7 +2475,7 @@ Index: binutils-2.24/opcodes/configure
    const char *name;
    void       *address;
  }
-@@ -6797,8 +7128,8 @@
+@@ -6837,8 +7168,8 @@ static const void *lt_preloaded_setup() {
  _LT_EOF
           # Now try linking the two files.
           mv conftest.$ac_objext conftstm.$ac_objext
@@ -9566,7 +2486,7 @@ Index: binutils-2.24/opcodes/configure
           LIBS="conftstm.$ac_objext"
           CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
           if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -6808,8 +7139,8 @@
+@@ -6848,8 +7179,8 @@ _LT_EOF
    test $ac_status = 0; } && test -s conftest${ac_exeext}; then
             pipe_works=yes
           fi
@@ -9577,7 +2497,7 @@ Index: binutils-2.24/opcodes/configure
         else
           echo "cannot find nm_test_func in $nlist" >&5
         fi
-@@ -6846,6 +7177,14 @@
+@@ -6886,6 +7217,20 @@ else
  $as_echo "ok" >&6; }
  fi
  
@@ -9589,17 +2509,19 @@ Index: binutils-2.24/opcodes/configure
 +fi
 +
 +
++
++
++
++
++
++
  
  
  
-@@ -6867,6 +7206,47 @@
+@@ -6905,6 +7250,41 @@ fi
  
  
  
-+
-+
-+
-+
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 +$as_echo_n "checking for sysroot... " >&6; }
 +
@@ -9635,12 +2557,10 @@ Index: binutils-2.24/opcodes/configure
 +
 +
 +
-+
-+
+ 
+ 
  # Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then :
-   enableval=$enable_libtool_lock;
-@@ -7073,6 +7453,123 @@
+@@ -7113,6 +7493,123 @@ esac
  
  need_locks="$enable_libtool_lock"
  
@@ -9764,7 +2684,7 @@ Index: binutils-2.24/opcodes/configure
  
    case $host_os in
      rhapsody* | darwin*)
-@@ -7636,6 +8133,8 @@
+@@ -7676,6 +8173,8 @@ _LT_EOF
        $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
        echo "$AR cru libconftest.a conftest.o" >&5
        $AR cru libconftest.a conftest.o 2>&5
@@ -9773,7 +2693,7 @@ Index: binutils-2.24/opcodes/configure
        cat > conftest.c << _LT_EOF
  int main() { return 0;}
  _LT_EOF
-@@ -7801,7 +8300,8 @@
+@@ -7871,7 +8370,8 @@ fi
  LIBTOOL_DEPS="$ltmain"
  
  # Always use our own libtool.
@@ -9783,7 +2703,7 @@ Index: binutils-2.24/opcodes/configure
  
  
  
-@@ -7890,7 +8390,7 @@
+@@ -7960,7 +8460,7 @@ aix3*)
  esac
  
  # Global variables:
@@ -9792,7 +2712,7 @@ Index: binutils-2.24/opcodes/configure
  can_build_shared=yes
  
  # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -8188,8 +8688,6 @@
+@@ -8258,8 +8758,6 @@ fi
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -9801,7 +2721,7 @@ Index: binutils-2.24/opcodes/configure
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -8355,6 +8853,12 @@
+@@ -8425,6 +8923,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         lt_prog_compiler_pic='--shared'
         lt_prog_compiler_static='--static'
         ;;
@@ -9814,7 +2734,7 @@ Index: binutils-2.24/opcodes/configure
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          # Portland Group compilers (*not* the Pentium gcc compiler,
         # which looks to be a dead project)
-@@ -8417,7 +8921,7 @@
+@@ -8487,7 +8991,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -9823,7 +2743,7 @@ Index: binutils-2.24/opcodes/configure
         lt_prog_compiler_wl='-Qoption ld ';;
        *)
         lt_prog_compiler_wl='-Wl,';;
-@@ -8474,13 +8978,17 @@
+@@ -8544,13 +9048,17 @@ case $host_os in
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -9847,7 +2767,7 @@ Index: binutils-2.24/opcodes/configure
  
  #
  # Check to make sure the PIC flag actually works.
-@@ -8541,6 +9049,11 @@
+@@ -8611,6 +9119,11 @@ fi
  
  
  
@@ -9859,7 +2779,7 @@ Index: binutils-2.24/opcodes/configure
  #
  # Check to make sure the static flag actually works.
  #
-@@ -8891,7 +9404,8 @@
+@@ -8961,7 +9474,8 @@ _LT_EOF
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -9869,7 +2789,7 @@ Index: binutils-2.24/opcodes/configure
  
        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8939,7 +9453,7 @@
+@@ -9009,7 +9523,7 @@ _LT_EOF
        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
          && test "$tmp_diet" = no
        then
@@ -9878,7 +2798,7 @@ Index: binutils-2.24/opcodes/configure
         tmp_sharedflag='-shared'
         case $cc_basename,$host_cpu in
          pgcc*)                         # Portland Group C compiler
-@@ -8990,12 +9504,12 @@
+@@ -9060,12 +9574,12 @@ _LT_EOF
           whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
           hardcode_libdir_flag_spec=
           hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -9893,7 +2813,7 @@ Index: binutils-2.24/opcodes/configure
           fi
           ;;
         esac
-@@ -9009,8 +9523,8 @@
+@@ -9079,8 +9593,8 @@ _LT_EOF
         archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
         wlarc=
        else
@@ -9904,7 +2824,7 @@ Index: binutils-2.24/opcodes/configure
        fi
        ;;
  
-@@ -9028,8 +9542,8 @@
+@@ -9098,8 +9612,8 @@ _LT_EOF
  
  _LT_EOF
        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -9915,7 +2835,7 @@ Index: binutils-2.24/opcodes/configure
        else
         ld_shlibs=no
        fi
-@@ -9075,8 +9589,8 @@
+@@ -9145,8 +9659,8 @@ _LT_EOF
  
      *)
        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -9926,7 +2846,7 @@ Index: binutils-2.24/opcodes/configure
        else
         ld_shlibs=no
        fi
-@@ -9206,7 +9720,13 @@
+@@ -9276,7 +9790,13 @@ _LT_EOF
         allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -9941,7 +2861,7 @@ Index: binutils-2.24/opcodes/configure
  /* end confdefs.h.  */
  
  int
-@@ -9219,22 +9739,29 @@
+@@ -9289,22 +9809,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -9984,7 +2904,7 @@ Index: binutils-2.24/opcodes/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
          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"
-@@ -9246,7 +9773,13 @@
+@@ -9316,7 +9843,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         else
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -9999,7 +2919,7 @@ Index: binutils-2.24/opcodes/configure
  /* end confdefs.h.  */
  
  int
-@@ -9259,22 +9792,29 @@
+@@ -9329,22 +9862,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -10042,7 +2962,7 @@ Index: binutils-2.24/opcodes/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
           # Warning - without using the other run time loading flags,
-@@ -9319,20 +9859,63 @@
+@@ -9389,20 +9929,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
@@ -10120,7 +3040,7 @@ Index: binutils-2.24/opcodes/configure
        ;;
  
      darwin* | rhapsody*)
-@@ -9393,7 +9976,7 @@
+@@ -9463,7 +10046,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
@@ -10129,7 +3049,7 @@ Index: binutils-2.24/opcodes/configure
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9401,7 +9984,7 @@
+@@ -9471,7 +10054,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -10138,7 +3058,7 @@ Index: binutils-2.24/opcodes/configure
        else
         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'
        fi
-@@ -9417,7 +10000,7 @@
+@@ -9487,7 +10070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux10*)
        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -10147,7 +3067,7 @@ Index: binutils-2.24/opcodes/configure
        else
         archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -9441,10 +10024,10 @@
+@@ -9511,10 +10094,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
           archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
           ;;
         ia64*)
@@ -10160,7 +3080,7 @@ Index: binutils-2.24/opcodes/configure
           ;;
         esac
        else
-@@ -9523,23 +10106,36 @@
+@@ -9593,23 +10176,36 @@ fi
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -10205,7 +3125,7 @@ Index: binutils-2.24/opcodes/configure
        else
         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'
         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'
-@@ -9624,7 +10220,7 @@
+@@ -9694,7 +10290,7 @@ rm -f core conftest.err conftest.$ac_objext \
      osf4* | osf5*)     # as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
         allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -10214,7 +3134,7 @@ Index: binutils-2.24/opcodes/configure
         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
         allow_undefined_flag=' -expect_unresolved \*'
-@@ -9643,9 +10239,9 @@
+@@ -9713,9 +10309,9 @@ rm -f core conftest.err conftest.$ac_objext \
        no_undefined_flag=' -z defs'
        if test "$GCC" = yes; then
         wlarc='${wl}'
@@ -10226,7 +3146,7 @@ Index: binutils-2.24/opcodes/configure
        else
         case `$CC -V 2>&1` in
         *"Compilers 5.0"*)
-@@ -10221,8 +10817,9 @@
+@@ -10291,8 +10887,9 @@ cygwin* | mingw* | pw32* | cegcc*)
    need_version=no
    need_lib_prefix=no
  
@@ -10238,7 +3158,7 @@ Index: binutils-2.24/opcodes/configure
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -10255,13 +10852,71 @@
+@@ -10325,13 +10922,71 @@ cygwin* | mingw* | pw32* | cegcc*)
        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
        ;;
      esac
@@ -10311,7 +3231,7 @@ Index: binutils-2.24/opcodes/configure
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
    ;;
-@@ -10353,7 +11008,7 @@
+@@ -10423,7 +11078,7 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -10320,7 +3240,7 @@ Index: binutils-2.24/opcodes/configure
    hardcode_into_libs=yes
    ;;
  
-@@ -11193,10 +11848,10 @@
+@@ -11263,10 +11918,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -10333,7 +3253,7 @@ Index: binutils-2.24/opcodes/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11299,10 +11954,10 @@
+@@ -11369,10 +12024,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -10346,16 +3266,7 @@ Index: binutils-2.24/opcodes/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12415,7 +13070,7 @@
- # since libbfd may not pull in the entirety of libiberty.
-   x=`sed -n -e 's/^[   ]*PICFLAG[      ]*=[    ]*//p' < ../libiberty/Makefile | sed -n '$p'`
-   if test -n "$x"; then
--    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
-+    SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
-   fi
- 
-   case "${host}" in
-@@ -13387,13 +14042,20 @@
+@@ -15373,13 +16028,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -10376,7 +3287,7 @@ Index: binutils-2.24/opcodes/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -13408,14 +14070,17 @@
+@@ -15394,14 +16056,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -10395,7 +3306,7 @@ Index: binutils-2.24/opcodes/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -13448,12 +14113,12 @@
+@@ -15434,12 +16099,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -10409,7 +3320,7 @@ Index: binutils-2.24/opcodes/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -13508,8 +14173,13 @@
+@@ -15494,8 +16159,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -10423,7 +3334,7 @@ Index: binutils-2.24/opcodes/configure
  STRIP \
  RANLIB \
  CC \
-@@ -13519,12 +14189,14 @@
+@@ -15505,12 +16175,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -10439,7 +3350,7 @@ Index: binutils-2.24/opcodes/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -13540,7 +14212,6 @@
+@@ -15526,7 +16198,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -10447,7 +3358,7 @@ Index: binutils-2.24/opcodes/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -13576,6 +14247,7 @@
+@@ -15562,6 +16233,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -10455,7 +3366,7 @@ Index: binutils-2.24/opcodes/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -14332,7 +15004,8 @@
+@@ -16319,7 +16991,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -10465,7 +3376,7 @@ Index: binutils-2.24/opcodes/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -14435,19 +15108,42 @@
+@@ -16422,19 +17095,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -10509,7 +3420,7 @@ Index: binutils-2.24/opcodes/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -14477,6 +15173,12 @@
+@@ -16464,6 +17160,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -10522,7 +3433,7 @@ Index: binutils-2.24/opcodes/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -14486,6 +15188,9 @@
+@@ -16473,6 +17175,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -10532,7 +3443,7 @@ Index: binutils-2.24/opcodes/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -14600,12 +15305,12 @@
+@@ -16587,12 +17292,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -10548,7 +3459,7 @@ Index: binutils-2.24/opcodes/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -14692,9 +15397,6 @@
+@@ -16679,9 +17384,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -10558,7 +3469,7 @@ Index: binutils-2.24/opcodes/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -14710,6 +15412,9 @@
+@@ -16697,6 +17399,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -10568,7 +3479,7 @@ Index: binutils-2.24/opcodes/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -14742,210 +15447,169 @@
+@@ -16729,210 +17434,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -10770,9 +3681,15 @@ Index: binutils-2.24/opcodes/configure
 -_LT_EOF
 -    ;;
 -  esac
+-
+-
+-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+-    || (rm -f "$cfgfile"; exit 1)
+-
+-  mv -f "$cfgfile" "$ofile" ||
 +  sed '$q' "$ltmain" >> "$cfgfile" \
 +     || (rm -f "$cfgfile"; exit 1)
- 
++
 +  if test x"$xsi_shell" = xyes; then
 +  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
 +func_dirname ()\
@@ -10930,20 +3847,30 @@ Index: binutils-2.24/opcodes/configure
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
 +fi
- 
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
- 
--  mv -f "$cfgfile" "$ofile" ||
++
++
 +   mv -f "$cfgfile" "$ofile" ||
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.24/binutils/configure
-===================================================================
---- binutils-2.24.orig/binutils/configure       2013-11-04 07:33:37.000000000 -0800
-+++ binutils-2.24/binutils/configure    2013-12-15 11:10:23.877118697 -0800
-@@ -655,8 +655,11 @@
+diff --git a/configure b/configure
+index e9f2f13..cbccb18 100755
+--- a/configure
++++ b/configure
+@@ -8041,7 +8041,7 @@ case " $build_configdirs " in
+     # For an installed makeinfo, we require it to be from texinfo 4.7 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*([1-3][0-9]|4.[4-9]|4.[1-9][0-9]+|[5-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
+diff --git a/gas/configure b/gas/configure
+index e9ba550..074886f 100755
+--- a/gas/configure
++++ b/gas/configure
+@@ -645,8 +645,11 @@ OTOOL
  LIPO
  NMEDIT
  DSYMUTIL
@@ -10955,24 +3882,24 @@ Index: binutils-2.24/binutils/configure
  OBJDUMP
  LN_S
  NM
-@@ -769,6 +772,7 @@
+@@ -757,6 +760,7 @@ enable_static
  with_pic
  enable_fast_install
  with_gnu_ld
 +with_libtool_sysroot
  enable_libtool_lock
- enable_targets
- enable_deterministic_archives
-@@ -1434,6 +1438,8 @@
+ enable_plugins
+ enable_largefile
+@@ -1422,6 +1426,8 @@ Optional Packages:
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
 +  --with-libtool-sysroot=DIR Search for dependent libraries within DIR
 +                        (or the compiler's sysroot if not specified).
    --with-zlib             include zlib support (auto/yes/no) default=auto
-   --with-gnu-ld           assume the C compiler uses GNU ld default=no
-   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
-@@ -5152,8 +5158,8 @@
+ 
+ Some influential environment variables:
+@@ -4901,8 +4907,8 @@ esac
  
  
  
@@ -10983,7 +3910,7 @@ Index: binutils-2.24/binutils/configure
  
  
  
-@@ -5193,7 +5199,7 @@
+@@ -4942,7 +4948,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  $as_echo_n "checking how to print strings... " >&6; }
  # Test print first, because it will be a builtin if present.
@@ -10992,7 +3919,7 @@ Index: binutils-2.24/binutils/configure
     test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
    ECHO='print -r --'
  elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-@@ -5879,8 +5885,8 @@
+@@ -5628,8 +5634,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  # Try some XSI features
  xsi_shell=no
  ( _lt_dummy="a/b/c"
@@ -11003,7 +3930,7 @@ Index: binutils-2.24/binutils/configure
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
-@@ -5929,6 +5935,80 @@
+@@ -5678,6 +5684,80 @@ esac
  
  
  
@@ -11084,7 +4011,7 @@ Index: binutils-2.24/binutils/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  $as_echo_n "checking for $LD option to reload object files... " >&6; }
  if test "${lt_cv_ld_reload_flag+set}" = set; then :
-@@ -5945,6 +6025,11 @@
+@@ -5694,6 +5774,11 @@ case $reload_flag in
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  case $host_os in
@@ -11096,7 +4023,7 @@ Index: binutils-2.24/binutils/configure
    darwin*)
      if test "$GCC" = yes; then
        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -6113,7 +6198,8 @@
+@@ -5862,7 +5947,8 @@ mingw* | pw32*)
      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
      lt_cv_file_magic_cmd='func_win32_libid'
    else
@@ -11106,7 +4033,7 @@ Index: binutils-2.24/binutils/configure
      lt_cv_file_magic_cmd='$OBJDUMP -f'
    fi
    ;;
-@@ -6267,6 +6353,21 @@
+@@ -6016,6 +6102,21 @@ esac
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -11128,7 +4055,7 @@ Index: binutils-2.24/binutils/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6282,9 +6383,162 @@
+@@ -6031,9 +6132,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
  
  
@@ -11142,9 +4069,7 @@ Index: binutils-2.24/binutils/configure
 +
 +
 +
- if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ar; ac_word=$2
++if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -11285,7 +4210,9 @@ Index: binutils-2.24/binutils/configure
 +
 +
 +
-+if test -n "$ac_tool_prefix"; then
+ if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
 +  for ac_prog in ar
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -11293,7 +4220,7 @@ Index: binutils-2.24/binutils/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then :
-@@ -6300,7 +6554,7 @@
+@@ -6049,7 +6303,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -11302,7 +4229,7 @@ Index: binutils-2.24/binutils/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6320,11 +6574,15 @@
+@@ -6069,11 +6323,15 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -11321,7 +4248,7 @@ Index: binutils-2.24/binutils/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-@@ -6340,7 +6598,7 @@
+@@ -6089,7 +6347,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -11330,7 +4257,7 @@ Index: binutils-2.24/binutils/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6359,6 +6617,10 @@
+@@ -6108,6 +6366,10 @@ else
  $as_echo "no" >&6; }
  fi
  
@@ -11341,7 +4268,7 @@ Index: binutils-2.24/binutils/configure
    if test "x$ac_ct_AR" = x; then
      AR="false"
    else
-@@ -6370,12 +6632,10 @@
+@@ -6119,12 +6381,10 @@ ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
    fi
@@ -11356,7 +4283,7 @@ Index: binutils-2.24/binutils/configure
  
  
  
-@@ -6387,6 +6647,64 @@
+@@ -6136,6 +6396,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  
  
  
@@ -11421,7 +4348,7 @@ Index: binutils-2.24/binutils/configure
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
-@@ -6721,8 +7039,8 @@
+@@ -6470,8 +6788,8 @@ esac
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
  # Transform an extracted symbol line into symbol name and symbol address
@@ -11432,7 +4359,7 @@ Index: binutils-2.24/binutils/configure
  
  # Handle CRLF in mingw tool chain
  opt_cr=
-@@ -6758,6 +7076,7 @@
+@@ -6507,6 +6825,7 @@ for ac_symprfx in "" "_"; do
    else
      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
    fi
@@ -11440,7 +4367,7 @@ Index: binutils-2.24/binutils/configure
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -6799,6 +7118,18 @@
+@@ -6548,6 +6867,18 @@ _LT_EOF
        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
         if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
           cat <<_LT_EOF > conftest.$ac_ext
@@ -11459,7 +4386,7 @@ Index: binutils-2.24/binutils/configure
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -6810,7 +7141,7 @@
+@@ -6559,7 +6890,7 @@ _LT_EOF
           cat <<_LT_EOF >> conftest.$ac_ext
  
  /* The mapping between symbol names and symbols.  */
@@ -11468,7 +4395,7 @@ Index: binutils-2.24/binutils/configure
    const char *name;
    void       *address;
  }
-@@ -6836,8 +7167,8 @@
+@@ -6585,8 +6916,8 @@ static const void *lt_preloaded_setup() {
  _LT_EOF
           # Now try linking the two files.
           mv conftest.$ac_objext conftstm.$ac_objext
@@ -11479,7 +4406,7 @@ Index: binutils-2.24/binutils/configure
           LIBS="conftstm.$ac_objext"
           CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
           if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -6847,8 +7178,8 @@
+@@ -6596,8 +6927,8 @@ _LT_EOF
    test $ac_status = 0; } && test -s conftest${ac_exeext}; then
             pipe_works=yes
           fi
@@ -11490,7 +4417,7 @@ Index: binutils-2.24/binutils/configure
         else
           echo "cannot find nm_test_func in $nlist" >&5
         fi
-@@ -6885,6 +7216,19 @@
+@@ -6634,6 +6965,21 @@ else
  $as_echo "ok" >&6; }
  fi
  
@@ -11507,10 +4434,12 @@ Index: binutils-2.24/binutils/configure
 +
 +
 +
++
++
  
  
  
-@@ -6905,6 +7249,42 @@
+@@ -6652,6 +6998,40 @@ fi
  
  
  
@@ -11548,12 +4477,10 @@ Index: binutils-2.24/binutils/configure
 +$as_echo "${lt_sysroot:-no}" >&6; }
 +
 +
-+
-+
  
- # Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then :
-@@ -7112,6 +7492,123 @@
+ 
+ 
+@@ -6861,6 +7241,123 @@ esac
  
  need_locks="$enable_libtool_lock"
  
@@ -11677,7 +4604,7 @@ Index: binutils-2.24/binutils/configure
  
    case $host_os in
      rhapsody* | darwin*)
-@@ -7675,6 +8172,8 @@
+@@ -7424,6 +7921,8 @@ _LT_EOF
        $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
        echo "$AR cru libconftest.a conftest.o" >&5
        $AR cru libconftest.a conftest.o 2>&5
@@ -11686,7 +4613,7 @@ Index: binutils-2.24/binutils/configure
        cat > conftest.c << _LT_EOF
  int main() { return 0;}
  _LT_EOF
-@@ -7870,7 +8369,8 @@
+@@ -7619,7 +8118,8 @@ fi
  LIBTOOL_DEPS="$ltmain"
  
  # Always use our own libtool.
@@ -11696,7 +4623,7 @@ Index: binutils-2.24/binutils/configure
  
  
  
-@@ -7959,7 +8459,7 @@
+@@ -7708,7 +8208,7 @@ aix3*)
  esac
  
  # Global variables:
@@ -11705,7 +4632,7 @@ Index: binutils-2.24/binutils/configure
  can_build_shared=yes
  
  # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -8257,8 +8757,6 @@
+@@ -8006,8 +8506,6 @@ fi
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -11714,7 +4641,7 @@ Index: binutils-2.24/binutils/configure
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -8424,6 +8922,12 @@
+@@ -8173,6 +8671,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         lt_prog_compiler_pic='--shared'
         lt_prog_compiler_static='--static'
         ;;
@@ -11727,7 +4654,7 @@ Index: binutils-2.24/binutils/configure
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          # Portland Group compilers (*not* the Pentium gcc compiler,
         # which looks to be a dead project)
-@@ -8486,7 +8990,7 @@
+@@ -8235,7 +8739,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -11736,7 +4663,7 @@ Index: binutils-2.24/binutils/configure
         lt_prog_compiler_wl='-Qoption ld ';;
        *)
         lt_prog_compiler_wl='-Wl,';;
-@@ -8543,13 +9047,17 @@
+@@ -8292,13 +8796,17 @@ case $host_os in
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -11760,7 +4687,7 @@ Index: binutils-2.24/binutils/configure
  
  #
  # Check to make sure the PIC flag actually works.
-@@ -8610,6 +9118,11 @@
+@@ -8359,6 +8867,11 @@ fi
  
  
  
@@ -11772,7 +4699,7 @@ Index: binutils-2.24/binutils/configure
  #
  # Check to make sure the static flag actually works.
  #
-@@ -8960,7 +9473,8 @@
+@@ -8709,7 +9222,8 @@ _LT_EOF
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -11782,7 +4709,7 @@ Index: binutils-2.24/binutils/configure
  
        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9008,7 +9522,7 @@
+@@ -8757,7 +9271,7 @@ _LT_EOF
        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
          && test "$tmp_diet" = no
        then
@@ -11791,7 +4718,7 @@ Index: binutils-2.24/binutils/configure
         tmp_sharedflag='-shared'
         case $cc_basename,$host_cpu in
          pgcc*)                         # Portland Group C compiler
-@@ -9059,12 +9573,12 @@
+@@ -8808,12 +9322,12 @@ _LT_EOF
           whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
           hardcode_libdir_flag_spec=
           hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -11806,7 +4733,7 @@ Index: binutils-2.24/binutils/configure
           fi
           ;;
         esac
-@@ -9078,8 +9592,8 @@
+@@ -8827,8 +9341,8 @@ _LT_EOF
         archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
         wlarc=
        else
@@ -11817,7 +4744,7 @@ Index: binutils-2.24/binutils/configure
        fi
        ;;
  
-@@ -9097,8 +9611,8 @@
+@@ -8846,8 +9360,8 @@ _LT_EOF
  
  _LT_EOF
        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11828,7 +4755,7 @@ Index: binutils-2.24/binutils/configure
        else
         ld_shlibs=no
        fi
-@@ -9144,8 +9658,8 @@
+@@ -8893,8 +9407,8 @@ _LT_EOF
  
      *)
        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -11839,7 +4766,7 @@ Index: binutils-2.24/binutils/configure
        else
         ld_shlibs=no
        fi
-@@ -9275,7 +9789,13 @@
+@@ -9024,7 +9538,13 @@ _LT_EOF
         allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -11854,7 +4781,7 @@ Index: binutils-2.24/binutils/configure
  /* end confdefs.h.  */
  
  int
-@@ -9288,22 +9808,29 @@
+@@ -9037,22 +9557,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -11897,7 +4824,7 @@ Index: binutils-2.24/binutils/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
          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"
-@@ -9315,7 +9842,13 @@
+@@ -9064,7 +9591,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         else
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -11912,7 +4839,7 @@ Index: binutils-2.24/binutils/configure
  /* end confdefs.h.  */
  
  int
-@@ -9328,22 +9861,29 @@
+@@ -9077,22 +9610,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -11955,7 +4882,7 @@ Index: binutils-2.24/binutils/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
           # Warning - without using the other run time loading flags,
-@@ -9388,20 +9928,63 @@
+@@ -9137,20 +9677,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
@@ -12033,7 +4960,7 @@ Index: binutils-2.24/binutils/configure
        ;;
  
      darwin* | rhapsody*)
-@@ -9462,7 +10045,7 @@
+@@ -9211,7 +9794,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
@@ -12042,7 +4969,7 @@ Index: binutils-2.24/binutils/configure
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9470,7 +10053,7 @@
+@@ -9219,7 +9802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -12051,7 +4978,7 @@ Index: binutils-2.24/binutils/configure
        else
         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'
        fi
-@@ -9486,7 +10069,7 @@
+@@ -9235,7 +9818,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux10*)
        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -12060,7 +4987,7 @@ Index: binutils-2.24/binutils/configure
        else
         archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -9510,10 +10093,10 @@
+@@ -9259,10 +9842,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
           archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
           ;;
         ia64*)
@@ -12073,7 +5000,7 @@ Index: binutils-2.24/binutils/configure
           ;;
         esac
        else
-@@ -9592,23 +10175,36 @@
+@@ -9341,23 +9924,36 @@ fi
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -12118,7 +5045,7 @@ Index: binutils-2.24/binutils/configure
        else
         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'
         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'
-@@ -9693,7 +10289,7 @@
+@@ -9442,7 +10038,7 @@ rm -f core conftest.err conftest.$ac_objext \
      osf4* | osf5*)     # as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
         allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -12127,7 +5054,7 @@ Index: binutils-2.24/binutils/configure
         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
         allow_undefined_flag=' -expect_unresolved \*'
-@@ -9712,9 +10308,9 @@
+@@ -9461,9 +10057,9 @@ rm -f core conftest.err conftest.$ac_objext \
        no_undefined_flag=' -z defs'
        if test "$GCC" = yes; then
         wlarc='${wl}'
@@ -12139,7 +5066,7 @@ Index: binutils-2.24/binutils/configure
        else
         case `$CC -V 2>&1` in
         *"Compilers 5.0"*)
-@@ -10290,8 +10886,9 @@
+@@ -10039,8 +10635,9 @@ cygwin* | mingw* | pw32* | cegcc*)
    need_version=no
    need_lib_prefix=no
  
@@ -12151,7 +5078,7 @@ Index: binutils-2.24/binutils/configure
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -10324,13 +10921,71 @@
+@@ -10073,13 +10670,71 @@ cygwin* | mingw* | pw32* | cegcc*)
        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
        ;;
      esac
@@ -12224,7 +5151,7 @@ Index: binutils-2.24/binutils/configure
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
    ;;
-@@ -10422,7 +11077,7 @@
+@@ -10171,7 +10826,7 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -12233,7 +5160,7 @@ Index: binutils-2.24/binutils/configure
    hardcode_into_libs=yes
    ;;
  
-@@ -11262,10 +11917,10 @@
+@@ -11011,10 +11666,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -12246,7 +5173,7 @@ Index: binutils-2.24/binutils/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11368,10 +12023,10 @@
+@@ -11117,10 +11772,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -12259,7 +5186,7 @@ Index: binutils-2.24/binutils/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -14948,13 +15603,20 @@
+@@ -15274,13 +15929,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -12280,7 +5207,7 @@ Index: binutils-2.24/binutils/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -14969,14 +15631,17 @@
+@@ -15295,14 +15957,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -12299,7 +5226,7 @@ Index: binutils-2.24/binutils/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -15009,12 +15674,12 @@
+@@ -15335,12 +16000,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -12313,7 +5240,7 @@ Index: binutils-2.24/binutils/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -15069,8 +15734,13 @@
+@@ -15395,8 +16060,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -12327,7 +5254,7 @@ Index: binutils-2.24/binutils/configure
  STRIP \
  RANLIB \
  CC \
-@@ -15080,12 +15750,14 @@
+@@ -15406,12 +16076,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -12343,7 +5270,7 @@ Index: binutils-2.24/binutils/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -15101,7 +15773,6 @@
+@@ -15427,7 +16099,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -12351,7 +5278,7 @@ Index: binutils-2.24/binutils/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -15137,6 +15808,7 @@
+@@ -15463,6 +16134,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -12359,7 +5286,7 @@ Index: binutils-2.24/binutils/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -15894,7 +16566,8 @@
+@@ -16227,7 +16899,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12369,7 +5296,7 @@ Index: binutils-2.24/binutils/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -15997,19 +16670,42 @@
+@@ -16330,19 +17003,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -12413,7 +5340,7 @@ Index: binutils-2.24/binutils/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -16039,6 +16735,12 @@
+@@ -16372,6 +17068,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -12426,7 +5353,7 @@ Index: binutils-2.24/binutils/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -16048,6 +16750,9 @@
+@@ -16381,6 +17083,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -12436,7 +5363,7 @@ Index: binutils-2.24/binutils/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -16162,12 +16867,12 @@
+@@ -16495,12 +17200,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -12452,7 +5379,7 @@ Index: binutils-2.24/binutils/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -16254,9 +16959,6 @@
+@@ -16587,9 +17292,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -12462,7 +5389,7 @@ Index: binutils-2.24/binutils/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -16272,6 +16974,9 @@
+@@ -16605,6 +17307,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -12472,7 +5399,7 @@ Index: binutils-2.24/binutils/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -16304,210 +17009,169 @@
+@@ -16637,210 +17342,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -12674,9 +5601,15 @@ Index: binutils-2.24/binutils/configure
 -_LT_EOF
 -    ;;
 -  esac
+-
+-
+-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+-    || (rm -f "$cfgfile"; exit 1)
+-
+-  mv -f "$cfgfile" "$ofile" ||
 +  sed '$q' "$ltmain" >> "$cfgfile" \
 +     || (rm -f "$cfgfile"; exit 1)
- 
++
 +  if test x"$xsi_shell" = xyes; then
 +  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
 +func_dirname ()\
@@ -12834,20 +5767,17 @@ Index: binutils-2.24/binutils/configure
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
 +fi
- 
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
- 
--  mv -f "$cfgfile" "$ofile" ||
++
++
 +   mv -f "$cfgfile" "$ofile" ||
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.24/gas/configure
-===================================================================
---- binutils-2.24.orig/gas/configure    2013-11-04 07:33:37.000000000 -0800
-+++ binutils-2.24/gas/configure 2013-12-15 11:10:23.880452030 -0800
-@@ -645,8 +645,11 @@
+diff --git a/gprof/configure b/gprof/configure
+index 79961c5..c4f6ac9 100755
+--- a/gprof/configure
++++ b/gprof/configure
+@@ -629,8 +629,11 @@ OTOOL
  LIPO
  NMEDIT
  DSYMUTIL
@@ -12859,24 +5789,24 @@ Index: binutils-2.24/gas/configure
  OBJDUMP
  LN_S
  NM
-@@ -759,6 +762,7 @@
+@@ -741,6 +744,7 @@ enable_static
  with_pic
  enable_fast_install
  with_gnu_ld
 +with_libtool_sysroot
  enable_libtool_lock
- enable_targets
- enable_checking
-@@ -1420,6 +1424,8 @@
+ enable_plugins
+ enable_largefile
+@@ -1399,6 +1403,8 @@ Optional Packages:
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
 +  --with-libtool-sysroot=DIR Search for dependent libraries within DIR
 +                        (or the compiler's sysroot if not specified).
-   --with-zlib             include zlib support (auto/yes/no) default=auto
  
  Some influential environment variables:
-@@ -5135,8 +5141,8 @@
+   CC          C compiler command
+@@ -4831,8 +4837,8 @@ esac
  
  
  
@@ -12887,7 +5817,7 @@ Index: binutils-2.24/gas/configure
  
  
  
-@@ -5176,7 +5182,7 @@
+@@ -4872,7 +4878,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  $as_echo_n "checking how to print strings... " >&6; }
  # Test print first, because it will be a builtin if present.
@@ -12896,7 +5826,7 @@ Index: binutils-2.24/gas/configure
     test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
    ECHO='print -r --'
  elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-@@ -5862,8 +5868,8 @@
+@@ -5558,8 +5564,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  # Try some XSI features
  xsi_shell=no
  ( _lt_dummy="a/b/c"
@@ -12907,7 +5837,7 @@ Index: binutils-2.24/gas/configure
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
-@@ -5912,6 +5918,80 @@
+@@ -5608,6 +5614,80 @@ esac
  
  
  
@@ -12988,7 +5918,7 @@ Index: binutils-2.24/gas/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  $as_echo_n "checking for $LD option to reload object files... " >&6; }
  if test "${lt_cv_ld_reload_flag+set}" = set; then :
-@@ -5928,6 +6008,11 @@
+@@ -5624,6 +5704,11 @@ case $reload_flag in
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  case $host_os in
@@ -13000,7 +5930,7 @@ Index: binutils-2.24/gas/configure
    darwin*)
      if test "$GCC" = yes; then
        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -6096,7 +6181,8 @@
+@@ -5792,7 +5877,8 @@ mingw* | pw32*)
      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
      lt_cv_file_magic_cmd='func_win32_libid'
    else
@@ -13010,7 +5940,19 @@ Index: binutils-2.24/gas/configure
      lt_cv_file_magic_cmd='$OBJDUMP -f'
    fi
    ;;
-@@ -6250,6 +6336,21 @@
+@@ -5869,11 +5955,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-linux-uclibc*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+-  ;;
+-
+ netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+@@ -5951,6 +6032,21 @@ esac
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -13032,7 +5974,7 @@ Index: binutils-2.24/gas/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6265,9 +6366,162 @@
+@@ -5966,9 +6062,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
  
  
@@ -13197,7 +6139,7 @@ Index: binutils-2.24/gas/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then :
-@@ -6283,7 +6537,7 @@
+@@ -5984,7 +6233,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -13206,7 +6148,7 @@ Index: binutils-2.24/gas/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6303,11 +6557,15 @@
+@@ -6004,11 +6253,15 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -13225,7 +6167,7 @@ Index: binutils-2.24/gas/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-@@ -6323,7 +6581,7 @@
+@@ -6024,7 +6277,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -13234,7 +6176,7 @@ Index: binutils-2.24/gas/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6342,6 +6600,10 @@
+@@ -6043,6 +6296,10 @@ else
  $as_echo "no" >&6; }
  fi
  
@@ -13245,7 +6187,7 @@ Index: binutils-2.24/gas/configure
    if test "x$ac_ct_AR" = x; then
      AR="false"
    else
-@@ -6353,16 +6615,72 @@
+@@ -6054,12 +6311,10 @@ ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
    fi
@@ -13257,17 +6199,13 @@ Index: binutils-2.24/gas/configure
 -test -z "$AR_FLAGS" && AR_FLAGS=cru
 +: ${AR=ar}
 +: ${AR_FLAGS=cru}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+ 
+ 
+ 
+@@ -6071,6 +6326,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+ 
+ 
+ 
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 +$as_echo_n "checking for archiver @FILE support... " >&6; }
 +if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -13280,7 +6218,7 @@ Index: binutils-2.24/gas/configure
 +int
 +main ()
 +{
- 
++
 +  ;
 +  return 0;
 +}
@@ -13306,23 +6244,30 @@ Index: binutils-2.24/gas/configure
 +        fi
 +      fi
 +      rm -f conftest.* libconftest.a
- 
++
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
++
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 +$as_echo "$lt_cv_ar_at_file" >&6; }
- 
++
 +if test "x$lt_cv_ar_at_file" = xno; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
 +fi
- 
- 
- 
-@@ -6704,8 +7022,8 @@
++
++
++
++
++
++
++
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+@@ -6405,8 +6718,8 @@ esac
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
  # Transform an extracted symbol line into symbol name and symbol address
@@ -13333,7 +6278,7 @@ Index: binutils-2.24/gas/configure
  
  # Handle CRLF in mingw tool chain
  opt_cr=
-@@ -6741,6 +7059,7 @@
+@@ -6442,6 +6755,7 @@ for ac_symprfx in "" "_"; do
    else
      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
    fi
@@ -13341,7 +6286,7 @@ Index: binutils-2.24/gas/configure
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -6782,6 +7101,18 @@
+@@ -6483,6 +6797,18 @@ _LT_EOF
        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
         if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
           cat <<_LT_EOF > conftest.$ac_ext
@@ -13360,7 +6305,7 @@ Index: binutils-2.24/gas/configure
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -6793,7 +7124,7 @@
+@@ -6494,7 +6820,7 @@ _LT_EOF
           cat <<_LT_EOF >> conftest.$ac_ext
  
  /* The mapping between symbol names and symbols.  */
@@ -13369,7 +6314,7 @@ Index: binutils-2.24/gas/configure
    const char *name;
    void       *address;
  }
-@@ -6819,8 +7150,8 @@
+@@ -6520,8 +6846,8 @@ static const void *lt_preloaded_setup() {
  _LT_EOF
           # Now try linking the two files.
           mv conftest.$ac_objext conftstm.$ac_objext
@@ -13380,7 +6325,7 @@ Index: binutils-2.24/gas/configure
           LIBS="conftstm.$ac_objext"
           CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
           if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -6830,8 +7161,8 @@
+@@ -6531,8 +6857,8 @@ _LT_EOF
    test $ac_status = 0; } && test -s conftest${ac_exeext}; then
             pipe_works=yes
           fi
@@ -13391,7 +6336,7 @@ Index: binutils-2.24/gas/configure
         else
           echo "cannot find nm_test_func in $nlist" >&5
         fi
-@@ -6868,6 +7199,19 @@
+@@ -6569,6 +6895,18 @@ else
  $as_echo "ok" >&6; }
  fi
  
@@ -13407,11 +6352,10 @@ Index: binutils-2.24/gas/configure
 +
 +
 +
-+
  
  
  
-@@ -6888,6 +7232,42 @@
+@@ -6590,6 +6928,43 @@ fi
  
  
  
@@ -13451,10 +6395,11 @@ Index: binutils-2.24/gas/configure
 +
 +
 +
- 
++
  # Check whether --enable-libtool-lock was given.
  if test "${enable_libtool_lock+set}" = set; then :
-@@ -7095,6 +7475,123 @@
+   enableval=$enable_libtool_lock;
+@@ -6796,6 +7171,123 @@ esac
  
  need_locks="$enable_libtool_lock"
  
@@ -13578,7 +6523,7 @@ Index: binutils-2.24/gas/configure
  
    case $host_os in
      rhapsody* | darwin*)
-@@ -7658,6 +8155,8 @@
+@@ -7359,6 +7851,8 @@ _LT_EOF
        $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
        echo "$AR cru libconftest.a conftest.o" >&5
        $AR cru libconftest.a conftest.o 2>&5
@@ -13587,7 +6532,7 @@ Index: binutils-2.24/gas/configure
        cat > conftest.c << _LT_EOF
  int main() { return 0;}
  _LT_EOF
-@@ -7853,7 +8352,8 @@
+@@ -7554,7 +8048,8 @@ fi
  LIBTOOL_DEPS="$ltmain"
  
  # Always use our own libtool.
@@ -13597,7 +6542,7 @@ Index: binutils-2.24/gas/configure
  
  
  
-@@ -7942,7 +8442,7 @@
+@@ -7643,7 +8138,7 @@ aix3*)
  esac
  
  # Global variables:
@@ -13606,7 +6551,7 @@ Index: binutils-2.24/gas/configure
  can_build_shared=yes
  
  # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -8240,8 +8740,6 @@
+@@ -7941,8 +8436,6 @@ fi
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -13615,7 +6560,7 @@ Index: binutils-2.24/gas/configure
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -8407,6 +8905,12 @@
+@@ -8108,6 +8601,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         lt_prog_compiler_pic='--shared'
         lt_prog_compiler_static='--static'
         ;;
@@ -13628,7 +6573,7 @@ Index: binutils-2.24/gas/configure
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          # Portland Group compilers (*not* the Pentium gcc compiler,
         # which looks to be a dead project)
-@@ -8469,7 +8973,7 @@
+@@ -8170,7 +8669,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -13637,7 +6582,7 @@ Index: binutils-2.24/gas/configure
         lt_prog_compiler_wl='-Qoption ld ';;
        *)
         lt_prog_compiler_wl='-Wl,';;
-@@ -8526,13 +9030,17 @@
+@@ -8227,13 +8726,17 @@ case $host_os in
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -13661,7 +6606,7 @@ Index: binutils-2.24/gas/configure
  
  #
  # Check to make sure the PIC flag actually works.
-@@ -8593,6 +9101,11 @@
+@@ -8294,6 +8797,11 @@ fi
  
  
  
@@ -13673,7 +6618,7 @@ Index: binutils-2.24/gas/configure
  #
  # Check to make sure the static flag actually works.
  #
-@@ -8943,7 +9456,8 @@
+@@ -8644,7 +9152,8 @@ _LT_EOF
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -13683,7 +6628,7 @@ Index: binutils-2.24/gas/configure
  
        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8991,7 +9505,7 @@
+@@ -8692,7 +9201,7 @@ _LT_EOF
        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
          && test "$tmp_diet" = no
        then
@@ -13692,7 +6637,7 @@ Index: binutils-2.24/gas/configure
         tmp_sharedflag='-shared'
         case $cc_basename,$host_cpu in
          pgcc*)                         # Portland Group C compiler
-@@ -9042,12 +9556,12 @@
+@@ -8743,12 +9252,12 @@ _LT_EOF
           whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
           hardcode_libdir_flag_spec=
           hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -13707,7 +6652,7 @@ Index: binutils-2.24/gas/configure
           fi
           ;;
         esac
-@@ -9061,8 +9575,8 @@
+@@ -8762,8 +9271,8 @@ _LT_EOF
         archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
         wlarc=
        else
@@ -13718,7 +6663,7 @@ Index: binutils-2.24/gas/configure
        fi
        ;;
  
-@@ -9080,8 +9594,8 @@
+@@ -8781,8 +9290,8 @@ _LT_EOF
  
  _LT_EOF
        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13729,7 +6674,7 @@ Index: binutils-2.24/gas/configure
        else
         ld_shlibs=no
        fi
-@@ -9127,8 +9641,8 @@
+@@ -8828,8 +9337,8 @@ _LT_EOF
  
      *)
        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -13740,7 +6685,7 @@ Index: binutils-2.24/gas/configure
        else
         ld_shlibs=no
        fi
-@@ -9258,7 +9772,13 @@
+@@ -8959,7 +9468,13 @@ _LT_EOF
         allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -13755,7 +6700,7 @@ Index: binutils-2.24/gas/configure
  /* end confdefs.h.  */
  
  int
-@@ -9271,22 +9791,29 @@
+@@ -8972,22 +9487,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -13798,7 +6743,7 @@ Index: binutils-2.24/gas/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
          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"
-@@ -9298,7 +9825,13 @@
+@@ -8999,7 +9521,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         else
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -13813,7 +6758,7 @@ Index: binutils-2.24/gas/configure
  /* end confdefs.h.  */
  
  int
-@@ -9311,22 +9844,29 @@
+@@ -9012,22 +9540,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -13856,7 +6801,7 @@ Index: binutils-2.24/gas/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
           # Warning - without using the other run time loading flags,
-@@ -9371,20 +9911,63 @@
+@@ -9072,20 +9607,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
@@ -13934,7 +6879,7 @@ Index: binutils-2.24/gas/configure
        ;;
  
      darwin* | rhapsody*)
-@@ -9445,7 +10028,7 @@
+@@ -9146,7 +9724,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
@@ -13943,7 +6888,7 @@ Index: binutils-2.24/gas/configure
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9453,7 +10036,7 @@
+@@ -9154,7 +9732,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -13952,7 +6897,7 @@ Index: binutils-2.24/gas/configure
        else
         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'
        fi
-@@ -9469,7 +10052,7 @@
+@@ -9170,7 +9748,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux10*)
        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -13961,7 +6906,7 @@ Index: binutils-2.24/gas/configure
        else
         archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -9493,10 +10076,10 @@
+@@ -9194,10 +9772,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
           archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
           ;;
         ia64*)
@@ -13974,7 +6919,7 @@ Index: binutils-2.24/gas/configure
           ;;
         esac
        else
-@@ -9575,23 +10158,36 @@
+@@ -9276,23 +9854,36 @@ fi
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -14019,7 +6964,7 @@ Index: binutils-2.24/gas/configure
        else
         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'
         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'
-@@ -9676,7 +10272,7 @@
+@@ -9377,7 +9968,7 @@ rm -f core conftest.err conftest.$ac_objext \
      osf4* | osf5*)     # as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
         allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -14028,7 +6973,7 @@ Index: binutils-2.24/gas/configure
         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
         allow_undefined_flag=' -expect_unresolved \*'
-@@ -9695,9 +10291,9 @@
+@@ -9396,9 +9987,9 @@ rm -f core conftest.err conftest.$ac_objext \
        no_undefined_flag=' -z defs'
        if test "$GCC" = yes; then
         wlarc='${wl}'
@@ -14040,7 +6985,7 @@ Index: binutils-2.24/gas/configure
        else
         case `$CC -V 2>&1` in
         *"Compilers 5.0"*)
-@@ -10273,8 +10869,9 @@
+@@ -9974,8 +10565,9 @@ cygwin* | mingw* | pw32* | cegcc*)
    need_version=no
    need_lib_prefix=no
  
@@ -14052,7 +6997,7 @@ Index: binutils-2.24/gas/configure
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -10307,13 +10904,71 @@
+@@ -10008,13 +10600,71 @@ cygwin* | mingw* | pw32* | cegcc*)
        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
        ;;
      esac
@@ -14125,7 +7070,7 @@ Index: binutils-2.24/gas/configure
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
    ;;
-@@ -10405,7 +11060,7 @@
+@@ -10106,7 +10756,7 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -14134,7 +7079,7 @@ Index: binutils-2.24/gas/configure
    hardcode_into_libs=yes
    ;;
  
-@@ -11245,10 +11900,10 @@
+@@ -10946,10 +11596,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -14147,7 +7092,7 @@ Index: binutils-2.24/gas/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11351,10 +12006,10 @@
+@@ -11052,10 +11702,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -14160,7 +7105,7 @@ Index: binutils-2.24/gas/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -15064,13 +15719,20 @@
+@@ -12924,13 +13574,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -14181,7 +7126,7 @@ Index: binutils-2.24/gas/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -15085,14 +15747,17 @@
+@@ -12945,14 +13602,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -14200,7 +7145,7 @@ Index: binutils-2.24/gas/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -15125,12 +15790,12 @@
+@@ -12985,12 +13645,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -14214,7 +7159,7 @@ Index: binutils-2.24/gas/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -15185,8 +15850,13 @@
+@@ -13045,8 +13705,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -14228,7 +7173,7 @@ Index: binutils-2.24/gas/configure
  STRIP \
  RANLIB \
  CC \
-@@ -15196,12 +15866,14 @@
+@@ -13056,12 +13721,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -14244,7 +7189,7 @@ Index: binutils-2.24/gas/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -15217,7 +15889,6 @@
+@@ -13077,7 +13744,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -14252,7 +7197,7 @@ Index: binutils-2.24/gas/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -15253,6 +15924,7 @@
+@@ -13113,6 +13779,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -14260,7 +7205,7 @@ Index: binutils-2.24/gas/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -16017,7 +16689,8 @@
+@@ -13869,7 +14536,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -14270,7 +7215,7 @@ Index: binutils-2.24/gas/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -16120,19 +16793,42 @@
+@@ -13972,19 +14640,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -14314,7 +7259,7 @@ Index: binutils-2.24/gas/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -16162,6 +16858,12 @@
+@@ -14014,6 +14705,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -14327,7 +7272,7 @@ Index: binutils-2.24/gas/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -16171,6 +16873,9 @@
+@@ -14023,6 +14720,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -14337,7 +7282,7 @@ Index: binutils-2.24/gas/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -16285,12 +16990,12 @@
+@@ -14137,12 +14837,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -14353,7 +7298,7 @@ Index: binutils-2.24/gas/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -16377,9 +17082,6 @@
+@@ -14229,9 +14929,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -14363,7 +7308,7 @@ Index: binutils-2.24/gas/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -16395,6 +17097,9 @@
+@@ -14247,6 +14944,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -14373,7 +7318,7 @@ Index: binutils-2.24/gas/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -16427,210 +17132,169 @@
+@@ -14279,210 +14979,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -14575,9 +7520,15 @@ Index: binutils-2.24/gas/configure
 -_LT_EOF
 -    ;;
 -  esac
+-
+-
+-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+-    || (rm -f "$cfgfile"; exit 1)
+-
+-  mv -f "$cfgfile" "$ofile" ||
 +  sed '$q' "$ltmain" >> "$cfgfile" \
 +     || (rm -f "$cfgfile"; exit 1)
- 
++
 +  if test x"$xsi_shell" = xyes; then
 +  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
 +func_dirname ()\
@@ -14735,20 +7686,17 @@ Index: binutils-2.24/gas/configure
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
 +fi
- 
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
- 
--  mv -f "$cfgfile" "$ofile" ||
++
++
 +   mv -f "$cfgfile" "$ofile" ||
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.24/gprof/configure
-===================================================================
---- binutils-2.24.orig/gprof/configure  2013-12-15 11:09:51.443785606 -0800
-+++ binutils-2.24/gprof/configure       2013-12-15 11:10:23.880452030 -0800
-@@ -629,8 +629,11 @@
+diff --git a/ld/configure b/ld/configure
+index 4408b0d..2fbaebf 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -654,8 +654,11 @@ OTOOL
  LIPO
  NMEDIT
  DSYMUTIL
@@ -14760,24 +7708,24 @@ Index: binutils-2.24/gprof/configure
  OBJDUMP
  LN_S
  NM
-@@ -743,6 +746,7 @@
+@@ -776,6 +779,7 @@ enable_static
  with_pic
  enable_fast_install
  with_gnu_ld
 +with_libtool_sysroot
  enable_libtool_lock
- enable_nls
- enable_maintainer_mode
-@@ -1397,6 +1401,8 @@
+ enable_plugins
+ enable_largefile
+@@ -1453,6 +1457,8 @@ Optional Packages:
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
 +  --with-libtool-sysroot=DIR Search for dependent libraries within DIR
 +                        (or the compiler's sysroot if not specified).
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -5065,8 +5071,8 @@
+   --with-lib-path=dir1:dir2...  set default LIB_PATH
+   --with-sysroot=DIR Search for usr/lib et al within DIR.
+   --with-zlib             include zlib support (auto/yes/no) default=auto
+@@ -5645,8 +5651,8 @@ esac
  
  
  
@@ -14788,7 +7736,7 @@ Index: binutils-2.24/gprof/configure
  
  
  
-@@ -5106,7 +5112,7 @@
+@@ -5686,7 +5692,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  $as_echo_n "checking how to print strings... " >&6; }
  # Test print first, because it will be a builtin if present.
@@ -14797,7 +7745,7 @@ Index: binutils-2.24/gprof/configure
     test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
    ECHO='print -r --'
  elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-@@ -5792,8 +5798,8 @@
+@@ -6372,8 +6378,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  # Try some XSI features
  xsi_shell=no
  ( _lt_dummy="a/b/c"
@@ -14808,7 +7756,7 @@ Index: binutils-2.24/gprof/configure
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
-@@ -5842,6 +5848,80 @@
+@@ -6422,6 +6428,80 @@ esac
  
  
  
@@ -14889,7 +7837,7 @@ Index: binutils-2.24/gprof/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  $as_echo_n "checking for $LD option to reload object files... " >&6; }
  if test "${lt_cv_ld_reload_flag+set}" = set; then :
-@@ -5858,6 +5938,11 @@
+@@ -6438,6 +6518,11 @@ case $reload_flag in
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  case $host_os in
@@ -14901,7 +7849,7 @@ Index: binutils-2.24/gprof/configure
    darwin*)
      if test "$GCC" = yes; then
        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -6026,7 +6111,8 @@
+@@ -6606,7 +6691,8 @@ mingw* | pw32*)
      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
      lt_cv_file_magic_cmd='func_win32_libid'
    else
@@ -14911,19 +7859,7 @@ Index: binutils-2.24/gprof/configure
      lt_cv_file_magic_cmd='$OBJDUMP -f'
    fi
    ;;
-@@ -6103,11 +6189,6 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--linux-uclibc*)
--  lt_cv_deplibs_check_method=pass_all
--  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
--  ;;
--
- netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-@@ -6185,6 +6266,21 @@
+@@ -6760,6 +6846,21 @@ esac
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -14945,7 +7881,7 @@ Index: binutils-2.24/gprof/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6200,9 +6296,162 @@
+@@ -6775,9 +6876,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
  
  
@@ -14959,9 +7895,7 @@ Index: binutils-2.24/gprof/configure
 +
 +
 +
- if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ar; ac_word=$2
++if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -15102,7 +8036,9 @@ Index: binutils-2.24/gprof/configure
 +
 +
 +
-+if test -n "$ac_tool_prefix"; then
+ if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
 +  for ac_prog in ar
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -15110,7 +8046,7 @@ Index: binutils-2.24/gprof/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then :
-@@ -6218,7 +6467,7 @@
+@@ -6793,7 +7047,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -15119,7 +8055,7 @@ Index: binutils-2.24/gprof/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6238,11 +6487,15 @@
+@@ -6813,11 +7067,15 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -15138,7 +8074,7 @@ Index: binutils-2.24/gprof/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-@@ -6258,7 +6511,7 @@
+@@ -6833,7 +7091,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -15147,7 +8083,7 @@ Index: binutils-2.24/gprof/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6277,6 +6530,10 @@
+@@ -6852,6 +7110,10 @@ else
  $as_echo "no" >&6; }
  fi
  
@@ -15158,7 +8094,7 @@ Index: binutils-2.24/gprof/configure
    if test "x$ac_ct_AR" = x; then
      AR="false"
    else
-@@ -6288,16 +6545,72 @@
+@@ -6863,12 +7125,12 @@ ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
    fi
@@ -15172,15 +8108,13 @@ Index: binutils-2.24/gprof/configure
 +: ${AR_FLAGS=cru}
 +
 +
-+
-+
-+
-+
-+
-+
-+
-+
-+
+ 
+ 
+ 
+@@ -6878,6 +7140,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+ 
+ 
+ 
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 +$as_echo_n "checking for archiver @FILE support... " >&6; }
 +if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -15193,7 +8127,7 @@ Index: binutils-2.24/gprof/configure
 +int
 +main ()
 +{
- 
++
 +  ;
 +  return 0;
 +}
@@ -15219,23 +8153,28 @@ Index: binutils-2.24/gprof/configure
 +        fi
 +      fi
 +      rm -f conftest.* libconftest.a
- 
++
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
++
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 +$as_echo "$lt_cv_ar_at_file" >&6; }
- 
++
 +if test "x$lt_cv_ar_at_file" = xno; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
 +fi
++
++
++
++
++
  
  
- 
-@@ -6639,8 +6952,8 @@
+ if test -n "$ac_tool_prefix"; then
+@@ -7214,8 +7532,8 @@ esac
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
  # Transform an extracted symbol line into symbol name and symbol address
@@ -15246,7 +8185,7 @@ Index: binutils-2.24/gprof/configure
  
  # Handle CRLF in mingw tool chain
  opt_cr=
-@@ -6676,6 +6989,7 @@
+@@ -7251,6 +7569,7 @@ for ac_symprfx in "" "_"; do
    else
      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
    fi
@@ -15254,7 +8193,7 @@ Index: binutils-2.24/gprof/configure
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -6717,6 +7031,18 @@
+@@ -7292,6 +7611,18 @@ _LT_EOF
        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
         if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
           cat <<_LT_EOF > conftest.$ac_ext
@@ -15273,7 +8212,7 @@ Index: binutils-2.24/gprof/configure
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -6728,7 +7054,7 @@
+@@ -7303,7 +7634,7 @@ _LT_EOF
           cat <<_LT_EOF >> conftest.$ac_ext
  
  /* The mapping between symbol names and symbols.  */
@@ -15282,7 +8221,7 @@ Index: binutils-2.24/gprof/configure
    const char *name;
    void       *address;
  }
-@@ -6754,8 +7080,8 @@
+@@ -7329,8 +7660,8 @@ static const void *lt_preloaded_setup() {
  _LT_EOF
           # Now try linking the two files.
           mv conftest.$ac_objext conftstm.$ac_objext
@@ -15293,7 +8232,7 @@ Index: binutils-2.24/gprof/configure
           LIBS="conftstm.$ac_objext"
           CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
           if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -6765,8 +7091,8 @@
+@@ -7340,8 +7671,8 @@ _LT_EOF
    test $ac_status = 0; } && test -s conftest${ac_exeext}; then
             pipe_works=yes
           fi
@@ -15304,7 +8243,7 @@ Index: binutils-2.24/gprof/configure
         else
           echo "cannot find nm_test_func in $nlist" >&5
         fi
-@@ -6803,6 +7129,17 @@
+@@ -7378,6 +7709,19 @@ else
  $as_echo "ok" >&6; }
  fi
  
@@ -15319,14 +8258,15 @@ Index: binutils-2.24/gprof/configure
 +
 +
 +
++
++
  
  
  
-@@ -6824,6 +7161,44 @@
+@@ -7398,6 +7742,42 @@ fi
  
  
  
-+
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 +$as_echo_n "checking for sysroot... " >&6; }
 +
@@ -15363,11 +8303,10 @@ Index: binutils-2.24/gprof/configure
 +
 +
 +
-+
+ 
  # Check whether --enable-libtool-lock was given.
  if test "${enable_libtool_lock+set}" = set; then :
-   enableval=$enable_libtool_lock;
-@@ -7030,6 +7405,123 @@
+@@ -7605,6 +7985,123 @@ esac
  
  need_locks="$enable_libtool_lock"
  
@@ -15491,7 +8430,7 @@ Index: binutils-2.24/gprof/configure
  
    case $host_os in
      rhapsody* | darwin*)
-@@ -7593,6 +8085,8 @@
+@@ -8168,6 +8665,8 @@ _LT_EOF
        $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
        echo "$AR cru libconftest.a conftest.o" >&5
        $AR cru libconftest.a conftest.o 2>&5
@@ -15500,7 +8439,24 @@ Index: binutils-2.24/gprof/configure
        cat > conftest.c << _LT_EOF
  int main() { return 0;}
  _LT_EOF
-@@ -7788,7 +8282,8 @@
+@@ -8236,6 +8735,16 @@ done
+ 
+ 
+ 
++func_stripname_cnf ()
++{
++  case ${2} in
++  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++  esac
++} # func_stripname_cnf
++
++
++
+ 
+ 
+ # Set options
+@@ -8364,7 +8873,8 @@ fi
  LIBTOOL_DEPS="$ltmain"
  
  # Always use our own libtool.
@@ -15510,7 +8466,7 @@ Index: binutils-2.24/gprof/configure
  
  
  
-@@ -7877,7 +8372,7 @@
+@@ -8453,7 +8963,7 @@ aix3*)
  esac
  
  # Global variables:
@@ -15519,7 +8475,7 @@ Index: binutils-2.24/gprof/configure
  can_build_shared=yes
  
  # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -8175,8 +8670,6 @@
+@@ -8751,8 +9261,6 @@ fi
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -15528,7 +8484,7 @@ Index: binutils-2.24/gprof/configure
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -8342,6 +8835,12 @@
+@@ -8918,6 +9426,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         lt_prog_compiler_pic='--shared'
         lt_prog_compiler_static='--static'
         ;;
@@ -15541,7 +8497,7 @@ Index: binutils-2.24/gprof/configure
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          # Portland Group compilers (*not* the Pentium gcc compiler,
         # which looks to be a dead project)
-@@ -8404,7 +8903,7 @@
+@@ -8980,7 +9494,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -15550,7 +8506,7 @@ Index: binutils-2.24/gprof/configure
         lt_prog_compiler_wl='-Qoption ld ';;
        *)
         lt_prog_compiler_wl='-Wl,';;
-@@ -8461,13 +8960,17 @@
+@@ -9037,13 +9551,17 @@ case $host_os in
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -15574,7 +8530,7 @@ Index: binutils-2.24/gprof/configure
  
  #
  # Check to make sure the PIC flag actually works.
-@@ -8528,6 +9031,11 @@
+@@ -9104,6 +9622,11 @@ fi
  
  
  
@@ -15586,7 +8542,7 @@ Index: binutils-2.24/gprof/configure
  #
  # Check to make sure the static flag actually works.
  #
-@@ -8878,7 +9386,8 @@
+@@ -9454,7 +9977,8 @@ _LT_EOF
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -15596,7 +8552,7 @@ Index: binutils-2.24/gprof/configure
  
        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8926,7 +9435,7 @@
+@@ -9502,7 +10026,7 @@ _LT_EOF
        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
          && test "$tmp_diet" = no
        then
@@ -15605,7 +8561,7 @@ Index: binutils-2.24/gprof/configure
         tmp_sharedflag='-shared'
         case $cc_basename,$host_cpu in
          pgcc*)                         # Portland Group C compiler
-@@ -8977,12 +9486,12 @@
+@@ -9553,12 +10077,12 @@ _LT_EOF
           whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
           hardcode_libdir_flag_spec=
           hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -15620,7 +8576,7 @@ Index: binutils-2.24/gprof/configure
           fi
           ;;
         esac
-@@ -8996,8 +9505,8 @@
+@@ -9572,8 +10096,8 @@ _LT_EOF
         archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
         wlarc=
        else
@@ -15631,7 +8587,7 @@ Index: binutils-2.24/gprof/configure
        fi
        ;;
  
-@@ -9015,8 +9524,8 @@
+@@ -9591,8 +10115,8 @@ _LT_EOF
  
  _LT_EOF
        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -15642,7 +8598,7 @@ Index: binutils-2.24/gprof/configure
        else
         ld_shlibs=no
        fi
-@@ -9062,8 +9571,8 @@
+@@ -9638,8 +10162,8 @@ _LT_EOF
  
      *)
        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -15653,7 +8609,7 @@ Index: binutils-2.24/gprof/configure
        else
         ld_shlibs=no
        fi
-@@ -9193,7 +9702,13 @@
+@@ -9769,7 +10293,13 @@ _LT_EOF
         allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -15668,7 +8624,7 @@ Index: binutils-2.24/gprof/configure
  /* end confdefs.h.  */
  
  int
-@@ -9206,22 +9721,29 @@
+@@ -9782,22 +10312,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -15711,7 +8667,7 @@ Index: binutils-2.24/gprof/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
          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"
-@@ -9233,7 +9755,13 @@
+@@ -9809,7 +10346,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         else
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -15726,7 +8682,7 @@ Index: binutils-2.24/gprof/configure
  /* end confdefs.h.  */
  
  int
-@@ -9246,22 +9774,29 @@
+@@ -9822,22 +10365,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -15769,10 +8725,11 @@ Index: binutils-2.24/gprof/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
           # Warning - without using the other run time loading flags,
-@@ -9306,20 +9841,63 @@
+@@ -9881,21 +10431,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+       # When not using gcc, we currently assume that we are using
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
+-      # no search path for DLLs.
 -      hardcode_libdir_flag_spec=' '
 -      allow_undefined_flag=unsupported
 -      # Tell ltmain to make .lib files, not .a files.
@@ -15787,6 +8744,7 @@ Index: binutils-2.24/gprof/configure
 -      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
 -      fix_srcfile_path='`cygpath -w "$srcfile"`'
 -      enable_shared_with_static_runtimes=yes
++      # no search path for DLLs.
 +      case $cc_basename in
 +      cl*)
 +       # Native MSVC
@@ -15847,7 +8805,7 @@ Index: binutils-2.24/gprof/configure
        ;;
  
      darwin* | rhapsody*)
-@@ -9380,7 +9958,7 @@
+@@ -9956,7 +10549,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
@@ -15856,7 +8814,7 @@ Index: binutils-2.24/gprof/configure
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9388,7 +9966,7 @@
+@@ -9964,7 +10557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -15865,7 +8823,7 @@ Index: binutils-2.24/gprof/configure
        else
         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'
        fi
-@@ -9404,7 +9982,7 @@
+@@ -9980,7 +10573,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux10*)
        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -15874,7 +8832,7 @@ Index: binutils-2.24/gprof/configure
        else
         archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -9428,10 +10006,10 @@
+@@ -10004,10 +10597,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
           archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
           ;;
         ia64*)
@@ -15887,7 +8845,7 @@ Index: binutils-2.24/gprof/configure
           ;;
         esac
        else
-@@ -9510,23 +10088,36 @@
+@@ -10086,23 +10679,36 @@ fi
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -15932,7 +8890,7 @@ Index: binutils-2.24/gprof/configure
        else
         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'
         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'
-@@ -9611,7 +10202,7 @@
+@@ -10187,7 +10793,7 @@ rm -f core conftest.err conftest.$ac_objext \
      osf4* | osf5*)     # as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
         allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15941,7 +8899,7 @@ Index: binutils-2.24/gprof/configure
         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
         allow_undefined_flag=' -expect_unresolved \*'
-@@ -9630,9 +10221,9 @@
+@@ -10206,9 +10812,9 @@ rm -f core conftest.err conftest.$ac_objext \
        no_undefined_flag=' -z defs'
        if test "$GCC" = yes; then
         wlarc='${wl}'
@@ -15953,7 +8911,7 @@ Index: binutils-2.24/gprof/configure
        else
         case `$CC -V 2>&1` in
         *"Compilers 5.0"*)
-@@ -10208,8 +10799,9 @@
+@@ -10784,8 +11390,9 @@ cygwin* | mingw* | pw32* | cegcc*)
    need_version=no
    need_lib_prefix=no
  
@@ -15965,7 +8923,7 @@ Index: binutils-2.24/gprof/configure
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -10242,13 +10834,71 @@
+@@ -10818,13 +11425,71 @@ cygwin* | mingw* | pw32* | cegcc*)
        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
        ;;
      esac
@@ -16038,7 +8996,7 @@ Index: binutils-2.24/gprof/configure
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
    ;;
-@@ -10340,7 +10990,7 @@
+@@ -10916,7 +11581,7 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -16047,7 +9005,16 @@ Index: binutils-2.24/gprof/configure
    hardcode_into_libs=yes
    ;;
  
-@@ -11180,10 +11830,10 @@
+@@ -11712,7 +12377,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11715 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11756,10 +12421,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -16060,7 +9027,16 @@ Index: binutils-2.24/gprof/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11286,10 +11936,10 @@
+@@ -11818,7 +12483,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11821 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11862,10 +12527,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -16073,7 +9049,612 @@ Index: binutils-2.24/gprof/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12831,13 +13481,20 @@
+@@ -12257,6 +12922,7 @@ $RM -r conftest*
+ 
+   # Allow CC to be a program name with arguments.
+   lt_save_CC=$CC
++  lt_save_CFLAGS=$CFLAGS
+   lt_save_LD=$LD
+   lt_save_GCC=$GCC
+   GCC=$GXX
+@@ -12274,6 +12940,7 @@ $RM -r conftest*
+   fi
+   test -z "${LDCXX+set}" || LD=$LDCXX
+   CC=${CXX-"c++"}
++  CFLAGS=$CXXFLAGS
+   compiler=$CC
+   compiler_CXX=$CC
+   for cc_temp in $compiler""; do
+@@ -12413,8 +13080,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+       # Check if GNU C++ uses GNU ld as the underlying linker, since the
+       # archiving commands below assume that GNU ld is being used.
+       if test "$with_gnu_ld" = yes; then
+-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-        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'
++        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        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'
+ 
+         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -12556,7 +13223,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+           allow_undefined_flag_CXX='-berok'
+           # Determine the default libpath from the value encoded in an empty
+           # executable.
+-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++          if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
++else
++  if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -12569,22 +13242,29 @@ main ()
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ 
+-lt_aix_libpath_sed='
+-    /Import File Strings/,/^$/ {
+-       /^0/ {
+-           s/^0  *\(.*\)$/\1/
+-           p
+-       }
+-    }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi
++  lt_aix_libpath_sed='
++      /Import File Strings/,/^$/ {
++         /^0/ {
++             s/^0  *\([^ ]*\) *$/\1/
++             p
++         }
++      }'
++  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$lt_cv_aix_libpath__CXX"; then
++    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++  if test -z "$lt_cv_aix_libpath__CXX"; then
++    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
++  fi
++
++fi
++
++  aix_libpath=$lt_cv_aix_libpath__CXX
++fi
+ 
+           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+@@ -12597,7 +13277,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+           else
+            # Determine the default libpath from the value encoded in an
+            # empty executable.
+-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++           if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
++else
++  if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -12610,22 +13296,29 @@ main ()
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ 
+-lt_aix_libpath_sed='
+-    /Import File Strings/,/^$/ {
+-       /^0/ {
+-           s/^0  *\(.*\)$/\1/
+-           p
+-       }
+-    }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi
++  lt_aix_libpath_sed='
++      /Import File Strings/,/^$/ {
++         /^0/ {
++             s/^0  *\([^ ]*\) *$/\1/
++             p
++         }
++      }'
++  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$lt_cv_aix_libpath__CXX"; then
++    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++  if test -z "$lt_cv_aix_libpath__CXX"; then
++    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
++  fi
++
++fi
++
++  aix_libpath=$lt_cv_aix_libpath__CXX
++fi
+ 
+            hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+            # Warning - without using the other run time loading flags,
+@@ -12668,29 +13361,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+         ;;
+ 
+       cygwin* | mingw* | pw32* | cegcc*)
+-        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+-        # as there is no search path for DLLs.
+-        hardcode_libdir_flag_spec_CXX='-L$libdir'
+-        export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+-        allow_undefined_flag_CXX=unsupported
+-        always_export_symbols_CXX=no
+-        enable_shared_with_static_runtimes_CXX=yes
+-
+-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+-          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'
+-          # If the export-symbols file already is a .def file (1st line
+-          # is EXPORTS), use it as is; otherwise, prepend...
+-          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-           cp $export_symbols $output_objdir/$soname.def;
+-          else
+-           echo EXPORTS > $output_objdir/$soname.def;
+-           cat $export_symbols >> $output_objdir/$soname.def;
+-          fi~
+-          $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'
+-        else
+-          ld_shlibs_CXX=no
+-        fi
+-        ;;
++       case $GXX,$cc_basename in
++       ,cl* | no,cl*)
++         # Native MSVC
++         # hardcode_libdir_flag_spec is actually meaningless, as there is
++         # no search path for DLLs.
++         hardcode_libdir_flag_spec_CXX=' '
++         allow_undefined_flag_CXX=unsupported
++         always_export_symbols_CXX=yes
++         file_list_spec_CXX='@'
++         # Tell ltmain to make .lib files, not .a files.
++         libext=lib
++         # Tell ltmain to make .dll files, not .so files.
++         shrext_cmds=".dll"
++         # FIXME: Setting linknames here is a bad hack.
++         archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++         archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++             $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++           else
++             $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++           fi~
++           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++           linknames='
++         # The linker will not automatically build a static lib if we build a DLL.
++         # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
++         enable_shared_with_static_runtimes_CXX=yes
++         # Don't use ranlib
++         old_postinstall_cmds_CXX='chmod 644 $oldlib'
++         postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
++           lt_tool_outputfile="@TOOL_OUTPUT@"~
++           case $lt_outputfile in
++             *.exe|*.EXE) ;;
++             *)
++               lt_outputfile="$lt_outputfile.exe"
++               lt_tool_outputfile="$lt_tool_outputfile.exe"
++               ;;
++           esac~
++           func_to_tool_file "$lt_outputfile"~
++           if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++             $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++             $RM "$lt_outputfile.manifest";
++           fi'
++         ;;
++       *)
++         # g++
++         # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
++         # as there is no search path for DLLs.
++         hardcode_libdir_flag_spec_CXX='-L$libdir'
++         export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
++         allow_undefined_flag_CXX=unsupported
++         always_export_symbols_CXX=no
++         enable_shared_with_static_runtimes_CXX=yes
++
++         if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++           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'
++           # If the export-symbols file already is a .def file (1st line
++           # is EXPORTS), use it as is; otherwise, prepend...
++           archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++             cp $export_symbols $output_objdir/$soname.def;
++           else
++             echo EXPORTS > $output_objdir/$soname.def;
++             cat $export_symbols >> $output_objdir/$soname.def;
++           fi~
++           $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'
++         else
++           ld_shlibs_CXX=no
++         fi
++         ;;
++       esac
++       ;;
+       darwin* | rhapsody*)
+ 
+ 
+@@ -12796,7 +13535,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+             ;;
+           *)
+             if test "$GXX" = yes; then
+-              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'
++              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'
+             else
+               # FIXME: insert proper C++ library support
+               ld_shlibs_CXX=no
+@@ -12867,10 +13606,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+                    archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                    ;;
+                  ia64*)
+-                   archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++                   archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                    ;;
+                  *)
+-                   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'
++                   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'
+                    ;;
+                esac
+              fi
+@@ -12911,9 +13650,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+           *)
+            if test "$GXX" = yes; then
+              if test "$with_gnu_ld" = no; then
+-               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'
++               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'
+              else
+-               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'
++               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'
+              fi
+            fi
+            link_all_deplibs_CXX=yes
+@@ -12983,20 +13722,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+              prelink_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+-               compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+              old_archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+-               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+              archive_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+-               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+              archive_expsym_cmds_CXX='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+-               $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'
++               $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'
+              ;;
+            *) # Version 6 and above use weak symbols
+              archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+@@ -13191,7 +13930,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+                  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'
+                  ;;
+                *)
+-                 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'
++                 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'
+                  ;;
+              esac
+ 
+@@ -13237,7 +13976,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+       solaris*)
+         case $cc_basename in
+-          CC*)
++          CC* | sunCC*)
+            # Sun C++ 4.2, 5.x and Centerline C++
+             archive_cmds_need_lc_CXX=yes
+            no_undefined_flag_CXX=' -zdefs'
+@@ -13278,9 +14017,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+            if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+              no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+              if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+-               archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++               archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+                archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-                 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++                 $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ 
+                # Commands to make compiler produce verbose output that lists
+                # what "hidden" libraries, object files and flags are used when
+@@ -13415,6 +14154,13 @@ private:
+ };
+ _LT_EOF
+ 
++
++_lt_libdeps_save_CFLAGS=$CFLAGS
++case "$CC $CFLAGS " in #(
++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++esac
++
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -13428,7 +14174,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   pre_test_object_deps_done=no
+ 
+   for p in `eval "$output_verbose_link_cmd"`; do
+-    case $p in
++    case ${prev}${p} in
+ 
+     -L* | -R* | -l*)
+        # Some compilers place space between "-{L,R}" and the path.
+@@ -13437,13 +14183,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+           test $p = "-R"; then
+         prev=$p
+         continue
+-       else
+-        prev=
+        fi
+ 
++       # Expand the sysroot to ease extracting the directories later.
++       if test -z "$prev"; then
++         case $p in
++         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
++         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
++         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
++         esac
++       fi
++       case $p in
++       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
++       esac
+        if test "$pre_test_object_deps_done" = no; then
+-        case $p in
+-        -L* | -R*)
++        case ${prev} in
++        -L | -R)
+           # Internal compiler library paths should come after those
+           # provided the user.  The postdeps already come after the
+           # user supplied libs so there is no need to process them.
+@@ -13463,8 +14218,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+           postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+         fi
+        fi
++       prev=
+        ;;
+ 
++    *.lto.$objext) ;; # Ignore GCC LTO objects
+     *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+@@ -13500,6 +14257,7 @@ else
+ fi
+ 
+ $RM -f confest.$objext
++CFLAGS=$_lt_libdeps_save_CFLAGS
+ 
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+@@ -13535,7 +14293,7 @@ linux*)
+ 
+ solaris*)
+   case $cc_basename in
+-  CC*)
++  CC* | sunCC*)
+     # The more standards-conforming stlport4 library is
+     # incompatible with the Cstd library. Avoid specifying
+     # it if it's in CXXFLAGS. Ignore libCrun as
+@@ -13600,8 +14358,6 @@ fi
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ 
+   # C++ specific cases for pic, static, wl, etc.
+   if test "$GXX" = yes; then
+@@ -13706,6 +14462,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+          ;;
+        esac
+        ;;
++      mingw* | cygwin* | os2* | pw32* | cegcc*)
++       # This hack is so that the source file can tell whether it is being
++       # built for inclusion in a dll (and should export symbols for example).
++       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++       ;;
+       dgux*)
+        case $cc_basename in
+          ec++*)
+@@ -13858,7 +14619,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+        ;;
+       solaris*)
+        case $cc_basename in
+-         CC*)
++         CC* | sunCC*)
+            # Sun C++ 4.2, 5.x and Centerline C++
+            lt_prog_compiler_pic_CXX='-KPIC'
+            lt_prog_compiler_static_CXX='-Bstatic'
+@@ -13923,10 +14684,17 @@ case $host_os in
+     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+     ;;
+ esac
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+-
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
++lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+@@ -13984,6 +14752,8 @@ fi
+ 
+ 
+ 
++
++
+ #
+ # Check to make sure the static flag actually works.
+ #
+@@ -14161,6 +14931,7 @@ fi
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ 
+   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+   case $host_os in
+   aix[4-9]*)
+     # If we're using GNU nm, then we don't want the "-C" option.
+@@ -14175,15 +14946,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+     ;;
+   pw32*)
+     export_symbols_cmds_CXX="$ltdll_cmds"
+-  ;;
++    ;;
+   cygwin* | mingw* | cegcc*)
+-    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'
+-  ;;
++    case $cc_basename in
++    cl*) ;;
++    *)
++      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'
++      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
++      ;;
++    esac
++    ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
++    ;;
+   esac
+-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+ $as_echo "$ld_shlibs_CXX" >&6; }
+@@ -14446,8 +15222,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+   need_version=no
+   need_lib_prefix=no
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  case $GCC,$cc_basename in
++  yes,*)
++    # gcc
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -14479,13 +15256,71 @@ cygwin* | mingw* | pw32* | cegcc*)
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
++    dynamic_linker='Win32 ld.exe'
++    ;;
++
++  *,cl*)
++    # Native MSVC
++    libname_spec='$name'
++    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++    library_names_spec='${libname}.dll.lib'
++
++    case $build_os in
++    mingw*)
++      sys_lib_search_path_spec=
++      lt_save_ifs=$IFS
++      IFS=';'
++      for lt_path in $LIB
++      do
++        IFS=$lt_save_ifs
++        # Let DOS variable expansion print the short 8.3 style file name.
++        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++      done
++      IFS=$lt_save_ifs
++      # Convert to MSYS style.
++      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
++      ;;
++    cygwin*)
++      # Convert to unix form, then to dos form, then back to unix form
++      # but this time dos style (no spaces!) so that the unix form looks
++      # like /cygdrive/c/PROGRA~1:/cygdr...
++      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      ;;
++    *)
++      sys_lib_search_path_spec="$LIB"
++      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH.
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      # FIXME: find the short name or the path components, as spaces are
++      # common. (e.g. "Program Files" -> "PROGRA~1")
++      ;;
++    esac
++
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
++    dynamic_linker='Win32 link.exe'
+     ;;
+ 
+   *)
++    # Assume MSVC wrapper
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    dynamic_linker='Win32 ld.exe'
+     ;;
+   esac
+-  dynamic_linker='Win32 ld.exe'
+   # FIXME: first we should search . and the directory the executable is in
+   shlibpath_var=PATH
+   ;;
+@@ -14576,7 +15411,7 @@ haiku*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+   hardcode_into_libs=yes
+   ;;
+ 
+@@ -15035,6 +15870,7 @@ fi
+   fi # test -n "$compiler"
+ 
+   CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
+   LDCXX=$LD
+   LD=$lt_save_LD
+   GCC=$lt_save_GCC
+@@ -17807,13 +18643,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -16094,7 +9675,7 @@ Index: binutils-2.24/gprof/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -12852,14 +13509,17 @@
+@@ -17828,14 +18671,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -16113,7 +9694,7 @@ Index: binutils-2.24/gprof/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -12892,12 +13552,12 @@
+@@ -17868,12 +18714,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -16127,7 +9708,31 @@ Index: binutils-2.24/gprof/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -12952,8 +13612,13 @@
+@@ -17912,8 +18758,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
+ compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+ GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+ lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+ lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+ lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+ lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+ archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+@@ -17940,12 +18786,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
+ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+ inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+ link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
+ always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+ export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+ exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+ include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+ prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+ file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+ hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+ compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+@@ -17983,8 +18829,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -16141,7 +9746,7 @@ Index: binutils-2.24/gprof/configure
  STRIP \
  RANLIB \
  CC \
-@@ -12963,12 +13628,14 @@
+@@ -17994,12 +18845,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -16157,7 +9762,7 @@ Index: binutils-2.24/gprof/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -12984,7 +13651,6 @@
+@@ -18015,7 +18868,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -16165,7 +9770,25 @@ Index: binutils-2.24/gprof/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -13020,6 +13686,7 @@
+@@ -18037,8 +18889,8 @@ LD_CXX \
+ reload_flag_CXX \
+ compiler_CXX \
+ lt_prog_compiler_no_builtin_flag_CXX \
+-lt_prog_compiler_wl_CXX \
+ lt_prog_compiler_pic_CXX \
++lt_prog_compiler_wl_CXX \
+ lt_prog_compiler_static_CXX \
+ lt_cv_prog_compiler_c_o_CXX \
+ export_dynamic_flag_spec_CXX \
+@@ -18050,7 +18902,6 @@ no_undefined_flag_CXX \
+ hardcode_libdir_flag_spec_CXX \
+ hardcode_libdir_flag_spec_ld_CXX \
+ hardcode_libdir_separator_CXX \
+-fix_srcfile_path_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX \
+ file_list_spec_CXX \
+@@ -18084,6 +18935,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -16173,7 +9796,17 @@ Index: binutils-2.24/gprof/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -13776,7 +14443,8 @@
+@@ -18098,7 +18950,8 @@ archive_expsym_cmds_CXX \
+ module_cmds_CXX \
+ module_expsym_cmds_CXX \
+ export_symbols_cmds_CXX \
+-prelink_cmds_CXX; do
++prelink_cmds_CXX \
++postlink_cmds_CXX; do
+     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+     *[\\\\\\\`\\"\\\$]*)
+       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+@@ -18891,7 +19744,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -16183,7 +9816,7 @@ Index: binutils-2.24/gprof/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -13879,19 +14547,42 @@
+@@ -18994,19 +19848,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -16227,7 +9860,7 @@ Index: binutils-2.24/gprof/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -13921,6 +14612,12 @@
+@@ -19036,6 +19913,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -16240,7 +9873,7 @@ Index: binutils-2.24/gprof/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -13930,6 +14627,9 @@
+@@ -19045,6 +19928,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -16250,7 +9883,7 @@ Index: binutils-2.24/gprof/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -14044,12 +14744,12 @@
+@@ -19159,12 +20045,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -16266,7 +9899,7 @@ Index: binutils-2.24/gprof/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -14136,9 +14836,6 @@
+@@ -19251,9 +20137,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -16276,7 +9909,7 @@ Index: binutils-2.24/gprof/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -14154,6 +14851,9 @@
+@@ -19269,6 +20152,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -16286,7 +9919,7 @@ Index: binutils-2.24/gprof/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -14186,210 +14886,169 @@
+@@ -19315,210 +20201,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -16488,9 +10121,15 @@ Index: binutils-2.24/gprof/configure
 -_LT_EOF
 -    ;;
 -  esac
+-
+-
+-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+-    || (rm -f "$cfgfile"; exit 1)
+-
+-  mv -f "$cfgfile" "$ofile" ||
 +  sed '$q' "$ltmain" >> "$cfgfile" \
 +     || (rm -f "$cfgfile"; exit 1)
- 
++
 +  if test x"$xsi_shell" = xyes; then
 +  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
 +func_dirname ()\
@@ -16648,49 +10287,7183 @@ Index: binutils-2.24/gprof/configure
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
 +fi
++
++
++   mv -f "$cfgfile" "$ofile" ||
+     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+   chmod +x "$ofile"
  
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+@@ -19546,12 +20391,12 @@ with_gcc=$GCC_CXX
+ # Compiler flag to turn off builtin functions.
+ no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+ 
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+ # Additional compiler flags for building library objects.
+ pic_flag=$lt_lt_prog_compiler_pic_CXX
+ 
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
++
+ # Compiler flag to prevent dynamic linking.
+ link_static_flag=$lt_lt_prog_compiler_static_CXX
+ 
+@@ -19638,9 +20483,6 @@ inherit_rpath=$inherit_rpath_CXX
+ # Whether libtool must link a program against all its dependency libraries.
+ link_all_deplibs=$link_all_deplibs_CXX
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path=$lt_fix_srcfile_path_CXX
+-
+ # Set to "yes" if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+ 
+@@ -19656,6 +20498,9 @@ include_expsyms=$lt_include_expsyms_CXX
+ # Commands necessary for linking programs (against libraries) with templates.
+ prelink_cmds=$lt_prelink_cmds_CXX
+ 
++# Commands necessary for finishing linking programs.
++postlink_cmds=$lt_postlink_cmds_CXX
++
+ # Specify filename containing input files.
+ file_list_spec=$lt_file_list_spec_CXX
+ 
+diff --git a/libtool.m4 b/libtool.m4
+index 797468f..02b15b3 100644
+--- a/libtool.m4
++++ b/libtool.m4
+@@ -1,7 +1,8 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ #
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
++#                 Inc.
+ #   Written by Gordon Matzigkeit, 1996
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -10,7 +11,8 @@
+ 
+ m4_define([_LT_COPYING], [dnl
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
++#                 Inc.
+ #   Written by Gordon Matzigkeit, 1996
+ #
+ #   This file is part of GNU Libtool.
+@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ])
+ 
+-# serial 56 LT_INIT
++# serial 57 LT_INIT
+ 
+ 
+ # LT_PREREQ(VERSION)
+@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
+ LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) $(top_builddir)'
++LIBTOOL="$LIBTOOL/${host_alias}-libtool"
+ AC_SUBST(LIBTOOL)dnl
+ 
+ _LT_SETUP
+@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+ dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+ m4_require([_LT_CMD_RELOAD])dnl
+ m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+ m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+ m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
++m4_require([_LT_WITH_SYSROOT])dnl
+ 
+ _LT_CONFIG_LIBTOOL_INIT([
+ # See if we are running on zsh, and set the options which allow our
+@@ -199,7 +205,7 @@ aix3*)
+ esac
+ 
+ # Global variables:
+-ofile=libtool
++ofile=${host_alias}-libtool
+ can_build_shared=yes
+ 
+ # All known linkers require a `.a' archive for static linking (except MSVC,
+@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+ configured by $[0], generated by m4_PACKAGE_STRING.
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.lt script is free software; the Free Software Foundation
+ gives unlimited permision to copy, distribute and modify it."
+ 
+@@ -746,15 +752,12 @@ _LT_EOF
+   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+   # text mode, it properly converts lines to CR/LF.  This bash problem
+   # is reportedly fixed, but why not run on old versions too?
+-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
 -    || (rm -f "$cfgfile"; exit 1)
++  sed '$q' "$ltmain" >> "$cfgfile" \
++     || (rm -f "$cfgfile"; exit 1)
  
+-  _LT_PROG_XSI_SHELLFNS
++  _LT_PROG_REPLACE_SHELLFNS
+ 
+-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+-    || (rm -f "$cfgfile"; exit 1)
+-
 -  mv -f "$cfgfile" "$ofile" ||
 +   mv -f "$cfgfile" "$ofile" ||
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
+ ],
+@@ -980,6 +983,8 @@ _LT_EOF
+       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+       echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+       $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
++      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
++      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+       cat > conftest.c << _LT_EOF
+ int main() { return 0;}
+ _LT_EOF
+@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+   fi
+ ])
  
-Index: binutils-2.24/ld/configure
-===================================================================
---- binutils-2.24.orig/ld/configure     2013-11-04 07:33:39.000000000 -0800
-+++ binutils-2.24/ld/configure  2013-12-15 11:12:06.120451266 -0800
-@@ -654,8 +654,11 @@ OTOOL
+-# _LT_SYS_MODULE_PATH_AIX
+-# -----------------------
++# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
++# ----------------------------------
+ # Links a minimal program and checks the executable
+ # for the system default hardcoded library path. In most cases,
+ # this is /usr/lib:/lib, but when the MPI compilers are used
+ # the location of the communication and MPI libs are included too.
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
++# Store the results from the different compilers for each TAGNAME.
++# Allow to override them for all tags through lt_cv_aix_libpath.
+ m4_defun([_LT_SYS_MODULE_PATH_AIX],
+ [m4_require([_LT_DECL_SED])dnl
+-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-lt_aix_libpath_sed='
+-    /Import File Strings/,/^$/ {
+-       /^0/ {
+-           s/^0  *\(.*\)$/\1/
+-           p
+-       }
+-    }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi],[])
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
++else
++  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
++  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
++  lt_aix_libpath_sed='[
++      /Import File Strings/,/^$/ {
++         /^0/ {
++             s/^0  *\([^ ]*\) *$/\1/
++             p
++         }
++      }]'
++  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
++    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi],[])
++  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
++    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
++  fi
++  ])
++  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
++fi
+ ])# _LT_SYS_MODULE_PATH_AIX
+ 
+ 
+@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+ 
+ AC_MSG_CHECKING([how to print strings])
+ # Test print first, because it will be a builtin if present.
+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+    test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+   ECHO='print -r --'
+ elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+ ])# _LT_PROG_ECHO_BACKSLASH
+ 
+ 
++# _LT_WITH_SYSROOT
++# ----------------
++AC_DEFUN([_LT_WITH_SYSROOT],
++[AC_MSG_CHECKING([for sysroot])
++AC_ARG_WITH([libtool-sysroot],
++[  --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
++                        (or the compiler's sysroot if not specified).],
++[], [with_libtool_sysroot=no])
++
++dnl lt_sysroot will always be passed unquoted.  We quote it here
++dnl in case the user passed a directory name.
++lt_sysroot=
++case ${with_libtool_sysroot} in #(
++ yes)
++   if test "$GCC" = yes; then
++     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
++   fi
++   ;; #(
++ /*)
++   lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
++   ;; #(
++ no|'')
++   ;; #(
++ *)
++   AC_MSG_RESULT([${with_libtool_sysroot}])
++   AC_MSG_ERROR([The sysroot must be an absolute path.])
++   ;;
++esac
++
++ AC_MSG_RESULT([${lt_sysroot:-no}])
++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
++[dependent libraries, and in which our libraries should be installed.])])
++
+ # _LT_ENABLE_LOCK
+ # ---------------
+ m4_defun([_LT_ENABLE_LOCK],
+@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock"
+ ])# _LT_ENABLE_LOCK
+ 
+ 
++# _LT_PROG_AR
++# -----------
++m4_defun([_LT_PROG_AR],
++[AC_CHECK_TOOLS(AR, [ar], false)
++: ${AR=ar}
++: ${AR_FLAGS=cru}
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
++
++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
++  [lt_cv_ar_at_file=no
++   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
++     [echo conftest.$ac_objext > conftest.lst
++      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
++      AC_TRY_EVAL([lt_ar_try])
++      if test "$ac_status" -eq 0; then
++       # Ensure the archiver fails upon bogus file names.
++       rm -f conftest.$ac_objext libconftest.a
++       AC_TRY_EVAL([lt_ar_try])
++       if test "$ac_status" -ne 0; then
++          lt_cv_ar_at_file=@
++        fi
++      fi
++      rm -f conftest.* libconftest.a
++     ])
++  ])
++
++if test "x$lt_cv_ar_at_file" = xno; then
++  archiver_list_spec=
++else
++  archiver_list_spec=$lt_cv_ar_at_file
++fi
++_LT_DECL([], [archiver_list_spec], [1],
++  [How to feed a file listing to the archiver])
++])# _LT_PROG_AR
++
++
+ # _LT_CMD_OLD_ARCHIVE
+ # -------------------
+ m4_defun([_LT_CMD_OLD_ARCHIVE],
+-[AC_CHECK_TOOL(AR, ar, false)
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-_LT_DECL([], [AR], [1], [The archiver])
+-_LT_DECL([], [AR_FLAGS], [1])
++[_LT_PROG_AR
+ 
+ AC_CHECK_TOOL(STRIP, strip, :)
+ test -z "$STRIP" && STRIP=:
+@@ -1623,7 +1705,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-[#line __oline__ "configure"
++[#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -1667,10 +1749,10 @@ else
+ /* When -fvisbility=hidden is used, assume the code has been annotated
+    correspondingly for the symbols needed.  */
+ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+-void fnord () __attribute__((visibility("default")));
++int fnord () __attribute__((visibility("default")));
+ #endif
+ 
+-void fnord () { int i=42; }
++int fnord () { return 42; }
+ int main ()
+ {
+   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+   need_version=no
+   need_lib_prefix=no
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  case $GCC,$cc_basename in
++  yes,*)
++    # gcc
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -2244,13 +2327,71 @@ m4_if([$1], [],[
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
++    dynamic_linker='Win32 ld.exe'
++    ;;
++
++  *,cl*)
++    # Native MSVC
++    libname_spec='$name'
++    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++    library_names_spec='${libname}.dll.lib'
++
++    case $build_os in
++    mingw*)
++      sys_lib_search_path_spec=
++      lt_save_ifs=$IFS
++      IFS=';'
++      for lt_path in $LIB
++      do
++        IFS=$lt_save_ifs
++        # Let DOS variable expansion print the short 8.3 style file name.
++        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++      done
++      IFS=$lt_save_ifs
++      # Convert to MSYS style.
++      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
++      ;;
++    cygwin*)
++      # Convert to unix form, then to dos form, then back to unix form
++      # but this time dos style (no spaces!) so that the unix form looks
++      # like /cygdrive/c/PROGRA~1:/cygdr...
++      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      ;;
++    *)
++      sys_lib_search_path_spec="$LIB"
++      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH.
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      # FIXME: find the short name or the path components, as spaces are
++      # common. (e.g. "Program Files" -> "PROGRA~1")
++      ;;
++    esac
++
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
++    dynamic_linker='Win32 link.exe'
+     ;;
+ 
+   *)
++    # Assume MSVC wrapper
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    dynamic_linker='Win32 ld.exe'
+     ;;
+   esac
+-  dynamic_linker='Win32 ld.exe'
+   # FIXME: first we should search . and the directory the executable is in
+   shlibpath_var=PATH
+   ;;
+@@ -2342,7 +2483,7 @@ haiku*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
++  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+   hardcode_into_libs=yes
+   ;;
+ 
+@@ -2950,6 +3091,11 @@ case $reload_flag in
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
++  cygwin* | mingw* | pw32* | cegcc*)
++    if test "$GCC" != yes; then
++      reload_cmds=false
++    fi
++    ;;
+   darwin*)
+     if test "$GCC" = yes; then
+       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+@@ -3016,7 +3162,8 @@ mingw* | pw32*)
+     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    # Keep this pattern in sync with the one in func_win32_libid.
++    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+     lt_cv_file_magic_cmd='$OBJDUMP -f'
+   fi
+   ;;
+@@ -3167,6 +3314,21 @@ tpf*)
+   ;;
+ esac
+ ])
++
++file_magic_glob=
++want_nocaseglob=no
++if test "$build" = "$host"; then
++  case $host_os in
++  mingw* | pw32*)
++    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
++      want_nocaseglob=yes
++    else
++      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
++    fi
++    ;;
++  esac
++fi
++
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+ _LT_DECL([], [deplibs_check_method], [1],
+     [Method to check whether dependent libraries are shared objects])
+ _LT_DECL([], [file_magic_cmd], [1],
+-    [Command to use when deplibs_check_method == "file_magic"])
++    [Command to use when deplibs_check_method = "file_magic"])
++_LT_DECL([], [file_magic_glob], [1],
++    [How to find potential files when deplibs_check_method = "file_magic"])
++_LT_DECL([], [want_nocaseglob], [1],
++    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+ ])# _LT_CHECK_MAGIC_METHOD
+ 
+ 
+@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility:
+ dnl AC_DEFUN([AM_PROG_NM], [])
+ dnl AC_DEFUN([AC_PROG_NM], [])
+ 
++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
++# --------------------------------
++# how to determine the name of the shared library
++# associated with a specific link library.
++#  -- PORTME fill in with the dynamic library characteristics
++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
++[m4_require([_LT_DECL_EGREP])
++m4_require([_LT_DECL_OBJDUMP])
++m4_require([_LT_DECL_DLLTOOL])
++AC_CACHE_CHECK([how to associate runtime and link libraries],
++lt_cv_sharedlib_from_linklib_cmd,
++[lt_cv_sharedlib_from_linklib_cmd='unknown'
++
++case $host_os in
++cygwin* | mingw* | pw32* | cegcc*)
++  # two different shell functions defined in ltmain.sh
++  # decide which to use based on capabilities of $DLLTOOL
++  case `$DLLTOOL --help 2>&1` in
++  *--identify-strict*)
++    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
++    ;;
++  *)
++    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
++    ;;
++  esac
++  ;;
++*)
++  # fallback: assume linklib IS sharedlib
++  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
++  ;;
++esac
++])
++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
++
++_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
++    [Command to associate shared and link libraries])
++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
++
++
++# _LT_PATH_MANIFEST_TOOL
++# ----------------------
++# locate the manifest tool
++m4_defun([_LT_PATH_MANIFEST_TOOL],
++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
++  [lt_cv_path_mainfest_tool=no
++  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
++  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
++  cat conftest.err >&AS_MESSAGE_LOG_FD
++  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
++    lt_cv_path_mainfest_tool=yes
++  fi
++  rm -f conftest*])
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
++  MANIFEST_TOOL=:
++fi
++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
++])# _LT_PATH_MANIFEST_TOOL
++
+ 
+ # LT_LIB_M
+ # --------
+@@ -3403,8 +3630,8 @@ esac
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ 
+ # Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+-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'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
++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'"
+ 
+ # Handle CRLF in mingw tool chain
+ opt_cr=
+@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do
+   else
+     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[    ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+   fi
++  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -3473,6 +3701,18 @@ _LT_EOF
+       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+        if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+          cat <<_LT_EOF > conftest.$ac_ext
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++   relocations are performed -- see ld's documentation on pseudo-relocs.  */
++# define LT@&t@_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data.  */
++# define LT@&t@_DLSYM_CONST
++#else
++# define LT@&t@_DLSYM_CONST const
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -3484,7 +3724,7 @@ _LT_EOF
+          cat <<_LT_EOF >> conftest.$ac_ext
+ 
+ /* The mapping between symbol names and symbols.  */
+-const struct {
++LT@&t@_DLSYM_CONST struct {
+   const char *name;
+   void       *address;
+ }
+@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() {
+ _LT_EOF
+          # Now try linking the two files.
+          mv conftest.$ac_objext conftstm.$ac_objext
+-         lt_save_LIBS="$LIBS"
+-         lt_save_CFLAGS="$CFLAGS"
++         lt_globsym_save_LIBS=$LIBS
++         lt_globsym_save_CFLAGS=$CFLAGS
+          LIBS="conftstm.$ac_objext"
+          CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+          if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+            pipe_works=yes
+          fi
+-         LIBS="$lt_save_LIBS"
+-         CFLAGS="$lt_save_CFLAGS"
++         LIBS=$lt_globsym_save_LIBS
++         CFLAGS=$lt_globsym_save_CFLAGS
+        else
+          echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+        fi
+@@ -3551,6 +3791,13 @@ else
+   AC_MSG_RESULT(ok)
+ fi
+ 
++# Response file support.
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++  nm_file_list_spec='@'
++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
++  nm_file_list_spec='@'
++fi
++
+ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+     [Take the output of nm and produce a listing of raw symbols and C names])
+ _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address],
+ _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+     [Transform the output of nm in a C name address pair when lib prefix is needed])
++_LT_DECL([], [nm_file_list_spec], [1],
++    [Specify filename containing input files for $NM])
+ ]) # _LT_CMD_GLOBAL_SYMBOLS
+ 
+ 
+@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ 
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
+ m4_if([$1], [CXX], [
+   # C++ specific cases for pic, static, wl, etc.
+   if test "$GXX" = yes; then
+@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [
+          ;;
+        esac
+        ;;
++      mingw* | cygwin* | os2* | pw32* | cegcc*)
++       # This hack is so that the source file can tell whether it is being
++       # built for inclusion in a dll (and should export symbols for example).
++       m4_if([$1], [GCJ], [],
++         [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++       ;;
+       dgux*)
+        case $cc_basename in
+          ec++*)
+@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [
+        ;;
+       solaris*)
+        case $cc_basename in
+-         CC*)
++         CC* | sunCC*)
+            # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+            _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+        ;;
++      nagfor*)
++       # NAG Fortran compiler
++       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
++       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++       ;;
+       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+         # Portland Group compilers (*not* the Pentium gcc compiler,
+        # which looks to be a dead project)
+@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       case $cc_basename in
+-      f77* | f90* | f95*)
++      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+       *)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+@@ -4172,9 +4432,11 @@ case $host_os in
+     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+     ;;
+ esac
+-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+-       [How to pass a linker flag through the compiler])
++
++AC_CACHE_CHECK([for $compiler option to produce PIC],
++  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
++  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+@@ -4193,6 +4455,8 @@ fi
+ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+        [Additional compiler flags for building library objects])
+ 
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
++       [How to pass a linker flag through the compiler])
+ #
+ # Check to make sure the static flag actually works.
+ #
+@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+ m4_defun([_LT_LINKER_SHLIBS],
+ [AC_REQUIRE([LT_PATH_LD])dnl
+ AC_REQUIRE([LT_PATH_NM])dnl
++m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_DECL_EGREP])dnl
+ m4_require([_LT_DECL_SED])dnl
+@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl
+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ m4_if([$1], [CXX], [
+   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+   case $host_os in
+   aix[[4-9]]*)
+     # If we're using GNU nm, then we don't want the "-C" option.
+@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [
+     ;;
+   pw32*)
+     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+-  ;;
++    ;;
+   cygwin* | mingw* | cegcc*)
+-    _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'
+-  ;;
++    case $cc_basename in
++    cl*) ;;
++    *)
++      _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'
++      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
++      ;;
++    esac
++    ;;
+   *)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
++    ;;
+   esac
+-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ], [
+   runpath_var=
+   _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -4411,7 +4682,8 @@ _LT_EOF
+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_TAGVAR(always_export_symbols, $1)=no
+       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _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'
++      _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'
++      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+ 
+       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+         _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'
+@@ -4459,7 +4731,7 @@ _LT_EOF
+       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+         && test "$tmp_diet" = no
+       then
+-       tmp_addflag=
++       tmp_addflag=' $pic_flag'
+        tmp_sharedflag='-shared'
+        case $cc_basename,$host_cpu in
+         pgcc*)                         # Portland Group C compiler
+@@ -4510,12 +4782,12 @@ _LT_EOF
+          _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+          _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+-         _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++         _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+          if test "x$supports_anon_versioning" = xyes; then
+            _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+-             $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++             $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+          fi
+          ;;
+        esac
+@@ -4529,8 +4801,8 @@ _LT_EOF
+        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+        wlarc=
+       else
+-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-       _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'
++       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++       _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'
+       fi
+       ;;
+ 
+@@ -4548,8 +4820,8 @@ _LT_EOF
+ 
+ _LT_EOF
+       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-       _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'
++       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++       _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'
+       else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -4595,8 +4867,8 @@ _LT_EOF
+ 
+     *)
+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-       _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'
++       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++       _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'
+       else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -4726,7 +4998,7 @@ _LT_EOF
+        _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+         # Determine the default libpath from the value encoded in an
+         # empty executable.
+-        _LT_SYS_MODULE_PATH_AIX
++        _LT_SYS_MODULE_PATH_AIX([$1])
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+         _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"
+       else
+@@ -4737,7 +5009,7 @@ _LT_EOF
+        else
+         # Determine the default libpath from the value encoded in an
+         # empty executable.
+-        _LT_SYS_MODULE_PATH_AIX
++        _LT_SYS_MODULE_PATH_AIX([$1])
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+          # Warning - without using the other run time loading flags,
+          # -berok will link without error, but may produce a broken library.
+@@ -4781,20 +5053,63 @@ _LT_EOF
+       # Microsoft Visual C++.
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext_cmds=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+-      # FIXME: Should let the user specify the lib program.
+-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      case $cc_basename in
++      cl*)
++       # Native MSVC
++       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++       _LT_TAGVAR(always_export_symbols, $1)=yes
++       _LT_TAGVAR(file_list_spec, $1)='@'
++       # Tell ltmain to make .lib files, not .a files.
++       libext=lib
++       # Tell ltmain to make .dll files, not .so files.
++       shrext_cmds=".dll"
++       # FIXME: Setting linknames here is a bad hack.
++       _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++       _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++           sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++         else
++           sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++         fi~
++         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++         linknames='
++       # The linker will not automatically build a static lib if we build a DLL.
++       # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++       _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'
++       # Don't use ranlib
++       _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
++       _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
++         lt_tool_outputfile="@TOOL_OUTPUT@"~
++         case $lt_outputfile in
++           *.exe|*.EXE) ;;
++           *)
++             lt_outputfile="$lt_outputfile.exe"
++             lt_tool_outputfile="$lt_tool_outputfile.exe"
++             ;;
++         esac~
++         if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++           $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++           $RM "$lt_outputfile.manifest";
++         fi'
++       ;;
++      *)
++       # Assume MSVC wrapper
++       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++       # Tell ltmain to make .lib files, not .a files.
++       libext=lib
++       # Tell ltmain to make .dll files, not .so files.
++       shrext_cmds=".dll"
++       # FIXME: Setting linknames here is a bad hack.
++       _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++       # The linker will automatically build a .lib file if we build a DLL.
++       _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++       # FIXME: Should let the user specify the lib program.
++       _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++       ;;
++      esac
+       ;;
+ 
+     darwin* | rhapsody*)
+@@ -4828,7 +5143,7 @@ _LT_EOF
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     freebsd* | dragonfly*)
+-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_TAGVAR(hardcode_direct, $1)=yes
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -4836,7 +5151,7 @@ _LT_EOF
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-       _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'
++       _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'
+       else
+        _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'
+       fi
+@@ -4852,7 +5167,7 @@ _LT_EOF
+ 
+     hpux10*)
+       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+       else
+        _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -4876,10 +5191,10 @@ _LT_EOF
+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        ia64*)
+-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        *)
+-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+          ;;
+        esac
+       else
+@@ -4926,16 +5241,31 @@ _LT_EOF
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-       _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'
++       _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'
+        # Try to use the -exported_symbol ld option, if it does not
+        # work, assume that -exports_file does not work either and
+        # implicitly export all symbols.
+-        save_LDFLAGS="$LDFLAGS"
+-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+-        AC_LINK_IFELSE(int foo(void) {},
+-          _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'
+-        )
+-        LDFLAGS="$save_LDFLAGS"
++       # This should be the same for all languages, so no per-tag cache variable.
++       AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
++         [lt_cv_irix_exported_symbol],
++         [save_LDFLAGS="$LDFLAGS"
++          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++          AC_LINK_IFELSE(
++            [AC_LANG_SOURCE(
++               [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
++                             [C++], [[int foo (void) { return 0; }]],
++                             [Fortran 77], [[
++      subroutine foo
++      end]],
++                             [Fortran], [[
++      subroutine foo
++      end]])])],
++             [lt_cv_irix_exported_symbol=yes],
++             [lt_cv_irix_exported_symbol=no])
++           LDFLAGS="$save_LDFLAGS"])
++       if test "$lt_cv_irix_exported_symbol" = yes; then
++          _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'
++       fi
+       else
+        _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'
+        _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'
+@@ -5020,7 +5350,7 @@ _LT_EOF
+     osf4* | osf5*)     # as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-       _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'
++       _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'
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       else
+        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+@@ -5039,9 +5369,9 @@ _LT_EOF
+       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+       if test "$GCC" = yes; then
+        wlarc='${wl}'
+-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-         $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++         $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'
+       else
+        case `$CC -V 2>&1` in
+        *"Compilers 5.0"*)
+@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
+     to runtime path list])
+ _LT_TAGDECL([], [link_all_deplibs], [0],
+     [Whether libtool must link a program against all its dependency libraries])
+-_LT_TAGDECL([], [fix_srcfile_path], [1],
+-    [Fix the shell variable $srcfile for the compiler])
+ _LT_TAGDECL([], [always_export_symbols], [0],
+     [Set to "yes" if exported symbols are required])
+ _LT_TAGDECL([], [export_symbols_cmds], [2],
+@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
+     [Symbols that must always be exported])
+ _LT_TAGDECL([], [prelink_cmds], [2],
+     [Commands necessary for linking programs (against libraries) with templates])
++_LT_TAGDECL([], [postlink_cmds], [2],
++    [Commands necessary for finishing linking programs])
+ _LT_TAGDECL([], [file_list_spec], [1],
+     [Specify filename containing input files])
+ dnl FIXME: Not yet implemented
+@@ -5426,6 +5756,7 @@ CC="$lt_save_CC"
+ m4_defun([_LT_LANG_CXX_CONFIG],
+ [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+     (test "X$CXX" != "Xg++"))) ; then
+@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+ 
+   # Allow CC to be a program name with arguments.
+   lt_save_CC=$CC
++  lt_save_CFLAGS=$CFLAGS
+   lt_save_LD=$LD
+   lt_save_GCC=$GCC
+   GCC=$GXX
+@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+   fi
+   test -z "${LDCXX+set}" || LD=$LDCXX
+   CC=${CXX-"c++"}
++  CFLAGS=$CXXFLAGS
+   compiler=$CC
+   _LT_TAGVAR(compiler, $1)=$CC
+   _LT_CC_BASENAME([$compiler])
+@@ -5525,8 +5858,8 @@ if test "$_lt_caught_CXX_error" != yes; then
+       # Check if GNU C++ uses GNU ld as the underlying linker, since the
+       # archiving commands below assume that GNU ld is being used.
+       if test "$with_gnu_ld" = yes; then
+-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-        _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'
++        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _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'
+ 
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+           # Determine the default libpath from the value encoded in an empty
+           # executable.
+-          _LT_SYS_MODULE_PATH_AIX
++          _LT_SYS_MODULE_PATH_AIX([$1])
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+           _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"
+@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+           else
+            # Determine the default libpath from the value encoded in an
+            # empty executable.
+-           _LT_SYS_MODULE_PATH_AIX
++           _LT_SYS_MODULE_PATH_AIX([$1])
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+            # Warning - without using the other run time loading flags,
+            # -berok will link without error, but may produce a broken library.
+@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then
+         ;;
+ 
+       cygwin* | mingw* | pw32* | cegcc*)
+-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-        # as there is no search path for DLLs.
+-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+-        _LT_TAGVAR(always_export_symbols, $1)=no
+-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-
+-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+-          _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'
+-          # If the export-symbols file already is a .def file (1st line
+-          # is EXPORTS), use it as is; otherwise, prepend...
+-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-           cp $export_symbols $output_objdir/$soname.def;
+-          else
+-           echo EXPORTS > $output_objdir/$soname.def;
+-           cat $export_symbols >> $output_objdir/$soname.def;
+-          fi~
+-          $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'
+-        else
+-          _LT_TAGVAR(ld_shlibs, $1)=no
+-        fi
+-        ;;
++       case $GXX,$cc_basename in
++       ,cl* | no,cl*)
++         # Native MSVC
++         # hardcode_libdir_flag_spec is actually meaningless, as there is
++         # no search path for DLLs.
++         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++         _LT_TAGVAR(always_export_symbols, $1)=yes
++         _LT_TAGVAR(file_list_spec, $1)='@'
++         # Tell ltmain to make .lib files, not .a files.
++         libext=lib
++         # Tell ltmain to make .dll files, not .so files.
++         shrext_cmds=".dll"
++         # FIXME: Setting linknames here is a bad hack.
++         _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++         _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++             $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++           else
++             $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++           fi~
++           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++           linknames='
++         # The linker will not automatically build a static lib if we build a DLL.
++         # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++         # Don't use ranlib
++         _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
++         _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
++           lt_tool_outputfile="@TOOL_OUTPUT@"~
++           case $lt_outputfile in
++             *.exe|*.EXE) ;;
++             *)
++               lt_outputfile="$lt_outputfile.exe"
++               lt_tool_outputfile="$lt_tool_outputfile.exe"
++               ;;
++           esac~
++           func_to_tool_file "$lt_outputfile"~
++           if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++             $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++             $RM "$lt_outputfile.manifest";
++           fi'
++         ;;
++       *)
++         # g++
++         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++         # as there is no search path for DLLs.
++         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
++         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++         _LT_TAGVAR(always_export_symbols, $1)=no
++         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++         if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++           _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'
++           # If the export-symbols file already is a .def file (1st line
++           # is EXPORTS), use it as is; otherwise, prepend...
++           _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++             cp $export_symbols $output_objdir/$soname.def;
++           else
++             echo EXPORTS > $output_objdir/$soname.def;
++             cat $export_symbols >> $output_objdir/$soname.def;
++           fi~
++           $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'
++         else
++           _LT_TAGVAR(ld_shlibs, $1)=no
++         fi
++         ;;
++       esac
++       ;;
+       darwin* | rhapsody*)
+         _LT_DARWIN_LINKER_FEATURES($1)
+        ;;
+@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+             ;;
+           *)
+             if test "$GXX" = yes; then
+-              _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'
++              _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'
+             else
+               # FIXME: insert proper C++ library support
+               _LT_TAGVAR(ld_shlibs, $1)=no
+@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+                    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                    ;;
+                  ia64*)
+-                   _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'
++                   _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'
+                    ;;
+                  *)
+-                   _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'
++                   _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'
+                    ;;
+                esac
+              fi
+@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then
+           *)
+            if test "$GXX" = yes; then
+              if test "$with_gnu_ld" = no; then
+-               _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'
++               _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'
+              else
+-               _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'
++               _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'
+              fi
+            fi
+            _LT_TAGVAR(link_all_deplibs, $1)=yes
+@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then
+              _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+-               compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+              _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+-               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+              _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+-               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+              _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+-               $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'
++               $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'
+              ;;
+            *) # Version 6 and above use weak symbols
+              _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+                  _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'
+                  ;;
+                *)
+-                 _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'
++                 _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'
+                  ;;
+              esac
+ 
+@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+ 
+       solaris*)
+         case $cc_basename in
+-          CC*)
++          CC* | sunCC*)
+            # Sun C++ 4.2, 5.x and Centerline C++
+             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+            _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then
+            if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+              _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+              if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++               _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'
+                _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-                 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++                 $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ 
+                # Commands to make compiler produce verbose output that lists
+                # what "hidden" libraries, object files and flags are used when
+@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+   fi # test -n "$compiler"
+ 
+   CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
+   LDCXX=$LD
+   LD=$lt_save_LD
+   GCC=$lt_save_GCC
+@@ -6445,6 +6825,29 @@ AC_LANG_POP
+ ])# _LT_LANG_CXX_CONFIG
+ 
+ 
++# _LT_FUNC_STRIPNAME_CNF
++# ----------------------
++# func_stripname_cnf prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++#
++# This function is identical to the (non-XSI) version of func_stripname,
++# except this one can be used by m4 code that may be executed by configure,
++# rather than the libtool script.
++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
++AC_REQUIRE([_LT_DECL_SED])
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
++func_stripname_cnf ()
++{
++  case ${2} in
++  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++  esac
++} # func_stripname_cnf
++])# _LT_FUNC_STRIPNAME_CNF
++
+ # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+ # ---------------------------------
+ # Figure out "hidden" library dependencies from verbose
+@@ -6453,6 +6856,7 @@ AC_LANG_POP
+ # objects, libraries and library flags.
+ m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+ [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+ # Dependencies to place before and after the object being linked:
+ _LT_TAGVAR(predep_objects, $1)=
+ _LT_TAGVAR(postdep_objects, $1)=
+@@ -6503,6 +6907,13 @@ public class foo {
+ };
+ _LT_EOF
+ ])
++
++_lt_libdeps_save_CFLAGS=$CFLAGS
++case "$CC $CFLAGS " in #(
++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++esac
++
+ dnl Parse the compiler output and extract the necessary
+ dnl objects, libraries and library flags.
+ if AC_TRY_EVAL(ac_compile); then
+@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then
+   pre_test_object_deps_done=no
+ 
+   for p in `eval "$output_verbose_link_cmd"`; do
+-    case $p in
++    case ${prev}${p} in
+ 
+     -L* | -R* | -l*)
+        # Some compilers place space between "-{L,R}" and the path.
+@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then
+           test $p = "-R"; then
+         prev=$p
+         continue
+-       else
+-        prev=
+        fi
+ 
++       # Expand the sysroot to ease extracting the directories later.
++       if test -z "$prev"; then
++         case $p in
++         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
++         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
++         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
++         esac
++       fi
++       case $p in
++       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
++       esac
+        if test "$pre_test_object_deps_done" = no; then
+-        case $p in
+-        -L* | -R*)
++        case ${prev} in
++        -L | -R)
+           # Internal compiler library paths should come after those
+           # provided the user.  The postdeps already come after the
+           # user supplied libs so there is no need to process them.
+@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then
+           _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+         fi
+        fi
++       prev=
+        ;;
+ 
++    *.lto.$objext) ;; # Ignore GCC LTO objects
+     *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+@@ -6586,6 +7008,7 @@ else
+ fi
+ 
+ $RM -f confest.$objext
++CFLAGS=$_lt_libdeps_save_CFLAGS
+ 
+ # PORTME: override above test on systems where it is broken
+ m4_if([$1], [CXX],
+@@ -6622,7 +7045,7 @@ linux*)
+ 
+ solaris*)
+   case $cc_basename in
+-  CC*)
++  CC* | sunCC*)
+     # The more standards-conforming stlport4 library is
+     # incompatible with the Cstd library. Avoid specifying
+     # it if it's in CXXFLAGS. Ignore libCrun as
+@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then
+   # Allow CC to be a program name with arguments.
+   lt_save_CC="$CC"
+   lt_save_GCC=$GCC
++  lt_save_CFLAGS=$CFLAGS
+   CC=${F77-"f77"}
++  CFLAGS=$FFLAGS
+   compiler=$CC
+   _LT_TAGVAR(compiler, $1)=$CC
+   _LT_CC_BASENAME([$compiler])
+@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then
+ 
+   GCC=$lt_save_GCC
+   CC="$lt_save_CC"
++  CFLAGS="$lt_save_CFLAGS"
+ fi # test "$_lt_disable_F77" != yes
+ 
+ AC_LANG_POP
+@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then
+   # Allow CC to be a program name with arguments.
+   lt_save_CC="$CC"
+   lt_save_GCC=$GCC
++  lt_save_CFLAGS=$CFLAGS
+   CC=${FC-"f95"}
++  CFLAGS=$FCFLAGS
+   compiler=$CC
+   GCC=$ac_cv_fc_compiler_gnu
+ 
+@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then
+   fi # test -n "$compiler"
+ 
+   GCC=$lt_save_GCC
+-  CC="$lt_save_CC"
++  CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
+ fi # test "$_lt_disable_FC" != yes
+ 
+ AC_LANG_POP
+@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE
+ _LT_LINKER_BOILERPLATE
+ 
+ # Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
++lt_save_CC=$CC
++lt_save_CFLAGS=$CFLAGS
+ lt_save_GCC=$GCC
+ GCC=yes
+ CC=${GCJ-"gcj"}
++CFLAGS=$GCJFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_TAGVAR(LD, $1)="$LD"
+@@ -6992,7 +7423,8 @@ fi
+ AC_LANG_RESTORE
+ 
+ GCC=$lt_save_GCC
+-CC="$lt_save_CC"
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
+ ])# _LT_LANG_GCJ_CONFIG
+ 
+ 
+@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
++lt_save_CFLAGS=$CFLAGS
+ lt_save_GCC=$GCC
+ GCC=
+ CC=${RC-"windres"}
++CFLAGS=
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+@@ -7042,7 +7476,8 @@ fi
+ 
+ GCC=$lt_save_GCC
+ AC_LANG_RESTORE
+-CC="$lt_save_CC"
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
+ ])# _LT_LANG_RC_CONFIG
+ 
+ 
+@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+ AC_SUBST([OBJDUMP])
+ ])
+ 
++# _LT_DECL_DLLTOOL
++# ----------------
++# Ensure DLLTOOL variable is set.
++m4_defun([_LT_DECL_DLLTOOL],
++[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
++AC_SUBST([DLLTOOL])
++])
+ 
+ # _LT_DECL_SED
+ # ------------
+@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
+ # Try some XSI features
+ xsi_shell=no
+ ( _lt_dummy="a/b/c"
+-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+-      = c,a/b,, \
++  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
++      = c,a/b,b/c, \
+     && eval 'test $(( 1 + 1 )) -eq 2 \
+     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+   && xsi_shell=yes
+@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+ ])# _LT_CHECK_SHELL_FEATURES
+ 
+ 
+-# _LT_PROG_XSI_SHELLFNS
+-# ---------------------
+-# Bourne and XSI compatible variants of some useful shell functions.
+-m4_defun([_LT_PROG_XSI_SHELLFNS],
+-[case $xsi_shell in
+-  yes)
+-    cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+-  case ${1} in
+-    */*) func_dirname_result="${1%/*}${2}" ;;
+-    *  ) func_dirname_result="${3}" ;;
+-  esac
+-}
+-
+-# func_basename file
+-func_basename ()
+-{
+-  func_basename_result="${1##*/}"
+-}
+-
+-# func_dirname_and_basename file append nondir_replacement
+-# perform func_basename and func_dirname in a single function
+-# call:
+-#   dirname:  Compute the dirname of FILE.  If nonempty,
+-#             add APPEND to the result, otherwise set result
+-#             to NONDIR_REPLACEMENT.
+-#             value returned in "$func_dirname_result"
+-#   basename: Compute filename of FILE.
+-#             value retuned in "$func_basename_result"
+-# Implementation must be kept synchronized with func_dirname
+-# and func_basename. For efficiency, we do not delegate to
+-# those functions but instead duplicate the functionality here.
+-func_dirname_and_basename ()
+-{
+-  case ${1} in
+-    */*) func_dirname_result="${1%/*}${2}" ;;
+-    *  ) func_dirname_result="${3}" ;;
+-  esac
+-  func_basename_result="${1##*/}"
+-}
+-
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-func_stripname ()
+-{
+-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+-  # positional parameters, so assign one to ordinary parameter first.
+-  func_stripname_result=${3}
+-  func_stripname_result=${func_stripname_result#"${1}"}
+-  func_stripname_result=${func_stripname_result%"${2}"}
+-}
+-
+-# func_opt_split
+-func_opt_split ()
+-{
+-  func_opt_split_opt=${1%%=*}
+-  func_opt_split_arg=${1#*=}
+-}
+-
+-# func_lo2o object
+-func_lo2o ()
+-{
+-  case ${1} in
+-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+-    *)    func_lo2o_result=${1} ;;
+-  esac
+-}
+-
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+-  func_xform_result=${1%.*}.lo
+-}
+-
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+-  func_arith_result=$(( $[*] ))
+-}
+-
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+-  func_len_result=${#1}
+-}
++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
++# ------------------------------------------------------
++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
++m4_defun([_LT_PROG_FUNCTION_REPLACE],
++[dnl {
++sed -e '/^$1 ()$/,/^} # $1 /c\
++$1 ()\
++{\
++m4_bpatsubsts([$2], [$], [\\], [^\([    ]\)], [\\\1])
++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
++  && mv -f "$cfgfile.tmp" "$cfgfile" \
++    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++])
+ 
+-_LT_EOF
+-    ;;
+-  *) # Bourne compatible functions.
+-    cat << \_LT_EOF >> "$cfgfile"
+ 
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+-  # Extract subdirectory from the argument.
+-  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+-  if test "X$func_dirname_result" = "X${1}"; then
+-    func_dirname_result="${3}"
+-  else
+-    func_dirname_result="$func_dirname_result${2}"
+-  fi
+-}
++# _LT_PROG_REPLACE_SHELLFNS
++# -------------------------
++# Replace existing portable implementations of several shell functions with
++# equivalent extended shell implementations where those features are available..
++m4_defun([_LT_PROG_REPLACE_SHELLFNS],
++[if test x"$xsi_shell" = xyes; then
++  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
++    case ${1} in
++      */*) func_dirname_result="${1%/*}${2}" ;;
++      *  ) func_dirname_result="${3}" ;;
++    esac])
++
++  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
++    func_basename_result="${1##*/}"])
++
++  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
++    case ${1} in
++      */*) func_dirname_result="${1%/*}${2}" ;;
++      *  ) func_dirname_result="${3}" ;;
++    esac
++    func_basename_result="${1##*/}"])
+ 
+-# func_basename file
+-func_basename ()
+-{
+-  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+-}
++  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
++    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++    # positional parameters, so assign one to ordinary parameter first.
++    func_stripname_result=${3}
++    func_stripname_result=${func_stripname_result#"${1}"}
++    func_stripname_result=${func_stripname_result%"${2}"}])
+ 
+-dnl func_dirname_and_basename
+-dnl A portable version of this function is already defined in general.m4sh
+-dnl so there is no need for it here.
++  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
++    func_split_long_opt_name=${1%%=*}
++    func_split_long_opt_arg=${1#*=}])
+ 
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-# func_strip_suffix prefix name
+-func_stripname ()
+-{
+-  case ${2} in
+-    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+-    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+-  esac
+-}
++  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
++    func_split_short_opt_arg=${1#??}
++    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+ 
+-# sed scripts:
+-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+-my_sed_long_arg='1s/^-[[^=]]*=//'
++  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
++    case ${1} in
++      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++      *)    func_lo2o_result=${1} ;;
++    esac])
+ 
+-# func_opt_split
+-func_opt_split ()
+-{
+-  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+-  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
+-}
++  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+ 
+-# func_lo2o object
+-func_lo2o ()
+-{
+-  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+-}
++  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+ 
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+-  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
+-}
++  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
++fi
+ 
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+-  func_arith_result=`expr "$[@]"`
+-}
++if test x"$lt_shell_append" = xyes; then
++  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+ 
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+-}
++  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
++    func_quote_for_eval "${2}"
++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
++    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+ 
+-_LT_EOF
+-esac
++  # Save a `func_append' function call where possible by direct use of '+='
++  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
++    && mv -f "$cfgfile.tmp" "$cfgfile" \
++      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++  test 0 -eq $? || _lt_function_replace_fail=:
++else
++  # Save a `func_append' function call even when '+=' is not available
++  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
++    && mv -f "$cfgfile.tmp" "$cfgfile" \
++      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++  test 0 -eq $? || _lt_function_replace_fail=:
++fi
+ 
+-case $lt_shell_append in
+-  yes)
+-    cat << \_LT_EOF >> "$cfgfile"
++if test x"$_lt_function_replace_fail" = x":"; then
++  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
++fi
++])
+ 
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+-  eval "$[1]+=\$[2]"
+-}
+-_LT_EOF
++# _LT_PATH_CONVERSION_FUNCTIONS
++# -----------------------------
++# Determine which file name conversion functions should be used by
++# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
++# for certain cross-compile configurations and native mingw.
++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_MSG_CHECKING([how to convert $build file names to $host format])
++AC_CACHE_VAL(lt_cv_to_host_file_cmd,
++[case $host in
++  *-*-mingw* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
++        ;;
++      *-*-cygwin* )
++        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
++        ;;
++      * ) # otherwise, assume *nix
++        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
++        ;;
++    esac
+     ;;
+-  *)
+-    cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+-  eval "$[1]=\$$[1]\$[2]"
+-}
+-
+-_LT_EOF
++  *-*-cygwin* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
++        ;;
++      *-*-cygwin* )
++        lt_cv_to_host_file_cmd=func_convert_file_noop
++        ;;
++      * ) # otherwise, assume *nix
++        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
++        ;;
++    esac
+     ;;
+-  esac
++  * ) # unhandled hosts (and "normal" native builds)
++    lt_cv_to_host_file_cmd=func_convert_file_noop
++    ;;
++esac
++])
++to_host_file_cmd=$lt_cv_to_host_file_cmd
++AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
++         [0], [convert $build file names to $host format])dnl
++
++AC_MSG_CHECKING([how to convert $build file names to toolchain format])
++AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
++[#assume ordinary cross tools, or native build.
++lt_cv_to_tool_file_cmd=func_convert_file_noop
++case $host in
++  *-*-mingw* )
++    case $build in
++      *-*-mingw* ) # actually msys
++        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
++        ;;
++    esac
++    ;;
++esac
+ ])
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
++         [0], [convert $build files to toolchain format])dnl
++])# _LT_PATH_CONVERSION_FUNCTIONS
+diff --git a/ltmain.sh b/ltmain.sh
+index 9503ec8..70e856e 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -1,10 +1,9 @@
+-# Generated from ltmain.m4sh.
+ 
+-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
++# libtool (GNU libtool) 2.4
+ # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+-# 2007, 2008, 2009 Free Software Foundation, Inc.
++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ # This is free software; see the source for copying conditions.  There is NO
+ # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+@@ -38,7 +37,6 @@
+ #   -n, --dry-run            display commands without modifying any files
+ #       --features           display basic configuration information and exit
+ #       --mode=MODE          use operation mode MODE
+-#       --no-finish          let install mode avoid finish commands
+ #       --preserve-dup-deps  don't remove duplicate dependency libraries
+ #       --quiet, --silent    don't print informational messages
+ #       --no-quiet, --no-silent
+@@ -71,17 +69,19 @@
+ #         compiler:            $LTCC
+ #         compiler flags:              $LTCFLAGS
+ #         linker:              $LD (gnu? $with_gnu_ld)
+-#         $progname:   (GNU libtool 1.3134 2009-11-29) 2.2.7a
++#         $progname:   (GNU libtool) 2.4
+ #         automake:    $automake_version
+ #         autoconf:    $autoconf_version
+ #
+ # Report bugs to <bug-libtool@gnu.org>.
++# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
++# General help using GNU software: <http://www.gnu.org/gethelp/>.
+ 
+ PROGRAM=libtool
+ PACKAGE=libtool
+-VERSION=2.2.7a
+-TIMESTAMP=" 1.3134 2009-11-29"
+-package_revision=1.3134
++VERSION=2.4
++TIMESTAMP=""
++package_revision=1.3293
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -106,9 +106,6 @@ _LTECHO_EOF'
+ }
+ 
+ # NLS nuisances: We save the old values to restore during execute mode.
+-# Only set LANG and LC_ALL to C if already set.
+-# These must not be set unconditionally because not all systems understand
+-# e.g. LANG=C (notably SCO).
+ lt_user_locale=
+ lt_safe_locale=
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+@@ -121,15 +118,13 @@ do
+          lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+        fi"
+ done
++LC_ALL=C
++LANGUAGE=C
++export LANGUAGE LC_ALL
+ 
+ $lt_unset CDPATH
+ 
+ 
+-
+-
+-
+-
+-
+ # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+ # is ksh but when the shell is invoked as "sh" and the current value of
+ # the _XPG environment variable is not equal to 1 (one), the special
+@@ -140,7 +135,7 @@ progpath="$0"
+ 
+ 
+ : ${CP="cp -f"}
+-: ${ECHO=$as_echo}
++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+ : ${EGREP="/bin/grep -E"}
+ : ${FGREP="/bin/grep -F"}
+ : ${GREP="/bin/grep"}
+@@ -149,7 +144,7 @@ progpath="$0"
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
++: ${SED="/bin/sed"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+ : ${Xsed="$SED -e 1s/^X//"}
+ 
+@@ -169,6 +164,27 @@ IFS="      $lt_nl"
+ dirname="s,/[^/]*$,,"
+ basename="s,^.*/,,"
+ 
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
++    if test "X$func_dirname_result" = "X${1}"; then
++      func_dirname_result="${3}"
++    else
++      func_dirname_result="$func_dirname_result${2}"
++    fi
++} # func_dirname may be replaced by extended shell implementation
++
++
++# func_basename file
++func_basename ()
++{
++    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++} # func_basename may be replaced by extended shell implementation
++
++
+ # func_dirname_and_basename file append nondir_replacement
+ # perform func_basename and func_dirname in a single function
+ # call:
+@@ -183,17 +199,31 @@ basename="s,^.*/,,"
+ # those functions but instead duplicate the functionality here.
+ func_dirname_and_basename ()
+ {
+-  # Extract subdirectory from the argument.
+-  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+-  if test "X$func_dirname_result" = "X${1}"; then
+-    func_dirname_result="${3}"
+-  else
+-    func_dirname_result="$func_dirname_result${2}"
+-  fi
+-  func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+-}
++    # Extract subdirectory from the argument.
++    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
++    if test "X$func_dirname_result" = "X${1}"; then
++      func_dirname_result="${3}"
++    else
++      func_dirname_result="$func_dirname_result${2}"
++    fi
++    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
++} # func_dirname_and_basename may be replaced by extended shell implementation
++
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++    case ${2} in
++      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++    esac
++} # func_stripname may be replaced by extended shell implementation
+ 
+-# Generated shell functions inserted here.
+ 
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ pathcar='s,^/\([^/]*\).*$,\1,'
+@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+ # Same as above, but do not quote variable references.
+ double_quote_subst='s/\(["`\\]\)/\\\1/g'
+ 
++# Sed substitution that turns a string into a regex matching for the
++# string literally.
++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
++
++# Sed substitution that converts a w32 file name or path
++# which contains forward slashes, into one that contains
++# (escaped) backslashes.  A very naive implementation.
++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++
+ # Re-`\' parameter expansions in output of double_quote_subst that were
+ # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+ # in input to double_quote_subst, that '$' was protected from expansion.
+@@ -404,7 +443,7 @@ opt_warning=:
+ # name if it has been set yet.
+ func_echo ()
+ {
+-    $ECHO "$progname${mode+: }$mode: $*"
++    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+ }
+ 
+ # func_verbose arg...
+@@ -430,14 +469,14 @@ func_echo_all ()
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
++    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ }
+ 
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
++    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ 
+     # bash bug again:
+     :
+@@ -656,19 +695,35 @@ func_show_eval_locale ()
+     fi
+ }
+ 
+-
+-
++# func_tr_sh
++# Turn $1 into a string suitable for a shell variable name.
++# Result is stored in $func_tr_sh_result.  All characters
++# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
++# if $1 begins with a digit, a '_' is prepended as well.
++func_tr_sh ()
++{
++  case $1 in
++  [0-9]* | *[!a-zA-Z0-9_]*)
++    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
++    ;;
++  * )
++    func_tr_sh_result=$1
++    ;;
++  esac
++}
+ 
+ 
+ # func_version
+ # Echo version message to standard output and exit.
+ func_version ()
+ {
++    $opt_debug
++
+     $SED -n '/(C)/!b go
+        :more
+        /\./!{
+          N
+-         s/\n# //
++         s/\n# / /
+          b more
+        }
+        :go
+@@ -685,7 +740,9 @@ func_version ()
+ # Echo short help message to standard output and exit.
+ func_usage ()
+ {
+-    $SED -n '/^# Usage:/,/^#  *-h/ {
++    $opt_debug
++
++    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+         s/^# //
+        s/^# *$//
+        s/\$progname/'$progname'/
+@@ -701,7 +758,10 @@ func_usage ()
+ # unless 'noexit' is passed as argument.
+ func_help ()
+ {
++    $opt_debug
++
+     $SED -n '/^# Usage:/,/# Report bugs to/ {
++       :print
+         s/^# //
+        s/^# *$//
+        s*\$progname*'$progname'*
+@@ -714,7 +774,11 @@ func_help ()
+        s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+        s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+        p
+-     }' < "$progpath"
++       d
++     }
++     /^# .* home page:/b print
++     /^# General help using/b print
++     ' < "$progpath"
+     ret=$?
+     if test -z "$1"; then
+       exit $ret
+@@ -726,12 +790,39 @@ func_help ()
+ # exit_cmd.
+ func_missing_arg ()
+ {
+-    func_error "missing argument for $1"
++    $opt_debug
++
++    func_error "missing argument for $1."
+     exit_cmd=exit
+ }
+ 
+-exit_cmd=:
+ 
++# func_split_short_opt shortopt
++# Set func_split_short_opt_name and func_split_short_opt_arg shell
++# variables after splitting SHORTOPT after the 2nd character.
++func_split_short_opt ()
++{
++    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
++    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
++
++    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
++    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
++} # func_split_short_opt may be replaced by extended shell implementation
++
++
++# func_split_long_opt longopt
++# Set func_split_long_opt_name and func_split_long_opt_arg shell
++# variables after splitting LONGOPT at the `=' sign.
++func_split_long_opt ()
++{
++    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
++    my_sed_long_arg='1s/^--[^=]*=//'
++
++    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
++    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
++} # func_split_long_opt may be replaced by extended shell implementation
++
++exit_cmd=:
+ 
+ 
+ 
+@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
+ magic_exe="%%%MAGIC EXE variable%%%"
+ 
+ # Global variables.
+-# $mode is unset
+ nonopt=
+-execute_dlfiles=
+ preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ extracted_archives=
+ extracted_serial=0
+ 
+-opt_dry_run=false
+-opt_finish=:
+-opt_duplicate_deps=false
+-opt_silent=false
+-opt_debug=:
+-
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+ exec_cmd=
+ 
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++    eval "${1}=\$${1}\${2}"
++} # func_append may be replaced by extended shell implementation
++
++# func_append_quoted var value
++# Quote VALUE and append to the end of shell variable VAR, separated
++# by a space.
++func_append_quoted ()
++{
++    func_quote_for_eval "${2}"
++    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
++} # func_append_quoted may be replaced by extended shell implementation
++
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++    func_arith_result=`expr "${@}"`
++} # func_arith may be replaced by extended shell implementation
++
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
++} # func_len may be replaced by extended shell implementation
++
++
++# func_lo2o object
++func_lo2o ()
++{
++    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++} # func_lo2o may be replaced by extended shell implementation
++
++
++# func_xform libobj-or-source
++func_xform ()
++{
++    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
++} # func_xform may be replaced by extended shell implementation
++
++
+ # func_fatal_configuration arg...
+ # Echo program name prefixed message to standard error, followed by
+ # a configuration failure hint, and exit.
+@@ -850,130 +979,204 @@ func_enable_tag ()
+   esac
+ }
+ 
+-# Parse options once, thoroughly.  This comes as soon as possible in
+-# the script to make things like `libtool --version' happen quickly.
++# func_check_version_match
++# Ensure that we are using m4 macros, and libtool script from the same
++# release of libtool.
++func_check_version_match ()
+ {
++  if test "$package_revision" != "$macro_revision"; then
++    if test "$VERSION" != "$macro_version"; then
++      if test -z "$macro_version"; then
++        cat >&2 <<_LT_EOF
++$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
++$progname: definition of this LT_INIT comes from an older release.
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
++$progname: and run autoconf again.
++_LT_EOF
++      else
++        cat >&2 <<_LT_EOF
++$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
++$progname: and run autoconf again.
++_LT_EOF
++      fi
++    else
++      cat >&2 <<_LT_EOF
++$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
++$progname: but the definition of this LT_INIT comes from revision $macro_revision.
++$progname: You should recreate aclocal.m4 with macros from revision $package_revision
++$progname: of $PACKAGE $VERSION and run autoconf again.
++_LT_EOF
++    fi
+ 
+-  # Shorthand for --mode=foo, only valid as the first argument
+-  case $1 in
+-  clean|clea|cle|cl)
+-    shift; set dummy --mode clean ${1+"$@"}; shift
+-    ;;
+-  compile|compil|compi|comp|com|co|c)
+-    shift; set dummy --mode compile ${1+"$@"}; shift
+-    ;;
+-  execute|execut|execu|exec|exe|ex|e)
+-    shift; set dummy --mode execute ${1+"$@"}; shift
+-    ;;
+-  finish|finis|fini|fin|fi|f)
+-    shift; set dummy --mode finish ${1+"$@"}; shift
+-    ;;
+-  install|instal|insta|inst|ins|in|i)
+-    shift; set dummy --mode install ${1+"$@"}; shift
+-    ;;
+-  link|lin|li|l)
+-    shift; set dummy --mode link ${1+"$@"}; shift
+-    ;;
+-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+-    shift; set dummy --mode uninstall ${1+"$@"}; shift
+-    ;;
+-  esac
++    exit $EXIT_MISMATCH
++  fi
++}
++
++
++# Shorthand for --mode=foo, only valid as the first argument
++case $1 in
++clean|clea|cle|cl)
++  shift; set dummy --mode clean ${1+"$@"}; shift
++  ;;
++compile|compil|compi|comp|com|co|c)
++  shift; set dummy --mode compile ${1+"$@"}; shift
++  ;;
++execute|execut|execu|exec|exe|ex|e)
++  shift; set dummy --mode execute ${1+"$@"}; shift
++  ;;
++finish|finis|fini|fin|fi|f)
++  shift; set dummy --mode finish ${1+"$@"}; shift
++  ;;
++install|instal|insta|inst|ins|in|i)
++  shift; set dummy --mode install ${1+"$@"}; shift
++  ;;
++link|lin|li|l)
++  shift; set dummy --mode link ${1+"$@"}; shift
++  ;;
++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
++  shift; set dummy --mode uninstall ${1+"$@"}; shift
++  ;;
++esac
+ 
+-  # Parse non-mode specific arguments:
+-  while test "$#" -gt 0; do
++
++
++# Option defaults:
++opt_debug=:
++opt_dry_run=false
++opt_config=false
++opt_preserve_dup_deps=false
++opt_features=false
++opt_finish=false
++opt_help=false
++opt_help_all=false
++opt_silent=:
++opt_verbose=:
++opt_silent=false
++opt_verbose=false
++
++
++# Parse options once, thoroughly.  This comes as soon as possible in the
++# script to make things like `--version' happen as quickly as we can.
++{
++  # this just eases exit handling
++  while test $# -gt 0; do
+     opt="$1"
+     shift
+-
+     case $opt in
+-      --config)                func_config                                     ;;
+-
+-      --debug)         preserve_args="$preserve_args $opt"
++      --debug|-x)      opt_debug='set -x'
+                        func_echo "enabling shell trace mode"
+-                       opt_debug='set -x'
+                        $opt_debug
+                        ;;
+-
+-      -dlopen)         test "$#" -eq 0 && func_missing_arg "$opt" && break
+-                       execute_dlfiles="$execute_dlfiles $1"
+-                       shift
++      --dry-run|--dryrun|-n)
++                       opt_dry_run=:
+                        ;;
+-
+-      --dry-run | -n)  opt_dry_run=:                                   ;;
+-      --features)       func_features                                  ;;
+-      --finish)                mode="finish"                                   ;;
+-      --no-finish)     opt_finish=false                                ;;
+-
+-      --mode)          test "$#" -eq 0 && func_missing_arg "$opt" && break
+-                       case $1 in
+-                         # Valid mode arguments:
+-                         clean)        ;;
+-                         compile)      ;;
+-                         execute)      ;;
+-                         finish)       ;;
+-                         install)      ;;
+-                         link)         ;;
+-                         relink)       ;;
+-                         uninstall)    ;;
+-
+-                         # Catch anything else as an error
+-                         *) func_error "invalid argument for $opt"
+-                            exit_cmd=exit
+-                            break
+-                            ;;
+-                       esac
+-
+-                       mode="$1"
++      --config)
++                       opt_config=:
++func_config
++                       ;;
++      --dlopen|-dlopen)
++                       optarg="$1"
++                       opt_dlopen="${opt_dlopen+$opt_dlopen
++}$optarg"
+                        shift
+                        ;;
+-
+       --preserve-dup-deps)
+-                       opt_duplicate_deps=:                            ;;
+-
+-      --quiet|--silent)        preserve_args="$preserve_args $opt"
+-                       opt_silent=:
+-                       opt_verbose=false
++                       opt_preserve_dup_deps=:
+                        ;;
+-
+-      --no-quiet|--no-silent)
+-                       preserve_args="$preserve_args $opt"
+-                       opt_silent=false
++      --features)
++                       opt_features=:
++func_features
+                        ;;
+-
+-      --verbose| -v)   preserve_args="$preserve_args $opt"
++      --finish)
++                       opt_finish=:
++set dummy --mode finish ${1+"$@"}; shift
++                       ;;
++      --help)
++                       opt_help=:
++                       ;;
++      --help-all)
++                       opt_help_all=:
++opt_help=': help-all'
++                       ;;
++      --mode)
++                       test $# = 0 && func_missing_arg $opt && break
++                       optarg="$1"
++                       opt_mode="$optarg"
++case $optarg in
++  # Valid mode arguments:
++  clean|compile|execute|finish|install|link|relink|uninstall) ;;
++
++  # Catch anything else as an error
++  *) func_error "invalid argument for $opt"
++     exit_cmd=exit
++     break
++     ;;
++esac
++                       shift
++                       ;;
++      --no-silent|--no-quiet)
+                        opt_silent=false
+-                       opt_verbose=:
++func_append preserve_args " $opt"
+                        ;;
+-
+-      --no-verbose)    preserve_args="$preserve_args $opt"
++      --no-verbose)
+                        opt_verbose=false
++func_append preserve_args " $opt"
+                        ;;
+-
+-      --tag)           test "$#" -eq 0 && func_missing_arg "$opt" && break
+-                       preserve_args="$preserve_args $opt $1"
+-                       func_enable_tag "$1"    # tagname is set here
++      --silent|--quiet)
++                       opt_silent=:
++func_append preserve_args " $opt"
++        opt_verbose=false
++                       ;;
++      --verbose|-v)
++                       opt_verbose=:
++func_append preserve_args " $opt"
++opt_silent=false
++                       ;;
++      --tag)
++                       test $# = 0 && func_missing_arg $opt && break
++                       optarg="$1"
++                       opt_tag="$optarg"
++func_append preserve_args " $opt $optarg"
++func_enable_tag "$optarg"
+                        shift
+                        ;;
+ 
++      -\?|-h)          func_usage                              ;;
++      --help)          func_help                               ;;
++      --version)       func_version                            ;;
++
+       # Separate optargs to long options:
+-      -dlopen=*|--mode=*|--tag=*)
+-                       func_opt_split "$opt"
+-                       set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
++      --*=*)
++                       func_split_long_opt "$opt"
++                       set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+                        shift
+                        ;;
+ 
+-      -\?|-h)          func_usage                                      ;;
+-      --help)          opt_help=:                                      ;;
+-      --help-all)      opt_help=': help-all'                           ;;
+-      --version)       func_version                                    ;;
+-
+-      -*)              func_fatal_help "unrecognized option \`$opt'"   ;;
+-
+-      *)               nonopt="$opt"
+-                       break
++      # Separate non-argument short options:
++      -\?*|-h*|-n*|-v*)
++                       func_split_short_opt "$opt"
++                       set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
++                       shift
+                        ;;
++
++      --)              break                                   ;;
++      -*)              func_fatal_help "unrecognized option \`$opt'" ;;
++      *)               set dummy "$opt" ${1+"$@"};     shift; break  ;;
+     esac
+   done
+ 
++  # Validate options:
++
++  # save first non-option argument
++  if test "$#" -gt 0; then
++    nonopt="$opt"
++    shift
++  fi
++
++  # preserve --debug
++  test "$opt_debug" = : || func_append preserve_args " --debug"
+ 
+   case $host in
+     *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
+@@ -981,82 +1184,44 @@ func_enable_tag ()
+       opt_duplicate_compiler_generated_deps=:
+       ;;
+     *)
+-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
++      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+       ;;
+   esac
+ 
+-  # Having warned about all mis-specified options, bail out if
+-  # anything was wrong.
+-  $exit_cmd $EXIT_FAILURE
+-}
++  $opt_help || {
++    # Sanity checks first:
++    func_check_version_match
+ 
+-# func_check_version_match
+-# Ensure that we are using m4 macros, and libtool script from the same
+-# release of libtool.
+-func_check_version_match ()
+-{
+-  if test "$package_revision" != "$macro_revision"; then
+-    if test "$VERSION" != "$macro_version"; then
+-      if test -z "$macro_version"; then
+-        cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from an older release.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+-      else
+-        cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+-      fi
+-    else
+-      cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+-$progname: of $PACKAGE $VERSION and run autoconf again.
+-_LT_EOF
++    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++      func_fatal_configuration "not configured to build any kind of library"
+     fi
+ 
+-    exit $EXIT_MISMATCH
+-  fi
+-}
+-
++    # Darwin sucks
++    eval std_shrext=\"$shrext_cmds\"
+ 
+-## ----------- ##
+-##    Main.    ##
+-## ----------- ##
+-
+-$opt_help || {
+-  # Sanity checks first:
+-  func_check_version_match
+-
+-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+-    func_fatal_configuration "not configured to build any kind of library"
+-  fi
++    # Only execute mode is allowed to have -dlopen flags.
++    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
++      func_error "unrecognized option \`-dlopen'"
++      $ECHO "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
+ 
+-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
++    # Change the help message to a mode-specific one.
++    generic_help="$help"
++    help="Try \`$progname --help --mode=$opt_mode' for more information."
++  }
+ 
+ 
+-  # Darwin sucks
+-  eval "std_shrext=\"$shrext_cmds\""
++  # Bail if the options were screwed
++  $exit_cmd $EXIT_FAILURE
++}
+ 
+ 
+-  # Only execute mode is allowed to have -dlopen flags.
+-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+-    func_error "unrecognized option \`-dlopen'"
+-    $ECHO "$help" 1>&2
+-    exit $EXIT_FAILURE
+-  fi
+ 
+-  # Change the help message to a mode-specific one.
+-  generic_help="$help"
+-  help="Try \`$progname --help --mode=$mode' for more information."
+-}
+ 
++## ----------- ##
++##    Main.    ##
++## ----------- ##
+ 
+ # func_lalib_p file
+ # True iff FILE is a libtool `.la' library or `.lo' object file.
+@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
+ # temporary ltwrapper_script.
+ func_ltwrapper_scriptname ()
+ {
+-    func_ltwrapper_scriptname_result=""
+-    if func_ltwrapper_executable_p "$1"; then
+-       func_dirname_and_basename "$1" "" "."
+-       func_stripname '' '.exe' "$func_basename_result"
+-       func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+-    fi
++    func_dirname_and_basename "$1" "" "."
++    func_stripname '' '.exe' "$func_basename_result"
++    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ }
+ 
+ # func_ltwrapper_p file
+@@ -1149,7 +1311,7 @@ func_execute_cmds ()
+     save_ifs=$IFS; IFS='~'
+     for cmd in $1; do
+       IFS=$save_ifs
+-      eval "cmd=\"$cmd\""
++      eval cmd=\"$cmd\"
+       func_show_eval "$cmd" "${2-:}"
+     done
+     IFS=$save_ifs
+@@ -1172,6 +1334,37 @@ func_source ()
+ }
+ 
+ 
++# func_resolve_sysroot PATH
++# Replace a leading = in PATH with a sysroot.  Store the result into
++# func_resolve_sysroot_result
++func_resolve_sysroot ()
++{
++  func_resolve_sysroot_result=$1
++  case $func_resolve_sysroot_result in
++  =*)
++    func_stripname '=' '' "$func_resolve_sysroot_result"
++    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
++    ;;
++  esac
++}
++
++# func_replace_sysroot PATH
++# If PATH begins with the sysroot, replace it with = and
++# store the result into func_replace_sysroot_result.
++func_replace_sysroot ()
++{
++  case "$lt_sysroot:$1" in
++  ?*:"$lt_sysroot"*)
++    func_stripname "$lt_sysroot" '' "$1"
++    func_replace_sysroot_result="=$func_stripname_result"
++    ;;
++  *)
++    # Including no sysroot.
++    func_replace_sysroot_result=$1
++    ;;
++  esac
++}
++
+ # func_infer_tag arg
+ # Infer tagged configuration to use if any are available and
+ # if one wasn't chosen via the "--tag" command line option.
+@@ -1184,8 +1377,7 @@ func_infer_tag ()
+     if test -n "$available_tags" && test -z "$tagname"; then
+       CC_quoted=
+       for arg in $CC; do
+-        func_quote_for_eval "$arg"
+-       CC_quoted="$CC_quoted $func_quote_for_eval_result"
++       func_append_quoted CC_quoted "$arg"
+       done
+       CC_expanded=`func_echo_all $CC`
+       CC_quoted_expanded=`func_echo_all $CC_quoted`
+@@ -1204,8 +1396,7 @@ func_infer_tag ()
+            CC_quoted=
+            for arg in $CC; do
+              # Double-quote args containing other shell metacharacters.
+-             func_quote_for_eval "$arg"
+-             CC_quoted="$CC_quoted $func_quote_for_eval_result"
++             func_append_quoted CC_quoted "$arg"
+            done
+            CC_expanded=`func_echo_all $CC`
+            CC_quoted_expanded=`func_echo_all $CC_quoted`
+@@ -1274,6 +1465,486 @@ EOF
+     }
+ }
+ 
++
++##################################################
++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
++##################################################
++
++# func_convert_core_file_wine_to_w32 ARG
++# Helper function used by file name conversion functions when $build is *nix,
++# and $host is mingw, cygwin, or some other w32 environment. Relies on a
++# correctly configured wine environment available, with the winepath program
++# in $build's $PATH.
++#
++# ARG is the $build file name to be converted to w32 format.
++# Result is available in $func_convert_core_file_wine_to_w32_result, and will
++# be empty on error (or when ARG is empty)
++func_convert_core_file_wine_to_w32 ()
++{
++  $opt_debug
++  func_convert_core_file_wine_to_w32_result="$1"
++  if test -n "$1"; then
++    # Unfortunately, winepath does not exit with a non-zero error code, so we
++    # are forced to check the contents of stdout. On the other hand, if the
++    # command is not found, the shell will set an exit code of 127 and print
++    # *an error message* to stdout. So we must check for both error code of
++    # zero AND non-empty stdout, which explains the odd construction:
++    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
++    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
++      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
++        $SED -e "$lt_sed_naive_backslashify"`
++    else
++      func_convert_core_file_wine_to_w32_result=
++    fi
++  fi
++}
++# end: func_convert_core_file_wine_to_w32
++
++
++# func_convert_core_path_wine_to_w32 ARG
++# Helper function used by path conversion functions when $build is *nix, and
++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
++# configured wine environment available, with the winepath program in $build's
++# $PATH. Assumes ARG has no leading or trailing path separator characters.
++#
++# ARG is path to be converted from $build format to win32.
++# Result is available in $func_convert_core_path_wine_to_w32_result.
++# Unconvertible file (directory) names in ARG are skipped; if no directory names
++# are convertible, then the result may be empty.
++func_convert_core_path_wine_to_w32 ()
++{
++  $opt_debug
++  # unfortunately, winepath doesn't convert paths, only file names
++  func_convert_core_path_wine_to_w32_result=""
++  if test -n "$1"; then
++    oldIFS=$IFS
++    IFS=:
++    for func_convert_core_path_wine_to_w32_f in $1; do
++      IFS=$oldIFS
++      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
++      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
++        if test -z "$func_convert_core_path_wine_to_w32_result"; then
++          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
++        else
++          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
++        fi
++      fi
++    done
++    IFS=$oldIFS
++  fi
++}
++# end: func_convert_core_path_wine_to_w32
++
++
++# func_cygpath ARGS...
++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
++# (2), returns the Cygwin file name or path in func_cygpath_result (input
++# file name or path is assumed to be in w32 format, as previously converted
++# from $build's *nix or MSYS format). In case (3), returns the w32 file name
++# or path in func_cygpath_result (input file name or path is assumed to be in
++# Cygwin format). Returns an empty string on error.
++#
++# ARGS are passed to cygpath, with the last one being the file name or path to
++# be converted.
++#
++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
++# environment variable; do not put it in $PATH.
++func_cygpath ()
++{
++  $opt_debug
++  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
++    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
++    if test "$?" -ne 0; then
++      # on failure, ensure result is empty
++      func_cygpath_result=
++    fi
++  else
++    func_cygpath_result=
++    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
++  fi
++}
++#end: func_cygpath
++
++
++# func_convert_core_msys_to_w32 ARG
++# Convert file name or path ARG from MSYS format to w32 format.  Return
++# result in func_convert_core_msys_to_w32_result.
++func_convert_core_msys_to_w32 ()
++{
++  $opt_debug
++  # awkward: cmd appends spaces to result
++  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
++    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++}
++#end: func_convert_core_msys_to_w32
++
++
++# func_convert_file_check ARG1 ARG2
++# Verify that ARG1 (a file name in $build format) was converted to $host
++# format in ARG2. Otherwise, emit an error message, but continue (resetting
++# func_to_host_file_result to ARG1).
++func_convert_file_check ()
++{
++  $opt_debug
++  if test -z "$2" && test -n "$1" ; then
++    func_error "Could not determine host file name corresponding to"
++    func_error "  \`$1'"
++    func_error "Continuing, but uninstalled executables may not work."
++    # Fallback:
++    func_to_host_file_result="$1"
++  fi
++}
++# end func_convert_file_check
++
++
++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
++# Verify that FROM_PATH (a path in $build format) was converted to $host
++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
++# func_to_host_file_result to a simplistic fallback value (see below).
++func_convert_path_check ()
++{
++  $opt_debug
++  if test -z "$4" && test -n "$3"; then
++    func_error "Could not determine the host path corresponding to"
++    func_error "  \`$3'"
++    func_error "Continuing, but uninstalled executables may not work."
++    # Fallback.  This is a deliberately simplistic "conversion" and
++    # should not be "improved".  See libtool.info.
++    if test "x$1" != "x$2"; then
++      lt_replace_pathsep_chars="s|$1|$2|g"
++      func_to_host_path_result=`echo "$3" |
++        $SED -e "$lt_replace_pathsep_chars"`
++    else
++      func_to_host_path_result="$3"
++    fi
++  fi
++}
++# end func_convert_path_check
++
++
++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
++# and appending REPL if ORIG matches BACKPAT.
++func_convert_path_front_back_pathsep ()
++{
++  $opt_debug
++  case $4 in
++  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
++    ;;
++  esac
++  case $4 in
++  $2 ) func_append func_to_host_path_result "$3"
++    ;;
++  esac
++}
++# end func_convert_path_front_back_pathsep
++
++
++##################################################
++# $build to $host FILE NAME CONVERSION FUNCTIONS #
++##################################################
++# invoked via `$to_host_file_cmd ARG'
++#
++# In each case, ARG is the path to be converted from $build to $host format.
++# Result will be available in $func_to_host_file_result.
++
++
++# func_to_host_file ARG
++# Converts the file name ARG from $build format to $host format. Return result
++# in func_to_host_file_result.
++func_to_host_file ()
++{
++  $opt_debug
++  $to_host_file_cmd "$1"
++}
++# end func_to_host_file
++
++
++# func_to_tool_file ARG LAZY
++# converts the file name ARG from $build format to toolchain format. Return
++# result in func_to_tool_file_result.  If the conversion in use is listed
++# in (the comma separated) LAZY, no conversion takes place.
++func_to_tool_file ()
++{
++  $opt_debug
++  case ,$2, in
++    *,"$to_tool_file_cmd",*)
++      func_to_tool_file_result=$1
++      ;;
++    *)
++      $to_tool_file_cmd "$1"
++      func_to_tool_file_result=$func_to_host_file_result
++      ;;
++  esac
++}
++# end func_to_tool_file
++
++
++# func_convert_file_noop ARG
++# Copy ARG to func_to_host_file_result.
++func_convert_file_noop ()
++{
++  func_to_host_file_result="$1"
++}
++# end func_convert_file_noop
++
++
++# func_convert_file_msys_to_w32 ARG
++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
++# conversion to w32 is not available inside the cwrapper.  Returns result in
++# func_to_host_file_result.
++func_convert_file_msys_to_w32 ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    func_convert_core_msys_to_w32 "$1"
++    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_msys_to_w32
++
++
++# func_convert_file_cygwin_to_w32 ARG
++# Convert file name ARG from Cygwin to w32 format.  Returns result in
++# func_to_host_file_result.
++func_convert_file_cygwin_to_w32 ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
++    # LT_CYGPATH in this case.
++    func_to_host_file_result=`cygpath -m "$1"`
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_cygwin_to_w32
++
++
++# func_convert_file_nix_to_w32 ARG
++# Convert file name ARG from *nix to w32 format.  Requires a wine environment
++# and a working winepath. Returns result in func_to_host_file_result.
++func_convert_file_nix_to_w32 ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    func_convert_core_file_wine_to_w32 "$1"
++    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_nix_to_w32
++
++
++# func_convert_file_msys_to_cygwin ARG
++# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
++# Returns result in func_to_host_file_result.
++func_convert_file_msys_to_cygwin ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    func_convert_core_msys_to_w32 "$1"
++    func_cygpath -u "$func_convert_core_msys_to_w32_result"
++    func_to_host_file_result="$func_cygpath_result"
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_msys_to_cygwin
++
++
++# func_convert_file_nix_to_cygwin ARG
++# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
++# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
++# in func_to_host_file_result.
++func_convert_file_nix_to_cygwin ()
++{
++  $opt_debug
++  func_to_host_file_result="$1"
++  if test -n "$1"; then
++    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
++    func_convert_core_file_wine_to_w32 "$1"
++    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
++    func_to_host_file_result="$func_cygpath_result"
++  fi
++  func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_nix_to_cygwin
++
++
++#############################################
++# $build to $host PATH CONVERSION FUNCTIONS #
++#############################################
++# invoked via `$to_host_path_cmd ARG'
++#
++# In each case, ARG is the path to be converted from $build to $host format.
++# The result will be available in $func_to_host_path_result.
++#
++# Path separators are also converted from $build format to $host format.  If
++# ARG begins or ends with a path separator character, it is preserved (but
++# converted to $host format) on output.
++#
++# All path conversion functions are named using the following convention:
++#   file name conversion function    : func_convert_file_X_to_Y ()
++#   path conversion function         : func_convert_path_X_to_Y ()
++# where, for any given $build/$host combination the 'X_to_Y' value is the
++# same.  If conversion functions are added for new $build/$host combinations,
++# the two new functions must follow this pattern, or func_init_to_host_path_cmd
++# will break.
++
++
++# func_init_to_host_path_cmd
++# Ensures that function "pointer" variable $to_host_path_cmd is set to the
++# appropriate value, based on the value of $to_host_file_cmd.
++to_host_path_cmd=
++func_init_to_host_path_cmd ()
++{
++  $opt_debug
++  if test -z "$to_host_path_cmd"; then
++    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
++    to_host_path_cmd="func_convert_path_${func_stripname_result}"
++  fi
++}
++
++
++# func_to_host_path ARG
++# Converts the path ARG from $build format to $host format. Return result
++# in func_to_host_path_result.
++func_to_host_path ()
++{
++  $opt_debug
++  func_init_to_host_path_cmd
++  $to_host_path_cmd "$1"
++}
++# end func_to_host_path
++
++
++# func_convert_path_noop ARG
++# Copy ARG to func_to_host_path_result.
++func_convert_path_noop ()
++{
++  func_to_host_path_result="$1"
++}
++# end func_convert_path_noop
++
++
++# func_convert_path_msys_to_w32 ARG
++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
++# conversion to w32 is not available inside the cwrapper.  Returns result in
++# func_to_host_path_result.
++func_convert_path_msys_to_w32 ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # Remove leading and trailing path separator characters from ARG.  MSYS
++    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
++    # and winepath ignores them completely.
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
++    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
++    func_convert_path_check : ";" \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++  fi
++}
++# end func_convert_path_msys_to_w32
++
++
++# func_convert_path_cygwin_to_w32 ARG
++# Convert path ARG from Cygwin to w32 format.  Returns result in
++# func_to_host_file_result.
++func_convert_path_cygwin_to_w32 ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # See func_convert_path_msys_to_w32:
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
++    func_convert_path_check : ";" \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++  fi
++}
++# end func_convert_path_cygwin_to_w32
++
++
++# func_convert_path_nix_to_w32 ARG
++# Convert path ARG from *nix to w32 format.  Requires a wine environment and
++# a working winepath.  Returns result in func_to_host_file_result.
++func_convert_path_nix_to_w32 ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # See func_convert_path_msys_to_w32:
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
++    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
++    func_convert_path_check : ";" \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++  fi
++}
++# end func_convert_path_nix_to_w32
++
++
++# func_convert_path_msys_to_cygwin ARG
++# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
++# Returns result in func_to_host_file_result.
++func_convert_path_msys_to_cygwin ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # See func_convert_path_msys_to_w32:
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
++    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
++    func_to_host_path_result="$func_cygpath_result"
++    func_convert_path_check : : \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
++  fi
++}
++# end func_convert_path_msys_to_cygwin
++
++
++# func_convert_path_nix_to_cygwin ARG
++# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
++# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
++# func_to_host_file_result.
++func_convert_path_nix_to_cygwin ()
++{
++  $opt_debug
++  func_to_host_path_result="$1"
++  if test -n "$1"; then
++    # Remove leading and trailing path separator characters from
++    # ARG. msys behavior is inconsistent here, cygpath turns them
++    # into '.;' and ';.', and winepath ignores them completely.
++    func_stripname : : "$1"
++    func_to_host_path_tmp1=$func_stripname_result
++    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
++    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
++    func_to_host_path_result="$func_cygpath_result"
++    func_convert_path_check : : \
++      "$func_to_host_path_tmp1" "$func_to_host_path_result"
++    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
++  fi
++}
++# end func_convert_path_nix_to_cygwin
++
++
+ # func_mode_compile arg...
+ func_mode_compile ()
+ {
+@@ -1314,12 +1985,12 @@ func_mode_compile ()
+          ;;
+ 
+        -pie | -fpie | -fPIE)
+-          pie_flag="$pie_flag $arg"
++          func_append pie_flag " $arg"
+          continue
+          ;;
+ 
+        -shared | -static | -prefer-pic | -prefer-non-pic)
+-         later="$later $arg"
++         func_append later " $arg"
+          continue
+          ;;
+ 
+@@ -1340,15 +2011,14 @@ func_mode_compile ()
+          save_ifs="$IFS"; IFS=','
+          for arg in $args; do
+            IFS="$save_ifs"
+-           func_quote_for_eval "$arg"
+-           lastarg="$lastarg $func_quote_for_eval_result"
++           func_append_quoted lastarg "$arg"
+          done
+          IFS="$save_ifs"
+          func_stripname ' ' '' "$lastarg"
+          lastarg=$func_stripname_result
+ 
+          # Add the arguments to base_compile.
+-         base_compile="$base_compile $lastarg"
++         func_append base_compile " $lastarg"
+          continue
+          ;;
+ 
+@@ -1364,8 +2034,7 @@ func_mode_compile ()
+       esac    #  case $arg_mode
+ 
+       # Aesthetically quote the previous argument.
+-      func_quote_for_eval "$lastarg"
+-      base_compile="$base_compile $func_quote_for_eval_result"
++      func_append_quoted base_compile "$lastarg"
+     done # for arg
+ 
+     case $arg_mode in
+@@ -1496,17 +2165,16 @@ compiler."
+        $opt_dry_run || $RM $removelist
+        exit $EXIT_FAILURE
+       fi
+-      removelist="$removelist $output_obj"
++      func_append removelist " $output_obj"
+       $ECHO "$srcfile" > "$lockfile"
+     fi
+ 
+     $opt_dry_run || $RM $removelist
+-    removelist="$removelist $lockfile"
++    func_append removelist " $lockfile"
+     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+ 
+-    if test -n "$fix_srcfile_path"; then
+-      eval "srcfile=\"$fix_srcfile_path\""
+-    fi
++    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
++    srcfile=$func_to_tool_file_result
+     func_quote_for_eval "$srcfile"
+     qsrcfile=$func_quote_for_eval_result
+ 
+@@ -1526,7 +2194,7 @@ compiler."
+ 
+       if test -z "$output_obj"; then
+        # Place PIC objects in $objdir
+-       command="$command -o $lobj"
++       func_append command " -o $lobj"
+       fi
+ 
+       func_show_eval_locale "$command" \
+@@ -1573,11 +2241,11 @@ compiler."
+        command="$base_compile $qsrcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+-       command="$command -o $obj"
++       func_append command " -o $obj"
+       fi
+ 
+       # Suppress compiler output if we already did a PIC compilation.
+-      command="$command$suppress_output"
++      func_append command "$suppress_output"
+       func_show_eval_locale "$command" \
+         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+ 
+@@ -1622,13 +2290,13 @@ compiler."
+ }
+ 
+ $opt_help || {
+-  test "$mode" = compile && func_mode_compile ${1+"$@"}
++  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ }
+ 
+ func_mode_help ()
+ {
+     # We need to display help for each of the modes.
+-    case $mode in
++    case $opt_mode in
+       "")
+         # Generic help is extracted from the usage comments
+         # at the start of this file.
+@@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
+ 
+   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+   -no-suppress      do not suppress compiler output for multiple passes
+-  -prefer-pic       try to building PIC objects only
+-  -prefer-non-pic   try to building non-PIC objects only
++  -prefer-pic       try to build PIC objects only
++  -prefer-non-pic   try to build non-PIC objects only
+   -shared           do not build a \`.o' file suitable for static linking
+   -static           only build a \`.o' file suitable for static linking
+   -Wc,FLAG          pass FLAG directly to the compiler
+@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
+         ;;
+ 
+       *)
+-        func_fatal_help "invalid operation mode \`$mode'"
++        func_fatal_help "invalid operation mode \`$opt_mode'"
+         ;;
+     esac
+ 
+@@ -1819,13 +2487,13 @@ if $opt_help; then
+   else
+     {
+       func_help noexit
+-      for mode in compile link execute install finish uninstall clean; do
++      for opt_mode in compile link execute install finish uninstall clean; do
+        func_mode_help
+       done
+     } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+     {
+       func_help noexit
+-      for mode in compile link execute install finish uninstall clean; do
++      for opt_mode in compile link execute install finish uninstall clean; do
+        echo
+        func_mode_help
+       done
+@@ -1854,13 +2522,16 @@ func_mode_execute ()
+       func_fatal_help "you must specify a COMMAND"
+ 
+     # Handle -dlopen flags immediately.
+-    for file in $execute_dlfiles; do
++    for file in $opt_dlopen; do
+       test -f "$file" \
+        || func_fatal_help "\`$file' is not a file"
+ 
+       dir=
+       case $file in
+       *.la)
++       func_resolve_sysroot "$file"
++       file=$func_resolve_sysroot_result
++
+        # Check to see that this really is a libtool archive.
+        func_lalib_unsafe_p "$file" \
+          || func_fatal_help "\`$lib' is not a valid libtool archive"
+@@ -1882,7 +2553,7 @@ func_mode_execute ()
+        dir="$func_dirname_result"
+ 
+        if test -f "$dir/$objdir/$dlname"; then
+-         dir="$dir/$objdir"
++         func_append dir "/$objdir"
+        else
+          if test ! -f "$dir/$dlname"; then
+            func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+@@ -1907,10 +2578,10 @@ func_mode_execute ()
+       test -n "$absdir" && dir="$absdir"
+ 
+       # Now add the directory to shlibpath_var.
+-      if eval test -z \"\$$shlibpath_var\"; then
+-       eval $shlibpath_var=\$dir
++      if eval "test -z \"\$$shlibpath_var\""; then
++       eval "$shlibpath_var=\"\$dir\""
+       else
+-       eval $shlibpath_var=\$dir:\$$shlibpath_var
++       eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+       fi
+     done
+ 
+@@ -1939,8 +2610,7 @@ func_mode_execute ()
+        ;;
+       esac
+       # Quote arguments (to preserve shell metacharacters).
+-      func_quote_for_eval "$file"
+-      args="$args $func_quote_for_eval_result"
++      func_append_quoted args "$file"
+     done
+ 
+     if test "X$opt_dry_run" = Xfalse; then
+@@ -1972,22 +2642,59 @@ func_mode_execute ()
+     fi
+ }
+ 
+-test "$mode" = execute && func_mode_execute ${1+"$@"}
++test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+ 
+ 
+ # func_mode_finish arg...
+ func_mode_finish ()
+ {
+     $opt_debug
+-    libdirs="$nonopt"
++    libs=
++    libdirs=
+     admincmds=
+ 
+-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+-      for dir
+-      do
+-       libdirs="$libdirs $dir"
+-      done
++    for opt in "$nonopt" ${1+"$@"}
++    do
++      if test -d "$opt"; then
++       func_append libdirs " $opt"
+ 
++      elif test -f "$opt"; then
++       if func_lalib_unsafe_p "$opt"; then
++         func_append libs " $opt"
++       else
++         func_warning "\`$opt' is not a valid libtool archive"
++       fi
++
++      else
++       func_fatal_error "invalid argument \`$opt'"
++      fi
++    done
++
++    if test -n "$libs"; then
++      if test -n "$lt_sysroot"; then
++        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
++        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
++      else
++        sysroot_cmd=
++      fi
++
++      # Remove sysroot references
++      if $opt_dry_run; then
++        for lib in $libs; do
++          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
++        done
++      else
++        tmpdir=`func_mktempdir`
++        for lib in $libs; do
++         sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
++           > $tmpdir/tmp-la
++         mv -f $tmpdir/tmp-la $lib
++       done
++        ${RM}r "$tmpdir"
++      fi
++    fi
++
++    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+       for libdir in $libdirs; do
+        if test -n "$finish_cmds"; then
+          # Do each command in the finish commands.
+@@ -1997,7 +2704,7 @@ func_mode_finish ()
+        if test -n "$finish_eval"; then
+          # Do the single finish_eval.
+          eval cmds=\"$finish_eval\"
+-         $opt_dry_run || eval "$cmds" || admincmds="$admincmds
++         $opt_dry_run || eval "$cmds" || func_append admincmds "
+        $cmds"
+        fi
+       done
+@@ -2006,53 +2713,55 @@ func_mode_finish ()
+     # Exit here if they wanted silent mode.
+     $opt_silent && exit $EXIT_SUCCESS
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      $ECHO "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval "flag=\"$hardcode_libdir_flag_spec\""
++    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++      echo "----------------------------------------------------------------------"
++      echo "Libraries have been installed in:"
++      for libdir in $libdirs; do
++       $ECHO "   $libdir"
++      done
++      echo
++      echo "If you ever happen to want to link against installed libraries"
++      echo "in a given directory, LIBDIR, you must either use libtool, and"
++      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++      echo "flag during linking and do at least one of the following:"
++      if test -n "$shlibpath_var"; then
++       echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
++       echo "     during execution"
++      fi
++      if test -n "$runpath_var"; then
++       echo "   - add LIBDIR to the \`$runpath_var' environment variable"
++       echo "     during linking"
++      fi
++      if test -n "$hardcode_libdir_flag_spec"; then
++       libdir=LIBDIR
++       eval flag=\"$hardcode_libdir_flag_spec\"
+ 
+-      $ECHO "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      $ECHO "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
++       $ECHO "   - use the \`$flag' linker flag"
++      fi
++      if test -n "$admincmds"; then
++       $ECHO "   - have your system administrator run these commands:$admincmds"
++      fi
++      if test -f /etc/ld.so.conf; then
++       echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++      fi
++      echo
+ 
+-    echo "See any operating system documentation about shared libraries for"
+-    case $host in
+-      solaris2.[6789]|solaris2.1[0-9])
+-        echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+-       echo "pages."
+-       ;;
+-      *)
+-        echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-        ;;
+-    esac
+-    echo "----------------------------------------------------------------------"
++      echo "See any operating system documentation about shared libraries for"
++      case $host in
++       solaris2.[6789]|solaris2.1[0-9])
++         echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
++         echo "pages."
++         ;;
++       *)
++         echo "more information, such as the ld(1) and ld.so(8) manual pages."
++         ;;
++      esac
++      echo "----------------------------------------------------------------------"
++    fi
+     exit $EXIT_SUCCESS
+ }
+ 
+-test "$mode" = finish && func_mode_finish ${1+"$@"}
++test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+ 
+ 
+ # func_mode_install arg...
+@@ -2077,7 +2786,7 @@ func_mode_install ()
+     # The real first argument should be the name of the installation program.
+     # Aesthetically quote it.
+     func_quote_for_eval "$arg"
+-    install_prog="$install_prog$func_quote_for_eval_result"
++    func_append install_prog "$func_quote_for_eval_result"
+     install_shared_prog=$install_prog
+     case " $install_prog " in
+       *[\\\ /]cp\ *) install_cp=: ;;
+@@ -2097,7 +2806,7 @@ func_mode_install ()
+     do
+       arg2=
+       if test -n "$dest"; then
+-       files="$files $dest"
++       func_append files " $dest"
+        dest=$arg
+        continue
+       fi
+@@ -2135,11 +2844,11 @@ func_mode_install ()
+ 
+       # Aesthetically quote the argument.
+       func_quote_for_eval "$arg"
+-      install_prog="$install_prog $func_quote_for_eval_result"
++      func_append install_prog " $func_quote_for_eval_result"
+       if test -n "$arg2"; then
+        func_quote_for_eval "$arg2"
+       fi
+-      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
++      func_append install_shared_prog " $func_quote_for_eval_result"
+     done
+ 
+     test -z "$install_prog" && \
+@@ -2151,7 +2860,7 @@ func_mode_install ()
+     if test -n "$install_override_mode" && $no_mode; then
+       if $install_cp; then :; else
+        func_quote_for_eval "$install_override_mode"
+-       install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
++       func_append install_shared_prog " -m $func_quote_for_eval_result"
+       fi
+     fi
+ 
+@@ -2209,10 +2918,13 @@ func_mode_install ()
+       case $file in
+       *.$libext)
+        # Do the static libraries later.
+-       staticlibs="$staticlibs $file"
++       func_append staticlibs " $file"
+        ;;
+ 
+       *.la)
++       func_resolve_sysroot "$file"
++       file=$func_resolve_sysroot_result
++
+        # Check to see that this really is a libtool archive.
+        func_lalib_unsafe_p "$file" \
+          || func_fatal_help "\`$file' is not a valid libtool archive"
+@@ -2226,23 +2938,30 @@ func_mode_install ()
+        if test "X$destdir" = "X$libdir"; then
+          case "$current_libdirs " in
+          *" $libdir "*) ;;
+-         *) current_libdirs="$current_libdirs $libdir" ;;
++         *) func_append current_libdirs " $libdir" ;;
+          esac
+        else
+          # Note the libdir as a future libdir.
+          case "$future_libdirs " in
+          *" $libdir "*) ;;
+-         *) future_libdirs="$future_libdirs $libdir" ;;
++         *) func_append future_libdirs " $libdir" ;;
+          esac
+        fi
+ 
+        func_dirname "$file" "/" ""
+        dir="$func_dirname_result"
+-       dir="$dir$objdir"
++       func_append dir "$objdir"
+ 
+        if test -n "$relink_command"; then
++      # Strip any trailing slash from the destination.
++      func_stripname '' '/' "$libdir"
++      destlibdir=$func_stripname_result
++
++      func_stripname '' '/' "$destdir"
++      s_destdir=$func_stripname_result
++
+          # Determine the prefix the user has applied to our future dir.
+-         inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
++         inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
+ 
+          # Don't allow the user to place us outside of our expected
+          # location b/c this prevents finding dependent libraries that
+@@ -2315,7 +3034,7 @@ func_mode_install ()
+        func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+ 
+        # Maybe install the static library, too.
+-       test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++       test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+        ;;
+ 
+       *.lo)
+@@ -2503,7 +3222,7 @@ func_mode_install ()
+     test -n "$future_libdirs" && \
+       func_warning "remember to run \`$progname --finish$future_libdirs'"
+ 
+-    if test -n "$current_libdirs" && $opt_finish; then
++    if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       $opt_dry_run && current_libdirs=" -n$current_libdirs"
+       exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+@@ -2512,7 +3231,7 @@ func_mode_install ()
+     fi
+ }
+ 
+-test "$mode" = install && func_mode_install ${1+"$@"}
++test "$opt_mode" = install && func_mode_install ${1+"$@"}
+ 
+ 
+ # func_generate_dlsyms outputname originator pic_p
+@@ -2559,6 +3278,18 @@ extern \"C\" {
+ #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+ #endif
+ 
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++   relocations are performed -- see ld's documentation on pseudo-relocs.  */
++# define LT_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data.  */
++# define LT_DLSYM_CONST
++#else
++# define LT_DLSYM_CONST const
++#endif
++
+ /* External symbol declarations for the compiler. */\
+ "
+ 
+@@ -2570,21 +3301,22 @@ extern \"C\" {
+          # Add our own program objects to the symbol list.
+          progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+          for progfile in $progfiles; do
+-           func_verbose "extracting global C symbols from \`$progfile'"
+-           $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
++           func_to_tool_file "$progfile" func_convert_file_msys_to_w32
++           func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
++           $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+          done
+ 
+          if test -n "$exclude_expsyms"; then
+            $opt_dry_run || {
+-             $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+-             $MV "$nlist"T "$nlist"
++             eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++             eval '$MV "$nlist"T "$nlist"'
+            }
+          fi
+ 
+          if test -n "$export_symbols_regex"; then
+            $opt_dry_run || {
+-             $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
+-             $MV "$nlist"T "$nlist"
++             eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++             eval '$MV "$nlist"T "$nlist"'
+            }
+          fi
+ 
+@@ -2593,23 +3325,23 @@ extern \"C\" {
+            export_symbols="$output_objdir/$outputname.exp"
+            $opt_dry_run || {
+              $RM $export_symbols
+-             ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
++             eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+              case $host in
+              *cygwin* | *mingw* | *cegcc* )
+-                echo EXPORTS > "$output_objdir/$outputname.def"
+-                cat "$export_symbols" >> "$output_objdir/$outputname.def"
++                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
+            }
+          else
+            $opt_dry_run || {
+-             ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
+-             $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
+-             $MV "$nlist"T "$nlist"
++             eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++             eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
++             eval '$MV "$nlist"T "$nlist"'
+              case $host in
+                *cygwin* | *mingw* | *cegcc* )
+-                 echo EXPORTS > "$output_objdir/$outputname.def"
+-                 cat "$nlist" >> "$output_objdir/$outputname.def"
++                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++                 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                  ;;
+              esac
+            }
+@@ -2620,10 +3352,52 @@ extern \"C\" {
+          func_verbose "extracting global C symbols from \`$dlprefile'"
+          func_basename "$dlprefile"
+          name="$func_basename_result"
+-         $opt_dry_run || {
+-           $ECHO ": $name " >> "$nlist"
+-           eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+-         }
++          case $host in
++           *cygwin* | *mingw* | *cegcc* )
++             # if an import library, we need to obtain dlname
++             if func_win32_import_lib_p "$dlprefile"; then
++               func_tr_sh "$dlprefile"
++               eval "curr_lafile=\$libfile_$func_tr_sh_result"
++               dlprefile_dlbasename=""
++               if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
++                 # Use subshell, to avoid clobbering current variable values
++                 dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
++                 if test -n "$dlprefile_dlname" ; then
++                   func_basename "$dlprefile_dlname"
++                   dlprefile_dlbasename="$func_basename_result"
++                 else
++                   # no lafile. user explicitly requested -dlpreopen <import library>.
++                   $sharedlib_from_linklib_cmd "$dlprefile"
++                   dlprefile_dlbasename=$sharedlib_from_linklib_result
++                 fi
++               fi
++               $opt_dry_run || {
++                 if test -n "$dlprefile_dlbasename" ; then
++                   eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
++                 else
++                   func_warning "Could not compute DLL name from $name"
++                   eval '$ECHO ": $name " >> "$nlist"'
++                 fi
++                 func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
++                   $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
++               }
++             else # not an import lib
++               $opt_dry_run || {
++                 eval '$ECHO ": $name " >> "$nlist"'
++                 func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++               }
++             fi
++           ;;
++           *)
++             $opt_dry_run || {
++               eval '$ECHO ": $name " >> "$nlist"'
++               func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++               eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++             }
++           ;;
++          esac
+        done
+ 
+        $opt_dry_run || {
+@@ -2661,26 +3435,9 @@ typedef struct {
+   const char *name;
+   void *address;
+ } lt_dlsymlist;
+-"
+-         case $host in
+-         *cygwin* | *mingw* | *cegcc* )
+-           echo >> "$output_objdir/$my_dlsyms" "\
+-/* DATA imports from DLLs on WIN32 con't be const, because
+-   runtime relocations are performed -- see ld's documentation
+-   on pseudo-relocs.  */"
+-           lt_dlsym_const= ;;
+-         *osf5*)
+-           echo >> "$output_objdir/$my_dlsyms" "\
+-/* This system does not cope well with relocations in const data */"
+-           lt_dlsym_const= ;;
+-         *)
+-           lt_dlsym_const=const ;;
+-         esac
+-
+-         echo >> "$output_objdir/$my_dlsyms" "\
+-extern $lt_dlsym_const lt_dlsymlist
++extern LT_DLSYM_CONST lt_dlsymlist
+ lt_${my_prefix}_LTX_preloaded_symbols[];
+-$lt_dlsym_const lt_dlsymlist
++LT_DLSYM_CONST lt_dlsymlist
+ lt_${my_prefix}_LTX_preloaded_symbols[] =
+ {\
+   { \"$my_originator\", (void *) 0 },"
+@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
+        for arg in $LTCFLAGS; do
+          case $arg in
+          -pie | -fpie | -fPIE) ;;
+-         *) symtab_cflags="$symtab_cflags $arg" ;;
++         *) func_append symtab_cflags " $arg" ;;
+          esac
+        done
+ 
+@@ -2796,9 +3553,11 @@ func_win32_libid ()
+     win32_libid_type="x86 archive import"
+     ;;
+   *ar\ archive*) # could be an import, or static
+-    if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
+-       $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+-      win32_nmres=`$NM -f posix -A "$1" |
++    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
++    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
++       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
++      func_to_tool_file "$1" func_convert_file_msys_to_w32
++      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+        $SED -n -e '
+            1,100{
+                / I /{
+@@ -2827,6 +3586,131 @@ func_win32_libid ()
+   $ECHO "$win32_libid_type"
+ }
+ 
++# func_cygming_dll_for_implib ARG
++#
++# Platform-specific function to extract the
++# name of the DLL associated with the specified
++# import library ARG.
++# Invoked by eval'ing the libtool variable
++#    $sharedlib_from_linklib_cmd
++# Result is available in the variable
++#    $sharedlib_from_linklib_result
++func_cygming_dll_for_implib ()
++{
++  $opt_debug
++  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
++}
++
++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
++#
++# The is the core of a fallback implementation of a
++# platform-specific function to extract the name of the
++# DLL associated with the specified import library LIBNAME.
++#
++# SECTION_NAME is either .idata$6 or .idata$7, depending
++# on the platform and compiler that created the implib.
++#
++# Echos the name of the DLL associated with the
++# specified import library.
++func_cygming_dll_for_implib_fallback_core ()
++{
++  $opt_debug
++  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
++  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
++    $SED '/^Contents of section '"$match_literal"':/{
++      # Place marker at beginning of archive member dllname section
++      s/.*/====MARK====/
++      p
++      d
++    }
++    # These lines can sometimes be longer than 43 characters, but
++    # are always uninteresting
++    /:[         ]*file format pe[i]\{,1\}-/d
++    /^In archive [^:]*:/d
++    # Ensure marker is printed
++    /^====MARK====/p
++    # Remove all lines with less than 43 characters
++    /^.\{43\}/!d
++    # From remaining lines, remove first 43 characters
++    s/^.\{43\}//' |
++    $SED -n '
++      # Join marker and all lines until next marker into a single line
++      /^====MARK====/ b para
++      H
++      $ b para
++      b
++      :para
++      x
++      s/\n//g
++      # Remove the marker
++      s/^====MARK====//
++      # Remove trailing dots and whitespace
++      s/[\. \t]*$//
++      # Print
++      /./p' |
++    # we now have a list, one entry per line, of the stringified
++    # contents of the appropriate section of all members of the
++    # archive which possess that section. Heuristic: eliminate
++    # all those which have a first or second character that is
++    # a '.' (that is, objdump's representation of an unprintable
++    # character.) This should work for all archives with less than
++    # 0x302f exports -- but will fail for DLLs whose name actually
++    # begins with a literal '.' or a single character followed by
++    # a '.'.
++    #
++    # Of those that remain, print the first one.
++    $SED -e '/^\./d;/^.\./d;q'
++}
++
++# func_cygming_gnu_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is a GNU/binutils-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_gnu_implib_p ()
++{
++  $opt_debug
++  func_to_tool_file "$1" func_convert_file_msys_to_w32
++  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)$'`
++  test -n "$func_cygming_gnu_implib_tmp"
++}
++
++# func_cygming_ms_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is an MS-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_ms_implib_p ()
++{
++  $opt_debug
++  func_to_tool_file "$1" func_convert_file_msys_to_w32
++  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
++  test -n "$func_cygming_ms_implib_tmp"
++}
++
++# func_cygming_dll_for_implib_fallback ARG
++# Platform-specific function to extract the
++# name of the DLL associated with the specified
++# import library ARG.
++#
++# This fallback implementation is for use when $DLLTOOL
++# does not support the --identify-strict option.
++# Invoked by eval'ing the libtool variable
++#    $sharedlib_from_linklib_cmd
++# Result is available in the variable
++#    $sharedlib_from_linklib_result
++func_cygming_dll_for_implib_fallback ()
++{
++  $opt_debug
++  if func_cygming_gnu_implib_p "$1" ; then
++    # binutils import library
++    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
++  elif func_cygming_ms_implib_p "$1" ; then
++    # ms-generated import library
++    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
++  else
++    # unknown
++    sharedlib_from_linklib_result=""
++  fi
++}
+ 
+ 
+ # func_extract_an_archive dir oldlib
+@@ -2917,7 +3801,7 @@ func_extract_archives ()
+            darwin_file=
+            darwin_files=
+            for darwin_file in $darwin_filelist; do
+-             darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++             darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+              $LIPO -create -output "$darwin_file" $darwin_files
+            done # $darwin_filelist
+            $RM -rf unfat-$$
+@@ -2932,7 +3816,7 @@ func_extract_archives ()
+         func_extract_an_archive "$my_xdir" "$my_xabs"
+        ;;
+       esac
+-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+     done
+ 
+     func_extract_archives_result="$my_oldobjs"
+@@ -3014,7 +3898,110 @@ func_fallback_echo ()
+ _LTECHO_EOF'
+ }
+     ECHO=\"$qECHO\"
+-  fi\
++  fi
++
++# Very basic option parsing. These options are (a) specific to
++# the libtool wrapper, (b) are identical between the wrapper
++# /script/ and the wrapper /executable/ which is used only on
++# windows platforms, and (c) all begin with the string "--lt-"
++# (application programs are unlikely to have options which match
++# this pattern).
++#
++# There are only two supported options: --lt-debug and
++# --lt-dump-script. There is, deliberately, no --lt-help.
++#
++# The first argument to this parsing function should be the
++# script's $0 value, followed by "$@".
++lt_option_debug=
++func_parse_lt_options ()
++{
++  lt_script_arg0=\$0
++  shift
++  for lt_opt
++  do
++    case \"\$lt_opt\" in
++    --lt-debug) lt_option_debug=1 ;;
++    --lt-dump-script)
++        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
++        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
++        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
++        cat \"\$lt_dump_D/\$lt_dump_F\"
++        exit 0
++      ;;
++    --lt-*)
++        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
++        exit 1
++      ;;
++    esac
++  done
++
++  # Print the debug banner immediately:
++  if test -n \"\$lt_option_debug\"; then
++    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
++  fi
++}
++
++# Used when --lt-debug. Prints its arguments to stdout
++# (redirection is the responsibility of the caller)
++func_lt_dump_args ()
++{
++  lt_dump_args_N=1;
++  for lt_arg
++  do
++    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
++    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
++  done
++}
++
++# Core function for launching the target application
++func_exec_program_core ()
++{
++"
++  case $host in
++  # Backslashes separate directories on plain windows
++  *-*-mingw | *-*-os2* | *-cegcc*)
++    $ECHO "\
++      if test -n \"\$lt_option_debug\"; then
++        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
++        func_lt_dump_args \${1+\"\$@\"} 1>&2
++      fi
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
++"
++    ;;
++
++  *)
++    $ECHO "\
++      if test -n \"\$lt_option_debug\"; then
++        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
++        func_lt_dump_args \${1+\"\$@\"} 1>&2
++      fi
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
++"
++    ;;
++  esac
++  $ECHO "\
++      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
++      exit 1
++}
++
++# A function to encapsulate launching the target application
++# Strips options in the --lt-* namespace from \$@ and
++# launches target application with the remaining arguments.
++func_exec_program ()
++{
++  for lt_wr_arg
++  do
++    case \$lt_wr_arg in
++    --lt-*) ;;
++    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
++    esac
++    shift
++  done
++  func_exec_program_core \${1+\"\$@\"}
++}
++
++  # Parse options
++  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+ 
+   # Find the directory that this script lives in.
+   thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+@@ -3078,7 +4065,7 @@ _LTECHO_EOF'
+ 
+     # relink executable if necessary
+     if test -n \"\$relink_command\"; then
+-      if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
++      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+       else
+        $ECHO \"\$relink_command_output\" >&2
+        $RM \"\$progdir/\$file\"
+@@ -3102,6 +4089,18 @@ _LTECHO_EOF'
+ 
+   if test -f \"\$progdir/\$program\"; then"
+ 
++       # fixup the dll searchpath if we need to.
++       #
++       # Fix the DLL searchpath if we need to.  Do this before prepending
++       # to shlibpath, because on Windows, both are PATH and uninstalled
++       # libraries must come first.
++       if test -n "$dllsearchpath"; then
++         $ECHO "\
++    # Add the dll search path components to the executable PATH
++    PATH=$dllsearchpath:\$PATH
++"
++       fi
++
+        # Export our shlibpath_var if we have one.
+        if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+          $ECHO "\
+@@ -3116,35 +4115,10 @@ _LTECHO_EOF'
+ "
+        fi
+ 
+-       # fixup the dll searchpath if we need to.
+-       if test -n "$dllsearchpath"; then
+-         $ECHO "\
+-    # Add the dll search path components to the executable PATH
+-    PATH=$dllsearchpath:\$PATH
+-"
+-       fi
+-
+        $ECHO "\
+     if test \"\$libtool_execute_magic\" != \"$magic\"; then
+       # Run the actual program with our arguments.
+-"
+-       case $host in
+-       # Backslashes separate directories on plain windows
+-       *-*-mingw | *-*-os2* | *-cegcc*)
+-         $ECHO "\
+-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+-"
+-         ;;
+-
+-       *)
+-         $ECHO "\
+-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+-"
+-         ;;
+-       esac
+-       $ECHO "\
+-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+-      exit 1
++      func_exec_program \${1+\"\$@\"}
+     fi
+   else
+     # The program doesn't exist.
+@@ -3158,166 +4132,6 @@ fi\
+ }
+ 
+ 
+-# func_to_host_path arg
+-#
+-# Convert paths to host format when used with build tools.
+-# Intended for use with "native" mingw (where libtool itself
+-# is running under the msys shell), or in the following cross-
+-# build environments:
+-#    $build          $host
+-#    mingw (msys)    mingw  [e.g. native]
+-#    cygwin          mingw
+-#    *nix + wine     mingw
+-# where wine is equipped with the `winepath' executable.
+-# In the native mingw case, the (msys) shell automatically
+-# converts paths for any non-msys applications it launches,
+-# but that facility isn't available from inside the cwrapper.
+-# Similar accommodations are necessary for $host mingw and
+-# $build cygwin.  Calling this function does no harm for other
+-# $host/$build combinations not listed above.
+-#
+-# ARG is the path (on $build) that should be converted to
+-# the proper representation for $host. The result is stored
+-# in $func_to_host_path_result.
+-func_to_host_path ()
+-{
+-  func_to_host_path_result="$1"
+-  if test -n "$1"; then
+-    case $host in
+-      *mingw* )
+-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+-        case $build in
+-          *mingw* ) # actually, msys
+-            # awkward: cmd appends spaces to result
+-            func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
+-              $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+-            ;;
+-          *cygwin* )
+-            func_to_host_path_result=`cygpath -w "$1" |
+-             $SED -e "$lt_sed_naive_backslashify"`
+-            ;;
+-          * )
+-            # Unfortunately, winepath does not exit with a non-zero
+-            # error code, so we are forced to check the contents of
+-            # stdout. On the other hand, if the command is not
+-            # found, the shell will set an exit code of 127 and print
+-            # *an error message* to stdout. So we must check for both
+-            # error code of zero AND non-empty stdout, which explains
+-            # the odd construction:
+-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+-              func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
+-                $SED -e "$lt_sed_naive_backslashify"`
+-            else
+-              # Allow warning below.
+-              func_to_host_path_result=
+-            fi
+-            ;;
+-        esac
+-        if test -z "$func_to_host_path_result" ; then
+-          func_error "Could not determine host path corresponding to"
+-          func_error "  \`$1'"
+-          func_error "Continuing, but uninstalled executables may not work."
+-          # Fallback:
+-          func_to_host_path_result="$1"
+-        fi
+-        ;;
+-    esac
+-  fi
+-}
+-# end: func_to_host_path
+-
+-# func_to_host_pathlist arg
+-#
+-# Convert pathlists to host format when used with build tools.
+-# See func_to_host_path(), above. This function supports the
+-# following $build/$host combinations (but does no harm for
+-# combinations not listed here):
+-#    $build          $host
+-#    mingw (msys)    mingw  [e.g. native]
+-#    cygwin          mingw
+-#    *nix + wine     mingw
+-#
+-# Path separators are also converted from $build format to
+-# $host format. If ARG begins or ends with a path separator
+-# character, it is preserved (but converted to $host format)
+-# on output.
+-#
+-# ARG is a pathlist (on $build) that should be converted to
+-# the proper representation on $host. The result is stored
+-# in $func_to_host_pathlist_result.
+-func_to_host_pathlist ()
+-{
+-  func_to_host_pathlist_result="$1"
+-  if test -n "$1"; then
+-    case $host in
+-      *mingw* )
+-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+-        # Remove leading and trailing path separator characters from
+-        # ARG. msys behavior is inconsistent here, cygpath turns them
+-        # into '.;' and ';.', and winepath ignores them completely.
+-       func_stripname : : "$1"
+-        func_to_host_pathlist_tmp1=$func_stripname_result
+-        case $build in
+-          *mingw* ) # Actually, msys.
+-            # Awkward: cmd appends spaces to result.
+-            func_to_host_pathlist_result=`
+-             ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
+-             $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+-            ;;
+-          *cygwin* )
+-            func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
+-              $SED -e "$lt_sed_naive_backslashify"`
+-            ;;
+-          * )
+-            # unfortunately, winepath doesn't convert pathlists
+-            func_to_host_pathlist_result=""
+-            func_to_host_pathlist_oldIFS=$IFS
+-            IFS=:
+-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+-              IFS=$func_to_host_pathlist_oldIFS
+-              if test -n "$func_to_host_pathlist_f" ; then
+-                func_to_host_path "$func_to_host_pathlist_f"
+-                if test -n "$func_to_host_path_result" ; then
+-                  if test -z "$func_to_host_pathlist_result" ; then
+-                    func_to_host_pathlist_result="$func_to_host_path_result"
+-                  else
+-                    func_append func_to_host_pathlist_result ";$func_to_host_path_result"
+-                  fi
+-                fi
+-              fi
+-            done
+-            IFS=$func_to_host_pathlist_oldIFS
+-            ;;
+-        esac
+-        if test -z "$func_to_host_pathlist_result"; then
+-          func_error "Could not determine the host path(s) corresponding to"
+-          func_error "  \`$1'"
+-          func_error "Continuing, but uninstalled executables may not work."
+-          # Fallback. This may break if $1 contains DOS-style drive
+-          # specifications. The fix is not to complicate the expression
+-          # below, but for the user to provide a working wine installation
+-          # with winepath so that path translation in the cross-to-mingw
+-          # case works properly.
+-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+-        fi
+-        # Now, add the leading and trailing path separators back
+-        case "$1" in
+-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+-            ;;
+-        esac
+-        case "$1" in
+-          *: ) func_append func_to_host_pathlist_result ";"
+-            ;;
+-        esac
+-        ;;
+-    esac
+-  fi
+-}
+-# end: func_to_host_pathlist
+-
+ # func_emit_cwrapperexe_src
+ # emit the source code for a wrapper executable on stdout
+ # Must ONLY be called from within func_mode_link because
+@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
+ 
+    This wrapper executable should never be moved out of the build directory.
+    If it is, it will not operate correctly.
+-
+-   Currently, it simply execs the wrapper *script* "$SHELL $output",
+-   but could eventually absorb all of the scripts functionality and
+-   exec $objdir/$outputname directly.
+ */
+ EOF
+            cat <<"EOF"
+@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
+   if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+ 
+-#undef LTWRAPPER_DEBUGPRINTF
+-#if defined LT_DEBUGWRAPPER
+-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+-static void
+-ltwrapper_debugprintf (const char *fmt, ...)
+-{
+-    va_list args;
+-    va_start (args, fmt);
+-    (void) vfprintf (stderr, fmt, args);
+-    va_end (args);
+-}
++#if defined(LT_DEBUGWRAPPER)
++static int lt_debug = 1;
+ #else
+-# define LTWRAPPER_DEBUGPRINTF(args)
++static int lt_debug = 0;
+ #endif
+ 
+-const char *program_name = NULL;
++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+ 
+ void *xmalloc (size_t num);
+ char *xstrdup (const char *string);
+@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
+ int make_executable (const char *path);
+ int check_executable (const char *path);
+ char *strendzap (char *str, const char *pat);
+-void lt_fatal (const char *message, ...);
++void lt_debugprintf (const char *file, int line, const char *fmt, ...);
++void lt_fatal (const char *file, int line, const char *message, ...);
++static const char *nonnull (const char *s);
++static const char *nonempty (const char *s);
+ void lt_setenv (const char *name, const char *value);
+ char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+ void lt_update_exe_path (const char *name, const char *value);
+@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
+ EOF
+ 
+            cat <<EOF
+-const char * MAGIC_EXE = "$magic_exe";
++volatile const char * MAGIC_EXE = "$magic_exe";
+ const char * LIB_PATH_VARNAME = "$shlibpath_var";
+ EOF
+ 
+            if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+-              func_to_host_pathlist "$temp_rpath"
++              func_to_host_path "$temp_rpath"
+              cat <<EOF
+-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
++const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+ EOF
+            else
+              cat <<"EOF"
+@@ -3513,10 +4317,10 @@ EOF
+            fi
+ 
+            if test -n "$dllsearchpath"; then
+-              func_to_host_pathlist "$dllsearchpath:"
++              func_to_host_path "$dllsearchpath:"
+              cat <<EOF
+ const char * EXE_PATH_VARNAME = "PATH";
+-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
++const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+ EOF
+            else
+              cat <<"EOF"
+@@ -3539,12 +4343,10 @@ EOF
+            cat <<"EOF"
+ 
+ #define LTWRAPPER_OPTION_PREFIX         "--lt-"
+-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
+ 
+-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
+ static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+-
+ static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
++static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+ 
+ int
+ main (int argc, char *argv[])
+@@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
+   int i;
+ 
+   program_name = (char *) xstrdup (base_name (argv[0]));
+-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
++  newargz = XMALLOC (char *, argc + 1);
+ 
+-  /* very simple arg parsing; don't want to rely on getopt */
++  /* very simple arg parsing; don't want to rely on getopt
++   * also, copy all non cwrapper options to newargz, except
++   * argz[0], which is handled differently
++   */
++  newargc=0;
+   for (i = 1; i < argc; i++)
+     {
+       if (strcmp (argv[i], dumpscript_opt) == 0)
+@@ -3581,21 +4386,54 @@ EOF
+          lt_dump_script (stdout);
+          return 0;
+        }
++      if (strcmp (argv[i], debug_opt) == 0)
++       {
++          lt_debug = 1;
++          continue;
++       }
++      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
++        {
++          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
++             namespace, but it is not one of the ones we know about and
++             have already dealt with, above (inluding dump-script), then
++             report an error. Otherwise, targets might begin to believe
++             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
++             namespace. The first time any user complains about this, we'll
++             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
++             or a configure.ac-settable value.
++           */
++          lt_fatal (__FILE__, __LINE__,
++                   "unrecognized %s option: '%s'",
++                    ltwrapper_option_prefix, argv[i]);
++        }
++      /* otherwise ... */
++      newargz[++newargc] = xstrdup (argv[i]);
+     }
++  newargz[++newargc] = NULL;
++
++EOF
++           cat <<EOF
++  /* The GNU banner must be the first non-error debug message */
++  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
++EOF
++           cat <<"EOF"
++  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
++  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+ 
+-  newargz = XMALLOC (char *, argc + 1);
+   tmp_pathspec = find_executable (argv[0]);
+   if (tmp_pathspec == NULL)
+-    lt_fatal ("Couldn't find %s", argv[0]);
+-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+-                         tmp_pathspec));
++    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
++  lt_debugprintf (__FILE__, __LINE__,
++                  "(main) found exe (before symlink chase) at: %s\n",
++                 tmp_pathspec);
+ 
+   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+-                         actual_cwrapper_path));
++  lt_debugprintf (__FILE__, __LINE__,
++                  "(main) found exe (after symlink chase) at: %s\n",
++                 actual_cwrapper_path);
+   XFREE (tmp_pathspec);
+ 
+-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
++  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+   strendzap (actual_cwrapper_path, actual_cwrapper_name);
+ 
+   /* wrapper name transforms */
+@@ -3613,8 +4451,9 @@ EOF
+   target_name = tmp_pathspec;
+   tmp_pathspec = 0;
+ 
+-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+-                         target_name));
++  lt_debugprintf (__FILE__, __LINE__,
++                 "(main) libtool target name: %s\n",
++                 target_name);
+ EOF
+ 
+            cat <<EOF
+@@ -3664,35 +4503,19 @@ EOF
+ 
+   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
++  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
++     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
++     because on Windows, both *_VARNAMEs are PATH but uninstalled
++     libraries must come first. */
+   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
++  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+ 
+-  newargc=0;
+-  for (i = 1; i < argc; i++)
+-    {
+-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+-        {
+-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+-             namespace, but it is not one of the ones we know about and
+-             have already dealt with, above (inluding dump-script), then
+-             report an error. Otherwise, targets might begin to believe
+-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+-             namespace. The first time any user complains about this, we'll
+-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+-             or a configure.ac-settable value.
+-           */
+-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+-                    ltwrapper_option_prefix, argv[i]);
+-        }
+-      /* otherwise ... */
+-      newargz[++newargc] = xstrdup (argv[i]);
+-    }
+-  newargz[++newargc] = NULL;
+-
+-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
++  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
++                 nonnull (lt_argv_zero));
+   for (i = 0; i < newargc; i++)
+     {
+-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
++      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
++                     i, nonnull (newargz[i]));
+     }
+ 
+ EOF
+@@ -3706,7 +4529,9 @@ EOF
+   if (rval == -1)
+     {
+       /* failed to start process */
+-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
++      lt_debugprintf (__FILE__, __LINE__,
++                     "(main) failed to launch target \"%s\": %s\n",
++                     lt_argv_zero, nonnull (strerror (errno)));
+       return 127;
+     }
+   return rval;
+@@ -3728,7 +4553,7 @@ xmalloc (size_t num)
+ {
+   void *p = (void *) malloc (num);
+   if (!p)
+-    lt_fatal ("Memory exhausted");
++    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+ 
+   return p;
+ }
+@@ -3762,8 +4587,8 @@ check_executable (const char *path)
+ {
+   struct stat st;
+ 
+-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+-                         path ? (*path ? path : "EMPTY!") : "NULL!"));
++  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
++                  nonempty (path));
+   if ((!path) || (!*path))
+     return 0;
+ 
+@@ -3780,8 +4605,8 @@ make_executable (const char *path)
+   int rval = 0;
+   struct stat st;
+ 
+-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+-                         path ? (*path ? path : "EMPTY!") : "NULL!"));
++  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
++                  nonempty (path));
+   if ((!path) || (!*path))
+     return 0;
+ 
+@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
+   int tmp_len;
+   char *concat_name;
+ 
+-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+-                         wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
++  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
++                  nonempty (wrapper));
+ 
+   if ((wrapper == NULL) || (*wrapper == '\0'))
+     return NULL;
+@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
+                {
+                  /* empty path: current directory */
+                  if (getcwd (tmp, LT_PATHMAX) == NULL)
+-                   lt_fatal ("getcwd failed");
++                   lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
++                              nonnull (strerror (errno)));
+                  tmp_len = strlen (tmp);
+                  concat_name =
+                    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
+     }
+   /* Relative path | not found in path: prepend cwd */
+   if (getcwd (tmp, LT_PATHMAX) == NULL)
+-    lt_fatal ("getcwd failed");
++    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
++              nonnull (strerror (errno)));
+   tmp_len = strlen (tmp);
+   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+   memcpy (concat_name, tmp, tmp_len);
+@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
+   int has_symlinks = 0;
+   while (strlen (tmp_pathspec) && !has_symlinks)
+     {
+-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+-                             tmp_pathspec));
++      lt_debugprintf (__FILE__, __LINE__,
++                     "checking path component for symlinks: %s\n",
++                     tmp_pathspec);
+       if (lstat (tmp_pathspec, &s) == 0)
+        {
+          if (S_ISLNK (s.st_mode) != 0)
+@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
+        }
+       else
+        {
+-         char *errstr = strerror (errno);
+-         lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
++         lt_fatal (__FILE__, __LINE__,
++                   "error accessing file \"%s\": %s",
++                   tmp_pathspec, nonnull (strerror (errno)));
+        }
+     }
+   XFREE (tmp_pathspec);
+@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
+   tmp_pathspec = realpath (pathspec, buf);
+   if (tmp_pathspec == 0)
+     {
+-      lt_fatal ("Could not follow symlinks for %s", pathspec);
++      lt_fatal (__FILE__, __LINE__,
++               "could not follow symlinks for %s", pathspec);
+     }
+   return xstrdup (tmp_pathspec);
+ #endif
+@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
+   return str;
+ }
+ 
++void
++lt_debugprintf (const char *file, int line, const char *fmt, ...)
++{
++  va_list args;
++  if (lt_debug)
++    {
++      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
++      va_start (args, fmt);
++      (void) vfprintf (stderr, fmt, args);
++      va_end (args);
++    }
++}
++
+ static void
+-lt_error_core (int exit_status, const char *mode,
++lt_error_core (int exit_status, const char *file,
++              int line, const char *mode,
+               const char *message, va_list ap)
+ {
+-  fprintf (stderr, "%s: %s: ", program_name, mode);
++  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+   vfprintf (stderr, message, ap);
+   fprintf (stderr, ".\n");
+ 
+@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
+ }
+ 
+ void
+-lt_fatal (const char *message, ...)
++lt_fatal (const char *file, int line, const char *message, ...)
+ {
+   va_list ap;
+   va_start (ap, message);
+-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
++  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+   va_end (ap);
+ }
+ 
++static const char *
++nonnull (const char *s)
++{
++  return s ? s : "(null)";
++}
++
++static const char *
++nonempty (const char *s)
++{
++  return (s && !*s) ? "(empty)" : nonnull (s);
++}
++
+ void
+ lt_setenv (const char *name, const char *value)
+ {
+-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+-                          (name ? name : "<NULL>"),
+-                          (value ? value : "<NULL>")));
++  lt_debugprintf (__FILE__, __LINE__,
++                 "(lt_setenv) setting '%s' to '%s'\n",
++                  nonnull (name), nonnull (value));
+   {
+ #ifdef HAVE_SETENV
+     /* always make a copy, for consistency with !HAVE_SETENV */
+@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
+ void
+ lt_update_exe_path (const char *name, const char *value)
+ {
+-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+-                          (name ? name : "<NULL>"),
+-                          (value ? value : "<NULL>")));
++  lt_debugprintf (__FILE__, __LINE__,
++                 "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
++                  nonnull (name), nonnull (value));
+ 
+   if (name && *name && value && *value)
+     {
+@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
+ void
+ lt_update_lib_path (const char *name, const char *value)
+ {
+-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+-                          (name ? name : "<NULL>"),
+-                          (value ? value : "<NULL>")));
++  lt_debugprintf (__FILE__, __LINE__,
++                 "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
++                  nonnull (name), nonnull (value));
+ 
+   if (name && *name && value && *value)
+     {
+@@ -4222,7 +5078,7 @@ EOF
+ func_win32_import_lib_p ()
+ {
+     $opt_debug
+-    case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
++    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+     *import*) : ;;
+     *) false ;;
+     esac
+@@ -4401,9 +5257,9 @@ func_mode_link ()
+            ;;
+          *)
+            if test "$prev" = dlfiles; then
+-             dlfiles="$dlfiles $arg"
++             func_append dlfiles " $arg"
+            else
+-             dlprefiles="$dlprefiles $arg"
++             func_append dlprefiles " $arg"
+            fi
+            prev=
+            continue
+@@ -4427,7 +5283,7 @@ func_mode_link ()
+            *-*-darwin*)
+              case "$deplibs " in
+                *" $qarg.ltframework "*) ;;
+-               *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
++               *) func_append deplibs " $qarg.ltframework" # this is fixed later
+                   ;;
+              esac
+              ;;
+@@ -4446,7 +5302,7 @@ func_mode_link ()
+            moreargs=
+            for fil in `cat "$save_arg"`
+            do
+-#            moreargs="$moreargs $fil"
++#            func_append moreargs " $fil"
+              arg=$fil
+              # A libtool-controlled object.
+ 
+@@ -4475,7 +5331,7 @@ func_mode_link ()
+ 
+                  if test "$prev" = dlfiles; then
+                    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-                     dlfiles="$dlfiles $pic_object"
++                     func_append dlfiles " $pic_object"
+                      prev=
+                      continue
+                    else
+@@ -4487,7 +5343,7 @@ func_mode_link ()
+                  # CHECK ME:  I think I busted this.  -Ossama
+                  if test "$prev" = dlprefiles; then
+                    # Preload the old-style object.
+-                   dlprefiles="$dlprefiles $pic_object"
++                   func_append dlprefiles " $pic_object"
+                    prev=
+                  fi
+ 
+@@ -4557,12 +5413,12 @@ func_mode_link ()
+          if test "$prev" = rpath; then
+            case "$rpath " in
+            *" $arg "*) ;;
+-           *) rpath="$rpath $arg" ;;
++           *) func_append rpath " $arg" ;;
+            esac
+          else
+            case "$xrpath " in
+            *" $arg "*) ;;
+-           *) xrpath="$xrpath $arg" ;;
++           *) func_append xrpath " $arg" ;;
+            esac
+          fi
+          prev=
+@@ -4574,28 +5430,28 @@ func_mode_link ()
+          continue
+          ;;
+        weak)
+-         weak_libs="$weak_libs $arg"
++         func_append weak_libs " $arg"
+          prev=
+          continue
+          ;;
+        xcclinker)
+-         linker_flags="$linker_flags $qarg"
+-         compiler_flags="$compiler_flags $qarg"
++         func_append linker_flags " $qarg"
++         func_append compiler_flags " $qarg"
+          prev=
+          func_append compile_command " $qarg"
+          func_append finalize_command " $qarg"
+          continue
+          ;;
+        xcompiler)
+-         compiler_flags="$compiler_flags $qarg"
++         func_append compiler_flags " $qarg"
+          prev=
+          func_append compile_command " $qarg"
+          func_append finalize_command " $qarg"
+          continue
+          ;;
+        xlinker)
+-         linker_flags="$linker_flags $qarg"
+-         compiler_flags="$compiler_flags $wl$qarg"
++         func_append linker_flags " $qarg"
++         func_append compiler_flags " $wl$qarg"
+          prev=
+          func_append compile_command " $wl$qarg"
+          func_append finalize_command " $wl$qarg"
+@@ -4686,15 +5542,16 @@ func_mode_link ()
+        ;;
+ 
+       -L*)
+-       func_stripname '-L' '' "$arg"
+-       dir=$func_stripname_result
+-       if test -z "$dir"; then
++       func_stripname "-L" '' "$arg"
++       if test -z "$func_stripname_result"; then
+          if test "$#" -gt 0; then
+            func_fatal_error "require no space between \`-L' and \`$1'"
+          else
+            func_fatal_error "need path for \`-L' option"
+          fi
+        fi
++       func_resolve_sysroot "$func_stripname_result"
++       dir=$func_resolve_sysroot_result
+        # We need an absolute path.
+        case $dir in
+        [\\/]* | [A-Za-z]:[\\/]*) ;;
+@@ -4706,10 +5563,16 @@ func_mode_link ()
+          ;;
+        esac
+        case "$deplibs " in
+-       *" -L$dir "*) ;;
++       *" -L$dir "* | *" $arg "*)
++         # Will only happen for absolute or sysroot arguments
++         ;;
+        *)
+-         deplibs="$deplibs -L$dir"
+-         lib_search_path="$lib_search_path $dir"
++         # Preserve sysroot, but never include relative directories
++         case $dir in
++           [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
++           *) func_append deplibs " -L$dir" ;;
++         esac
++         func_append lib_search_path " $dir"
+          ;;
+        esac
+        case $host in
+@@ -4718,12 +5581,12 @@ func_mode_link ()
+          case :$dllsearchpath: in
+          *":$dir:"*) ;;
+          ::) dllsearchpath=$dir;;
+-         *) dllsearchpath="$dllsearchpath:$dir";;
++         *) func_append dllsearchpath ":$dir";;
+          esac
+          case :$dllsearchpath: in
+          *":$testbindir:"*) ;;
+          ::) dllsearchpath=$testbindir;;
+-         *) dllsearchpath="$dllsearchpath:$testbindir";;
++         *) func_append dllsearchpath ":$testbindir";;
+          esac
+          ;;
+        esac
+@@ -4747,7 +5610,7 @@ func_mode_link ()
+            ;;
+          *-*-rhapsody* | *-*-darwin1.[012])
+            # Rhapsody C and math libraries are in the System framework
+-           deplibs="$deplibs System.ltframework"
++           func_append deplibs " System.ltframework"
+            continue
+            ;;
+          *-*-sco3.2v5* | *-*-sco5v6*)
+@@ -4758,9 +5621,6 @@ func_mode_link ()
+            # Compiler inserts libc in the correct place for threads to work
+            test "X$arg" = "X-lc" && continue
+            ;;
+-         *-*-linux*)
+-           test "X$arg" = "X-lc" && continue
+-           ;;
+          esac
+        elif test "X$arg" = "X-lc_r"; then
+         case $host in
+@@ -4770,7 +5630,7 @@ func_mode_link ()
+           ;;
+         esac
+        fi
+-       deplibs="$deplibs $arg"
++       func_append deplibs " $arg"
+        continue
+        ;;
+ 
+@@ -4782,8 +5642,8 @@ func_mode_link ()
+       # Tru64 UNIX uses -model [arg] to determine the layout of C++
+       # classes, name mangling, and exception handling.
+       # Darwin uses the -arch flag to determine output architecture.
+-      -model|-arch|-isysroot)
+-       compiler_flags="$compiler_flags $arg"
++      -model|-arch|-isysroot|--sysroot)
++       func_append compiler_flags " $arg"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        prev=xcompiler
+@@ -4791,12 +5651,12 @@ func_mode_link ()
+        ;;
+ 
+       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+-       compiler_flags="$compiler_flags $arg"
++       func_append compiler_flags " $arg"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        case "$new_inherited_linker_flags " in
+            *" $arg "*) ;;
+-           * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
++           * ) func_append new_inherited_linker_flags " $arg" ;;
+        esac
+        continue
+        ;;
+@@ -4863,13 +5723,17 @@ func_mode_link ()
+        # We need an absolute path.
+        case $dir in
+        [\\/]* | [A-Za-z]:[\\/]*) ;;
++       =*)
++         func_stripname '=' '' "$dir"
++         dir=$lt_sysroot$func_stripname_result
++         ;;
+        *)
+          func_fatal_error "only absolute run-paths are allowed"
+          ;;
+        esac
+        case "$xrpath " in
+        *" $dir "*) ;;
+-       *) xrpath="$xrpath $dir" ;;
++       *) func_append xrpath " $dir" ;;
+        esac
+        continue
+        ;;
+@@ -4922,8 +5786,8 @@ func_mode_link ()
+        for flag in $args; do
+          IFS="$save_ifs"
+           func_quote_for_eval "$flag"
+-         arg="$arg $func_quote_for_eval_result"
+-         compiler_flags="$compiler_flags $func_quote_for_eval_result"
++         func_append arg " $func_quote_for_eval_result"
++         func_append compiler_flags " $func_quote_for_eval_result"
+        done
+        IFS="$save_ifs"
+        func_stripname ' ' '' "$arg"
+@@ -4938,9 +5802,9 @@ func_mode_link ()
+        for flag in $args; do
+          IFS="$save_ifs"
+           func_quote_for_eval "$flag"
+-         arg="$arg $wl$func_quote_for_eval_result"
+-         compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+-         linker_flags="$linker_flags $func_quote_for_eval_result"
++         func_append arg " $wl$func_quote_for_eval_result"
++         func_append compiler_flags " $wl$func_quote_for_eval_result"
++         func_append linker_flags " $func_quote_for_eval_result"
+        done
+        IFS="$save_ifs"
+        func_stripname ' ' '' "$arg"
+@@ -4968,24 +5832,27 @@ func_mode_link ()
+        arg="$func_quote_for_eval_result"
+        ;;
+ 
+-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+-      # +DA*, +DD* enable 64-bit mode on the HP compiler
+-      # -q* pass through compiler args for the IBM compiler
+-      # -m*, -t[45]*, -txscale* pass through architecture-specific
+-      # compiler args for GCC
+-      # -F/path gives path to uninstalled frameworks, gcc on darwin
+-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+-      # @file GCC response files
+-      # -tp=* Portland pgcc target processor selection
++      # Flags to be passed through unchanged, with rationale:
++      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
++      # -r[0-9][0-9]*        specify processor for the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
++      # +DA*, +DD*           enable 64-bit mode for the HP compiler
++      # -q*                  compiler args for the IBM compiler
++      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
++      # -F/path              path to uninstalled frameworks, gcc on darwin
++      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
++      # @file                GCC response files
++      # -tp=*                Portland pgcc target processor selection
++      # --sysroot=*          for sysroot support
++      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+         func_quote_for_eval "$arg"
+        arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+         func_append finalize_command " $arg"
+-        compiler_flags="$compiler_flags $arg"
++        func_append compiler_flags " $arg"
+         continue
+         ;;
+ 
+@@ -4997,7 +5864,7 @@ func_mode_link ()
+ 
+       *.$objext)
+        # A standard object.
+-       objs="$objs $arg"
++       func_append objs " $arg"
+        ;;
+ 
+       *.lo)
+@@ -5028,7 +5895,7 @@ func_mode_link ()
+ 
+            if test "$prev" = dlfiles; then
+              if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-               dlfiles="$dlfiles $pic_object"
++               func_append dlfiles " $pic_object"
+                prev=
+                continue
+              else
+@@ -5040,7 +5907,7 @@ func_mode_link ()
+            # CHECK ME:  I think I busted this.  -Ossama
+            if test "$prev" = dlprefiles; then
+              # Preload the old-style object.
+-             dlprefiles="$dlprefiles $pic_object"
++             func_append dlprefiles " $pic_object"
+              prev=
+            fi
+ 
+@@ -5085,24 +5952,25 @@ func_mode_link ()
+ 
+       *.$libext)
+        # An archive.
+-       deplibs="$deplibs $arg"
+-       old_deplibs="$old_deplibs $arg"
++       func_append deplibs " $arg"
++       func_append old_deplibs " $arg"
+        continue
+        ;;
+ 
+       *.la)
+        # A libtool-controlled library.
+ 
++       func_resolve_sysroot "$arg"
+        if test "$prev" = dlfiles; then
+          # This library was specified with -dlopen.
+-         dlfiles="$dlfiles $arg"
++         func_append dlfiles " $func_resolve_sysroot_result"
+          prev=
+        elif test "$prev" = dlprefiles; then
+          # The library was specified with -dlpreopen.
+-         dlprefiles="$dlprefiles $arg"
++         func_append dlprefiles " $func_resolve_sysroot_result"
+          prev=
+        else
+-         deplibs="$deplibs $arg"
++         func_append deplibs " $func_resolve_sysroot_result"
+        fi
+        continue
+        ;;
+@@ -5127,7 +5995,7 @@ func_mode_link ()
+       func_fatal_help "the \`$prevarg' option requires an argument"
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+-      eval "arg=\"$export_dynamic_flag_spec\""
++      eval arg=\"$export_dynamic_flag_spec\"
+       func_append compile_command " $arg"
+       func_append finalize_command " $arg"
+     fi
+@@ -5144,11 +6012,13 @@ func_mode_link ()
+     else
+       shlib_search_path=
+     fi
+-    eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
+-    eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
++    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
++    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ 
+     func_dirname "$output" "/" ""
+     output_objdir="$func_dirname_result$objdir"
++    func_to_tool_file "$output_objdir/"
++    tool_output_objdir=$func_to_tool_file_result
+     # Create the object directory.
+     func_mkdir_p "$output_objdir"
+ 
+@@ -5169,12 +6039,12 @@ func_mode_link ()
+     # Find all interdependent deplibs by searching for libraries
+     # that are linked more than once (e.g. -la -lb -la)
+     for deplib in $deplibs; do
+-      if $opt_duplicate_deps ; then
++      if $opt_preserve_dup_deps ; then
+        case "$libs " in
+-       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++       *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+        esac
+       fi
+-      libs="$libs $deplib"
++      func_append libs " $deplib"
+     done
+ 
+     if test "$linkmode" = lib; then
+@@ -5187,9 +6057,9 @@ func_mode_link ()
+       if $opt_duplicate_compiler_generated_deps; then
+        for pre_post_dep in $predeps $postdeps; do
+          case "$pre_post_deps " in
+-         *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
++         *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+          esac
+-         pre_post_deps="$pre_post_deps $pre_post_dep"
++         func_append pre_post_deps " $pre_post_dep"
+        done
+       fi
+       pre_post_deps=
+@@ -5256,8 +6126,9 @@ func_mode_link ()
+        for lib in $dlprefiles; do
+          # Ignore non-libtool-libs
+          dependency_libs=
++         func_resolve_sysroot "$lib"
+          case $lib in
+-         *.la) func_source "$lib" ;;
++         *.la) func_source "$func_resolve_sysroot_result" ;;
+          esac
+ 
+          # Collect preopened libtool deplibs, except any this library
+@@ -5267,7 +6138,7 @@ func_mode_link ()
+             deplib_base=$func_basename_result
+            case " $weak_libs " in
+            *" $deplib_base "*) ;;
+-           *) deplibs="$deplibs $deplib" ;;
++           *) func_append deplibs " $deplib" ;;
+            esac
+          done
+        done
+@@ -5288,11 +6159,11 @@ func_mode_link ()
+            compile_deplibs="$deplib $compile_deplibs"
+            finalize_deplibs="$deplib $finalize_deplibs"
+          else
+-           compiler_flags="$compiler_flags $deplib"
++           func_append compiler_flags " $deplib"
+            if test "$linkmode" = lib ; then
+                case "$new_inherited_linker_flags " in
+                    *" $deplib "*) ;;
+-                   * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
++                   * ) func_append new_inherited_linker_flags " $deplib" ;;
+                esac
+            fi
+          fi
+@@ -5377,7 +6248,7 @@ func_mode_link ()
+            if test "$linkmode" = lib ; then
+                case "$new_inherited_linker_flags " in
+                    *" $deplib "*) ;;
+-                   * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
++                   * ) func_append new_inherited_linker_flags " $deplib" ;;
+                esac
+            fi
+          fi
+@@ -5390,7 +6261,8 @@ func_mode_link ()
+            test "$pass" = conv && continue
+            newdependency_libs="$deplib $newdependency_libs"
+            func_stripname '-L' '' "$deplib"
+-           newlib_search_path="$newlib_search_path $func_stripname_result"
++           func_resolve_sysroot "$func_stripname_result"
++           func_append newlib_search_path " $func_resolve_sysroot_result"
+            ;;
+          prog)
+            if test "$pass" = conv; then
+@@ -5404,7 +6276,8 @@ func_mode_link ()
+              finalize_deplibs="$deplib $finalize_deplibs"
+            fi
+            func_stripname '-L' '' "$deplib"
+-           newlib_search_path="$newlib_search_path $func_stripname_result"
++           func_resolve_sysroot "$func_stripname_result"
++           func_append newlib_search_path " $func_resolve_sysroot_result"
+            ;;
+          *)
+            func_warning "\`-L' is ignored for archives/objects"
+@@ -5415,17 +6288,21 @@ func_mode_link ()
+        -R*)
+          if test "$pass" = link; then
+            func_stripname '-R' '' "$deplib"
+-           dir=$func_stripname_result
++           func_resolve_sysroot "$func_stripname_result"
++           dir=$func_resolve_sysroot_result
+            # Make sure the xrpath contains only unique directories.
+            case "$xrpath " in
+            *" $dir "*) ;;
+-           *) xrpath="$xrpath $dir" ;;
++           *) func_append xrpath " $dir" ;;
+            esac
+          fi
+          deplibs="$deplib $deplibs"
+          continue
+          ;;
+-       *.la) lib="$deplib" ;;
++       *.la)
++         func_resolve_sysroot "$deplib"
++         lib=$func_resolve_sysroot_result
++         ;;
+        *.$libext)
+          if test "$pass" = conv; then
+            deplibs="$deplib $deplibs"
+@@ -5488,11 +6365,11 @@ func_mode_link ()
+            if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+              # If there is no dlopen support or we're linking statically,
+              # we need to preload.
+-             newdlprefiles="$newdlprefiles $deplib"
++             func_append newdlprefiles " $deplib"
+              compile_deplibs="$deplib $compile_deplibs"
+              finalize_deplibs="$deplib $finalize_deplibs"
+            else
+-             newdlfiles="$newdlfiles $deplib"
++             func_append newdlfiles " $deplib"
+            fi
+          fi
+          continue
+@@ -5538,7 +6415,7 @@ func_mode_link ()
+          for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+            case " $new_inherited_linker_flags " in
+              *" $tmp_inherited_linker_flag "*) ;;
+-             *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
++             *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+            esac
+          done
+        fi
+@@ -5546,8 +6423,8 @@ func_mode_link ()
+        if test "$linkmode,$pass" = "lib,link" ||
+           test "$linkmode,$pass" = "prog,scan" ||
+           { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+-         test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+-         test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
++         test -n "$dlopen" && func_append dlfiles " $dlopen"
++         test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+        fi
+ 
+        if test "$pass" = conv; then
+@@ -5558,20 +6435,20 @@ func_mode_link ()
+              func_fatal_error "cannot find name of link library for \`$lib'"
+            fi
+            # It is a libtool convenience library, so add in its objects.
+-           convenience="$convenience $ladir/$objdir/$old_library"
+-           old_convenience="$old_convenience $ladir/$objdir/$old_library"
++           func_append convenience " $ladir/$objdir/$old_library"
++           func_append old_convenience " $ladir/$objdir/$old_library"
+          elif test "$linkmode" != prog && test "$linkmode" != lib; then
+            func_fatal_error "\`$lib' is not a convenience library"
+          fi
+          tmp_libs=
+          for deplib in $dependency_libs; do
+            deplibs="$deplib $deplibs"
+-           if $opt_duplicate_deps ; then
++           if $opt_preserve_dup_deps ; then
+              case "$tmp_libs " in
+-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++             *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+              esac
+            fi
+-           tmp_libs="$tmp_libs $deplib"
++           func_append tmp_libs " $deplib"
+          done
+          continue
+        fi # $pass = conv
+@@ -5579,9 +6456,15 @@ func_mode_link ()
+ 
+        # Get the name of the library we link against.
+        linklib=
+-       for l in $old_library $library_names; do
+-         linklib="$l"
+-       done
++       if test -n "$old_library" &&
++          { test "$prefer_static_libs" = yes ||
++            test "$prefer_static_libs,$installed" = "built,no"; }; then
++         linklib=$old_library
++       else
++         for l in $old_library $library_names; do
++           linklib="$l"
++         done
++       fi
+        if test -z "$linklib"; then
+          func_fatal_error "cannot find name of link library for \`$lib'"
+        fi
+@@ -5598,9 +6481,9 @@ func_mode_link ()
+            # statically, we need to preload.  We also need to preload any
+            # dependent libraries so libltdl's deplib preloader doesn't
+            # bomb out in the load deplibs phase.
+-           dlprefiles="$dlprefiles $lib $dependency_libs"
++           func_append dlprefiles " $lib $dependency_libs"
+          else
+-           newdlfiles="$newdlfiles $lib"
++           func_append newdlfiles " $lib"
+          fi
+          continue
+        fi # $pass = dlopen
+@@ -5622,14 +6505,14 @@ func_mode_link ()
+ 
+        # Find the relevant object directory and library name.
+        if test "X$installed" = Xyes; then
+-         if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++         if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+            func_warning "library \`$lib' was moved."
+            dir="$ladir"
+            absdir="$abs_ladir"
+            libdir="$abs_ladir"
+          else
+-           dir="$libdir"
+-           absdir="$libdir"
++           dir="$lt_sysroot$libdir"
++           absdir="$lt_sysroot$libdir"
+          fi
+          test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+        else
+@@ -5637,12 +6520,12 @@ func_mode_link ()
+            dir="$ladir"
+            absdir="$abs_ladir"
+            # Remove this search path later
+-           notinst_path="$notinst_path $abs_ladir"
++           func_append notinst_path " $abs_ladir"
+          else
+            dir="$ladir/$objdir"
+            absdir="$abs_ladir/$objdir"
+            # Remove this search path later
+-           notinst_path="$notinst_path $abs_ladir"
++           func_append notinst_path " $abs_ladir"
+          fi
+        fi # $installed = yes
+        func_stripname 'lib' '.la' "$laname"
+@@ -5653,20 +6536,46 @@ func_mode_link ()
+          if test -z "$libdir" && test "$linkmode" = prog; then
+            func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+          fi
+-         # Prefer using a static library (so that no silly _DYNAMIC symbols
+-         # are required to link).
+-         if test -n "$old_library"; then
+-           newdlprefiles="$newdlprefiles $dir/$old_library"
+-           # Keep a list of preopened convenience libraries to check
+-           # that they are being used correctly in the link pass.
+-           test -z "$libdir" && \
+-               dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+-         # Otherwise, use the dlname, so that lt_dlopen finds it.
+-         elif test -n "$dlname"; then
+-           newdlprefiles="$newdlprefiles $dir/$dlname"
+-         else
+-           newdlprefiles="$newdlprefiles $dir/$linklib"
+-         fi
++         case "$host" in
++           # special handling for platforms with PE-DLLs.
++           *cygwin* | *mingw* | *cegcc* )
++             # Linker will automatically link against shared library if both
++             # static and shared are present.  Therefore, ensure we extract
++             # symbols from the import library if a shared library is present
++             # (otherwise, the dlopen module name will be incorrect).  We do
++             # this by putting the import library name into $newdlprefiles.
++             # We recover the dlopen module name by 'saving' the la file
++             # name in a special purpose variable, and (later) extracting the
++             # dlname from the la file.
++             if test -n "$dlname"; then
++               func_tr_sh "$dir/$linklib"
++               eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
++               func_append newdlprefiles " $dir/$linklib"
++             else
++               func_append newdlprefiles " $dir/$old_library"
++               # Keep a list of preopened convenience libraries to check
++               # that they are being used correctly in the link pass.
++               test -z "$libdir" && \
++                 func_append dlpreconveniencelibs " $dir/$old_library"
++             fi
++           ;;
++           * )
++             # Prefer using a static library (so that no silly _DYNAMIC symbols
++             # are required to link).
++             if test -n "$old_library"; then
++               func_append newdlprefiles " $dir/$old_library"
++               # Keep a list of preopened convenience libraries to check
++               # that they are being used correctly in the link pass.
++               test -z "$libdir" && \
++                 func_append dlpreconveniencelibs " $dir/$old_library"
++             # Otherwise, use the dlname, so that lt_dlopen finds it.
++             elif test -n "$dlname"; then
++               func_append newdlprefiles " $dir/$dlname"
++             else
++               func_append newdlprefiles " $dir/$linklib"
++             fi
++           ;;
++         esac
+        fi # $pass = dlpreopen
+ 
+        if test -z "$libdir"; then
+@@ -5684,7 +6593,7 @@ func_mode_link ()
+ 
+ 
+        if test "$linkmode" = prog && test "$pass" != link; then
+-         newlib_search_path="$newlib_search_path $ladir"
++         func_append newlib_search_path " $ladir"
+          deplibs="$lib $deplibs"
+ 
+          linkalldeplibs=no
+@@ -5697,7 +6606,8 @@ func_mode_link ()
+          for deplib in $dependency_libs; do
+            case $deplib in
+            -L*) func_stripname '-L' '' "$deplib"
+-                newlib_search_path="$newlib_search_path $func_stripname_result"
++                func_resolve_sysroot "$func_stripname_result"
++                func_append newlib_search_path " $func_resolve_sysroot_result"
+                 ;;
+            esac
+            # Need to link against all dependency_libs?
+@@ -5708,12 +6618,12 @@ func_mode_link ()
+              # or/and link against static libraries
+              newdependency_libs="$deplib $newdependency_libs"
+            fi
+-           if $opt_duplicate_deps ; then
++           if $opt_preserve_dup_deps ; then
+              case "$tmp_libs " in
+-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++             *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+              esac
+            fi
+-           tmp_libs="$tmp_libs $deplib"
++           func_append tmp_libs " $deplib"
+          done # for deplib
+          continue
+        fi # $linkmode = prog...
+@@ -5728,7 +6638,7 @@ func_mode_link ()
+              # Make sure the rpath contains only unique directories.
+              case "$temp_rpath:" in
+              *"$absdir:"*) ;;
+-             *) temp_rpath="$temp_rpath$absdir:" ;;
++             *) func_append temp_rpath "$absdir:" ;;
+              esac
+            fi
+ 
+@@ -5740,7 +6650,7 @@ func_mode_link ()
+            *)
+              case "$compile_rpath " in
+              *" $absdir "*) ;;
+-             *) compile_rpath="$compile_rpath $absdir"
++             *) func_append compile_rpath " $absdir" ;;
+              esac
+              ;;
+            esac
+@@ -5749,7 +6659,7 @@ func_mode_link ()
+            *)
+              case "$finalize_rpath " in
+              *" $libdir "*) ;;
+-             *) finalize_rpath="$finalize_rpath $libdir"
++             *) func_append finalize_rpath " $libdir" ;;
+              esac
+              ;;
+            esac
+@@ -5774,12 +6684,12 @@ func_mode_link ()
+          case $host in
+          *cygwin* | *mingw* | *cegcc*)
+              # No point in relinking DLLs because paths are not encoded
+-             notinst_deplibs="$notinst_deplibs $lib"
++             func_append notinst_deplibs " $lib"
+              need_relink=no
+            ;;
+          *)
+            if test "$installed" = no; then
+-             notinst_deplibs="$notinst_deplibs $lib"
++             func_append notinst_deplibs " $lib"
+              need_relink=yes
+            fi
+            ;;
+@@ -5814,7 +6724,7 @@ func_mode_link ()
+            *)
+              case "$compile_rpath " in
+              *" $absdir "*) ;;
+-             *) compile_rpath="$compile_rpath $absdir"
++             *) func_append compile_rpath " $absdir" ;;
+              esac
+              ;;
+            esac
+@@ -5823,7 +6733,7 @@ func_mode_link ()
+            *)
+              case "$finalize_rpath " in
+              *" $libdir "*) ;;
+-             *) finalize_rpath="$finalize_rpath $libdir"
++             *) func_append finalize_rpath " $libdir" ;;
+              esac
+              ;;
+            esac
+@@ -5835,7 +6745,7 @@ func_mode_link ()
+            shift
+            realname="$1"
+            shift
+-           eval "libname=\"$libname_spec\""
++           libname=`eval "\\$ECHO \"$libname_spec\""`
+            # use dlname if we got it. it's perfectly good, no?
+            if test -n "$dlname"; then
+              soname="$dlname"
+@@ -5848,7 +6758,7 @@ func_mode_link ()
+                versuffix="-$major"
+                ;;
+              esac
+-             eval "soname=\"$soname_spec\""
++             eval soname=\"$soname_spec\"
+            else
+              soname="$realname"
+            fi
+@@ -5877,7 +6787,7 @@ func_mode_link ()
+            linklib=$newlib
+          fi # test -n "$old_archive_from_expsyms_cmds"
+ 
+-         if test "$linkmode" = prog || test "$mode" != relink; then
++         if test "$linkmode" = prog || test "$opt_mode" != relink; then
+            add_shlibpath=
+            add_dir=
+            add=
+@@ -5933,7 +6843,7 @@ func_mode_link ()
+                if test -n "$inst_prefix_dir"; then
+                  case $libdir in
+                    [\\/]*)
+-                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
++                     func_append add_dir " -L$inst_prefix_dir$libdir"
+                      ;;
+                  esac
+                fi
+@@ -5955,7 +6865,7 @@ func_mode_link ()
+            if test -n "$add_shlibpath"; then
+              case :$compile_shlibpath: in
+              *":$add_shlibpath:"*) ;;
+-             *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
++             *) func_append compile_shlibpath "$add_shlibpath:" ;;
+              esac
+            fi
+            if test "$linkmode" = prog; then
+@@ -5969,13 +6879,13 @@ func_mode_link ()
+                 test "$hardcode_shlibpath_var" = yes; then
+                case :$finalize_shlibpath: in
+                *":$libdir:"*) ;;
+-               *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++               *) func_append finalize_shlibpath "$libdir:" ;;
+                esac
+              fi
+            fi
+          fi
+ 
+-         if test "$linkmode" = prog || test "$mode" = relink; then
++         if test "$linkmode" = prog || test "$opt_mode" = relink; then
+            add_shlibpath=
+            add_dir=
+            add=
+@@ -5989,7 +6899,7 @@ func_mode_link ()
+            elif test "$hardcode_shlibpath_var" = yes; then
+              case :$finalize_shlibpath: in
+              *":$libdir:"*) ;;
+-             *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++             *) func_append finalize_shlibpath "$libdir:" ;;
+              esac
+              add="-l$name"
+            elif test "$hardcode_automatic" = yes; then
+@@ -6001,12 +6911,12 @@ func_mode_link ()
+              fi
+            else
+              # We cannot seem to hardcode it, guess we'll fake it.
+-             add_dir="-L$libdir"
++             add_dir="-L$lt_sysroot$libdir"
+              # Try looking first in the location we're being installed to.
+              if test -n "$inst_prefix_dir"; then
+                case $libdir in
+                  [\\/]*)
+-                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
++                   func_append add_dir " -L$inst_prefix_dir$libdir"
+                    ;;
+                esac
+              fi
+@@ -6083,27 +6993,33 @@ func_mode_link ()
+                   temp_xrpath=$func_stripname_result
+                   case " $xrpath " in
+                   *" $temp_xrpath "*) ;;
+-                  *) xrpath="$xrpath $temp_xrpath";;
++                  *) func_append xrpath " $temp_xrpath";;
+                   esac;;
+-             *) temp_deplibs="$temp_deplibs $libdir";;
++             *) func_append temp_deplibs " $libdir";;
+              esac
+            done
+            dependency_libs="$temp_deplibs"
+          fi
+ 
+-         newlib_search_path="$newlib_search_path $absdir"
++         func_append newlib_search_path " $absdir"
+          # Link against this library
+          test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+          # ... and its dependency_libs
+          tmp_libs=
+          for deplib in $dependency_libs; do
+            newdependency_libs="$deplib $newdependency_libs"
+-           if $opt_duplicate_deps ; then
++           case $deplib in
++              -L*) func_stripname '-L' '' "$deplib"
++                   func_resolve_sysroot "$func_stripname_result";;
++              *) func_resolve_sysroot "$deplib" ;;
++            esac
++           if $opt_preserve_dup_deps ; then
+              case "$tmp_libs " in
+-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++             *" $func_resolve_sysroot_result "*)
++                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+              esac
+            fi
+-           tmp_libs="$tmp_libs $deplib"
++           func_append tmp_libs " $func_resolve_sysroot_result"
+          done
+ 
+          if test "$link_all_deplibs" != no; then
+@@ -6113,8 +7029,10 @@ func_mode_link ()
+              case $deplib in
+              -L*) path="$deplib" ;;
+              *.la)
++               func_resolve_sysroot "$deplib"
++               deplib=$func_resolve_sysroot_result
+                func_dirname "$deplib" "" "."
+-               dir="$func_dirname_result"
++               dir=$func_dirname_result
+                # We need an absolute path.
+                case $dir in
+                [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+@@ -6130,7 +7048,7 @@ func_mode_link ()
+                case $host in
+                *-*-darwin*)
+                  depdepl=
+-                 deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++                 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+                  if test -n "$deplibrary_names" ; then
+                    for tmp in $deplibrary_names ; do
+                      depdepl=$tmp
+@@ -6141,8 +7059,8 @@ func_mode_link ()
+                       if test -z "$darwin_install_name"; then
+                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                       fi
+-                     compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+-                     linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
++                     func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
++                     func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+                      path=
+                    fi
+                  fi
+@@ -6152,7 +7070,7 @@ func_mode_link ()
+                  ;;
+                esac
+                else
+-                 libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+                  test -z "$libdir" && \
+                    func_fatal_error "\`$deplib' is not a valid libtool archive"
+                  test "$absdir" != "$libdir" && \
+@@ -6192,7 +7110,7 @@ func_mode_link ()
+          for dir in $newlib_search_path; do
+            case "$lib_search_path " in
+            *" $dir "*) ;;
+-           *) lib_search_path="$lib_search_path $dir" ;;
++           *) func_append lib_search_path " $dir" ;;
+            esac
+          done
+          newlib_search_path=
+@@ -6205,7 +7123,7 @@ func_mode_link ()
+        fi
+        for var in $vars dependency_libs; do
+          # Add libraries to $var in reverse order
+-         eval tmp_libs=\$$var
++         eval tmp_libs=\"\$$var\"
+          new_libs=
+          for deplib in $tmp_libs; do
+            # FIXME: Pedantically, this is the right thing to do, so
+@@ -6250,13 +7168,13 @@ func_mode_link ()
+            -L*)
+              case " $tmp_libs " in
+              *" $deplib "*) ;;
+-             *) tmp_libs="$tmp_libs $deplib" ;;
++             *) func_append tmp_libs " $deplib" ;;
+              esac
+              ;;
+-           *) tmp_libs="$tmp_libs $deplib" ;;
++           *) func_append tmp_libs " $deplib" ;;
+            esac
+          done
+-         eval $var=\$tmp_libs
++         eval $var=\"$tmp_libs\"
+        done # for var
+       fi
+       # Last step: remove runtime libs from dependency_libs
+@@ -6269,7 +7187,7 @@ func_mode_link ()
+          ;;
+        esac
+        if test -n "$i" ; then
+-         tmp_libs="$tmp_libs $i"
++         func_append tmp_libs " $i"
+        fi
+       done
+       dependency_libs=$tmp_libs
+@@ -6310,7 +7228,7 @@ func_mode_link ()
+       # Now set the variables for building old libraries.
+       build_libtool_libs=no
+       oldlibs="$output"
+-      objs="$objs$old_deplibs"
++      func_append objs "$old_deplibs"
+       ;;
+ 
+     lib)
+@@ -6319,8 +7237,8 @@ func_mode_link ()
+       lib*)
+        func_stripname 'lib' '.la' "$outputname"
+        name=$func_stripname_result
+-       eval "shared_ext=\"$shrext_cmds\""
+-       eval "libname=\"$libname_spec\""
++       eval shared_ext=\"$shrext_cmds\"
++       eval libname=\"$libname_spec\"
+        ;;
+       *)
+        test "$module" = no && \
+@@ -6330,8 +7248,8 @@ func_mode_link ()
+          # Add the "lib" prefix for modules if required
+          func_stripname '' '.la' "$outputname"
+          name=$func_stripname_result
+-         eval "shared_ext=\"$shrext_cmds\""
+-         eval "libname=\"$libname_spec\""
++         eval shared_ext=\"$shrext_cmds\"
++         eval libname=\"$libname_spec\"
+        else
+          func_stripname '' '.la' "$outputname"
+          libname=$func_stripname_result
+@@ -6346,7 +7264,7 @@ func_mode_link ()
+          echo
+          $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+          $ECHO "*** objects $objs is not portable!"
+-         libobjs="$libobjs $objs"
++         func_append libobjs " $objs"
+        fi
+       fi
+ 
+@@ -6544,7 +7462,7 @@ func_mode_link ()
+          done
+ 
+          # Make executables depend on our current version.
+-         verstring="$verstring:${current}.0"
++         func_append verstring ":${current}.0"
+          ;;
+ 
+        qnx)
+@@ -6612,10 +7530,10 @@ func_mode_link ()
+       fi
+ 
+       func_generate_dlsyms "$libname" "$libname" "yes"
+-      libobjs="$libobjs $symfileobj"
++      func_append libobjs " $symfileobj"
+       test "X$libobjs" = "X " && libobjs=
+ 
+-      if test "$mode" != relink; then
++      if test "$opt_mode" != relink; then
+        # Remove our outputs, but don't remove object files since they
+        # may have been created when compiling PIC objects.
+        removelist=
+@@ -6631,7 +7549,7 @@ func_mode_link ()
+                   continue
+                 fi
+               fi
+-              removelist="$removelist $p"
++              func_append removelist " $p"
+               ;;
+            *) ;;
+          esac
+@@ -6642,7 +7560,7 @@ func_mode_link ()
+ 
+       # Now set the variables for building old libraries.
+       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+-       oldlibs="$oldlibs $output_objdir/$libname.$libext"
++       func_append oldlibs " $output_objdir/$libname.$libext"
+ 
+        # Transform .lo files to .o files.
+        oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+@@ -6659,10 +7577,11 @@ func_mode_link ()
+        # If the user specified any rpath flags, then add them.
+        temp_xrpath=
+        for libdir in $xrpath; do
+-         temp_xrpath="$temp_xrpath -R$libdir"
++         func_replace_sysroot "$libdir"
++         func_append temp_xrpath " -R$func_replace_sysroot_result"
+          case "$finalize_rpath " in
+          *" $libdir "*) ;;
+-         *) finalize_rpath="$finalize_rpath $libdir" ;;
++         *) func_append finalize_rpath " $libdir" ;;
+          esac
+        done
+        if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+@@ -6676,7 +7595,7 @@ func_mode_link ()
+       for lib in $old_dlfiles; do
+        case " $dlprefiles $dlfiles " in
+        *" $lib "*) ;;
+-       *) dlfiles="$dlfiles $lib" ;;
++       *) func_append dlfiles " $lib" ;;
+        esac
+       done
+ 
+@@ -6686,7 +7605,7 @@ func_mode_link ()
+       for lib in $old_dlprefiles; do
+        case "$dlprefiles " in
+        *" $lib "*) ;;
+-       *) dlprefiles="$dlprefiles $lib" ;;
++       *) func_append dlprefiles " $lib" ;;
+        esac
+       done
+ 
+@@ -6698,7 +7617,7 @@ func_mode_link ()
+            ;;
+          *-*-rhapsody* | *-*-darwin1.[012])
+            # Rhapsody C library is in the System framework
+-           deplibs="$deplibs System.ltframework"
++           func_append deplibs " System.ltframework"
+            ;;
+          *-*-netbsd*)
+            # Don't link with libc until the a.out ld.so is fixed.
+@@ -6715,7 +7634,7 @@ func_mode_link ()
+          *)
+            # Add libc to deplibs on all other systems if necessary.
+            if test "$build_libtool_need_lc" = "yes"; then
+-             deplibs="$deplibs -lc"
++             func_append deplibs " -lc"
+            fi
+            ;;
+          esac
+@@ -6764,18 +7683,18 @@ EOF
+                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                  case " $predeps $postdeps " in
+                  *" $i "*)
+-                   newdeplibs="$newdeplibs $i"
++                   func_append newdeplibs " $i"
+                    i=""
+                    ;;
+                  esac
+                fi
+                if test -n "$i" ; then
+-                 eval "libname=\"$libname_spec\""
+-                 eval "deplib_matches=\"$library_names_spec\""
++                 libname=`eval "\\$ECHO \"$libname_spec\""`
++                 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+                  set dummy $deplib_matches; shift
+                  deplib_match=$1
+                  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-                   newdeplibs="$newdeplibs $i"
++                   func_append newdeplibs " $i"
+                  else
+                    droppeddeps=yes
+                    echo
+@@ -6789,7 +7708,7 @@ EOF
+                fi
+                ;;
+              *)
+-               newdeplibs="$newdeplibs $i"
++               func_append newdeplibs " $i"
+                ;;
+              esac
+            done
+@@ -6807,18 +7726,18 @@ EOF
+                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                    case " $predeps $postdeps " in
+                    *" $i "*)
+-                     newdeplibs="$newdeplibs $i"
++                     func_append newdeplibs " $i"
+                      i=""
+                      ;;
+                    esac
+                  fi
+                  if test -n "$i" ; then
+-                   eval "libname=\"$libname_spec\""
+-                   eval "deplib_matches=\"$library_names_spec\""
++                   libname=`eval "\\$ECHO \"$libname_spec\""`
++                   deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+                    set dummy $deplib_matches; shift
+                    deplib_match=$1
+                    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-                     newdeplibs="$newdeplibs $i"
++                     func_append newdeplibs " $i"
+                    else
+                      droppeddeps=yes
+                      echo
+@@ -6840,7 +7759,7 @@ EOF
+                fi
+                ;;
+              *)
+-               newdeplibs="$newdeplibs $i"
++               func_append newdeplibs " $i"
+                ;;
+              esac
+            done
+@@ -6857,15 +7776,27 @@ EOF
+              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                case " $predeps $postdeps " in
+                *" $a_deplib "*)
+-                 newdeplibs="$newdeplibs $a_deplib"
++                 func_append newdeplibs " $a_deplib"
+                  a_deplib=""
+                  ;;
+                esac
+              fi
+              if test -n "$a_deplib" ; then
+-               eval "libname=\"$libname_spec\""
++               libname=`eval "\\$ECHO \"$libname_spec\""`
++               if test -n "$file_magic_glob"; then
++                 libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
++               else
++                 libnameglob=$libname
++               fi
++               test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+                for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++                 if test "$want_nocaseglob" = yes; then
++                   shopt -s nocaseglob
++                   potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
++                   $nocaseglob
++                 else
++                   potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
++                 fi
+                  for potent_lib in $potential_libs; do
+                      # Follow soft links.
+                      if ls -lLd "$potent_lib" 2>/dev/null |
+@@ -6885,10 +7816,10 @@ EOF
+                        *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+                        esac
+                      done
+-                     if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
++                     if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+                         $SED -e 10q |
+                         $EGREP "$file_magic_regex" > /dev/null; then
+-                       newdeplibs="$newdeplibs $a_deplib"
++                       func_append newdeplibs " $a_deplib"
+                        a_deplib=""
+                        break 2
+                      fi
+@@ -6913,7 +7844,7 @@ EOF
+              ;;
+            *)
+              # Add a -L argument.
+-             newdeplibs="$newdeplibs $a_deplib"
++             func_append newdeplibs " $a_deplib"
+              ;;
+            esac
+          done # Gone through all deplibs.
+@@ -6929,20 +7860,20 @@ EOF
+              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                case " $predeps $postdeps " in
+                *" $a_deplib "*)
+-                 newdeplibs="$newdeplibs $a_deplib"
++                 func_append newdeplibs " $a_deplib"
+                  a_deplib=""
+                  ;;
+                esac
+              fi
+              if test -n "$a_deplib" ; then
+-               eval "libname=\"$libname_spec\""
++               libname=`eval "\\$ECHO \"$libname_spec\""`
+                for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                  for potent_lib in $potential_libs; do
+                    potlib="$potent_lib" # see symlink-check above in file_magic test
+                    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+                       $EGREP "$match_pattern_regex" > /dev/null; then
+-                     newdeplibs="$newdeplibs $a_deplib"
++                     func_append newdeplibs " $a_deplib"
+                      a_deplib=""
+                      break 2
+                    fi
+@@ -6967,7 +7898,7 @@ EOF
+              ;;
+            *)
+              # Add a -L argument.
+-             newdeplibs="$newdeplibs $a_deplib"
++             func_append newdeplibs " $a_deplib"
+              ;;
+            esac
+          done # Gone through all deplibs.
+@@ -7071,7 +8002,7 @@ EOF
+        *)
+          case " $deplibs " in
+          *" -L$path/$objdir "*)
+-           new_libs="$new_libs -L$path/$objdir" ;;
++           func_append new_libs " -L$path/$objdir" ;;
+          esac
+          ;;
+        esac
+@@ -7081,10 +8012,10 @@ EOF
+        -L*)
+          case " $new_libs " in
+          *" $deplib "*) ;;
+-         *) new_libs="$new_libs $deplib" ;;
++         *) func_append new_libs " $deplib" ;;
+          esac
+          ;;
+-       *) new_libs="$new_libs $deplib" ;;
++       *) func_append new_libs " $deplib" ;;
+        esac
+       done
+       deplibs="$new_libs"
+@@ -7101,10 +8032,12 @@ EOF
+          hardcode_libdirs=
+          dep_rpath=
+          rpath="$finalize_rpath"
+-         test "$mode" != relink && rpath="$compile_rpath$rpath"
++         test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+          for libdir in $rpath; do
+            if test -n "$hardcode_libdir_flag_spec"; then
+              if test -n "$hardcode_libdir_separator"; then
++               func_replace_sysroot "$libdir"
++               libdir=$func_replace_sysroot_result
+                if test -z "$hardcode_libdirs"; then
+                  hardcode_libdirs="$libdir"
+                else
+@@ -7113,18 +8046,18 @@ EOF
+                  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+                    ;;
+                  *)
+-                   hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++                   func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+                    ;;
+                  esac
+                fi
+              else
+-               eval "flag=\"$hardcode_libdir_flag_spec\""
+-               dep_rpath="$dep_rpath $flag"
++               eval flag=\"$hardcode_libdir_flag_spec\"
++               func_append dep_rpath " $flag"
+              fi
+            elif test -n "$runpath_var"; then
+              case "$perm_rpath " in
+              *" $libdir "*) ;;
+-             *) perm_rpath="$perm_rpath $libdir" ;;
++             *) func_apped perm_rpath " $libdir" ;;
+              esac
+            fi
+          done
+@@ -7133,40 +8066,38 @@ EOF
+             test -n "$hardcode_libdirs"; then
+            libdir="$hardcode_libdirs"
+            if test -n "$hardcode_libdir_flag_spec_ld"; then
+-             eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
++             eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+            else
+-             eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
++             eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+            fi
+          fi
+          if test -n "$runpath_var" && test -n "$perm_rpath"; then
+            # We should set the runpath_var.
+            rpath=
+            for dir in $perm_rpath; do
+-             rpath="$rpath$dir:"
++             func_append rpath "$dir:"
+            done
+-           eval $runpath_var=\$rpath\$$runpath_var
+-           export $runpath_var
++           eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+          fi
+          test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+        fi
+ 
+        shlibpath="$finalize_shlibpath"
+-       test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++       test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+        if test -n "$shlibpath"; then
+-         eval $shlibpath_var=\$shlibpath\$$shlibpath_var
+-         export $shlibpath_var
++         eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+        fi
+ 
+        # Get the real and link names of the library.
+-       eval "shared_ext=\"$shrext_cmds\""
+-       eval "library_names=\"$library_names_spec\""
++       eval shared_ext=\"$shrext_cmds\"
++       eval library_names=\"$library_names_spec\"
+        set dummy $library_names
+        shift
+        realname="$1"
+        shift
+ 
+        if test -n "$soname_spec"; then
+-         eval "soname=\"$soname_spec\""
++         eval soname=\"$soname_spec\"
+        else
+          soname="$realname"
+        fi
+@@ -7178,7 +8109,7 @@ EOF
+        linknames=
+        for link
+        do
+-         linknames="$linknames $link"
++         func_append linknames " $link"
+        done
+ 
+        # Use standard objects if they are pic
+@@ -7189,7 +8120,7 @@ EOF
+        if test -n "$export_symbols" && test -n "$include_expsyms"; then
+          $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+          export_symbols="$output_objdir/$libname.uexp"
+-         delfiles="$delfiles $export_symbols"
++         func_append delfiles " $export_symbols"
+        fi
+ 
+        orig_export_symbols=
+@@ -7220,13 +8151,45 @@ EOF
+            $opt_dry_run || $RM $export_symbols
+            cmds=$export_symbols_cmds
+            save_ifs="$IFS"; IFS='~'
+-           for cmd in $cmds; do
++           for cmd1 in $cmds; do
+              IFS="$save_ifs"
+-             eval "cmd=\"$cmd\""
+-             func_len " $cmd"
+-             len=$func_len_result
+-             if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++             # Take the normal branch if the nm_file_list_spec branch
++             # doesn't work or if tool conversion is not needed.
++             case $nm_file_list_spec~$to_tool_file_cmd in
++               *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
++                 try_normal_branch=yes
++                 eval cmd=\"$cmd1\"
++                 func_len " $cmd"
++                 len=$func_len_result
++                 ;;
++               *)
++                 try_normal_branch=no
++                 ;;
++             esac
++             if test "$try_normal_branch" = yes \
++                && { test "$len" -lt "$max_cmd_len" \
++                     || test "$max_cmd_len" -le -1; }
++             then
++               func_show_eval "$cmd" 'exit $?'
++               skipped_export=false
++             elif test -n "$nm_file_list_spec"; then
++               func_basename "$output"
++               output_la=$func_basename_result
++               save_libobjs=$libobjs
++               save_output=$output
++               output=${output_objdir}/${output_la}.nm
++               func_to_tool_file "$output"
++               libobjs=$nm_file_list_spec$func_to_tool_file_result
++               func_append delfiles " $output"
++               func_verbose "creating $NM input file list: $output"
++               for obj in $save_libobjs; do
++                 func_to_tool_file "$obj"
++                 $ECHO "$func_to_tool_file_result"
++               done > "$output"
++               eval cmd=\"$cmd1\"
+                func_show_eval "$cmd" 'exit $?'
++               output=$save_output
++               libobjs=$save_libobjs
+                skipped_export=false
+              else
+                # The command line is too long to execute in one step.
+@@ -7248,7 +8211,7 @@ EOF
+        if test -n "$export_symbols" && test -n "$include_expsyms"; then
+          tmp_export_symbols="$export_symbols"
+          test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+-         $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
++         $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+        fi
+ 
+        if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+@@ -7260,7 +8223,7 @@ EOF
+          # global variables. join(1) would be nice here, but unfortunately
+          # isn't a blessed tool.
+          $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+-         delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
++         func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+          export_symbols=$output_objdir/$libname.def
+          $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+        fi
+@@ -7270,7 +8233,7 @@ EOF
+          case " $convenience " in
+          *" $test_deplib "*) ;;
+          *)
+-           tmp_deplibs="$tmp_deplibs $test_deplib"
++           func_append tmp_deplibs " $test_deplib"
+            ;;
+          esac
+        done
+@@ -7286,43 +8249,43 @@ EOF
+          fi
+          if test -n "$whole_archive_flag_spec"; then
+            save_libobjs=$libobjs
+-           eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
++           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+            test "X$libobjs" = "X " && libobjs=
+          else
+            gentop="$output_objdir/${outputname}x"
+-           generated="$generated $gentop"
++           func_append generated " $gentop"
+ 
+            func_extract_archives $gentop $convenience
+-           libobjs="$libobjs $func_extract_archives_result"
++           func_append libobjs " $func_extract_archives_result"
+            test "X$libobjs" = "X " && libobjs=
+          fi
+        fi
+ 
+        if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+-         eval "flag=\"$thread_safe_flag_spec\""
+-         linker_flags="$linker_flags $flag"
++         eval flag=\"$thread_safe_flag_spec\"
++         func_append linker_flags " $flag"
+        fi
+ 
+        # Make a backup of the uninstalled library when relinking
+-       if test "$mode" = relink; then
+-         $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
++       if test "$opt_mode" = relink; then
++         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+        fi
+ 
+        # Do each of the archive commands.
+        if test "$module" = yes && test -n "$module_cmds" ; then
+          if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-           eval "test_cmds=\"$module_expsym_cmds\""
++           eval test_cmds=\"$module_expsym_cmds\"
+            cmds=$module_expsym_cmds
+          else
+-           eval "test_cmds=\"$module_cmds\""
++           eval test_cmds=\"$module_cmds\"
+            cmds=$module_cmds
+          fi
+        else
+          if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-           eval "test_cmds=\"$archive_expsym_cmds\""
++           eval test_cmds=\"$archive_expsym_cmds\"
+            cmds=$archive_expsym_cmds
+          else
+-           eval "test_cmds=\"$archive_cmds\""
++           eval test_cmds=\"$archive_cmds\"
+            cmds=$archive_cmds
+          fi
+        fi
+@@ -7366,10 +8329,13 @@ EOF
+            echo 'INPUT (' > $output
+            for obj in $save_libobjs
+            do
+-             $ECHO "$obj" >> $output
++             func_to_tool_file "$obj"
++             $ECHO "$func_to_tool_file_result" >> $output
+            done
+            echo ')' >> $output
+-           delfiles="$delfiles $output"
++           func_append delfiles " $output"
++           func_to_tool_file "$output"
++           output=$func_to_tool_file_result
+          elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+            output=${output_objdir}/${output_la}.lnk
+            func_verbose "creating linker input file list: $output"
+@@ -7383,15 +8349,17 @@ EOF
+            fi
+            for obj
+            do
+-             $ECHO "$obj" >> $output
++             func_to_tool_file "$obj"
++             $ECHO "$func_to_tool_file_result" >> $output
+            done
+-           delfiles="$delfiles $output"
+-           output=$firstobj\"$file_list_spec$output\"
++           func_append delfiles " $output"
++           func_to_tool_file "$output"
++           output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+          else
+            if test -n "$save_libobjs"; then
+              func_verbose "creating reloadable object files..."
+              output=$output_objdir/$output_la-${k}.$objext
+-             eval "test_cmds=\"$reload_cmds\""
++             eval test_cmds=\"$reload_cmds\"
+              func_len " $test_cmds"
+              len0=$func_len_result
+              len=$len0
+@@ -7411,12 +8379,12 @@ EOF
+                  if test "$k" -eq 1 ; then
+                    # The first file doesn't have a previous command to add.
+                    reload_objs=$objlist
+-                   eval "concat_cmds=\"$reload_cmds\""
++                   eval concat_cmds=\"$reload_cmds\"
+                  else
+                    # All subsequent reloadable object files will link in
+                    # the last one created.
+                    reload_objs="$objlist $last_robj"
+-                   eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
++                   eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+                  fi
+                  last_robj=$output_objdir/$output_la-${k}.$objext
+                  func_arith $k + 1
+@@ -7433,11 +8401,11 @@ EOF
+              # files will link in the last one created.
+              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+              reload_objs="$objlist $last_robj"
+-             eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
++             eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+              if test -n "$last_robj"; then
+-               eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
++               eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+              fi
+-             delfiles="$delfiles $output"
++             func_append delfiles " $output"
+ 
+            else
+              output=
+@@ -7450,9 +8418,9 @@ EOF
+              libobjs=$output
+              # Append the command to create the export file.
+              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+-             eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
++             eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+              if test -n "$last_robj"; then
+-               eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
++               eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+              fi
+            fi
+ 
+@@ -7471,7 +8439,7 @@ EOF
+                lt_exit=$?
+ 
+                # Restore the uninstalled library and exit
+-               if test "$mode" = relink; then
++               if test "$opt_mode" = relink; then
+                  ( cd "$output_objdir" && \
+                    $RM "${realname}T" && \
+                    $MV "${realname}U" "$realname" )
+@@ -7492,7 +8460,7 @@ EOF
+            if test -n "$export_symbols" && test -n "$include_expsyms"; then
+              tmp_export_symbols="$export_symbols"
+              test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+-             $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
++             $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+            fi
+ 
+            if test -n "$orig_export_symbols"; then
+@@ -7504,7 +8472,7 @@ EOF
+              # global variables. join(1) would be nice here, but unfortunately
+              # isn't a blessed tool.
+              $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+-             delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
++             func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+              export_symbols=$output_objdir/$libname.def
+              $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+            fi
+@@ -7515,7 +8483,7 @@ EOF
+          output=$save_output
+ 
+          if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+-           eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
++           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+            test "X$libobjs" = "X " && libobjs=
+          fi
+          # Expand the library linking commands again to reset the
+@@ -7539,23 +8507,23 @@ EOF
+ 
+        if test -n "$delfiles"; then
+          # Append the command to remove temporary files to $cmds.
+-         eval "cmds=\"\$cmds~\$RM $delfiles\""
++         eval cmds=\"\$cmds~\$RM $delfiles\"
+        fi
+ 
+        # Add any objects from preloaded convenience libraries
+        if test -n "$dlprefiles"; then
+          gentop="$output_objdir/${outputname}x"
+-         generated="$generated $gentop"
++         func_append generated " $gentop"
+ 
+          func_extract_archives $gentop $dlprefiles
+-         libobjs="$libobjs $func_extract_archives_result"
++         func_append libobjs " $func_extract_archives_result"
+          test "X$libobjs" = "X " && libobjs=
+        fi
+ 
+        save_ifs="$IFS"; IFS='~'
+        for cmd in $cmds; do
+          IFS="$save_ifs"
+-         eval "cmd=\"$cmd\""
++         eval cmd=\"$cmd\"
+          $opt_silent || {
+            func_quote_for_expand "$cmd"
+            eval "func_echo $func_quote_for_expand_result"
+@@ -7564,7 +8532,7 @@ EOF
+            lt_exit=$?
+ 
+            # Restore the uninstalled library and exit
+-           if test "$mode" = relink; then
++           if test "$opt_mode" = relink; then
+              ( cd "$output_objdir" && \
+                $RM "${realname}T" && \
+                $MV "${realname}U" "$realname" )
+@@ -7576,8 +8544,8 @@ EOF
+        IFS="$save_ifs"
+ 
+        # Restore the uninstalled library and exit
+-       if test "$mode" = relink; then
+-         $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
++       if test "$opt_mode" = relink; then
++         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+ 
+          if test -n "$convenience"; then
+            if test -z "$whole_archive_flag_spec"; then
+@@ -7656,17 +8624,20 @@ EOF
+ 
+       if test -n "$convenience"; then
+        if test -n "$whole_archive_flag_spec"; then
+-         eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
++         eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+          reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+        else
+          gentop="$output_objdir/${obj}x"
+-         generated="$generated $gentop"
++         func_append generated " $gentop"
+ 
+          func_extract_archives $gentop $convenience
+          reload_conv_objs="$reload_objs $func_extract_archives_result"
+        fi
+       fi
+ 
++      # If we're not building shared, we need to use non_pic_objs
++      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
++
+       # Create the old-style object.
+       reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+@@ -7690,7 +8661,7 @@ EOF
+        # Create an invalid libtool object if no PIC, so that we don't
+        # accidentally link it into a program.
+        # $show "echo timestamp > $libobj"
+-       # $opt_dry_run || echo timestamp > $libobj || exit $?
++       # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+        exit $EXIT_SUCCESS
+       fi
+ 
+@@ -7740,8 +8711,8 @@ EOF
+        if test "$tagname" = CXX ; then
+          case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+            10.[0123])
+-             compile_command="$compile_command ${wl}-bind_at_load"
+-             finalize_command="$finalize_command ${wl}-bind_at_load"
++             func_append compile_command " ${wl}-bind_at_load"
++             func_append finalize_command " ${wl}-bind_at_load"
+            ;;
+          esac
+        fi
+@@ -7761,7 +8732,7 @@ EOF
+        *)
+          case " $compile_deplibs " in
+          *" -L$path/$objdir "*)
+-           new_libs="$new_libs -L$path/$objdir" ;;
++           func_append new_libs " -L$path/$objdir" ;;
+          esac
+          ;;
+        esac
+@@ -7771,17 +8742,17 @@ EOF
+        -L*)
+          case " $new_libs " in
+          *" $deplib "*) ;;
+-         *) new_libs="$new_libs $deplib" ;;
++         *) func_append new_libs " $deplib" ;;
+          esac
+          ;;
+-       *) new_libs="$new_libs $deplib" ;;
++       *) func_append new_libs " $deplib" ;;
+        esac
+       done
+       compile_deplibs="$new_libs"
+ 
+ 
+-      compile_command="$compile_command $compile_deplibs"
+-      finalize_command="$finalize_command $finalize_deplibs"
++      func_append compile_command " $compile_deplibs"
++      func_append finalize_command " $finalize_deplibs"
+ 
+       if test -n "$rpath$xrpath"; then
+        # If the user specified any rpath flags, then add them.
+@@ -7789,7 +8760,7 @@ EOF
+          # This is the magic to use -rpath.
+          case "$finalize_rpath " in
+          *" $libdir "*) ;;
+-         *) finalize_rpath="$finalize_rpath $libdir" ;;
++         *) func_append finalize_rpath " $libdir" ;;
+          esac
+        done
+       fi
+@@ -7808,18 +8779,18 @@ EOF
+              *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+                ;;
+              *)
+-               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++               func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+                ;;
+              esac
+            fi
+          else
+-           eval "flag=\"$hardcode_libdir_flag_spec\""
+-           rpath="$rpath $flag"
++           eval flag=\"$hardcode_libdir_flag_spec\"
++           func_append rpath " $flag"
+          fi
+        elif test -n "$runpath_var"; then
+          case "$perm_rpath " in
+          *" $libdir "*) ;;
+-         *) perm_rpath="$perm_rpath $libdir" ;;
++         *) func_append perm_rpath " $libdir" ;;
+          esac
+        fi
+        case $host in
+@@ -7828,12 +8799,12 @@ EOF
+          case :$dllsearchpath: in
+          *":$libdir:"*) ;;
+          ::) dllsearchpath=$libdir;;
+-         *) dllsearchpath="$dllsearchpath:$libdir";;
++         *) func_append dllsearchpath ":$libdir";;
+          esac
+          case :$dllsearchpath: in
+          *":$testbindir:"*) ;;
+          ::) dllsearchpath=$testbindir;;
+-         *) dllsearchpath="$dllsearchpath:$testbindir";;
++         *) func_append dllsearchpath ":$testbindir";;
+          esac
+          ;;
+        esac
+@@ -7842,7 +8813,7 @@ EOF
+       if test -n "$hardcode_libdir_separator" &&
+         test -n "$hardcode_libdirs"; then
+        libdir="$hardcode_libdirs"
+-       eval "rpath=\" $hardcode_libdir_flag_spec\""
++       eval rpath=\" $hardcode_libdir_flag_spec\"
+       fi
+       compile_rpath="$rpath"
+ 
+@@ -7859,18 +8830,18 @@ EOF
+              *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+                ;;
+              *)
+-               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++               func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+                ;;
+              esac
+            fi
+          else
+-           eval "flag=\"$hardcode_libdir_flag_spec\""
+-           rpath="$rpath $flag"
++           eval flag=\"$hardcode_libdir_flag_spec\"
++           func_append rpath " $flag"
+          fi
+        elif test -n "$runpath_var"; then
+          case "$finalize_perm_rpath " in
+          *" $libdir "*) ;;
+-         *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++         *) func_append finalize_perm_rpath " $libdir" ;;
+          esac
+        fi
+       done
+@@ -7878,7 +8849,7 @@ EOF
+       if test -n "$hardcode_libdir_separator" &&
+         test -n "$hardcode_libdirs"; then
+        libdir="$hardcode_libdirs"
+-       eval "rpath=\" $hardcode_libdir_flag_spec\""
++       eval rpath=\" $hardcode_libdir_flag_spec\"
+       fi
+       finalize_rpath="$rpath"
+ 
+@@ -7921,6 +8892,12 @@ EOF
+        exit_status=0
+        func_show_eval "$link_command" 'exit_status=$?'
+ 
++       if test -n "$postlink_cmds"; then
++         func_to_tool_file "$output"
++         postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
++         func_execute_cmds "$postlink_cmds" 'exit $?'
++       fi
++
+        # Delete the generated files.
+        if test -f "$output_objdir/${outputname}S.${objext}"; then
+          func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+@@ -7943,7 +8920,7 @@ EOF
+          # We should set the runpath_var.
+          rpath=
+          for dir in $perm_rpath; do
+-           rpath="$rpath$dir:"
++           func_append rpath "$dir:"
+          done
+          compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+        fi
+@@ -7951,7 +8928,7 @@ EOF
+          # We should set the runpath_var.
+          rpath=
+          for dir in $finalize_perm_rpath; do
+-           rpath="$rpath$dir:"
++           func_append rpath "$dir:"
+          done
+          finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+        fi
+@@ -7966,6 +8943,13 @@ EOF
+        $opt_dry_run || $RM $output
+        # Link the executable and exit
+        func_show_eval "$link_command" 'exit $?'
++
++       if test -n "$postlink_cmds"; then
++         func_to_tool_file "$output"
++         postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
++         func_execute_cmds "$postlink_cmds" 'exit $?'
++       fi
++
+        exit $EXIT_SUCCESS
+       fi
+ 
+@@ -7999,6 +8983,12 @@ EOF
+ 
+       func_show_eval "$link_command" 'exit $?'
+ 
++      if test -n "$postlink_cmds"; then
++       func_to_tool_file "$output_objdir/$outputname"
++       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'`
++       func_execute_cmds "$postlink_cmds" 'exit $?'
++      fi
++
+       # Now create the wrapper script.
+       func_verbose "creating $output"
+ 
+@@ -8096,7 +9086,7 @@ EOF
+        else
+          oldobjs="$old_deplibs $non_pic_objects"
+          if test "$preload" = yes && test -f "$symfileobj"; then
+-           oldobjs="$oldobjs $symfileobj"
++           func_append oldobjs " $symfileobj"
+          fi
+        fi
+        addlibs="$old_convenience"
+@@ -8104,10 +9094,10 @@ EOF
+ 
+       if test -n "$addlibs"; then
+        gentop="$output_objdir/${outputname}x"
+-       generated="$generated $gentop"
++       func_append generated " $gentop"
+ 
+        func_extract_archives $gentop $addlibs
+-       oldobjs="$oldobjs $func_extract_archives_result"
++       func_append oldobjs " $func_extract_archives_result"
+       fi
+ 
+       # Do each command in the archive commands.
+@@ -8118,10 +9108,10 @@ EOF
+        # Add any objects from preloaded convenience libraries
+        if test -n "$dlprefiles"; then
+          gentop="$output_objdir/${outputname}x"
+-         generated="$generated $gentop"
++         func_append generated " $gentop"
+ 
+          func_extract_archives $gentop $dlprefiles
+-         oldobjs="$oldobjs $func_extract_archives_result"
++         func_append oldobjs " $func_extract_archives_result"
+        fi
+ 
+        # POSIX demands no paths to be encoded in archives.  We have
+@@ -8139,7 +9129,7 @@ EOF
+        else
+          echo "copying selected object files to avoid basename conflicts..."
+          gentop="$output_objdir/${outputname}x"
+-         generated="$generated $gentop"
++         func_append generated " $gentop"
+          func_mkdir_p "$gentop"
+          save_oldobjs=$oldobjs
+          oldobjs=
+@@ -8163,18 +9153,28 @@ EOF
+                esac
+              done
+              func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+-             oldobjs="$oldobjs $gentop/$newobj"
++             func_append oldobjs " $gentop/$newobj"
+              ;;
+-           *) oldobjs="$oldobjs $obj" ;;
++           *) func_append oldobjs " $obj" ;;
+            esac
+          done
+        fi
+-       eval "cmds=\"$old_archive_cmds\""
++       eval cmds=\"$old_archive_cmds\"
+ 
+        func_len " $cmds"
+        len=$func_len_result
+        if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+          cmds=$old_archive_cmds
++       elif test -n "$archiver_list_spec"; then
++         func_verbose "using command file archive linking..."
++         for obj in $oldobjs
++         do
++           func_to_tool_file "$obj"
++           $ECHO "$func_to_tool_file_result"
++         done > $output_objdir/$libname.libcmd
++         func_to_tool_file "$output_objdir/$libname.libcmd"
++         oldobjs=" $archiver_list_spec$func_to_tool_file_result"
++         cmds=$old_archive_cmds
+        else
+          # the command line is too long to link in one step, link in parts
+          func_verbose "using piecewise archive linking..."
+@@ -8189,7 +9189,7 @@ EOF
+          do
+            last_oldobj=$obj
+          done
+-         eval "test_cmds=\"$old_archive_cmds\""
++         eval test_cmds=\"$old_archive_cmds\"
+          func_len " $test_cmds"
+          len0=$func_len_result
+          len=$len0
+@@ -8208,7 +9208,7 @@ EOF
+                RANLIB=$save_RANLIB
+              fi
+              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+-             eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
++             eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+              objlist=
+              len=$len0
+            fi
+@@ -8216,9 +9216,9 @@ EOF
+          RANLIB=$save_RANLIB
+          oldobjs=$objlist
+          if test "X$oldobjs" = "X" ; then
+-           eval "cmds=\"\$concat_cmds\""
++           eval cmds=\"\$concat_cmds\"
+          else
+-           eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
++           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+          fi
+        fi
+       fi
+@@ -8268,12 +9268,23 @@ EOF
+              *.la)
+                func_basename "$deplib"
+                name="$func_basename_result"
+-               libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++               func_resolve_sysroot "$deplib"
++               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+                test -z "$libdir" && \
+                  func_fatal_error "\`$deplib' is not a valid libtool archive"
+-               newdependency_libs="$newdependency_libs $libdir/$name"
++               func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
++               ;;
++             -L*)
++               func_stripname -L '' "$deplib"
++               func_replace_sysroot "$func_stripname_result"
++               func_append newdependency_libs " -L$func_replace_sysroot_result"
+                ;;
+-             *) newdependency_libs="$newdependency_libs $deplib" ;;
++             -R*)
++               func_stripname -R '' "$deplib"
++               func_replace_sysroot "$func_stripname_result"
++               func_append newdependency_libs " -R$func_replace_sysroot_result"
++               ;;
++             *) func_append newdependency_libs " $deplib" ;;
+              esac
+            done
+            dependency_libs="$newdependency_libs"
+@@ -8284,12 +9295,14 @@ EOF
+              *.la)
+                func_basename "$lib"
+                name="$func_basename_result"
+-               libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++               func_resolve_sysroot "$lib"
++               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
++
+                test -z "$libdir" && \
+                  func_fatal_error "\`$lib' is not a valid libtool archive"
+-               newdlfiles="$newdlfiles $libdir/$name"
++               func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+                ;;
+-             *) newdlfiles="$newdlfiles $lib" ;;
++             *) func_append newdlfiles " $lib" ;;
+              esac
+            done
+            dlfiles="$newdlfiles"
+@@ -8303,10 +9316,11 @@ EOF
+                # the library:
+                func_basename "$lib"
+                name="$func_basename_result"
+-               libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++               func_resolve_sysroot "$lib"
++               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+                test -z "$libdir" && \
+                  func_fatal_error "\`$lib' is not a valid libtool archive"
+-               newdlprefiles="$newdlprefiles $libdir/$name"
++               func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+                ;;
+              esac
+            done
+@@ -8318,7 +9332,7 @@ EOF
+                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+                *) abs=`pwd`"/$lib" ;;
+              esac
+-             newdlfiles="$newdlfiles $abs"
++             func_append newdlfiles " $abs"
+            done
+            dlfiles="$newdlfiles"
+            newdlprefiles=
+@@ -8327,7 +9341,7 @@ EOF
+                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+                *) abs=`pwd`"/$lib" ;;
+              esac
+-             newdlprefiles="$newdlprefiles $abs"
++             func_append newdlprefiles " $abs"
+            done
+            dlprefiles="$newdlprefiles"
+          fi
+@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
+     exit $EXIT_SUCCESS
+ }
+ 
+-{ test "$mode" = link || test "$mode" = relink; } &&
++{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+     func_mode_link ${1+"$@"}
+ 
+ 
+@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
+     for arg
+     do
+       case $arg in
+-      -f) RM="$RM $arg"; rmforce=yes ;;
+-      -*) RM="$RM $arg" ;;
+-      *) files="$files $arg" ;;
++      -f) func_append RM " $arg"; rmforce=yes ;;
++      -*) func_append RM " $arg" ;;
++      *) func_append files " $arg" ;;
+       esac
+     done
+ 
+@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
+ 
+     rmdirs=
+ 
+-    origobjdir="$objdir"
+     for file in $files; do
+       func_dirname "$file" "" "."
+       dir="$func_dirname_result"
+       if test "X$dir" = X.; then
+-       objdir="$origobjdir"
++       odir="$objdir"
+       else
+-       objdir="$dir/$origobjdir"
++       odir="$dir/$objdir"
+       fi
+       func_basename "$file"
+       name="$func_basename_result"
+-      test "$mode" = uninstall && objdir="$dir"
++      test "$opt_mode" = uninstall && odir="$dir"
+ 
+-      # Remember objdir for removal later, being careful to avoid duplicates
+-      if test "$mode" = clean; then
++      # Remember odir for removal later, being careful to avoid duplicates
++      if test "$opt_mode" = clean; then
+        case " $rmdirs " in
+-         *" $objdir "*) ;;
+-         *) rmdirs="$rmdirs $objdir" ;;
++         *" $odir "*) ;;
++         *) func_append rmdirs " $odir" ;;
+        esac
+       fi
+ 
+@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
+ 
+          # Delete the libtool libraries and symlinks.
+          for n in $library_names; do
+-           rmfiles="$rmfiles $objdir/$n"
++           func_append rmfiles " $odir/$n"
+          done
+-         test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
++         test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+ 
+-         case "$mode" in
++         case "$opt_mode" in
+          clean)
+-           case "  $library_names " in
+-           # "  " in the beginning catches empty $dlname
++           case " $library_names " in
+            *" $dlname "*) ;;
+-           *) rmfiles="$rmfiles $objdir/$dlname" ;;
++           *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+            esac
+-           test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++           test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+            ;;
+          uninstall)
+            if test -n "$library_names"; then
+@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
+          # Add PIC object to the list of files to remove.
+          if test -n "$pic_object" &&
+             test "$pic_object" != none; then
+-           rmfiles="$rmfiles $dir/$pic_object"
++           func_append rmfiles " $dir/$pic_object"
+          fi
+ 
+          # Add non-PIC object to the list of files to remove.
+          if test -n "$non_pic_object" &&
+             test "$non_pic_object" != none; then
+-           rmfiles="$rmfiles $dir/$non_pic_object"
++           func_append rmfiles " $dir/$non_pic_object"
+          fi
+        fi
+        ;;
+ 
+       *)
+-       if test "$mode" = clean ; then
++       if test "$opt_mode" = clean ; then
+          noexename=$name
+          case $file in
+          *.exe)
+@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
+            noexename=$func_stripname_result
+            # $file with .exe has already been added to rmfiles,
+            # add $file without .exe
+-           rmfiles="$rmfiles $file"
++           func_append rmfiles " $file"
+            ;;
+          esac
+          # Do a test to see if this is a libtool program.
+@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
+              func_ltwrapper_scriptname "$file"
+              relink_command=
+              func_source $func_ltwrapper_scriptname_result
+-             rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
++             func_append rmfiles " $func_ltwrapper_scriptname_result"
+            else
+              relink_command=
+              func_source $dir/$noexename
+@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
+ 
+            # note $name still contains .exe if it was in $file originally
+            # as does the version of $file that was added into $rmfiles
+-           rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
++           func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+            if test "$fast_install" = yes && test -n "$relink_command"; then
+-             rmfiles="$rmfiles $objdir/lt-$name"
++             func_append rmfiles " $odir/lt-$name"
+            fi
+            if test "X$noexename" != "X$name" ; then
+-             rmfiles="$rmfiles $objdir/lt-${noexename}.c"
++             func_append rmfiles " $odir/lt-${noexename}.c"
+            fi
+          fi
+        fi
+@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
+       esac
+       func_show_eval "$RM $rmfiles" 'exit_status=1'
+     done
+-    objdir="$origobjdir"
+ 
+     # Try to remove the ${objdir}s in the directories where we deleted files
+     for dir in $rmdirs; do
+@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
+     exit $exit_status
+ }
+ 
+-{ test "$mode" = uninstall || test "$mode" = clean; } &&
++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+     func_mode_uninstall ${1+"$@"}
+ 
+-test -z "$mode" && {
++test -z "$opt_mode" && {
+   help="$generic_help"
+   func_fatal_help "you must specify a MODE"
+ }
+ 
+ test -z "$exec_cmd" && \
+-  func_fatal_help "invalid operation mode \`$mode'"
++  func_fatal_help "invalid operation mode \`$opt_mode'"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec "$exec_cmd"
+diff --git a/ltoptions.m4 b/ltoptions.m4
+index 5ef12ce..17cfd51 100644
+--- a/ltoptions.m4
++++ b/ltoptions.m4
+@@ -8,7 +8,7 @@
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+ 
+-# serial 6 ltoptions.m4
++# serial 7 ltoptions.m4
+ 
+ # This is to help aclocal find these macros, as it can't see m4_define.
+ AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+diff --git a/ltversion.m4 b/ltversion.m4
+index bf87f77..9c7b5d4 100644
+--- a/ltversion.m4
++++ b/ltversion.m4
+@@ -7,17 +7,17 @@
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+ 
+-# Generated from ltversion.in.
++# @configure_input@
+ 
+-# serial 3134 ltversion.m4
++# serial 3293 ltversion.m4
+ # This file is part of GNU Libtool
+ 
+-m4_define([LT_PACKAGE_VERSION], [2.2.7a])
+-m4_define([LT_PACKAGE_REVISION], [1.3134])
++m4_define([LT_PACKAGE_VERSION], [2.4])
++m4_define([LT_PACKAGE_REVISION], [1.3293])
+ 
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.7a'
+-macro_revision='1.3134'
++[macro_version='2.4'
++macro_revision='1.3293'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
+index bf92b5e..c573da9 100644
+--- a/lt~obsolete.m4
++++ b/lt~obsolete.m4
+@@ -7,7 +7,7 @@
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+ 
+-# serial 4 lt~obsolete.m4
++# serial 5 lt~obsolete.m4
+ 
+ # These exist entirely to fool aclocal when bootstrapping libtool.
+ #
+diff --git a/opcodes/configure b/opcodes/configure
+index c9c04ce..31141d9 100755
+--- a/opcodes/configure
++++ b/opcodes/configure
+@@ -648,6 +648,9 @@ OTOOL
  LIPO
  NMEDIT
  DSYMUTIL
 +MANIFEST_TOOL
- RANLIB
 +ac_ct_AR
- AR
 +DLLTOOL
  OBJDUMP
  LN_S
  NM
-@@ -776,6 +779,7 @@ enable_static
+@@ -760,6 +763,7 @@ enable_static
  with_pic
  enable_fast_install
  with_gnu_ld
 +with_libtool_sysroot
  enable_libtool_lock
- enable_plugins
- enable_largefile
-@@ -1453,6 +1457,8 @@ Optional Packages:
+ enable_targets
+ enable_werror
+@@ -1420,6 +1424,8 @@ Optional Packages:
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
 +  --with-libtool-sysroot=DIR Search for dependent libraries within DIR
 +                        (or the compiler's sysroot if not specified).
-   --with-lib-path=dir1:dir2...  set default LIB_PATH
-   --with-sysroot=DIR Search for usr/lib et al within DIR.
-   --with-zlib             include zlib support (auto/yes/no) default=auto
-@@ -5645,8 +5651,8 @@ esac
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -5110,8 +5116,8 @@ esac
  
  
  
@@ -16701,7 +17474,7 @@ Index: binutils-2.24/ld/configure
  
  
  
-@@ -5686,7 +5692,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+@@ -5151,7 +5157,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  $as_echo_n "checking how to print strings... " >&6; }
  # Test print first, because it will be a builtin if present.
@@ -16710,7 +17483,7 @@ Index: binutils-2.24/ld/configure
     test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
    ECHO='print -r --'
  elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-@@ -6372,8 +6378,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
+@@ -5837,8 +5843,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  # Try some XSI features
  xsi_shell=no
  ( _lt_dummy="a/b/c"
@@ -16721,7 +17494,7 @@ Index: binutils-2.24/ld/configure
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
-@@ -6422,6 +6428,80 @@ esac
+@@ -5887,6 +5893,80 @@ esac
  
  
  
@@ -16802,7 +17575,7 @@ Index: binutils-2.24/ld/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  $as_echo_n "checking for $LD option to reload object files... " >&6; }
  if test "${lt_cv_ld_reload_flag+set}" = set; then :
-@@ -6438,6 +6518,11 @@ case $reload_flag in
+@@ -5903,6 +5983,11 @@ case $reload_flag in
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  case $host_os in
@@ -16814,7 +17587,7 @@ Index: binutils-2.24/ld/configure
    darwin*)
      if test "$GCC" = yes; then
        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -6606,7 +6691,8 @@ mingw* | pw32*)
+@@ -6071,7 +6156,8 @@ mingw* | pw32*)
      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
      lt_cv_file_magic_cmd='func_win32_libid'
    else
@@ -16824,7 +17597,7 @@ Index: binutils-2.24/ld/configure
      lt_cv_file_magic_cmd='$OBJDUMP -f'
    fi
    ;;
-@@ -6760,6 +6846,21 @@ esac
+@@ -6225,6 +6311,21 @@ esac
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -16846,7 +17619,7 @@ Index: binutils-2.24/ld/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6775,9 +6876,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -6240,9 +6341,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
  
  
@@ -16860,7 +17633,9 @@ Index: binutils-2.24/ld/configure
 +
 +
 +
-+if test -n "$ac_tool_prefix"; then
+ if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
 +  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -17001,9 +17776,7 @@ Index: binutils-2.24/ld/configure
 +
 +
 +
- if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ar; ac_word=$2
++if test -n "$ac_tool_prefix"; then
 +  for ac_prog in ar
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -17011,7 +17784,7 @@ Index: binutils-2.24/ld/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then :
-@@ -6793,7 +7047,7 @@ do
+@@ -6258,7 +6512,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -17020,7 +17793,7 @@ Index: binutils-2.24/ld/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6813,11 +7067,15 @@ $as_echo "no" >&6; }
+@@ -6278,11 +6532,15 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -17039,7 +17812,7 @@ Index: binutils-2.24/ld/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-@@ -6833,7 +7091,7 @@ do
+@@ -6298,7 +6556,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -17048,7 +17821,7 @@ Index: binutils-2.24/ld/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6852,6 +7110,10 @@ else
+@@ -6317,6 +6575,10 @@ else
  $as_echo "no" >&6; }
  fi
  
@@ -17059,7 +17832,7 @@ Index: binutils-2.24/ld/configure
    if test "x$ac_ct_AR" = x; then
      AR="false"
    else
-@@ -6863,12 +7125,12 @@ ac_tool_warned=yes ;;
+@@ -6328,16 +6590,72 @@ ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
    fi
@@ -17073,13 +17846,15 @@ Index: binutils-2.24/ld/configure
 +: ${AR_FLAGS=cru}
 +
 +
- 
- 
- 
-@@ -6878,6 +7140,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
- 
- 
- 
++
++
++
++
++
++
++
++
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 +$as_echo_n "checking for archiver @FILE support... " >&6; }
 +if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -17092,7 +17867,7 @@ Index: binutils-2.24/ld/configure
 +int
 +main ()
 +{
-+
+ 
 +  ;
 +  return 0;
 +}
@@ -17118,28 +17893,23 @@ Index: binutils-2.24/ld/configure
 +        fi
 +      fi
 +      rm -f conftest.* libconftest.a
-+
+ 
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 +$as_echo "$lt_cv_ar_at_file" >&6; }
-+
+ 
 +if test "x$lt_cv_ar_at_file" = xno; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
 +fi
-+
-+
-+
-+
-+
  
  
- if test -n "$ac_tool_prefix"; then
-@@ -7214,8 +7532,8 @@ esac
+ 
+@@ -6679,8 +6997,8 @@ esac
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
  # Transform an extracted symbol line into symbol name and symbol address
@@ -17150,7 +17920,7 @@ Index: binutils-2.24/ld/configure
  
  # Handle CRLF in mingw tool chain
  opt_cr=
-@@ -7251,6 +7569,7 @@ for ac_symprfx in "" "_"; do
+@@ -6716,6 +7034,7 @@ for ac_symprfx in "" "_"; do
    else
      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
    fi
@@ -17158,7 +17928,7 @@ Index: binutils-2.24/ld/configure
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -7292,6 +7611,18 @@ _LT_EOF
+@@ -6757,6 +7076,18 @@ _LT_EOF
        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
         if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
           cat <<_LT_EOF > conftest.$ac_ext
@@ -17177,7 +17947,7 @@ Index: binutils-2.24/ld/configure
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -7303,7 +7634,7 @@ _LT_EOF
+@@ -6768,7 +7099,7 @@ _LT_EOF
           cat <<_LT_EOF >> conftest.$ac_ext
  
  /* The mapping between symbol names and symbols.  */
@@ -17186,7 +17956,7 @@ Index: binutils-2.24/ld/configure
    const char *name;
    void       *address;
  }
-@@ -7329,8 +7660,8 @@ static const void *lt_preloaded_setup() {
+@@ -6794,8 +7125,8 @@ static const void *lt_preloaded_setup() {
  _LT_EOF
           # Now try linking the two files.
           mv conftest.$ac_objext conftstm.$ac_objext
@@ -17197,7 +17967,7 @@ Index: binutils-2.24/ld/configure
           LIBS="conftstm.$ac_objext"
           CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
           if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -7340,8 +7671,8 @@ _LT_EOF
+@@ -6805,8 +7136,8 @@ _LT_EOF
    test $ac_status = 0; } && test -s conftest${ac_exeext}; then
             pipe_works=yes
           fi
@@ -17208,7 +17978,7 @@ Index: binutils-2.24/ld/configure
         else
           echo "cannot find nm_test_func in $nlist" >&5
         fi
-@@ -7378,6 +7709,19 @@ else
+@@ -6843,6 +7174,16 @@ else
  $as_echo "ok" >&6; }
  fi
  
@@ -17222,16 +17992,15 @@ Index: binutils-2.24/ld/configure
 +
 +
 +
-+
-+
-+
  
  
  
-@@ -7398,6 +7742,42 @@ fi
+@@ -6864,6 +7205,45 @@ fi
  
  
  
++
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 +$as_echo_n "checking for sysroot... " >&6; }
 +
@@ -17268,10 +18037,11 @@ Index: binutils-2.24/ld/configure
 +
 +
 +
- 
++
  # Check whether --enable-libtool-lock was given.
  if test "${enable_libtool_lock+set}" = set; then :
-@@ -7605,6 +7985,123 @@ esac
+   enableval=$enable_libtool_lock;
+@@ -7070,6 +7450,123 @@ esac
  
  need_locks="$enable_libtool_lock"
  
@@ -17395,7 +18165,7 @@ Index: binutils-2.24/ld/configure
  
    case $host_os in
      rhapsody* | darwin*)
-@@ -8168,6 +8665,8 @@ _LT_EOF
+@@ -7633,6 +8130,8 @@ _LT_EOF
        $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
        echo "$AR cru libconftest.a conftest.o" >&5
        $AR cru libconftest.a conftest.o 2>&5
@@ -17404,24 +18174,7 @@ Index: binutils-2.24/ld/configure
        cat > conftest.c << _LT_EOF
  int main() { return 0;}
  _LT_EOF
-@@ -8236,6 +8735,16 @@ done
- 
- 
- 
-+func_stripname_cnf ()
-+{
-+  case ${2} in
-+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+  esac
-+} # func_stripname_cnf
-+
-+
-+
- 
- 
- # Set options
-@@ -8364,7 +8873,8 @@ fi
+@@ -7798,7 +8297,8 @@ fi
  LIBTOOL_DEPS="$ltmain"
  
  # Always use our own libtool.
@@ -17431,7 +18184,7 @@ Index: binutils-2.24/ld/configure
  
  
  
-@@ -8453,7 +8963,7 @@ aix3*)
+@@ -7887,7 +8387,7 @@ aix3*)
  esac
  
  # Global variables:
@@ -17440,7 +18193,7 @@ Index: binutils-2.24/ld/configure
  can_build_shared=yes
  
  # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -8751,8 +9261,6 @@ fi
+@@ -8185,8 +8685,6 @@ fi
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -17449,7 +18202,7 @@ Index: binutils-2.24/ld/configure
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -8918,6 +9426,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8352,6 +8850,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         lt_prog_compiler_pic='--shared'
         lt_prog_compiler_static='--static'
         ;;
@@ -17462,7 +18215,7 @@ Index: binutils-2.24/ld/configure
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          # Portland Group compilers (*not* the Pentium gcc compiler,
         # which looks to be a dead project)
-@@ -8980,7 +9494,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8414,7 +8918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -17471,7 +18224,7 @@ Index: binutils-2.24/ld/configure
         lt_prog_compiler_wl='-Qoption ld ';;
        *)
         lt_prog_compiler_wl='-Wl,';;
-@@ -9037,13 +9551,17 @@ case $host_os in
+@@ -8471,13 +8975,17 @@ case $host_os in
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -17495,7 +18248,7 @@ Index: binutils-2.24/ld/configure
  
  #
  # Check to make sure the PIC flag actually works.
-@@ -9104,6 +9622,11 @@ fi
+@@ -8538,6 +9046,11 @@ fi
  
  
  
@@ -17507,7 +18260,7 @@ Index: binutils-2.24/ld/configure
  #
  # Check to make sure the static flag actually works.
  #
-@@ -9454,7 +9977,8 @@ _LT_EOF
+@@ -8888,7 +9401,8 @@ _LT_EOF
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -17517,7 +18270,7 @@ Index: binutils-2.24/ld/configure
  
        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9502,7 +10026,7 @@ _LT_EOF
+@@ -8936,7 +9450,7 @@ _LT_EOF
        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
          && test "$tmp_diet" = no
        then
@@ -17526,7 +18279,7 @@ Index: binutils-2.24/ld/configure
         tmp_sharedflag='-shared'
         case $cc_basename,$host_cpu in
          pgcc*)                         # Portland Group C compiler
-@@ -9553,12 +10077,12 @@ _LT_EOF
+@@ -8987,12 +9501,12 @@ _LT_EOF
           whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
           hardcode_libdir_flag_spec=
           hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -17541,7 +18294,7 @@ Index: binutils-2.24/ld/configure
           fi
           ;;
         esac
-@@ -9572,8 +10096,8 @@ _LT_EOF
+@@ -9006,8 +9520,8 @@ _LT_EOF
         archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
         wlarc=
        else
@@ -17552,7 +18305,7 @@ Index: binutils-2.24/ld/configure
        fi
        ;;
  
-@@ -9591,8 +10115,8 @@ _LT_EOF
+@@ -9025,8 +9539,8 @@ _LT_EOF
  
  _LT_EOF
        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17563,7 +18316,7 @@ Index: binutils-2.24/ld/configure
        else
         ld_shlibs=no
        fi
-@@ -9638,8 +10162,8 @@ _LT_EOF
+@@ -9072,8 +9586,8 @@ _LT_EOF
  
      *)
        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17574,7 +18327,7 @@ Index: binutils-2.24/ld/configure
        else
         ld_shlibs=no
        fi
-@@ -9769,7 +10293,13 @@ _LT_EOF
+@@ -9203,7 +9717,13 @@ _LT_EOF
         allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -17589,7 +18342,7 @@ Index: binutils-2.24/ld/configure
  /* end confdefs.h.  */
  
  int
-@@ -9782,22 +10312,29 @@ main ()
+@@ -9216,22 +9736,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -17632,7 +18385,7 @@ Index: binutils-2.24/ld/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
          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"
-@@ -9809,7 +10346,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9243,7 +9770,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         else
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -17647,7 +18400,7 @@ Index: binutils-2.24/ld/configure
  /* end confdefs.h.  */
  
  int
-@@ -9822,22 +10365,29 @@ main ()
+@@ -9256,22 +9789,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -17690,11 +18443,10 @@ Index: binutils-2.24/ld/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
           # Warning - without using the other run time loading flags,
-@@ -9881,21 +10431,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       # When not using gcc, we currently assume that we are using
+@@ -9316,20 +9856,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
--      # no search path for DLLs.
+       # no search path for DLLs.
 -      hardcode_libdir_flag_spec=' '
 -      allow_undefined_flag=unsupported
 -      # Tell ltmain to make .lib files, not .a files.
@@ -17709,7 +18461,6 @@ Index: binutils-2.24/ld/configure
 -      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
 -      fix_srcfile_path='`cygpath -w "$srcfile"`'
 -      enable_shared_with_static_runtimes=yes
-+      # no search path for DLLs.
 +      case $cc_basename in
 +      cl*)
 +       # Native MSVC
@@ -17770,7 +18521,7 @@ Index: binutils-2.24/ld/configure
        ;;
  
      darwin* | rhapsody*)
-@@ -9956,7 +10549,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
@@ -17779,7 +18530,7 @@ Index: binutils-2.24/ld/configure
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9964,7 +10557,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9398,7 +9981,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -17788,7 +18539,7 @@ Index: binutils-2.24/ld/configure
        else
         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'
        fi
-@@ -9980,7 +10573,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9414,7 +9997,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
      hpux10*)
        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -17797,7 +18548,7 @@ Index: binutils-2.24/ld/configure
        else
         archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10004,10 +10597,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9438,10 +10021,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
           archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
           ;;
         ia64*)
@@ -17810,7 +18561,7 @@ Index: binutils-2.24/ld/configure
           ;;
         esac
        else
-@@ -10086,23 +10679,36 @@ fi
+@@ -9520,23 +10103,36 @@ fi
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -17855,7 +18606,7 @@ Index: binutils-2.24/ld/configure
        else
         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'
         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'
-@@ -10187,7 +10793,7 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9621,7 +10217,7 @@ rm -f core conftest.err conftest.$ac_objext \
      osf4* | osf5*)     # as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
         allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -17864,7 +18615,7 @@ Index: binutils-2.24/ld/configure
         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
         allow_undefined_flag=' -expect_unresolved \*'
-@@ -10206,9 +10812,9 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9640,9 +10236,9 @@ rm -f core conftest.err conftest.$ac_objext \
        no_undefined_flag=' -z defs'
        if test "$GCC" = yes; then
         wlarc='${wl}'
@@ -17876,7 +18627,7 @@ Index: binutils-2.24/ld/configure
        else
         case `$CC -V 2>&1` in
         *"Compilers 5.0"*)
-@@ -10784,8 +11390,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10218,8 +10814,9 @@ cygwin* | mingw* | pw32* | cegcc*)
    need_version=no
    need_lib_prefix=no
  
@@ -17888,7 +18639,7 @@ Index: binutils-2.24/ld/configure
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -10818,13 +11425,71 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10252,13 +10849,71 @@ cygwin* | mingw* | pw32* | cegcc*)
        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
        ;;
      esac
@@ -17961,7 +18712,7 @@ Index: binutils-2.24/ld/configure
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
    ;;
-@@ -10916,7 +11581,7 @@ haiku*)
+@@ -10350,7 +11005,7 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -17970,16 +18721,7 @@ Index: binutils-2.24/ld/configure
    hardcode_into_libs=yes
    ;;
  
-@@ -11712,7 +12377,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11715 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11756,10 +12421,10 @@ else
+@@ -11190,10 +11845,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -17992,16 +18734,7 @@ Index: binutils-2.24/ld/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11818,7 +12483,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11821 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11862,10 +12527,10 @@ else
+@@ -11296,10 +11951,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -18014,612 +18747,16 @@ Index: binutils-2.24/ld/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12257,6 +12922,7 @@ $RM -r conftest*
- 
-   # Allow CC to be a program name with arguments.
-   lt_save_CC=$CC
-+  lt_save_CFLAGS=$CFLAGS
-   lt_save_LD=$LD
-   lt_save_GCC=$GCC
-   GCC=$GXX
-@@ -12274,6 +12940,7 @@ $RM -r conftest*
+@@ -12450,7 +13105,7 @@ if test "$enable_shared" = "yes"; then
+ # since libbfd may not pull in the entirety of libiberty.
+   x=`sed -n -e 's/^[   ]*PICFLAG[      ]*=[    ]*//p' < ../libiberty/Makefile | sed -n '$p'`
+   if test -n "$x"; then
+-    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
++    SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
    fi
-   test -z "${LDCXX+set}" || LD=$LDCXX
-   CC=${CXX-"c++"}
-+  CFLAGS=$CXXFLAGS
-   compiler=$CC
-   compiler_CXX=$CC
-   for cc_temp in $compiler""; do
-@@ -12413,8 +13080,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
-       # Check if GNU C++ uses GNU ld as the underlying linker, since the
-       # archiving commands below assume that GNU ld is being used.
-       if test "$with_gnu_ld" = yes; then
--        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        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'
-+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        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'
- 
-         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12556,7 +13223,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
-           allow_undefined_flag_CXX='-berok'
-           # Determine the default libpath from the value encoded in an empty
-           # executable.
--          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+          if test "${lt_cv_aix_libpath+set}" = set; then
-+  aix_libpath=$lt_cv_aix_libpath
-+else
-+  if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -12569,22 +13242,29 @@ main ()
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
- 
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--       /^0/ {
--           s/^0  *\(.*\)$/\1/
--           p
--       }
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi
-+  lt_aix_libpath_sed='
-+      /Import File Strings/,/^$/ {
-+         /^0/ {
-+             s/^0  *\([^ ]*\) *$/\1/
-+             p
-+         }
-+      }'
-+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  # Check for a 64-bit object if we didn't find anything.
-+  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-+  fi
-+
-+fi
-+
-+  aix_libpath=$lt_cv_aix_libpath__CXX
-+fi
- 
-           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
-@@ -12597,7 +13277,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-           else
-            # Determine the default libpath from the value encoded in an
-            # empty executable.
--           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+           if test "${lt_cv_aix_libpath+set}" = set; then
-+  aix_libpath=$lt_cv_aix_libpath
-+else
-+  if test "${lt_cv_aix_libpath__CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -12610,22 +13296,29 @@ main ()
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
- 
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--       /^0/ {
--           s/^0  *\(.*\)$/\1/
--           p
--       }
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi
-+  lt_aix_libpath_sed='
-+      /Import File Strings/,/^$/ {
-+         /^0/ {
-+             s/^0  *\([^ ]*\) *$/\1/
-+             p
-+         }
-+      }'
-+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  # Check for a 64-bit object if we didn't find anything.
-+  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-+  fi
-+
-+fi
-+
-+  aix_libpath=$lt_cv_aix_libpath__CXX
-+fi
  
-            hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-            # Warning - without using the other run time loading flags,
-@@ -12668,29 +13361,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-         ;;
- 
-       cygwin* | mingw* | pw32* | cegcc*)
--        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
--        # as there is no search path for DLLs.
--        hardcode_libdir_flag_spec_CXX='-L$libdir'
--        export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
--        allow_undefined_flag_CXX=unsupported
--        always_export_symbols_CXX=no
--        enable_shared_with_static_runtimes_CXX=yes
--
--        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
--          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'
--          # If the export-symbols file already is a .def file (1st line
--          # is EXPORTS), use it as is; otherwise, prepend...
--          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--           cp $export_symbols $output_objdir/$soname.def;
--          else
--           echo EXPORTS > $output_objdir/$soname.def;
--           cat $export_symbols >> $output_objdir/$soname.def;
--          fi~
--          $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'
--        else
--          ld_shlibs_CXX=no
--        fi
--        ;;
-+       case $GXX,$cc_basename in
-+       ,cl* | no,cl*)
-+         # Native MSVC
-+         # hardcode_libdir_flag_spec is actually meaningless, as there is
-+         # no search path for DLLs.
-+         hardcode_libdir_flag_spec_CXX=' '
-+         allow_undefined_flag_CXX=unsupported
-+         always_export_symbols_CXX=yes
-+         file_list_spec_CXX='@'
-+         # Tell ltmain to make .lib files, not .a files.
-+         libext=lib
-+         # Tell ltmain to make .dll files, not .so files.
-+         shrext_cmds=".dll"
-+         # FIXME: Setting linknames here is a bad hack.
-+         archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+         archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+             $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+           else
-+             $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+           fi~
-+           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+           linknames='
-+         # The linker will not automatically build a static lib if we build a DLL.
-+         # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
-+         enable_shared_with_static_runtimes_CXX=yes
-+         # Don't use ranlib
-+         old_postinstall_cmds_CXX='chmod 644 $oldlib'
-+         postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-+           lt_tool_outputfile="@TOOL_OUTPUT@"~
-+           case $lt_outputfile in
-+             *.exe|*.EXE) ;;
-+             *)
-+               lt_outputfile="$lt_outputfile.exe"
-+               lt_tool_outputfile="$lt_tool_outputfile.exe"
-+               ;;
-+           esac~
-+           func_to_tool_file "$lt_outputfile"~
-+           if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+             $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+             $RM "$lt_outputfile.manifest";
-+           fi'
-+         ;;
-+       *)
-+         # g++
-+         # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-+         # as there is no search path for DLLs.
-+         hardcode_libdir_flag_spec_CXX='-L$libdir'
-+         export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-+         allow_undefined_flag_CXX=unsupported
-+         always_export_symbols_CXX=no
-+         enable_shared_with_static_runtimes_CXX=yes
-+
-+         if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+           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'
-+           # If the export-symbols file already is a .def file (1st line
-+           # is EXPORTS), use it as is; otherwise, prepend...
-+           archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+             cp $export_symbols $output_objdir/$soname.def;
-+           else
-+             echo EXPORTS > $output_objdir/$soname.def;
-+             cat $export_symbols >> $output_objdir/$soname.def;
-+           fi~
-+           $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'
-+         else
-+           ld_shlibs_CXX=no
-+         fi
-+         ;;
-+       esac
-+       ;;
-       darwin* | rhapsody*)
- 
- 
-@@ -12796,7 +13535,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-             ;;
-           *)
-             if test "$GXX" = yes; then
--              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'
-+              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'
-             else
-               # FIXME: insert proper C++ library support
-               ld_shlibs_CXX=no
-@@ -12867,10 +13606,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-                    archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                    ;;
-                  ia64*)
--                   archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+                   archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                    ;;
-                  *)
--                   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'
-+                   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'
-                    ;;
-                esac
-              fi
-@@ -12911,9 +13650,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-           *)
-            if test "$GXX" = yes; then
-              if test "$with_gnu_ld" = no; then
--               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'
-+               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'
-              else
--               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'
-+               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'
-              fi
-            fi
-            link_all_deplibs_CXX=yes
-@@ -12983,20 +13722,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-              prelink_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--               compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-              old_archive_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-                $RANLIB $oldlib'
-              archive_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-              archive_expsym_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--               $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'
-+               $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'
-              ;;
-            *) # Version 6 and above use weak symbols
-              archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-@@ -13191,7 +13930,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-                  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'
-                  ;;
-                *)
--                 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'
-+                 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'
-                  ;;
-              esac
- 
-@@ -13237,7 +13976,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-       solaris*)
-         case $cc_basename in
--          CC*)
-+          CC* | sunCC*)
-            # Sun C++ 4.2, 5.x and Centerline C++
-             archive_cmds_need_lc_CXX=yes
-            no_undefined_flag_CXX=' -zdefs'
-@@ -13278,9 +14017,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-            if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-              no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-              if $CC --version | $GREP -v '^2\.7' > /dev/null; then
--               archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+               archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-                archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--                 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+                 $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- 
-                # Commands to make compiler produce verbose output that lists
-                # what "hidden" libraries, object files and flags are used when
-@@ -13415,6 +14154,13 @@ private:
- };
- _LT_EOF
- 
-+
-+_lt_libdeps_save_CFLAGS=$CFLAGS
-+case "$CC $CFLAGS " in #(
-+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-+esac
-+
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -13428,7 +14174,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   pre_test_object_deps_done=no
- 
-   for p in `eval "$output_verbose_link_cmd"`; do
--    case $p in
-+    case ${prev}${p} in
- 
-     -L* | -R* | -l*)
-        # Some compilers place space between "-{L,R}" and the path.
-@@ -13437,13 +14183,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-           test $p = "-R"; then
-         prev=$p
-         continue
--       else
--        prev=
-        fi
- 
-+       # Expand the sysroot to ease extracting the directories later.
-+       if test -z "$prev"; then
-+         case $p in
-+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-+         esac
-+       fi
-+       case $p in
-+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-+       esac
-        if test "$pre_test_object_deps_done" = no; then
--        case $p in
--        -L* | -R*)
-+        case ${prev} in
-+        -L | -R)
-           # Internal compiler library paths should come after those
-           # provided the user.  The postdeps already come after the
-           # user supplied libs so there is no need to process them.
-@@ -13463,8 +14218,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-           postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-         fi
-        fi
-+       prev=
-        ;;
- 
-+    *.lto.$objext) ;; # Ignore GCC LTO objects
-     *.$objext)
-        # This assumes that the test object file only shows up
-        # once in the compiler output.
-@@ -13500,6 +14257,7 @@ else
- fi
- 
- $RM -f confest.$objext
-+CFLAGS=$_lt_libdeps_save_CFLAGS
- 
- # PORTME: override above test on systems where it is broken
- case $host_os in
-@@ -13535,7 +14293,7 @@ linux*)
- 
- solaris*)
-   case $cc_basename in
--  CC*)
-+  CC* | sunCC*)
-     # The more standards-conforming stlport4 library is
-     # incompatible with the Cstd library. Avoid specifying
-     # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -13600,8 +14358,6 @@ fi
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -13706,6 +14462,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-          ;;
-        esac
-        ;;
-+      mingw* | cygwin* | os2* | pw32* | cegcc*)
-+       # This hack is so that the source file can tell whether it is being
-+       # built for inclusion in a dll (and should export symbols for example).
-+       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-+       ;;
-       dgux*)
-        case $cc_basename in
-          ec++*)
-@@ -13858,7 +14619,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-        ;;
-       solaris*)
-        case $cc_basename in
--         CC*)
-+         CC* | sunCC*)
-            # Sun C++ 4.2, 5.x and Centerline C++
-            lt_prog_compiler_pic_CXX='-KPIC'
-            lt_prog_compiler_static_CXX='-Bstatic'
-@@ -13923,10 +14684,17 @@ case $host_os in
-     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-     ;;
- esac
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
--$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
--
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
- 
- #
- # Check to make sure the PIC flag actually works.
-@@ -13984,6 +14752,8 @@ fi
- 
- 
- 
-+
-+
- #
- # Check to make sure the static flag actually works.
- #
-@@ -14161,6 +14931,7 @@ fi
- $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-   case $host_os in
-   aix[4-9]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-@@ -14175,15 +14946,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
-     ;;
-   pw32*)
-     export_symbols_cmds_CXX="$ltdll_cmds"
--  ;;
-+    ;;
-   cygwin* | mingw* | cegcc*)
--    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'
--  ;;
-+    case $cc_basename in
-+    cl*) ;;
-+    *)
-+      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'
-+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-+      ;;
-+    esac
-+    ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
-+    ;;
-   esac
--  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
- $as_echo "$ld_shlibs_CXX" >&6; }
-@@ -14446,8 +15222,9 @@ cygwin* | mingw* | pw32* | cegcc*)
-   need_version=no
-   need_lib_prefix=no
- 
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+  case $GCC,$cc_basename in
-+  yes,*)
-+    # gcc
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -14479,13 +15256,71 @@ cygwin* | mingw* | pw32* | cegcc*)
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-+    dynamic_linker='Win32 ld.exe'
-+    ;;
-+
-+  *,cl*)
-+    # Native MSVC
-+    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
-+
-+    case $build_os in
-+    mingw*)
-+      sys_lib_search_path_spec=
-+      lt_save_ifs=$IFS
-+      IFS=';'
-+      for lt_path in $LIB
-+      do
-+        IFS=$lt_save_ifs
-+        # Let DOS variable expansion print the short 8.3 style file name.
-+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-+      done
-+      IFS=$lt_save_ifs
-+      # Convert to MSYS style.
-+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-+      ;;
-+    cygwin*)
-+      # Convert to unix form, then to dos form, then back to unix form
-+      # but this time dos style (no spaces!) so that the unix form looks
-+      # like /cygdrive/c/PROGRA~1:/cygdr...
-+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      ;;
-+    *)
-+      sys_lib_search_path_spec="$LIB"
-+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      # FIXME: find the short name or the path components, as spaces are
-+      # common. (e.g. "Program Files" -> "PROGRA~1")
-+      ;;
-+    esac
-+
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+    dynamic_linker='Win32 link.exe'
-     ;;
- 
-   *)
-+    # Assume MSVC wrapper
-     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    dynamic_linker='Win32 ld.exe'
-     ;;
-   esac
--  dynamic_linker='Win32 ld.exe'
-   # FIXME: first we should search . and the directory the executable is in
-   shlibpath_var=PATH
-   ;;
-@@ -14576,7 +15411,7 @@ haiku*)
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
--  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-   hardcode_into_libs=yes
-   ;;
- 
-@@ -15035,6 +15870,7 @@ fi
-   fi # test -n "$compiler"
- 
-   CC=$lt_save_CC
-+  CFLAGS=$lt_save_CFLAGS
-   LDCXX=$LD
-   LD=$lt_save_LD
-   GCC=$lt_save_GCC
-@@ -17807,13 +18643,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+   case "${host}" in
+@@ -13422,13 +14077,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -18640,7 +18777,7 @@ Index: binutils-2.24/ld/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -17828,14 +18671,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
+@@ -13443,14 +14105,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -18659,7 +18796,7 @@ Index: binutils-2.24/ld/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -17868,12 +18714,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
+@@ -13483,12 +14148,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -18673,31 +18810,7 @@ Index: binutils-2.24/ld/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -17912,8 +18758,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
- compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
- GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
- archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-@@ -17940,12 +18786,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
- hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
- inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
--fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
- always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
- include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
- prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
- file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
- hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
- compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-@@ -17983,8 +18829,13 @@ reload_flag \
+@@ -13543,8 +14208,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -18711,7 +18824,7 @@ Index: binutils-2.24/ld/configure
  STRIP \
  RANLIB \
  CC \
-@@ -17994,12 +18845,14 @@ lt_cv_sys_global_symbol_pipe \
+@@ -13554,12 +14224,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -18727,7 +18840,7 @@ Index: binutils-2.24/ld/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -18015,7 +18868,6 @@ no_undefined_flag \
+@@ -13575,7 +14247,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -18735,25 +18848,7 @@ Index: binutils-2.24/ld/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -18037,8 +18889,8 @@ LD_CXX \
- reload_flag_CXX \
- compiler_CXX \
- lt_prog_compiler_no_builtin_flag_CXX \
--lt_prog_compiler_wl_CXX \
- lt_prog_compiler_pic_CXX \
-+lt_prog_compiler_wl_CXX \
- lt_prog_compiler_static_CXX \
- lt_cv_prog_compiler_c_o_CXX \
- export_dynamic_flag_spec_CXX \
-@@ -18050,7 +18902,6 @@ no_undefined_flag_CXX \
- hardcode_libdir_flag_spec_CXX \
- hardcode_libdir_flag_spec_ld_CXX \
- hardcode_libdir_separator_CXX \
--fix_srcfile_path_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX \
- file_list_spec_CXX \
-@@ -18084,6 +18935,7 @@ module_cmds \
+@@ -13611,6 +14282,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -18761,17 +18856,7 @@ Index: binutils-2.24/ld/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -18098,7 +18950,8 @@ archive_expsym_cmds_CXX \
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- export_symbols_cmds_CXX \
--prelink_cmds_CXX; do
-+prelink_cmds_CXX \
-+postlink_cmds_CXX; do
-     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-     *[\\\\\\\`\\"\\\$]*)
-       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-@@ -18891,7 +19744,8 @@ $as_echo X"$file" |
+@@ -14367,7 +15039,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -18781,7 +18866,7 @@ Index: binutils-2.24/ld/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -18994,19 +19848,42 @@ SP2NL=$lt_lt_SP2NL
+@@ -14470,19 +15143,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -18825,7 +18910,7 @@ Index: binutils-2.24/ld/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -19036,6 +19913,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+@@ -14512,6 +15208,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -18838,7 +18923,7 @@ Index: binutils-2.24/ld/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -19045,6 +19928,9 @@ MAGIC_CMD=$MAGIC_CMD
+@@ -14521,6 +15223,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -18848,7 +18933,7 @@ Index: binutils-2.24/ld/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -19159,12 +20045,12 @@ with_gcc=$GCC
+@@ -14635,12 +15340,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -18864,7 +18949,7 @@ Index: binutils-2.24/ld/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -19251,9 +20137,6 @@ inherit_rpath=$inherit_rpath
+@@ -14727,9 +15432,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -18874,7 +18959,7 @@ Index: binutils-2.24/ld/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -19269,6 +20152,9 @@ include_expsyms=$lt_include_expsyms
+@@ -14745,6 +15447,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -18884,7 +18969,7 @@ Index: binutils-2.24/ld/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -19315,210 +20201,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -14777,210 +15482,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -19258,60 +19343,11 @@ Index: binutils-2.24/ld/configure
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-@@ -19546,12 +20391,12 @@ with_gcc=$GCC_CXX
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
--
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic_CXX
- 
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-+
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static_CXX
- 
-@@ -19638,9 +20483,6 @@ inherit_rpath=$inherit_rpath_CXX
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs_CXX
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path=$lt_fix_srcfile_path_CXX
--
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols_CXX
- 
-@@ -19656,6 +20498,9 @@ include_expsyms=$lt_include_expsyms_CXX
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds_CXX
- 
-+# Commands necessary for finishing linking programs.
-+postlink_cmds=$lt_postlink_cmds_CXX
-+
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec_CXX
- 
-Index: binutils-2.24/bfd/configure.ac
-===================================================================
---- binutils-2.24.orig/bfd/configure.ac 2013-12-02 01:30:28.000000000 -0800
-+++ binutils-2.24/bfd/configure.ac      2013-12-15 11:10:23.887118697 -0800
-@@ -568,7 +568,7 @@
-   x=`sed -n -e 's/^[   ]*PICFLAG[      ]*=[    ]*//p' < ../libiberty/Makefile | sed -n '$p'`
- changequote([,])dnl
-   if test -n "$x"; then
--    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
-+    SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
-   fi
- 
- # More hacks to build DLLs on Windows.
-Index: binutils-2.24/opcodes/configure.ac
-===================================================================
---- binutils-2.24.orig/opcodes/configure.ac     2013-11-04 07:33:40.000000000 -0800
-+++ binutils-2.24/opcodes/configure.ac  2013-12-15 11:10:23.887118697 -0800
-@@ -162,7 +162,7 @@
+diff --git a/opcodes/configure.ac b/opcodes/configure.ac
+index b93e855..43ba976 100644
+--- a/opcodes/configure.ac
++++ b/opcodes/configure.ac
+@@ -167,7 +167,7 @@ changequote(,)dnl
    x=`sed -n -e 's/^[   ]*PICFLAG[      ]*=[    ]*//p' < ../libiberty/Makefile | sed -n '$p'`
  changequote([,])dnl
    if test -n "$x"; then
@@ -19320,3 +19356,6 @@ Index: binutils-2.24/opcodes/configure.ac
    fi
  
    case "${host}" in
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
new file mode 100644
index 0000000000..a037634ccf
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
@@ -0,0 +1,35 @@
+From 743f42aaecb1ab89eba0eaf5e88ed67bbf3ba304 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:37:10 +0000
+Subject: [PATCH 07/13] Add the armv5e architecture to binutils
+
+Binutils has a comment that indicates it is supposed to match gcc for
+all of the support "-march=" settings, but it was lacking the armv5e setting.
+This was a simple way to add it, as thumb instructions shouldn't be generated
+by the compiler anyway.
+
+Upstream-Status: Denied
+Upstream maintainer indicated that we should not be using armv5e, even
+though it is a legal archicture defined by our gcc.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gas/config/tc-arm.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
+index 2db6c2d..ab48168 100644
+--- a/gas/config/tc-arm.c
++++ b/gas/config/tc-arm.c
+@@ -24463,6 +24463,7 @@ static const struct arm_arch_option_table arm_archs[] =
+   ARM_ARCH_OPT ("armv4t",      ARM_ARCH_V4T,    FPU_ARCH_FPA),
+   ARM_ARCH_OPT ("armv4txm",    ARM_ARCH_V4TxM,  FPU_ARCH_FPA),
+   ARM_ARCH_OPT ("armv5",       ARM_ARCH_V5,     FPU_ARCH_VFP),
++  ARM_ARCH_OPT ("armv5e",      ARM_ARCH_V5TE,   FPU_ARCH_VFP),
+   ARM_ARCH_OPT ("armv5t",      ARM_ARCH_V5T,    FPU_ARCH_VFP),
+   ARM_ARCH_OPT ("armv5txm",    ARM_ARCH_V5TxM,  FPU_ARCH_VFP),
+   ARM_ARCH_OPT ("armv5te",     ARM_ARCH_V5TE,   FPU_ARCH_VFP),
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
new file mode 100644
index 0000000000..0ae68fcd7e
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
@@ -0,0 +1,35 @@
+From 4d3a9f6db604055348332b56889d466c058fa5f3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:39:01 +0000
+Subject: [PATCH 08/13] don't let the distro compiler point to the wrong
+ installation location
+
+Thanks to RP for helping find the source code causing the issue.
+
+2010/08/13
+Nitin A Kamble <nitin.a.kamble@intel.com>
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libiberty/Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
+index 9b87720..ff43f53 100644
+--- a/libiberty/Makefile.in
++++ b/libiberty/Makefile.in
+@@ -361,7 +361,8 @@ install-strip: install
+ # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
+ # default multilib, so we have to take CFLAGS into account as well,
+ # since it will be passed the multilib flags.
+-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
++#MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
++MULTIOSDIR = ""
+ install_to_libdir: all
+        if test -n "${target_header_dir}"; then \
+                ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
index eb540766dc..f800796d9a 100644
--- a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-Upstream-Status-Inappropriate-distribution-codesourc.patch
@@ -1,4 +1,8 @@
-Upstream-Status: Inappropriate [distribution: codesourcery]
+From e02e119b278c3f404e97669e7180cac944134c91 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:41:04 +0000
+Subject: [PATCH 09/13] Upstream-Status: Inappropriate [distribution:
+ codesourcery]
 
 Patch originally created by Mark Hatle, forward-ported to
 binutils 2.21 by Scott Garman.
@@ -51,11 +55,23 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ld/config.in    |  3 +++
+ ld/configure    | 14 ++++++++++++++
+ ld/configure.ac | 10 ++++++++++
+ ld/ld.h         |  8 ++++++++
+ ld/ld.texinfo   | 12 ++++++++++++
+ ld/ldfile.c     | 17 +++++++++++++++++
+ ld/ldlex.h      |  2 ++
+ ld/ldmain.c     |  2 ++
+ ld/lexsup.c     | 16 ++++++++++++++++
+ 9 files changed, 84 insertions(+)
 
-Index: binutils-2.24/ld/config.in
-===================================================================
---- binutils-2.24.orig/ld/config.in     2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/config.in  2013-12-15 11:46:59.810435651 -0800
+diff --git a/ld/config.in b/ld/config.in
+index 2ab4844..766d23c 100644
+--- a/ld/config.in
++++ b/ld/config.in
 @@ -11,6 +11,9 @@
     language is requested. */
  #undef ENABLE_NLS
@@ -66,11 +82,11 @@ Index: binutils-2.24/ld/config.in
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-Index: binutils-2.24/ld/configure
-===================================================================
---- binutils-2.24.orig/ld/configure     2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/configure  2013-12-15 11:46:59.810435651 -0800
-@@ -777,6 +777,7 @@
+diff --git a/ld/configure b/ld/configure
+index 2fbaebf..5726a08 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -787,6 +787,7 @@ with_lib_path
  enable_targets
  enable_64_bit_bfd
  with_sysroot
@@ -78,8 +94,8 @@ Index: binutils-2.24/ld/configure
  enable_gold
  enable_got
  enable_werror
-@@ -1433,6 +1434,8 @@
-                          (and sometimes confusing) to the casual installer
+@@ -1443,6 +1444,8 @@ Optional Features:
+   --disable-largefile     omit support for large files
    --enable-targets        alternative target configurations
    --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
 +  --enable-poison-system-directories
@@ -87,7 +103,7 @@ Index: binutils-2.24/ld/configure
    --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
    --enable-got=<type>     GOT handling scheme (target, single, negative,
                            multigot)
-@@ -4345,7 +4348,18 @@
+@@ -16323,7 +16326,18 @@ else
  fi
  
  
@@ -106,11 +122,11 @@ Index: binutils-2.24/ld/configure
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-Index: binutils-2.24/ld/configure.ac
-===================================================================
---- binutils-2.24.orig/ld/configure.ac  2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/configure.ac       2013-12-15 11:46:59.810435651 -0800
-@@ -87,6 +87,16 @@
+diff --git a/ld/configure.ac b/ld/configure.ac
+index 1bddfc9..e9edb7f 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
  
@@ -127,39 +143,11 @@ Index: binutils-2.24/ld/configure.ac
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-Index: binutils-2.24/ld/ldfile.c
-===================================================================
---- binutils-2.24.orig/ld/ldfile.c      2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/ldfile.c   2013-12-15 11:46:59.813768989 -0800
-@@ -116,6 +116,23 @@
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-Index: binutils-2.24/ld/ld.h
-===================================================================
---- binutils-2.24.orig/ld/ld.h  2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/ld.h       2013-12-15 11:46:59.813768989 -0800
-@@ -180,6 +180,14 @@
+diff --git a/ld/ld.h b/ld/ld.h
+index f773ce7..adba0f6 100644
+--- a/ld/ld.h
++++ b/ld/ld.h
+@@ -161,6 +161,14 @@ typedef struct {
    /* If TRUE we'll just print the default output on stdout.  */
    bfd_boolean print_output_format;
  
@@ -174,24 +162,11 @@ Index: binutils-2.24/ld/ld.h
    /* Big or little endian as set on command line.  */
    enum endian_enum endian;
  
-Index: binutils-2.24/ld/ldmain.c
-===================================================================
---- binutils-2.24.orig/ld/ldmain.c      2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/ldmain.c   2013-12-15 11:48:12.087101740 -0800
-@@ -266,6 +266,8 @@
-   command_line.warn_mismatch = TRUE;
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-Index: binutils-2.24/ld/ld.texinfo
-===================================================================
---- binutils-2.24.orig/ld/ld.texinfo    2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/ld.texinfo 2013-12-15 11:46:59.813768989 -0800
-@@ -2175,6 +2175,18 @@
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index 502582c..dae168a 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -2212,6 +2212,18 @@ string identifying the original linked file does not change.
  
  Passing @code{none} for @var{style} disables the setting from any
  @code{--build-id} options earlier on the command line.
@@ -210,10 +185,64 @@ Index: binutils-2.24/ld/ld.texinfo
  @end table
  
  @c man end
-Index: binutils-2.24/ld/lexsup.c
-===================================================================
---- binutils-2.24.orig/ld/lexsup.c      2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/lexsup.c   2013-12-15 11:49:28.950434490 -0800
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index 782ed7f..19a9ab4 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
+   else
+     new_dirs->name = xstrdup (name);
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (command_line.poison_system_directories
++  && ((!strncmp (name, "/lib", 4))
++      || (!strncmp (name, "/usr/lib", 8))
++      || (!strncmp (name, "/usr/local/lib", 14))
++      || (!strncmp (name, "/usr/X11R6/lib", 14))))
++   {
++     if (command_line.error_poison_system_directories)
++       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++     else
++       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++   }
++#endif
++
+ }
+ 
+ /* Try to open a BFD for a lang_input_statement.  */
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index e3e9b24..29487a3 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -140,6 +140,8 @@ enum option_values
+   OPTION_IGNORE_UNRESOLVED_SYMBOL,
+   OPTION_PUSH_STATE,
+   OPTION_POP_STATE,
++  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
++  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
+ };
+ 
+ /* The initial parser states.  */
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index 818d108..54c49f2 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -266,6 +266,8 @@ main (int argc, char **argv)
+   command_line.warn_mismatch = TRUE;
+   command_line.warn_search_mismatch = TRUE;
+   command_line.check_section_addresses = -1;
++  command_line.poison_system_directories = TRUE;
++  command_line.error_poison_system_directories = FALSE;
+ 
+   /* We initialize DEMANGLING based on the environment variable
+      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index 4812c97..21b49df 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
 @@ -513,6 +513,14 @@ static const struct ld_option ld_options[] =
    { {"pop-state", no_argument, NULL, OPTION_POP_STATE},
      '\0', NULL, N_("Pop state of flags governing input file handling"),
@@ -244,16 +273,6 @@ Index: binutils-2.24/ld/lexsup.c
         }
      }
  
-Index: binutils-2.24/ld/ldlex.h
-===================================================================
---- binutils-2.24.orig/ld/ldlex.h       2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/ldlex.h    2013-12-15 11:47:43.230435299 -0800
-@@ -140,6 +140,8 @@ enum option_values
-   OPTION_IGNORE_UNRESOLVED_SYMBOL,
-   OPTION_PUSH_STATE,
-   OPTION_POP_STATE,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
index 4fcffa471e..5451e743d7 100644
--- a/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
+++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
@@ -1,17 +1,27 @@
-Upstream-Status: Inappropriate [embedded specific]
+From edbee9a68e1c2e11c059668aa1d13001d9f3de06 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:42:38 +0000
+Subject: [PATCH 10/13] Fix rpath in libtool when sysroot is enabled
 
 Enabling sysroot support in libtool exposed a bug where the final
 library had an RPATH encoded into it which still pointed to the
 sysroot. This works around the issue until it gets sorted out
 upstream.
 
-Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org> 
+Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Upstream-Status: Inappropriate [embedded specific]
+
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ltmain.sh | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
-Index: binutils-2.22/ltmain.sh
-===================================================================
---- binutils-2.22.orig/ltmain.sh
-+++ binutils-2.22/ltmain.sh
+diff --git a/ltmain.sh b/ltmain.sh
+index 70e856e..11ee684 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
 @@ -8035,9 +8035,11 @@ EOF
           test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
           for libdir in $rpath; do
@@ -37,3 +47,6 @@ Index: binutils-2.22/ltmain.sh
           if test -n "$hardcode_libdir_separator"; then
             if test -z "$hardcode_libdirs"; then
               hardcode_libdirs="$libdir"
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/mips64-default-ld-emulation.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
index e668faa6e8..d9d57eee44 100644
--- a/meta/recipes-devtools/binutils/binutils/mips64-default-ld-emulation.patch
+++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
@@ -1,15 +1,22 @@
-for mips64*-*-linux we change the default emulations to be
-N64 instead of N32
+From 2a5e8813d3c5db3e2b7d9dfa2ab27cccd5111e53 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:44:14 +0000
+Subject: [PATCH 11/13] Change default emulation for mips64*-*-linux
+
+we change the default emulations to be N64 instead of N32
 
 Upstream-Status: Inappropriate [ OE configuration Specific]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ bfd/config.bfd   | 8 ++++----
+ ld/configure.tgt | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
 
-Index: binutils-2.24/bfd/config.bfd
-===================================================================
---- binutils-2.24.orig/bfd/config.bfd   2013-11-04 07:33:37.000000000 -0800
-+++ binutils-2.24/bfd/config.bfd        2013-12-15 11:54:57.113765374 -0800
-Index: binutils-2.24/ld/configure.tgt
+diff --git a/bfd/config.bfd b/bfd/config.bfd
+index 7bcb92a..03d2c6f 100644
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
 @@ -1062,12 +1062,12 @@ case "${targ}" in
      targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
      ;;
@@ -27,10 +34,11 @@ Index: binutils-2.24/ld/configure.tgt
      ;;
    mips*el-*-linux*)
      targ_defvec=mips_elf32_trad_le_vec
-===================================================================
---- binutils-2.24.orig/ld/configure.tgt 2013-11-26 03:37:33.000000000 -0800
-+++ binutils-2.24/ld/configure.tgt      2013-12-15 11:50:52.273766155 -0800
-@@ -471,11 +471,11 @@
+diff --git a/ld/configure.tgt b/ld/configure.tgt
+index 24e36d1..740b2ea 100644
+--- a/ld/configure.tgt
++++ b/ld/configure.tgt
+@@ -476,11 +476,11 @@ mips*el-*-vxworks*)       targ_emul=elf32elmipvxworks
  mips*-*-vxworks*)      targ_emul=elf32ebmipvxworks
                         targ_extra_emuls="elf32elmipvxworks" ;;
  mips*-*-windiss)       targ_emul=elf32mipswindiss ;;
@@ -46,3 +54,6 @@ Index: binutils-2.24/ld/configure.tgt
                         targ_extra_libpath=$targ_extra_emuls ;;
  mips*el-*-linux-*)     targ_emul=elf32ltsmip
                         targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
index b03bb28237..c56ff915b4 100644
--- a/meta/recipes-devtools/binutils/binutils/binutils-xlp-support.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
@@ -1,5 +1,7 @@
-Upstream-Status: Unknown
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
+From 448329ea097447aee73d050045295c5a0ae8519e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 01:51:05 +0000
+Subject: [PATCH 12/13] Add XLP instructions support
 
 From 26adb06ce515aadfec08ce13109b4b98287f677b Mon Sep 17 00:00:00 2001
 From: Nebu Philips <nphilips@netlogicmicro.com>
@@ -26,6 +28,27 @@ Netlogic. Also, update vendor name to NLM wherever applicable.
  opcodes/mips-opc.c    |   33 +++++++++++++++++++++------------
  15 files changed, 65 insertions(+), 25 deletions(-)
 
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ bfd/aoutx.h           |  1 +
+ bfd/archures.c        |  1 +
+ bfd/bfd-in2.h         |  1 +
+ bfd/config.bfd        |  5 +++++
+ bfd/cpu-mips.c        |  6 ++++--
+ bfd/elfxx-mips.c      |  8 ++++++++
+ binutils/readelf.c    |  1 +
+ gas/config/tc-mips.c  |  4 +++-
+ gas/configure         |  3 +++
+ gas/configure.tgt     |  2 +-
+ include/elf/mips.h    |  1 +
+ include/opcode/mips.h | 10 ++++++++--
+ ld/configure.tgt      |  2 ++
+ opcodes/mips-dis.c    | 12 +++++-------
+ opcodes/mips-opc.c    | 33 +++++++++++++++++++++------------
+ 15 files changed, 65 insertions(+), 25 deletions(-)
+
 diff --git a/bfd/aoutx.h b/bfd/aoutx.h
 index 9385a98..a88df99 100644
 --- a/bfd/aoutx.h
@@ -63,7 +86,7 @@ index c7a2bb5..413b773 100644
  #define bfd_mach_mipsisa32r2           33
  #define bfd_mach_mipsisa32r3           34
 diff --git a/bfd/config.bfd b/bfd/config.bfd
-index 03d2c6f..91cedb8 100644
+index 03d2c6f..27086db 100644
 --- a/bfd/config.bfd
 +++ b/bfd/config.bfd
 @@ -1041,6 +1041,11 @@ case "${targ}" in
@@ -103,7 +126,7 @@ index b617aaa..19a99d1 100644
  
  /* The default architecture is mips:3000, but with a machine number of
 diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
-index a0cc26e..672d5b3 100644
+index 0df7abf..d268e86 100644
 --- a/bfd/elfxx-mips.c
 +++ b/bfd/elfxx-mips.c
 @@ -6608,6 +6608,9 @@ _bfd_elf_mips_mach (flagword flags)
@@ -127,7 +150,7 @@ index a0cc26e..672d5b3 100644
      case bfd_mach_mipsisa32:
        val = E_MIPS_ARCH_32;
        break;
-@@ -14753,6 +14760,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
+@@ -14765,6 +14772,7 @@ static const struct mips_mach_extension mips_mach_extensions[] =
    { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
    { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
    { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 },
@@ -177,7 +200,7 @@ index c3e3e2a..8d64344 100644
    /* End marker */
    { NULL, 0, 0, 0, 0 }
 diff --git a/gas/configure b/gas/configure
-index 9529f1a..63bba5b 100755
+index 074886f..8091f2f 100755
 --- a/gas/configure
 +++ b/gas/configure
 @@ -12808,6 +12808,9 @@ _ACEOF
@@ -191,7 +214,7 @@ index 9529f1a..63bba5b 100755
             mips_cpu=r3900
             ;;
 diff --git a/gas/configure.tgt b/gas/configure.tgt
-index 05546ca..bb859d6 100644
+index 1d92f55..06e8b4f 100644
 --- a/gas/configure.tgt
 +++ b/gas/configure.tgt
 @@ -332,7 +332,7 @@ case ${generic_target} in
@@ -204,7 +227,7 @@ index 05546ca..bb859d6 100644
    mips-*-openbsd*)                     fmt=elf em=tmips ;;
  
 diff --git a/include/elf/mips.h b/include/elf/mips.h
-index 2ed6acd..899b1e5 100644
+index 2ed6acd..e541f50 100644
 --- a/include/elf/mips.h
 +++ b/include/elf/mips.h
 @@ -285,6 +285,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
@@ -287,7 +310,7 @@ index 1eb1d45..d6881af 100644
    /* This entry, mips16, is here only for ISA/processor selection; do
       not print its name.  */
 diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
-index 2c3bbad..86eb95b 100644
+index 2c3bbad..9785a7e 100644
 --- a/opcodes/mips-opc.c
 +++ b/opcodes/mips-opc.c
 @@ -319,7 +319,8 @@ decode_mips_operand (const char *p)
@@ -331,8 +354,7 @@ index 2c3bbad..86eb95b 100644
  {"dmt",                        "",             0x41600bc1, 0xffffffff, TRAP,                   0,              0,              MT32,   0 },
  {"dmt",                        "t",            0x41600bc1, 0xffe0ffff, WR_1|TRAP,              0,              0,              MT32,   0 },
  {"dmtc0",              "t,G",          0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM,    0,              I3,             0,      EE },
-@@ -1079,6 +1083,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
- /* dmtc2 is at the bottom of the table.  */
+@@ -1080,6 +1084,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
  /* dmfc3 is at the bottom of the table.  */
  /* dmtc3 is at the bottom of the table.  */
  {"dmuh",               "d,s,t",        0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3,         0,              I69,            0,      0 },
@@ -340,6 +362,7 @@ index 2c3bbad..86eb95b 100644
 +{"dmul",               "d,s,t",        0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3,         0,              XLP,            0,      0 },
  {"dmul",               "d,s,t",        0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3,         0,              I69,            0,      0 },
  {"dmul",               "d,v,t",        0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0,              IOCT,           0,      0 },
+ {"dmul",               "d,v,t",        0,    (int) M_DMUL,     INSN_MACRO,             0,              I3,             0,      M32|I69 },
 @@ -1229,9 +1235,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
  {"ld",                 "s,-b(+R)",     0xec180000, 0xfc1c0000, WR_1,                   RD_pc,          I69,            0,      0 },
  {"ld",                 "t,A(b)",       0,    (int) M_LD_AB,    INSN_MACRO,             0,              I1,             0,      0 },
@@ -400,3 +423,6 @@ index 2c3bbad..86eb95b 100644
  {"swc0",               "E,o(b)",       0xe0000000, 0xfc000000, RD_3|RD_C0|SM,          0,              I1,             0,      IOCT|IOCTP|IOCT2|I37 },
  {"swc0",               "E,A(b)",       0,    (int) M_SWC0_AB,  INSN_MACRO,             0,              I1,             0,      IOCT|IOCTP|IOCT2|I37 },
  {"swc1",               "T,o(b)",       0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S,      0,              I1,             0,      0 },
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch b/meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
index a47faef352..aee01c0b41 100644
--- a/meta/recipes-devtools/binutils/binutils/0001-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
+++ b/meta/recipes-devtools/binutils/binutils/0013-Fix-an-internal-error-in-do_print_to_mapfile-seen-wi.patch
@@ -1,8 +1,8 @@
-From 54583eb23233b5369372ae41768655693d0584ef Mon Sep 17 00:00:00 2001
+From 8e8f77ec2b6262e7d10af54700c340173d957267 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 27 Feb 2015 09:05:49 +0000
-Subject: [PATCH] Fix an internal error in do_print_to_mapfile seen with gold
- on arm
+Subject: [PATCH 13/13] Fix an internal error in do_print_to_mapfile seen with
+ gold on arm
 
 This is due to missing implementation of do_print_to_mapfile for
 atrributea section (ARM.attributes), it started to show up after fix
@@ -12,12 +12,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Upstream-Status: Submitted
 ---
- gold/ChangeLog    | 5 +++++
  gold/attributes.h | 4 ++++
- 2 files changed, 9 insertions(+)
+ 1 file changed, 4 insertions(+)
 
 diff --git a/gold/attributes.h b/gold/attributes.h
-index c0b171f..6e3ab8c 100644
+index 2aa7a78..3d126e6 100644
 --- a/gold/attributes.h
 +++ b/gold/attributes.h
 @@ -387,6 +387,10 @@ class Output_attributes_section_data : public Output_section_data
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch b/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
deleted file mode 100644
index 97ad6dffba..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add the armv5e architecture to binutils
-
-Binutils has a comment that indicates it is supposed to match gcc for all of
-the support "-march=" settings, but it was lacking the armv5e setting.  This
-was a simple way to add it, as thumb instructions shouldn't be generated by
-the compiler anyway.
-
-Upstream-Status: Denied
-Upstream maintainer indicated that we should not be using armv5e, even though
-it is a legal archicture defined by our gcc.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Index: binutils-2.22.90/gas/config/tc-arm.c
-===================================================================
---- binutils-2.22.90.orig/gas/config/tc-arm.c   2012-07-24 09:38:32.000000000 -0700
-+++ binutils-2.22.90/gas/config/tc-arm.c        2012-08-07 23:41:59.822564075 -0700
-@@ -23162,6 +23162,7 @@
-   ARM_ARCH_OPT ("armv4t",      ARM_ARCH_V4T,    FPU_ARCH_FPA),
-   ARM_ARCH_OPT ("armv4txm",    ARM_ARCH_V4TxM,  FPU_ARCH_FPA),
-   ARM_ARCH_OPT ("armv5",       ARM_ARCH_V5,     FPU_ARCH_VFP),
-+  ARM_ARCH_OPT ("armv5e",      ARM_ARCH_V5TE,   FPU_ARCH_VFP),
-   ARM_ARCH_OPT ("armv5t",      ARM_ARCH_V5T,    FPU_ARCH_VFP),
-   ARM_ARCH_OPT ("armv5txm",    ARM_ARCH_V5TxM,  FPU_ARCH_VFP),
-   ARM_ARCH_OPT ("armv5te",     ARM_ARCH_V5TE,   FPU_ARCH_VFP),
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch
deleted file mode 100644
index b5a25c2389..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream-Status: Pending
-
-Index: binutils-2.22/configure
-===================================================================
---- binutils-2.22.orig/configure
-+++ binutils-2.22/configure
-@@ -3130,7 +3130,7 @@ case "${target}" in
-     ;;
-   s390-*-* | s390x-*-*)
-     ;;
--  sh-*-* | sh[34]*-*-*)
-+  sh*-*-* | sh[34]*-*-*)
-     ;;
-   sh64-*-* | sh5*-*-*)
-     ;;
-@@ -3570,7 +3570,7 @@ case "${target}" in
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
-Index: binutils-2.22/gprof/configure
-===================================================================
---- binutils-2.22.orig/gprof/configure
-+++ binutils-2.22/gprof/configure
-@@ -6103,6 +6103,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+  ;;
-+
- netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch
deleted file mode 100644
index c6e1efcea0..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh -e
-## 001_ld_makefile_patch.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: correct where ld scripts are installed
-## DP: Author: Chris Chimelis <chris@debian.org>
-## DP: Upstream status: N/A
-## DP: Date: ??
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-Upstream-Status: Inappropriate [debian patch]
-
-@DPATCH@
-Index: binutils-2.22/ld/Makefile.am
-===================================================================
---- binutils-2.22.orig/ld/Makefile.am
-+++ binutils-2.22/ld/Makefile.am
-@@ -37,7 +37,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-Index: binutils-2.22/ld/Makefile.in
-===================================================================
---- binutils-2.22.orig/ld/Makefile.in
-+++ binutils-2.22/ld/Makefile.in
-@@ -366,7 +366,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch
deleted file mode 100644
index 47bd8ff109..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -e
-## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Specify which filename is causing an error if the filename is a
-## DP: directory. (#45832)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-Upstream-Status: Inappropriate [debian patch]
-
-@DPATCH@
-Index: binutils-2.22/bfd/opncls.c
-===================================================================
---- binutils-2.22.orig/bfd/opncls.c
-+++ binutils-2.22/bfd/opncls.c
-@@ -197,6 +197,13 @@ bfd_fopen (const char *filename, const c
- {
-   bfd *nbfd;
-   const bfd_target *target_vec;
-+  struct stat s;
-+
-+  if (stat (filename, &s) == 0)
-+    if (S_ISDIR(s.st_mode)) {
-+      bfd_set_error (bfd_error_file_not_recognized);
-+      return NULL;
-+    }
- 
-   nbfd = _bfd_new_bfd ();
-   if (nbfd == NULL)
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
deleted file mode 100644
index d31f80cd3d..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh -e
-## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
-## DP: cases where -rpath isn't specified. (#151024)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-Upstream-Status: Inappropriate [debian patch]
-
-@DPATCH@
-Index: binutils-2.22/ld/emultempl/elf32.em
-===================================================================
---- binutils-2.22.orig/ld/emultempl/elf32.em
-+++ binutils-2.22/ld/emultempl/elf32.em
-@@ -1273,6 +1273,8 @@ fragment <<EOF
-              && command_line.rpath == NULL)
-            {
-              lib_path = (const char *) getenv ("LD_RUN_PATH");
-+             if ((lib_path) && (strlen (lib_path) == 0))
-+                 lib_path = NULL;
-              if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
-                                                      force))
-                break;
-@@ -1500,6 +1502,8 @@ gld${EMULATION_NAME}_before_allocation (
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+    rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch
deleted file mode 100644
index 3869faff0e..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Source: Khem Raj <raj.khem@gmail.com>
-Disposition: submit upstream.
-Upstream-Status: Pending
-
-Description:
-
-We do not need to have the libtool patch anymore for binutils after
-libtool has been updated upstream it include support for it. However
-for building gas natively on uclibc systems we have to link it with
--lm so that it picks up missing symbols.
-
-/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_from_double':
-floatformat.c:(.text+0x1ec): undefined reference to `frexp'
-floatformat.c:(.text+0x2f8): undefined reference to `ldexp'
-/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_to_double':
-floatformat.c:(.text+0x38a): undefined reference to `ldexp'
-floatformat.c:(.text+0x3d2): undefined reference to `ldexp'
-floatformat.c:(.text+0x43e): undefined reference to `ldexp'                     floatformat.c:(.text+0x4e2): undefined reference to `ldexp'
-collect2: ld returned 1 exit status
-make[4]: *** [as-new] Error 1
-
-Index: binutils-2.22/gas/configure.tgt
-===================================================================
---- binutils-2.22.orig/gas/configure.tgt
-+++ binutils-2.22/gas/configure.tgt
-@@ -428,6 +428,12 @@ case ${generic_target} in
-   *-*-netware)                         fmt=elf em=netware ;;
- esac
- 
-+case ${generic_target} in
-+  arm-*-*uclibc*)
-+    need_libm=yes
-+    ;;
-+esac
-+
- case ${cpu_type} in
-   alpha | arm | i386 | ia64 | microblaze | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
-     bfd_gas=yes
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uninitialised-warning.patch b/meta/recipes-devtools/binutils/binutils/binutils-uninitialised-warning.patch
deleted file mode 100644
index 2feb80c4d2..0000000000
--- a/meta/recipes-devtools/binutils/binutils/binutils-uninitialised-warning.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f9c316c4d75be236bbaa8464ef803ed2d3859d6d Mon Sep 17 00:00:00 2001
-From: H.J. Lu <hjl.tools@gmail.com>
-Date: Wed, 15 Jan 2014 07:43:19 -0800
-Subject: [PATCH 1/1] Silence uninitialized warning on ehdr_start_save
-
-Older GCC, like 4.1/4.2, will issue an uninitialized warning on
-ehdr_start_save.  This patch silences by using
-
-struct bfd_link_hash_entry ehdr_start_save = ehdr_start_save;
-
-        * emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation):
-        Silence uninitialized warning on ehdr_start_save with older
-        GCC.
-
-Upstream-Status: Backport
----
- ld/ChangeLog          |    6 ++++++
- ld/emultempl/elf32.em |    2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-#diff --git a/ld/ChangeLog b/ld/ChangeLog
-#index eaa6b93..91055de 100644
-#--- a/ld/ChangeLog
-#+++ b/ld/ChangeLog
-#@@ -1,3 +1,9 @@
-#+2014-01-15  H.J. Lu  <hongjiu.lu@intel.com>
-#+
-#+      * emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation):
-#+      Silence uninitialized warning on ehdr_start_save with older
-#+      GCC.
-#+
-# 2014-01-15  Alan Modra  <amodra@gmail.com>
-# 
-#       * emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation): Define
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 13f86f0..569c7f7 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1481,7 +1481,7 @@ gld${EMULATION_NAME}_before_allocation (void)
-   asection *sinterp;
-   bfd *abfd;
-   struct elf_link_hash_entry *ehdr_start = NULL;
--  struct bfd_link_hash_entry ehdr_start_save;
-+  struct bfd_link_hash_entry ehdr_start_save = ehdr_start_save;
- 
-   if (is_elf_hash_table (link_info.hash))
-     {
--- 
-1.7.1
-
diff --git a/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch b/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch
deleted file mode 100644
index 6e732fbd0a..0000000000
--- a/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-don't let the distro compiler point to the wrong installation location
-
-Thanks to RP for helping find the source code causing the issue.
-
-2010/08/13
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Index: binutils-2.22/libiberty/Makefile.in
-===================================================================
---- binutils-2.22.orig/libiberty/Makefile.in
-+++ binutils-2.22/libiberty/Makefile.in
-@@ -350,7 +350,8 @@ install-strip: install
- # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
- # default multilib, so we have to take CFLAGS into account as well,
- # since it will be passed the multilib flags.
--MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
-+#MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
-+MULTIOSDIR = ""
- install_to_libdir: all
-        ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
-        $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n