diff options
Diffstat (limited to 'meta/recipes-devtools/binutils')
29 files changed, 1349 insertions, 1105 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.26.inc b/meta/recipes-devtools/binutils/binutils-2.28.inc index 6d535fcaa3..7585da1ca9 100644 --- a/meta/recipes-devtools/binutils/binutils-2.26.inc +++ b/meta/recipes-devtools/binutils/binutils-2.28.inc @@ -11,29 +11,32 @@ LIC_FILES_CHKSUM="\ " def binutils_branch_version(d): - pvsplit = d.getVar('PV', True).split('.') + pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] BINUPV = "${@binutils_branch_version(d)}" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" -SRCREV = "71fa566a9cf2597b60a58c1d7c148bab637454a6" +SRCREV = "354199c7692c1bed53a2a15f0e4d531457e95f17" SRC_URI = "\ 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-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0011-Change-default-emulation-for-mips64-linux.patch \ - file://0012-Add-support-for-Netlogic-XLP.patch \ - file://0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch \ - file://0014-Correct-nios2-_gp-address-computation.patch \ + file://0003-gprof-add-uclibc-support-to-configure.patch \ + file://0004-Point-scripts-location-to-libdir.patch \ + file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0006-Explicitly-link-with-libm-on-uclibc.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-Add-the-armv5e-architecture-to-binutils.patch \ + file://0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0010-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0011-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0012-Change-default-emulation-for-mips64-linux.patch \ + file://0013-Add-support-for-Netlogic-XLP.patch \ + file://0014-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ + file://0016-Detect-64-bit-MIPS-targets.patch \ + file://CVE-2017-6965.patch \ + file://CVE-2017-6966.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index ae14642272..b3d591e658 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc @@ -6,6 +6,7 @@ BPN = "binutils" DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex" EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ + --enable-poison-system-directories \ " # We have to point binutils at a sysroot but we don't need to rebuild if this changes diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.26.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.28.bb index 5dbaa03017..5dbaa03017 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.26.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.28.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc index fd3d801491..02ec891606 100644 --- a/meta/recipes-devtools/binutils/binutils-cross.inc +++ b/meta/recipes-devtools/binutils/binutils-cross.inc @@ -4,12 +4,20 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils" PN = "binutils-cross-${TARGET_ARCH}" BPN = "binutils" +# Ignore how TARGET_ARCH is computed. +TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}" + INHIBIT_DEFAULT_DEPS = "1" INHIBIT_AUTOTOOLS_DEPS = "1" +SRC_URI += "file://0002-binutils-cross-Do-not-generate-linker-script-directo.patch" + +# Specify lib-path else we use a load of search dirs which we don't use +# and mean the linker scripts have to be relocated. EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_TARGET} \ --disable-install-libbfd \ --enable-poison-system-directories \ + --with-lib-path==${target_base_libdir}:=${target_libdir} \ " do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.26.bb b/meta/recipes-devtools/binutils/binutils-cross_2.28.bb index fbd1f7d25a..fbd1f7d25a 100644 --- a/meta/recipes-devtools/binutils/binutils-cross_2.26.bb +++ b/meta/recipes-devtools/binutils/binutils-cross_2.28.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.26.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.28.bb index 788106f9e7..37f4d6d2e9 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.26.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.28.bb @@ -2,11 +2,11 @@ require binutils-cross_${PV}.bb inherit crosssdk -PN = "binutils-crosssdk-${TARGET_ARCH}" +PN = "binutils-crosssdk-${SDK_SYS}" PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" -SRC_URI += "file://0001-Generate-relocatable-SDKs.patch" +SRC_URI += "file://0001-binutils-crosssdk-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.inc b/meta/recipes-devtools/binutils/binutils.inc index 43e2aa232b..7efe13fdf6 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -57,12 +57,11 @@ USE_ALTERNATIVES_FOR = " \ strings \ strip \ " -USE_ALTERNATIVES_FOR_remove_mips = "ld.gold dwp" python do_package_prepend() { - make_alts = d.getVar("USE_ALTERNATIVES_FOR", True) or "" - prefix = d.getVar("TARGET_PREFIX", True) - bindir = d.getVar("bindir", True) + make_alts = d.getVar("USE_ALTERNATIVES_FOR") or "" + prefix = d.getVar("TARGET_PREFIX") + bindir = d.getVar("bindir") for alt in make_alts.split(): d.setVarFlag('ALTERNATIVE_TARGET', alt, bindir + "/" + prefix + alt) d.setVarFlag('ALTERNATIVE_LINK_NAME', alt, bindir + "/" + alt) @@ -72,13 +71,15 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ --disable-werror \ + --enable-deterministic-archives \ --enable-plugins \ ${LDGOLD} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" -LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default', d)}" +LDGOLD_sdkmingw32 = "" +LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" # This is necessary due to a bug in the binutils Makefiles # EXTRA_OEMAKE = "configure-build-libiberty all" diff --git a/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 91f9017613..8fb1b4edea 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,7 +1,7 @@ -From 3c75355342a8562ccb65b8bbbe81a0495fec5c57 Mon Sep 17 00:00:00 2001 +From 689d011688b5ff9481d4367bef3dea7a7b2867fb 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/14] Generate relocatable SDKs +Subject: [PATCH 01/15] binutils-crosssdk: 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 @@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index a84d233..d12c4e2 100755 +index b6940d376d..a42c4d7a4b 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -277,6 +277,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" @@ -43,12 +43,12 @@ index a84d233..d12c4e2 100755 LD_FLAG= DATA_ALIGNMENT=${DATA_ALIGNMENT_} diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index ec78c90..f9e7a31 100644 +index e65f9a3ccf..d99d2c1d2a 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc -@@ -136,8 +136,8 @@ if test -n "${COMMONPAGESIZE}"; then - DATA_SEGMENT_END=". = DATA_SEGMENT_END (.);" - DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" +@@ -138,8 +138,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then + DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" + fi fi -if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then - INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }" @@ -58,5 +58,5 @@ index ec78c90..f9e7a31 100644 if test -z "$PLT"; then IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" -- -2.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch new file mode 100644 index 0000000000..14299fd1ae --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -0,0 +1,61 @@ +From 7c7de107b4b0a507d2aeca3e3a86d01cb4b51360 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Mar 2017 23:37:05 -0800 +Subject: [PATCH 02/15] binutils-cross: Do not generate linker script + directories + +We don't place target libraries within ${exec_prefix}, we'd always place these +within the target sysroot within the standard library directories. Worse, the +append_to_lib_path code prefixes these paths with the sysroot which makes even +less sense. + +These directories therefore don't make sense in our case and mean we have to +relocate all the linker scripts if they're present. Dropping them +gives a reasonable performance improvement/simplification. + +Upstream-Status: Inappropriate + +RP 2017/01/30 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ld/genscripts.sh | 23 ----------------------- + 1 file changed, 23 deletions(-) + +diff --git a/ld/genscripts.sh b/ld/genscripts.sh +index a42c4d7a4b..d727b4d07e 100755 +--- a/ld/genscripts.sh ++++ b/ld/genscripts.sh +@@ -189,29 +189,6 @@ append_to_lib_path() + fi + } + +-# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native +-# except when LIBPATH=":". +-if [ "${LIB_PATH}" != ":" ] ; then +- libs= +- if [ "x${TOOL_LIB}" = "x" ] ; then +- if [ "x${NATIVE}" = "xyes" ] ; then +- libs="${exec_prefix}/${target_alias}/lib" +- fi +- else +- # For multilib'ed targets, ensure both ${target_alias}/lib${LIBPATH_SUFFIX} +- # and ${TOOL_LIB}/lib${LIBPATH_SUFFIX} are in the default search path, +- # because 64bit libraries may be in both places, depending on +- # cross-development setup method (e.g.: /usr/s390x-linux/lib64 +- # vs. /usr/s390-linux/lib64) +- case "${NATIVE}:${LIBPATH_SUFFIX}:${TOOL_LIB}" in +- :* | *::* | *:*:*${LIBPATH_SUFFIX}) ;; +- *) libs="${exec_prefix}/${target_alias}/lib${LIBPATH_SUFFIX}" ;; +- esac +- libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}" +- fi +- append_to_lib_path ${libs} +-fi +- + if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then + libs=${NATIVE_LIB_DIRS} + if [ "x${NATIVE}" = "xyes" ] ; then +-- +2.12.0 + 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 deleted file mode 100644 index 4a202d0474..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0002-configure-widen-the-regexp-for-SH-architectures.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b1ae604880562ed065f614a745d3f8922838bc5a 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/14] 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 34b66f7..85414ab 100755 ---- a/configure -+++ b/configure -@@ -3445,7 +3445,7 @@ case "${target}" in - ;; - s390-*-* | s390x-*-*) - ;; -- sh-*-* | sh[34]*-*-*) -+ sh*-*-* | sh[34]*-*-*) - ;; - sh64-*-* | sh5*-*-*) - ;; -@@ -3939,7 +3939,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 693b927..d4db554 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.7.1 - diff --git a/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch b/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch new file mode 100644 index 0000000000..eddb42b4e3 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch @@ -0,0 +1,31 @@ +From 7893d2b24d0303bda3a0049846489619ffd1387b 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 03/15] gprof: add uclibc support to configure + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gprof/configure | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gprof/configure b/gprof/configure +index 9e6b8f3525..38a4c0b0e5 100755 +--- a/gprof/configure ++++ b/gprof/configure +@@ -5874,6 +5874,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.12.0 + diff --git a/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch index 2c70ecd93a..c6b9de7991 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch @@ -1,7 +1,7 @@ -From 01808e8ef8ee709c8218d962601c18a63a063a1f Mon Sep 17 00:00:00 2001 +From e34650c50574a8a39d694567ed607a63006b6f99 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/14] Point scripts location to libdir +Subject: [PATCH 04/15] Point scripts location to libdir Upstream-Status: Inappropriate [debian patch] @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index 0b3b049..3871c74 100644 +index 15beaa7021..bbf9c671d8 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -57,7 +57,7 @@ endif @@ -25,10 +25,10 @@ index 0b3b049..3871c74 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index ed98f87..530e4c9 100644 +index 042b690ed6..37e7b25e9a 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -452,7 +452,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # 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. @@ -38,5 +38,5 @@ index ed98f87..530e4c9 100644 BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include -- -2.7.1 +2.12.0 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/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 8f0a40210f..726f7020dd 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,7 +1,7 @@ -From c008c7f97c1cf487749c6c375820a1f3b3c6c53d Mon Sep 17 00:00:00 2001 +From 42292f5533bca904f230a8e03ceee1f84ef0c4ec 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/14] Only generate an RPATH entry if LD_RUN_PATH is not +Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not empty for cases where -rpath isn't specified. debian (#151024) @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+) diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index 0405d4f..73c5447 100644 +index 84adaef6df..ab8c74257e 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em -@@ -1242,6 +1242,8 @@ fragment <<EOF +@@ -1411,6 +1411,8 @@ fragment <<EOF && command_line.rpath == NULL) { lib_path = (const char *) getenv ("LD_RUN_PATH"); @@ -27,7 +27,7 @@ index 0405d4f..73c5447 100644 if (gld${EMULATION_NAME}_search_needed (lib_path, &n, force)) break; -@@ -1523,6 +1525,8 @@ gld${EMULATION_NAME}_before_allocation (void) +@@ -1692,6 +1694,8 @@ gld${EMULATION_NAME}_before_allocation (void) rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); @@ -37,5 +37,5 @@ index 0405d4f..73c5447 100644 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) -- -2.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch b/meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch index 92ead7fb48..9770ca7f0f 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Explicitly-link-with-libm-on-uclibc.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch @@ -1,7 +1,7 @@ -From 6a41635e29c4a6c064b1f66e79a8fe2026f4361b Mon Sep 17 00:00:00 2001 +From 6a46bf151d7e53df8b5e7645a2d241967688368a 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/14] Explicitly link with libm on uclibc +Subject: [PATCH 06/15] Explicitly link with libm on uclibc Description: @@ -31,10 +31,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 6 insertions(+) diff --git a/gas/configure.tgt b/gas/configure.tgt -index 0b490d4..086e0d2 100644 +index 711d537e95..7cd2dc176a 100644 --- a/gas/configure.tgt +++ b/gas/configure.tgt -@@ -487,6 +487,12 @@ case ${generic_target} in +@@ -494,6 +494,12 @@ case ${generic_target} in *-*-netware) fmt=elf em=netware ;; esac @@ -45,8 +45,8 @@ index 0b490d4..086e0d2 100644 +esac + case ${cpu_type} in - aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | sparc | z80 | z8k) + aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | riscv | sparc | z80 | z8k) bfd_gas=yes -- -2.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch index e54ab1bc8a..6b7f753891 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch @@ -1,36 +1,35 @@ -From da70f0876cdd8ed703d9ed1524212ccfefb09ef3 Mon Sep 17 00:00:00 2001 +From 9a3651e120261c72090689ad770ad048b0baf506 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH 06/14] Use libtool 2.4 +Date: Mon, 6 Mar 2017 23:28:33 -0800 +Subject: [PATCH 07/15] Use libtool 2.4 get libtool sysroot support Signed-off-by: Khem Raj <raj.khem@gmail.com> --- -Upstream-Status: Pending +Upstream-Status: Inappropriate [ OE configuration Specific] - bfd/configure | 1322 +++++++++++++++++------ + bfd/configure | 1318 +++++++++++++++++------ bfd/configure.ac | 2 +- - binutils/configure | 1320 +++++++++++++++++------ - configure | 4 +- - gas/configure | 1320 +++++++++++++++++------ - gprof/configure | 1325 +++++++++++++++++------ - ld/configure | 1695 +++++++++++++++++++++-------- + binutils/configure | 1316 +++++++++++++++++------ + gas/configure | 1314 +++++++++++++++++------ + gprof/configure | 1321 +++++++++++++++++------ + ld/configure | 1691 +++++++++++++++++++++-------- libtool.m4 | 1080 +++++++++++++------ ltmain.sh | 2925 +++++++++++++++++++++++++++++++++----------------- ltoptions.m4 | 2 +- ltversion.m4 | 12 +- lt~obsolete.m4 | 2 +- - opcodes/configure | 1322 +++++++++++++++++------ + opcodes/configure | 1318 +++++++++++++++++------ opcodes/configure.ac | 2 +- - zlib/configure | 1320 +++++++++++++++++------ - 15 files changed, 9944 insertions(+), 3709 deletions(-) + zlib/configure | 1316 +++++++++++++++++------ + 14 files changed, 9926 insertions(+), 3693 deletions(-) diff --git a/bfd/configure b/bfd/configure -index 7411c6d..eae743e 100755 +index f30bfabef3..fa1a545e9d 100755 --- a/bfd/configure +++ b/bfd/configure -@@ -670,6 +670,9 @@ OTOOL +@@ -672,6 +672,9 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -40,7 +39,7 @@ index 7411c6d..eae743e 100755 OBJDUMP LN_S NM -@@ -782,6 +785,7 @@ enable_static +@@ -785,6 +788,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -48,7 +47,7 @@ index 7411c6d..eae743e 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1458,6 +1462,8 @@ Optional Packages: +@@ -1461,6 +1465,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] @@ -57,7 +56,7 @@ index 7411c6d..eae743e 100755 --with-mmap try using mmap for BFD input files if available --with-separate-debug-dir=DIR Look for global separate debug info in DIR -@@ -5388,8 +5394,8 @@ esac +@@ -5393,8 +5399,8 @@ esac @@ -68,7 +67,7 @@ index 7411c6d..eae743e 100755 -@@ -5429,7 +5435,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5434,7 +5440,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. @@ -77,7 +76,7 @@ index 7411c6d..eae743e 100755 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 -@@ -6115,8 +6121,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6120,8 +6126,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" @@ -88,7 +87,7 @@ index 7411c6d..eae743e 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6165,6 +6171,80 @@ esac +@@ -6170,6 +6176,80 @@ esac @@ -169,7 +168,7 @@ index 7411c6d..eae743e 100755 { $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 : -@@ -6181,6 +6261,11 @@ case $reload_flag in +@@ -6186,6 +6266,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -181,7 +180,7 @@ index 7411c6d..eae743e 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6349,7 +6434,8 @@ mingw* | pw32*) +@@ -6354,7 +6439,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -191,7 +190,7 @@ index 7411c6d..eae743e 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6503,6 +6589,21 @@ esac +@@ -6508,6 +6594,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; } @@ -213,7 +212,7 @@ index 7411c6d..eae743e 100755 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 -@@ -6518,9 +6619,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6523,9 +6624,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -378,7 +377,7 @@ index 7411c6d..eae743e 100755 { $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 : -@@ -6536,7 +6790,7 @@ do +@@ -6541,7 +6795,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 @@ -387,7 +386,7 @@ index 7411c6d..eae743e 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6556,11 +6810,15 @@ $as_echo "no" >&6; } +@@ -6561,11 +6815,15 @@ $as_echo "no" >&6; } fi @@ -406,7 +405,7 @@ index 7411c6d..eae743e 100755 { $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 : -@@ -6576,7 +6834,7 @@ do +@@ -6581,7 +6839,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 @@ -415,7 +414,7 @@ index 7411c6d..eae743e 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6595,6 +6853,10 @@ else +@@ -6600,6 +6858,10 @@ else $as_echo "no" >&6; } fi @@ -426,7 +425,7 @@ index 7411c6d..eae743e 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6606,16 +6868,72 @@ ac_tool_warned=yes ;; +@@ -6611,16 +6873,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -503,7 +502,7 @@ index 7411c6d..eae743e 100755 -@@ -6957,8 +7275,8 @@ esac +@@ -6962,8 +7280,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 @@ -514,7 +513,7 @@ index 7411c6d..eae743e 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6994,6 +7312,7 @@ for ac_symprfx in "" "_"; do +@@ -6999,6 +7317,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 @@ -522,7 +521,7 @@ index 7411c6d..eae743e 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7035,6 +7354,18 @@ _LT_EOF +@@ -7040,6 +7359,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 @@ -541,7 +540,7 @@ index 7411c6d..eae743e 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7046,7 +7377,7 @@ _LT_EOF +@@ -7051,7 +7382,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -550,7 +549,7 @@ index 7411c6d..eae743e 100755 const char *name; void *address; } -@@ -7072,8 +7403,8 @@ static const void *lt_preloaded_setup() { +@@ -7077,8 +7408,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -561,7 +560,7 @@ index 7411c6d..eae743e 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7083,8 +7414,8 @@ _LT_EOF +@@ -7088,8 +7419,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -572,7 +571,7 @@ index 7411c6d..eae743e 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7121,6 +7452,16 @@ else +@@ -7126,6 +7457,16 @@ else $as_echo "ok" >&6; } fi @@ -589,7 +588,7 @@ index 7411c6d..eae743e 100755 -@@ -7142,6 +7483,45 @@ fi +@@ -7147,6 +7488,45 @@ fi @@ -635,7 +634,7 @@ index 7411c6d..eae743e 100755 # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; -@@ -7348,6 +7728,123 @@ esac +@@ -7353,6 +7733,123 @@ esac need_locks="$enable_libtool_lock" @@ -759,7 +758,7 @@ index 7411c6d..eae743e 100755 case $host_os in rhapsody* | darwin*) -@@ -7911,6 +8408,8 @@ _LT_EOF +@@ -7916,6 +8413,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 @@ -768,7 +767,7 @@ index 7411c6d..eae743e 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8075,7 +8574,8 @@ fi +@@ -8080,7 +8579,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -778,7 +777,7 @@ index 7411c6d..eae743e 100755 -@@ -8164,7 +8664,7 @@ aix3*) +@@ -8169,7 +8669,7 @@ aix3*) esac # Global variables: @@ -787,7 +786,7 @@ index 7411c6d..eae743e 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8462,8 +8962,6 @@ fi +@@ -8467,8 +8967,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -796,7 +795,7 @@ index 7411c6d..eae743e 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8629,6 +9127,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8634,6 +9132,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -809,7 +808,7 @@ index 7411c6d..eae743e 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8691,7 +9195,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8696,7 +9200,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 @@ -818,7 +817,7 @@ index 7411c6d..eae743e 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8748,13 +9252,17 @@ case $host_os in +@@ -8753,13 +9257,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -842,7 +841,7 @@ index 7411c6d..eae743e 100755 # # Check to make sure the PIC flag actually works. -@@ -8815,6 +9323,11 @@ fi +@@ -8820,6 +9328,11 @@ fi @@ -854,7 +853,7 @@ index 7411c6d..eae743e 100755 # # Check to make sure the static flag actually works. # -@@ -9165,7 +9678,8 @@ _LT_EOF +@@ -9170,7 +9683,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -864,7 +863,7 @@ index 7411c6d..eae743e 100755 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' -@@ -9264,12 +9778,12 @@ _LT_EOF +@@ -9269,12 +9783,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -879,7 +878,7 @@ index 7411c6d..eae743e 100755 fi ;; esac -@@ -9283,8 +9797,8 @@ _LT_EOF +@@ -9288,8 +9802,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -890,7 +889,7 @@ index 7411c6d..eae743e 100755 fi ;; -@@ -9302,8 +9816,8 @@ _LT_EOF +@@ -9307,8 +9821,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -901,7 +900,7 @@ index 7411c6d..eae743e 100755 else ld_shlibs=no fi -@@ -9349,8 +9863,8 @@ _LT_EOF +@@ -9354,8 +9868,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -912,7 +911,7 @@ index 7411c6d..eae743e 100755 else ld_shlibs=no fi -@@ -9480,7 +9994,13 @@ _LT_EOF +@@ -9485,7 +9999,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -927,7 +926,7 @@ index 7411c6d..eae743e 100755 /* end confdefs.h. */ int -@@ -9493,22 +10013,29 @@ main () +@@ -9498,22 +10018,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -970,7 +969,7 @@ index 7411c6d..eae743e 100755 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" -@@ -9520,7 +10047,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9525,7 +10052,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. @@ -985,7 +984,7 @@ index 7411c6d..eae743e 100755 /* end confdefs.h. */ int -@@ -9533,22 +10066,29 @@ main () +@@ -9538,22 +10071,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -1028,7 +1027,7 @@ index 7411c6d..eae743e 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9593,20 +10133,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9598,20 +10138,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. @@ -1106,7 +1105,7 @@ index 7411c6d..eae743e 100755 ;; darwin* | rhapsody*) -@@ -9667,7 +10250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9672,7 +10255,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*) @@ -1115,7 +1114,7 @@ index 7411c6d..eae743e 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9675,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9680,7 +10263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -1124,7 +1123,7 @@ index 7411c6d..eae743e 100755 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 -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9696,7 +10279,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -1133,7 +1132,7 @@ index 7411c6d..eae743e 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9715,10 +10298,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9720,10 +10303,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*) @@ -1146,7 +1145,7 @@ index 7411c6d..eae743e 100755 ;; esac else -@@ -9797,23 +10380,36 @@ fi +@@ -9802,23 +10385,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -1191,7 +1190,7 @@ index 7411c6d..eae743e 100755 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' -@@ -9898,7 +10494,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9903,7 +10499,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}\*' @@ -1200,7 +1199,7 @@ index 7411c6d..eae743e 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9917,9 +10513,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9922,9 +10518,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -1212,7 +1211,7 @@ index 7411c6d..eae743e 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10495,8 +11091,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10500,8 +11096,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -1224,7 +1223,7 @@ index 7411c6d..eae743e 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10529,13 +11126,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10534,13 +11131,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 @@ -1297,7 +1296,7 @@ index 7411c6d..eae743e 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10627,7 +11282,7 @@ haiku*) +@@ -10632,7 +11287,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -1306,16 +1305,7 @@ index 7411c6d..eae743e 100755 hardcode_into_libs=yes ;; -@@ -11423,7 +12078,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11426 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11467,10 +12122,10 @@ else +@@ -11472,10 +12127,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)) @@ -1328,16 +1318,7 @@ index 7411c6d..eae743e 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11529,7 +12184,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11532 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11573,10 +12228,10 @@ else +@@ -11578,10 +12233,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)) @@ -1350,7 +1331,7 @@ index 7411c6d..eae743e 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15121,7 +15776,7 @@ SHARED_LDFLAGS= +@@ -14122,7 +14777,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 @@ -1359,7 +1340,7 @@ index 7411c6d..eae743e 100755 fi # More hacks to build DLLs on Windows. -@@ -16746,13 +17401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -16826,13 +17481,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"`' @@ -1380,7 +1361,7 @@ index 7411c6d..eae743e 100755 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"`' -@@ -16767,14 +17429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -16847,14 +17509,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"`' @@ -1399,7 +1380,7 @@ index 7411c6d..eae743e 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -16807,12 +17472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -16887,12 +17552,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"`' @@ -1413,7 +1394,7 @@ index 7411c6d..eae743e 100755 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"`' -@@ -16867,8 +17532,13 @@ reload_flag \ +@@ -16947,8 +17612,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1427,7 +1408,7 @@ index 7411c6d..eae743e 100755 STRIP \ RANLIB \ CC \ -@@ -16878,12 +17548,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16958,12 +17628,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 \ @@ -1443,7 +1424,7 @@ index 7411c6d..eae743e 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16899,7 +17571,6 @@ no_undefined_flag \ +@@ -16979,7 +17651,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1451,7 +1432,7 @@ index 7411c6d..eae743e 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16935,6 +17606,7 @@ module_cmds \ +@@ -17015,6 +17686,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1459,7 +1440,7 @@ index 7411c6d..eae743e 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -17714,7 +18386,8 @@ $as_echo X"$file" | +@@ -17794,7 +18466,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, @@ -1469,7 +1450,7 @@ index 7411c6d..eae743e 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17817,19 +18490,42 @@ SP2NL=$lt_lt_SP2NL +@@ -17897,19 +18570,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1513,7 +1494,7 @@ index 7411c6d..eae743e 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17859,6 +18555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -17939,6 +18635,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 @@ -1526,7 +1507,7 @@ index 7411c6d..eae743e 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17868,6 +18570,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17948,6 +18650,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1536,7 +1517,7 @@ index 7411c6d..eae743e 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17982,12 +18687,12 @@ with_gcc=$GCC +@@ -18062,12 +18767,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1552,7 +1533,7 @@ index 7411c6d..eae743e 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -18074,9 +18779,6 @@ inherit_rpath=$inherit_rpath +@@ -18154,9 +18859,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1562,7 +1543,7 @@ index 7411c6d..eae743e 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -18092,6 +18794,9 @@ include_expsyms=$lt_include_expsyms +@@ -18172,6 +18874,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1572,7 +1553,7 @@ index 7411c6d..eae743e 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -18124,210 +18829,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -18204,210 +18909,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? @@ -1947,10 +1928,10 @@ index 7411c6d..eae743e 100755 chmod +x "$ofile" diff --git a/bfd/configure.ac b/bfd/configure.ac -index 6f5e85f..44bd02c 100644 +index 9a183c1628..3d8ea07836 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -567,7 +567,7 @@ changequote(,)dnl +@@ -253,7 +253,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -1960,10 +1941,10 @@ index 6f5e85f..44bd02c 100644 # More hacks to build DLLs on Windows. diff --git a/binutils/configure b/binutils/configure -index d4f3e1e..a6df5bb 100755 +index 82119efe72..4a98918ce1 100755 --- a/binutils/configure +++ b/binutils/configure -@@ -657,8 +657,11 @@ OTOOL +@@ -659,8 +659,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -1975,7 +1956,7 @@ index d4f3e1e..a6df5bb 100755 OBJDUMP LN_S NM -@@ -769,6 +772,7 @@ enable_static +@@ -772,6 +775,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -1983,7 +1964,7 @@ index d4f3e1e..a6df5bb 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1441,6 +1445,8 @@ Optional Packages: +@@ -1444,6 +1448,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] @@ -1992,7 +1973,7 @@ index d4f3e1e..a6df5bb 100755 --with-system-zlib use installed libz --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 -@@ -5155,8 +5161,8 @@ esac +@@ -5160,8 +5166,8 @@ esac @@ -2003,7 +1984,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -5196,7 +5202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5201,7 +5207,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. @@ -2012,7 +1993,7 @@ index d4f3e1e..a6df5bb 100755 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 -@@ -5882,8 +5888,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5887,8 +5893,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" @@ -2023,7 +2004,7 @@ index d4f3e1e..a6df5bb 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5932,6 +5938,80 @@ esac +@@ -5937,6 +5943,80 @@ esac @@ -2104,7 +2085,7 @@ index d4f3e1e..a6df5bb 100755 { $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 : -@@ -5948,6 +6028,11 @@ case $reload_flag in +@@ -5953,6 +6033,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -2116,7 +2097,7 @@ index d4f3e1e..a6df5bb 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6116,7 +6201,8 @@ mingw* | pw32*) +@@ -6121,7 +6206,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -2126,7 +2107,7 @@ index d4f3e1e..a6df5bb 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6270,6 +6356,21 @@ esac +@@ -6275,6 +6361,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; } @@ -2148,7 +2129,7 @@ index d4f3e1e..a6df5bb 100755 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 -@@ -6285,9 +6386,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6290,9 +6391,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -2313,7 +2294,7 @@ index d4f3e1e..a6df5bb 100755 { $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 : -@@ -6303,7 +6557,7 @@ do +@@ -6308,7 +6562,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 @@ -2322,7 +2303,7 @@ index d4f3e1e..a6df5bb 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6323,11 +6577,15 @@ $as_echo "no" >&6; } +@@ -6328,11 +6582,15 @@ $as_echo "no" >&6; } fi @@ -2341,7 +2322,7 @@ index d4f3e1e..a6df5bb 100755 { $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 : -@@ -6343,7 +6601,7 @@ do +@@ -6348,7 +6606,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 @@ -2350,7 +2331,7 @@ index d4f3e1e..a6df5bb 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6362,6 +6620,10 @@ else +@@ -6367,6 +6625,10 @@ else $as_echo "no" >&6; } fi @@ -2361,7 +2342,7 @@ index d4f3e1e..a6df5bb 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6373,12 +6635,10 @@ ac_tool_warned=yes ;; +@@ -6378,12 +6640,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -2376,7 +2357,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -6390,6 +6650,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6395,6 +6655,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -2441,7 +2422,7 @@ index d4f3e1e..a6df5bb 100755 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 -@@ -6724,8 +7042,8 @@ esac +@@ -6729,8 +7047,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 @@ -2452,7 +2433,7 @@ index d4f3e1e..a6df5bb 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6761,6 +7079,7 @@ for ac_symprfx in "" "_"; do +@@ -6766,6 +7084,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 @@ -2460,7 +2441,7 @@ index d4f3e1e..a6df5bb 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6802,6 +7121,18 @@ _LT_EOF +@@ -6807,6 +7126,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 @@ -2479,7 +2460,7 @@ index d4f3e1e..a6df5bb 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6813,7 +7144,7 @@ _LT_EOF +@@ -6818,7 +7149,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -2488,7 +2469,7 @@ index d4f3e1e..a6df5bb 100755 const char *name; void *address; } -@@ -6839,8 +7170,8 @@ static const void *lt_preloaded_setup() { +@@ -6844,8 +7175,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -2499,7 +2480,7 @@ index d4f3e1e..a6df5bb 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6850,8 +7181,8 @@ _LT_EOF +@@ -6855,8 +7186,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -2510,7 +2491,7 @@ index d4f3e1e..a6df5bb 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6888,6 +7219,21 @@ else +@@ -6893,6 +7224,21 @@ else $as_echo "ok" >&6; } fi @@ -2532,7 +2513,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -6906,6 +7252,40 @@ fi +@@ -6910,6 +7256,40 @@ fi @@ -2573,7 +2554,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -7115,6 +7495,123 @@ esac +@@ -7120,6 +7500,123 @@ esac need_locks="$enable_libtool_lock" @@ -2697,7 +2678,7 @@ index d4f3e1e..a6df5bb 100755 case $host_os in rhapsody* | darwin*) -@@ -7678,6 +8175,8 @@ _LT_EOF +@@ -7683,6 +8180,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 @@ -2706,7 +2687,7 @@ index d4f3e1e..a6df5bb 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7873,7 +8372,8 @@ fi +@@ -7878,7 +8377,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -2716,7 +2697,7 @@ index d4f3e1e..a6df5bb 100755 -@@ -7962,7 +8462,7 @@ aix3*) +@@ -7967,7 +8467,7 @@ aix3*) esac # Global variables: @@ -2725,7 +2706,7 @@ index d4f3e1e..a6df5bb 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8260,8 +8760,6 @@ fi +@@ -8265,8 +8765,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -2734,7 +2715,7 @@ index d4f3e1e..a6df5bb 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8427,6 +8925,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8432,6 +8930,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -2747,7 +2728,7 @@ index d4f3e1e..a6df5bb 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8489,7 +8993,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8494,7 +8998,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 @@ -2756,7 +2737,7 @@ index d4f3e1e..a6df5bb 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8546,13 +9050,17 @@ case $host_os in +@@ -8551,13 +9055,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -2780,7 +2761,7 @@ index d4f3e1e..a6df5bb 100755 # # Check to make sure the PIC flag actually works. -@@ -8613,6 +9121,11 @@ fi +@@ -8618,6 +9126,11 @@ fi @@ -2792,7 +2773,7 @@ index d4f3e1e..a6df5bb 100755 # # Check to make sure the static flag actually works. # -@@ -8963,7 +9476,8 @@ _LT_EOF +@@ -8968,7 +9481,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -2802,7 +2783,7 @@ index d4f3e1e..a6df5bb 100755 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' -@@ -9062,12 +9576,12 @@ _LT_EOF +@@ -9067,12 +9581,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -2817,7 +2798,7 @@ index d4f3e1e..a6df5bb 100755 fi ;; esac -@@ -9081,8 +9595,8 @@ _LT_EOF +@@ -9086,8 +9600,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -2828,7 +2809,7 @@ index d4f3e1e..a6df5bb 100755 fi ;; -@@ -9100,8 +9614,8 @@ _LT_EOF +@@ -9105,8 +9619,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2839,7 +2820,7 @@ index d4f3e1e..a6df5bb 100755 else ld_shlibs=no fi -@@ -9147,8 +9661,8 @@ _LT_EOF +@@ -9152,8 +9666,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2850,7 +2831,7 @@ index d4f3e1e..a6df5bb 100755 else ld_shlibs=no fi -@@ -9278,7 +9792,13 @@ _LT_EOF +@@ -9283,7 +9797,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -2865,7 +2846,7 @@ index d4f3e1e..a6df5bb 100755 /* end confdefs.h. */ int -@@ -9291,22 +9811,29 @@ main () +@@ -9296,22 +9816,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2908,7 +2889,7 @@ index d4f3e1e..a6df5bb 100755 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" -@@ -9318,7 +9845,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9323,7 +9850,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. @@ -2923,7 +2904,7 @@ index d4f3e1e..a6df5bb 100755 /* end confdefs.h. */ int -@@ -9331,22 +9864,29 @@ main () +@@ -9336,22 +9869,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2966,7 +2947,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9391,20 +9931,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9396,20 +9936,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. @@ -3044,7 +3025,7 @@ index d4f3e1e..a6df5bb 100755 ;; darwin* | rhapsody*) -@@ -9465,7 +10048,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9470,7 +10053,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*) @@ -3053,7 +3034,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9473,7 +10056,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9478,7 +10061,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -3062,7 +3043,7 @@ index d4f3e1e..a6df5bb 100755 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 -@@ -9489,7 +10072,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9494,7 +10077,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -3071,7 +3052,7 @@ index d4f3e1e..a6df5bb 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9513,10 +10096,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9518,10 +10101,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*) @@ -3084,7 +3065,7 @@ index d4f3e1e..a6df5bb 100755 ;; esac else -@@ -9595,23 +10178,36 @@ fi +@@ -9600,23 +10183,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -3129,7 +3110,7 @@ index d4f3e1e..a6df5bb 100755 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' -@@ -9696,7 +10292,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9701,7 +10297,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}\*' @@ -3138,7 +3119,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9715,9 +10311,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9720,9 +10316,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -3150,7 +3131,7 @@ index d4f3e1e..a6df5bb 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10293,8 +10889,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10298,8 +10894,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -3162,7 +3143,7 @@ index d4f3e1e..a6df5bb 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10327,13 +10924,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10332,13 +10929,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 @@ -3235,7 +3216,7 @@ index d4f3e1e..a6df5bb 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10425,7 +11080,7 @@ haiku*) +@@ -10430,7 +11085,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3244,16 +3225,7 @@ index d4f3e1e..a6df5bb 100755 hardcode_into_libs=yes ;; -@@ -11221,7 +11876,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11224 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11265,10 +11920,10 @@ else +@@ -11270,10 +11925,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)) @@ -3266,16 +3238,7 @@ index d4f3e1e..a6df5bb 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11327,7 +11982,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11330 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11371,10 +12026,10 @@ else +@@ -11376,10 +12031,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)) @@ -3288,7 +3251,7 @@ index d4f3e1e..a6df5bb 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15355,13 +16010,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15436,13 +16091,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"`' @@ -3309,7 +3272,7 @@ index d4f3e1e..a6df5bb 100755 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"`' -@@ -15376,14 +16038,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15457,14 +16119,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"`' @@ -3328,7 +3291,7 @@ index d4f3e1e..a6df5bb 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15416,12 +16081,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15497,12 +16162,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"`' @@ -3342,7 +3305,7 @@ index d4f3e1e..a6df5bb 100755 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"`' -@@ -15476,8 +16141,13 @@ reload_flag \ +@@ -15557,8 +16222,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3356,7 +3319,7 @@ index d4f3e1e..a6df5bb 100755 STRIP \ RANLIB \ CC \ -@@ -15487,12 +16157,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15568,12 +16238,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 \ @@ -3372,7 +3335,7 @@ index d4f3e1e..a6df5bb 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15508,7 +16180,6 @@ no_undefined_flag \ +@@ -15589,7 +16261,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3380,7 +3343,7 @@ index d4f3e1e..a6df5bb 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15544,6 +16215,7 @@ module_cmds \ +@@ -15625,6 +16296,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3388,7 +3351,7 @@ index d4f3e1e..a6df5bb 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16301,7 +16973,8 @@ $as_echo X"$file" | +@@ -16382,7 +17054,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, @@ -3398,7 +3361,7 @@ index d4f3e1e..a6df5bb 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16404,19 +17077,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16485,19 +17158,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3442,7 +3405,7 @@ index d4f3e1e..a6df5bb 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16446,6 +17142,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16527,6 +17223,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 @@ -3455,7 +3418,7 @@ index d4f3e1e..a6df5bb 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16455,6 +17157,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16536,6 +17238,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3465,7 +3428,7 @@ index d4f3e1e..a6df5bb 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16569,12 +17274,12 @@ with_gcc=$GCC +@@ -16650,12 +17355,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3481,7 +3444,7 @@ index d4f3e1e..a6df5bb 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16661,9 +17366,6 @@ inherit_rpath=$inherit_rpath +@@ -16742,9 +17447,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3491,7 +3454,7 @@ index d4f3e1e..a6df5bb 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16679,6 +17381,9 @@ include_expsyms=$lt_include_expsyms +@@ -16760,6 +17462,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3501,7 +3464,7 @@ index d4f3e1e..a6df5bb 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16711,210 +17416,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16792,210 +17497,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? @@ -3875,33 +3838,11 @@ index d4f3e1e..a6df5bb 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -diff --git a/configure b/configure -index 85414ab..34b66f7 100755 ---- a/configure -+++ b/configure -@@ -3445,7 +3445,7 @@ case "${target}" in - ;; - s390-*-* | s390x-*-*) - ;; -- sh*-*-* | sh[34]*-*-*) -+ sh-*-* | sh[34]*-*-*) - ;; - sh64-*-* | sh5*-*-*) - ;; -@@ -3939,7 +3939,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh*-*-* | sh64-*-*) -+ sh-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; diff --git a/gas/configure b/gas/configure -index dd9c953..89f18b3 100755 +index e574cb8514..a36f1ae161 100755 --- a/gas/configure +++ b/gas/configure -@@ -647,8 +647,11 @@ OTOOL +@@ -650,8 +650,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -3913,7 +3854,7 @@ index dd9c953..89f18b3 100755 OBJDUMP LN_S NM -@@ -759,6 +762,7 @@ enable_static +@@ -763,6 +766,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -3921,16 +3862,7 @@ index dd9c953..89f18b3 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1430,6 +1434,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-system-zlib use installed libz - - Some influential environment variables: -@@ -4909,8 +4915,8 @@ esac +@@ -4921,8 +4925,8 @@ esac @@ -3941,7 +3873,7 @@ index dd9c953..89f18b3 100755 -@@ -4950,7 +4956,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4962,7 +4966,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. @@ -3950,7 +3882,7 @@ index dd9c953..89f18b3 100755 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 -@@ -5636,8 +5642,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5648,8 +5652,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" @@ -3961,7 +3893,7 @@ index dd9c953..89f18b3 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5686,6 +5692,80 @@ esac +@@ -5698,6 +5702,80 @@ esac @@ -4042,7 +3974,7 @@ index dd9c953..89f18b3 100755 { $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 : -@@ -5702,6 +5782,11 @@ case $reload_flag in +@@ -5714,6 +5792,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -4054,7 +3986,7 @@ index dd9c953..89f18b3 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5870,7 +5955,8 @@ mingw* | pw32*) +@@ -5882,7 +5965,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -4064,7 +3996,7 @@ index dd9c953..89f18b3 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6024,6 +6110,21 @@ esac +@@ -6036,6 +6120,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; } @@ -4086,7 +4018,7 @@ index dd9c953..89f18b3 100755 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 -@@ -6039,9 +6140,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6051,9 +6150,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4251,7 +4183,7 @@ index dd9c953..89f18b3 100755 { $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 : -@@ -6057,7 +6311,7 @@ do +@@ -6069,7 +6321,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 @@ -4260,7 +4192,7 @@ index dd9c953..89f18b3 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6077,11 +6331,15 @@ $as_echo "no" >&6; } +@@ -6089,11 +6341,15 @@ $as_echo "no" >&6; } fi @@ -4279,7 +4211,7 @@ index dd9c953..89f18b3 100755 { $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 : -@@ -6097,7 +6355,7 @@ do +@@ -6109,7 +6365,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 @@ -4288,7 +4220,7 @@ index dd9c953..89f18b3 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6116,6 +6374,10 @@ else +@@ -6128,6 +6384,10 @@ else $as_echo "no" >&6; } fi @@ -4299,7 +4231,7 @@ index dd9c953..89f18b3 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6127,12 +6389,10 @@ ac_tool_warned=yes ;; +@@ -6139,12 +6399,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -4314,7 +4246,7 @@ index dd9c953..89f18b3 100755 -@@ -6144,6 +6404,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6156,6 +6414,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -4379,7 +4311,7 @@ index dd9c953..89f18b3 100755 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 -@@ -6478,8 +6796,8 @@ esac +@@ -6490,8 +6806,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 @@ -4390,7 +4322,7 @@ index dd9c953..89f18b3 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6515,6 +6833,7 @@ for ac_symprfx in "" "_"; do +@@ -6527,6 +6843,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 @@ -4398,7 +4330,7 @@ index dd9c953..89f18b3 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6556,6 +6875,18 @@ _LT_EOF +@@ -6568,6 +6885,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 @@ -4417,7 +4349,7 @@ index dd9c953..89f18b3 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6567,7 +6898,7 @@ _LT_EOF +@@ -6579,7 +6908,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -4426,7 +4358,7 @@ index dd9c953..89f18b3 100755 const char *name; void *address; } -@@ -6593,8 +6924,8 @@ static const void *lt_preloaded_setup() { +@@ -6605,8 +6934,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -4437,7 +4369,7 @@ index dd9c953..89f18b3 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6604,8 +6935,8 @@ _LT_EOF +@@ -6616,8 +6945,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -4448,7 +4380,7 @@ index dd9c953..89f18b3 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6642,6 +6973,21 @@ else +@@ -6654,6 +6983,21 @@ else $as_echo "ok" >&6; } fi @@ -4470,7 +4402,7 @@ index dd9c953..89f18b3 100755 -@@ -6660,6 +7006,40 @@ fi +@@ -6671,6 +7015,40 @@ fi @@ -4511,7 +4443,7 @@ index dd9c953..89f18b3 100755 -@@ -6869,6 +7249,123 @@ esac +@@ -6881,6 +7259,123 @@ esac need_locks="$enable_libtool_lock" @@ -4635,7 +4567,7 @@ index dd9c953..89f18b3 100755 case $host_os in rhapsody* | darwin*) -@@ -7432,6 +7929,8 @@ _LT_EOF +@@ -7444,6 +7939,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 @@ -4644,7 +4576,7 @@ index dd9c953..89f18b3 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7627,7 +8126,8 @@ fi +@@ -7639,7 +8136,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -4654,7 +4586,7 @@ index dd9c953..89f18b3 100755 -@@ -7716,7 +8216,7 @@ aix3*) +@@ -7728,7 +8226,7 @@ aix3*) esac # Global variables: @@ -4663,7 +4595,7 @@ index dd9c953..89f18b3 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8014,8 +8514,6 @@ fi +@@ -8026,8 +8524,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -4672,7 +4604,7 @@ index dd9c953..89f18b3 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8181,6 +8679,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8193,6 +8689,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -4685,7 +4617,7 @@ index dd9c953..89f18b3 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8243,7 +8747,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8255,7 +8757,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 @@ -4694,7 +4626,7 @@ index dd9c953..89f18b3 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8300,13 +8804,17 @@ case $host_os in +@@ -8312,13 +8814,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -4718,7 +4650,7 @@ index dd9c953..89f18b3 100755 # # Check to make sure the PIC flag actually works. -@@ -8367,6 +8875,11 @@ fi +@@ -8379,6 +8885,11 @@ fi @@ -4730,7 +4662,7 @@ index dd9c953..89f18b3 100755 # # Check to make sure the static flag actually works. # -@@ -8717,7 +9230,8 @@ _LT_EOF +@@ -8729,7 +9240,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -4740,7 +4672,7 @@ index dd9c953..89f18b3 100755 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' -@@ -8816,12 +9330,12 @@ _LT_EOF +@@ -8828,12 +9340,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -4755,7 +4687,7 @@ index dd9c953..89f18b3 100755 fi ;; esac -@@ -8835,8 +9349,8 @@ _LT_EOF +@@ -8847,8 +9359,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -4766,7 +4698,7 @@ index dd9c953..89f18b3 100755 fi ;; -@@ -8854,8 +9368,8 @@ _LT_EOF +@@ -8866,8 +9378,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4777,7 +4709,7 @@ index dd9c953..89f18b3 100755 else ld_shlibs=no fi -@@ -8901,8 +9415,8 @@ _LT_EOF +@@ -8913,8 +9425,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4788,7 +4720,7 @@ index dd9c953..89f18b3 100755 else ld_shlibs=no fi -@@ -9032,7 +9546,13 @@ _LT_EOF +@@ -9044,7 +9556,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -4803,7 +4735,7 @@ index dd9c953..89f18b3 100755 /* end confdefs.h. */ int -@@ -9045,22 +9565,29 @@ main () +@@ -9057,22 +9575,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4846,7 +4778,7 @@ index dd9c953..89f18b3 100755 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" -@@ -9072,7 +9599,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9084,7 +9609,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. @@ -4861,7 +4793,7 @@ index dd9c953..89f18b3 100755 /* end confdefs.h. */ int -@@ -9085,22 +9618,29 @@ main () +@@ -9097,22 +9628,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4904,7 +4836,7 @@ index dd9c953..89f18b3 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9145,20 +9685,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9157,20 +9695,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. @@ -4982,7 +4914,7 @@ index dd9c953..89f18b3 100755 ;; darwin* | rhapsody*) -@@ -9219,7 +9802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9231,7 +9812,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*) @@ -4991,7 +4923,7 @@ index dd9c953..89f18b3 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9227,7 +9810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9239,7 +9820,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -5000,7 +4932,7 @@ index dd9c953..89f18b3 100755 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 -@@ -9243,7 +9826,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9255,7 +9836,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -5009,7 +4941,7 @@ index dd9c953..89f18b3 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9267,10 +9850,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9279,10 +9860,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*) @@ -5022,7 +4954,7 @@ index dd9c953..89f18b3 100755 ;; esac else -@@ -9349,23 +9932,36 @@ fi +@@ -9361,23 +9942,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -5067,7 +4999,7 @@ index dd9c953..89f18b3 100755 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' -@@ -9450,7 +10046,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9462,7 +10056,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}\*' @@ -5076,7 +5008,7 @@ index dd9c953..89f18b3 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9469,9 +10065,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9481,9 +10075,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -5088,7 +5020,7 @@ index dd9c953..89f18b3 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10047,8 +10643,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10059,8 +10653,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -5100,7 +5032,7 @@ index dd9c953..89f18b3 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10081,13 +10678,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10093,13 +10688,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 @@ -5173,7 +5105,7 @@ index dd9c953..89f18b3 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10179,7 +10834,7 @@ haiku*) +@@ -10191,7 +10844,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -5182,16 +5114,7 @@ index dd9c953..89f18b3 100755 hardcode_into_libs=yes ;; -@@ -10975,7 +11630,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10978 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11019,10 +11674,10 @@ else +@@ -11031,10 +11684,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)) @@ -5204,16 +5127,7 @@ index dd9c953..89f18b3 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11081,7 +11736,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11084 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11125,10 +11780,10 @@ else +@@ -11137,10 +11790,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)) @@ -5226,7 +5140,7 @@ index dd9c953..89f18b3 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15276,13 +15931,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15425,13 +16078,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"`' @@ -5247,7 +5161,7 @@ index dd9c953..89f18b3 100755 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"`' -@@ -15297,14 +15959,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15446,14 +16106,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"`' @@ -5266,7 +5180,7 @@ index dd9c953..89f18b3 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15337,12 +16002,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15486,12 +16149,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"`' @@ -5280,7 +5194,7 @@ index dd9c953..89f18b3 100755 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"`' -@@ -15397,8 +16062,13 @@ reload_flag \ +@@ -15546,8 +16209,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -5294,7 +5208,7 @@ index dd9c953..89f18b3 100755 STRIP \ RANLIB \ CC \ -@@ -15408,12 +16078,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15557,12 +16225,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 \ @@ -5310,7 +5224,7 @@ index dd9c953..89f18b3 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15429,7 +16101,6 @@ no_undefined_flag \ +@@ -15578,7 +16248,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -5318,7 +5232,7 @@ index dd9c953..89f18b3 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15465,6 +16136,7 @@ module_cmds \ +@@ -15614,6 +16283,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -5326,7 +5240,7 @@ index dd9c953..89f18b3 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16229,7 +16901,8 @@ $as_echo X"$file" | +@@ -16378,7 +17048,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, @@ -5336,7 +5250,7 @@ index dd9c953..89f18b3 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16332,19 +17005,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16481,19 +17152,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -5380,7 +5294,7 @@ index dd9c953..89f18b3 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -16374,6 +17070,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16523,6 +17217,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 @@ -5393,7 +5307,7 @@ index dd9c953..89f18b3 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16383,6 +17085,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16532,6 +17232,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -5403,7 +5317,7 @@ index dd9c953..89f18b3 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16497,12 +17202,12 @@ with_gcc=$GCC +@@ -16646,12 +17349,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -5419,7 +5333,7 @@ index dd9c953..89f18b3 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -16589,9 +17294,6 @@ inherit_rpath=$inherit_rpath +@@ -16738,9 +17441,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -5429,7 +5343,7 @@ index dd9c953..89f18b3 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -16607,6 +17309,9 @@ include_expsyms=$lt_include_expsyms +@@ -16756,6 +17456,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -5439,7 +5353,7 @@ index dd9c953..89f18b3 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -16639,210 +17344,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16788,210 +17491,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? @@ -5814,10 +5728,10 @@ index dd9c953..89f18b3 100755 chmod +x "$ofile" diff --git a/gprof/configure b/gprof/configure -index d4db554..78b292c 100755 +index 38a4c0b0e5..38d1f699c7 100755 --- a/gprof/configure +++ b/gprof/configure -@@ -629,8 +629,11 @@ OTOOL +@@ -631,8 +631,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -5829,7 +5743,7 @@ index d4db554..78b292c 100755 OBJDUMP LN_S NM -@@ -741,6 +744,7 @@ enable_static +@@ -744,6 +747,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -5837,7 +5751,7 @@ index d4db554..78b292c 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1399,6 +1403,8 @@ Optional Packages: +@@ -1402,6 +1406,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] @@ -5846,7 +5760,7 @@ index d4db554..78b292c 100755 Some influential environment variables: CC C compiler command -@@ -4831,8 +4837,8 @@ esac +@@ -4836,8 +4842,8 @@ esac @@ -5857,7 +5771,7 @@ index d4db554..78b292c 100755 -@@ -4872,7 +4878,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4877,7 +4883,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. @@ -5866,7 +5780,7 @@ index d4db554..78b292c 100755 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 -@@ -5558,8 +5564,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5563,8 +5569,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" @@ -5877,7 +5791,7 @@ index d4db554..78b292c 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5608,6 +5614,80 @@ esac +@@ -5613,6 +5619,80 @@ esac @@ -5958,7 +5872,7 @@ index d4db554..78b292c 100755 { $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 : -@@ -5624,6 +5704,11 @@ case $reload_flag in +@@ -5629,6 +5709,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -5970,7 +5884,7 @@ index d4db554..78b292c 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5792,7 +5877,8 @@ mingw* | pw32*) +@@ -5797,7 +5882,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5980,7 +5894,7 @@ index d4db554..78b292c 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -5869,11 +5955,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) +@@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5992,7 +5906,7 @@ index d4db554..78b292c 100755 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 +@@ -5956,6 +6037,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; } @@ -6014,7 +5928,7 @@ index d4db554..78b292c 100755 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 -@@ -5966,9 +6062,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5971,9 +6067,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6179,7 +6093,7 @@ index d4db554..78b292c 100755 { $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 : -@@ -5984,7 +6233,7 @@ do +@@ -5989,7 +6238,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 @@ -6188,7 +6102,7 @@ index d4db554..78b292c 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6004,11 +6253,15 @@ $as_echo "no" >&6; } +@@ -6009,11 +6258,15 @@ $as_echo "no" >&6; } fi @@ -6207,7 +6121,7 @@ index d4db554..78b292c 100755 { $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 : -@@ -6024,7 +6277,7 @@ do +@@ -6029,7 +6282,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 @@ -6216,7 +6130,7 @@ index d4db554..78b292c 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6043,6 +6296,10 @@ else +@@ -6048,6 +6301,10 @@ else $as_echo "no" >&6; } fi @@ -6227,7 +6141,7 @@ index d4db554..78b292c 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6054,12 +6311,10 @@ ac_tool_warned=yes ;; +@@ -6059,12 +6316,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -6242,7 +6156,7 @@ index d4db554..78b292c 100755 -@@ -6071,6 +6326,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6076,6 +6331,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -6307,7 +6221,7 @@ index d4db554..78b292c 100755 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 +@@ -6410,8 +6723,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 @@ -6318,7 +6232,7 @@ index d4db554..78b292c 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6442,6 +6755,7 @@ for ac_symprfx in "" "_"; do +@@ -6447,6 +6760,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 @@ -6326,7 +6240,7 @@ index d4db554..78b292c 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6483,6 +6797,18 @@ _LT_EOF +@@ -6488,6 +6802,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 @@ -6345,7 +6259,7 @@ index d4db554..78b292c 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6494,7 +6820,7 @@ _LT_EOF +@@ -6499,7 +6825,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -6354,7 +6268,7 @@ index d4db554..78b292c 100755 const char *name; void *address; } -@@ -6520,8 +6846,8 @@ static const void *lt_preloaded_setup() { +@@ -6525,8 +6851,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -6365,7 +6279,7 @@ index d4db554..78b292c 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6531,8 +6857,8 @@ _LT_EOF +@@ -6536,8 +6862,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -6376,7 +6290,7 @@ index d4db554..78b292c 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6569,6 +6895,18 @@ else +@@ -6574,6 +6900,18 @@ else $as_echo "ok" >&6; } fi @@ -6395,7 +6309,7 @@ index d4db554..78b292c 100755 -@@ -6590,6 +6928,43 @@ fi +@@ -6595,6 +6933,43 @@ fi @@ -6439,7 +6353,7 @@ index d4db554..78b292c 100755 # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; -@@ -6796,6 +7171,123 @@ esac +@@ -6801,6 +7176,123 @@ esac need_locks="$enable_libtool_lock" @@ -6563,7 +6477,7 @@ index d4db554..78b292c 100755 case $host_os in rhapsody* | darwin*) -@@ -7359,6 +7851,8 @@ _LT_EOF +@@ -7364,6 +7856,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 @@ -6572,7 +6486,7 @@ index d4db554..78b292c 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7554,7 +8048,8 @@ fi +@@ -7559,7 +8053,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -6582,7 +6496,7 @@ index d4db554..78b292c 100755 -@@ -7643,7 +8138,7 @@ aix3*) +@@ -7648,7 +8143,7 @@ aix3*) esac # Global variables: @@ -6591,7 +6505,7 @@ index d4db554..78b292c 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7941,8 +8436,6 @@ fi +@@ -7946,8 +8441,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -6600,7 +6514,7 @@ index d4db554..78b292c 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8108,6 +8601,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8113,6 +8606,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -6613,7 +6527,7 @@ index d4db554..78b292c 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8170,7 +8669,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8175,7 +8674,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 @@ -6622,7 +6536,7 @@ index d4db554..78b292c 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8227,13 +8726,17 @@ case $host_os in +@@ -8232,13 +8731,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -6646,7 +6560,7 @@ index d4db554..78b292c 100755 # # Check to make sure the PIC flag actually works. -@@ -8294,6 +8797,11 @@ fi +@@ -8299,6 +8802,11 @@ fi @@ -6658,7 +6572,7 @@ index d4db554..78b292c 100755 # # Check to make sure the static flag actually works. # -@@ -8644,7 +9152,8 @@ _LT_EOF +@@ -8649,7 +9157,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -6668,7 +6582,7 @@ index d4db554..78b292c 100755 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' -@@ -8743,12 +9252,12 @@ _LT_EOF +@@ -8748,12 +9257,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -6683,7 +6597,7 @@ index d4db554..78b292c 100755 fi ;; esac -@@ -8762,8 +9271,8 @@ _LT_EOF +@@ -8767,8 +9276,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -6694,7 +6608,7 @@ index d4db554..78b292c 100755 fi ;; -@@ -8781,8 +9290,8 @@ _LT_EOF +@@ -8786,8 +9295,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6705,7 +6619,7 @@ index d4db554..78b292c 100755 else ld_shlibs=no fi -@@ -8828,8 +9337,8 @@ _LT_EOF +@@ -8833,8 +9342,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6716,7 +6630,7 @@ index d4db554..78b292c 100755 else ld_shlibs=no fi -@@ -8959,7 +9468,13 @@ _LT_EOF +@@ -8964,7 +9473,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -6731,7 +6645,7 @@ index d4db554..78b292c 100755 /* end confdefs.h. */ int -@@ -8972,22 +9487,29 @@ main () +@@ -8977,22 +9492,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6774,7 +6688,7 @@ index d4db554..78b292c 100755 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" -@@ -8999,7 +9521,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9004,7 +9526,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. @@ -6789,7 +6703,7 @@ index d4db554..78b292c 100755 /* end confdefs.h. */ int -@@ -9012,22 +9540,29 @@ main () +@@ -9017,22 +9545,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6832,7 +6746,7 @@ index d4db554..78b292c 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9072,20 +9607,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9077,20 +9612,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. @@ -6910,7 +6824,7 @@ index d4db554..78b292c 100755 ;; darwin* | rhapsody*) -@@ -9146,7 +9724,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9151,7 +9729,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*) @@ -6919,7 +6833,7 @@ index d4db554..78b292c 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9154,7 +9732,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9159,7 +9737,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -6928,7 +6842,7 @@ index d4db554..78b292c 100755 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 -@@ -9170,7 +9748,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9175,7 +9753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -6937,7 +6851,7 @@ index d4db554..78b292c 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9194,10 +9772,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9199,10 +9777,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*) @@ -6950,7 +6864,7 @@ index d4db554..78b292c 100755 ;; esac else -@@ -9276,23 +9854,36 @@ fi +@@ -9281,23 +9859,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -6995,7 +6909,7 @@ index d4db554..78b292c 100755 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' -@@ -9377,7 +9968,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9382,7 +9973,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}\*' @@ -7004,7 +6918,7 @@ index d4db554..78b292c 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9396,9 +9987,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9401,9 +9992,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -7016,7 +6930,7 @@ index d4db554..78b292c 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -9974,8 +10565,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9979,8 +10570,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -7028,7 +6942,7 @@ index d4db554..78b292c 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10008,13 +10600,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10013,13 +10605,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 @@ -7101,7 +7015,7 @@ index d4db554..78b292c 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10106,7 +10756,7 @@ haiku*) +@@ -10111,7 +10761,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -7110,16 +7024,7 @@ index d4db554..78b292c 100755 hardcode_into_libs=yes ;; -@@ -10902,7 +11552,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10900 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10946,10 +11596,10 @@ else +@@ -10951,10 +11601,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)) @@ -7132,16 +7037,7 @@ index d4db554..78b292c 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11008,7 +11658,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11006 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11052,10 +11702,10 @@ else +@@ -11057,10 +11707,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)) @@ -7154,7 +7050,7 @@ index d4db554..78b292c 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12924,13 +13574,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13005,13 +13655,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"`' @@ -7175,7 +7071,7 @@ index d4db554..78b292c 100755 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"`' -@@ -12945,14 +13602,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13026,14 +13683,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"`' @@ -7194,7 +7090,7 @@ index d4db554..78b292c 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12985,12 +13645,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13066,12 +13726,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"`' @@ -7208,7 +7104,7 @@ index d4db554..78b292c 100755 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"`' -@@ -13045,8 +13705,13 @@ reload_flag \ +@@ -13126,8 +13786,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -7222,7 +7118,7 @@ index d4db554..78b292c 100755 STRIP \ RANLIB \ CC \ -@@ -13056,12 +13721,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13137,12 +13802,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 \ @@ -7238,7 +7134,7 @@ index d4db554..78b292c 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13077,7 +13744,6 @@ no_undefined_flag \ +@@ -13158,7 +13825,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -7246,7 +7142,7 @@ index d4db554..78b292c 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13113,6 +13779,7 @@ module_cmds \ +@@ -13194,6 +13860,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -7254,7 +7150,7 @@ index d4db554..78b292c 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -13869,7 +14536,8 @@ $as_echo X"$file" | +@@ -13950,7 +14617,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, @@ -7264,7 +7160,7 @@ index d4db554..78b292c 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -13972,19 +14640,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14053,19 +14721,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -7308,7 +7204,7 @@ index d4db554..78b292c 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14014,6 +14705,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14095,6 +14786,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 @@ -7321,7 +7217,7 @@ index d4db554..78b292c 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14023,6 +14720,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14104,6 +14801,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -7331,7 +7227,7 @@ index d4db554..78b292c 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14137,12 +14837,12 @@ with_gcc=$GCC +@@ -14218,12 +14918,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -7347,7 +7243,7 @@ index d4db554..78b292c 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14229,9 +14929,6 @@ inherit_rpath=$inherit_rpath +@@ -14310,9 +15010,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -7357,7 +7253,7 @@ index d4db554..78b292c 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14247,6 +14944,9 @@ include_expsyms=$lt_include_expsyms +@@ -14328,6 +15025,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -7367,7 +7263,7 @@ index d4db554..78b292c 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14279,210 +14979,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14360,210 +15060,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? @@ -7742,10 +7638,10 @@ index d4db554..78b292c 100755 chmod +x "$ofile" diff --git a/ld/configure b/ld/configure -index 8095b71..eb4f0d7 100755 +index a16c6db059..4277b74bad 100755 --- a/ld/configure +++ b/ld/configure -@@ -657,8 +657,11 @@ OTOOL +@@ -659,8 +659,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -7757,7 +7653,7 @@ index 8095b71..eb4f0d7 100755 OBJDUMP LN_S NM -@@ -779,6 +782,7 @@ enable_static +@@ -782,6 +785,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -7765,7 +7661,7 @@ index 8095b71..eb4f0d7 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1458,6 +1462,8 @@ Optional Packages: +@@ -1463,6 +1467,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] @@ -7774,7 +7670,7 @@ index 8095b71..eb4f0d7 100755 --with-lib-path=dir1:dir2... set default LIB_PATH --with-sysroot=DIR Search for usr/lib et al within DIR. -@@ -5649,8 +5655,8 @@ esac +@@ -5657,8 +5663,8 @@ esac @@ -7785,7 +7681,7 @@ index 8095b71..eb4f0d7 100755 -@@ -5690,7 +5696,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5698,7 +5704,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. @@ -7794,7 +7690,7 @@ index 8095b71..eb4f0d7 100755 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 -@@ -6376,8 +6382,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6384,8 +6390,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" @@ -7805,7 +7701,7 @@ index 8095b71..eb4f0d7 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6426,6 +6432,80 @@ esac +@@ -6434,6 +6440,80 @@ esac @@ -7886,7 +7782,7 @@ index 8095b71..eb4f0d7 100755 { $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 : -@@ -6442,6 +6522,11 @@ case $reload_flag in +@@ -6450,6 +6530,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -7898,7 +7794,7 @@ index 8095b71..eb4f0d7 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6610,7 +6695,8 @@ mingw* | pw32*) +@@ -6618,7 +6703,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7908,7 +7804,7 @@ index 8095b71..eb4f0d7 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6764,6 +6850,21 @@ esac +@@ -6772,6 +6858,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; } @@ -7930,7 +7826,7 @@ index 8095b71..eb4f0d7 100755 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 -@@ -6779,9 +6880,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6787,9 +6888,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8095,7 +7991,7 @@ index 8095b71..eb4f0d7 100755 { $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 : -@@ -6797,7 +7051,7 @@ do +@@ -6805,7 +7059,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 @@ -8104,7 +8000,7 @@ index 8095b71..eb4f0d7 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6817,11 +7071,15 @@ $as_echo "no" >&6; } +@@ -6825,11 +7079,15 @@ $as_echo "no" >&6; } fi @@ -8123,7 +8019,7 @@ index 8095b71..eb4f0d7 100755 { $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 : -@@ -6837,7 +7095,7 @@ do +@@ -6845,7 +7103,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 @@ -8132,7 +8028,7 @@ index 8095b71..eb4f0d7 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6856,6 +7114,10 @@ else +@@ -6864,6 +7122,10 @@ else $as_echo "no" >&6; } fi @@ -8143,7 +8039,7 @@ index 8095b71..eb4f0d7 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6867,12 +7129,12 @@ ac_tool_warned=yes ;; +@@ -6875,12 +7137,12 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8160,7 +8056,7 @@ index 8095b71..eb4f0d7 100755 -@@ -6882,6 +7144,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6890,6 +7152,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -8223,7 +8119,7 @@ index 8095b71..eb4f0d7 100755 if test -n "$ac_tool_prefix"; then -@@ -7218,8 +7536,8 @@ esac +@@ -7226,8 +7544,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 @@ -8234,7 +8130,7 @@ index 8095b71..eb4f0d7 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7255,6 +7573,7 @@ for ac_symprfx in "" "_"; do +@@ -7263,6 +7581,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 @@ -8242,7 +8138,7 @@ index 8095b71..eb4f0d7 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7296,6 +7615,18 @@ _LT_EOF +@@ -7304,6 +7623,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 @@ -8261,7 +8157,7 @@ index 8095b71..eb4f0d7 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7307,7 +7638,7 @@ _LT_EOF +@@ -7315,7 +7646,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8270,7 +8166,7 @@ index 8095b71..eb4f0d7 100755 const char *name; void *address; } -@@ -7333,8 +7664,8 @@ static const void *lt_preloaded_setup() { +@@ -7341,8 +7672,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8281,7 +8177,7 @@ index 8095b71..eb4f0d7 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7344,8 +7675,8 @@ _LT_EOF +@@ -7352,8 +7683,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8292,7 +8188,7 @@ index 8095b71..eb4f0d7 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7382,6 +7713,19 @@ else +@@ -7390,6 +7721,19 @@ else $as_echo "ok" >&6; } fi @@ -8312,7 +8208,7 @@ index 8095b71..eb4f0d7 100755 -@@ -7402,6 +7746,42 @@ fi +@@ -7410,6 +7754,42 @@ fi @@ -8355,7 +8251,7 @@ index 8095b71..eb4f0d7 100755 # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : -@@ -7609,6 +7989,123 @@ esac +@@ -7617,6 +7997,123 @@ esac need_locks="$enable_libtool_lock" @@ -8479,7 +8375,7 @@ index 8095b71..eb4f0d7 100755 case $host_os in rhapsody* | darwin*) -@@ -8172,6 +8669,8 @@ _LT_EOF +@@ -8180,6 +8677,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 @@ -8488,7 +8384,7 @@ index 8095b71..eb4f0d7 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8240,6 +8739,16 @@ done +@@ -8248,6 +8747,16 @@ done @@ -8505,7 +8401,7 @@ index 8095b71..eb4f0d7 100755 # Set options -@@ -8368,7 +8877,8 @@ fi +@@ -8376,7 +8885,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -8515,7 +8411,7 @@ index 8095b71..eb4f0d7 100755 -@@ -8457,7 +8967,7 @@ aix3*) +@@ -8465,7 +8975,7 @@ aix3*) esac # Global variables: @@ -8524,7 +8420,7 @@ index 8095b71..eb4f0d7 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8755,8 +9265,6 @@ fi +@@ -8763,8 +9273,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8533,7 +8429,7 @@ index 8095b71..eb4f0d7 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8922,6 +9430,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8930,6 +9438,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8546,7 +8442,7 @@ index 8095b71..eb4f0d7 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8984,7 +9498,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8992,7 +9506,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 @@ -8555,7 +8451,7 @@ index 8095b71..eb4f0d7 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9041,13 +9555,17 @@ case $host_os in +@@ -9049,13 +9563,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8579,7 +8475,7 @@ index 8095b71..eb4f0d7 100755 # # Check to make sure the PIC flag actually works. -@@ -9108,6 +9626,11 @@ fi +@@ -9116,6 +9634,11 @@ fi @@ -8591,7 +8487,7 @@ index 8095b71..eb4f0d7 100755 # # Check to make sure the static flag actually works. # -@@ -9458,7 +9981,8 @@ _LT_EOF +@@ -9466,7 +9989,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8601,7 +8497,7 @@ index 8095b71..eb4f0d7 100755 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' -@@ -9557,12 +10081,12 @@ _LT_EOF +@@ -9565,12 +10089,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8616,7 +8512,7 @@ index 8095b71..eb4f0d7 100755 fi ;; esac -@@ -9576,8 +10100,8 @@ _LT_EOF +@@ -9584,8 +10108,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8627,7 +8523,7 @@ index 8095b71..eb4f0d7 100755 fi ;; -@@ -9595,8 +10119,8 @@ _LT_EOF +@@ -9603,8 +10127,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8638,7 +8534,7 @@ index 8095b71..eb4f0d7 100755 else ld_shlibs=no fi -@@ -9642,8 +10166,8 @@ _LT_EOF +@@ -9650,8 +10174,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8649,7 +8545,7 @@ index 8095b71..eb4f0d7 100755 else ld_shlibs=no fi -@@ -9773,7 +10297,13 @@ _LT_EOF +@@ -9781,7 +10305,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8664,7 +8560,7 @@ index 8095b71..eb4f0d7 100755 /* end confdefs.h. */ int -@@ -9786,22 +10316,29 @@ main () +@@ -9794,22 +10324,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8707,7 +8603,7 @@ index 8095b71..eb4f0d7 100755 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" -@@ -9813,7 +10350,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9821,7 +10358,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. @@ -8722,7 +8618,7 @@ index 8095b71..eb4f0d7 100755 /* end confdefs.h. */ int -@@ -9826,22 +10369,29 @@ main () +@@ -9834,22 +10377,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8765,7 +8661,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9885,21 +10435,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9893,21 +10443,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 @@ -8845,7 +8741,7 @@ index 8095b71..eb4f0d7 100755 ;; darwin* | rhapsody*) -@@ -9960,7 +10553,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9968,7 +10561,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*) @@ -8854,7 +8750,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9968,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9976,7 +10569,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8863,7 +8759,7 @@ index 8095b71..eb4f0d7 100755 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 -@@ -9984,7 +10577,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9992,7 +10585,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8872,7 +8768,7 @@ index 8095b71..eb4f0d7 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10008,10 +10601,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10016,10 +10609,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*) @@ -8885,7 +8781,7 @@ index 8095b71..eb4f0d7 100755 ;; esac else -@@ -10090,23 +10683,36 @@ fi +@@ -10098,23 +10691,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -8930,7 +8826,7 @@ index 8095b71..eb4f0d7 100755 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' -@@ -10191,7 +10797,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10199,7 +10805,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}\*' @@ -8939,7 +8835,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10210,9 +10816,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10218,9 +10824,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -8951,7 +8847,7 @@ index 8095b71..eb4f0d7 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10788,8 +11394,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10796,8 +11402,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -8963,7 +8859,7 @@ index 8095b71..eb4f0d7 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10822,13 +11429,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10830,13 +11437,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 @@ -9036,7 +8932,7 @@ index 8095b71..eb4f0d7 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10920,7 +11585,7 @@ haiku*) +@@ -10928,7 +11593,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9045,16 +8941,7 @@ index 8095b71..eb4f0d7 100755 hardcode_into_libs=yes ;; -@@ -11716,7 +12381,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11719 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11760,10 +12425,10 @@ else +@@ -11768,10 +12433,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)) @@ -9067,16 +8954,7 @@ index 8095b71..eb4f0d7 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11822,7 +12487,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11825 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11866,10 +12531,10 @@ else +@@ -11874,10 +12539,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)) @@ -9089,7 +8967,7 @@ index 8095b71..eb4f0d7 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12261,6 +12926,7 @@ $RM -r conftest* +@@ -12269,6 +12934,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -9097,7 +8975,7 @@ index 8095b71..eb4f0d7 100755 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12278,6 +12944,7 @@ $RM -r conftest* +@@ -12286,6 +12952,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9105,7 +8983,7 @@ index 8095b71..eb4f0d7 100755 compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12560,7 +13227,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -12568,7 +13235,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. @@ -9120,7 +8998,7 @@ index 8095b71..eb4f0d7 100755 /* end confdefs.h. */ int -@@ -12573,22 +13246,29 @@ main () +@@ -12581,22 +13254,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9163,7 +9041,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12601,7 +13281,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12609,7 +13289,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. @@ -9178,7 +9056,7 @@ index 8095b71..eb4f0d7 100755 /* end confdefs.h. */ int -@@ -12614,22 +13300,29 @@ main () +@@ -12622,22 +13308,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9221,7 +9099,7 @@ index 8095b71..eb4f0d7 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -12672,29 +13365,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12680,29 +13373,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9320,7 +9198,7 @@ index 8095b71..eb4f0d7 100755 darwin* | rhapsody*) -@@ -12800,7 +13539,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12808,7 +13547,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9329,7 +9207,7 @@ index 8095b71..eb4f0d7 100755 else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -12871,10 +13610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12879,10 +13618,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*) @@ -9342,7 +9220,7 @@ index 8095b71..eb4f0d7 100755 ;; esac fi -@@ -12915,9 +13654,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12923,9 +13662,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 @@ -9354,7 +9232,7 @@ index 8095b71..eb4f0d7 100755 fi fi link_all_deplibs_CXX=yes -@@ -12987,20 +13726,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12995,20 +13734,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~ @@ -9379,7 +9257,7 @@ index 8095b71..eb4f0d7 100755 ;; *) # 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' -@@ -13195,7 +13934,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13203,7 +13942,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' ;; *) @@ -9388,7 +9266,7 @@ index 8095b71..eb4f0d7 100755 ;; esac -@@ -13241,7 +13980,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13249,7 +13988,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9397,7 +9275,7 @@ index 8095b71..eb4f0d7 100755 # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13282,9 +14021,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13290,9 +14029,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 @@ -9409,7 +9287,7 @@ index 8095b71..eb4f0d7 100755 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13419,6 +14158,13 @@ private: +@@ -13427,6 +14166,13 @@ private: }; _LT_EOF @@ -9423,7 +9301,7 @@ index 8095b71..eb4f0d7 100755 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13432,7 +14178,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13440,7 +14186,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 @@ -9432,7 +9310,7 @@ index 8095b71..eb4f0d7 100755 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13441,13 +14187,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13449,13 +14195,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9459,7 +9337,7 @@ index 8095b71..eb4f0d7 100755 # 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. -@@ -13467,8 +14222,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13475,8 +14230,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9470,7 +9348,7 @@ index 8095b71..eb4f0d7 100755 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -13504,6 +14261,7 @@ else +@@ -13512,6 +14269,7 @@ else fi $RM -f confest.$objext @@ -9478,7 +9356,7 @@ index 8095b71..eb4f0d7 100755 # PORTME: override above test on systems where it is broken case $host_os in -@@ -13539,7 +14297,7 @@ linux*) +@@ -13547,7 +14305,7 @@ linux*) solaris*) case $cc_basename in @@ -9487,7 +9365,7 @@ index 8095b71..eb4f0d7 100755 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13604,8 +14362,6 @@ fi +@@ -13612,8 +14370,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9496,7 +9374,7 @@ index 8095b71..eb4f0d7 100755 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -13710,6 +14466,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -13718,6 +14474,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9508,7 +9386,7 @@ index 8095b71..eb4f0d7 100755 dgux*) case $cc_basename in ec++*) -@@ -13862,7 +14623,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -13870,7 +14631,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9517,7 +9395,7 @@ index 8095b71..eb4f0d7 100755 # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -13927,10 +14688,17 @@ case $host_os in +@@ -13935,10 +14696,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9538,7 +9416,7 @@ index 8095b71..eb4f0d7 100755 # # Check to make sure the PIC flag actually works. -@@ -13988,6 +14756,8 @@ fi +@@ -13996,6 +14764,8 @@ fi @@ -9547,7 +9425,7 @@ index 8095b71..eb4f0d7 100755 # # Check to make sure the static flag actually works. # -@@ -14165,6 +14935,7 @@ fi +@@ -14173,6 +14943,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' @@ -9555,7 +9433,7 @@ index 8095b71..eb4f0d7 100755 case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14179,15 +14950,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -14187,15 +14958,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9581,7 +9459,7 @@ index 8095b71..eb4f0d7 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14450,8 +15226,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14458,8 +15234,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9593,7 +9471,7 @@ index 8095b71..eb4f0d7 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14483,13 +15260,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14491,13 +15268,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 @@ -9666,7 +9544,7 @@ index 8095b71..eb4f0d7 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -14580,7 +15415,7 @@ haiku*) +@@ -14588,7 +15423,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9675,7 +9553,7 @@ index 8095b71..eb4f0d7 100755 hardcode_into_libs=yes ;; -@@ -15039,6 +15874,7 @@ fi +@@ -15047,6 +15882,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9683,7 +9561,7 @@ index 8095b71..eb4f0d7 100755 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -17953,13 +18789,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -18026,13 +18862,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"`' @@ -9704,7 +9582,7 @@ index 8095b71..eb4f0d7 100755 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"`' -@@ -17974,14 +18817,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -18047,14 +18890,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"`' @@ -9723,7 +9601,7 @@ index 8095b71..eb4f0d7 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18014,12 +18860,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -18087,12 +18933,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"`' @@ -9737,7 +9615,7 @@ index 8095b71..eb4f0d7 100755 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"`' -@@ -18058,8 +18904,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote +@@ -18131,8 +18977,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"`' @@ -9747,7 +9625,7 @@ index 8095b71..eb4f0d7 100755 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"`' -@@ -18086,12 +18932,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ +@@ -18159,12 +19005,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"`' @@ -9761,7 +9639,7 @@ index 8095b71..eb4f0d7 100755 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"`' -@@ -18129,8 +18975,13 @@ reload_flag \ +@@ -18202,8 +19048,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9775,7 +9653,7 @@ index 8095b71..eb4f0d7 100755 STRIP \ RANLIB \ CC \ -@@ -18140,12 +18991,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -18213,12 +19064,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 \ @@ -9791,7 +9669,7 @@ index 8095b71..eb4f0d7 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -18161,7 +19014,6 @@ no_undefined_flag \ +@@ -18234,7 +19087,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9799,7 +9677,7 @@ index 8095b71..eb4f0d7 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -18183,8 +19035,8 @@ LD_CXX \ +@@ -18256,8 +19108,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9809,7 +9687,7 @@ index 8095b71..eb4f0d7 100755 lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -18196,7 +19048,6 @@ no_undefined_flag_CXX \ +@@ -18269,7 +19121,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9817,7 +9695,7 @@ index 8095b71..eb4f0d7 100755 exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -18230,6 +19081,7 @@ module_cmds \ +@@ -18303,6 +19154,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9825,7 +9703,7 @@ index 8095b71..eb4f0d7 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18244,7 +19096,8 @@ archive_expsym_cmds_CXX \ +@@ -18317,7 +19169,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9835,7 +9713,7 @@ index 8095b71..eb4f0d7 100755 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19037,7 +19890,8 @@ $as_echo X"$file" | +@@ -19110,7 +19963,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, @@ -9845,7 +9723,7 @@ index 8095b71..eb4f0d7 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -19140,19 +19994,42 @@ SP2NL=$lt_lt_SP2NL +@@ -19213,19 +20067,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9889,7 +9767,7 @@ index 8095b71..eb4f0d7 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -19182,6 +20059,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -19255,6 +20132,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 @@ -9902,7 +9780,7 @@ index 8095b71..eb4f0d7 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -19191,6 +20074,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -19264,6 +20147,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -9912,7 +9790,7 @@ index 8095b71..eb4f0d7 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19305,12 +20191,12 @@ with_gcc=$GCC +@@ -19378,12 +20264,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -9928,7 +9806,7 @@ index 8095b71..eb4f0d7 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -19397,9 +20283,6 @@ inherit_rpath=$inherit_rpath +@@ -19470,9 +20356,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -9938,7 +9816,7 @@ index 8095b71..eb4f0d7 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -19415,6 +20298,9 @@ include_expsyms=$lt_include_expsyms +@@ -19488,6 +20371,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -9948,7 +9826,7 @@ index 8095b71..eb4f0d7 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -19461,210 +20347,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -19534,210 +20420,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? @@ -10322,7 +10200,7 @@ index 8095b71..eb4f0d7 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -19692,12 +20537,12 @@ with_gcc=$GCC_CXX +@@ -19765,12 +20610,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10338,7 +10216,7 @@ index 8095b71..eb4f0d7 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -19784,9 +20629,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -19857,9 +20702,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10348,7 +10226,7 @@ index 8095b71..eb4f0d7 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -19802,6 +20644,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -19875,6 +20717,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10359,7 +10237,7 @@ index 8095b71..eb4f0d7 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/libtool.m4 b/libtool.m4 -index 4b2d30a..008d331 100644 +index 24d13f3440..e45fdc6998 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1,7 +1,8 @@ @@ -12158,7 +12036,7 @@ index 4b2d30a..008d331 100644 + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/ltmain.sh b/ltmain.sh -index 9503ec8..70e856e 100644 +index 9503ec85d7..70e856e065 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -1,10 +1,9 @@ @@ -17388,7 +17266,7 @@ index 9503ec8..70e856e 100644 if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff --git a/ltoptions.m4 b/ltoptions.m4 -index 5ef12ce..17cfd51 100644 +index 5ef12ced2a..17cfd51c0b 100644 --- a/ltoptions.m4 +++ b/ltoptions.m4 @@ -8,7 +8,7 @@ @@ -17401,7 +17279,7 @@ index 5ef12ce..17cfd51 100644 # 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 +index bf87f77132..9c7b5d4118 100644 --- a/ltversion.m4 +++ b/ltversion.m4 @@ -7,17 +7,17 @@ @@ -17429,7 +17307,7 @@ index bf87f77..9c7b5d4 100644 _LT_DECL(, macro_revision, 0) ]) diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 -index bf92b5e..c573da9 100644 +index bf92b5e079..c573da90c5 100644 --- a/lt~obsolete.m4 +++ b/lt~obsolete.m4 @@ -7,7 +7,7 @@ @@ -17442,10 +17320,10 @@ index bf92b5e..c573da9 100644 # These exist entirely to fool aclocal when bootstrapping libtool. # diff --git a/opcodes/configure b/opcodes/configure -index eedb184..d3076e1 100755 +index 0b352a454d..7eaea7db73 100755 --- a/opcodes/configure +++ b/opcodes/configure -@@ -648,6 +648,9 @@ OTOOL +@@ -650,6 +650,9 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -17455,7 +17333,7 @@ index eedb184..d3076e1 100755 OBJDUMP LN_S NM -@@ -760,6 +763,7 @@ enable_static +@@ -763,6 +766,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -17463,7 +17341,7 @@ index eedb184..d3076e1 100755 enable_libtool_lock enable_targets enable_werror -@@ -1420,6 +1424,8 @@ Optional Packages: +@@ -1423,6 +1427,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] @@ -17472,7 +17350,7 @@ index eedb184..d3076e1 100755 Some influential environment variables: CC C compiler command -@@ -5110,8 +5116,8 @@ esac +@@ -5115,8 +5121,8 @@ esac @@ -17483,7 +17361,7 @@ index eedb184..d3076e1 100755 -@@ -5151,7 +5157,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5156,7 +5162,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. @@ -17492,7 +17370,7 @@ index eedb184..d3076e1 100755 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 -@@ -5837,8 +5843,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5842,8 +5848,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" @@ -17503,7 +17381,7 @@ index eedb184..d3076e1 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5887,6 +5893,80 @@ esac +@@ -5892,6 +5898,80 @@ esac @@ -17584,7 +17462,7 @@ index eedb184..d3076e1 100755 { $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 : -@@ -5903,6 +5983,11 @@ case $reload_flag in +@@ -5908,6 +5988,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -17596,7 +17474,7 @@ index eedb184..d3076e1 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6071,7 +6156,8 @@ mingw* | pw32*) +@@ -6076,7 +6161,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -17606,7 +17484,7 @@ index eedb184..d3076e1 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6225,6 +6311,21 @@ esac +@@ -6230,6 +6316,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; } @@ -17628,7 +17506,7 @@ index eedb184..d3076e1 100755 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 -@@ -6240,9 +6341,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6245,9 +6346,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -17793,7 +17671,7 @@ index eedb184..d3076e1 100755 { $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 : -@@ -6258,7 +6512,7 @@ do +@@ -6263,7 +6517,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 @@ -17802,7 +17680,7 @@ index eedb184..d3076e1 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6278,11 +6532,15 @@ $as_echo "no" >&6; } +@@ -6283,11 +6537,15 @@ $as_echo "no" >&6; } fi @@ -17821,7 +17699,7 @@ index eedb184..d3076e1 100755 { $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 : -@@ -6298,7 +6556,7 @@ do +@@ -6303,7 +6561,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 @@ -17830,7 +17708,7 @@ index eedb184..d3076e1 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6317,6 +6575,10 @@ else +@@ -6322,6 +6580,10 @@ else $as_echo "no" >&6; } fi @@ -17841,7 +17719,7 @@ index eedb184..d3076e1 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6328,16 +6590,72 @@ ac_tool_warned=yes ;; +@@ -6333,16 +6595,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -17918,7 +17796,7 @@ index eedb184..d3076e1 100755 -@@ -6679,8 +6997,8 @@ esac +@@ -6684,8 +7002,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 @@ -17929,7 +17807,7 @@ index eedb184..d3076e1 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6716,6 +7034,7 @@ for ac_symprfx in "" "_"; do +@@ -6721,6 +7039,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 @@ -17937,7 +17815,7 @@ index eedb184..d3076e1 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6757,6 +7076,18 @@ _LT_EOF +@@ -6762,6 +7081,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 @@ -17956,7 +17834,7 @@ index eedb184..d3076e1 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6768,7 +7099,7 @@ _LT_EOF +@@ -6773,7 +7104,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -17965,7 +17843,7 @@ index eedb184..d3076e1 100755 const char *name; void *address; } -@@ -6794,8 +7125,8 @@ static const void *lt_preloaded_setup() { +@@ -6799,8 +7130,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -17976,7 +17854,7 @@ index eedb184..d3076e1 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6805,8 +7136,8 @@ _LT_EOF +@@ -6810,8 +7141,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -17987,7 +17865,7 @@ index eedb184..d3076e1 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6843,6 +7174,16 @@ else +@@ -6848,6 +7179,16 @@ else $as_echo "ok" >&6; } fi @@ -18004,7 +17882,7 @@ index eedb184..d3076e1 100755 -@@ -6864,6 +7205,45 @@ fi +@@ -6869,6 +7210,45 @@ fi @@ -18050,7 +17928,7 @@ index eedb184..d3076e1 100755 # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; -@@ -7070,6 +7450,123 @@ esac +@@ -7075,6 +7455,123 @@ esac need_locks="$enable_libtool_lock" @@ -18174,7 +18052,7 @@ index eedb184..d3076e1 100755 case $host_os in rhapsody* | darwin*) -@@ -7633,6 +8130,8 @@ _LT_EOF +@@ -7638,6 +8135,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 @@ -18183,7 +18061,7 @@ index eedb184..d3076e1 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7798,7 +8297,8 @@ fi +@@ -7803,7 +8302,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -18193,7 +18071,7 @@ index eedb184..d3076e1 100755 -@@ -7887,7 +8387,7 @@ aix3*) +@@ -7892,7 +8392,7 @@ aix3*) esac # Global variables: @@ -18202,7 +18080,7 @@ index eedb184..d3076e1 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8185,8 +8685,6 @@ fi +@@ -8190,8 +8690,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -18211,7 +18089,7 @@ index eedb184..d3076e1 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8352,6 +8850,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8357,6 +8855,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -18224,7 +18102,7 @@ index eedb184..d3076e1 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8414,7 +8918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8419,7 +8923,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 @@ -18233,7 +18111,7 @@ index eedb184..d3076e1 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8471,13 +8975,17 @@ case $host_os in +@@ -8476,13 +8980,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -18257,7 +18135,7 @@ index eedb184..d3076e1 100755 # # Check to make sure the PIC flag actually works. -@@ -8538,6 +9046,11 @@ fi +@@ -8543,6 +9051,11 @@ fi @@ -18269,7 +18147,7 @@ index eedb184..d3076e1 100755 # # Check to make sure the static flag actually works. # -@@ -8888,7 +9401,8 @@ _LT_EOF +@@ -8893,7 +9406,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -18279,7 +18157,7 @@ index eedb184..d3076e1 100755 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' -@@ -8987,12 +9501,12 @@ _LT_EOF +@@ -8992,12 +9506,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -18294,7 +18172,7 @@ index eedb184..d3076e1 100755 fi ;; esac -@@ -9006,8 +9520,8 @@ _LT_EOF +@@ -9011,8 +9525,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -18305,7 +18183,7 @@ index eedb184..d3076e1 100755 fi ;; -@@ -9025,8 +9539,8 @@ _LT_EOF +@@ -9030,8 +9544,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18316,7 +18194,7 @@ index eedb184..d3076e1 100755 else ld_shlibs=no fi -@@ -9072,8 +9586,8 @@ _LT_EOF +@@ -9077,8 +9591,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18327,7 +18205,7 @@ index eedb184..d3076e1 100755 else ld_shlibs=no fi -@@ -9203,7 +9717,13 @@ _LT_EOF +@@ -9208,7 +9722,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -18342,7 +18220,7 @@ index eedb184..d3076e1 100755 /* end confdefs.h. */ int -@@ -9216,22 +9736,29 @@ main () +@@ -9221,22 +9741,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18385,7 +18263,7 @@ index eedb184..d3076e1 100755 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" -@@ -9243,7 +9770,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9248,7 +9775,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. @@ -18400,7 +18278,7 @@ index eedb184..d3076e1 100755 /* end confdefs.h. */ int -@@ -9256,22 +9789,29 @@ main () +@@ -9261,22 +9794,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18443,7 +18321,7 @@ index eedb184..d3076e1 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9316,20 +9856,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9321,20 +9861,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. @@ -18521,7 +18399,7 @@ index eedb184..d3076e1 100755 ;; darwin* | rhapsody*) -@@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9395,7 +9978,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*) @@ -18530,7 +18408,7 @@ index eedb184..d3076e1 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9398,7 +9981,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9403,7 +9986,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -18539,7 +18417,7 @@ index eedb184..d3076e1 100755 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 -@@ -9414,7 +9997,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9419,7 +10002,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -18548,7 +18426,7 @@ index eedb184..d3076e1 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9438,10 +10021,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9443,10 +10026,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*) @@ -18561,7 +18439,7 @@ index eedb184..d3076e1 100755 ;; esac else -@@ -9520,23 +10103,36 @@ fi +@@ -9525,23 +10108,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -18606,7 +18484,7 @@ index eedb184..d3076e1 100755 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' -@@ -9621,7 +10217,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9626,7 +10222,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}\*' @@ -18615,7 +18493,7 @@ index eedb184..d3076e1 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9640,9 +10236,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9645,9 +10241,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -18627,7 +18505,7 @@ index eedb184..d3076e1 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10218,8 +10814,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10223,8 +10819,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -18639,7 +18517,7 @@ index eedb184..d3076e1 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10252,13 +10849,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10257,13 +10854,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 @@ -18712,7 +18590,7 @@ index eedb184..d3076e1 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10350,7 +11005,7 @@ haiku*) +@@ -10355,7 +11010,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -18721,16 +18599,7 @@ index eedb184..d3076e1 100755 hardcode_into_libs=yes ;; -@@ -11146,7 +11801,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11149 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11190,10 +11845,10 @@ else +@@ -11195,10 +11850,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)) @@ -18743,16 +18612,7 @@ index eedb184..d3076e1 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11252,7 +11907,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11255 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11296,10 +11951,10 @@ else +@@ -11301,10 +11956,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)) @@ -18765,7 +18625,7 @@ index eedb184..d3076e1 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12462,7 +13117,7 @@ if test "$enable_shared" = "yes"; then +@@ -12543,7 +13198,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 @@ -18774,7 +18634,7 @@ index eedb184..d3076e1 100755 fi case "${host}" in -@@ -13436,13 +14091,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13518,13 +14173,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"`' @@ -18795,7 +18655,7 @@ index eedb184..d3076e1 100755 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"`' -@@ -13457,14 +14119,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13539,14 +14201,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"`' @@ -18814,7 +18674,7 @@ index eedb184..d3076e1 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13497,12 +14162,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13579,12 +14244,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"`' @@ -18828,7 +18688,7 @@ index eedb184..d3076e1 100755 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"`' -@@ -13557,8 +14222,13 @@ reload_flag \ +@@ -13639,8 +14304,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -18842,7 +18702,7 @@ index eedb184..d3076e1 100755 STRIP \ RANLIB \ CC \ -@@ -13568,12 +14238,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13650,12 +14320,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 \ @@ -18858,7 +18718,7 @@ index eedb184..d3076e1 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13589,7 +14261,6 @@ no_undefined_flag \ +@@ -13671,7 +14343,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -18866,7 +18726,7 @@ index eedb184..d3076e1 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13625,6 +14296,7 @@ module_cmds \ +@@ -13707,6 +14378,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -18874,7 +18734,7 @@ index eedb184..d3076e1 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14381,7 +15053,8 @@ $as_echo X"$file" | +@@ -14463,7 +15135,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, @@ -18884,7 +18744,7 @@ index eedb184..d3076e1 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14484,19 +15157,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14566,19 +15239,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -18928,7 +18788,7 @@ index eedb184..d3076e1 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14526,6 +15222,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14608,6 +15304,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 @@ -18941,7 +18801,7 @@ index eedb184..d3076e1 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14535,6 +15237,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14617,6 +15319,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -18951,7 +18811,7 @@ index eedb184..d3076e1 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14649,12 +15354,12 @@ with_gcc=$GCC +@@ -14731,12 +15436,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -18967,7 +18827,7 @@ index eedb184..d3076e1 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14741,9 +15446,6 @@ inherit_rpath=$inherit_rpath +@@ -14823,9 +15528,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -18977,7 +18837,7 @@ index eedb184..d3076e1 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14759,6 +15461,9 @@ include_expsyms=$lt_include_expsyms +@@ -14841,6 +15543,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -18987,7 +18847,7 @@ index eedb184..d3076e1 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14791,210 +15496,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14873,210 +15578,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? @@ -19362,7 +19222,7 @@ index eedb184..d3076e1 100755 chmod +x "$ofile" diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index 07e3162..c0c75d4 100644 +index b9f5eb8a4f..a31b66a2f0 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -167,7 +167,7 @@ changequote(,)dnl @@ -19375,7 +19235,7 @@ index 07e3162..c0c75d4 100644 case "${host}" in diff --git a/zlib/configure b/zlib/configure -index 8378857..7584940 100755 +index bed9e3ea2b..caef0b674e 100755 --- a/zlib/configure +++ b/zlib/configure @@ -614,8 +614,11 @@ OTOOL @@ -19390,7 +19250,7 @@ index 8378857..7584940 100755 OBJDUMP LN_S NM -@@ -736,6 +739,7 @@ enable_static +@@ -737,6 +740,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -19398,7 +19258,7 @@ index 8378857..7584940 100755 enable_libtool_lock enable_host_shared ' -@@ -1384,6 +1388,8 @@ Optional Packages: +@@ -1385,6 +1389,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] @@ -19407,7 +19267,7 @@ index 8378857..7584940 100755 Some influential environment variables: CC C compiler command -@@ -3907,8 +3913,8 @@ esac +@@ -3910,8 +3916,8 @@ esac @@ -19418,7 +19278,7 @@ index 8378857..7584940 100755 -@@ -3948,7 +3954,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -3951,7 +3957,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. @@ -19427,7 +19287,7 @@ index 8378857..7584940 100755 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 -@@ -4764,8 +4770,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -4767,8 +4773,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" @@ -19438,7 +19298,7 @@ index 8378857..7584940 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -4814,6 +4820,80 @@ esac +@@ -4817,6 +4823,80 @@ esac @@ -19519,7 +19379,7 @@ index 8378857..7584940 100755 { $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 : -@@ -4830,6 +4910,11 @@ case $reload_flag in +@@ -4833,6 +4913,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -19531,7 +19391,7 @@ index 8378857..7584940 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -4998,7 +5083,8 @@ mingw* | pw32*) +@@ -5001,7 +5086,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -19541,7 +19401,7 @@ index 8378857..7584940 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -5152,6 +5238,21 @@ esac +@@ -5155,6 +5241,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; } @@ -19563,7 +19423,7 @@ index 8378857..7584940 100755 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 -@@ -5167,9 +5268,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5170,9 +5271,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -19729,7 +19589,7 @@ index 8378857..7584940 100755 { $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 : -@@ -5185,7 +5440,7 @@ do +@@ -5188,7 +5443,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 @@ -19738,7 +19598,7 @@ index 8378857..7584940 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5205,11 +5460,15 @@ $as_echo "no" >&6; } +@@ -5208,11 +5463,15 @@ $as_echo "no" >&6; } fi @@ -19757,7 +19617,7 @@ index 8378857..7584940 100755 { $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 : -@@ -5225,7 +5484,7 @@ do +@@ -5228,7 +5487,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 @@ -19766,7 +19626,7 @@ index 8378857..7584940 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5244,6 +5503,10 @@ else +@@ -5247,6 +5506,10 @@ else $as_echo "no" >&6; } fi @@ -19777,7 +19637,7 @@ index 8378857..7584940 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -5255,16 +5518,72 @@ ac_tool_warned=yes ;; +@@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -19854,7 +19714,7 @@ index 8378857..7584940 100755 -@@ -5606,8 +5925,8 @@ esac +@@ -5609,8 +5928,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 @@ -19865,7 +19725,7 @@ index 8378857..7584940 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -5643,6 +5962,7 @@ for ac_symprfx in "" "_"; do +@@ -5646,6 +5965,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 @@ -19873,7 +19733,7 @@ index 8378857..7584940 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -5684,6 +6004,18 @@ _LT_EOF +@@ -5687,6 +6007,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 @@ -19892,7 +19752,7 @@ index 8378857..7584940 100755 #ifdef __cplusplus extern "C" { #endif -@@ -5695,7 +6027,7 @@ _LT_EOF +@@ -5698,7 +6030,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -19901,7 +19761,7 @@ index 8378857..7584940 100755 const char *name; void *address; } -@@ -5721,8 +6053,8 @@ static const void *lt_preloaded_setup() { +@@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -19912,7 +19772,7 @@ index 8378857..7584940 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5732,8 +6064,8 @@ _LT_EOF +@@ -5735,8 +6067,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -19923,7 +19783,7 @@ index 8378857..7584940 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -5770,6 +6102,19 @@ else +@@ -5773,6 +6105,19 @@ else $as_echo "ok" >&6; } fi @@ -19943,7 +19803,7 @@ index 8378857..7584940 100755 -@@ -5790,6 +6135,41 @@ fi +@@ -5793,6 +6138,41 @@ fi @@ -19985,7 +19845,7 @@ index 8378857..7584940 100755 # Check whether --enable-libtool-lock was given. -@@ -6001,6 +6381,123 @@ esac +@@ -6004,6 +6384,123 @@ esac need_locks="$enable_libtool_lock" @@ -20109,7 +19969,7 @@ index 8378857..7584940 100755 case $host_os in rhapsody* | darwin*) -@@ -6567,6 +7064,8 @@ _LT_EOF +@@ -6570,6 +7067,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 @@ -20118,7 +19978,7 @@ index 8378857..7584940 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7030,7 +7529,8 @@ fi +@@ -7033,7 +7532,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -20128,7 +19988,7 @@ index 8378857..7584940 100755 -@@ -7119,7 +7619,7 @@ aix3*) +@@ -7122,7 +7622,7 @@ aix3*) esac # Global variables: @@ -20137,7 +19997,7 @@ index 8378857..7584940 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7417,8 +7917,6 @@ fi +@@ -7420,8 +7920,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -20146,7 +20006,7 @@ index 8378857..7584940 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -7584,6 +8082,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -20159,7 +20019,7 @@ index 8378857..7584940 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -7646,7 +8150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7649,7 +8153,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 @@ -20168,7 +20028,7 @@ index 8378857..7584940 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -7703,13 +8207,17 @@ case $host_os in +@@ -7706,13 +8210,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -20192,7 +20052,7 @@ index 8378857..7584940 100755 # # Check to make sure the PIC flag actually works. -@@ -7770,6 +8278,11 @@ fi +@@ -7773,6 +8281,11 @@ fi @@ -20204,7 +20064,7 @@ index 8378857..7584940 100755 # # Check to make sure the static flag actually works. # -@@ -8120,7 +8633,8 @@ _LT_EOF +@@ -8123,7 +8636,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -20214,7 +20074,7 @@ index 8378857..7584940 100755 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' -@@ -8219,12 +8733,12 @@ _LT_EOF +@@ -8222,12 +8736,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -20229,7 +20089,7 @@ index 8378857..7584940 100755 fi ;; esac -@@ -8238,8 +8752,8 @@ _LT_EOF +@@ -8241,8 +8755,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -20240,7 +20100,7 @@ index 8378857..7584940 100755 fi ;; -@@ -8257,8 +8771,8 @@ _LT_EOF +@@ -8260,8 +8774,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -20251,7 +20111,7 @@ index 8378857..7584940 100755 else ld_shlibs=no fi -@@ -8304,8 +8818,8 @@ _LT_EOF +@@ -8307,8 +8821,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -20262,7 +20122,7 @@ index 8378857..7584940 100755 else ld_shlibs=no fi -@@ -8435,7 +8949,13 @@ _LT_EOF +@@ -8438,7 +8952,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -20277,7 +20137,7 @@ index 8378857..7584940 100755 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8451,22 +8971,29 @@ main () +@@ -8454,22 +8974,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -20320,7 +20180,7 @@ index 8378857..7584940 100755 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" -@@ -8478,7 +9005,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8481,7 +9008,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. @@ -20335,7 +20195,7 @@ index 8378857..7584940 100755 as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8494,22 +9027,29 @@ main () +@@ -8497,22 +9030,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -20378,7 +20238,7 @@ index 8378857..7584940 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -8554,20 +9094,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8557,20 +9097,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. @@ -20456,7 +20316,7 @@ index 8378857..7584940 100755 ;; darwin* | rhapsody*) -@@ -8628,7 +9211,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8631,7 +9214,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*) @@ -20465,7 +20325,7 @@ index 8378857..7584940 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -8636,7 +9219,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -20474,7 +20334,7 @@ index 8378857..7584940 100755 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 -@@ -8652,7 +9235,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -20483,7 +20343,7 @@ index 8378857..7584940 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -8676,10 +9259,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8679,10 +9262,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*) @@ -20496,7 +20356,7 @@ index 8378857..7584940 100755 ;; esac else -@@ -8758,26 +9341,39 @@ fi +@@ -8761,26 +9344,39 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -20544,7 +20404,7 @@ index 8378857..7584940 100755 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' -@@ -8862,7 +9458,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -8865,7 +9461,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}\*' @@ -20553,7 +20413,7 @@ index 8378857..7584940 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -8881,9 +9477,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -20565,7 +20425,7 @@ index 8378857..7584940 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -9459,8 +10055,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -20577,7 +20437,7 @@ index 8378857..7584940 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -9493,13 +10090,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9496,13 +10093,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 @@ -20650,7 +20510,7 @@ index 8378857..7584940 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -9591,7 +10246,7 @@ haiku*) +@@ -9594,7 +10249,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -20659,16 +20519,7 @@ index 8378857..7584940 100755 hardcode_into_libs=yes ;; -@@ -10405,7 +11060,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10408 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10449,10 +11104,10 @@ else +@@ -10452,10 +11107,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)) @@ -20681,16 +20532,7 @@ index 8378857..7584940 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10511,7 +11166,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10514 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10555,10 +11210,10 @@ else +@@ -10558,10 +11213,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)) @@ -20703,7 +20545,7 @@ index 8378857..7584940 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11990,13 +12645,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -11992,13 +12647,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"`' @@ -20724,7 +20566,7 @@ index 8378857..7584940 100755 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"`' -@@ -12011,14 +12673,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -12013,14 +12675,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"`' @@ -20743,7 +20585,7 @@ index 8378857..7584940 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12051,12 +12716,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -12053,12 +12718,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"`' @@ -20757,7 +20599,7 @@ index 8378857..7584940 100755 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"`' -@@ -12111,8 +12776,13 @@ reload_flag \ +@@ -12113,8 +12778,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -20771,7 +20613,7 @@ index 8378857..7584940 100755 STRIP \ RANLIB \ CC \ -@@ -12122,12 +12792,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -12124,12 +12794,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 \ @@ -20787,7 +20629,7 @@ index 8378857..7584940 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -12143,7 +12815,6 @@ no_undefined_flag \ +@@ -12145,7 +12817,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -20795,7 +20637,7 @@ index 8378857..7584940 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -12179,6 +12850,7 @@ module_cmds \ +@@ -12181,6 +12852,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -20803,7 +20645,7 @@ index 8378857..7584940 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -12768,7 +13440,8 @@ $as_echo X"$file" | +@@ -12770,7 +13442,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, @@ -20813,7 +20655,7 @@ index 8378857..7584940 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -12871,19 +13544,42 @@ SP2NL=$lt_lt_SP2NL +@@ -12873,19 +13546,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -20857,7 +20699,7 @@ index 8378857..7584940 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -12913,6 +13609,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -12915,6 +13611,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 @@ -20870,7 +20712,7 @@ index 8378857..7584940 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -12922,6 +13624,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -12924,6 +13626,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -20880,7 +20722,7 @@ index 8378857..7584940 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -13036,12 +13741,12 @@ with_gcc=$GCC +@@ -13038,12 +13743,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -20896,7 +20738,7 @@ index 8378857..7584940 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -13128,9 +13833,6 @@ inherit_rpath=$inherit_rpath +@@ -13130,9 +13835,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -20906,7 +20748,7 @@ index 8378857..7584940 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -13146,6 +13848,9 @@ include_expsyms=$lt_include_expsyms +@@ -13148,6 +13850,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -20916,7 +20758,7 @@ index 8378857..7584940 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -13178,210 +13883,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -13180,210 +13885,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? @@ -21291,5 +21133,5 @@ index 8378857..7584940 100755 chmod +x "$ofile" -- -2.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/meta/recipes-devtools/binutils/binutils/0008-Add-the-armv5e-architecture-to-binutils.patch index cb3f83b4fb..449225a362 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-Add-the-armv5e-architecture-to-binutils.patch @@ -1,7 +1,7 @@ -From 4ff9dbe13f38e4fea24fbcc9879cf7352c0561ff Mon Sep 17 00:00:00 2001 +From 9c313e8a15a7e7c5c0f2906e3218ed211563ac2a 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/14] Add the armv5e architecture to binutils +Subject: [PATCH 08/15] 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. @@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+) diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c -index 3bd4bc9..5d99921 100644 +index 60bda51070..eb6d0afd6e 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c -@@ -24791,6 +24791,7 @@ static const struct arm_arch_option_table arm_archs[] = +@@ -25633,6 +25633,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), @@ -31,5 +31,5 @@ index 3bd4bc9..5d99921 100644 ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP), -- -2.7.1 +2.12.0 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/0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index f8382f872e..1c40593927 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,7 +1,7 @@ -From cb36d94dbd521752e6444418af500e139a26eabb Mon Sep 17 00:00:00 2001 +From 2be9b44a4a308e3ea42a027c4c3211170f10c9c0 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/14] don't let the distro compiler point to the wrong +Subject: [PATCH 09/15] don't let the distro compiler point to the wrong installation location Thanks to RP for helping find the source code causing the issue. @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 7d7e2f4..1aaaf0e 100644 +index 0ff9e45e45..42c32642b2 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -366,7 +366,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. @@ -31,5 +31,5 @@ index 7d7e2f4..1aaaf0e 100644 if test -n "${target_header_dir}"; then \ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ -- -2.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0010-warn-for-uses-of-system-directories-when-cross-linki.patch index d3f510b11a..0774ad6f0c 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,7 +1,7 @@ -From 4daa841ce16ba52b717bdff9eb1dfc4f19638814 Mon Sep 17 00:00:00 2001 +From b1ab17abe4128684f19775448545176fb2a5e27e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 Jan 2016 06:31:09 +0000 -Subject: [PATCH 09/14] warn for uses of system directories when cross linking +Subject: [PATCH 10/15] warn for uses of system directories when cross linking 2008-07-02 Joseph Myers <joseph@codesourcery.com> @@ -63,10 +63,10 @@ Upstream-Status: Pending 9 files changed, 86 insertions(+) diff --git a/ld/config.in b/ld/config.in -index 276fb77..35c58eb 100644 +index 2c6d698b6c..d3cb7e882d 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -14,6 +14,9 @@ +@@ -17,6 +17,9 @@ language is requested. */ #undef ENABLE_NLS @@ -77,10 +77,10 @@ index 276fb77..35c58eb 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index eb4f0d7..e9054b4 100755 +index 4277b74bad..63109644b6 100755 --- a/ld/configure +++ b/ld/configure -@@ -790,6 +790,7 @@ with_lib_path +@@ -793,6 +793,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -88,7 +88,7 @@ index eb4f0d7..e9054b4 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1446,6 +1447,8 @@ Optional Features: +@@ -1450,6 +1451,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) @@ -97,7 +97,7 @@ index eb4f0d7..e9054b4 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got=<type> GOT handling scheme (target, single, negative, multigot) -@@ -16306,6 +16309,19 @@ fi +@@ -16314,6 +16317,19 @@ fi @@ -118,7 +118,7 @@ index eb4f0d7..e9054b4 100755 if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in diff --git a/ld/configure.ac b/ld/configure.ac -index e28f38e..7b474e7 100644 +index 36a9f5083a..47f1d33fa5 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) @@ -139,10 +139,10 @@ index e28f38e..7b474e7 100644 dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. diff --git a/ld/ld.h b/ld/ld.h -index d84ec4e..3476b26 100644 +index 104bb8e237..74c914bdd5 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -164,6 +164,14 @@ typedef struct { +@@ -172,6 +172,14 @@ typedef struct /* If set, display the target memory usage (per memory region). */ bfd_boolean print_memory_usage; @@ -158,10 +158,10 @@ index d84ec4e..3476b26 100644 enum endian_enum endian; diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index 2389661..d06112b 100644 +index d393acdd94..ba995b1e3a 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo -@@ -2338,6 +2338,18 @@ string identifying the original linked file does not change. +@@ -2403,6 +2403,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. @@ -181,7 +181,7 @@ index 2389661..d06112b 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index 96f9ecc..af231c0 100644 +index 0943bb2dfa..95874c75de 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) @@ -209,10 +209,10 @@ index 96f9ecc..af231c0 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 6f11e7b..0ca3110 100644 +index 3ecac2bc86..34117f43a5 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -144,6 +144,8 @@ enum option_values +@@ -146,6 +146,8 @@ enum option_values OPTION_PRINT_MEMORY_USAGE, OPTION_REQUIRE_DEFINED_SYMBOL, OPTION_ORPHAN_HANDLING, @@ -222,10 +222,10 @@ index 6f11e7b..0ca3110 100644 /* The initial parser states. */ diff --git a/ld/ldmain.c b/ld/ldmain.c -index bb0b9cc..a23c56c 100644 +index 1e48b1a2db..21f27bacf1 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -257,6 +257,8 @@ main (int argc, char **argv) +@@ -270,6 +270,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -235,10 +235,10 @@ index bb0b9cc..a23c56c 100644 /* 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 e2fb212..a2064f1 100644 +index 0b7d4976ac..dedc07a143 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] = +@@ -535,6 +535,14 @@ static const struct ld_option ld_options[] = { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, '\0', N_("=MODE"), N_("Control how orphan sections are handled."), TWO_DASHES }, @@ -253,7 +253,7 @@ index e2fb212..a2064f1 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1550,6 +1558,14 @@ parse_args (unsigned argc, char **argv) +@@ -1562,6 +1570,14 @@ parse_args (unsigned argc, char **argv) einfo (_("%P%F: invalid argument to option" " \"--orphan-handling\"\n")); break; @@ -269,5 +269,5 @@ index e2fb212..a2064f1 100644 } -- -2.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0011-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index 4074241037..949ef51bdf 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,7 +1,7 @@ -From bb9eb09411ddcef515f0f7ad7c29214b0766e960 Mon Sep 17 00:00:00 2001 +From 4fe13a36997253a5c91bcb086aeb392ab2095f67 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/14] Fix rpath in libtool when sysroot is enabled +Subject: [PATCH 11/15] 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 @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ltmain.sh b/ltmain.sh -index 70e856e..11ee684 100644 +index 70e856e065..11ee684ccc 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -8035,9 +8035,11 @@ EOF @@ -48,5 +48,5 @@ index 70e856e..11ee684 100644 if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" -- -2.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0012-Change-default-emulation-for-mips64-linux.patch index c0d2d718a6..2ac101c958 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Change-default-emulation-for-mips64-linux.patch @@ -1,7 +1,7 @@ -From af1b4ee69b4fd617b88127ed40c3ca7351a9532f Mon Sep 17 00:00:00 2001 +From f43f832e0009caea6a3d5bcaa8f0a64d943072ea 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/14] Change default emulation for mips64*-*-linux +Subject: [PATCH 12/15] Change default emulation for mips64*-*-linux we change the default emulations to be N64 instead of N32 @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bfd/config.bfd b/bfd/config.bfd -index c5688cb..5c27b49 100644 +index 1b28016b91..63596c2ebc 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -1087,12 +1087,12 @@ case "${targ}" in +@@ -1183,12 +1183,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" ;; mips64*el-*-linux*) @@ -35,10 +35,10 @@ index c5688cb..5c27b49 100644 mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec diff --git a/ld/configure.tgt b/ld/configure.tgt -index 6b6bbf2..b45b1e5 100644 +index b85c6bb35a..4e77383a19 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -509,11 +509,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks +@@ -518,11 +518,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks mips*-*-vxworks*) targ_emul=elf32ebmipvxworks targ_extra_emuls="elf32elmipvxworks" ;; mips*-*-windiss) targ_emul=elf32mipswindiss ;; @@ -55,5 +55,5 @@ index 6b6bbf2..b45b1e5 100644 mips*el-*-linux-*) targ_emul=elf32ltsmip targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" -- -2.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0013-Add-support-for-Netlogic-XLP.patch index af7f12ff8b..b03e04608d 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-Add-support-for-Netlogic-XLP.patch @@ -1,7 +1,7 @@ -From 9f967c555b3fda64af4549ae252a0fba00120529 Mon Sep 17 00:00:00 2001 +From fc6fa6a6e6e9e6e5ad7080785af31b4ea68f60c4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Feb 2016 17:06:19 +0000 -Subject: [PATCH 12/14] Add support for Netlogic XLP +Subject: [PATCH 13/15] Add support for Netlogic XLP Patch From: Nebu Philips <nphilips@netlogicmicro.com> @@ -26,19 +26,18 @@ Upstream-Status: Pending 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(-) + 14 files changed, 64 insertions(+), 24 deletions(-) diff --git a/bfd/aoutx.h b/bfd/aoutx.h -index f78b910..d0d8dd3 100644 +index d30e8b8fbc..913b499744 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -802,6 +802,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, +@@ -812,6 +812,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -47,10 +46,10 @@ index f78b910..d0d8dd3 100644 arch_flags = M_MIPS2; break; diff --git a/bfd/archures.c b/bfd/archures.c -index 51068b9..727741f 100644 +index 6f35a5b2a7..d12cdf609a 100644 --- a/bfd/archures.c +++ b/bfd/archures.c -@@ -181,6 +181,7 @@ DESCRIPTION +@@ -197,6 +197,7 @@ DESCRIPTION .#define bfd_mach_mips_octeon2 6502 .#define bfd_mach_mips_octeon3 6503 .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR' *} @@ -59,10 +58,10 @@ index 51068b9..727741f 100644 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 779ffbf..bf5a565 100644 +index 6288c3bb4a..e9f9859a7b 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -1993,6 +1993,7 @@ enum bfd_architecture +@@ -2041,6 +2041,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon2 6502 #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR' */ @@ -71,10 +70,10 @@ index 779ffbf..bf5a565 100644 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 diff --git a/bfd/config.bfd b/bfd/config.bfd -index 5c27b49..d553039 100644 +index 63596c2ebc..6e923fb0ed 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -1066,6 +1066,11 @@ case "${targ}" in +@@ -1166,6 +1166,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -83,11 +82,11 @@ index 5c27b49..d553039 100644 + targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" + want64=true + ;; - mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks | mips*-*-windiss) + mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c -index 8a9475d..de7e5a3 100644 +index b9ecdd6e55..df1bffc25b 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c @@ -104,7 +104,8 @@ enum @@ -111,10 +110,10 @@ index 8a9475d..de7e5a3 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 1f2f4a3..700afd3 100644 +index 723853f821..7b464211c3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c -@@ -6605,6 +6605,9 @@ _bfd_elf_mips_mach (flagword flags) +@@ -6787,6 +6787,9 @@ _bfd_elf_mips_mach (flagword flags) case E_MIPS_MACH_XLR: return bfd_mach_mips_xlr; @@ -124,7 +123,7 @@ index 1f2f4a3..700afd3 100644 default: switch (flags & EF_MIPS_ARCH) { -@@ -11901,6 +11904,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12106,6 +12109,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -135,7 +134,7 @@ index 1f2f4a3..700afd3 100644 case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -13931,6 +13938,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = +@@ -14135,6 +14142,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 }, @@ -144,10 +143,10 @@ index 1f2f4a3..700afd3 100644 /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, diff --git a/binutils/readelf.c b/binutils/readelf.c -index d5dd46f..66810cc 100644 +index 8dca490226..b5f577f5a1 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3140,6 +3140,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) +@@ -3261,6 +3261,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break; case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; @@ -156,7 +155,7 @@ index d5dd46f..66810cc 100644 /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c -index a2d45a4..75902c0 100644 +index e24e84df54..baf84e419d 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -552,6 +552,7 @@ static int mips_32bitmode = 0; @@ -175,20 +174,20 @@ index a2d45a4..75902c0 100644 ) /* Whether the processor uses hardware interlocks to protect reads -@@ -18702,7 +18704,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = +@@ -19409,7 +19411,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ - { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR }, + { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLP }, - /* i6400. */ + /* MIPS 64 Release 6 */ { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, diff --git a/gas/configure b/gas/configure -index 89f18b3..86b19ae 100755 +index a36f1ae161..99f0a94e20 100755 --- a/gas/configure +++ b/gas/configure -@@ -12851,6 +12851,9 @@ _ACEOF +@@ -12989,6 +12989,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; @@ -198,24 +197,11 @@ index 89f18b3..86b19ae 100755 mipstx39 | mipstx39el) mips_cpu=r3900 ;; -diff --git a/gas/configure.tgt b/gas/configure.tgt -index 086e0d2..2b71270 100644 ---- a/gas/configure.tgt -+++ b/gas/configure.tgt -@@ -339,7 +339,7 @@ case ${generic_target} in - mips-*-sysv4*MP* | mips-*-gnu*) fmt=elf em=tmips ;; - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) - fmt=elf em=tmips ;; -- mips-*-elf* | mips-*-rtems*) fmt=elf ;; -+ mips-*-elf* | mips-*-rtems*) fmt=elf em=tmips ;; - mips-*-netbsd*) fmt=elf em=tmips ;; - mips-*-openbsd*) fmt=elf em=tmips ;; - diff --git a/include/elf/mips.h b/include/elf/mips.h -index 57de3bc..9ba141d 100644 +index 3e27b05122..81ea78a817 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h -@@ -285,6 +285,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) +@@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) #define E_MIPS_MACH_SB1 0x008a0000 #define E_MIPS_MACH_OCTEON 0x008b0000 #define E_MIPS_MACH_XLR 0x008c0000 @@ -224,10 +210,10 @@ index 57de3bc..9ba141d 100644 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 diff --git a/include/opcode/mips.h b/include/opcode/mips.h -index 9318fcc..9be5645 100644 +index 0d043d9520..450e9c2d67 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1228,8 +1228,10 @@ static const unsigned int mips_isa_table[] = { +@@ -1244,8 +1244,10 @@ static const unsigned int mips_isa_table[] = { #define INSN_LOONGSON_2F 0x80000000 /* Loongson 3A. */ #define INSN_LOONGSON_3A 0x00000400 @@ -240,7 +226,7 @@ index 9318fcc..9be5645 100644 /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1326,6 +1328,7 @@ static const unsigned int mips_isa_table[] = { +@@ -1344,6 +1346,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON2 6502 #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ @@ -248,7 +234,7 @@ index 9318fcc..9be5645 100644 /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1403,6 +1406,9 @@ cpu_is_member (int cpu, unsigned int mask) +@@ -1421,6 +1424,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -259,10 +245,10 @@ index 9318fcc..9be5645 100644 return FALSE; } diff --git a/ld/configure.tgt b/ld/configure.tgt -index b45b1e5..fb2f36a 100644 +index 4e77383a19..8a81f7ac39 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -495,6 +495,8 @@ mips*el-sde-elf*) targ_emul=elf32ltsmip +@@ -504,6 +504,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*) mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; @@ -272,7 +258,7 @@ index b45b1e5..fb2f36a 100644 targ_extra_emuls="elf32lr5900" targ_extra_libpath=$targ_extra_emuls ;; diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c -index 8200920..40d9fe2 100644 +index bb9912e462..70ecc51717 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -648,13 +648,11 @@ const struct mips_arch_choice mips_arch_choices[] = @@ -295,7 +281,7 @@ index 8200920..40d9fe2 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 402f887..3764836 100644 +index 5cb8e7365f..f2074856a2 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -320,7 +320,8 @@ decode_mips_operand (const char *p) @@ -308,7 +294,7 @@ index 402f887..3764836 100644 #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -957,6 +958,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -958,6 +959,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -316,7 +302,7 @@ index 402f887..3764836 100644 /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -989,12 +991,13 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -990,12 +992,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -331,7 +317,7 @@ index 402f887..3764836 100644 /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1066,6 +1069,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1067,6 +1070,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -339,7 +325,7 @@ index 402f887..3764836 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 }, -@@ -1081,6 +1085,8 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1082,6 +1086,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 }, @@ -348,7 +334,7 @@ index 402f887..3764836 100644 {"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 }, -@@ -1234,9 +1240,9 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1235,9 +1241,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 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -361,7 +347,7 @@ index 402f887..3764836 100644 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1401,7 +1407,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1402,7 +1408,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -370,7 +356,7 @@ index 402f887..3764836 100644 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1446,10 +1452,13 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1447,10 +1453,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -386,7 +372,7 @@ index 402f887..3764836 100644 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1499,7 +1508,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1500,7 +1509,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -395,7 +381,7 @@ index 402f887..3764836 100644 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1936,9 +1945,9 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1937,9 +1946,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, @@ -409,5 +395,5 @@ index 402f887..3764836 100644 {"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.7.1 +2.12.0 diff --git a/meta/recipes-devtools/binutils/binutils/0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch b/meta/recipes-devtools/binutils/binutils/0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch deleted file mode 100644 index 24af1207ce..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9619a608528383a44ccc1637ae939b5f3e97adc5 Mon Sep 17 00:00:00 2001 -From: Sandra Loosemore <sandra@codesourcery.com> -Date: Wed, 9 Dec 2015 16:13:58 -0800 -Subject: [PATCH 13/14] Fix GOT address computations in initial PLT entries for - nios2. - -2015-12-09 Sandra Loosemore <sandra@codesourcery.com> - - bfd/ - * elf32-nios2.c (nios2_elf32_finish_dynamic_sections): Correct - %hiadj/%lo computations for _GLOBAL_OFFSET_TABLE_ in initial - PLT entries. Assert alignment requirements. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Backport ---- - bfd/elf32-nios2.c | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) - -diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c -index 6b29d8b..1c54320 100644 ---- a/bfd/elf32-nios2.c -+++ b/bfd/elf32-nios2.c -@@ -5383,12 +5383,17 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, - + sgotplt->output_offset); - if (bfd_link_pic (info)) - { -- bfd_vma corrected = got_address - (splt->output_section->vma -- + splt->output_offset + 4); -+ bfd_vma got_pcrel = got_address - (splt->output_section->vma -+ + splt->output_offset); -+ /* Both GOT and PLT must be aligned to a 16-byte boundary -+ for the two loads to share the %hiadj part. The 4-byte -+ offset for nextpc is accounted for in the %lo offsets -+ on the loads. */ -+ BFD_ASSERT ((got_pcrel & 0xf) == 0); - nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); -- nios2_elf32_install_imm16 (splt, 4, hiadj (corrected)); -- nios2_elf32_install_imm16 (splt, 12, (corrected & 0xffff) + 4); -- nios2_elf32_install_imm16 (splt, 16, (corrected & 0xffff) + 8); -+ nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); -+ nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); -+ nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); - } - else - { -@@ -5404,6 +5409,10 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, - 6 | ((res_size - (res_offset + 4)) << 6), - splt->contents + res_offset); - -+ /* The GOT must be aligned to a 16-byte boundary for the -+ two loads to share the same %hiadj part. */ -+ BFD_ASSERT ((got_address & 0xf) == 0); -+ - nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); - nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); - nios2_elf32_install_imm16 (splt, res_size + 4, -@@ -5411,9 +5420,9 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, - nios2_elf32_install_imm16 (splt, res_size + 12, - hiadj (got_address)); - nios2_elf32_install_imm16 (splt, res_size + 16, -- (got_address & 0xffff) + 4); -+ (got_address + 4) & 0xffff); - nios2_elf32_install_imm16 (splt, res_size + 20, -- (got_address & 0xffff) + 8); -+ (got_address + 8) & 0xffff); - } - } - } --- -2.7.1 - diff --git a/meta/recipes-devtools/binutils/binutils/0014-Correct-nios2-_gp-address-computation.patch b/meta/recipes-devtools/binutils/binutils/0014-Correct-nios2-_gp-address-computation.patch deleted file mode 100644 index 86eeded6e8..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0014-Correct-nios2-_gp-address-computation.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 27f155fd0ab4ba954366643dbfdc3c7104933794 Mon Sep 17 00:00:00 2001 -From: Sandra Loosemore <sandra@codesourcery.com> -Date: Sun, 27 Dec 2015 12:30:26 -0800 -Subject: [PATCH 14/14] Correct nios2 _gp address computation. - -2015-12-27 Sandra Loosemore <sandra@codesourcery.com> - - bfd/ - * elf32-nios2.c (nios2_elf_assign_gp): Correct computation of _gp - address. - (nios2_elf32_relocate_section): Tidy code for R_NIOS2_GPREL error - messages. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Backport ---- - bfd/elf32-nios2.c | 31 +++++++++++++++++++++---------- - 1 file changed, 21 insertions(+), 10 deletions(-) - -diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c -index 1c54320..babecf3 100644 ---- a/bfd/elf32-nios2.c -+++ b/bfd/elf32-nios2.c -@@ -3086,7 +3086,15 @@ lookup: - case bfd_link_hash_defined: - case bfd_link_hash_defweak: - gp_found = TRUE; -- *pgp = lh->u.def.value; -+ { -+ asection *sym_sec = lh->u.def.section; -+ bfd_vma sym_value = lh->u.def.value; -+ -+ if (sym_sec->output_section) -+ sym_value = (sym_value + sym_sec->output_offset -+ + sym_sec->output_section->vma); -+ *pgp = sym_value; -+ } - break; - case bfd_link_hash_indirect: - case bfd_link_hash_warning: -@@ -3719,7 +3727,6 @@ nios2_elf32_relocate_section (bfd *output_bfd, - struct elf32_nios2_link_hash_entry *eh; - bfd_vma relocation; - bfd_vma gp; -- bfd_vma reloc_address; - bfd_reloc_status_type r = bfd_reloc_ok; - const char *name = NULL; - int r_type; -@@ -3762,12 +3769,6 @@ nios2_elf32_relocate_section (bfd *output_bfd, - if (bfd_link_relocatable (info)) - continue; - -- if (sec && sec->output_section) -- reloc_address = (sec->output_section->vma + sec->output_offset -- + rel->r_offset); -- else -- reloc_address = 0; -- - if (howto) - { - switch (howto->type) -@@ -3816,6 +3817,15 @@ nios2_elf32_relocate_section (bfd *output_bfd, - /* Turns an absolute address into a gp-relative address. */ - if (!nios2_elf_assign_gp (output_bfd, &gp, info)) - { -+ bfd_vma reloc_address; -+ -+ if (sec && sec->output_section) -+ reloc_address = (sec->output_section->vma -+ + sec->output_offset -+ + rel->r_offset); -+ else -+ reloc_address = 0; -+ - format = _("global pointer relative relocation at address " - "0x%08x when _gp not defined\n"); - sprintf (msgbuf, format, reloc_address); -@@ -3825,7 +3835,7 @@ nios2_elf32_relocate_section (bfd *output_bfd, - else - { - bfd_vma symbol_address = rel->r_addend + relocation; -- relocation = relocation + rel->r_addend - gp; -+ relocation = symbol_address - gp; - rel->r_addend = 0; - if (((signed) relocation < -32768 - || (signed) relocation > 32767) -@@ -3833,6 +3843,8 @@ nios2_elf32_relocate_section (bfd *output_bfd, - || h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak)) - { -+ if (h) -+ name = h->root.root.string; - format = _("Unable to reach %s (at 0x%08x) from the " - "global pointer (at 0x%08x) because the " - "offset (%d) is out of the allowed range, " -@@ -3848,7 +3860,6 @@ nios2_elf32_relocate_section (bfd *output_bfd, - rel->r_offset, relocation, - rel->r_addend); - } -- - break; - case R_NIOS2_UJMP: - r = nios2_elf32_do_ujmp_relocate (input_bfd, howto, --- -2.7.1 - diff --git a/meta/recipes-devtools/binutils/binutils/0014-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0014-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch new file mode 100644 index 0000000000..bb95a0cb06 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0014-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -0,0 +1,36 @@ +From a9177150f808d7e6285e1011c85d0ce89037b553 Mon Sep 17 00:00:00 2001 +From: Zhenhua Luo <zhenhua.luo@nxp.com> +Date: Sat, 11 Jun 2016 22:08:29 -0500 +Subject: [PATCH 14/15] fix the incorrect assembling for ppc wait mnemonic + +Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> + +Upstream-Status: Pending +--- + opcodes/ppc-opc.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c +index 30fd789182..f2708e2276 100644 +--- a/opcodes/ppc-opc.c ++++ b/opcodes/ppc-opc.c +@@ -4876,7 +4876,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, + + {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, +-{"wait", X(31,30), XWC_MASK, POWER9, 0, {WC}}, + + {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, + +@@ -4930,7 +4929,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, + {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, +-{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, ++{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9, 0, {WC}}, + + {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, + +-- +2.12.0 + diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch new file mode 100644 index 0000000000..1559038e50 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -0,0 +1,89 @@ +From 58cdb28ed71cb57b4a0ea1b412a708fdb0f84c27 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Mon, 6 Mar 2017 23:33:27 -0800 +Subject: [PATCH 15/15] sync with OE libtool changes + +Apply these patches from our libtool patches as not only are redundant RPATHs a +waste of space but they can cause incorrect linking when native packages are +restored from sstate. + +fix-rpath.patch: +We don't want to add RPATHS which match default linker +search paths, they're a waste of space. This patch +filters libtools list and removes the ones we don't need. + +norm-rpath.patch: +Libtool may be passed link paths of the form "/usr/lib/../lib", which +fool its detection code into thinking it should be included as an +RPATH in the generated binary. Normalize before comparision. + +Upstream-Status: Inappropriate + +Signed-off-by: Ross Burton <ross.burton@intel.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ltmain.sh | 34 ++++++++++++++++++++++++++++------ + 1 file changed, 28 insertions(+), 6 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 11ee684ccc..3b19ac1532 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -8053,8 +8053,16 @@ EOF + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append dep_rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ func_normal_abspath "$libdir" ++ libdir_norm=$func_normal_abspath_result ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir_norm "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +@@ -8790,8 +8798,16 @@ EOF + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ func_normal_abspath "$libdir" ++ libdir_norm=$func_normal_abspath_result ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir_norm "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath+=" $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +@@ -8841,8 +8857,14 @@ EOF + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in +-- +2.12.0 + diff --git a/meta/recipes-devtools/binutils/binutils/0016-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0016-Detect-64-bit-MIPS-targets.patch new file mode 100644 index 0000000000..1b2eb8485c --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0016-Detect-64-bit-MIPS-targets.patch @@ -0,0 +1,50 @@ +From c3ebde5d8cc3b0092966b4d725cad7cfd074fd8d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 31 Mar 2017 11:42:03 -0700 +Subject: [PATCH 16/16] Detect 64-bit MIPS targets + +Add mips64 target triplets and default to N64 + +Upstream-Status: Submitted +https://sourceware.org/ml/binutils/2016-08/msg00048.html + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gold/configure.tgt | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/gold/configure.tgt b/gold/configure.tgt +index 3d63027297..c1f92a1360 100644 +--- a/gold/configure.tgt ++++ b/gold/configure.tgt +@@ -153,6 +153,13 @@ aarch64*-*) + targ_big_endian=false + targ_extra_big_endian=true + ;; ++mips*64*el*-*-*|mips*64*le*-*-*) ++ targ_obj=mips ++ targ_machine=EM_MIPS_RS3_LE ++ targ_size=64 ++ targ_big_endian=false ++ targ_extra_big_endian=true ++ ;; + mips*el*-*-*|mips*le*-*-*) + targ_obj=mips + targ_machine=EM_MIPS_RS3_LE +@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*) + targ_big_endian=false + targ_extra_big_endian=true + ;; ++mips*64*-*-*) ++ targ_obj=mips ++ targ_machine=EM_MIPS ++ targ_size=64 ++ targ_big_endian=true ++ targ_extra_big_endian=false ++ ;; + mips*-*-*) + targ_obj=mips + targ_machine=EM_MIPS +-- +2.12.1 + diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch new file mode 100644 index 0000000000..1334c9444d --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch @@ -0,0 +1,124 @@ +From bdc5166c274b842f83f8328e7cfaaf80fd29934e Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Mon, 13 Feb 2017 13:08:32 +0000 +Subject: [PATCH 1/2] Fix readelf writing to illegal addresses whilst + processing corrupt input files containing symbol-difference relocations. + + PR binutils/21137 + * readelf.c (target_specific_reloc_handling): Add end parameter. + Check for buffer overflow before writing relocated values. + (apply_relocations): Pass end to target_specific_reloc_handling. + +(cherry pick from commit 03f7786e2f440b9892b1c34a58fb26222ce1b493) +Upstream-Status: Backport [master] +CVE: CVE-2017-6965 + +Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> +--- + binutils/ChangeLog | 7 +++++++ + binutils/readelf.c | 30 +++++++++++++++++++++++++----- + 2 files changed, 32 insertions(+), 5 deletions(-) + +diff --git a/binutils/ChangeLog b/binutils/ChangeLog +index f21867f98c..e789a3b99b 100644 +--- a/binutils/ChangeLog ++++ b/binutils/ChangeLog +@@ -1,3 +1,10 @@ ++2017-02-13 Nick Clifton <nickc@redhat.com> ++ ++ PR binutils/21137 ++ * readelf.c (target_specific_reloc_handling): Add end parameter. ++ Check for buffer overflow before writing relocated values. ++ (apply_relocations): Pass end to target_specific_reloc_handling. ++ + 2017-03-02 Tristan Gingold <gingold@adacore.com> + + * configure: Regenerate. +diff --git a/binutils/readelf.c b/binutils/readelf.c +index b5f577f5a1..8cdaae3b8c 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -11585,6 +11585,7 @@ process_syminfo (FILE * file ATTRIBUTE_UNUSED) + static bfd_boolean + target_specific_reloc_handling (Elf_Internal_Rela * reloc, + unsigned char * start, ++ unsigned char * end, + Elf_Internal_Sym * symtab) + { + unsigned int reloc_type = get_reloc_type (reloc->r_info); +@@ -11625,13 +11626,19 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + handle_sym_diff: + if (saved_sym != NULL) + { ++ int reloc_size = reloc_type == 1 ? 4 : 2; + bfd_vma value; + + value = reloc->r_addend + + (symtab[get_reloc_symindex (reloc->r_info)].st_value + - saved_sym->st_value); + +- byte_put (start + reloc->r_offset, value, reloc_type == 1 ? 4 : 2); ++ if (start + reloc->r_offset + reloc_size >= end) ++ /* PR 21137 */ ++ error (_("MSP430 sym diff reloc writes past end of section (%p vs %p)\n"), ++ start + reloc->r_offset + reloc_size, end); ++ else ++ byte_put (start + reloc->r_offset, value, reloc_size); + + saved_sym = NULL; + return TRUE; +@@ -11662,13 +11669,18 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + case 2: /* R_MN10300_16 */ + if (saved_sym != NULL) + { ++ int reloc_size = reloc_type == 1 ? 4 : 2; + bfd_vma value; + + value = reloc->r_addend + + (symtab[get_reloc_symindex (reloc->r_info)].st_value + - saved_sym->st_value); + +- byte_put (start + reloc->r_offset, value, reloc_type == 1 ? 4 : 2); ++ if (start + reloc->r_offset + reloc_size >= end) ++ error (_("MN10300 sym diff reloc writes past end of section (%p vs %p)\n"), ++ start + reloc->r_offset + reloc_size, end); ++ else ++ byte_put (start + reloc->r_offset, value, reloc_size); + + saved_sym = NULL; + return TRUE; +@@ -11703,12 +11715,20 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + break; + + case 0x41: /* R_RL78_ABS32. */ +- byte_put (start + reloc->r_offset, value, 4); ++ if (start + reloc->r_offset + 4 >= end) ++ error (_("RL78 sym diff reloc writes past end of section (%p vs %p)\n"), ++ start + reloc->r_offset + 2, end); ++ else ++ byte_put (start + reloc->r_offset, value, 4); + value = 0; + return TRUE; + + case 0x43: /* R_RL78_ABS16. */ +- byte_put (start + reloc->r_offset, value, 2); ++ if (start + reloc->r_offset + 2 >= end) ++ error (_("RL78 sym diff reloc writes past end of section (%p vs %p)\n"), ++ start + reloc->r_offset + 2, end); ++ else ++ byte_put (start + reloc->r_offset, value, 2); + value = 0; + return TRUE; + +@@ -12325,7 +12345,7 @@ apply_relocations (void * file, + + reloc_type = get_reloc_type (rp->r_info); + +- if (target_specific_reloc_handling (rp, start, symtab)) ++ if (target_specific_reloc_handling (rp, start, end, symtab)) + continue; + else if (is_none_reloc (reloc_type)) + continue; +-- +2.11.0 + diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch new file mode 100644 index 0000000000..dd58df5fbf --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch @@ -0,0 +1,241 @@ +From 383ec757d27652448d1511169e1133f486abf54f Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Mon, 13 Feb 2017 14:03:22 +0000 +Subject: [PATCH] Fix read-after-free error in readelf when processing + multiple, relocated sections in an MSP430 binary. + + PR binutils/21139 + * readelf.c (target_specific_reloc_handling): Add num_syms + parameter. Check for symbol table overflow before accessing + symbol value. If reloc pointer is NULL, discard all saved state. + (apply_relocations): Pass num_syms to target_specific_reloc_handling. + Call target_specific_reloc_handling with a NULL reloc pointer + after processing all of the relocs. + +(cherry pick from commit f84ce13b6708801ca1d6289b7c4003e2f5a6d7f9) +Upstream-Status: Backport [master] +CVE: CVE-2017-6966 + +Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> +--- + binutils/ChangeLog | 10 +++++ + binutils/readelf.c | 109 +++++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 94 insertions(+), 25 deletions(-) + +diff --git a/binutils/ChangeLog b/binutils/ChangeLog +index e789a3b99b..bd63c8a0d8 100644 +--- a/binutils/ChangeLog ++++ b/binutils/ChangeLog +@@ -1,5 +1,15 @@ + 2017-02-13 Nick Clifton <nickc@redhat.com> + ++ PR binutils/21139 ++ * readelf.c (target_specific_reloc_handling): Add num_syms ++ parameter. Check for symbol table overflow before accessing ++ symbol value. If reloc pointer is NULL, discard all saved state. ++ (apply_relocations): Pass num_syms to target_specific_reloc_handling. ++ Call target_specific_reloc_handling with a NULL reloc pointer ++ after processing all of the relocs. ++ ++2017-02-13 Nick Clifton <nickc@redhat.com> ++ + PR binutils/21137 + * readelf.c (target_specific_reloc_handling): Add end parameter. + Check for buffer overflow before writing relocated values. +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 8cdaae3b8c..7c158c6342 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -11580,15 +11580,27 @@ process_syminfo (FILE * file ATTRIBUTE_UNUSED) + + /* Check to see if the given reloc needs to be handled in a target specific + manner. If so then process the reloc and return TRUE otherwise return +- FALSE. */ ++ FALSE. ++ ++ If called with reloc == NULL, then this is a signal that reloc processing ++ for the current section has finished, and any saved state should be ++ discarded. */ + + static bfd_boolean + target_specific_reloc_handling (Elf_Internal_Rela * reloc, + unsigned char * start, + unsigned char * end, +- Elf_Internal_Sym * symtab) ++ Elf_Internal_Sym * symtab, ++ unsigned long num_syms) + { +- unsigned int reloc_type = get_reloc_type (reloc->r_info); ++ unsigned int reloc_type = 0; ++ unsigned long sym_index = 0; ++ ++ if (reloc) ++ { ++ reloc_type = get_reloc_type (reloc->r_info); ++ sym_index = get_reloc_symindex (reloc->r_info); ++ } + + switch (elf_header.e_machine) + { +@@ -11597,6 +11609,12 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + { + static Elf_Internal_Sym * saved_sym = NULL; + ++ if (reloc == NULL) ++ { ++ saved_sym = NULL; ++ return TRUE; ++ } ++ + switch (reloc_type) + { + case 10: /* R_MSP430_SYM_DIFF */ +@@ -11604,7 +11622,12 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + break; + /* Fall through. */ + case 21: /* R_MSP430X_SYM_DIFF */ +- saved_sym = symtab + get_reloc_symindex (reloc->r_info); ++ /* PR 21139. */ ++ if (sym_index >= num_syms) ++ error (_("MSP430 SYM_DIFF reloc contains invalid symbol index %lu\n"), ++ sym_index); ++ else ++ saved_sym = symtab + sym_index; + return TRUE; + + case 1: /* R_MSP430_32 or R_MSP430_ABS32 */ +@@ -11629,16 +11652,21 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + int reloc_size = reloc_type == 1 ? 4 : 2; + bfd_vma value; + +- value = reloc->r_addend +- + (symtab[get_reloc_symindex (reloc->r_info)].st_value +- - saved_sym->st_value); +- +- if (start + reloc->r_offset + reloc_size >= end) +- /* PR 21137 */ +- error (_("MSP430 sym diff reloc writes past end of section (%p vs %p)\n"), +- start + reloc->r_offset + reloc_size, end); ++ if (sym_index >= num_syms) ++ error (_("MSP430 reloc contains invalid symbol index %lu\n"), ++ sym_index); + else +- byte_put (start + reloc->r_offset, value, reloc_size); ++ { ++ value = reloc->r_addend + (symtab[sym_index].st_value ++ - saved_sym->st_value); ++ ++ if (start + reloc->r_offset + reloc_size >= end) ++ /* PR 21137 */ ++ error (_("MSP430 sym diff reloc writes past end of section (%p vs %p)\n"), ++ start + reloc->r_offset + reloc_size, end); ++ else ++ byte_put (start + reloc->r_offset, value, reloc_size); ++ } + + saved_sym = NULL; + return TRUE; +@@ -11658,13 +11686,24 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + { + static Elf_Internal_Sym * saved_sym = NULL; + ++ if (reloc == NULL) ++ { ++ saved_sym = NULL; ++ return TRUE; ++ } ++ + switch (reloc_type) + { + case 34: /* R_MN10300_ALIGN */ + return TRUE; + case 33: /* R_MN10300_SYM_DIFF */ +- saved_sym = symtab + get_reloc_symindex (reloc->r_info); ++ if (sym_index >= num_syms) ++ error (_("MN10300_SYM_DIFF reloc contains invalid symbol index %lu\n"), ++ sym_index); ++ else ++ saved_sym = symtab + sym_index; + return TRUE; ++ + case 1: /* R_MN10300_32 */ + case 2: /* R_MN10300_16 */ + if (saved_sym != NULL) +@@ -11672,15 +11711,20 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + int reloc_size = reloc_type == 1 ? 4 : 2; + bfd_vma value; + +- value = reloc->r_addend +- + (symtab[get_reloc_symindex (reloc->r_info)].st_value +- - saved_sym->st_value); +- +- if (start + reloc->r_offset + reloc_size >= end) +- error (_("MN10300 sym diff reloc writes past end of section (%p vs %p)\n"), +- start + reloc->r_offset + reloc_size, end); ++ if (sym_index >= num_syms) ++ error (_("MN10300 reloc contains invalid symbol index %lu\n"), ++ sym_index); + else +- byte_put (start + reloc->r_offset, value, reloc_size); ++ { ++ value = reloc->r_addend + (symtab[sym_index].st_value ++ - saved_sym->st_value); ++ ++ if (start + reloc->r_offset + reloc_size >= end) ++ error (_("MN10300 sym diff reloc writes past end of section (%p vs %p)\n"), ++ start + reloc->r_offset + reloc_size, end); ++ else ++ byte_put (start + reloc->r_offset, value, reloc_size); ++ } + + saved_sym = NULL; + return TRUE; +@@ -11700,12 +11744,24 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, + static bfd_vma saved_sym2 = 0; + static bfd_vma value; + ++ if (reloc == NULL) ++ { ++ saved_sym1 = saved_sym2 = 0; ++ return TRUE; ++ } ++ + switch (reloc_type) + { + case 0x80: /* R_RL78_SYM. */ + saved_sym1 = saved_sym2; +- saved_sym2 = symtab[get_reloc_symindex (reloc->r_info)].st_value; +- saved_sym2 += reloc->r_addend; ++ if (sym_index >= num_syms) ++ error (_("RL78_SYM reloc contains invalid symbol index %lu\n"), ++ sym_index); ++ else ++ { ++ saved_sym2 = symtab[sym_index].st_value; ++ saved_sym2 += reloc->r_addend; ++ } + return TRUE; + + case 0x83: /* R_RL78_OPsub. */ +@@ -12345,7 +12401,7 @@ apply_relocations (void * file, + + reloc_type = get_reloc_type (rp->r_info); + +- if (target_specific_reloc_handling (rp, start, end, symtab)) ++ if (target_specific_reloc_handling (rp, start, end, symtab, num_syms)) + continue; + else if (is_none_reloc (reloc_type)) + continue; +@@ -12441,6 +12497,9 @@ apply_relocations (void * file, + } + + free (symtab); ++ /* Let the target specific reloc processing code know that ++ we have finished with these relocs. */ ++ target_specific_reloc_handling (NULL, NULL, NULL, NULL, 0); + + if (relocs_return) + { +-- +2.11.0 + diff --git a/meta/recipes-devtools/binutils/binutils_2.26.bb b/meta/recipes-devtools/binutils/binutils_2.28.bb index b70ffbf28a..b51437bbc3 100644 --- a/meta/recipes-devtools/binutils/binutils_2.26.bb +++ b/meta/recipes-devtools/binutils/binutils_2.28.bb @@ -10,10 +10,15 @@ EXTRA_OECONF += "--with-sysroot=/ \ --with-system-zlib \ " +EXTRA_OEMAKE_append_libc-musl = "\ + gt_cv_func_gnugettext1_libc=yes \ + gt_cv_func_gnugettext2_libc=yes \ + " EXTRA_OECONF_class-native = "--enable-targets=all \ --enable-64-bit-bfd \ --enable-install-libiberty \ - --enable-install-libbfd" + --enable-install-libbfd \ + --disable-werror" do_install_class-native () { autotools_do_install |